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

ghc-*-binary: remove redundant assertion

Browse Source 
Any attempt to instantiate these expressions on an unsupported platform is
going to 'throw' an error. The call to 'assert' doesn't add any value to
that (and generates less readable error messages, too). Further details are
available at <https://github.com/NixOS/nix/issues/56>.
This commit is contained in:
Peter Simons
2012-10-12 15:23:05 +02:00
parent 85140f590a
commit b1169e5509
6 changed files with 6 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/compilers/ghc/6.10.1-binary.nix
+1 -7
View File
@@ -1,11 +1,5 @@
{stdenv, fetchurl, perl, libedit, ncurses, gmp}:
let
supportedPlatforms = ["i686-darwin" "x86_64-linux" "i686-linux"];
in
assert stdenv.lib.elem stdenv.system supportedPlatforms;
stdenv.mkDerivation rec {
version = "6.10.1";
@@ -104,5 +98,5 @@ stdenv.mkDerivation rec {
[ $(./main) == "yes" ]
'';
meta.platforms = supportedPlatforms;
meta.platforms = ["i686-darwin" "x86_64-linux" "i686-linux"];
}
pkgs/development/compilers/ghc/6.10.2-binary.nix
+1 -7
View File
@@ -1,11 +1,5 @@
{stdenv, fetchurl, perl, libedit, ncurses, gmp}:
let
supportedPlatforms = ["x86_64-linux" "i686-linux"];
in
assert stdenv.lib.elem stdenv.system supportedPlatforms;
stdenv.mkDerivation rec {
version = "6.10.2";
@@ -103,5 +97,5 @@ stdenv.mkDerivation rec {
[ $(./main) == "yes" ]
'';
meta.platforms = supportedPlatforms;
meta.platforms = ["x86_64-linux" "i686-linux"];
}
pkgs/development/compilers/ghc/6.12.1-binary.nix
+1 -7
View File
@@ -1,11 +1,5 @@
{stdenv, fetchurl, perl, ncurses, gmp}:
let
supportedPlatforms = ["x86_64-linux" "i686-linux"];
in
assert stdenv.lib.elem stdenv.system supportedPlatforms;
stdenv.mkDerivation rec {
version = "6.12.1";
@@ -105,5 +99,5 @@ stdenv.mkDerivation rec {
[ $(./main) == "yes" ]
'';
meta.platforms = supportedPlatforms;
meta.platforms = ["x86_64-linux" "i686-linux"];
}
pkgs/development/compilers/ghc/6.4.2-binary.nix
+1 -7
View File
@@ -1,11 +1,5 @@
{stdenv, fetchurl, perl, readline, ncurses, gmp}:
let
supportedPlatforms = ["i686-darwin" "x86_64-linux" "i686-linux"];
in
assert stdenv.lib.elem stdenv.system supportedPlatforms;
stdenv.mkDerivation {
name = if stdenv.system == "i686-darwin" then "ghc-6.6.1-binary" else "ghc-6.4.2-binary";
@@ -68,5 +62,5 @@ stdenv.mkDerivation {
'' else "";
meta.platforms = supportedPlatforms;
meta.platforms = ["i686-darwin" "x86_64-linux" "i686-linux"];
}
pkgs/development/compilers/ghc/7.0.4-binary.nix
+1 -7
View File
@@ -1,11 +1,5 @@
{stdenv, fetchurl, perl, ncurses, gmp}:
let
supportedPlatforms = ["x86_64-linux" "i686-linux" "i686-darwin" "x86_64-darwin"];
in
assert stdenv.lib.elem stdenv.system supportedPlatforms;
stdenv.mkDerivation rec {
version = "7.0.4";
@@ -93,5 +87,5 @@ stdenv.mkDerivation rec {
[ $(./main) == "yes" ]
'';
meta.platforms = supportedPlatforms;
meta.platforms = ["x86_64-linux" "i686-linux" "i686-darwin" "x86_64-darwin"];
}
pkgs/development/compilers/ghc/7.4.2-binary.nix
+1 -7
View File
@@ -1,11 +1,5 @@
{stdenv, fetchurl, perl, ncurses, gmp}:
let
supportedPlatforms = ["x86_64-linux" "i686-linux" "i686-darwin" "x86_64-darwin"];
in
assert stdenv.lib.elem stdenv.system supportedPlatforms;
stdenv.mkDerivation rec {
version = "7.4.2";
@@ -93,5 +87,5 @@ stdenv.mkDerivation rec {
[ $(./main) == "yes" ]
'';
meta.platforms = supportedPlatforms;
meta.platforms = ["x86_64-linux" "i686-linux" "i686-darwin" "x86_64-darwin"];
}