Skip to content

Commit 44560ee

Browse files
various: make all uses of fixed point builders use finalAttrs as argument
some of these were just typos like `finalAttr`, `finalAtts` or `finaAttrs` some of these were using `self`, `final`, `finalPackage`, `attrs` or `_` some of these were wrong by using `oldAttrs` or `finalPackages` other than the nixos manual this shouldn't create any rebuilds
1 parent 8ea8ad0 commit 44560ee

58 files changed

Lines changed: 198 additions & 195 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

doc/languages-frameworks/ocaml.section.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -116,14 +116,14 @@ Here is a second example, this time using a source archive generated with `dune-
116116
buildDunePackage,
117117
}:
118118
119-
buildDunePackage (finalAtts: {
119+
buildDunePackage (finalAttrs: {
120120
pname = "wtf8";
121121
version = "1.0.2";
122122
123123
minimalOCamlVersion = "4.02";
124124
125125
src = fetchurl {
126-
url = "https://github.com/flowtype/ocaml-wtf8/releases/download/v${finalAtts.version}/wtf8-v${finalAtts.version}.tbz";
126+
url = "https://github.com/flowtype/ocaml-wtf8/releases/download/v${finalAttrs.version}/wtf8-v${finalAttrs.version}.tbz";
127127
hash = "sha256-d5/3KUBAWRj8tntr4RkJ74KWW7wvn/B/m1nx0npnzyc=";
128128
};
129129

pkgs/applications/misc/qtbitcointrader/default.nix

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@
55
libsForQt5,
66
}:
77

8-
stdenv.mkDerivation (finalAttr: {
8+
stdenv.mkDerivation (finalAttrs: {
99
pname = "qtbitcointrader";
1010
version = "1.42.21";
1111

1212
src = fetchFromGitHub {
1313
owner = "JulyIGHOR";
1414
repo = "QtBitcoinTrader";
15-
tag = "v${finalAttr.version}";
15+
tag = "v${finalAttrs.version}";
1616
hash = "sha256-u3+Kwn8KunYUpWCd55TQuVVfoSp8hdti93d6hk7Uqx8=";
1717
};
1818

@@ -24,7 +24,7 @@ stdenv.mkDerivation (finalAttr: {
2424
libsForQt5.qtscript
2525
];
2626

27-
sourceRoot = "${finalAttr.src.name}/src";
27+
sourceRoot = "${finalAttrs.src.name}/src";
2828

2929
configurePhase = ''
3030
runHook preConfigure

pkgs/by-name/ag/age/package.nix

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,14 @@
1616
nix-update-script,
1717
}:
1818

19-
buildGoModule (final: {
19+
buildGoModule (finalAttrs: {
2020
pname = "age";
2121
version = "1.3.1";
2222

2323
src = fetchFromGitHub {
2424
owner = "FiloSottile";
2525
repo = "age";
26-
tag = "v${final.version}";
26+
tag = "v${finalAttrs.version}";
2727
hash = "sha256-Qs/q3zQYV0PukABBPf/aU5V1oOhw95NG6K301VYJk8A=";
2828
};
2929

@@ -32,7 +32,7 @@ buildGoModule (final: {
3232
ldflags = [
3333
"-s"
3434
"-w"
35-
"-X main.Version=v${final.version}"
35+
"-X main.Version=v${finalAttrs.version}"
3636
];
3737

3838
nativeBuildInputs = [ installShellFiles ];
@@ -67,15 +67,15 @@ buildGoModule (final: {
6767
# convenience function for wrapping sops with plugins
6868
passthru.withPlugins =
6969
filter:
70-
runCommand "age-${final.version}-with-plugins" { nativeBuildInputs = [ makeWrapper ]; } ''
71-
makeWrapper ${lib.getBin final.finalPackage}/bin/age $out/bin/age \
72-
--prefix PATH : "${lib.makeBinPath (filter final.passthru.plugins)}"
70+
runCommand "age-${finalAttrs.version}-with-plugins" { nativeBuildInputs = [ makeWrapper ]; } ''
71+
makeWrapper ${lib.getBin finalAttrs.finalPackage}/bin/age $out/bin/age \
72+
--prefix PATH : "${lib.makeBinPath (filter finalAttrs.passthru.plugins)}"
7373
'';
7474

7575
passthru.updateScript = nix-update-script { };
7676

7777
meta = {
78-
changelog = "https://github.com/FiloSottile/age/releases/tag/v${final.version}";
78+
changelog = "https://github.com/FiloSottile/age/releases/tag/v${finalAttrs.version}";
7979
homepage = "https://age-encryption.org/";
8080
description = "Modern encryption tool with small explicit keys";
8181
license = lib.licenses.bsd3;

pkgs/by-name/al/alacritty-theme/package.nix

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
stdenvNoCC,
66
}:
77

8-
stdenvNoCC.mkDerivation (self: {
8+
stdenvNoCC.mkDerivation (finalAttrs: {
99
pname = "alacritty-theme";
1010
version = "0-unstable-2025-11-16";
1111

@@ -21,7 +21,7 @@ stdenvNoCC.mkDerivation (self: {
2121
dontBuild = true;
2222
preferLocalBuild = true;
2323

24-
sourceRoot = "${self.src.name}/themes";
24+
sourceRoot = "${finalAttrs.src.name}/themes";
2525
installPhase = ''
2626
runHook preInstall
2727
install -Dt $out/share/alacritty-theme *.toml

pkgs/by-name/al/alice/package.nix

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
fetchzip,
55
}:
66

7-
stdenv.mkDerivation (attrs: {
7+
stdenv.mkDerivation (finalAttrs: {
88
pname = "Alice";
99
version = "2.003";
1010

@@ -15,7 +15,7 @@ stdenv.mkDerivation (attrs: {
1515

1616
src = fetchzip {
1717
url =
18-
with attrs;
18+
with finalAttrs;
1919
"https://github.com/cyrealtype/${pname}/releases/download/v${version}/${pname}-v${version}.zip";
2020
stripRoot = false;
2121
hash = "sha256-p+tE3DECfJyBIPyafGZ8jDYQ1lPb+iAnEwLyaUy7DW0=";

pkgs/by-name/ba/bark/package.nix

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,13 @@
1111
versionCheckHook,
1212
nix-update-script,
1313
}:
14-
rustPlatform.buildRustPackage (final: {
14+
rustPlatform.buildRustPackage (finalAttrs: {
1515
pname = "bark";
1616
version = "0.6.0";
1717
src = fetchFromGitHub {
1818
owner = "haileys";
1919
repo = "bark";
20-
tag = "v${final.version}";
20+
tag = "v${finalAttrs.version}";
2121
hash = "sha256-JaUIWGCYhasM0DgqL+DiG2rE1OWVg/N66my/4RWDN1E=";
2222
};
2323

pkgs/by-name/bo/boxed-cpp/package.nix

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,14 @@
66
catch2,
77
}:
88

9-
stdenv.mkDerivation (final: {
9+
stdenv.mkDerivation (finalAttrs: {
1010
pname = "boxed-cpp";
1111
version = "1.4.3";
1212

1313
src = fetchFromGitHub {
1414
owner = "contour-terminal";
1515
repo = "boxed-cpp";
16-
rev = "v${final.version}";
16+
rev = "v${finalAttrs.version}";
1717
hash = "sha256-uZ/wT159UuEcTUtoQyt0D59z2wnLT5KpeeCpjyij198=";
1818
};
1919

pkgs/by-name/cl/clprover/package.nix

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
fetchFromGitHub,
55
}:
66

7-
stdenv.mkDerivation (self: {
7+
stdenv.mkDerivation (finalAttrs: {
88
pname = "CLProver++";
99
version = "1.0.3";
1010

@@ -43,8 +43,8 @@ stdenv.mkDerivation (self: {
4343
mkdir -p $out/bin
4444
cp -r bin $out/
4545
46-
mkdir -p $out/share/${self.pname}
47-
cp -r examples $out/share/${self.pname}/examples
46+
mkdir -p $out/share/${finalAttrs.pname}
47+
cp -r examples $out/share/${finalAttrs.pname}/examples
4848
4949
runHook postInstall
5050
'';

pkgs/by-name/da/dark-mode-notify/package.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
# Use the same stdenv, including clang, as Swift itself
1111
# Fixes build issues, see https://github.com/NixOS/nixpkgs/pull/296082 and https://github.com/NixOS/nixpkgs/issues/295322
12-
swiftPackages.stdenv.mkDerivation (final: {
12+
swiftPackages.stdenv.mkDerivation (finalAttrs: {
1313
pname = "dark-mode-notify";
1414
version = "0-unstable-2022-07-18";
1515

pkgs/by-name/ds/dssat/package.nix

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,14 +23,14 @@ let
2323
hash = "sha256-WwJR5lnWtR3aYWZmk8pBC0/qaRqY0UrWHIaYp2ajImE=";
2424
};
2525
in
26-
stdenv.mkDerivation (final: {
26+
stdenv.mkDerivation (finalAttrs: {
2727
pname = "dssat";
2828
version = "4.8.2.12";
2929

3030
src = fetchFromGitHub {
3131
owner = "DSSAT";
3232
repo = "dssat-csm-os";
33-
tag = "v${final.version}";
33+
tag = "v${finalAttrs.version}";
3434
hash = "sha256-8OaTM7IXFZjlelx5O4O+bVNQj4dIhGzIk2iCfpqI8uA=";
3535
};
3636

0 commit comments

Comments
 (0)