diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2017-12-06 00:06:43 +0100 |
|---|---|---|
| committer | Graham Christensen <graham@grahamc.com> | 2017-12-12 18:08:10 -0500 |
| commit | 3a110ea3f96db56012f7f2707e842593a7d7c5b8 (patch) | |
| tree | 727bb87c20c860814a494875af0b874d3b977bbb /pkgs/misc | |
| parent | 76bf375a162d81d49b274eb07d6a33a74fe8850f (diff) | |
| download | nixlib-3a110ea3f96db56012f7f2707e842593a7d7c5b8.tar nixlib-3a110ea3f96db56012f7f2707e842593a7d7c5b8.tar.gz nixlib-3a110ea3f96db56012f7f2707e842593a7d7c5b8.tar.bz2 nixlib-3a110ea3f96db56012f7f2707e842593a7d7c5b8.tar.lz nixlib-3a110ea3f96db56012f7f2707e842593a7d7c5b8.tar.xz nixlib-3a110ea3f96db56012f7f2707e842593a7d7c5b8.tar.zst nixlib-3a110ea3f96db56012f7f2707e842593a7d7c5b8.zip | |
treewide platform checks: `abort` -> `throw`
They aren't meant to be critical (uncatchable) errors. Tested with nix-env + checkMeta: [ "x86_64-linux" "i686-linux" "x86_64-darwin" "aarch64-linux" ]
Diffstat (limited to 'pkgs/misc')
| -rw-r--r-- | pkgs/misc/cups/drivers/cnijfilter_4_00/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/misc/cups/drivers/kyocera/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/misc/drivers/sundtek/default.nix | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/misc/cups/drivers/cnijfilter_4_00/default.nix b/pkgs/misc/cups/drivers/cnijfilter_4_00/default.nix index 2856aee4a5d2..b83e84154bbe 100644 --- a/pkgs/misc/cups/drivers/cnijfilter_4_00/default.nix +++ b/pkgs/misc/cups/drivers/cnijfilter_4_00/default.nix @@ -9,7 +9,7 @@ let arch = if stdenv.system == "x86_64-linux" then "64" else if stdenv.system == "i686-linux" then "32" - else abort "Unsupported architecture"; + else throw "Unsupported system ${stdenv.system}"; in stdenv.mkDerivation rec { name = "cnijfilter-${version}"; diff --git a/pkgs/misc/cups/drivers/kyocera/default.nix b/pkgs/misc/cups/drivers/kyocera/default.nix index be9d4f837092..17e5b37ed440 100644 --- a/pkgs/misc/cups/drivers/kyocera/default.nix +++ b/pkgs/misc/cups/drivers/kyocera/default.nix @@ -4,7 +4,7 @@ let platform = if stdenv.system == "x86_64-linux" then "64bit" else if stdenv.system == "i686-linux" then "32bit" - else abort "Unsupported platform"; + else throw "Unsupported system: ${stdenv.system}"; libPath = lib.makeLibraryPath [ cups ]; in diff --git a/pkgs/misc/drivers/sundtek/default.nix b/pkgs/misc/drivers/sundtek/default.nix index 4dc0f2591d82..35a9bd2e3844 100644 --- a/pkgs/misc/drivers/sundtek/default.nix +++ b/pkgs/misc/drivers/sundtek/default.nix @@ -9,7 +9,7 @@ let if isx86_64 then "64bit" else if isi686 then "32bit" - else abort "${system} not considered in build derivation. Might still be supported."; + else throw "${system} not considered in build derivation. Might still be supported."; in stdenv.mkDerivation { |