diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2019-05-14 10:23:13 +0200 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2019-05-14 10:23:13 +0200 |
commit | 8abe5ee07ee6b23fb014709f01bb161a62407a44 (patch) | |
tree | 23fe6fb06258812145de6c5c2c41bf83b887af72 /pkgs/applications/science/math/cbc/default.nix | |
parent | ef0dbef7f15f962f9fedfd86563664bc95e6e2f9 (diff) | |
parent | f2affe03443d916d1c693dc246e48985bc2222d4 (diff) | |
download | nixpkgs-8abe5ee07ee6b23fb014709f01bb161a62407a44.tar nixpkgs-8abe5ee07ee6b23fb014709f01bb161a62407a44.tar.gz nixpkgs-8abe5ee07ee6b23fb014709f01bb161a62407a44.tar.bz2 nixpkgs-8abe5ee07ee6b23fb014709f01bb161a62407a44.tar.lz nixpkgs-8abe5ee07ee6b23fb014709f01bb161a62407a44.tar.xz nixpkgs-8abe5ee07ee6b23fb014709f01bb161a62407a44.tar.zst nixpkgs-8abe5ee07ee6b23fb014709f01bb161a62407a44.zip |
Merge master into staging-next
Diffstat (limited to 'pkgs/applications/science/math/cbc/default.nix')
-rw-r--r-- | pkgs/applications/science/math/cbc/default.nix | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/pkgs/applications/science/math/cbc/default.nix b/pkgs/applications/science/math/cbc/default.nix index 93aefbca216..d0857e2a517 100644 --- a/pkgs/applications/science/math/cbc/default.nix +++ b/pkgs/applications/science/math/cbc/default.nix @@ -1,11 +1,12 @@ { lib, stdenv, fetchurl, zlib, bzip2 }: -stdenv.mkDerivation { - name = "cbc-2.9.9"; +stdenv.mkDerivation rec { + pname = "cbc"; + version = "2.10.2"; src = fetchurl { - url = "https://www.coin-or.org/download/source/Cbc/Cbc-2.9.9.tgz"; - sha256 = "1w8axdzm05xf5y13c31w7rc5z6ywxqxiwafnxcq3p195kgj0915a"; + url = "https://www.coin-or.org/download/source/Cbc/Cbc-${version}.tgz"; + sha256 = "0frbxkh6nbh46kaxsx5bmzridgip3v7aq75l8yak5npiiq4jlwv3"; }; configureFlags = [ "-C" ]; @@ -23,6 +24,7 @@ stdenv.mkDerivation { license = lib.licenses.epl10; maintainers = [ lib.maintainers.eelco ]; platforms = lib.platforms.linux ++ lib.platforms.darwin; + broken = stdenv.isAarch64; # Missing <immintrin.h> after 2.10.0 description = "A mixed integer programming solver"; }; } |