diff options
author | Dennis Gosnell <cdep.illabout@gmail.com> | 2021-05-07 20:05:11 +0900 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-05-07 20:05:11 +0900 |
commit | f73c2278d07e674233040422b71d965a0587756f (patch) | |
tree | 9b368e4f6d400c622912b697cbcdbeccfaadb2f3 /pkgs/development/tools | |
parent | ffc669baf944dfc0556abf4efda0fb46d19df97c (diff) | |
parent | 774b4d678375cd0c2a7a2e95ff16ed5cd3f0cb86 (diff) | |
download | nixpkgs-f73c2278d07e674233040422b71d965a0587756f.tar nixpkgs-f73c2278d07e674233040422b71d965a0587756f.tar.gz nixpkgs-f73c2278d07e674233040422b71d965a0587756f.tar.bz2 nixpkgs-f73c2278d07e674233040422b71d965a0587756f.tar.lz nixpkgs-f73c2278d07e674233040422b71d965a0587756f.tar.xz nixpkgs-f73c2278d07e674233040422b71d965a0587756f.tar.zst nixpkgs-f73c2278d07e674233040422b71d965a0587756f.zip |
Merge pull request #121970 from cdepillabout/spago-0.20.2
spago: 0.20.1 -> 0.20.2
Diffstat (limited to 'pkgs/development/tools')
-rw-r--r-- | pkgs/development/tools/purescript/spago/spago.nix | 38 | ||||
-rwxr-xr-x | pkgs/development/tools/purescript/spago/update.sh | 7 |
2 files changed, 24 insertions, 21 deletions
diff --git a/pkgs/development/tools/purescript/spago/spago.nix b/pkgs/development/tools/purescript/spago/spago.nix index ed8da83e30a..0bd33f19f8e 100644 --- a/pkgs/development/tools/purescript/spago/spago.nix +++ b/pkgs/development/tools/purescript/spago/spago.nix @@ -1,37 +1,38 @@ +# This has been automatically generated by the script +# ./update.sh. This should not be changed by hand. { mkDerivation, aeson, aeson-pretty, ansi-terminal, async-pool -, base, bower-json, bytestring, Cabal, containers, cryptonite -, dhall, directory, either, extra, fetchgit, file-embed, filepath -, foldl, fsnotify, generic-lens, Glob, hpack, hspec, hspec-discover +, base, bower-json, bytestring, containers, cryptonite, dhall +, directory, either, extra, fetchgit, file-embed, filepath, foldl +, fsnotify, generic-lens, Glob, hspec, hspec-discover , hspec-megaparsec, http-client, http-conduit, http-types , lens-family-core, lib, megaparsec, mtl, network-uri, open-browser , optparse-applicative, prettyprinter, process, QuickCheck, retry -, rio, rio-orphans, safe, semver-range, stm, stringsearch -, tar, template-haskell, temporary, text, time, transformers -, turtle, unliftio, unordered-containers, utf8-string, versions -, with-utf8, zlib +, rio, rio-orphans, safe, semver-range, stm, stringsearch, tar +, template-haskell, temporary, text, time, transformers, turtle +, unliftio, unordered-containers, utf8-string, versions, with-utf8 +, zlib }: mkDerivation { pname = "spago"; - version = "0.20.1"; + version = "0.20.2"; src = fetchgit { url = "https://github.com/purescript/spago.git"; - sha256 = "1j2yi6zz9m0k0298wllin39h244v8b2rx87yxxgdbjg77kn96vxg"; - rev = "41ad739614f4f2c2356ac921308f9475a5a918f4"; + sha256 = "11jh3bszvl8zfi4xcabpx43jply28dxdywd6fadxspaa05jdxxn2"; + rev = "0f38c9153e46f30e9d87963e181f5c1a595f4b64"; fetchSubmodules = true; }; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson aeson-pretty ansi-terminal async-pool base bower-json - bytestring Cabal containers cryptonite dhall directory either - file-embed filepath foldl fsnotify generic-lens Glob http-client - http-conduit http-types lens-family-core megaparsec mtl network-uri - open-browser optparse-applicative prettyprinter process retry rio - rio-orphans safe semver-range stm stringsearch tar template-haskell - temporary text time transformers turtle unliftio - unordered-containers utf8-string versions with-utf8 zlib + bytestring containers cryptonite dhall directory either file-embed + filepath foldl fsnotify generic-lens Glob http-client http-conduit + http-types lens-family-core megaparsec mtl network-uri open-browser + optparse-applicative prettyprinter process retry rio rio-orphans + safe semver-range stm stringsearch tar template-haskell temporary + text time transformers turtle unliftio unordered-containers + utf8-string versions with-utf8 zlib ]; - libraryToolDepends = [ hpack ]; executableHaskellDepends = [ ansi-terminal base text turtle with-utf8 ]; @@ -40,7 +41,6 @@ mkDerivation { process QuickCheck temporary text turtle versions ]; testToolDepends = [ hspec-discover ]; - prePatch = "hpack"; homepage = "https://github.com/purescript/spago#readme"; license = lib.licenses.bsd3; } diff --git a/pkgs/development/tools/purescript/spago/update.sh b/pkgs/development/tools/purescript/spago/update.sh index 74bc0105066..12595885df3 100755 --- a/pkgs/development/tools/purescript/spago/update.sh +++ b/pkgs/development/tools/purescript/spago/update.sh @@ -1,5 +1,5 @@ #!/usr/bin/env nix-shell -#!nix-shell -i bash -p cabal2nix curl jq +#!nix-shell -i bash -p cabal2nix curl jq haskellPackages.cabal2nix-unstable -I nixpkgs=. # # This script will update the spago derivation to the latest version using # cabal2nix. @@ -25,7 +25,10 @@ new_version=$(curl --silent "https://api.github.com/repos/purescript/spago/relea echo "Updating spago from old version $old_version to new version $new_version." echo "Running cabal2nix and outputting to ${spago_derivation_file}..." -cabal2nix --revision "$new_version" "https://github.com/purescript/spago.git" > "$spago_derivation_file" +echo "# This has been automatically generated by the script" > "$spago_derivation_file" +echo "# ./update.sh. This should not be changed by hand." >> "$spago_derivation_file" + +cabal2nix --revision "$new_version" "https://github.com/purescript/spago.git" >> "$spago_derivation_file" # TODO: This should ideally also automatically update the docsSearchVersion # from pkgs/development/haskell/configuration-nix.nix. |