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

spago: 0.14.0 -> 0.15.1

Browse Source
This commit is contained in:
(cdep)illabout 2020-04-15 22:41:09 +09:00 committed by Peter Simons
parent 7932fb22cb
commit a0612c2a06
2 changed files with 15 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -655,22 +655,19 @@ self: super: builtins.intersectAttrs super {
spago = spago =
let let
# Spago needs a patch for MonadFail changes. # Spago needs a small patch to work with the latest versions of rio.
# https://github.com/purescript/spago/pull/584 # https://github.com/purescript/spago/pull/616
# This can probably be removed when a version after spago-0.14.0 is released. # This can probably be removed when a version after spago-0.15.1 is released.
spagoWithPatches = appendPatch super.spago (pkgs.fetchpatch { spagoWithPatches = appendPatch super.spago (pkgs.fetchpatch {
url = "https://github.com/purescript/spago/pull/584/commits/898a8e48665e5a73ea03525ce2c973455ab9ac52.patch"; url = "https://github.com/purescript/spago/pull/616/commits/95b5fa0f1d3bfb07972d1ef5004b8bee8a070667.patch";
sha256 = "05gs1hjlcf60cr6728rhgwwgxp3ildly14v4l2lrh6ma2fljhyjy"; sha256 = "0v3890lwhddfrq9mhbq92962pkxra8kwbin97wg3s0b02dk65ysc";
}); });
# Spago basically compiles with LTS-14, but it requires a newer version # Spago basically compiles with LTS-14, but it requires a newer version
# of directory. This is to work around a bug only present on windows, so # of directory. This is to work around a bug only present on windows, so
# we can safely jailbreak spago and use the older directory package from # we can safely jailbreak spago and use the older directory package from
# LTS-14. # LTS-14.
spagoWithOverrides = doJailbreak (spagoWithPatches.override { spagoWithOverrides = doJailbreak spagoWithPatches;
# spago requires dhall-1.29.0.
dhall = self.dhall_1_29_0;
});
# 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.

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

@ -7,15 +7,15 @@
, prettyprinter, process, QuickCheck, retry, rio, rio-orphans, safe , prettyprinter, process, QuickCheck, retry, rio, rio-orphans, safe
, semver-range, stdenv, stm, tar, template-haskell, temporary, text , semver-range, stdenv, stm, tar, template-haskell, temporary, text
, time, transformers, turtle, unliftio, unordered-containers , time, transformers, turtle, unliftio, unordered-containers
, vector, versions, zlib , vector, versions, with-utf8, zlib
}: }:
mkDerivation { mkDerivation {
pname = "spago"; pname = "spago";
version = "0.14.0"; version = "0.15.1";
src = fetchgit { src = fetchgit {
url = "https://github.com/purescript/spago.git"; url = "https://github.com/purescript/spago.git";
sha256 = "12i1430prqspy73nwfxc17zf51yprhrxxcnhw4rks6jhkgwxf4a4"; sha256 = "09ypbm03ap8xfhq803ra3cc01dxcavckn7nis6hi80dk2xxlhc3d";
rev = "7a99343e4876a465600eaa64b0697a9f0b2a49a9"; rev = "d5d206ff0f5c686f8b609fb4bc2e866959cc0144";
fetchSubmodules = true; fetchSubmodules = true;
}; };
isLibrary = true; isLibrary = true;
@ -25,17 +25,13 @@ mkDerivation {
bytestring Cabal containers dhall directory either exceptions bytestring Cabal containers dhall directory either exceptions
file-embed filepath foldl fsnotify github Glob http-client file-embed filepath foldl fsnotify github Glob http-client
http-conduit lens-family-core megaparsec mtl network-uri http-conduit lens-family-core megaparsec mtl network-uri
open-browser prettyprinter process retry rio rio-orphans safe open-browser optparse-applicative prettyprinter process retry rio
semver-range stm tar template-haskell temporary text time rio-orphans safe semver-range stm tar template-haskell temporary
transformers turtle unliftio unordered-containers vector versions text time transformers turtle unliftio unordered-containers vector
zlib versions with-utf8 zlib
]; ];
libraryToolDepends = [ hpack ]; libraryToolDepends = [ hpack ];
executableHaskellDepends = [ executableHaskellDepends = [ base text turtle with-utf8 ];
aeson-pretty async-pool base bytestring containers dhall filepath
github lens-family-core megaparsec optparse-applicative process
retry stm temporary text time turtle vector
];
testHaskellDepends = [ testHaskellDepends = [
base containers directory extra hspec hspec-megaparsec megaparsec base containers directory extra hspec hspec-megaparsec megaparsec
process QuickCheck temporary text turtle versions process QuickCheck temporary text turtle versions