spago: 0.12.1.0 -> 0.13.0

This commit is contained in:
(cdep)illabout
2019-12-20 16:12:29 +09:00
committed by Peter Simons
parent 54fad88234
commit b7a5df05c3
6 changed files with 65 additions and 55 deletions

View File

@@ -1,47 +1,14 @@
{ mkDerivation, aeson, aeson-pretty, ansi-terminal, async-pool
, base, bower-json, bytestring, Cabal, containers, dhall, directory
, either, exceptions, extra, fetchgit, file-embed, filepath, foldl
, fsnotify, github, Glob, hpack, hspec, hspec-discover
, hspec-megaparsec, http-client, http-conduit, lens-family-core
, megaparsec, mtl, network-uri, open-browser, optparse-applicative
, prettyprinter, process, QuickCheck, retry, rio, rio-orphans, safe
, semver-range, stdenv, stm, tar, template-haskell, temporary, text
, time, transformers, turtle, unliftio, unordered-containers
, vector, versions, zlib
{ haskellPackages
, haskell
, lib
}:
mkDerivation {
pname = "spago";
version = "0.12.1.0";
src = fetchgit {
url = "https://github.com/spacchetti/spago";
sha256 = "17xgp75yxangmb65sv3raysad31kmc109c4q4aj9dgcdqz23fcn2";
rev = "a4679880402ead320f8be2f091b25d30e27b62df";
fetchSubmodules = true;
haskell.lib.justStaticExecutables (haskell.lib.overrideCabal haskellPackages.spago (oldAttrs: {
maintainers = (oldAttrs.maintainers or []) ++ [
lib.maintainers.cdepillabout
];
passthru = (oldAttrs.passthru or {}) // {
updateScript = ./update.sh;
};
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
aeson aeson-pretty ansi-terminal async-pool base bower-json
bytestring Cabal containers dhall directory either exceptions
file-embed filepath foldl fsnotify github Glob http-client
http-conduit lens-family-core megaparsec mtl network-uri
open-browser prettyprinter process retry rio rio-orphans safe
semver-range stm tar template-haskell temporary text time
transformers turtle unliftio unordered-containers vector versions
zlib
];
libraryToolDepends = [ hpack ];
executableHaskellDepends = [
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 = [
base containers directory extra hspec hspec-megaparsec megaparsec
process QuickCheck temporary text turtle versions
];
testToolDepends = [ hspec-discover ];
prePatch = "hpack";
homepage = "https://github.com/spacchetti/spago#readme";
license = stdenv.lib.licenses.bsd3;
}
}))

View File

@@ -0,0 +1,47 @@
{ mkDerivation, aeson, aeson-pretty, ansi-terminal, async-pool
, base, bower-json, bytestring, Cabal, containers, dhall, directory
, either, exceptions, extra, fetchgit, file-embed, filepath, foldl
, fsnotify, github, Glob, hpack, hspec, hspec-discover
, hspec-megaparsec, http-client, http-conduit, lens-family-core
, megaparsec, mtl, network-uri, open-browser, optparse-applicative
, prettyprinter, process, QuickCheck, retry, rio, rio-orphans, safe
, semver-range, stdenv, stm, tar, template-haskell, temporary, text
, time, transformers, turtle, unliftio, unordered-containers
, vector, versions, zlib
}:
mkDerivation {
pname = "spago";
version = "0.13.0";
src = fetchgit {
url = "https://github.com/spacchetti/spago.git";
sha256 = "158xq5zn32iwswxmpma92763hl6kzq7kb01cyvphmmlilx55b6yk";
rev = "426838670ba9de4593f4c533a6947efb2d8ad4ba";
fetchSubmodules = true;
};
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
aeson aeson-pretty ansi-terminal async-pool base bower-json
bytestring Cabal containers dhall directory either exceptions
file-embed filepath foldl fsnotify github Glob http-client
http-conduit lens-family-core megaparsec mtl network-uri
open-browser prettyprinter process retry rio rio-orphans safe
semver-range stm tar template-haskell temporary text time
transformers turtle unliftio unordered-containers vector versions
zlib
];
libraryToolDepends = [ hpack ];
executableHaskellDepends = [
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 = [
base containers directory extra hspec hspec-megaparsec megaparsec
process QuickCheck temporary text turtle versions
];
testToolDepends = [ hspec-discover ];
prePatch = "hpack";
homepage = "https://github.com/spacchetti/spago#readme";
license = stdenv.lib.licenses.bsd3;
}

View File

@@ -14,7 +14,7 @@ set -eo pipefail
script_dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
# Spago derivation created with cabal2nix.
spago_derivation_file="${script_dir}/default.nix"
spago_derivation_file="${script_dir}/spago.nix"
# This is the current revision of spago in Nixpkgs.
old_version="$(sed -En 's/.*\bversion = "(.*?)".*/\1/p' "$spago_derivation_file")"