git.iko.soy/typeable/stackage2nix
on master help sign in
swap
a78e43325 ahead, 0 behind
.travis.yml+3−7
since splitsnapshots
unifiedsplit
@@ -12,14 +12,10 @@ cache:
12 - $HOME/.local/bin
12 - $HOME/.local/bin
13 - $HOME/.stack
13 - $HOME/.stack
14
14
15−env:
16− - STACK_YAML=stack-ghc-802.yaml
17− - STACK_YAML=stack-ghc-822.yaml
18−
19jobs:
15jobs:
20 include:
16 include:
17+ - stage: build
21 - stage: bootstrap
18 - stage: bootstrap
22− env: STACK_YAML=stack-ghc-822.yaml
23 install:
19 install:
24 # Install Nix
20 # Install Nix
25 - mkdir -p ~/.nix
21 - mkdir -p ~/.nix
@@ -29,10 +25,10 @@ jobs:
29 - curl https://nixos.org/nix/install | sh
25 - curl https://nixos.org/nix/install | sh
30 - source ~/.nix-profile/etc/profile.d/nix.sh
26 - source ~/.nix-profile/etc/profile.d/nix.sh
31 # nixpkgs-unstable not supported
27 # nixpkgs-unstable not supported
32− - nix-channel --add https://nixos.org/channels/nixos-17.09 nixpkgs
28+ - nix-channel --add https://nixos.org/channels/nixos-18.03 nixpkgs
33 - nix-channel --update
29 - nix-channel --update
34 script:
30 script:
35− - nix-env -i cabal-install
31+ - nix-env -i cabal-install nix-prefetch-scripts
36 - cabal update
32 - cabal update
37 - nix-build nix/stackage2nix --dry-run
33 - nix-build nix/stackage2nix --dry-run
38 - ./ci-stackage2nix --dry-run
34 - ./ci-stackage2nix --dry-run
CHANGELOG.md+28−15
@@ -1,12 +1,24 @@
1−# 0.3.0
1+# 0.7.2
2−- Initial Hackage release
2+- Build with ghc-8.4
3−- Add CHANGELOG.md
3+- Drop compatibility with Cabal<2.2
4+- Don't check extra-deps when generating derivation from stack.yaml
4
5
5−# 0.4.0
6+# 0.7.1
6−- Add `--resolver` option to generate full stackage packages set
7+- Generate stack packages `stack-yaml-packages.nix`
7−- Add Nix wrapper, see `nix/README.md`
8+
8−- Upd support cabal2nix >2.5
9+# 0.7.0
9−- Fix honor `--hackage-db` flag
10+- Add compatibility with nixos-18.03
11+- Drop compatibility with nixos-17-09
12+- Add partial support for new stack extra-deps syntax.
13+ https://docs.haskellstack.org/en/stable/yaml_configuration/#packages-and-extra-deps
14+ Supported same syntax for packages and extra-deps sections
15+
16+# 0.6.1
17+- Pass extra `buildHaskellPackages` argument to `makePackageSet` function
18+
19+# 0.6.0
20+- Replace call to `<nixpkgs/pkgs/development/haskell-modules>` in generated
21+ Haskell packages with `makePackageSet` library function
10
22
11# 0.5.0
23# 0.5.0
12- Add `--with-stackage` and `--with-stackage-closure` flag generates stackage
24- Add `--with-stackage` and `--with-stackage-closure` flag generates stackage
@@ -26,11 +38,12 @@
26- Remove `--no-packages-closure` flag (use `--with-stackage-closure`)
38- Remove `--no-packages-closure` flag (use `--with-stackage-closure`)
27- Remove `cabal2nix < 2.7.2` support #45
39- Remove `cabal2nix < 2.7.2` support #45
28
40
29−# 0.6.0
41+# 0.4.0
30−
42+- Add `--resolver` option to generate full stackage packages set
31−- Replace call to `<nixpkgs/pkgs/development/haskell-modules>` in generated
43+- Add Nix wrapper, see `nix/README.md`
32− Haskell packages with `makePackageSet` library function
44+- Upd support cabal2nix >2.5
33−
45+- Fix honor `--hackage-db` flag
34−# 0.6.1
35
46
36−- Pass extra `buildHaskellPackages` argument to `makePackageSet` function
47+# 0.3.0
48+- Initial Hackage release
49+- Add CHANGELOG.md
README.md+7−6
@@ -1,4 +1,4 @@
1−# stackage2nix
1+# stackage2nix (DEPRECATED)
2
2
3[![Build Status](https://travis-ci.org/typeable/stackage2nix.svg?branch=master)](https://travis-ci.org/typeable/stackage2nix)
3[![Build Status](https://travis-ci.org/typeable/stackage2nix.svg?branch=master)](https://travis-ci.org/typeable/stackage2nix)
4
4
@@ -36,11 +36,12 @@ stack exec -- stackage2nix \
36 ./stack.yaml
36 ./stack.yaml
37```
37```
38
38
39−To generate Stackage packages, you should supply additional
39+To generate Stackage packages, supply the `--all-cabal-hashes` flag
40−`--all-cabal-hashes` and `--lts-haskell` flags that points to
40+with the path to a local clone of
41−[commercialhaskell/all-cabal-hashes](https://github.com/commercialhaskell)
41+[all-cabal-hashes](https://github.com/commercialhaskell/all-cabal-hashes)
42−checked out to `hackage` branch and
42+checked out on the `hackage` branch and supply the `--lts-haskell` flag
43+with the path to a local clone of
43−[fpco/lts-haskell](https://github.com/fpco/lts-haskell) respectively.
44+[lts-haskell](https://github.com/commercialhaskell/lts-haskell).
44
45
45### stackage2nix wrapper
46### stackage2nix wrapper
46
47
ci-stackage2nix+7−7
@@ -4,21 +4,21 @@ set -e
4
4
5STACKAGE2NIX_WORK_DIR=${STACKAGE2NIX_WORK_DIR:-$HOME}
5STACKAGE2NIX_WORK_DIR=${STACKAGE2NIX_WORK_DIR:-$HOME}
6STACKAGE_REPO=${STACKAGE_REPO:-$STACKAGE2NIX_WORK_DIR/lts-haskell}
6STACKAGE_REPO=${STACKAGE_REPO:-$STACKAGE2NIX_WORK_DIR/lts-haskell}
7−ALL_CABAL_HASHES_DIR=${ALL_CABAL_HASHES_DIR:-$STACKAGE2NIX_WORK_DIR/all-cabal-hashes}
7+ALL_CABAL_HASHES_REPO=${ALL_CABAL_HASHES_REPO:-$STACKAGE2NIX_WORK_DIR/all-cabal-hashes}
8−STACK_FILE=${STACK_YAML:-.}
8+STACK_FILE=${STACK_YAML:-stack.yaml}
9
9
10if [ ! -d "$STACKAGE_REPO" ]; then
10if [ ! -d "$STACKAGE_REPO" ]; then
11− git clone --depth 1 https://github.com/fpco/lts-haskell.git "$STACKAGE_REPO"
11+ git clone --depth 1 https://github.com/commercialhaskell/lts-haskell.git "$STACKAGE_REPO"
12fi
12fi
13
13
14−if [ ! -d "$ALL_CABAL_HASHES_DIR" ]; then
14+if [ ! -d "$ALL_CABAL_HASHES_REPO" ]; then
15− git clone --branch hackage https://github.com/commercialhaskell/all-cabal-hashes.git "$ALL_CABAL_HASHES_DIR"
15+ git clone --branch hackage https://github.com/commercialhaskell/all-cabal-hashes.git "$ALL_CABAL_HASHES_REPO"
16fi
16fi
17
17
18set -x
18set -x
19−time stack exec -- stackage2nix \
19+time stackage2nix \
20 --lts-haskell "$STACKAGE_REPO" \
20 --lts-haskell "$STACKAGE_REPO" \
21− --all-cabal-hashes "$ALL_CABAL_HASHES_DIR" \
21+ --all-cabal-hashes "$ALL_CABAL_HASHES_REPO" \
22 --hackage-db "$HOME/.cabal/packages/hackage.haskell.org/01-index.tar" \
22 --hackage-db "$HOME/.cabal/packages/hackage.haskell.org/01-index.tar" \
23 --with-stackage-closure \
23 --with-stackage-closure \
24 "$STACK_FILE"
24 "$STACK_FILE"
nix/haskell-packages/configuration-packages.nix+4−9
@@ -1,4 +1,4 @@
1−# Generated by stackage2nix 0.6.1 from "/home/dbushev/projects/fpco/lts-haskell/lts-10.0.yaml"
1+# Generated by stackage2nix 0.7.1 from "/home/dbushev/projects/commercialhaskell/lts-haskell/lts-12.2.yaml"
2{ pkgs, haskellLib }:
2{ pkgs, haskellLib }:
3
3
4with haskellLib; self: super: {
4with haskellLib; self: super: {
@@ -16,7 +16,6 @@ with haskellLib; self: super: {
16 "ghc-boot-th" = null;
16 "ghc-boot-th" = null;
17 "ghc-prim" = null;
17 "ghc-prim" = null;
18 "ghci" = null;
18 "ghci" = null;
19− "hoopl" = null;
20 "hpc" = null;
19 "hpc" = null;
21 "integer-gmp" = null;
20 "integer-gmp" = null;
22 "pretty" = null;
21 "pretty" = null;
@@ -27,19 +26,15 @@ with haskellLib; self: super: {
27 "time" = null;
26 "time" = null;
28 "transformers" = null;
27 "transformers" = null;
29 "unix" = null;
28 "unix" = null;
30− # break cycle: HUnit call-stack nanospec hspec hspec-core ansi-terminal colour test-framework ansi-wl-pprint xml text test-framework-hunit test-framework-quickcheck2 async hspec-expectations hspec-meta quickcheck-io silently temporary base-compat exceptions tasty clock tasty-quickcheck tasty-hunit optparse-applicative regex-tdfa parsec hspec-discover stringbuilder
29+ # break cycle: HUnit call-stack nanospec hspec hspec-core clock tasty async hashable test-framework-hunit tasty-quickcheck tasty-hunit hspec-expectations hspec-meta quickcheck-io silently temporary exceptions hspec-discover stringbuilder
31 "stringbuilder" = dontCheck super.stringbuilder;
30 "stringbuilder" = dontCheck super.stringbuilder;
32 "hspec-discover" = dontCheck super.hspec-discover;
31 "hspec-discover" = dontCheck super.hspec-discover;
33− "clock" = dontCheck super.clock;
34 "exceptions" = dontCheck super.exceptions;
32 "exceptions" = dontCheck super.exceptions;
35− "base-compat" = dontCheck super.base-compat;
36 "temporary" = dontCheck super.temporary;
33 "temporary" = dontCheck super.temporary;
37 "silently" = dontCheck super.silently;
34 "silently" = dontCheck super.silently;
35+ "hashable" = dontCheck super.hashable;
38 "async" = dontCheck super.async;
36 "async" = dontCheck super.async;
39− "text" = dontCheck super.text;
37+ "clock" = dontCheck super.clock;
40− "colour" = dontCheck super.colour;
41 "nanospec" = dontCheck super.nanospec;
38 "nanospec" = dontCheck super.nanospec;
42− # break cycle: statistics monad-par mwc-random vector-algorithms
43− "mwc-random" = dontCheck super.mwc-random;
44
39
45}
40}
nix/haskell-packages/default.nix+136−43
@@ -1,4 +1,4 @@
1−# Generated by stackage2nix 0.6.1 from "../../stack-ghc-822.yaml"
1+# Generated by stackage2nix 0.7.1 from "../../stack.yaml"
2{ nixpkgs ? import <nixpkgs> {} }:
2{ nixpkgs ? import <nixpkgs> {} }:
3
3
4with nixpkgs;
4with nixpkgs;
@@ -11,44 +11,6 @@ let
11 { pkgs, stdenv, callPackage }:
11 { pkgs, stdenv, callPackage }:
12
12
13 self: {
13 self: {
14− "cabal2nix" = callPackage
15− ({ mkDerivation, aeson, ansi-wl-pprint, base, bytestring, Cabal
16− , cabal-doctest, containers, deepseq, directory
17− , distribution-nixpkgs, doctest, filepath, hackage-db, hopenssl
18− , hpack, language-nix, lens, monad-par, monad-par-extras, mtl
19− , optparse-applicative, pretty, process, split, text, time
20− , transformers, utf8-string, yaml
21− }:
22− mkDerivation {
23− pname = "cabal2nix";
24− version = "2.7.2";
25− sha256 = "1efe847160adda73c9cf7bb39426e4522a95e9338b5048d171fdc27a4f52e68c";
26− isLibrary = true;
27− isExecutable = true;
28− setupHaskellDepends = [ base Cabal cabal-doctest ];
29− libraryHaskellDepends = [
30− aeson ansi-wl-pprint base bytestring Cabal containers deepseq
31− directory distribution-nixpkgs filepath hackage-db hopenssl hpack
32− language-nix lens optparse-applicative pretty process split text
33− time transformers yaml
34− ];
35− executableHaskellDepends = [
36− aeson ansi-wl-pprint base bytestring Cabal containers deepseq
37− directory distribution-nixpkgs filepath hackage-db hopenssl hpack
38− language-nix lens monad-par monad-par-extras mtl
39− optparse-applicative pretty process split text time transformers
40− utf8-string yaml
41− ];
42− testHaskellDepends = [
43− aeson ansi-wl-pprint base bytestring Cabal containers deepseq
44− directory distribution-nixpkgs doctest filepath hackage-db hopenssl
45− hpack language-nix lens optparse-applicative pretty process split
46− text time transformers yaml
47− ];
48− homepage = "https://github.com/nixos/cabal2nix#readme";
49− description = "Convert Cabal files into Nix build instructions";
50− license = stdenv.lib.licenses.bsd3;
51− }) {};
52 "stackage2nix" = callPackage
14 "stackage2nix" = callPackage
53 ({ mkDerivation, aeson, base, bytestring, Cabal, cabal2nix
15 ({ mkDerivation, aeson, base, bytestring, Cabal, cabal2nix
54 , containers, deepseq, distribution-nixpkgs, exceptions, filepath
16 , containers, deepseq, distribution-nixpkgs, exceptions, filepath
@@ -59,7 +21,7 @@ let
59 }:
21 }:
60 mkDerivation {
22 mkDerivation {
61 pname = "stackage2nix";
23 pname = "stackage2nix";
62− version = "0.6.1";
24+ version = "0.7.1";
63 src = ../../.;
25 src = ../../.;
64 isLibrary = true;
26 isLibrary = true;
65 isExecutable = true;
27 isExecutable = true;
@@ -72,21 +34,152 @@ let
72 ];
34 ];
73 executableHaskellDepends = [ base ];
35 executableHaskellDepends = [ base ];
74 testHaskellDepends = [
36 testHaskellDepends = [
75− base bytestring Cabal hspec pretty shakespeare text yaml
37+ base bytestring Cabal hspec network-uri pretty shakespeare text
38+ yaml
76 ];
39 ];
77 homepage = "https://github.com/typeable/stackage2nix#readme";
40 homepage = "https://github.com/typeable/stackage2nix#readme";
78 description = "Convert Stack files into Nix build instructions";
41 description = "Convert Stack files into Nix build instructions";
79 license = stdenv.lib.licenses.bsd3;
42 license = stdenv.lib.licenses.bsd3;
80 }) {};
43 }) {};
44+ "yaml" = callPackage
45+ ({ mkDerivation, aeson, attoparsec, base, bytestring, conduit
46+ , containers, directory, filepath, resourcet, scientific
47+ , semigroups, template-haskell, text, transformers
48+ , unordered-containers, vector
49+ }:
50+ mkDerivation {
51+ pname = "yaml";
52+ version = "0.8.31.1";
53+ sha256 = "1ba1451917e6cb1df6081e2e14c2e4dcec6969b9b25a5d72db96942c3e6d8b53";
54+ isLibrary = true;
55+ isExecutable = true;
56+ libraryHaskellDepends = [
57+ aeson attoparsec base bytestring conduit containers directory
58+ filepath resourcet scientific semigroups template-haskell text
59+ transformers unordered-containers vector
60+ ];
61+ doHaddock = false;
62+ doCheck = false;
63+ homepage = "http://github.com/snoyberg/yaml/";
64+ description = "Support for parsing and rendering YAML documents";
65+ license = stdenv.lib.licenses.bsd3;
66+ }) {};
67+ "stackage-curator" = callPackage
68+ ({ mkDerivation, aeson, amazonka, amazonka-core, amazonka-s3, async
69+ , base, blaze-html, bytestring, Cabal, classy-prelude-conduit
70+ , conduit, conduit-extra, containers, cryptonite
71+ , cryptonite-conduit, data-default-class, directory, exceptions
72+ , fetchgit, filepath, hashable, html-conduit, http-client
73+ , http-client-tls, http-conduit, lucid, memory, mime-types
74+ , mono-traversable, mtl, old-locale, optparse-applicative
75+ , optparse-simple, process, resourcet, safe, semigroups, stm, store
76+ , streaming-commons, syb, tar, temporary, text, time, transformers
77+ , unix-compat, unordered-containers, utf8-string, vector
78+ , xml-conduit, xml-types, yaml, zlib
79+ }:
80+ mkDerivation {
81+ pname = "stackage-curator";
82+ version = "0.17.0.0";
83+ src = fetchgit {
84+ url = "https://github.com/fpco/stackage-curator.git";
85+ sha256 = "0hymmzn59aszqxqs5s0mba8pzrky8wpkmy7hdgaxqrhg0syc6mkw";
86+ rev = "73c5ed06602990c33d3fec1711e27875f283b6bf";
87+ };
88+ isLibrary = true;
89+ isExecutable = true;
90+ libraryHaskellDepends = [
91+ aeson amazonka amazonka-core amazonka-s3 async base blaze-html
92+ bytestring Cabal classy-prelude-conduit conduit conduit-extra
93+ containers cryptonite cryptonite-conduit data-default-class
94+ directory exceptions filepath hashable html-conduit http-client
95+ http-client-tls http-conduit lucid memory mime-types
96+ mono-traversable mtl old-locale process resourcet safe semigroups
97+ stm store streaming-commons syb tar temporary text time
98+ transformers unix-compat unordered-containers utf8-string vector
99+ xml-conduit xml-types yaml zlib
100+ ];
101+ executableHaskellDepends = [
102+ aeson amazonka amazonka-core amazonka-s3 async base blaze-html
103+ bytestring Cabal classy-prelude-conduit conduit conduit-extra
104+ containers cryptonite cryptonite-conduit data-default-class
105+ directory exceptions filepath hashable html-conduit http-client
106+ http-client-tls http-conduit lucid memory mime-types
107+ mono-traversable mtl old-locale optparse-applicative
108+ optparse-simple process resourcet safe semigroups stm store
109+ streaming-commons syb tar temporary text time transformers
110+ unix-compat unordered-containers utf8-string vector xml-conduit
111+ xml-types yaml zlib
112+ ];
113+ doHaddock = false;
114+ doCheck = false;
115+ homepage = "https://github.com/fpco/stackage-curator#readme";
116+ description = "Tools for curating Stackage bundles";
117+ license = stdenv.lib.licenses.mit;
118+ }) {};
119+ "gitlib" = callPackage
120+ ({ mkDerivation, base, base16-bytestring, bytestring, conduit
121+ , conduit-combinators, containers, directory, exceptions, fetchgit
122+ , filepath, hashable, mtl, resourcet, semigroups, tagged, text
123+ , time, transformers, unix, unliftio, unliftio-core
124+ , unordered-containers
125+ }:
126+ mkDerivation {
127+ pname = "gitlib";
128+ version = "3.1.2";
129+ src = fetchgit {
130+ url = "https://github.com/jwiegley/gitlib.git";
131+ sha256 = "0rp6lnbbbf9m6fvmx7mzknrk89ly0gbqaxsfx38cn6qdy7r54xcm";
132+ rev = "70c99759b8b9377f67492fe29afb32f05882409d";
133+ };
134+ postUnpack = "sourceRoot+=/gitlib; echo source root reset to $sourceRoot";
135+ libraryHaskellDepends = [
136+ base base16-bytestring bytestring conduit conduit-combinators
137+ containers directory exceptions filepath hashable mtl resourcet
138+ semigroups tagged text time transformers unix unliftio
139+ unliftio-core unordered-containers
140+ ];
141+ doHaddock = false;
142+ doCheck = false;
143+ homepage = "https://github.com/jwiegley/gitlib";
144+ description = "API library for working with Git repositories";
145+ license = stdenv.lib.licenses.mit;
146+ }) {};
147+ "gitlib-libgit2" = callPackage
148+ ({ mkDerivation, base, bytestring, conduit, conduit-combinators
149+ , containers, directory, exceptions, fast-logger, fetchgit
150+ , filepath, gitlib, hlibgit2, mmorph, monad-loops, mtl, resourcet
151+ , stm, stm-conduit, tagged, template-haskell, text, text-icu, time
152+ , transformers, transformers-base, unliftio, unliftio-core
153+ }:
154+ mkDerivation {
155+ pname = "gitlib-libgit2";
156+ version = "3.1.1";
157+ src = fetchgit {
158+ url = "https://github.com/jwiegley/gitlib.git";
159+ sha256 = "0rp6lnbbbf9m6fvmx7mzknrk89ly0gbqaxsfx38cn6qdy7r54xcm";
160+ rev = "70c99759b8b9377f67492fe29afb32f05882409d";
161+ };
162+ postUnpack = "sourceRoot+=/gitlib-libgit2; echo source root reset to $sourceRoot";
163+ libraryHaskellDepends = [
164+ base bytestring conduit conduit-combinators containers directory
165+ exceptions fast-logger filepath gitlib hlibgit2 mmorph monad-loops
166+ mtl resourcet stm stm-conduit tagged template-haskell text text-icu
167+ time transformers transformers-base unliftio unliftio-core
168+ ];
169+ doHaddock = false;
170+ doCheck = false;
171+ description = "Libgit2 backend for gitlib";
172+ license = stdenv.lib.licenses.mit;
173+ }) {};
81 };
174 };
82
175
83 pkgOverrides = self: stackPackages {
176 pkgOverrides = self: stackPackages {
84 inherit pkgs stdenv;
177 inherit pkgs stdenv;
85 inherit (self) callPackage;
178 inherit (self) callPackage;
86 };
179 };
87−
88in callPackage (nixpkgs.path + "/pkgs/development/haskell-modules") {
180in callPackage (nixpkgs.path + "/pkgs/development/haskell-modules") {
89− ghc = pkgs.haskell.compiler.ghc822;
181+ ghc = pkgs.haskell.compiler.ghc843;
182+ buildHaskellPackages = buildPackages.haskell.packages.ghc843;
90 compilerConfig = self: extends pkgOverrides (stackageConfig self);
183 compilerConfig = self: extends pkgOverrides (stackageConfig self);
91 initialPackages = stackagePackages;
184 initialPackages = stackagePackages;
92 configurationCommon = args: self: super: {};
185 configurationCommon = args: self: super: {};
nix/haskell-packages/packages.nix+1135−1243
@@ -1,56 +1,83 @@
1−# Generated by stackage2nix 0.6.1 from "/home/dbushev/projects/fpco/lts-haskell/lts-10.0.yaml"
1+# Generated by stackage2nix 0.7.1 from "/home/dbushev/projects/commercialhaskell/lts-haskell/lts-12.2.yaml"
2{ pkgs, stdenv, callPackage }:
2{ pkgs, stdenv, callPackage }:
3
3
4self: {
4self: {
5 "Cabal" = callPackage
5 "Cabal" = callPackage
6 ({ mkDerivation, array, base, binary, bytestring, containers
6 ({ mkDerivation, array, base, binary, bytestring, containers
7− , deepseq, directory, filepath, pretty, process, QuickCheck, tagged
7+ , deepseq, directory, filepath, mtl, parsec, pretty, process, text
8− , tar, tasty, tasty-hunit, tasty-quickcheck, time, unix
8+ , time, transformers, unix
9 }:
9 }:
10 mkDerivation {
10 mkDerivation {
11 pname = "Cabal";
11 pname = "Cabal";
12− version = "2.0.1.1";
12+ version = "2.2.0.1";
13− sha256 = "06rx6jxikqrdf7k6pmam5cvhwnagq6njmb9qm5777nrz278ccaw0";
13+ sha256 = "0yqa6fm9jvr0ka6b1mf17bf43092dc1bai6mqyiwwwyz0h9k1d82";
14+ setupHaskellDepends = [ mtl parsec ];
14 libraryHaskellDepends = [
15 libraryHaskellDepends = [
15 array base binary bytestring containers deepseq directory filepath
16 array base binary bytestring containers deepseq directory filepath
16− pretty process time unix
17+ mtl parsec pretty process text time transformers unix
17− ];
18− testHaskellDepends = [
19− array base bytestring containers directory filepath pretty
20− QuickCheck tagged tar tasty tasty-hunit tasty-quickcheck
21 ];
18 ];
19+ doCheck = false;
22 homepage = "http://www.haskell.org/cabal/";
20 homepage = "http://www.haskell.org/cabal/";
23 description = "A framework for packaging Haskell software";
21 description = "A framework for packaging Haskell software";
24 license = stdenv.lib.licenses.bsd3;
22 license = stdenv.lib.licenses.bsd3;
25 }) {};
23 }) {};
24+ "ChasingBottoms" = callPackage
25+ ({ mkDerivation, array, base, containers, mtl, QuickCheck, random
26+ , syb
27+ }:
28+ mkDerivation {
29+ pname = "ChasingBottoms";
30+ version = "1.3.1.4";
31+ sha256 = "06cynx6hcbfpky7qq3b3mjjgwbnaxkwin3znbwq4b9ikiw0ng633";
32+ libraryHaskellDepends = [
33+ base containers mtl QuickCheck random syb
34+ ];
35+ testHaskellDepends = [
36+ array base containers mtl QuickCheck random syb
37+ ];
38+ description = "For testing partial and infinite values";
39+ license = stdenv.lib.licenses.mit;
40+ }) {};
26 "Glob" = callPackage
41 "Glob" = callPackage
27 ({ mkDerivation, base, containers, directory, dlist, filepath
42 ({ mkDerivation, base, containers, directory, dlist, filepath
43+ , HUnit, QuickCheck, test-framework, test-framework-hunit
28− , transformers, transformers-compat
44+ , test-framework-quickcheck2, transformers, transformers-compat
29 }:
45 }:
30 mkDerivation {
46 mkDerivation {
31 pname = "Glob";
47 pname = "Glob";
32− version = "0.9.1";
48+ version = "0.9.2";
33− sha256 = "0rzmsknl02p332dxmm36fyrz3dpma7bchn0ymyjipxvqil20pjw0";
49+ sha256 = "1rbwcq9w9951qsnp13vqcm9r01yax2yh1wk8s4zxa3ckk9717iwg";
34 libraryHaskellDepends = [
50 libraryHaskellDepends = [
35 base containers directory dlist filepath transformers
51 base containers directory dlist filepath transformers
36 transformers-compat
52 transformers-compat
37 ];
53 ];
38− doCheck = false;
54+ testHaskellDepends = [
55+ base containers directory dlist filepath HUnit QuickCheck
56+ test-framework test-framework-hunit test-framework-quickcheck2
57+ transformers transformers-compat
58+ ];
39 homepage = "http://iki.fi/matti.niemenmaa/glob/";
59 homepage = "http://iki.fi/matti.niemenmaa/glob/";
40 description = "Globbing library";
60 description = "Globbing library";
41 license = stdenv.lib.licenses.bsd3;
61 license = stdenv.lib.licenses.bsd3;
42 }) {};
62 }) {};
43 "HTTP" = callPackage
63 "HTTP" = callPackage
44− ({ mkDerivation, array, base, bytestring, mtl, network, network-uri
64+ ({ mkDerivation, array, base, bytestring, case-insensitive, conduit
45− , parsec, time
65+ , conduit-extra, deepseq, http-types, httpd-shed, HUnit, mtl
66+ , network, network-uri, parsec, pureMD5, split, test-framework
67+ , test-framework-hunit, time, wai, warp
46 }:
68 }:
47 mkDerivation {
69 mkDerivation {
48 pname = "HTTP";
70 pname = "HTTP";
49− version = "4000.3.9";
71+ version = "4000.3.12";
50− sha256 = "1zv38sjr1kv6vm35a8w5659ap9jpxpq5b9zjgablils8ca52p5h5";
72+ sha256 = "140r6qy1ay25piv0z3hih11zhigyi08nkwc32097j43pjff6mzx3";
51 libraryHaskellDepends = [
73 libraryHaskellDepends = [
52 array base bytestring mtl network network-uri parsec time
74 array base bytestring mtl network network-uri parsec time
53 ];
75 ];
76+ testHaskellDepends = [
77+ base bytestring case-insensitive conduit conduit-extra deepseq
78+ http-types httpd-shed HUnit mtl network network-uri pureMD5 split
79+ test-framework test-framework-hunit wai warp
80+ ];
54 doCheck = false;
81 doCheck = false;
55 homepage = "https://github.com/haskell/HTTP";
82 homepage = "https://github.com/haskell/HTTP";
56 description = "A library for client-side HTTP";
83 description = "A library for client-side HTTP";
@@ -80,24 +107,14 @@ self: {
80 description = "The 1-tuple type or single-value \"collection\"";
107 description = "The 1-tuple type or single-value \"collection\"";
81 license = stdenv.lib.licenses.bsd3;
108 license = stdenv.lib.licenses.bsd3;
82 }) {};
109 }) {};
83− "PSQueue" = callPackage
84− ({ mkDerivation, base }:
85− mkDerivation {
86− pname = "PSQueue";
87− version = "1.1";
88− sha256 = "1k291bh8j5vpcrn6vycww2blwg7jxx9yrfmrqdanz48gs4d8gq58";
89− libraryHaskellDepends = [ base ];
90− description = "Priority Search Queue";
91− license = stdenv.lib.licenses.bsd3;
92− }) {};
93 "QuickCheck" = callPackage
110 "QuickCheck" = callPackage
94 ({ mkDerivation, base, containers, deepseq, random
111 ({ mkDerivation, base, containers, deepseq, random
95 , template-haskell, tf-random, transformers
112 , template-haskell, tf-random, transformers
96 }:
113 }:
97 mkDerivation {
114 mkDerivation {
98 pname = "QuickCheck";
115 pname = "QuickCheck";
99− version = "2.10.1";
116+ version = "2.11.3";
100− sha256 = "1rfmns3lj3hl93k1jws85ajkkw7z9ll8cw292n9m7zald1w5dfqx";
117+ sha256 = "0xhqk35fkzlbjcqbabg6962jkv8d688nzmz7ng4bm84x2d95d328";
101 libraryHaskellDepends = [
118 libraryHaskellDepends = [
102 base containers deepseq random template-haskell tf-random
119 base containers deepseq random template-haskell tf-random
103 transformers
120 transformers
@@ -111,8 +128,8 @@ self: {
111 ({ mkDerivation, base, stm, transformers }:
128 ({ mkDerivation, base, stm, transformers }:
112 mkDerivation {
129 mkDerivation {
113 pname = "StateVar";
130 pname = "StateVar";
114− version = "1.1.0.4";
131+ version = "1.1.1.0";
115− sha256 = "1dzz9l0haswgag9x56q7n57kw18v7nhmzkjyr61nz9y9npn8vmks";
132+ sha256 = "102f4x240zj3jwa7gx6vp813j76cjhlc3zbi9i5kiz6268kcv28s";
116 libraryHaskellDepends = [ base stm transformers ];
133 libraryHaskellDepends = [ base stm transformers ];
117 homepage = "https://github.com/haskell-opengl/StateVar";
134 homepage = "https://github.com/haskell-opengl/StateVar";
118 description = "State variables";
135 description = "State variables";
@@ -142,20 +159,23 @@ self: {
142 }) {};
159 }) {};
143 "adjunctions" = callPackage
160 "adjunctions" = callPackage
144 ({ mkDerivation, array, base, comonad, containers, contravariant
161 ({ mkDerivation, array, base, comonad, containers, contravariant
162+ , distributive, free, generic-deriving, hspec, hspec-discover, mtl
145− , distributive, free, mtl, profunctors, semigroupoids, semigroups
163+ , profunctors, semigroupoids, semigroups, tagged, transformers
146− , tagged, transformers, transformers-compat, void
164+ , transformers-compat, void
147 }:
165 }:
148 mkDerivation {
166 mkDerivation {
149 pname = "adjunctions";
167 pname = "adjunctions";
150− version = "4.3";
168+ version = "4.4";
151− sha256 = "1k1ykisf96i4g2zm47c45md7p42c4vsp9r73392pz1g8mx7s2j5r";
169+ sha256 = "1sbal7cbhm12crfnfhkk322jnzgx7lhw3jzq0p463bipagsjwz2h";
152 revision = "1";
170 revision = "1";
153− editedCabalFile = "1079l9szyr7ybi9wcvv1vjsjfrqirkn9z3j7dann8vbk81a4z37q";
171+ editedCabalFile = "0582nnn3fab63nd7ng8smk2c8j7pciiyzfj1na34wqid2hs675as";
154 libraryHaskellDepends = [
172 libraryHaskellDepends = [
155 array base comonad containers contravariant distributive free mtl
173 array base comonad containers contravariant distributive free mtl
156 profunctors semigroupoids semigroups tagged transformers
174 profunctors semigroupoids semigroups tagged transformers
157 transformers-compat void
175 transformers-compat void
158 ];
176 ];
177+ testHaskellDepends = [ base distributive generic-deriving hspec ];
178+ testToolDepends = [ hspec-discover ];
159 homepage = "http://github.com/ekmett/adjunctions/";
179 homepage = "http://github.com/ekmett/adjunctions/";
160 description = "Adjunctions and representable functors";
180 description = "Adjunctions and representable functors";
161 license = stdenv.lib.licenses.bsd3;
181 license = stdenv.lib.licenses.bsd3;
@@ -168,8 +188,8 @@ self: {
168 }:
188 }:
169 mkDerivation {
189 mkDerivation {
170 pname = "aeson";
190 pname = "aeson";
171− version = "1.2.3.0";
191+ version = "1.3.1.1";
172− sha256 = "1gwwqpbj6j93nlm6rvhdmvs0sq8rn17cwpyw7wdphanwjn9cdkda";
192+ sha256 = "1i1ig840fvsb1lnklcv32zsc0zscirc301lw1mpfxhc6h4pk0gw4";
173 libraryHaskellDepends = [
193 libraryHaskellDepends = [
174 attoparsec base base-compat bytestring containers deepseq dlist
194 attoparsec base base-compat bytestring containers deepseq dlist
175 ghc-prim hashable scientific tagged template-haskell text
195 ghc-prim hashable scientific tagged template-haskell text
@@ -187,8 +207,8 @@ self: {
187 }:
207 }:
188 mkDerivation {
208 mkDerivation {
189 pname = "aeson-pretty";
209 pname = "aeson-pretty";
190− version = "0.8.5";
210+ version = "0.8.7";
191− sha256 = "1yd98972srlbkn0f2jhrb3f443j9wnq2fnw5gbxjxzmkcinfh5yx";
211+ sha256 = "1m977gs0s9gf3lwzlbs5y7bl6ansc5pywmn2qjk09l5bwg2yrhf1";
192 isLibrary = true;
212 isLibrary = true;
193 isExecutable = true;
213 isExecutable = true;
194 libraryHaskellDepends = [
214 libraryHaskellDepends = [
@@ -202,41 +222,22 @@ self: {
202 description = "JSON pretty-printing library and command-line tool";
222 description = "JSON pretty-printing library and command-line tool";
203 license = stdenv.lib.licenses.bsd3;
223 license = stdenv.lib.licenses.bsd3;
204 }) {};
224 }) {};
205− "aeson-qq" = callPackage
206− ({ mkDerivation, aeson, attoparsec, base, base-compat, ghc-prim
207− , haskell-src-meta, hspec, parsec, scientific, template-haskell
208− , text, vector
209− }:
210− mkDerivation {
211− pname = "aeson-qq";
212− version = "0.8.2";
213− sha256 = "0ln13jqyfh5726hdrk1rad9a6cgrrj201plmwcfcpvq18v4m5ckd";
214− libraryHaskellDepends = [
215− aeson attoparsec base base-compat haskell-src-meta parsec
216− scientific template-haskell text vector
217− ];
218− testHaskellDepends = [
219− aeson attoparsec base base-compat ghc-prim haskell-src-meta hspec
220− parsec scientific template-haskell text vector
221− ];
222− homepage = "https://github.com/sol/aeson-qq#readme";
223− description = "JSON quasiquoter for Haskell";
224− license = stdenv.lib.licenses.mit;
225− }) {};
226 "amazonka" = callPackage
225 "amazonka" = callPackage
227 ({ mkDerivation, amazonka-core, base, bytestring, conduit
226 ({ mkDerivation, amazonka-core, base, bytestring, conduit
228− , conduit-extra, directory, exceptions, http-conduit, ini, mmorph
227+ , conduit-extra, directory, exceptions, http-client, http-conduit
229− , monad-control, mtl, resourcet, retry, tasty, tasty-hunit, text
228+ , http-types, ini, mmorph, monad-control, mtl, resourcet, retry
230− , time, transformers, transformers-base, transformers-compat
229+ , tasty, tasty-hunit, text, time, transformers, transformers-base
230+ , transformers-compat, void
231 }:
231 }:
232 mkDerivation {
232 mkDerivation {
233 pname = "amazonka";
233 pname = "amazonka";
234− version = "1.5.0";
234+ version = "1.6.0";
235− sha256 = "0g5fb1kwydhhi4pvp4skc0l26gy0kdpbrl3pixmnml5d2fxa86pw";
235+ sha256 = "07647x7lq9kaq6bqh38rvdiajji4ks6s7nvxv2xi4v4lhwn8j89p";
236 libraryHaskellDepends = [
236 libraryHaskellDepends = [
237 amazonka-core base bytestring conduit conduit-extra directory
237 amazonka-core base bytestring conduit conduit-extra directory
238− exceptions http-conduit ini mmorph monad-control mtl resourcet
238+ exceptions http-client http-conduit http-types ini mmorph
239+ monad-control mtl resourcet retry text time transformers
239− retry text time transformers transformers-base transformers-compat
240+ transformers-base transformers-compat void
240 ];
241 ];
241 testHaskellDepends = [ base tasty tasty-hunit ];
242 testHaskellDepends = [ base tasty tasty-hunit ];
242 homepage = "https://github.com/brendanhay/amazonka";
243 homepage = "https://github.com/brendanhay/amazonka";
@@ -246,22 +247,23 @@ self: {
246 "amazonka-core" = callPackage
247 "amazonka-core" = callPackage
247 ({ mkDerivation, aeson, attoparsec, base, bifunctors, bytestring
248 ({ mkDerivation, aeson, attoparsec, base, bifunctors, bytestring
248 , case-insensitive, conduit, conduit-extra, cryptonite
249 , case-insensitive, conduit, conduit-extra, cryptonite
249− , data-ordlist, deepseq, exceptions, hashable, http-conduit
250+ , data-ordlist, deepseq, exceptions, hashable, http-client
250− , http-types, lens, memory, mtl, QuickCheck, quickcheck-unicode
251+ , http-conduit, http-types, lens, memory, mtl, QuickCheck
251− , resourcet, scientific, semigroups, tagged, tasty, tasty-hunit
252+ , quickcheck-unicode, resourcet, scientific, semigroups, tagged
252− , tasty-quickcheck, template-haskell, text, time, transformers
253+ , tasty, tasty-hunit, tasty-quickcheck, template-haskell, text
253− , transformers-compat, unordered-containers, xml-conduit, xml-types
254+ , time, transformers, transformers-compat, unordered-containers
255+ , xml-conduit, xml-types
254 }:
256 }:
255 mkDerivation {
257 mkDerivation {
256 pname = "amazonka-core";
258 pname = "amazonka-core";
257− version = "1.5.0";
259+ version = "1.6.0";
258− sha256 = "173mdmk3p9jqnskjf5g9r1kr568plrmshb6p17cq11n1wnngkxnk";
260+ sha256 = "1j9x17zhyxrg4ds5pdxfjdb4z7hpzn42cydx34j25h5d9avwbqdg";
259 libraryHaskellDepends = [
261 libraryHaskellDepends = [
260 aeson attoparsec base bifunctors bytestring case-insensitive
262 aeson attoparsec base bifunctors bytestring case-insensitive
261 conduit conduit-extra cryptonite deepseq exceptions hashable
263 conduit conduit-extra cryptonite deepseq exceptions hashable
262− http-conduit http-types lens memory mtl resourcet scientific
264+ http-client http-conduit http-types lens memory mtl resourcet
263− semigroups tagged text time transformers transformers-compat
265+ scientific semigroups tagged text time transformers
264− unordered-containers xml-conduit xml-types
266+ transformers-compat unordered-containers xml-conduit xml-types
265 ];
267 ];
266 testHaskellDepends = [
268 testHaskellDepends = [
267 aeson base bytestring case-insensitive conduit data-ordlist
269 aeson base bytestring case-insensitive conduit data-ordlist
@@ -279,8 +281,8 @@ self: {
279 }:
281 }:
280 mkDerivation {
282 mkDerivation {
281 pname = "amazonka-s3";
283 pname = "amazonka-s3";
282− version = "1.5.0";
284+ version = "1.6.0";
283− sha256 = "03v5fdn81g2k1pb1kn9c2r0yf52mnv3a8flxl9cms123n4lzhsrg";
285+ sha256 = "0irz8vyklapjy3w3qasidpvq4hk2qwkmhrnrd23sf4yzs2xqx8gc";
284 libraryHaskellDepends = [ amazonka-core base lens text ];
286 libraryHaskellDepends = [ amazonka-core base lens text ];
285 testHaskellDepends = [
287 testHaskellDepends = [
286 amazonka-core amazonka-test base bytestring tasty tasty-hunit text
288 amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -299,8 +301,8 @@ self: {
299 }:
301 }:
300 mkDerivation {
302 mkDerivation {
301 pname = "amazonka-test";
303 pname = "amazonka-test";
302− version = "1.5.0";
304+ version = "1.6.0";
303− sha256 = "020qm4za63w69hcbqzbky1r269nv05ajf4zxgvp8jvnz33nj3rs7";
305+ sha256 = "0a6xfp97hijhqmhj9nv4aqax08ry8y809jpjhyj2819p01wvga26";
304 libraryHaskellDepends = [
306 libraryHaskellDepends = [
305 aeson amazonka-core base bifunctors bytestring case-insensitive
307 aeson amazonka-core base bifunctors bytestring case-insensitive
306 conduit conduit-extra groom http-client http-types process
308 conduit conduit-extra groom http-client http-types process
@@ -315,12 +317,11 @@ self: {
315 ({ mkDerivation, base, colour }:
317 ({ mkDerivation, base, colour }:
316 mkDerivation {
318 mkDerivation {
317 pname = "ansi-terminal";
319 pname = "ansi-terminal";
318− version = "0.7.1.1";
320+ version = "0.8.0.4";
319− sha256 = "1z2lllm5f2wy3a1j1198mpwq9cb6qclrxr2gpdzjyxzzvybpdj3g";
321+ sha256 = "0428gq8m3fdnb7ldcsyk97qcch76hcxbgh2666p6f76fs2qbhg7b";
320 isLibrary = true;
322 isLibrary = true;
321 isExecutable = true;
323 isExecutable = true;
322 libraryHaskellDepends = [ base colour ];
324 libraryHaskellDepends = [ base colour ];
323− executableHaskellDepends = [ base ];
324 homepage = "https://github.com/feuerbach/ansi-terminal";
325 homepage = "https://github.com/feuerbach/ansi-terminal";
325 description = "Simple ANSI terminal support, with Windows compatibility";
326 description = "Simple ANSI terminal support, with Windows compatibility";
326 license = stdenv.lib.licenses.bsd3;
327 license = stdenv.lib.licenses.bsd3;
@@ -329,14 +330,11 @@ self: {
329 ({ mkDerivation, ansi-terminal, base }:
330 ({ mkDerivation, ansi-terminal, base }:
330 mkDerivation {
331 mkDerivation {
331 pname = "ansi-wl-pprint";
332 pname = "ansi-wl-pprint";
332− version = "0.6.8.1";
333+ version = "0.6.8.2";
333− sha256 = "0qxk0iibbyqk7fmrq5cbkr1269bd6vqbdmj2n8s5bvds0836mnnm";
334+ sha256 = "0gnb4mkqryv08vncxnj0bzwcnd749613yw3cxfzw6y3nsldp4c56";
334− revision = "1";
335− editedCabalFile = "0miriy5zkssjwg8zk1wzg7wx3l5ljzvrhga33m2iz7j4y0sb4fx7";
336 isLibrary = true;
335 isLibrary = true;
337 isExecutable = true;
336 isExecutable = true;
338 libraryHaskellDepends = [ ansi-terminal base ];
337 libraryHaskellDepends = [ ansi-terminal base ];
339− executableHaskellDepends = [ ansi-terminal base ];
340 homepage = "http://github.com/ekmett/ansi-wl-pprint";
338 homepage = "http://github.com/ekmett/ansi-wl-pprint";
341 description = "The Wadler/Leijen Pretty Printer for colored ANSI terminal output";
339 description = "The Wadler/Leijen Pretty Printer for colored ANSI terminal output";
342 license = stdenv.lib.licenses.bsd3;
340 license = stdenv.lib.licenses.bsd3;
@@ -393,16 +391,18 @@ self: {
393 license = stdenv.lib.licenses.bsd3;
391 license = stdenv.lib.licenses.bsd3;
394 }) {};
392 }) {};
395 "async" = callPackage
393 "async" = callPackage
396− ({ mkDerivation, base, HUnit, stm, test-framework
394+ ({ mkDerivation, base, hashable, HUnit, stm, test-framework
397 , test-framework-hunit
395 , test-framework-hunit
398 }:
396 }:
399 mkDerivation {
397 mkDerivation {
400 pname = "async";
398 pname = "async";
401− version = "2.1.1.1";
399+ version = "2.2.1";
402− sha256 = "1qj4fp1ynwg0l453gmm27vgkzb5k5m2hzdlg5rdqi9kf8rqy90yd";
400+ sha256 = "09whscli1q5z7lzyq9rfk0bq1ydplh6pjmc6qv0x668k5818c2wg";
401+ isLibrary = true;
402+ isExecutable = true;
403− libraryHaskellDepends = [ base stm ];
403+ libraryHaskellDepends = [ base hashable stm ];
404 testHaskellDepends = [
404 testHaskellDepends = [
405− base HUnit test-framework test-framework-hunit
405+ base HUnit stm test-framework test-framework-hunit
406 ];
406 ];
407 homepage = "https://github.com/simonmar/async";
407 homepage = "https://github.com/simonmar/async";
408 description = "Run IO operations asynchronously and wait for their results";
408 description = "Run IO operations asynchronously and wait for their results";
@@ -416,8 +416,8 @@ self: {
416 }:
416 }:
417 mkDerivation {
417 mkDerivation {
418 pname = "attoparsec";
418 pname = "attoparsec";
419− version = "0.13.2.0";
419+ version = "0.13.2.2";
420− sha256 = "1wrwj359r0kgrcc2kw1yl9cpvkihhq0qm3i12kw39707s6m2x0pd";
420+ sha256 = "0j6qcwd146yzlkc9mcvzvnixsyl65n2a68l28322q5v9p4g4g4yx";
421 libraryHaskellDepends = [
421 libraryHaskellDepends = [
422 array base bytestring containers deepseq scientific text
422 array base bytestring containers deepseq scientific text
423 transformers
423 transformers
@@ -444,24 +444,39 @@ self: {
444 license = stdenv.lib.licenses.mit;
444 license = stdenv.lib.licenses.mit;
445 }) {};
445 }) {};
446 "base-compat" = callPackage
446 "base-compat" = callPackage
447− ({ mkDerivation, base, hspec, QuickCheck, unix }:
447+ ({ mkDerivation, base, unix }:
448 mkDerivation {
448 mkDerivation {
449 pname = "base-compat";
449 pname = "base-compat";
450− version = "0.9.3";
450+ version = "0.10.4";
451− sha256 = "0452l6zf6fjhy4kxqwv6i6hhg6yfx4wcg450k3axpyj30l7jnq3x";
451+ sha256 = "0ksp990gxs731mq19rzbxrbs43nazfljjc8krlx5bjqblw3kfs8d";
452 libraryHaskellDepends = [ base unix ];
452 libraryHaskellDepends = [ base unix ];
453− testHaskellDepends = [ base hspec QuickCheck ];
454 description = "A compatibility layer for base";
453 description = "A compatibility layer for base";
455 license = stdenv.lib.licenses.mit;
454 license = stdenv.lib.licenses.mit;
456 }) {};
455 }) {};
456+ "base-compat-batteries" = callPackage
457+ ({ mkDerivation, base, base-compat, hspec, hspec-discover
458+ , QuickCheck
459+ }:
460+ mkDerivation {
461+ pname = "base-compat-batteries";
462+ version = "0.10.1";
463+ sha256 = "1j8ky6241mj1ymbwm9scvyvbknj7n2r56cnkg9y1zf2xwjpqnmqm";
464+ libraryHaskellDepends = [ base base-compat ];
465+ testHaskellDepends = [ base hspec QuickCheck ];
466+ testToolDepends = [ hspec-discover ];
467+ description = "base-compat with extra batteries";
468+ license = stdenv.lib.licenses.mit;
469+ }) {};
457 "base-orphans" = callPackage
470 "base-orphans" = callPackage
458− ({ mkDerivation, base, ghc-prim, hspec, QuickCheck }:
471+ ({ mkDerivation, base, ghc-prim, hspec, hspec-discover, QuickCheck
472+ }:
459 mkDerivation {
473 mkDerivation {
460 pname = "base-orphans";
474 pname = "base-orphans";
461− version = "0.6";
475+ version = "0.7";
462− sha256 = "03mdww5j0gwai7aqlx3m71ldmjcr99jzpkcclzjfclk6a6kjla67";
476+ sha256 = "057f9npnqk71ccfh95djfkpd54dzazphj06grwxa3fyhwcwxrb8a";
463 libraryHaskellDepends = [ base ghc-prim ];
477 libraryHaskellDepends = [ base ghc-prim ];
464 testHaskellDepends = [ base hspec QuickCheck ];
478 testHaskellDepends = [ base hspec QuickCheck ];
479+ testToolDepends = [ hspec-discover ];
465 homepage = "https://github.com/haskell-compat/base-orphans#readme";
480 homepage = "https://github.com/haskell-compat/base-orphans#readme";
466 description = "Backwards-compatible orphan instances for base";
481 description = "Backwards-compatible orphan instances for base";
467 license = stdenv.lib.licenses.mit;
482 license = stdenv.lib.licenses.mit;
@@ -470,8 +485,8 @@ self: {
470 ({ mkDerivation, base }:
485 ({ mkDerivation, base }:
471 mkDerivation {
486 mkDerivation {
472 pname = "base-prelude";
487 pname = "base-prelude";
473− version = "1.2.0.1";
488+ version = "1.3";
474− sha256 = "17hivs7lmsglagdlzxd9q9zsddmgqin2788mpq911zwnb57lj6l1";
489+ sha256 = "1zk728sd09hh2r4xwz4lazsrrgg5cshydn64932sm0vckplndk73";
475 libraryHaskellDepends = [ base ];
490 libraryHaskellDepends = [ base ];
476 doCheck = false;
491 doCheck = false;
477 homepage = "https://github.com/nikita-volkov/base-prelude";
492 homepage = "https://github.com/nikita-volkov/base-prelude";
@@ -510,10 +525,10 @@ self: {
510 ({ mkDerivation, base, ghc-prim }:
525 ({ mkDerivation, base, ghc-prim }:
511 mkDerivation {
526 mkDerivation {
512 pname = "basement";
527 pname = "basement";
513− version = "0.0.4";
528+ version = "0.0.8";
514− sha256 = "1zdqv8dbzv8jx6z8fcghinbnxdc5fb97i7sdfswdr1fcp8jq6i38";
529+ sha256 = "194jw567di4q2758943q9rrwkbf9gl261my7qc21i9xhyabipx67";
515 libraryHaskellDepends = [ base ghc-prim ];
530 libraryHaskellDepends = [ base ghc-prim ];
516− homepage = "https://github.com/haskell-foundation/foundation";
531+ homepage = "https://github.com/haskell-foundation/foundation#readme";
517 description = "Foundation scrap box of array & string";
532 description = "Foundation scrap box of array & string";
518 license = stdenv.lib.licenses.bsd3;
533 license = stdenv.lib.licenses.bsd3;
519 }) {};
534 }) {};
@@ -535,21 +550,22 @@ self: {
535 }) {};
550 }) {};
536 "bifunctors" = callPackage
551 "bifunctors" = callPackage
537 ({ mkDerivation, base, base-orphans, comonad, containers, hspec
552 ({ mkDerivation, base, base-orphans, comonad, containers, hspec
538− , QuickCheck, semigroups, tagged, template-haskell, th-abstraction
553+ , hspec-discover, QuickCheck, semigroups, tagged, template-haskell
539− , transformers, transformers-compat
554+ , th-abstraction, transformers, transformers-compat
540 }:
555 }:
541 mkDerivation {
556 mkDerivation {
542 pname = "bifunctors";
557 pname = "bifunctors";
543− version = "5.5";
558+ version = "5.5.3";
544− sha256 = "0a5y85p1dhcvkagpdci6ah5kczc2jpwsj7ywkd9cg0nqcyzq3icj";
559+ sha256 = "1jn9rxg643xnlhrknmjz88nblcpsr45xwjkwwnn5nxpasa7m4d6l";
545 libraryHaskellDepends = [
560 libraryHaskellDepends = [
546 base base-orphans comonad containers semigroups tagged
561 base base-orphans comonad containers semigroups tagged
547− template-haskell th-abstraction transformers transformers-compat
562+ template-haskell th-abstraction transformers
548 ];
563 ];
549 testHaskellDepends = [
564 testHaskellDepends = [
550 base hspec QuickCheck template-haskell transformers
565 base hspec QuickCheck template-haskell transformers
551 transformers-compat
566 transformers-compat
552 ];
567 ];
568+ testToolDepends = [ hspec-discover ];
553 homepage = "http://github.com/ekmett/bifunctors/";
569 homepage = "http://github.com/ekmett/bifunctors/";
554 description = "Bifunctors";
570 description = "Bifunctors";
555 license = stdenv.lib.licenses.bsd3;
571 license = stdenv.lib.licenses.bsd3;
@@ -558,8 +574,8 @@ self: {
558 ({ mkDerivation, base }:
574 ({ mkDerivation, base }:
559 mkDerivation {
575 mkDerivation {
560 pname = "bindings-DSL";
576 pname = "bindings-DSL";
561− version = "1.0.24";
577+ version = "1.0.25";
562− sha256 = "03n8z5qxrrq4l6h2f3xyav45f5v2gr112g4l4r4jw8yfvr8qyk93";
578+ sha256 = "0kqrd78nspl3lk4a0fqn47d8dirjg3b24dkvkigcrlb81hw35pk3";
563 libraryHaskellDepends = [ base ];
579 libraryHaskellDepends = [ base ];
564 homepage = "https://github.com/jwiegley/bindings-dsl/wiki";
580 homepage = "https://github.com/jwiegley/bindings-dsl/wiki";
565 description = "FFI domain specific language, on top of hsc2hs";
581 description = "FFI domain specific language, on top of hsc2hs";
@@ -572,8 +588,8 @@ self: {
572 }:
588 }:
573 mkDerivation {
589 mkDerivation {
574 pname = "blaze-builder";
590 pname = "blaze-builder";
575− version = "0.4.0.2";
591+ version = "0.4.1.0";
576− sha256 = "1m33y6p5xldni8p4fzg8fmsyqvkfmnimdamr1xjnsmgm3dkf9lws";
592+ sha256 = "05681dih2d8s96an945wkbwl05w8ddbcfx8n3r3ck79ydyb8pz4i";
577 libraryHaskellDepends = [ base bytestring deepseq text ];
593 libraryHaskellDepends = [ base bytestring deepseq text ];
578 testHaskellDepends = [
594 testHaskellDepends = [
579 base bytestring HUnit QuickCheck test-framework
595 base bytestring HUnit QuickCheck test-framework
@@ -589,8 +605,8 @@ self: {
589 }:
605 }:
590 mkDerivation {
606 mkDerivation {
591 pname = "blaze-html";
607 pname = "blaze-html";
592− version = "0.9.0.1";
608+ version = "0.9.1.1";
593− sha256 = "0r0acv47nh75bmf7kjyfvhcwz8f02rn9x0a1l80pzgyczfrsmkmf";
609+ sha256 = "06xv8fqhclfjj61z74cgggn4lmx1s7diakxg84mnkgfvk11983pa";
594 libraryHaskellDepends = [
610 libraryHaskellDepends = [
595 base blaze-builder blaze-markup bytestring text
611 base blaze-builder blaze-markup bytestring text
596 ];
612 ];
@@ -603,14 +619,25 @@ self: {
603 ({ mkDerivation, base, blaze-builder, bytestring, text }:
619 ({ mkDerivation, base, blaze-builder, bytestring, text }:
604 mkDerivation {
620 mkDerivation {
605 pname = "blaze-markup";
621 pname = "blaze-markup";
606− version = "0.8.0.0";
622+ version = "0.8.2.1";
607− sha256 = "03sl7xs6vk4zxbjszgyjpsppi1cknswg7z7rswz2f0rq62wwpq8r";
623+ sha256 = "0ih1c3qahkdgzbqihdhny5s313l2m66fbb88w8jbx7yz56y7rawh";
608 libraryHaskellDepends = [ base blaze-builder bytestring text ];
624 libraryHaskellDepends = [ base blaze-builder bytestring text ];
609 doCheck = false;
625 doCheck = false;
610 homepage = "http://jaspervdj.be/blaze";
626 homepage = "http://jaspervdj.be/blaze";
611 description = "A blazingly fast markup combinator library for Haskell";
627 description = "A blazingly fast markup combinator library for Haskell";
612 license = stdenv.lib.licenses.bsd3;
628 license = stdenv.lib.licenses.bsd3;
613 }) {};
629 }) {};
630+ "bsb-http-chunked" = callPackage
631+ ({ mkDerivation, base, bytestring, bytestring-builder }:
632+ mkDerivation {
633+ pname = "bsb-http-chunked";
634+ version = "0.0.0.2";
635+ sha256 = "1x6m6xkrcw6jiaig1bb2wb5pqyw31x8xr9k9pxgq2g3ng44pbjr8";
636+ libraryHaskellDepends = [ base bytestring bytestring-builder ];
637+ homepage = "http://github.com/sjakobi/bsb-http-chunked";
638+ description = "Chunked HTTP transfer encoding for bytestring builders";
639+ license = stdenv.lib.licenses.bsd3;
640+ }) {};
614 "byteable" = callPackage
641 "byteable" = callPackage
615 ({ mkDerivation, base, bytestring }:
642 ({ mkDerivation, base, bytestring }:
616 mkDerivation {
643 mkDerivation {
@@ -623,20 +650,6 @@ self: {
623 description = "Type class for sequence of bytes";
650 description = "Type class for sequence of bytes";
624 license = stdenv.lib.licenses.bsd3;
651 license = stdenv.lib.licenses.bsd3;
625 }) {};
652 }) {};
626− "bytedump" = callPackage
627− ({ mkDerivation, base, bytestring }:
628− mkDerivation {
629− pname = "bytedump";
630− version = "1.0";
631− sha256 = "1pf01mna3isx3i7m50yz3pw5ygz5sg8i8pshjb3yw8q41w2ba5xf";
632− isLibrary = true;
633− isExecutable = true;
634− enableSeparateDataOutput = true;
635− libraryHaskellDepends = [ base bytestring ];
636− homepage = "http://github.com/vincenthz/hs-bytedump";
637− description = "Flexible byte dump helpers for human readers";
638− license = stdenv.lib.licenses.bsd3;
639− }) {};
640 "byteorder" = callPackage
653 "byteorder" = callPackage
641 ({ mkDerivation, base }:
654 ({ mkDerivation, base }:
642 mkDerivation {
655 mkDerivation {
@@ -659,23 +672,14 @@ self: {
659 description = "The new bytestring builder, packaged outside of GHC";
672 description = "The new bytestring builder, packaged outside of GHC";
660 license = stdenv.lib.licenses.bsd3;
673 license = stdenv.lib.licenses.bsd3;
661 }) {};
674 }) {};
662− "bytestring-trie" = callPackage
663− ({ mkDerivation, base, binary, bytestring }:
664− mkDerivation {
665− pname = "bytestring-trie";
666− version = "0.2.4.1";
667− sha256 = "0qqklrvdcprchnl4bxr6w7zf6k5gncincl3kysm34gd04sszxr1g";
668− libraryHaskellDepends = [ base binary bytestring ];
669− homepage = "http://code.haskell.org/~wren/";
670− description = "An efficient finite map from (byte)strings to values";
671− license = stdenv.lib.licenses.bsd3;
672− }) {};
673 "cabal-doctest" = callPackage
675 "cabal-doctest" = callPackage
674 ({ mkDerivation, base, Cabal, directory, filepath }:
676 ({ mkDerivation, base, Cabal, directory, filepath }:
675 mkDerivation {
677 mkDerivation {
676 pname = "cabal-doctest";
678 pname = "cabal-doctest";
677− version = "1.0.4";
679+ version = "1.0.6";
678− sha256 = "03sawamkp95jycq9sah72iw525pdndb3x4h489zf4s3ir9avds3d";
680+ sha256 = "0bgd4jdmzxq5y465r4sf4jv2ix73yvblnr4c9wyazazafddamjny";
681+ revision = "1";
682+ editedCabalFile = "1bk85avgc93yvcggwbk01fy8nvg6753wgmaanhkry0hz55h7mpld";
679 libraryHaskellDepends = [ base Cabal directory filepath ];
683 libraryHaskellDepends = [ base Cabal directory filepath ];
680 homepage = "https://github.com/phadej/cabal-doctest";
684 homepage = "https://github.com/phadej/cabal-doctest";
681 description = "A Setup.hs helper for doctests running";
685 description = "A Setup.hs helper for doctests running";
@@ -683,19 +687,17 @@ self: {
683 }) {};
687 }) {};
684 "cabal2nix" = callPackage
688 "cabal2nix" = callPackage
685 ({ mkDerivation, aeson, ansi-wl-pprint, base, bytestring, Cabal
689 ({ mkDerivation, aeson, ansi-wl-pprint, base, bytestring, Cabal
686− , cabal-doctest, containers, deepseq, directory
690+ , containers, deepseq, directory, distribution-nixpkgs, filepath
687− , distribution-nixpkgs, doctest, filepath, hackage-db, hopenssl
688− , hpack, language-nix, lens, monad-par, monad-par-extras, mtl
691+ , hackage-db, hopenssl, hpack, language-nix, lens, monad-par
689− , optparse-applicative, pretty, process, split, text, time
692+ , monad-par-extras, mtl, optparse-applicative, pretty, process
690− , transformers, utf8-string, yaml
693+ , split, tasty, tasty-golden, text, time, transformers, yaml
691 }:
694 }:
692 mkDerivation {
695 mkDerivation {
693 pname = "cabal2nix";
696 pname = "cabal2nix";
694− version = "2.7";
697+ version = "2.9.3";
695− sha256 = "1ypzldvifqm4nv9bwzvm5pfsxxn4mp19z50fpkxk84fhb5pb6nbd";
698+ sha256 = "10l1k8rilf032v6pchwhxaq53mr0d08h6xkllidc3c7wfkzcx7qj";
696 isLibrary = true;
699 isLibrary = true;
697 isExecutable = true;
700 isExecutable = true;
698− setupHaskellDepends = [ base Cabal cabal-doctest ];
699 libraryHaskellDepends = [
701 libraryHaskellDepends = [
700 aeson ansi-wl-pprint base bytestring Cabal containers deepseq
702 aeson ansi-wl-pprint base bytestring Cabal containers deepseq
701 directory distribution-nixpkgs filepath hackage-db hopenssl hpack
703 directory distribution-nixpkgs filepath hackage-db hopenssl hpack
@@ -703,17 +705,13 @@ self: {
703 time transformers yaml
705 time transformers yaml
704 ];
706 ];
705 executableHaskellDepends = [
707 executableHaskellDepends = [
706− aeson ansi-wl-pprint base bytestring Cabal containers deepseq
708+ aeson base bytestring Cabal containers directory
707− directory distribution-nixpkgs filepath hackage-db hopenssl hpack
709+ distribution-nixpkgs filepath hopenssl language-nix lens monad-par
708− language-nix lens monad-par monad-par-extras mtl
709− optparse-applicative pretty process split text time transformers
710+ monad-par-extras mtl optparse-applicative pretty
710− utf8-string yaml
711 ];
711 ];
712 testHaskellDepends = [
712 testHaskellDepends = [
713− aeson ansi-wl-pprint base bytestring Cabal containers deepseq
713+ base Cabal containers directory filepath language-nix lens pretty
714− directory distribution-nixpkgs doctest filepath hackage-db hopenssl
714+ process tasty tasty-golden
715− hpack language-nix lens optparse-applicative pretty process split
716− text time transformers yaml
717 ];
715 ];
718 homepage = "https://github.com/nixos/cabal2nix#readme";
716 homepage = "https://github.com/nixos/cabal2nix#readme";
719 description = "Convert Cabal files into Nix build instructions";
717 description = "Convert Cabal files into Nix build instructions";
@@ -733,15 +731,17 @@ self: {
733 }) {};
731 }) {};
734 "case-insensitive" = callPackage
732 "case-insensitive" = callPackage
735 ({ mkDerivation, base, bytestring, criterion, deepseq, hashable
733 ({ mkDerivation, base, bytestring, criterion, deepseq, hashable
736− , text
734+ , HUnit, test-framework, test-framework-hunit, text
737 }:
735 }:
738 mkDerivation {
736 mkDerivation {
739 pname = "case-insensitive";
737 pname = "case-insensitive";
740− version = "1.2.0.10";
738+ version = "1.2.0.11";
741− sha256 = "0v1hclvv0516fnlj5j2izd9xmakl7dshi9cb32iz6dgvzx01qck6";
739+ sha256 = "1qrpxfirsxckg7jv28f5ah2qc8lh95hp7rnqkbqs1ahcwlbnvkm7";
742 libraryHaskellDepends = [ base bytestring deepseq hashable text ];
740 libraryHaskellDepends = [ base bytestring deepseq hashable text ];
741+ testHaskellDepends = [
742+ base bytestring HUnit test-framework test-framework-hunit text
743+ ];
743 benchmarkHaskellDepends = [ base bytestring criterion deepseq ];
744 benchmarkHaskellDepends = [ base bytestring criterion deepseq ];
744− doCheck = false;
745 homepage = "https://github.com/basvandijk/case-insensitive";
745 homepage = "https://github.com/basvandijk/case-insensitive";
746 description = "Case insensitive string comparison";
746 description = "Case insensitive string comparison";
747 license = stdenv.lib.licenses.bsd3;
747 license = stdenv.lib.licenses.bsd3;
@@ -771,8 +771,8 @@ self: {
771 }:
771 }:
772 mkDerivation {
772 mkDerivation {
773 pname = "cereal";
773 pname = "cereal";
774− version = "0.5.4.0";
774+ version = "0.5.5.0";
775− sha256 = "1rzyr8r9pjlgas5pc8n776r22i0ficanq05ypqrs477jxxd6rjns";
775+ sha256 = "08k8y6nf3n8h8gzw4a44mssy7rhgpmfj28lhczjz4vgszc7k55qb";
776 libraryHaskellDepends = [
776 libraryHaskellDepends = [
777 array base bytestring containers ghc-prim
777 array base bytestring containers ghc-prim
778 ];
778 ];
@@ -790,66 +790,52 @@ self: {
790 }:
790 }:
791 mkDerivation {
791 mkDerivation {
792 pname = "cereal-conduit";
792 pname = "cereal-conduit";
793− version = "0.7.3";
793+ version = "0.8.0";
794− sha256 = "18h09j16m4yc4fcp80x7m1p2c87q6f628z36y8bnxbcjc9m95gq5";
794+ sha256 = "1srr7agvgfw78q5s1npjq5sgynvhjgllpihiv37ylkwqm4c4ap6r";
795+ revision = "1";
796+ editedCabalFile = "1imyl3g2bni8bc6kajr857xh94fscphksj3286pxfpa8yp9vqqpc";
795 libraryHaskellDepends = [
797 libraryHaskellDepends = [
796 base bytestring cereal conduit resourcet transformers
798 base bytestring cereal conduit resourcet transformers
797 ];
799 ];
798 testHaskellDepends = [
800 testHaskellDepends = [
799− base bytestring cereal conduit HUnit mtl resourcet transformers
801+ base bytestring cereal conduit HUnit mtl transformers
800 ];
802 ];
801 homepage = "https://github.com/snoyberg/conduit";
803 homepage = "https://github.com/snoyberg/conduit";
802 description = "Turn Data.Serialize Gets and Puts into Sources, Sinks, and Conduits";
804 description = "Turn Data.Serialize Gets and Puts into Sources, Sinks, and Conduits";
803 license = stdenv.lib.licenses.bsd3;
805 license = stdenv.lib.licenses.bsd3;
804 }) {};
806 }) {};
805− "cereal-vector" = callPackage
806− ({ mkDerivation, base, bytestring, cereal, QuickCheck, vector }:
807− mkDerivation {
808− pname = "cereal-vector";
809− version = "0.2.0.1";
810− sha256 = "0czrb4l1n73cfxxlzbcqfa34qa3gw0m5w5mlz0rawylyqfk8a1pz";
811− libraryHaskellDepends = [ base bytestring cereal vector ];
812− testHaskellDepends = [ base cereal QuickCheck vector ];
813− homepage = "https://github.com/acfoltzer/cereal-vector";
814− description = "Serialize instances for Data.Vector types.";
815− license = stdenv.lib.licenses.bsd3;
816− }) {};
817 "chunked-data" = callPackage
807 "chunked-data" = callPackage
818 ({ mkDerivation, base, bytestring, containers, semigroups, text
808 ({ mkDerivation, base, bytestring, containers, semigroups, text
819 , transformers, vector
809 , transformers, vector
820 }:
810 }:
821 mkDerivation {
811 mkDerivation {
822 pname = "chunked-data";
812 pname = "chunked-data";
823− version = "0.3.0";
813+ version = "0.3.1";
824− sha256 = "0bszq6fijnr4pmadzz89smj7kfmzx0ca3wd9ga8gv0in9jk9vgp1";
814+ sha256 = "16m7y7fwrirbjbqqcsfmr4yxa9qvfax6r7pw0zl9ky71ms0wa47p";
825 libraryHaskellDepends = [
815 libraryHaskellDepends = [
826 base bytestring containers semigroups text transformers vector
816 base bytestring containers semigroups text transformers vector
827 ];
817 ];
828− homepage = "https://github.com/snoyberg/mono-traversable";
818+ homepage = "https://github.com/snoyberg/mono-traversable#readme";
829 description = "Typeclasses for dealing with various chunked data representations";
819 description = "Typeclasses for dealing with various chunked data representations";
830 license = stdenv.lib.licenses.mit;
820 license = stdenv.lib.licenses.mit;
831 }) {};
821 }) {};
832 "classy-prelude" = callPackage
822 "classy-prelude" = callPackage
833 ({ mkDerivation, async, base, basic-prelude, bifunctors, bytestring
823 ({ mkDerivation, async, base, basic-prelude, bifunctors, bytestring
834− , chunked-data, containers, deepseq, dlist, exceptions, ghc-prim
824+ , chunked-data, containers, deepseq, dlist, ghc-prim, hashable
835− , hashable, hspec, lifted-async, lifted-base, monad-unlift
836− , mono-traversable, mono-traversable-instances, mtl
825+ , hspec, mono-traversable, mono-traversable-instances, mtl
837− , mutable-containers, primitive, QuickCheck, safe-exceptions, say
826+ , mutable-containers, primitive, QuickCheck, say, semigroups, stm
838− , semigroups, stm, stm-chans, text, time, time-locale-compat
827+ , stm-chans, text, time, transformers, unliftio
839− , transformers, transformers-base, unordered-containers, vector
840− , vector-instances
828+ , unordered-containers, vector, vector-instances
841 }:
829 }:
842 mkDerivation {
830 mkDerivation {
843 pname = "classy-prelude";
831 pname = "classy-prelude";
844− version = "1.3.1";
832+ version = "1.4.0";
845− sha256 = "0rk1h0kipmpk94ny2i389l6kjv7j4a55vabpm938rxv5clja2wyd";
833+ sha256 = "1q7r4lnrxjsh7rj5nr0cs22ddp9m6maa7bzbkarxw3xbfrb2afrb";
846 libraryHaskellDepends = [
834 libraryHaskellDepends = [
847 async base basic-prelude bifunctors bytestring chunked-data
835 async base basic-prelude bifunctors bytestring chunked-data
848− containers deepseq dlist exceptions ghc-prim hashable lifted-async
836+ containers deepseq dlist ghc-prim hashable mono-traversable
849− lifted-base monad-unlift mono-traversable
850− mono-traversable-instances mtl mutable-containers primitive
837+ mono-traversable-instances mtl mutable-containers primitive say
851− safe-exceptions say semigroups stm stm-chans text time
838+ semigroups stm stm-chans text time transformers unliftio
852− time-locale-compat transformers transformers-base
853 unordered-containers vector vector-instances
839 unordered-containers vector vector-instances
854 ];
840 ];
855 testHaskellDepends = [
841 testHaskellDepends = [
@@ -860,17 +846,16 @@ self: {
860 license = stdenv.lib.licenses.mit;
846 license = stdenv.lib.licenses.mit;
861 }) {};
847 }) {};
862 "classy-prelude-conduit" = callPackage
848 "classy-prelude-conduit" = callPackage
863− ({ mkDerivation, base, bytestring, classy-prelude, conduit
849+ ({ mkDerivation, base, bytestring, classy-prelude, conduit, hspec
864− , conduit-combinators, hspec, monad-control, QuickCheck, resourcet
850+ , monad-control, QuickCheck, resourcet, transformers, void
865− , transformers, void
866 }:
851 }:
867 mkDerivation {
852 mkDerivation {
868 pname = "classy-prelude-conduit";
853 pname = "classy-prelude-conduit";
869− version = "1.3.1";
854+ version = "1.4.0";
870− sha256 = "0n76c6bg45zcvy1jid3lrn6cr4iz3la7dd1ym7nffvqvgrfp0r2j";
855+ sha256 = "096466cyyxxmg3jpq705xjjc4r7v9b607hgbys8vybjlldkjbvrr";
871 libraryHaskellDepends = [
856 libraryHaskellDepends = [
872− base bytestring classy-prelude conduit conduit-combinators
857+ base bytestring classy-prelude conduit monad-control resourcet
873− monad-control resourcet transformers void
858+ transformers void
874 ];
859 ];
875 testHaskellDepends = [
860 testHaskellDepends = [
876 base bytestring conduit hspec QuickCheck transformers
861 base bytestring conduit hspec QuickCheck transformers
@@ -897,16 +882,13 @@ self: {
897 }:
882 }:
898 mkDerivation {
883 mkDerivation {
899 pname = "cmdargs";
884 pname = "cmdargs";
900− version = "0.10.18";
885+ version = "0.10.20";
901− sha256 = "1lnmcsf6p9yrwwz1zvrw5lbc32xpff7b70yz4ylawaflnlz6wrlh";
886+ sha256 = "0cbkmgrcnwgigg6z88y3c09gm7g6dwm7gzbgr53h8k1xik29s9hf";
902 isLibrary = true;
887 isLibrary = true;
903 isExecutable = true;
888 isExecutable = true;
904 libraryHaskellDepends = [
889 libraryHaskellDepends = [
905 base filepath process template-haskell transformers
890 base filepath process template-haskell transformers
906 ];
891 ];
907− executableHaskellDepends = [
908− base filepath process template-haskell transformers
909− ];
910 homepage = "https://github.com/ndmitchell/cmdargs#readme";
892 homepage = "https://github.com/ndmitchell/cmdargs#readme";
911 description = "Command line argument processing";
893 description = "Command line argument processing";
912 license = stdenv.lib.licenses.bsd3;
894 license = stdenv.lib.licenses.bsd3;
@@ -924,18 +906,14 @@ self: {
924 license = stdenv.lib.licenses.bsd3;
906 license = stdenv.lib.licenses.bsd3;
925 }) {};
907 }) {};
926 "colour" = callPackage
908 "colour" = callPackage
927− ({ mkDerivation, base, QuickCheck, random, test-framework
909+ ({ mkDerivation, base }:
928− , test-framework-quickcheck2
929− }:
930 mkDerivation {
910 mkDerivation {
931 pname = "colour";
911 pname = "colour";
932 version = "2.3.4";
912 version = "2.3.4";
933 sha256 = "1sy51nz096sv91nxqk6yk7b92b5a40axv9183xakvki2nc09yhqg";
913 sha256 = "1sy51nz096sv91nxqk6yk7b92b5a40axv9183xakvki2nc09yhqg";
934 enableSeparateDataOutput = true;
914 enableSeparateDataOutput = true;
935 libraryHaskellDepends = [ base ];
915 libraryHaskellDepends = [ base ];
936− testHaskellDepends = [
916+ doCheck = false;
937− base QuickCheck random test-framework test-framework-quickcheck2
938− ];
939 homepage = "http://www.haskell.org/haskellwiki/Colour";
917 homepage = "http://www.haskell.org/haskellwiki/Colour";
940 description = "A model for human colour/color perception";
918 description = "A model for human colour/color perception";
941 license = stdenv.lib.licenses.mit;
919 license = stdenv.lib.licenses.mit;
@@ -947,10 +925,8 @@ self: {
947 }:
925 }:
948 mkDerivation {
926 mkDerivation {
949 pname = "comonad";
927 pname = "comonad";
950− version = "5.0.2";
928+ version = "5.0.4";
951− sha256 = "115pai560rllsmym76bj787kwz5xx19y8bl6262005nddqwzxc0v";
929+ sha256 = "09g870c4flp4k3fgbibsd0mmfjani1qcpbcl685v8x89kxzrva3q";
952− revision = "1";
953− editedCabalFile = "1lnsnx8p3wlfhd1xfc68za3b00vq77z2m6b0vqiw2laqmpj9akcw";
954 setupHaskellDepends = [ base Cabal cabal-doctest ];
930 setupHaskellDepends = [ base Cabal cabal-doctest ];
955 libraryHaskellDepends = [
931 libraryHaskellDepends = [
956 base containers contravariant distributive semigroups tagged
932 base containers contravariant distributive semigroups tagged
@@ -961,26 +937,43 @@ self: {
961 description = "Comonads";
937 description = "Comonads";
962 license = stdenv.lib.licenses.bsd3;
938 license = stdenv.lib.licenses.bsd3;
963 }) {};
939 }) {};
940+ "concurrent-output" = callPackage
941+ ({ mkDerivation, ansi-terminal, async, base, directory, exceptions
942+ , process, stm, terminal-size, text, transformers, unix
943+ }:
944+ mkDerivation {
945+ pname = "concurrent-output";
946+ version = "1.10.6";
947+ sha256 = "1qlp1vij4qgcrkw8ym5xdc0pgfwklbhsfh56sgayy3cvpvcac093";
948+ libraryHaskellDepends = [
949+ ansi-terminal async base directory exceptions process stm
950+ terminal-size text transformers unix
951+ ];
952+ description = "Ungarble output from several threads or commands";
953+ license = stdenv.lib.licenses.bsd2;
954+ }) {};
964 "conduit" = callPackage
955 "conduit" = callPackage
965− ({ mkDerivation, base, containers, criterion, deepseq, exceptions
956+ ({ mkDerivation, base, bytestring, containers, deepseq, directory
966− , hspec, kan-extensions, lifted-base, mmorph, monad-control, mtl
957+ , exceptions, filepath, gauge, hspec, kan-extensions
967− , mwc-random, primitive, QuickCheck, resourcet, safe, split
958+ , mono-traversable, mtl, mwc-random, primitive, QuickCheck
968− , transformers, transformers-base, transformers-compat, vector
959+ , resourcet, safe, silently, split, text, transformers, unix
960+ , unliftio, unliftio-core, vector
969 }:
961 }:
970 mkDerivation {
962 mkDerivation {
971 pname = "conduit";
963 pname = "conduit";
972− version = "1.2.12.1";
964+ version = "1.3.0.3";
973− sha256 = "0zl6gflh7y36y2vypjhqx13nhkk5y3h12c1zj7kjfclrmwnvnwh0";
965+ sha256 = "1sangm0qqi9dzlq95746a3kl14k8b09592a423shxjf2a0b1yx5v";
974 libraryHaskellDepends = [
966 libraryHaskellDepends = [
975− base exceptions lifted-base mmorph monad-control mtl primitive
967+ base bytestring directory exceptions filepath mono-traversable mtl
976− resourcet transformers transformers-base transformers-compat
968+ primitive resourcet text transformers unix unliftio-core vector
977 ];
969 ];
978 testHaskellDepends = [
970 testHaskellDepends = [
979− base containers exceptions hspec mtl QuickCheck resourcet safe
971+ base bytestring containers directory exceptions filepath hspec
972+ mono-traversable mtl QuickCheck resourcet safe silently split text
980− split transformers
973+ transformers unliftio vector
981 ];
974 ];
982 benchmarkHaskellDepends = [
975 benchmarkHaskellDepends = [
983− base containers criterion deepseq hspec kan-extensions mwc-random
976+ base containers deepseq gauge hspec kan-extensions mwc-random
984 transformers vector
977 transformers vector
985 ];
978 ];
986 homepage = "http://github.com/snoyberg/conduit";
979 homepage = "http://github.com/snoyberg/conduit";
@@ -988,57 +981,40 @@ self: {
988 license = stdenv.lib.licenses.mit;
981 license = stdenv.lib.licenses.mit;
989 }) {};
982 }) {};
990 "conduit-combinators" = callPackage
983 "conduit-combinators" = callPackage
991− ({ mkDerivation, base, base16-bytestring, base64-bytestring
984+ ({ mkDerivation, base }:
992− , bytestring, chunked-data, conduit, conduit-extra, containers
993− , directory, filepath, hspec, monad-control, mono-traversable, mtl
994− , mwc-random, primitive, QuickCheck, resourcet, safe, silently
995− , text, transformers, transformers-base, unix, unix-compat, vector
996− , void
997− }:
998 mkDerivation {
985 mkDerivation {
999 pname = "conduit-combinators";
986 pname = "conduit-combinators";
1000− version = "1.1.2";
987+ version = "1.3.0";
1001− sha256 = "0f31iphdi31m7cfd2szq06x3xdag1kkv2vbxh6bm2ax37k9sw2w4";
988+ sha256 = "1lz70vwp4y4lpsivxl0cshq7aq3968rh48r6rjvpyaj2l0bdj5wp";
1002− libraryHaskellDepends = [
989+ libraryHaskellDepends = [ base ];
1003− base base16-bytestring base64-bytestring bytestring chunked-data
990+ doHaddock = false;
1004− conduit conduit-extra filepath monad-control mono-traversable
1005− mwc-random primitive resourcet text transformers transformers-base
1006− unix unix-compat vector void
1007− ];
1008− testHaskellDepends = [
1009− base base16-bytestring base64-bytestring bytestring chunked-data
1010− conduit containers directory filepath hspec mono-traversable mtl
1011− mwc-random QuickCheck safe silently text transformers vector
1012− ];
1013 homepage = "https://github.com/snoyberg/mono-traversable#readme";
991 homepage = "https://github.com/snoyberg/mono-traversable#readme";
1014− description = "Commonly used conduit functions, for both chunked and unchunked data";
992+ description = "DEPRECATED Functionality merged into the conduit package itself";
1015 license = stdenv.lib.licenses.mit;
993 license = stdenv.lib.licenses.mit;
1016 }) {};
994 }) {};
1017 "conduit-extra" = callPackage
995 "conduit-extra" = callPackage
1018− ({ mkDerivation, async, attoparsec, base, blaze-builder, bytestring
996+ ({ mkDerivation, async, attoparsec, base, bytestring
1019− , bytestring-builder, conduit, criterion, directory, exceptions
997+ , bytestring-builder, conduit, directory, exceptions, filepath
1020− , filepath, hspec, monad-control, network, primitive, process
998+ , gauge, hspec, network, primitive, process, QuickCheck, resourcet
1021− , QuickCheck, resourcet, stm, streaming-commons, text, transformers
999+ , stm, streaming-commons, text, transformers, transformers-base
1022− , transformers-base, typed-process, unliftio-core
1000+ , typed-process, unliftio-core
1023 }:
1001 }:
1024 mkDerivation {
1002 mkDerivation {
1025 pname = "conduit-extra";
1003 pname = "conduit-extra";
1026− version = "1.2.2";
1004+ version = "1.3.0";
1027− sha256 = "04bc1vy9giwfdcavrhjbmzm31lrf5360swns38yg6brql4pa2vii";
1005+ sha256 = "1bi2b6kdzy5f9glq46jzsk02has95jkxqz0cchpbmnakzhjwjh9c";
1028 libraryHaskellDepends = [
1006 libraryHaskellDepends = [
1029− async attoparsec base blaze-builder bytestring conduit directory
1007+ async attoparsec base bytestring conduit directory filepath network
1030− exceptions filepath monad-control network primitive process
1031− resourcet stm streaming-commons text transformers transformers-base
1008+ primitive process resourcet stm streaming-commons text transformers
1032 typed-process unliftio-core
1009 typed-process unliftio-core
1033 ];
1010 ];
1034 testHaskellDepends = [
1011 testHaskellDepends = [
1035− async attoparsec base blaze-builder bytestring bytestring-builder
1012+ async attoparsec base bytestring bytestring-builder conduit
1036− conduit directory exceptions hspec process QuickCheck resourcet stm
1013+ directory exceptions hspec process QuickCheck resourcet stm
1037 streaming-commons text transformers transformers-base
1014 streaming-commons text transformers transformers-base
1038 ];
1015 ];
1039 benchmarkHaskellDepends = [
1016 benchmarkHaskellDepends = [
1040− base blaze-builder bytestring bytestring-builder conduit criterion
1017+ base bytestring bytestring-builder conduit gauge transformers
1041− transformers
1042 ];
1018 ];
1043 homepage = "http://github.com/snoyberg/conduit";
1019 homepage = "http://github.com/snoyberg/conduit";
1044 description = "Batteries included conduit: adapters for common libraries";
1020 description = "Batteries included conduit: adapters for common libraries";
@@ -1062,52 +1038,55 @@ self: {
1062 license = stdenv.lib.licenses.bsd3;
1038 license = stdenv.lib.licenses.bsd3;
1063 }) {};
1039 }) {};
1064 "constraints" = callPackage
1040 "constraints" = callPackage
1065− ({ mkDerivation, base, binary, deepseq, ghc-prim, hashable, mtl
1041+ ({ mkDerivation, base, binary, deepseq, ghc-prim, hashable, hspec
1042+ , hspec-discover, mtl, semigroups, transformers
1066− , transformers, transformers-compat
1043+ , transformers-compat
1067 }:
1044 }:
1068 mkDerivation {
1045 mkDerivation {
1069 pname = "constraints";
1046 pname = "constraints";
1070− version = "0.9.1";
1047+ version = "0.10.1";
1071− sha256 = "11d76051i2a335bvack04dqvsz4zhgcms1jxlvy4a4c670l02vi7";
1048+ sha256 = "1xy3vv78jxc17hm0z7qqspxjwv7l2jbcbj670yrl2f053qkfr02q";
1072 libraryHaskellDepends = [
1049 libraryHaskellDepends = [
1073− base binary deepseq ghc-prim hashable mtl transformers
1050+ base binary deepseq ghc-prim hashable mtl semigroups transformers
1074 transformers-compat
1051 transformers-compat
1075 ];
1052 ];
1053+ testHaskellDepends = [ base hspec ];
1054+ testToolDepends = [ hspec-discover ];
1076 homepage = "http://github.com/ekmett/constraints/";
1055 homepage = "http://github.com/ekmett/constraints/";
1077 description = "Constraint manipulation";
1056 description = "Constraint manipulation";
1078 license = stdenv.lib.licenses.bsd2;
1057 license = stdenv.lib.licenses.bsd2;
1079 }) {};
1058 }) {};
1080 "contravariant" = callPackage
1059 "contravariant" = callPackage
1081− ({ mkDerivation, base, semigroups, StateVar, transformers
1060+ ({ mkDerivation, base, StateVar, transformers, transformers-compat
1082− , transformers-compat, void
1083 }:
1061 }:
1084 mkDerivation {
1062 mkDerivation {
1085 pname = "contravariant";
1063 pname = "contravariant";
1086− version = "1.4";
1064+ version = "1.4.1";
1087− sha256 = "117fff8kkrvlmr8cb2jpj71z7lf2pdiyks6ilyx89mry6zqnsrp1";
1065+ sha256 = "1vfhk8c5cxmmakx7rflap1ipkx5q0j5vnlrcz7yz6y53kxhksgf9";
1066+ revision = "1";
1067+ editedCabalFile = "0qj5nymccrb9p0cd6hffsy90jidjng14g9yv95z8v6h4q84sbzvx";
1088 libraryHaskellDepends = [
1068 libraryHaskellDepends = [
1089− base semigroups StateVar transformers transformers-compat void
1069+ base StateVar transformers transformers-compat
1090 ];
1070 ];
1091 homepage = "http://github.com/ekmett/contravariant/";
1071 homepage = "http://github.com/ekmett/contravariant/";
1092 description = "Contravariant functors";
1072 description = "Contravariant functors";
1093 license = stdenv.lib.licenses.bsd3;
1073 license = stdenv.lib.licenses.bsd3;
1094 }) {};
1074 }) {};
1095 "cookie" = callPackage
1075 "cookie" = callPackage
1096− ({ mkDerivation, base, blaze-builder, bytestring
1076+ ({ mkDerivation, base, bytestring, data-default-class, deepseq
1097− , data-default-class, deepseq, HUnit, old-locale, QuickCheck, tasty
1098− , tasty-hunit, tasty-quickcheck, text, time
1077+ , HUnit, QuickCheck, tasty, tasty-hunit, tasty-quickcheck, text
1078+ , time
1099 }:
1079 }:
1100 mkDerivation {
1080 mkDerivation {
1101 pname = "cookie";
1081 pname = "cookie";
1102− version = "0.4.3";
1082+ version = "0.4.4";
1103− sha256 = "0qpdydhb9gw590ffabqg70x7xvjpg8l74idqnrfbhv5yrr7hryzv";
1083+ sha256 = "1qy09i0jh2z9i9avy2khf8a8afq4fqgnv0fyrszgfg4kmq2fsi9j";
1104 libraryHaskellDepends = [
1084 libraryHaskellDepends = [
1105− base blaze-builder bytestring data-default-class deepseq old-locale
1085+ base bytestring data-default-class deepseq text time
1106− text time
1107 ];
1086 ];
1108 testHaskellDepends = [
1087 testHaskellDepends = [
1109− base blaze-builder bytestring HUnit QuickCheck tasty tasty-hunit
1088+ base bytestring HUnit QuickCheck tasty tasty-hunit tasty-quickcheck
1110− tasty-quickcheck text time
1089+ text time
1111 ];
1090 ];
1112 homepage = "http://github.com/snoyberg/cookie";
1091 homepage = "http://github.com/snoyberg/cookie";
1113 description = "HTTP cookie parsing and rendering";
1092 description = "HTTP cookie parsing and rendering";
@@ -1147,37 +1126,76 @@ self: {
1147 license = stdenv.lib.licenses.bsd3;
1126 license = stdenv.lib.licenses.bsd3;
1148 }) {};
1127 }) {};
1149 "criterion" = callPackage
1128 "criterion" = callPackage
1150− ({ mkDerivation, aeson, ansi-wl-pprint, base, base-compat, binary
1129+ ({ mkDerivation, aeson, ansi-wl-pprint, base, base-compat
1151− , bytestring, cassava, code-page, containers, deepseq, directory
1130+ , base-compat-batteries, binary, bytestring, cassava, code-page
1152− , exceptions, filepath, Glob, HUnit, js-flot, js-jquery
1131+ , containers, deepseq, directory, exceptions, filepath, Glob, HUnit
1153− , microstache, mtl, mwc-random, optparse-applicative, parsec
1132+ , js-flot, js-jquery, microstache, mtl, mwc-random
1154− , QuickCheck, semigroups, statistics, tasty, tasty-hunit
1133+ , optparse-applicative, parsec, QuickCheck, semigroups, statistics
1155− , tasty-quickcheck, text, time, transformers, transformers-compat
1134+ , tasty, tasty-hunit, tasty-quickcheck, text, time, transformers
1156− , vector, vector-algorithms
1135+ , transformers-compat, vector, vector-algorithms
1157 }:
1136 }:
1158 mkDerivation {
1137 mkDerivation {
1159 pname = "criterion";
1138 pname = "criterion";
1160− version = "1.2.6.0";
1139+ version = "1.4.1.0";
1161− sha256 = "0a9pjmy74cd3yirihyabavsfa6b9rrrgav86qdagw5nwjw7as1bc";
1140+ sha256 = "0v429araqkcw3wwwi6fsp0g7g1hy3l47p061lcy7r4m7d9khd4y4";
1162 isLibrary = true;
1141 isLibrary = true;
1163 isExecutable = true;
1142 isExecutable = true;
1164 enableSeparateDataOutput = true;
1143 enableSeparateDataOutput = true;
1165 libraryHaskellDepends = [
1144 libraryHaskellDepends = [
1166− aeson ansi-wl-pprint base base-compat binary bytestring cassava
1145+ aeson ansi-wl-pprint base base-compat-batteries binary bytestring
1167− code-page containers deepseq directory exceptions filepath Glob
1146+ cassava code-page containers deepseq directory exceptions filepath
1168− js-flot js-jquery microstache mtl mwc-random optparse-applicative
1147+ Glob js-flot js-jquery microstache mtl mwc-random
1169− parsec semigroups statistics text time transformers
1148+ optparse-applicative parsec semigroups statistics text time
1170− transformers-compat vector vector-algorithms
1149+ transformers transformers-compat vector vector-algorithms
1150+ ];
1151+ executableHaskellDepends = [
1152+ base base-compat-batteries optparse-applicative semigroups
1171 ];
1153 ];
1172− executableHaskellDepends = [ base optparse-applicative ];
1173 testHaskellDepends = [
1154 testHaskellDepends = [
1155+ aeson base base-compat base-compat-batteries bytestring deepseq
1174− aeson base bytestring deepseq directory HUnit QuickCheck statistics
1156+ directory HUnit QuickCheck statistics tasty tasty-hunit
1175− tasty tasty-hunit tasty-quickcheck vector
1157+ tasty-quickcheck vector
1176 ];
1158 ];
1177 homepage = "http://www.serpentine.com/criterion";
1159 homepage = "http://www.serpentine.com/criterion";
1178 description = "Robust, reliable performance measurement and analysis";
1160 description = "Robust, reliable performance measurement and analysis";
1179 license = stdenv.lib.licenses.bsd3;
1161 license = stdenv.lib.licenses.bsd3;
1180 }) {};
1162 }) {};
1163+ "crypto-api" = callPackage
1164+ ({ mkDerivation, base, bytestring, cereal, entropy, tagged
1165+ , transformers
1166+ }:
1167+ mkDerivation {
1168+ pname = "crypto-api";
1169+ version = "0.13.3";
1170+ sha256 = "19bsmkqkpnvh01b77pmyarx00fic15j4hvg4pzscrj4prskrx2i9";
1171+ revision = "1";
1172+ editedCabalFile = "1z6n1sa5pn3iqvqjrd8hv4bc2pxzsrhm5sh0l8z7g9lbqp6w0wp5";
1173+ libraryHaskellDepends = [
1174+ base bytestring cereal entropy tagged transformers
1175+ ];
1176+ homepage = "https://github.com/TomMD/crypto-api";
1177+ description = "A generic interface for cryptographic operations";
1178+ license = stdenv.lib.licenses.bsd3;
1179+ }) {};
1180+ "crypto-api-tests" = callPackage
1181+ ({ mkDerivation, base, bytestring, cereal, crypto-api, directory
1182+ , filepath, HUnit, QuickCheck, test-framework, test-framework-hunit
1183+ , test-framework-quickcheck2
1184+ }:
1185+ mkDerivation {
1186+ pname = "crypto-api-tests";
1187+ version = "0.3";
1188+ sha256 = "0w3j43jdrlj28jryp18hc6q84nkl2yf4vs1hhgrsk7gb9kfyqjpl";
1189+ enableSeparateDataOutput = true;
1190+ libraryHaskellDepends = [
1191+ base bytestring cereal crypto-api directory filepath HUnit
1192+ QuickCheck test-framework test-framework-hunit
1193+ test-framework-quickcheck2
1194+ ];
1195+ homepage = "http://trac.haskell.org/crypto-api/wiki";
1196+ description = "A test framework and KATs for cryptographic operations";
1197+ license = stdenv.lib.licenses.bsd3;
1198+ }) {};
1181 "cryptohash" = callPackage
1199 "cryptohash" = callPackage
1182 ({ mkDerivation, base, byteable, bytestring, criterion, cryptonite
1200 ({ mkDerivation, base, byteable, bytestring, criterion, cryptonite
1183 , ghc-prim, HUnit, memory, QuickCheck, tasty, tasty-hunit
1201 , ghc-prim, HUnit, memory, QuickCheck, tasty, tasty-hunit
@@ -1200,22 +1218,22 @@ self: {
1200 license = stdenv.lib.licenses.bsd3;
1218 license = stdenv.lib.licenses.bsd3;
1201 }) {};
1219 }) {};
1202 "cryptonite" = callPackage
1220 "cryptonite" = callPackage
1203− ({ mkDerivation, base, bytestring, criterion, deepseq, foundation
1221+ ({ mkDerivation, base, basement, bytestring, deepseq, gauge
1204 , ghc-prim, integer-gmp, memory, random, tasty, tasty-hunit
1222 , ghc-prim, integer-gmp, memory, random, tasty, tasty-hunit
1205 , tasty-kat, tasty-quickcheck
1223 , tasty-kat, tasty-quickcheck
1206 }:
1224 }:
1207 mkDerivation {
1225 mkDerivation {
1208 pname = "cryptonite";
1226 pname = "cryptonite";
1209− version = "0.24";
1227+ version = "0.25";
1210− sha256 = "11js3fg1rbrgy17i0nq19v9w4w28s80zglb6fnlbz6zg8cik3hqp";
1228+ sha256 = "131wbbdr5yavs5k1ah9sz6fqx1ffyvaxf66pwjzsfc47mwc1mgl9";
1211 libraryHaskellDepends = [
1229 libraryHaskellDepends = [
1212− base bytestring deepseq foundation ghc-prim integer-gmp memory
1230+ base basement bytestring deepseq ghc-prim integer-gmp memory
1213 ];
1231 ];
1214 testHaskellDepends = [
1232 testHaskellDepends = [
1215 base bytestring memory tasty tasty-hunit tasty-kat tasty-quickcheck
1233 base bytestring memory tasty tasty-hunit tasty-kat tasty-quickcheck
1216 ];
1234 ];
1217 benchmarkHaskellDepends = [
1235 benchmarkHaskellDepends = [
1218− base bytestring criterion memory random
1236+ base bytestring deepseq gauge memory random
1219 ];
1237 ];
1220 homepage = "https://github.com/haskell-crypto/cryptonite";
1238 homepage = "https://github.com/haskell-crypto/cryptonite";
1221 description = "Cryptography Primitives sink";
1239 description = "Cryptography Primitives sink";
@@ -1230,6 +1248,8 @@ self: {
1230 pname = "cryptonite-conduit";
1248 pname = "cryptonite-conduit";
1231 version = "0.2.2";
1249 version = "0.2.2";
1232 sha256 = "1bldcmda4xh52mw1wfrjljv8crhw3al7v7kv1j0vidvr7ymnjpbh";
1250 sha256 = "1bldcmda4xh52mw1wfrjljv8crhw3al7v7kv1j0vidvr7ymnjpbh";
1251+ revision = "1";
1252+ editedCabalFile = "1hh2nzfz4qpxgivfilgk4ll416lph8b2fdkzpzrmqfjglivydfmz";
1233 libraryHaskellDepends = [
1253 libraryHaskellDepends = [
1234 base bytestring conduit conduit-extra cryptonite exceptions memory
1254 base bytestring conduit conduit-extra cryptonite exceptions memory
1235 resourcet transformers
1255 resourcet transformers
@@ -1310,18 +1330,17 @@ self: {
1310 }) {};
1330 }) {};
1311 "distribution-nixpkgs" = callPackage
1331 "distribution-nixpkgs" = callPackage
1312 ({ mkDerivation, aeson, base, bytestring, Cabal, containers
1332 ({ mkDerivation, aeson, base, bytestring, Cabal, containers
1313− , deepseq, doctest, hspec, language-nix, lens, pretty, process
1333+ , deepseq, hspec, language-nix, lens, pretty, process, split
1314− , split
1315 }:
1334 }:
1316 mkDerivation {
1335 mkDerivation {
1317 pname = "distribution-nixpkgs";
1336 pname = "distribution-nixpkgs";
1318− version = "1.1";
1337+ version = "1.1.1";
1319− sha256 = "15m881mrhpqg1xjdjz65ym8pajp1nijrcvb6dx3vv55430cjw1qx";
1338+ sha256 = "1694crd3l9cyc0c5xvqmx62154519g2cnpzc5qmlypwrk258bssm";
1320 libraryHaskellDepends = [
1339 libraryHaskellDepends = [
1321 aeson base bytestring Cabal containers deepseq language-nix lens
1340 aeson base bytestring Cabal containers deepseq language-nix lens
1322 pretty process split
1341 pretty process split
1323 ];
1342 ];
1324− testHaskellDepends = [ base deepseq doctest hspec lens ];
1343+ testHaskellDepends = [ base deepseq hspec lens ];
1325 homepage = "https://github.com/peti/distribution-nixpkgs#readme";
1344 homepage = "https://github.com/peti/distribution-nixpkgs#readme";
1326 description = "Types and functions to manipulate the Nixpkgs distribution";
1345 description = "Types and functions to manipulate the Nixpkgs distribution";
1327 license = stdenv.lib.licenses.bsd3;
1346 license = stdenv.lib.licenses.bsd3;
@@ -1335,8 +1354,8 @@ self: {
1335 pname = "distributive";
1354 pname = "distributive";
1336 version = "0.5.3";
1355 version = "0.5.3";
1337 sha256 = "0y566r97sfyvhsmd4yxiz4ns2mqgwf5bdbp56wgxl6wlkidq0wwi";
1356 sha256 = "0y566r97sfyvhsmd4yxiz4ns2mqgwf5bdbp56wgxl6wlkidq0wwi";
1338− revision = "2";
1357+ revision = "6";
1339− editedCabalFile = "02j27xvlj0jw3b2jpfg6wbysj0blllin792wj6qnrgnrvd4haj7v";
1358+ editedCabalFile = "06bd38rf31yrvvy989r44pm0id3dsxwcp6nxg7wk6ccj3n2b8rzk";
1340 setupHaskellDepends = [ base Cabal cabal-doctest ];
1359 setupHaskellDepends = [ base Cabal cabal-doctest ];
1341 libraryHaskellDepends = [
1360 libraryHaskellDepends = [
1342 base base-orphans tagged transformers transformers-compat
1361 base base-orphans tagged transformers transformers-compat
@@ -1347,17 +1366,13 @@ self: {
1347 license = stdenv.lib.licenses.bsd3;
1366 license = stdenv.lib.licenses.bsd3;
1348 }) {};
1367 }) {};
1349 "dlist" = callPackage
1368 "dlist" = callPackage
1350− ({ mkDerivation, base, Cabal, deepseq, QuickCheck
1369+ ({ mkDerivation, base, Cabal, deepseq, QuickCheck }:
1351− , quickcheck-instances
1352− }:
1353 mkDerivation {
1370 mkDerivation {
1354 pname = "dlist";
1371 pname = "dlist";
1355− version = "0.8.0.3";
1372+ version = "0.8.0.4";
1356− sha256 = "0brgai4vs7xz29p06kd6gzg5bpa8iy3k7yzgcc44izspd74q4rw7";
1373+ sha256 = "0yirrh0s6acjy9hhvf5fqg2d6q5y6gm9xs04v6w1imndh1xqdwdc";
1357 libraryHaskellDepends = [ base deepseq ];
1374 libraryHaskellDepends = [ base deepseq ];
1358− testHaskellDepends = [
1375+ testHaskellDepends = [ base Cabal QuickCheck ];
1359− base Cabal QuickCheck quickcheck-instances
1360− ];
1361 homepage = "https://github.com/spl/dlist";
1376 homepage = "https://github.com/spl/dlist";
1362 description = "Difference lists";
1377 description = "Difference lists";
1363 license = stdenv.lib.licenses.bsd3;
1378 license = stdenv.lib.licenses.bsd3;
@@ -1381,20 +1396,24 @@ self: {
1381 }:
1396 }:
1382 mkDerivation {
1397 mkDerivation {
1383 pname = "doctest";
1398 pname = "doctest";
1384− version = "0.13.0";
1399+ version = "0.16.0";
1385− sha256 = "08g3nmpqbnbkxc95d65hkhfabwax10qrq51vlynr342npn40mn2b";
1400+ sha256 = "0hkccch65s3kp0b36h7bqhilnpi4bx8kngncm7ma9vbd3dwacjdv";
1386 isLibrary = true;
1401 isLibrary = true;
1387 isExecutable = true;
1402 isExecutable = true;
1388 libraryHaskellDepends = [
1403 libraryHaskellDepends = [
1389 base base-compat code-page deepseq directory filepath ghc ghc-paths
1404 base base-compat code-page deepseq directory filepath ghc ghc-paths
1390 process syb transformers
1405 process syb transformers
1391 ];
1406 ];
1392− executableHaskellDepends = [ base ];
1407+ executableHaskellDepends = [
1408+ base base-compat code-page deepseq directory filepath ghc ghc-paths
1409+ process syb transformers
1410+ ];
1393 testHaskellDepends = [
1411 testHaskellDepends = [
1394 base base-compat code-page deepseq directory filepath ghc ghc-paths
1412 base base-compat code-page deepseq directory filepath ghc ghc-paths
1395 hspec HUnit mockery process QuickCheck setenv silently
1413 hspec HUnit mockery process QuickCheck setenv silently
1396 stringbuilder syb transformers with-location
1414 stringbuilder syb transformers with-location
1397 ];
1415 ];
1416+ doCheck = false;
1398 homepage = "https://github.com/sol/doctest#readme";
1417 homepage = "https://github.com/sol/doctest#readme";
1399 description = "Test interactive Haskell examples";
1418 description = "Test interactive Haskell examples";
1400 license = stdenv.lib.licenses.mit;
1419 license = stdenv.lib.licenses.mit;
@@ -1403,13 +1422,27 @@ self: {
1403 ({ mkDerivation, base, directory, filepath, time, unix }:
1422 ({ mkDerivation, base, directory, filepath, time, unix }:
1404 mkDerivation {
1423 mkDerivation {
1405 pname = "easy-file";
1424 pname = "easy-file";
1406− version = "0.2.1";
1425+ version = "0.2.2";
1407− sha256 = "0v75081bx4qzlqy29hh639nzlr7dncwza3qxbzm9njc4jarf31pz";
1426+ sha256 = "0zmlcz723051qpn8l8vi51c5rx1blwrw4094jcshkmj8p9r2xxaj";
1408 libraryHaskellDepends = [ base directory filepath time unix ];
1427 libraryHaskellDepends = [ base directory filepath time unix ];
1409 homepage = "http://github.com/kazu-yamamoto/easy-file";
1428 homepage = "http://github.com/kazu-yamamoto/easy-file";
1410 description = "Cross-platform File handling";
1429 description = "Cross-platform File handling";
1411 license = stdenv.lib.licenses.bsd3;
1430 license = stdenv.lib.licenses.bsd3;
1412 }) {};
1431 }) {};
1432+ "entropy" = callPackage
1433+ ({ mkDerivation, base, bytestring, Cabal, directory, filepath
1434+ , process, unix
1435+ }:
1436+ mkDerivation {
1437+ pname = "entropy";
1438+ version = "0.4.1.1";
1439+ sha256 = "1ahz5g148l6sax3dy505na2513i99c7bxix68jja5kbx4f271zcf";
1440+ setupHaskellDepends = [ base Cabal directory filepath process ];
1441+ libraryHaskellDepends = [ base bytestring unix ];
1442+ homepage = "https://github.com/TomMD/entropy";
1443+ description = "A platform independent entropy source";
1444+ license = stdenv.lib.licenses.bsd3;
1445+ }) {};
1413 "erf" = callPackage
1446 "erf" = callPackage
1414 ({ mkDerivation, base }:
1447 ({ mkDerivation, base }:
1415 mkDerivation {
1448 mkDerivation {
@@ -1422,21 +1455,22 @@ self: {
1422 }) {};
1455 }) {};
1423 "exceptions" = callPackage
1456 "exceptions" = callPackage
1424 ({ mkDerivation, base, mtl, QuickCheck, stm, template-haskell
1457 ({ mkDerivation, base, mtl, QuickCheck, stm, template-haskell
1425− , test-framework, test-framework-quickcheck2, transformers
1458+ , test-framework, test-framework-hunit, test-framework-quickcheck2
1426− , transformers-compat
1459+ , transformers, transformers-compat
1427 }:
1460 }:
1428 mkDerivation {
1461 mkDerivation {
1429 pname = "exceptions";
1462 pname = "exceptions";
1430− version = "0.8.3";
1463+ version = "0.10.0";
1431− sha256 = "1gl7xzffsqmigam6zg0jsglncgzxqafld2p6kb7ccp9xirzdjsjd";
1464+ sha256 = "1ms9zansv0pwzwdjncvx4kf18lnkjy2p61hvjhvxmjx5bqp93p8y";
1432− revision = "2";
1465+ revision = "1";
1433− editedCabalFile = "1vl59j0l7m53hkzlcfmdbqbab8dk4lp9gzwryn7nsr6ylg94wayw";
1466+ editedCabalFile = "1ydvmhi9bj7b1md3wd4l2z2lccgyjgv3ha8milmy2l4lad9xh6xy";
1434 libraryHaskellDepends = [
1467 libraryHaskellDepends = [
1435 base mtl stm template-haskell transformers transformers-compat
1468 base mtl stm template-haskell transformers transformers-compat
1436 ];
1469 ];
1437 testHaskellDepends = [
1470 testHaskellDepends = [
1438 base mtl QuickCheck stm template-haskell test-framework
1471 base mtl QuickCheck stm template-haskell test-framework
1439− test-framework-quickcheck2 transformers transformers-compat
1472+ test-framework-hunit test-framework-quickcheck2 transformers
1473+ transformers-compat
1440 ];
1474 ];
1441 homepage = "http://github.com/ekmett/exceptions/";
1475 homepage = "http://github.com/ekmett/exceptions/";
1442 description = "Extensible optionally-pure exceptions";
1476 description = "Extensible optionally-pure exceptions";
@@ -1452,25 +1486,14 @@ self: {
1452 description = "Extensible exceptions";
1486 description = "Extensible exceptions";
1453 license = stdenv.lib.licenses.bsd3;
1487 license = stdenv.lib.licenses.bsd3;
1454 }) {};
1488 }) {};
1455− "fail" = callPackage
1456− ({ mkDerivation }:
1457− mkDerivation {
1458− pname = "fail";
1459− version = "4.9.0.0";
1460− sha256 = "18nlj6xvnggy61gwbyrpmvbdkq928wv0wx2zcsljb52kbhddnp3d";
1461− doHaddock = false;
1462− homepage = "https://prime.haskell.org/wiki/Libraries/Proposals/MonadFail";
1463− description = "Forward-compatible MonadFail class";
1464− license = stdenv.lib.licenses.bsd3;
1465− }) {};
1466 "fast-logger" = callPackage
1489 "fast-logger" = callPackage
1467 ({ mkDerivation, array, auto-update, base, bytestring, directory
1490 ({ mkDerivation, array, auto-update, base, bytestring, directory
1468 , easy-file, filepath, hspec, text, unix, unix-time
1491 , easy-file, filepath, hspec, text, unix, unix-time
1469 }:
1492 }:
1470 mkDerivation {
1493 mkDerivation {
1471 pname = "fast-logger";
1494 pname = "fast-logger";
1472− version = "2.4.10";
1495+ version = "2.4.11";
1473− sha256 = "13b7rrv8dw574k6lbl96nar67fx81058gvilsc42v0lgm38sbi6y";
1496+ sha256 = "1ad2vq4nifdxshqk9yrmghqizhkgybfz134kpr6padglb2mxxrdv";
1474 libraryHaskellDepends = [
1497 libraryHaskellDepends = [
1475 array auto-update base bytestring directory easy-file filepath text
1498 array auto-update base bytestring directory easy-file filepath text
1476 unix unix-time
1499 unix unix-time
@@ -1480,46 +1503,20 @@ self: {
1480 description = "A fast logging system";
1503 description = "A fast logging system";
1481 license = stdenv.lib.licenses.bsd3;
1504 license = stdenv.lib.licenses.bsd3;
1482 }) {};
1505 }) {};
1483− "fingertree" = callPackage
1484− ({ mkDerivation, base, HUnit, QuickCheck, test-framework
1485− , test-framework-hunit, test-framework-quickcheck2
1486− }:
1487− mkDerivation {
1488− pname = "fingertree";
1489− version = "0.1.3.1";
1490− sha256 = "08wqzrjdndd7svkil1wr964w4d7zay04nlg7dyzw7wm4d3d3ak4p";
1491− libraryHaskellDepends = [ base ];
1492− testHaskellDepends = [
1493− base HUnit QuickCheck test-framework test-framework-hunit
1494− test-framework-quickcheck2
1495− ];
1496− description = "Generic finger-tree structure, with example instances";
1497− license = stdenv.lib.licenses.bsd3;
1498− }) {};
1499− "fingertree-psqueue" = callPackage
1500− ({ mkDerivation, base, fingertree }:
1501− mkDerivation {
1502− pname = "fingertree-psqueue";
1503− version = "0.3";
1504− sha256 = "14kc0ijx44q7whniickjj3h9ag1pixn51dlxjs6n2ypaclcjz34z";
1505− libraryHaskellDepends = [ base fingertree ];
1506− description = "Implementation of priority search queues as finger trees";
1507− license = stdenv.lib.licenses.bsd3;
1508− }) {};
1509 "foldl" = callPackage
1506 "foldl" = callPackage
1510 ({ mkDerivation, base, bytestring, comonad, containers
1507 ({ mkDerivation, base, bytestring, comonad, containers
1511 , contravariant, criterion, hashable, mwc-random, primitive
1508 , contravariant, criterion, hashable, mwc-random, primitive
1512− , profunctors, semigroups, text, transformers, unordered-containers
1509+ , profunctors, semigroupoids, semigroups, text, transformers
1513− , vector, vector-builder
1510+ , unordered-containers, vector, vector-builder
1514 }:
1511 }:
1515 mkDerivation {
1512 mkDerivation {
1516 pname = "foldl";
1513 pname = "foldl";
1517− version = "1.3.5";
1514+ version = "1.4.2";
1518− sha256 = "10qsp7dj2xsq4q2xm6x6b12y5pq32qf7my41hnkmdwwbccvhdxb2";
1515+ sha256 = "14ccc2spv63v7vipfrmk8jbbw2x1dkkxsyzqzcpnkzjw0yg4ghc9";
1519 libraryHaskellDepends = [
1516 libraryHaskellDepends = [
1520 base bytestring comonad containers contravariant hashable
1517 base bytestring comonad containers contravariant hashable
1521− mwc-random primitive profunctors semigroups text transformers
1518+ mwc-random primitive profunctors semigroupoids semigroups text
1522− unordered-containers vector vector-builder
1519+ transformers unordered-containers vector vector-builder
1523 ];
1520 ];
1524 benchmarkHaskellDepends = [ base criterion ];
1521 benchmarkHaskellDepends = [ base criterion ];
1525 description = "Composable, streaming, and efficient left folds";
1522 description = "Composable, streaming, and efficient left folds";
@@ -1529,8 +1526,8 @@ self: {
1529 ({ mkDerivation, base, basement, gauge, ghc-prim }:
1526 ({ mkDerivation, base, basement, gauge, ghc-prim }:
1530 mkDerivation {
1527 mkDerivation {
1531 pname = "foundation";
1528 pname = "foundation";
1532− version = "0.0.17";
1529+ version = "0.0.21";
1533− sha256 = "00f2p47h715fjb3rpsxlf4jskgwk9sz5p692r09gspspqmrs5l84";
1530+ sha256 = "1q43y8wfj0wf9gdq2kzphwjwq6m5pvryy1lqgk954aq5z3ks1lsf";
1534 libraryHaskellDepends = [ base basement ghc-prim ];
1531 libraryHaskellDepends = [ base basement ghc-prim ];
1535 testHaskellDepends = [ base basement ];
1532 testHaskellDepends = [ base basement ];
1536 benchmarkHaskellDepends = [ base basement gauge ];
1533 benchmarkHaskellDepends = [ base basement gauge ];
@@ -1540,38 +1537,36 @@ self: {
1540 }) {};
1537 }) {};
1541 "free" = callPackage
1538 "free" = callPackage
1542 ({ mkDerivation, base, bifunctors, comonad, containers
1539 ({ mkDerivation, base, bifunctors, comonad, containers
1543− , distributive, exceptions, mtl, prelude-extras, profunctors
1540+ , distributive, exceptions, mtl, profunctors, semigroupoids
1544− , semigroupoids, semigroups, template-haskell, transformers
1541+ , semigroups, template-haskell, transformers, transformers-base
1545 , transformers-compat
1542 , transformers-compat
1546 }:
1543 }:
1547 mkDerivation {
1544 mkDerivation {
1548 pname = "free";
1545 pname = "free";
1549− version = "4.12.4";
1546+ version = "5.0.2";
1550− sha256 = "1147s393442xf4gkpbq0rd1p286vmykgx85mxhk5d1c7wfm4bzn9";
1547+ sha256 = "15m3n9vhz7z3kzv1w3wlfa3x8jp4cbrkwmrcjr7jlx39iqffn1gg";
1551 libraryHaskellDepends = [
1548 libraryHaskellDepends = [
1552 base bifunctors comonad containers distributive exceptions mtl
1549 base bifunctors comonad containers distributive exceptions mtl
1553− prelude-extras profunctors semigroupoids semigroups
1550+ profunctors semigroupoids semigroups template-haskell transformers
1554− template-haskell transformers transformers-compat
1551+ transformers-base transformers-compat
1555 ];
1552 ];
1556 homepage = "http://github.com/ekmett/free/";
1553 homepage = "http://github.com/ekmett/free/";
1557 description = "Monads for free";
1554 description = "Monads for free";
1558 license = stdenv.lib.licenses.bsd3;
1555 license = stdenv.lib.licenses.bsd3;
1559 }) {};
1556 }) {};
1560 "gauge" = callPackage
1557 "gauge" = callPackage
1561− ({ mkDerivation, base, basement, bytestring, code-page, containers
1558+ ({ mkDerivation, base, basement, bytestring, deepseq, directory
1562− , deepseq, directory, HUnit, math-functions, mwc-random, tasty
1559+ , foundation, process, vector
1563− , tasty-hunit, vector
1564 }:
1560 }:
1565 mkDerivation {
1561 mkDerivation {
1566 pname = "gauge";
1562 pname = "gauge";
1567− version = "0.1.3";
1563+ version = "0.2.3";
1568− sha256 = "1i97f00haj4832s2arbnqq19dpna54ygmchvnqkq00hsxk38cyc0";
1564+ sha256 = "0slsimv2zn9yhakxy2wdyfj6bgjd1p65wp6nr8j0ba7df64xykjs";
1569 libraryHaskellDepends = [
1565 libraryHaskellDepends = [
1570− base basement code-page containers deepseq math-functions
1566+ base basement deepseq directory process vector
1571− mwc-random vector
1572 ];
1567 ];
1573 testHaskellDepends = [
1568 testHaskellDepends = [
1574− base bytestring deepseq directory HUnit tasty tasty-hunit
1569+ base bytestring deepseq directory foundation
1575 ];
1570 ];
1576 benchmarkHaskellDepends = [ base ];
1571 benchmarkHaskellDepends = [ base ];
1577 homepage = "https://github.com/vincenthz/hs-gauge";
1572 homepage = "https://github.com/vincenthz/hs-gauge";
@@ -1579,17 +1574,20 @@ self: {
1579 license = stdenv.lib.licenses.bsd3;
1574 license = stdenv.lib.licenses.bsd3;
1580 }) {};
1575 }) {};
1581 "generic-deriving" = callPackage
1576 "generic-deriving" = callPackage
1582− ({ mkDerivation, base, containers, ghc-prim, hspec
1577+ ({ mkDerivation, base, containers, ghc-prim, hspec, hspec-discover
1583− , template-haskell
1578+ , template-haskell, th-abstraction
1584 }:
1579 }:
1585 mkDerivation {
1580 mkDerivation {
1586 pname = "generic-deriving";
1581 pname = "generic-deriving";
1587− version = "1.12";
1582+ version = "1.12.2";
1588− sha256 = "09nl2c2b54ngqv4rgv3avvallyvfnv5jfld0wk2v90srl3x6p5vk";
1583+ sha256 = "1i7d6cpj9yhaqb79zays3nqchhaacacjz9bkc0zlwj73y5gvi22n";
1584+ revision = "1";
1585+ editedCabalFile = "0gr20ypr6s0183wmrhmia0zvpbn4dmfyr3wksrkrqj4i8nhj42fz";
1589 libraryHaskellDepends = [
1586 libraryHaskellDepends = [
1590− base containers ghc-prim template-haskell
1587+ base containers ghc-prim template-haskell th-abstraction
1591 ];
1588 ];
1592 testHaskellDepends = [ base hspec template-haskell ];
1589 testHaskellDepends = [ base hspec template-haskell ];
1590+ testToolDepends = [ hspec-discover ];
1593 homepage = "https://github.com/dreixel/generic-deriving";
1591 homepage = "https://github.com/dreixel/generic-deriving";
1594 description = "Generic programming library for generalised deriving";
1592 description = "Generic programming library for generalised deriving";
1595 license = stdenv.lib.licenses.bsd3;
1593 license = stdenv.lib.licenses.bsd3;
@@ -1600,101 +1598,13 @@ self: {
1600 pname = "ghc-paths";
1598 pname = "ghc-paths";
1601 version = "0.1.0.9";
1599 version = "0.1.0.9";
1602 sha256 = "0ibrr1dxa35xx20cpp8jzgfak1rdmy344dfwq4vlq013c6w8z9mg";
1600 sha256 = "0ibrr1dxa35xx20cpp8jzgfak1rdmy344dfwq4vlq013c6w8z9mg";
1603− revision = "2";
1601+ revision = "3";
1604− editedCabalFile = "1gs6biqbcabgmrwhc1bq1bdaxdwwh26v4mpvj5c7cfyigc64gwyk";
1602+ editedCabalFile = "1gx47xbm3qviqccnbsibzkfnlzljvls33jh1ry4l506yvfnf4j10";
1605 setupHaskellDepends = [ base Cabal directory ];
1603 setupHaskellDepends = [ base Cabal directory ];
1606 libraryHaskellDepends = [ base ];
1604 libraryHaskellDepends = [ base ];
1607 description = "Knowledge of GHC's installation directories";
1605 description = "Knowledge of GHC's installation directories";
1608 license = stdenv.lib.licenses.bsd3;
1606 license = stdenv.lib.licenses.bsd3;
1609 }) {};
1607 }) {};
1610− "git" = callPackage
1611− ({ mkDerivation, base, byteable, bytedump, bytestring, containers
1612− , cryptonite, hourglass, memory, patience, random, system-fileio
1613− , system-filepath, tasty, tasty-quickcheck, unix-compat
1614− , utf8-string, vector, zlib, zlib-bindings
1615− }:
1616− mkDerivation {
1617− pname = "git";
1618− version = "0.2.1";
1619− sha256 = "0j0hzlxb58g0q8fibg09ppag6bnhk7ym3nyzmqpwjbr6hxkdidsz";
1620− enableSeparateDataOutput = true;
1621− libraryHaskellDepends = [
1622− base byteable bytestring containers cryptonite hourglass memory
1623− patience random system-fileio system-filepath unix-compat
1624− utf8-string vector zlib zlib-bindings
1625− ];
1626− testHaskellDepends = [
1627− base bytedump bytestring hourglass tasty tasty-quickcheck
1628− ];
1629− homepage = "https://github.com/vincenthz/hs-git";
1630− description = "Git operations in haskell";
1631− license = stdenv.lib.licenses.bsd3;
1632− }) {};
1633− "gitlib" = callPackage
1634− ({ mkDerivation, base, base16-bytestring, bytestring, conduit
1635− , conduit-combinators, containers, directory, exceptions, filepath
1636− , hashable, lifted-async, lifted-base, monad-control, mtl
1637− , resourcet, semigroups, tagged, text, time, transformers, unix
1638− , unordered-containers
1639− }:
1640− mkDerivation {
1641− pname = "gitlib";
1642− version = "3.1.1";
1643− sha256 = "1vwmyfmqlly351jq9pgjhcfhnxvrhzkd4lfq7qpsa37vca5pas6x";
1644− libraryHaskellDepends = [
1645− base base16-bytestring bytestring conduit conduit-combinators
1646− containers directory exceptions filepath hashable lifted-async
1647− lifted-base monad-control mtl resourcet semigroups tagged text time
1648− transformers unix unordered-containers
1649− ];
1650− description = "API library for working with Git repositories";
1651− license = stdenv.lib.licenses.mit;
1652− }) {};
1653− "gitlib-libgit2" = callPackage
1654− ({ mkDerivation, base, bytestring, conduit, conduit-combinators
1655− , containers, directory, exceptions, fast-logger, filepath, gitlib
1656− , gitlib-test, hlibgit2, hspec, hspec-expectations, HUnit
1657− , lifted-async, lifted-base, mmorph, monad-control, monad-loops
1658− , mtl, resourcet, stm, stm-conduit, tagged, template-haskell, text
1659− , text-icu, time, transformers, transformers-base
1660− }:
1661− mkDerivation {
1662− pname = "gitlib-libgit2";
1663− version = "3.1.1";
1664− sha256 = "1fv8r2w0fd9m7chrccmf5kw0pr2v0k2r2l0d782galdvq7mhca7w";
1665− revision = "1";
1666− editedCabalFile = "0v510c4sd6zwwf6mbc6gfv5sin91ckw4v6c844wrfksi9gdq3shm";
1667− libraryHaskellDepends = [
1668− base bytestring conduit conduit-combinators containers directory
1669− exceptions fast-logger filepath gitlib hlibgit2 lifted-async
1670− lifted-base mmorph monad-control monad-loops mtl resourcet stm
1671− stm-conduit tagged template-haskell text text-icu time transformers
1672− transformers-base
1673− ];
1674− testHaskellDepends = [
1675− base exceptions gitlib gitlib-test hspec hspec-expectations HUnit
1676− transformers
1677− ];
1678− description = "Libgit2 backend for gitlib";
1679− license = stdenv.lib.licenses.mit;
1680− }) {};
1681− "gitlib-test" = callPackage
1682− ({ mkDerivation, base, bytestring, conduit, conduit-combinators
1683− , exceptions, gitlib, hspec, hspec-expectations, HUnit
1684− , monad-control, tagged, text, time, transformers
1685− }:
1686− mkDerivation {
1687− pname = "gitlib-test";
1688− version = "3.1.0.3";
1689− sha256 = "07r970d6m15gri6xim71kl2vvml85jlb0vc51zb67gfsd6iby2py";
1690− libraryHaskellDepends = [
1691− base bytestring conduit conduit-combinators exceptions gitlib hspec
1692− hspec-expectations HUnit monad-control tagged text time
1693− transformers
1694− ];
1695− description = "Test library for confirming gitlib backend compliance";
1696− license = stdenv.lib.licenses.mit;
1697− }) {};
1698 "gitrev" = callPackage
1608 "gitrev" = callPackage
1699 ({ mkDerivation, base, base-compat, directory, filepath, process
1609 ({ mkDerivation, base, base-compat, directory, filepath, process
1700 , template-haskell
1610 , template-haskell
@@ -1729,17 +1639,14 @@ self: {
1729 }:
1639 }:
1730 mkDerivation {
1640 mkDerivation {
1731 pname = "hackage-db";
1641 pname = "hackage-db";
1732− version = "2.0";
1642+ version = "2.0.1";
1733− sha256 = "09xza82g45nv3gxmryqd2mns4bm8hr6d7hzr7nqdi6zq46s0lfgq";
1643+ sha256 = "13ggj72i8dxwh3qwznnqxbr00nvsbapyyhzx5zybfacddnpw3aph";
1734 isLibrary = true;
1644 isLibrary = true;
1735 isExecutable = true;
1645 isExecutable = true;
1736 libraryHaskellDepends = [
1646 libraryHaskellDepends = [
1737 aeson base bytestring Cabal containers directory filepath tar time
1647 aeson base bytestring Cabal containers directory filepath tar time
1738 utf8-string
1648 utf8-string
1739 ];
1649 ];
1740− executableHaskellDepends = [
1741− base bytestring Cabal containers utf8-string
1742− ];
1743 homepage = "https://github.com/peti/hackage-db#readme";
1650 homepage = "https://github.com/peti/hackage-db#readme";
1744 description = "Access Hackage's package database via Data.Map";
1651 description = "Access Hackage's package database via Data.Map";
1745 license = stdenv.lib.licenses.bsd3;
1652 license = stdenv.lib.licenses.bsd3;
@@ -1750,8 +1657,10 @@ self: {
1750 }:
1657 }:
1751 mkDerivation {
1658 mkDerivation {
1752 pname = "happy";
1659 pname = "happy";
1753− version = "1.19.8";
1660+ version = "1.19.9";
1754− sha256 = "186ky3bly0i3cc56qk3r7j7pxh2108aackq4n2lli7jmbnb3kxsd";
1661+ sha256 = "138xpxdb7x62lpmgmb6b3v3vgdqqvqn4273jaap3mjmc2gla709y";
1662+ revision = "2";
1663+ editedCabalFile = "1zxi8zfwiwxidrhr0yj5srpzp32z66sld9xv0k4yz7046rkl3577";
1755 isLibrary = false;
1664 isLibrary = false;
1756 isExecutable = true;
1665 isExecutable = true;
1757 setupHaskellDepends = [ base Cabal directory filepath ];
1666 setupHaskellDepends = [ base Cabal directory filepath ];
@@ -1770,10 +1679,8 @@ self: {
1770 }:
1679 }:
1771 mkDerivation {
1680 mkDerivation {
1772 pname = "hashable";
1681 pname = "hashable";
1773− version = "1.2.6.1";
1682+ version = "1.2.7.0";
1774− sha256 = "0ymv2mcrrgbdc2w39rib171fwnhg7fgp0sy4h8amrh1vw64qgjll";
1683+ sha256 = "1gra8gq3kb7b2sd845h55yxlrfqx3ii004c6vjhga8v0b30fzdgc";
1775− revision = "2";
1776− editedCabalFile = "0w4756sa04nk2bw3vnysb0y9d09zzg3c77aydkjfxz1hnl1dvnjn";
1777 isLibrary = true;
1684 isLibrary = true;
1778 isExecutable = true;
1685 isExecutable = true;
1779 libraryHaskellDepends = [
1686 libraryHaskellDepends = [
@@ -1794,10 +1701,8 @@ self: {
1794 ({ mkDerivation, base, ghc-prim, hashable, primitive, vector }:
1701 ({ mkDerivation, base, ghc-prim, hashable, primitive, vector }:
1795 mkDerivation {
1702 mkDerivation {
1796 pname = "hashtables";
1703 pname = "hashtables";
1797− version = "1.2.2.1";
1704+ version = "1.2.3.1";
1798− sha256 = "1g7nvj4cmscv1jjhms1pxb2gj4rflg2pcj3pb2z7x9fck8557bbs";
1705+ sha256 = "1giw9caajr07slf09j7zry9b0kvm4yj9q78zy1mawzi6gk3wglcg";
1799− revision = "1";
1800− editedCabalFile = "0wcjkd8imgx3j4ygj3r2cdfzknk1bbq0745axy7kbm2sckz1xqcz";
1801 libraryHaskellDepends = [
1706 libraryHaskellDepends = [
1802 base ghc-prim hashable primitive vector
1707 base ghc-prim hashable primitive vector
1803 ];
1708 ];
@@ -1822,8 +1727,8 @@ self: {
1822 }:
1727 }:
1823 mkDerivation {
1728 mkDerivation {
1824 pname = "haskell-src-exts";
1729 pname = "haskell-src-exts";
1825− version = "1.19.1";
1730+ version = "1.20.2";
1826− sha256 = "0wd93cqzdk1wq8csha8c8sphksi2jb3gr9g8rk3m9mkkfs3b5xgh";
1731+ sha256 = "1sm3z4v1p5yffg01ldgavz71s3bvfhjfa13k428rk14bpkl8crlz";
1827 libraryHaskellDepends = [ array base cpphs ghc-prim pretty ];
1732 libraryHaskellDepends = [ array base cpphs ghc-prim pretty ];
1828 libraryToolDepends = [ happy ];
1733 libraryToolDepends = [ happy ];
1829 testHaskellDepends = [
1734 testHaskellDepends = [
@@ -1841,8 +1746,8 @@ self: {
1841 }:
1746 }:
1842 mkDerivation {
1747 mkDerivation {
1843 pname = "haskell-src-meta";
1748 pname = "haskell-src-meta";
1844− version = "0.8.0.1";
1749+ version = "0.8.0.3";
1845− sha256 = "1i5f21mx061k50nl3pvvffjqsbvvldl50y8d4b9b31g63l0jg5q9";
1750+ sha256 = "08jq156zv4m0fjq6712n99c1jwxnpa6kj6sq8ch0r1l0a1ay6ww4";
1846 libraryHaskellDepends = [
1751 libraryHaskellDepends = [
1847 base haskell-src-exts pretty syb template-haskell th-orphans
1752 base haskell-src-exts pretty syb template-haskell th-orphans
1848 ];
1753 ];
@@ -1859,10 +1764,10 @@ self: {
1859 }:
1764 }:
1860 mkDerivation {
1765 mkDerivation {
1861 pname = "heaps";
1766 pname = "heaps";
1862− version = "0.3.5";
1767+ version = "0.3.6";
1863− sha256 = "1p1nsglsf8hric63cn3n1iw1nlbiv3lgk3n5gq0znajj7j7s64qv";
1768+ sha256 = "1cnxgmxxvl053yv93vcz5fnla4iir5g9wr697n88ysdyybbkq70q";
1864− revision = "1";
1769+ revision = "3";
1865− editedCabalFile = "05avm1b16gj3rlm9sjqkxb0flq055r6gqhnacp7yzw4j1bghm5j7";
1770+ editedCabalFile = "0k6wsm1hwn3vaxdvw8p7cidxg7p8zply2ig4w4qrbpyjhl6dj9x9";
1866 setupHaskellDepends = [ base Cabal cabal-doctest ];
1771 setupHaskellDepends = [ base Cabal cabal-doctest ];
1867 libraryHaskellDepends = [ base ];
1772 libraryHaskellDepends = [ base ];
1868 testHaskellDepends = [ base directory doctest filepath ];
1773 testHaskellDepends = [ base directory doctest filepath ];
@@ -1870,6 +1775,32 @@ self: {
1870 description = "Asymptotically optimal Brodal/Okasaki heaps";
1775 description = "Asymptotically optimal Brodal/Okasaki heaps";
1871 license = stdenv.lib.licenses.bsd3;
1776 license = stdenv.lib.licenses.bsd3;
1872 }) {};
1777 }) {};
1778+ "hedgehog" = callPackage
1779+ ({ mkDerivation, ansi-terminal, async, base, bytestring
1780+ , concurrent-output, containers, directory, exceptions
1781+ , lifted-async, mmorph, monad-control, mtl, pretty-show, primitive
1782+ , random, resourcet, semigroups, stm, template-haskell, text
1783+ , th-lift, time, transformers, transformers-base, unix
1784+ , wl-pprint-annotated
1785+ }:
1786+ mkDerivation {
1787+ pname = "hedgehog";
1788+ version = "0.6";
1789+ sha256 = "0c3y4gvl1i2r54ayha2kw5i2gdpd8nfzfzjly5vhxm13ylygwvxq";
1790+ libraryHaskellDepends = [
1791+ ansi-terminal async base bytestring concurrent-output containers
1792+ directory exceptions lifted-async mmorph monad-control mtl
1793+ pretty-show primitive random resourcet semigroups stm
1794+ template-haskell text th-lift time transformers transformers-base
1795+ unix wl-pprint-annotated
1796+ ];
1797+ testHaskellDepends = [
1798+ base containers pretty-show semigroups text transformers
1799+ ];
1800+ homepage = "https://hedgehog.qa";
1801+ description = "Hedgehog will eat all your bugs";
1802+ license = stdenv.lib.licenses.bsd3;
1803+ }) {};
1873 "hex" = callPackage
1804 "hex" = callPackage
1874 ({ mkDerivation, base, bytestring }:
1805 ({ mkDerivation, base, bytestring }:
1875 mkDerivation {
1806 mkDerivation {
@@ -1920,19 +1851,19 @@ self: {
1920 license = stdenv.lib.licenses.bsd3;
1851 license = stdenv.lib.licenses.bsd3;
1921 }) {};
1852 }) {};
1922 "hourglass" = callPackage
1853 "hourglass" = callPackage
1923− ({ mkDerivation, base, bytestring, criterion, deepseq, mtl
1854+ ({ mkDerivation, base, bytestring, deepseq, gauge, mtl, old-locale
1924− , old-locale, tasty, tasty-hunit, tasty-quickcheck, time
1855+ , tasty, tasty-hunit, tasty-quickcheck, time
1925 }:
1856 }:
1926 mkDerivation {
1857 mkDerivation {
1927 pname = "hourglass";
1858 pname = "hourglass";
1928− version = "0.2.10";
1859+ version = "0.2.11";
1929− sha256 = "104d1yd84hclprg740nkz60vx589mnm094zriw6zczbgg8nkclym";
1860+ sha256 = "0lag9sgj7ndrbfmab6jhszlv413agg0zzaj5r9f2fmf07wqbp9hq";
1930 libraryHaskellDepends = [ base deepseq ];
1861 libraryHaskellDepends = [ base deepseq ];
1931 testHaskellDepends = [
1862 testHaskellDepends = [
1932 base deepseq mtl old-locale tasty tasty-hunit tasty-quickcheck time
1863 base deepseq mtl old-locale tasty tasty-hunit tasty-quickcheck time
1933 ];
1864 ];
1934 benchmarkHaskellDepends = [
1865 benchmarkHaskellDepends = [
1935− base bytestring criterion deepseq mtl old-locale time
1866+ base bytestring deepseq gauge mtl old-locale time
1936 ];
1867 ];
1937 homepage = "https://github.com/vincenthz/hs-hourglass";
1868 homepage = "https://github.com/vincenthz/hs-hourglass";
1938 description = "simple performant time related library";
1869 description = "simple performant time related library";
@@ -1941,30 +1872,34 @@ self: {
1941 "hpack" = callPackage
1872 "hpack" = callPackage
1942 ({ mkDerivation, aeson, base, bifunctors, bytestring, Cabal
1873 ({ mkDerivation, aeson, base, bifunctors, bytestring, Cabal
1943 , containers, cryptonite, deepseq, directory, filepath, Glob, hspec
1874 , containers, cryptonite, deepseq, directory, filepath, Glob, hspec
1875+ , http-client, http-client-tls, http-types, HUnit, interpolate
1944− , HUnit, interpolate, mockery, pretty, QuickCheck, scientific
1876+ , mockery, pretty, QuickCheck, scientific, template-haskell
1945− , temporary, text, transformers, unordered-containers, yaml
1877+ , temporary, text, transformers, unordered-containers, vector, yaml
1946 }:
1878 }:
1947 mkDerivation {
1879 mkDerivation {
1948 pname = "hpack";
1880 pname = "hpack";
1949− version = "0.21.2";
1881+ version = "0.28.2";
1950− sha256 = "1grsr2418z42bcvqnr788n3lpfbscqvvfcnglba9v95nl8lpfm0c";
1882+ sha256 = "18w0h76jdp3mk9vin8da9iz3cwhcxmw787xy8wlh8bxcpcr16q5r";
1951 isLibrary = true;
1883 isLibrary = true;
1952 isExecutable = true;
1884 isExecutable = true;
1953 libraryHaskellDepends = [
1885 libraryHaskellDepends = [
1954 aeson base bifunctors bytestring Cabal containers cryptonite
1886 aeson base bifunctors bytestring Cabal containers cryptonite
1887+ deepseq directory filepath Glob http-client http-client-tls
1955− deepseq directory filepath Glob pretty scientific text transformers
1888+ http-types pretty scientific text transformers unordered-containers
1956− unordered-containers yaml
1889+ vector yaml
1957 ];
1890 ];
1958 executableHaskellDepends = [
1891 executableHaskellDepends = [
1959 aeson base bifunctors bytestring Cabal containers cryptonite
1892 aeson base bifunctors bytestring Cabal containers cryptonite
1893+ deepseq directory filepath Glob http-client http-client-tls
1960− deepseq directory filepath Glob pretty scientific text transformers
1894+ http-types pretty scientific text transformers unordered-containers
1961− unordered-containers yaml
1895+ vector yaml
1962 ];
1896 ];
1963 testHaskellDepends = [
1897 testHaskellDepends = [
1964 aeson base bifunctors bytestring Cabal containers cryptonite
1898 aeson base bifunctors bytestring Cabal containers cryptonite
1965− deepseq directory filepath Glob hspec HUnit interpolate mockery
1899+ deepseq directory filepath Glob hspec http-client http-client-tls
1966− pretty QuickCheck scientific temporary text transformers
1900+ http-types HUnit interpolate mockery pretty QuickCheck scientific
1967− unordered-containers yaml
1901+ template-haskell temporary text transformers unordered-containers
1902+ vector yaml
1968 ];
1903 ];
1969 homepage = "https://github.com/sol/hpack#readme";
1904 homepage = "https://github.com/sol/hpack#readme";
1970 description = "An alternative format for Haskell packages";
1905 description = "An alternative format for Haskell packages";
@@ -1974,8 +1909,8 @@ self: {
1974 ({ mkDerivation, base, containers }:
1909 ({ mkDerivation, base, containers }:
1975 mkDerivation {
1910 mkDerivation {
1976 pname = "hscolour";
1911 pname = "hscolour";
1977− version = "1.24.2";
1912+ version = "1.24.4";
1978− sha256 = "08ng635m1qylng1khm9nqvfw2wdhljy1q2wi4ly63nfaznx8dysm";
1913+ sha256 = "079jwph4bwllfp03yfr26s5zc6m6kw3nhb1cggrifh99haq34cr4";
1979 isLibrary = true;
1914 isLibrary = true;
1980 isExecutable = true;
1915 isExecutable = true;
1981 enableSeparateDataOutput = true;
1916 enableSeparateDataOutput = true;
@@ -1992,8 +1927,8 @@ self: {
1992 }:
1927 }:
1993 mkDerivation {
1928 mkDerivation {
1994 pname = "hspec";
1929 pname = "hspec";
1995− version = "2.4.4";
1930+ version = "2.5.5";
1996− sha256 = "08fg8w38xbhidw3pfn13ag3mnpp3rb1lzp7xpq47cncwv92k46mh";
1931+ sha256 = "1yv4k5b5kkig2q3waj28587sq28wms7wfav5a3lq4dra6jybimfm";
1997 libraryHaskellDepends = [
1932 libraryHaskellDepends = [
1998 base call-stack hspec-core hspec-discover hspec-expectations HUnit
1933 base call-stack hspec-core hspec-discover hspec-expectations HUnit
1999 QuickCheck transformers
1934 QuickCheck transformers
@@ -2008,24 +1943,24 @@ self: {
2008 license = stdenv.lib.licenses.mit;
1943 license = stdenv.lib.licenses.mit;
2009 }) {};
1944 }) {};
2010 "hspec-core" = callPackage
1945 "hspec-core" = callPackage
2011− ({ mkDerivation, ansi-terminal, array, async, base, call-stack
1946+ ({ mkDerivation, ansi-terminal, array, base, call-stack, clock
2012 , deepseq, directory, filepath, hspec-expectations, hspec-meta
1947 , deepseq, directory, filepath, hspec-expectations, hspec-meta
2013 , HUnit, process, QuickCheck, quickcheck-io, random, setenv
1948 , HUnit, process, QuickCheck, quickcheck-io, random, setenv
2014− , silently, temporary, tf-random, time, transformers
1949+ , silently, stm, temporary, tf-random, transformers
2015 }:
1950 }:
2016 mkDerivation {
1951 mkDerivation {
2017 pname = "hspec-core";
1952 pname = "hspec-core";
2018− version = "2.4.4";
1953+ version = "2.5.5";
2019− sha256 = "1pxzr3l8b9640mh904n51nwlr2338wak23781s48a9kzvwf347b0";
1954+ sha256 = "1vfrqlpn32s9wiykmkxbnrnd5p56yznw20pf8fwzw78ar4wpz55x";
2020 libraryHaskellDepends = [
1955 libraryHaskellDepends = [
2021− ansi-terminal array async base call-stack deepseq directory
1956+ ansi-terminal array base call-stack clock deepseq directory
2022 filepath hspec-expectations HUnit QuickCheck quickcheck-io random
1957 filepath hspec-expectations HUnit QuickCheck quickcheck-io random
2023− setenv tf-random time transformers
1958+ setenv stm tf-random transformers
2024 ];
1959 ];
2025 testHaskellDepends = [
1960 testHaskellDepends = [
2026− ansi-terminal array async base call-stack deepseq directory
1961+ ansi-terminal array base call-stack clock deepseq directory
2027 filepath hspec-expectations hspec-meta HUnit process QuickCheck
1962 filepath hspec-expectations hspec-meta HUnit process QuickCheck
2028− quickcheck-io random setenv silently temporary tf-random time
1963+ quickcheck-io random setenv silently stm temporary tf-random
2029 transformers
1964 transformers
2030 ];
1965 ];
2031 testTarget = "--test-option=--skip --test-option='Test.Hspec.Core.Runner.hspecResult runs specs in parallel'";
1966 testTarget = "--test-option=--skip --test-option='Test.Hspec.Core.Runner.hspecResult runs specs in parallel'";
@@ -2034,16 +1969,19 @@ self: {
2034 license = stdenv.lib.licenses.mit;
1969 license = stdenv.lib.licenses.mit;
2035 }) {};
1970 }) {};
2036 "hspec-discover" = callPackage
1971 "hspec-discover" = callPackage
2037− ({ mkDerivation, base, directory, filepath, hspec-meta }:
1972+ ({ mkDerivation, base, directory, filepath, hspec-meta, QuickCheck
1973+ }:
2038 mkDerivation {
1974 mkDerivation {
2039 pname = "hspec-discover";
1975 pname = "hspec-discover";
2040− version = "2.4.4";
1976+ version = "2.5.5";
2041− sha256 = "0isx9nc59nw8pkh4r6ynd55dghqnzgrzn9pvrq6ail1y5z3knhkn";
1977+ sha256 = "04aidzi91ccr9bygmfkjzshz34z9vh8wvqj4zinx2clxq6r7gqfz";
2042 isLibrary = true;
1978 isLibrary = true;
2043 isExecutable = true;
1979 isExecutable = true;
2044 libraryHaskellDepends = [ base directory filepath ];
1980 libraryHaskellDepends = [ base directory filepath ];
2045 executableHaskellDepends = [ base directory filepath ];
1981 executableHaskellDepends = [ base directory filepath ];
1982+ testHaskellDepends = [
2046− testHaskellDepends = [ base directory filepath hspec-meta ];
1983+ base directory filepath hspec-meta QuickCheck
1984+ ];
2047 homepage = "http://hspec.github.io/";
1985 homepage = "http://hspec.github.io/";
2048 description = "Automatically discover and run Hspec tests";
1986 description = "Automatically discover and run Hspec tests";
2049 license = stdenv.lib.licenses.mit;
1987 license = stdenv.lib.licenses.mit;
@@ -2083,8 +2021,8 @@ self: {
2083 }:
2021 }:
2084 mkDerivation {
2022 mkDerivation {
2085 pname = "hspec-meta";
2023 pname = "hspec-meta";
2086− version = "2.4.4";
2024+ version = "2.4.6";
2087− sha256 = "117n4j56wfh48xj02mv0wkp10bkr2xkyvwg7n7r2ynp03wrf9ykm";
2025+ sha256 = "0qmvk01n79j6skn79r6zalg2pd0x0nqqn9qn8mhg0pgyzcdnfc9b";
2088 isLibrary = true;
2026 isLibrary = true;
2089 isExecutable = true;
2027 isExecutable = true;
2090 libraryHaskellDepends = [
2028 libraryHaskellDepends = [
@@ -2102,83 +2040,91 @@ self: {
2102 license = stdenv.lib.licenses.mit;
2040 license = stdenv.lib.licenses.mit;
2103 }) {};
2041 }) {};
2104 "hspec-smallcheck" = callPackage
2042 "hspec-smallcheck" = callPackage
2105− ({ mkDerivation, base, hspec, hspec-core, QuickCheck, smallcheck }:
2043+ ({ mkDerivation, base, base-orphans, call-stack, hspec, hspec-core
2044+ , HUnit, QuickCheck, smallcheck
2045+ }:
2106 mkDerivation {
2046 mkDerivation {
2107 pname = "hspec-smallcheck";
2047 pname = "hspec-smallcheck";
2108− version = "0.4.2";
2048+ version = "0.5.2";
2109− sha256 = "1lsy71ri0lfvs6w1drwa4p69bcy0nrpb62dah3bg4vqwxfrd82ds";
2049+ sha256 = "06c1ym793zkdwi4bxk5f4l7m1n1bg5jmnm0p68q2pa9rlhk1lc4s";
2110− libraryHaskellDepends = [ base hspec-core smallcheck ];
2050+ libraryHaskellDepends = [
2051+ base call-stack hspec-core HUnit smallcheck
2052+ ];
2111 testHaskellDepends = [
2053 testHaskellDepends = [
2112− base hspec hspec-core QuickCheck smallcheck
2054+ base base-orphans call-stack hspec hspec-core HUnit QuickCheck
2055+ smallcheck
2113 ];
2056 ];
2114 homepage = "http://hspec.github.io/";
2057 homepage = "http://hspec.github.io/";
2115 description = "SmallCheck support for the Hspec testing framework";
2058 description = "SmallCheck support for the Hspec testing framework";
2116 license = stdenv.lib.licenses.mit;
2059 license = stdenv.lib.licenses.mit;
2117 }) {};
2060 }) {};
2118 "html-conduit" = callPackage
2061 "html-conduit" = callPackage
2119− ({ mkDerivation, base, bytestring, conduit, conduit-extra
2062+ ({ mkDerivation, attoparsec, base, bytestring, conduit
2120− , containers, hspec, HUnit, resourcet, tagstream-conduit, text
2063+ , conduit-extra, containers, deepseq, hspec, HUnit, resourcet, text
2121 , transformers, xml-conduit, xml-types
2064 , transformers, xml-conduit, xml-types
2122 }:
2065 }:
2123 mkDerivation {
2066 mkDerivation {
2124 pname = "html-conduit";
2067 pname = "html-conduit";
2125− version = "1.2.1.2";
2068+ version = "1.3.1";
2126− sha256 = "172ip4rkn2y3mpzjrj2h3nrmxrf90gcl8ax6dgdhrdjsyg4h8vjk";
2069+ sha256 = "0dg3sblihi93qn6ax1cwha0cng4zlpmic83ckdylq7s7kwa3rhbi";
2127 libraryHaskellDepends = [
2070 libraryHaskellDepends = [
2128− base bytestring conduit conduit-extra containers resourcet
2071+ attoparsec base bytestring conduit conduit-extra containers
2129− tagstream-conduit text transformers xml-conduit xml-types
2072+ resourcet text transformers xml-conduit xml-types
2130 ];
2073 ];
2131 testHaskellDepends = [
2074 testHaskellDepends = [
2132− base bytestring containers hspec HUnit xml-conduit
2075+ base bytestring containers deepseq hspec HUnit text xml-conduit
2133 ];
2076 ];
2134 homepage = "https://github.com/snoyberg/xml";
2077 homepage = "https://github.com/snoyberg/xml";
2135 description = "Parse HTML documents using xml-conduit datatypes";
2078 description = "Parse HTML documents using xml-conduit datatypes";
2136 license = stdenv.lib.licenses.mit;
2079 license = stdenv.lib.licenses.mit;
2137 }) {};
2080 }) {};
2138 "http-client" = callPackage
2081 "http-client" = callPackage
2139− ({ mkDerivation, array, async, base, base64-bytestring
2082+ ({ mkDerivation, array, async, base, blaze-builder, bytestring
2140− , blaze-builder, bytestring, case-insensitive, containers, cookie
2083+ , case-insensitive, containers, cookie, deepseq, directory
2141− , deepseq, directory, exceptions, filepath, ghc-prim, hspec
2084+ , exceptions, filepath, ghc-prim, hspec, http-types, memory
2142− , http-types, mime-types, monad-control, network, network-uri
2085+ , mime-types, monad-control, network, network-uri, random, stm
2143− , random, streaming-commons, text, time, transformers, zlib
2086+ , streaming-commons, text, time, transformers, zlib
2144 }:
2087 }:
2145 mkDerivation {
2088 mkDerivation {
2146 pname = "http-client";
2089 pname = "http-client";
2147− version = "0.5.7.1";
2090+ version = "0.5.13.1";
2148− sha256 = "19cvnnfcjj2m3pgs6ivyjs21rw9wx5ynarh6hvb27a76cscai2fy";
2091+ sha256 = "0szwbgvkkdz56lgi91armkagmb7nnfwbpp4j7cm9zhmffv3ba8g1";
2149 libraryHaskellDepends = [
2092 libraryHaskellDepends = [
2150− array base base64-bytestring blaze-builder bytestring
2093+ array base blaze-builder bytestring case-insensitive containers
2151− case-insensitive containers cookie deepseq exceptions filepath
2094+ cookie deepseq exceptions filepath ghc-prim http-types memory
2152− ghc-prim http-types mime-types network network-uri random
2095+ mime-types network network-uri random stm streaming-commons text
2153− streaming-commons text time transformers
2096+ time transformers
2154 ];
2097 ];
2155 testHaskellDepends = [
2098 testHaskellDepends = [
2156− async base base64-bytestring blaze-builder bytestring
2099+ async base blaze-builder bytestring case-insensitive containers
2157− case-insensitive containers deepseq directory hspec http-types
2100+ deepseq directory hspec http-types monad-control network
2158− monad-control network network-uri streaming-commons text time
2101+ network-uri streaming-commons text time transformers zlib
2159− transformers zlib
2160 ];
2102 ];
2103+ doCheck = false;
2161 homepage = "https://github.com/snoyberg/http-client";
2104 homepage = "https://github.com/snoyberg/http-client";
2162 description = "An HTTP client engine";
2105 description = "An HTTP client engine";
2163 license = stdenv.lib.licenses.mit;
2106 license = stdenv.lib.licenses.mit;
2164 }) {};
2107 }) {};
2165 "http-client-tls" = callPackage
2108 "http-client-tls" = callPackage
2166 ({ mkDerivation, base, bytestring, case-insensitive, connection
2109 ({ mkDerivation, base, bytestring, case-insensitive, connection
2167− , containers, criterion, cryptonite, data-default-class, exceptions
2110+ , containers, cryptonite, data-default-class, exceptions, gauge
2168 , hspec, http-client, http-types, memory, network, network-uri
2111 , hspec, http-client, http-types, memory, network, network-uri
2169 , text, tls, transformers
2112 , text, tls, transformers
2170 }:
2113 }:
2171 mkDerivation {
2114 mkDerivation {
2172 pname = "http-client-tls";
2115 pname = "http-client-tls";
2173− version = "0.3.5.1";
2116+ version = "0.3.5.3";
2174− sha256 = "0n4mi8z77qaggfyq17z79cl304nf1f4h6gag60v4wjwghvmj7yn1";
2117+ sha256 = "0qj3pcpgbsfsc4m52dz35khhl4hf1i0nmcpa445z82d9567vy6j7";
2175 libraryHaskellDepends = [
2118 libraryHaskellDepends = [
2176 base bytestring case-insensitive connection containers cryptonite
2119 base bytestring case-insensitive connection containers cryptonite
2177 data-default-class exceptions http-client http-types memory network
2120 data-default-class exceptions http-client http-types memory network
2178 network-uri text tls transformers
2121 network-uri text tls transformers
2179 ];
2122 ];
2123+ testHaskellDepends = [
2180− testHaskellDepends = [ base hspec http-client http-types ];
2124+ base connection hspec http-client http-types
2125+ ];
2181− benchmarkHaskellDepends = [ base criterion http-client ];
2126+ benchmarkHaskellDepends = [ base gauge http-client ];
2127+ doCheck = false;
2182 homepage = "https://github.com/snoyberg/http-client";
2128 homepage = "https://github.com/snoyberg/http-client";
2183 description = "http-client backend using the connection package and tls library";
2129 description = "http-client backend using the connection package and tls library";
2184 license = stdenv.lib.licenses.mit;
2130 license = stdenv.lib.licenses.mit;
@@ -2186,25 +2132,26 @@ self: {
2186 "http-conduit" = callPackage
2132 "http-conduit" = callPackage
2187 ({ mkDerivation, aeson, base, blaze-builder, bytestring
2133 ({ mkDerivation, aeson, base, blaze-builder, bytestring
2188 , case-insensitive, conduit, conduit-extra, connection, cookie
2134 , case-insensitive, conduit, conduit-extra, connection, cookie
2189− , data-default-class, exceptions, hspec, http-client
2135+ , data-default-class, hspec, http-client, http-client-tls
2190− , http-client-tls, http-types, HUnit, lifted-base, monad-control
2191− , mtl, network, resourcet, streaming-commons, temporary, text, time
2136+ , http-types, HUnit, mtl, network, resourcet, streaming-commons
2137+ , temporary, text, time, transformers, unliftio, unliftio-core
2192− , transformers, utf8-string, wai, wai-conduit, warp, warp-tls
2138+ , utf8-string, wai, wai-conduit, warp, warp-tls
2193 }:
2139 }:
2194 mkDerivation {
2140 mkDerivation {
2195 pname = "http-conduit";
2141 pname = "http-conduit";
2196− version = "2.2.4";
2142+ version = "2.3.2";
2197− sha256 = "1wcl3lpg4v1ylq9j77j9fmf6l9qbmp8dmj3a9829q19q6bbgza7l";
2143+ sha256 = "1iay4hr0mj8brkxvgkv1liqa8irl9axfc3qhn8qsvcyq4n1l95km";
2144+ revision = "1";
2145+ editedCabalFile = "0g6rg8r33q5rmrx5287vjfcqwjacchgzyfc8aqqrhrfz3fq5ll0g";
2198 libraryHaskellDepends = [
2146 libraryHaskellDepends = [
2199− aeson base bytestring conduit conduit-extra exceptions http-client
2147+ aeson base bytestring conduit conduit-extra http-client
2200− http-client-tls http-types lifted-base monad-control mtl resourcet
2148+ http-client-tls http-types mtl resourcet transformers unliftio-core
2201− transformers
2202 ];
2149 ];
2203 testHaskellDepends = [
2150 testHaskellDepends = [
2204 aeson base blaze-builder bytestring case-insensitive conduit
2151 aeson base blaze-builder bytestring case-insensitive conduit
2205 conduit-extra connection cookie data-default-class hspec
2152 conduit-extra connection cookie data-default-class hspec
2206− http-client http-types HUnit lifted-base network resourcet
2153+ http-client http-types HUnit network resourcet streaming-commons
2207− streaming-commons temporary text time transformers utf8-string wai
2154+ temporary text time transformers unliftio utf8-string wai
2208 wai-conduit warp warp-tls
2155 wai-conduit warp warp-tls
2209 ];
2156 ];
2210 homepage = "http://www.yesodweb.com/book/http-conduit";
2157 homepage = "http://www.yesodweb.com/book/http-conduit";
@@ -2217,9 +2164,9 @@ self: {
2217 }:
2164 }:
2218 mkDerivation {
2165 mkDerivation {
2219 pname = "http-date";
2166 pname = "http-date";
2220− version = "0.0.6.1";
2167+ version = "0.0.7";
2221− sha256 = "0dknh28kyarnzqrsc80ssalxjrq0qbv7ir49247p2grb7rh0dqgj";
2168+ sha256 = "1hpzs646qqzp2g2qy7rx1bf3knf1hw38n82vcq6bs4mm1xzdryff";
2222− libraryHaskellDepends = [ array attoparsec base bytestring ];
2169+ libraryHaskellDepends = [ array attoparsec base bytestring time ];
2223 testHaskellDepends = [
2170 testHaskellDepends = [
2224 base bytestring doctest hspec old-locale time
2171 base bytestring doctest hspec old-locale time
2225 ];
2172 ];
@@ -2227,20 +2174,18 @@ self: {
2227 license = stdenv.lib.licenses.bsd3;
2174 license = stdenv.lib.licenses.bsd3;
2228 }) {};
2175 }) {};
2229 "http-types" = callPackage
2176 "http-types" = callPackage
2230− ({ mkDerivation, array, base, blaze-builder, bytestring
2177+ ({ mkDerivation, array, base, bytestring, case-insensitive, doctest
2231− , case-insensitive, doctest, hspec, QuickCheck
2232− , quickcheck-instances, text
2178+ , hspec, QuickCheck, quickcheck-instances, text
2233 }:
2179 }:
2234 mkDerivation {
2180 mkDerivation {
2235 pname = "http-types";
2181 pname = "http-types";
2236− version = "0.9.1";
2182+ version = "0.12.1";
2237− sha256 = "0l7mnvqyppxpnq6ds4a9f395zdbl22z3sxiry1myfs8wvj669vbv";
2183+ sha256 = "1wv9k6nlvkdsxwlr7gaynphvzmvi5211gvwq96mbcxgk51a739rz";
2238 libraryHaskellDepends = [
2184 libraryHaskellDepends = [
2239− array base blaze-builder bytestring case-insensitive text
2185+ array base bytestring case-insensitive text
2240 ];
2186 ];
2241 testHaskellDepends = [
2187 testHaskellDepends = [
2242− base blaze-builder bytestring doctest hspec QuickCheck
2188+ base bytestring doctest hspec QuickCheck quickcheck-instances text
2243− quickcheck-instances text
2244 ];
2189 ];
2245 homepage = "https://github.com/aristidb/http-types";
2190 homepage = "https://github.com/aristidb/http-types";
2246 description = "Generic HTTP types for Haskell (for both client and server code)";
2191 description = "Generic HTTP types for Haskell (for both client and server code)";
@@ -2263,11 +2208,6 @@ self: {
2263 array base bytestring bytestring-builder case-insensitive
2208 array base bytestring bytestring-builder case-insensitive
2264 containers psqueues stm
2209 containers psqueues stm
2265 ];
2210 ];
2266− executableHaskellDepends = [
2267− aeson aeson-pretty array base bytestring bytestring-builder
2268− case-insensitive containers directory filepath hex text
2269− unordered-containers vector word8
2270− ];
2271 testHaskellDepends = [
2211 testHaskellDepends = [
2272 aeson aeson-pretty array base bytestring bytestring-builder
2212 aeson aeson-pretty array base bytestring bytestring-builder
2273 case-insensitive containers directory doctest filepath Glob hex
2213 case-insensitive containers directory doctest filepath Glob hex
@@ -2281,6 +2221,20 @@ self: {
2281 description = "HTTP/2 library including frames, priority queues and HPACK";
2221 description = "HTTP/2 library including frames, priority queues and HPACK";
2282 license = stdenv.lib.licenses.bsd3;
2222 license = stdenv.lib.licenses.bsd3;
2283 }) {};
2223 }) {};
2224+ "httpd-shed" = callPackage
2225+ ({ mkDerivation, base, network, network-uri }:
2226+ mkDerivation {
2227+ pname = "httpd-shed";
2228+ version = "0.4.0.3";
2229+ sha256 = "064jy1mqhnf1hvq6s04wlhmp916rd522x58djb9qixv13vc8gzxh";
2230+ revision = "1";
2231+ editedCabalFile = "159cjn9j8lq00gj2yvrzp81r37av25f83chsimp88h55zm9z8akw";
2232+ isLibrary = true;
2233+ isExecutable = true;
2234+ libraryHaskellDepends = [ base network network-uri ];
2235+ description = "A simple web-server with an interact style API";
2236+ license = stdenv.lib.licenses.bsd3;
2237+ }) {};
2284 "ieee754" = callPackage
2238 "ieee754" = callPackage
2285 ({ mkDerivation, base }:
2239 ({ mkDerivation, base }:
2286 mkDerivation {
2240 mkDerivation {
@@ -2299,8 +2253,8 @@ self: {
2299 }:
2253 }:
2300 mkDerivation {
2254 mkDerivation {
2301 pname = "inflections";
2255 pname = "inflections";
2302− version = "0.4.0.0";
2256+ version = "0.4.0.3";
2303− sha256 = "1m42sigx621yzd6sznaas6917skyw8lf5ynfcjd87jybhv2r9g2k";
2257+ sha256 = "028dj9pgs5g6qb9x1hc8r4rn0rznr1ynn79vln48k2llyf2r38dx";
2304 libraryHaskellDepends = [
2258 libraryHaskellDepends = [
2305 base exceptions megaparsec text unordered-containers
2259 base exceptions megaparsec text unordered-containers
2306 ];
2260 ];
@@ -2315,8 +2269,10 @@ self: {
2315 ({ mkDerivation, attoparsec, base, text, unordered-containers }:
2269 ({ mkDerivation, attoparsec, base, text, unordered-containers }:
2316 mkDerivation {
2270 mkDerivation {
2317 pname = "ini";
2271 pname = "ini";
2318− version = "0.3.5";
2272+ version = "0.3.6";
2319− sha256 = "1iicavbjr4qmlcdxh32cgqxlxd80xvzyxxskrs3hji1qzrnq7lxz";
2273+ sha256 = "1n9wsl7nz910bc8jx9ps7pvpql4hlnryjkqbdpfq0phjb9sf7fzw";
2274+ revision = "1";
2275+ editedCabalFile = "0gfikdal67aws20i5r4wg4r0lgn844glykcn3nnmbmyvwsks049l";
2320 libraryHaskellDepends = [
2276 libraryHaskellDepends = [
2321 attoparsec base text unordered-containers
2277 attoparsec base text unordered-containers
2322 ];
2278 ];
@@ -2328,8 +2284,8 @@ self: {
2328 ({ mkDerivation, array, base, ghc-prim, integer-gmp }:
2284 ({ mkDerivation, array, base, ghc-prim, integer-gmp }:
2329 mkDerivation {
2285 mkDerivation {
2330 pname = "integer-logarithms";
2286 pname = "integer-logarithms";
2331− version = "1.0.2";
2287+ version = "1.0.2.1";
2332− sha256 = "0w5mhak181zi6qr5h2zbcs9ymaqacisp9jwk99naz6s8zz5rq1ii";
2288+ sha256 = "1wj8kgjg5bn2yrs4zh9qfjv85cx6w998j9pi39yrbv305944mb9j";
2333 libraryHaskellDepends = [ array base ghc-prim integer-gmp ];
2289 libraryHaskellDepends = [ array base ghc-prim integer-gmp ];
2334 doCheck = false;
2290 doCheck = false;
2335 homepage = "https://github.com/phadej/integer-logarithms";
2291 homepage = "https://github.com/phadej/integer-logarithms";
@@ -2337,30 +2293,53 @@ self: {
2337 license = stdenv.lib.licenses.mit;
2293 license = stdenv.lib.licenses.mit;
2338 }) {};
2294 }) {};
2339 "interpolate" = callPackage
2295 "interpolate" = callPackage
2340− ({ mkDerivation, base, bytestring, haskell-src-meta, hspec
2296+ ({ mkDerivation, base, base-compat, bytestring, haskell-src-meta
2341− , QuickCheck, quickcheck-instances, template-haskell, text
2297+ , hspec, QuickCheck, quickcheck-instances, template-haskell, text
2342 }:
2298 }:
2343 mkDerivation {
2299 mkDerivation {
2344 pname = "interpolate";
2300 pname = "interpolate";
2345− version = "0.1.1";
2301+ version = "0.2.0";
2346− sha256 = "120ygxs8vfsjcc7xr9v8p8bcyqidhlg1rd568ym2bsl1nhx4h22b";
2302+ sha256 = "1gkaj98yz363v38fv78sqby236mp8yqwqcilx7kr2b9z0w3204bf";
2347 libraryHaskellDepends = [ base haskell-src-meta template-haskell ];
2303 libraryHaskellDepends = [ base haskell-src-meta template-haskell ];
2348 testHaskellDepends = [
2304 testHaskellDepends = [
2349− base bytestring haskell-src-meta hspec QuickCheck
2305+ base base-compat bytestring haskell-src-meta hspec QuickCheck
2350 quickcheck-instances template-haskell text
2306 quickcheck-instances template-haskell text
2351 ];
2307 ];
2352 homepage = "https://github.com/sol/interpolate#readme";
2308 homepage = "https://github.com/sol/interpolate#readme";
2353 description = "String interpolation done right";
2309 description = "String interpolation done right";
2354 license = stdenv.lib.licenses.mit;
2310 license = stdenv.lib.licenses.mit;
2355 }) {};
2311 }) {};
2312+ "invariant" = callPackage
2313+ ({ mkDerivation, array, base, bifunctors, comonad, containers
2314+ , contravariant, ghc-prim, hspec, hspec-discover, profunctors
2315+ , QuickCheck, semigroups, StateVar, stm, tagged, template-haskell
2316+ , th-abstraction, transformers, transformers-compat
2317+ , unordered-containers
2318+ }:
2319+ mkDerivation {
2320+ pname = "invariant";
2321+ version = "0.5.1";
2322+ sha256 = "0aqj7z55632qdg45074kgn9qfdxzb0a2f8lgjzr0l0i4mm2rr37b";
2323+ libraryHaskellDepends = [
2324+ array base bifunctors comonad containers contravariant ghc-prim
2325+ profunctors semigroups StateVar stm tagged template-haskell
2326+ th-abstraction transformers transformers-compat
2327+ unordered-containers
2328+ ];
2329+ testHaskellDepends = [ base hspec QuickCheck template-haskell ];
2330+ testToolDepends = [ hspec-discover ];
2331+ homepage = "https://github.com/nfrisby/invariant-functors";
2332+ description = "Haskell98 invariant functors";
2333+ license = stdenv.lib.licenses.bsd2;
2334+ }) {};
2356 "iproute" = callPackage
2335 "iproute" = callPackage
2357 ({ mkDerivation, appar, base, byteorder, containers, doctest, hspec
2336 ({ mkDerivation, appar, base, byteorder, containers, doctest, hspec
2358 , network, QuickCheck, safe
2337 , network, QuickCheck, safe
2359 }:
2338 }:
2360 mkDerivation {
2339 mkDerivation {
2361 pname = "iproute";
2340 pname = "iproute";
2362− version = "1.7.1";
2341+ version = "1.7.5";
2363− sha256 = "1viyxq3m1aifl05w0hxwrhhhcfpmvwz4ymil2gngi4nfm0yd1f2p";
2342+ sha256 = "1vw1nm3s8vz1hqnjnqd3wh5rr4q3m2r4izn5ynhf93h9185qwqzd";
2364 libraryHaskellDepends = [
2343 libraryHaskellDepends = [
2365 appar base byteorder containers network
2344 appar base byteorder containers network
2366 ];
2345 ];
@@ -2389,8 +2368,8 @@ self: {
2389 ({ mkDerivation, base, HTTP }:
2368 ({ mkDerivation, base, HTTP }:
2390 mkDerivation {
2369 mkDerivation {
2391 pname = "js-jquery";
2370 pname = "js-jquery";
2392− version = "3.2.1";
2371+ version = "3.3.1";
2393− sha256 = "03qymiwnk24sigqjnl42i77rsx6vrgg5wjday0f2j0d6s213sl30";
2372+ sha256 = "16q68jzbs7kp07dnq8cprdcc8fd41rim38039vg0w4x11lgniq70";
2394 enableSeparateDataOutput = true;
2373 enableSeparateDataOutput = true;
2395 libraryHaskellDepends = [ base ];
2374 libraryHaskellDepends = [ base ];
2396 testHaskellDepends = [ base HTTP ];
2375 testHaskellDepends = [ base HTTP ];
@@ -2400,35 +2379,35 @@ self: {
2400 }) {};
2379 }) {};
2401 "kan-extensions" = callPackage
2380 "kan-extensions" = callPackage
2402 ({ mkDerivation, adjunctions, array, base, comonad, containers
2381 ({ mkDerivation, adjunctions, array, base, comonad, containers
2403− , contravariant, distributive, fail, free, mtl, semigroupoids
2382+ , contravariant, distributive, free, invariant, mtl, profunctors
2404− , tagged, transformers
2383+ , semigroupoids, tagged, transformers, transformers-compat
2405 }:
2384 }:
2406 mkDerivation {
2385 mkDerivation {
2407 pname = "kan-extensions";
2386 pname = "kan-extensions";
2408− version = "5.0.2";
2387+ version = "5.2";
2409− sha256 = "0bj88bgwxlx490f5r979idsm9dpdsb0ldzar9sa0jhj2jn2xx7hw";
2388+ sha256 = "1lyvyiwwh962j2nnnsqzlvp5zq6z8p3spvhmji99cjvldxc7wwkb";
2410 libraryHaskellDepends = [
2389 libraryHaskellDepends = [
2411 adjunctions array base comonad containers contravariant
2390 adjunctions array base comonad containers contravariant
2412− distributive fail free mtl semigroupoids tagged transformers
2391+ distributive free invariant mtl profunctors semigroupoids tagged
2392+ transformers transformers-compat
2413 ];
2393 ];
2414 homepage = "http://github.com/ekmett/kan-extensions/";
2394 homepage = "http://github.com/ekmett/kan-extensions/";
2415− description = "Kan extensions, Kan lifts, various forms of the Yoneda lemma, and (co)density (co)monads";
2395+ description = "Kan extensions, Kan lifts, the Yoneda lemma, and (co)density (co)monads";
2416 license = stdenv.lib.licenses.bsd3;
2396 license = stdenv.lib.licenses.bsd3;
2417 }) {};
2397 }) {};
2418 "keys" = callPackage
2398 "keys" = callPackage
2419 ({ mkDerivation, array, base, comonad, containers, free, hashable
2399 ({ mkDerivation, array, base, comonad, containers, free, hashable
2420− , semigroupoids, semigroups, transformers, transformers-compat
2400+ , semigroupoids, semigroups, tagged, transformers
2421− , unordered-containers
2401+ , transformers-compat, unordered-containers
2422 }:
2402 }:
2423 mkDerivation {
2403 mkDerivation {
2424 pname = "keys";
2404 pname = "keys";
2425− version = "3.11";
2405+ version = "3.12.1";
2426− sha256 = "1cn45h27hxwb4ci1iyd2qn0fzyb2y85qq4821a9xm37bwsvrgwqc";
2406+ sha256 = "1yqm4gpshsgswx6w78z64c83gpydh6jhgslx2lnc10nzhy0s9kkz";
2427− revision = "1";
2428− editedCabalFile = "1lyg4wyi7mkqvbfl9lvfln3j4vys47jih56zyjba7nx36kbw185i";
2429 libraryHaskellDepends = [
2407 libraryHaskellDepends = [
2430 array base comonad containers free hashable semigroupoids
2408 array base comonad containers free hashable semigroupoids
2431− semigroups transformers transformers-compat unordered-containers
2409+ semigroups tagged transformers transformers-compat
2410+ unordered-containers
2432 ];
2411 ];
2433 homepage = "http://github.com/ekmett/keys/";
2412 homepage = "http://github.com/ekmett/keys/";
2434 description = "Keyed functors and containers";
2413 description = "Keyed functors and containers";
@@ -2479,8 +2458,10 @@ self: {
2479 }:
2458 }:
2480 mkDerivation {
2459 mkDerivation {
2481 pname = "lens";
2460 pname = "lens";
2482− version = "4.15.4";
2461+ version = "4.16.1";
2483− sha256 = "1lkwlnhgpgnsz046mw4qs0fa7h4l012gilrr3nf3spllsy3pnbkl";
2462+ sha256 = "1im4drhbydbawd6i0jsrzpqihnmx4ywpkg7yg94ddwsw3mxwkgpm";
2463+ revision = "2";
2464+ editedCabalFile = "11h83lj5mba4grhz1qx3irz10ysm9c3k7k6i6xv2cr60q8xin3ri";
2484 setupHaskellDepends = [ base Cabal cabal-doctest filepath ];
2465 setupHaskellDepends = [ base Cabal cabal-doctest filepath ];
2485 libraryHaskellDepends = [
2466 libraryHaskellDepends = [
2486 array base base-orphans bifunctors bytestring call-stack comonad
2467 array base base-orphans bifunctors bytestring call-stack comonad
@@ -2507,19 +2488,19 @@ self: {
2507 }) {};
2488 }) {};
2508 "lifted-async" = callPackage
2489 "lifted-async" = callPackage
2509 ({ mkDerivation, async, base, constraints, criterion, deepseq
2490 ({ mkDerivation, async, base, constraints, criterion, deepseq
2510− , HUnit, lifted-base, monad-control, mtl, tasty, tasty-hunit
2491+ , HUnit, lifted-base, monad-control, mtl, tasty
2511− , tasty-th, transformers-base
2492+ , tasty-expected-failure, tasty-hunit, tasty-th, transformers-base
2512 }:
2493 }:
2513 mkDerivation {
2494 mkDerivation {
2514 pname = "lifted-async";
2495 pname = "lifted-async";
2515− version = "0.9.3.2";
2496+ version = "0.10.0.2";
2516− sha256 = "0c8y6m1kpkviq2zi1d2889hbzh7k46rly4mvmfkrzam45fqggrcj";
2497+ sha256 = "1073r512c1x2m1v0jar9bwqg656slg7jd1jhsyj6m8awgx1l1mwf";
2517 libraryHaskellDepends = [
2498 libraryHaskellDepends = [
2518 async base constraints lifted-base monad-control transformers-base
2499 async base constraints lifted-base monad-control transformers-base
2519 ];
2500 ];
2520 testHaskellDepends = [
2501 testHaskellDepends = [
2521− async base HUnit lifted-base monad-control mtl tasty tasty-hunit
2502+ async base HUnit lifted-base monad-control mtl tasty
2522− tasty-th
2503+ tasty-expected-failure tasty-hunit tasty-th
2523 ];
2504 ];
2524 benchmarkHaskellDepends = [ async base criterion deepseq ];
2505 benchmarkHaskellDepends = [ async base criterion deepseq ];
2525 homepage = "https://github.com/maoe/lifted-async";
2506 homepage = "https://github.com/maoe/lifted-async";
@@ -2527,18 +2508,22 @@ self: {
2527 license = stdenv.lib.licenses.bsd3;
2508 license = stdenv.lib.licenses.bsd3;
2528 }) {};
2509 }) {};
2529 "lifted-base" = callPackage
2510 "lifted-base" = callPackage
2530− ({ mkDerivation, base, criterion, monad-control, monad-peel
2511+ ({ mkDerivation, base, criterion, HUnit, monad-control, monad-peel
2512+ , test-framework, test-framework-hunit, transformers
2531− , transformers, transformers-base
2513+ , transformers-base, transformers-compat
2532 }:
2514 }:
2533 mkDerivation {
2515 mkDerivation {
2534 pname = "lifted-base";
2516 pname = "lifted-base";
2535− version = "0.2.3.11";
2517+ version = "0.2.3.12";
2536− sha256 = "1ass00wfa91z5xp2xmm97xrvwm7j5hdkxid5cqvr3xbwrsgpmi4f";
2518+ sha256 = "1i8p8d3rkdh21bhgjjh32vd7qqjr7jq7p59qds0aw2kmargsjd61";
2537 libraryHaskellDepends = [ base monad-control transformers-base ];
2519 libraryHaskellDepends = [ base monad-control transformers-base ];
2520+ testHaskellDepends = [
2521+ base HUnit monad-control test-framework test-framework-hunit
2522+ transformers transformers-base transformers-compat
2523+ ];
2538 benchmarkHaskellDepends = [
2524 benchmarkHaskellDepends = [
2539 base criterion monad-control monad-peel transformers
2525 base criterion monad-control monad-peel transformers
2540 ];
2526 ];
2541− doCheck = false;
2542 homepage = "https://github.com/basvandijk/lifted-base";
2527 homepage = "https://github.com/basvandijk/lifted-base";
2543 description = "lifted IO operations from the base library";
2528 description = "lifted IO operations from the base library";
2544 license = stdenv.lib.licenses.bsd3;
2529 license = stdenv.lib.licenses.bsd3;
@@ -2573,8 +2558,10 @@ self: {
2573 }:
2558 }:
2574 mkDerivation {
2559 mkDerivation {
2575 pname = "lucid";
2560 pname = "lucid";
2576− version = "2.9.9";
2561+ version = "2.9.10";
2577− sha256 = "0cqdlm1kamfn8kv3r3vphz16j2xi9yf15kpb6440rhsyvwddbani";
2562+ sha256 = "14238cnrvkbr81hpaqg1r342sryj8k0p6igkwf140s9phfpdzry0";
2563+ revision = "1";
2564+ editedCabalFile = "0n94x2havrvks85z8azsa4pvz33amhb444cias3kfxmkyvypn5ah";
2578 libraryHaskellDepends = [
2565 libraryHaskellDepends = [
2579 base blaze-builder bytestring containers hashable mmorph mtl text
2566 base blaze-builder bytestring containers hashable mmorph mtl text
2580 transformers unordered-containers
2567 transformers unordered-containers
@@ -2613,14 +2600,16 @@ self: {
2613 }) {};
2600 }) {};
2614 "megaparsec" = callPackage
2601 "megaparsec" = callPackage
2615 ({ mkDerivation, base, bytestring, case-insensitive, containers
2602 ({ mkDerivation, base, bytestring, case-insensitive, containers
2616− , criterion, deepseq, hspec, hspec-expectations, mtl
2603+ , criterion, deepseq, hspec, hspec-discover, hspec-expectations
2617− , parser-combinators, QuickCheck, scientific, text, transformers
2604+ , mtl, parser-combinators, QuickCheck, scientific, text
2618− , weigh
2605+ , transformers, weigh
2619 }:
2606 }:
2620 mkDerivation {
2607 mkDerivation {
2621 pname = "megaparsec";
2608 pname = "megaparsec";
2622− version = "6.3.0";
2609+ version = "6.5.0";
2623− sha256 = "15bhghiszm18acn1igmq6vgdlcvsvsx4dlkl2vg2ghy5qgyrqxsv";
2610+ sha256 = "12iggy7qpf8x93jm64zf0g215xwy779bqyfyjk2bhmxqqr1yzgdy";
2611+ revision = "2";
2612+ editedCabalFile = "0ahvqr29ym3g46yv2jxniccyn1ng1yqicqdbamkzm89gjnxd9n25";
2624 libraryHaskellDepends = [
2613 libraryHaskellDepends = [
2625 base bytestring case-insensitive containers deepseq mtl
2614 base bytestring case-insensitive containers deepseq mtl
2626 parser-combinators scientific text transformers
2615 parser-combinators scientific text transformers
@@ -2629,6 +2618,7 @@ self: {
2629 base bytestring containers hspec hspec-expectations mtl QuickCheck
2618 base bytestring containers hspec hspec-expectations mtl QuickCheck
2630 scientific text transformers
2619 scientific text transformers
2631 ];
2620 ];
2621+ testToolDepends = [ hspec-discover ];
2632 benchmarkHaskellDepends = [ base criterion deepseq text weigh ];
2622 benchmarkHaskellDepends = [ base criterion deepseq text weigh ];
2633 homepage = "https://github.com/mrkkrp/megaparsec";
2623 homepage = "https://github.com/mrkkrp/megaparsec";
2634 description = "Monadic parser combinators";
2624 description = "Monadic parser combinators";
@@ -2636,18 +2626,16 @@ self: {
2636 }) {};
2626 }) {};
2637 "memory" = callPackage
2627 "memory" = callPackage
2638 ({ mkDerivation, base, basement, bytestring, deepseq, foundation
2628 ({ mkDerivation, base, basement, bytestring, deepseq, foundation
2639− , ghc-prim, tasty, tasty-hunit, tasty-quickcheck
2629+ , ghc-prim
2640 }:
2630 }:
2641 mkDerivation {
2631 mkDerivation {
2642 pname = "memory";
2632 pname = "memory";
2643− version = "0.14.10";
2633+ version = "0.14.16";
2644− sha256 = "01i1nx83n5lspwdhkhhjxxcp9agf9y70547dzs5m8zl043jmd0z4";
2634+ sha256 = "03rbszi5d4z9rlbfv8ydrl1xf84xsh8z57g07f7j9qccn9587c3v";
2645 libraryHaskellDepends = [
2635 libraryHaskellDepends = [
2646 base basement bytestring deepseq foundation ghc-prim
2636 base basement bytestring deepseq foundation ghc-prim
2647 ];
2637 ];
2648− testHaskellDepends = [
2638+ testHaskellDepends = [ base basement bytestring foundation ];
2649− base foundation tasty tasty-hunit tasty-quickcheck
2650− ];
2651 homepage = "https://github.com/vincenthz/hs-memory";
2639 homepage = "https://github.com/vincenthz/hs-memory";
2652 description = "memory and related abstraction stuff";
2640 description = "memory and related abstraction stuff";
2653 license = stdenv.lib.licenses.bsd3;
2641 license = stdenv.lib.licenses.bsd3;
@@ -2661,6 +2649,8 @@ self: {
2661 pname = "microstache";
2649 pname = "microstache";
2662 version = "1.0.1.1";
2650 version = "1.0.1.1";
2663 sha256 = "0851sqr1ppdj6m822635pa3j6qzdf25gyrhkjs25zdry6518bsax";
2651 sha256 = "0851sqr1ppdj6m822635pa3j6qzdf25gyrhkjs25zdry6518bsax";
2652+ revision = "2";
2653+ editedCabalFile = "0rl6vgmjnf1a14kiynh4gnmy6n6kkik9hqj9k5vqw68h4f110i4b";
2664 libraryHaskellDepends = [
2654 libraryHaskellDepends = [
2665 aeson base bytestring containers deepseq directory filepath parsec
2655 aeson base bytestring containers deepseq directory filepath parsec
2666 text transformers unordered-containers vector
2656 text transformers unordered-containers vector
@@ -2676,8 +2666,8 @@ self: {
2676 ({ mkDerivation, base, bytestring, containers, text }:
2666 ({ mkDerivation, base, bytestring, containers, text }:
2677 mkDerivation {
2667 mkDerivation {
2678 pname = "mime-types";
2668 pname = "mime-types";
2679− version = "0.1.0.7";
2669+ version = "0.1.0.8";
2680− sha256 = "1fg9cqpp5lswk8ajlq4f41n12c2v2naz179l8dsz6zisjqj4l5l3";
2670+ sha256 = "14ccl2842ya17zyj0bpc7vzklbyqvvydpbypn69h2fmhgji192x8";
2681 libraryHaskellDepends = [ base bytestring containers text ];
2671 libraryHaskellDepends = [ base bytestring containers text ];
2682 homepage = "https://github.com/yesodweb/wai";
2672 homepage = "https://github.com/yesodweb/wai";
2683 description = "Basic mime-type handling types and functions";
2673 description = "Basic mime-type handling types and functions";
@@ -2687,10 +2677,8 @@ self: {
2687 ({ mkDerivation, base, mtl, transformers, transformers-compat }:
2677 ({ mkDerivation, base, mtl, transformers, transformers-compat }:
2688 mkDerivation {
2678 mkDerivation {
2689 pname = "mmorph";
2679 pname = "mmorph";
2690− version = "1.1.0";
2680+ version = "1.1.2";
2691− sha256 = "1pklvg28hjfsq5r66x4igjrxbdq0l74g6lirrvsh6ckmc1av9g61";
2681+ sha256 = "1gjz1ib968lqybma7my1n19qq6cdj6a7nskrlnwy4jy9jrwzs2n9";
2692− revision = "1";
2693− editedCabalFile = "0ppf6icblgrmiaa09s2plg1m2818pp2l9rd7c821q0zq266v79wi";
2694 libraryHaskellDepends = [
2682 libraryHaskellDepends = [
2695 base mtl transformers transformers-compat
2683 base mtl transformers transformers-compat
2696 ];
2684 ];
@@ -2722,8 +2710,8 @@ self: {
2722 }:
2710 }:
2723 mkDerivation {
2711 mkDerivation {
2724 pname = "monad-control";
2712 pname = "monad-control";
2725− version = "1.0.2.2";
2713+ version = "1.0.2.3";
2726− sha256 = "0cz4ww3vp96crdqrh7w86rzrs7gs8c1z7rq84yxxhbiz28fs4d0y";
2714+ sha256 = "1c92833gr6cadidjdp8mlznkpp8lyxl0w3y7d19y8yi3klc3843c";
2727 libraryHaskellDepends = [
2715 libraryHaskellDepends = [
2728 base stm transformers transformers-base transformers-compat
2716 base stm transformers transformers-base transformers-compat
2729 ];
2717 ];
@@ -2801,48 +2789,16 @@ self: {
2801 description = "Lift control operations like exception catching through monad transformers";
2789 description = "Lift control operations like exception catching through monad transformers";
2802 license = stdenv.lib.licenses.bsd3;
2790 license = stdenv.lib.licenses.bsd3;
2803 }) {};
2791 }) {};
2804− "monad-unlift" = callPackage
2805− ({ mkDerivation, base, constraints, monad-control, transformers
2806− , transformers-base
2807− }:
2808− mkDerivation {
2809− pname = "monad-unlift";
2810− version = "0.2.0";
2811− sha256 = "03zf2nd00ds12rrbp3qn7pr9vaw1npzswrzcnhc1k0p436366pjb";
2812− libraryHaskellDepends = [
2813− base constraints monad-control transformers transformers-base
2814− ];
2815− homepage = "https://github.com/fpco/monad-unlift";
2816− description = "Typeclasses for representing monad transformer unlifting";
2817− license = stdenv.lib.licenses.mit;
2818− }) {};
2819− "monad-unlift-ref" = callPackage
2820− ({ mkDerivation, base, constraints, exceptions, monad-control
2821− , monad-unlift, mtl, mutable-containers, resourcet, stm
2822− , transformers, transformers-base
2823− }:
2824− mkDerivation {
2825− pname = "monad-unlift-ref";
2826− version = "0.2.1";
2827− sha256 = "078xjz3a6rgqqgf8zg9ngspixf9pgch845l6gs5ssy3l54wra18g";
2828− libraryHaskellDepends = [
2829− base constraints exceptions monad-control monad-unlift mtl
2830− mutable-containers resourcet stm transformers transformers-base
2831− ];
2832− homepage = "https://github.com/fpco/monad-unlift";
2833− description = "Typeclasses for representing monad transformer unlifting";
2834− license = stdenv.lib.licenses.mit;
2835− }) {};
2836 "mono-traversable" = callPackage
2792 "mono-traversable" = callPackage
2837− ({ mkDerivation, base, bytestring, containers, criterion, foldl
2793+ ({ mkDerivation, base, bytestring, containers, foldl, gauge
2838 , hashable, hspec, HUnit, mwc-random, QuickCheck, semigroups, split
2794 , hashable, hspec, HUnit, mwc-random, QuickCheck, semigroups, split
2839 , text, transformers, unordered-containers, vector
2795 , text, transformers, unordered-containers, vector
2840 , vector-algorithms
2796 , vector-algorithms
2841 }:
2797 }:
2842 mkDerivation {
2798 mkDerivation {
2843 pname = "mono-traversable";
2799 pname = "mono-traversable";
2844− version = "1.0.5.0";
2800+ version = "1.0.8.1";
2845− sha256 = "1zrn7wp938di4mdc8q0z4imgg2hky7ap98ralzf8rdgqfrrvfpa6";
2801+ sha256 = "0d9r6z3a8gkhl1j5yq8hjg5wcndi5yixxm9xwbrf4z6pgdwr04lr";
2846 libraryHaskellDepends = [
2802 libraryHaskellDepends = [
2847 base bytestring containers hashable split text transformers
2803 base bytestring containers hashable split text transformers
2848 unordered-containers vector vector-algorithms
2804 unordered-containers vector vector-algorithms
@@ -2851,7 +2807,7 @@ self: {
2851 base bytestring containers foldl hspec HUnit QuickCheck semigroups
2807 base bytestring containers foldl hspec HUnit QuickCheck semigroups
2852 text transformers unordered-containers vector
2808 text transformers unordered-containers vector
2853 ];
2809 ];
2854− benchmarkHaskellDepends = [ base criterion mwc-random vector ];
2810+ benchmarkHaskellDepends = [ base gauge mwc-random vector ];
2855 homepage = "https://github.com/snoyberg/mono-traversable#readme";
2811 homepage = "https://github.com/snoyberg/mono-traversable#readme";
2856 description = "Type classes for mapping, folding, and traversing monomorphic containers";
2812 description = "Type classes for mapping, folding, and traversing monomorphic containers";
2857 license = stdenv.lib.licenses.mit;
2813 license = stdenv.lib.licenses.mit;
@@ -2877,39 +2833,34 @@ self: {
2877 ({ mkDerivation, base, transformers }:
2833 ({ mkDerivation, base, transformers }:
2878 mkDerivation {
2834 mkDerivation {
2879 pname = "mtl";
2835 pname = "mtl";
2880− version = "2.2.1";
2836+ version = "2.2.2";
2881− sha256 = "1icdbj2rshzn0m1zz5wa7v3xvkf6qw811p4s7jgqwvx1ydwrvrfa";
2837+ sha256 = "1xmy5741h8cyy0d91ahvqdz2hykkk20l8br7lg1rccnkis5g80w8";
2882− revision = "1";
2883− editedCabalFile = "0fsa965g9h23mlfjzghmmhcb9dmaq8zpm374gby6iwgdx47q0njb";
2884 libraryHaskellDepends = [ base transformers ];
2838 libraryHaskellDepends = [ base transformers ];
2885− homepage = "http://github.com/ekmett/mtl";
2839+ homepage = "http://github.com/haskell/mtl";
2886 description = "Monad classes, using functional dependencies";
2840 description = "Monad classes, using functional dependencies";
2887 license = stdenv.lib.licenses.bsd3;
2841 license = stdenv.lib.licenses.bsd3;
2888 }) {};
2842 }) {};
2889 "mutable-containers" = callPackage
2843 "mutable-containers" = callPackage
2890− ({ mkDerivation, base, containers, criterion, ghc-prim, hspec
2844+ ({ mkDerivation, base, containers, gauge, ghc-prim, hspec
2891 , mono-traversable, primitive, QuickCheck, vector
2845 , mono-traversable, primitive, QuickCheck, vector
2892 }:
2846 }:
2893 mkDerivation {
2847 mkDerivation {
2894 pname = "mutable-containers";
2848 pname = "mutable-containers";
2895− version = "0.3.3";
2849+ version = "0.3.4";
2896− sha256 = "1svwa54prfdmhdlmv118lnkwv3jx3rx7v5x30wbdsy39n75kjyks";
2850+ sha256 = "0zhkhlvg9yw45fg3srvzx7j81547djpkfw7higdvlj7fmph6c6b4";
2897 libraryHaskellDepends = [
2851 libraryHaskellDepends = [
2898 base containers ghc-prim mono-traversable primitive vector
2852 base containers ghc-prim mono-traversable primitive vector
2899 ];
2853 ];
2900 testHaskellDepends = [
2854 testHaskellDepends = [
2901 base containers hspec primitive QuickCheck vector
2855 base containers hspec primitive QuickCheck vector
2902 ];
2856 ];
2903− benchmarkHaskellDepends = [ base containers criterion ];
2857+ benchmarkHaskellDepends = [ base containers gauge vector ];
2904− homepage = "https://github.com/snoyberg/mono-traversable";
2858+ homepage = "https://github.com/snoyberg/mono-traversable#readme";
2905 description = "Abstactions and concrete implementations of mutable containers";
2859 description = "Abstactions and concrete implementations of mutable containers";
2906 license = stdenv.lib.licenses.mit;
2860 license = stdenv.lib.licenses.mit;
2907 }) {};
2861 }) {};
2908 "mwc-random" = callPackage
2862 "mwc-random" = callPackage
2909− ({ mkDerivation, base, HUnit, math-functions, primitive, QuickCheck
2863+ ({ mkDerivation, base, math-functions, primitive, time, vector }:
2910− , statistics, test-framework, test-framework-hunit
2911− , test-framework-quickcheck2, time, vector
2912− }:
2913 mkDerivation {
2864 mkDerivation {
2914 pname = "mwc-random";
2865 pname = "mwc-random";
2915 version = "0.13.6.0";
2866 version = "0.13.6.0";
@@ -2917,10 +2868,6 @@ self: {
2917 libraryHaskellDepends = [
2868 libraryHaskellDepends = [
2918 base math-functions primitive time vector
2869 base math-functions primitive time vector
2919 ];
2870 ];
2920− testHaskellDepends = [
2921− base HUnit QuickCheck statistics test-framework
2922− test-framework-hunit test-framework-quickcheck2 vector
2923− ];
2924 homepage = "https://github.com/bos/mwc-random";
2871 homepage = "https://github.com/bos/mwc-random";
2925 description = "Fast, high quality pseudo random number generation";
2872 description = "Fast, high quality pseudo random number generation";
2926 license = stdenv.lib.licenses.bsd3;
2873 license = stdenv.lib.licenses.bsd3;
@@ -2929,10 +2876,11 @@ self: {
2929 ({ mkDerivation, base, hspec, silently }:
2876 ({ mkDerivation, base, hspec, silently }:
2930 mkDerivation {
2877 mkDerivation {
2931 pname = "nanospec";
2878 pname = "nanospec";
2932− version = "0.2.1";
2879+ version = "0.2.2";
2933− sha256 = "0jq2l1lmy4hcl6r975xcg86xr1y7jfxr3qn27ibsmjbzlnxdkjyv";
2880+ sha256 = "1rcmhl9bhyfvanalnf1r86wkx6rq6wdvagnw1h011jcnnb1cq56g";
2934 libraryHaskellDepends = [ base ];
2881 libraryHaskellDepends = [ base ];
2935 testHaskellDepends = [ base hspec silently ];
2882 testHaskellDepends = [ base hspec silently ];
2883+ homepage = "https://github.com/hspec/nanospec#readme";
2936 description = "A lightweight implementation of a subset of Hspec's API";
2884 description = "A lightweight implementation of a subset of Hspec's API";
2937 license = stdenv.lib.licenses.mit;
2885 license = stdenv.lib.licenses.mit;
2938 }) {};
2886 }) {};
@@ -2940,27 +2888,23 @@ self: {
2940 ({ mkDerivation }:
2888 ({ mkDerivation }:
2941 mkDerivation {
2889 mkDerivation {
2942 pname = "nats";
2890 pname = "nats";
2943− version = "1.1.1";
2891+ version = "1.1.2";
2944− sha256 = "1kfl2yy97nb7q0j17v96rl73xvi3z4db9bk0xychc76dax41n78k";
2892+ sha256 = "1v40drmhixck3pz3mdfghamh73l4rp71mzcviipv1y8jhrfxilmr";
2893+ revision = "1";
2894+ editedCabalFile = "1jzyysf758lfindlclqpzqcd0lrgrdv0rnz2lg8g1rvv07x2n7zh";
2945 doHaddock = false;
2895 doHaddock = false;
2946 homepage = "http://github.com/ekmett/nats/";
2896 homepage = "http://github.com/ekmett/nats/";
2947 description = "Natural numbers";
2897 description = "Natural numbers";
2948 license = stdenv.lib.licenses.bsd3;
2898 license = stdenv.lib.licenses.bsd3;
2949 }) {};
2899 }) {};
2950 "network" = callPackage
2900 "network" = callPackage
2951− ({ mkDerivation, base, bytestring, doctest, HUnit, test-framework
2901+ ({ mkDerivation, base, bytestring, doctest, hspec, HUnit, unix }:
2952− , test-framework-hunit, unix
2953− }:
2954 mkDerivation {
2902 mkDerivation {
2955 pname = "network";
2903 pname = "network";
2956− version = "2.6.3.2";
2904+ version = "2.6.3.6";
2957− sha256 = "1dn092zfqmxfbzln6d0khka4gizzjivf2yja9w9hwb5g9q3pfi1m";
2905+ sha256 = "198mam7ahny48p9fajznbqq16a8ya2gw0xm3gnm1si1rmc4hdplv";
2958− revision = "1";
2959− editedCabalFile = "17234sy0vqic8g9wg8gmfmc0by50scjwbdk8bkcl9kjf3fvs4nyx";
2960 libraryHaskellDepends = [ base bytestring unix ];
2906 libraryHaskellDepends = [ base bytestring unix ];
2961− testHaskellDepends = [
2907+ testHaskellDepends = [ base bytestring doctest hspec HUnit ];
2962− base bytestring doctest HUnit test-framework test-framework-hunit
2963− ];
2964 doCheck = false;
2908 doCheck = false;
2965 homepage = "https://github.com/haskell/network";
2909 homepage = "https://github.com/haskell/network";
2966 description = "Low-level networking interface";
2910 description = "Low-level networking interface";
@@ -3015,8 +2959,8 @@ self: {
3015 }:
2959 }:
3016 mkDerivation {
2960 mkDerivation {
3017 pname = "optparse-applicative";
2961 pname = "optparse-applicative";
3018− version = "0.14.0.0";
2962+ version = "0.14.2.0";
3019− sha256 = "06iwp1qsq0gjhnhxwyhdhldwvhlgcik6lx5jxpbb40fispyk4nxm";
2963+ sha256 = "0c3z1mvynlyv1garjbdmdd3npm40dabgm75js4r07cf766c1wd71";
3020 libraryHaskellDepends = [
2964 libraryHaskellDepends = [
3021 ansi-wl-pprint base process transformers transformers-compat
2965 ansi-wl-pprint base process transformers transformers-compat
3022 ];
2966 ];
@@ -3042,24 +2986,30 @@ self: {
3042 license = stdenv.lib.licenses.bsd3;
2986 license = stdenv.lib.licenses.bsd3;
3043 }) {};
2987 }) {};
3044 "parallel" = callPackage
2988 "parallel" = callPackage
3045− ({ mkDerivation, array, base, containers, deepseq }:
2989+ ({ mkDerivation, array, base, containers, deepseq, ghc-prim }:
3046 mkDerivation {
2990 mkDerivation {
3047 pname = "parallel";
2991 pname = "parallel";
3048− version = "3.2.1.1";
2992+ version = "3.2.2.0";
3049− sha256 = "05rw8zhpqhx31zi6vg7zpyciaarh24j7g2p613xrpyrnksybjfrj";
2993+ sha256 = "1xkfi96w6yfpppd0nw1rnszdxmvifwzm699ilv6332ra3akm610p";
3050− libraryHaskellDepends = [ array base containers deepseq ];
2994+ libraryHaskellDepends = [ array base containers deepseq ghc-prim ];
3051 description = "Parallel programming library";
2995 description = "Parallel programming library";
3052 license = stdenv.lib.licenses.bsd3;
2996 license = stdenv.lib.licenses.bsd3;
3053 }) {};
2997 }) {};
3054 "parsec" = callPackage
2998 "parsec" = callPackage
3055− ({ mkDerivation, base, bytestring, mtl, text }:
2999+ ({ mkDerivation, base, bytestring, HUnit, mtl, test-framework
3000+ , test-framework-hunit, text
3001+ }:
3056 mkDerivation {
3002 mkDerivation {
3057 pname = "parsec";
3003 pname = "parsec";
3058− version = "3.1.11";
3004+ version = "3.1.13.0";
3059− sha256 = "0vk7q9j2128q191zf1sg0ylj9s9djwayqk9747k0a5fin4f2b1vg";
3005+ sha256 = "1wc09pyn70p8z6llink10c8pqbh6ikyk554911yfwxv1g91swqbq";
3006+ revision = "1";
3007+ editedCabalFile = "1dpr1wfpykkl6kayp4wnyn0n1zv7pvqksax2i54dhdgjijj8qynd";
3060 libraryHaskellDepends = [ base bytestring mtl text ];
3008 libraryHaskellDepends = [ base bytestring mtl text ];
3061− doCheck = false;
3009+ testHaskellDepends = [
3010+ base HUnit mtl test-framework test-framework-hunit
3011+ ];
3062− homepage = "https://github.com/aslatter/parsec";
3012+ homepage = "https://github.com/hvr/parsec";
3063 description = "Monadic parser combinators";
3013 description = "Monadic parser combinators";
3064 license = stdenv.lib.licenses.bsd3;
3014 license = stdenv.lib.licenses.bsd3;
3065 }) {};
3015 }) {};
@@ -3067,23 +3017,13 @@ self: {
3067 ({ mkDerivation, base }:
3017 ({ mkDerivation, base }:
3068 mkDerivation {
3018 mkDerivation {
3069 pname = "parser-combinators";
3019 pname = "parser-combinators";
3070− version = "0.2.1";
3020+ version = "1.0.0";
3071− sha256 = "1iai2i4kr7f8fbvvm4xw4hqcwnv26g0gaglpcim9r36jmzhf2yna";
3021+ sha256 = "1pwfdsklqwvaynwpdzmx1bs35mp6dpsyaqdnzxnqcrxwf5h8sk75";
3072 libraryHaskellDepends = [ base ];
3022 libraryHaskellDepends = [ base ];
3073 homepage = "https://github.com/mrkkrp/parser-combinators";
3023 homepage = "https://github.com/mrkkrp/parser-combinators";
3074 description = "Lightweight package providing commonly useful parser combinators";
3024 description = "Lightweight package providing commonly useful parser combinators";
3075 license = stdenv.lib.licenses.bsd3;
3025 license = stdenv.lib.licenses.bsd3;
3076 }) {};
3026 }) {};
3077− "patience" = callPackage
3078− ({ mkDerivation, base, containers }:
3079− mkDerivation {
3080− pname = "patience";
3081− version = "0.1.1";
3082− sha256 = "0qyv20gqy9pb1acy700ahv70lc6vprcwb26cc7fcpcs4scsc7irm";
3083− libraryHaskellDepends = [ base containers ];
3084− description = "Patience diff and longest increasing subsequence";
3085− license = stdenv.lib.licenses.bsd3;
3086− }) {};
3087 "pcre-light" = callPackage
3027 "pcre-light" = callPackage
3088 ({ mkDerivation, base, bytestring, pcre }:
3028 ({ mkDerivation, base, bytestring, pcre }:
3089 mkDerivation {
3029 mkDerivation {
@@ -3097,16 +3037,15 @@ self: {
3097 license = stdenv.lib.licenses.bsd3;
3037 license = stdenv.lib.licenses.bsd3;
3098 }) {inherit (pkgs) pcre;};
3038 }) {inherit (pkgs) pcre;};
3099 "pem" = callPackage
3039 "pem" = callPackage
3100− ({ mkDerivation, base, base64-bytestring, bytestring, HUnit, mtl
3040+ ({ mkDerivation, base, basement, bytestring, HUnit, memory
3101 , QuickCheck, test-framework, test-framework-hunit
3041 , QuickCheck, test-framework, test-framework-hunit
3102 , test-framework-quickcheck2
3042 , test-framework-quickcheck2
3103 }:
3043 }:
3104 mkDerivation {
3044 mkDerivation {
3105 pname = "pem";
3045 pname = "pem";
3106− version = "0.2.2";
3046+ version = "0.2.4";
3107− sha256 = "162sk5sg22w21wqz5qv8kx6ibxp99v5p20g3nknhm1kddk3hha1p";
3047+ sha256 = "1m7qjsxrd8m88cvkqmr8kscril500j2a9y0iynvksjyjkhdlq33p";
3108− enableSeparateDataOutput = true;
3109− libraryHaskellDepends = [ base base64-bytestring bytestring mtl ];
3048+ libraryHaskellDepends = [ base basement bytestring memory ];
3110 testHaskellDepends = [
3049 testHaskellDepends = [
3111 base bytestring HUnit QuickCheck test-framework
3050 base bytestring HUnit QuickCheck test-framework
3112 test-framework-hunit test-framework-quickcheck2
3051 test-framework-hunit test-framework-quickcheck2
@@ -3122,10 +3061,10 @@ self: {
3122 }:
3061 }:
3123 mkDerivation {
3062 mkDerivation {
3124 pname = "pointed";
3063 pname = "pointed";
3125− version = "5";
3064+ version = "5.0.1";
3126− sha256 = "05sxac90xv4j8glmf2mxs0smmv6vhia0qaaag5v37ar5a6pvh1l9";
3065+ sha256 = "1p91a762xglckscnhpflxzav8byf49a02mli3983i4kpr2jkaimr";
3127 revision = "1";
3066 revision = "1";
3128− editedCabalFile = "170gqax34qch77zzqwq95z2lzq9da8gmfxg1vcll4aphhafwgzzp";
3067+ editedCabalFile = "1ccjmzz3jf5ybrzv7qdwm3qb8rz0yskvi4ackrixyhdk8bg5f3nc";
3129 libraryHaskellDepends = [
3068 libraryHaskellDepends = [
3130 base comonad containers data-default-class hashable kan-extensions
3069 base comonad containers data-default-class hashable kan-extensions
3131 semigroupoids semigroups stm tagged transformers
3070 semigroupoids semigroups stm tagged transformers
@@ -3146,30 +3085,29 @@ self: {
3146 description = "A variety of alternative parser combinator libraries";
3085 description = "A variety of alternative parser combinator libraries";
3147 license = "LGPL";
3086 license = "LGPL";
3148 }) {};
3087 }) {};
3149− "prelude-extras" = callPackage
3088+ "pretty-hex" = callPackage
3150− ({ mkDerivation, base }:
3089+ ({ mkDerivation, base, bytestring }:
3151 mkDerivation {
3090 mkDerivation {
3152− pname = "prelude-extras";
3091+ pname = "pretty-hex";
3153− version = "0.4.0.3";
3092+ version = "1.0";
3154− sha256 = "0xzqdf3nl2h0ra4gnslm1m1nsxlsgc0hh6ky3vn578vh11zhifq9";
3093+ sha256 = "0ylwkvvjvmpprha9nx83xb8gkhyanhk5fffc0r7lb96n4ch5z6pz";
3155− libraryHaskellDepends = [ base ];
3094+ libraryHaskellDepends = [ base bytestring ];
3156− homepage = "http://github.com/ekmett/prelude-extras";
3095+ description = "A library for hex dumps of ByteStrings";
3157− description = "Higher order versions of Prelude classes";
3158 license = stdenv.lib.licenses.bsd3;
3096 license = stdenv.lib.licenses.bsd3;
3159 }) {};
3097 }) {};
3160 "pretty-show" = callPackage
3098 "pretty-show" = callPackage
3161 ({ mkDerivation, array, base, filepath, ghc-prim, happy
3099 ({ mkDerivation, array, base, filepath, ghc-prim, happy
3162− , haskell-lexer, pretty
3100+ , haskell-lexer, pretty, text
3163 }:
3101 }:
3164 mkDerivation {
3102 mkDerivation {
3165 pname = "pretty-show";
3103 pname = "pretty-show";
3166− version = "1.6.15";
3104+ version = "1.7";
3167− sha256 = "16ik7dhagyr3is5dmkihw109l4d0500vi55z46p8lhigmfwqpn2n";
3105+ sha256 = "0br7pkxqqqhby2j2v1g847lgqsrasx56g1jw3dhmjh4flzs6warq";
3168 isLibrary = true;
3106 isLibrary = true;
3169 isExecutable = true;
3107 isExecutable = true;
3170 enableSeparateDataOutput = true;
3108 enableSeparateDataOutput = true;
3171 libraryHaskellDepends = [
3109 libraryHaskellDepends = [
3172− array base filepath ghc-prim haskell-lexer pretty
3110+ array base filepath ghc-prim haskell-lexer pretty text
3173 ];
3111 ];
3174 libraryToolDepends = [ happy ];
3112 libraryToolDepends = [ happy ];
3175 executableHaskellDepends = [ base ];
3113 executableHaskellDepends = [ base ];
@@ -3181,10 +3119,8 @@ self: {
3181 ({ mkDerivation, base, ghc-prim, transformers }:
3119 ({ mkDerivation, base, ghc-prim, transformers }:
3182 mkDerivation {
3120 mkDerivation {
3183 pname = "primitive";
3121 pname = "primitive";
3184− version = "0.6.2.0";
3122+ version = "0.6.3.0";
3185− sha256 = "1q9a537av81c0lvcdzc8i5hqjx3209f5448d1smkyaz22c1dgs5q";
3123+ sha256 = "0mcmbnj08wd6zfwn7xk6zf5hy5zwbla5v78pw0dpymqg9s0gzpnd";
3186− revision = "1";
3187− editedCabalFile = "0d61g8ppsdajdqykl2kc46kq00aamsf12v60ilgrf58dbji9sz56";
3188 libraryHaskellDepends = [ base ghc-prim transformers ];
3124 libraryHaskellDepends = [ base ghc-prim transformers ];
3189 testHaskellDepends = [ base ghc-prim ];
3125 testHaskellDepends = [ base ghc-prim ];
3190 homepage = "https://github.com/haskell/primitive";
3126 homepage = "https://github.com/haskell/primitive";
@@ -3193,42 +3129,58 @@ self: {
3193 }) {};
3129 }) {};
3194 "profunctors" = callPackage
3130 "profunctors" = callPackage
3195 ({ mkDerivation, base, base-orphans, bifunctors, comonad
3131 ({ mkDerivation, base, base-orphans, bifunctors, comonad
3196− , contravariant, distributive, tagged, transformers
3132+ , contravariant, distributive, semigroups, tagged, transformers
3197 }:
3133 }:
3198 mkDerivation {
3134 mkDerivation {
3199 pname = "profunctors";
3135 pname = "profunctors";
3200− version = "5.2.1";
3136+ version = "5.2.2";
3201− sha256 = "0pcwjp813d3mrzb7qf7dzkspf85xnfj1m2snhjgnvwx6vw07w877";
3137+ sha256 = "0s1pwjidbn761xk43pmzyvn99hm3psdifjd78ylki7f97aiyd0g9";
3138+ revision = "2";
3139+ editedCabalFile = "1ywlg9z8nlhd2avgb8c6gbkv8zyk7hvc25926bafyg0m0k8y1amq";
3202 libraryHaskellDepends = [
3140 libraryHaskellDepends = [
3203 base base-orphans bifunctors comonad contravariant distributive
3141 base base-orphans bifunctors comonad contravariant distributive
3204− tagged transformers
3142+ semigroups tagged transformers
3205 ];
3143 ];
3206 homepage = "http://github.com/ekmett/profunctors/";
3144 homepage = "http://github.com/ekmett/profunctors/";
3207 description = "Profunctors";
3145 description = "Profunctors";
3208 license = stdenv.lib.licenses.bsd3;
3146 license = stdenv.lib.licenses.bsd3;
3209 }) {};
3147 }) {};
3210 "psqueues" = callPackage
3148 "psqueues" = callPackage
3211− ({ mkDerivation, array, base, containers, criterion, deepseq
3149+ ({ mkDerivation, array, base, deepseq, ghc-prim, hashable, HUnit
3212− , fingertree-psqueue, ghc-prim, hashable, HUnit, mtl, PSQueue
3213− , QuickCheck, random, tagged, test-framework, test-framework-hunit
3150+ , QuickCheck, tagged, test-framework, test-framework-hunit
3214− , test-framework-quickcheck2, unordered-containers
3151+ , test-framework-quickcheck2
3215 }:
3152 }:
3216 mkDerivation {
3153 mkDerivation {
3217 pname = "psqueues";
3154 pname = "psqueues";
3218− version = "0.2.4.0";
3155+ version = "0.2.7.0";
3219− sha256 = "1lbjm6mnw91qg1ik73mwh48cq79k4kkaj4l380ilqp0p05a386j9";
3156+ sha256 = "1sjgc9bxh63kkdp59nbirx3xazr02ia5yhp4f4a0jnq1hj465wsc";
3220 libraryHaskellDepends = [ base deepseq ghc-prim hashable ];
3157 libraryHaskellDepends = [ base deepseq ghc-prim hashable ];
3221 testHaskellDepends = [
3158 testHaskellDepends = [
3222 array base deepseq ghc-prim hashable HUnit QuickCheck tagged
3159 array base deepseq ghc-prim hashable HUnit QuickCheck tagged
3223 test-framework test-framework-hunit test-framework-quickcheck2
3160 test-framework test-framework-hunit test-framework-quickcheck2
3224 ];
3161 ];
3225− benchmarkHaskellDepends = [
3226− base containers criterion deepseq fingertree-psqueue ghc-prim
3227− hashable mtl PSQueue random unordered-containers
3228− ];
3229 description = "Pure priority search queues";
3162 description = "Pure priority search queues";
3230 license = stdenv.lib.licenses.bsd3;
3163 license = stdenv.lib.licenses.bsd3;
3231 }) {};
3164 }) {};
3165+ "pureMD5" = callPackage
3166+ ({ mkDerivation, base, binary, bytestring, cereal, crypto-api
3167+ , crypto-api-tests, pretty-hex, QuickCheck, tagged, test-framework
3168+ , test-framework-quickcheck2
3169+ }:
3170+ mkDerivation {
3171+ pname = "pureMD5";
3172+ version = "2.1.3";
3173+ sha256 = "0zdilz41cla2ck7mcw1a9702gyg2abq94mqahr4vci9sbs53bwxy";
3174+ libraryHaskellDepends = [
3175+ base binary bytestring cereal crypto-api tagged
3176+ ];
3177+ testHaskellDepends = [
3178+ base binary bytestring cereal crypto-api-tests pretty-hex
3179+ QuickCheck test-framework test-framework-quickcheck2
3180+ ];
3181+ description = "A Haskell-only implementation of the MD5 digest (hash) algorithm";
3182+ license = stdenv.lib.licenses.bsd3;
3183+ }) {};
3232 "quickcheck-instances" = callPackage
3184 "quickcheck-instances" = callPackage
3233 ({ mkDerivation, array, base, base-compat, bytestring
3185 ({ mkDerivation, array, base, base-compat, bytestring
3234 , case-insensitive, containers, hashable, old-time, QuickCheck
3186 , case-insensitive, containers, hashable, old-time, QuickCheck
@@ -3237,10 +3189,10 @@ self: {
3237 }:
3189 }:
3238 mkDerivation {
3190 mkDerivation {
3239 pname = "quickcheck-instances";
3191 pname = "quickcheck-instances";
3240− version = "0.3.16";
3192+ version = "0.3.18";
3241− sha256 = "07xqbjb3rb5hzhjak3qpvj4hl91gc0z2272n60hv67zmv3w8kcf1";
3193+ sha256 = "1bh1pzz5fdcqvzdcirqxna6fnjms02min5md716299g5niz46w55";
3242 revision = "1";
3194 revision = "1";
3243− editedCabalFile = "1sfqjhk7z185l0gxrvn5pi3s8mvnqv1d1yzrx0k0mi48y5421jcm";
3195+ editedCabalFile = "1sngfq3v71bvgjsl8cj5kh65m3fziwy8dkvwjzs0kxfrzr87faly";
3244 libraryHaskellDepends = [
3196 libraryHaskellDepends = [
3245 array base base-compat bytestring case-insensitive containers
3197 array base base-compat bytestring case-insensitive containers
3246 hashable old-time QuickCheck scientific tagged text time
3198 hashable old-time QuickCheck scientific tagged text time
@@ -3293,8 +3245,8 @@ self: {
3293 ({ mkDerivation, base, template-haskell }:
3245 ({ mkDerivation, base, template-haskell }:
3294 mkDerivation {
3246 mkDerivation {
3295 pname = "reflection";
3247 pname = "reflection";
3296− version = "2.1.2";
3248+ version = "2.1.4";
3297− sha256 = "0f9w0akbm6p8h7kzgcd2f6nnpw1wy84pqn45vfz1ch5j0hn8h2d9";
3249+ sha256 = "0kf4a5ijw6jfnfibjcrpdy9vzh1n6v2pxia8dhyyqdissiwc8bzj";
3298 libraryHaskellDepends = [ base template-haskell ];
3250 libraryHaskellDepends = [ base template-haskell ];
3299 homepage = "http://github.com/ekmett/reflection";
3251 homepage = "http://github.com/ekmett/reflection";
3300 description = "Reifies arbitrary terms into types that can be reflected back into terms";
3252 description = "Reifies arbitrary terms into types that can be reflected back into terms";
@@ -3324,51 +3276,38 @@ self: {
3324 description = "Replaces/Enhances Text.Regex";
3276 description = "Replaces/Enhances Text.Regex";
3325 license = stdenv.lib.licenses.bsd3;
3277 license = stdenv.lib.licenses.bsd3;
3326 }) {};
3278 }) {};
3327− "regex-tdfa" = callPackage
3328− ({ mkDerivation, array, base, bytestring, containers, ghc-prim, mtl
3329− , parsec, regex-base
3330− }:
3331− mkDerivation {
3332− pname = "regex-tdfa";
3333− version = "1.2.2";
3334− sha256 = "0f8x8wyr6m21g8dnxvnvalz5bsq37l125l6qhs0fscbvprsxc4nb";
3335− libraryHaskellDepends = [
3336− array base bytestring containers ghc-prim mtl parsec regex-base
3337− ];
3338− homepage = "https://github.com/ChrisKuklewicz/regex-tdfa";
3339− description = "Replaces/Enhances Text.Regex";
3340− license = stdenv.lib.licenses.bsd3;
3341− }) {};
3342 "resourcet" = callPackage
3279 "resourcet" = callPackage
3343− ({ mkDerivation, base, containers, exceptions, hspec, lifted-base
3280+ ({ mkDerivation, base, containers, exceptions, hspec, mtl
3344− , mmorph, monad-control, mtl, transformers, transformers-base
3345− , transformers-compat, unliftio-core
3281+ , primitive, transformers, unliftio-core
3346 }:
3282 }:
3347 mkDerivation {
3283 mkDerivation {
3348 pname = "resourcet";
3284 pname = "resourcet";
3349− version = "1.1.10";
3285+ version = "1.2.1";
3350− sha256 = "1hhw9w85nj8i2azzj5sxixffdvciq96b0jhl0zz24038bij66cyl";
3286+ sha256 = "0rzjzh34s36ssign7akqjnwnjxf11c3511wk7ky0xxy0dqmc2rg7";
3351 libraryHaskellDepends = [
3287 libraryHaskellDepends = [
3352− base containers exceptions lifted-base mmorph monad-control mtl
3288+ base containers exceptions mtl primitive transformers unliftio-core
3353− transformers transformers-base transformers-compat unliftio-core
3354 ];
3289 ];
3355− testHaskellDepends = [ base hspec lifted-base transformers ];
3290+ testHaskellDepends = [ base exceptions hspec transformers ];
3356 homepage = "http://github.com/snoyberg/conduit";
3291 homepage = "http://github.com/snoyberg/conduit";
3357 description = "Deterministic allocation and freeing of scarce resources";
3292 description = "Deterministic allocation and freeing of scarce resources";
3358 license = stdenv.lib.licenses.bsd3;
3293 license = stdenv.lib.licenses.bsd3;
3359 }) {};
3294 }) {};
3360 "retry" = callPackage
3295 "retry" = callPackage
3361 ({ mkDerivation, base, data-default-class, exceptions, ghc-prim
3296 ({ mkDerivation, base, data-default-class, exceptions, ghc-prim
3297+ , hedgehog, HUnit, mtl, random, stm, tasty, tasty-hedgehog
3362− , random, transformers
3298+ , tasty-hunit, time, transformers
3363 }:
3299 }:
3364 mkDerivation {
3300 mkDerivation {
3365 pname = "retry";
3301 pname = "retry";
3366− version = "0.7.5.1";
3302+ version = "0.7.6.2";
3367− sha256 = "116fjfxdyqrk3079hqcil0dv7r2fw6x64pjwfxhckpxqavxza7sk";
3303+ sha256 = "0bmrp2h6pf43hr7sd6562qixw755h2xgszj700157pk2hxcz16ad";
3368 libraryHaskellDepends = [
3304 libraryHaskellDepends = [
3369 base data-default-class exceptions ghc-prim random transformers
3305 base data-default-class exceptions ghc-prim random transformers
3370 ];
3306 ];
3371− doCheck = false;
3307+ testHaskellDepends = [
3308+ base data-default-class exceptions ghc-prim hedgehog HUnit mtl
3309+ random stm tasty tasty-hedgehog tasty-hunit time transformers
3310+ ];
3372 homepage = "http://github.com/Soostone/retry";
3311 homepage = "http://github.com/Soostone/retry";
3373 description = "Retry combinators for monadic actions that may fail";
3312 description = "Retry combinators for monadic actions that may fail";
3374 license = stdenv.lib.licenses.bsd3;
3313 license = stdenv.lib.licenses.bsd3;
@@ -3377,28 +3316,14 @@ self: {
3377 ({ mkDerivation, base, deepseq, QuickCheck }:
3316 ({ mkDerivation, base, deepseq, QuickCheck }:
3378 mkDerivation {
3317 mkDerivation {
3379 pname = "safe";
3318 pname = "safe";
3380− version = "0.3.15";
3319+ version = "0.3.17";
3381− sha256 = "0bbalr2n92akwcgdyl5ff45h8d4waamj1lp7ly6mdgda17k4lpm3";
3320+ sha256 = "0p3yaf5slvyz1cyy51jq64c5rlp8yzwim8iy2dlnk42if4gc9ibr";
3382 libraryHaskellDepends = [ base ];
3321 libraryHaskellDepends = [ base ];
3383 testHaskellDepends = [ base deepseq QuickCheck ];
3322 testHaskellDepends = [ base deepseq QuickCheck ];
3384 homepage = "https://github.com/ndmitchell/safe#readme";
3323 homepage = "https://github.com/ndmitchell/safe#readme";
3385 description = "Library of safe (exception free) functions";
3324 description = "Library of safe (exception free) functions";
3386 license = stdenv.lib.licenses.bsd3;
3325 license = stdenv.lib.licenses.bsd3;
3387 }) {};
3326 }) {};
3388− "safe-exceptions" = callPackage
3389− ({ mkDerivation, base, deepseq, exceptions, hspec, transformers
3390− , void
3391− }:
3392− mkDerivation {
3393− pname = "safe-exceptions";
3394− version = "0.1.6.0";
3395− sha256 = "074dy2f9fbhnh59clpz8c1ljplm1wwqjj7r3i4nv0rcl0khprm3i";
3396− libraryHaskellDepends = [ base deepseq exceptions transformers ];
3397− testHaskellDepends = [ base hspec void ];
3398− homepage = "https://github.com/fpco/safe-exceptions#readme";
3399− description = "Safe, consistent, and easy exception handling";
3400− license = stdenv.lib.licenses.mit;
3401− }) {};
3402 "say" = callPackage
3327 "say" = callPackage
3403 ({ mkDerivation, base, bytestring, criterion, hspec, temporary
3328 ({ mkDerivation, base, bytestring, criterion, hspec, temporary
3404 , text, transformers
3329 , text, transformers
@@ -3424,10 +3349,8 @@ self: {
3424 }:
3349 }:
3425 mkDerivation {
3350 mkDerivation {
3426 pname = "scientific";
3351 pname = "scientific";
3427− version = "0.3.5.2";
3352+ version = "0.3.6.2";
3428− sha256 = "0msnjz7ml0zycw9bssslxbg0nigziw7vs5km4q3vjbs8jpzpkr2w";
3353+ sha256 = "03ql2f0ac8bsl524idy9xxa3kxisb2sj3avflzw580j5hzy0m397";
3429− revision = "2";
3430− editedCabalFile = "0wsrd213480p3pqrd6i650fr092yv7dhla7a85p8154pn5gvbr0a";
3431 libraryHaskellDepends = [
3354 libraryHaskellDepends = [
3432 base binary bytestring containers deepseq hashable integer-gmp
3355 base binary bytestring containers deepseq hashable integer-gmp
3433 integer-logarithms primitive text
3356 integer-logarithms primitive text
@@ -3444,20 +3367,20 @@ self: {
3444 "semigroupoids" = callPackage
3367 "semigroupoids" = callPackage
3445 ({ mkDerivation, base, base-orphans, bifunctors, Cabal
3368 ({ mkDerivation, base, base-orphans, bifunctors, Cabal
3446 , cabal-doctest, comonad, containers, contravariant, distributive
3369 , cabal-doctest, comonad, containers, contravariant, distributive
3447− , doctest, hashable, semigroups, tagged, transformers
3370+ , doctest, hashable, semigroups, tagged, template-haskell
3448− , transformers-compat, unordered-containers
3371+ , transformers, transformers-compat, unordered-containers
3449 }:
3372 }:
3450 mkDerivation {
3373 mkDerivation {
3451 pname = "semigroupoids";
3374 pname = "semigroupoids";
3452− version = "5.2.1";
3375+ version = "5.2.2";
3453− sha256 = "006jys6kvckkmbnhf4jc51sh64hamkz464mr8ciiakybrfvixr3r";
3376+ sha256 = "17i96y4iqj8clcs090lf6k0ij3j16nj14vsfwz0mm9nd6i4gbpp4";
3454− revision = "3";
3377+ revision = "4";
3455− editedCabalFile = "0wzcnpz8pyjk823vqnq5s8krsb8i6cw573hcschpd9x5ynq4li70";
3378+ editedCabalFile = "0pqfrxzypjq6z8lgdkzq4vhcyqkpk5326hny0r6snpc3gm78r4ij";
3456 setupHaskellDepends = [ base Cabal cabal-doctest ];
3379 setupHaskellDepends = [ base Cabal cabal-doctest ];
3457 libraryHaskellDepends = [
3380 libraryHaskellDepends = [
3458 base base-orphans bifunctors comonad containers contravariant
3381 base base-orphans bifunctors comonad containers contravariant
3459− distributive hashable semigroups tagged transformers
3382+ distributive hashable semigroups tagged template-haskell
3460− transformers-compat unordered-containers
3383+ transformers transformers-compat unordered-containers
3461 ];
3384 ];
3462 testHaskellDepends = [ base doctest ];
3385 testHaskellDepends = [ base doctest ];
3463 homepage = "http://github.com/ekmett/semigroupoids";
3386 homepage = "http://github.com/ekmett/semigroupoids";
@@ -3468,8 +3391,8 @@ self: {
3468 ({ mkDerivation, base }:
3391 ({ mkDerivation, base }:
3469 mkDerivation {
3392 mkDerivation {
3470 pname = "semigroups";
3393 pname = "semigroups";
3471− version = "0.18.3";
3394+ version = "0.18.5";
3472− sha256 = "1jm9wnb5jmwdk4i9qbwfay69ydi76xi0qqi9zqp6wh3jd2c7qa9m";
3395+ sha256 = "17g29h62g1k51ghhvzkw72zksjgi6vs6bfipkj81pqw1dsprcamb";
3473 libraryHaskellDepends = [ base ];
3396 libraryHaskellDepends = [ base ];
3474 homepage = "http://github.com/ekmett/semigroups/";
3397 homepage = "http://github.com/ekmett/semigroups/";
3475 description = "Anything that associates";
3398 description = "Anything that associates";
@@ -3495,8 +3418,8 @@ self: {
3495 }:
3418 }:
3496 mkDerivation {
3419 mkDerivation {
3497 pname = "shakespeare";
3420 pname = "shakespeare";
3498− version = "2.0.14.1";
3421+ version = "2.0.15";
3499− sha256 = "02pahbvibll4jmbq6p5vxr2r4mmrfx3h0c8v6qbj4rlq96lc6a23";
3422+ sha256 = "1vk4b19zvwy4mpwaq9z3l3kfmz75gfyf7alhh0y112gspgpccm23";
3500 libraryHaskellDepends = [
3423 libraryHaskellDepends = [
3501 aeson base blaze-html blaze-markup bytestring containers directory
3424 aeson base blaze-html blaze-markup bytestring containers directory
3502 exceptions ghc-prim parsec process scientific template-haskell text
3425 exceptions ghc-prim parsec process scientific template-haskell text
@@ -3527,8 +3450,8 @@ self: {
3527 ({ mkDerivation, base }:
3450 ({ mkDerivation, base }:
3528 mkDerivation {
3451 mkDerivation {
3529 pname = "simple-reflect";
3452 pname = "simple-reflect";
3530− version = "0.3.2";
3453+ version = "0.3.3";
3531− sha256 = "1dpcf6w3cf1sfl9bnlsx04x7aghw029glj5d05qzrsnms2rlw8iq";
3454+ sha256 = "0ayvrx5cm8n6db21jiyjmk5h93pw7cz1707hih09hlhk9jh5x0h7";
3532 libraryHaskellDepends = [ base ];
3455 libraryHaskellDepends = [ base ];
3533 homepage = "http://twanvl.nl/blog/haskell/simple-reflection-of-expressions";
3456 homepage = "http://twanvl.nl/blog/haskell/simple-reflection-of-expressions";
3534 description = "Simple reflection of expressions containing variables";
3457 description = "Simple reflection of expressions containing variables";
@@ -3540,8 +3463,8 @@ self: {
3540 }:
3463 }:
3541 mkDerivation {
3464 mkDerivation {
3542 pname = "simple-sendfile";
3465 pname = "simple-sendfile";
3543− version = "0.2.26";
3466+ version = "0.2.27";
3544− sha256 = "0z2r971bjy9wwv9rhnzh0ldd0z9zvqwyrq9yhz7m4lnf0k0wqq6z";
3467+ sha256 = "1bwwqzcm56m2w4ymsa054sxmpbj76h9pvb0jf8zxp8lr41cp51gn";
3545 libraryHaskellDepends = [ base bytestring network unix ];
3468 libraryHaskellDepends = [ base bytestring network unix ];
3546 testHaskellDepends = [
3469 testHaskellDepends = [
3547 base bytestring conduit conduit-extra directory hspec HUnit network
3470 base bytestring conduit conduit-extra directory hspec HUnit network
@@ -3574,8 +3497,8 @@ self: {
3574 ({ mkDerivation, base, ghc-prim, logict, mtl, pretty }:
3497 ({ mkDerivation, base, ghc-prim, logict, mtl, pretty }:
3575 mkDerivation {
3498 mkDerivation {
3576 pname = "smallcheck";
3499 pname = "smallcheck";
3577− version = "1.1.3";
3500+ version = "1.1.5";
3578− sha256 = "15f00jzfv9a35507hax3y7vwwzj1fkbf38hs16797hlrsaxmnlmm";
3501+ sha256 = "195fj7w3v03d1y1nm2ylavzrwxjcdbq0lb6zsw1dwyx5jmwfc84h";
3579 libraryHaskellDepends = [ base ghc-prim logict mtl pretty ];
3502 libraryHaskellDepends = [ base ghc-prim logict mtl pretty ];
3580 homepage = "https://github.com/feuerbach/smallcheck";
3503 homepage = "https://github.com/feuerbach/smallcheck";
3581 description = "A property-based testing library";
3504 description = "A property-based testing library";
@@ -3585,70 +3508,24 @@ self: {
3585 ({ mkDerivation, base, bytestring, cereal, network }:
3508 ({ mkDerivation, base, bytestring, cereal, network }:
3586 mkDerivation {
3509 mkDerivation {
3587 pname = "socks";
3510 pname = "socks";
3588− version = "0.5.5";
3511+ version = "0.5.6";
3589− sha256 = "0s689w1hh9g8ifl75xhzbv96ir07hwn04b4lgvbxzl8swa9ylir6";
3512+ sha256 = "0f44qy74i0n6ll3jym0a2ipafkpw1h67amcpqmj8iq95h21wsqzs";
3590− revision = "1";
3591− editedCabalFile = "0nz8q0xvd8y6f42bd1w3q8d8bg1qzl8ggx0a23kb3jb60g36dmvw";
3592 libraryHaskellDepends = [ base bytestring cereal network ];
3513 libraryHaskellDepends = [ base bytestring cereal network ];
3593 homepage = "http://github.com/vincenthz/hs-socks";
3514 homepage = "http://github.com/vincenthz/hs-socks";
3594− description = "Socks proxy (version 5) implementation";
3515+ description = "Socks proxy (ver 5)";
3595 license = stdenv.lib.licenses.bsd3;
3516 license = stdenv.lib.licenses.bsd3;
3596 }) {};
3517 }) {};
3597 "split" = callPackage
3518 "split" = callPackage
3598 ({ mkDerivation, base, QuickCheck }:
3519 ({ mkDerivation, base, QuickCheck }:
3599 mkDerivation {
3520 mkDerivation {
3600 pname = "split";
3521 pname = "split";
3601− version = "0.2.3.2";
3522+ version = "0.2.3.3";
3602− sha256 = "0fmnkvq1ky4dgyh1z2mvdal5pw103irvkf4p9d5x8wyl1nnylhs9";
3523+ sha256 = "04qlmkcyklznl03gsjg95b4nzb6i96gdapqg60rny9szgi7ngk8x";
3603 libraryHaskellDepends = [ base ];
3524 libraryHaskellDepends = [ base ];
3604 testHaskellDepends = [ base QuickCheck ];
3525 testHaskellDepends = [ base QuickCheck ];
3605 description = "Combinator library for splitting lists";
3526 description = "Combinator library for splitting lists";
3606 license = stdenv.lib.licenses.bsd3;
3527 license = stdenv.lib.licenses.bsd3;
3607 }) {};
3528 }) {};
3608− "stackage-curator" = callPackage
3609− ({ mkDerivation, aeson, amazonka, amazonka-core, amazonka-s3, async
3610− , base, blaze-html, bytestring, Cabal, classy-prelude-conduit
3611− , conduit, conduit-extra, containers, cryptonite
3612− , cryptonite-conduit, data-default-class, directory, exceptions
3613− , filepath, hashable, hspec, html-conduit, http-client
3614− , http-client-tls, http-conduit, lucid, memory, mime-types
3615− , monad-unlift, monad-unlift-ref, mono-traversable, mtl, old-locale
3616− , optparse-applicative, optparse-simple, process, QuickCheck
3617− , resourcet, safe, semigroups, stm, store, streaming-commons, syb
3618− , system-fileio, system-filepath, tar, temporary, text, time
3619− , transformers, unix-compat, unordered-containers, utf8-string
3620− , vector, xml-conduit, xml-types, yaml, zlib
3621− }:
3622− mkDerivation {
3623− pname = "stackage-curator";
3624− version = "0.15.1.0";
3625− sha256 = "158bxk5g1bc139nmdqvr4fid5igmsgqa1d4nxy0dpl8xb68l69jp";
3626− isLibrary = true;
3627− isExecutable = true;
3628− libraryHaskellDepends = [
3629− aeson amazonka amazonka-core amazonka-s3 async base blaze-html
3630− bytestring Cabal classy-prelude-conduit conduit conduit-extra
3631− containers cryptonite cryptonite-conduit data-default-class
3632− directory exceptions filepath hashable html-conduit http-client
3633− http-client-tls http-conduit lucid memory mime-types monad-unlift
3634− monad-unlift-ref mono-traversable mtl old-locale process resourcet
3635− safe semigroups stm store streaming-commons syb system-fileio
3636− system-filepath tar temporary text time transformers unix-compat
3637− unordered-containers utf8-string vector xml-conduit xml-types yaml
3638− zlib
3639− ];
3640− executableHaskellDepends = [
3641− aeson base http-client http-client-tls optparse-applicative
3642− optparse-simple system-filepath text
3643− ];
3644− testHaskellDepends = [
3645− base Cabal classy-prelude-conduit containers directory hspec
3646− http-client http-client-tls QuickCheck text yaml
3647− ];
3648− homepage = "https://github.com/fpco/stackage-curator";
3649− description = "Tools for curating Stackage bundles";
3650− license = stdenv.lib.licenses.mit;
3651− }) {};
3652 "statistics" = callPackage
3529 "statistics" = callPackage
3653 ({ mkDerivation, aeson, base, base-orphans, binary, deepseq, erf
3530 ({ mkDerivation, aeson, base, base-orphans, binary, deepseq, erf
3654 , HUnit, ieee754, math-functions, monad-par, mwc-random, primitive
3531 , HUnit, ieee754, math-functions, monad-par, mwc-random, primitive
@@ -3660,6 +3537,8 @@ self: {
3660 pname = "statistics";
3537 pname = "statistics";
3661 version = "0.14.0.2";
3538 version = "0.14.0.2";
3662 sha256 = "0y27gafkib0x0fn39qfn2rkgsfrm09ng35sbb5dwr7rclhnxz59l";
3539 sha256 = "0y27gafkib0x0fn39qfn2rkgsfrm09ng35sbb5dwr7rclhnxz59l";
3540+ revision = "2";
3541+ editedCabalFile = "1bx70yqkn62ii17fjv3pig4hklrzkqd09zj67zzjiyjzmn04fir3";
3663 libraryHaskellDepends = [
3542 libraryHaskellDepends = [
3664 aeson base base-orphans binary deepseq erf math-functions monad-par
3543 aeson base base-orphans binary deepseq erf math-functions monad-par
3665 mwc-random primitive vector vector-algorithms
3544 mwc-random primitive vector vector-algorithms
@@ -3679,20 +3558,22 @@ self: {
3679 ({ mkDerivation, array, base }:
3558 ({ mkDerivation, array, base }:
3680 mkDerivation {
3559 mkDerivation {
3681 pname = "stm";
3560 pname = "stm";
3682− version = "2.4.4.1";
3561+ version = "2.4.5.0";
3683− sha256 = "111kpy1d6f5c0bggh6hyfm86q5p8bq1qbqf6dw2x4l4dxnar16cg";
3562+ sha256 = "19sr11a0hqikhvf561b38phz6k3zg9s157a0f5ffvghk7wcdpmri";
3684− revision = "1";
3685− editedCabalFile = "0kzw4rw9fgmc4qyxmm1lwifdyrx5r1356150xm14vy4mp86diks9";
3686 libraryHaskellDepends = [ array base ];
3563 libraryHaskellDepends = [ array base ];
3564+ homepage = "https://wiki.haskell.org/Software_transactional_memory";
3687 description = "Software Transactional Memory";
3565 description = "Software Transactional Memory";
3688 license = stdenv.lib.licenses.bsd3;
3566 license = stdenv.lib.licenses.bsd3;
3689 }) {};
3567 }) {};
3690 "stm-chans" = callPackage
3568 "stm-chans" = callPackage
3691− ({ mkDerivation, base, stm }:
3569+ ({ mkDerivation, base, Cabal, stm }:
3692 mkDerivation {
3570 mkDerivation {
3693 pname = "stm-chans";
3571 pname = "stm-chans";
3694 version = "3.0.0.4";
3572 version = "3.0.0.4";
3695 sha256 = "0f27sp09yha43xk9q55sc185jyjs5h7gq2dhsyx6bm9kz9dzqi13";
3573 sha256 = "0f27sp09yha43xk9q55sc185jyjs5h7gq2dhsyx6bm9kz9dzqi13";
3574+ revision = "1";
3575+ editedCabalFile = "0v9axxcfszqdmf3dhjxy34ybh22x3r5c48mdnbvjh5i5lp7g7vp2";
3576+ setupHaskellDepends = [ base Cabal ];
3696 libraryHaskellDepends = [ base stm ];
3577 libraryHaskellDepends = [ base stm ];
3697 homepage = "http://code.haskell.org/~wren/";
3578 homepage = "http://code.haskell.org/~wren/";
3698 description = "Additional types of channels for STM";
3579 description = "Additional types of channels for STM";
@@ -3700,27 +3581,24 @@ self: {
3700 }) {};
3581 }) {};
3701 "stm-conduit" = callPackage
3582 "stm-conduit" = callPackage
3702 ({ mkDerivation, async, base, cereal, cereal-conduit, conduit
3583 ({ mkDerivation, async, base, cereal, cereal-conduit, conduit
3703− , conduit-combinators, conduit-extra, directory, doctest, ghc-prim
3584+ , conduit-extra, directory, doctest, exceptions, HUnit, monad-loops
3704− , HUnit, lifted-async, lifted-base, monad-control, monad-loops
3705 , QuickCheck, resourcet, stm, stm-chans, test-framework
3585 , QuickCheck, resourcet, stm, stm-chans, test-framework
3706 , test-framework-hunit, test-framework-quickcheck2, transformers
3586 , test-framework-hunit, test-framework-quickcheck2, transformers
3707− , void
3587+ , unliftio
3708 }:
3588 }:
3709 mkDerivation {
3589 mkDerivation {
3710 pname = "stm-conduit";
3590 pname = "stm-conduit";
3711− version = "3.0.0";
3591+ version = "4.0.0";
3712− sha256 = "02d83mji1rlijdn315q7fik6jy5q49fjwygd64c9kf4z0qy6cvyg";
3592+ sha256 = "0paapljn7nqfzrx889y0n8sszci38mdiaxkgr0bb00ph9246rr7z";
3713− revision = "1";
3714− editedCabalFile = "0wmjqypqjw9irmpsmra6zbj1sa4l14xnx5xpaz2zvfsk4x90qyyg";
3715 libraryHaskellDepends = [
3593 libraryHaskellDepends = [
3716− async base cereal cereal-conduit conduit conduit-combinators
3594+ async base cereal cereal-conduit conduit conduit-extra directory
3717− conduit-extra directory ghc-prim lifted-async lifted-base
3718− monad-control monad-loops resourcet stm stm-chans transformers void
3595+ exceptions monad-loops resourcet stm stm-chans transformers
3596+ unliftio
3719 ];
3597 ];
3720 testHaskellDepends = [
3598 testHaskellDepends = [
3721− base conduit conduit-combinators directory doctest HUnit QuickCheck
3599+ base conduit directory doctest HUnit QuickCheck resourcet stm
3722− resourcet stm stm-chans test-framework test-framework-hunit
3600+ stm-chans test-framework test-framework-hunit
3723− test-framework-quickcheck2 transformers
3601+ test-framework-quickcheck2 transformers unliftio
3724 ];
3602 ];
3725 homepage = "https://github.com/cgaebel/stm-conduit";
3603 homepage = "https://github.com/cgaebel/stm-conduit";
3726 description = "Introduces conduits to channels, and promotes using conduits concurrently";
3604 description = "Introduces conduits to channels, and promotes using conduits concurrently";
@@ -3728,92 +3606,77 @@ self: {
3728 }) {};
3606 }) {};
3729 "store" = callPackage
3607 "store" = callPackage
3730 ({ mkDerivation, array, async, base, base-orphans
3608 ({ mkDerivation, array, async, base, base-orphans
3731− , base64-bytestring, bytestring, cereal, cereal-vector, conduit
3609+ , base64-bytestring, bifunctors, bytestring, containers
3732− , containers, contravariant, criterion, cryptohash, deepseq
3610+ , contravariant, criterion, cryptohash, deepseq, directory
3733− , directory, filepath, free, ghc-prim, hashable, hspec
3611+ , filepath, free, ghc-prim, hashable, hspec, hspec-smallcheck
3734− , hspec-smallcheck, integer-gmp, lifted-base, monad-control
3612+ , integer-gmp, lifted-base, monad-control, mono-traversable
3735− , mono-traversable, network, primitive, resourcet, safe, semigroups
3613+ , network, primitive, resourcet, safe, semigroups, smallcheck
3736− , smallcheck, store-core, streaming-commons, syb, template-haskell
3614+ , store-core, syb, template-haskell, text, th-lift
3737− , text, th-lift, th-lift-instances, th-orphans, th-reify-many
3615+ , th-lift-instances, th-orphans, th-reify-many, th-utilities, time
3738− , th-utilities, time, transformers, unordered-containers, vector
3616+ , transformers, unordered-containers, vector, void
3739− , vector-binary-instances, void, weigh
3740 }:
3617 }:
3741 mkDerivation {
3618 mkDerivation {
3742 pname = "store";
3619 pname = "store";
3743− version = "0.4.3.2";
3620+ version = "0.5.0";
3744− sha256 = "13ihh1n42j9lq2dhkcgisds7bzm7nm4a02abk8vadracn4a7r97c";
3621+ sha256 = "1ivr2pvfja2plhp625wjv9lbd47vmydp33f31ljwdyzqik2j7vij";
3745− libraryHaskellDepends = [
3622+ libraryHaskellDepends = [
3746− array async base base-orphans base64-bytestring bytestring conduit
3623+ array async base base-orphans base64-bytestring bifunctors
3747− containers contravariant cryptohash deepseq directory filepath free
3624+ bytestring containers contravariant cryptohash deepseq directory
3748− ghc-prim hashable hspec hspec-smallcheck integer-gmp lifted-base
3625+ filepath free ghc-prim hashable hspec hspec-smallcheck integer-gmp
3749− monad-control mono-traversable network primitive resourcet safe
3626+ lifted-base monad-control mono-traversable network primitive
3750− semigroups smallcheck store-core streaming-commons syb
3627+ resourcet safe semigroups smallcheck store-core syb
3751 template-haskell text th-lift th-lift-instances th-orphans
3628 template-haskell text th-lift th-lift-instances th-orphans
3752 th-reify-many th-utilities time transformers unordered-containers
3629 th-reify-many th-utilities time transformers unordered-containers
3753 vector void
3630 vector void
3754 ];
3631 ];
3755− testHaskellDepends = [
3756− array async base base-orphans base64-bytestring bytestring cereal
3757− cereal-vector conduit containers contravariant criterion cryptohash
3758− deepseq directory filepath free ghc-prim hashable hspec
3759− hspec-smallcheck integer-gmp lifted-base monad-control
3760− mono-traversable network primitive resourcet safe semigroups
3761− smallcheck store-core streaming-commons syb template-haskell text
3762− th-lift th-lift-instances th-orphans th-reify-many th-utilities
3763− time transformers unordered-containers vector
3764− vector-binary-instances void weigh
3765− ];
3766 benchmarkHaskellDepends = [
3632 benchmarkHaskellDepends = [
3767− array async base base-orphans base64-bytestring bytestring conduit
3633+ array async base base-orphans base64-bytestring bifunctors
3768− containers contravariant criterion cryptohash deepseq directory
3634+ bytestring containers contravariant criterion cryptohash deepseq
3769− filepath free ghc-prim hashable hspec hspec-smallcheck integer-gmp
3635+ directory filepath free ghc-prim hashable hspec hspec-smallcheck
3770− lifted-base monad-control mono-traversable network primitive
3636+ integer-gmp lifted-base monad-control mono-traversable network
3771− resourcet safe semigroups smallcheck store-core streaming-commons
3637+ primitive resourcet safe semigroups smallcheck store-core syb
3772− syb template-haskell text th-lift th-lift-instances th-orphans
3638+ template-haskell text th-lift th-lift-instances th-orphans
3773 th-reify-many th-utilities time transformers unordered-containers
3639 th-reify-many th-utilities time transformers unordered-containers
3774 vector void
3640 vector void
3775 ];
3641 ];
3776− doHaddock = false;
3777 doCheck = false;
3642 doCheck = false;
3778 homepage = "https://github.com/fpco/store#readme";
3643 homepage = "https://github.com/fpco/store#readme";
3779 description = "Fast binary serialization";
3644 description = "Fast binary serialization";
3780 license = stdenv.lib.licenses.mit;
3645 license = stdenv.lib.licenses.mit;
3781 }) {};
3646 }) {};
3782 "store-core" = callPackage
3647 "store-core" = callPackage
3783− ({ mkDerivation, base, bytestring, fail, ghc-prim, primitive, text
3648+ ({ mkDerivation, base, bytestring, ghc-prim, primitive, text
3784 , transformers
3649 , transformers
3785 }:
3650 }:
3786 mkDerivation {
3651 mkDerivation {
3787 pname = "store-core";
3652 pname = "store-core";
3788− version = "0.4.1";
3653+ version = "0.4.4";
3789− sha256 = "1d34n2n9vjngxndkbxcqm07sg4cnaq6rlx013rhyjr3aybwqalhl";
3654+ sha256 = "1489ydwmq3vd9lz193m5w277wvb9g74ssc1ncfjdry2g0y6czbjv";
3790 libraryHaskellDepends = [
3655 libraryHaskellDepends = [
3791− base bytestring fail ghc-prim primitive text transformers
3656+ base bytestring ghc-prim primitive text transformers
3792 ];
3657 ];
3793 homepage = "https://github.com/fpco/store#readme";
3658 homepage = "https://github.com/fpco/store#readme";
3794 description = "Fast and lightweight binary serialization";
3659 description = "Fast and lightweight binary serialization";
3795 license = stdenv.lib.licenses.mit;
3660 license = stdenv.lib.licenses.mit;
3796 }) {};
3661 }) {};
3797 "streaming-commons" = callPackage
3662 "streaming-commons" = callPackage
3798− ({ mkDerivation, array, async, base, blaze-builder, bytestring
3663+ ({ mkDerivation, array, async, base, bytestring, deepseq, directory
3799− , criterion, deepseq, directory, hspec, network, process
3664+ , gauge, hspec, network, process, QuickCheck, random, stm, text
3800− , QuickCheck, random, stm, text, transformers, unix, zlib
3665+ , transformers, unix, zlib
3801 }:
3666 }:
3802 mkDerivation {
3667 mkDerivation {
3803 pname = "streaming-commons";
3668 pname = "streaming-commons";
3804− version = "0.1.18";
3669+ version = "0.2.1.0";
3805− sha256 = "1jw3y3clh2l0kmsrkhhn6n1b8i8gnwz5cwbczj1kq00sj3xjxbr7";
3670+ sha256 = "13fn6qmpiggwpn8lczyydgp77cyzfypwds7wxskrwir4i5cgxlfq";
3806 libraryHaskellDepends = [
3671 libraryHaskellDepends = [
3807− array async base blaze-builder bytestring directory network process
3672+ array async base bytestring directory network process random stm
3808− random stm text transformers unix zlib
3673+ text transformers unix zlib
3809 ];
3674 ];
3810 testHaskellDepends = [
3675 testHaskellDepends = [
3811− array async base blaze-builder bytestring deepseq hspec network
3676+ array async base bytestring deepseq hspec network QuickCheck text
3812− QuickCheck text unix zlib
3677+ unix zlib
3813− ];
3814− benchmarkHaskellDepends = [
3815− base blaze-builder bytestring criterion deepseq text
3816 ];
3678 ];
3679+ benchmarkHaskellDepends = [ base bytestring deepseq gauge text ];
3817 homepage = "https://github.com/fpco/streaming-commons";
3680 homepage = "https://github.com/fpco/streaming-commons";
3818 description = "Common lower-level functions needed by various streaming data libraries";
3681 description = "Common lower-level functions needed by various streaming data libraries";
3819 license = stdenv.lib.licenses.mit;
3682 license = stdenv.lib.licenses.mit;
@@ -3822,8 +3685,8 @@ self: {
3822 ({ mkDerivation, base, hspec, QuickCheck }:
3685 ({ mkDerivation, base, hspec, QuickCheck }:
3823 mkDerivation {
3686 mkDerivation {
3824 pname = "stringbuilder";
3687 pname = "stringbuilder";
3825− version = "0.5.0";
3688+ version = "0.5.1";
3826− sha256 = "1ap95xphqnrhv64c2a137wqslkdmb2jjd9ldb17gs1pw48k8hrl9";
3689+ sha256 = "1fh3csx1wcssn8xyvl4ip4aprh9l4qyz2kk8mgjvqvc0vb2bsy6q";
3827 libraryHaskellDepends = [ base ];
3690 libraryHaskellDepends = [ base ];
3828 testHaskellDepends = [ base hspec QuickCheck ];
3691 testHaskellDepends = [ base hspec QuickCheck ];
3829 description = "A writer monad for multi-line string literals";
3692 description = "A writer monad for multi-line string literals";
@@ -3841,34 +3704,6 @@ self: {
3841 description = "Scrap Your Boilerplate";
3704 description = "Scrap Your Boilerplate";
3842 license = stdenv.lib.licenses.bsd3;
3705 license = stdenv.lib.licenses.bsd3;
3843 }) {};
3706 }) {};
3844− "system-fileio" = callPackage
3845− ({ mkDerivation, base, bytestring, system-filepath, text, time
3846− , unix
3847− }:
3848− mkDerivation {
3849− pname = "system-fileio";
3850− version = "0.3.16.3";
3851− sha256 = "1484hcl27s2qcby8ws5djj11q9bz68bspcifz9h5gii2ndy70x9i";
3852− libraryHaskellDepends = [
3853− base bytestring system-filepath text time unix
3854− ];
3855− doCheck = false;
3856− homepage = "https://github.com/fpco/haskell-filesystem";
3857− description = "Consistent filesystem interaction across GHC versions (deprecated)";
3858− license = stdenv.lib.licenses.mit;
3859− }) {};
3860− "system-filepath" = callPackage
3861− ({ mkDerivation, base, bytestring, deepseq, text }:
3862− mkDerivation {
3863− pname = "system-filepath";
3864− version = "0.4.13.4";
3865− sha256 = "1yy5zsmmimhg6iaw9fmpwrxvxrgi5s6bfyqfihdsnx4bjvn7sp9l";
3866− libraryHaskellDepends = [ base bytestring deepseq text ];
3867− doCheck = false;
3868− homepage = "https://github.com/fpco/haskell-filesystem";
3869− description = "High-level, byte-based file and directory path manipulations (deprecated)";
3870− license = stdenv.lib.licenses.mit;
3871− }) {};
3872 "tagged" = callPackage
3707 "tagged" = callPackage
3873 ({ mkDerivation, base, deepseq, template-haskell, transformers
3708 ({ mkDerivation, base, deepseq, template-haskell, transformers
3874 , transformers-compat
3709 , transformers-compat
@@ -3877,8 +3712,8 @@ self: {
3877 pname = "tagged";
3712 pname = "tagged";
3878 version = "0.8.5";
3713 version = "0.8.5";
3879 sha256 = "16cdzh0bw16nvjnyyy5j9s60malhz4nnazw96vxb0xzdap4m2z74";
3714 sha256 = "16cdzh0bw16nvjnyyy5j9s60malhz4nnazw96vxb0xzdap4m2z74";
3880− revision = "1";
3715+ revision = "2";
3881− editedCabalFile = "15mqdimbgrq5brqljjl7dbxkyrxppap06q53cp7ml7w3l08v5mx8";
3716+ editedCabalFile = "0r2knfcq0b4s652vlvlnfwxlc2mkc2ra9kl8bp4zdn1awmfy0ia5";
3882 libraryHaskellDepends = [
3717 libraryHaskellDepends = [
3883 base deepseq template-haskell transformers transformers-compat
3718 base deepseq template-haskell transformers transformers-compat
3884 ];
3719 ];
@@ -3886,58 +3721,38 @@ self: {
3886 description = "Haskell 98 phantom types to avoid unsafely passing dummy arguments";
3721 description = "Haskell 98 phantom types to avoid unsafely passing dummy arguments";
3887 license = stdenv.lib.licenses.bsd3;
3722 license = stdenv.lib.licenses.bsd3;
3888 }) {};
3723 }) {};
3889− "tagstream-conduit" = callPackage
3890− ({ mkDerivation, attoparsec, base, blaze-builder, bytestring
3891− , case-insensitive, conduit, conduit-extra, data-default, hspec
3892− , HUnit, QuickCheck, resourcet, text, transformers, xml-conduit
3893− }:
3894− mkDerivation {
3895− pname = "tagstream-conduit";
3896− version = "0.5.5.3";
3897− sha256 = "1arlf7qil9bzcqykda8yyrnncm29jsfjvz5kbcdrbbhqpbqfi5mj";
3898− libraryHaskellDepends = [
3899− attoparsec base blaze-builder bytestring case-insensitive conduit
3900− conduit-extra data-default resourcet text transformers xml-conduit
3901− ];
3902− testHaskellDepends = [
3903− base bytestring conduit hspec HUnit QuickCheck resourcet text
3904− ];
3905− homepage = "http://github.com/yihuang/tagstream-conduit";
3906− description = "streamlined html tag parser";
3907− license = stdenv.lib.licenses.bsd3;
3908− }) {};
3909 "tar" = callPackage
3724 "tar" = callPackage
3910 ({ mkDerivation, array, base, bytestring, containers, criterion
3725 ({ mkDerivation, array, base, bytestring, containers, criterion
3911− , deepseq, directory, filepath, old-time, time
3726+ , deepseq, directory, filepath, time
3912 }:
3727 }:
3913 mkDerivation {
3728 mkDerivation {
3914 pname = "tar";
3729 pname = "tar";
3915− version = "0.5.0.3";
3730+ version = "0.5.1.0";
3916− sha256 = "18qq94j9bm91iswnxq2dm5dws5c7wm4k01q2rpf8py35cf3svnfq";
3731+ sha256 = "0s2brvaxg5fki2jdkccmnpssiy6a3wjh24p6a3dkkdvjcixnk7f8";
3917 configureFlags = [ "-f-old-time" ];
3732 configureFlags = [ "-f-old-time" ];
3918 libraryHaskellDepends = [
3733 libraryHaskellDepends = [
3919 array base bytestring containers deepseq directory filepath time
3734 array base bytestring containers deepseq directory filepath time
3920 ];
3735 ];
3921 benchmarkHaskellDepends = [
3736 benchmarkHaskellDepends = [
3922 array base bytestring containers criterion deepseq directory
3737 array base bytestring containers criterion deepseq directory
3923− filepath old-time time
3738+ filepath time
3924 ];
3739 ];
3925 doCheck = false;
3740 doCheck = false;
3926 description = "Reading, writing and manipulating \".tar\" archive files.";
3741 description = "Reading, writing and manipulating \".tar\" archive files.";
3927 license = stdenv.lib.licenses.bsd3;
3742 license = stdenv.lib.licenses.bsd3;
3928 }) {};
3743 }) {};
3929 "tasty" = callPackage
3744 "tasty" = callPackage
3930− ({ mkDerivation, ansi-terminal, async, base, clock, containers
3745+ ({ mkDerivation, ansi-terminal, async, base, clock, containers, mtl
3931− , deepseq, mtl, optparse-applicative, regex-tdfa, stm, tagged
3746+ , optparse-applicative, stm, tagged, unbounded-delays, unix
3932− , unbounded-delays, unix
3747+ , wcwidth
3933 }:
3748 }:
3934 mkDerivation {
3749 mkDerivation {
3935 pname = "tasty";
3750 pname = "tasty";
3936− version = "0.11.3";
3751+ version = "1.1.0.2";
3937− sha256 = "1g5394akq4j7y93b7cqwqf9lacqh2k21rrj6srbnh2sg97ng7j1b";
3752+ sha256 = "1q3hsy1a6q8xng3m04hp1m10bwamihani30zi25cjhkhmyl4ads7";
3938 libraryHaskellDepends = [
3753 libraryHaskellDepends = [
3939− ansi-terminal async base clock containers deepseq mtl
3754+ ansi-terminal async base clock containers mtl optparse-applicative
3940− optparse-applicative regex-tdfa stm tagged unbounded-delays unix
3755+ stm tagged unbounded-delays unix wcwidth
3941 ];
3756 ];
3942 homepage = "https://github.com/feuerbach/tasty";
3757 homepage = "https://github.com/feuerbach/tasty";
3943 description = "Modern and extensible testing framework";
3758 description = "Modern and extensible testing framework";
@@ -3950,8 +3765,8 @@ self: {
3950 }:
3765 }:
3951 mkDerivation {
3766 mkDerivation {
3952 pname = "tasty-ant-xml";
3767 pname = "tasty-ant-xml";
3953− version = "1.1.1";
3768+ version = "1.1.4";
3954− sha256 = "0asvz2jjk1zf3ylps1277kf4yy6bifascblsd3vjfk9k9rh52w3j";
3769+ sha256 = "0v0gsb90kh6hwlgxbclzawsskywc6yf7n8xhiifia97l4y0yx2m8";
3955 libraryHaskellDepends = [
3770 libraryHaskellDepends = [
3956 base containers directory filepath generic-deriving ghc-prim mtl
3771 base containers directory filepath generic-deriving ghc-prim mtl
3957 stm tagged tasty transformers xml
3772 stm tagged tasty transformers xml
@@ -3960,6 +3775,17 @@ self: {
3960 description = "Render tasty output to XML for Jenkins";
3775 description = "Render tasty output to XML for Jenkins";
3961 license = stdenv.lib.licenses.bsd3;
3776 license = stdenv.lib.licenses.bsd3;
3962 }) {};
3777 }) {};
3778+ "tasty-expected-failure" = callPackage
3779+ ({ mkDerivation, base, tagged, tasty }:
3780+ mkDerivation {
3781+ pname = "tasty-expected-failure";
3782+ version = "0.11.1.1";
3783+ sha256 = "1i2s809m644b7hgiblqay9j364r3fjj1rwbrahsn1pgr5q6mr6ji";
3784+ libraryHaskellDepends = [ base tagged tasty ];
3785+ homepage = "http://github.com/nomeata/tasty-expected-failure";
3786+ description = "Mark tasty tests as failure expected";
3787+ license = stdenv.lib.licenses.mit;
3788+ }) {};
3963 "tasty-golden" = callPackage
3789 "tasty-golden" = callPackage
3964 ({ mkDerivation, async, base, bytestring, containers, deepseq
3790 ({ mkDerivation, async, base, bytestring, containers, deepseq
3965 , directory, filepath, mtl, optparse-applicative, process, tagged
3791 , directory, filepath, mtl, optparse-applicative, process, tagged
@@ -3967,8 +3793,8 @@ self: {
3967 }:
3793 }:
3968 mkDerivation {
3794 mkDerivation {
3969 pname = "tasty-golden";
3795 pname = "tasty-golden";
3970− version = "2.3.1.2";
3796+ version = "2.3.2";
3971− sha256 = "088rvrvmi8wjci3zlyn3mph1yjl77j0wabdwzp4x2wxpygviy7k9";
3797+ sha256 = "0k3ibjhjc9vcwzrjnl4rnwvfm8l81q347nb7dgvcib6n5wm3s404";
3972 libraryHaskellDepends = [
3798 libraryHaskellDepends = [
3973 async base bytestring containers deepseq directory filepath mtl
3799 async base bytestring containers deepseq directory filepath mtl
3974 optparse-applicative process tagged tasty temporary
3800 optparse-applicative process tagged tasty temporary
@@ -3980,14 +3806,32 @@ self: {
3980 description = "Golden tests support for tasty";
3806 description = "Golden tests support for tasty";
3981 license = stdenv.lib.licenses.mit;
3807 license = stdenv.lib.licenses.mit;
3982 }) {};
3808 }) {};
3809+ "tasty-hedgehog" = callPackage
3810+ ({ mkDerivation, base, hedgehog, tagged, tasty
3811+ , tasty-expected-failure
3812+ }:
3813+ mkDerivation {
3814+ pname = "tasty-hedgehog";
3815+ version = "0.2.0.0";
3816+ sha256 = "10m1akbiblnjq9ljk469725k30b254d36d267rk51z2f171py42s";
3817+ revision = "4";
3818+ editedCabalFile = "04d7lhn0dlqna0pqz7wxmz2y6vq7qar2m2g432z38cvm5na9w4y0";
3819+ libraryHaskellDepends = [ base hedgehog tagged tasty ];
3820+ testHaskellDepends = [
3821+ base hedgehog tasty tasty-expected-failure
3822+ ];
3823+ homepage = "https://github.com/qfpl/tasty-hedgehog";
3824+ description = "Integration for tasty and hedgehog";
3825+ license = stdenv.lib.licenses.bsd3;
3826+ }) {};
3983 "tasty-hunit" = callPackage
3827 "tasty-hunit" = callPackage
3984− ({ mkDerivation, base, tasty }:
3828+ ({ mkDerivation, base, call-stack, tasty }:
3985 mkDerivation {
3829 mkDerivation {
3986 pname = "tasty-hunit";
3830 pname = "tasty-hunit";
3987− version = "0.9.2";
3831+ version = "0.10.0.1";
3988− sha256 = "08qnxaw34wfnzi9irs1jd4d0zczqm3k5ffkd4zwhkz0dflmgq7mf";
3832+ sha256 = "0j3hgga6c3s8h5snzivb8a75h96207ia2rlbxzj07xbf4zpkp44g";
3989− libraryHaskellDepends = [ base tasty ];
3833+ libraryHaskellDepends = [ base call-stack tasty ];
3990− homepage = "http://documentup.com/feuerbach/tasty";
3834+ homepage = "https://github.com/feuerbach/tasty";
3991 description = "HUnit support for the Tasty test framework";
3835 description = "HUnit support for the Tasty test framework";
3992 license = stdenv.lib.licenses.mit;
3836 license = stdenv.lib.licenses.mit;
3993 }) {};
3837 }) {};
@@ -4008,16 +3852,20 @@ self: {
4008 license = stdenv.lib.licenses.mit;
3852 license = stdenv.lib.licenses.mit;
4009 }) {};
3853 }) {};
4010 "tasty-quickcheck" = callPackage
3854 "tasty-quickcheck" = callPackage
4011− ({ mkDerivation, base, pcre-light, QuickCheck, random, tagged
3855+ ({ mkDerivation, base, optparse-applicative, pcre-light, QuickCheck
4012− , tasty, tasty-hunit
3856+ , random, tagged, tasty, tasty-hunit
4013 }:
3857 }:
4014 mkDerivation {
3858 mkDerivation {
4015 pname = "tasty-quickcheck";
3859 pname = "tasty-quickcheck";
4016− version = "0.9.1";
3860+ version = "0.10";
4017− sha256 = "03db6aknm5rdl14mn98lxhb38357ywvs7agygyz1hbc5iv7rggxa";
3861+ sha256 = "0vr6szbbz3s5461i0zr8zpq347zfvidfzv5gf3xwxhm0yk731z8h";
3862+ revision = "1";
3863+ editedCabalFile = "1ndkkywcqgb2wj339vgckjv5915da5kd4ixlkaww9fsba3qsrnwx";
3864+ libraryHaskellDepends = [
4018− libraryHaskellDepends = [ base QuickCheck random tagged tasty ];
3865+ base optparse-applicative QuickCheck random tagged tasty
3866+ ];
4019 testHaskellDepends = [ base pcre-light tasty tasty-hunit ];
3867 testHaskellDepends = [ base pcre-light tasty tasty-hunit ];
4020− homepage = "http://documentup.com/feuerbach/tasty";
3868+ homepage = "https://github.com/feuerbach/tasty";
4021 description = "QuickCheck support for the Tasty test framework";
3869 description = "QuickCheck support for the Tasty test framework";
4022 license = stdenv.lib.licenses.mit;
3870 license = stdenv.lib.licenses.mit;
4023 }) {};
3871 }) {};
@@ -4050,14 +3898,14 @@ self: {
4050 }) {};
3898 }) {};
4051 "temporary" = callPackage
3899 "temporary" = callPackage
4052 ({ mkDerivation, base, base-compat, directory, exceptions, filepath
3900 ({ mkDerivation, base, base-compat, directory, exceptions, filepath
4053− , tasty, tasty-hunit, transformers, unix
3901+ , random, tasty, tasty-hunit, transformers, unix
4054 }:
3902 }:
4055 mkDerivation {
3903 mkDerivation {
4056 pname = "temporary";
3904 pname = "temporary";
4057− version = "1.2.1.1";
3905+ version = "1.3";
4058− sha256 = "1wq0rc71mp0lw7pkpcbhglf636ni46xnlpsmx6yz8acmwmqj8xsm";
3906+ sha256 = "144qhwfwg37l3k313raf4ssiz16jbgwlm1nf4flgqpsbd69jji4c";
4059 libraryHaskellDepends = [
3907 libraryHaskellDepends = [
4060− base directory exceptions filepath transformers unix
3908+ base directory exceptions filepath random transformers unix
4061 ];
3909 ];
4062 testHaskellDepends = [
3910 testHaskellDepends = [
4063 base base-compat directory filepath tasty tasty-hunit unix
3911 base base-compat directory filepath tasty tasty-hunit unix
@@ -4081,23 +3929,30 @@ self: {
4081 description = "Portable temporary file and directory support for Windows and Unix, based on code from Cabal";
3929 description = "Portable temporary file and directory support for Windows and Unix, based on code from Cabal";
4082 license = stdenv.lib.licenses.bsd3;
3930 license = stdenv.lib.licenses.bsd3;
4083 }) {};
3931 }) {};
3932+ "terminal-size" = callPackage
3933+ ({ mkDerivation, base }:
3934+ mkDerivation {
3935+ pname = "terminal-size";
3936+ version = "0.3.2.1";
3937+ sha256 = "0n4nvj3dbj9gxfnprgish45asn9z4dipv9j98s8i7g2n8yb3xhmm";
3938+ libraryHaskellDepends = [ base ];
3939+ description = "Get terminal window height and width";
3940+ license = stdenv.lib.licenses.bsd3;
3941+ }) {};
4084 "test-framework" = callPackage
3942 "test-framework" = callPackage
4085 ({ mkDerivation, ansi-terminal, ansi-wl-pprint, base, containers
3943 ({ mkDerivation, ansi-terminal, ansi-wl-pprint, base, containers
4086 , hostname, old-locale, random, regex-posix, time, xml
3944 , hostname, old-locale, random, regex-posix, time, xml
4087 }:
3945 }:
4088 mkDerivation {
3946 mkDerivation {
4089 pname = "test-framework";
3947 pname = "test-framework";
4090− version = "0.8.1.1";
3948+ version = "0.8.2.0";
4091− sha256 = "0wxjgdvb1c4ykazw774zlx86550848wbsvgjgcrdzcgbb9m650vq";
3949+ sha256 = "1hhacrzam6b8f10hyldmjw8pb7frdxh04rfg3farxcxwbnhwgbpm";
4092− revision = "2";
4093− editedCabalFile = "1mp1h0fzwxa3xxnbw33lp8hj0rb8vwkd712r5ak8ny5nmawh2c9y";
4094− isLibrary = true;
4095− isExecutable = true;
4096 libraryHaskellDepends = [
3950 libraryHaskellDepends = [
4097 ansi-terminal ansi-wl-pprint base containers hostname old-locale
3951 ansi-terminal ansi-wl-pprint base containers hostname old-locale
4098 random regex-posix time xml
3952 random regex-posix time xml
4099 ];
3953 ];
3954+ doCheck = false;
4100− homepage = "https://batterseapower.github.io/test-framework/";
3955+ homepage = "http://haskell.github.io/test-framework/";
4101 description = "Framework for running and organising tests, with HUnit and QuickCheck support";
3956 description = "Framework for running and organising tests, with HUnit and QuickCheck support";
4102 license = stdenv.lib.licenses.bsd3;
3957 license = stdenv.lib.licenses.bsd3;
4103 }) {};
3958 }) {};
@@ -4125,6 +3980,8 @@ self: {
4125 pname = "test-framework-quickcheck2";
3980 pname = "test-framework-quickcheck2";
4126 version = "0.3.0.4";
3981 version = "0.3.0.4";
4127 sha256 = "0vj834337r6jzr3258cv68ly2sv5999mklpsrfngyk51kywsyqyp";
3982 sha256 = "0vj834337r6jzr3258cv68ly2sv5999mklpsrfngyk51kywsyqyp";
3983+ revision = "1";
3984+ editedCabalFile = "147ngmfdkskyg7mwsp5w73a4dbx3rp5s38bci3z03kn1m093lxff";
4128 libraryHaskellDepends = [
3985 libraryHaskellDepends = [
4129 base extensible-exceptions QuickCheck random test-framework
3986 base extensible-exceptions QuickCheck random test-framework
4130 ];
3987 ];
@@ -4149,26 +4006,19 @@ self: {
4149 license = stdenv.lib.licenses.bsd3;
4006 license = stdenv.lib.licenses.bsd3;
4150 }) {};
4007 }) {};
4151 "text" = callPackage
4008 "text" = callPackage
4152− ({ mkDerivation, array, base, binary, bytestring, deepseq
4009+ ({ mkDerivation, array, base, binary, bytestring, deepseq, ghc-prim
4153− , directory, ghc-prim, HUnit, integer-gmp, QuickCheck
4010+ , integer-gmp
4154− , quickcheck-unicode, random, test-framework, test-framework-hunit
4155− , test-framework-quickcheck2
4156 }:
4011 }:
4157 mkDerivation {
4012 mkDerivation {
4158 pname = "text";
4013 pname = "text";
4159− version = "1.2.2.2";
4014+ version = "1.2.3.0";
4160− sha256 = "1y9d0zjs2ls0c574mr5xw7y3y49s62sd3wcn9lhpwz8a6q352iii";
4015+ sha256 = "06iir7q99rnffzxi8gagn8w1k9m49368sbidgz634fv1gxib3q10";
4161 configureFlags = [ "-f-integer-simple" ];
4016 configureFlags = [ "-f-integer-simple" ];
4162 libraryHaskellDepends = [
4017 libraryHaskellDepends = [
4163 array base binary bytestring deepseq ghc-prim integer-gmp
4018 array base binary bytestring deepseq ghc-prim integer-gmp
4164 ];
4019 ];
4165− testHaskellDepends = [
4166− array base binary bytestring deepseq directory ghc-prim HUnit
4167− integer-gmp QuickCheck quickcheck-unicode random test-framework
4168− test-framework-hunit test-framework-quickcheck2
4169− ];
4170 doCheck = false;
4020 doCheck = false;
4171− homepage = "https://github.com/bos/text";
4021+ homepage = "https://github.com/haskell/text";
4172 description = "An efficient packed Unicode text type";
4022 description = "An efficient packed Unicode text type";
4173 license = stdenv.lib.licenses.bsd2;
4023 license = stdenv.lib.licenses.bsd2;
4174 }) {};
4024 }) {};
@@ -4194,14 +4044,15 @@ self: {
4194 license = stdenv.lib.licenses.bsd3;
4044 license = stdenv.lib.licenses.bsd3;
4195 }) {inherit (pkgs) icu;};
4045 }) {inherit (pkgs) icu;};
4196 "text-short" = callPackage
4046 "text-short" = callPackage
4197− ({ mkDerivation, base, binary, bytestring, deepseq, hashable, text
4047+ ({ mkDerivation, base, binary, bytestring, deepseq, ghc-prim
4048+ , hashable, text
4198 }:
4049 }:
4199 mkDerivation {
4050 mkDerivation {
4200 pname = "text-short";
4051 pname = "text-short";
4201− version = "0.1.1";
4052+ version = "0.1.2";
4202− sha256 = "1c912nn1xqqvg27rndb8qvqwhw4iivhr19qjkgy3nfbi6krzkvsm";
4053+ sha256 = "0rqiwgjkgyfy8596swl0s0x2jqk6ddh2h02qxa32az2cs5kviwmk";
4203 libraryHaskellDepends = [
4054 libraryHaskellDepends = [
4204− base binary bytestring deepseq hashable text
4055+ base binary bytestring deepseq ghc-prim hashable text
4205 ];
4056 ];
4206 doCheck = false;
4057 doCheck = false;
4207 description = "Memory-efficient representation of Unicode text strings";
4058 description = "Memory-efficient representation of Unicode text strings";
@@ -4221,8 +4072,10 @@ self: {
4221 ({ mkDerivation, base, containers, ghc-prim, template-haskell }:
4072 ({ mkDerivation, base, containers, ghc-prim, template-haskell }:
4222 mkDerivation {
4073 mkDerivation {
4223 pname = "th-abstraction";
4074 pname = "th-abstraction";
4224− version = "0.2.6.0";
4075+ version = "0.2.8.0";
4225− sha256 = "0g42h6wnj2awc5ryhbvx009wd8w75pn66bjzsq1z4s3xajd2hbp5";
4076+ sha256 = "0n17w4q2ykd0nica4sck2wng6md56rfad8x0icl0l8vnzb9nn4ya";
4077+ revision = "1";
4078+ editedCabalFile = "0yr4bj9ypbls0ysmwrgn2nsjb1xpsb12bjaiwbkzp6nf3kljwnnv";
4226 libraryHaskellDepends = [
4079 libraryHaskellDepends = [
4227 base containers ghc-prim template-haskell
4080 base containers ghc-prim template-haskell
4228 ];
4081 ];
@@ -4235,8 +4088,8 @@ self: {
4235 ({ mkDerivation, base, containers, syb, template-haskell }:
4088 ({ mkDerivation, base, containers, syb, template-haskell }:
4236 mkDerivation {
4089 mkDerivation {
4237 pname = "th-expand-syns";
4090 pname = "th-expand-syns";
4238− version = "0.4.3.0";
4091+ version = "0.4.4.0";
4239− sha256 = "17b73q0d5r8xixhvdp0hv4ap96l7s3f2y0j5cknp81b1hyinivlz";
4092+ sha256 = "01prlvh3py5hq5ccjidfyp9ixq2zd88dkbsidyjrpkja6v8m43yc";
4240 libraryHaskellDepends = [ base containers syb template-haskell ];
4093 libraryHaskellDepends = [ base containers syb template-haskell ];
4241 testHaskellDepends = [ base template-haskell ];
4094 testHaskellDepends = [ base template-haskell ];
4242 homepage = "https://github.com/DanielSchuessler/th-expand-syns";
4095 homepage = "https://github.com/DanielSchuessler/th-expand-syns";
@@ -4244,12 +4097,15 @@ self: {
4244 license = stdenv.lib.licenses.bsd3;
4097 license = stdenv.lib.licenses.bsd3;
4245 }) {};
4098 }) {};
4246 "th-lift" = callPackage
4099 "th-lift" = callPackage
4247− ({ mkDerivation, base, ghc-prim, template-haskell }:
4100+ ({ mkDerivation, base, ghc-prim, template-haskell, th-abstraction
4101+ }:
4248 mkDerivation {
4102 mkDerivation {
4249 pname = "th-lift";
4103 pname = "th-lift";
4250− version = "0.7.7";
4104+ version = "0.7.10";
4251− sha256 = "1dfb0z42vrmdx579lkam07ic03d3v5y19339a3ca0bwpprpzmihn";
4105+ sha256 = "13c89mr9g4jwrmqxx882ygr1lkvj1chw29p80qv2f3g5wnhlgkmr";
4252− libraryHaskellDepends = [ base ghc-prim template-haskell ];
4106+ libraryHaskellDepends = [
4107+ base ghc-prim template-haskell th-abstraction
4108+ ];
4253 testHaskellDepends = [ base ghc-prim template-haskell ];
4109 testHaskellDepends = [ base ghc-prim template-haskell ];
4254 homepage = "http://github.com/mboes/th-lift";
4110 homepage = "http://github.com/mboes/th-lift";
4255 description = "Derive Template Haskell's Lift class for datatypes";
4111 description = "Derive Template Haskell's Lift class for datatypes";
@@ -4274,17 +4130,18 @@ self: {
4274 license = stdenv.lib.licenses.bsd3;
4130 license = stdenv.lib.licenses.bsd3;
4275 }) {};
4131 }) {};
4276 "th-orphans" = callPackage
4132 "th-orphans" = callPackage
4277− ({ mkDerivation, base, hspec, mtl, template-haskell, th-lift
4133+ ({ mkDerivation, base, hspec, hspec-discover, mtl, template-haskell
4278− , th-lift-instances, th-reify-many
4134+ , th-lift, th-lift-instances, th-reify-many
4279 }:
4135 }:
4280 mkDerivation {
4136 mkDerivation {
4281 pname = "th-orphans";
4137 pname = "th-orphans";
4282− version = "0.13.4";
4138+ version = "0.13.6";
4283− sha256 = "0cab6hmyii42p157jhm0sd5jzdlxms4ip2ncrmcmc47dl3pxk5gk";
4139+ sha256 = "0sfl3pn9kq9da3ji3lsgzgzy82vz6yvsg80dmakc1jvk7awycibp";
4284 libraryHaskellDepends = [
4140 libraryHaskellDepends = [
4285 base mtl template-haskell th-lift th-lift-instances th-reify-many
4141 base mtl template-haskell th-lift th-lift-instances th-reify-many
4286 ];
4142 ];
4287 testHaskellDepends = [ base hspec template-haskell ];
4143 testHaskellDepends = [ base hspec template-haskell ];
4144+ testToolDepends = [ hspec-discover ];
4288 description = "Orphan instances for TH datatypes";
4145 description = "Orphan instances for TH datatypes";
4289 license = stdenv.lib.licenses.bsd3;
4146 license = stdenv.lib.licenses.bsd3;
4290 }) {};
4147 }) {};
@@ -4328,12 +4185,12 @@ self: {
4328 ({ mkDerivation, base, time }:
4185 ({ mkDerivation, base, time }:
4329 mkDerivation {
4186 mkDerivation {
4330 pname = "time-locale-compat";
4187 pname = "time-locale-compat";
4331− version = "0.1.1.3";
4188+ version = "0.1.1.4";
4332− sha256 = "1vdcfr2hp9qh3ag90x6ikbdf42wiqpdylnplffna54bpnilbyi4i";
4189+ sha256 = "0qmyxf8nz0q6brvplc4s2wsb1bbpq7kb65b69m503g9bgranblgj";
4333 configureFlags = [ "-f-old-locale" ];
4190 configureFlags = [ "-f-old-locale" ];
4334 libraryHaskellDepends = [ base time ];
4191 libraryHaskellDepends = [ base time ];
4335 homepage = "https://github.com/khibino/haskell-time-locale-compat";
4192 homepage = "https://github.com/khibino/haskell-time-locale-compat";
4336− description = "Compatibility of TimeLocale between old-locale and time-1.5";
4193+ description = "Compatibile module for time-format locale";
4337 license = stdenv.lib.licenses.bsd3;
4194 license = stdenv.lib.licenses.bsd3;
4338 }) {};
4195 }) {};
4339 "tls" = callPackage
4196 "tls" = callPackage
@@ -4344,8 +4201,8 @@ self: {
4344 }:
4201 }:
4345 mkDerivation {
4202 mkDerivation {
4346 pname = "tls";
4203 pname = "tls";
4347− version = "1.4.0";
4204+ version = "1.4.1";
4348− sha256 = "1fhpyimmvhwfv6k4k00rlnc5lmk9bw3sckmfsdkv20q4cjb0hac3";
4205+ sha256 = "1y083724mym28n6xfaz7pcc7zqxdhjpaxpbvzxfbs25qq2px3smv";
4349 libraryHaskellDepends = [
4206 libraryHaskellDepends = [
4350 asn1-encoding asn1-types async base bytestring cereal cryptonite
4207 asn1-encoding asn1-types async base bytestring cereal cryptonite
4351 data-default-class memory mtl network transformers x509 x509-store
4208 data-default-class memory mtl network transformers x509 x509-store
@@ -4376,15 +4233,15 @@ self: {
4376 license = stdenv.lib.licenses.bsd3;
4233 license = stdenv.lib.licenses.bsd3;
4377 }) {};
4234 }) {};
4378 "transformers-base" = callPackage
4235 "transformers-base" = callPackage
4379− ({ mkDerivation, base, stm, transformers, transformers-compat }:
4236+ ({ mkDerivation, base, base-orphans, stm, transformers
4237+ , transformers-compat
4238+ }:
4380 mkDerivation {
4239 mkDerivation {
4381 pname = "transformers-base";
4240 pname = "transformers-base";
4382− version = "0.4.4";
4241+ version = "0.4.5.2";
4383− sha256 = "11r3slgpgpra6zi2kjg3g60gvv17b1fh6qxipcpk8n86qx7lk8va";
4242+ sha256 = "1s256bi0yh0x2hp2gwd30f3mg1cv53zz397dv1yhfsnfzmihrj6h";
4384− revision = "1";
4385− editedCabalFile = "196pr3a4lhgklyw6nq6rv1j9djwzmvx7xrpp58carxnb55gk06pv";
4386 libraryHaskellDepends = [
4243 libraryHaskellDepends = [
4387− base stm transformers transformers-compat
4244+ base base-orphans stm transformers transformers-compat
4388 ];
4245 ];
4389 homepage = "https://github.com/mvv/transformers-base";
4246 homepage = "https://github.com/mvv/transformers-base";
4390 description = "Lift computations from the bottom of a transformer stack";
4247 description = "Lift computations from the bottom of a transformer stack";
@@ -4394,11 +4251,12 @@ self: {
4394 ({ mkDerivation, base, ghc-prim, transformers }:
4251 ({ mkDerivation, base, ghc-prim, transformers }:
4395 mkDerivation {
4252 mkDerivation {
4396 pname = "transformers-compat";
4253 pname = "transformers-compat";
4397− version = "0.5.1.4";
4254+ version = "0.6.2";
4398− sha256 = "17yam0199fh9ndsn9n69jx9nvbsmymzzwbi23dck3dk4q57fz0fq";
4255+ sha256 = "1gp4a8kvniwgm8947ghb4iwv4b7wd6ry4kvv4nfnym4agf5j41nw";
4256+ configureFlags = [ "-ffive-three" ];
4399 libraryHaskellDepends = [ base ghc-prim transformers ];
4257 libraryHaskellDepends = [ base ghc-prim transformers ];
4400 homepage = "http://github.com/ekmett/transformers-compat/";
4258 homepage = "http://github.com/ekmett/transformers-compat/";
4401− description = "A small compatibility shim exposing the new types from transformers 0.3 and 0.4 to older Haskell platforms.";
4259+ description = "A small compatibility shim for the transformers library";
4402 license = stdenv.lib.licenses.bsd3;
4260 license = stdenv.lib.licenses.bsd3;
4403 }) {};
4261 }) {};
4404 "typed-process" = callPackage
4262 "typed-process" = callPackage
@@ -4407,8 +4265,8 @@ self: {
4407 }:
4265 }:
4408 mkDerivation {
4266 mkDerivation {
4409 pname = "typed-process";
4267 pname = "typed-process";
4410− version = "0.2.0.0";
4268+ version = "0.2.2.0";
4411− sha256 = "1vc6ig5r5ajdr9d28fk1q0cb4p7nahbknn9fkzli4n9l9bk4xhdf";
4269+ sha256 = "0c6gvgvjyncbni9a5bvpbglknd4yclr3d3hfg9bhgahmkj40dva2";
4412 libraryHaskellDepends = [
4270 libraryHaskellDepends = [
4413 async base bytestring process stm transformers
4271 async base bytestring process stm transformers
4414 ];
4272 ];
@@ -4448,8 +4306,8 @@ self: {
4448 }:
4306 }:
4449 mkDerivation {
4307 mkDerivation {
4450 pname = "unix-time";
4308 pname = "unix-time";
4451− version = "0.3.7";
4309+ version = "0.3.8";
4452− sha256 = "1qdlc9raih8s0m3x8x3n7q3ngh4faw2alv9l78sp6gnx648k0c8i";
4310+ sha256 = "051slgpid5cxiaw203ky0ql3823h28fcjs08axkzd4265wrvv8fw";
4453 libraryHaskellDepends = [ base binary bytestring old-time ];
4311 libraryHaskellDepends = [ base binary bytestring old-time ];
4454 testHaskellDepends = [
4312 testHaskellDepends = [
4455 base bytestring doctest hspec old-locale old-time QuickCheck time
4313 base bytestring doctest hspec old-locale old-time QuickCheck time
@@ -4457,25 +4315,53 @@ self: {
4457 description = "Unix time parser/formatter and utilities";
4315 description = "Unix time parser/formatter and utilities";
4458 license = stdenv.lib.licenses.bsd3;
4316 license = stdenv.lib.licenses.bsd3;
4459 }) {};
4317 }) {};
4318+ "unliftio" = callPackage
4319+ ({ mkDerivation, async, base, deepseq, directory, filepath, hspec
4320+ , process, stm, time, transformers, unix, unliftio-core
4321+ }:
4322+ mkDerivation {
4323+ pname = "unliftio";
4324+ version = "0.2.7.0";
4325+ sha256 = "0qql93lq5w7qghl454cc3s1i8v1jb4h08n82fqkw0kli4g3g9njs";
4326+ libraryHaskellDepends = [
4327+ async base deepseq directory filepath process stm time transformers
4328+ unix unliftio-core
4329+ ];
4330+ testHaskellDepends = [
4331+ async base deepseq directory filepath hspec process stm time
4332+ transformers unix unliftio-core
4333+ ];
4334+ homepage = "https://github.com/fpco/unliftio/tree/master/unliftio#readme";
4335+ description = "The MonadUnliftIO typeclass for unlifting monads to IO (batteries included)";
4336+ license = stdenv.lib.licenses.mit;
4337+ }) {};
4460 "unliftio-core" = callPackage
4338 "unliftio-core" = callPackage
4461 ({ mkDerivation, base, transformers }:
4339 ({ mkDerivation, base, transformers }:
4462 mkDerivation {
4340 mkDerivation {
4463 pname = "unliftio-core";
4341 pname = "unliftio-core";
4464− version = "0.1.0.0";
4342+ version = "0.1.1.0";
4465− sha256 = "0wxv6s91wpfv2f5x17lwm04fvghcfnmzqw7p65117pr1r6yz5fcj";
4343+ sha256 = "1193fplsjm1lcr05xwvkj1rsyzx74i755f6kw3ikmxbsv0bv0l3m";
4344+ revision = "1";
4345+ editedCabalFile = "16bjwcsaghqqmyi69rq65dn3ydifyfaabq3ns37apdm00mwqbcj2";
4466 libraryHaskellDepends = [ base transformers ];
4346 libraryHaskellDepends = [ base transformers ];
4467− homepage = "https://github.com/fpco/monad-unlift/tree/master/unliftio-core#readme";
4347+ homepage = "https://github.com/fpco/unliftio/tree/master/unliftio-core#readme";
4468 description = "The MonadUnliftIO typeclass for unlifting monads to IO";
4348 description = "The MonadUnliftIO typeclass for unlifting monads to IO";
4469 license = stdenv.lib.licenses.mit;
4349 license = stdenv.lib.licenses.mit;
4470 }) {};
4350 }) {};
4471 "unordered-containers" = callPackage
4351 "unordered-containers" = callPackage
4472− ({ mkDerivation, base, deepseq, hashable }:
4352+ ({ mkDerivation, base, ChasingBottoms, containers, deepseq
4353+ , hashable, HUnit, QuickCheck, test-framework, test-framework-hunit
4354+ , test-framework-quickcheck2
4355+ }:
4473 mkDerivation {
4356 mkDerivation {
4474 pname = "unordered-containers";
4357 pname = "unordered-containers";
4475− version = "0.2.8.0";
4358+ version = "0.2.9.0";
4476− sha256 = "1a7flszhhgyjn0nm9w7cm26jbf6vyx9ij1iij4sl11pjkwsqi8d4";
4359+ sha256 = "0l4264p0av12cc6i8gls13q8y27x12z2ar4x34n3x59y99fcnc37";
4477 libraryHaskellDepends = [ base deepseq hashable ];
4360 libraryHaskellDepends = [ base deepseq hashable ];
4478− doCheck = false;
4361+ testHaskellDepends = [
4362+ base ChasingBottoms containers hashable HUnit QuickCheck
4363+ test-framework test-framework-hunit test-framework-quickcheck2
4364+ ];
4479 homepage = "https://github.com/tibbe/unordered-containers";
4365 homepage = "https://github.com/tibbe/unordered-containers";
4480 description = "Efficient hashing-based container types";
4366 description = "Efficient hashing-based container types";
4481 license = stdenv.lib.licenses.bsd3;
4367 license = stdenv.lib.licenses.bsd3;
@@ -4486,8 +4372,8 @@ self: {
4486 pname = "utf8-string";
4372 pname = "utf8-string";
4487 version = "1.0.1.1";
4373 version = "1.0.1.1";
4488 sha256 = "0h7imvxkahiy8pzr8cpsimifdfvv18lizrb33k6mnq70rcx9w2zv";
4374 sha256 = "0h7imvxkahiy8pzr8cpsimifdfvv18lizrb33k6mnq70rcx9w2zv";
4489− revision = "2";
4375+ revision = "3";
4490− editedCabalFile = "1b97s9picjl689hcz8scinv7c8k5iaal1livqr0l1l8yc4h0imhr";
4376+ editedCabalFile = "02vhj5gykkqa2dyn7s6gn8is1b5fdn9xcqqvlls268g7cpv6rk38";
4491 libraryHaskellDepends = [ base bytestring ];
4377 libraryHaskellDepends = [ base bytestring ];
4492 homepage = "http://github.com/glguy/utf8-string/";
4378 homepage = "http://github.com/glguy/utf8-string/";
4493 description = "Support for reading and writing UTF8 Strings";
4379 description = "Support for reading and writing UTF8 Strings";
@@ -4512,14 +4398,15 @@ self: {
4512 license = stdenv.lib.licenses.bsd3;
4398 license = stdenv.lib.licenses.bsd3;
4513 }) {};
4399 }) {};
4514 "vault" = callPackage
4400 "vault" = callPackage
4515− ({ mkDerivation, base, containers, hashable, unordered-containers
4401+ ({ mkDerivation, base, containers, hashable, semigroups
4402+ , unordered-containers
4516 }:
4403 }:
4517 mkDerivation {
4404 mkDerivation {
4518 pname = "vault";
4405 pname = "vault";
4519− version = "0.3.0.7";
4406+ version = "0.3.1.1";
4520− sha256 = "1w36ldr5iv0yiqbvibm7b1c66hf1ps5rbassz348zmi113d8k4cy";
4407+ sha256 = "0a1fir7gvbj2w894daac5c4c3gy36r6c74yci78lb2nvk431b95j";
4521 libraryHaskellDepends = [
4408 libraryHaskellDepends = [
4522− base containers hashable unordered-containers
4409+ base containers hashable semigroups unordered-containers
4523 ];
4410 ];
4524 homepage = "https://github.com/HeinrichApfelmus/vault";
4411 homepage = "https://github.com/HeinrichApfelmus/vault";
4525 description = "a persistent store for values of arbitrary types";
4412 description = "a persistent store for values of arbitrary types";
@@ -4531,8 +4418,8 @@ self: {
4531 pname = "vector";
4418 pname = "vector";
4532 version = "0.12.0.1";
4419 version = "0.12.0.1";
4533 sha256 = "0yrx2ypiaxahvaz84af5bi855hd3107kxkbqc8km29nsp5wyw05i";
4420 sha256 = "0yrx2ypiaxahvaz84af5bi855hd3107kxkbqc8km29nsp5wyw05i";
4534− revision = "1";
4421+ revision = "3";
4535− editedCabalFile = "1xjv8876kx9vh86w718vdaaai40pwnsiw8368c5h88ch8iqq10qb";
4422+ editedCabalFile = "0y5rh8k710i2a3p1h2rghvr5cfg78p5h0kbfi7ifxqqf6pzlyr1x";
4536 libraryHaskellDepends = [ base deepseq ghc-prim primitive ];
4423 libraryHaskellDepends = [ base deepseq ghc-prim primitive ];
4537 doCheck = false;
4424 doCheck = false;
4538 homepage = "https://github.com/haskell/vector";
4425 homepage = "https://github.com/haskell/vector";
@@ -4540,8 +4427,8 @@ self: {
4540 license = stdenv.lib.licenses.bsd3;
4427 license = stdenv.lib.licenses.bsd3;
4541 }) {};
4428 }) {};
4542 "vector-algorithms" = callPackage
4429 "vector-algorithms" = callPackage
4543− ({ mkDerivation, base, bytestring, containers, mtl, mwc-random
4430+ ({ mkDerivation, base, bytestring, containers, primitive
4544− , primitive, QuickCheck, vector
4431+ , QuickCheck, vector
4545 }:
4432 }:
4546 mkDerivation {
4433 mkDerivation {
4547 pname = "vector-algorithms";
4434 pname = "vector-algorithms";
@@ -4552,7 +4439,6 @@ self: {
4552 isLibrary = true;
4439 isLibrary = true;
4553 isExecutable = true;
4440 isExecutable = true;
4554 libraryHaskellDepends = [ base bytestring primitive vector ];
4441 libraryHaskellDepends = [ base bytestring primitive vector ];
4555− executableHaskellDepends = [ base mtl mwc-random vector ];
4556 testHaskellDepends = [
4442 testHaskellDepends = [
4557 base bytestring containers QuickCheck vector
4443 base bytestring containers QuickCheck vector
4558 ];
4444 ];
@@ -4567,10 +4453,10 @@ self: {
4567 }:
4453 }:
4568 mkDerivation {
4454 mkDerivation {
4569 pname = "vector-binary-instances";
4455 pname = "vector-binary-instances";
4570− version = "0.2.3.5";
4456+ version = "0.2.4";
4571− sha256 = "0niad09lbxz3cj20qllyj92lwbc013ihw4lby8fv07x5xjx5a4p1";
4457+ sha256 = "1y236jb72iab9ska1mc48z6yb0xgwmj45laaqdyjxksd84z7hbrb";
4572 revision = "1";
4458 revision = "1";
4573− editedCabalFile = "0yk61mifvcc31vancsfsd0vskqh5k3a3znx1rbz8wzcs4ijjzh48";
4459+ editedCabalFile = "196frl4akhfk7xf1nxzn8lmq99dxhzhsimanswn9yy7ym8zhki4i";
4574 libraryHaskellDepends = [ base binary vector ];
4460 libraryHaskellDepends = [ base binary vector ];
4575 testHaskellDepends = [ base binary tasty tasty-quickcheck vector ];
4461 testHaskellDepends = [ base binary tasty tasty-quickcheck vector ];
4576 benchmarkHaskellDepends = [
4462 benchmarkHaskellDepends = [
@@ -4630,67 +4516,65 @@ self: {
4630 license = stdenv.lib.licenses.bsd3;
4516 license = stdenv.lib.licenses.bsd3;
4631 }) {};
4517 }) {};
4632 "wai" = callPackage
4518 "wai" = callPackage
4633− ({ mkDerivation, base, blaze-builder, bytestring
4519+ ({ mkDerivation, base, bytestring, hspec, hspec-discover
4634− , bytestring-builder, hspec, http-types, network, text
4635− , transformers, vault
4520+ , http-types, network, text, transformers, vault
4636 }:
4521 }:
4637 mkDerivation {
4522 mkDerivation {
4638 pname = "wai";
4523 pname = "wai";
4639− version = "3.2.1.1";
4524+ version = "3.2.1.2";
4640− sha256 = "08afasnirja21vr0bmzcywz4w29x736dmdv7h8nnh1l8bn7sd02x";
4525+ sha256 = "0jr3b2789wa4m6mxkz12ynz4lfsqmgbrcy0am8karyqr3x3528r8";
4641 libraryHaskellDepends = [
4526 libraryHaskellDepends = [
4642− base blaze-builder bytestring bytestring-builder http-types network
4643− text transformers vault
4527+ base bytestring http-types network text transformers vault
4644 ];
4528 ];
4645− testHaskellDepends = [ base blaze-builder bytestring hspec ];
4529+ testHaskellDepends = [ base bytestring hspec ];
4530+ testToolDepends = [ hspec-discover ];
4646 homepage = "https://github.com/yesodweb/wai";
4531 homepage = "https://github.com/yesodweb/wai";
4647 description = "Web Application Interface";
4532 description = "Web Application Interface";
4648 license = stdenv.lib.licenses.mit;
4533 license = stdenv.lib.licenses.mit;
4649 }) {};
4534 }) {};
4650 "wai-conduit" = callPackage
4535 "wai-conduit" = callPackage
4651− ({ mkDerivation, base, blaze-builder, bytestring, conduit
4536+ ({ mkDerivation, base, bytestring, conduit, http-types
4652− , http-types, transformers, wai
4537+ , transformers, wai
4653 }:
4538 }:
4654 mkDerivation {
4539 mkDerivation {
4655 pname = "wai-conduit";
4540 pname = "wai-conduit";
4656− version = "3.0.0.3";
4541+ version = "3.0.0.4";
4657− sha256 = "1zvsiwjq2mvkb9sjgp3ly9m968m7a2jjzr4id6jpi3mmqykj15z4";
4542+ sha256 = "07yn41rn2skd5p3wqqa09wa761vj7ibl8l19gh4bi4i8slxhk417";
4658 libraryHaskellDepends = [
4543 libraryHaskellDepends = [
4659− base blaze-builder bytestring conduit http-types transformers wai
4544+ base bytestring conduit http-types transformers wai
4660 ];
4545 ];
4661 homepage = "https://github.com/yesodweb/wai";
4546 homepage = "https://github.com/yesodweb/wai";
4662 description = "conduit wrappers for WAI";
4547 description = "conduit wrappers for WAI";
4663 license = stdenv.lib.licenses.mit;
4548 license = stdenv.lib.licenses.mit;
4664 }) {};
4549 }) {};
4665 "warp" = callPackage
4550 "warp" = callPackage
4666− ({ mkDerivation, array, async, auto-update, base, blaze-builder
4551+ ({ mkDerivation, array, async, auto-update, base, bsb-http-chunked
4667− , bytestring, bytestring-builder, case-insensitive, containers
4552+ , bytestring, case-insensitive, containers, directory, doctest
4668− , criterion, directory, doctest, ghc-prim, hashable, hspec, HTTP
4553+ , gauge, ghc-prim, hashable, hspec, http-client, http-date
4669− , http-date, http-types, http2, HUnit, iproute, lifted-base
4554+ , http-types, http2, HUnit, iproute, lifted-base, network, process
4670− , network, process, QuickCheck, silently, simple-sendfile, stm
4555+ , QuickCheck, silently, simple-sendfile, stm, streaming-commons
4671− , streaming-commons, text, time, transformers, unix, unix-compat
4556+ , text, time, transformers, unix, unix-compat, vault, wai, word8
4672− , vault, wai, word8
4673 }:
4557 }:
4674 mkDerivation {
4558 mkDerivation {
4675 pname = "warp";
4559 pname = "warp";
4676− version = "3.2.13";
4560+ version = "3.2.23";
4677− sha256 = "0964l8xcbdqnrz0mnk0b732n66i7q8grwzzax96mqbh15ps5nfcj";
4561+ sha256 = "12v9qhi4hyp0sb90yddsax16jj7x47nmqwn53sv7b5nszcxgzam0";
4678 libraryHaskellDepends = [
4562 libraryHaskellDepends = [
4679− array async auto-update base blaze-builder bytestring
4563+ array async auto-update base bsb-http-chunked bytestring
4680− bytestring-builder case-insensitive containers ghc-prim hashable
4564+ case-insensitive containers ghc-prim hashable http-date http-types
4681− http-date http-types http2 iproute network simple-sendfile stm
4565+ http2 iproute network simple-sendfile stm streaming-commons text
4682− streaming-commons text unix unix-compat vault wai word8
4566+ unix unix-compat vault wai word8
4683 ];
4567 ];
4684 testHaskellDepends = [
4568 testHaskellDepends = [
4685− array async auto-update base blaze-builder bytestring
4569+ array async auto-update base bsb-http-chunked bytestring
4686− bytestring-builder case-insensitive containers directory doctest
4570+ case-insensitive containers directory doctest ghc-prim hashable
4687− ghc-prim hashable hspec HTTP http-date http-types http2 HUnit
4571+ hspec http-client http-date http-types http2 HUnit iproute
4688− iproute lifted-base network process QuickCheck silently
4572+ lifted-base network process QuickCheck silently simple-sendfile stm
4689− simple-sendfile stm streaming-commons text time transformers unix
4573+ streaming-commons text time transformers unix unix-compat vault wai
4690− unix-compat vault wai word8
4574+ word8
4691 ];
4575 ];
4692 benchmarkHaskellDepends = [
4576 benchmarkHaskellDepends = [
4693− auto-update base bytestring containers criterion hashable http-date
4577+ auto-update base bytestring containers gauge hashable http-date
4694 http-types network unix unix-compat
4578 http-types network unix unix-compat
4695 ];
4579 ];
4696 homepage = "http://github.com/yesodweb/wai";
4580 homepage = "http://github.com/yesodweb/wai";
@@ -4703,8 +4587,8 @@ self: {
4703 }:
4587 }:
4704 mkDerivation {
4588 mkDerivation {
4705 pname = "warp-tls";
4589 pname = "warp-tls";
4706− version = "3.2.4";
4590+ version = "3.2.4.3";
4707− sha256 = "05vfjlgi574nnydfmfpyp3q6mf389iyj9mv94djnm8d1izasml85";
4591+ sha256 = "17gj295fr98l7mkz2gdz6kahdnmja0sql3kvy2zab6q168g53kc4";
4708 libraryHaskellDepends = [
4592 libraryHaskellDepends = [
4709 base bytestring cryptonite data-default-class network
4593 base bytestring cryptonite data-default-class network
4710 streaming-commons tls tls-session-manager wai warp
4594 streaming-commons tls tls-session-manager wai warp
@@ -4713,21 +4597,29 @@ self: {
4713 description = "HTTP over TLS support for Warp via the TLS package";
4597 description = "HTTP over TLS support for Warp via the TLS package";
4714 license = stdenv.lib.licenses.mit;
4598 license = stdenv.lib.licenses.mit;
4715 }) {};
4599 }) {};
4600+ "wcwidth" = callPackage
4601+ ({ mkDerivation, base, containers }:
4602+ mkDerivation {
4603+ pname = "wcwidth";
4604+ version = "0.0.2";
4605+ sha256 = "1n1fq7v64b59ajf5g50iqj9sa34wm7s2j3viay0kxpmvlcv8gipz";
4606+ isLibrary = true;
4607+ isExecutable = true;
4608+ libraryHaskellDepends = [ base containers ];
4609+ homepage = "http://github.com/solidsnack/wcwidth/";
4610+ description = "Native wcwidth";
4611+ license = stdenv.lib.licenses.bsd3;
4612+ }) {};
4716 "weigh" = callPackage
4613 "weigh" = callPackage
4717− ({ mkDerivation, base, bytestring-trie, containers, deepseq, mtl
4614+ ({ mkDerivation, base, deepseq, mtl, process, split, temporary }:
4718− , process, random, split, template-haskell, temporary
4719− , unordered-containers
4720− }:
4721 mkDerivation {
4615 mkDerivation {
4722 pname = "weigh";
4616 pname = "weigh";
4723− version = "0.0.7";
4617+ version = "0.0.12";
4724− sha256 = "1k5mxk0cn82x1lc1j0ik4sfkr0q4ipa2ls9sm5g39hl6bjwp1lp3";
4618+ sha256 = "0zw2a997gxgdzqmd7j730kxgynzmjvvlkw84dajmfzf1v9pbij7x";
4725 libraryHaskellDepends = [
4619 libraryHaskellDepends = [
4726− base deepseq mtl process split template-haskell temporary
4620+ base deepseq mtl process split temporary
4727− ];
4728− testHaskellDepends = [
4729− base bytestring-trie containers deepseq random unordered-containers
4730 ];
4621 ];
4622+ testHaskellDepends = [ base deepseq ];
4731 homepage = "https://github.com/fpco/weigh#readme";
4623 homepage = "https://github.com/fpco/weigh#readme";
4732 description = "Measure allocations of a Haskell functions/values";
4624 description = "Measure allocations of a Haskell functions/values";
4733 license = stdenv.lib.licenses.bsd3;
4625 license = stdenv.lib.licenses.bsd3;
@@ -4744,6 +4636,22 @@ self: {
4744 description = "Use ImplicitParams-based source locations in a backward compatible way";
4636 description = "Use ImplicitParams-based source locations in a backward compatible way";
4745 license = stdenv.lib.licenses.mit;
4637 license = stdenv.lib.licenses.mit;
4746 }) {};
4638 }) {};
4639+ "wl-pprint-annotated" = callPackage
4640+ ({ mkDerivation, base, containers, deepseq, tasty, tasty-hunit
4641+ , text
4642+ }:
4643+ mkDerivation {
4644+ pname = "wl-pprint-annotated";
4645+ version = "0.1.0.0";
4646+ sha256 = "0c2996x5gdrif1l0lfwlqnka7xp5diac74rckv0jasv2i0333kmp";
4647+ libraryHaskellDepends = [ base containers deepseq text ];
4648+ testHaskellDepends = [
4649+ base containers deepseq tasty tasty-hunit text
4650+ ];
4651+ homepage = "https://github.com/minad/wl-pprint-annotated#readme";
4652+ description = "Wadler/Leijen pretty printer with annotations and slightly modernized API";
4653+ license = stdenv.lib.licenses.bsd3;
4654+ }) {};
4747 "word8" = callPackage
4655 "word8" = callPackage
4748 ({ mkDerivation, base, bytestring, criterion, hspec }:
4656 ({ mkDerivation, base, bytestring, criterion, hspec }:
4749 mkDerivation {
4657 mkDerivation {
@@ -4763,10 +4671,10 @@ self: {
4763 }:
4671 }:
4764 mkDerivation {
4672 mkDerivation {
4765 pname = "x509";
4673 pname = "x509";
4766− version = "1.7.2";
4674+ version = "1.7.3";
4767− sha256 = "0yyfw07bw73gkh93z653lnncc30wj3g3rf26cwxjpyxvwalia0yw";
4675+ sha256 = "0mkk29g32fs70bqkikg83v45h9jig9c8aail3mrdqwxpkfa0yx21";
4768 revision = "1";
4676 revision = "1";
4769− editedCabalFile = "07mphpmj4zk5mzhp5x50a7q6w134kgymf557dcgbp643cbkcmc66";
4677+ editedCabalFile = "06zzirygvzp0ssdg9blipdwmd0b41p4gxh3ldai7ngjyjsdclwsx";
4770 libraryHaskellDepends = [
4678 libraryHaskellDepends = [
4771 asn1-encoding asn1-parse asn1-types base bytestring containers
4679 asn1-encoding asn1-parse asn1-types base bytestring containers
4772 cryptonite hourglass memory mtl pem
4680 cryptonite hourglass memory mtl pem
@@ -4786,8 +4694,8 @@ self: {
4786 }:
4694 }:
4787 mkDerivation {
4695 mkDerivation {
4788 pname = "x509-store";
4696 pname = "x509-store";
4789− version = "1.6.5";
4697+ version = "1.6.6";
4790− sha256 = "1lg9gy0bmzjmlk4gfnzx2prfar1qha4hfjsw8yvjg33zm0fv3ahs";
4698+ sha256 = "0dbndqmnmyixxc7308nyq3zlkhz9dff4rbcw2a49c77rbicny9va";
4791 libraryHaskellDepends = [
4699 libraryHaskellDepends = [
4792 asn1-encoding asn1-types base bytestring containers cryptonite
4700 asn1-encoding asn1-types base bytestring containers cryptonite
4793 directory filepath mtl pem x509
4701 directory filepath mtl pem x509
@@ -4814,20 +4722,19 @@ self: {
4814 license = stdenv.lib.licenses.bsd3;
4722 license = stdenv.lib.licenses.bsd3;
4815 }) {};
4723 }) {};
4816 "x509-validation" = callPackage
4724 "x509-validation" = callPackage
4817− ({ mkDerivation, asn1-encoding, asn1-types, base, byteable
4725+ ({ mkDerivation, asn1-encoding, asn1-types, base, bytestring
4818− , bytestring, containers, cryptonite, data-default-class, hourglass
4726+ , containers, cryptonite, data-default-class, hourglass, memory
4819− , memory, mtl, pem, tasty, tasty-hunit, x509, x509-store
4727+ , mtl, pem, tasty, tasty-hunit, x509, x509-store
4820 }:
4728 }:
4821 mkDerivation {
4729 mkDerivation {
4822 pname = "x509-validation";
4730 pname = "x509-validation";
4823− version = "1.6.9";
4731+ version = "1.6.10";
4824− sha256 = "005m5jxjz5cx3lriayv4a17xa19qc2qxw7kz2f9wvj7hgjnwww44";
4732+ sha256 = "1ms51scawldgyfcim5a2qlgyn3rnrclyh205d6djaa1569vrs73n";
4825 revision = "1";
4733 revision = "1";
4826− editedCabalFile = "02n9s0wizi4wivs6is4cyapqjjnbrx3zdk34q0cnlfsvbbvyhjax";
4734+ editedCabalFile = "1isap8v1gh31q4pj3gn155ya8nd1da0a5a3cryqh4yhf0ivbwl0w";
4827 libraryHaskellDepends = [
4735 libraryHaskellDepends = [
4828− asn1-encoding asn1-types base byteable bytestring containers
4736+ asn1-encoding asn1-types base bytestring containers cryptonite
4829− cryptonite data-default-class hourglass memory mtl pem x509
4737+ data-default-class hourglass memory mtl pem x509 x509-store
4830− x509-store
4831 ];
4738 ];
4832 testHaskellDepends = [
4739 testHaskellDepends = [
4833 asn1-encoding asn1-types base bytestring cryptonite
4740 asn1-encoding asn1-types base bytestring cryptonite
@@ -4849,19 +4756,19 @@ self: {
4849 license = stdenv.lib.licenses.bsd3;
4756 license = stdenv.lib.licenses.bsd3;
4850 }) {};
4757 }) {};
4851 "xml-conduit" = callPackage
4758 "xml-conduit" = callPackage
4852− ({ mkDerivation, attoparsec, base, blaze-builder, blaze-html
4759+ ({ mkDerivation, attoparsec, base, blaze-html, blaze-markup
4853− , blaze-markup, bytestring, conduit, conduit-extra, containers
4760+ , bytestring, conduit, conduit-extra, containers
4854 , data-default-class, deepseq, hspec, HUnit, monad-control
4761 , data-default-class, deepseq, hspec, HUnit, monad-control
4855 , resourcet, text, transformers, xml-types
4762 , resourcet, text, transformers, xml-types
4856 }:
4763 }:
4857 mkDerivation {
4764 mkDerivation {
4858 pname = "xml-conduit";
4765 pname = "xml-conduit";
4859− version = "1.7.0";
4766+ version = "1.8.0";
4860− sha256 = "0g0a6h52n6q3w09350d6vgjpvb6xj224isp4lphgwbmd2xr12i76";
4767+ sha256 = "0di0ll2p4ykqnlipf2jrlalirxdf9wkli292245rgr3vcb9vz0h3";
4861 libraryHaskellDepends = [
4768 libraryHaskellDepends = [
4862− attoparsec base blaze-builder blaze-html blaze-markup bytestring
4769+ attoparsec base blaze-html blaze-markup bytestring conduit
4863− conduit conduit-extra containers data-default-class deepseq
4770+ conduit-extra containers data-default-class deepseq monad-control
4864− monad-control resourcet text transformers xml-types
4771+ resourcet text transformers xml-types
4865 ];
4772 ];
4866 testHaskellDepends = [
4773 testHaskellDepends = [
4867 base blaze-markup bytestring conduit containers hspec HUnit
4774 base blaze-markup bytestring conduit containers hspec HUnit
@@ -4883,16 +4790,15 @@ self: {
4883 license = stdenv.lib.licenses.mit;
4790 license = stdenv.lib.licenses.mit;
4884 }) {};
4791 }) {};
4885 "yaml" = callPackage
4792 "yaml" = callPackage
4886− ({ mkDerivation, aeson, aeson-qq, attoparsec, base, base-compat
4793+ ({ mkDerivation, aeson, attoparsec, base, base-compat, bytestring
4887− , bytestring, conduit, containers, directory, filepath, hspec
4794+ , conduit, containers, directory, filepath, hspec, HUnit, mockery
4888− , HUnit, mockery, resourcet, scientific, semigroups
4795+ , resourcet, scientific, semigroups, template-haskell, temporary
4889− , template-haskell, temporary, text, transformers
4890− , unordered-containers, vector
4796+ , text, transformers, unordered-containers, vector
4891 }:
4797 }:
4892 mkDerivation {
4798 mkDerivation {
4893 pname = "yaml";
4799 pname = "yaml";
4894− version = "0.8.25";
4800+ version = "0.8.32";
4895− sha256 = "16bx7vkj455796wdklh8h13zm98h5m81dl8np0sjbx9hcsrfdbyp";
4801+ sha256 = "0cbsyh4ilvjzq1q7pxls43k6pdqxg1l85xzibcwpbvmlvrizh86w";
4896 isLibrary = true;
4802 isLibrary = true;
4897 isExecutable = true;
4803 isExecutable = true;
4898 libraryHaskellDepends = [
4804 libraryHaskellDepends = [
@@ -4900,13 +4806,13 @@ self: {
4900 filepath resourcet scientific semigroups template-haskell text
4806 filepath resourcet scientific semigroups template-haskell text
4901 transformers unordered-containers vector
4807 transformers unordered-containers vector
4902 ];
4808 ];
4903− executableHaskellDepends = [ aeson base bytestring ];
4904 testHaskellDepends = [
4809 testHaskellDepends = [
4905− aeson aeson-qq base base-compat bytestring conduit directory hspec
4810+ aeson attoparsec base base-compat bytestring conduit containers
4811+ directory filepath hspec HUnit mockery resourcet scientific
4906− HUnit mockery resourcet temporary text transformers
4812+ semigroups template-haskell temporary text transformers
4907 unordered-containers vector
4813 unordered-containers vector
4908 ];
4814 ];
4909− homepage = "http://github.com/snoyberg/yaml/";
4815+ homepage = "https://github.com/snoyberg/yaml#readme";
4910 description = "Support for parsing and rendering YAML documents";
4816 description = "Support for parsing and rendering YAML documents";
4911 license = stdenv.lib.licenses.bsd3;
4817 license = stdenv.lib.licenses.bsd3;
4912 }) {};
4818 }) {};
@@ -4914,27 +4820,13 @@ self: {
4914 ({ mkDerivation, base, bytestring, zlib }:
4820 ({ mkDerivation, base, bytestring, zlib }:
4915 mkDerivation {
4821 mkDerivation {
4916 pname = "zlib";
4822 pname = "zlib";
4917− version = "0.6.1.2";
4823+ version = "0.6.2";
4918− sha256 = "1fx2k2qmgm2dj3fkxx2ry945fpdn02d4dkihjxma21xgdiilxsz4";
4824+ sha256 = "1vbzf0awb6zb456xf48za1kl22018646cfzq4frvxgb9ay97vk0d";
4919 libraryHaskellDepends = [ base bytestring ];
4825 libraryHaskellDepends = [ base bytestring ];
4920 librarySystemDepends = [ zlib ];
4826 librarySystemDepends = [ zlib ];
4921 doCheck = false;
4827 doCheck = false;
4922 description = "Compression and decompression in the gzip and zlib formats";
4828 description = "Compression and decompression in the gzip and zlib formats";
4923 license = stdenv.lib.licenses.bsd3;
4829 license = stdenv.lib.licenses.bsd3;
4924 }) {inherit (pkgs) zlib;};
4830 }) {inherit (pkgs) zlib;};
4925− "zlib-bindings" = callPackage
4926− ({ mkDerivation, base, bytestring, hspec, QuickCheck, zlib }:
4927− mkDerivation {
4928− pname = "zlib-bindings";
4929− version = "0.1.1.5";
4930− sha256 = "02ciywlz4wdlymgc3jsnicz9kzvymjw1www2163gxidnz4wb8fy8";
4931− revision = "2";
4932− editedCabalFile = "0fq49694gqkab8m0vq4i879blswczwd66n7xh4r4gwiahf0ryvqc";
4933− libraryHaskellDepends = [ base bytestring zlib ];
4934− testHaskellDepends = [ base bytestring hspec QuickCheck zlib ];
4935− homepage = "http://github.com/snapframework/zlib-bindings";
4936− description = "Low-level bindings to the zlib package";
4937− license = stdenv.lib.licenses.bsd3;
4938− }) {};
4939
4831
4940}
4832}
nix/lib.nix+1−1
@@ -23,7 +23,7 @@ rec {
23 buildInputs = [ git ];
23 buildInputs = [ git ];
24 installPhase = ''
24 installPhase = ''
25 mkdir -p $out
25 mkdir -p $out
26− git clone --branch hackage https://github.com/commercialhaskell/all-cabal-hashes.git $out
26+ git clone --bare --branch hackage https://github.com/commercialhaskell/all-cabal-hashes.git $out
27 '';
27 '';
28 SSL_CERT_FILE="${cacert}/etc/ssl/certs/ca-bundle.crt";
28 SSL_CERT_FILE="${cacert}/etc/ssl/certs/ca-bundle.crt";
29 };
29 };
src/AllCabalHashes.hs+27−21
@@ -3,14 +3,14 @@ module AllCabalHashes where
3import Control.Lens hiding ((<.>))
3import Control.Lens hiding ((<.>))
4import Data.Aeson as A
4import Data.Aeson as A
5import Data.ByteString as BS
5import Data.ByteString as BS
6−import Data.ByteString.Lazy as BSL
6+import Data.ByteString.Char8 as B8
7import Data.Map as M
7import Data.Map as M
8+import Data.Tagged (Tagged(..))
8import Data.Text as T
9import Data.Text as T
9−import Data.Text.Encoding as T
10import Distribution.Nixpkgs.Hashes as NH
10import Distribution.Nixpkgs.Hashes as NH
11import Distribution.Package
11import Distribution.Package
12import Distribution.PackageDescription
12import Distribution.PackageDescription
13−import Distribution.PackageDescription.Parse
13+import Distribution.PackageDescription.Parsec
14import Distribution.Text ( display )
14import Distribution.Text ( display )
15import Git
15import Git
16import Git.Libgit2 as Libgit2
16import Git.Libgit2 as Libgit2
@@ -41,28 +41,34 @@ readPackageByHash repoDir sha1Hash = do
41 let repoOpts = defaultRepositoryOptions { repoPath = repoDir }
41 let repoOpts = defaultRepositoryOptions { repoPath = repoDir }
42 repo <- openLgRepository repoOpts
42 repo <- openLgRepository repoOpts
43 buf <- runLgRepository repo $ do
43 buf <- runLgRepository repo $ do
44− BlobObj (Blob _ contents) <- lookupObject =<< parseOid sha1Hash
44+ oid <- parseOid sha1Hash
45− case contents of
45+ catBlob (Tagged oid)
46− BlobString bs -> return bs
47− BlobStringLazy bsl -> return $ BSL.toStrict bsl
48− _ -> fail $ "Git SHA1 " ++ show sha1Hash ++ ": expected single Blob"
49− cabal <- case parseGenericPackageDescription (T.unpack $ T.decodeUtf8 buf) of
50− ParseOk _ a -> return a
51− ParseFailed err -> fail ("Git SHA1 " ++ show sha1Hash ++ ": " ++ show err)
46+ parseCabal ("Git SHA1 " ++ show sha1Hash) buf
52− let
53− hash = printSHA256 (digest (digestByName "sha256") buf)
54− pkg = setCabalFileHash hash cabal
55− return (pkg, hash)
56
47
57readPackageByName :: FilePath -> PackageIdentifier -> IO (GenericPackageDescription, SHA256Hash)
48readPackageByName :: FilePath -> PackageIdentifier -> IO (GenericPackageDescription, SHA256Hash)
58readPackageByName repoDir (PackageIdentifier name version) = do
49readPackageByName repoDir (PackageIdentifier name version) = do
59− let cabalFile = repoDir </> unPackageName name </> display version </> unPackageName name <.> "cabal"
50+ let cabalFile = unPackageName name </> display version </> unPackageName name <.> "cabal"
60− buf <- BS.readFile cabalFile
51+ let repoOpts = defaultRepositoryOptions { repoPath = repoDir }
52+ repo <- openLgRepository repoOpts
53+ buf <- runLgRepository repo $ do
54+ headCommit <- resolveReference "HEAD" >>= \case
55+ Nothing -> fail "Failed to parse HEAD ref"
56+ Just oid -> lookupCommit $ Tagged oid
57+ blobOid <- commitTreeEntry headCommit (B8.pack cabalFile) >>= \case
58+ Nothing -> fail (cabalFile ++ ": no such file at HEAD")
59+ Just (BlobEntry oid PlainBlob) -> pure oid
60+ Just (BlobEntry _ _) -> fail (cabalFile ++ " is not a plain blob")
61+ _ -> fail (cabalFile ++ " points to a non-blob!")
62+ catBlob blobOid
63+ parseCabal cabalFile buf
64+
65+parseCabal :: String -> BS.ByteString -> IO (GenericPackageDescription, SHA256Hash)
66+parseCabal what blob = do
61− cabal <- case parseGenericPackageDescription (T.unpack $ T.decodeUtf8 buf) of
67+ cabal <- let (_, res) = runParseResult (parseGenericPackageDescription blob)
62− ParseOk _ a -> return a
68+ in case res of Right a -> return a
63− ParseFailed err -> fail (cabalFile ++ ": " ++ show err)
69+ Left (_, err) -> fail (what ++ ": " ++ show err)
64 let
70 let
65− hash = NH.printSHA256 (SSL.digest (SSL.digestByName "sha256") buf)
71+ hash = NH.printSHA256 (SSL.digest (SSL.digestByName "sha256") blob)
66 pkg = setCabalFileHash hash cabal
72 pkg = setCabalFileHash hash cabal
67 return (pkg, hash)
73 return (pkg, hash)
68
74
src/Distribution/Nixpkgs/Haskell/FromStack.hs+3−2
@@ -68,14 +68,14 @@ fromPackage conf pconf plan pkg =
68 (haskellResolver conf)
68 (haskellResolver conf)
69 (targetPlatform conf)
69 (targetPlatform conf)
70 (targetCompiler conf)
70 (targetCompiler conf)
71− flags
71+ (mkFlagAssignment flags)
72 (planDependencies plan)
72 (planDependencies plan)
73 (configureBenches . configureTests $ pkgCabal pkg)
73 (configureBenches . configureTests $ pkgCabal pkg)
74 genericDrv = fromPackageDescription
74 genericDrv = fromPackageDescription
75 (haskellResolver conf)
75 (haskellResolver conf)
76 (nixpkgsResolver conf)
76 (nixpkgsResolver conf)
77 missingDeps
77 missingDeps
78− flags
78+ (mkFlagAssignment flags)
79 descr
79 descr
80 depName (Dependency name _) = name
80 depName (Dependency name _) = name
81 testDeps = setOf
81 testDeps = setOf
@@ -97,4 +97,5 @@ finalizePackage :: Package -> PackageConfig -> Derivation -> Derivation
97finalizePackage pkg pconf drv = drv
97finalizePackage pkg pconf drv = drv
98 & src .~ pkgSource pkg
98 & src .~ pkgSource pkg
99 & doCheck &&~ enableCheck pconf
99 & doCheck &&~ enableCheck pconf
100+ & testDepends %~ (if enableCheck pconf then id else const mempty)
100 & runHaddock &&~ enableHaddock pconf
101 & runHaddock &&~ enableHaddock pconf
src/Distribution/Nixpkgs/Haskell/FromStack/Package.hs−1
@@ -5,7 +5,6 @@ import Data.Foldable as F
5import Data.Function (on)
5import Data.Function (on)
6import Data.Graph (Graph, Vertex)
6import Data.Graph (Graph, Vertex)
7import Data.Maybe
7import Data.Maybe
8−import Data.Monoid
9import Data.Ord as O
8import Data.Ord as O
10import Distribution.Text (display, disp)
9import Distribution.Text (display, disp)
11import Distribution.Package (unPackageName, packageName)
10import Distribution.Package (unPackageName, packageName)
src/Distribution/Nixpkgs/Haskell/Packages/PrettyPrinting.hs+2
@@ -2,6 +2,8 @@ module Distribution.Nixpkgs.Haskell.Packages.PrettyPrinting where
2
2
3import Language.Nix.PrettyPrinting
3import Language.Nix.PrettyPrinting
4
4
5+import Prelude hiding ((<>))
6+
5compilerConfig :: Doc -> Doc
7compilerConfig :: Doc -> Doc
6compilerConfig body =
8compilerConfig body =
7 funargsCurried ["self", "super"] <+> body
9 funargsCurried ["self", "super"] <+> body
src/Distribution/Nixpkgs/Haskell/Stack.hs+4−4
@@ -42,22 +42,22 @@ stackLocationToSource
42 -> Maybe FilePath
42 -> Maybe FilePath
43 -> Source
43 -> Source
44stackLocationToSource pl mCabalDir = case pl of
44stackLocationToSource pl mCabalDir = case pl of
45− StackIndex p -> Source
45+ PlIndex p -> Source
46 { sourceUrl = "cabal://" ++ T.unpack (p ^. piNameVersion)
46 { sourceUrl = "cabal://" ++ T.unpack (p ^. piNameVersion)
47 , sourceRevision = mempty
47 , sourceRevision = mempty
48 , sourceHash = UnknownHash
48 , sourceHash = UnknownHash
49 , sourceCabalDir = cabalDir }
49 , sourceCabalDir = cabalDir }
50− StackFilePath p -> Source
50+ PlFilePath p -> Source
51 { sourceUrl = p
51 { sourceUrl = p
52 , sourceRevision = mempty
52 , sourceRevision = mempty
53 , sourceHash = UnknownHash
53 , sourceHash = UnknownHash
54 , sourceCabalDir = cabalDir }
54 , sourceCabalDir = cabalDir }
55− StackUri uri -> Source
55+ PlUri uri -> Source
56 { sourceUrl = URI.uriToString id uri mempty
56 { sourceUrl = URI.uriToString id uri mempty
57 , sourceRevision = mempty
57 , sourceRevision = mempty
58 , sourceHash = UnknownHash
58 , sourceHash = UnknownHash
59 , sourceCabalDir = cabalDir }
59 , sourceCabalDir = cabalDir }
60− StackRepo r -> Source
60+ PlRepo r -> Source
61 { sourceUrl = T.unpack $ r ^. rUri
61 { sourceUrl = T.unpack $ r ^. rUri
62 , sourceRevision = T.unpack $ r ^. rCommit
62 , sourceRevision = T.unpack $ r ^. rCommit
63 , sourceHash = UnknownHash
63 , sourceHash = UnknownHash
src/Distribution/Nixpkgs/Haskell/Stack/PrettyPrinting.hs+16−3
@@ -17,6 +17,8 @@ import qualified Language.Nix.FilePath as Nix
17import Language.Nix.PrettyPrinting as PP
17import Language.Nix.PrettyPrinting as PP
18import Stack.Config (StackResolver, unStackResolver)
18import Stack.Config (StackResolver, unStackResolver)
19
19
20+import Prelude hiding ((<>))
21+
20
22
21data OverrideConfig = OverrideConfig
23data OverrideConfig = OverrideConfig
22 { _ocGhc :: Version
24 { _ocGhc :: Version
@@ -75,11 +77,11 @@ overrideHaskellPackages oc packages = vcat
75 , nest 2 "inherit pkgs stdenv;"
77 , nest 2 "inherit pkgs stdenv;"
76 , nest 2 "inherit (self) callPackage;"
78 , nest 2 "inherit (self) callPackage;"
77 , "};"
79 , "};"
78− , ""
79− ]
80+ ]
80 , "in callPackage (nixpkgs.path + \"/pkgs/development/haskell-modules\") {"
81 , "in callPackage (nixpkgs.path + \"/pkgs/development/haskell-modules\") {"
81 , nest 2 $ vcat
82 , nest 2 $ vcat
82− [ attr "ghc" ("pkgs.haskell.compiler." <> toNixGhcVersion (oc ^. ocGhc))
83+ [ attr "ghc" ("pkgs.haskell.compiler." <> nixGhc)
84+ , attr "buildHaskellPackages" ("buildPackages.haskell.packages." <> nixGhc)
83 , attr "compilerConfig" "self: extends pkgOverrides (stackageConfig self)"
85 , attr "compilerConfig" "self: extends pkgOverrides (stackageConfig self)"
84 , attr "initialPackages" "stackagePackages"
86 , attr "initialPackages" "stackagePackages"
85 , attr "configurationCommon" "args: self: super: {}"
87 , attr "configurationCommon" "args: self: super: {}"
@@ -87,6 +89,8 @@ overrideHaskellPackages oc packages = vcat
87 ]
89 ]
88 , "}"
90 , "}"
89 ]
91 ]
92+ where
93+ nixGhc = toNixGhcVersion (oc ^. ocGhc)
90
94
91overrideStackage :: StackResolver -> FilePath -> NonEmpty Derivation -> Doc
95overrideStackage :: StackResolver -> FilePath -> NonEmpty Derivation -> Doc
92overrideStackage stackResolver nixpkgsPath packages = vcat
96overrideStackage stackResolver nixpkgsPath packages = vcat
@@ -145,6 +149,15 @@ pPrintHaskellPackages oc = vcat
145 , "in extensible-self"
149 , "in extensible-self"
146 ]
150 ]
147
151
152+stackYamlPackages :: NonEmpty Derivation -> Doc
153+stackYamlPackages packages = hcat
154+ [ "self: { "
155+ , "inherit (self) "
156+ , text . intercalate " " $ NE.toList packageNames
157+ , "; }" ]
158+ where
159+ packageNames = unPackageName . pkgName . packageId <$> packages
160+
148toNixGhcVersion :: Version -> Doc
161toNixGhcVersion :: Version -> Doc
149toNixGhcVersion = (<>) "ghc" . toNixVersion . show . disp
162toNixGhcVersion = (<>) "ghc" . toNixVersion . show . disp
150
163
src/LtsHaskell.hs+1−1
@@ -52,7 +52,7 @@ getPackageFromRepo allCabalHashesPath mSha1Hash pkgId = do
52getPackageFromDb :: DB.HackageDB -> PackageIdentifier -> IO Package
52getPackageFromDb :: DB.HackageDB -> PackageIdentifier -> IO Package
53getPackageFromDb hackageDb pkgId =
53getPackageFromDb hackageDb pkgId =
54 getStackPackageFromDb hackageDb
54 getStackPackageFromDb hackageDb
55− $ StackPackage (StackIndex $ PackageIndex (T.pack $ Text.display pkgId) Nothing) True Nothing
55+ $ StackPackage (PlIndex $ PackageIndex (T.pack $ Text.display pkgId) Nothing) True Nothing
56
56
57loadPackage :: DB.HackageDB -> FilePath -> Maybe SHA1Hash -> PackageIdentifier -> IO Package
57loadPackage :: DB.HackageDB -> FilePath -> Maybe SHA1Hash -> PackageIdentifier -> IO Package
58loadPackage hackageDb allCabalHashesPath mSha1Hash pkgId =
58loadPackage hackageDb allCabalHashesPath mSha1Hash pkgId =
src/Runner.hs+24−13
@@ -25,8 +25,9 @@ import Stackage.Types
25import System.IO (withFile, IOMode(..), hPutStrLn)
25import System.IO (withFile, IOMode(..), hPutStrLn)
26import Text.PrettyPrint.HughesPJClass (Doc, render)
26import Text.PrettyPrint.HughesPJClass (Doc, render)
27
27
28−import qualified Data.Set as Set
28+import qualified Data.List.NonEmpty as NE
29import qualified Data.Map as Map
29import qualified Data.Map as Map
30+import qualified Data.Set as Set
30import qualified LtsHaskell as LH
31import qualified LtsHaskell as LH
31
32
32run :: IO ()
33run :: IO ()
@@ -49,8 +50,16 @@ run = do
49 let
50 let
50 stackResolver = stackConf ^. scResolver
51 stackResolver = stackConf ^. scResolver
51 stackPackagesConfig = mkStackPackagesConfig opts
52 stackPackagesConfig = mkStackPackagesConfig opts
53+ stackExtraDepsConfig = stackPackagesConfig
54+ & spcDoCheckPackages .~ False
55+ & spcDoHaddockPackages .~ False
52 stackConfPackages <- traverse (fmap mkNode . packageDerivation stackPackagesConfig hackageDb)
56 stackConfPackages <- traverse (fmap mkNode . packageDerivation stackPackagesConfig hackageDb)
53 $ stackConf ^. scPackages
57 $ stackConf ^. scPackages
58+ stackConfExtraDeps <- traverse (fmap mkNode . packageDerivation stackExtraDepsConfig hackageDb)
59+ $ stackConf ^. scExtraDeps
60+ let
61+ stackConfAllPackages = maybe stackConfPackages ((<>) stackConfPackages)
62+ $ NE.nonEmpty stackConfExtraDeps
54
63
55 case buildTarget of
64 case buildTarget of
56 TargetStackageClosure -> do
65 TargetStackageClosure -> do
@@ -58,11 +67,11 @@ run = do
58 let
67 let
59 overrideConfig = mkOverrideConfig opts (siGhcVersion $ bpSystemInfo buildPlan)
68 overrideConfig = mkOverrideConfig opts (siGhcVersion $ bpSystemInfo buildPlan)
60 stackageSetConfig = if opts ^. optTweaks . tExtraDepsRevisionLatest
69 stackageSetConfig = if opts ^. optTweaks . tExtraDepsRevisionLatest
61− then extraDepsLatestConfig stackConfPackages packageSetConfig
70+ then extraDepsLatestConfig stackConfAllPackages packageSetConfig
62 else packageSetConfig
71 else packageSetConfig
63 stackagePackages <- buildStackagePackages stackageSetConfig buildPlan
72 stackagePackages <- buildStackagePackages stackageSetConfig buildPlan
64 let
73 let
65− reachable = reachableDeps stackConfPackages
74+ reachable = reachableDeps stackConfAllPackages
66 -- Nixpkgs generic-builder puts hscolour on path for all libraries
75 -- Nixpkgs generic-builder puts hscolour on path for all libraries
67 withHscolour pkgs =
76 withHscolour pkgs =
68 let hscolour = F.find ((== "hscolour") . nodeName) stackagePackages
77 let hscolour = F.find ((== "hscolour") . nodeName) stackagePackages
@@ -84,14 +93,14 @@ run = do
84 writeOutFile buildPlanFile (opts ^. optOutStackageConfig)
93 writeOutFile buildPlanFile (opts ^. optOutStackageConfig)
85 $ pPrintOutConfig (bpSystemInfo buildPlan) nodes
94 $ pPrintOutConfig (bpSystemInfo buildPlan) nodes
86 writeOutFile (stackYaml ^. syFilePath) (opts ^. optOutDerivation)
95 writeOutFile (stackYaml ^. syFilePath) (opts ^. optOutDerivation)
87− $ PP.overrideHaskellPackages overrideConfig (view nodeDerivation <$> stackConfPackages)
96+ $ PP.overrideHaskellPackages overrideConfig (view nodeDerivation <$> stackConfAllPackages)
88
97
89 TargetStackagePackages -> do
98 TargetStackagePackages -> do
90 (buildPlanFile, buildPlan, packageSetConfig) <- loadStackageBuildPlan hackageDb stackResolver opts sopts
99 (buildPlanFile, buildPlan, packageSetConfig) <- loadStackageBuildPlan hackageDb stackResolver opts sopts
91 let
100 let
92 overrideConfig = mkOverrideConfig opts (siGhcVersion $ bpSystemInfo buildPlan)
101 overrideConfig = mkOverrideConfig opts (siGhcVersion $ bpSystemInfo buildPlan)
93 stackageSetConfig = if opts ^. optTweaks . tExtraDepsRevisionLatest
102 stackageSetConfig = if opts ^. optTweaks . tExtraDepsRevisionLatest
94− then extraDepsLatestConfig stackConfPackages packageSetConfig
103+ then extraDepsLatestConfig stackConfAllPackages packageSetConfig
95 else packageSetConfig
104 else packageSetConfig
96 -- stackageLoader mHash pkgId =
105 -- stackageLoader mHash pkgId =
97 -- if pkgName pkgId `Set.member` reachable
106 -- if pkgName pkgId `Set.member` reachable
@@ -104,14 +113,16 @@ run = do
104 writeOutFile buildPlanFile (opts ^. optOutStackageConfig)
113 writeOutFile buildPlanFile (opts ^. optOutStackageConfig)
105 $ pPrintOutConfig (bpSystemInfo buildPlan) nodes
114 $ pPrintOutConfig (bpSystemInfo buildPlan) nodes
106 writeOutFile (stackYaml ^. syFilePath) (opts ^. optOutDerivation)
115 writeOutFile (stackYaml ^. syFilePath) (opts ^. optOutDerivation)
107− $ PP.overrideHaskellPackages overrideConfig (view nodeDerivation <$> stackConfPackages)
116+ $ PP.overrideHaskellPackages overrideConfig (view nodeDerivation <$> stackConfAllPackages)
108
117
109− TargetStackageOverride ->
118+ TargetStackageOverride -> do
110− writeOutFile (stackYaml ^. syFilePath) (opts ^. optOutDerivation) $
119+ writeOutFile (stackYaml ^. syFilePath) (opts ^. optOutDerivation)
111− PP.overrideStackage
120+ $ PP.overrideStackage
112− (stackConf ^. scResolver)
121+ (stackConf ^. scResolver)
113− (opts ^. optNixpkgsRepository)
122+ (opts ^. optNixpkgsRepository)
123+ (view nodeDerivation <$> stackConfAllPackages)
124+ writeOutFile (stackYaml ^. syFilePath) (opts ^. optOutStackYamlPackages)
114− (view nodeDerivation <$> stackConfPackages)
125+ $ PP.stackYamlPackages (view nodeDerivation <$> stackConfPackages)
115
126
116 -- Generate Stackage packages from resolver
127 -- Generate Stackage packages from resolver
117 OriginResolver stackResolver -> do
128 OriginResolver stackResolver -> do
@@ -181,6 +192,6 @@ mkStackPackagesConfig opts = StackPackagesConfig
181 , _spcNixpkgsResolver = \i -> Just (Nix.binding # (i, Nix.path # [i]))
192 , _spcNixpkgsResolver = \i -> Just (Nix.binding # (i, Nix.path # [i]))
182 , _spcTargetPlatform = opts ^. optPlatform
193 , _spcTargetPlatform = opts ^. optPlatform
183 , _spcTargetCompiler = unknownCompilerInfo (opts ^. optCompilerId) NoAbiTag
194 , _spcTargetCompiler = unknownCompilerInfo (opts ^. optCompilerId) NoAbiTag
184− , _spcFlagAssignment = []
195+ , _spcFlagAssignment = mempty
185 , _spcDoCheckPackages = opts ^. optDoCheckPackages
196 , _spcDoCheckPackages = opts ^. optDoCheckPackages
186 , _spcDoHaddockPackages = opts ^. optDoHaddockPackages }
197 , _spcDoHaddockPackages = opts ^. optDoHaddockPackages }
src/Runner/Cli.hs+23−13
@@ -46,19 +46,20 @@ data StackageOptions = StackageOptions
46makeLenses ''StackageOptions
46makeLenses ''StackageOptions
47
47
48data Options = Options
48data Options = Options
49− { _optAllCabalHashesRepo :: Maybe FilePath
49+ { _optAllCabalHashesRepo :: Maybe FilePath
50− , _optLtsHaskellRepo :: Maybe FilePath
50+ , _optLtsHaskellRepo :: Maybe FilePath
51− , _optOutStackagePackages :: FilePath
51+ , _optOutStackagePackages :: FilePath
52− , _optOutStackageConfig :: FilePath
52+ , _optOutStackageConfig :: FilePath
53− , _optOutDerivation :: FilePath
53+ , _optOutDerivation :: FilePath
54+ , _optOutStackYamlPackages :: FilePath
54− , _optDoCheckPackages :: Bool
55+ , _optDoCheckPackages :: Bool
55− , _optDoHaddockPackages :: Bool
56+ , _optDoHaddockPackages :: Bool
56− , _optTweaks :: Tweaks
57+ , _optTweaks :: Tweaks
57− , _optHackageDb :: Maybe FilePath
58+ , _optHackageDb :: Maybe FilePath
58− , _optNixpkgsRepository :: FilePath
59+ , _optNixpkgsRepository :: FilePath
59− , _optCompilerId :: CompilerId
60+ , _optCompilerId :: CompilerId
60− , _optPlatform :: Platform
61+ , _optPlatform :: Platform
61− , _optConfigOrigin :: ConfigOrigin
62+ , _optConfigOrigin :: ConfigOrigin
62 } deriving (Show)
63 } deriving (Show)
63
64
64makeLenses ''Options
65makeLenses ''Options
@@ -79,6 +80,7 @@ options = Options
79 <*> outStackagePackages
80 <*> outStackagePackages
80 <*> outStackageConfig
81 <*> outStackageConfig
81 <*> outDerivation
82 <*> outDerivation
83+ <*> outStackYamlPackages
82 <*> doCheckPackages
84 <*> doCheckPackages
83 <*> doHaddockPackages
85 <*> doHaddockPackages
84 <*> tweaks
86 <*> tweaks
@@ -140,6 +142,14 @@ outDerivation = option str
140 <> value "default.nix"
142 <> value "default.nix"
141 <> showDefaultWith id )
143 <> showDefaultWith id )
142
144
145+outStackYamlPackages :: Parser FilePath
146+outStackYamlPackages = option str
147+ ( long "out-stack-yaml-packages"
148+ <> metavar "NIX_FILE"
149+ <> help "path to output stackage.yaml packages list"
150+ <> value "stack-yaml-packages.nix"
151+ <> showDefaultWith id )
152+
143doCheckPackages :: Parser Bool
153doCheckPackages :: Parser Bool
144doCheckPackages = flag True False
154doCheckPackages = flag True False
145 ( long "no-check"
155 ( long "no-check"
src/Stack/Config.hs+44−28
@@ -3,12 +3,11 @@
3module Stack.Config where
3module Stack.Config where
4
4
5import Control.Lens
5import Control.Lens
6−import Data.Bifunctor
7import Data.ByteString as BS
6import Data.ByteString as BS
8import Data.Coerce
7import Data.Coerce
8+import Data.List as L
9import Data.List.NonEmpty as NE
9import Data.List.NonEmpty as NE
10import Data.Maybe
10import Data.Maybe
11−import Data.Semigroup
12import Data.Text as T
11import Data.Text as T
13import Data.Yaml
12import Data.Yaml
14import Network.URI
13import Network.URI
@@ -51,10 +50,10 @@ data PackageIndex = PackageIndex
51makeLenses ''PackageIndex
50makeLenses ''PackageIndex
52
51
53data PackageLocation
52data PackageLocation
54− = StackIndex PackageIndex
53+ = PlIndex PackageIndex
55− | StackFilePath FilePath
54+ | PlFilePath FilePath
56− | StackUri URI
55+ | PlUri URI
57− | StackRepo Repo
56+ | PlRepo Repo
58 deriving (Eq, Ord, Show)
57 deriving (Eq, Ord, Show)
59
58
60makePrisms ''PackageLocation
59makePrisms ''PackageLocation
@@ -71,23 +70,37 @@ makeLenses ''StackPackage
71data StackConfig = StackConfig
70data StackConfig = StackConfig
72 { _scResolver :: StackResolver
71 { _scResolver :: StackResolver
73 , _scPackages :: NonEmpty StackPackage
72 , _scPackages :: NonEmpty StackPackage
73+ , _scExtraDeps :: [StackPackage]
74 } deriving (Eq, Ord, Show)
74 } deriving (Eq, Ord, Show)
75
75
76makeLenses ''StackConfig
76makeLenses ''StackConfig
77
77
78+scAllPackages :: Getter StackConfig (NonEmpty StackPackage)
79+scAllPackages = to allPs
80+ where
81+ allPs sc = maybe ps ((<>) ps) (NE.nonEmpty ed)
82+ where
83+ ps = sc ^. scPackages
84+ ed = sc ^. scExtraDeps
85+
78fromYamlConfig :: Yaml.Config -> StackConfig
86fromYamlConfig :: Yaml.Config -> StackConfig
79fromYamlConfig c = StackConfig{..}
87fromYamlConfig c = StackConfig{..}
80 where
88 where
81 _scResolver = coerce $ c ^. cResolver
89 _scResolver = coerce $ c ^. cResolver
90+ -- 'nub' replicates Stack behavior of having a Set of packages rather than list
82− _scPackages = NE.nub
91+ _scPackages = NE.nub nePackages
92+ _scExtraDeps = L.nub $ extraDeps ++ yamlExtraDeps
83− $ fromMaybe (pure defaultPackage)
93+ nePackages = fromMaybe (pure defaultPackage)
84− $ fmap sconcat
94+ $ NE.nonEmpty packages
85− $ NE.nonEmpty (yamlPackages <> yamlExtraDeps)
95+ -- yaml packages section can contain extra-deps
96+ (extraDeps, packages) = L.partition (view spExtraDep) yamlPackages
97+ yamlPackages = L.concatMap NE.toList
86− yamlPackages = fromYamlPackage packagesSimplePath False
98+ $ fromYamlPackage packagesSimplePath False
87 <$> fromMaybe mempty (c ^. cPackages)
99 <$> fromMaybe mempty (c ^. cPackages)
100+ yamlExtraDeps = L.concatMap NE.toList
88− yamlExtraDeps = fromYamlPackage extraDepsSimplePath True
101+ $ fromYamlPackage extraDepsSimplePath True
89 <$> fromMaybe mempty (c ^. cExtraDeps)
102 <$> fromMaybe mempty (c ^. cExtraDeps)
90− defaultPackage = StackPackage (StackFilePath ".") False Nothing
103+ defaultPackage = StackPackage (PlFilePath ".") False Nothing
91
104
92-- | Simple string in a packages section can be an URI or FilePath location
105-- | Simple string in a packages section can be an URI or FilePath location
93packagesSimplePath :: Text -> StackPackage
106packagesSimplePath :: Text -> StackPackage
@@ -95,19 +108,19 @@ packagesSimplePath t = StackPackage (parseSimplePath t) False Nothing
95
108
96-- | Parse location as URI or a FilePath
109-- | Parse location as URI or a FilePath
97parseSimplePath :: Text -> PackageLocation
110parseSimplePath :: Text -> PackageLocation
98−parseSimplePath (T.unpack -> p) = maybe (StackFilePath p) StackUri $ parseURI p
111+parseSimplePath (T.unpack -> p) = maybe (PlFilePath p) PlUri $ parseURI p
99
112
100-- | Simple string in an extra-deps section can be an URI or FilePath or PackageIndex name-version
113-- | Simple string in an extra-deps section can be an URI or FilePath or PackageIndex name-version
101extraDepsSimplePath :: Text -> StackPackage
114extraDepsSimplePath :: Text -> StackPackage
102extraDepsSimplePath t = StackPackage loc True Nothing
115extraDepsSimplePath t = StackPackage loc True Nothing
103 where
116 where
104− loc = maybe (parsePackageIndex t) StackUri $ parseURI (T.unpack t)
117+ loc = maybe (parsePackageIndex t) PlUri $ parseURI (T.unpack t)
105
118
106-- TODO: support new package index format with hash and revision
119-- TODO: support new package index format with hash and revision
107parsePackageIndex :: Text -> PackageLocation
120parsePackageIndex :: Text -> PackageLocation
108parsePackageIndex t = if isFilePath t
121parsePackageIndex t = if isFilePath t
109− then StackFilePath (T.unpack t)
122+ then PlFilePath (T.unpack t)
110− else StackIndex $ PackageIndex t Nothing
123+ else PlIndex $ PackageIndex t Nothing
111
124
112-- Determine wether package is file path
125-- Determine wether package is file path
113isFilePath :: Text -> Bool
126isFilePath :: Text -> Bool
@@ -121,21 +134,23 @@ fromYamlPackage
121 -> Yaml.Package
134 -> Yaml.Package
122 -> NonEmpty StackPackage
135 -> NonEmpty StackPackage
123fromYamlPackage fromSimple isExtraDep = \case
136fromYamlPackage fromSimple isExtraDep = \case
124− Yaml.Simple p ->
137+ Yaml.PSimple p ->
125 pure (fromSimple p)
138 pure (fromSimple p)
126− Yaml.LocationSimple (Location p extraDep ms) ->
139+ Yaml.PLocationSimple (Location p extraDep ms) ->
127 unroll ms $ StackPackage (parseSimplePath p) (fromMaybe False extraDep)
140 unroll ms $ StackPackage (parseSimplePath p) (fromMaybe False extraDep)
128− Yaml.LocationGit loc ->
141+ Yaml.PLocationGit loc ->
129 mkStackPackageRepo fromYamlGit loc
142 mkStackPackageRepo fromYamlGit loc
130− Yaml.LocationHg loc ->
143+ Yaml.PLocationHg loc ->
131 mkStackPackageRepo fromYamlHg loc
144 mkStackPackageRepo fromYamlHg loc
145+ Yaml.PArchive a ->
146+ unroll (a ^. aSubdirs) $ StackPackage (a ^. aArchive . to parseSimplePath) isExtraDep
132− Yaml.PNewGit ng -> unroll (ng ^. ngSubdirs)
147+ Yaml.PNewGit ng -> unroll (ng ^. ngSubdirs)
133− $ StackPackage (StackRepo $ fromYamlNewGit ng) isExtraDep
148+ $ StackPackage (PlRepo $ fromYamlNewGit ng) isExtraDep
134− Yaml.PNewHg nh -> unroll (nh ^. nhSubdirs)
149+ Yaml.PNewHg nh -> unroll (nh ^. nhSubdirs)
135− $ StackPackage (StackRepo $ fromYamlNewHg nh) isExtraDep
150+ $ StackPackage (PlRepo $ fromYamlNewHg nh) isExtraDep
136 where
151 where
137 mkStackPackageRepo f loc = unroll (loc ^. lSubdirs)
152 mkStackPackageRepo f loc = unroll (loc ^. lSubdirs)
138− $ StackPackage (StackRepo (loc ^. lLocation . to f)) (fromMaybe isExtraDep $ loc ^. lExtraDep)
153+ $ StackPackage (PlRepo (loc ^. lLocation . to f)) (fromMaybe isExtraDep $ loc ^. lExtraDep)
139 -- Each package gets a single directory with cabal file in it. If
154 -- Each package gets a single directory with cabal file in it. If
140 -- it's not specified, path is empty.
155 -- it's not specified, path is empty.
141 unroll subs p = case subs of
156 unroll subs p = case subs of
@@ -170,8 +185,9 @@ readStackConfig :: StackYaml -> IO (Either String StackConfig)
170readStackConfig stackYaml = do
185readStackConfig stackYaml = do
171 let
186 let
172 relativeToStackYaml = \case
187 relativeToStackYaml = \case
173− StackFilePath p -> StackFilePath $ stackYaml ^. syDirName </> p
188+ PlFilePath p -> PlFilePath $ stackYaml ^. syDirName </> p
174 packageLocation -> packageLocation
189 packageLocation -> packageLocation
175 mkStackConfig = over (scPackages . traversed . spLocation) relativeToStackYaml
190 mkStackConfig = over (scPackages . traversed . spLocation) relativeToStackYaml
191+ . over (scExtraDeps . traversed . spLocation) relativeToStackYaml
176 . fromYamlConfig
192 . fromYamlConfig
177− second mkStackConfig . decodeEither <$> BS.readFile (stackYaml ^. syFilePath)
193+ bimap show mkStackConfig . decodeEither' <$> BS.readFile (stackYaml ^. syFilePath)
src/Stack/Config/Yaml.hs+29−17
@@ -16,6 +16,15 @@ data Location a = Location
16makeLenses ''Location
16makeLenses ''Location
17deriveJSON jsonOpts ''Location
17deriveJSON jsonOpts ''Location
18
18
19+data Archive = Archive
20+ { _aArchive :: Text
21+ , _aSha256 :: Maybe Text
22+ , _aSubdirs :: Maybe [FilePath]
23+ } deriving (Eq, Show)
24+
25+makeLenses ''Archive
26+deriveJSON jsonOpts ''Archive
27+
19data Git = Git
28data Git = Git
20 { _gGit :: Text
29 { _gGit :: Text
21 , _gCommit :: Text
30 , _gCommit :: Text
@@ -53,10 +62,11 @@ makeLenses ''NewHg
53deriveJSON jsonOpts ''NewHg
62deriveJSON jsonOpts ''NewHg
54
63
55data Package
64data Package
56− = Simple Text
65+ = PSimple Text
57− | LocationSimple (Location Text)
66+ | PLocationSimple (Location Text)
58− | LocationGit (Location Git)
67+ | PLocationGit (Location Git)
59− | LocationHg (Location Hg)
68+ | PLocationHg (Location Hg)
69+ | PArchive Archive
60 | PNewGit NewGit
70 | PNewGit NewGit
61 | PNewHg NewHg
71 | PNewHg NewHg
62 deriving (Eq, Show)
72 deriving (Eq, Show)
@@ -65,24 +75,26 @@ makePrisms ''Package
65
75
66instance FromJSON Package where
76instance FromJSON Package where
67 parseJSON v =
77 parseJSON v =
68− (Simple <$> parseJSON v) <|>
78+ (PSimple <$> parseJSON v) <|>
69− (LocationSimple <$> parseJSON v) <|>
79+ (PLocationSimple <$> parseJSON v) <|>
70− (LocationGit <$> parseJSON v) <|>
80+ (PLocationGit <$> parseJSON v) <|>
81+ (PLocationHg <$> parseJSON v) <|>
71− (LocationHg <$> parseJSON v) <|>
82+ (PArchive <$> parseJSON v) <|>
72 (PNewGit <$> parseJSON v) <|>
83 (PNewGit <$> parseJSON v) <|>
73 (PNewHg <$> parseJSON v)
84 (PNewHg <$> parseJSON v)
74
85
75instance ToJSON Package where
86instance ToJSON Package where
76 toJSON = \case
87 toJSON = \case
77− Simple t -> toJSON t
88+ PSimple t -> toJSON t
78− LocationSimple t -> toJSON t
89+ PLocationSimple t -> toJSON t
79− LocationGit t -> toJSON t
90+ PLocationGit t -> toJSON t
80− LocationHg t -> toJSON t
91+ PLocationHg t -> toJSON t
92+ PArchive t -> toJSON t
81− PNewGit t -> toJSON t
93+ PNewGit t -> toJSON t
82− PNewHg t -> toJSON t
94+ PNewHg t -> toJSON t
83−
95+
84−-- To support support both old and new syntax, we allow all varieties of package
96+-- To support both old and new syntax, we allow all variants of package
85−-- definitions in both "packages" and "extra-deps" sections
97+-- definitions in "packages" and "extra-deps" sections
86data Config = Config
98data Config = Config
87 { _cResolver :: Text
99 { _cResolver :: Text
88 , _cPackages :: Maybe [Package]
100 , _cPackages :: Maybe [Package]
stack-ghc-802.yamldeleted−8
@@ -1,8 +0,0 @@
1−resolver: lts-9.21
2−extra-deps:
3−- Cabal-2.0.0.2
4−- cabal2nix-2.7.2
5−- hackage-db-2.0
6−- stackage-curator-0.15.0.0
7−nix:
8− packages: [icu openssl zlib]
stack-ghc-822.yamldeleted−3
@@ -1,3 +0,0 @@
1−resolver: lts-10.0
2−extra-deps:
3− - cabal2nix-2.7.2
stack.yamlmode 120000 → 100644+11−1
@@ -1 +0,0 @@
1−stack-ghc-822.yaml
@@ -0,0 +1,11 @@
1+resolver: lts-12.2
2+extra-deps:
3+ - yaml-0.8.31.1
4+ - git: https://github.com/fpco/stackage-curator.git
5+ commit: 73c5ed06602990c33d3fec1711e27875f283b6bf
6+ - git: https://github.com/jwiegley/gitlib.git
7+ commit: 70c99759b8b9377f67492fe29afb32f05882409d
8+ subdirs:
9+ - gitlib
10+ - gitlib-libgit2
11+
stackage2nix.cabal+5−2
@@ -1,5 +1,5 @@
1name: stackage2nix
1name: stackage2nix
2−version: 0.6.1
2+version: 0.7.2
3synopsis: Convert Stack files into Nix build instructions.
3synopsis: Convert Stack files into Nix build instructions.
4homepage: https://github.com/typeable/stackage2nix#readme
4homepage: https://github.com/typeable/stackage2nix#readme
5license: BSD3
5license: BSD3
@@ -31,7 +31,7 @@ library
31 , LtsHaskell
31 , LtsHaskell
32 , Paths_stackage2nix
32 , Paths_stackage2nix
33 build-depends: base > 4.7 && < 5
33 build-depends: base > 4.7 && < 5
34− , Cabal > 2
34+ , Cabal > 2.2
35 , QuickCheck
35 , QuickCheck
36 , aeson
36 , aeson
37 , bytestring
37 , bytestring
@@ -51,6 +51,7 @@ library
51 , optparse-applicative
51 , optparse-applicative
52 , pretty
52 , pretty
53 , stackage-curator >= 0.15
53 , stackage-curator >= 0.15
54+ , tagged
54 , text
55 , text
55 , unordered-containers
56 , unordered-containers
56 , yaml
57 , yaml
@@ -77,6 +78,7 @@ test-suite spec
77 , Cabal
78 , Cabal
78 , bytestring
79 , bytestring
79 , hspec
80 , hspec
81+ , network-uri
80 , pretty
82 , pretty
81 , shakespeare
83 , shakespeare
82 , stackage2nix
84 , stackage2nix
@@ -86,6 +88,7 @@ test-suite spec
86 other-modules: Language.Nix.FilePathSpec
88 other-modules: Language.Nix.FilePathSpec
87 , PrettyPrintingSpec
89 , PrettyPrintingSpec
88 , Stack.Config.YamlSpec
90 , Stack.Config.YamlSpec
91+ , Stack.ConfigSpec
89 ghc-options: -Wall -threaded -rtsopts -with-rtsopts=-N
92 ghc-options: -Wall -threaded -rtsopts -with-rtsopts=-N
90 default-language: Haskell2010
93 default-language: Haskell2010
91
94
test/Stack/Config/YamlSpec.hs+40−24
@@ -1,7 +1,7 @@
1{-# LANGUAGE OverloadedStrings #-}
1{-# LANGUAGE OverloadedStrings #-}
2{-# LANGUAGE QuasiQuotes #-}
2{-# LANGUAGE QuasiQuotes #-}
3
3
4−module Stack.Config.YamlSpec where
4+module Stack.Config.YamlSpec (spec) where
5
5
6import Data.ByteString
6import Data.ByteString
7import Data.Text.Encoding as T
7import Data.Text.Encoding as T
@@ -69,13 +69,18 @@ extra-deps:
69 subdirs:
69 subdirs:
70 - subdir1
70 - subdir1
71 - subdir2
71 - subdir2
72+ - archive: http://github.com/yesodweb/wai/archive/2f8a8e1b771829f4a8a77c0111352ce45a14c30f.zip
73+ subdirs:
74+ - wai
75+ - warp
76+ - archive: ../acme-missiles-0.3.tar.gz
77+ sha256: e563d8b524017a06b32768c4db8eff1f822f3fb22a90320b7e414402647b735b
72|]
78|]
73
79
74−
75configMinimal :: Config
80configMinimal :: Config
76configMinimal = Config
81configMinimal = Config
77 { _cResolver = "lts-8.15"
82 { _cResolver = "lts-8.15"
78− , _cPackages = Just [ Simple "." ]
83+ , _cPackages = Just [ PSimple "." ]
79 , _cExtraDeps = Nothing
84 , _cExtraDeps = Nothing
80 }
85 }
81
86
@@ -83,46 +88,46 @@ config :: Config
83config = Config
88config = Config
84 { _cResolver = "lts-3.7"
89 { _cResolver = "lts-3.7"
85 , _cPackages = Just
90 , _cPackages = Just
86− [ Simple "."
91+ [ PSimple "."
87− , LocationSimple (Location "dir1/dir2" Nothing Nothing)
92+ , PLocationSimple (Location "dir1/dir2" Nothing Nothing)
88− , LocationSimple (Location "https://example.com/foo/bar/baz-0.0.2.tar.gz" (Just True) Nothing)
93+ , PLocationSimple (Location "https://example.com/foo/bar/baz-0.0.2.tar.gz" (Just True) Nothing)
89− , LocationGit $ Location
94+ , PLocationGit $ Location
90 (Git
95 (Git
91 "git@github.com:commercialhaskell/stack.git"
96 "git@github.com:commercialhaskell/stack.git"
92 "6a86ee32e5b869a877151f74064572225e1a0398")
97 "6a86ee32e5b869a877151f74064572225e1a0398")
93 Nothing Nothing
98 Nothing Nothing
94− , LocationGit (Location
99+ , PLocationGit (Location
95 (Git
100 (Git
96 "git@github.com:example/mega-repo"
101 "git@github.com:example/mega-repo"
97 "6a86ee32e5b869a877151f74064572225e1a0000")
102 "6a86ee32e5b869a877151f74064572225e1a0000")
98 Nothing (Just ["subdir1", "subdir2"]))
103 Nothing (Just ["subdir1", "subdir2"]))
99 ]
104 ]
100 , _cExtraDeps = Just
105 , _cExtraDeps = Just
101− [Simple "acme-missiles-0.3"]
106+ [PSimple "acme-missiles-0.3"]
102 }
107 }
103
108
104configNew :: Config
109configNew :: Config
105configNew = Config
110configNew = Config
106 { _cResolver = "lts-3.7"
111 { _cResolver = "lts-3.7"
107 , _cPackages = Just
112 , _cPackages = Just
108− [ Simple "."
113+ [ PSimple "."
109− , LocationSimple (Location "dir1/dir2" Nothing Nothing)
114+ , PLocationSimple (Location "dir1/dir2" Nothing Nothing)
110− , LocationSimple (Location "https://example.com/foo/bar/baz-0.0.2.tar.gz" (Just True) Nothing)
115+ , PLocationSimple (Location "https://example.com/foo/bar/baz-0.0.2.tar.gz" (Just True) Nothing)
111− , LocationGit $ Location
116+ , PLocationGit $ Location
112 (Git
117 (Git
113 "git@github.com:commercialhaskell/stack.git"
118 "git@github.com:commercialhaskell/stack.git"
114 "6a86ee32e5b869a877151f74064572225e1a0398")
119 "6a86ee32e5b869a877151f74064572225e1a0398")
115 Nothing Nothing
120 Nothing Nothing
116− , LocationGit (Location
121+ , PLocationGit (Location
117 (Git
122 (Git
118 "git@github.com:example/mega-repo"
123 "git@github.com:example/mega-repo"
119 "6a86ee32e5b869a877151f74064572225e1a0000")
124 "6a86ee32e5b869a877151f74064572225e1a0000")
120 Nothing (Just ["subdir1", "subdir2"]))
125 Nothing (Just ["subdir1", "subdir2"]))
121 ]
126 ]
122 , _cExtraDeps = Just
127 , _cExtraDeps = Just
123− [ Simple "acme-missiles-0.3"
128+ [ PSimple "acme-missiles-0.3"
124− , Simple "acme-missiles-hash-0.4@sha256:2ba66a092a32593880a87fb00f3213762d7bca65a687d45965778deb8694c5d1"
129+ , PSimple "acme-missiles-hash-0.4@sha256:2ba66a092a32593880a87fb00f3213762d7bca65a687d45965778deb8694c5d1"
125− , Simple "acme-missiles-rev-0.5@rev:0"
130+ , PSimple "acme-missiles-rev-0.5@rev:0"
126 , PNewGit $ NewGit
131 , PNewGit $ NewGit
127 "git@github.com:commercialhaskell/stack.git"
132 "git@github.com:commercialhaskell/stack.git"
128 "6a86ee32e5b869a877151f74064572225e1a0398"
133 "6a86ee32e5b869a877151f74064572225e1a0398"
@@ -131,14 +136,25 @@ configNew = Config
131 "git@github.com:example/mega-repo"
136 "git@github.com:example/mega-repo"
132 "6a86ee32e5b869a877151f74064572225e1a0000"
137 "6a86ee32e5b869a877151f74064572225e1a0000"
133 (Just ["subdir1", "subdir2"])
138 (Just ["subdir1", "subdir2"])
139+ , PArchive $ Archive
140+ "http://github.com/yesodweb/wai/archive/2f8a8e1b771829f4a8a77c0111352ce45a14c30f.zip"
141+ Nothing
142+ (Just ["wai", "warp"])
143+ , PArchive $ Archive
144+ "../acme-missiles-0.3.tar.gz"
145+ (Just "e563d8b524017a06b32768c4db8eff1f822f3fb22a90320b7e414402647b735b")
146+ Nothing
134 ]
147 ]
135 }
148 }
136
149
137spec :: Spec
150spec :: Spec
138−spec = describe "Parse" $ do
151+spec = describe "Config" $ do
139− specify "config-minimal" $
152+ specify "minimal" $
140− (Y.decode configYamlMinimal :: Maybe Config) `shouldBe` Just configMinimal
153+ (decodeMaybe configYamlMinimal :: Maybe Config) `shouldBe` Just configMinimal
141− specify "config-full" $
154+ specify "full" $
142− (Y.decode configYaml :: Maybe Config) `shouldBe` Just config
155+ (decodeMaybe configYaml :: Maybe Config) `shouldBe` Just config
143− specify "config-new" $
156+ specify "new" $
144− (Y.decode configNewYaml :: Maybe Config) `shouldBe` Just configNew
157+ (decodeMaybe configNewYaml :: Maybe Config) `shouldBe` Just configNew
158+
159+decodeMaybe :: ByteString -> Maybe Config
160+decodeMaybe = either (const Nothing) id . Y.decodeEither'
test/Stack/ConfigSpec.hsnew file+191
@@ -0,0 +1,191 @@
1+{-# LANGUAGE OverloadedStrings #-}
2+{-# LANGUAGE QuasiQuotes #-}
3+
4+module Stack.ConfigSpec (spec) where
5+
6+import Data.ByteString
7+import Data.List.NonEmpty as NE
8+import Data.Text.Encoding as T
9+import Data.Yaml as Y
10+import Network.URI as URI
11+import Stack.Config
12+import Test.Hspec
13+import Text.Shakespeare.Text
14+
15+
16+spec :: Spec
17+spec = describe "StackConfig" $ do
18+ specify "minimal"
19+ $ checkYamlConfig minimalBs minimalConf
20+ specify "packageDefault"
21+ $ checkYamlConfig packageDefaultBs packageDefaultConf
22+ specify "packageSimpleList"
23+ $ checkYamlConfig packageSimpleListBs packageSimpleListConf
24+ specify "packageLocations"
25+ $ checkYamlConfig packageLocationsBs packageLocationsConf
26+ specify "packageExtraDeps"
27+ $ checkYamlConfig packageExtraDepsBs packageExtraDepsConf
28+ specify "packageMixed"
29+ $ checkYamlConfig packageMixedBs packageMixedConf
30+ specify "packageExtraDepsNew"
31+ $ checkYamlConfig packageExtraDepsNewBs packageExtraDepsNewConf
32+
33+parseYamlConfig :: ByteString -> Maybe StackConfig
34+parseYamlConfig = either (const Nothing) (Just . fromYamlConfig) . Y.decodeEither'
35+
36+checkYamlConfig :: ByteString -> StackConfig -> Expectation
37+checkYamlConfig bs sc = parseYamlConfig bs `shouldBe` Just sc
38+
39+stUri :: String -> URI
40+stUri s =
41+ let Just uri = parseURI s
42+ in uri
43+
44+minimalBs :: ByteString
45+minimalBs = T.encodeUtf8 [st|
46+resolver: lts-10.0
47+|]
48+
49+minimalConf :: StackConfig
50+minimalConf = StackConfig
51+ { _scResolver = StackResolver "lts-10.0"
52+ , _scPackages = NE.fromList
53+ [ StackPackage (PlFilePath ".") False Nothing]
54+ , _scExtraDeps = []
55+ }
56+
57+packageDefaultBs :: ByteString
58+packageDefaultBs = T.encodeUtf8 [st|
59+resolver: lts-10.0
60+packages:
61+ - .
62+|]
63+
64+packageDefaultConf :: StackConfig
65+packageDefaultConf = minimalConf
66+
67+packageSimpleListBs :: ByteString
68+packageSimpleListBs = T.encodeUtf8 [st|
69+resolver: lts-10.0
70+packages:
71+ - client
72+ - server
73+|]
74+
75+packageSimpleListConf :: StackConfig
76+packageSimpleListConf = StackConfig
77+ { _scResolver = StackResolver "lts-10.0"
78+ , _scPackages = NE.fromList
79+ [ StackPackage (PlFilePath "client") False Nothing
80+ , StackPackage (PlFilePath "server") False Nothing ]
81+ , _scExtraDeps = []
82+ }
83+
84+packageLocationsBs :: ByteString
85+packageLocationsBs = T.encodeUtf8 [st|
86+resolver: lts-10.0
87+packages:
88+ - location: humble/package
89+ subdirs:
90+ - client
91+ - server
92+ - location: https://example.com/foo/bar/baz-0.0.2.tar.gz
93+ extra-dep: true
94+ subdirs:
95+ - extra
96+ - location:
97+ git: git@github.com:example/mega-repo
98+ commit: 6a86ee32e5b869a877151f74064572225e1a0000
99+ subdirs:
100+ - subdir1
101+ - subdir2
102+ extra-dep: true
103+|]
104+
105+packageLocationsConf :: StackConfig
106+packageLocationsConf = StackConfig
107+ { _scResolver = StackResolver "lts-10.0"
108+ , _scPackages = NE.fromList
109+ [ StackPackage (PlFilePath "humble/package") False (Just "client")
110+ , StackPackage (PlFilePath "humble/package") False (Just "server") ]
111+ , _scExtraDeps =
112+ [ StackPackage (PlUri $ stUri "https://example.com/foo/bar/baz-0.0.2.tar.gz") True (Just "extra")
113+ , StackPackage (PlRepo $ Repo (Vcs "git") "git@github.com:example/mega-repo" "6a86ee32e5b869a877151f74064572225e1a0000") True (Just "subdir1")
114+ , StackPackage (PlRepo $ Repo (Vcs "git") "git@github.com:example/mega-repo" "6a86ee32e5b869a877151f74064572225e1a0000") True (Just "subdir2")
115+ ]
116+ }
117+
118+packageExtraDepsBs :: ByteString
119+packageExtraDepsBs = T.encodeUtf8 [st|
120+resolver: lts-10.0
121+extra-deps:
122+ - acme-missiles-0.3
123+ - humble-package-1
124+|]
125+
126+packageExtraDepsConf :: StackConfig
127+packageExtraDepsConf = StackConfig
128+ { _scResolver = StackResolver "lts-10.0"
129+ , _scPackages = NE.fromList [ StackPackage (PlFilePath ".") False Nothing ]
130+ , _scExtraDeps =
131+ [ StackPackage (PlIndex $ PackageIndex "acme-missiles-0.3" Nothing) True Nothing
132+ , StackPackage (PlIndex $ PackageIndex "humble-package-1" Nothing) True Nothing ]
133+ }
134+
135+packageMixedBs :: ByteString
136+packageMixedBs = T.encodeUtf8 [st|
137+resolver: lts-10.0
138+packages:
139+ - client
140+ - server
141+extra-deps:
142+ - acme-missiles-0.3
143+ - humble-package-1
144+|]
145+
146+packageMixedConf :: StackConfig
147+packageMixedConf = StackConfig
148+ { _scResolver = StackResolver "lts-10.0"
149+ , _scPackages = NE.fromList
150+ [ StackPackage (PlFilePath "client") False Nothing
151+ , StackPackage (PlFilePath "server") False Nothing ]
152+ , _scExtraDeps =
153+ [ StackPackage (PlIndex $ PackageIndex "acme-missiles-0.3" Nothing) True Nothing
154+ , StackPackage (PlIndex $ PackageIndex "humble-package-1" Nothing) True Nothing ]
155+ }
156+
157+packageExtraDepsNewBs :: ByteString
158+packageExtraDepsNewBs = T.encodeUtf8 [st|
159+resolver: lts-10.0
160+extra-deps:
161+ - vendor/lib
162+ - acme-missiles-0.3
163+ - git: git@github.com:yesodweb/wai
164+ commit: 2f8a8e1b771829f4a8a77c0111352ce45a14c30f
165+ subdirs:
166+ - auto-update
167+ - wai
168+ - https://example.com/foo/bar/baz-0.0.2.tar.gz
169+ - archive: http://github.com/yesodweb/wai/archive/2f8a8e1b771829f4a8a77c0111352ce45a14c30f.zip
170+ subdirs:
171+ - wai
172+ - warp
173+ - archive: ../acme-missiles-0.3.tar.gz
174+ sha256: e563d8b524017a06b32768c4db8eff1f822f3fb22a90320b7e414402647b735b
175+|]
176+
177+packageExtraDepsNewConf :: StackConfig
178+packageExtraDepsNewConf = StackConfig
179+ { _scResolver = StackResolver "lts-10.0"
180+ , _scPackages = NE.fromList [ StackPackage (PlFilePath ".") False Nothing ]
181+ , _scExtraDeps =
182+ [ StackPackage (PlFilePath "vendor/lib") True Nothing
183+ , StackPackage (PlIndex $ PackageIndex "acme-missiles-0.3" Nothing) True Nothing
184+ , StackPackage (PlRepo $ Repo (Vcs "git") "git@github.com:yesodweb/wai" "2f8a8e1b771829f4a8a77c0111352ce45a14c30f") True (Just "auto-update")
185+ , StackPackage (PlRepo $ Repo (Vcs "git") "git@github.com:yesodweb/wai" "2f8a8e1b771829f4a8a77c0111352ce45a14c30f") True (Just "wai")
186+ , StackPackage (PlUri $ stUri "https://example.com/foo/bar/baz-0.0.2.tar.gz") True Nothing
187+ , StackPackage (PlUri $ stUri "http://github.com/yesodweb/wai/archive/2f8a8e1b771829f4a8a77c0111352ce45a14c30f.zip") True (Just "wai")
188+ , StackPackage (PlUri $ stUri "http://github.com/yesodweb/wai/archive/2f8a8e1b771829f4a8a77c0111352ce45a14c30f.zip") True (Just "warp")
189+ , StackPackage (PlFilePath "../acme-missiles-0.3.tar.gz") True Nothing
190+ ]
191+ }