treewide: expose pname and version in some more packages (#361250)

authored by jopejoe1 and committed by GitHub 34ac189b c40884eb

+22 -22
+2 -1
pkgs/applications/misc/zathura/wrapper.nix
··· 18 ], 19 }: 20 symlinkJoin { 21 - name = "zathura-with-plugins-${zathura_core.version}"; 22 23 paths = 24 with zathura_core;
··· 18 ], 19 }: 20 symlinkJoin { 21 + inherit (zathura_core) version; 22 + pname = "zathura-with-plugins"; 23 24 paths = 25 with zathura_core;
+2
pkgs/by-name/ge/gepetto-viewer/package.nix
··· 93 plugins: 94 runCommand "gepetto-gui" 95 { 96 meta = { 97 # can't just "inherit (gepetto-viewer) meta;" because: 98 # error: derivation '/nix/store/…-gepetto-gui.drv' does not have wanted outputs 'bin'
··· 93 plugins: 94 runCommand "gepetto-gui" 95 { 96 + inherit (finalAttrs) version; 97 + pname = "gepetto-gui"; 98 meta = { 99 # can't just "inherit (gepetto-viewer) meta;" because: 100 # error: derivation '/nix/store/…-gepetto-gui.drv' does not have wanted outputs 'bin'
+2 -1
pkgs/by-name/x1/x16/run.nix
··· 22 }; 23 in 24 symlinkJoin { 25 - name = "run-x16-${emulator.version}"; 26 27 paths = [ 28 emulator
··· 22 }; 23 in 24 symlinkJoin { 25 + pname = "run-x16"; 26 + inherit (emulator) version; 27 28 paths = [ 29 emulator
+1 -1
pkgs/by-name/xm/xmoji/package.nix
··· 14 }: 15 16 stdenv.mkDerivation (finalAttrs: { 17 - name = "xmoji"; 18 version = "0.8"; 19 20 src = fetchFromGitHub {
··· 14 }: 15 16 stdenv.mkDerivation (finalAttrs: { 17 + pname = "xmoji"; 18 version = "0.8"; 19 20 src = fetchFromGitHub {
+1 -1
pkgs/by-name/zi/zitadel/package.nix
··· 95 }; 96 in 97 buildGoModule rec { 98 - name = "zitadel"; 99 inherit version; 100 101 src = zitadelRepo;
··· 95 }; 96 in 97 buildGoModule rec { 98 + pname = "zitadel"; 99 inherit version; 100 101 src = zitadelRepo;
+6 -6
pkgs/by-name/zo/zod/package.nix
··· 16 , substituteAll 17 }: 18 let 19 - name = "zod-engine"; 20 version = "2011-09-06"; 21 src = fetchzip { 22 url = "mirror://sourceforge/zod/linux_releases/zod_linux-${version}.tar.gz"; ··· 41 NIX_LDFLAGS = "-L${libmysqlclient}/lib/mysql"; 42 zod_engine = stdenv.mkDerivation { 43 inherit version src postPatch nativeBuildInputs buildInputs hardeningDisable NIX_LDFLAGS; 44 - pname = "${name}-engine"; 45 enableParallelBuilding = true; 46 preBuild = "cd zod_src"; 47 installPhase = '' ··· 52 }; 53 zod_map_editor = stdenv.mkDerivation { 54 inherit version src postPatch nativeBuildInputs buildInputs hardeningDisable NIX_LDFLAGS; 55 - pname = "${name}-map_editor"; 56 enableParallelBuilding = true; 57 preBuild = "cd zod_src"; 58 makeFlags = [ "map_editor" ]; ··· 64 }; 65 zod_launcher = stdenv.mkDerivation { 66 inherit version src nativeBuildInputs buildInputs zod_engine zod_map_editor; 67 - pname = "${name}-launcher"; 68 # This is necessary because the zod_launcher has terrible fixed-width window 69 # the Idea is to apply the scalingFactor to all positions and sizes and I tested 1,2,3 and 4 70 # 2,3,4 look acceptable on my 4k monitor and 1 is unreadable. ··· 86 install -m755 zod_launcher $out/bin 87 ''; 88 }; 89 - zod_assets = runCommandLocal "${name}-assets" {} '' 90 mkdir -p $out/usr/lib/commander-zod{,blank_maps} 91 cp -r ${src}/assets $out/usr/lib/commander-zod/assets 92 for i in ${src}/*.map ${src}/*.txt; do ··· 98 ''; 99 in 100 symlinkJoin { 101 - inherit name; 102 paths = [ 103 zod_engine 104 zod_launcher
··· 16 , substituteAll 17 }: 18 let 19 + pname = "zod-engine"; 20 version = "2011-09-06"; 21 src = fetchzip { 22 url = "mirror://sourceforge/zod/linux_releases/zod_linux-${version}.tar.gz"; ··· 41 NIX_LDFLAGS = "-L${libmysqlclient}/lib/mysql"; 42 zod_engine = stdenv.mkDerivation { 43 inherit version src postPatch nativeBuildInputs buildInputs hardeningDisable NIX_LDFLAGS; 44 + pname = "${pname}-engine"; 45 enableParallelBuilding = true; 46 preBuild = "cd zod_src"; 47 installPhase = '' ··· 52 }; 53 zod_map_editor = stdenv.mkDerivation { 54 inherit version src postPatch nativeBuildInputs buildInputs hardeningDisable NIX_LDFLAGS; 55 + pname = "${pname}-map_editor"; 56 enableParallelBuilding = true; 57 preBuild = "cd zod_src"; 58 makeFlags = [ "map_editor" ]; ··· 64 }; 65 zod_launcher = stdenv.mkDerivation { 66 inherit version src nativeBuildInputs buildInputs zod_engine zod_map_editor; 67 + pname = "${pname}-launcher"; 68 # This is necessary because the zod_launcher has terrible fixed-width window 69 # the Idea is to apply the scalingFactor to all positions and sizes and I tested 1,2,3 and 4 70 # 2,3,4 look acceptable on my 4k monitor and 1 is unreadable. ··· 86 install -m755 zod_launcher $out/bin 87 ''; 88 }; 89 + zod_assets = runCommandLocal "${pname}-assets" {} '' 90 mkdir -p $out/usr/lib/commander-zod{,blank_maps} 91 cp -r ${src}/assets $out/usr/lib/commander-zod/assets 92 for i in ${src}/*.map ${src}/*.txt; do ··· 98 ''; 99 in 100 symlinkJoin { 101 + inherit pname version; 102 paths = [ 103 zod_engine 104 zod_launcher
+1 -1
pkgs/development/python-modules/dscribe/default.nix
··· 11 }: 12 13 buildPythonPackage rec { 14 - name = "dscribe"; 15 version = "2.1.1"; 16 17 src = fetchFromGitHub {
··· 11 }: 12 13 buildPythonPackage rec { 14 + pname = "dscribe"; 15 version = "2.1.1"; 16 17 src = fetchFromGitHub {
+1 -3
pkgs/development/python-modules/magic/default.nix
··· 6 }: 7 8 buildPythonPackage { 9 - name = pkgs.file.name; 10 - 11 - src = pkgs.file.src; 12 13 patchPhase = '' 14 substituteInPlace python/magic.py --replace "find_library('magic')" "'${pkgs.file}/lib/libmagic${stdenv.hostPlatform.extensions.sharedLibrary}'"
··· 6 }: 7 8 buildPythonPackage { 9 + inherit (pkgs.file) pname version src; 10 11 patchPhase = '' 12 substituteInPlace python/magic.py --replace "find_library('magic')" "'${pkgs.file}/lib/libmagic${stdenv.hostPlatform.extensions.sharedLibrary}'"
+1 -1
pkgs/development/python-modules/molbar/default.nix
··· 19 }: 20 21 buildPythonPackage rec { 22 - name = "MolBar"; 23 version = "1.1.1"; 24 25 src = fetchgit {
··· 19 }: 20 21 buildPythonPackage rec { 22 + pname = "MolBar"; 23 version = "1.1.1"; 24 25 src = fetchgit {
+5 -7
pkgs/games/xonotic/default.nix
··· 158 rm -rf $(ls | grep -v "^data$" | grep -v "^key_0.d0pk$") 159 ''; 160 meta.hydraPlatforms = []; 161 - passthru.version = version; 162 }; 163 164 xonotic = runCommand "xonotic${variant}-${version}" { 165 - inherit xonotic-unwrapped; 166 nativeBuildInputs = [ makeWrapper copyDesktopItems ]; 167 desktopItems = [ desktopItem ]; 168 - passthru = { 169 - inherit version; 170 - meta = meta // { 171 - hydraPlatforms = []; 172 - }; 173 }; 174 } ('' 175 mkdir -p $out/bin
··· 158 rm -rf $(ls | grep -v "^data$" | grep -v "^key_0.d0pk$") 159 ''; 160 meta.hydraPlatforms = []; 161 + inherit version pname; 162 }; 163 164 xonotic = runCommand "xonotic${variant}-${version}" { 165 + inherit xonotic-unwrapped version; 166 + pname = "${pname}${variant}"; 167 nativeBuildInputs = [ makeWrapper copyDesktopItems ]; 168 desktopItems = [ desktopItem ]; 169 + meta = meta // { 170 + hydraPlatforms = []; 171 }; 172 } ('' 173 mkdir -p $out/bin