Skip to content

Commit

Permalink
haskellPackages.neuron: Fix build
Browse files Browse the repository at this point in the history
  • Loading branch information
maralorn authored and peti committed Jun 19, 2020
1 parent 1ca0005 commit 9175446
Show file tree
Hide file tree
Showing 3 changed files with 66 additions and 0 deletions.
12 changes: 12 additions & 0 deletions pkgs/development/haskell-modules/configuration-common.nix
Expand Up @@ -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"]
Expand Down Expand Up @@ -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
Expand Up @@ -2557,6 +2557,7 @@ extra-packages:
- dbus <1 # for xmonad-0.26
- deepseq == 1.3.0.1 # required to build Cabal with GHC 6.12.3
- dhall == 1.29.0 # required for spago 0.14.0.
- dhall == 1.30.0 # required for neuron 0.4.0.0.
- doctemplates == 0.8 # required by pandoc-2.9.x
- generic-deriving == 1.10.5.* # new versions don't compile with GHC 7.10.x
- ghc-check == 0.3.0.1 # only version compatible with ghcide 0.2.0
Expand Down
53 changes: 53 additions & 0 deletions pkgs/development/haskell-modules/hackage-packages.nix

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 9175446

Please sign in to comment.