diff options
| -rw-r--r-- | pkgs/development/compilers/rust/bootstrap.nix | 4 | ||||
| -rw-r--r-- | pkgs/development/compilers/rust/nightlyBin.nix | 4 | ||||
| -rw-r--r-- | pkgs/development/tools/misc/kibana/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/tools/misc/bandwidth/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/tools/misc/grub4dos/default.nix | 2 |
5 files changed, 7 insertions, 7 deletions
diff --git a/pkgs/development/compilers/rust/bootstrap.nix b/pkgs/development/compilers/rust/bootstrap.nix index b582b21dcc492..91660dcc5b330 100644 --- a/pkgs/development/compilers/rust/bootstrap.nix +++ b/pkgs/development/compilers/rust/bootstrap.nix @@ -12,7 +12,7 @@ let then "i686-apple-darwin" else if stdenv.system == "x86_64-darwin" then "x86_64-apple-darwin" - else abort "missing boostrap url for platform ${stdenv.system}"; + else throw "missing bootstrap url for platform ${stdenv.system}"; # fetch hashes by running `print-hashes.sh 1.14.0` bootstrapHash = @@ -24,7 +24,7 @@ let then "fe1b3d67329a22d67e3b8db8858a43022e2e746dde60ef4a2db3f2cac16ea9bd" else if stdenv.system == "x86_64-darwin" then "3381341524b0184da5ed2cdcddc2a25e2e335e87f1cf676f64d98ee5e6479f20" - else throw "missing boostrap hash for platform ${stdenv.system}"; + else throw "missing bootstrap hash for platform ${stdenv.system}"; needsPatchelf = stdenv.isLinux; diff --git a/pkgs/development/compilers/rust/nightlyBin.nix b/pkgs/development/compilers/rust/nightlyBin.nix index 5f92e5c6d9224..9916e4555c56b 100644 --- a/pkgs/development/compilers/rust/nightlyBin.nix +++ b/pkgs/development/compilers/rust/nightlyBin.nix @@ -5,12 +5,12 @@ let platform = if stdenv.system == "x86_64-linux" then "x86_64-unknown-linux-gnu" - else abort "missing boostrap url for platform ${stdenv.system}"; + else throw "missing bootstrap url for platform ${stdenv.system}"; bootstrapHash = if stdenv.system == "x86_64-linux" then "1v7jvwigb29m15wilzcrk5jmlpaccpzbkhlzf7z5qw08320gvc91" - else throw "missing boostrap hash for platform ${stdenv.system}"; + else throw "missing bootstrap hash for platform ${stdenv.system}"; needsPatchelf = stdenv.isLinux; diff --git a/pkgs/development/tools/misc/kibana/default.nix b/pkgs/development/tools/misc/kibana/default.nix index 677ffa49c998c..bd85f61402881 100644 --- a/pkgs/development/tools/misc/kibana/default.nix +++ b/pkgs/development/tools/misc/kibana/default.nix @@ -21,7 +21,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "https://download.elastic.co/kibana/kibana/${name}-${plat}-${elasticArch}.tar.gz"; - sha256 = shas."${stdenv.system}"; + sha256 = shas."${stdenv.system}" or (throw "Unknown architecture"); }; buildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/misc/bandwidth/default.nix b/pkgs/tools/misc/bandwidth/default.nix index 05fbe9b563247..8b0e17191964a 100644 --- a/pkgs/tools/misc/bandwidth/default.nix +++ b/pkgs/tools/misc/bandwidth/default.nix @@ -7,7 +7,7 @@ let else if stdenv.system == "x86_64-darwin" then "bandwidth-mac64" else if stdenv.system == "i686-darwin" then "bandwidth-mac32" else if stdenv.system == "i686-cygwin" then "bandwidth-win32" - else null; + else throw "Unknown architecture"; in stdenv.mkDerivation rec { name = "bandwidth-${version}"; diff --git a/pkgs/tools/misc/grub4dos/default.nix b/pkgs/tools/misc/grub4dos/default.nix index d9e4ae3a638cc..054c7d39405cb 100644 --- a/pkgs/tools/misc/grub4dos/default.nix +++ b/pkgs/tools/misc/grub4dos/default.nix @@ -3,7 +3,7 @@ let arch = if stdenv.isi686 then "i386" else if stdenv.isx86_64 then "x86_64" - else abort "Unknown architecture"; + else throw "Unknown architecture"; in stdenv.mkDerivation rec { name = "grub4dos-${version}"; version = "0.4.6a-2016-12-24"; |