From 1df0e06d540ac88153860df4874bd2294f9d92b0 Mon Sep 17 00:00:00 2001 From: Mike Sperber Date: Thu, 23 Feb 2023 08:50:35 +0100 Subject: [PATCH] haskell-tensorflow: unbreak build This just moves the package to the current head in the official repo, which has since seen patches that unbreak the ghc-9 build and work with our version of TensorFlow. --- .../haskell-modules/configuration-hackage2nix/broken.yaml | 2 -- .../haskell-modules/configuration-tensorflow.nix | 8 +++++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index f04d106fa81c..eec94a94a244 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -5253,8 +5253,6 @@ broken-packages: - tempus - ten - tensor - - tensorflow - - tensorflow-opgen - tensor-safe - termbox-bindings - termination-combinators diff --git a/pkgs/development/haskell-modules/configuration-tensorflow.nix b/pkgs/development/haskell-modules/configuration-tensorflow.nix index 54a5bc52ebaa..3f9dc1643275 100644 --- a/pkgs/development/haskell-modules/configuration-tensorflow.nix +++ b/pkgs/development/haskell-modules/configuration-tensorflow.nix @@ -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;