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

spago: 0.20.0 -> 0.20.1

Browse Source
This commit is contained in:
(cdep)illabout 2021-04-21 22:21:55 +09:00
parent 2d1d0dd3a7
commit cba97fcde5
No known key found for this signature in database
GPG Key ID: 462E0C03D11422F4
2 changed files with 44 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -661,20 +661,26 @@ self: super: builtins.intersectAttrs super {
# fine with newer versions. # fine with newer versions.
spagoWithOverrides = doJailbreak super.spago; spagoWithOverrides = doJailbreak super.spago;
# This defines the version of the purescript-docs-search release we are using. docsSearchApp_0_0_10 = pkgs.fetchurl {
# This is defined in the src/Spago/Prelude.hs file in the spago source. url = "https://github.com/purescript/purescript-docs-search/releases/download/v0.0.10/docs-search-app.js";
docsSearchVersion = "v0.0.10";
docsSearchAppJsFile = pkgs.fetchurl {
url = "https://github.com/spacchetti/purescript-docs-search/releases/download/${docsSearchVersion}/docs-search-app.js";
sha256 = "0m5ah29x290r0zk19hx2wix2djy7bs4plh9kvjz6bs9r45x25pa5"; sha256 = "0m5ah29x290r0zk19hx2wix2djy7bs4plh9kvjz6bs9r45x25pa5";
}; };
purescriptDocsSearchFile = pkgs.fetchurl { docsSearchApp_0_0_11 = pkgs.fetchurl {
url = "https://github.com/spacchetti/purescript-docs-search/releases/download/${docsSearchVersion}/purescript-docs-search"; url = "https://github.com/purescript/purescript-docs-search/releases/download/v0.0.11/docs-search-app.js";
sha256 = "17qngsdxfg96cka1cgrl3zdrpal8ll6vyhhnazqm4hwj16ywjm02";
};
purescriptDocsSearch_0_0_10 = pkgs.fetchurl {
url = "https://github.com/purescript/purescript-docs-search/releases/download/v0.0.10/purescript-docs-search";
sha256 = "0wc1zyhli4m2yykc6i0crm048gyizxh7b81n8xc4yb7ibjqwhyj3"; sha256 = "0wc1zyhli4m2yykc6i0crm048gyizxh7b81n8xc4yb7ibjqwhyj3";
}; };
purescriptDocsSearch_0_0_11 = pkgs.fetchurl {
url = "https://github.com/purescript/purescript-docs-search/releases/download/v0.0.11/purescript-docs-search";
sha256 = "1hjdprm990vyxz86fgq14ajn0lkams7i00h8k2i2g1a0hjdwppq6";
};
spagoFixHpack = overrideCabal spagoWithOverrides (drv: { spagoFixHpack = overrideCabal spagoWithOverrides (drv: {
postUnpack = (drv.postUnpack or "") + '' postUnpack = (drv.postUnpack or "") + ''
# The source for spago is pulled directly from GitHub. It uses a # The source for spago is pulled directly from GitHub. It uses a
@ -695,13 +701,19 @@ self: super: builtins.intersectAttrs super {
# However, they are not actually available in the spago source, so they # However, they are not actually available in the spago source, so they
# need to fetched with nix and put in the correct place. # need to fetched with nix and put in the correct place.
# https://github.com/spacchetti/spago/issues/510 # https://github.com/spacchetti/spago/issues/510
cp ${docsSearchAppJsFile} "$sourceRoot/templates/docs-search-app.js" cp ${docsSearchApp_0_0_10} "$sourceRoot/templates/docs-search-app-0.0.10.js"
cp ${purescriptDocsSearchFile} "$sourceRoot/templates/purescript-docs-search" cp ${docsSearchApp_0_0_11} "$sourceRoot/templates/docs-search-app-0.0.11.js"
cp ${purescriptDocsSearch_0_0_10} "$sourceRoot/templates/purescript-docs-search-0.0.10"
cp ${purescriptDocsSearch_0_0_11} "$sourceRoot/templates/purescript-docs-search-0.0.11"
# For some weird reason, on Darwin, the open(2) call to embed these files # For some weird reason, on Darwin, the open(2) call to embed these files
# requires write permissions. The easiest resolution is just to permit that # requires write permissions. The easiest resolution is just to permit that
# (doesn't cause any harm on other systems). # (doesn't cause any harm on other systems).
chmod u+w "$sourceRoot/templates/docs-search-app.js" "$sourceRoot/templates/purescript-docs-search" chmod u+w \
"$sourceRoot/templates/docs-search-app-0.0.10.js" \
"$sourceRoot/templates/purescript-docs-search-0.0.10" \
"$sourceRoot/templates/docs-search-app-0.0.11.js" \
"$sourceRoot/templates/purescript-docs-search-0.0.11"
''; '';
}); });

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

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