diff options
author | Peter Simons <simons@cryp.to> | 2020-04-10 20:31:13 +0200 |
---|---|---|
committer | Peter Simons <simons@cryp.to> | 2020-04-10 20:56:39 +0200 |
commit | 6ec9d95a86db4446f219678165b51630a4a5bf78 (patch) | |
tree | 4f98853cdf9c8e30ae7a89152304549a744e6fb9 /pkgs/development/haskell-modules/configuration-tensorflow.nix | |
parent | 08a9d51699f275c2e183e4e40879f28b05b19673 (diff) | |
download | nixpkgs-6ec9d95a86db4446f219678165b51630a4a5bf78.tar nixpkgs-6ec9d95a86db4446f219678165b51630a4a5bf78.tar.gz nixpkgs-6ec9d95a86db4446f219678165b51630a4a5bf78.tar.bz2 nixpkgs-6ec9d95a86db4446f219678165b51630a4a5bf78.tar.lz nixpkgs-6ec9d95a86db4446f219678165b51630a4a5bf78.tar.xz nixpkgs-6ec9d95a86db4446f219678165b51630a4a5bf78.tar.zst nixpkgs-6ec9d95a86db4446f219678165b51630a4a5bf78.zip |
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.
Diffstat (limited to 'pkgs/development/haskell-modules/configuration-tensorflow.nix')
-rw-r--r-- | pkgs/development/haskell-modules/configuration-tensorflow.nix | 13 |
1 files 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; }); |