Unverified Commit 0ed96eed authored by Silvan Mosberger's avatar Silvan Mosberger Committed by GitHub
Browse files

Merge pull request #278777 from tweag/fix-evals 

`lib.callPackageWith`: Use abort again instead of throw and fix evaluation errors caused by it
parents 61402f77 56df6683

lib/customisation.nix

+5 −1
Original line number Diff line number Diff line
@@ -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

pkgs/desktops/mate/mate-user-share/default.nix

+4 −2
Original line number Diff line number Diff line
@@ -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";

pkgs/development/cuda-modules/setup-hooks/extension.nix

+1 −1
Original line number Diff line number Diff line
@@ -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";

pkgs/development/python-modules/dnf-plugins-core/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -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

pkgs/development/python-modules/snakemake-interface-common/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -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" ];