public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #118907 from cdepillabout/spago-0.20.0

Browse Source 
spago: 0.19.0 -> 0.20.0
This commit is contained in:
Dennis Gosnell 2021-04-10 00:40:43 +09:00 committed by GitHub
commit b6043ee295
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pkgs/development/haskell-modules/configuration-hackage2nix.yaml
View File

@ -2774,7 +2774,6 @@ extra-packages:
- Cabal == 3.2.* # required for cabal-install etc. - Cabal == 3.2.* # required for cabal-install etc.
- base16-bytestring < 1 # required for cabal-install etc. - base16-bytestring < 1 # required for cabal-install etc.
- dhall == 1.29.0 # required for ats-pkg - 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 - 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 - ghc-tcplugins-extra ==0.3.2 # required for polysemy-plugin 0.2.5.0
- haddock == 2.23.* # required on GHC < 8.10.x - haddock == 2.23.* # required on GHC < 8.10.x

4
pkgs/development/haskell-modules/configuration-nix.nix
View File

@ -659,9 +659,7 @@ self: super: builtins.intersectAttrs super {
let let
# spago requires an older version of megaparsec, but it appears to work # spago requires an older version of megaparsec, but it appears to work
# fine with newer versions. # fine with newer versions.
spagoWithOverrides = doJailbreak (super.spago.override { spagoWithOverrides = doJailbreak super.spago;
dhall = self.dhall_1_37_1;
});
# This defines the version of the purescript-docs-search release we are using. # 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. # This is defined in the src/Spago/Prelude.hs file in the spago source.

2
pkgs/development/tools/purescript/spago/default.nix
View File

@ -3,6 +3,7 @@
, lib , lib
# The following are only needed for the passthru.tests: # The following are only needed for the passthru.tests:
, cacert
, git , git
, nodejs , nodejs
, purescript , purescript
@ -35,6 +36,7 @@ spago.overrideAttrs (oldAttrs: {
{ {
__noChroot = true; __noChroot = true;
nativeBuildInputs = [ nativeBuildInputs = [
cacert
git git
nodejs nodejs
purescript purescript

6
pkgs/development/tools/purescript/spago/spago.nix
View File

@ -12,11 +12,11 @@
}: }:
mkDerivation { mkDerivation {
pname = "spago"; pname = "spago";
version = "0.19.0"; version = "0.20.0";
src = fetchgit { src = fetchgit {
url = "https://github.com/purescript/spago.git"; url = "https://github.com/purescript/spago.git";
sha256 = "182a9pkv64rbyqrig470cmql4ingf5vpxh11xkxqq2baxym3vwip"; sha256 = "1n48p9ycry8bjnf9jlcfgyxsbgn5985l4vhbwlv46kbb41ddwi51";
rev = "960a310d6efca3bb40009eb06d88382e4670ccef"; rev = "7dfd2236aff92e5ae4f7a4dc336b50a7e14e4f44";
fetchSubmodules = true; fetchSubmodules = true;
}; };
isLibrary = true; isLibrary = true;