summary refs log tree commit diff
path: root/pkgs/os-specific
diff options
context:
space:
mode:
authorVladimír Čunát <vcunat@gmail.com>2017-12-06 00:06:43 +0100
committerGraham Christensen <graham@grahamc.com>2017-12-12 18:08:10 -0500
commit3a110ea3f96db56012f7f2707e842593a7d7c5b8 (patch)
tree727bb87c20c860814a494875af0b874d3b977bbb /pkgs/os-specific
parent76bf375a162d81d49b274eb07d6a33a74fe8850f (diff)
downloadnixlib-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/os-specific')
-rw-r--r--pkgs/os-specific/linux/broadcom-sta/default.nix2
-rw-r--r--pkgs/os-specific/linux/prl-tools/default.nix2
2 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/os-specific/linux/broadcom-sta/default.nix b/pkgs/os-specific/linux/broadcom-sta/default.nix
index 3143968d75c8..8a42e5a0b262 100644
--- a/pkgs/os-specific/linux/broadcom-sta/default.nix
+++ b/pkgs/os-specific/linux/broadcom-sta/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "https://docs.broadcom.com/docs-and-downloads/docs/linux_sta/${tarball}";
-    sha256 = hashes."${stdenv.system}";
+    sha256 = hashes.${stdenv.system} or (throw "Unsupported system: ${stdenv.system}");
   };
 
   hardeningDisable = [ "pic" ];
diff --git a/pkgs/os-specific/linux/prl-tools/default.nix b/pkgs/os-specific/linux/prl-tools/default.nix
index 9fe331e6cb12..12b361e953ea 100644
--- a/pkgs/os-specific/linux/prl-tools/default.nix
+++ b/pkgs/os-specific/linux/prl-tools/default.nix
@@ -10,7 +10,7 @@ let xorgFullVer = (builtins.parseDrvName xorg.xorgserver.name).version;
     xorgVer = lib.concatStringsSep "." (lib.take 2 (lib.splitString "." xorgFullVer));
     x64 = if stdenv.system == "x86_64-linux" then true
           else if stdenv.system == "i686-linux" then false
-          else abort "Parallels Tools for Linux only support {x86-64,i686}-linux targets";
+          else throw "Parallels Tools for Linux only support {x86-64,i686}-linux targets";
 in
 stdenv.mkDerivation rec {
   version = "${prl_major}.2.1-41615";