Merge pull request #118907 from cdepillabout/spago-0.20.0
spago: 0.19.0 -> 0.20.0
This commit is contained in:
commit
b6043ee295
|
@ -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
|
||||
|
|
|
@ -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.
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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;
|
||||
|
|
Loading…
Reference in a new issue