Unverified Commit 2432c6b8 authored by Atemu's avatar Atemu Committed by GitHub
Browse files

Merge pull request #271071 from pbsds/wrapAppImage-pname-redux 

appimageTools.wrapAppImage: remove version from `pname`
parents 512b6bda 17151c64

doc/build-helpers/special/fhs-environments.section.md

+5 −1
Original line number Diff line number Diff line
@@ -6,7 +6,11 @@ It uses Linux' namespaces feature to create temporary lightweight environments w 
Accepted arguments are:



- `name`

        The name of the environment and the wrapper executable.

        The name of the environment, and the wrapper executable if `pname` is unset.

- `pname`

        The pname of the environment and the wrapper executable.

- `version`

        The version of the environment.

- `targetPkgs`

        Packages to be installed for the main host's architecture (i.e. x86_64 on x86_64 installations). Along with libraries binaries are also installed.

- `multiPkgs`

nixos/doc/manual/release-notes/rl-2405.section.md

+4 −0
Original line number Diff line number Diff line
@@ -208,6 +208,8 @@ The pre-existing [services.ankisyncd](#opt-services.ankisyncd.enable) has been m 


- `cudaPackages.autoFixElfFiles` has been deprecated for `pkgs.autoFixElfFiles`. Functionality has not changed, but the setuphook has been renamed and moved to the top-level package scope.



- `appimageTools.wrapAppImage` now create the binary at `$out/bin/${pname}` rather than `$out/bin/${pname}-${version}`, which will break downstream workarounds.



- `pdns` was updated to version [v4.9.x](https://doc.powerdns.com/authoritative/changelog/4.9.html), which introduces breaking changes. Check out the [Upgrade Notes](https://doc.powerdns.com/authoritative/upgrading.html#to-4-9-0) for details.



- `unrar` was updated to v7. See [changelog](https://www.rarlab.com/unrar7notes.htm) for more information.
@@ -495,6 +497,8 @@ The pre-existing [services.ankisyncd](#opt-services.ankisyncd.enable) has been m 


- `boot.initrd.network.ssh.authorizedKeyFiles` is a new option in the initrd ssh daemon module, for adding authorized keys via list of files.



- `appimage`, `appimageTools.wrapAppImage` and `buildFHSEnvBubblewrap` now properly accepts `pname` and `version`.



- Programs written in [Nim](https://nim-lang.org/) are built with libraries selected by lockfiles.

  The `nimPackages` and `nim2Packages` sets have been removed.

  See https://nixos.org/manual/nixpkgs/unstable#nim for more information.

pkgs/applications/audio/cider/default.nix

+0 −2
Original line number Diff line number Diff line
@@ -12,8 +12,6 @@ appimageTools.wrapType2 rec { 
  extraInstallCommands =

    let contents = appimageTools.extract { inherit pname version src; };

    in ''

      mv $out/bin/${pname}-${version} $out/bin/${pname}



      source "${makeWrapper}/nix-support/setup-hook"

      wrapProgram $out/bin/${pname} \

        --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}"

pkgs/applications/audio/museeks/default.nix

+0 −2
Original line number Diff line number Diff line
@@ -17,8 +17,6 @@ appimageTools.wrapType2 { 
  inherit pname version src;



  extraInstallCommands = ''

    mv $out/bin/${pname}-${version} $out/bin/${pname}



    mkdir -p $out/share/${pname}

    cp -a ${appimageContents}/{locales,resources} $out/share/${pname}

    cp -a ${appimageContents}/usr/share/icons $out/share/

pkgs/applications/audio/nuclear/default.nix

+0 −4
Original line number Diff line number Diff line
@@ -21,10 +21,6 @@ appimageTools.wrapType2 { 
    substituteInPlace $out/share/applications/${pname}.desktop \

      --replace 'Exec=AppRun' 'Exec=${pname}'

    cp -r ${appimageContents}/usr/share/icons $out/share



    # unless linked, the binary is placed in $out/bin/nuclear-someVersion

    # link it to $out/bin/nuclear

    ln -s $out/bin/${pname}-${version} $out/bin/${pname}

  '';



  meta = with lib; {