From 396d33115c6f3a67d3af9b31e247a8bb6b6df435 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Thu, 6 Mar 2025 21:49:34 +0100 Subject: [PATCH 01/12] agorakit: avoid using finalAttrs.pname --- pkgs/by-name/ag/agorakit/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ag/agorakit/package.nix b/pkgs/by-name/ag/agorakit/package.nix index f68fb9393e79d..0d23000df9fb2 100644 --- a/pkgs/by-name/ag/agorakit/package.nix +++ b/pkgs/by-name/ag/agorakit/package.nix @@ -10,8 +10,8 @@ php.buildComposerProject2 (finalAttrs: { version = "1.9.3"; src = fetchFromGitHub { - owner = finalAttrs.pname; - repo = finalAttrs.pname; + owner = "agorakit"; + repo = "agorakit"; tag = finalAttrs.version; sha256 = "sha256-mBBl/8nXG3FsMeecbERLyY2tGFhh+5nS8A4nd7HI+8c="; }; From fa211f1a3c382fb727ec2445ee6137744a82ae86 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Thu, 6 Mar 2025 21:49:34 +0100 Subject: [PATCH 02/12] base45: avoid using finalAttrs.pname --- pkgs/by-name/ba/base45/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/ba/base45/package.nix b/pkgs/by-name/ba/base45/package.nix index a02b502f1ede3..926f49912598e 100644 --- a/pkgs/by-name/ba/base45/package.nix +++ b/pkgs/by-name/ba/base45/package.nix @@ -16,7 +16,7 @@ buildNimPackage (finalAttrs: { meta = finalAttrs.src.meta // { description = "Base45 library for Nim"; license = lib.licenses.unlicense; - mainProgram = finalAttrs.pname; + mainProgram = "base45"; maintainers = with lib.maintainers; [ ehmry ]; }; }) From 07fad50b2acbca273a70603773201d982d96b03c Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Thu, 6 Mar 2025 21:49:35 +0100 Subject: [PATCH 03/12] chsrc: avoid using finalAttrs.pname --- pkgs/by-name/ch/chsrc/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/ch/chsrc/package.nix b/pkgs/by-name/ch/chsrc/package.nix index d59c2823ee20d..571e6302d03af 100644 --- a/pkgs/by-name/ch/chsrc/package.nix +++ b/pkgs/by-name/ch/chsrc/package.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitHub { owner = "RubyMetric"; - repo = finalAttrs.pname; + repo = "chsrc"; rev = "v${finalAttrs.version}"; hash = "sha256-MwT6SuDisJ2ynxlOqAUA8WjhrTeUcyoAMArehnby8Yw="; }; From d009fc44e05465a24e4e4f98ac8c816f1d5dc8fc Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Thu, 6 Mar 2025 21:49:35 +0100 Subject: [PATCH 04/12] frr: avoid using finalAttrs.pname --- pkgs/by-name/fr/frr/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/fr/frr/package.nix b/pkgs/by-name/fr/frr/package.nix index f1bee212713ef..465b6c3b5620f 100644 --- a/pkgs/by-name/fr/frr/package.nix +++ b/pkgs/by-name/fr/frr/package.nix @@ -86,8 +86,8 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitHub { owner = "FRRouting"; - repo = finalAttrs.pname; - rev = "${finalAttrs.pname}-${finalAttrs.version}"; + repo = "frr"; + rev = "frr-${finalAttrs.version}"; hash = "sha256-TWqW6kI5dDl6IW2Ql6eeySDSyxp0fPgcJOOX1JxjAxs="; }; From 7a564478a52090c9368092cad184b81e95491448 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Thu, 6 Mar 2025 21:49:35 +0100 Subject: [PATCH 05/12] iio-oscilloscope: avoid using finalAttrs.pname --- pkgs/by-name/ii/iio-oscilloscope/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/ii/iio-oscilloscope/package.nix b/pkgs/by-name/ii/iio-oscilloscope/package.nix index 70fd9d092e5eb..d4447b6bd8c8e 100644 --- a/pkgs/by-name/ii/iio-oscilloscope/package.nix +++ b/pkgs/by-name/ii/iio-oscilloscope/package.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitHub { owner = "analogdevicesinc"; - repo = finalAttrs.pname; + repo = "iio-oscilloscope"; rev = "v${finalAttrs.version}-master"; hash = "sha256-wCeOLAkrytrBaXzUbNu8z2Ayz44M+b+mbyaRoWHpZYU="; }; From 5747644628c6744bb51f70197449510506a0d052 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Thu, 6 Mar 2025 21:49:36 +0100 Subject: [PATCH 06/12] minutor: avoid using finalAttrs.pname --- pkgs/by-name/mi/minutor/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/mi/minutor/package.nix b/pkgs/by-name/mi/minutor/package.nix index e04e2504a22fc..1a49394b87210 100644 --- a/pkgs/by-name/mi/minutor/package.nix +++ b/pkgs/by-name/mi/minutor/package.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitHub { owner = "mrkite"; - repo = finalAttrs.pname; + repo = "minutor"; tag = finalAttrs.version; sha256 = "0ldjnrk429ywf8cxdpjkam5k73s6fq7lvksandfn3xn7gl9np5rk"; }; From 38db49a5df45c9e73d308fd1b64fe929295abcc5 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Thu, 6 Mar 2025 21:49:36 +0100 Subject: [PATCH 07/12] misskey: avoid using finalAttrs.pname --- pkgs/by-name/mi/misskey/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/mi/misskey/package.nix b/pkgs/by-name/mi/misskey/package.nix index 8343793050280..df5907190c318 100644 --- a/pkgs/by-name/mi/misskey/package.nix +++ b/pkgs/by-name/mi/misskey/package.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitHub { owner = "misskey-dev"; - repo = finalAttrs.pname; + repo = "misskey"; rev = finalAttrs.version; hash = "sha256-uei5Ojx39kCbS8DCjHZ5PoEAsqJ5vC6SsFqIEIJ16n8="; fetchSubmodules = true; From bab5d497b63b0a47d728ba526ba490ec2f62ca41 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Thu, 6 Mar 2025 21:49:36 +0100 Subject: [PATCH 08/12] tart: avoid using finalAttrs.pname --- pkgs/by-name/ta/tart/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/ta/tart/package.nix b/pkgs/by-name/ta/tart/package.nix index 2d0fc60ad3aba..7f1b68712fbcf 100644 --- a/pkgs/by-name/ta/tart/package.nix +++ b/pkgs/by-name/ta/tart/package.nix @@ -45,7 +45,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { emilytrau aduh95 ]; - mainProgram = finalAttrs.pname; + mainProgram = "tart"; platforms = [ "aarch64-darwin" "x86_64-darwin" From 8b218a7bf728b78d98e271f525381ca5aad04702 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Thu, 6 Mar 2025 21:49:37 +0100 Subject: [PATCH 09/12] tslib: avoid using finalAttrs.pname --- pkgs/by-name/ts/tslib/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/ts/tslib/package.nix b/pkgs/by-name/ts/tslib/package.nix index 3e94b24e5dca7..4ab8ddda9b62e 100644 --- a/pkgs/by-name/ts/tslib/package.nix +++ b/pkgs/by-name/ts/tslib/package.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitHub { owner = "libts"; - repo = finalAttrs.pname; + repo = "tslib"; rev = finalAttrs.version; sha256 = finalAttrs.hash; }; From 0a539165d1d7d83f12deb3fd1133230e2d23e8bd Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Thu, 6 Mar 2025 21:49:37 +0100 Subject: [PATCH 10/12] ytmdesktop: avoid using finalAttrs.pname --- pkgs/by-name/yt/ytmdesktop/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/yt/ytmdesktop/package.nix b/pkgs/by-name/yt/ytmdesktop/package.nix index d5e537c4d43df..e9642c7641467 100644 --- a/pkgs/by-name/yt/ytmdesktop/package.nix +++ b/pkgs/by-name/yt/ytmdesktop/package.nix @@ -94,7 +94,7 @@ stdenv.mkDerivation (finalAttrs: { downloadPage = "https://github.com/ytmdesktop/ytmdesktop/releases"; homepage = "https://ytmdesktop.app/"; license = lib.licenses.gpl3Only; - mainProgram = finalAttrs.pname; + mainProgram = "ytmdesktop"; maintainers = [ lib.maintainers.cjshearer ]; inherit (electron_33.meta) platforms; # While the files we extract from the .deb are cross-platform (javascript), the installation From dcd7bc77fdb2cab194bcd5116e5b7ff06e4c17c0 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Thu, 6 Mar 2025 21:49:38 +0100 Subject: [PATCH 11/12] zinit: avoid using finalAttrs.pname --- pkgs/by-name/zi/zinit/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/zi/zinit/package.nix b/pkgs/by-name/zi/zinit/package.nix index dc0eccdfad25a..2f43e0bcf1bbb 100644 --- a/pkgs/by-name/zi/zinit/package.nix +++ b/pkgs/by-name/zi/zinit/package.nix @@ -12,7 +12,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { src = fetchFromGitHub { owner = "zdharma-continuum"; - repo = finalAttrs.pname; + repo = "zinit"; tag = "v${finalAttrs.version}"; hash = "sha256-fnBV0LmC/wJm0pOITJ1mhiBqsg2F8AQJWvn0p/Bgo5Q="; }; From 757af0457031ec338755af1420fa95e8201360a7 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Thu, 6 Mar 2025 21:49:59 +0100 Subject: [PATCH 12/12] stellarsolver: avoid using finalAttrs.pname --- pkgs/by-name/st/stellarsolver/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/st/stellarsolver/package.nix b/pkgs/by-name/st/stellarsolver/package.nix index b871365599e16..0417d3cbd2f0f 100644 --- a/pkgs/by-name/st/stellarsolver/package.nix +++ b/pkgs/by-name/st/stellarsolver/package.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitHub { owner = "rlancaste"; - repo = finalAttrs.pname; + repo = "stellarsolver"; rev = finalAttrs.version; sha256 = "sha256-6WDiHaBhi9POtXynGU/eTeuqZSK81JJeuZv4SxOeVoE="; };