shogun: add patch for json-c 0.13

This commit is contained in:
Robin Gloster 2018-03-05 21:54:22 +01:00
parent 43e5af0a43
commit 50cdd5f02b
No known key found for this signature in database
GPG Key ID: D5C458DF6DD97EDF

View File

@ -14,7 +14,6 @@ assert pythonSupport -> pythonPackages != null;
assert opencvSupport -> opencv != null; assert opencvSupport -> opencv != null;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "shogun"; pname = "shogun";
version = "6.0.0"; version = "6.0.0";
name = pname + "-" + version; name = pname + "-" + version;
@ -27,11 +26,17 @@ stdenv.mkDerivation rec {
fetchSubmodules = true; fetchSubmodules = true;
}; };
patches = fetchpatch { patches = [
(fetchpatch {
name = "Fix-meta-example-parser-bug-in-parallel-builds.patch"; name = "Fix-meta-example-parser-bug-in-parallel-builds.patch";
url = "https://github.com/shogun-toolbox/shogun/commit/ecd6a8f11ac52748e89d27c7fab7f43c1de39f05.patch"; url = "https://github.com/shogun-toolbox/shogun/commit/ecd6a8f11ac52748e89d27c7fab7f43c1de39f05.patch";
sha256 = "1hrwwrj78sxhwcvgaz7n4kvh5y9snfcc4jf5xpgji5hjymnl311n"; sha256 = "1hrwwrj78sxhwcvgaz7n4kvh5y9snfcc4jf5xpgji5hjymnl311n";
}; })
(fetchpatch {
url = "https://github.com/awild82/shogun/commit/365ce4c4c700736d2eec8ba6c975327a5ac2cd9b.patch";
sha256 = "158hqv4xzw648pmjbwrhxjp7qcppqa7kvriif87gn3zdn711c49s";
})
];
CCACHE_DIR=".ccache"; CCACHE_DIR=".ccache";
@ -53,5 +58,4 @@ stdenv.mkDerivation rec {
license = licenses.gpl3; license = licenses.gpl3;
maintainers = with maintainers; [ edwtjo ]; maintainers = with maintainers; [ edwtjo ];
}; };
} }