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

spago: 0.17.0 -> 0.18.0

Browse Source
This commit is contained in:
(cdep)illabout 2020-12-23 17:30:54 +09:00 committed by Peter Simons
parent 54f0a1be81
commit 2db65a5d1e
3 changed files with 22 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -662,33 +662,9 @@ self: super: builtins.intersectAttrs super {
spago = spago =
let let
# Spago needs a small patch to work with the latest versions of rio.
# https://github.com/purescript/spago/pull/647
spagoWithPatches = overrideCabal (appendPatch super.spago (
# Spago-0.17 needs a small patch to work with the latest version of dhall.
# This can probably be removed with Spago-0.18.
# https://github.com/purescript/spago/pull/695
pkgs.fetchpatch {
url = "https://github.com/purescript/spago/commit/6258ac601480e776c215c989cc5faae46d5ca9f7.patch";
sha256 = "02zy4jf24qlqz9fkcs2rqg64ijd8smncmra8s5yp2mln4dmmii1k";
}
)) (old: {
# The above patch contains a completely new spago.cabal file, but our
# source tree from Hackage already contains a cabal file. Delete the
# local cabal file and just take the one from the patch.
#
# WARNING: The empty line above the `rm` needs to be kept.
prePatch = old.prePatch or "" + ''
rm spago.cabal
'';
# The above patch also adds a dependency on the stringsearch package.
libraryHaskellDepends = old.libraryHaskellDepends or [] ++ [ self.stringsearch ];
});
# 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 spagoWithPatches; spagoWithOverrides = doJailbreak super.spago;
# 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.

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

@ -1,6 +1,9 @@
{ haskell { haskell
, haskellPackages , haskellPackages
, lib , lib
# The following are only needed for the passthru.tests:
, git
, nodejs , nodejs
, purescript , purescript
, runCommand , runCommand
@ -32,6 +35,7 @@ spago.overrideAttrs (oldAttrs: {
{ {
__noChroot = true; __noChroot = true;
nativeBuildInputs = [ nativeBuildInputs = [
git
nodejs nodejs
purescript purescript
spago spago

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

@ -1,21 +1,22 @@
{ mkDerivation, aeson, aeson-pretty, ansi-terminal, async-pool { mkDerivation, aeson, aeson-pretty, ansi-terminal, async-pool
, base, bower-json, bytestring, Cabal, containers, dhall, directory , base, bower-json, bytestring, Cabal, containers, dhall, directory
, either, exceptions, extra, fetchgit, file-embed, filepath, foldl , either, exceptions, extra, fetchgit, file-embed, filepath, foldl
, fsnotify, github, Glob, hpack, hspec, hspec-discover , fsnotify, generic-lens, github, Glob, hpack, hspec
, hspec-megaparsec, http-client, http-conduit, http-types , hspec-discover, hspec-megaparsec, http-client, http-conduit
, lens-family-core, megaparsec, mtl, network-uri, open-browser , http-types, lens-family-core, megaparsec, mtl, network-uri
, optparse-applicative, prettyprinter, process, QuickCheck, retry , open-browser, optparse-applicative, prettyprinter, process
, rio, rio-orphans, safe, semver-range, stdenv, stm, tar , QuickCheck, retry, rio, rio-orphans, safe, semver-range, stdenv
, template-haskell, temporary, text, time, transformers, turtle , stm, stringsearch, tar, template-haskell, temporary, text, time
, unliftio, unordered-containers, vector, versions, with-utf8, zlib , transformers, turtle, unliftio, unordered-containers, utf8-string
, vector, versions, with-utf8, zlib
}: }:
mkDerivation { mkDerivation {
pname = "spago"; pname = "spago";
version = "0.17.0"; version = "0.18.0";
src = fetchgit { src = fetchgit {
url = "https://github.com/purescript/spago.git"; url = "https://github.com/purescript/spago.git";
sha256 = "1w9y1gvk307f92gixs5g02zbg0xwhrshwmc5j97pxhbzzg9qjidy"; sha256 = "03ww7qhrggwsbm0kcnvcr3ifb8rm860ajimzr81isiw46ykwrl38";
rev = "3309afdef25e3e77f991a079eed78ff2f750e463"; rev = "a4d39c21cae2f2c6d43fa204853c8e17c72904d2";
fetchSubmodules = true; fetchSubmodules = true;
}; };
isLibrary = true; isLibrary = true;
@ -23,12 +24,12 @@ mkDerivation {
libraryHaskellDepends = [ libraryHaskellDepends = [
aeson aeson-pretty ansi-terminal async-pool base bower-json aeson aeson-pretty ansi-terminal async-pool base bower-json
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 generic-lens github Glob
http-conduit http-types lens-family-core megaparsec mtl network-uri http-client http-conduit http-types lens-family-core megaparsec mtl
open-browser optparse-applicative prettyprinter process retry rio network-uri open-browser optparse-applicative prettyprinter process
rio-orphans safe semver-range stm tar template-haskell temporary retry rio rio-orphans safe semver-range stm stringsearch tar
text time transformers turtle unliftio unordered-containers vector template-haskell temporary text time transformers turtle unliftio
versions with-utf8 zlib unordered-containers utf8-string vector versions with-utf8 zlib
]; ];
libraryToolDepends = [ hpack ]; libraryToolDepends = [ hpack ];
executableHaskellDepends = [ base text turtle with-utf8 ]; executableHaskellDepends = [ base text turtle with-utf8 ];