From 6ec9d95a86db4446f219678165b51630a4a5bf78 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 10 Apr 2020 20:31:13 +0200 Subject: [PATCH] haskell-tensorflow: fix evalution errors The configuration-tensorflow.nix file specified several overrides for version 0.2.x packages, but those packages are no longer included in our package set because they are so old. (Current versions seem to be in the range of 0.6.x.) I fixed the evalution errors, but I did not verify whether these packages actually build with the newer versions. --- .../haskell-modules/configuration-tensorflow.nix | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-tensorflow.nix b/pkgs/development/haskell-modules/configuration-tensorflow.nix index eb98a385034..7aba8e3a574 100644 --- a/pkgs/development/haskell-modules/configuration-tensorflow.nix +++ b/pkgs/development/haskell-modules/configuration-tensorflow.nix @@ -14,22 +14,21 @@ let setSourceRoot = dir: drv: drv.overrideAttrs (_oldAttrs: {sourceRoot = "source/${dir}";}); - proto-lens = self.proto-lens_0_2_2_0; - proto-lens-protoc = self.proto-lens-protoc_0_2_2_3; - proto-lens-protobuf-types = self.proto-lens-protobuf-types_0_2_2_0; + proto-lens = self.proto-lens; + proto-lens-protoc = self.proto-lens-protoc; + proto-lens-protobuf-types = self.proto-lens-protobuf-types; mainland-pretty = self.mainland-pretty_0_6_2; in { - proto-lens_0_2_2_0 = appendPatch super.proto-lens_0_2_2_0 ./patches/proto-lens-0.2.2.0.patch; + proto-lens = appendPatch super.proto-lens ./patches/proto-lens-0.2.2.0.patch; proto-lens-descriptors = doJailbreak (super.proto-lens-descriptors.override { inherit proto-lens; lens-labels = self.lens-labels_0_1_0_2; }); - proto-lens-protoc_0_2_2_3 = appendPatch (addBuildDepend (super.proto-lens-protoc_0_2_2_3.override { + proto-lens-protoc = appendPatch (addBuildDepend (super.proto-lens-protoc.override { inherit proto-lens; - haskell-src-exts = self.haskell-src-exts_1_19_1; }) self.semigroups) ./patches/proto-lens-protoc-0.2.2.3.patch; - proto-lens-protobuf-types_0_2_2_0 = doJailbreak (super.proto-lens-protobuf-types_0_2_2_0.override { + proto-lens-protobuf-types = doJailbreak (super.proto-lens-protobuf-types.override { inherit proto-lens proto-lens-protoc; });