From 44560ee9f79afe60ad12f18e75fa7e6bb61cfca9 Mon Sep 17 00:00:00 2001 From: quantenzitrone Date: Fri, 6 Feb 2026 23:14:16 +0100 Subject: [PATCH] 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 --- doc/languages-frameworks/ocaml.section.md | 4 +- .../misc/qtbitcointrader/default.nix | 6 +-- pkgs/by-name/ag/age/package.nix | 14 ++--- pkgs/by-name/al/alacritty-theme/package.nix | 4 +- pkgs/by-name/al/alice/package.nix | 4 +- pkgs/by-name/ba/bark/package.nix | 4 +- pkgs/by-name/bo/boxed-cpp/package.nix | 4 +- pkgs/by-name/cl/clprover/package.nix | 6 +-- pkgs/by-name/da/dark-mode-notify/package.nix | 2 +- pkgs/by-name/ds/dssat/package.nix | 4 +- .../em/emmy-lua-code-style/package.nix | 6 +-- pkgs/by-name/ev/evil-helix/package.nix | 4 +- pkgs/by-name/gl/glaze/package.nix | 4 +- pkgs/by-name/he/helix/package.nix | 6 +-- pkgs/by-name/ia/iat/package.nix | 4 +- pkgs/by-name/iv/ivm/package.nix | 4 +- .../by-name/ja/jack-example-tools/package.nix | 4 +- pkgs/by-name/ki/kismet/package.nix | 4 +- pkgs/by-name/kr/kryoptic/package.nix | 4 +- pkgs/by-name/li/libsbml/package.nix | 4 +- pkgs/by-name/li/libunicode/package.nix | 4 +- pkgs/by-name/lo/logiops/package.nix | 6 +-- .../ma/maa-assistant-arknights/package.nix | 10 ++-- pkgs/by-name/nu/nuget/package.nix | 10 ++-- .../op/open-english-wordnet/package.nix | 8 +-- pkgs/by-name/op/openterface-qt/package.nix | 8 +-- pkgs/by-name/ov/ovftool/package.nix | 4 +- pkgs/by-name/pa/pacman/package.nix | 6 +-- pkgs/by-name/pa/patcher9x/package.nix | 4 +- pkgs/by-name/pi/pipeworld/package.nix | 2 +- pkgs/by-name/po/poselib/package.nix | 6 +-- pkgs/by-name/pt/ptcpdump/package.nix | 6 +-- pkgs/by-name/re/retdec/package.nix | 8 +-- pkgs/by-name/ro/rofi-emoji/package.nix | 4 +- pkgs/by-name/rs/rsstail/package.nix | 4 +- pkgs/by-name/sc/scom/package.nix | 4 +- pkgs/by-name/so/sops/package.nix | 14 ++--- pkgs/by-name/sr/srm-cuarzo/package.nix | 6 +-- pkgs/by-name/st/strobealign/package.nix | 4 +- pkgs/by-name/ta/tattoy/package.nix | 4 +- pkgs/by-name/te/termpaint/package.nix | 4 +- pkgs/by-name/ti/tidal-hifi/package.nix | 8 +-- pkgs/by-name/tm/tm/package.nix | 4 +- pkgs/by-name/tz/tzpfms/package.nix | 6 +-- pkgs/by-name/wi/wifi-qr/package.nix | 4 +- pkgs/by-name/wi/winboat/package.nix | 10 ++-- pkgs/by-name/wl/wlopm/package.nix | 4 +- pkgs/by-name/xd/xdg-utils/package.nix | 6 +-- pkgs/by-name/yk/ykush/package.nix | 8 +-- pkgs/by-name/yu/yubihsm-setup/package.nix | 4 +- pkgs/development/compilers/sbcl/default.nix | 52 ++++++++++--------- .../emilua-plugins/beast/default.nix | 4 +- pkgs/development/libraries/quarto/default.nix | 6 +-- .../python-modules/outspin/default.nix | 6 +-- pkgs/development/tools/godot/3/default.nix | 37 ++++++------- .../tools/parsing/tree-sitter/default.nix | 6 +-- .../tools/selenium/chromedriver/source.nix | 2 +- pkgs/os-specific/linux/xpad-noone/default.nix | 4 +- 58 files changed, 198 insertions(+), 195 deletions(-) diff --git a/doc/languages-frameworks/ocaml.section.md b/doc/languages-frameworks/ocaml.section.md index d84b5fd80a1c..06c2fb197105 100644 --- a/doc/languages-frameworks/ocaml.section.md +++ b/doc/languages-frameworks/ocaml.section.md @@ -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="; }; diff --git a/pkgs/applications/misc/qtbitcointrader/default.nix b/pkgs/applications/misc/qtbitcointrader/default.nix index 7130e5e34e93..cb6def2c2074 100644 --- a/pkgs/applications/misc/qtbitcointrader/default.nix +++ b/pkgs/applications/misc/qtbitcointrader/default.nix @@ -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 diff --git a/pkgs/by-name/ag/age/package.nix b/pkgs/by-name/ag/age/package.nix index 9ac09fee82be..ecbb1d9d5309 100644 --- a/pkgs/by-name/ag/age/package.nix +++ b/pkgs/by-name/ag/age/package.nix @@ -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; diff --git a/pkgs/by-name/al/alacritty-theme/package.nix b/pkgs/by-name/al/alacritty-theme/package.nix index 0e0ce734fb3c..0f11fbed594c 100644 --- a/pkgs/by-name/al/alacritty-theme/package.nix +++ b/pkgs/by-name/al/alacritty-theme/package.nix @@ -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 diff --git a/pkgs/by-name/al/alice/package.nix b/pkgs/by-name/al/alice/package.nix index 88ef1554dd51..daf66b775658 100644 --- a/pkgs/by-name/al/alice/package.nix +++ b/pkgs/by-name/al/alice/package.nix @@ -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="; diff --git a/pkgs/by-name/ba/bark/package.nix b/pkgs/by-name/ba/bark/package.nix index ae9588cf4b46..f6abecc0de47 100644 --- a/pkgs/by-name/ba/bark/package.nix +++ b/pkgs/by-name/ba/bark/package.nix @@ -11,13 +11,13 @@ versionCheckHook, nix-update-script, }: -rustPlatform.buildRustPackage (final: { +rustPlatform.buildRustPackage (finalAttrs: { pname = "bark"; version = "0.6.0"; src = fetchFromGitHub { owner = "haileys"; repo = "bark"; - tag = "v${final.version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-JaUIWGCYhasM0DgqL+DiG2rE1OWVg/N66my/4RWDN1E="; }; diff --git a/pkgs/by-name/bo/boxed-cpp/package.nix b/pkgs/by-name/bo/boxed-cpp/package.nix index 6977c595aca2..1645b5aa5121 100644 --- a/pkgs/by-name/bo/boxed-cpp/package.nix +++ b/pkgs/by-name/bo/boxed-cpp/package.nix @@ -6,14 +6,14 @@ catch2, }: -stdenv.mkDerivation (final: { +stdenv.mkDerivation (finalAttrs: { pname = "boxed-cpp"; version = "1.4.3"; src = fetchFromGitHub { owner = "contour-terminal"; repo = "boxed-cpp"; - rev = "v${final.version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-uZ/wT159UuEcTUtoQyt0D59z2wnLT5KpeeCpjyij198="; }; diff --git a/pkgs/by-name/cl/clprover/package.nix b/pkgs/by-name/cl/clprover/package.nix index ec18eb101cb4..af561cfb1c71 100644 --- a/pkgs/by-name/cl/clprover/package.nix +++ b/pkgs/by-name/cl/clprover/package.nix @@ -4,7 +4,7 @@ fetchFromGitHub, }: -stdenv.mkDerivation (self: { +stdenv.mkDerivation (finalAttrs: { pname = "CLProver++"; version = "1.0.3"; @@ -43,8 +43,8 @@ stdenv.mkDerivation (self: { mkdir -p $out/bin cp -r bin $out/ - mkdir -p $out/share/${self.pname} - cp -r examples $out/share/${self.pname}/examples + mkdir -p $out/share/${finalAttrs.pname} + cp -r examples $out/share/${finalAttrs.pname}/examples runHook postInstall ''; diff --git a/pkgs/by-name/da/dark-mode-notify/package.nix b/pkgs/by-name/da/dark-mode-notify/package.nix index e1abe256505d..2b941f11b0ed 100644 --- a/pkgs/by-name/da/dark-mode-notify/package.nix +++ b/pkgs/by-name/da/dark-mode-notify/package.nix @@ -9,7 +9,7 @@ # Use the same stdenv, including clang, as Swift itself # Fixes build issues, see https://github.com/NixOS/nixpkgs/pull/296082 and https://github.com/NixOS/nixpkgs/issues/295322 -swiftPackages.stdenv.mkDerivation (final: { +swiftPackages.stdenv.mkDerivation (finalAttrs: { pname = "dark-mode-notify"; version = "0-unstable-2022-07-18"; diff --git a/pkgs/by-name/ds/dssat/package.nix b/pkgs/by-name/ds/dssat/package.nix index c04c35f6f012..2f3b6543c426 100644 --- a/pkgs/by-name/ds/dssat/package.nix +++ b/pkgs/by-name/ds/dssat/package.nix @@ -23,14 +23,14 @@ let hash = "sha256-WwJR5lnWtR3aYWZmk8pBC0/qaRqY0UrWHIaYp2ajImE="; }; in -stdenv.mkDerivation (final: { +stdenv.mkDerivation (finalAttrs: { pname = "dssat"; version = "4.8.2.12"; src = fetchFromGitHub { owner = "DSSAT"; repo = "dssat-csm-os"; - tag = "v${final.version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-8OaTM7IXFZjlelx5O4O+bVNQj4dIhGzIk2iCfpqI8uA="; }; diff --git a/pkgs/by-name/em/emmy-lua-code-style/package.nix b/pkgs/by-name/em/emmy-lua-code-style/package.nix index 465ce8d01e37..0df147419dc4 100644 --- a/pkgs/by-name/em/emmy-lua-code-style/package.nix +++ b/pkgs/by-name/em/emmy-lua-code-style/package.nix @@ -6,14 +6,14 @@ nix-update-script, }: -stdenv.mkDerivation (self: { +stdenv.mkDerivation (finalAttrs: { pname = "emmy-lua-code-style"; version = "1.6.0"; src = fetchFromGitHub { owner = "CppCXY"; repo = "EmmyLuaCodeStyle"; - tag = self.version; + tag = finalAttrs.version; hash = "sha256-FYtDO9ZL7MjC+vHzrylyYBQHTtef/GM9ipt//EcLr4w="; }; @@ -23,7 +23,7 @@ stdenv.mkDerivation (self: { meta = { homepage = "https://github.com/CppCXY/EmmyLuaCodeStyle"; - changelog = "https://github.com/CppCXY/EmmyLuaCodeStyle/releases/tag/${self.version}"; + changelog = "https://github.com/CppCXY/EmmyLuaCodeStyle/releases/tag/${finalAttrs.version}"; description = "Fast, powerful, and feature-rich Lua formatting and checking tool"; mainProgram = "CodeFormat"; platforms = lib.platforms.unix; diff --git a/pkgs/by-name/ev/evil-helix/package.nix b/pkgs/by-name/ev/evil-helix/package.nix index e0fa61b724d6..692fe89ddeda 100644 --- a/pkgs/by-name/ev/evil-helix/package.nix +++ b/pkgs/by-name/ev/evil-helix/package.nix @@ -7,14 +7,14 @@ rustPlatform, }: -rustPlatform.buildRustPackage (final: { +rustPlatform.buildRustPackage (finalAttrs: { pname = "evil-helix"; version = "20250915"; src = fetchFromGitHub { owner = "usagi-flow"; repo = "evil-helix"; - tag = "release-${final.version}"; + tag = "release-${finalAttrs.version}"; hash = "sha256-6kqKTZNS1RZwfxcFoa2uC7fUKcQ+KhT5KXusyCt59YQ="; }; diff --git a/pkgs/by-name/gl/glaze/package.nix b/pkgs/by-name/gl/glaze/package.nix index f2e519bf5364..f1d7fd657272 100644 --- a/pkgs/by-name/gl/glaze/package.nix +++ b/pkgs/by-name/gl/glaze/package.nix @@ -9,14 +9,14 @@ enableInterop ? true, }: -stdenv.mkDerivation (final: { +stdenv.mkDerivation (finalAttrs: { pname = "glaze"; version = "7.0.0"; src = fetchFromGitHub { owner = "stephenberry"; repo = "glaze"; - tag = "v${final.version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-bYXXQmrVnrBTW/r+fgRBPYfKGPtHvEDw0Sk6BYTMm/4="; }; diff --git a/pkgs/by-name/he/helix/package.nix b/pkgs/by-name/he/helix/package.nix index b71f940fe492..4221b653127c 100644 --- a/pkgs/by-name/he/helix/package.nix +++ b/pkgs/by-name/he/helix/package.nix @@ -10,7 +10,7 @@ nix-update-script, }: -rustPlatform.buildRustPackage (final: { +rustPlatform.buildRustPackage (finalAttrs: { pname = "helix"; version = "25.07.1"; outputs = [ @@ -21,7 +21,7 @@ rustPlatform.buildRustPackage (final: { # This release tarball includes source code for the tree-sitter grammars, # which is not ordinarily part of the repository. src = fetchzip { - url = "https://github.com/helix-editor/helix/releases/download/${final.version}/helix-${final.version}-source.tar.xz"; + url = "https://github.com/helix-editor/helix/releases/download/${finalAttrs.version}/helix-${finalAttrs.version}-source.tar.xz"; hash = "sha256-Pj/lfcQXRWqBOTTWt6+Gk61F9F1UmeCYr+26hGdG974="; stripRoot = false; }; @@ -77,7 +77,7 @@ rustPlatform.buildRustPackage (final: { meta = { description = "Post-modern modal text editor"; homepage = "https://helix-editor.com"; - changelog = "https://github.com/helix-editor/helix/blob/${final.version}/CHANGELOG.md"; + changelog = "https://github.com/helix-editor/helix/blob/${finalAttrs.version}/CHANGELOG.md"; license = lib.licenses.mpl20; mainProgram = "hx"; maintainers = with lib.maintainers; [ diff --git a/pkgs/by-name/ia/iat/package.nix b/pkgs/by-name/ia/iat/package.nix index 1443a257b941..7818ff845001 100644 --- a/pkgs/by-name/ia/iat/package.nix +++ b/pkgs/by-name/ia/iat/package.nix @@ -4,12 +4,12 @@ fetchurl, }: -stdenv.mkDerivation (finalAttr: { +stdenv.mkDerivation (finalAttrs: { pname = "iat"; version = "0.1.7"; src = fetchurl { - url = "mirror://sourceforge/iat.berlios/iat-${finalAttr.version}.tar.gz"; + url = "mirror://sourceforge/iat.berlios/iat-${finalAttrs.version}.tar.gz"; hash = "sha256-sl1X/eKKArLYfNSf0UeLA5rb2DY1GHmmVP6hTCd2SyE="; }; diff --git a/pkgs/by-name/iv/ivm/package.nix b/pkgs/by-name/iv/ivm/package.nix index d27d928130dd..5291768b236a 100644 --- a/pkgs/by-name/iv/ivm/package.nix +++ b/pkgs/by-name/iv/ivm/package.nix @@ -13,14 +13,14 @@ nix-update-script, }: -rustPlatform.buildRustPackage (finalAttr: { +rustPlatform.buildRustPackage (finalAttrs: { pname = "ivm"; version = "0.6.0"; src = fetchFromGitHub { owner = "inko-lang"; repo = "ivm"; - tag = "v${finalAttr.version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-pqqUvHK6mPrK1Mir2ILANxtih9OrAKDJPE0nRWc5JOY="; }; diff --git a/pkgs/by-name/ja/jack-example-tools/package.nix b/pkgs/by-name/ja/jack-example-tools/package.nix index 19fddc33c8ef..6bbce59554ce 100644 --- a/pkgs/by-name/ja/jack-example-tools/package.nix +++ b/pkgs/by-name/ja/jack-example-tools/package.nix @@ -20,14 +20,14 @@ enableAlsa ? stdenv.hostPlatform.isLinux, }: -stdenv.mkDerivation (final: { +stdenv.mkDerivation (finalAttrs: { pname = "jack-example-tools"; version = "4"; src = fetchFromGitHub { owner = "jackaudio"; repo = "jack-example-tools"; - rev = "tags/${final.version}"; + rev = "tags/${finalAttrs.version}"; hash = "sha256-5jmynNxwNVLxEZ1MaqQUG6kRwipDkjhrdDCbZHtmAHk="; }; diff --git a/pkgs/by-name/ki/kismet/package.nix b/pkgs/by-name/ki/kismet/package.nix index 43677310ba31..4f992ffb2e60 100644 --- a/pkgs/by-name/ki/kismet/package.nix +++ b/pkgs/by-name/ki/kismet/package.nix @@ -32,14 +32,14 @@ zlib, }: -stdenv.mkDerivation (finalPackage: { +stdenv.mkDerivation (finalAttrs: { pname = "kismet"; version = "2025-09-R1"; src = fetchFromGitHub { owner = "kismetwireless"; repo = "kismet"; - tag = "kismet-${finalPackage.version}"; + tag = "kismet-${finalAttrs.version}"; hash = "sha256-bwgeBIa5P1he0azWBu1YTXS9EGlHdJK8hS6A5Rj9XU4="; }; diff --git a/pkgs/by-name/kr/kryoptic/package.nix b/pkgs/by-name/kr/kryoptic/package.nix index c3d23ad99f7e..c48f562a4a55 100644 --- a/pkgs/by-name/kr/kryoptic/package.nix +++ b/pkgs/by-name/kr/kryoptic/package.nix @@ -13,14 +13,14 @@ withPostQuantum ? true, }: -rustPlatform.buildRustPackage (finalPackage: { +rustPlatform.buildRustPackage (finalAttrs: { pname = "kryoptic"; version = "1.4.0"; src = fetchFromGitHub { owner = "latchset"; repo = "kryoptic"; - tag = "v${finalPackage.version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-tP2BZkGCZqfLNLZ/mYAVkICWKTM1EbL7lbw+Mnx4VTk="; }; diff --git a/pkgs/by-name/li/libsbml/package.nix b/pkgs/by-name/li/libsbml/package.nix index 95486537dec2..9f491de86d62 100644 --- a/pkgs/by-name/li/libsbml/package.nix +++ b/pkgs/by-name/li/libsbml/package.nix @@ -10,14 +10,14 @@ python ? null, withPython ? false, }: -stdenv.mkDerivation (attrs: { +stdenv.mkDerivation (finalAttrs: { pname = "libsbml"; version = "5.20.4"; src = fetchFromGitHub { owner = "sbmlteam"; repo = "libsbml"; - rev = "v${attrs.version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-qWTN033YU4iWzt+mXQaP5W/6IF5nebF4PwNVkyL8wTg="; }; diff --git a/pkgs/by-name/li/libunicode/package.nix b/pkgs/by-name/li/libunicode/package.nix index c1cfd06efdf6..4d3713ef1d4f 100644 --- a/pkgs/by-name/li/libunicode/package.nix +++ b/pkgs/by-name/li/libunicode/package.nix @@ -19,14 +19,14 @@ let stripRoot = false; }; in -stdenv.mkDerivation (final: { +stdenv.mkDerivation (finalAttrs: { pname = "libunicode"; version = "0.7.0"; src = fetchFromGitHub { owner = "contour-terminal"; repo = "libunicode"; - tag = "v${final.version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-J8qawT1oiUO9xTVEMQvsY0K2NtIfkUq9PoCbFt6wqek="; }; diff --git a/pkgs/by-name/lo/logiops/package.nix b/pkgs/by-name/lo/logiops/package.nix index 369cd824a4d3..3378b7812278 100644 --- a/pkgs/by-name/lo/logiops/package.nix +++ b/pkgs/by-name/lo/logiops/package.nix @@ -10,14 +10,14 @@ libconfig, }: -stdenv.mkDerivation (oldAttrs: { +stdenv.mkDerivation (finalAttrs: { pname = "logiops"; version = "0.3.5"; src = fetchFromGitHub { owner = "PixlOne"; repo = "logiops"; - tag = "v${oldAttrs.version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-GAnlPqjIFGyOWwYFs7gth2m9ITc1jyiaW0sWwQ2zFOs="; # In v0.3.0, the `ipcgull` submodule was added as a dependency # https://github.com/PixlOne/logiops/releases/tag/v0.3.0 @@ -40,7 +40,7 @@ stdenv.mkDerivation (oldAttrs: { ]; cmakeFlags = [ - "-DLOGIOPS_VERSION=${oldAttrs.version}" + "-DLOGIOPS_VERSION=${finalAttrs.version}" "-DDBUS_SYSTEM_POLICY_INSTALL_DIR=${placeholder "out"}/share/dbus-1/system.d" ]; diff --git a/pkgs/by-name/ma/maa-assistant-arknights/package.nix b/pkgs/by-name/ma/maa-assistant-arknights/package.nix index 40ceab5fdd91..6692daa5419d 100644 --- a/pkgs/by-name/ma/maa-assistant-arknights/package.nix +++ b/pkgs/by-name/ma/maa-assistant-arknights/package.nix @@ -18,14 +18,14 @@ let fastdeploy = callPackage ./fastdeploy-ppocr.nix { }; sources = lib.importJSON ./pin.json; in -stdenv.mkDerivation (finalAttr: { +stdenv.mkDerivation (finalAttrs: { pname = "maa-assistant-arknights" + lib.optionalString isBeta "-beta"; version = if isBeta then sources.beta.version else sources.stable.version; src = fetchFromGitHub { owner = "MaaAssistantArknights"; repo = "MaaAssistantArknights"; - rev = "v${finalAttr.version}"; + rev = "v${finalAttrs.version}"; hash = if isBeta then sources.beta.hash else sources.stable.hash; }; @@ -63,7 +63,7 @@ stdenv.mkDerivation (finalAttr: { (lib.cmakeBool "INSTALL_PYTHON" true) (lib.cmakeBool "INSTALL_RESOURCE" true) (lib.cmakeBool "USE_MAADEPS" false) - (lib.cmakeFeature "MAA_VERSION" "v${finalAttr.version}") + (lib.cmakeFeature "MAA_VERSION" "v${finalAttrs.version}") ]; passthru.updateScript = ./update.sh; @@ -73,8 +73,8 @@ stdenv.mkDerivation (finalAttr: { ''; postInstall = '' - mkdir -p $out/share/${finalAttr.pname} - mv $out/{Python,resource} $out/share/${finalAttr.pname} + mkdir -p $out/share/${finalAttrs.pname} + mv $out/{Python,resource} $out/share/${finalAttrs.pname} ''; meta = { diff --git a/pkgs/by-name/nu/nuget/package.nix b/pkgs/by-name/nu/nuget/package.nix index fd28bbc90ba1..800e37bd700b 100644 --- a/pkgs/by-name/nu/nuget/package.nix +++ b/pkgs/by-name/nu/nuget/package.nix @@ -6,14 +6,14 @@ lib, }: -stdenv.mkDerivation (attrs: { +stdenv.mkDerivation (finalAttrs: { pname = "Nuget"; version = "6.6.1.2"; src = fetchFromGitHub { owner = "mono"; repo = "linux-packaging-nuget"; - rev = "upstream/${attrs.version}.bin"; + rev = "upstream/${finalAttrs.version}.bin"; hash = "sha256-9/dSeVshHbpYIgGE/8OzrB4towrWVB3UxDi8Esmbu7Y="; }; @@ -24,14 +24,14 @@ stdenv.mkDerivation (attrs: { installPhase = '' runHook preInstall - mkdir -p $out/lib/${attrs.pname} - cp -r . $out/lib/${attrs.pname}/ + mkdir -p $out/lib/${finalAttrs.pname} + cp -r . $out/lib/${finalAttrs.pname}/ mkdir -p $out/bin makeWrapper \ "${mono}/bin/mono" \ "$out/bin/nuget" \ - --add-flags "$out/lib/${attrs.pname}/nuget.exe" + --add-flags "$out/lib/${finalAttrs.pname}/nuget.exe" runHook postInstall ''; diff --git a/pkgs/by-name/op/open-english-wordnet/package.nix b/pkgs/by-name/op/open-english-wordnet/package.nix index e4e753d59169..9caa355a0b27 100644 --- a/pkgs/by-name/op/open-english-wordnet/package.nix +++ b/pkgs/by-name/op/open-english-wordnet/package.nix @@ -7,14 +7,14 @@ stdenvNoCC, }: -stdenvNoCC.mkDerivation (self: { +stdenvNoCC.mkDerivation (finalAttrs: { pname = "open-english-wordnet"; version = "2022"; src = fetchFromGitHub { owner = "globalwordnet"; repo = "english-wordnet"; - rev = "${self.version}-edition"; + rev = "${finalAttrs.version}-edition"; hash = "sha256-a1fWIp39uuJZL1aFX/r+ttLB1+kwh/XPHwphgENTQ5M="; }; @@ -49,14 +49,14 @@ stdenvNoCC.mkDerivation (self: { python scripts/merge.py echo Compressing - gzip --best --no-name --stdout ./wn.xml > 'oewn:${self.version}.xml.gz' + gzip --best --no-name --stdout ./wn.xml > 'oewn:${finalAttrs.version}.xml.gz' runHook postBuild ''; installPhase = '' runHook preInstall - install -Dt $out/share/wordnet 'oewn:${self.version}.xml.gz' + install -Dt $out/share/wordnet 'oewn:${finalAttrs.version}.xml.gz' runHook postInstall ''; diff --git a/pkgs/by-name/op/openterface-qt/package.nix b/pkgs/by-name/op/openterface-qt/package.nix index da78f25d07b3..a23e80556e6e 100644 --- a/pkgs/by-name/op/openterface-qt/package.nix +++ b/pkgs/by-name/op/openterface-qt/package.nix @@ -20,13 +20,13 @@ let KERNEL=="hidraw*", ATTRS{idVendor}=="534d", ATTRS{idProduct}=="2109", TAG+="uaccess" ''; in -stdenv.mkDerivation (final: { +stdenv.mkDerivation (finalAttrs: { pname = "openterface-qt"; version = "0.3.18"; src = fetchFromGitHub { owner = "TechxArtisanStudio"; repo = "Openterface_QT"; - rev = "${final.version}"; + rev = "${finalAttrs.version}"; hash = "sha256-yD71UOi6iRd9N3NeASUzqoeHMcTYIqkysAfxRm7GkOA="; }; nativeBuildInputs = [ @@ -62,8 +62,8 @@ stdenv.mkDerivation (final: { (makeDesktopItem { name = "openterfaceQT"; exec = "openterfaceQT"; - icon = final.pname; - comment = final.meta.description; + icon = finalAttrs.pname; + comment = finalAttrs.meta.description; desktopName = "Openterface QT"; categories = [ "Utility" ]; }) diff --git a/pkgs/by-name/ov/ovftool/package.nix b/pkgs/by-name/ov/ovftool/package.nix index fe4888375a97..1caa02e0bf16 100644 --- a/pkgs/by-name/ov/ovftool/package.nix +++ b/pkgs/by-name/ov/ovftool/package.nix @@ -95,7 +95,7 @@ let }; }); in -stdenv.mkDerivation (final: { +stdenv.mkDerivation (finalAttrs: { pname = "ovftool"; inherit (ovftoolSystem) version; @@ -109,7 +109,7 @@ stdenv.mkDerivation (final: { See the following URL for terms of using this software: ${mkBaseUrl ovftoolId} - Use `${final.pname}.override { acceptBroadcomEula = true; }` if you accept Broadcom's terms + Use `${finalAttrs.pname}.override { acceptBroadcomEula = true; }` if you accept Broadcom's terms and would like to use this package. ''; diff --git a/pkgs/by-name/pa/pacman/package.nix b/pkgs/by-name/pa/pacman/package.nix index e73805e5e1a9..d4faa6298245 100644 --- a/pkgs/by-name/pa/pacman/package.nix +++ b/pkgs/by-name/pa/pacman/package.nix @@ -39,7 +39,7 @@ sysHookDir ? "/usr/share/libalpm/hooks/", }: -stdenv.mkDerivation (final: { +stdenv.mkDerivation (finalAttrs: { pname = "pacman"; version = "7.0.0"; @@ -47,7 +47,7 @@ stdenv.mkDerivation (final: { domain = "gitlab.archlinux.org"; owner = "pacman"; repo = "pacman"; - rev = "v${final.version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-ejOBxN2HjV4dZwFA7zvPz3JUJa0xiJ/jZ+evEQYG1Mc="; }; @@ -132,7 +132,7 @@ stdenv.mkDerivation (final: { meta = { description = "Simple library-based package manager"; homepage = "https://archlinux.org/pacman/"; - changelog = "https://gitlab.archlinux.org/pacman/pacman/-/raw/v${final.version}/NEWS"; + changelog = "https://gitlab.archlinux.org/pacman/pacman/-/raw/v${finalAttrs.version}/NEWS"; license = lib.licenses.gpl2Plus; platforms = lib.platforms.linux; mainProgram = "pacman"; diff --git a/pkgs/by-name/pa/patcher9x/package.nix b/pkgs/by-name/pa/patcher9x/package.nix index 78f8abe489ad..6785d18ad69e 100644 --- a/pkgs/by-name/pa/patcher9x/package.nix +++ b/pkgs/by-name/pa/patcher9x/package.nix @@ -5,7 +5,7 @@ fetchFromGitHub, }: -stdenv.mkDerivation (finalAttr: { +stdenv.mkDerivation (finalAttrs: { pname = "patcher9x"; version = "0.8.50"; @@ -13,7 +13,7 @@ stdenv.mkDerivation (finalAttr: { (fetchFromGitHub { owner = "JHRobotics"; repo = "patcher9x"; - rev = "v${finalAttr.version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-TZw2+R7Dzojzxzal1Wp8jhe5gwU4CfZDROITi5Z+auo="; name = "src"; }) diff --git a/pkgs/by-name/pi/pipeworld/package.nix b/pkgs/by-name/pi/pipeworld/package.nix index 016d371dcbc9..9f8835de61b9 100644 --- a/pkgs/by-name/pi/pipeworld/package.nix +++ b/pkgs/by-name/pi/pipeworld/package.nix @@ -4,7 +4,7 @@ fetchFromGitHub, }: -stdenvNoCC.mkDerivation (finalPackages: { +stdenvNoCC.mkDerivation (finalAttrs: { pname = "pipeworld"; version = "0-unstable-2023-02-05"; diff --git a/pkgs/by-name/po/poselib/package.nix b/pkgs/by-name/po/poselib/package.nix index da1cb4a5709d..62bb49b067e2 100644 --- a/pkgs/by-name/po/poselib/package.nix +++ b/pkgs/by-name/po/poselib/package.nix @@ -8,14 +8,14 @@ pkg-config, }: -stdenv.mkDerivation (final: { +stdenv.mkDerivation (finalAttrs: { pname = "poselib"; version = "2.0.5"; src = fetchFromGitHub { owner = "PoseLib"; repo = "PoseLib"; - rev = "v${final.version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-fARRKT2UoPuuk9FOOsBdrACwGiGXWg/mLV4R0QIjeak="; }; @@ -31,7 +31,7 @@ stdenv.mkDerivation (final: { meta = { description = "A collection of minimal solvers for camera pose estimation"; homepage = "https://github.com/PoseLib/PoseLib"; - changelog = "https://github.com/PoseLib/PoseLib/releases/tag/v${final.version}"; + changelog = "https://github.com/PoseLib/PoseLib/releases/tag/v${finalAttrs.version}"; license = lib.licenses.bsd3; platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ usertam ]; diff --git a/pkgs/by-name/pt/ptcpdump/package.nix b/pkgs/by-name/pt/ptcpdump/package.nix index d392993454f4..3e2d5d21b2dc 100644 --- a/pkgs/by-name/pt/ptcpdump/package.nix +++ b/pkgs/by-name/pt/ptcpdump/package.nix @@ -6,14 +6,14 @@ libpcap, }: -buildGoModule (finalAttr: { +buildGoModule (finalAttrs: { pname = "ptcpdump"; version = "0.37.0"; src = fetchFromGitHub { owner = "mozillazg"; repo = "ptcpdump"; - tag = "v${finalAttr.version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-ouH7VFWSCOElbmbSWAkmM4dtNVp545mC/FnoNAFtaEw="; }; @@ -24,7 +24,7 @@ buildGoModule (finalAttr: { tags = [ "dynamic" ]; ldflags = [ - "-X github.com/mozillazg/ptcpdump/internal.Version=v${finalAttr.version}" + "-X github.com/mozillazg/ptcpdump/internal.Version=v${finalAttrs.version}" ]; nativeInstallCheckInputs = [ versionCheckHook ]; doInstallCheck = true; diff --git a/pkgs/by-name/re/retdec/package.nix b/pkgs/by-name/re/retdec/package.nix index 4b0609cf87f9..a84e60854aaf 100644 --- a/pkgs/by-name/re/retdec/package.nix +++ b/pkgs/by-name/re/retdec/package.nix @@ -115,7 +115,7 @@ let subprocess.check_call(['chmod', '-R', 'u+w', support_dir]) ''; in -stdenv.mkDerivation (self: { +stdenv.mkDerivation (finalAttrs: { pname = "retdec"; # If you update this you will also need to adjust the versions of the updated dependencies. @@ -129,7 +129,7 @@ stdenv.mkDerivation (self: { src = fetchFromGitHub { owner = "avast"; repo = "retdec"; - tag = "v${self.version}"; + tag = "v${finalAttrs.version}"; sha256 = "sha256-H4e+aSgdBBbG6X6DzHGiDEIASPwBVNVsfHyeBTQLAKI="; }; @@ -161,10 +161,10 @@ stdenv.mkDerivation (self: { libxml2 zlib ] - ++ lib.optional self.doInstallCheck gtest; + ++ lib.optional finalAttrs.doInstallCheck gtest; cmakeFlags = [ - (lib.cmakeBool "RETDEC_TESTS" self.doInstallCheck) # build tests + (lib.cmakeBool "RETDEC_TESTS" finalAttrs.doInstallCheck) # build tests (lib.cmakeBool "RETDEC_DEV_TOOLS" buildDevTools) # build tools e.g. capstone2llvmir, retdectool (lib.cmakeBool "RETDEC_COMPILE_YARA" compileYaraPatterns) # build and install compiled patterns ] diff --git a/pkgs/by-name/ro/rofi-emoji/package.nix b/pkgs/by-name/ro/rofi-emoji/package.nix index 03ef3156716e..7a4b63576ef2 100644 --- a/pkgs/by-name/ro/rofi-emoji/package.nix +++ b/pkgs/by-name/ro/rofi-emoji/package.nix @@ -23,14 +23,14 @@ nix-update-script, }: -stdenv.mkDerivation (final: { +stdenv.mkDerivation (finalAttrs: { pname = "rofi-emoji"; version = "4.1.0"; src = fetchFromGitHub { owner = "Mange"; repo = "rofi-emoji"; - rev = "v${final.version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-Amaz+83mSPue+pjZq/pJiCxu5QczYvmJk6f96eraaK8="; }; diff --git a/pkgs/by-name/rs/rsstail/package.nix b/pkgs/by-name/rs/rsstail/package.nix index 0f1a76fd5401..50c6308796d3 100644 --- a/pkgs/by-name/rs/rsstail/package.nix +++ b/pkgs/by-name/rs/rsstail/package.nix @@ -5,14 +5,14 @@ libmrss, }: -stdenv.mkDerivation (final: { +stdenv.mkDerivation (finalAttrs: { pname = "rsstail"; version = "2.2"; src = fetchFromGitHub { owner = "folkertvanheusden"; repo = "rsstail"; - rev = "v${final.version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-wbdf9zhwMN7QhJ5WoJo1Csu0EcKUTON8Q2Ic5scbn7I="; }; diff --git a/pkgs/by-name/sc/scom/package.nix b/pkgs/by-name/sc/scom/package.nix index b17e053d819b..9e042b6056c5 100644 --- a/pkgs/by-name/sc/scom/package.nix +++ b/pkgs/by-name/sc/scom/package.nix @@ -3,14 +3,14 @@ stdenv, fetchFromGitHub, }: -stdenv.mkDerivation (finaAttrs: { +stdenv.mkDerivation (finalAttrs: { pname = "scom"; version = "1.2.3"; src = fetchFromGitHub { owner = "crash-systems"; repo = "scom"; - tag = finaAttrs.version; + tag = finalAttrs.version; hash = "sha256-eFnCXMrks5V6o+0+vMjR8zaCdkc+hC3trSS+pOh4Y6U="; }; diff --git a/pkgs/by-name/so/sops/package.nix b/pkgs/by-name/so/sops/package.nix index bdf11b100e4d..185ea8954669 100644 --- a/pkgs/by-name/so/sops/package.nix +++ b/pkgs/by-name/so/sops/package.nix @@ -10,14 +10,14 @@ age, }: -buildGoModule (final: { +buildGoModule (finalAttrs: { pname = "sops"; version = "3.11.0"; src = fetchFromGitHub { owner = "getsops"; - repo = final.pname; - tag = "v${final.version}"; + repo = finalAttrs.pname; + tag = "v${finalAttrs.version}"; hash = "sha256-AAnrZvNkBgliHdk1lAoFrJdISNWteFdBUorRycKsptU="; }; @@ -28,7 +28,7 @@ buildGoModule (final: { ldflags = [ "-s" "-w" - "-X github.com/getsops/sops/v3/version.Version=${final.version}" + "-X github.com/getsops/sops/v3/version.Version=${finalAttrs.version}" ]; nativeBuildInputs = [ @@ -49,19 +49,19 @@ buildGoModule (final: { # wrap sops with age plugins passthru.withAgePlugins = filter: - runCommand "sops-${final.version}-with-age-plugins" + runCommand "sops-${finalAttrs.version}-with-age-plugins" { nativeBuildInputs = [ makeWrapper ]; } '' - makeWrapper ${lib.getBin final.finalPackage}/bin/sops $out/bin/sops \ + makeWrapper ${lib.getBin finalAttrs.finalPackage}/bin/sops $out/bin/sops \ --prefix PATH : "${lib.makeBinPath (filter age.passthru.plugins)}" ''; meta = { homepage = "https://getsops.io/"; description = "Simple and flexible tool for managing secrets"; - changelog = "https://github.com/getsops/sops/blob/v${final.version}/CHANGELOG.rst"; + changelog = "https://github.com/getsops/sops/blob/v${finalAttrs.version}/CHANGELOG.rst"; mainProgram = "sops"; maintainers = with lib.maintainers; [ Scrumplex diff --git a/pkgs/by-name/sr/srm-cuarzo/package.nix b/pkgs/by-name/sr/srm-cuarzo/package.nix index 10aa962e5b2a..b0371a884da9 100644 --- a/pkgs/by-name/sr/srm-cuarzo/package.nix +++ b/pkgs/by-name/sr/srm-cuarzo/package.nix @@ -13,14 +13,14 @@ seatd, udev, }: -stdenv.mkDerivation (self: { +stdenv.mkDerivation (finalAttrs: { pname = "srm-cuarzo"; version = "0.13.0-1"; - rev = "v${self.version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-5BwLqAZdfO5vyEMPZImaxymvLoNuu6bOiOkvR8JERxg="; src = fetchFromGitHub { - inherit (self) rev hash; + inherit (finalAttrs) rev hash; owner = "CuarzoSoftware"; repo = "SRM"; }; diff --git a/pkgs/by-name/st/strobealign/package.nix b/pkgs/by-name/st/strobealign/package.nix index 239bb1c04974..54f6e6ab866b 100644 --- a/pkgs/by-name/st/strobealign/package.nix +++ b/pkgs/by-name/st/strobealign/package.nix @@ -7,14 +7,14 @@ isa-l, zlib, }: -stdenv.mkDerivation (self: { +stdenv.mkDerivation (finalAttrs: { pname = "strobealign"; version = "0.17.0"; src = fetchFromGitHub { owner = "ksahlin"; repo = "strobealign"; - tag = "v${self.version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-ah21ptyfZbgdJrtCCftYhGh1hfcJ9JpXNsXUp8pZDJw="; }; diff --git a/pkgs/by-name/ta/tattoy/package.nix b/pkgs/by-name/ta/tattoy/package.nix index c22678cb8163..56a5558d9ccc 100644 --- a/pkgs/by-name/ta/tattoy/package.nix +++ b/pkgs/by-name/ta/tattoy/package.nix @@ -11,14 +11,14 @@ watch, }: -rustPlatform.buildRustPackage (attrs: { +rustPlatform.buildRustPackage (finalAttrs: { pname = "tattoy"; version = "0.1.8"; src = fetchFromGitHub { owner = "tattoy-org"; repo = "tattoy"; - tag = "tattoy-v${attrs.version}"; + tag = "tattoy-v${finalAttrs.version}"; hash = "sha256-44rXygZVbwwC/jOB69iHydsjYr/WeVU4Eky3BPqJzyc="; }; diff --git a/pkgs/by-name/te/termpaint/package.nix b/pkgs/by-name/te/termpaint/package.nix index cb2dc6335806..b9cc6217119d 100644 --- a/pkgs/by-name/te/termpaint/package.nix +++ b/pkgs/by-name/te/termpaint/package.nix @@ -7,14 +7,14 @@ pkg-config, python3, }: -stdenv.mkDerivation (final: { +stdenv.mkDerivation (finalAttrs: { pname = "termpaint"; version = "0.3.1"; src = fetchFromGitHub { owner = "termpaint"; repo = "termpaint"; - rev = final.version; + rev = finalAttrs.version; hash = "sha256-7mfGTC5vJ4806bDbrPMSVthtW05a+M3vgUlHGbtaI4Q="; }; diff --git a/pkgs/by-name/ti/tidal-hifi/package.nix b/pkgs/by-name/ti/tidal-hifi/package.nix index 2b20fdbc0bd3..f2a73b57b1b9 100644 --- a/pkgs/by-name/ti/tidal-hifi/package.nix +++ b/pkgs/by-name/ti/tidal-hifi/package.nix @@ -87,7 +87,7 @@ let vulkan-loader ]; in -buildNpmPackage (self: { +buildNpmPackage (finalAttrs: { pname = "tidal-hifi"; inherit version; @@ -125,12 +125,12 @@ buildNpmPackage (self: { desktopItems = [ (makeDesktopItem { - name = self.pname; + name = finalAttrs.pname; desktopName = "TIDAL Hi-Fi"; genericName = "Music Player"; - comment = self.meta.description; + comment = finalAttrs.meta.description; icon = "tidal-hifi"; - exec = self.meta.mainProgram; + exec = finalAttrs.meta.mainProgram; terminal = false; mimeTypes = [ "x-scheme-handler/tidal" ]; categories = [ diff --git a/pkgs/by-name/tm/tm/package.nix b/pkgs/by-name/tm/tm/package.nix index c181cddd6f81..740e6e175892 100644 --- a/pkgs/by-name/tm/tm/package.nix +++ b/pkgs/by-name/tm/tm/package.nix @@ -4,12 +4,12 @@ fetchurl, }: -stdenv.mkDerivation (finalAtts: { +stdenv.mkDerivation (finalAttrs: { pname = "tm"; version = "0.4.1"; src = fetchurl { - url = "https://vicerveza.homeunix.net/~viric/soft/tm/tm-${finalAtts.version}.tar.gz"; + url = "https://vicerveza.homeunix.net/~viric/soft/tm/tm-${finalAttrs.version}.tar.gz"; hash = "sha256-OzibwDtpZK1f+lejRLiR/bz3ybJgSt2nI6hj+DZXxKA="; }; diff --git a/pkgs/by-name/tz/tzpfms/package.nix b/pkgs/by-name/tz/tzpfms/package.nix index 43461f674b3a..2367c855b671 100644 --- a/pkgs/by-name/tz/tzpfms/package.nix +++ b/pkgs/by-name/tz/tzpfms/package.nix @@ -15,19 +15,19 @@ zlib, }: -stdenv.mkDerivation (finalPackage: { +stdenv.mkDerivation (finalAttrs: { pname = "tzpfms"; version = "0.4.1"; src = fetchFromSourcehut { owner = "~nabijaczleweli"; repo = "tzpfms"; - rev = "v${finalPackage.version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-DHmJpfURyFPeOWxIkfwn4f0n2WeDYErevC1gY2oM3Vg="; }; env = { - TZPFMS_VERSION = ''"${finalPackage.version}"''; + TZPFMS_VERSION = ''"${finalAttrs.version}"''; TZPFMS_DATE = "January 1, 1980"; }; diff --git a/pkgs/by-name/wi/wifi-qr/package.nix b/pkgs/by-name/wi/wifi-qr/package.nix index 8871d0113e74..e85156efc646 100644 --- a/pkgs/by-name/wi/wifi-qr/package.nix +++ b/pkgs/by-name/wi/wifi-qr/package.nix @@ -17,7 +17,7 @@ gnugrep, file, }: -stdenvNoCC.mkDerivation (finalAttr: { +stdenvNoCC.mkDerivation (finalAttrs: { pname = "wifi-qr"; version = "0.4"; @@ -29,7 +29,7 @@ stdenvNoCC.mkDerivation (finalAttr: { src = fetchFromGitHub { owner = "kokoye2007"; repo = "wifi-qr"; - tag = "v${finalAttr.version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-tE+9bFDgiFS1Jj+AAwTMKjMh5wS5/gkRSQaCBR/riYQ="; }; diff --git a/pkgs/by-name/wi/winboat/package.nix b/pkgs/by-name/wi/winboat/package.nix index 9a5725e2d263..838aa63d7790 100644 --- a/pkgs/by-name/wi/winboat/package.nix +++ b/pkgs/by-name/wi/winboat/package.nix @@ -17,14 +17,14 @@ nix-update-script, }: -buildNpmPackage (final: { +buildNpmPackage (finalAttrs: { pname = "winboat"; version = "0.9.0"; src = fetchFromGitHub { owner = "TibixDev"; repo = "winboat"; - tag = "v${final.version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-DgH6CAZf+XIgBav2xd2FF2MGRgGIyOs/98vqWHA3XYw="; }; @@ -48,7 +48,7 @@ buildNpmPackage (final: { guest-server = pkgsCross.mingwW64.callPackage ./guest-server.nix { }; passthru = { - guest-server = final.guest-server; + guest-server = finalAttrs.guest-server; updateScript = nix-update-script { extraArgs = [ "--subpackage" @@ -76,7 +76,7 @@ buildNpmPackage (final: { install -Dm444 icons/winboat_logo.svg $out/share/icons/hicolor/256x256/apps/winboat.svg # copy the the winboat-guest-server executable and generate the zip - cp ${lib.getExe final.guest-server} $out/share/winboat/resources/guest_server/winboat_guest_server.exe + cp ${lib.getExe finalAttrs.guest-server} $out/share/winboat/resources/guest_server/winboat_guest_server.exe (cd $out/share/winboat/resources/guest_server/ && zip -r winboat_guest_server.zip .) # symlink data/ and guest_server/ into parent folder @@ -114,7 +114,7 @@ buildNpmPackage (final: { mainProgram = "winboat"; description = "Run Windows apps on Linux with seamless integration"; homepage = "https://github.com/TibixDev/winboat"; - changelog = "https://github.com/TibixDev/winboat/releases/tag/v${final.version}"; + changelog = "https://github.com/TibixDev/winboat/releases/tag/v${finalAttrs.version}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ rexies diff --git a/pkgs/by-name/wl/wlopm/package.nix b/pkgs/by-name/wl/wlopm/package.nix index 6025fb941dc7..c9f4a955d98c 100644 --- a/pkgs/by-name/wl/wlopm/package.nix +++ b/pkgs/by-name/wl/wlopm/package.nix @@ -6,14 +6,14 @@ wayland-scanner, }: -stdenv.mkDerivation (finalAttr: { +stdenv.mkDerivation (finalAttrs: { pname = "wlopm"; version = "1.0.0"; src = fetchFromSourcehut { owner = "~leon_plickat"; repo = "wlopm"; - rev = "v${finalAttr.version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-GrcV51mUZUaiiYhko8ysaTieJoZDcunLn1yG5k+TpQQ="; }; diff --git a/pkgs/by-name/xd/xdg-utils/package.nix b/pkgs/by-name/xd/xdg-utils/package.nix index 442101475ab5..9e29b0c5a41e 100644 --- a/pkgs/by-name/xd/xdg-utils/package.nix +++ b/pkgs/by-name/xd/xdg-utils/package.nix @@ -297,7 +297,7 @@ let ]; in -stdenv.mkDerivation (self: { +stdenv.mkDerivation (finalAttrs: { pname = "xdg-utils"; version = "1.2.1"; @@ -305,7 +305,7 @@ stdenv.mkDerivation (self: { domain = "gitlab.freedesktop.org"; owner = "xdg"; repo = "xdg-utils"; - rev = "v${self.version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-58ElbrVlk+13DUODSEHBPcDDt9H+Kuee8Rz9CIcoy0I="; }; @@ -336,7 +336,7 @@ stdenv.mkDerivation (self: { passthru.tests.xdg-mime = runCommand "xdg-mime-test" { - nativeBuildInputs = [ self.finalPackage ]; + nativeBuildInputs = [ finalAttrs.finalPackage ]; preferLocalBuild = true; xenias = lib.mapAttrsToList (hash: urls: fetchurl { inherit hash urls; }) { "sha256-SL95tM1AjOi7vDnCyT10s0tvQvc+ZSZBbkNOYXfbOy0=" = [ diff --git a/pkgs/by-name/yk/ykush/package.nix b/pkgs/by-name/yk/ykush/package.nix index f8507e20849f..7bc503d158c4 100644 --- a/pkgs/by-name/yk/ykush/package.nix +++ b/pkgs/by-name/yk/ykush/package.nix @@ -6,7 +6,7 @@ runCommand, versionCheckHook, }: -stdenv.mkDerivation (final: { +stdenv.mkDerivation (finalAttrs: { pname = "ykushcmd"; version = "1.4.0"; @@ -15,7 +15,7 @@ stdenv.mkDerivation (final: { src = fetchFromGitHub { owner = "yepkit"; repo = "ykush"; - tag = "v${final.version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-+ssr1QHKjEdK8pFkmyHYwG9tY7YHaYcIIJUqaEXixOg="; }; @@ -33,8 +33,8 @@ stdenv.mkDerivation (final: { passthru.tests = { # We can't run any actual tests without hardware, but we can at least check the binary. - run-only = runCommand "${final.pname}-test" '' - ${final}/bin/ykushcmd -h | grep YKUSHCMD + run-only = runCommand "${finalAttrs.pname}-test" '' + ${finalAttrs}/bin/ykushcmd -h | grep YKUSHCMD ''; }; diff --git a/pkgs/by-name/yu/yubihsm-setup/package.nix b/pkgs/by-name/yu/yubihsm-setup/package.nix index 50fedb2c0213..d8f02b479988 100644 --- a/pkgs/by-name/yu/yubihsm-setup/package.nix +++ b/pkgs/by-name/yu/yubihsm-setup/package.nix @@ -7,14 +7,14 @@ yubihsm-shell, }: -rustPlatform.buildRustPackage (finalPackage: { +rustPlatform.buildRustPackage (finalAttrs: { pname = "yubihsm-setup"; version = "2.3.3"; src = fetchFromGitHub { owner = "Yubico"; repo = "yubihsm-setup"; - tag = finalPackage.version; + tag = finalAttrs.version; hash = "sha256-ScpcEDNWLhywtcPPG84vZyIAQ5lF07udmGsmsyc3+iU="; }; diff --git a/pkgs/development/compilers/sbcl/default.nix b/pkgs/development/compilers/sbcl/default.nix index 8e487dc37416..6bcf350ffc22 100644 --- a/pkgs/development/compilers/sbcl/default.nix +++ b/pkgs/development/compilers/sbcl/default.nix @@ -74,7 +74,7 @@ let in -stdenv.mkDerivation (self: { +stdenv.mkDerivation (finalAttrs: { pname = "sbcl"; inherit version; @@ -88,7 +88,7 @@ stdenv.mkDerivation (self: { nativeBuildInputs = [ texinfo ] - ++ lib.optionals self.doCheck ( + ++ lib.optionals finalAttrs.doCheck ( [ which writableTmpDirAsHomeHook @@ -96,14 +96,14 @@ stdenv.mkDerivation (self: { ++ lib.optionals (builtins.elem stdenv.system strace.meta.platforms) [ strace ] - ++ lib.optionals (lib.versionOlder "2.4.10" self.version) [ + ++ lib.optionals (lib.versionOlder "2.4.10" finalAttrs.version) [ ps ] ); - buildInputs = lib.optionals self.coreCompression ( + buildInputs = lib.optionals finalAttrs.coreCompression ( # Declare at the point of actual use in case the caller wants to override # buildInputs to sidestep this. - assert lib.assertMsg (!self.purgeNixReferences) '' + assert lib.assertMsg (!finalAttrs.purgeNixReferences) '' Cannot enable coreCompression when purging Nix references, because compression requires linking in zstd ''; [ zstd ] @@ -119,7 +119,7 @@ stdenv.mkDerivation (self: { # to get rid of ${glibc} dependency. purgeNixReferences = false; coreCompression = true; - markRegionGC = self.threadSupport; + markRegionGC = finalAttrs.threadSupport; disableImmobileSpace = false; linkableRuntime = stdenv.hostPlatform.isx86; @@ -128,7 +128,7 @@ stdenv.mkDerivation (self: { # altogether. One by one hopefully we can fix these (on ofBorg, # upstream--somehow some way) in due time. disabledTestFiles = - lib.optionals (lib.versionOlder "2.5.2" self.version) [ "debug.impure.lisp" ] + lib.optionals (lib.versionOlder "2.5.2" finalAttrs.version) [ "debug.impure.lisp" ] ++ lib.optionals (builtins.elem stdenv.hostPlatform.system [ @@ -182,7 +182,7 @@ stdenv.mkDerivation (self: { # "https://sourceforge.net/p/sbcl/mailman/sbcl-devel/thread/2cf20df7-01d0-44f2-8551-0df01fe55f1a%400brg.net/"), # but for Nix envvars are sufficiently useful that it’s worth maintaining # this functionality downstream. - if lib.versionOlder "2.5.2" self.version then + if lib.versionOlder "2.5.2" finalAttrs.version then [ ./dynamic-space-size-envvar-2.5.3-feature.patch ./dynamic-space-size-envvar-2.5.3-tests.patch @@ -194,10 +194,10 @@ stdenv.mkDerivation (self: { ]; sbclPatchPhase = - lib.optionalString (self.disabledTestFiles != [ ]) '' - (cd tests ; rm -f ${lib.concatStringsSep " " self.disabledTestFiles}) + lib.optionalString (finalAttrs.disabledTestFiles != [ ]) '' + (cd tests ; rm -f ${lib.concatStringsSep " " finalAttrs.disabledTestFiles}) '' - + lib.optionalString self.purgeNixReferences '' + + lib.optionalString finalAttrs.purgeNixReferences '' # This is the default location to look for the core; by default in $out/lib/sbcl sed 's@^\(#define SBCL_HOME\) .*$@\1 "/no-such-path"@' \ -i src/runtime/runtime.c @@ -209,7 +209,9 @@ stdenv.mkDerivation (self: { # binary. There are some tricky files in nested directories which should # definitely NOT be patched this way, hence just a single * (and no # globstar). - substituteInPlace ${if self.purgeNixReferences then "tests" else "{tests,src/code}"}/*.{lisp,sh} \ + substituteInPlace ${ + if finalAttrs.purgeNixReferences then "tests" else "{tests,src/code}" + }/*.{lisp,sh} \ --replace-quiet /usr/bin/env "${posixUtils}/bin/env" \ --replace-quiet /bin/uname "${posixUtils}/bin/uname" \ --replace-quiet /bin/sh "${stdenv.shell}" @@ -218,7 +220,7 @@ stdenv.mkDerivation (self: { # want to override { src = ... } it might not exist. It’s required for # building, so create a mock version as a backup. if [[ ! -a version.lisp-expr ]]; then - echo '"${self.version}.nixos"' > version.lisp-expr + echo '"${finalAttrs.version}.nixos"' > version.lisp-expr fi ''; @@ -226,17 +228,17 @@ stdenv.mkDerivation (self: { enableFeatures = assert lib.assertMsg ( - self.markRegionGC -> self.threadSupport + finalAttrs.markRegionGC -> finalAttrs.threadSupport ) "SBCL mark region GC requires thread support"; - lib.optional self.threadSupport "sb-thread" - ++ lib.optional self.linkableRuntime "sb-linkable-runtime" - ++ lib.optional self.coreCompression "sb-core-compression" + lib.optional finalAttrs.threadSupport "sb-thread" + ++ lib.optional finalAttrs.linkableRuntime "sb-linkable-runtime" + ++ lib.optional finalAttrs.coreCompression "sb-core-compression" ++ lib.optional stdenv.hostPlatform.isAarch32 "arm" - ++ lib.optional self.markRegionGC "mark-region-gc"; + ++ lib.optional finalAttrs.markRegionGC "mark-region-gc"; disableFeatures = - lib.optional (!self.threadSupport) "sb-thread" - ++ lib.optionals self.disableImmobileSpace [ + lib.optional (!finalAttrs.threadSupport) "sb-thread" + ++ lib.optionals finalAttrs.disableImmobileSpace [ "immobile-space" "immobile-code" "compact-instance-header" @@ -246,8 +248,8 @@ stdenv.mkDerivation (self: { "--prefix=$out" "--xc-host=${lib.escapeShellArg bootstrapLisp'}" ] - ++ map (x: "--with-${x}") self.enableFeatures - ++ map (x: "--without-${x}") self.disableFeatures + ++ map (x: "--with-${x}") finalAttrs.enableFeatures + ++ map (x: "--without-${x}") finalAttrs.disableFeatures ++ lib.optionals (stdenv.hostPlatform.system == "aarch64-darwin") [ "--arch=arm64" ]; @@ -264,7 +266,7 @@ stdenv.mkDerivation (self: { runHook preBuild export INSTALL_ROOT=$out - sh make.sh ${lib.concatStringsSep " " self.buildArgs} + sh make.sh ${lib.concatStringsSep " " finalAttrs.buildArgs} (cd doc/manual ; make info) runHook postBuild @@ -291,7 +293,7 @@ stdenv.mkDerivation (self: { sh install.sh '' - + lib.optionalString (!self.purgeNixReferences) '' + + lib.optionalString (!finalAttrs.purgeNixReferences) '' cp -r src $out/lib/sbcl cp -r contrib $out/lib/sbcl cat >$out/lib/sbcl/sbclrc <