Merge pull request #217812 from mikesperber/unbreak-snappy-haskell-tensorflow
Unbreak snappy and tensorflow Haskell packages
This commit is contained in:
commit
8b4b0fb234
|
@ -459,7 +459,17 @@ self: super: {
|
|||
cmdtheline = dontCheck super.cmdtheline;
|
||||
|
||||
# https://github.com/bos/snappy/issues/1
|
||||
snappy = dontCheck super.snappy;
|
||||
# https://github.com/bos/snappy/pull/10
|
||||
snappy = appendPatches [
|
||||
(pkgs.fetchpatch {
|
||||
url = "https://github.com/bos/snappy/commit/8687802c0b85ed7fbbb1b1945a75f14fb9a9c886.patch";
|
||||
sha256 = "sha256-p6rMzkjPAZVljsC1Ubj16/mNr4mq5JpxfP5xwT+Gt5M=";
|
||||
})
|
||||
(pkgs.fetchpatch {
|
||||
url = "https://github.com/bos/snappy/commit/21c3250c1f3d273cdcf597e2b7909a22aeaa710f.patch";
|
||||
sha256 = "sha256-qHEQ8FFagXGxvtblBvo7xivRARzXlaMLw8nt0068nt0=";
|
||||
})
|
||||
] (dontCheck super.snappy);
|
||||
|
||||
# https://github.com/vincenthz/hs-crypto-pubkey/issues/20
|
||||
crypto-pubkey = dontCheck super.crypto-pubkey;
|
||||
|
|
|
@ -4913,7 +4913,8 @@ broken-packages:
|
|||
- snaplet-typed-sessions
|
||||
- snap-loader-dynamic
|
||||
- snap-predicates
|
||||
- snappy
|
||||
- snappy-iteratee
|
||||
- snappy-conduit
|
||||
- snap-routes
|
||||
- snap-stream
|
||||
- snap-testing
|
||||
|
@ -5252,8 +5253,6 @@ broken-packages:
|
|||
- tempus
|
||||
- ten
|
||||
- tensor
|
||||
- tensorflow
|
||||
- tensorflow-opgen
|
||||
- tensor-safe
|
||||
- termbox-bindings
|
||||
- termination-combinators
|
||||
|
|
|
@ -11,8 +11,8 @@ let
|
|||
tensorflow-haskell = pkgs.fetchFromGitHub {
|
||||
owner = "tensorflow";
|
||||
repo = "haskell";
|
||||
rev = "568c9b6f03e5d66a25685a776386e2ff50b61aa9";
|
||||
sha256 = "0v58zhqipa441hzdvp9pwgv6srir2fm7cp0bq2pb5jl1imwyd37h";
|
||||
rev = "555d90c43202d5a3021893013bfc8e2ffff58c97";
|
||||
sha256 = "uOuIeD4o+pcjvluTqyVU3GJUQ4e1+p3FhINJ9b6oK+k=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
@ -23,7 +23,9 @@ in
|
|||
{
|
||||
tensorflow-proto = doJailbreak (setTensorflowSourceRoot "tensorflow-proto" super.tensorflow-proto);
|
||||
|
||||
tensorflow = setTensorflowSourceRoot "tensorflow" super.tensorflow;
|
||||
tensorflow = overrideCabal
|
||||
(drv: { libraryHaskellDepends = drv.libraryHaskellDepends ++ [self.vector-split]; })
|
||||
(setTensorflowSourceRoot "tensorflow" super.tensorflow);
|
||||
|
||||
tensorflow-core-ops = setTensorflowSourceRoot "tensorflow-core-ops" super.tensorflow-core-ops;
|
||||
|
||||
|
|
Loading…
Reference in a new issue