diff options
| author | Robin Gloster <mail@glob.in> | 2018-03-05 21:54:22 +0100 |
|---|---|---|
| committer | Robin Gloster <mail@glob.in> | 2018-03-05 22:00:03 +0100 |
| commit | 50cdd5f02b8899a515513ad65b0db97b057e1609 (patch) | |
| tree | 87706e7ec365fc63a55275e8486a2dc2fdec5e92 /pkgs/applications/science/machine-learning | |
| parent | 43e5af0a430576e33b6765e4caf8e2f9f7902ed1 (diff) | |
| download | nixpkgs-50cdd5f02b8899a515513ad65b0db97b057e1609.tar nixpkgs-50cdd5f02b8899a515513ad65b0db97b057e1609.tar.gz nixpkgs-50cdd5f02b8899a515513ad65b0db97b057e1609.tar.bz2 nixpkgs-50cdd5f02b8899a515513ad65b0db97b057e1609.tar.lz nixpkgs-50cdd5f02b8899a515513ad65b0db97b057e1609.tar.xz nixpkgs-50cdd5f02b8899a515513ad65b0db97b057e1609.tar.zst nixpkgs-50cdd5f02b8899a515513ad65b0db97b057e1609.zip | |
shogun: add patch for json-c 0.13
Diffstat (limited to 'pkgs/applications/science/machine-learning')
| -rw-r--r-- | pkgs/applications/science/machine-learning/shogun/default.nix | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/pkgs/applications/science/machine-learning/shogun/default.nix b/pkgs/applications/science/machine-learning/shogun/default.nix index ae272284bcd..e33b55503bd 100644 --- a/pkgs/applications/science/machine-learning/shogun/default.nix +++ b/pkgs/applications/science/machine-learning/shogun/default.nix @@ -14,7 +14,6 @@ assert pythonSupport -> pythonPackages != null; assert opencvSupport -> opencv != null; stdenv.mkDerivation rec { - pname = "shogun"; version = "6.0.0"; name = pname + "-" + version; @@ -27,11 +26,17 @@ stdenv.mkDerivation rec { fetchSubmodules = true; }; - patches = fetchpatch { - name = "Fix-meta-example-parser-bug-in-parallel-builds.patch"; - url = "https://github.com/shogun-toolbox/shogun/commit/ecd6a8f11ac52748e89d27c7fab7f43c1de39f05.patch"; - sha256 = "1hrwwrj78sxhwcvgaz7n4kvh5y9snfcc4jf5xpgji5hjymnl311n"; - }; + patches = [ + (fetchpatch { + name = "Fix-meta-example-parser-bug-in-parallel-builds.patch"; + url = "https://github.com/shogun-toolbox/shogun/commit/ecd6a8f11ac52748e89d27c7fab7f43c1de39f05.patch"; + sha256 = "1hrwwrj78sxhwcvgaz7n4kvh5y9snfcc4jf5xpgji5hjymnl311n"; + }) + (fetchpatch { + url = "https://github.com/awild82/shogun/commit/365ce4c4c700736d2eec8ba6c975327a5ac2cd9b.patch"; + sha256 = "158hqv4xzw648pmjbwrhxjp7qcppqa7kvriif87gn3zdn711c49s"; + }) + ]; CCACHE_DIR=".ccache"; @@ -53,5 +58,4 @@ stdenv.mkDerivation rec { license = licenses.gpl3; maintainers = with maintainers; [ edwtjo ]; }; - } |