From e1d9ca4f0799172a84db709ed2ab2401aa60632c Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Thu, 4 Jan 2024 21:17:10 +0100 Subject: [PATCH 1/8] abcde: Fix evaluation Was broken in 9fddd791c6a5aab0386eb789521495d0732dc4b4 but not caught due to https://github.com/NixOS/nixpkgs/pull/271123#discussion_r1442134594 --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 75130bb4d03c8..d2a0095f6243a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -30292,7 +30292,7 @@ with pkgs; aaxtomp3 = callPackage ../applications/audio/aaxtomp3 { }; abcde = callPackage ../applications/audio/abcde { - inherit (python3Packages) eyeD3; + inherit (python3Packages) eyed3; }; abiword = callPackage ../applications/office/abiword { }; From 1797094f8b929f12ada2e57772d32151ee7cf843 Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Thu, 4 Jan 2024 21:23:21 +0100 Subject: [PATCH 2/8] pythonPackages.dnf-plugins-core: Fix eval with allowAliases false This was not caught when the package was introduced because of https://github.com/NixOS/nixpkgs/pull/271123#discussion_r1442134594 --- pkgs/development/python-modules/dnf-plugins-core/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dnf-plugins-core/default.nix b/pkgs/development/python-modules/dnf-plugins-core/default.nix index 2c27dfe5fa01f..54b170f37812c 100644 --- a/pkgs/development/python-modules/dnf-plugins-core/default.nix +++ b/pkgs/development/python-modules/dnf-plugins-core/default.nix @@ -4,7 +4,7 @@ # dependencies , cmake -, dateutil +, python-dateutil , dbus-python , dnf4 , gettext @@ -54,7 +54,7 @@ buildPythonPackage rec { ]; propagatedBuildInputs = [ - dateutil + python-dateutil dbus-python dnf4.py libcomps From 199a63aa10609022f44491af56c6e95643425636 Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Thu, 4 Jan 2024 21:33:59 +0100 Subject: [PATCH 3/8] mate.mate-user-share: Fix evaluation with allowAliases false Was broken by feb114f7f0f01295a99c108ed2d97cd0d152f41a And not caught due to https://github.com/NixOS/nixpkgs/pull/271123#discussion_r1442134594 --- pkgs/desktops/mate/mate-user-share/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/mate/mate-user-share/default.nix b/pkgs/desktops/mate/mate-user-share/default.nix index 8dc35d7046694..84204e3e34be7 100644 --- a/pkgs/desktops/mate/mate-user-share/default.nix +++ b/pkgs/desktops/mate/mate-user-share/default.nix @@ -9,14 +9,16 @@ , libnotify , libxml2 , libcanberra-gtk3 -, mod_dnssd -, apacheHttpd +, apacheHttpdPackages , hicolor-icon-theme , mate , wrapGAppsHook , mateUpdateScript }: +let + inherit (apacheHttpdPackages) apacheHttpd mod_dnssd; +in stdenv.mkDerivation rec { pname = "mate-user-share"; version = "1.26.0"; From 046d653f7e5ccb746a3133f1d3aca58156827533 Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Thu, 4 Jan 2024 21:35:12 +0100 Subject: [PATCH 4/8] pythonPackages.sqlalchemy_1_4: Fix evaluation with allowAliases false Was broken since 7dd34690ec816fe50624466e1c59ce32c2a43b8a but not caught due to https://github.com/NixOS/nixpkgs/pull/271123#discussion_r1442134594 --- pkgs/development/python-modules/sqlalchemy/1_4.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sqlalchemy/1_4.nix b/pkgs/development/python-modules/sqlalchemy/1_4.nix index 4efdee5927cc6..4deeb396bd0ca 100644 --- a/pkgs/development/python-modules/sqlalchemy/1_4.nix +++ b/pkgs/development/python-modules/sqlalchemy/1_4.nix @@ -13,7 +13,7 @@ , aiosqlite , asyncmy , asyncpg -, cx_oracle +, cx-oracle , mariadb , mypy , mysql-connector @@ -79,7 +79,7 @@ buildPythonPackage rec { mariadb ]; oracle = [ - cx_oracle + cx-oracle ]; postgresql = [ psycopg2 From 69460711750d4bb4718516fdb155145e922ff610 Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Thu, 4 Jan 2024 21:39:07 +0100 Subject: [PATCH 5/8] tests.checkpoint-build: Fix evaluation with allowAliases false Was broken since introduced, but not caught due to https://github.com/NixOS/nixpkgs/pull/271123#discussion_r1442134594 --- pkgs/test/checkpointBuild/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/test/checkpointBuild/default.nix b/pkgs/test/checkpointBuild/default.nix index 4a59760230a6e..cdcb022086bad 100644 --- a/pkgs/test/checkpointBuild/default.nix +++ b/pkgs/test/checkpointBuild/default.nix @@ -1,9 +1,9 @@ -{ hello, checkpointBuildTools, runCommandNoCC, texinfo, stdenv, rsync }: +{ hello, checkpointBuildTools, runCommand, texinfo, stdenv, rsync }: let baseHelloArtifacts = checkpointBuildTools.prepareCheckpointBuild hello; patchedHello = hello.overrideAttrs (old: { buildInputs = [ texinfo ]; - src = runCommandNoCC "patch-hello-src" { } '' + src = runCommand "patch-hello-src" { } '' mkdir -p $out cd $out tar xf ${hello.src} --strip-components=1 @@ -24,7 +24,7 @@ let patches = [ ./hello-additionalFile.patch ]; })); - preparedHelloRemoveFileSrc = runCommandNoCC "patch-hello-src" { } '' + preparedHelloRemoveFileSrc = runCommand "patch-hello-src" { } '' mkdir -p $out cd $out tar xf ${hello.src} --strip-components=1 @@ -33,7 +33,7 @@ let patchedHelloRemoveFile = hello.overrideAttrs (old: { buildInputs = [ texinfo ]; - src = runCommandNoCC "patch-hello-src" { } '' + src = runCommand "patch-hello-src" { } '' mkdir -p $out cd $out ${rsync}/bin/rsync -cutU --chown=$USER:$USER --chmod=+w -r ${preparedHelloRemoveFileSrc}/* . From 9be716fb75bc10db65584a18635243d8d5ad784e Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Fri, 5 Jan 2024 02:53:01 +0100 Subject: [PATCH 6/8] cudaPackages.autoAddCudaCompatRunpathHook: Fix eval w/o cuda_compat --- pkgs/development/cuda-modules/setup-hooks/extension.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/cuda-modules/setup-hooks/extension.nix b/pkgs/development/cuda-modules/setup-hooks/extension.nix index 930730ce6c06b..10f126bc12fbf 100644 --- a/pkgs/development/cuda-modules/setup-hooks/extension.nix +++ b/pkgs/development/cuda-modules/setup-hooks/extension.nix @@ -53,7 +53,7 @@ final: _: { autoAddCudaCompatRunpathHook = final.callPackage ( - {makeSetupHook, cuda_compat}: + {makeSetupHook, cuda_compat ? throw "autoAddCudaCompatRunpathHook: No cuda_compat for CUDA ${final.cudaMajorMinorVersion}" }: makeSetupHook { name = "auto-add-cuda-compat-runpath-hook"; From 3e929146cf01b532ec68a2f73af22271effdc75d Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Sun, 7 Jan 2024 23:18:05 +0100 Subject: [PATCH 7/8] pythonPackages.snakemake-interface-common: Fix eval with allowAliases false Was broken since initialised in 9b2d4d2faa875d91f76d77a9193ff7a840f263e7 but not noticed due to https://github.com/NixOS/nixpkgs/pull/271123#discussion_r1442134594 --- .../python-modules/snakemake-interface-common/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/snakemake-interface-common/default.nix b/pkgs/development/python-modules/snakemake-interface-common/default.nix index d8a326112c33d..bccad271d4a1c 100644 --- a/pkgs/development/python-modules/snakemake-interface-common/default.nix +++ b/pkgs/development/python-modules/snakemake-interface-common/default.nix @@ -3,7 +3,7 @@ , fetchFromGitHub , poetry-core , argparse-dataclass -, ConfigArgParse +, configargparse }: buildPythonPackage rec { @@ -24,7 +24,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ argparse-dataclass - ConfigArgParse + configargparse ]; pythonImportsCheck = [ "snakemake_interface_common" ]; From 56df668386ac83c5bcddf9849c645cf0d25706d7 Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Thu, 4 Jan 2024 21:44:50 +0100 Subject: [PATCH 8/8] lib.callPackageWith: Use abort, not throw This reverts f8ea911f7c4e44b167d4b1b51f6d00ebd93e1ed1, see also https://github.com/NixOS/nixpkgs/pull/271123#discussion_r1442134594 --- lib/customisation.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/lib/customisation.nix b/lib/customisation.nix index c233744e07cad..0b5cad71fddf4 100644 --- a/lib/customisation.nix +++ b/lib/customisation.nix @@ -203,7 +203,11 @@ rec { in if missingArgs == {} then makeOverridable f allArgs - else throw "lib.customisation.callPackageWith: ${error}"; + # This needs to be an abort so it can't be caught with `builtins.tryEval`, + # which is used by nix-env and ofborg to filter out packages that don't evaluate. + # This way we're forced to fix such errors in Nixpkgs, + # which is especially relevant with allowAliases = false + else abort "lib.customisation.callPackageWith: ${error}"; /* Like callPackage, but for a function that returns an attribute