Clone of https://github.com/NixOS/nixpkgs.git (to stress-test knotserver)

treewide: fix name for appimages

+16 -32
+3 -5
pkgs/applications/blockchains/trezor-suite/default.nix
··· 9 9 let 10 10 pname = "trezor-suite"; 11 11 version = "24.6.2"; 12 - name = "${pname}-${version}"; 13 12 14 13 suffix = { 15 14 aarch64-linux = "linux-arm64"; ··· 17 16 }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); 18 17 19 18 src = fetchurl { 20 - url = "https://github.com/trezor/${pname}/releases/download/v${version}/Trezor-Suite-${version}-${suffix}.AppImage"; 19 + url = "https://github.com/trezor/trezor-suite/releases/download/v${version}/Trezor-Suite-${version}-${suffix}.AppImage"; 21 20 hash = { # curl -Lfs https://github.com/trezor/trezor-suite/releases/download/v${version}/latest-linux{-arm64,}.yml | grep ^sha512 | sed 's/: /-/' 22 21 aarch64-linux = "sha512-fJnka//9DbvTTq7GEN++6thU8f8BL4cHh1J4P/Tu9Eu94KWCHDG2IwFALOXEvZnwLbxFYiu3Cqldp2RIxYFXTA=="; 23 22 x86_64-linux = "sha512-/gRQR1EriiwrDj04BTnhXlsawJgHp6TqgHpgVCMO1r+U2zGiFLdNfwG/SYwARE+55X8Umls5hCt/wuCpTEPkEg=="; ··· 25 24 }; 26 25 27 26 appimageContents = appimageTools.extractType2 { 28 - inherit name src; 27 + inherit pname version src; 29 28 }; 30 29 31 30 in 32 31 33 32 appimageTools.wrapType2 rec { 34 - inherit name src; 33 + inherit pname version src; 35 34 36 35 extraInstallCommands = '' 37 - mv $out/bin/${name} $out/bin/${pname} 38 36 mkdir -p $out/bin $out/share/${pname} $out/share/${pname}/resources 39 37 40 38 cp -a ${appimageContents}/locales/ $out/share/${pname}
+2 -5
pkgs/applications/misc/mobilecoin-wallet/default.nix
··· 3 3 let 4 4 pname = "mobilecoin-wallet"; 5 5 version = "1.8.0"; 6 - name = "${pname}-${version}"; 7 6 src = fetchurl { 8 7 url = "https://github.com/mobilecoinofficial/desktop-wallet/releases/download/v${version}/MobileCoin.Wallet-${version}.AppImage"; 9 8 hash = "sha256-XGU/xxsMhOBAh+MeMtL2S707yH8HnoO9w5l7zqjO6rs="; 10 9 }; 11 - appimageContents = appimageTools.extractType2 { inherit name src; }; 10 + appimageContents = appimageTools.extractType2 { inherit pname version src; }; 12 11 13 12 in appimageTools.wrapType2 { 14 - inherit name src; 13 + inherit pname version src; 15 14 16 15 extraPkgs = pkgs: [ pkgs.libsecret ]; 17 16 18 17 extraInstallCommands = '' 19 - mv $out/bin/${name} $out/bin/${pname} 20 - 21 18 mkdir -p $out/share/${pname} 22 19 cp -a ${appimageContents}/locales $out/share/${pname} 23 20 cp -a ${appimageContents}/resources $out/share/${pname}
+2 -6
pkgs/applications/networking/cluster/lens/linux.nix
··· 1 1 { pname, version, src, meta, appimageTools, makeWrapper }: 2 2 let 3 - 4 - name = "${pname}-${version}"; 5 - 6 3 appimageContents = appimageTools.extractType2 { 7 - inherit name src; 4 + inherit pname version src; 8 5 }; 9 6 10 7 in 11 8 12 9 appimageTools.wrapType2 { 13 - inherit name src meta; 10 + inherit pname version src meta; 14 11 15 12 extraInstallCommands = 16 13 '' 17 - mv $out/bin/${name} $out/bin/${pname} 18 14 source "${makeWrapper}/nix-support/setup-hook" 19 15 wrapProgram $out/bin/${pname} \ 20 16 --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}"
+1 -2
pkgs/applications/networking/instant-messengers/beeper/default.nix
··· 11 11 let 12 12 pname = "beeper"; 13 13 version = "3.106.2"; 14 - name = "${pname}-${version}"; 15 14 src = fetchurl { 16 15 url = "https://download.todesktop.com/2003241lzgn20jd/beeper-3.106.2-build-240604xwl5q01pr-x86_64.AppImage"; 17 16 hash = "sha256-WbAWJJzk58UVmRN3RHmU/V6zPiLWAb7m7hns4gmP55M="; ··· 25 24 }; 26 25 in 27 26 stdenvNoCC.mkDerivation rec { 28 - inherit name pname version; 27 + inherit pname version; 29 28 30 29 src = appimage; 31 30
+1 -1
pkgs/applications/networking/instant-messengers/ripcord/default.nix
··· 14 14 name = "${pname}-${version}.AppImage"; 15 15 }; 16 16 in appimageTools.extract { 17 - name = "${pname}-${version}"; 17 + inherit pname version; 18 18 src = appimage; 19 19 }; 20 20
+1 -1
pkgs/applications/networking/pcloud/default.nix
··· 48 48 }; 49 49 50 50 appimageContents = appimageTools.extractType2 { 51 - name = "${pname}-${version}"; 51 + inherit pname version; 52 52 src = "${src}/pcloud"; 53 53 }; 54 54
+1 -2
pkgs/applications/office/super-productivity/default.nix
··· 11 11 }; 12 12 13 13 appimageContents = appimageTools.extractType2 { 14 - name = "${pname}-${version}"; 15 - inherit src; 14 + inherit pname version src; 16 15 }; 17 16 18 17 dontUnpack = true;
+1 -2
pkgs/applications/video/freetube/default.nix
··· 12 12 passthru.tests = nixosTests.freetube; 13 13 14 14 appimageContents = appimageTools.extractType2 { 15 - name = "${pname}-${version}"; 16 - inherit src; 15 + inherit pname version src; 17 16 }; 18 17 19 18 dontUnpack = true;
+1 -2
pkgs/by-name/im/immersed-vr/linux.nix
··· 4 4 , meta 5 5 , appimageTools 6 6 }: 7 - appimageTools.wrapType2 rec { 7 + appimageTools.wrapType2 { 8 8 inherit pname version src meta; 9 - name = "${pname}-${version}"; 10 9 }
+2 -4
pkgs/by-name/wo/wowup-cf/package.nix
··· 3 3 let 4 4 version = "2.12.0"; 5 5 pname = "wowup-cf"; 6 - name = "${pname}-${version}"; 7 6 8 7 src = fetchurl { 9 8 url = "https://github.com/WowUp/WowUp.CF/releases/download/v${version}/WowUp-CF-${version}.AppImage"; 10 9 hash = "sha256-uWz/EQBX/d1UBfpc9EL4x+UH72kINd6pqFIvJkV16e8="; 11 10 }; 12 11 13 - appimageContents = appimageTools.extractType1 { inherit name src; }; 12 + appimageContents = appimageTools.extractType1 { inherit pname version src; }; 14 13 in appimageTools.wrapType1 { 15 - inherit name src; 14 + inherit pname version src; 16 15 17 16 extraInstallCommands = '' 18 - mv $out/bin/${name} $out/bin/${pname} 19 17 install -m 444 -D ${appimageContents}/${pname}.desktop -t $out/share/applications 20 18 substituteInPlace $out/share/applications/${pname}.desktop \ 21 19 --replace 'Exec=AppRun' 'Exec=${pname}'
+1 -2
pkgs/os-specific/linux/uhk-agent/default.nix
··· 21 21 }; 22 22 23 23 appimageContents = appimageTools.extract { 24 - name = "${pname}-${version}"; 25 - inherit src; 24 + inherit pname version src; 26 25 }; 27 26 in 28 27 stdenvNoCC.mkDerivation {