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/development/compilers | |
| 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/development/compilers')
| -rw-r--r-- | pkgs/development/compilers/jetbrains-jdk/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/compilers/oraclejdk/jdk-linux-base.nix | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/development/compilers/jetbrains-jdk/default.nix b/pkgs/development/compilers/jetbrains-jdk/default.nix index 383283309ddf..7f23a4d507e7 100644 --- a/pkgs/development/compilers/jetbrains-jdk/default.nix +++ b/pkgs/development/compilers/jetbrains-jdk/default.nix @@ -16,7 +16,7 @@ let drv = stdenv.mkDerivation rec { sha256 = "1768f02i3dxdbxn8n29d522h8v0mkgnhpb8ixzq5p54vwjmfl6md"; } else - abort "unsupported system: ${stdenv.system}"; + throw "unsupported system: ${stdenv.system}"; nativeBuildInputs = [ file ]; diff --git a/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix b/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix index fadae3eb5925..554c322781fc 100644 --- a/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix +++ b/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix @@ -44,7 +44,7 @@ assert stdenv.system == "i686-linux" assert swingSupport -> xorg != null; let - abortArch = abort "jdk requires i686-linux, x86_64-linux, aarch64-linux or armv7l-linux"; + abortArch = throw "Unsupported system: ${stdenv.system}"; /** * The JRE libraries are in directories that depend on the CPU. |