Merge commit '891f607d5301d6730cb1f9dcf3618bcb1ab7f10e'

1 files changed, 22 insertions, 21 deletions

diff --git a/nixpkgs/pkgs/development/tools/purescript/spago/spago.nix b/nixpkgs/pkgs/development/tools/purescript/spago/spago.nix
index 43f8e66d8704..3f54a4f9c0ee 100644
--- a/nixpkgs/pkgs/development/tools/purescript/spago/spago.nix
+++ b/nixpkgs/pkgs/development/tools/purescript/spago/spago.nix
@@ -1,35 +1,36 @@
 { 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, generic-lens, github, Glob, hpack, hspec
-, hspec-discover, hspec-megaparsec, http-client, http-conduit
-, http-types, lens-family-core, megaparsec, mtl, network-uri
-, open-browser, optparse-applicative, prettyprinter, process
-, QuickCheck, retry, rio, rio-orphans, safe, semver-range, stdenv
-, stm, stringsearch, tar, template-haskell, temporary, text, time
-, transformers, turtle, unliftio, unordered-containers, utf8-string
-, vector, versions, with-utf8, zlib
+, base, bower-json, bytestring, Cabal, containers, cryptonite
+, dhall, directory, either, exceptions, extra, fetchgit, file-embed
+, filepath, foldl, fsnotify, generic-lens, github, Glob, hpack
+, hspec, hspec-discover, hspec-megaparsec, http-client
+, http-conduit, http-types, lens-family-core, megaparsec, mtl
+, network-uri, open-browser, optparse-applicative, prettyprinter
+, process, QuickCheck, retry, rio, rio-orphans, safe, semver-range
+, lib, stdenv, stm, stringsearch, tar, template-haskell, temporary, text
+, time, transformers, turtle, unliftio, unordered-containers
+, utf8-string, vector, versions, with-utf8, zlib
 }:
 mkDerivation {
   pname = "spago";
-  version = "0.18.0";
+  version = "0.19.0";
   src = fetchgit {
     url = "https://github.com/purescript/spago.git";
-    sha256 = "03ww7qhrggwsbm0kcnvcr3ifb8rm860ajimzr81isiw46ykwrl38";
-    rev = "a4d39c21cae2f2c6d43fa204853c8e17c72904d2";
+    sha256 = "182a9pkv64rbyqrig470cmql4ingf5vpxh11xkxqq2baxym3vwip";
+    rev = "960a310d6efca3bb40009eb06d88382e4670ccef";
     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 generic-lens github 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 vector versions with-utf8 zlib
+    bytestring Cabal containers cryptonite dhall directory either
+    exceptions file-embed filepath foldl fsnotify generic-lens github
+    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 vector versions
+    with-utf8 zlib
   ];
   libraryToolDepends = [ hpack ];
   executableHaskellDepends = [ base text turtle with-utf8 ];
@@ -40,5 +41,5 @@ mkDerivation {
   testToolDepends = [ hspec-discover ];
   prePatch = "hpack";
   homepage = "https://github.com/purescript/spago#readme";
-  license = stdenv.lib.licenses.bsd3;
+  license = lib.licenses.bsd3;
 }