Update tensorflow-haskell dependencies.

Updating to the current HEAD of the Tensorflow-Haskell bindings allows
us to also update the dependencies, specifically proto-lens, and avoid
having to retain their outdated versions.

1 files changed, 7 insertions, 62 deletions

diff --git a/pkgs/development/haskell-modules/configuration-tensorflow.nix b/pkgs/development/haskell-modules/configuration-tensorflow.nix
index aab416b9a87b..1be2b2e8ec32 100644
--- a/pkgs/development/haskell-modules/configuration-tensorflow.nix
+++ b/pkgs/development/haskell-modules/configuration-tensorflow.nix
@@ -11,79 +11,28 @@ let
   tensorflow-haskell = pkgs.fetchFromGitHub {
     owner = "tensorflow";
     repo = "haskell";
-    rev = "0f322b2e0611cbe7011c84ba8b6cb822e4725ebc";
-    sha256 = "15gn66i547q20sd50ixwm6yk1g00syfgxp8xa6xjd0i3kcsl3gs1";
+    rev = "568c9b6f03e5d66a25685a776386e2ff50b61aa9";
+    sha256 = "0v58zhqipa441hzdvp9pwgv6srir2fm7cp0bq2pb5jl1imwyd37h";
     fetchSubmodules = true;
   };
 
   setTensorflowSourceRoot = dir: drv:
     (overrideCabal drv (drv: { src = tensorflow-haskell; }))
       .overrideAttrs (_oldAttrs: {sourceRoot = "source/${dir}";});
-
-  proto-lens = self.proto-lens_0_5_1_0;
-  proto-lens-protoc = self.proto-lens-protoc_0_5_0_0;
-  proto-lens-runtime = self.proto-lens-runtime_0_5_0_0;
-  proto-lens-protobuf-types = self.proto-lens-protobuf-types_0_5_0_0;
-  proto-lens-setup = self.proto-lens-setup_0_4_0_2;
-  lens-family = self.lens-family_1_2_3;
 in
 {
-  lens-family_1_2_3 = super.lens-family_1_2_3.override {
-    lens-family-core = self.lens-family-core_1_2_3;
-  };
-  
-  proto-lens_0_5_1_0 = (appendPatch (doJailbreak super.proto-lens_0_5_1_0) ./patches/proto-lens-0.5.1.0.patch).override {
-    inherit lens-family;
-  };
-
-  proto-lens-runtime_0_5_0_0 = doJailbreak (super.proto-lens-runtime_0_5_0_0.override {
-    inherit lens-family proto-lens;
-  });
-
-  proto-lens-protoc_0_5_0_0 = doJailbreak (super.proto-lens-protoc_0_5_0_0.override {
-    inherit lens-family proto-lens;
-    haskell-src-exts = self.haskell-src-exts_1_19_1;
-  });
-  proto-lens-setup_0_4_0_2 = appendPatch (doJailbreak (super.proto-lens-setup_0_4_0_2.override {
-    inherit proto-lens-protoc;
-  })) ./patches/proto-lens-setup-0.4.0.2.patch;
-
-  proto-lens-protobuf-types_0_5_0_0 = doJailbreak (super.proto-lens-protobuf-types_0_5_0_0.override {
-    inherit lens-family proto-lens proto-lens-runtime proto-lens-setup;
-  });
-
-  haskell-src-exts_1_19_1 = appendPatches (doJailbreak super.haskell-src-exts_1_19_1) [
-    # Adapt to the Semigroup–Monoid Proposal (enables building on GHC >= 8.4)
-    (pkgs.fetchpatch {
-        url = "https://github.com/haskell-suite/haskell-src-exts/commit/258e072fe9e37f94360b7488b58ea2832843bbb8.patch";
-        sha256 = "0ja6ai41v9plinlhjwja282m6ahn6mw4xi79np0jxqk83cg0z1ff";
-    })
-    # Adapt to MonadFail proposal (enables building on GHC >= 8.8)
-    (pkgs.fetchpatch {
-        url = "https://gist.githubusercontent.com/mikesperber/0f2addaf3fbe97ffb4a5234d8711ba41/raw/e09e20998283c7195e82d546ba9266d290eb000d/gistfile1.txt";
-        sha256 = "18clvli7vpqsqlf2f3qidn71738j9zdlpana6wha3x0dxwan5ly0";
-    }) ];
-
-  tensorflow-proto = (setTensorflowSourceRoot "tensorflow-proto" super.tensorflow-proto).override {
-    inherit proto-lens proto-lens-runtime proto-lens-setup proto-lens-protobuf-types;
-  };
+  tensorflow-proto = doJailbreak (setTensorflowSourceRoot "tensorflow-proto" super.tensorflow-proto);
 
   tensorflow = (setTensorflowSourceRoot "tensorflow" super.tensorflow).override {
-    inherit lens-family proto-lens;
     # the "regular" Python package does not seem to include the binary library
     libtensorflow = pkgs.libtensorflow-bin;
   };
 
-  tensorflow-core-ops = (setTensorflowSourceRoot "tensorflow-core-ops" super.tensorflow-core-ops).override {
-    inherit lens-family proto-lens;
-  };
+  tensorflow-core-ops = setTensorflowSourceRoot "tensorflow-core-ops" super.tensorflow-core-ops;
 
-  tensorflow-logging = (setTensorflowSourceRoot "tensorflow-logging" super.tensorflow-logging).override {
-    inherit lens-family proto-lens;
-  };
+  tensorflow-logging = setTensorflowSourceRoot "tensorflow-logging" super.tensorflow-logging;
 
   tensorflow-mnist = (setTensorflowSourceRoot "tensorflow-mnist" super.tensorflow-mnist).override {
-    inherit lens-family proto-lens;
     # https://github.com/tensorflow/haskell/issues/215
     tensorflow-mnist-input-data = self.tensorflow-mnist-input-data;
   };
@@ -124,11 +73,7 @@ in
     }
   ) {});
 
-  tensorflow-opgen = (setTensorflowSourceRoot "tensorflow-opgen" super.tensorflow-opgen).override {
-    inherit lens-family proto-lens;
-  };
+  tensorflow-opgen = setTensorflowSourceRoot "tensorflow-opgen" super.tensorflow-opgen;
 
-  tensorflow-ops = (setTensorflowSourceRoot "tensorflow-ops" super.tensorflow-ops).override {
-    inherit lens-family proto-lens;
-  };
+  tensorflow-ops = setTensorflowSourceRoot "tensorflow-ops" super.tensorflow-ops;
 }