diff options
| author | Malte Brandy <malte.brandy@maralorn.de> | 2020-06-12 18:23:52 +0200 |
|---|---|---|
| committer | Peter Simons <simons@cryp.to> | 2020-06-19 22:29:21 +0200 |
| commit | 91754464d37957710cf778ce78f02a918d4c03d4 (patch) | |
| tree | e01ce0670055aefdf3acffccc7d88eae57d12416 /pkgs/development/haskell-modules/configuration-common.nix | |
| parent | 1ca0005c6bdf397bc02e39001daca8f311a7cb95 (diff) | |
| download | nixpkgs-91754464d37957710cf778ce78f02a918d4c03d4.tar nixpkgs-91754464d37957710cf778ce78f02a918d4c03d4.tar.gz nixpkgs-91754464d37957710cf778ce78f02a918d4c03d4.tar.bz2 nixpkgs-91754464d37957710cf778ce78f02a918d4c03d4.tar.lz nixpkgs-91754464d37957710cf778ce78f02a918d4c03d4.tar.xz nixpkgs-91754464d37957710cf778ce78f02a918d4c03d4.tar.zst nixpkgs-91754464d37957710cf778ce78f02a918d4c03d4.zip | |
haskellPackages.neuron: Fix build
Diffstat (limited to 'pkgs/development/haskell-modules/configuration-common.nix')
| -rw-r--r-- | pkgs/development/haskell-modules/configuration-common.nix | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index dc593ef893b..9472414d243 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1027,6 +1027,7 @@ self: super: { # 2020-06-04: HACK: dontCheck - The test suite attempts to use the network. # Should be solved when: https://github.com/dhall-lang/dhall-haskell/issues/1837 dhall = generateOptparseApplicativeCompletion "dhall" (dontCheck super.dhall); + dhall_1_30_0 = dontCheck super.dhall_1_30_0; dhall-json = generateOptparseApplicativeCompletions ["dhall-to-json" "dhall-to-yaml"] @@ -1472,4 +1473,15 @@ self: super: { # https://github.com/ocharles/weeder/issues/15 weeder = doJailbreak super.weeder; + # Requested version bump on upstream https://github.com/obsidiansystems/constraints-extras/issues/32 + constraints-extras = doJailbreak super.constraints-extras; + # Requested version bump on upstream https://github.com/srid/rib/issues/160 + rib = doJailbreak (super.rib.override { + dhall = self.dhall_1_30_0; + }); + # Necessary for neuron 0.4.0 + neuron = super.neuron.override { + dhall = self.dhall_1_30_0; + }; + } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super |