public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

treewide platform checks: abort -> throw

Browse Source 
They aren't meant to be critical (uncatchable) errors.
Tested with nix-env + checkMeta:
[ "x86_64-linux" "i686-linux" "x86_64-darwin" "aarch64-linux" ]
This commit is contained in:
Vladimír Čunát
2017-12-06 00:06:43 +01:00
committed by Graham Christensen
parent 76bf375a16
commit 3a110ea3f9
21 changed files with 30 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/development/compilers/jetbrains-jdk/default.nix
View File

@@ -16,7 +16,7 @@ let drv = stdenv.mkDerivation rec {
sha256 = "1768f02i3dxdbxn8n29d522h8v0mkgnhpb8ixzq5p54vwjmfl6md";
}
else
abort "unsupported system: ${stdenv.system}";
throw "unsupported system: ${stdenv.system}";
nativeBuildInputs = [ file ];

2
pkgs/development/compilers/oraclejdk/jdk-linux-base.nix
View File

@@ -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.