From 90e7159c559021ac4f4cc1222000f08a91feff69 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Mon, 1 Sep 2025 12:49:06 +0200 Subject: [PATCH] treewide: remove unused rec Auto-fix by nixf-diagnose. --- ci/default.nix | 1 - nixos/modules/programs/atop.nix | 2 +- .../modules/programs/nix-required-mounts.nix | 2 +- nixos/modules/services/databases/openldap.nix | 2 +- .../services/desktop-managers/gnome.nix | 2 +- nixos/modules/services/misc/gitlab.nix | 2 +- .../services/monitoring/parsedmarc.nix | 2 +- .../services/networking/https-dns-proxy.nix | 2 +- nixos/modules/services/web-apps/flarum.nix | 2 +- nixos/modules/services/web-apps/gancio.nix | 2 +- nixos/tests/hledger-web.nix | 2 +- nixos/tests/installed-tests/default.nix | 2 +- nixos/tests/jenkins-cli.nix | 2 +- nixos/tests/locate.nix | 2 +- nixos/tests/pihole-ftl/basic.nix | 2 +- nixos/tests/web-apps/phylactery.nix | 2 +- nixos/tests/zfs.nix | 4 +- .../editors/kakoune/plugins/overrides.nix | 6 +- .../applications/editors/sublime/3/common.nix | 2 +- .../extensions/ms-python.python/default.nix | 2 +- pkgs/applications/misc/cura/plugins.nix | 2 +- .../networking/cluster/hadoop/default.nix | 4 +- .../networking/cluster/spark/default.nix | 2 +- .../science/logic/klee/default.nix | 2 +- .../system/coolercontrol/default.nix | 2 +- pkgs/build-support/checkpoint-build.nix | 2 +- .../build-rust-crate/test/rcgen-crates.nix | 184 +++++++++--------- pkgs/build-support/rust/lib/default.nix | 2 +- .../by-name/ap/appindicator-sharp/package.nix | 2 +- pkgs/by-name/av/avizo/package.nix | 2 +- pkgs/by-name/bi/bic/package.nix | 2 +- pkgs/by-name/ce/cerca/package.nix | 2 +- pkgs/by-name/ce/certmitm/package.nix | 2 +- pkgs/by-name/cf/cfn-nag/package.nix | 2 +- pkgs/by-name/cj/cjs/package.nix | 2 +- pkgs/by-name/co/code-nautilus/package.nix | 2 +- pkgs/by-name/co/codux/package.nix | 2 +- pkgs/by-name/co/colmap/package.nix | 2 +- pkgs/by-name/co/coltrane/package.nix | 2 +- pkgs/by-name/co/countryguess/package.nix | 2 +- .../by-name/cr/crossfire-gridarta/package.nix | 2 +- pkgs/by-name/dc/dcgm/package.nix | 2 +- pkgs/by-name/de/defaultbrowser/package.nix | 2 +- pkgs/by-name/de/denemo/package.nix | 2 +- pkgs/by-name/dl/dli/package.nix | 2 +- pkgs/by-name/dp/dpms-off/package.nix | 2 +- pkgs/by-name/du/duti/package.nix | 2 +- pkgs/by-name/el/elmerfem/package.nix | 2 +- pkgs/by-name/gi/git-point/package.nix | 2 +- pkgs/by-name/ha/haxor-news/package.nix | 2 +- pkgs/by-name/ik/ike-scan/package.nix | 2 +- pkgs/by-name/ja/jasper-gtk-theme/package.nix | 2 +- pkgs/by-name/ki/kind-lang/package.nix | 2 +- pkgs/by-name/ku/kubernix/package.nix | 2 +- pkgs/by-name/ma/mari0/package.nix | 2 +- .../ni/nix-required-mounts/package.nix | 2 +- pkgs/by-name/no/nordic/package.nix | 2 +- pkgs/by-name/os/osx-cpu-temp/package.nix | 2 +- pkgs/by-name/ot/otto-matic/package.nix | 2 +- pkgs/by-name/ov/overcommit/package.nix | 2 +- pkgs/by-name/ow/owi/package.nix | 2 +- pkgs/by-name/pd/pdm/package.nix | 2 +- pkgs/by-name/po/polar/package.nix | 2 +- pkgs/by-name/pr/precice/package.nix | 2 +- pkgs/by-name/pr/prowler/package.nix | 2 +- .../pu/pulumi/extra/mk-pulumi-package.nix | 2 +- pkgs/by-name/qi/qimgv/package.nix | 2 +- .../re/reversal-icon-theme/package.nix | 2 +- pkgs/by-name/ro/roc/package.nix | 2 +- pkgs/by-name/sa/samfirm-js/package.nix | 2 +- .../sh/shadowsocks-v2ray-plugin/package.nix | 2 +- pkgs/by-name/so/soapyuhd/package.nix | 2 +- pkgs/by-name/ta/tamgamp-lv2/package.nix | 2 +- pkgs/by-name/te/teleport_16/package.nix | 2 +- pkgs/by-name/te/teleport_17/package.nix | 2 +- pkgs/by-name/te/teleport_18/package.nix | 2 +- pkgs/by-name/un/unwaf/package.nix | 2 +- pkgs/by-name/uu/uudeview/package.nix | 2 +- pkgs/by-name/wm/wmutils-opt/package.nix | 2 +- pkgs/by-name/x1/x11docker/package.nix | 2 +- .../xo/xow_dongle-firmware/package.nix | 2 +- pkgs/by-name/ze/zenmap/package.nix | 2 +- pkgs/data/themes/qogir-kde/default.nix | 2 +- .../elementary-session-settings/default.nix | 2 +- .../compilers/gcc/ng/common/default.nix | 14 +- .../compilers/ghc/9.0.2-binary.nix | 2 +- pkgs/development/compilers/ghc/9.10.3.nix | 2 +- pkgs/development/compilers/ghc/9.12.2.nix | 2 +- .../compilers/ghc/9.2.4-binary.nix | 2 +- .../compilers/ghc/9.6.3-binary.nix | 2 +- .../compilers/ghc/9.8.4-binary.nix | 2 +- .../libraries/prometheus-client-c/default.nix | 2 +- .../development/libraries/wlroots/default.nix | 2 +- .../ocaml-modules/augeas/default.nix | 2 +- .../ocaml-modules/cooltt/default.nix | 2 +- .../ocaml-modules/flac/default.nix | 2 +- .../python-modules/datalad-next/default.nix | 2 +- .../python-modules/dbt-common/default.nix | 2 +- .../python-modules/devpi-ldap/default.nix | 2 +- .../python-modules/libsupermesh/default.nix | 2 +- .../python-modules/manifold3d/default.nix | 2 +- .../python-modules/msrplib/default.nix | 2 +- .../python-modules/mypy-boto3/default.nix | 2 +- .../python-modules/nampa/default.nix | 2 +- .../python-modules/py-libnuma/default.nix | 2 +- .../python-modules/pyipv8/default.nix | 2 +- .../python-modules/pyquerylist/default.nix | 2 +- .../python-modules/pysecretsocks/default.nix | 2 +- .../python-modules/pytest-icdiff/default.nix | 2 +- .../python-coinmarketcap/default.nix | 2 +- .../python-modules/python-sat/default.nix | 2 +- .../python-modules/pytorchviz/default.nix | 2 +- .../python-modules/root/default.nix | 2 +- .../python-modules/sss/default.nix | 2 +- .../python-modules/tensorrt/default.nix | 2 +- .../python-modules/xcaplib/default.nix | 2 +- .../tools/analysis/sparse/default.nix | 2 +- .../tools/misc/creduce/default.nix | 2 +- pkgs/development/tools/replay-io/default.nix | 4 +- .../flightgear/openscenegraph-flightgear.nix | 2 +- .../cups/drivers/brother/dcp375cw/default.nix | 2 +- .../drivers/brother/dcp9020cdw/default.nix | 2 +- pkgs/misc/tmux-plugins/default.nix | 4 +- pkgs/os-specific/linux/digimend/default.nix | 2 +- .../custom-components/luxer_one/package.nix | 2 +- pkgs/test/vim/default.nix | 2 +- pkgs/tools/typesetting/tex/texlive/bin.nix | 2 +- pkgs/top-level/lua-packages.nix | 2 +- 128 files changed, 230 insertions(+), 231 deletions(-) diff --git a/ci/default.nix b/ci/default.nix index 629d798831e5..74cea1c01aa5 100644 --- a/ci/default.nix +++ b/ci/default.nix @@ -97,7 +97,6 @@ let # https://github.com/nix-community/nixd/blob/main/libnixf/src/Basic/diagnostic.py # TODO: Remove the following and fix things. "--ignore=parse-redundant-paren" - "--ignore=sema-extra-rec" "--ignore=sema-extra-with" "--ignore=sema-unused-def-lambda-noarg-formal" "--ignore=sema-unused-def-lambda-witharg-arg" diff --git a/nixos/modules/programs/atop.nix b/nixos/modules/programs/atop.nix index ca662d03213d..34e48fbd34b9 100644 --- a/nixos/modules/programs/atop.nix +++ b/nixos/modules/programs/atop.nix @@ -16,7 +16,7 @@ in options = { - programs.atop = rec { + programs.atop = { enable = lib.mkEnableOption "Atop, a tool for monitoring system resources"; diff --git a/nixos/modules/programs/nix-required-mounts.nix b/nixos/modules/programs/nix-required-mounts.nix index f1fa34509dbf..a7ec09fe5f9a 100644 --- a/nixos/modules/programs/nix-required-mounts.nix +++ b/nixos/modules/programs/nix-required-mounts.nix @@ -80,7 +80,7 @@ in ''; allowedPatterns = with lib.types; - lib.mkOption rec { + lib.mkOption { type = attrsOf Pattern; description = "The hook config, describing which paths to mount for which system features"; default = { }; diff --git a/nixos/modules/services/databases/openldap.nix b/nixos/modules/services/databases/openldap.nix index 44affdfb0586..72593aff4c84 100644 --- a/nixos/modules/services/databases/openldap.nix +++ b/nixos/modules/services/databases/openldap.nix @@ -12,7 +12,7 @@ let ldapValueType = let # Can't do types.either with multiple non-overlapping submodules, so define our own - singleLdapValueType = lib.mkOptionType rec { + singleLdapValueType = lib.mkOptionType { name = "LDAP"; # TODO: It would be nice to define a { secret = ...; } option, using # systemd's LoadCredentials for secrets. That would remove the last diff --git a/nixos/modules/services/desktop-managers/gnome.nix b/nixos/modules/services/desktop-managers/gnome.nix index 39ae0d93451c..91f4002e59d7 100644 --- a/nixos/modules/services/desktop-managers/gnome.nix +++ b/nixos/modules/services/desktop-managers/gnome.nix @@ -42,7 +42,7 @@ let inherit flashbackEnabled nixos-background-dark nixos-background-light; }; - nixos-background-info = pkgs.writeTextFile rec { + nixos-background-info = pkgs.writeTextFile { name = "nixos-background-info"; text = '' diff --git a/nixos/modules/services/misc/gitlab.nix b/nixos/modules/services/misc/gitlab.nix index 240561f20278..127a7e73e83e 100644 --- a/nixos/modules/services/misc/gitlab.nix +++ b/nixos/modules/services/misc/gitlab.nix @@ -1699,7 +1699,7 @@ in filteredConfig = filterAttrs (_: v: v != null) cfg.pages.settings; isSecret = v: isAttrs v && v ? _secret && isString v._secret; mkPagesKeyValue = lib.generators.toKeyValue { - mkKeyValue = lib.flip lib.generators.mkKeyValueDefault "=" rec { + mkKeyValue = lib.flip lib.generators.mkKeyValueDefault "=" { mkValueString = v: if isInt v then diff --git a/nixos/modules/services/monitoring/parsedmarc.nix b/nixos/modules/services/monitoring/parsedmarc.nix index 61bce5726dd4..1d6a7c1f567f 100644 --- a/nixos/modules/services/monitoring/parsedmarc.nix +++ b/nixos/modules/services/monitoring/parsedmarc.nix @@ -11,7 +11,7 @@ let opt = options.services.parsedmarc; isSecret = v: isAttrs v && v ? _secret && isString v._secret; ini = pkgs.formats.ini { - mkKeyValue = lib.flip lib.generators.mkKeyValueDefault "=" rec { + mkKeyValue = lib.flip lib.generators.mkKeyValueDefault "=" { mkValueString = v: if isInt v then diff --git a/nixos/modules/services/networking/https-dns-proxy.nix b/nixos/modules/services/networking/https-dns-proxy.nix index 2476edf4a469..4e8f81888cc2 100644 --- a/nixos/modules/services/networking/https-dns-proxy.nix +++ b/nixos/modules/services/networking/https-dns-proxy.nix @@ -136,7 +136,7 @@ in wants = [ "nss-lookup.target" ]; before = [ "nss-lookup.target" ]; wantedBy = [ "multi-user.target" ]; - serviceConfig = rec { + serviceConfig = { Type = "exec"; DynamicUser = true; ProtectHome = "tmpfs"; diff --git a/nixos/modules/services/web-apps/flarum.nix b/nixos/modules/services/web-apps/flarum.nix index 2b5517d8af98..c4c05826d8cd 100644 --- a/nixos/modules/services/web-apps/flarum.nix +++ b/nixos/modules/services/web-apps/flarum.nix @@ -90,7 +90,7 @@ in description = "Home directory for writable storage"; }; - database = mkOption rec { + database = mkOption { type = with types; attrsOf (oneOf [ diff --git a/nixos/modules/services/web-apps/gancio.nix b/nixos/modules/services/web-apps/gancio.nix index 62de57276fcd..6dc6c26bc089 100644 --- a/nixos/modules/services/web-apps/gancio.nix +++ b/nixos/modules/services/web-apps/gancio.nix @@ -44,7 +44,7 @@ in default = "gancio"; }; - settings = mkOption rec { + settings = mkOption { type = types.submodule { freeformType = settingsFormat.type; options = { diff --git a/nixos/tests/hledger-web.nix b/nixos/tests/hledger-web.nix index 705288dc4e71..e772c7a74c18 100644 --- a/nixos/tests/hledger-web.nix +++ b/nixos/tests/hledger-web.nix @@ -9,7 +9,7 @@ let assets:cash -250$ ''; in -rec { +{ name = "hledger-web"; meta.maintainers = with lib.maintainers; [ marijanp ]; diff --git a/nixos/tests/installed-tests/default.nix b/nixos/tests/installed-tests/default.nix index 2dc0e850c066..5741f23d11b0 100644 --- a/nixos/tests/installed-tests/default.nix +++ b/nixos/tests/installed-tests/default.nix @@ -38,7 +38,7 @@ let }@args: makeTest ( recursiveUpdate - rec { + { name = tested.name; meta = { diff --git a/nixos/tests/jenkins-cli.nix b/nixos/tests/jenkins-cli.nix index 69167ffa3a6f..fd1801eaef25 100644 --- a/nixos/tests/jenkins-cli.nix +++ b/nixos/tests/jenkins-cli.nix @@ -1,5 +1,5 @@ { pkgs, ... }: -rec { +{ name = "jenkins-cli"; meta = with pkgs.lib.maintainers; { maintainers = [ pamplemousse ]; diff --git a/nixos/tests/locate.nix b/nixos/tests/locate.nix index 559868128560..012119bdcb2d 100644 --- a/nixos/tests/locate.nix +++ b/nixos/tests/locate.nix @@ -6,7 +6,7 @@ in name = "locate"; meta.maintainers = with pkgs.lib.maintainers; [ chkno ]; - nodes = rec { + nodes = { a = { environment.systemPackages = with pkgs; [ sshfs ]; virtualisation.fileSystems = { diff --git a/nixos/tests/pihole-ftl/basic.nix b/nixos/tests/pihole-ftl/basic.nix index 2d1a867b0938..5789d5a99428 100644 --- a/nixos/tests/pihole-ftl/basic.nix +++ b/nixos/tests/pihole-ftl/basic.nix @@ -5,7 +5,7 @@ ... }: -rec { +{ name = "pihole-ftl-basic"; meta.maintainers = with lib.maintainers; [ averyvigolo ]; diff --git a/nixos/tests/web-apps/phylactery.nix b/nixos/tests/web-apps/phylactery.nix index 1643231ff8f0..d6d52680ec5f 100644 --- a/nixos/tests/web-apps/phylactery.nix +++ b/nixos/tests/web-apps/phylactery.nix @@ -5,7 +5,7 @@ nodes.machine = { ... }: { - services.phylactery = rec { + services.phylactery = { enable = true; port = 8080; library = "/tmp"; diff --git a/nixos/tests/zfs.nix b/nixos/tests/zfs.nix index 12d9b23886f1..470d256ba515 100644 --- a/nixos/tests/zfs.nix +++ b/nixos/tests/zfs.nix @@ -214,12 +214,12 @@ in kernelPackages = pkgs.linuxPackages; }; - unstable = makeZfsTest rec { + unstable = makeZfsTest { zfsPackage = pkgs.zfs_unstable; kernelPackages = pkgs.linuxPackages; }; - unstableWithSystemdStage1 = makeZfsTest rec { + unstableWithSystemdStage1 = makeZfsTest { zfsPackage = pkgs.zfs_unstable; kernelPackages = pkgs.linuxPackages; enableSystemdStage1 = true; diff --git a/pkgs/applications/editors/kakoune/plugins/overrides.nix b/pkgs/applications/editors/kakoune/plugins/overrides.nix index 5c769e8db03f..09d53750ca24 100644 --- a/pkgs/applications/editors/kakoune/plugins/overrides.nix +++ b/pkgs/applications/editors/kakoune/plugins/overrides.nix @@ -112,7 +112,7 @@ self: super: { }; }; - kakoune-rainbow = super.kakoune-rainbow.overrideAttrs (oldAttrs: rec { + kakoune-rainbow = super.kakoune-rainbow.overrideAttrs (oldAttrs: { preFixup = '' mkdir -p $out/bin mv $out/share/kak/autoload/plugins/kakoune-rainbow/bin/kak-rainbow.scm $out/bin @@ -146,14 +146,14 @@ self: super: { }; }; - powerline-kak = super.powerline-kak.overrideAttrs (oldAttrs: rec { + powerline-kak = super.powerline-kak.overrideAttrs (oldAttrs: { preFixup = '' substituteInPlace $out/share/kak/autoload/plugins/powerline-kak/rc/modules/git.kak \ --replace ' git ' ' ${git}/bin/git ' ''; }); - hop-kak = rustPlatform.buildRustPackage rec { + hop-kak = rustPlatform.buildRustPackage { pname = "hop-kak"; version = "0.2.0"; diff --git a/pkgs/applications/editors/sublime/3/common.nix b/pkgs/applications/editors/sublime/3/common.nix index 38452146e105..b427f15aa508 100644 --- a/pkgs/applications/editors/sublime/3/common.nix +++ b/pkgs/applications/editors/sublime/3/common.nix @@ -140,7 +140,7 @@ let ''; }; in -stdenv.mkDerivation (rec { +stdenv.mkDerivation ({ inherit pname; version = buildVersion; diff --git a/pkgs/applications/editors/vscode/extensions/ms-python.python/default.nix b/pkgs/applications/editors/vscode/extensions/ms-python.python/default.nix index aa6bbe2d05c7..6b6ac27fde0b 100644 --- a/pkgs/applications/editors/vscode/extensions/ms-python.python/default.nix +++ b/pkgs/applications/editors/vscode/extensions/ms-python.python/default.nix @@ -37,7 +37,7 @@ let or (throw "unsupported platform ${stdenv.hostPlatform.system}"); in -vscode-utils.buildVscodeMarketplaceExtension rec { +vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = base // { name = "python"; publisher = "ms-python"; diff --git a/pkgs/applications/misc/cura/plugins.nix b/pkgs/applications/misc/cura/plugins.nix index 4782e4e3c456..eec6b5cc864d 100644 --- a/pkgs/applications/misc/cura/plugins.nix +++ b/pkgs/applications/misc/cura/plugins.nix @@ -11,7 +11,7 @@ let self = { - octoprint = stdenv.mkDerivation rec { + octoprint = stdenv.mkDerivation { pname = "Cura-OctoPrintPlugin"; version = "3.5.18"; diff --git a/pkgs/applications/networking/cluster/hadoop/default.nix b/pkgs/applications/networking/cluster/hadoop/default.nix index 105621a2598a..3d5896aa623e 100644 --- a/pkgs/applications/networking/cluster/hadoop/default.nix +++ b/pkgs/applications/networking/cluster/hadoop/default.nix @@ -186,7 +186,7 @@ in # TODO: Package and add Intel Storage Acceleration Library tests = nixosTests.hadoop; }; - hadoop_3_3 = common rec { + hadoop_3_3 = common { pname = "hadoop"; platformAttrs = rec { x86_64-linux = { @@ -204,7 +204,7 @@ in # TODO: Package and add Intel Storage Acceleration Library tests = nixosTests.hadoop_3_3; }; - hadoop2 = common rec { + hadoop2 = common { pname = "hadoop"; platformAttrs.x86_64-linux = { version = "2.10.2"; diff --git a/pkgs/applications/networking/cluster/spark/default.nix b/pkgs/applications/networking/cluster/spark/default.nix index 2609c4fd0a2b..f472d23cccd7 100644 --- a/pkgs/applications/networking/cluster/spark/default.nix +++ b/pkgs/applications/networking/cluster/spark/default.nix @@ -101,7 +101,7 @@ in version = "3.5.5"; hash = "sha256-vzcWgIfHPhN3nyrxdk3f0p4fW3MpQ+FuEPnWPw0xNPg="; }; - spark_3_4 = spark rec { + spark_3_4 = spark { pname = "spark"; version = "3.4.4"; hash = "sha256-GItHmthLhG7y0XSF3QINCyE7wYFb0+lPZmYLUuMa4Ww="; diff --git a/pkgs/applications/science/logic/klee/default.nix b/pkgs/applications/science/logic/klee/default.nix index 6cf24445c6c4..dcccc03bb45c 100644 --- a/pkgs/applications/science/logic/klee/default.nix +++ b/pkgs/applications/science/logic/klee/default.nix @@ -51,7 +51,7 @@ let # Python used for KLEE tests. kleePython = python3.withPackages (ps: with ps; [ tabulate ]); in -llvmPackages.stdenv.mkDerivation rec { +llvmPackages.stdenv.mkDerivation { pname = "klee"; version = "3.1-unstable-2025-07-11"; diff --git a/pkgs/applications/system/coolercontrol/default.nix b/pkgs/applications/system/coolercontrol/default.nix index 35e138f5f195..009525ec8eb3 100644 --- a/pkgs/applications/system/coolercontrol/default.nix +++ b/pkgs/applications/system/coolercontrol/default.nix @@ -27,7 +27,7 @@ let applySharedDetails = drv: drv { inherit version src meta; }; in -rec { +{ coolercontrol-ui-data = applySharedDetails (callPackage ./coolercontrol-ui-data.nix { }); coolercontrold = applySharedDetails (callPackage ./coolercontrold.nix { }); diff --git a/pkgs/build-support/checkpoint-build.nix b/pkgs/build-support/checkpoint-build.nix index 5071ad4ac5b7..fc46565ca875 100644 --- a/pkgs/build-support/checkpoint-build.nix +++ b/pkgs/build-support/checkpoint-build.nix @@ -44,7 +44,7 @@ let }); in -rec { +{ inherit mkCheckpointBuild; /* Prepare a derivation for local builds. diff --git a/pkgs/build-support/rust/build-rust-crate/test/rcgen-crates.nix b/pkgs/build-support/rust/build-rust-crate/test/rcgen-crates.nix index 69905245b2d7..bca7163fdeea 100644 --- a/pkgs/build-support/rust/build-rust-crate/test/rcgen-crates.nix +++ b/pkgs/build-support/rust/build-rust-crate/test/rcgen-crates.nix @@ -92,7 +92,7 @@ rec { # inject test dependencies into the build crates = { - "asn1-rs" = rec { + "asn1-rs" = { crateName = "asn1-rs"; version = "0.3.1"; edition = "2018"; @@ -160,7 +160,7 @@ rec { "time" ]; }; - "asn1-rs-derive" = rec { + "asn1-rs-derive" = { crateName = "asn1-rs-derive"; version = "0.1.0"; edition = "2018"; @@ -189,7 +189,7 @@ rec { ]; }; - "asn1-rs-impl" = rec { + "asn1-rs-impl" = { crateName = "asn1-rs-impl"; version = "0.1.0"; edition = "2018"; @@ -214,7 +214,7 @@ rec { ]; }; - "autocfg 0.1.7" = rec { + "autocfg 0.1.7" = { crateName = "autocfg"; version = "0.1.7"; edition = "2015"; @@ -224,7 +224,7 @@ rec { ]; }; - "autocfg 1.0.1" = rec { + "autocfg 1.0.1" = { crateName = "autocfg"; version = "1.0.1"; edition = "2015"; @@ -234,7 +234,7 @@ rec { ]; }; - "base64" = rec { + "base64" = { crateName = "base64"; version = "0.13.0"; edition = "2018"; @@ -251,7 +251,7 @@ rec { "std" ]; }; - "base64ct" = rec { + "base64ct" = { crateName = "base64ct"; version = "1.1.1"; edition = "2018"; @@ -263,7 +263,7 @@ rec { "std" = [ "alloc" ]; }; }; - "bitflags" = rec { + "bitflags" = { crateName = "bitflags"; version = "1.3.2"; edition = "2018"; @@ -281,7 +281,7 @@ rec { }; resolvedDefaultFeatures = [ "default" ]; }; - "botan" = rec { + "botan" = { crateName = "botan"; version = "0.8.1"; edition = "2018"; @@ -309,7 +309,7 @@ rec { "vendored" ]; }; - "botan-src" = rec { + "botan-src" = { crateName = "botan-src"; version = "0.21703.0"; edition = "2018"; @@ -320,7 +320,7 @@ rec { ]; }; - "botan-sys" = rec { + "botan-sys" = { crateName = "botan-sys"; version = "0.8.1"; edition = "2015"; @@ -351,7 +351,7 @@ rec { "vendored" ]; }; - "bumpalo" = rec { + "bumpalo" = { crateName = "bumpalo"; version = "3.9.1"; edition = "2018"; @@ -363,7 +363,7 @@ rec { }; resolvedDefaultFeatures = [ "default" ]; }; - "byteorder" = rec { + "byteorder" = { crateName = "byteorder"; version = "1.4.3"; edition = "2018"; @@ -375,7 +375,7 @@ rec { "default" = [ "std" ]; }; }; - "cc" = rec { + "cc" = { crateName = "cc"; version = "1.0.72"; edition = "2018"; @@ -389,7 +389,7 @@ rec { "parallel" = [ "jobserver" ]; }; }; - "cfg-if" = rec { + "cfg-if" = { crateName = "cfg-if"; version = "1.0.0"; edition = "2018"; @@ -406,7 +406,7 @@ rec { ]; }; }; - "const-oid" = rec { + "const-oid" = { crateName = "const-oid"; version = "0.6.2"; edition = "2018"; @@ -417,7 +417,7 @@ rec { features = { }; }; - "crypto-bigint" = rec { + "crypto-bigint" = { crateName = "crypto-bigint"; version = "0.2.11"; edition = "2018"; @@ -457,7 +457,7 @@ rec { "rand_core" ]; }; - "cty" = rec { + "cty" = { crateName = "cty"; version = "0.2.2"; edition = "2015"; @@ -467,7 +467,7 @@ rec { ]; }; - "data-encoding" = rec { + "data-encoding" = { crateName = "data-encoding"; version = "2.3.2"; edition = "2018"; @@ -485,7 +485,7 @@ rec { "std" ]; }; - "der" = rec { + "der" = { crateName = "der"; version = "0.4.5"; edition = "2018"; @@ -524,7 +524,7 @@ rec { "std" ]; }; - "der-parser" = rec { + "der-parser" = { crateName = "der-parser"; version = "7.0.0"; edition = "2018"; @@ -577,7 +577,7 @@ rec { "std" ]; }; - "digest" = rec { + "digest" = { crateName = "digest"; version = "0.9.0"; edition = "2018"; @@ -601,7 +601,7 @@ rec { "std" ]; }; - "displaydoc" = rec { + "displaydoc" = { crateName = "displaydoc"; version = "0.2.3"; edition = "2018"; @@ -632,7 +632,7 @@ rec { "std" ]; }; - "foreign-types" = rec { + "foreign-types" = { crateName = "foreign-types"; version = "0.3.2"; edition = "2015"; @@ -648,7 +648,7 @@ rec { ]; }; - "foreign-types-shared" = rec { + "foreign-types-shared" = { crateName = "foreign-types-shared"; version = "0.1.1"; edition = "2015"; @@ -658,7 +658,7 @@ rec { ]; }; - "generic-array" = rec { + "generic-array" = { crateName = "generic-array"; version = "0.14.5"; edition = "2015"; @@ -684,7 +684,7 @@ rec { "serde" = [ "dep:serde" ]; }; }; - "getrandom" = rec { + "getrandom" = { crateName = "getrandom"; version = "0.2.4"; edition = "2018"; @@ -727,7 +727,7 @@ rec { }; resolvedDefaultFeatures = [ "std" ]; }; - "itoa" = rec { + "itoa" = { crateName = "itoa"; version = "1.0.1"; edition = "2018"; @@ -737,7 +737,7 @@ rec { ]; }; - "js-sys" = rec { + "js-sys" = { crateName = "js-sys"; version = "0.3.56"; edition = "2018"; @@ -753,7 +753,7 @@ rec { ]; }; - "lazy_static" = rec { + "lazy_static" = { crateName = "lazy_static"; version = "1.4.0"; edition = "2015"; @@ -777,7 +777,7 @@ rec { "spin_no_std" ]; }; - "libc" = rec { + "libc" = { crateName = "libc"; version = "0.2.116"; edition = "2015"; @@ -799,7 +799,7 @@ rec { "std" ]; }; - "libm" = rec { + "libm" = { crateName = "libm"; version = "0.2.1"; edition = "2018"; @@ -813,7 +813,7 @@ rec { }; resolvedDefaultFeatures = [ "default" ]; }; - "log" = rec { + "log" = { crateName = "log"; version = "0.4.14"; edition = "2015"; @@ -849,7 +849,7 @@ rec { "value-bag" = [ "dep:value-bag" ]; }; }; - "memchr" = rec { + "memchr" = { crateName = "memchr"; version = "2.4.1"; edition = "2018"; @@ -871,7 +871,7 @@ rec { }; resolvedDefaultFeatures = [ "std" ]; }; - "minimal-lexical" = rec { + "minimal-lexical" = { crateName = "minimal-lexical"; version = "0.2.1"; edition = "2018"; @@ -884,7 +884,7 @@ rec { }; resolvedDefaultFeatures = [ "std" ]; }; - "nom" = rec { + "nom" = { crateName = "nom"; version = "7.1.0"; edition = "2018"; @@ -924,7 +924,7 @@ rec { "std" ]; }; - "num-bigint" = rec { + "num-bigint" = { crateName = "num-bigint"; version = "0.4.3"; edition = "2018"; @@ -968,7 +968,7 @@ rec { "std" ]; }; - "num-bigint-dig" = rec { + "num-bigint-dig" = { crateName = "num-bigint-dig"; version = "0.7.0"; edition = "2015"; @@ -1070,7 +1070,7 @@ rec { "zeroize" ]; }; - "num-integer" = rec { + "num-integer" = { crateName = "num-integer"; version = "0.1.44"; edition = "2015"; @@ -1101,7 +1101,7 @@ rec { "std" ]; }; - "num-iter" = rec { + "num-iter" = { crateName = "num-iter"; version = "0.1.42"; edition = "2015"; @@ -1139,7 +1139,7 @@ rec { ]; }; }; - "num-traits" = rec { + "num-traits" = { crateName = "num-traits"; version = "0.2.14"; edition = "2015"; @@ -1171,7 +1171,7 @@ rec { "std" ]; }; - "num_threads" = rec { + "num_threads" = { crateName = "num_threads"; version = "0.1.3"; edition = "2015"; @@ -1188,7 +1188,7 @@ rec { ]; }; - "oid-registry" = rec { + "oid-registry" = { crateName = "oid-registry"; version = "0.4.0"; edition = "2018"; @@ -1228,7 +1228,7 @@ rec { "x962" ]; }; - "once_cell" = rec { + "once_cell" = { crateName = "once_cell"; version = "1.9.0"; edition = "2018"; @@ -1250,7 +1250,7 @@ rec { "std" ]; }; - "openssl" = rec { + "openssl" = { crateName = "openssl"; version = "0.10.38"; edition = "2018"; @@ -1289,7 +1289,7 @@ rec { "vendored" = [ "ffi/vendored" ]; }; }; - "openssl-sys" = rec { + "openssl-sys" = { crateName = "openssl-sys"; version = "0.9.72"; edition = "2015"; @@ -1329,7 +1329,7 @@ rec { "vendored" = [ "openssl-src" ]; }; }; - "pem" = rec { + "pem" = { crateName = "pem"; version = "1.0.2"; edition = "2018"; @@ -1345,7 +1345,7 @@ rec { ]; }; - "pem-rfc7468" = rec { + "pem-rfc7468" = { crateName = "pem-rfc7468"; version = "0.2.4"; edition = "2018"; @@ -1364,7 +1364,7 @@ rec { }; resolvedDefaultFeatures = [ "alloc" ]; }; - "pkcs1" = rec { + "pkcs1" = { crateName = "pkcs1"; version = "0.2.4"; edition = "2018"; @@ -1414,7 +1414,7 @@ rec { "zeroize" ]; }; - "pkcs8" = rec { + "pkcs8" = { crateName = "pkcs8"; version = "0.7.6"; edition = "2018"; @@ -1497,7 +1497,7 @@ rec { "zeroize" ]; }; - "pkg-config" = rec { + "pkg-config" = { crateName = "pkg-config"; version = "0.3.24"; edition = "2015"; @@ -1507,7 +1507,7 @@ rec { ]; }; - "ppv-lite86" = rec { + "ppv-lite86" = { crateName = "ppv-lite86"; version = "0.2.16"; edition = "2018"; @@ -1523,7 +1523,7 @@ rec { "std" ]; }; - "proc-macro2" = rec { + "proc-macro2" = { crateName = "proc-macro2"; version = "1.0.36"; edition = "2018"; @@ -1546,7 +1546,7 @@ rec { "proc-macro" ]; }; - "quote" = rec { + "quote" = { crateName = "quote"; version = "1.0.15"; edition = "2018"; @@ -1570,7 +1570,7 @@ rec { "proc-macro" ]; }; - "rand" = rec { + "rand" = { crateName = "rand"; version = "0.8.4"; edition = "2018"; @@ -1652,7 +1652,7 @@ rec { "std_rng" ]; }; - "rand_chacha" = rec { + "rand_chacha" = { crateName = "rand_chacha"; version = "0.3.1"; edition = "2018"; @@ -1682,7 +1682,7 @@ rec { }; resolvedDefaultFeatures = [ "std" ]; }; - "rand_core" = rec { + "rand_core" = { crateName = "rand_core"; version = "0.6.3"; edition = "2018"; @@ -1714,7 +1714,7 @@ rec { "std" ]; }; - "rand_hc" = rec { + "rand_hc" = { crateName = "rand_hc"; version = "0.3.1"; edition = "2018"; @@ -1730,7 +1730,7 @@ rec { ]; }; - "rcgen" = rec { + "rcgen" = { crateName = "rcgen"; version = "0.9.2"; edition = "2018"; @@ -1821,7 +1821,7 @@ rec { "zeroize" ]; }; - "ring" = rec { + "ring" = { crateName = "ring"; version = "0.16.20"; edition = "2018"; @@ -1938,7 +1938,7 @@ rec { "once_cell" ]; }; - "rsa" = rec { + "rsa" = { crateName = "rsa"; version = "0.5.0"; edition = "2018"; @@ -2062,7 +2062,7 @@ rec { "std" ]; }; - "rusticata-macros" = rec { + "rusticata-macros" = { crateName = "rusticata-macros"; version = "4.0.0"; edition = "2018"; @@ -2080,7 +2080,7 @@ rec { ]; }; - "smallvec" = rec { + "smallvec" = { crateName = "smallvec"; version = "1.8.0"; edition = "2018"; @@ -2094,7 +2094,7 @@ rec { "serde" = [ "dep:serde" ]; }; }; - "spin" = rec { + "spin" = { crateName = "spin"; version = "0.5.2"; edition = "2015"; @@ -2105,7 +2105,7 @@ rec { ]; }; - "spki" = rec { + "spki" = { crateName = "spki"; version = "0.4.1"; edition = "2018"; @@ -2124,7 +2124,7 @@ rec { "std" = [ "der/std" ]; }; }; - "subtle" = rec { + "subtle" = { crateName = "subtle"; version = "2.4.1"; edition = "2015"; @@ -2140,7 +2140,7 @@ rec { ]; }; }; - "syn" = rec { + "syn" = { crateName = "syn"; version = "1.0.86"; edition = "2018"; @@ -2194,7 +2194,7 @@ rec { "visit" ]; }; - "synstructure" = rec { + "synstructure" = { crateName = "synstructure"; version = "0.12.6"; edition = "2018"; @@ -2244,7 +2244,7 @@ rec { "proc-macro" ]; }; - "thiserror" = rec { + "thiserror" = { crateName = "thiserror"; version = "1.0.30"; edition = "2018"; @@ -2260,7 +2260,7 @@ rec { ]; }; - "thiserror-impl" = rec { + "thiserror-impl" = { crateName = "thiserror-impl"; version = "1.0.30"; edition = "2018"; @@ -2285,7 +2285,7 @@ rec { ]; }; - "time" = rec { + "time" = { crateName = "time"; version = "0.3.7"; edition = "2018"; @@ -2357,7 +2357,7 @@ rec { "time-macros" ]; }; - "time-macros" = rec { + "time-macros" = { crateName = "time-macros"; version = "0.2.3"; edition = "2018"; @@ -2370,7 +2370,7 @@ rec { features = { }; }; - "typenum" = rec { + "typenum" = { crateName = "typenum"; version = "1.15.0"; edition = "2018"; @@ -2385,7 +2385,7 @@ rec { "scale_info" = [ "scale-info/derive" ]; }; }; - "unicode-xid" = rec { + "unicode-xid" = { crateName = "unicode-xid"; version = "0.2.2"; edition = "2015"; @@ -2399,7 +2399,7 @@ rec { }; resolvedDefaultFeatures = [ "default" ]; }; - "untrusted" = rec { + "untrusted" = { crateName = "untrusted"; version = "0.7.1"; edition = "2018"; @@ -2410,7 +2410,7 @@ rec { ]; }; - "vcpkg" = rec { + "vcpkg" = { crateName = "vcpkg"; version = "0.2.15"; edition = "2015"; @@ -2420,7 +2420,7 @@ rec { ]; }; - "version_check" = rec { + "version_check" = { crateName = "version_check"; version = "0.9.4"; edition = "2015"; @@ -2430,7 +2430,7 @@ rec { ]; }; - "wasi" = rec { + "wasi" = { crateName = "wasi"; version = "0.10.2+wasi-snapshot-preview1"; edition = "2018"; @@ -2454,7 +2454,7 @@ rec { "std" ]; }; - "wasm-bindgen" = rec { + "wasm-bindgen" = { crateName = "wasm-bindgen"; version = "0.2.79"; edition = "2018"; @@ -2497,7 +2497,7 @@ rec { "std" ]; }; - "wasm-bindgen-backend" = rec { + "wasm-bindgen-backend" = { crateName = "wasm-bindgen-backend"; version = "0.2.79"; edition = "2018"; @@ -2541,7 +2541,7 @@ rec { }; resolvedDefaultFeatures = [ "spans" ]; }; - "wasm-bindgen-macro" = rec { + "wasm-bindgen-macro" = { crateName = "wasm-bindgen-macro"; version = "0.2.79"; edition = "2018"; @@ -2566,7 +2566,7 @@ rec { }; resolvedDefaultFeatures = [ "spans" ]; }; - "wasm-bindgen-macro-support" = rec { + "wasm-bindgen-macro-support" = { crateName = "wasm-bindgen-macro-support"; version = "0.2.79"; edition = "2018"; @@ -2606,7 +2606,7 @@ rec { }; resolvedDefaultFeatures = [ "spans" ]; }; - "wasm-bindgen-shared" = rec { + "wasm-bindgen-shared" = { crateName = "wasm-bindgen-shared"; version = "0.2.79"; edition = "2018"; @@ -2616,7 +2616,7 @@ rec { ]; }; - "web-sys" = rec { + "web-sys" = { crateName = "web-sys"; version = "0.3.56"; edition = "2018"; @@ -4083,7 +4083,7 @@ rec { "Window" ]; }; - "webpki" = rec { + "webpki" = { crateName = "webpki"; version = "0.22.0"; edition = "2018"; @@ -4111,7 +4111,7 @@ rec { "std" ]; }; - "winapi" = rec { + "winapi" = { crateName = "winapi"; version = "0.3.9"; edition = "2015"; @@ -4139,7 +4139,7 @@ rec { "wtypesbase" ]; }; - "winapi-i686-pc-windows-gnu" = rec { + "winapi-i686-pc-windows-gnu" = { crateName = "winapi-i686-pc-windows-gnu"; version = "0.4.0"; edition = "2015"; @@ -4149,7 +4149,7 @@ rec { ]; }; - "winapi-x86_64-pc-windows-gnu" = rec { + "winapi-x86_64-pc-windows-gnu" = { crateName = "winapi-x86_64-pc-windows-gnu"; version = "0.4.0"; edition = "2015"; @@ -4159,7 +4159,7 @@ rec { ]; }; - "x509-parser" = rec { + "x509-parser" = { crateName = "x509-parser"; version = "0.13.0"; edition = "2018"; @@ -4231,7 +4231,7 @@ rec { "verify" ]; }; - "yasna" = rec { + "yasna" = { crateName = "yasna"; version = "0.5.0"; edition = "2018"; @@ -4259,7 +4259,7 @@ rec { "time" ]; }; - "zeroize" = rec { + "zeroize" = { crateName = "zeroize"; version = "1.4.3"; edition = "2018"; @@ -4284,7 +4284,7 @@ rec { "zeroize_derive" ]; }; - "zeroize_derive" = rec { + "zeroize_derive" = { crateName = "zeroize_derive"; version = "1.3.1"; edition = "2018"; diff --git a/pkgs/build-support/rust/lib/default.nix b/pkgs/build-support/rust/lib/default.nix index 86be047af73b..e492d03e3026 100644 --- a/pkgs/build-support/rust/lib/default.nix +++ b/pkgs/build-support/rust/lib/default.nix @@ -6,7 +6,7 @@ pkgsTargetTarget, }: -rec { +{ # These environment variables must be set when using `cargo-c` and # several other tools which do not deal well with cross # compilation. The symptom of the problem they fix is errors due diff --git a/pkgs/by-name/ap/appindicator-sharp/package.nix b/pkgs/by-name/ap/appindicator-sharp/package.nix index 24e8c314e7b1..f5f512103ecc 100644 --- a/pkgs/by-name/ap/appindicator-sharp/package.nix +++ b/pkgs/by-name/ap/appindicator-sharp/package.nix @@ -9,7 +9,7 @@ stdenv, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "appindicator-sharp"; version = "0-unstable-2016-01-18"; diff --git a/pkgs/by-name/av/avizo/package.nix b/pkgs/by-name/av/avizo/package.nix index cbec1c25b6b2..e9801ee33570 100644 --- a/pkgs/by-name/av/avizo/package.nix +++ b/pkgs/by-name/av/avizo/package.nix @@ -19,7 +19,7 @@ brightnessctl, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "avizo"; version = "1.3-unstable-2024-11-03"; diff --git a/pkgs/by-name/bi/bic/package.nix b/pkgs/by-name/bi/bic/package.nix index 2a57ca0d5466..2279faf537e1 100644 --- a/pkgs/by-name/bi/bic/package.nix +++ b/pkgs/by-name/bi/bic/package.nix @@ -14,7 +14,7 @@ pkg-config, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "bic"; version = "1.0.0-unstable-2022-02-16"; diff --git a/pkgs/by-name/ce/cerca/package.nix b/pkgs/by-name/ce/cerca/package.nix index 1a9134458728..32a2c23da6ad 100644 --- a/pkgs/by-name/ce/cerca/package.nix +++ b/pkgs/by-name/ce/cerca/package.nix @@ -4,7 +4,7 @@ fetchFromGitHub, }: -buildGoModule rec { +buildGoModule { pname = "cerca"; version = "0-unstable-2025-05-21"; diff --git a/pkgs/by-name/ce/certmitm/package.nix b/pkgs/by-name/ce/certmitm/package.nix index 0b754cc54c11..829ba0618605 100644 --- a/pkgs/by-name/ce/certmitm/package.nix +++ b/pkgs/by-name/ce/certmitm/package.nix @@ -4,7 +4,7 @@ python3, }: -python3.pkgs.buildPythonApplication rec { +python3.pkgs.buildPythonApplication { pname = "certmitm"; version = "0-unstable-2025-05-14"; pyproject = false; diff --git a/pkgs/by-name/cf/cfn-nag/package.nix b/pkgs/by-name/cf/cfn-nag/package.nix index dc25c29fca35..71c198c9a9b7 100644 --- a/pkgs/by-name/cf/cfn-nag/package.nix +++ b/pkgs/by-name/cf/cfn-nag/package.nix @@ -5,7 +5,7 @@ ruby, }: -bundlerEnv rec { +bundlerEnv { pname = "cfn-nag"; version = "0.8.10"; diff --git a/pkgs/by-name/cj/cjs/package.nix b/pkgs/by-name/cj/cjs/package.nix index 70a9076ae0e9..e7b9bddabe16 100644 --- a/pkgs/by-name/cj/cjs/package.nix +++ b/pkgs/by-name/cj/cjs/package.nix @@ -17,7 +17,7 @@ libxml2, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "cjs"; version = "128.0-unstable-2025-09-15"; diff --git a/pkgs/by-name/co/code-nautilus/package.nix b/pkgs/by-name/co/code-nautilus/package.nix index 91925d5d9d40..873a36f17f8a 100644 --- a/pkgs/by-name/co/code-nautilus/package.nix +++ b/pkgs/by-name/co/code-nautilus/package.nix @@ -5,7 +5,7 @@ nautilus-python, python3, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "code-nautilus"; version = "0-unstable-2024-09-11"; diff --git a/pkgs/by-name/co/codux/package.nix b/pkgs/by-name/co/codux/package.nix index dc0424da6d0b..b7bca77b035b 100644 --- a/pkgs/by-name/co/codux/package.nix +++ b/pkgs/by-name/co/codux/package.nix @@ -16,7 +16,7 @@ let appimageContents = appimageTools.extractType2 { inherit pname version src; }; in -appimageTools.wrapType2 rec { +appimageTools.wrapType2 { inherit pname version src; extraInstallCommands = '' diff --git a/pkgs/by-name/co/colmap/package.nix b/pkgs/by-name/co/colmap/package.nix index ed97fb1b4e5d..babe6beab93b 100644 --- a/pkgs/by-name/co/colmap/package.nix +++ b/pkgs/by-name/co/colmap/package.nix @@ -62,7 +62,7 @@ let # TODO: migrate to redist packages inherit (cudaPackages) cudatoolkit; in -stdenv'.mkDerivation rec { +stdenv'.mkDerivation { version = "unstable-3.12.5-openimageio"; pname = "colmap"; src = fetchFromGitHub { diff --git a/pkgs/by-name/co/coltrane/package.nix b/pkgs/by-name/co/coltrane/package.nix index 9b40cf12d339..10f8bf3d69c2 100644 --- a/pkgs/by-name/co/coltrane/package.nix +++ b/pkgs/by-name/co/coltrane/package.nix @@ -4,7 +4,7 @@ bundlerUpdateScript, }: -bundlerApp rec { +bundlerApp { pname = "coltrane"; gemdir = ./.; exes = [ "coltrane" ]; diff --git a/pkgs/by-name/co/countryguess/package.nix b/pkgs/by-name/co/countryguess/package.nix index 22cf4135f4db..36982553f788 100644 --- a/pkgs/by-name/co/countryguess/package.nix +++ b/pkgs/by-name/co/countryguess/package.nix @@ -5,7 +5,7 @@ makeWrapper, }: -python3Packages.buildPythonApplication rec { +python3Packages.buildPythonApplication { pname = "countryguess"; version = "0-unstable-2025-03-04"; # upstream pyproject.toml is nonsense. Copied from another project diff --git a/pkgs/by-name/cr/crossfire-gridarta/package.nix b/pkgs/by-name/cr/crossfire-gridarta/package.nix index e60dad6e0d91..0eae54417943 100644 --- a/pkgs/by-name/cr/crossfire-gridarta/package.nix +++ b/pkgs/by-name/cr/crossfire-gridarta/package.nix @@ -7,7 +7,7 @@ gradle, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "crossfire-gridarta"; version = "2025-04"; diff --git a/pkgs/by-name/dc/dcgm/package.nix b/pkgs/by-name/dc/dcgm/package.nix index d097d2957312..a9094cd870a5 100644 --- a/pkgs/by-name/dc/dcgm/package.nix +++ b/pkgs/by-name/dc/dcgm/package.nix @@ -70,7 +70,7 @@ let )) ]; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "dcgm"; version = "4.3.1"; # N.B: If you change this, be sure prometheus-dcgm-exporter supports this version. diff --git a/pkgs/by-name/de/defaultbrowser/package.nix b/pkgs/by-name/de/defaultbrowser/package.nix index b8c82b800345..744bc447fdd2 100644 --- a/pkgs/by-name/de/defaultbrowser/package.nix +++ b/pkgs/by-name/de/defaultbrowser/package.nix @@ -4,7 +4,7 @@ fetchFromGitHub, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "defaultbrowser"; version = "unstable-2020-07-23"; diff --git a/pkgs/by-name/de/denemo/package.nix b/pkgs/by-name/de/denemo/package.nix index 837791645e1e..ac500882d15f 100644 --- a/pkgs/by-name/de/denemo/package.nix +++ b/pkgs/by-name/de/denemo/package.nix @@ -26,7 +26,7 @@ wrapGAppsHook3, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "denemo"; version = "2.6.43"; diff --git a/pkgs/by-name/dl/dli/package.nix b/pkgs/by-name/dl/dli/package.nix index 6c50c0c116eb..44cd343b9100 100644 --- a/pkgs/by-name/dl/dli/package.nix +++ b/pkgs/by-name/dl/dli/package.nix @@ -4,7 +4,7 @@ fetchFromGitHub, }: -buildGoModule rec { +buildGoModule { pname = "dli"; version = "0-unstable-2025-09-06"; diff --git a/pkgs/by-name/dp/dpms-off/package.nix b/pkgs/by-name/dp/dpms-off/package.nix index 2fd41461ada7..1a8cc1bf29d6 100644 --- a/pkgs/by-name/dp/dpms-off/package.nix +++ b/pkgs/by-name/dp/dpms-off/package.nix @@ -4,7 +4,7 @@ fetchFromGitHub, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage { pname = "dpms-off"; version = "0.2.1"; diff --git a/pkgs/by-name/du/duti/package.nix b/pkgs/by-name/du/duti/package.nix index e9175191a3b6..f793dbc5877e 100644 --- a/pkgs/by-name/du/duti/package.nix +++ b/pkgs/by-name/du/duti/package.nix @@ -5,7 +5,7 @@ autoreconfHook, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "duti"; version = "1.5.5pre"; src = fetchFromGitHub { diff --git a/pkgs/by-name/el/elmerfem/package.nix b/pkgs/by-name/el/elmerfem/package.nix index aacf40f49afa..e78ffe1d7320 100644 --- a/pkgs/by-name/el/elmerfem/package.nix +++ b/pkgs/by-name/el/elmerfem/package.nix @@ -16,7 +16,7 @@ vtkWithQt6, llvmPackages, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "elmerfem"; version = "9.0-unstable-2025-05-25"; diff --git a/pkgs/by-name/gi/git-point/package.nix b/pkgs/by-name/gi/git-point/package.nix index f3a307e3c826..1420708e1cbc 100644 --- a/pkgs/by-name/gi/git-point/package.nix +++ b/pkgs/by-name/gi/git-point/package.nix @@ -4,7 +4,7 @@ fetchFromGitHub, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage { pname = "git-point"; version = "0.2.2"; diff --git a/pkgs/by-name/ha/haxor-news/package.nix b/pkgs/by-name/ha/haxor-news/package.nix index d57a43d20c95..11ba11ebd899 100644 --- a/pkgs/by-name/ha/haxor-news/package.nix +++ b/pkgs/by-name/ha/haxor-news/package.nix @@ -5,7 +5,7 @@ python3Packages, }: -python3Packages.buildPythonApplication rec { +python3Packages.buildPythonApplication { pname = "haxor-news"; version = "unstable-2022-04-22"; format = "setuptools"; diff --git a/pkgs/by-name/ik/ike-scan/package.nix b/pkgs/by-name/ik/ike-scan/package.nix index 903dcd2003e7..f7386651d84f 100644 --- a/pkgs/by-name/ik/ike-scan/package.nix +++ b/pkgs/by-name/ik/ike-scan/package.nix @@ -7,7 +7,7 @@ stdenv, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "ike-scan"; version = "1.9.5-unstable-2024-09-15"; diff --git a/pkgs/by-name/ja/jasper-gtk-theme/package.nix b/pkgs/by-name/ja/jasper-gtk-theme/package.nix index 662f84cc033e..d884248b15d7 100644 --- a/pkgs/by-name/ja/jasper-gtk-theme/package.nix +++ b/pkgs/by-name/ja/jasper-gtk-theme/package.nix @@ -49,7 +49,7 @@ lib.checkListOfEnum "${pname}: theme variants" tweaks stdenvNoCC.mkDerivation - rec { + { inherit pname; version = "0-unstable-2025-04-02"; diff --git a/pkgs/by-name/ki/kind-lang/package.nix b/pkgs/by-name/ki/kind-lang/package.nix index 613d310a5dfe..a064dcc8cad7 100644 --- a/pkgs/by-name/ki/kind-lang/package.nix +++ b/pkgs/by-name/ki/kind-lang/package.nix @@ -10,7 +10,7 @@ let ghcVersion = "ghc910"; haskellPackages = haskell.packages.${ghcVersion}; - overrides = rec { + overrides = { version = "${raw-pkg.version}-unstable-2024-12-09"; postPatch = '' diff --git a/pkgs/by-name/ku/kubernix/package.nix b/pkgs/by-name/ku/kubernix/package.nix index 73fd7ed1ba8d..d61b67d1a03e 100644 --- a/pkgs/by-name/ku/kubernix/package.nix +++ b/pkgs/by-name/ku/kubernix/package.nix @@ -4,7 +4,7 @@ rustPlatform, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage { pname = "kubernix"; version = "0.2.0-unstable-2021-11-16"; diff --git a/pkgs/by-name/ma/mari0/package.nix b/pkgs/by-name/ma/mari0/package.nix index d18e20da557e..38a1fa5d72a3 100644 --- a/pkgs/by-name/ma/mari0/package.nix +++ b/pkgs/by-name/ma/mari0/package.nix @@ -10,7 +10,7 @@ zip, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "mari0"; version = "1.6.2-unstable-2023-08-08"; diff --git a/pkgs/by-name/ni/nix-required-mounts/package.nix b/pkgs/by-name/ni/nix-required-mounts/package.nix index e37cba924edc..89069a112051 100644 --- a/pkgs/by-name/ni/nix-required-mounts/package.nix +++ b/pkgs/by-name/ni/nix-required-mounts/package.nix @@ -1,7 +1,7 @@ { addDriverRunpath, allowedPatternsPath ? callPackage ./closure.nix { inherit allowedPatterns; }, - allowedPatterns ? rec { + allowedPatterns ? { # This config is just an example. # When the hook observes either of the following requiredSystemFeatures: nvidia-gpu.onFeatures = [ diff --git a/pkgs/by-name/no/nordic/package.nix b/pkgs/by-name/no/nordic/package.nix index d27f7ff1a7e1..418d526e703b 100644 --- a/pkgs/by-name/no/nordic/package.nix +++ b/pkgs/by-name/no/nordic/package.nix @@ -7,7 +7,7 @@ kdePackages, }: -stdenvNoCC.mkDerivation rec { +stdenvNoCC.mkDerivation { pname = "nordic"; version = "2.2.0-unstable-2025-05-05"; diff --git a/pkgs/by-name/os/osx-cpu-temp/package.nix b/pkgs/by-name/os/osx-cpu-temp/package.nix index 8b55a27d6910..ba6deb709230 100644 --- a/pkgs/by-name/os/osx-cpu-temp/package.nix +++ b/pkgs/by-name/os/osx-cpu-temp/package.nix @@ -4,7 +4,7 @@ fetchFromGitHub, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "osx-cpu-temp"; version = "unstable-2020-12-04"; diff --git a/pkgs/by-name/ot/otto-matic/package.nix b/pkgs/by-name/ot/otto-matic/package.nix index f58ce12e8bd4..08595f76dce6 100644 --- a/pkgs/by-name/ot/otto-matic/package.nix +++ b/pkgs/by-name/ot/otto-matic/package.nix @@ -9,7 +9,7 @@ unstableGitUpdater, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "OttoMatic"; version = "4.0.1-unstable-2025-04-27"; diff --git a/pkgs/by-name/ov/overcommit/package.nix b/pkgs/by-name/ov/overcommit/package.nix index a5809b86472c..8100ba20db42 100644 --- a/pkgs/by-name/ov/overcommit/package.nix +++ b/pkgs/by-name/ov/overcommit/package.nix @@ -8,7 +8,7 @@ testers, }: -bundlerApp rec { +bundlerApp { pname = "overcommit"; gemdir = ./.; exes = [ "overcommit" ]; diff --git a/pkgs/by-name/ow/owi/package.nix b/pkgs/by-name/ow/owi/package.nix index 3554e91d8e4d..c21d43e056b4 100644 --- a/pkgs/by-name/ow/owi/package.nix +++ b/pkgs/by-name/ow/owi/package.nix @@ -13,7 +13,7 @@ let ocamlPackages = ocaml-ng.ocamlPackages_5_2; in -ocamlPackages.buildDunePackage rec { +ocamlPackages.buildDunePackage { pname = "owi"; version = "0.2-unstable-2025-09-25"; diff --git a/pkgs/by-name/pd/pdm/package.nix b/pkgs/by-name/pd/pdm/package.nix index 0a53a2c523d3..c4f097a2de66 100644 --- a/pkgs/by-name/pd/pdm/package.nix +++ b/pkgs/by-name/pd/pdm/package.nix @@ -22,7 +22,7 @@ let # pdm requires ...... -> ghostscript-with-X which is AGPL only matplotlib = super.matplotlib.override ({ enableTk = false; }); # pdm requires ...... -> jbig2dec which is AGPL only - moto = super.moto.overridePythonAttrs (old: rec { + moto = super.moto.overridePythonAttrs (old: { doCheck = false; }); }; diff --git a/pkgs/by-name/po/polar/package.nix b/pkgs/by-name/po/polar/package.nix index f7f438dac991..80de9a3d17ca 100644 --- a/pkgs/by-name/po/polar/package.nix +++ b/pkgs/by-name/po/polar/package.nix @@ -19,7 +19,7 @@ let }; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "polar"; # The package has no releases so let's use the latest commit diff --git a/pkgs/by-name/pr/precice/package.nix b/pkgs/by-name/pr/precice/package.nix index d60bc8bac569..ac12dbdd38e6 100644 --- a/pkgs/by-name/pr/precice/package.nix +++ b/pkgs/by-name/pr/precice/package.nix @@ -12,7 +12,7 @@ pkg-config, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "precice"; version = "3.2.0-unstable-2025-05-23"; diff --git a/pkgs/by-name/pr/prowler/package.nix b/pkgs/by-name/pr/prowler/package.nix index 5c43eb8885b3..06138fe29724 100644 --- a/pkgs/by-name/pr/prowler/package.nix +++ b/pkgs/by-name/pr/prowler/package.nix @@ -9,7 +9,7 @@ let packageOverrides = self: super: { # Doesn't work with latest pydantic - py-ocsf-models = super.py-ocsf-models.overridePythonAttrs (oldAttrs: rec { + py-ocsf-models = super.py-ocsf-models.overridePythonAttrs (oldAttrs: { dependencies = [ python3.pkgs.pydantic_1 python3.pkgs.cryptography diff --git a/pkgs/by-name/pu/pulumi/extra/mk-pulumi-package.nix b/pkgs/by-name/pu/pulumi/extra/mk-pulumi-package.nix index bdbe5f79f81f..d6705b5932ed 100644 --- a/pkgs/by-name/pu/pulumi/extra/mk-pulumi-package.nix +++ b/pkgs/by-name/pu/pulumi/extra/mk-pulumi-package.nix @@ -135,7 +135,7 @@ let ; }; - pulumi-gen = mkBasePackage rec { + pulumi-gen = mkBasePackage { inherit src version diff --git a/pkgs/by-name/qi/qimgv/package.nix b/pkgs/by-name/qi/qimgv/package.nix index e4a2e453456f..6c6ac5feaac6 100644 --- a/pkgs/by-name/qi/qimgv/package.nix +++ b/pkgs/by-name/qi/qimgv/package.nix @@ -10,7 +10,7 @@ opencv4, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "qimgv"; version = "1.0.3-unstable-2024-10-11"; diff --git a/pkgs/by-name/re/reversal-icon-theme/package.nix b/pkgs/by-name/re/reversal-icon-theme/package.nix index e61a5d6a15e7..8e81f62658c9 100644 --- a/pkgs/by-name/re/reversal-icon-theme/package.nix +++ b/pkgs/by-name/re/reversal-icon-theme/package.nix @@ -31,7 +31,7 @@ lib.checkListOfEnum "${pname}: color variants" colorVariants stdenvNoCC.mkDerivation - rec { + { inherit pname; version = "0-unstable-2023-05-13"; diff --git a/pkgs/by-name/ro/roc/package.nix b/pkgs/by-name/ro/roc/package.nix index 1a5de4353e23..6bbac562f1d4 100755 --- a/pkgs/by-name/ro/roc/package.nix +++ b/pkgs/by-name/ro/roc/package.nix @@ -20,7 +20,7 @@ let rocVersion = "alpha4"; in -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage { pname = "roc"; version = "0-${rocVersion}"; diff --git a/pkgs/by-name/sa/samfirm-js/package.nix b/pkgs/by-name/sa/samfirm-js/package.nix index f1f460a04145..60aadeaf15b3 100644 --- a/pkgs/by-name/sa/samfirm-js/package.nix +++ b/pkgs/by-name/sa/samfirm-js/package.nix @@ -4,7 +4,7 @@ fetchFromGitHub, }: -buildNpmPackage rec { +buildNpmPackage { pname = "samfirm-js"; version = "0.3.0-unstable-2023-12-27"; diff --git a/pkgs/by-name/sh/shadowsocks-v2ray-plugin/package.nix b/pkgs/by-name/sh/shadowsocks-v2ray-plugin/package.nix index 0db84caedc3d..616f1208bf54 100644 --- a/pkgs/by-name/sh/shadowsocks-v2ray-plugin/package.nix +++ b/pkgs/by-name/sh/shadowsocks-v2ray-plugin/package.nix @@ -4,7 +4,7 @@ fetchFromGitHub, }: -buildGoModule rec { +buildGoModule { pname = "shadowsocks-v2ray-plugin"; version = "1.3.2-unstable-2025-09-05"; diff --git a/pkgs/by-name/so/soapyuhd/package.nix b/pkgs/by-name/so/soapyuhd/package.nix index c3f57dc02081..fba5ed77970d 100644 --- a/pkgs/by-name/so/soapyuhd/package.nix +++ b/pkgs/by-name/so/soapyuhd/package.nix @@ -9,7 +9,7 @@ soapysdr, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "soapyuhd"; version = "0.4.1-unstable-2025-02-13"; diff --git a/pkgs/by-name/ta/tamgamp-lv2/package.nix b/pkgs/by-name/ta/tamgamp-lv2/package.nix index 2f32a41460f4..b0e503db8fba 100644 --- a/pkgs/by-name/ta/tamgamp-lv2/package.nix +++ b/pkgs/by-name/ta/tamgamp-lv2/package.nix @@ -7,7 +7,7 @@ zita-resampler, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "tamgamp.lv2"; version = "unstable-2020-06-14"; diff --git a/pkgs/by-name/te/teleport_16/package.nix b/pkgs/by-name/te/teleport_16/package.nix index 0d8fdc114401..cfd330a470b2 100644 --- a/pkgs/by-name/te/teleport_16/package.nix +++ b/pkgs/by-name/te/teleport_16/package.nix @@ -5,7 +5,7 @@ withRdpClient ? true, extPatches ? [ ], }: -buildTeleport rec { +buildTeleport { version = "16.5.15"; hash = "sha256-DqNG6gl+KdjSbkE9Bwum8az8cLCSOmZwo9xpuWafHCA="; vendorHash = "sha256-sZvRKLF2iZ3UpgGNUPuWMT7VTpnDa2uU0d1XjDKSmdo="; diff --git a/pkgs/by-name/te/teleport_17/package.nix b/pkgs/by-name/te/teleport_17/package.nix index 3213a864918b..7aa71820e439 100644 --- a/pkgs/by-name/te/teleport_17/package.nix +++ b/pkgs/by-name/te/teleport_17/package.nix @@ -6,7 +6,7 @@ extPatches ? [ ], }: -buildTeleport rec { +buildTeleport { version = "17.7.3"; hash = "sha256-YSYkJRAeu7iPOs/gFnozZbks0Fx5srNH0VjrKvFmHZo="; vendorHash = "sha256-7Rb94ERtp3H1Jwyh9d7AFT06d4xXdnfe5tpdvJQrbUQ="; diff --git a/pkgs/by-name/te/teleport_18/package.nix b/pkgs/by-name/te/teleport_18/package.nix index 96081e9578d7..7585fde5f5b0 100644 --- a/pkgs/by-name/te/teleport_18/package.nix +++ b/pkgs/by-name/te/teleport_18/package.nix @@ -6,7 +6,7 @@ extPatches ? [ ], }: -buildTeleport rec { +buildTeleport { version = "18.2.0"; hash = "sha256-JWgGRv9pK76u7IxwqnBcuAI93XIKfIVvme7l+a/3J7c="; vendorHash = "sha256-oPi/rIuwze2ZlyHfZ2MdDHHvdIaF2IZ2aklEVNRgoLo="; diff --git a/pkgs/by-name/un/unwaf/package.nix b/pkgs/by-name/un/unwaf/package.nix index c377aba3d45b..80e0a5867b05 100644 --- a/pkgs/by-name/un/unwaf/package.nix +++ b/pkgs/by-name/un/unwaf/package.nix @@ -4,7 +4,7 @@ fetchFromGitHub, }: -buildGoModule rec { +buildGoModule { pname = "unwaf"; version = "0-unstable-2025-07-04"; diff --git a/pkgs/by-name/uu/uudeview/package.nix b/pkgs/by-name/uu/uudeview/package.nix index 211a70b7ff11..d14e02a8eb4a 100644 --- a/pkgs/by-name/uu/uudeview/package.nix +++ b/pkgs/by-name/uu/uudeview/package.nix @@ -7,7 +7,7 @@ autoreconfHook, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "uudeview"; version = "0.5.20-unstable-2025-03-20"; diff --git a/pkgs/by-name/wm/wmutils-opt/package.nix b/pkgs/by-name/wm/wmutils-opt/package.nix index c5eb09c8e4c0..1894af702624 100644 --- a/pkgs/by-name/wm/wmutils-opt/package.nix +++ b/pkgs/by-name/wm/wmutils-opt/package.nix @@ -6,7 +6,7 @@ xorg, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "wmutils-opt"; version = "1.0-unstable-2024-09-09"; diff --git a/pkgs/by-name/x1/x11docker/package.nix b/pkgs/by-name/x1/x11docker/package.nix index 0c151a8f05c7..cbd6ac36c245 100644 --- a/pkgs/by-name/x1/x11docker/package.nix +++ b/pkgs/by-name/x1/x11docker/package.nix @@ -20,7 +20,7 @@ weston, xwayland, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "x11docker"; version = "7.6.0-unstable-2024-04-04"; src = fetchFromGitHub { diff --git a/pkgs/by-name/xo/xow_dongle-firmware/package.nix b/pkgs/by-name/xo/xow_dongle-firmware/package.nix index b077ae814b87..aae11e3ba621 100644 --- a/pkgs/by-name/xo/xow_dongle-firmware/package.nix +++ b/pkgs/by-name/xo/xow_dongle-firmware/package.nix @@ -4,7 +4,7 @@ fetchurl, cabextract, }: -stdenvNoCC.mkDerivation rec { +stdenvNoCC.mkDerivation { pname = "xow_dongle-firmware"; version = "0-unstable-2025-04-22"; diff --git a/pkgs/by-name/ze/zenmap/package.nix b/pkgs/by-name/ze/zenmap/package.nix index 702ec89a866f..4167ae948408 100644 --- a/pkgs/by-name/ze/zenmap/package.nix +++ b/pkgs/by-name/ze/zenmap/package.nix @@ -8,7 +8,7 @@ xterm, }: -python3Packages.buildPythonApplication rec { +python3Packages.buildPythonApplication { pname = "zenmap"; version = nmap.version; pyproject = true; diff --git a/pkgs/data/themes/qogir-kde/default.nix b/pkgs/data/themes/qogir-kde/default.nix index 2819e8a16bf7..51779fb4346e 100644 --- a/pkgs/data/themes/qogir-kde/default.nix +++ b/pkgs/data/themes/qogir-kde/default.nix @@ -26,7 +26,7 @@ # ]; # }; -stdenvNoCC.mkDerivation rec { +stdenvNoCC.mkDerivation { pname = "qogir-kde"; version = "0-unstable-2024-12-21"; diff --git a/pkgs/desktops/pantheon/desktop/elementary-session-settings/default.nix b/pkgs/desktops/pantheon/desktop/elementary-session-settings/default.nix index b62d9af7ccc1..ebc521c3b292 100644 --- a/pkgs/desktops/pantheon/desktop/elementary-session-settings/default.nix +++ b/pkgs/desktops/pantheon/desktop/elementary-session-settings/default.nix @@ -19,7 +19,7 @@ meson, ninja, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "elementary-session-settings"; # Allow disabling x11 session # nixpkgs-update: no auto update diff --git a/pkgs/development/compilers/gcc/ng/common/default.nix b/pkgs/development/compilers/gcc/ng/common/default.nix index 3f2e3b3b189d..ecb075894476 100644 --- a/pkgs/development/compilers/gcc/ng/common/default.nix +++ b/pkgs/development/compilers/gcc/ng/common/default.nix @@ -119,7 +119,7 @@ makeScopeWithSplicing' { langFortran = true; }; - gfortran = wrapCCWith rec { + gfortran = wrapCCWith { cc = gccPackages.gfortran-unwrapped; libcxx = targetGccPackages.libstdcxx; bintools = binutils; @@ -134,7 +134,7 @@ makeScopeWithSplicing' { ]; }; - gfortranNoLibgfortran = wrapCCWith rec { + gfortranNoLibgfortran = wrapCCWith { cc = gccPackages.gfortran-unwrapped; libcxx = targetGccPackages.libstdcxx; bintools = binutils; @@ -148,7 +148,7 @@ makeScopeWithSplicing' { ]; }; - gcc = wrapCCWith rec { + gcc = wrapCCWith { cc = gccPackages.gcc-unwrapped; libcxx = targetGccPackages.libstdcxx; bintools = binutils; @@ -162,7 +162,7 @@ makeScopeWithSplicing' { ]; }; - gccNoLibgcc = wrapCCWith rec { + gccNoLibgcc = wrapCCWith { cc = gccPackages.gcc-unwrapped; libcxx = null; bintools = binutilsNoLibc; @@ -176,7 +176,7 @@ makeScopeWithSplicing' { stdenv = overrideCC stdenv buildGccPackages.gccNoLibgcc; }; - gccWithLibc = wrapCCWith rec { + gccWithLibc = wrapCCWith { cc = gccPackages.gcc-unwrapped; libcxx = null; bintools = binutils; @@ -192,7 +192,7 @@ makeScopeWithSplicing' { stdenv = overrideCC stdenv buildGccPackages.gccWithLibc; }; - gccWithLibssp = wrapCCWith rec { + gccWithLibssp = wrapCCWith { cc = gccPackages.gcc-unwrapped; libcxx = null; bintools = binutils; @@ -209,7 +209,7 @@ makeScopeWithSplicing' { stdenv = overrideCC stdenv buildGccPackages.gccWithLibssp; }; - gccWithLibatomic = wrapCCWith rec { + gccWithLibatomic = wrapCCWith { cc = gccPackages.gcc-unwrapped; libcxx = null; bintools = binutils; diff --git a/pkgs/development/compilers/ghc/9.0.2-binary.nix b/pkgs/development/compilers/ghc/9.0.2-binary.nix index e99a7fe331c8..aa29a7cc010b 100644 --- a/pkgs/development/compilers/ghc/9.0.2-binary.nix +++ b/pkgs/development/compilers/ghc/9.0.2-binary.nix @@ -516,7 +516,7 @@ stdenv.mkDerivation { hadrian = null; }; - meta = rec { + meta = { homepage = "http://haskell.org/ghc"; description = "Glasgow Haskell Compiler"; license = lib.licenses.bsd3; diff --git a/pkgs/development/compilers/ghc/9.10.3.nix b/pkgs/development/compilers/ghc/9.10.3.nix index aac558f47417..582c192d57b4 100644 --- a/pkgs/development/compilers/ghc/9.10.3.nix +++ b/pkgs/development/compilers/ghc/9.10.3.nix @@ -1,4 +1,4 @@ -import ./common-hadrian.nix rec { +import ./common-hadrian.nix { version = "9.10.3"; sha256 = "d266864b9e0b7b741abe8c9d6a790d7c01c21cf43a1419839119255878ebc59a"; } diff --git a/pkgs/development/compilers/ghc/9.12.2.nix b/pkgs/development/compilers/ghc/9.12.2.nix index abd792750dc1..40ca6681a391 100644 --- a/pkgs/development/compilers/ghc/9.12.2.nix +++ b/pkgs/development/compilers/ghc/9.12.2.nix @@ -1,4 +1,4 @@ -import ./common-hadrian.nix rec { +import ./common-hadrian.nix { version = "9.12.2"; sha256 = "0e49cd5dde43f348c5716e5de9a5d7a0f8d68d945dc41cf75dfdefe65084f933"; } diff --git a/pkgs/development/compilers/ghc/9.2.4-binary.nix b/pkgs/development/compilers/ghc/9.2.4-binary.nix index 2031babd4ebb..adb1afa5e74f 100644 --- a/pkgs/development/compilers/ghc/9.2.4-binary.nix +++ b/pkgs/development/compilers/ghc/9.2.4-binary.nix @@ -480,7 +480,7 @@ stdenv.mkDerivation { hadrian = null; }; - meta = rec { + meta = { homepage = "http://haskell.org/ghc"; description = "Glasgow Haskell Compiler"; license = lib.licenses.bsd3; diff --git a/pkgs/development/compilers/ghc/9.6.3-binary.nix b/pkgs/development/compilers/ghc/9.6.3-binary.nix index 814c188be2da..e2444aac54fa 100644 --- a/pkgs/development/compilers/ghc/9.6.3-binary.nix +++ b/pkgs/development/compilers/ghc/9.6.3-binary.nix @@ -454,7 +454,7 @@ stdenv.mkDerivation { hadrian = null; }; - meta = rec { + meta = { homepage = "http://haskell.org/ghc"; description = "Glasgow Haskell Compiler"; license = lib.licenses.bsd3; diff --git a/pkgs/development/compilers/ghc/9.8.4-binary.nix b/pkgs/development/compilers/ghc/9.8.4-binary.nix index 11422665a057..e281377503cd 100644 --- a/pkgs/development/compilers/ghc/9.8.4-binary.nix +++ b/pkgs/development/compilers/ghc/9.8.4-binary.nix @@ -469,7 +469,7 @@ stdenv.mkDerivation { hadrian = null; }; - meta = rec { + meta = { homepage = "http://haskell.org/ghc"; description = "Glasgow Haskell Compiler"; license = lib.licenses.bsd3; diff --git a/pkgs/development/libraries/prometheus-client-c/default.nix b/pkgs/development/libraries/prometheus-client-c/default.nix index a33e20b7bd5b..d76b47dbeee1 100644 --- a/pkgs/development/libraries/prometheus-client-c/default.nix +++ b/pkgs/development/libraries/prometheus-client-c/default.nix @@ -62,7 +62,7 @@ let }; }; in -rec { +{ libprom = build { pname = "libprom"; subdir = "prom"; diff --git a/pkgs/development/libraries/wlroots/default.nix b/pkgs/development/libraries/wlroots/default.nix index 2fb4711bdcdf..66cbe09dd1a2 100644 --- a/pkgs/development/libraries/wlroots/default.nix +++ b/pkgs/development/libraries/wlroots/default.nix @@ -145,7 +145,7 @@ let }); in -rec { +{ wlroots_0_17 = generic { version = "0.17.4"; hash = "sha256-AzmXf+HMX/6VAr0LpfHwfmDB9dRrrLQHt7l35K98MVo="; diff --git a/pkgs/development/ocaml-modules/augeas/default.nix b/pkgs/development/ocaml-modules/augeas/default.nix index a4c74815ce01..efa3d94ac956 100644 --- a/pkgs/development/ocaml-modules/augeas/default.nix +++ b/pkgs/development/ocaml-modules/augeas/default.nix @@ -12,7 +12,7 @@ lib, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "ocaml-augeas"; version = "0.6"; diff --git a/pkgs/development/ocaml-modules/cooltt/default.nix b/pkgs/development/ocaml-modules/cooltt/default.nix index 69647bb08aa8..d6d5f10c1f6b 100644 --- a/pkgs/development/ocaml-modules/cooltt/default.nix +++ b/pkgs/development/ocaml-modules/cooltt/default.nix @@ -43,7 +43,7 @@ let license = lib.licenses.asl20; }; }; - kado = buildDunePackage rec { + kado = buildDunePackage { pname = "kado"; version = "unstable-2023-10-03"; src = fetchFromGitHub { diff --git a/pkgs/development/ocaml-modules/flac/default.nix b/pkgs/development/ocaml-modules/flac/default.nix index 3ba28f702a47..f58eee2bed89 100644 --- a/pkgs/development/ocaml-modules/flac/default.nix +++ b/pkgs/development/ocaml-modules/flac/default.nix @@ -8,7 +8,7 @@ flac, }: -buildDunePackage rec { +buildDunePackage { pname = "flac"; inherit (ogg) version src; diff --git a/pkgs/development/python-modules/datalad-next/default.nix b/pkgs/development/python-modules/datalad-next/default.nix index c46762606788..8a063e55244a 100644 --- a/pkgs/development/python-modules/datalad-next/default.nix +++ b/pkgs/development/python-modules/datalad-next/default.nix @@ -23,7 +23,7 @@ writableTmpDirAsHomeHook, }: -buildPythonPackage rec { +buildPythonPackage { pname = "datalad-next"; version = "1.6.0-unstable-2025-07-04"; pyproject = true; diff --git a/pkgs/development/python-modules/dbt-common/default.nix b/pkgs/development/python-modules/dbt-common/default.nix index d0829b2c34f3..3f44d1da7e43 100644 --- a/pkgs/development/python-modules/dbt-common/default.nix +++ b/pkgs/development/python-modules/dbt-common/default.nix @@ -27,7 +27,7 @@ pytest-xdist, }: -buildPythonPackage rec { +buildPythonPackage { pname = "dbt-common"; version = "1.28.0-unstable-2025-08-14"; pyproject = true; diff --git a/pkgs/development/python-modules/devpi-ldap/default.nix b/pkgs/development/python-modules/devpi-ldap/default.nix index 5a6173b2263e..3112bc4fd52f 100644 --- a/pkgs/development/python-modules/devpi-ldap/default.nix +++ b/pkgs/development/python-modules/devpi-ldap/default.nix @@ -14,7 +14,7 @@ webtest, }: -buildPythonPackage rec { +buildPythonPackage { pname = "devpi-ldap"; version = "2.1.1-unstable-2023-11-28"; pyproject = true; diff --git a/pkgs/development/python-modules/libsupermesh/default.nix b/pkgs/development/python-modules/libsupermesh/default.nix index bed0e1607932..aeb349fbca7a 100644 --- a/pkgs/development/python-modules/libsupermesh/default.nix +++ b/pkgs/development/python-modules/libsupermesh/default.nix @@ -12,7 +12,7 @@ rtree, }: -buildPythonPackage rec { +buildPythonPackage { inherit (pkgs.libsupermesh) pname version diff --git a/pkgs/development/python-modules/manifold3d/default.nix b/pkgs/development/python-modules/manifold3d/default.nix index e4f95df9e637..7c0c181914a1 100644 --- a/pkgs/development/python-modules/manifold3d/default.nix +++ b/pkgs/development/python-modules/manifold3d/default.nix @@ -16,7 +16,7 @@ trimesh, }: -buildPythonPackage rec { +buildPythonPackage { pname = "manifold3d"; inherit (manifold) version src; pyproject = true; diff --git a/pkgs/development/python-modules/msrplib/default.nix b/pkgs/development/python-modules/msrplib/default.nix index 0ccdbdd1b87c..de8e1eca240f 100644 --- a/pkgs/development/python-modules/msrplib/default.nix +++ b/pkgs/development/python-modules/msrplib/default.nix @@ -6,7 +6,7 @@ unstableGitUpdater, }: -buildPythonPackage rec { +buildPythonPackage { pname = "msrplib"; version = "0.20.1-unstable-2021-06-01"; pyproject = true; diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix index dfca70d12f95..8012fe183223 100644 --- a/pkgs/development/python-modules/mypy-boto3/default.nix +++ b/pkgs/development/python-modules/mypy-boto3/default.nix @@ -44,7 +44,7 @@ let }; }; in -rec { +{ mypy-boto3-accessanalyzer = buildMypyBoto3Package "accessanalyzer" "1.40.0" "sha256-hY5aShO9E5zMwPSUUucjgG2Bod0lAm51BZyLP/1JLgY="; diff --git a/pkgs/development/python-modules/nampa/default.nix b/pkgs/development/python-modules/nampa/default.nix index e096ea945a00..b4738f5dd261 100644 --- a/pkgs/development/python-modules/nampa/default.nix +++ b/pkgs/development/python-modules/nampa/default.nix @@ -7,7 +7,7 @@ unstableGitUpdater, }: -buildPythonPackage rec { +buildPythonPackage { pname = "nampa"; version = "1.0-unstable-2024-12-18"; pyproject = true; diff --git a/pkgs/development/python-modules/py-libnuma/default.nix b/pkgs/development/python-modules/py-libnuma/default.nix index 21e2d05547e0..90310b81b4c3 100644 --- a/pkgs/development/python-modules/py-libnuma/default.nix +++ b/pkgs/development/python-modules/py-libnuma/default.nix @@ -8,7 +8,7 @@ numactl, }: -buildPythonPackage rec { +buildPythonPackage { pname = "py-libnuma"; version = "1.2"; pyproject = true; diff --git a/pkgs/development/python-modules/pyipv8/default.nix b/pkgs/development/python-modules/pyipv8/default.nix index 55e65a97679a..b9c4b2fc6b62 100644 --- a/pkgs/development/python-modules/pyipv8/default.nix +++ b/pkgs/development/python-modules/pyipv8/default.nix @@ -15,7 +15,7 @@ apispec, }: -buildPythonPackage rec { +buildPythonPackage { pname = "pyipv8"; version = "3.0.2197-unstable-2025-07-29"; format = "setuptools"; diff --git a/pkgs/development/python-modules/pyquerylist/default.nix b/pkgs/development/python-modules/pyquerylist/default.nix index 17560e05400f..af03588470e7 100644 --- a/pkgs/development/python-modules/pyquerylist/default.nix +++ b/pkgs/development/python-modules/pyquerylist/default.nix @@ -11,7 +11,7 @@ pytestCheckHook, fetchpatch, }: -buildPythonPackage rec { +buildPythonPackage { pname = "pyquerylist"; version = "0-unstable-2025-03-03"; pyproject = true; diff --git a/pkgs/development/python-modules/pysecretsocks/default.nix b/pkgs/development/python-modules/pysecretsocks/default.nix index 2e9a3283c525..ae70105c0048 100644 --- a/pkgs/development/python-modules/pysecretsocks/default.nix +++ b/pkgs/development/python-modules/pysecretsocks/default.nix @@ -6,7 +6,7 @@ pyasyncore, }: -buildPythonPackage rec { +buildPythonPackage { pname = "pysecretsocks"; version = "0.9.1-unstable-2023-11-04"; pyproject = true; diff --git a/pkgs/development/python-modules/pytest-icdiff/default.nix b/pkgs/development/python-modules/pytest-icdiff/default.nix index 6b0ba2adfd42..a4f98a9958f5 100644 --- a/pkgs/development/python-modules/pytest-icdiff/default.nix +++ b/pkgs/development/python-modules/pytest-icdiff/default.nix @@ -10,7 +10,7 @@ writableTmpDirAsHomeHook, }: -buildPythonPackage rec { +buildPythonPackage { pname = "pytest-icdiff"; version = "0.5-unstable-2024-09-04"; pyproject = true; diff --git a/pkgs/development/python-modules/python-coinmarketcap/default.nix b/pkgs/development/python-modules/python-coinmarketcap/default.nix index 9e64a9138d18..b0469d4175e3 100644 --- a/pkgs/development/python-modules/python-coinmarketcap/default.nix +++ b/pkgs/development/python-modules/python-coinmarketcap/default.nix @@ -7,7 +7,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage { pname = "python-coinmarketcap"; version = "0.6"; pyproject = true; diff --git a/pkgs/development/python-modules/python-sat/default.nix b/pkgs/development/python-modules/python-sat/default.nix index a64ab34d2cd1..8b6e8716a56b 100644 --- a/pkgs/development/python-modules/python-sat/default.nix +++ b/pkgs/development/python-modules/python-sat/default.nix @@ -6,7 +6,7 @@ pypblib, pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage { pname = "python-sat"; version = "0.1.8.dev20"; format = "setuptools"; diff --git a/pkgs/development/python-modules/pytorchviz/default.nix b/pkgs/development/python-modules/pytorchviz/default.nix index 445e2b9b425d..f5396a6899ce 100644 --- a/pkgs/development/python-modules/pytorchviz/default.nix +++ b/pkgs/development/python-modules/pytorchviz/default.nix @@ -9,7 +9,7 @@ unittestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage { pname = "pytorchviz"; version = "0.0.2-unstable-2024-12-30"; pyproject = true; diff --git a/pkgs/development/python-modules/root/default.nix b/pkgs/development/python-modules/root/default.nix index 15837bfee25f..8dbfd4295ed5 100644 --- a/pkgs/development/python-modules/root/default.nix +++ b/pkgs/development/python-modules/root/default.nix @@ -7,7 +7,7 @@ let unwrapped = root.override { python3 = python; }; in -buildPythonPackage rec { +buildPythonPackage { # ROOT builds the C++ libraries and CPython extensions in one package and # python versions must never be mixed passthru = { diff --git a/pkgs/development/python-modules/sss/default.nix b/pkgs/development/python-modules/sss/default.nix index 71241e26cf74..69055cb1d1e2 100644 --- a/pkgs/development/python-modules/sss/default.nix +++ b/pkgs/development/python-modules/sss/default.nix @@ -13,7 +13,7 @@ let python3 = python; }; in -buildPythonPackage rec { +buildPythonPackage { pname = "sss"; inherit (sssdForPython) version; diff --git a/pkgs/development/python-modules/tensorrt/default.nix b/pkgs/development/python-modules/tensorrt/default.nix index 12f07753be8a..e884b769aa99 100644 --- a/pkgs/development/python-modules/tensorrt/default.nix +++ b/pkgs/development/python-modules/tensorrt/default.nix @@ -12,7 +12,7 @@ let pyVersion = "${lib.versions.major python.version}${lib.versions.minor python.version}"; buildVersion = lib.optionalString (cudaPackages ? tensorrt) cudaPackages.tensorrt.version; in -buildPythonPackage rec { +buildPythonPackage { pname = "tensorrt"; version = buildVersion; diff --git a/pkgs/development/python-modules/xcaplib/default.nix b/pkgs/development/python-modules/xcaplib/default.nix index d046f8500bd8..33f7607b6a3b 100644 --- a/pkgs/development/python-modules/xcaplib/default.nix +++ b/pkgs/development/python-modules/xcaplib/default.nix @@ -9,7 +9,7 @@ unstableGitUpdater, }: -buildPythonPackage rec { +buildPythonPackage { pname = "xcaplib"; # latest commit is needed for python 3.13 compat. version = "2.0.1-unstable-2025-03-20"; diff --git a/pkgs/development/tools/analysis/sparse/default.nix b/pkgs/development/tools/analysis/sparse/default.nix index 6f5e331b3c29..86718b6ee95f 100644 --- a/pkgs/development/tools/analysis/sparse/default.nix +++ b/pkgs/development/tools/analysis/sparse/default.nix @@ -14,7 +14,7 @@ let GCC_BASE = "${stdenv.cc.cc}/lib/gcc/${stdenv.hostPlatform.uname.processor}-unknown-linux-gnu/${stdenv.cc.cc.version}"; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "sparse"; version = "0.6.4-unstable-2024-02-03"; diff --git a/pkgs/development/tools/misc/creduce/default.nix b/pkgs/development/tools/misc/creduce/default.nix index 1984e22780c6..3061968e2b71 100644 --- a/pkgs/development/tools/misc/creduce/default.nix +++ b/pkgs/development/tools/misc/creduce/default.nix @@ -12,7 +12,7 @@ util-linux, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "creduce"; version = "2.10.0-unstable-2024-06-01"; diff --git a/pkgs/development/tools/replay-io/default.nix b/pkgs/development/tools/replay-io/default.nix index ab15c278ddcc..029b0b9e003b 100644 --- a/pkgs/development/tools/replay-io/default.nix +++ b/pkgs/development/tools/replay-io/default.nix @@ -50,7 +50,7 @@ rec { }; }; - replay-io = stdenv.mkDerivation rec { + replay-io = stdenv.mkDerivation { pname = "replay-io"; version = builtins.head (builtins.match ".*/linux-gecko-(.*).tar.bz2" metadata.replay.url); srcs = fetchurl metadata.replay; @@ -96,7 +96,7 @@ rec { }; }; - replay-node = stdenv.mkDerivation rec { + replay-node = stdenv.mkDerivation { pname = "replay-node"; version = builtins.head (builtins.match ".*/linux-node-(.*)" metadata.replay-node.url); nativeBuildInputs = [ diff --git a/pkgs/games/flightgear/openscenegraph-flightgear.nix b/pkgs/games/flightgear/openscenegraph-flightgear.nix index a1440f4dd253..a78f6b887359 100644 --- a/pkgs/games/flightgear/openscenegraph-flightgear.nix +++ b/pkgs/games/flightgear/openscenegraph-flightgear.nix @@ -25,7 +25,7 @@ libXrandr, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "openscenegraph"; version = "2024-build"; diff --git a/pkgs/misc/cups/drivers/brother/dcp375cw/default.nix b/pkgs/misc/cups/drivers/brother/dcp375cw/default.nix index 57cfd2ef45fa..05e1c20a722a 100644 --- a/pkgs/misc/cups/drivers/brother/dcp375cw/default.nix +++ b/pkgs/misc/cups/drivers/brother/dcp375cw/default.nix @@ -19,7 +19,7 @@ let version = "1.1.3"; model = "dcp375cw"; in -rec { +{ driver = stdenv.mkDerivation { pname = "${model}-lpr"; inherit version; diff --git a/pkgs/misc/cups/drivers/brother/dcp9020cdw/default.nix b/pkgs/misc/cups/drivers/brother/dcp9020cdw/default.nix index 1a1e5988f007..7cf4e1017314 100644 --- a/pkgs/misc/cups/drivers/brother/dcp9020cdw/default.nix +++ b/pkgs/misc/cups/drivers/brother/dcp9020cdw/default.nix @@ -19,7 +19,7 @@ let version = "1.1.2"; model = "dcp9020cdw"; in -rec { +{ driver = stdenv.mkDerivation { pname = "${model}-lpr"; inherit version; diff --git a/pkgs/misc/tmux-plugins/default.nix b/pkgs/misc/tmux-plugins/default.nix index 2d006c33d0de..7536614cbf82 100644 --- a/pkgs/misc/tmux-plugins/default.nix +++ b/pkgs/misc/tmux-plugins/default.nix @@ -421,7 +421,7 @@ in }; }; - kanagawa = mkTmuxPlugin rec { + kanagawa = mkTmuxPlugin { pluginName = "kanagawa"; version = "0-unstable-2025-02-10"; src = fetchFromGitHub { @@ -478,7 +478,7 @@ in }; }; - mode-indicator = mkTmuxPlugin rec { + mode-indicator = mkTmuxPlugin { pluginName = "mode-indicator"; version = "unstable-2021-10-01"; src = fetchFromGitHub { diff --git a/pkgs/os-specific/linux/digimend/default.nix b/pkgs/os-specific/linux/digimend/default.nix index f3a00333a751..839f524fd526 100644 --- a/pkgs/os-specific/linux/digimend/default.nix +++ b/pkgs/os-specific/linux/digimend/default.nix @@ -6,7 +6,7 @@ kernelModuleMakeFlags, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "digimend"; version = "13-unstable-2025-01-02"; diff --git a/pkgs/servers/home-assistant/custom-components/luxer_one/package.nix b/pkgs/servers/home-assistant/custom-components/luxer_one/package.nix index efda15717365..f36f2283c505 100644 --- a/pkgs/servers/home-assistant/custom-components/luxer_one/package.nix +++ b/pkgs/servers/home-assistant/custom-components/luxer_one/package.nix @@ -5,7 +5,7 @@ ruff, }: -buildHomeAssistantComponent rec { +buildHomeAssistantComponent { owner = "tjhorner"; domain = "luxer"; version = "0-unstable-2023-03-27"; diff --git a/pkgs/test/vim/default.nix b/pkgs/test/vim/default.nix index eb76745d038e..2606f7d92b63 100644 --- a/pkgs/test/vim/default.nix +++ b/pkgs/test/vim/default.nix @@ -10,7 +10,7 @@ let packages.myVimPackage.start = with vimPlugins; [ vim-nix ]; in -pkgs.recurseIntoAttrs (rec { +pkgs.recurseIntoAttrs ({ vim_empty_config = vimUtils.vimrcFile { beforePlugins = ""; customRC = ""; diff --git a/pkgs/tools/typesetting/tex/texlive/bin.nix b/pkgs/tools/typesetting/tex/texlive/bin.nix index fe2e8ed03c51..f7d4a1b408a9 100644 --- a/pkgs/tools/typesetting/tex/texlive/bin.nix +++ b/pkgs/tools/typesetting/tex/texlive/bin.nix @@ -540,7 +540,7 @@ rec { # https://github.com/gucci-on-fleek/context-packaging context_packaging_release = "2025-06-12-14-21-B"; in - stdenv.mkDerivation rec { + stdenv.mkDerivation { pname = "luametatex"; version = "2.11.07"; diff --git a/pkgs/top-level/lua-packages.nix b/pkgs/top-level/lua-packages.nix index 477e51215339..c9f0b72cd552 100644 --- a/pkgs/top-level/lua-packages.nix +++ b/pkgs/top-level/lua-packages.nix @@ -118,7 +118,7 @@ rec { linux-pam, openpam, }: - buildLuaPackage rec { + buildLuaPackage { pname = "lua-pam"; version = "unstable-2015-07-03";