diff options
author | Silvan Mosberger <contact@infinisil.com> | 2024-01-08 03:50:58 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-01-08 03:50:58 +0100 |
commit | 0ed96eed101462bf05e1e99e1bbadcd49b4eb302 (patch) | |
tree | 5d957097e1930f3d67348cd310ec0a3ad12d6c46 | |
parent | 61402f77f693f5b1091bb8807e0a6be1a5b65997 (diff) | |
parent | 56df668386ac83c5bcddf9849c645cf0d25706d7 (diff) | |
download | nixlib-0ed96eed101462bf05e1e99e1bbadcd49b4eb302.tar nixlib-0ed96eed101462bf05e1e99e1bbadcd49b4eb302.tar.gz nixlib-0ed96eed101462bf05e1e99e1bbadcd49b4eb302.tar.bz2 nixlib-0ed96eed101462bf05e1e99e1bbadcd49b4eb302.tar.lz nixlib-0ed96eed101462bf05e1e99e1bbadcd49b4eb302.tar.xz nixlib-0ed96eed101462bf05e1e99e1bbadcd49b4eb302.tar.zst nixlib-0ed96eed101462bf05e1e99e1bbadcd49b4eb302.zip |
Merge pull request #278777 from tweag/fix-evals
`lib.callPackageWith`: Use abort again instead of throw and fix evaluation errors caused by it
-rw-r--r-- | lib/customisation.nix | 6 | ||||
-rw-r--r-- | pkgs/desktops/mate/mate-user-share/default.nix | 6 | ||||
-rw-r--r-- | pkgs/development/cuda-modules/setup-hooks/extension.nix | 2 | ||||
-rw-r--r-- | pkgs/development/python-modules/dnf-plugins-core/default.nix | 4 | ||||
-rw-r--r-- | pkgs/development/python-modules/snakemake-interface-common/default.nix | 4 | ||||
-rw-r--r-- | pkgs/development/python-modules/sqlalchemy/1_4.nix | 4 | ||||
-rw-r--r-- | pkgs/test/checkpointBuild/default.nix | 8 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
8 files changed, 21 insertions, 15 deletions
diff --git a/lib/customisation.nix b/lib/customisation.nix index c233744e07ca..0b5cad71fddf 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 diff --git a/pkgs/desktops/mate/mate-user-share/default.nix b/pkgs/desktops/mate/mate-user-share/default.nix index 8dc35d704669..84204e3e34be 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"; diff --git a/pkgs/development/cuda-modules/setup-hooks/extension.nix b/pkgs/development/cuda-modules/setup-hooks/extension.nix index 930730ce6c06..10f126bc12fb 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"; diff --git a/pkgs/development/python-modules/dnf-plugins-core/default.nix b/pkgs/development/python-modules/dnf-plugins-core/default.nix index 2c27dfe5fa01..54b170f37812 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 diff --git a/pkgs/development/python-modules/snakemake-interface-common/default.nix b/pkgs/development/python-modules/snakemake-interface-common/default.nix index d8a326112c33..bccad271d4a1 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" ]; diff --git a/pkgs/development/python-modules/sqlalchemy/1_4.nix b/pkgs/development/python-modules/sqlalchemy/1_4.nix index 4efdee5927cc..4deeb396bd0c 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 diff --git a/pkgs/test/checkpointBuild/default.nix b/pkgs/test/checkpointBuild/default.nix index 4a59760230a6..cdcb022086ba 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}/* . diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 75130bb4d03c..d2a0095f6243 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 { }; |