From e0151085a4343b023c9f341a77f989509a0d0ec5 Mon Sep 17 00:00:00 2001 From: Jake Waksbaum Date: Sun, 19 Aug 2018 23:53:11 -0400 Subject: [PATCH 1/2] Mark lots of packages as buildable on darwin --- pkgs/applications/science/math/gap/default.nix | 6 ++++-- pkgs/applications/science/math/giac/default.nix | 4 +--- pkgs/applications/science/math/lrcalc/default.nix | 2 +- pkgs/applications/science/math/nauty/default.nix | 2 +- pkgs/applications/science/math/pynac/default.nix | 2 +- pkgs/applications/science/math/singular/default.nix | 2 +- pkgs/development/compilers/ecl/16.1.2.nix | 2 +- pkgs/development/libraries/arb/default.nix | 2 +- pkgs/development/libraries/fplll/default.nix | 2 +- pkgs/development/libraries/iml/default.nix | 2 +- pkgs/development/libraries/libgap/default.nix | 2 +- pkgs/development/libraries/mpfi/default.nix | 2 +- pkgs/development/libraries/science/math/brial/default.nix | 2 +- pkgs/development/libraries/science/math/cliquer/default.nix | 2 +- pkgs/development/libraries/science/math/m4ri/default.nix | 2 +- pkgs/development/libraries/science/math/m4rie/default.nix | 2 +- .../libraries/science/math/rankwidth/default.nix | 2 +- pkgs/development/libraries/science/math/rubiks/default.nix | 2 +- pkgs/development/libraries/science/math/sympow/default.nix | 2 +- pkgs/development/python-modules/cvxopt/default.nix | 1 - 20 files changed, 22 insertions(+), 23 deletions(-) diff --git a/pkgs/applications/science/math/gap/default.nix b/pkgs/applications/science/math/gap/default.nix index 7eb10d1f95250..9d5df1f6ea3b5 100644 --- a/pkgs/applications/science/math/gap/default.nix +++ b/pkgs/applications/science/math/gap/default.nix @@ -5,6 +5,7 @@ , makeWrapper , m4 , gmp +, libtool # one of # - "minimal" (~400M): # Install the bare minimum of packages required by gap to start. @@ -68,6 +69,8 @@ stdenv.mkDerivation rec { sha256 = "0cp6ddk0469zzv1m1vair6gm27ic6c5m77ri8rn0znq3gaps6x94"; }; + enableParallelBuilding = true; + # remove all non-essential packages (which take up a lot of space) preConfigure = lib.optionalString (!keepAll) (removeNonWhitelistedPkgs packagesToKeep) + '' patchShebangs . @@ -78,7 +81,7 @@ stdenv.mkDerivation rec { buildInputs = [ m4 gmp - ]; + ] ++ lib.optional stdenv.isDarwin libtool; nativeBuildInputs = [ makeWrapper @@ -169,7 +172,6 @@ stdenv.mkDerivation rec { timokau ]; platforms = platforms.all; - broken = stdenv.isDarwin; # keeping all packages increases the package size considerably, wchich # is why a local build is preferable in that situation. The timeframe # is reasonable and that way the binary cache doesn't get overloaded. diff --git a/pkgs/applications/science/math/giac/default.nix b/pkgs/applications/science/math/giac/default.nix index ad82d7572e345..90b1b367a7c4d 100644 --- a/pkgs/applications/science/math/giac/default.nix +++ b/pkgs/applications/science/math/giac/default.nix @@ -104,9 +104,7 @@ stdenv.mkDerivation rec { description = "A free computer algebra system (CAS)"; homepage = "https://www-fourier.ujf-grenoble.fr/~parisse/giac.html"; license = licenses.gpl3Plus; - ## xcas is buildable on darwin but there are specific instructions I could - ## not test - platforms = platforms.linux; + platforms = platforms.unix; maintainers = [ maintainers.symphorien ]; }; } diff --git a/pkgs/applications/science/math/lrcalc/default.nix b/pkgs/applications/science/math/lrcalc/default.nix index eecb37dd743f6..f407358d8f266 100644 --- a/pkgs/applications/science/math/lrcalc/default.nix +++ b/pkgs/applications/science/math/lrcalc/default.nix @@ -35,6 +35,6 @@ stdenv.mkDerivation rec { homepage = http://math.rutgers.edu/~asbuch/lrcalc/; license = licenses.gpl2Plus; maintainers = with maintainers; [ timokau ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/applications/science/math/nauty/default.nix b/pkgs/applications/science/math/nauty/default.nix index c86354234e3fc..fbc01a52648d4 100644 --- a/pkgs/applications/science/math/nauty/default.nix +++ b/pkgs/applications/science/math/nauty/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { description = ''Programs for computing automorphism groups of graphs and digraphs''; license = licenses.asl20; maintainers = with maintainers; [ raskin timokau ]; - platforms = platforms.linux; + platforms = platforms.unix; homepage = http://pallini.di.uniroma1.it/; }; } diff --git a/pkgs/applications/science/math/pynac/default.nix b/pkgs/applications/science/math/pynac/default.nix index 75a46bb182aef..05c0c0e8ec621 100644 --- a/pkgs/applications/science/math/pynac/default.nix +++ b/pkgs/applications/science/math/pynac/default.nix @@ -43,6 +43,6 @@ stdenv.mkDerivation rec { homepage = http://pynac.org; license = licenses.gpl3; maintainers = with maintainers; [ timokau ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/applications/science/math/singular/default.nix b/pkgs/applications/science/math/singular/default.nix index ccb139203acb7..fccd1489e11ca 100644 --- a/pkgs/applications/science/math/singular/default.nix +++ b/pkgs/applications/science/math/singular/default.nix @@ -110,7 +110,7 @@ stdenv.mkDerivation rec { description = "A CAS for polynomial computations"; maintainers = with maintainers; [ raskin timokau ]; # 32 bit x86 fails with some link error: `undefined reference to `__divmoddi4@GCC_7.0.0'` - platforms = subtractLists platforms.i686 platforms.linux; + platforms = subtractLists platforms.i686 platforms.unix; license = licenses.gpl3; # Or GPLv2 at your option - but not GPLv4 homepage = http://www.singular.uni-kl.de; downloadPage = "http://www.mathematik.uni-kl.de/ftp/pub/Math/Singular/SOURCES/"; diff --git a/pkgs/development/compilers/ecl/16.1.2.nix b/pkgs/development/compilers/ecl/16.1.2.nix index c27f2a2267051..bede9fa4aa687 100644 --- a/pkgs/development/compilers/ecl/16.1.2.nix +++ b/pkgs/development/compilers/ecl/16.1.2.nix @@ -78,6 +78,6 @@ stdenv.mkDerivation { description = "Lisp implementation aiming to be small, fast and easy to embed"; license = stdenv.lib.licenses.mit ; maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/arb/default.nix b/pkgs/development/libraries/arb/default.nix index ac67a101bc583..f22585dc72047 100644 --- a/pkgs/development/libraries/arb/default.nix +++ b/pkgs/development/libraries/arb/default.nix @@ -21,6 +21,6 @@ stdenv.mkDerivation rec { description = ''A library for arbitrary-precision interval arithmetic''; license = stdenv.lib.licenses.lgpl21Plus; maintainers = with maintainers; [ raskin timokau ]; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/fplll/default.nix b/pkgs/development/libraries/fplll/default.nix index f06f7bf4a02f9..9dd5ab1b5af69 100644 --- a/pkgs/development/libraries/fplll/default.nix +++ b/pkgs/development/libraries/fplll/default.nix @@ -17,6 +17,6 @@ stdenv.mkDerivation rec { description = ''Lattice algorithms using floating-point arithmetic''; license = stdenv.lib.licenses.lgpl21Plus; maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/iml/default.nix b/pkgs/development/libraries/iml/default.nix index 5ad3e249fc321..2b85f12115b1d 100644 --- a/pkgs/development/libraries/iml/default.nix +++ b/pkgs/development/libraries/iml/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { description = ''Algorithms for computing exact solutions to dense systems of linear equations over the integers''; license = stdenv.lib.licenses.gpl2Plus; maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.unix; homepage = https://cs.uwaterloo.ca/~astorjoh/iml.html; updateWalker = true; }; diff --git a/pkgs/development/libraries/libgap/default.nix b/pkgs/development/libraries/libgap/default.nix index b6a8ae3c8dfe2..16a042bb6fdb1 100644 --- a/pkgs/development/libraries/libgap/default.nix +++ b/pkgs/development/libraries/libgap/default.nix @@ -20,6 +20,6 @@ stdenv.mkDerivation rec { description = ''A library-packaged fork of the GAP kernel''; license = stdenv.lib.licenses.gpl3Plus; maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/mpfi/default.nix b/pkgs/development/libraries/mpfi/default.nix index baefab487e520..fe46336649e12 100644 --- a/pkgs/development/libraries/mpfi/default.nix +++ b/pkgs/development/libraries/mpfi/default.nix @@ -17,6 +17,6 @@ stdenv.mkDerivation rec { homepage = https://gforge.inria.fr/projects/mpfi/; license = stdenv.lib.licenses.lgpl21Plus; maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/science/math/brial/default.nix b/pkgs/development/libraries/science/math/brial/default.nix index bc276b9923c8e..f08f6425655f4 100644 --- a/pkgs/development/libraries/science/math/brial/default.nix +++ b/pkgs/development/libraries/science/math/brial/default.nix @@ -41,6 +41,6 @@ stdenv.mkDerivation rec { description = "Legacy version of PolyBoRi maintained by sagemath developers"; license = licenses.gpl2Plus; maintainers = with maintainers; [ timokau ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/science/math/cliquer/default.nix b/pkgs/development/libraries/science/math/cliquer/default.nix index 5193c2db5c5b8..08f821dcb2c97 100644 --- a/pkgs/development/libraries/science/math/cliquer/default.nix +++ b/pkgs/development/libraries/science/math/cliquer/default.nix @@ -33,6 +33,6 @@ stdenv.mkDerivation rec { ''; license = licenses.gpl2Plus; maintainers = with maintainers; [ timokau ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/science/math/m4ri/default.nix b/pkgs/development/libraries/science/math/m4ri/default.nix index b8c4fa6714842..764901adf7b47 100644 --- a/pkgs/development/libraries/science/math/m4ri/default.nix +++ b/pkgs/development/libraries/science/math/m4ri/default.nix @@ -25,6 +25,6 @@ stdenv.mkDerivation rec { description = "Library to do fast arithmetic with dense matrices over F_2"; license = licenses.gpl2Plus; maintainers = with maintainers; [ timokau ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/science/math/m4rie/default.nix b/pkgs/development/libraries/science/math/m4rie/default.nix index 6a664b1dffff9..6a91230002a0c 100644 --- a/pkgs/development/libraries/science/math/m4rie/default.nix +++ b/pkgs/development/libraries/science/math/m4rie/default.nix @@ -34,6 +34,6 @@ stdenv.mkDerivation rec { ''; license = licenses.gpl2Plus; maintainers = with maintainers; [ timokau ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/science/math/rankwidth/default.nix b/pkgs/development/libraries/science/math/rankwidth/default.nix index 66c573245db15..ded7b7dc90ac9 100644 --- a/pkgs/development/libraries/science/math/rankwidth/default.nix +++ b/pkgs/development/libraries/science/math/rankwidth/default.nix @@ -22,6 +22,6 @@ stdenv.mkDerivation rec { description = "Calculates rank-width and rank-decompositions"; license = with licenses; [ gpl2Plus ]; maintainers = with maintainers; [ timokau ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/science/math/rubiks/default.nix b/pkgs/development/libraries/science/math/rubiks/default.nix index 207406388e0e3..3b2ddc6f06c5f 100644 --- a/pkgs/development/libraries/science/math/rubiks/default.nix +++ b/pkgs/development/libraries/science/math/rubiks/default.nix @@ -76,6 +76,6 @@ stdenv.mkDerivation rec { mit # Dik T. Winter's software ]; maintainers = with maintainers; [ timokau ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/science/math/sympow/default.nix b/pkgs/development/libraries/science/math/sympow/default.nix index e67f61599b572..a6e99fead49f3 100644 --- a/pkgs/development/libraries/science/math/sympow/default.nix +++ b/pkgs/development/libraries/science/math/sympow/default.nix @@ -69,6 +69,6 @@ stdenv.mkDerivation rec { free = true; }; maintainers = with maintainers; [ timokau ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/development/python-modules/cvxopt/default.nix b/pkgs/development/python-modules/cvxopt/default.nix index 4847d57b67b38..201c8ccda705c 100644 --- a/pkgs/development/python-modules/cvxopt/default.nix +++ b/pkgs/development/python-modules/cvxopt/default.nix @@ -65,7 +65,6 @@ buildPythonPackage rec { programming language. ''; maintainers = with maintainers; [ edwtjo ]; - broken = stdenv.targetPlatform.isDarwin; license = licenses.gpl3Plus; }; } From 748a20191fd5f75ae64060517c12f25e01fda834 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sun, 8 Sep 2019 11:02:20 +0200 Subject: [PATCH 2/2] fixup! Mark lots of packages as buildable on darwin --- pkgs/development/libraries/libgap/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libgap/default.nix b/pkgs/development/libraries/libgap/default.nix index 16a042bb6fdb1..b6a8ae3c8dfe2 100644 --- a/pkgs/development/libraries/libgap/default.nix +++ b/pkgs/development/libraries/libgap/default.nix @@ -20,6 +20,6 @@ stdenv.mkDerivation rec { description = ''A library-packaged fork of the GAP kernel''; license = stdenv.lib.licenses.gpl3Plus; maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.unix; + platforms = stdenv.lib.platforms.linux; }; }