Unverified Commit 44560ee9 authored by quantenzitrone's avatar quantenzitrone
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
parent 8ea8ad0a

doc/languages-frameworks/ocaml.section.md

+2 −2
Original line number Diff line number Diff line
@@ -116,14 +116,14 @@ Here is a second example, this time using a source archive generated with `dune- 
  buildDunePackage,

}:



buildDunePackage (finalAtts: {

buildDunePackage (finalAttrs: {

  pname = "wtf8";

  version = "1.0.2";



  minimalOCamlVersion = "4.02";



  src = fetchurl {

    url = "https://github.com/flowtype/ocaml-wtf8/releases/download/v${finalAtts.version}/wtf8-v${finalAtts.version}.tbz";

    url = "https://github.com/flowtype/ocaml-wtf8/releases/download/v${finalAttrs.version}/wtf8-v${finalAttrs.version}.tbz";

    hash = "sha256-d5/3KUBAWRj8tntr4RkJ74KWW7wvn/B/m1nx0npnzyc=";

  };

pkgs/applications/misc/qtbitcointrader/default.nix

+3 −3
Original line number Diff line number Diff line
@@ -5,14 +5,14 @@ 
  libsForQt5,

}:



stdenv.mkDerivation (finalAttr: {

stdenv.mkDerivation (finalAttrs: {

  pname = "qtbitcointrader";

  version = "1.42.21";



  src = fetchFromGitHub {

    owner = "JulyIGHOR";

    repo = "QtBitcoinTrader";

    tag = "v${finalAttr.version}";

    tag = "v${finalAttrs.version}";

    hash = "sha256-u3+Kwn8KunYUpWCd55TQuVVfoSp8hdti93d6hk7Uqx8=";

  };
@@ -24,7 +24,7 @@ stdenv.mkDerivation (finalAttr: { 
    libsForQt5.qtscript

  ];



  sourceRoot = "${finalAttr.src.name}/src";

  sourceRoot = "${finalAttrs.src.name}/src";



  configurePhase = ''

    runHook preConfigure

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

+7 −7
Original line number Diff line number Diff line
@@ -16,14 +16,14 @@ 
  nix-update-script,

}:



buildGoModule (final: {

buildGoModule (finalAttrs: {

  pname = "age";

  version = "1.3.1";



  src = fetchFromGitHub {

    owner = "FiloSottile";

    repo = "age";

    tag = "v${final.version}";

    tag = "v${finalAttrs.version}";

    hash = "sha256-Qs/q3zQYV0PukABBPf/aU5V1oOhw95NG6K301VYJk8A=";

  };
@@ -32,7 +32,7 @@ buildGoModule (final: { 
  ldflags = [

    "-s"

    "-w"

    "-X main.Version=v${final.version}"

    "-X main.Version=v${finalAttrs.version}"

  ];



  nativeBuildInputs = [ installShellFiles ];
@@ -67,15 +67,15 @@ buildGoModule (final: { 
  # convenience function for wrapping sops with plugins

  passthru.withPlugins =

    filter:

    runCommand "age-${final.version}-with-plugins" { nativeBuildInputs = [ makeWrapper ]; } ''

      makeWrapper ${lib.getBin final.finalPackage}/bin/age $out/bin/age \

        --prefix PATH : "${lib.makeBinPath (filter final.passthru.plugins)}"

    runCommand "age-${finalAttrs.version}-with-plugins" { nativeBuildInputs = [ makeWrapper ]; } ''

      makeWrapper ${lib.getBin finalAttrs.finalPackage}/bin/age $out/bin/age \

        --prefix PATH : "${lib.makeBinPath (filter finalAttrs.passthru.plugins)}"

    '';



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



  meta = {

    changelog = "https://github.com/FiloSottile/age/releases/tag/v${final.version}";

    changelog = "https://github.com/FiloSottile/age/releases/tag/v${finalAttrs.version}";

    homepage = "https://age-encryption.org/";

    description = "Modern encryption tool with small explicit keys";

    license = lib.licenses.bsd3;

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

+2 −2
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 
  stdenvNoCC,

}:



stdenvNoCC.mkDerivation (self: {

stdenvNoCC.mkDerivation (finalAttrs: {

  pname = "alacritty-theme";

  version = "0-unstable-2025-11-16";
@@ -21,7 +21,7 @@ stdenvNoCC.mkDerivation (self: { 
  dontBuild = true;

  preferLocalBuild = true;



  sourceRoot = "${self.src.name}/themes";

  sourceRoot = "${finalAttrs.src.name}/themes";

  installPhase = ''

    runHook preInstall

    install -Dt $out/share/alacritty-theme *.toml

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

+2 −2
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 
  fetchzip,

}:



stdenv.mkDerivation (attrs: {

stdenv.mkDerivation (finalAttrs: {

  pname = "Alice";

  version = "2.003";
@@ -15,7 +15,7 @@ stdenv.mkDerivation (attrs: { 


  src = fetchzip {

    url =

      with attrs;

      with finalAttrs;

      "https://github.com/cyrealtype/${pname}/releases/download/v${version}/${pname}-v${version}.zip";

    stripRoot = false;

    hash = "sha256-p+tE3DECfJyBIPyafGZ8jDYQ1lPb+iAnEwLyaUy7DW0=";