From 84902fa84a89ef4b7afacefa7504f1ed8bbd960a Mon Sep 17 00:00:00 2001 From: "(cdep)illabout" Date: Fri, 9 Apr 2021 23:47:09 +0900 Subject: [PATCH 1/2] spago: 0.19.0 -> 0.20.0 --- pkgs/development/haskell-modules/configuration-nix.nix | 4 +--- pkgs/development/tools/purescript/spago/default.nix | 2 ++ pkgs/development/tools/purescript/spago/spago.nix | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index a06caa41064..066830814fd 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -659,9 +659,7 @@ self: super: builtins.intersectAttrs super { let # spago requires an older version of megaparsec, but it appears to work # fine with newer versions. - spagoWithOverrides = doJailbreak (super.spago.override { - dhall = self.dhall_1_37_1; - }); + spagoWithOverrides = doJailbreak super.spago; # This defines the version of the purescript-docs-search release we are using. # This is defined in the src/Spago/Prelude.hs file in the spago source. diff --git a/pkgs/development/tools/purescript/spago/default.nix b/pkgs/development/tools/purescript/spago/default.nix index 62e85a87487..6fef3dd8675 100644 --- a/pkgs/development/tools/purescript/spago/default.nix +++ b/pkgs/development/tools/purescript/spago/default.nix @@ -3,6 +3,7 @@ , lib # The following are only needed for the passthru.tests: +, cacert , git , nodejs , purescript @@ -35,6 +36,7 @@ spago.overrideAttrs (oldAttrs: { { __noChroot = true; nativeBuildInputs = [ + cacert git nodejs purescript diff --git a/pkgs/development/tools/purescript/spago/spago.nix b/pkgs/development/tools/purescript/spago/spago.nix index 58458ea79aa..eca516bbeba 100644 --- a/pkgs/development/tools/purescript/spago/spago.nix +++ b/pkgs/development/tools/purescript/spago/spago.nix @@ -12,11 +12,11 @@ }: mkDerivation { pname = "spago"; - version = "0.19.0"; + version = "0.20.0"; src = fetchgit { url = "https://github.com/purescript/spago.git"; - sha256 = "182a9pkv64rbyqrig470cmql4ingf5vpxh11xkxqq2baxym3vwip"; - rev = "960a310d6efca3bb40009eb06d88382e4670ccef"; + sha256 = "1n48p9ycry8bjnf9jlcfgyxsbgn5985l4vhbwlv46kbb41ddwi51"; + rev = "7dfd2236aff92e5ae4f7a4dc336b50a7e14e4f44"; fetchSubmodules = true; }; isLibrary = true; From 8c36813a426d258f7a142ec2f44c318e0a385e34 Mon Sep 17 00:00:00 2001 From: "(cdep)illabout" Date: Sat, 10 Apr 2021 00:04:42 +0900 Subject: [PATCH 2/2] haskellPackages: remove dhall_1_37_1 extra package because it is no longer used --- pkgs/development/haskell-modules/configuration-hackage2nix.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index 07f3ba4dfa2..b8c11ee4aac 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -2774,7 +2774,6 @@ extra-packages: - Cabal == 3.2.* # required for cabal-install etc. - base16-bytestring < 1 # required for cabal-install etc. - dhall == 1.29.0 # required for ats-pkg - - dhall == 1.37.1 # required for spago 0.19.0. - Diff < 0.4 # required by liquidhaskell-0.8.10.2: https://github.com/ucsd-progsys/liquidhaskell/issues/1729 - ghc-tcplugins-extra ==0.3.2 # required for polysemy-plugin 0.2.5.0 - haddock == 2.23.* # required on GHC < 8.10.x