From 91754464d37957710cf778ce78f02a918d4c03d4 Mon Sep 17 00:00:00 2001 From: Malte Brandy Date: Fri, 12 Jun 2020 18:23:52 +0200 Subject: [PATCH] haskellPackages.neuron: Fix build --- .../haskell-modules/configuration-common.nix | 12 +++++ .../configuration-hackage2nix.yaml | 1 + .../haskell-modules/hackage-packages.nix | 53 +++++++++++++++++++ 3 files changed, 66 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index dc593ef893b1..9472414d243f 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 diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index 4da1e312bb35..3acdf164e6f8 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -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 diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index f312b0e69f0d..43b79933b2e8 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -70836,6 +70836,59 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "dhall_1_30_0" = callPackage + ({ mkDerivation, aeson, aeson-pretty, ansi-terminal, atomic-write + , base, bytestring, case-insensitive, cborg, cborg-json, containers + , contravariant, cryptonite, data-fix, deepseq, Diff, directory + , doctest, dotgen, either, exceptions, filepath, foldl, gauge + , generic-random, hashable, haskeline, http-client, http-client-tls + , http-types, lens-family-core, megaparsec, memory, mockery, mtl + , network-uri, optparse-applicative, parser-combinators, parsers + , pretty-simple, prettyprinter, prettyprinter-ansi-terminal + , profunctors, QuickCheck, quickcheck-instances, repline + , scientific, semigroups, serialise, special-values, spoon, tasty + , tasty-expected-failure, tasty-hunit, tasty-quickcheck + , template-haskell, text, th-lift-instances, transformers + , transformers-compat, turtle, unordered-containers, uri-encode + , vector + }: + mkDerivation { + pname = "dhall"; + version = "1.30.0"; + sha256 = "10aagimwa5ycrq15240ff2g7r0n995waa33vaz0h51nqvncrbgpj"; + revision = "1"; + editedCabalFile = "1pazhb3h1rabb80wxh29k5yfp915zqp1gmhcv4mx7ibzv9zw7miq"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson aeson-pretty ansi-terminal atomic-write base bytestring + case-insensitive cborg cborg-json containers contravariant + cryptonite data-fix deepseq Diff directory dotgen either exceptions + filepath hashable haskeline http-client http-client-tls http-types + lens-family-core megaparsec memory mtl network-uri + optparse-applicative parser-combinators parsers pretty-simple + prettyprinter prettyprinter-ansi-terminal profunctors repline + scientific serialise template-haskell text th-lift-instances + transformers transformers-compat unordered-containers uri-encode + vector + ]; + executableHaskellDepends = [ base ]; + testHaskellDepends = [ + base bytestring cborg containers data-fix deepseq directory doctest + either filepath foldl generic-random lens-family-core megaparsec + mockery prettyprinter QuickCheck quickcheck-instances scientific + semigroups serialise special-values spoon tasty + tasty-expected-failure tasty-hunit tasty-quickcheck text + transformers turtle unordered-containers vector + ]; + benchmarkHaskellDepends = [ + base bytestring containers directory gauge serialise text + ]; + description = "A configuration language guaranteed to terminate"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "dhall" = callPackage ({ mkDerivation, aeson, aeson-pretty, ansi-terminal, atomic-write , base, bytestring, case-insensitive, cborg, cborg-json, containers