git.iko.soy/typeable/stackage2nix
on master help sign in
33 files changed+2844−2512
since splitsnapshots
unifiedsplit
.gitignore+1 .travis.yml+18−14 CHANGELOG.md+42−3 README.md+61−33 ci-stackage2nix+8−7 nix/README.md+2−18 nix/haskellPackages/configuration-packages.nix → nix/haskell-packages/configuration-packages.nix+7−11 nix/haskell-packages/default.nix+187 nix/haskellPackages/packages.nix → nix/haskell-packages/packages.nix+1597−1861 nix/haskellPackages/default.nix−164 nix/lib.nix+1−1 nix/stackage/default.nix−24 nix/stackage2nix/default.nix+1−1 src/AllCabalHashes.hs+27−21 src/Distribution/Nixpkgs/Haskell/FromStack.hs+12−7 src/Distribution/Nixpkgs/Haskell/FromStack/Package.hs+32−12 src/Distribution/Nixpkgs/Haskell/Packages/PrettyPrinting.hs+2 src/Distribution/Nixpkgs/Haskell/Stack.hs+22−42 src/Distribution/Nixpkgs/Haskell/Stack/PrettyPrinting.hs+103−28 src/LtsHaskell.hs+11−15 src/Runner.hs+134−66 src/Runner/Cli.hs+84−50 src/Stack/Config.hs+118−49 src/Stack/Config/Yaml.hs+63−26 src/Stack/Types.hs+2−4 stack-ghc-7103.yaml−22 stack-ghc-802.yaml−7 stack-ghc-821.yaml−4 stack-ghc-822.yaml−1 stack.yaml+11−1 stackage2nix.cabal+10−7 test/Stack/Config/YamlSpec.hs+97−13 test/Stack/ConfigSpec.hs+191
.gitignore+1
@@ -1,3 +1,4 @@
11.stack-work
22Paths_stackage2nix.hs
33/*.nix
4+/result*
.travis.yml+18−14
@@ -11,19 +11,26 @@ cache:
1111 directories:
1212 - $HOME/.local/bin
1313 - $HOME/.stack
14− - $HOME/.nix
1514
1615jobs:
1716 include:
18− - stage: test
19− script:
20− - stack --no-terminal --install-ghc build --fast --only-dependencies
21− - stack --no-terminal --install-ghc build --test --haddock --no-haddock-deps --fast --pedantic
22− - stack --no-terminal install
17+ - stage: build
2318 - stage: bootstrap
19+ install:
20+ # Install Nix
21+ - mkdir -p ~/.nix
22+ - sudo mkdir -p /nix
23+ - sudo chmod a+w /nix
24+ - sudo mount --bind ~/.nix /nix
25+ - curl https://nixos.org/nix/install | sh
26+ - source ~/.nix-profile/etc/profile.d/nix.sh
27+ # nixpkgs-unstable not supported
28+ - nix-channel --add https://nixos.org/channels/nixos-18.03 nixpkgs
29+ - nix-channel --update
2430 script:
25− - nix-env -i cabal-install
31+ - nix-env -i cabal-install nix-prefetch-scripts
2632 - cabal update
33+ - nix-build nix/stackage2nix --dry-run
2734 - ./ci-stackage2nix --dry-run
2835
2936before_install:
@@ -31,10 +38,7 @@ before_install:
3138- mkdir -p ~/.local/bin
3239- export PATH=$HOME/.local/bin:$PATH
3340- travis_retry curl -L https://www.stackage.org/stack/linux-x86_64 | tar xz --wildcards --strip-components=1 -C ~/.local/bin '*/stack'
34−# Install Nix
35−- mkdir -p ~/.nix
36−- sudo mkdir -p /nix
37−- sudo chmod a+w /nix
38−- sudo mount --bind ~/.nix /nix
39−- curl https://nixos.org/nix/install | sh
40−- source ~/.nix-profile/etc/profile.d/nix.sh
41+
42+script:
43+- stack --no-terminal --install-ghc build --test --haddock --no-haddock-deps --copy-bins --fast --pedantic
44+
CHANGELOG.md+42−3
@@ -1,10 +1,49 @@
1−# 0.3.0
1+# 0.7.2
2+- Build with ghc-8.4
3+- Drop compatibility with Cabal<2.2
4+- Don't check extra-deps when generating derivation from stack.yaml
25
3−- Initial Hackage release
4−- Add CHANGELOG.md
6+# 0.7.1
7+- Generate stack packages `stack-yaml-packages.nix`
8+
9+# 0.7.0
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
22+
23+# 0.5.0
24+- Add `--with-stackage` and `--with-stackage-closure` flag generates stackage
25+- Add `--extra-deps-revision-latest` flag. Changes generation strategy for the
26+ direct dependencies of the stack.yaml extra-deps. Default strategy is to
27+ generate exact revision defined in the Stackage config. With this flag
28+ enabled, direct dependencies of the stack.yaml extra-deps will be generated
29+ with latest revision available on Hackage. This may help when Cabal fails to
30+ resolve dependencies of extra-deps, and dependences are fixed in the latest
31+ revision
32+- Upd by default stackage2nix generates override of pre-generated Stackage
33+ packages set.
34+- Upd generated Stackage packages with `doCheck` and `runHaddock` enabled by
35+ default
36+- Remove `--do-check-stackage` flag (enabled by default)
37+- Remove `--do-haddock-stackage` flag (enabled by default)
38+- Remove `--no-packages-closure` flag (use `--with-stackage-closure`)
39+- Remove `cabal2nix < 2.7.2` support #45
540
641# 0.4.0
742- Add `--resolver` option to generate full stackage packages set
843- Add Nix wrapper, see `nix/README.md`
944- Upd support cabal2nix >2.5
1045- Fix honor `--hackage-db` flag
46+
47+# 0.3.0
48+- Initial Hackage release
49+- Add CHANGELOG.md
README.md+61−33
@@ -1,48 +1,81 @@
1−# stackage2nix
1+# stackage2nix (DEPRECATED)
22
33[![Build Status](https://travis-ci.org/typeable/stackage2nix.svg?branch=master)](https://travis-ci.org/typeable/stackage2nix)
44
55`stackage2nix` converts a Stack file into a Nix Haskell packages set.
6−It creates LTS Stackage packages set, and applies appropriate overrides on top of it.
76
8−## Install
7+# Create build derivation from stack.yaml
98
10−You can install `stackage2nix` from the Nix expression:
9+## Generate targets from stack.yaml only
1110
1211```
13−nix-env -i -f ./nix/stackage2nix
12+stack exec -- stackage2nix .
1413```
1514
16−It provides pre-configured wrapper around the raw executable with runtime
17−`PATH` and all auxiliary flags set up.
15+Command creates file `default.nix` which overrides `haskell.packages.stackage`
16+packages set. You should use
17+[typeable/nixpkgs-stackage](https://github.com/typeable/nixpkgs-stackage) overlay that
18+adds LTS Stackage packages to Nixpkgs.
1819
19−## Executable
20+Build package with overlay installed:
2021
2122```
22−stackage2nix \
23− --lts-haskell "$LTS_HASKELL_REPO" \
24− --all-cabal-hashes "$ALL_CABAL_HASHES_REPO" \
25− .
23+nix-build -A stackage2nix
24+```
25+
26+## Generate Stackage packages for the build
27+
28+If you don't want to use Stackage overlay, stackage2nix can generate required
29+packages with `--with-stackage-closure` flag.
30+
31+``` bash
32+stack exec -- stackage2nix \
33+ --all-cabal-hashes /path/to/commercialhaskell/all-cabal-hashes \
34+ --lts-haskell /path/to/fpco/lts-haskell \
35+ --with-stackage-closure \
36+ ./stack.yaml
2637```
2738
28−`stackage2nix` has three required arguments:
29−- `--lts-haskell` - path to [fpco/lts-haskell](https://github.com/fpco/lts-haskell)
30−- `--all-cabal-hashes` - path to [commercialhaskell/all-cabal-hashes](https://github.com/commercialhaskell/all-cabal-hashes) checked out to `hackage` branch
31−- `.` - path to stack.yaml file or directory
39+To generate Stackage packages, supply the `--all-cabal-hashes` flag
40+with the path to a local clone of
41+[all-cabal-hashes](https://github.com/commercialhaskell/all-cabal-hashes)
42+checked out on the `hackage` branch and supply the `--lts-haskell` flag
43+with the path to a local clone of
44+[lts-haskell](https://github.com/commercialhaskell/lts-haskell).
3245
33−Produced Nix derivation split on following files:
34−- packages.nix - Base Stackage packages set
35−- configuration-packages.nix - Compiler configuration
36−- default.nix - Final Haskell packages set with all overrides applied
46+### stackage2nix wrapper
3747
38−A particular package from result Haskell packages set can be built with:
48+You can use stackage2nix wrapper from `nix` directory that adds required flags:
3949
4050```
41−nix-build -A <package-name>
51+nix-env -i -f ./nix/stackage2nix
52+stackage2nix --with-stackage-closure ./stack.yaml
4253```
4354
44−See also the [blog post](https://blog.typeable.io/posts/2017-08-24-stackage2nix.html)
45−about history and motivation behind the project.
55+This command will produce `packages.nix` and `configuration-packages.nix`
56+Stackage packages and its override in `default.nix`
57+
58+## Generate full Stackage
59+
60+`--with-stackage` parameter generates full Stackage LTS in addition to the
61+targets from `stack.yaml`
62+
63+```
64+nix-env -i -f ./nix/stackage2nix
65+stackage2nix --with-stackage ./stack.yaml
66+```
67+
68+## Generate Stackage from LTS resolver
69+
70+You can also generate only Stackage packages set from the resolver:
71+
72+```
73+nix-env -i -f ./nix/stackage2nix
74+stackage2nix --resolver lts-10.0
75+```
76+
77+This command will produce Stackage packages `packages.nix`, packages config
78+`configuration-packages.nix` and a Haskell packages set `default.nix`.
4679
4780## Runtime dependencies
4881
@@ -58,9 +91,9 @@ Complex projects may require some extra customization.
5891Snippet `override.nix` below shows a minimal example of how to apply additional
5992overrides on top of Haskell packages set produced by `stackage2nix`.
6093
61−```
94+``` nix
6295with import <nixpkgs> {};
63−with pkgs.haskell.lib;
96+with haskell.lib;
6497let haskellPackages = import ./. {};
6598in haskellPackages.override {
6699 overrides = self: super: {
@@ -77,16 +110,11 @@ For more complex overrides and detailed information on how to work with Haskell
77110
78111## Tests
79112
80−Integration tests that check generation of stackage packages versus different stack configs:
113+Integration tests that build stackage2nix form different yaml configs:
81114
82−```
115+``` bash
83116STACKAGE_REPO=<path/to/stackage/repo> \
84117ALL_CABAL_HASHES=<path/to/all-cabal-hashes/repo> \
85118STACK_FILE=stack-ghc-7103.yaml \
86119./ci-stackage2nix
87120```
88−
89−## Examples
90−
91−For other examples of `stackage2nix` usage, see [4e6/stackage2nix-examples](https://github.com/4e6/stackage2nix-examples) repository.
92−It verifies `stackage2nix` by running it on different public projects.
ci-stackage2nix+8−7
@@ -4,22 +4,23 @@ set -e
44
55STACKAGE2NIX_WORK_DIR=${STACKAGE2NIX_WORK_DIR:-$HOME}
66STACKAGE_REPO=${STACKAGE_REPO:-$STACKAGE2NIX_WORK_DIR/lts-haskell}
7−ALL_CABAL_HASHES_DIR=${ALL_CABAL_HASHES_DIR:-$STACKAGE2NIX_WORK_DIR/all-cabal-hashes}
8−STACK_FILE=${STACK_FILE:-.}
7+ALL_CABAL_HASHES_REPO=${ALL_CABAL_HASHES_REPO:-$STACKAGE2NIX_WORK_DIR/all-cabal-hashes}
8+STACK_FILE=${STACK_YAML:-stack.yaml}
99
1010if [ ! -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"
1212fi
1313
14−if [ ! -d "$ALL_CABAL_HASHES_DIR" ]; then
15− git clone --branch hackage https://github.com/commercialhaskell/all-cabal-hashes.git "$ALL_CABAL_HASHES_DIR"
14+if [ ! -d "$ALL_CABAL_HASHES_REPO" ]; then
15+ git clone --branch hackage https://github.com/commercialhaskell/all-cabal-hashes.git "$ALL_CABAL_HASHES_REPO"
1616fi
1717
1818set -x
19−stack exec -- stackage2nix \
19+time stackage2nix \
2020 --lts-haskell "$STACKAGE_REPO" \
21− --all-cabal-hashes "$ALL_CABAL_HASHES_DIR" \
21+ --all-cabal-hashes "$ALL_CABAL_HASHES_REPO" \
2222 --hackage-db "$HOME/.cabal/packages/hackage.haskell.org/01-index.tar" \
23+ --with-stackage-closure \
2324 "$STACK_FILE"
2425
2526nix-build -o "result-$(basename $STACK_FILE)" -A stackage2nix "$@"
nix/README.md+2−18
@@ -4,7 +4,7 @@ Nix infrastructure.
44
55## stackage2nix
66
7−Directory contains ready-to-use `stackage2nix` wrapper with
7+Provides ready-to-use `stackage2nix` wrapper with
88`--all-cabal-hashes` and `--lts-haskell` flags set up. It also has all
99required executables on `PATH`.
1010
@@ -12,25 +12,9 @@ Install stackage2nix:
1212
1313```
1414$ nix-env -i -f ./stackage2nix
15−
16−$ stackage2nix
17−Missing: (--resolver ARG | STACK_YAML)
18−```
19−
20−## stackage
21−
22−Directory contains derivation that creates Stackage LTS from `lts` argument.
23−
24−Build lts-9.0:
25−
26−```
27−$ nix-build --argstr lts lts-9.0 ./stackage
28−
29−$ ls result
30−configuration-packages.nix packages.nix
3115```
3216
33−## haskellPackages
17+## haskell-packages
3418
3519Directory contains Stackage LTS packages generated by `stackage2nix` from this
3620project's `stack.yaml`.
nix/haskellPackages/configuration-packages.nix → nix/haskell-packages/configuration-packages.nixrenamed+7−11
@@ -1,7 +1,7 @@
1−# Generated by stackage2nix 0.3.0 from "/home/dbushev/lts-haskell/lts-9.1.yaml"
2−{ pkgs }:
1+# Generated by stackage2nix 0.7.1 from "/home/dbushev/projects/commercialhaskell/lts-haskell/lts-12.2.yaml"
2+{ pkgs, haskellLib }:
33
4−with pkgs.haskell.lib; self: super: {
4+with haskellLib; self: super: {
55
66 # core packages
77 "array" = null;
@@ -16,29 +16,25 @@ with pkgs.haskell.lib; self: super: {
1616 "ghc-boot-th" = null;
1717 "ghc-prim" = null;
1818 "ghci" = null;
19− "hoopl" = null;
2019 "hpc" = null;
2120 "integer-gmp" = null;
2221 "pretty" = null;
2322 "process" = null;
2423 "rts" = null;
2524 "template-haskell" = null;
25+ "terminfo" = null;
2626 "time" = null;
2727 "transformers" = null;
2828 "unix" = null;
29− # break cycle: HUnit call-stack nanospec hspec QuickCheck test-framework xml text quickcheck-unicode test-framework-hunit test-framework-quickcheck2 hspec-core 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
3030 "stringbuilder" = dontCheck super.stringbuilder;
3131 "hspec-discover" = dontCheck super.hspec-discover;
32− "optparse-applicative" = dontCheck super.optparse-applicative;
33− "clock" = dontCheck super.clock;
3432 "exceptions" = dontCheck super.exceptions;
35− "base-compat" = dontCheck super.base-compat;
3633 "temporary" = dontCheck super.temporary;
3734 "silently" = dontCheck super.silently;
35+ "hashable" = dontCheck super.hashable;
3836 "async" = dontCheck super.async;
39− "text" = dontCheck super.text;
37+ "clock" = dontCheck super.clock;
4038 "nanospec" = dontCheck super.nanospec;
41− # break cycle: statistics monad-par mwc-random vector-algorithms
42− "mwc-random" = dontCheck super.mwc-random;
4339
4440}
nix/haskell-packages/default.nixnew file+187
@@ -0,0 +1,187 @@
1+# Generated by stackage2nix 0.7.1 from "../../stack.yaml"
2+{ nixpkgs ? import <nixpkgs> {} }:
3+
4+with nixpkgs;
5+let
6+ inherit (stdenv.lib) extends;
7+ haskellLib = callPackage (nixpkgs.path + "/pkgs/development/haskell-modules/lib.nix") {};
8+ stackagePackages = import ./packages.nix;
9+ stackageConfig = import ./configuration-packages.nix { inherit pkgs haskellLib; };
10+ stackPackages =
11+ { pkgs, stdenv, callPackage }:
12+
13+ self: {
14+ "stackage2nix" = callPackage
15+ ({ mkDerivation, aeson, base, bytestring, Cabal, cabal2nix
16+ , containers, deepseq, distribution-nixpkgs, exceptions, filepath
17+ , gitlib, gitlib-libgit2, hopenssl, hspec, inflections
18+ , language-nix, lens, network-uri, optparse-applicative, pretty
19+ , QuickCheck, shakespeare, stackage-curator, text
20+ , unordered-containers, yaml
21+ }:
22+ mkDerivation {
23+ pname = "stackage2nix";
24+ version = "0.7.1";
25+ src = ../../.;
26+ isLibrary = true;
27+ isExecutable = true;
28+ libraryHaskellDepends = [
29+ aeson base bytestring Cabal cabal2nix containers deepseq
30+ distribution-nixpkgs exceptions filepath gitlib gitlib-libgit2
31+ hopenssl inflections language-nix lens network-uri
32+ optparse-applicative pretty QuickCheck stackage-curator text
33+ unordered-containers yaml
34+ ];
35+ executableHaskellDepends = [ base ];
36+ testHaskellDepends = [
37+ base bytestring Cabal hspec network-uri pretty shakespeare text
38+ yaml
39+ ];
40+ homepage = "https://github.com/typeable/stackage2nix#readme";
41+ description = "Convert Stack files into Nix build instructions";
42+ license = stdenv.lib.licenses.bsd3;
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+ }) {};
174+ };
175+
176+ pkgOverrides = self: stackPackages {
177+ inherit pkgs stdenv;
178+ inherit (self) callPackage;
179+ };
180+in callPackage (nixpkgs.path + "/pkgs/development/haskell-modules") {
181+ ghc = pkgs.haskell.compiler.ghc843;
182+ buildHaskellPackages = buildPackages.haskell.packages.ghc843;
183+ compilerConfig = self: extends pkgOverrides (stackageConfig self);
184+ initialPackages = stackagePackages;
185+ configurationCommon = args: self: super: {};
186+ inherit haskellLib;
187+}
nix/haskellPackages/packages.nix → nix/haskell-packages/packages.nixrenamed+1597−1861
@@ -1,57 +1,83 @@
1−# Generated by stackage2nix 0.3.0 from "/home/dbushev/lts-haskell/lts-9.1.yaml"
1+# Generated by stackage2nix 0.7.1 from "/home/dbushev/projects/commercialhaskell/lts-haskell/lts-12.2.yaml"
22{ pkgs, stdenv, callPackage }:
33
44self: {
55 "Cabal" = callPackage
66 ({ mkDerivation, array, base, binary, bytestring, containers
7− , deepseq, directory, filepath, pretty, process, time, unix
7+ , deepseq, directory, filepath, mtl, parsec, pretty, process, text
8+ , time, transformers, unix
89 }:
910 mkDerivation {
1011 pname = "Cabal";
11− version = "1.24.2.0";
12− sha256 = "0h33v1716wkqh9wvq2wynvhwzkjjhg4aav0a1i3cmyq36n7fpl5p";
13− revision = "1";
14− editedCabalFile = "0jw809psa2ms9sy1mnirmbj9h7rs76wbmf24zgjqvhp4wq919z3m";
12+ version = "2.2.0.1";
13+ sha256 = "0yqa6fm9jvr0ka6b1mf17bf43092dc1bai6mqyiwwwyz0h9k1d82";
14+ setupHaskellDepends = [ mtl parsec ];
1515 libraryHaskellDepends = [
1616 array base binary bytestring containers deepseq directory filepath
17− pretty process time unix
17+ mtl parsec pretty process text time transformers unix
1818 ];
19− doHaddock = false;
2019 doCheck = false;
2120 homepage = "http://www.haskell.org/cabal/";
2221 description = "A framework for packaging Haskell software";
2322 license = stdenv.lib.licenses.bsd3;
2423 }) {};
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+ }) {};
2541 "Glob" = callPackage
2642 ({ mkDerivation, base, containers, directory, dlist, filepath
27− , transformers, transformers-compat
43+ , HUnit, QuickCheck, test-framework, test-framework-hunit
44+ , test-framework-quickcheck2, transformers, transformers-compat
2845 }:
2946 mkDerivation {
3047 pname = "Glob";
31− version = "0.8.0";
32− sha256 = "15p8nbi19mhl3iisngbawmdpvk8paaqq4248fqgan63q1sz13w1q";
48+ version = "0.9.2";
49+ sha256 = "1rbwcq9w9951qsnp13vqcm9r01yax2yh1wk8s4zxa3ckk9717iwg";
3350 libraryHaskellDepends = [
3451 base containers directory dlist filepath transformers
3552 transformers-compat
3653 ];
37− doHaddock = false;
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+ ];
3959 homepage = "http://iki.fi/matti.niemenmaa/glob/";
4060 description = "Globbing library";
4161 license = stdenv.lib.licenses.bsd3;
4262 }) {};
4363 "HTTP" = callPackage
44− ({ mkDerivation, array, base, bytestring, mtl, network, network-uri
45− , parsec, time
64+ ({ mkDerivation, array, base, bytestring, case-insensitive, conduit
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
4668 }:
4769 mkDerivation {
4870 pname = "HTTP";
49− version = "4000.3.7";
50− sha256 = "1s7amm0wai6z4x2arrqh0h6n0gjbrqpkqyz9a7l38i78hkmwrh6m";
71+ version = "4000.3.12";
72+ sha256 = "140r6qy1ay25piv0z3hih11zhigyi08nkwc32097j43pjff6mzx3";
5173 libraryHaskellDepends = [
5274 array base bytestring mtl network network-uri parsec time
5375 ];
54− doHaddock = false;
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+ ];
5581 doCheck = false;
5682 homepage = "https://github.com/haskell/HTTP";
5783 description = "A library for client-side HTTP";
@@ -61,77 +87,50 @@ self: {
6187 ({ mkDerivation, base, call-stack, deepseq, filepath }:
6288 mkDerivation {
6389 pname = "HUnit";
64− version = "1.5.0.0";
65− sha256 = "186ykl7vxlfgkd2k8k1rq7yzcryzjpqwmn4ci1nn9h6irqbivib5";
90+ version = "1.6.0.0";
91+ sha256 = "1pnhwqq5v8h48gbp3ibv3skfj25mf4zs5svxcavq93p9cswycj3l";
6692 libraryHaskellDepends = [ base call-stack deepseq ];
6793 testHaskellDepends = [ base call-stack deepseq filepath ];
68− doHaddock = false;
69− doCheck = false;
7094 homepage = "https://github.com/hspec/HUnit#readme";
7195 description = "A unit testing framework for Haskell";
7296 license = stdenv.lib.licenses.bsd3;
7397 }) {};
74− "MonadRandom" = callPackage
75− ({ mkDerivation, base, fail, mtl, primitive, random, transformers
76− , transformers-compat
77− }:
98+ "Only" = callPackage
99+ ({ mkDerivation, base, deepseq }:
78100 mkDerivation {
79− pname = "MonadRandom";
80− version = "0.5.1";
81− sha256 = "11qdfghizww810vdj9ac1f5qr5kdmrk40l6w6qh311bjh290ygwy";
82− libraryHaskellDepends = [
83− base fail mtl primitive random transformers transformers-compat
84− ];
85− doHaddock = false;
86− doCheck = false;
87− description = "Random-number generation monad";
101+ pname = "Only";
102+ version = "0.1";
103+ sha256 = "0rdj3a629fk2vp121jq8mf2smkblrz5w3cxhlsyx6my2x29s2ymb";
104+ revision = "1";
105+ editedCabalFile = "1ahk7p34kmh041mz7lyc10nhcxgv2i4z8nvzxvqm2x34gslmsbzr";
106+ libraryHaskellDepends = [ base deepseq ];
107+ description = "The 1-tuple type or single-value \"collection\"";
88108 license = stdenv.lib.licenses.bsd3;
89109 }) {};
90110 "QuickCheck" = callPackage
91− ({ mkDerivation, base, containers, random, template-haskell
92− , test-framework, tf-random, transformers
111+ ({ mkDerivation, base, containers, deepseq, random
112+ , template-haskell, tf-random, transformers
93113 }:
94114 mkDerivation {
95115 pname = "QuickCheck";
96− version = "2.9.2";
97− sha256 = "119np67qvx8hyp9vkg4gr2wv3lj3j6ay2vl4hxspkg43ymb1cp0m";
116+ version = "2.11.3";
117+ sha256 = "0xhqk35fkzlbjcqbabg6962jkv8d688nzmz7ng4bm84x2d95d328";
98118 libraryHaskellDepends = [
99− base containers random template-haskell tf-random transformers
100− ];
101− testHaskellDepends = [
102− base containers template-haskell test-framework
119+ base containers deepseq random template-haskell tf-random
120+ transformers
103121 ];
104− doHaddock = false;
105− doCheck = false;
122+ testHaskellDepends = [ base ];
106123 homepage = "https://github.com/nick8325/quickcheck";
107124 description = "Automatic testing of Haskell programs";
108125 license = stdenv.lib.licenses.bsd3;
109126 }) {};
110− "ReadArgs" = callPackage
111− ({ mkDerivation, base, system-filepath, text }:
112− mkDerivation {
113− pname = "ReadArgs";
114− version = "1.2.3";
115− sha256 = "0s8s4nhl84qsr5a87gzjslcf4d9vvvzmcfl5g4gqa3czzafjljwz";
116− isLibrary = true;
117− isExecutable = true;
118− libraryHaskellDepends = [ base system-filepath text ];
119− executableHaskellDepends = [ base system-filepath text ];
120− doHaddock = false;
121− doCheck = false;
122− homepage = "http://github.com/rampion/ReadArgs";
123− description = "Simple command line argument parsing";
124− license = stdenv.lib.licenses.bsd3;
125− }) {};
126127 "StateVar" = callPackage
127128 ({ mkDerivation, base, stm, transformers }:
128129 mkDerivation {
129130 pname = "StateVar";
130− version = "1.1.0.4";
131− sha256 = "1dzz9l0haswgag9x56q7n57kw18v7nhmzkjyr61nz9y9npn8vmks";
131+ version = "1.1.1.0";
132+ sha256 = "102f4x240zj3jwa7gx6vp813j76cjhlc3zbi9i5kiz6268kcv28s";
132133 libraryHaskellDepends = [ base stm transformers ];
133− doHaddock = false;
134− doCheck = false;
135134 homepage = "https://github.com/haskell-opengl/StateVar";
136135 description = "State variables";
137136 license = stdenv.lib.licenses.bsd3;
@@ -143,8 +142,6 @@ self: {
143142 version = "0.3";
144143 sha256 = "18jwswjxwzc9bjiy4ds6hw2a74ki797jmfcifxd2ga4kh7ri1ah9";
145144 libraryHaskellDepends = [ array base containers random time ];
146− doHaddock = false;
147− doCheck = false;
148145 homepage = "https://github.com/rrnewton/haskell-lockfree/wiki";
149146 description = "Abstract, parameterized interface to mutable Deques";
150147 license = stdenv.lib.licenses.bsd3;
@@ -156,64 +153,49 @@ self: {
156153 version = "0.3.3";
157154 sha256 = "0q6qsniw4wks2pw6wzncb1p1j3k6al5njnvm2v5n494hplwqg2i4";
158155 libraryHaskellDepends = [ base deepseq ];
159− doHaddock = false;
160− doCheck = false;
161156 homepage = "https://github.com/simonmar/monad-par";
162157 description = "Type classes generalizing the functionality of the 'monad-par' library";
163158 license = stdenv.lib.licenses.bsd3;
164159 }) {};
165160 "adjunctions" = callPackage
166161 ({ mkDerivation, array, base, comonad, containers, contravariant
167− , distributive, free, mtl, profunctors, semigroupoids, semigroups
168− , tagged, transformers, transformers-compat, void
162+ , distributive, free, generic-deriving, hspec, hspec-discover, mtl
163+ , profunctors, semigroupoids, semigroups, tagged, transformers
164+ , transformers-compat, void
169165 }:
170166 mkDerivation {
171167 pname = "adjunctions";
172− version = "4.3";
173− sha256 = "1k1ykisf96i4g2zm47c45md7p42c4vsp9r73392pz1g8mx7s2j5r";
168+ version = "4.4";
169+ sha256 = "1sbal7cbhm12crfnfhkk322jnzgx7lhw3jzq0p463bipagsjwz2h";
174170 revision = "1";
175− editedCabalFile = "1079l9szyr7ybi9wcvv1vjsjfrqirkn9z3j7dann8vbk81a4z37q";
171+ editedCabalFile = "0582nnn3fab63nd7ng8smk2c8j7pciiyzfj1na34wqid2hs675as";
176172 libraryHaskellDepends = [
177173 array base comonad containers contravariant distributive free mtl
178174 profunctors semigroupoids semigroups tagged transformers
179175 transformers-compat void
180176 ];
181− doHaddock = false;
182− doCheck = false;
177+ testHaskellDepends = [ base distributive generic-deriving hspec ];
178+ testToolDepends = [ hspec-discover ];
183179 homepage = "http://github.com/ekmett/adjunctions/";
184180 description = "Adjunctions and representable functors";
185181 license = stdenv.lib.licenses.bsd3;
186182 }) {};
187183 "aeson" = callPackage
188− ({ mkDerivation, attoparsec, base, base-compat, base-orphans
189− , base16-bytestring, bytestring, containers, deepseq, directory
190− , dlist, filepath, generic-deriving, ghc-prim, hashable
191− , hashable-time, HUnit, integer-logarithms, QuickCheck
192− , quickcheck-instances, scientific, tagged, template-haskell
193− , test-framework, test-framework-hunit, test-framework-quickcheck2
194− , text, time, time-locale-compat, unordered-containers, uuid-types
195− , vector
184+ ({ mkDerivation, attoparsec, base, base-compat, bytestring
185+ , containers, deepseq, dlist, ghc-prim, hashable, scientific
186+ , tagged, template-haskell, text, th-abstraction, time
187+ , time-locale-compat, unordered-containers, uuid-types, vector
196188 }:
197189 mkDerivation {
198190 pname = "aeson";
199− version = "1.1.2.0";
200− sha256 = "1zy5z8pzvh53qkjm0nm3f4rwqfqg3867ck8ncd6mrxpcyvxqqj1p";
201− revision = "1";
202− editedCabalFile = "06acsik1qcn5r1z1y3n7iw5h8x0h3hdcjii0bq9nf9ncvc71h1d4";
191+ version = "1.3.1.1";
192+ sha256 = "1i1ig840fvsb1lnklcv32zsc0zscirc301lw1mpfxhc6h4pk0gw4";
203193 libraryHaskellDepends = [
204194 attoparsec base base-compat bytestring containers deepseq dlist
205− ghc-prim hashable scientific tagged template-haskell text time
206− time-locale-compat unordered-containers uuid-types vector
207− ];
208− testHaskellDepends = [
209− attoparsec base base-compat base-orphans base16-bytestring
210− bytestring containers directory dlist filepath generic-deriving
211− ghc-prim hashable hashable-time HUnit integer-logarithms QuickCheck
212− quickcheck-instances scientific tagged template-haskell
213− test-framework test-framework-hunit test-framework-quickcheck2 text
214− time time-locale-compat unordered-containers uuid-types vector
195+ ghc-prim hashable scientific tagged template-haskell text
196+ th-abstraction time time-locale-compat unordered-containers
197+ uuid-types vector
215198 ];
216− doHaddock = false;
217199 doCheck = false;
218200 homepage = "https://github.com/bos/aeson";
219201 description = "Fast JSON parsing and encoding";
@@ -225,8 +207,8 @@ self: {
225207 }:
226208 mkDerivation {
227209 pname = "aeson-pretty";
228− version = "0.8.5";
229− sha256 = "1yd98972srlbkn0f2jhrb3f443j9wnq2fnw5gbxjxzmkcinfh5yx";
210+ version = "0.8.7";
211+ sha256 = "1m977gs0s9gf3lwzlbs5y7bl6ansc5pywmn2qjk09l5bwg2yrhf1";
230212 isLibrary = true;
231213 isExecutable = true;
232214 libraryHaskellDepends = [
@@ -236,87 +218,62 @@ self: {
236218 executableHaskellDepends = [
237219 aeson attoparsec base bytestring cmdargs
238220 ];
239− doHaddock = false;
240− doCheck = false;
241221 homepage = "http://github.com/informatikr/aeson-pretty";
242222 description = "JSON pretty-printing library and command-line tool";
243223 license = stdenv.lib.licenses.bsd3;
244224 }) {};
245− "aeson-qq" = callPackage
246− ({ mkDerivation, aeson, attoparsec, base, base-compat, ghc-prim
247− , haskell-src-meta, hspec, parsec, scientific, template-haskell
248− , text, vector
249− }:
250− mkDerivation {
251− pname = "aeson-qq";
252− version = "0.8.2";
253− sha256 = "0ln13jqyfh5726hdrk1rad9a6cgrrj201plmwcfcpvq18v4m5ckd";
254− libraryHaskellDepends = [
255− aeson attoparsec base base-compat haskell-src-meta parsec
256− scientific template-haskell text vector
257− ];
258− testHaskellDepends = [
259− aeson attoparsec base base-compat ghc-prim haskell-src-meta hspec
260− parsec scientific template-haskell text vector
261− ];
262− doHaddock = false;
263− doCheck = false;
264− homepage = "https://github.com/sol/aeson-qq#readme";
265− description = "JSON quasiquoter for Haskell";
266− license = stdenv.lib.licenses.mit;
267− }) {};
268225 "amazonka" = callPackage
269226 ({ mkDerivation, amazonka-core, base, bytestring, conduit
270− , conduit-extra, directory, exceptions, http-conduit, ini, mmorph
271− , monad-control, mtl, resourcet, retry, tasty, tasty-hunit, text
272− , time, transformers, transformers-base, transformers-compat
227+ , conduit-extra, directory, exceptions, http-client, http-conduit
228+ , http-types, ini, mmorph, monad-control, mtl, resourcet, retry
229+ , tasty, tasty-hunit, text, time, transformers, transformers-base
230+ , transformers-compat, void
273231 }:
274232 mkDerivation {
275233 pname = "amazonka";
276− version = "1.4.5";
277− sha256 = "0p48ra5hns9kpnsgr40imj0zgnd311ww2kk4lz4nnjpa1ppvgrw6";
234+ version = "1.6.0";
235+ sha256 = "07647x7lq9kaq6bqh38rvdiajji4ks6s7nvxv2xi4v4lhwn8j89p";
278236 libraryHaskellDepends = [
279237 amazonka-core base bytestring conduit conduit-extra directory
280− exceptions http-conduit ini mmorph monad-control mtl resourcet
281− retry text time transformers transformers-base transformers-compat
238+ exceptions http-client http-conduit http-types ini mmorph
239+ monad-control mtl resourcet retry text time transformers
240+ transformers-base transformers-compat void
282241 ];
283242 testHaskellDepends = [ base tasty tasty-hunit ];
284− doHaddock = false;
285− doCheck = false;
286243 homepage = "https://github.com/brendanhay/amazonka";
287244 description = "Comprehensive Amazon Web Services SDK";
288− license = "unknown";
245+ license = stdenv.lib.licenses.mpl20;
289246 }) {};
290247 "amazonka-core" = callPackage
291248 ({ mkDerivation, aeson, attoparsec, base, bifunctors, bytestring
292− , case-insensitive, conduit, conduit-extra, cryptonite, deepseq
293− , exceptions, hashable, http-conduit, http-types, lens, memory, mtl
294− , QuickCheck, quickcheck-unicode, resourcet, scientific, semigroups
295− , tagged, tasty, tasty-hunit, tasty-quickcheck, template-haskell
296− , text, time, transformers, transformers-compat
297− , unordered-containers, xml-conduit, xml-types
249+ , case-insensitive, conduit, conduit-extra, cryptonite
250+ , data-ordlist, deepseq, exceptions, hashable, http-client
251+ , http-conduit, http-types, lens, memory, mtl, QuickCheck
252+ , quickcheck-unicode, resourcet, scientific, semigroups, tagged
253+ , tasty, tasty-hunit, tasty-quickcheck, template-haskell, text
254+ , time, transformers, transformers-compat, unordered-containers
255+ , xml-conduit, xml-types
298256 }:
299257 mkDerivation {
300258 pname = "amazonka-core";
301− version = "1.4.5";
302− sha256 = "0zzfrn4m7ixs7dxw2n7d6ajfb9h8bnbk8pw1hw8w48nprv8f24yv";
259+ version = "1.6.0";
260+ sha256 = "1j9x17zhyxrg4ds5pdxfjdb4z7hpzn42cydx34j25h5d9avwbqdg";
303261 libraryHaskellDepends = [
304262 aeson attoparsec base bifunctors bytestring case-insensitive
305263 conduit conduit-extra cryptonite deepseq exceptions hashable
306− http-conduit http-types lens memory mtl resourcet scientific
307− semigroups tagged text time transformers transformers-compat
308− unordered-containers xml-conduit xml-types
264+ http-client http-conduit http-types lens memory mtl resourcet
265+ scientific semigroups tagged text time transformers
266+ transformers-compat unordered-containers xml-conduit xml-types
309267 ];
310268 testHaskellDepends = [
311− aeson base bytestring case-insensitive http-types QuickCheck
312− quickcheck-unicode tasty tasty-hunit tasty-quickcheck
313− template-haskell text time
269+ aeson base bytestring case-insensitive conduit data-ordlist
270+ http-conduit http-types lens QuickCheck quickcheck-unicode tasty
271+ tasty-hunit tasty-quickcheck template-haskell text time
314272 ];
315− doHaddock = false;
316273 doCheck = false;
317274 homepage = "https://github.com/brendanhay/amazonka";
318275 description = "Core data types and functionality for Amazonka libraries";
319− license = "unknown";
276+ license = stdenv.lib.licenses.mpl20;
320277 }) {};
321278 "amazonka-s3" = callPackage
322279 ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
@@ -324,18 +281,16 @@ self: {
324281 }:
325282 mkDerivation {
326283 pname = "amazonka-s3";
327− version = "1.4.5";
328− sha256 = "1bg45wxcvizdi7j5jggvblxwhd3f7sfy1j0jaq2ajfxcdsb7wabq";
284+ version = "1.6.0";
285+ sha256 = "0irz8vyklapjy3w3qasidpvq4hk2qwkmhrnrd23sf4yzs2xqx8gc";
329286 libraryHaskellDepends = [ amazonka-core base lens text ];
330287 testHaskellDepends = [
331288 amazonka-core amazonka-test base bytestring tasty tasty-hunit text
332289 time unordered-containers
333290 ];
334− doHaddock = false;
335− doCheck = false;
336291 homepage = "https://github.com/brendanhay/amazonka";
337292 description = "Amazon Simple Storage Service SDK";
338− license = "unknown";
293+ license = stdenv.lib.licenses.mpl20;
339294 }) {};
340295 "amazonka-test" = callPackage
341296 ({ mkDerivation, aeson, amazonka-core, base, bifunctors, bytestring
@@ -346,32 +301,27 @@ self: {
346301 }:
347302 mkDerivation {
348303 pname = "amazonka-test";
349− version = "1.4.5";
350− sha256 = "0fjynyb85px3mbf85jf1xvs7n21622w60lasshgjy42brp5p524q";
304+ version = "1.6.0";
305+ sha256 = "0a6xfp97hijhqmhj9nv4aqax08ry8y809jpjhyj2819p01wvga26";
351306 libraryHaskellDepends = [
352307 aeson amazonka-core base bifunctors bytestring case-insensitive
353308 conduit conduit-extra groom http-client http-types process
354309 resourcet tasty tasty-hunit template-haskell temporary text time
355310 unordered-containers yaml
356311 ];
357− doHaddock = false;
358− doCheck = false;
359312 homepage = "https://github.com/brendanhay/amazonka";
360313 description = "Common functionality for Amazonka library test-suites";
361− license = "unknown";
314+ license = stdenv.lib.licenses.mpl20;
362315 }) {};
363316 "ansi-terminal" = callPackage
364− ({ mkDerivation, base }:
317+ ({ mkDerivation, base, colour }:
365318 mkDerivation {
366319 pname = "ansi-terminal";
367− version = "0.6.3.1";
368− sha256 = "15c0c0vb66y3mr11kcvgjf4h0f7dqg7k1xq7zzq9fy11r7h9i3s5";
320+ version = "0.8.0.4";
321+ sha256 = "0428gq8m3fdnb7ldcsyk97qcch76hcxbgh2666p6f76fs2qbhg7b";
369322 isLibrary = true;
370323 isExecutable = true;
371− libraryHaskellDepends = [ base ];
372− executableHaskellDepends = [ base ];
373− doHaddock = false;
374− doCheck = false;
324+ libraryHaskellDepends = [ base colour ];
375325 homepage = "https://github.com/feuerbach/ansi-terminal";
376326 description = "Simple ANSI terminal support, with Windows compatibility";
377327 license = stdenv.lib.licenses.bsd3;
@@ -380,14 +330,11 @@ self: {
380330 ({ mkDerivation, ansi-terminal, base }:
381331 mkDerivation {
382332 pname = "ansi-wl-pprint";
383− version = "0.6.7.3";
384− sha256 = "025pyphsjf0dnbrmj5nscbi6gzyigwgp3ifxb3psn7kji6mfr29p";
333+ version = "0.6.8.2";
334+ sha256 = "0gnb4mkqryv08vncxnj0bzwcnd749613yw3cxfzw6y3nsldp4c56";
385335 isLibrary = true;
386336 isExecutable = true;
387337 libraryHaskellDepends = [ ansi-terminal base ];
388− executableHaskellDepends = [ ansi-terminal base ];
389− doHaddock = false;
390− doCheck = false;
391338 homepage = "http://github.com/ekmett/ansi-wl-pprint";
392339 description = "The Wadler/Leijen Pretty Printer for colored ANSI terminal output";
393340 license = stdenv.lib.licenses.bsd3;
@@ -399,8 +346,6 @@ self: {
399346 version = "0.1.4";
400347 sha256 = "09jb9ij78fdkz2qk66rw99q19qnm504dpv0yq0pjsl6xwjmndsjq";
401348 libraryHaskellDepends = [ base bytestring ];
402− doHaddock = false;
403− doCheck = false;
404349 description = "A simple applicative parser";
405350 license = stdenv.lib.licenses.bsd3;
406351 }) {};
@@ -417,8 +362,6 @@ self: {
417362 asn1-types base bytestring hourglass mtl tasty tasty-quickcheck
418363 text
419364 ];
420− doHaddock = false;
421− doCheck = false;
422365 homepage = "http://github.com/vincenthz/hs-asn1";
423366 description = "ASN1 data reader and writer in RAW, BER and DER forms";
424367 license = stdenv.lib.licenses.bsd3;
@@ -432,8 +375,6 @@ self: {
432375 libraryHaskellDepends = [
433376 asn1-encoding asn1-types base bytestring
434377 ];
435− doHaddock = false;
436− doCheck = false;
437378 homepage = "https://github.com/vincenthz/hs-asn1";
438379 description = "Simple monadic parser for ASN1 stream types";
439380 license = stdenv.lib.licenses.bsd3;
@@ -445,26 +386,24 @@ self: {
445386 version = "0.3.2";
446387 sha256 = "05vjchyqiy9n275cygffhn0ma7fz7jx52j0dcdm9qm8h9bziymqc";
447388 libraryHaskellDepends = [ base bytestring hourglass memory ];
448− doHaddock = false;
449− doCheck = false;
450389 homepage = "http://github.com/vincenthz/hs-asn1-types";
451390 description = "ASN.1 types";
452391 license = stdenv.lib.licenses.bsd3;
453392 }) {};
454393 "async" = callPackage
455− ({ mkDerivation, base, HUnit, stm, test-framework
394+ ({ mkDerivation, base, hashable, HUnit, stm, test-framework
456395 , test-framework-hunit
457396 }:
458397 mkDerivation {
459398 pname = "async";
460− version = "2.1.1.1";
461− sha256 = "1qj4fp1ynwg0l453gmm27vgkzb5k5m2hzdlg5rdqi9kf8rqy90yd";
462− libraryHaskellDepends = [ base stm ];
399+ version = "2.2.1";
400+ sha256 = "09whscli1q5z7lzyq9rfk0bq1ydplh6pjmc6qv0x668k5818c2wg";
401+ isLibrary = true;
402+ isExecutable = true;
403+ libraryHaskellDepends = [ base hashable stm ];
463404 testHaskellDepends = [
464− base HUnit test-framework test-framework-hunit
405+ base HUnit stm test-framework test-framework-hunit
465406 ];
466− doHaddock = false;
467− doCheck = false;
468407 homepage = "https://github.com/simonmar/async";
469408 description = "Run IO operations asynchronously and wait for their results";
470409 license = stdenv.lib.licenses.bsd3;
@@ -472,28 +411,22 @@ self: {
472411 "attoparsec" = callPackage
473412 ({ mkDerivation, array, base, bytestring, case-insensitive
474413 , containers, criterion, deepseq, directory, filepath, ghc-prim
475− , http-types, parsec, QuickCheck, quickcheck-unicode, scientific
476− , tasty, tasty-quickcheck, text, transformers, unordered-containers
477− , vector
414+ , http-types, parsec, scientific, text, transformers
415+ , unordered-containers, vector
478416 }:
479417 mkDerivation {
480418 pname = "attoparsec";
481− version = "0.13.1.0";
482− sha256 = "0r1zrrkbqv8w4pb459fj5izd1h85p9nrsp3gyzj7qiayjpa79p2j";
419+ version = "0.13.2.2";
420+ sha256 = "0j6qcwd146yzlkc9mcvzvnixsyl65n2a68l28322q5v9p4g4g4yx";
483421 libraryHaskellDepends = [
484422 array base bytestring containers deepseq scientific text
485423 transformers
486424 ];
487− testHaskellDepends = [
488− array base bytestring deepseq QuickCheck quickcheck-unicode
489− scientific tasty tasty-quickcheck text transformers vector
490− ];
491425 benchmarkHaskellDepends = [
492426 array base bytestring case-insensitive containers criterion deepseq
493427 directory filepath ghc-prim http-types parsec scientific text
494428 transformers unordered-containers vector
495429 ];
496− doHaddock = false;
497430 doCheck = false;
498431 homepage = "https://github.com/bos/attoparsec";
499432 description = "Fast combinator parsing for bytestrings and text";
@@ -506,39 +439,60 @@ self: {
506439 version = "0.1.4";
507440 sha256 = "09dlh2alsx2mw5kvj931yhbj0aw7jmly2cm9xbscm2sf098w35jy";
508441 libraryHaskellDepends = [ base ];
509− doHaddock = false;
510− doCheck = false;
511442 homepage = "https://github.com/yesodweb/wai";
512443 description = "Efficiently run periodic, on-demand actions";
513444 license = stdenv.lib.licenses.mit;
514445 }) {};
515446 "base-compat" = callPackage
516− ({ mkDerivation, base, hspec, QuickCheck, unix }:
447+ ({ mkDerivation, base, unix }:
517448 mkDerivation {
518449 pname = "base-compat";
519− version = "0.9.3";
520− sha256 = "0452l6zf6fjhy4kxqwv6i6hhg6yfx4wcg450k3axpyj30l7jnq3x";
450+ version = "0.10.4";
451+ sha256 = "0ksp990gxs731mq19rzbxrbs43nazfljjc8krlx5bjqblw3kfs8d";
521452 libraryHaskellDepends = [ base unix ];
522− testHaskellDepends = [ base hspec QuickCheck ];
523− doHaddock = false;
524− doCheck = false;
525453 description = "A compatibility layer for base";
526454 license = stdenv.lib.licenses.mit;
527455 }) {};
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+ }) {};
528470 "base-orphans" = callPackage
529− ({ mkDerivation, base, ghc-prim, hspec, QuickCheck }:
471+ ({ mkDerivation, base, ghc-prim, hspec, hspec-discover, QuickCheck
472+ }:
530473 mkDerivation {
531474 pname = "base-orphans";
532− version = "0.6";
533− sha256 = "03mdww5j0gwai7aqlx3m71ldmjcr99jzpkcclzjfclk6a6kjla67";
475+ version = "0.7";
476+ sha256 = "057f9npnqk71ccfh95djfkpd54dzazphj06grwxa3fyhwcwxrb8a";
534477 libraryHaskellDepends = [ base ghc-prim ];
535478 testHaskellDepends = [ base hspec QuickCheck ];
536− doHaddock = false;
537− doCheck = false;
479+ testToolDepends = [ hspec-discover ];
538480 homepage = "https://github.com/haskell-compat/base-orphans#readme";
539481 description = "Backwards-compatible orphan instances for base";
540482 license = stdenv.lib.licenses.mit;
541483 }) {};
484+ "base-prelude" = callPackage
485+ ({ mkDerivation, base }:
486+ mkDerivation {
487+ pname = "base-prelude";
488+ version = "1.3";
489+ sha256 = "1zk728sd09hh2r4xwz4lazsrrgg5cshydn64932sm0vckplndk73";
490+ libraryHaskellDepends = [ base ];
491+ doCheck = false;
492+ homepage = "https://github.com/nikita-volkov/base-prelude";
493+ description = "The most complete prelude formed solely from the \"base\" package";
494+ license = stdenv.lib.licenses.mit;
495+ }) {};
542496 "base16-bytestring" = callPackage
543497 ({ mkDerivation, base, bytestring, ghc-prim }:
544498 mkDerivation {
@@ -546,8 +500,6 @@ self: {
546500 version = "0.1.1.6";
547501 sha256 = "0jf40m3yijqw6wd1rwwvviww46fasphaay9m9rgqyhf5aahnbzjs";
548502 libraryHaskellDepends = [ base bytestring ghc-prim ];
549− doHaddock = false;
550− doCheck = false;
551503 homepage = "http://github.com/bos/base16-bytestring";
552504 description = "Fast base16 (hex) encoding and decoding for ByteStrings";
553505 license = stdenv.lib.licenses.bsd3;
@@ -565,50 +517,55 @@ self: {
565517 base bytestring containers HUnit QuickCheck test-framework
566518 test-framework-hunit test-framework-quickcheck2
567519 ];
568− doHaddock = false;
569− doCheck = false;
570520 homepage = "https://github.com/bos/base64-bytestring";
571521 description = "Fast base64 encoding and decoding for ByteStrings";
572522 license = stdenv.lib.licenses.bsd3;
573523 }) {};
524+ "basement" = callPackage
525+ ({ mkDerivation, base, ghc-prim }:
526+ mkDerivation {
527+ pname = "basement";
528+ version = "0.0.8";
529+ sha256 = "194jw567di4q2758943q9rrwkbf9gl261my7qc21i9xhyabipx67";
530+ libraryHaskellDepends = [ base ghc-prim ];
531+ homepage = "https://github.com/haskell-foundation/foundation#readme";
532+ description = "Foundation scrap box of array & string";
533+ license = stdenv.lib.licenses.bsd3;
534+ }) {};
574535 "basic-prelude" = callPackage
575536 ({ mkDerivation, base, bytestring, containers, filepath, hashable
576− , lifted-base, ReadArgs, safe, text, transformers
577− , unordered-containers, vector
537+ , text, transformers, unordered-containers, vector
578538 }:
579539 mkDerivation {
580540 pname = "basic-prelude";
581− version = "0.6.1.1";
582− sha256 = "1irfz57w4966y1vxkgh6bqxdlw3jijwz1pmq3qz9748linnpicgp";
541+ version = "0.7.0";
542+ sha256 = "0yckmnvm6i4vw0mykj4fzl4ldsf67v8d2h0vp1bakyj84n4myx8h";
583543 libraryHaskellDepends = [
584− base bytestring containers filepath hashable lifted-base ReadArgs
585− safe text transformers unordered-containers vector
544+ base bytestring containers filepath hashable text transformers
545+ unordered-containers vector
586546 ];
587− doHaddock = false;
588− doCheck = false;
589− homepage = "https://github.com/snoyberg/basic-prelude";
547+ homepage = "https://github.com/snoyberg/basic-prelude#readme";
590548 description = "An enhanced core prelude; a common foundation for alternate preludes";
591549 license = stdenv.lib.licenses.mit;
592550 }) {};
593551 "bifunctors" = callPackage
594552 ({ mkDerivation, base, base-orphans, comonad, containers, hspec
595− , QuickCheck, semigroups, tagged, template-haskell, transformers
596− , transformers-compat
553+ , hspec-discover, QuickCheck, semigroups, tagged, template-haskell
554+ , th-abstraction, transformers, transformers-compat
597555 }:
598556 mkDerivation {
599557 pname = "bifunctors";
600− version = "5.4.2";
601− sha256 = "13fwvw1102ik96pgi85i34kisz1h237vgw88ywsgifsah9kh4qiq";
558+ version = "5.5.3";
559+ sha256 = "1jn9rxg643xnlhrknmjz88nblcpsr45xwjkwwnn5nxpasa7m4d6l";
602560 libraryHaskellDepends = [
603561 base base-orphans comonad containers semigroups tagged
604− template-haskell transformers transformers-compat
562+ template-haskell th-abstraction transformers
605563 ];
606564 testHaskellDepends = [
607565 base hspec QuickCheck template-haskell transformers
608566 transformers-compat
609567 ];
610− doHaddock = false;
611− doCheck = false;
568+ testToolDepends = [ hspec-discover ];
612569 homepage = "http://github.com/ekmett/bifunctors/";
613570 description = "Bifunctors";
614571 license = stdenv.lib.licenses.bsd3;
@@ -617,11 +574,9 @@ self: {
617574 ({ mkDerivation, base }:
618575 mkDerivation {
619576 pname = "bindings-DSL";
620− version = "1.0.23";
621− sha256 = "1rqhkk8hn1xjl3705dvakxx93q89vp0fw22v2cbrlapbir27cv7b";
577+ version = "1.0.25";
578+ sha256 = "0kqrd78nspl3lk4a0fqn47d8dirjg3b24dkvkigcrlb81hw35pk3";
622579 libraryHaskellDepends = [ base ];
623− doHaddock = false;
624− doCheck = false;
625580 homepage = "https://github.com/jwiegley/bindings-dsl/wiki";
626581 description = "FFI domain specific language, on top of hsc2hs";
627582 license = stdenv.lib.licenses.bsd3;
@@ -633,90 +588,68 @@ self: {
633588 }:
634589 mkDerivation {
635590 pname = "blaze-builder";
636− version = "0.4.0.2";
637− sha256 = "1m33y6p5xldni8p4fzg8fmsyqvkfmnimdamr1xjnsmgm3dkf9lws";
591+ version = "0.4.1.0";
592+ sha256 = "05681dih2d8s96an945wkbwl05w8ddbcfx8n3r3ck79ydyb8pz4i";
638593 libraryHaskellDepends = [ base bytestring deepseq text ];
639594 testHaskellDepends = [
640595 base bytestring HUnit QuickCheck test-framework
641596 test-framework-hunit test-framework-quickcheck2 text utf8-string
642597 ];
643− doHaddock = false;
644− doCheck = false;
645598 homepage = "http://github.com/lpsmith/blaze-builder";
646599 description = "Efficient buffered output";
647600 license = stdenv.lib.licenses.bsd3;
648601 }) {};
649602 "blaze-html" = callPackage
650603 ({ mkDerivation, base, blaze-builder, blaze-markup, bytestring
651− , containers, HUnit, QuickCheck, test-framework
652− , test-framework-hunit, test-framework-quickcheck2, text
604+ , text
653605 }:
654606 mkDerivation {
655607 pname = "blaze-html";
656− version = "0.9.0.1";
657− sha256 = "0r0acv47nh75bmf7kjyfvhcwz8f02rn9x0a1l80pzgyczfrsmkmf";
608+ version = "0.9.1.1";
609+ sha256 = "06xv8fqhclfjj61z74cgggn4lmx1s7diakxg84mnkgfvk11983pa";
658610 libraryHaskellDepends = [
659611 base blaze-builder blaze-markup bytestring text
660612 ];
661− testHaskellDepends = [
662− base blaze-builder blaze-markup bytestring containers HUnit
663− QuickCheck test-framework test-framework-hunit
664− test-framework-quickcheck2 text
665− ];
666− doHaddock = false;
667613 doCheck = false;
668614 homepage = "http://jaspervdj.be/blaze";
669615 description = "A blazingly fast HTML combinator library for Haskell";
670616 license = stdenv.lib.licenses.bsd3;
671617 }) {};
672618 "blaze-markup" = callPackage
673− ({ mkDerivation, base, blaze-builder, bytestring, containers, HUnit
674− , QuickCheck, test-framework, test-framework-hunit
675− , test-framework-quickcheck2, text
676− }:
619+ ({ mkDerivation, base, blaze-builder, bytestring, text }:
677620 mkDerivation {
678621 pname = "blaze-markup";
679− version = "0.8.0.0";
680− sha256 = "03sl7xs6vk4zxbjszgyjpsppi1cknswg7z7rswz2f0rq62wwpq8r";
622+ version = "0.8.2.1";
623+ sha256 = "0ih1c3qahkdgzbqihdhny5s313l2m66fbb88w8jbx7yz56y7rawh";
681624 libraryHaskellDepends = [ base blaze-builder bytestring text ];
682− testHaskellDepends = [
683− base blaze-builder bytestring containers HUnit QuickCheck
684− test-framework test-framework-hunit test-framework-quickcheck2 text
685− ];
686− doHaddock = false;
687625 doCheck = false;
688626 homepage = "http://jaspervdj.be/blaze";
689627 description = "A blazingly fast markup combinator library for Haskell";
690628 license = stdenv.lib.licenses.bsd3;
691629 }) {};
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+ }) {};
692641 "byteable" = callPackage
693642 ({ mkDerivation, base, bytestring }:
694643 mkDerivation {
695644 pname = "byteable";
696645 version = "0.1.1";
697646 sha256 = "1qizg0kxxjqnd3cbrjhhidk5pbbciz0pb3z5kzikjjxnnnhk8fr4";
647+ enableSeparateDataOutput = true;
698648 libraryHaskellDepends = [ base bytestring ];
699− doHaddock = false;
700− doCheck = false;
701649 homepage = "http://github.com/vincenthz/hs-byteable";
702650 description = "Type class for sequence of bytes";
703651 license = stdenv.lib.licenses.bsd3;
704652 }) {};
705− "bytedump" = callPackage
706− ({ mkDerivation, base, bytestring }:
707− mkDerivation {
708− pname = "bytedump";
709− version = "1.0";
710− sha256 = "1pf01mna3isx3i7m50yz3pw5ygz5sg8i8pshjb3yw8q41w2ba5xf";
711− isLibrary = true;
712− isExecutable = true;
713− libraryHaskellDepends = [ base bytestring ];
714− doHaddock = false;
715− doCheck = false;
716− homepage = "http://github.com/vincenthz/hs-bytedump";
717− description = "Flexible byte dump helpers for human readers";
718− license = stdenv.lib.licenses.bsd3;
719− }) {};
720653 "byteorder" = callPackage
721654 ({ mkDerivation, base }:
722655 mkDerivation {
@@ -724,8 +657,6 @@ self: {
724657 version = "1.0.4";
725658 sha256 = "06995paxbxk8lldvarqpb3ygcjbg4v8dk4scib1rjzwlhssvn85x";
726659 libraryHaskellDepends = [ base ];
727− doHaddock = false;
728− doCheck = false;
729660 homepage = "http://community.haskell.org/~aslatter/code/byteorder";
730661 description = "Exposes the native endianness or byte ordering of the system";
731662 license = stdenv.lib.licenses.bsd3;
@@ -738,59 +669,50 @@ self: {
738669 sha256 = "1hnvjac28y44yn78c9vdp1zvrknvlw98ky3g4n5vivr16rvh8x3d";
739670 libraryHaskellDepends = [ base bytestring deepseq ];
740671 doHaddock = false;
741− doCheck = false;
742672 description = "The new bytestring builder, packaged outside of GHC";
743673 license = stdenv.lib.licenses.bsd3;
744674 }) {};
745− "bytestring-handle" = callPackage
746− ({ mkDerivation, base, bytestring }:
675+ "cabal-doctest" = callPackage
676+ ({ mkDerivation, base, Cabal, directory, filepath }:
747677 mkDerivation {
748− pname = "bytestring-handle";
749− version = "0.1.0.5";
750− sha256 = "10xv4m1k1wxnbabb02slp08fxcmv8m4nsbncbgj24a53bgrjdi52";
751− libraryHaskellDepends = [ base bytestring ];
752− doHaddock = false;
753− doCheck = false;
754− homepage = "http://hub.darcs.net/ganesh/bytestring-handle";
755− description = "ByteString-backed Handles";
678+ pname = "cabal-doctest";
679+ version = "1.0.6";
680+ sha256 = "0bgd4jdmzxq5y465r4sf4jv2ix73yvblnr4c9wyazazafddamjny";
681+ revision = "1";
682+ editedCabalFile = "1bk85avgc93yvcggwbk01fy8nvg6753wgmaanhkry0hz55h7mpld";
683+ libraryHaskellDepends = [ base Cabal directory filepath ];
684+ homepage = "https://github.com/phadej/cabal-doctest";
685+ description = "A Setup.hs helper for doctests running";
756686 license = stdenv.lib.licenses.bsd3;
757687 }) {};
758688 "cabal2nix" = callPackage
759689 ({ mkDerivation, aeson, ansi-wl-pprint, base, bytestring, Cabal
760− , cabal-doctest, containers, deepseq, directory
761− , distribution-nixpkgs, doctest, filepath, hackage-db, hopenssl
762− , language-nix, lens, monad-par, monad-par-extras, mtl
763− , optparse-applicative, pretty, process, split, text, time
764− , transformers, utf8-string, yaml
690+ , containers, deepseq, directory, distribution-nixpkgs, filepath
691+ , hackage-db, hopenssl, hpack, language-nix, lens, monad-par
692+ , monad-par-extras, mtl, optparse-applicative, pretty, process
693+ , split, tasty, tasty-golden, text, time, transformers, yaml
765694 }:
766695 mkDerivation {
767696 pname = "cabal2nix";
768− version = "2.3.1";
769− sha256 = "0xi4mj8gyb2k9a43dp49wc84sbxpv9sfa8cmzfp0mkak0alwqahj";
697+ version = "2.9.3";
698+ sha256 = "10l1k8rilf032v6pchwhxaq53mr0d08h6xkllidc3c7wfkzcx7qj";
770699 isLibrary = true;
771700 isExecutable = true;
772− setupHaskellDepends = [ base Cabal cabal-doctest ];
773701 libraryHaskellDepends = [
774702 aeson ansi-wl-pprint base bytestring Cabal containers deepseq
775− directory distribution-nixpkgs filepath hackage-db hopenssl
703+ directory distribution-nixpkgs filepath hackage-db hopenssl hpack
776704 language-nix lens optparse-applicative pretty process split text
777− transformers yaml
705+ time transformers yaml
778706 ];
779707 executableHaskellDepends = [
780− aeson ansi-wl-pprint base bytestring Cabal containers deepseq
781− directory distribution-nixpkgs filepath hackage-db hopenssl
782− language-nix lens monad-par monad-par-extras mtl
783− optparse-applicative pretty process split text time transformers
784− utf8-string yaml
708+ aeson base bytestring Cabal containers directory
709+ distribution-nixpkgs filepath hopenssl language-nix lens monad-par
710+ monad-par-extras mtl optparse-applicative pretty
785711 ];
786712 testHaskellDepends = [
787− aeson ansi-wl-pprint base bytestring Cabal containers deepseq
788− directory distribution-nixpkgs doctest filepath hackage-db hopenssl
789− language-nix lens optparse-applicative pretty process split text
790− transformers yaml
713+ base Cabal containers directory filepath language-nix lens pretty
714+ process tasty tasty-golden
791715 ];
792− doHaddock = false;
793− doCheck = false;
794716 homepage = "https://github.com/nixos/cabal2nix#readme";
795717 description = "Convert Cabal files into Nix build instructions";
796718 license = stdenv.lib.licenses.bsd3;
@@ -803,36 +725,54 @@ self: {
803725 sha256 = "1qmihf5jafmc79sk52l6gpx75f5bnla2lp62kh3p34x3j84mwpzj";
804726 libraryHaskellDepends = [ base ];
805727 testHaskellDepends = [ base nanospec ];
806− doHaddock = false;
807− doCheck = false;
808728 homepage = "https://github.com/sol/call-stack#readme";
809729 description = "Use GHC call-stacks in a backward compatible way";
810730 license = stdenv.lib.licenses.mit;
811731 }) {};
812732 "case-insensitive" = callPackage
813733 ({ mkDerivation, base, bytestring, criterion, deepseq, hashable
814− , text
734+ , HUnit, test-framework, test-framework-hunit, text
815735 }:
816736 mkDerivation {
817737 pname = "case-insensitive";
818− version = "1.2.0.10";
819− sha256 = "0v1hclvv0516fnlj5j2izd9xmakl7dshi9cb32iz6dgvzx01qck6";
738+ version = "1.2.0.11";
739+ sha256 = "1qrpxfirsxckg7jv28f5ah2qc8lh95hp7rnqkbqs1ahcwlbnvkm7";
820740 libraryHaskellDepends = [ base bytestring deepseq hashable text ];
741+ testHaskellDepends = [
742+ base bytestring HUnit test-framework test-framework-hunit text
743+ ];
821744 benchmarkHaskellDepends = [ base bytestring criterion deepseq ];
822− doHaddock = false;
823− doCheck = false;
824745 homepage = "https://github.com/basvandijk/case-insensitive";
825746 description = "Case insensitive string comparison";
826747 license = stdenv.lib.licenses.bsd3;
827748 }) {};
749+ "cassava" = callPackage
750+ ({ mkDerivation, array, attoparsec, base, bytestring, containers
751+ , deepseq, hashable, Only, scientific, text, text-short
752+ , unordered-containers, vector
753+ }:
754+ mkDerivation {
755+ pname = "cassava";
756+ version = "0.5.1.0";
757+ sha256 = "0xs2c5lpy0g5lsmp2cx0dm5lnxij7cgry6xd5gsn3bfdlap8lb3n";
758+ configureFlags = [ "-f-bytestring--lt-0_10_4" ];
759+ libraryHaskellDepends = [
760+ array attoparsec base bytestring containers deepseq hashable Only
761+ scientific text text-short unordered-containers vector
762+ ];
763+ doCheck = false;
764+ homepage = "https://github.com/hvr/cassava";
765+ description = "A CSV parsing and encoding library";
766+ license = stdenv.lib.licenses.bsd3;
767+ }) {};
828768 "cereal" = callPackage
829769 ({ mkDerivation, array, base, bytestring, containers, ghc-prim
830770 , QuickCheck, test-framework, test-framework-quickcheck2
831771 }:
832772 mkDerivation {
833773 pname = "cereal";
834− version = "0.5.4.0";
835− sha256 = "1rzyr8r9pjlgas5pc8n776r22i0ficanq05ypqrs477jxxd6rjns";
774+ version = "0.5.5.0";
775+ sha256 = "08k8y6nf3n8h8gzw4a44mssy7rhgpmfj28lhczjz4vgszc7k55qb";
836776 libraryHaskellDepends = [
837777 array base bytestring containers ghc-prim
838778 ];
@@ -840,8 +780,6 @@ self: {
840780 base bytestring QuickCheck test-framework
841781 test-framework-quickcheck2
842782 ];
843− doHaddock = false;
844− doCheck = false;
845783 homepage = "https://github.com/GaloisInc/cereal";
846784 description = "A binary serialization library";
847785 license = stdenv.lib.licenses.bsd3;
@@ -852,106 +790,77 @@ self: {
852790 }:
853791 mkDerivation {
854792 pname = "cereal-conduit";
855− version = "0.7.3";
856− sha256 = "18h09j16m4yc4fcp80x7m1p2c87q6f628z36y8bnxbcjc9m95gq5";
793+ version = "0.8.0";
794+ sha256 = "1srr7agvgfw78q5s1npjq5sgynvhjgllpihiv37ylkwqm4c4ap6r";
795+ revision = "1";
796+ editedCabalFile = "1imyl3g2bni8bc6kajr857xh94fscphksj3286pxfpa8yp9vqqpc";
857797 libraryHaskellDepends = [
858798 base bytestring cereal conduit resourcet transformers
859799 ];
860800 testHaskellDepends = [
861− base bytestring cereal conduit HUnit mtl resourcet transformers
801+ base bytestring cereal conduit HUnit mtl transformers
862802 ];
863− doHaddock = false;
864− doCheck = false;
865803 homepage = "https://github.com/snoyberg/conduit";
866804 description = "Turn Data.Serialize Gets and Puts into Sources, Sinks, and Conduits";
867805 license = stdenv.lib.licenses.bsd3;
868806 }) {};
869− "chell" = callPackage
870− ({ mkDerivation, ansi-terminal, base, bytestring, options, patience
871− , random, template-haskell, text, transformers
872− }:
873− mkDerivation {
874− pname = "chell";
875− version = "0.4.0.1";
876− sha256 = "0lb95abzxl4a87nfqxsxpb3a39pd52cci43hcvj8615hyhqvs2jz";
877− libraryHaskellDepends = [
878− ansi-terminal base bytestring options patience random
879− template-haskell text transformers
880− ];
881− doHaddock = false;
882− doCheck = false;
883− homepage = "https://john-millikin.com/software/chell/";
884− description = "A simple and intuitive library for automated testing";
885− license = stdenv.lib.licenses.mit;
886− }) {};
887807 "chunked-data" = callPackage
888808 ({ mkDerivation, base, bytestring, containers, semigroups, text
889809 , transformers, vector
890810 }:
891811 mkDerivation {
892812 pname = "chunked-data";
893− version = "0.3.0";
894− sha256 = "0bszq6fijnr4pmadzz89smj7kfmzx0ca3wd9ga8gv0in9jk9vgp1";
813+ version = "0.3.1";
814+ sha256 = "16m7y7fwrirbjbqqcsfmr4yxa9qvfax6r7pw0zl9ky71ms0wa47p";
895815 libraryHaskellDepends = [
896816 base bytestring containers semigroups text transformers vector
897817 ];
898− doHaddock = false;
899− doCheck = false;
900− homepage = "https://github.com/snoyberg/mono-traversable";
818+ homepage = "https://github.com/snoyberg/mono-traversable#readme";
901819 description = "Typeclasses for dealing with various chunked data representations";
902820 license = stdenv.lib.licenses.mit;
903821 }) {};
904822 "classy-prelude" = callPackage
905823 ({ mkDerivation, async, base, basic-prelude, bifunctors, bytestring
906− , chunked-data, containers, deepseq, dlist, exceptions, ghc-prim
907− , hashable, hspec, lifted-async, lifted-base, monad-unlift
908− , mono-traversable, mono-traversable-instances, mtl
909− , mutable-containers, primitive, QuickCheck, safe-exceptions, say
910− , semigroups, stm, stm-chans, text, time, time-locale-compat
911− , transformers, transformers-base, unordered-containers, vector
912− , vector-instances
824+ , chunked-data, containers, deepseq, dlist, ghc-prim, hashable
825+ , hspec, mono-traversable, mono-traversable-instances, mtl
826+ , mutable-containers, primitive, QuickCheck, say, semigroups, stm
827+ , stm-chans, text, time, transformers, unliftio
828+ , unordered-containers, vector, vector-instances
913829 }:
914830 mkDerivation {
915831 pname = "classy-prelude";
916− version = "1.2.0.1";
917− sha256 = "0d7s3z4vbp2pq696m0yc1ccd51d3qvz7f50ya7xijfx7771y0zm4";
832+ version = "1.4.0";
833+ sha256 = "1q7r4lnrxjsh7rj5nr0cs22ddp9m6maa7bzbkarxw3xbfrb2afrb";
918834 libraryHaskellDepends = [
919835 async base basic-prelude bifunctors bytestring chunked-data
920− containers deepseq dlist exceptions ghc-prim hashable lifted-async
921− lifted-base monad-unlift mono-traversable
922− mono-traversable-instances mtl mutable-containers primitive
923− safe-exceptions say semigroups stm stm-chans text time
924− time-locale-compat transformers transformers-base
836+ containers deepseq dlist ghc-prim hashable mono-traversable
837+ mono-traversable-instances mtl mutable-containers primitive say
838+ semigroups stm stm-chans text time transformers unliftio
925839 unordered-containers vector vector-instances
926840 ];
927841 testHaskellDepends = [
928842 base containers hspec QuickCheck transformers unordered-containers
929843 ];
930− doHaddock = false;
931− doCheck = false;
932− homepage = "https://github.com/snoyberg/mono-traversable";
844+ homepage = "https://github.com/snoyberg/mono-traversable#readme";
933845 description = "A typeclass-based Prelude";
934846 license = stdenv.lib.licenses.mit;
935847 }) {};
936848 "classy-prelude-conduit" = callPackage
937− ({ mkDerivation, base, bytestring, classy-prelude, conduit
938− , conduit-combinators, hspec, monad-control, QuickCheck, resourcet
939− , transformers, void
849+ ({ mkDerivation, base, bytestring, classy-prelude, conduit, hspec
850+ , monad-control, QuickCheck, resourcet, transformers, void
940851 }:
941852 mkDerivation {
942853 pname = "classy-prelude-conduit";
943− version = "1.2.0";
944− sha256 = "0zzc6095205qf58qnnagfnb90svlc0m4hw2q79kd4x6d8b80s294";
854+ version = "1.4.0";
855+ sha256 = "096466cyyxxmg3jpq705xjjc4r7v9b607hgbys8vybjlldkjbvrr";
945856 libraryHaskellDepends = [
946− base bytestring classy-prelude conduit conduit-combinators
947− monad-control resourcet transformers void
857+ base bytestring classy-prelude conduit monad-control resourcet
858+ transformers void
948859 ];
949860 testHaskellDepends = [
950861 base bytestring conduit hspec QuickCheck transformers
951862 ];
952− doHaddock = false;
953− doCheck = false;
954− homepage = "https://github.com/snoyberg/mono-traversable";
863+ homepage = "https://github.com/snoyberg/mono-traversable#readme";
955864 description = "classy-prelude together with conduit functions";
956865 license = stdenv.lib.licenses.mit;
957866 }) {};
@@ -963,8 +872,6 @@ self: {
963872 sha256 = "07v91s20halsqjmziqb1sqjp2sjpckl9by7y28aaklwqi2bh2rl8";
964873 libraryHaskellDepends = [ base ];
965874 testHaskellDepends = [ base tasty tasty-quickcheck ];
966− doHaddock = false;
967− doCheck = false;
968875 homepage = "https://github.com/corsis/clock";
969876 description = "High-resolution clock functions: monotonic, realtime, cputime";
970877 license = stdenv.lib.licenses.bsd3;
@@ -975,18 +882,13 @@ self: {
975882 }:
976883 mkDerivation {
977884 pname = "cmdargs";
978− version = "0.10.17";
979− sha256 = "1nklhglfa83s9rd8x4j40bvnzdvd81pwdq902sv51mnfyk5a8drl";
885+ version = "0.10.20";
886+ sha256 = "0cbkmgrcnwgigg6z88y3c09gm7g6dwm7gzbgr53h8k1xik29s9hf";
980887 isLibrary = true;
981888 isExecutable = true;
982889 libraryHaskellDepends = [
983890 base filepath process template-haskell transformers
984891 ];
985− executableHaskellDepends = [
986− base filepath process template-haskell transformers
987− ];
988− doHaddock = false;
989− doCheck = false;
990892 homepage = "https://github.com/ndmitchell/cmdargs#readme";
991893 description = "Command line argument processing";
992894 license = stdenv.lib.licenses.bsd3;
@@ -999,12 +901,23 @@ self: {
999901 sha256 = "1491frk4jx6dlhifky9dvcxbsbcfssrz979a5hp5zn061rh8cp76";
1000902 libraryHaskellDepends = [ base ];
1001903 testHaskellDepends = [ base ];
1002− doHaddock = false;
1003− doCheck = false;
1004904 homepage = "https://github.com/RyanGlScott/code-page";
1005905 description = "Windows code page library for Haskell";
1006906 license = stdenv.lib.licenses.bsd3;
1007907 }) {};
908+ "colour" = callPackage
909+ ({ mkDerivation, base }:
910+ mkDerivation {
911+ pname = "colour";
912+ version = "2.3.4";
913+ sha256 = "1sy51nz096sv91nxqk6yk7b92b5a40axv9183xakvki2nc09yhqg";
914+ enableSeparateDataOutput = true;
915+ libraryHaskellDepends = [ base ];
916+ doCheck = false;
917+ homepage = "http://www.haskell.org/haskellwiki/Colour";
918+ description = "A model for human colour/color perception";
919+ license = stdenv.lib.licenses.mit;
920+ }) {};
1008921 "comonad" = callPackage
1009922 ({ mkDerivation, base, Cabal, cabal-doctest, containers
1010923 , contravariant, distributive, doctest, semigroups, tagged
@@ -1012,106 +925,97 @@ self: {
1012925 }:
1013926 mkDerivation {
1014927 pname = "comonad";
1015− version = "5.0.2";
1016− sha256 = "115pai560rllsmym76bj787kwz5xx19y8bl6262005nddqwzxc0v";
1017− revision = "1";
1018− editedCabalFile = "1lnsnx8p3wlfhd1xfc68za3b00vq77z2m6b0vqiw2laqmpj9akcw";
928+ version = "5.0.4";
929+ sha256 = "09g870c4flp4k3fgbibsd0mmfjani1qcpbcl685v8x89kxzrva3q";
1019930 setupHaskellDepends = [ base Cabal cabal-doctest ];
1020931 libraryHaskellDepends = [
1021932 base containers contravariant distributive semigroups tagged
1022933 transformers transformers-compat
1023934 ];
1024935 testHaskellDepends = [ base doctest ];
1025− doHaddock = false;
1026− doCheck = false;
1027936 homepage = "http://github.com/ekmett/comonad/";
1028937 description = "Comonads";
1029938 license = stdenv.lib.licenses.bsd3;
1030939 }) {};
1031− "conduit" = callPackage
1032− ({ mkDerivation, base, containers, criterion, deepseq, exceptions
1033− , hspec, kan-extensions, lifted-base, mmorph, monad-control, mtl
1034− , mwc-random, primitive, QuickCheck, resourcet, safe, split
1035− , transformers, transformers-base, vector
940+ "concurrent-output" = callPackage
941+ ({ mkDerivation, ansi-terminal, async, base, directory, exceptions
942+ , process, stm, terminal-size, text, transformers, unix
1036943 }:
1037944 mkDerivation {
1038− pname = "conduit";
1039− version = "1.2.11";
1040− sha256 = "1xx8vj2azbzr2skcrpcy02hgnik01i6hcx01h0mjd4fr0hzl4rhb";
945+ pname = "concurrent-output";
946+ version = "1.10.6";
947+ sha256 = "1qlp1vij4qgcrkw8ym5xdc0pgfwklbhsfh56sgayy3cvpvcac093";
1041948 libraryHaskellDepends = [
1042− base exceptions lifted-base mmorph monad-control mtl primitive
1043− resourcet transformers transformers-base
949+ ansi-terminal async base directory exceptions process stm
950+ terminal-size text transformers unix
1044951 ];
1045− testHaskellDepends = [
1046− base containers exceptions hspec mtl QuickCheck resourcet safe
1047− split transformers
952+ description = "Ungarble output from several threads or commands";
953+ license = stdenv.lib.licenses.bsd2;
954+ }) {};
955+ "conduit" = callPackage
956+ ({ mkDerivation, base, bytestring, containers, deepseq, directory
957+ , exceptions, filepath, gauge, hspec, kan-extensions
958+ , mono-traversable, mtl, mwc-random, primitive, QuickCheck
959+ , resourcet, safe, silently, split, text, transformers, unix
960+ , unliftio, unliftio-core, vector
961+ }:
962+ mkDerivation {
963+ pname = "conduit";
964+ version = "1.3.0.3";
965+ sha256 = "1sangm0qqi9dzlq95746a3kl14k8b09592a423shxjf2a0b1yx5v";
966+ libraryHaskellDepends = [
967+ base bytestring directory exceptions filepath mono-traversable mtl
968+ primitive resourcet text transformers unix unliftio-core vector
969+ ];
970+ testHaskellDepends = [
971+ base bytestring containers directory exceptions filepath hspec
972+ mono-traversable mtl QuickCheck resourcet safe silently split text
973+ transformers unliftio vector
1048974 ];
1049975 benchmarkHaskellDepends = [
1050− base containers criterion deepseq hspec kan-extensions mwc-random
976+ base containers deepseq gauge hspec kan-extensions mwc-random
1051977 transformers vector
1052978 ];
1053− doHaddock = false;
1054− doCheck = false;
1055979 homepage = "http://github.com/snoyberg/conduit";
1056980 description = "Streaming data processing library";
1057981 license = stdenv.lib.licenses.mit;
1058982 }) {};
1059983 "conduit-combinators" = callPackage
1060− ({ mkDerivation, base, base16-bytestring, base64-bytestring
1061− , bytestring, chunked-data, conduit, conduit-extra, containers
1062− , directory, filepath, hspec, monad-control, mono-traversable, mtl
1063− , mwc-random, primitive, QuickCheck, resourcet, safe, silently
1064− , text, transformers, transformers-base, unix, unix-compat, vector
1065− , void
1066− }:
984+ ({ mkDerivation, base }:
1067985 mkDerivation {
1068986 pname = "conduit-combinators";
1069− version = "1.1.1";
1070− sha256 = "0609miq03lq9visfb2dqqsxghmvgzm24pq39mqby1jnnah6yh8m0";
1071− libraryHaskellDepends = [
1072− base base16-bytestring base64-bytestring bytestring chunked-data
1073− conduit conduit-extra filepath monad-control mono-traversable
1074− mwc-random primitive resourcet text transformers transformers-base
1075− unix unix-compat vector void
1076− ];
1077− testHaskellDepends = [
1078− base base16-bytestring base64-bytestring bytestring chunked-data
1079− conduit containers directory filepath hspec mono-traversable mtl
1080− mwc-random QuickCheck safe silently text transformers vector
1081− ];
987+ version = "1.3.0";
988+ sha256 = "1lz70vwp4y4lpsivxl0cshq7aq3968rh48r6rjvpyaj2l0bdj5wp";
989+ libraryHaskellDepends = [ base ];
1082990 doHaddock = false;
1083− doCheck = false;
1084− homepage = "https://github.com/snoyberg/mono-traversable";
1085− description = "Commonly used conduit functions, for both chunked and unchunked data";
991+ homepage = "https://github.com/snoyberg/mono-traversable#readme";
992+ description = "DEPRECATED Functionality merged into the conduit package itself";
1086993 license = stdenv.lib.licenses.mit;
1087994 }) {};
1088995 "conduit-extra" = callPackage
1089− ({ mkDerivation, async, attoparsec, base, blaze-builder, bytestring
1090− , bytestring-builder, conduit, criterion, directory, exceptions
1091− , filepath, hspec, monad-control, network, primitive, process
1092− , QuickCheck, resourcet, stm, streaming-commons, text, transformers
1093− , transformers-base
996+ ({ mkDerivation, async, attoparsec, base, bytestring
997+ , bytestring-builder, conduit, directory, exceptions, filepath
998+ , gauge, hspec, network, primitive, process, QuickCheck, resourcet
999+ , stm, streaming-commons, text, transformers, transformers-base
1000+ , typed-process, unliftio-core
10941001 }:
10951002 mkDerivation {
10961003 pname = "conduit-extra";
1097− version = "1.1.16";
1098− sha256 = "1mgqc34i6ccq5bjkkn943gfa3w0lhddi3am0fd5afnazrnxc2wmx";
1004+ version = "1.3.0";
1005+ sha256 = "1bi2b6kdzy5f9glq46jzsk02has95jkxqz0cchpbmnakzhjwjh9c";
10991006 libraryHaskellDepends = [
1100− async attoparsec base blaze-builder bytestring conduit directory
1101− exceptions filepath monad-control network primitive process
1102− resourcet stm streaming-commons text transformers transformers-base
1007+ async attoparsec base bytestring conduit directory filepath network
1008+ primitive process resourcet stm streaming-commons text transformers
1009+ typed-process unliftio-core
11031010 ];
11041011 testHaskellDepends = [
1105− async attoparsec base blaze-builder bytestring bytestring-builder
1106− conduit directory exceptions hspec process QuickCheck resourcet stm
1012+ async attoparsec base bytestring bytestring-builder conduit
1013+ directory exceptions hspec process QuickCheck resourcet stm
11071014 streaming-commons text transformers transformers-base
11081015 ];
11091016 benchmarkHaskellDepends = [
1110− base blaze-builder bytestring bytestring-builder conduit criterion
1111− transformers
1017+ base bytestring bytestring-builder conduit gauge transformers
11121018 ];
1113− doHaddock = false;
1114− doCheck = false;
11151019 homepage = "http://github.com/snoyberg/conduit";
11161020 description = "Batteries included conduit: adapters for common libraries";
11171021 license = stdenv.lib.licenses.mit;
@@ -1129,66 +1033,61 @@ self: {
11291033 base byteable bytestring containers data-default-class network
11301034 socks tls x509 x509-store x509-system x509-validation
11311035 ];
1132− doHaddock = false;
1133− doCheck = false;
11341036 homepage = "http://github.com/vincenthz/hs-connection";
11351037 description = "Simple and easy network connections API";
11361038 license = stdenv.lib.licenses.bsd3;
11371039 }) {};
11381040 "constraints" = callPackage
1139− ({ mkDerivation, base, binary, deepseq, ghc-prim, hashable, mtl
1140− , transformers, transformers-compat
1041+ ({ mkDerivation, base, binary, deepseq, ghc-prim, hashable, hspec
1042+ , hspec-discover, mtl, semigroups, transformers
1043+ , transformers-compat
11411044 }:
11421045 mkDerivation {
11431046 pname = "constraints";
1144− version = "0.9.1";
1145− sha256 = "11d76051i2a335bvack04dqvsz4zhgcms1jxlvy4a4c670l02vi7";
1047+ version = "0.10.1";
1048+ sha256 = "1xy3vv78jxc17hm0z7qqspxjwv7l2jbcbj670yrl2f053qkfr02q";
11461049 libraryHaskellDepends = [
1147− base binary deepseq ghc-prim hashable mtl transformers
1050+ base binary deepseq ghc-prim hashable mtl semigroups transformers
11481051 transformers-compat
11491052 ];
1150− doHaddock = false;
1151− doCheck = false;
1053+ testHaskellDepends = [ base hspec ];
1054+ testToolDepends = [ hspec-discover ];
11521055 homepage = "http://github.com/ekmett/constraints/";
11531056 description = "Constraint manipulation";
11541057 license = stdenv.lib.licenses.bsd2;
11551058 }) {};
11561059 "contravariant" = callPackage
1157− ({ mkDerivation, base, semigroups, StateVar, transformers
1158− , transformers-compat, void
1060+ ({ mkDerivation, base, StateVar, transformers, transformers-compat
11591061 }:
11601062 mkDerivation {
11611063 pname = "contravariant";
1162− version = "1.4";
1163− sha256 = "117fff8kkrvlmr8cb2jpj71z7lf2pdiyks6ilyx89mry6zqnsrp1";
1064+ version = "1.4.1";
1065+ sha256 = "1vfhk8c5cxmmakx7rflap1ipkx5q0j5vnlrcz7yz6y53kxhksgf9";
1066+ revision = "1";
1067+ editedCabalFile = "0qj5nymccrb9p0cd6hffsy90jidjng14g9yv95z8v6h4q84sbzvx";
11641068 libraryHaskellDepends = [
1165− base semigroups StateVar transformers transformers-compat void
1069+ base StateVar transformers transformers-compat
11661070 ];
1167− doHaddock = false;
1168− doCheck = false;
11691071 homepage = "http://github.com/ekmett/contravariant/";
11701072 description = "Contravariant functors";
11711073 license = stdenv.lib.licenses.bsd3;
11721074 }) {};
11731075 "cookie" = callPackage
1174− ({ mkDerivation, base, blaze-builder, bytestring
1175− , data-default-class, deepseq, HUnit, old-locale, QuickCheck, tasty
1176− , tasty-hunit, tasty-quickcheck, text, time
1076+ ({ mkDerivation, base, bytestring, data-default-class, deepseq
1077+ , HUnit, QuickCheck, tasty, tasty-hunit, tasty-quickcheck, text
1078+ , time
11771079 }:
11781080 mkDerivation {
11791081 pname = "cookie";
1180− version = "0.4.2.1";
1181− sha256 = "1r2j518lfcswn76qm6p2h1rl98gfsxad7p7z9qaww84fj28k0h86";
1082+ version = "0.4.4";
1083+ sha256 = "1qy09i0jh2z9i9avy2khf8a8afq4fqgnv0fyrszgfg4kmq2fsi9j";
11821084 libraryHaskellDepends = [
1183− base blaze-builder bytestring data-default-class deepseq old-locale
1184− text time
1085+ base bytestring data-default-class deepseq text time
11851086 ];
11861087 testHaskellDepends = [
1187− base blaze-builder bytestring HUnit QuickCheck tasty tasty-hunit
1188− tasty-quickcheck text time
1088+ base bytestring HUnit QuickCheck tasty tasty-hunit tasty-quickcheck
1089+ text time
11891090 ];
1190− doHaddock = false;
1191− doCheck = false;
11921091 homepage = "http://github.com/snoyberg/cookie";
11931092 description = "HTTP cookie parsing and rendering";
11941093 license = stdenv.lib.licenses.mit;
@@ -1208,12 +1107,95 @@ self: {
12081107 executableHaskellDepends = [
12091108 base directory old-locale old-time polyparse
12101109 ];
1211− doHaddock = false;
1212− doCheck = false;
12131110 homepage = "http://projects.haskell.org/cpphs/";
12141111 description = "A liberalised re-implementation of cpp, the C pre-processor";
12151112 license = "LGPL";
12161113 }) {};
1114+ "cpu" = callPackage
1115+ ({ mkDerivation, base }:
1116+ mkDerivation {
1117+ pname = "cpu";
1118+ version = "0.1.2";
1119+ sha256 = "0x19mlanmkg96h6h1i04w2i631z84y4rbk22ki4zhgsajysgw9sn";
1120+ isLibrary = true;
1121+ isExecutable = true;
1122+ enableSeparateDataOutput = true;
1123+ libraryHaskellDepends = [ base ];
1124+ homepage = "http://github.com/vincenthz/hs-cpu";
1125+ description = "Cpu information and properties helpers";
1126+ license = stdenv.lib.licenses.bsd3;
1127+ }) {};
1128+ "criterion" = callPackage
1129+ ({ mkDerivation, aeson, ansi-wl-pprint, base, base-compat
1130+ , base-compat-batteries, binary, bytestring, cassava, code-page
1131+ , containers, deepseq, directory, exceptions, filepath, Glob, HUnit
1132+ , js-flot, js-jquery, microstache, mtl, mwc-random
1133+ , optparse-applicative, parsec, QuickCheck, semigroups, statistics
1134+ , tasty, tasty-hunit, tasty-quickcheck, text, time, transformers
1135+ , transformers-compat, vector, vector-algorithms
1136+ }:
1137+ mkDerivation {
1138+ pname = "criterion";
1139+ version = "1.4.1.0";
1140+ sha256 = "0v429araqkcw3wwwi6fsp0g7g1hy3l47p061lcy7r4m7d9khd4y4";
1141+ isLibrary = true;
1142+ isExecutable = true;
1143+ enableSeparateDataOutput = true;
1144+ libraryHaskellDepends = [
1145+ aeson ansi-wl-pprint base base-compat-batteries binary bytestring
1146+ cassava code-page containers deepseq directory exceptions filepath
1147+ Glob js-flot js-jquery microstache mtl mwc-random
1148+ optparse-applicative parsec semigroups statistics text time
1149+ transformers transformers-compat vector vector-algorithms
1150+ ];
1151+ executableHaskellDepends = [
1152+ base base-compat-batteries optparse-applicative semigroups
1153+ ];
1154+ testHaskellDepends = [
1155+ aeson base base-compat base-compat-batteries bytestring deepseq
1156+ directory HUnit QuickCheck statistics tasty tasty-hunit
1157+ tasty-quickcheck vector
1158+ ];
1159+ homepage = "http://www.serpentine.com/criterion";
1160+ description = "Robust, reliable performance measurement and analysis";
1161+ license = stdenv.lib.licenses.bsd3;
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+ }) {};
12171199 "cryptohash" = callPackage
12181200 ({ mkDerivation, base, byteable, bytestring, criterion, cryptonite
12191201 , ghc-prim, HUnit, memory, QuickCheck, tasty, tasty-hunit
@@ -1231,54 +1213,55 @@ self: {
12311213 tasty-quickcheck
12321214 ];
12331215 benchmarkHaskellDepends = [ base byteable bytestring criterion ];
1234− doHaddock = false;
1235− doCheck = false;
12361216 homepage = "http://github.com/vincenthz/hs-cryptohash";
12371217 description = "collection of crypto hashes, fast, pure and practical";
12381218 license = stdenv.lib.licenses.bsd3;
12391219 }) {};
1240− "cryptohash-conduit" = callPackage
1241− ({ mkDerivation, base, bytestring, conduit, conduit-extra
1242− , cryptohash, resourcet, transformers
1243− }:
1244− mkDerivation {
1245− pname = "cryptohash-conduit";
1246− version = "0.1.1";
1247− sha256 = "1kmlskgb0jx8hkzdncr24aqir9k1kyfcb2rypvkdld1yin4nslga";
1248− libraryHaskellDepends = [
1249− base bytestring conduit conduit-extra cryptohash resourcet
1250− transformers
1251− ];
1252− doHaddock = false;
1253− doCheck = false;
1254− homepage = "http://github.com/vincenthz/hs-cryptohash-conduit";
1255− description = "cryptohash conduit";
1256− license = stdenv.lib.licenses.bsd3;
1257− }) {};
12581220 "cryptonite" = callPackage
1259− ({ mkDerivation, base, bytestring, criterion, deepseq, foundation
1221+ ({ mkDerivation, base, basement, bytestring, deepseq, gauge
12601222 , ghc-prim, integer-gmp, memory, random, tasty, tasty-hunit
12611223 , tasty-kat, tasty-quickcheck
12621224 }:
12631225 mkDerivation {
12641226 pname = "cryptonite";
1265− version = "0.23";
1266− sha256 = "1680dxgmnjgj083jhsw3rlljwaw0zqi5099m59x6kwqkxhn1qjpf";
1227+ version = "0.25";
1228+ sha256 = "131wbbdr5yavs5k1ah9sz6fqx1ffyvaxf66pwjzsfc47mwc1mgl9";
12671229 libraryHaskellDepends = [
1268− base bytestring deepseq foundation ghc-prim integer-gmp memory
1230+ base basement bytestring deepseq ghc-prim integer-gmp memory
12691231 ];
12701232 testHaskellDepends = [
12711233 base bytestring memory tasty tasty-hunit tasty-kat tasty-quickcheck
12721234 ];
12731235 benchmarkHaskellDepends = [
1274− base bytestring criterion memory random
1236+ base bytestring deepseq gauge memory random
12751237 ];
1276− doHaddock = false;
1277− doCheck = false;
12781238 homepage = "https://github.com/haskell-crypto/cryptonite";
12791239 description = "Cryptography Primitives sink";
12801240 license = stdenv.lib.licenses.bsd3;
12811241 }) {};
1242+ "cryptonite-conduit" = callPackage
1243+ ({ mkDerivation, base, bytestring, conduit, conduit-combinators
1244+ , conduit-extra, cryptonite, exceptions, memory, resourcet, tasty
1245+ , tasty-hunit, tasty-quickcheck, transformers
1246+ }:
1247+ mkDerivation {
1248+ pname = "cryptonite-conduit";
1249+ version = "0.2.2";
1250+ sha256 = "1bldcmda4xh52mw1wfrjljv8crhw3al7v7kv1j0vidvr7ymnjpbh";
1251+ revision = "1";
1252+ editedCabalFile = "1hh2nzfz4qpxgivfilgk4ll416lph8b2fdkzpzrmqfjglivydfmz";
1253+ libraryHaskellDepends = [
1254+ base bytestring conduit conduit-extra cryptonite exceptions memory
1255+ resourcet transformers
1256+ ];
1257+ testHaskellDepends = [
1258+ base bytestring conduit conduit-combinators cryptonite memory tasty
1259+ tasty-hunit tasty-quickcheck
1260+ ];
1261+ homepage = "https://github.com/haskell-crypto/cryptonite-conduit";
1262+ description = "cryptonite conduit";
1263+ license = stdenv.lib.licenses.bsd3;
1264+ }) {};
12821265 "data-default" = callPackage
12831266 ({ mkDerivation, base, data-default-class
12841267 , data-default-instances-containers, data-default-instances-dlist
@@ -1292,8 +1275,6 @@ self: {
12921275 base data-default-class data-default-instances-containers
12931276 data-default-instances-dlist data-default-instances-old-locale
12941277 ];
1295− doHaddock = false;
1296− doCheck = false;
12971278 description = "A class for types with a default value";
12981279 license = stdenv.lib.licenses.bsd3;
12991280 }) {};
@@ -1304,8 +1285,6 @@ self: {
13041285 version = "0.1.2.0";
13051286 sha256 = "0miyjz8d4jyvqf2vp60lyfbnflx6cj2k8apmm9ly1hq0y0iv80ag";
13061287 libraryHaskellDepends = [ base ];
1307− doHaddock = false;
1308− doCheck = false;
13091288 description = "A class for types with a default value";
13101289 license = stdenv.lib.licenses.bsd3;
13111290 }) {};
@@ -1316,8 +1295,6 @@ self: {
13161295 version = "0.0.1";
13171296 sha256 = "06h8xka031w752a7cjlzghvr8adqbl95xj9z5zc1b62w02phfpm5";
13181297 libraryHaskellDepends = [ base containers data-default-class ];
1319− doHaddock = false;
1320− doCheck = false;
13211298 description = "Default instances for types in containers";
13221299 license = stdenv.lib.licenses.bsd3;
13231300 }) {};
@@ -1328,8 +1305,6 @@ self: {
13281305 version = "0.0.1";
13291306 sha256 = "0narkdqiprhgayjiawrr4390h4rq4pl2pb6mvixbv2phrc8kfs3x";
13301307 libraryHaskellDepends = [ base data-default-class dlist ];
1331− doHaddock = false;
1332− doCheck = false;
13331308 description = "Default instances for types in dlist";
13341309 license = stdenv.lib.licenses.bsd3;
13351310 }) {};
@@ -1340,27 +1315,32 @@ self: {
13401315 version = "0.0.1";
13411316 sha256 = "00h81i5phib741yj517p8mbnc48myvfj8axzsw44k34m48lv1lv0";
13421317 libraryHaskellDepends = [ base data-default-class old-locale ];
1343− doHaddock = false;
1344− doCheck = false;
13451318 description = "Default instances for types in old-locale";
13461319 license = stdenv.lib.licenses.bsd3;
13471320 }) {};
1321+ "data-ordlist" = callPackage
1322+ ({ mkDerivation, base }:
1323+ mkDerivation {
1324+ pname = "data-ordlist";
1325+ version = "0.4.7.0";
1326+ sha256 = "03a9ix1fcx08viwv2jg5ndw1qbkydyyrmjvqr9wasmcik9x1wv3g";
1327+ libraryHaskellDepends = [ base ];
1328+ description = "Set and bag operations on ordered lists";
1329+ license = stdenv.lib.licenses.bsd3;
1330+ }) {};
13481331 "distribution-nixpkgs" = callPackage
13491332 ({ mkDerivation, aeson, base, bytestring, Cabal, containers
1350− , deepseq, doctest, hspec, language-nix, lens, pretty, process
1351− , split
1333+ , deepseq, hspec, language-nix, lens, pretty, process, split
13521334 }:
13531335 mkDerivation {
13541336 pname = "distribution-nixpkgs";
1355− version = "1.1";
1356− sha256 = "15m881mrhpqg1xjdjz65ym8pajp1nijrcvb6dx3vv55430cjw1qx";
1337+ version = "1.1.1";
1338+ sha256 = "1694crd3l9cyc0c5xvqmx62154519g2cnpzc5qmlypwrk258bssm";
13571339 libraryHaskellDepends = [
13581340 aeson base bytestring Cabal containers deepseq language-nix lens
13591341 pretty process split
13601342 ];
1361− testHaskellDepends = [ base deepseq doctest hspec lens ];
1362− doHaddock = false;
1363− doCheck = false;
1343+ testHaskellDepends = [ base deepseq hspec lens ];
13641344 homepage = "https://github.com/peti/distribution-nixpkgs#readme";
13651345 description = "Types and functions to manipulate the Nixpkgs distribution";
13661346 license = stdenv.lib.licenses.bsd3;
@@ -1374,28 +1354,25 @@ self: {
13741354 pname = "distributive";
13751355 version = "0.5.3";
13761356 sha256 = "0y566r97sfyvhsmd4yxiz4ns2mqgwf5bdbp56wgxl6wlkidq0wwi";
1377− revision = "1";
1378− editedCabalFile = "0hsq03i0qa0jvw7kaaqic40zvfkzhkd25dgvbdg6hjzylf1k1gax";
1357+ revision = "6";
1358+ editedCabalFile = "06bd38rf31yrvvy989r44pm0id3dsxwcp6nxg7wk6ccj3n2b8rzk";
13791359 setupHaskellDepends = [ base Cabal cabal-doctest ];
13801360 libraryHaskellDepends = [
13811361 base base-orphans tagged transformers transformers-compat
13821362 ];
13831363 testHaskellDepends = [ base doctest generic-deriving hspec ];
1384− doHaddock = false;
1385− doCheck = false;
13861364 homepage = "http://github.com/ekmett/distributive/";
13871365 description = "Distributive functors -- Dual to Traversable";
13881366 license = stdenv.lib.licenses.bsd3;
13891367 }) {};
13901368 "dlist" = callPackage
1391− ({ mkDerivation, base, deepseq }:
1369+ ({ mkDerivation, base, Cabal, deepseq, QuickCheck }:
13921370 mkDerivation {
13931371 pname = "dlist";
1394− version = "0.8.0.3";
1395− sha256 = "0brgai4vs7xz29p06kd6gzg5bpa8iy3k7yzgcc44izspd74q4rw7";
1372+ version = "0.8.0.4";
1373+ sha256 = "0yirrh0s6acjy9hhvf5fqg2d6q5y6gm9xs04v6w1imndh1xqdwdc";
13961374 libraryHaskellDepends = [ base deepseq ];
1397− doHaddock = false;
1398− doCheck = false;
1375+ testHaskellDepends = [ base Cabal QuickCheck ];
13991376 homepage = "https://github.com/spl/dlist";
14001377 description = "Difference lists";
14011378 license = stdenv.lib.licenses.bsd3;
@@ -1407,8 +1384,6 @@ self: {
14071384 version = "0.1.1.1";
14081385 sha256 = "0nsgrr25r4qxv2kpn7i20hra8jjkyllxfrhh5hml3ysjdz010jni";
14091386 libraryHaskellDepends = [ base dlist semigroups ];
1410− doHaddock = false;
1411− doCheck = false;
14121387 homepage = "https://github.com/gregwebs/dlist-instances";
14131388 description = "Difference lists instances";
14141389 license = stdenv.lib.licenses.bsd3;
@@ -1421,21 +1396,23 @@ self: {
14211396 }:
14221397 mkDerivation {
14231398 pname = "doctest";
1424− version = "0.11.4";
1425− sha256 = "09a170wr13p2c0w085d7qbf2blrvj1qmg92j61xqi17rwdwkvyjs";
1399+ version = "0.16.0";
1400+ sha256 = "0hkccch65s3kp0b36h7bqhilnpi4bx8kngncm7ma9vbd3dwacjdv";
14261401 isLibrary = true;
14271402 isExecutable = true;
14281403 libraryHaskellDepends = [
14291404 base base-compat code-page deepseq directory filepath ghc ghc-paths
14301405 process syb transformers
14311406 ];
1432− executableHaskellDepends = [ base ];
1407+ executableHaskellDepends = [
1408+ base base-compat code-page deepseq directory filepath ghc ghc-paths
1409+ process syb transformers
1410+ ];
14331411 testHaskellDepends = [
14341412 base base-compat code-page deepseq directory filepath ghc ghc-paths
14351413 hspec HUnit mockery process QuickCheck setenv silently
14361414 stringbuilder syb transformers with-location
14371415 ];
1438− doHaddock = false;
14391416 doCheck = false;
14401417 homepage = "https://github.com/sol/doctest#readme";
14411418 description = "Test interactive Haskell examples";
@@ -1445,35 +1422,25 @@ self: {
14451422 ({ mkDerivation, base, directory, filepath, time, unix }:
14461423 mkDerivation {
14471424 pname = "easy-file";
1448− version = "0.2.1";
1449− sha256 = "0v75081bx4qzlqy29hh639nzlr7dncwza3qxbzm9njc4jarf31pz";
1425+ version = "0.2.2";
1426+ sha256 = "0zmlcz723051qpn8l8vi51c5rx1blwrw4094jcshkmj8p9r2xxaj";
14501427 libraryHaskellDepends = [ base directory filepath time unix ];
1451− doHaddock = false;
1452− doCheck = false;
14531428 homepage = "http://github.com/kazu-yamamoto/easy-file";
14541429 description = "Cross-platform File handling";
14551430 license = stdenv.lib.licenses.bsd3;
14561431 }) {};
1457− "either" = callPackage
1458− ({ mkDerivation, base, bifunctors, exceptions, free, mmorph
1459− , monad-control, MonadRandom, mtl, profunctors, semigroupoids
1460− , semigroups, transformers, transformers-base
1432+ "entropy" = callPackage
1433+ ({ mkDerivation, base, bytestring, Cabal, directory, filepath
1434+ , process, unix
14611435 }:
14621436 mkDerivation {
1463− pname = "either";
1464− version = "4.4.1.1";
1465− sha256 = "1lrlwqqnm6ibfcydlv5qvvssw7bm0c6yypy0rayjzv1znq7wp1xh";
1466− revision = "2";
1467− editedCabalFile = "1n7792mcrvfh31qrbj8mpnx372s03kz83mypj7l4fm5h6zi4a3hs";
1468− libraryHaskellDepends = [
1469− base bifunctors exceptions free mmorph monad-control MonadRandom
1470− mtl profunctors semigroupoids semigroups transformers
1471− transformers-base
1472− ];
1473− doHaddock = false;
1474− doCheck = false;
1475− homepage = "http://github.com/ekmett/either/";
1476− description = "An either monad transformer";
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";
14771444 license = stdenv.lib.licenses.bsd3;
14781445 }) {};
14791446 "erf" = callPackage
@@ -1483,31 +1450,28 @@ self: {
14831450 version = "2.0.0.0";
14841451 sha256 = "0dxk2r32ajmmc05vaxcp0yw6vgv4lkbmh8jcshncn98xgsfbgw14";
14851452 libraryHaskellDepends = [ base ];
1486− doHaddock = false;
1487− doCheck = false;
14881453 description = "The error function, erf, and related functions";
14891454 license = stdenv.lib.licenses.bsd3;
14901455 }) {};
14911456 "exceptions" = callPackage
14921457 ({ mkDerivation, base, mtl, QuickCheck, stm, template-haskell
1493− , test-framework, test-framework-quickcheck2, transformers
1494− , transformers-compat
1458+ , test-framework, test-framework-hunit, test-framework-quickcheck2
1459+ , transformers, transformers-compat
14951460 }:
14961461 mkDerivation {
14971462 pname = "exceptions";
1498− version = "0.8.3";
1499− sha256 = "1gl7xzffsqmigam6zg0jsglncgzxqafld2p6kb7ccp9xirzdjsjd";
1500− revision = "2";
1501− editedCabalFile = "1vl59j0l7m53hkzlcfmdbqbab8dk4lp9gzwryn7nsr6ylg94wayw";
1463+ version = "0.10.0";
1464+ sha256 = "1ms9zansv0pwzwdjncvx4kf18lnkjy2p61hvjhvxmjx5bqp93p8y";
1465+ revision = "1";
1466+ editedCabalFile = "1ydvmhi9bj7b1md3wd4l2z2lccgyjgv3ha8milmy2l4lad9xh6xy";
15021467 libraryHaskellDepends = [
15031468 base mtl stm template-haskell transformers transformers-compat
15041469 ];
15051470 testHaskellDepends = [
15061471 base mtl QuickCheck stm template-haskell test-framework
1507− test-framework-quickcheck2 transformers transformers-compat
1472+ test-framework-hunit test-framework-quickcheck2 transformers
1473+ transformers-compat
15081474 ];
1509− doHaddock = false;
1510− doCheck = false;
15111475 homepage = "http://github.com/ekmett/exceptions/";
15121476 description = "Extensible optionally-pure exceptions";
15131477 license = stdenv.lib.licenses.bsd3;
@@ -1519,38 +1483,22 @@ self: {
15191483 version = "0.1.1.4";
15201484 sha256 = "1273nqws9ij1rp1bsq5jc7k2jxpqa0svawdbim05lf302y0firbc";
15211485 libraryHaskellDepends = [ base ];
1522− doHaddock = false;
1523− doCheck = false;
15241486 description = "Extensible exceptions";
15251487 license = stdenv.lib.licenses.bsd3;
15261488 }) {};
1527− "fail" = callPackage
1528− ({ mkDerivation }:
1529− mkDerivation {
1530− pname = "fail";
1531− version = "4.9.0.0";
1532− sha256 = "18nlj6xvnggy61gwbyrpmvbdkq928wv0wx2zcsljb52kbhddnp3d";
1533− doHaddock = false;
1534− doCheck = false;
1535− homepage = "https://prime.haskell.org/wiki/Libraries/Proposals/MonadFail";
1536− description = "Forward-compatible MonadFail class";
1537− license = stdenv.lib.licenses.bsd3;
1538− }) {};
15391489 "fast-logger" = callPackage
15401490 ({ mkDerivation, array, auto-update, base, bytestring, directory
15411491 , easy-file, filepath, hspec, text, unix, unix-time
15421492 }:
15431493 mkDerivation {
15441494 pname = "fast-logger";
1545− version = "2.4.10";
1546− sha256 = "13b7rrv8dw574k6lbl96nar67fx81058gvilsc42v0lgm38sbi6y";
1495+ version = "2.4.11";
1496+ sha256 = "1ad2vq4nifdxshqk9yrmghqizhkgybfz134kpr6padglb2mxxrdv";
15471497 libraryHaskellDepends = [
15481498 array auto-update base bytestring directory easy-file filepath text
15491499 unix unix-time
15501500 ];
15511501 testHaskellDepends = [ base bytestring directory hspec ];
1552− doHaddock = false;
1553− doCheck = false;
15541502 homepage = "https://github.com/kazu-yamamoto/logger";
15551503 description = "A fast logging system";
15561504 license = stdenv.lib.licenses.bsd3;
@@ -1558,77 +1506,88 @@ self: {
15581506 "foldl" = callPackage
15591507 ({ mkDerivation, base, bytestring, comonad, containers
15601508 , contravariant, criterion, hashable, mwc-random, primitive
1561− , profunctors, text, transformers, unordered-containers, vector
1509+ , profunctors, semigroupoids, semigroups, text, transformers
1510+ , unordered-containers, vector, vector-builder
15621511 }:
15631512 mkDerivation {
15641513 pname = "foldl";
1565− version = "1.2.5";
1566− sha256 = "0jzc00dqwkr3kvy40f8f9klh24s8zvhfk2flrlyichc6zcy5qbda";
1514+ version = "1.4.2";
1515+ sha256 = "14ccc2spv63v7vipfrmk8jbbw2x1dkkxsyzqzcpnkzjw0yg4ghc9";
15671516 libraryHaskellDepends = [
15681517 base bytestring comonad containers contravariant hashable
1569− mwc-random primitive profunctors text transformers
1570− unordered-containers vector
1518+ mwc-random primitive profunctors semigroupoids semigroups text
1519+ transformers unordered-containers vector vector-builder
15711520 ];
15721521 benchmarkHaskellDepends = [ base criterion ];
1573− doHaddock = false;
1574− doCheck = false;
15751522 description = "Composable, streaming, and efficient left folds";
15761523 license = stdenv.lib.licenses.bsd3;
15771524 }) {};
15781525 "foundation" = callPackage
1579− ({ mkDerivation, base, criterion, ghc-prim, mtl, QuickCheck, tasty
1580− , tasty-hunit, tasty-quickcheck
1581− }:
1526+ ({ mkDerivation, base, basement, gauge, ghc-prim }:
15821527 mkDerivation {
15831528 pname = "foundation";
1584− version = "0.0.13";
1585− sha256 = "0pvmq3lkbdzj861l7jkf5xsib77j756y0vml8kgr2rckpz5qashh";
1586− libraryHaskellDepends = [ base ghc-prim ];
1587− testHaskellDepends = [
1588− base mtl QuickCheck tasty tasty-hunit tasty-quickcheck
1589− ];
1590− benchmarkHaskellDepends = [ base criterion ];
1591− doHaddock = false;
1592− doCheck = false;
1529+ version = "0.0.21";
1530+ sha256 = "1q43y8wfj0wf9gdq2kzphwjwq6m5pvryy1lqgk954aq5z3ks1lsf";
1531+ libraryHaskellDepends = [ base basement ghc-prim ];
1532+ testHaskellDepends = [ base basement ];
1533+ benchmarkHaskellDepends = [ base basement gauge ];
15931534 homepage = "https://github.com/haskell-foundation/foundation";
15941535 description = "Alternative prelude with batteries and no dependencies";
15951536 license = stdenv.lib.licenses.bsd3;
15961537 }) {};
15971538 "free" = callPackage
15981539 ({ mkDerivation, base, bifunctors, comonad, containers
1599− , distributive, exceptions, mtl, prelude-extras, profunctors
1600− , semigroupoids, semigroups, template-haskell, transformers
1540+ , distributive, exceptions, mtl, profunctors, semigroupoids
1541+ , semigroups, template-haskell, transformers, transformers-base
16011542 , transformers-compat
16021543 }:
16031544 mkDerivation {
16041545 pname = "free";
1605− version = "4.12.4";
1606− sha256 = "1147s393442xf4gkpbq0rd1p286vmykgx85mxhk5d1c7wfm4bzn9";
1546+ version = "5.0.2";
1547+ sha256 = "15m3n9vhz7z3kzv1w3wlfa3x8jp4cbrkwmrcjr7jlx39iqffn1gg";
16071548 libraryHaskellDepends = [
16081549 base bifunctors comonad containers distributive exceptions mtl
1609− prelude-extras profunctors semigroupoids semigroups
1610− template-haskell transformers transformers-compat
1550+ profunctors semigroupoids semigroups template-haskell transformers
1551+ transformers-base transformers-compat
16111552 ];
1612− doHaddock = false;
1613− doCheck = false;
16141553 homepage = "http://github.com/ekmett/free/";
16151554 description = "Monads for free";
16161555 license = stdenv.lib.licenses.bsd3;
16171556 }) {};
1557+ "gauge" = callPackage
1558+ ({ mkDerivation, base, basement, bytestring, deepseq, directory
1559+ , foundation, process, vector
1560+ }:
1561+ mkDerivation {
1562+ pname = "gauge";
1563+ version = "0.2.3";
1564+ sha256 = "0slsimv2zn9yhakxy2wdyfj6bgjd1p65wp6nr8j0ba7df64xykjs";
1565+ libraryHaskellDepends = [
1566+ base basement deepseq directory process vector
1567+ ];
1568+ testHaskellDepends = [
1569+ base bytestring deepseq directory foundation
1570+ ];
1571+ benchmarkHaskellDepends = [ base ];
1572+ homepage = "https://github.com/vincenthz/hs-gauge";
1573+ description = "small framework for performance measurement and analysis";
1574+ license = stdenv.lib.licenses.bsd3;
1575+ }) {};
16181576 "generic-deriving" = callPackage
1619− ({ mkDerivation, base, containers, ghc-prim, hspec
1620− , template-haskell
1577+ ({ mkDerivation, base, containers, ghc-prim, hspec, hspec-discover
1578+ , template-haskell, th-abstraction
16211579 }:
16221580 mkDerivation {
16231581 pname = "generic-deriving";
1624− version = "1.11.2";
1625− sha256 = "1y92q4dmbyc24hjjvq02474s9grwabxffn16y31gzaqhm0m0z5i9";
1582+ version = "1.12.2";
1583+ sha256 = "1i7d6cpj9yhaqb79zays3nqchhaacacjz9bkc0zlwj73y5gvi22n";
1584+ revision = "1";
1585+ editedCabalFile = "0gr20ypr6s0183wmrhmia0zvpbn4dmfyr3wksrkrqj4i8nhj42fz";
16261586 libraryHaskellDepends = [
1627− base containers ghc-prim template-haskell
1587+ base containers ghc-prim template-haskell th-abstraction
16281588 ];
16291589 testHaskellDepends = [ base hspec template-haskell ];
1630− doHaddock = false;
1631− doCheck = false;
1590+ testToolDepends = [ hspec-discover ];
16321591 homepage = "https://github.com/dreixel/generic-deriving";
16331592 description = "Generic programming library for generalised deriving";
16341593 license = stdenv.lib.licenses.bsd3;
@@ -1639,110 +1598,13 @@ self: {
16391598 pname = "ghc-paths";
16401599 version = "0.1.0.9";
16411600 sha256 = "0ibrr1dxa35xx20cpp8jzgfak1rdmy344dfwq4vlq013c6w8z9mg";
1642− revision = "2";
1643− editedCabalFile = "1gs6biqbcabgmrwhc1bq1bdaxdwwh26v4mpvj5c7cfyigc64gwyk";
1601+ revision = "3";
1602+ editedCabalFile = "1gx47xbm3qviqccnbsibzkfnlzljvls33jh1ry4l506yvfnf4j10";
16441603 setupHaskellDepends = [ base Cabal directory ];
16451604 libraryHaskellDepends = [ base ];
1646− doHaddock = false;
1647− doCheck = false;
16481605 description = "Knowledge of GHC's installation directories";
16491606 license = stdenv.lib.licenses.bsd3;
16501607 }) {};
1651− "git" = callPackage
1652− ({ mkDerivation, base, byteable, bytedump, bytestring, containers
1653− , cryptonite, hourglass, memory, mtl, patience, random
1654− , system-fileio, system-filepath, tasty, tasty-quickcheck
1655− , unix-compat, utf8-string, vector, zlib, zlib-bindings
1656− }:
1657− mkDerivation {
1658− pname = "git";
1659− version = "0.2.0";
1660− sha256 = "1a4frn53qs31s6rqldw91zmc0i0gr33zm10y9ailqasbsgyxqwyp";
1661− libraryHaskellDepends = [
1662− base byteable bytestring containers cryptonite hourglass memory mtl
1663− patience random system-fileio system-filepath unix-compat
1664− utf8-string vector zlib zlib-bindings
1665− ];
1666− testHaskellDepends = [
1667− base bytedump bytestring hourglass tasty tasty-quickcheck
1668− ];
1669− doHaddock = false;
1670− doCheck = false;
1671− homepage = "https://github.com/vincenthz/hs-git";
1672− description = "Git operations in haskell";
1673− license = stdenv.lib.licenses.bsd3;
1674− }) {};
1675− "gitlib" = callPackage
1676− ({ mkDerivation, base, base16-bytestring, bytestring, conduit
1677− , conduit-combinators, containers, directory, exceptions, filepath
1678− , hashable, lifted-async, lifted-base, monad-control, mtl
1679− , resourcet, semigroups, tagged, text, time, transformers, unix
1680− , unordered-containers
1681− }:
1682− mkDerivation {
1683− pname = "gitlib";
1684− version = "3.1.1";
1685− sha256 = "1vwmyfmqlly351jq9pgjhcfhnxvrhzkd4lfq7qpsa37vca5pas6x";
1686− libraryHaskellDepends = [
1687− base base16-bytestring bytestring conduit conduit-combinators
1688− containers directory exceptions filepath hashable lifted-async
1689− lifted-base monad-control mtl resourcet semigroups tagged text time
1690− transformers unix unordered-containers
1691− ];
1692− doHaddock = false;
1693− doCheck = false;
1694− description = "API library for working with Git repositories";
1695− license = stdenv.lib.licenses.mit;
1696− }) {};
1697− "gitlib-libgit2" = callPackage
1698− ({ mkDerivation, base, bytestring, conduit, conduit-combinators
1699− , containers, directory, exceptions, fast-logger, filepath, gitlib
1700− , gitlib-test, hlibgit2, hspec, hspec-expectations, HUnit
1701− , lifted-async, lifted-base, mmorph, monad-control, monad-loops
1702− , mtl, resourcet, stm, stm-conduit, tagged, template-haskell, text
1703− , text-icu, time, transformers, transformers-base
1704− }:
1705− mkDerivation {
1706− pname = "gitlib-libgit2";
1707− version = "3.1.1";
1708− sha256 = "1fv8r2w0fd9m7chrccmf5kw0pr2v0k2r2l0d782galdvq7mhca7w";
1709− revision = "1";
1710− editedCabalFile = "0v510c4sd6zwwf6mbc6gfv5sin91ckw4v6c844wrfksi9gdq3shm";
1711− libraryHaskellDepends = [
1712− base bytestring conduit conduit-combinators containers directory
1713− exceptions fast-logger filepath gitlib hlibgit2 lifted-async
1714− lifted-base mmorph monad-control monad-loops mtl resourcet stm
1715− stm-conduit tagged template-haskell text text-icu time transformers
1716− transformers-base
1717− ];
1718− testHaskellDepends = [
1719− base exceptions gitlib gitlib-test hspec hspec-expectations HUnit
1720− transformers
1721− ];
1722− doHaddock = false;
1723− doCheck = false;
1724− description = "Libgit2 backend for gitlib";
1725− license = stdenv.lib.licenses.mit;
1726− }) {};
1727− "gitlib-test" = callPackage
1728− ({ mkDerivation, base, bytestring, conduit, conduit-combinators
1729− , exceptions, gitlib, hspec, hspec-expectations, HUnit
1730− , monad-control, tagged, text, time, transformers
1731− }:
1732− mkDerivation {
1733− pname = "gitlib-test";
1734− version = "3.1.0.3";
1735− sha256 = "07r970d6m15gri6xim71kl2vvml85jlb0vc51zb67gfsd6iby2py";
1736− libraryHaskellDepends = [
1737− base bytestring conduit conduit-combinators exceptions gitlib hspec
1738− hspec-expectations HUnit monad-control tagged text time
1739− transformers
1740− ];
1741− doHaddock = false;
1742− doCheck = false;
1743− description = "Test library for confirming gitlib backend compliance";
1744− license = stdenv.lib.licenses.mit;
1745− }) {};
17461608 "gitrev" = callPackage
17471609 ({ mkDerivation, base, base-compat, directory, filepath, process
17481610 , template-haskell
@@ -1754,8 +1616,6 @@ self: {
17541616 libraryHaskellDepends = [
17551617 base base-compat directory filepath process template-haskell
17561618 ];
1757− doHaddock = false;
1758− doCheck = false;
17591619 homepage = "https://github.com/acfoltzer/gitrev";
17601620 description = "Compile git revision info into Haskell projects";
17611621 license = stdenv.lib.licenses.bsd3;
@@ -1770,28 +1630,25 @@ self: {
17701630 isExecutable = true;
17711631 libraryHaskellDepends = [ base haskell-src-exts ];
17721632 executableHaskellDepends = [ base ];
1773− doHaddock = false;
1774− doCheck = false;
17751633 description = "Pretty printing for well-behaved Show instances";
17761634 license = stdenv.lib.licenses.bsd3;
17771635 }) {};
17781636 "hackage-db" = callPackage
1779− ({ mkDerivation, base, bytestring, Cabal, containers, directory
1780− , filepath, tar, utf8-string
1637+ ({ mkDerivation, aeson, base, bytestring, Cabal, containers
1638+ , directory, filepath, tar, time, utf8-string
17811639 }:
17821640 mkDerivation {
17831641 pname = "hackage-db";
1784− version = "1.22";
1785− sha256 = "0rhh7w4929zkwzv10ika952yiw4dkffqd8f79f1bl76lz1la6cjd";
1786− revision = "1";
1787− editedCabalFile = "0xj3wwf0wl8qfcz4zsxw0r6f79rg7h010jfv54gsiyzwpf67l9xm";
1642+ version = "2.0.1";
1643+ sha256 = "13ggj72i8dxwh3qwznnqxbr00nvsbapyyhzx5zybfacddnpw3aph";
1644+ isLibrary = true;
1645+ isExecutable = true;
17881646 libraryHaskellDepends = [
1789− base bytestring Cabal containers directory filepath tar utf8-string
1647+ aeson base bytestring Cabal containers directory filepath tar time
1648+ utf8-string
17901649 ];
1791− doHaddock = false;
1792− doCheck = false;
1793− homepage = "http://github.com/peti/hackage-db";
1794− description = "access Hackage's package database via Data.Map";
1650+ homepage = "https://github.com/peti/hackage-db#readme";
1651+ description = "Access Hackage's package database via Data.Map";
17951652 license = stdenv.lib.licenses.bsd3;
17961653 }) {};
17971654 "happy" = callPackage
@@ -1800,10 +1657,10 @@ self: {
18001657 }:
18011658 mkDerivation {
18021659 pname = "happy";
1803− version = "1.19.5";
1804− sha256 = "1nj353q4z1g186fpjzf0dnsg71qhxqpamx8jy89rjjvv3p0kmw32";
1660+ version = "1.19.9";
1661+ sha256 = "138xpxdb7x62lpmgmb6b3v3vgdqqvqn4273jaap3mjmc2gla709y";
18051662 revision = "2";
1806− editedCabalFile = "1dvhv94lzmya938i5crshg9qbx7dxvkyxkhfbqimxkydxn7l2w7w";
1663+ editedCabalFile = "1zxi8zfwiwxidrhr0yj5srpzp32z66sld9xv0k4yz7046rkl3577";
18071664 isLibrary = false;
18081665 isExecutable = true;
18091666 setupHaskellDepends = [ base Cabal directory filepath ];
@@ -1811,9 +1668,9 @@ self: {
18111668 testHaskellDepends = [ base process ];
18121669 doHaddock = false;
18131670 doCheck = false;
1814− homepage = "http://www.haskell.org/happy/";
1671+ homepage = "https://www.haskell.org/happy/";
18151672 description = "Happy is a parser generator for Haskell";
1816− license = stdenv.lib.licenses.bsd3;
1673+ license = stdenv.lib.licenses.bsd2;
18171674 }) {};
18181675 "hashable" = callPackage
18191676 ({ mkDerivation, base, bytestring, criterion, deepseq, ghc-prim
@@ -1822,10 +1679,8 @@ self: {
18221679 }:
18231680 mkDerivation {
18241681 pname = "hashable";
1825− version = "1.2.6.1";
1826− sha256 = "0ymv2mcrrgbdc2w39rib171fwnhg7fgp0sy4h8amrh1vw64qgjll";
1827− revision = "2";
1828− editedCabalFile = "0w4756sa04nk2bw3vnysb0y9d09zzg3c77aydkjfxz1hnl1dvnjn";
1682+ version = "1.2.7.0";
1683+ sha256 = "1gra8gq3kb7b2sd845h55yxlrfqx3ii004c6vjhga8v0b30fzdgc";
18291684 isLibrary = true;
18301685 isExecutable = true;
18311686 libraryHaskellDepends = [
@@ -1838,22 +1693,21 @@ self: {
18381693 benchmarkHaskellDepends = [
18391694 base bytestring criterion ghc-prim integer-gmp siphash text
18401695 ];
1841− doHaddock = false;
1842− doCheck = false;
18431696 homepage = "http://github.com/tibbe/hashable";
18441697 description = "A class for types that can be converted to a hash value";
18451698 license = stdenv.lib.licenses.bsd3;
18461699 }) {};
1847− "hashable-time" = callPackage
1848− ({ mkDerivation, base, hashable, time }:
1700+ "hashtables" = callPackage
1701+ ({ mkDerivation, base, ghc-prim, hashable, primitive, vector }:
18491702 mkDerivation {
1850− pname = "hashable-time";
1851− version = "0.2.0.1";
1852− sha256 = "0k932nyd08l3xxbh2g3n76py2f4kd9yw4s5a065vjz0xp6wjnxdm";
1853− libraryHaskellDepends = [ base hashable time ];
1854− doHaddock = false;
1855− doCheck = false;
1856− description = "Hashable instances for Data.Time";
1703+ pname = "hashtables";
1704+ version = "1.2.3.1";
1705+ sha256 = "1giw9caajr07slf09j7zry9b0kvm4yj9q78zy1mawzi6gk3wglcg";
1706+ libraryHaskellDepends = [
1707+ base ghc-prim hashable primitive vector
1708+ ];
1709+ homepage = "http://github.com/gregorycollins/hashtables";
1710+ description = "Mutable hash tables in the ST monad";
18571711 license = stdenv.lib.licenses.bsd3;
18581712 }) {};
18591713 "haskell-lexer" = callPackage
@@ -1863,8 +1717,6 @@ self: {
18631717 version = "1.0.1";
18641718 sha256 = "0rj3r1pk88hh3sk3mj61whp8czz5kpxhbc78xlr04bxwqjrjmm6p";
18651719 libraryHaskellDepends = [ base ];
1866− doHaddock = false;
1867− doCheck = false;
18681720 description = "A fully compliant Haskell 98 lexer";
18691721 license = stdenv.lib.licenses.bsd3;
18701722 }) {};
@@ -1875,16 +1727,14 @@ self: {
18751727 }:
18761728 mkDerivation {
18771729 pname = "haskell-src-exts";
1878− version = "1.18.2";
1879− sha256 = "0hq9f6r67gkhad4cc4dhahrwrz9kxfibhk8qrw5j0p7cvh23hn1i";
1730+ version = "1.20.2";
1731+ sha256 = "1sm3z4v1p5yffg01ldgavz71s3bvfhjfa13k428rk14bpkl8crlz";
18801732 libraryHaskellDepends = [ array base cpphs ghc-prim pretty ];
18811733 libraryToolDepends = [ happy ];
18821734 testHaskellDepends = [
18831735 base containers directory filepath mtl pretty-show smallcheck tasty
18841736 tasty-golden tasty-smallcheck
18851737 ];
1886− doHaddock = false;
1887− doCheck = false;
18881738 homepage = "https://github.com/haskell-suite/haskell-src-exts";
18891739 description = "Manipulating Haskell source: abstract syntax, lexer, parser, and pretty-printer";
18901740 license = stdenv.lib.licenses.bsd3;
@@ -1896,8 +1746,8 @@ self: {
18961746 }:
18971747 mkDerivation {
18981748 pname = "haskell-src-meta";
1899− version = "0.8.0.1";
1900− sha256 = "1i5f21mx061k50nl3pvvffjqsbvvldl50y8d4b9b31g63l0jg5q9";
1749+ version = "0.8.0.3";
1750+ sha256 = "08jq156zv4m0fjq6712n99c1jwxnpa6kj6sq8ch0r1l0a1ay6ww4";
19011751 libraryHaskellDepends = [
19021752 base haskell-src-exts pretty syb template-haskell th-orphans
19031753 ];
@@ -1905,11 +1755,52 @@ self: {
19051755 base haskell-src-exts HUnit pretty template-haskell test-framework
19061756 test-framework-hunit
19071757 ];
1908− doHaddock = false;
1909− doCheck = false;
19101758 description = "Parse source to template-haskell abstract syntax";
19111759 license = stdenv.lib.licenses.bsd3;
19121760 }) {};
1761+ "heaps" = callPackage
1762+ ({ mkDerivation, base, Cabal, cabal-doctest, directory, doctest
1763+ , filepath
1764+ }:
1765+ mkDerivation {
1766+ pname = "heaps";
1767+ version = "0.3.6";
1768+ sha256 = "1cnxgmxxvl053yv93vcz5fnla4iir5g9wr697n88ysdyybbkq70q";
1769+ revision = "3";
1770+ editedCabalFile = "0k6wsm1hwn3vaxdvw8p7cidxg7p8zply2ig4w4qrbpyjhl6dj9x9";
1771+ setupHaskellDepends = [ base Cabal cabal-doctest ];
1772+ libraryHaskellDepends = [ base ];
1773+ testHaskellDepends = [ base directory doctest filepath ];
1774+ homepage = "http://github.com/ekmett/heaps/";
1775+ description = "Asymptotically optimal Brodal/Okasaki heaps";
1776+ license = stdenv.lib.licenses.bsd3;
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+ }) {};
19131804 "hex" = callPackage
19141805 ({ mkDerivation, base, bytestring }:
19151806 mkDerivation {
@@ -1917,8 +1808,6 @@ self: {
19171808 version = "0.1.2";
19181809 sha256 = "1v31xiaivrrn0q2jz8919wvkjplv1kxna5ajhsj701fqxm1i5vhj";
19191810 libraryHaskellDepends = [ base bytestring ];
1920− doHaddock = false;
1921− doCheck = false;
19221811 description = "Convert strings into hexadecimal and back";
19231812 license = stdenv.lib.licenses.bsd3;
19241813 }) {};
@@ -1932,8 +1821,6 @@ self: {
19321821 librarySystemDepends = [ openssl ];
19331822 testHaskellDepends = [ base process ];
19341823 testToolDepends = [ git ];
1935− doHaddock = false;
1936− doCheck = false;
19371824 description = "Low-level bindings to libgit2";
19381825 license = stdenv.lib.licenses.mit;
19391826 }) {inherit (pkgs) git; inherit (pkgs) openssl;};
@@ -1949,8 +1836,6 @@ self: {
19491836 libraryHaskellDepends = [ base bytestring ];
19501837 librarySystemDepends = [ openssl ];
19511838 testHaskellDepends = [ base doctest HUnit ];
1952− doHaddock = false;
1953− doCheck = false;
19541839 homepage = "http://github.com/peti/hopenssl";
19551840 description = "FFI Bindings to OpenSSL's EVP Digest Interface";
19561841 license = stdenv.lib.licenses.bsd3;
@@ -1962,32 +1847,79 @@ self: {
19621847 version = "1.0";
19631848 sha256 = "0p6gm4328946qxc295zb6vhwhf07l1fma82vd0siylnsnsqxlhwv";
19641849 libraryHaskellDepends = [ base ];
1965− doHaddock = false;
1966− doCheck = false;
19671850 description = "A very simple package providing a cross-platform means of determining the hostname";
19681851 license = stdenv.lib.licenses.bsd3;
19691852 }) {};
19701853 "hourglass" = callPackage
1971− ({ mkDerivation, base, bytestring, criterion, deepseq, mtl
1972− , old-locale, tasty, tasty-hunit, tasty-quickcheck, time
1854+ ({ mkDerivation, base, bytestring, deepseq, gauge, mtl, old-locale
1855+ , tasty, tasty-hunit, tasty-quickcheck, time
19731856 }:
19741857 mkDerivation {
19751858 pname = "hourglass";
1976− version = "0.2.10";
1977− sha256 = "104d1yd84hclprg740nkz60vx589mnm094zriw6zczbgg8nkclym";
1859+ version = "0.2.11";
1860+ sha256 = "0lag9sgj7ndrbfmab6jhszlv413agg0zzaj5r9f2fmf07wqbp9hq";
19781861 libraryHaskellDepends = [ base deepseq ];
19791862 testHaskellDepends = [
19801863 base deepseq mtl old-locale tasty tasty-hunit tasty-quickcheck time
19811864 ];
19821865 benchmarkHaskellDepends = [
1983− base bytestring criterion deepseq mtl old-locale time
1866+ base bytestring deepseq gauge mtl old-locale time
19841867 ];
1985− doHaddock = false;
1986− doCheck = false;
19871868 homepage = "https://github.com/vincenthz/hs-hourglass";
19881869 description = "simple performant time related library";
19891870 license = stdenv.lib.licenses.bsd3;
19901871 }) {};
1872+ "hpack" = callPackage
1873+ ({ mkDerivation, aeson, base, bifunctors, bytestring, Cabal
1874+ , containers, cryptonite, deepseq, directory, filepath, Glob, hspec
1875+ , http-client, http-client-tls, http-types, HUnit, interpolate
1876+ , mockery, pretty, QuickCheck, scientific, template-haskell
1877+ , temporary, text, transformers, unordered-containers, vector, yaml
1878+ }:
1879+ mkDerivation {
1880+ pname = "hpack";
1881+ version = "0.28.2";
1882+ sha256 = "18w0h76jdp3mk9vin8da9iz3cwhcxmw787xy8wlh8bxcpcr16q5r";
1883+ isLibrary = true;
1884+ isExecutable = true;
1885+ libraryHaskellDepends = [
1886+ aeson base bifunctors bytestring Cabal containers cryptonite
1887+ deepseq directory filepath Glob http-client http-client-tls
1888+ http-types pretty scientific text transformers unordered-containers
1889+ vector yaml
1890+ ];
1891+ executableHaskellDepends = [
1892+ aeson base bifunctors bytestring Cabal containers cryptonite
1893+ deepseq directory filepath Glob http-client http-client-tls
1894+ http-types pretty scientific text transformers unordered-containers
1895+ vector yaml
1896+ ];
1897+ testHaskellDepends = [
1898+ aeson base bifunctors bytestring Cabal containers cryptonite
1899+ deepseq directory filepath Glob hspec http-client http-client-tls
1900+ http-types HUnit interpolate mockery pretty QuickCheck scientific
1901+ template-haskell temporary text transformers unordered-containers
1902+ vector yaml
1903+ ];
1904+ homepage = "https://github.com/sol/hpack#readme";
1905+ description = "An alternative format for Haskell packages";
1906+ license = stdenv.lib.licenses.mit;
1907+ }) {};
1908+ "hscolour" = callPackage
1909+ ({ mkDerivation, base, containers }:
1910+ mkDerivation {
1911+ pname = "hscolour";
1912+ version = "1.24.4";
1913+ sha256 = "079jwph4bwllfp03yfr26s5zc6m6kw3nhb1cggrifh99haq34cr4";
1914+ isLibrary = true;
1915+ isExecutable = true;
1916+ enableSeparateDataOutput = true;
1917+ libraryHaskellDepends = [ base containers ];
1918+ executableHaskellDepends = [ base containers ];
1919+ homepage = "http://code.haskell.org/~malcolm/hscolour/";
1920+ description = "Colourise Haskell code";
1921+ license = "LGPL";
1922+ }) {};
19911923 "hspec" = callPackage
19921924 ({ mkDerivation, base, call-stack, directory, hspec-core
19931925 , hspec-discover, hspec-expectations, hspec-meta, HUnit, QuickCheck
@@ -1995,8 +1927,8 @@ self: {
19951927 }:
19961928 mkDerivation {
19971929 pname = "hspec";
1998− version = "2.4.4";
1999− sha256 = "08fg8w38xbhidw3pfn13ag3mnpp3rb1lzp7xpq47cncwv92k46mh";
1930+ version = "2.5.5";
1931+ sha256 = "1yv4k5b5kkig2q3waj28587sq28wms7wfav5a3lq4dra6jybimfm";
20001932 libraryHaskellDepends = [
20011933 base call-stack hspec-core hspec-discover hspec-expectations HUnit
20021934 QuickCheck transformers
@@ -2006,52 +1938,50 @@ self: {
20061938 hspec-expectations hspec-meta HUnit QuickCheck stringbuilder
20071939 transformers
20081940 ];
2009− doHaddock = false;
2010− doCheck = false;
20111941 homepage = "http://hspec.github.io/";
20121942 description = "A Testing Framework for Haskell";
20131943 license = stdenv.lib.licenses.mit;
20141944 }) {};
20151945 "hspec-core" = callPackage
2016− ({ mkDerivation, ansi-terminal, array, async, base, call-stack
1946+ ({ mkDerivation, ansi-terminal, array, base, call-stack, clock
20171947 , deepseq, directory, filepath, hspec-expectations, hspec-meta
20181948 , HUnit, process, QuickCheck, quickcheck-io, random, setenv
2019− , silently, temporary, tf-random, time, transformers
1949+ , silently, stm, temporary, tf-random, transformers
20201950 }:
20211951 mkDerivation {
20221952 pname = "hspec-core";
2023− version = "2.4.4";
2024− sha256 = "1pxzr3l8b9640mh904n51nwlr2338wak23781s48a9kzvwf347b0";
1953+ version = "2.5.5";
1954+ sha256 = "1vfrqlpn32s9wiykmkxbnrnd5p56yznw20pf8fwzw78ar4wpz55x";
20251955 libraryHaskellDepends = [
2026− ansi-terminal array async base call-stack deepseq directory
1956+ ansi-terminal array base call-stack clock deepseq directory
20271957 filepath hspec-expectations HUnit QuickCheck quickcheck-io random
2028− setenv tf-random time transformers
1958+ setenv stm tf-random transformers
20291959 ];
20301960 testHaskellDepends = [
2031− ansi-terminal array async base call-stack deepseq directory
1961+ ansi-terminal array base call-stack clock deepseq directory
20321962 filepath hspec-expectations hspec-meta HUnit process QuickCheck
2033− quickcheck-io random setenv silently temporary tf-random time
1963+ quickcheck-io random setenv silently stm temporary tf-random
20341964 transformers
20351965 ];
2036− doHaddock = false;
2037− doCheck = false;
1966+ testTarget = "--test-option=--skip --test-option='Test.Hspec.Core.Runner.hspecResult runs specs in parallel'";
20381967 homepage = "http://hspec.github.io/";
20391968 description = "A Testing Framework for Haskell";
20401969 license = stdenv.lib.licenses.mit;
20411970 }) {};
20421971 "hspec-discover" = callPackage
2043− ({ mkDerivation, base, directory, filepath, hspec-meta }:
1972+ ({ mkDerivation, base, directory, filepath, hspec-meta, QuickCheck
1973+ }:
20441974 mkDerivation {
20451975 pname = "hspec-discover";
2046− version = "2.4.4";
2047− sha256 = "0isx9nc59nw8pkh4r6ynd55dghqnzgrzn9pvrq6ail1y5z3knhkn";
1976+ version = "2.5.5";
1977+ sha256 = "04aidzi91ccr9bygmfkjzshz34z9vh8wvqj4zinx2clxq6r7gqfz";
20481978 isLibrary = true;
20491979 isExecutable = true;
20501980 libraryHaskellDepends = [ base directory filepath ];
20511981 executableHaskellDepends = [ base directory filepath ];
2052− testHaskellDepends = [ base directory filepath hspec-meta ];
2053− doHaddock = false;
2054− doCheck = false;
1982+ testHaskellDepends = [
1983+ base directory filepath hspec-meta QuickCheck
1984+ ];
20551985 homepage = "http://hspec.github.io/";
20561986 description = "Automatically discover and run Hspec tests";
20571987 license = stdenv.lib.licenses.mit;
@@ -2064,8 +1994,6 @@ self: {
20641994 sha256 = "1vxl9zazbaapijr6zmcj72j9wf7ka1pirrjbwddwwddg3zm0g5l1";
20651995 libraryHaskellDepends = [ base call-stack HUnit ];
20661996 testHaskellDepends = [ base call-stack HUnit nanospec ];
2067− doHaddock = false;
2068− doCheck = false;
20691997 homepage = "https://github.com/hspec/hspec-expectations#readme";
20701998 description = "Catchy combinators for HUnit";
20711999 license = stdenv.lib.licenses.mit;
@@ -2076,16 +2004,12 @@ self: {
20762004 }:
20772005 mkDerivation {
20782006 pname = "hspec-megaparsec";
2079− version = "0.3.1";
2080− sha256 = "0kaif74f1qq92nvksnq12h0imsrr02q1nawgprbg1s9cpilq2vw2";
2007+ version = "1.0.0";
2008+ sha256 = "1dafrbzjm7rzwvcpjpk3bsg7bd111xfij94n17sh8wfykzhim5hl";
20812009 libraryHaskellDepends = [
20822010 base containers hspec-expectations megaparsec
20832011 ];
2084− testHaskellDepends = [
2085− base containers hspec hspec-expectations megaparsec
2086− ];
2087− doHaddock = false;
2088− doCheck = false;
2012+ testHaskellDepends = [ base hspec hspec-expectations megaparsec ];
20892013 homepage = "https://github.com/mrkkrp/hspec-megaparsec";
20902014 description = "Utility functions for testing Megaparsec parsers with Hspec";
20912015 license = stdenv.lib.licenses.bsd3;
@@ -2097,8 +2021,8 @@ self: {
20972021 }:
20982022 mkDerivation {
20992023 pname = "hspec-meta";
2100− version = "2.4.4";
2101− sha256 = "117n4j56wfh48xj02mv0wkp10bkr2xkyvwg7n7r2ynp03wrf9ykm";
2024+ version = "2.4.6";
2025+ sha256 = "0qmvk01n79j6skn79r6zalg2pd0x0nqqn9qn8mhg0pgyzcdnfc9b";
21022026 isLibrary = true;
21032027 isExecutable = true;
21042028 libraryHaskellDepends = [
@@ -2111,76 +2035,71 @@ self: {
21112035 filepath hspec-expectations HUnit QuickCheck quickcheck-io random
21122036 setenv time transformers
21132037 ];
2114− doHaddock = false;
2115− doCheck = false;
21162038 homepage = "http://hspec.github.io/";
21172039 description = "A version of Hspec which is used to test Hspec itself";
21182040 license = stdenv.lib.licenses.mit;
21192041 }) {};
21202042 "hspec-smallcheck" = callPackage
2121− ({ mkDerivation, base, hspec, hspec-core, QuickCheck, smallcheck }:
2043+ ({ mkDerivation, base, base-orphans, call-stack, hspec, hspec-core
2044+ , HUnit, QuickCheck, smallcheck
2045+ }:
21222046 mkDerivation {
21232047 pname = "hspec-smallcheck";
2124− version = "0.4.2";
2125− sha256 = "1lsy71ri0lfvs6w1drwa4p69bcy0nrpb62dah3bg4vqwxfrd82ds";
2126− libraryHaskellDepends = [ base hspec-core smallcheck ];
2048+ version = "0.5.2";
2049+ sha256 = "06c1ym793zkdwi4bxk5f4l7m1n1bg5jmnm0p68q2pa9rlhk1lc4s";
2050+ libraryHaskellDepends = [
2051+ base call-stack hspec-core HUnit smallcheck
2052+ ];
21272053 testHaskellDepends = [
2128− base hspec hspec-core QuickCheck smallcheck
2054+ base base-orphans call-stack hspec hspec-core HUnit QuickCheck
2055+ smallcheck
21292056 ];
2130− doHaddock = false;
2131− doCheck = false;
21322057 homepage = "http://hspec.github.io/";
21332058 description = "SmallCheck support for the Hspec testing framework";
21342059 license = stdenv.lib.licenses.mit;
21352060 }) {};
21362061 "html-conduit" = callPackage
2137− ({ mkDerivation, base, bytestring, conduit, conduit-extra
2138− , containers, hspec, HUnit, resourcet, tagstream-conduit, text
2062+ ({ mkDerivation, attoparsec, base, bytestring, conduit
2063+ , conduit-extra, containers, deepseq, hspec, HUnit, resourcet, text
21392064 , transformers, xml-conduit, xml-types
21402065 }:
21412066 mkDerivation {
21422067 pname = "html-conduit";
2143− version = "1.2.1.1";
2144− sha256 = "1a5878axl1w65rv3g76d8fwgzbwazikna885jz5156zrrdq79hlq";
2145− revision = "2";
2146− editedCabalFile = "1fhna6ck1v05zpf4c715phz102v8vz0p7lsjk3fljmxblamc8kn6";
2068+ version = "1.3.1";
2069+ sha256 = "0dg3sblihi93qn6ax1cwha0cng4zlpmic83ckdylq7s7kwa3rhbi";
21472070 libraryHaskellDepends = [
2148− base bytestring conduit conduit-extra containers resourcet
2149− tagstream-conduit text transformers xml-conduit xml-types
2071+ attoparsec base bytestring conduit conduit-extra containers
2072+ resourcet text transformers xml-conduit xml-types
21502073 ];
21512074 testHaskellDepends = [
2152− base bytestring containers hspec HUnit xml-conduit
2075+ base bytestring containers deepseq hspec HUnit text xml-conduit
21532076 ];
2154− doHaddock = false;
2155− doCheck = false;
21562077 homepage = "https://github.com/snoyberg/xml";
21572078 description = "Parse HTML documents using xml-conduit datatypes";
21582079 license = stdenv.lib.licenses.mit;
21592080 }) {};
21602081 "http-client" = callPackage
2161− ({ mkDerivation, array, async, base, base64-bytestring
2162− , blaze-builder, bytestring, case-insensitive, containers, cookie
2163− , deepseq, directory, exceptions, filepath, ghc-prim, hspec
2164− , http-types, mime-types, monad-control, network, network-uri
2165− , random, streaming-commons, text, time, transformers, zlib
2082+ ({ mkDerivation, array, async, base, blaze-builder, bytestring
2083+ , case-insensitive, containers, cookie, deepseq, directory
2084+ , exceptions, filepath, ghc-prim, hspec, http-types, memory
2085+ , mime-types, monad-control, network, network-uri, random, stm
2086+ , streaming-commons, text, time, transformers, zlib
21662087 }:
21672088 mkDerivation {
21682089 pname = "http-client";
2169− version = "0.5.7.0";
2170− sha256 = "18zza3smv5fn5clgq2nij0wqnakh950xif9lwlfqbkam5k1flhg2";
2090+ version = "0.5.13.1";
2091+ sha256 = "0szwbgvkkdz56lgi91armkagmb7nnfwbpp4j7cm9zhmffv3ba8g1";
21712092 libraryHaskellDepends = [
2172− array base base64-bytestring blaze-builder bytestring
2173− case-insensitive containers cookie deepseq exceptions filepath
2174− ghc-prim http-types mime-types network network-uri random
2175− streaming-commons text time transformers
2093+ array base blaze-builder bytestring case-insensitive containers
2094+ cookie deepseq exceptions filepath ghc-prim http-types memory
2095+ mime-types network network-uri random stm streaming-commons text
2096+ time transformers
21762097 ];
21772098 testHaskellDepends = [
2178− async base base64-bytestring blaze-builder bytestring
2179− case-insensitive containers deepseq directory hspec http-types
2180− monad-control network network-uri streaming-commons text time
2181− transformers zlib
2099+ async base blaze-builder bytestring case-insensitive containers
2100+ deepseq directory hspec http-types monad-control network
2101+ network-uri streaming-commons text time transformers zlib
21822102 ];
2183− doHaddock = false;
21842103 doCheck = false;
21852104 homepage = "https://github.com/snoyberg/http-client";
21862105 description = "An HTTP client engine";
@@ -2188,22 +2107,23 @@ self: {
21882107 }) {};
21892108 "http-client-tls" = callPackage
21902109 ({ mkDerivation, base, bytestring, case-insensitive, connection
2191− , containers, criterion, cryptonite, data-default-class, exceptions
2110+ , containers, cryptonite, data-default-class, exceptions, gauge
21922111 , hspec, http-client, http-types, memory, network, network-uri
21932112 , text, tls, transformers
21942113 }:
21952114 mkDerivation {
21962115 pname = "http-client-tls";
2197− version = "0.3.5.1";
2198− sha256 = "0n4mi8z77qaggfyq17z79cl304nf1f4h6gag60v4wjwghvmj7yn1";
2116+ version = "0.3.5.3";
2117+ sha256 = "0qj3pcpgbsfsc4m52dz35khhl4hf1i0nmcpa445z82d9567vy6j7";
21992118 libraryHaskellDepends = [
22002119 base bytestring case-insensitive connection containers cryptonite
22012120 data-default-class exceptions http-client http-types memory network
22022121 network-uri text tls transformers
22032122 ];
2204− testHaskellDepends = [ base hspec http-client http-types ];
2205− benchmarkHaskellDepends = [ base criterion http-client ];
2206− doHaddock = false;
2123+ testHaskellDepends = [
2124+ base connection hspec http-client http-types
2125+ ];
2126+ benchmarkHaskellDepends = [ base gauge http-client ];
22072127 doCheck = false;
22082128 homepage = "https://github.com/snoyberg/http-client";
22092129 description = "http-client backend using the connection package and tls library";
@@ -2212,29 +2132,28 @@ self: {
22122132 "http-conduit" = callPackage
22132133 ({ mkDerivation, aeson, base, blaze-builder, bytestring
22142134 , case-insensitive, conduit, conduit-extra, connection, cookie
2215− , data-default-class, exceptions, hspec, http-client
2216− , http-client-tls, http-types, HUnit, lifted-base, monad-control
2217− , mtl, network, resourcet, streaming-commons, temporary, text, time
2218− , transformers, utf8-string, wai, wai-conduit, warp, warp-tls
2135+ , data-default-class, hspec, http-client, http-client-tls
2136+ , http-types, HUnit, mtl, network, resourcet, streaming-commons
2137+ , temporary, text, time, transformers, unliftio, unliftio-core
2138+ , utf8-string, wai, wai-conduit, warp, warp-tls
22192139 }:
22202140 mkDerivation {
22212141 pname = "http-conduit";
2222− version = "2.2.3.2";
2223− sha256 = "1f0yqka43gp7vhv7yr4q6pqr8qw0qq2yh4y2lnayhc876zpw6ng3";
2142+ version = "2.3.2";
2143+ sha256 = "1iay4hr0mj8brkxvgkv1liqa8irl9axfc3qhn8qsvcyq4n1l95km";
2144+ revision = "1";
2145+ editedCabalFile = "0g6rg8r33q5rmrx5287vjfcqwjacchgzyfc8aqqrhrfz3fq5ll0g";
22242146 libraryHaskellDepends = [
2225− aeson base bytestring conduit conduit-extra exceptions http-client
2226− http-client-tls http-types lifted-base monad-control mtl resourcet
2227− transformers
2147+ aeson base bytestring conduit conduit-extra http-client
2148+ http-client-tls http-types mtl resourcet transformers unliftio-core
22282149 ];
22292150 testHaskellDepends = [
22302151 aeson base blaze-builder bytestring case-insensitive conduit
22312152 conduit-extra connection cookie data-default-class hspec
2232− http-client http-types HUnit lifted-base network resourcet
2233− streaming-commons temporary text time transformers utf8-string wai
2153+ http-client http-types HUnit network resourcet streaming-commons
2154+ temporary text time transformers unliftio utf8-string wai
22342155 wai-conduit warp warp-tls
22352156 ];
2236− doHaddock = false;
2237− doCheck = false;
22382157 homepage = "http://www.yesodweb.com/book/http-conduit";
22392158 description = "HTTP client package with conduit interface and HTTPS support";
22402159 license = stdenv.lib.licenses.bsd3;
@@ -2245,35 +2164,29 @@ self: {
22452164 }:
22462165 mkDerivation {
22472166 pname = "http-date";
2248− version = "0.0.6.1";
2249− sha256 = "0dknh28kyarnzqrsc80ssalxjrq0qbv7ir49247p2grb7rh0dqgj";
2250− libraryHaskellDepends = [ array attoparsec base bytestring ];
2167+ version = "0.0.7";
2168+ sha256 = "1hpzs646qqzp2g2qy7rx1bf3knf1hw38n82vcq6bs4mm1xzdryff";
2169+ libraryHaskellDepends = [ array attoparsec base bytestring time ];
22512170 testHaskellDepends = [
22522171 base bytestring doctest hspec old-locale time
22532172 ];
2254− doHaddock = false;
2255− doCheck = false;
22562173 description = "HTTP Date parser/formatter";
22572174 license = stdenv.lib.licenses.bsd3;
22582175 }) {};
22592176 "http-types" = callPackage
2260− ({ mkDerivation, array, base, blaze-builder, bytestring
2261− , case-insensitive, doctest, hspec, QuickCheck
2262− , quickcheck-instances, text
2177+ ({ mkDerivation, array, base, bytestring, case-insensitive, doctest
2178+ , hspec, QuickCheck, quickcheck-instances, text
22632179 }:
22642180 mkDerivation {
22652181 pname = "http-types";
2266− version = "0.9.1";
2267− sha256 = "0l7mnvqyppxpnq6ds4a9f395zdbl22z3sxiry1myfs8wvj669vbv";
2182+ version = "0.12.1";
2183+ sha256 = "1wv9k6nlvkdsxwlr7gaynphvzmvi5211gvwq96mbcxgk51a739rz";
22682184 libraryHaskellDepends = [
2269− array base blaze-builder bytestring case-insensitive text
2185+ array base bytestring case-insensitive text
22702186 ];
22712187 testHaskellDepends = [
2272− base blaze-builder bytestring doctest hspec QuickCheck
2273− quickcheck-instances text
2188+ base bytestring doctest hspec QuickCheck quickcheck-instances text
22742189 ];
2275− doHaddock = false;
2276− doCheck = false;
22772190 homepage = "https://github.com/aristidb/http-types";
22782191 description = "Generic HTTP types for Haskell (for both client and server code)";
22792192 license = stdenv.lib.licenses.bsd3;
@@ -2295,11 +2208,6 @@ self: {
22952208 array base bytestring bytestring-builder case-insensitive
22962209 containers psqueues stm
22972210 ];
2298− executableHaskellDepends = [
2299− aeson aeson-pretty array base bytestring bytestring-builder
2300− case-insensitive containers directory filepath hex text
2301− unordered-containers vector word8
2302− ];
23032211 testHaskellDepends = [
23042212 aeson aeson-pretty array base bytestring bytestring-builder
23052213 case-insensitive containers directory doctest filepath Glob hex
@@ -2309,12 +2217,24 @@ self: {
23092217 array base bytestring case-insensitive containers criterion
23102218 hashtables heaps mwc-random psqueues stm
23112219 ];
2312− doHaddock = false;
2313− doCheck = false;
23142220 homepage = "https://github.com/kazu-yamamoto/http2";
23152221 description = "HTTP/2 library including frames, priority queues and HPACK";
23162222 license = stdenv.lib.licenses.bsd3;
23172223 }) {};
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+ }) {};
23182238 "ieee754" = callPackage
23192239 ({ mkDerivation, base }:
23202240 mkDerivation {
@@ -2322,28 +2242,25 @@ self: {
23222242 version = "0.8.0";
23232243 sha256 = "1lcs521g9lzy9d7337vg4w7q7s8500rfqy7rcifcz6pm6yfgyb8f";
23242244 libraryHaskellDepends = [ base ];
2325− doHaddock = false;
2326− doCheck = false;
23272245 homepage = "http://github.com/patperry/hs-ieee754";
23282246 description = "Utilities for dealing with IEEE floating point numbers";
23292247 license = stdenv.lib.licenses.bsd3;
23302248 }) {};
23312249 "inflections" = callPackage
2332− ({ mkDerivation, base, exceptions, hspec, hspec-megaparsec
2333− , megaparsec, QuickCheck, text, unordered-containers
2250+ ({ mkDerivation, base, containers, exceptions, hspec
2251+ , hspec-megaparsec, megaparsec, QuickCheck, text
2252+ , unordered-containers
23342253 }:
23352254 mkDerivation {
23362255 pname = "inflections";
2337− version = "0.3.0.0";
2338− sha256 = "1w96i4rnsxxzrjjvqzjs7dqbs4h4nrdw84cxvizb4bq19y0cp483";
2256+ version = "0.4.0.3";
2257+ sha256 = "028dj9pgs5g6qb9x1hc8r4rn0rznr1ynn79vln48k2llyf2r38dx";
23392258 libraryHaskellDepends = [
23402259 base exceptions megaparsec text unordered-containers
23412260 ];
23422261 testHaskellDepends = [
2343− base hspec hspec-megaparsec megaparsec QuickCheck text
2262+ base containers hspec hspec-megaparsec megaparsec QuickCheck text
23442263 ];
2345− doHaddock = false;
2346− doCheck = false;
23472264 homepage = "https://github.com/stackbuilders/inflections-hs";
23482265 description = "Inflections library for Haskell";
23492266 license = stdenv.lib.licenses.mit;
@@ -2352,13 +2269,13 @@ self: {
23522269 ({ mkDerivation, attoparsec, base, text, unordered-containers }:
23532270 mkDerivation {
23542271 pname = "ini";
2355− version = "0.3.5";
2356− sha256 = "1iicavbjr4qmlcdxh32cgqxlxd80xvzyxxskrs3hji1qzrnq7lxz";
2272+ version = "0.3.6";
2273+ sha256 = "1n9wsl7nz910bc8jx9ps7pvpql4hlnryjkqbdpfq0phjb9sf7fzw";
2274+ revision = "1";
2275+ editedCabalFile = "0gfikdal67aws20i5r4wg4r0lgn844glykcn3nnmbmyvwsks049l";
23572276 libraryHaskellDepends = [
23582277 attoparsec base text unordered-containers
23592278 ];
2360− doHaddock = false;
2361− doCheck = false;
23622279 homepage = "http://github.com/chrisdone/ini";
23632280 description = "Quick and easy configuration files in the INI format";
23642281 license = stdenv.lib.licenses.bsd3;
@@ -2367,23 +2284,62 @@ self: {
23672284 ({ mkDerivation, array, base, ghc-prim, integer-gmp }:
23682285 mkDerivation {
23692286 pname = "integer-logarithms";
2370− version = "1.0.2";
2371− sha256 = "0w5mhak181zi6qr5h2zbcs9ymaqacisp9jwk99naz6s8zz5rq1ii";
2287+ version = "1.0.2.1";
2288+ sha256 = "1wj8kgjg5bn2yrs4zh9qfjv85cx6w998j9pi39yrbv305944mb9j";
23722289 libraryHaskellDepends = [ array base ghc-prim integer-gmp ];
2373− doHaddock = false;
23742290 doCheck = false;
23752291 homepage = "https://github.com/phadej/integer-logarithms";
23762292 description = "Integer logarithms";
23772293 license = stdenv.lib.licenses.mit;
23782294 }) {};
2295+ "interpolate" = callPackage
2296+ ({ mkDerivation, base, base-compat, bytestring, haskell-src-meta
2297+ , hspec, QuickCheck, quickcheck-instances, template-haskell, text
2298+ }:
2299+ mkDerivation {
2300+ pname = "interpolate";
2301+ version = "0.2.0";
2302+ sha256 = "1gkaj98yz363v38fv78sqby236mp8yqwqcilx7kr2b9z0w3204bf";
2303+ libraryHaskellDepends = [ base haskell-src-meta template-haskell ];
2304+ testHaskellDepends = [
2305+ base base-compat bytestring haskell-src-meta hspec QuickCheck
2306+ quickcheck-instances template-haskell text
2307+ ];
2308+ homepage = "https://github.com/sol/interpolate#readme";
2309+ description = "String interpolation done right";
2310+ license = stdenv.lib.licenses.mit;
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+ }) {};
23792335 "iproute" = callPackage
23802336 ({ mkDerivation, appar, base, byteorder, containers, doctest, hspec
23812337 , network, QuickCheck, safe
23822338 }:
23832339 mkDerivation {
23842340 pname = "iproute";
2385− version = "1.7.1";
2386− sha256 = "1viyxq3m1aifl05w0hxwrhhhcfpmvwz4ymil2gngi4nfm0yd1f2p";
2341+ version = "1.7.5";
2342+ sha256 = "1vw1nm3s8vz1hqnjnqd3wh5rr4q3m2r4izn5ynhf93h9185qwqzd";
23872343 libraryHaskellDepends = [
23882344 appar base byteorder containers network
23892345 ];
@@ -2391,48 +2347,68 @@ self: {
23912347 appar base byteorder containers doctest hspec network QuickCheck
23922348 safe
23932349 ];
2394− doHaddock = false;
2395− doCheck = false;
23962350 homepage = "http://www.mew.org/~kazu/proj/iproute/";
23972351 description = "IP Routing Table";
23982352 license = stdenv.lib.licenses.bsd3;
23992353 }) {};
2354+ "js-flot" = callPackage
2355+ ({ mkDerivation, base, HTTP }:
2356+ mkDerivation {
2357+ pname = "js-flot";
2358+ version = "0.8.3";
2359+ sha256 = "0yjyzqh3qzhy5h3nql1fckw0gcfb0f4wj9pm85nafpfqp2kg58hv";
2360+ enableSeparateDataOutput = true;
2361+ libraryHaskellDepends = [ base ];
2362+ testHaskellDepends = [ base HTTP ];
2363+ homepage = "https://github.com/ndmitchell/js-flot#readme";
2364+ description = "Obtain minified flot code";
2365+ license = stdenv.lib.licenses.mit;
2366+ }) {};
2367+ "js-jquery" = callPackage
2368+ ({ mkDerivation, base, HTTP }:
2369+ mkDerivation {
2370+ pname = "js-jquery";
2371+ version = "3.3.1";
2372+ sha256 = "16q68jzbs7kp07dnq8cprdcc8fd41rim38039vg0w4x11lgniq70";
2373+ enableSeparateDataOutput = true;
2374+ libraryHaskellDepends = [ base ];
2375+ testHaskellDepends = [ base HTTP ];
2376+ homepage = "https://github.com/ndmitchell/js-jquery#readme";
2377+ description = "Obtain minified jQuery code";
2378+ license = stdenv.lib.licenses.mit;
2379+ }) {};
24002380 "kan-extensions" = callPackage
24012381 ({ mkDerivation, adjunctions, array, base, comonad, containers
2402− , contravariant, distributive, fail, free, mtl, semigroupoids
2403− , tagged, transformers
2382+ , contravariant, distributive, free, invariant, mtl, profunctors
2383+ , semigroupoids, tagged, transformers, transformers-compat
24042384 }:
24052385 mkDerivation {
24062386 pname = "kan-extensions";
2407− version = "5.0.2";
2408− sha256 = "0bj88bgwxlx490f5r979idsm9dpdsb0ldzar9sa0jhj2jn2xx7hw";
2387+ version = "5.2";
2388+ sha256 = "1lyvyiwwh962j2nnnsqzlvp5zq6z8p3spvhmji99cjvldxc7wwkb";
24092389 libraryHaskellDepends = [
24102390 adjunctions array base comonad containers contravariant
2411− distributive fail free mtl semigroupoids tagged transformers
2391+ distributive free invariant mtl profunctors semigroupoids tagged
2392+ transformers transformers-compat
24122393 ];
2413− doHaddock = false;
2414− doCheck = false;
24152394 homepage = "http://github.com/ekmett/kan-extensions/";
2416− 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";
24172396 license = stdenv.lib.licenses.bsd3;
24182397 }) {};
24192398 "keys" = callPackage
24202399 ({ mkDerivation, array, base, comonad, containers, free, hashable
2421− , semigroupoids, semigroups, transformers, transformers-compat
2422− , unordered-containers
2400+ , semigroupoids, semigroups, tagged, transformers
2401+ , transformers-compat, unordered-containers
24232402 }:
24242403 mkDerivation {
24252404 pname = "keys";
2426− version = "3.11";
2427− sha256 = "1cn45h27hxwb4ci1iyd2qn0fzyb2y85qq4821a9xm37bwsvrgwqc";
2428− revision = "1";
2429− editedCabalFile = "1lyg4wyi7mkqvbfl9lvfln3j4vys47jih56zyjba7nx36kbw185i";
2405+ version = "3.12.1";
2406+ sha256 = "1yqm4gpshsgswx6w78z64c83gpydh6jhgslx2lnc10nzhy0s9kkz";
24302407 libraryHaskellDepends = [
24312408 array base comonad containers free hashable semigroupoids
2432− semigroups transformers transformers-compat unordered-containers
2409+ semigroups tagged transformers transformers-compat
2410+ unordered-containers
24332411 ];
2434− doHaddock = false;
2435− doCheck = false;
24362412 homepage = "http://github.com/ekmett/keys/";
24372413 description = "Keyed functors and containers";
24382414 license = stdenv.lib.licenses.bsd3;
@@ -2444,8 +2420,6 @@ self: {
24442420 version = "0.2.4";
24452421 sha256 = "1nxcs7g8a1sp91bzpy4cj6s31k5pvc3gvig04cbrggv5cvjidnhl";
24462422 libraryHaskellDepends = [ base regex-posix template-haskell ];
2447− doHaddock = false;
2448− doCheck = false;
24492423 homepage = "http://github.com/finnsson/template-helper";
24502424 description = "Module to automatically extract functions from the local code";
24512425 license = stdenv.lib.licenses.bsd3;
@@ -2466,8 +2440,6 @@ self: {
24662440 testHaskellDepends = [
24672441 base base-compat Cabal deepseq doctest lens pretty QuickCheck
24682442 ];
2469− doHaddock = false;
2470− doCheck = false;
24712443 homepage = "https://github.com/peti/language-nix#readme";
24722444 description = "Data types and useful functions to represent and manipulate the Nix language";
24732445 license = stdenv.lib.licenses.bsd3;
@@ -2486,8 +2458,10 @@ self: {
24862458 }:
24872459 mkDerivation {
24882460 pname = "lens";
2489− version = "4.15.4";
2490− sha256 = "1lkwlnhgpgnsz046mw4qs0fa7h4l012gilrr3nf3spllsy3pnbkl";
2461+ version = "4.16.1";
2462+ sha256 = "1im4drhbydbawd6i0jsrzpqihnmx4ywpkg7yg94ddwsw3mxwkgpm";
2463+ revision = "2";
2464+ editedCabalFile = "11h83lj5mba4grhz1qx3irz10ysm9c3k7k6i6xv2cr60q8xin3ri";
24912465 setupHaskellDepends = [ base Cabal cabal-doctest filepath ];
24922466 libraryHaskellDepends = [
24932467 array base base-orphans bifunctors bytestring call-stack comonad
@@ -2508,49 +2482,48 @@ self: {
25082482 base bytestring comonad containers criterion deepseq
25092483 generic-deriving transformers unordered-containers vector
25102484 ];
2511− doHaddock = false;
2512− doCheck = false;
25132485 homepage = "http://github.com/ekmett/lens/";
25142486 description = "Lenses, Folds and Traversals";
25152487 license = stdenv.lib.licenses.bsd2;
25162488 }) {};
25172489 "lifted-async" = callPackage
25182490 ({ mkDerivation, async, base, constraints, criterion, deepseq
2519− , HUnit, lifted-base, monad-control, mtl, tasty, tasty-hunit
2520− , tasty-th, transformers-base
2491+ , HUnit, lifted-base, monad-control, mtl, tasty
2492+ , tasty-expected-failure, tasty-hunit, tasty-th, transformers-base
25212493 }:
25222494 mkDerivation {
25232495 pname = "lifted-async";
2524− version = "0.9.3";
2525− sha256 = "0qdlc64kf02g97rzpragm4943ppy2cx74kbjcpbv32jcyc3q75wp";
2496+ version = "0.10.0.2";
2497+ sha256 = "1073r512c1x2m1v0jar9bwqg656slg7jd1jhsyj6m8awgx1l1mwf";
25262498 libraryHaskellDepends = [
25272499 async base constraints lifted-base monad-control transformers-base
25282500 ];
25292501 testHaskellDepends = [
2530− async base HUnit lifted-base monad-control mtl tasty tasty-hunit
2531− tasty-th
2502+ async base HUnit lifted-base monad-control mtl tasty
2503+ tasty-expected-failure tasty-hunit tasty-th
25322504 ];
25332505 benchmarkHaskellDepends = [ async base criterion deepseq ];
2534− doHaddock = false;
2535− doCheck = false;
25362506 homepage = "https://github.com/maoe/lifted-async";
25372507 description = "Run lifted IO operations asynchronously and wait for their results";
25382508 license = stdenv.lib.licenses.bsd3;
25392509 }) {};
25402510 "lifted-base" = callPackage
2541− ({ mkDerivation, base, criterion, monad-control, monad-peel
2542− , transformers, transformers-base
2511+ ({ mkDerivation, base, criterion, HUnit, monad-control, monad-peel
2512+ , test-framework, test-framework-hunit, transformers
2513+ , transformers-base, transformers-compat
25432514 }:
25442515 mkDerivation {
25452516 pname = "lifted-base";
2546− version = "0.2.3.11";
2547− sha256 = "1ass00wfa91z5xp2xmm97xrvwm7j5hdkxid5cqvr3xbwrsgpmi4f";
2517+ version = "0.2.3.12";
2518+ sha256 = "1i8p8d3rkdh21bhgjjh32vd7qqjr7jq7p59qds0aw2kmargsjd61";
25482519 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+ ];
25492524 benchmarkHaskellDepends = [
25502525 base criterion monad-control monad-peel transformers
25512526 ];
2552− doHaddock = false;
2553− doCheck = false;
25542527 homepage = "https://github.com/basvandijk/lifted-base";
25552528 description = "lifted IO operations from the base library";
25562529 license = stdenv.lib.licenses.bsd3;
@@ -2563,8 +2536,6 @@ self: {
25632536 sha256 = "0d0lwxxgd16is9aw6v3ps4r9prv3dj8xscmm45fvzq3nicjiawcf";
25642537 libraryHaskellDepends = [ base call-stack transformers ];
25652538 testHaskellDepends = [ base hspec ];
2566− doHaddock = false;
2567− doCheck = false;
25682539 homepage = "https://github.com/sol/logging-facade#readme";
25692540 description = "Simple logging abstraction that allows multiple back-ends";
25702541 license = stdenv.lib.licenses.mit;
@@ -2576,8 +2547,6 @@ self: {
25762547 version = "0.6.0.2";
25772548 sha256 = "07hnirv6snnym2r7iijlfz00b60jpy2856zvqxh989q0in7bd0hi";
25782549 libraryHaskellDepends = [ base mtl ];
2579− doHaddock = false;
2580− doCheck = false;
25812550 homepage = "http://code.haskell.org/~dolio/";
25822551 description = "A backtracking logic-programming monad";
25832552 license = stdenv.lib.licenses.bsd3;
@@ -2589,8 +2558,10 @@ self: {
25892558 }:
25902559 mkDerivation {
25912560 pname = "lucid";
2592− version = "2.9.8.1";
2593− sha256 = "026s82bh3a4lgmpy9445i5f6q0iiqpc8cxxx8rhmn32nrqhf187b";
2561+ version = "2.9.10";
2562+ sha256 = "14238cnrvkbr81hpaqg1r342sryj8k0p6igkwf140s9phfpdzry0";
2563+ revision = "1";
2564+ editedCabalFile = "0n94x2havrvks85z8azsa4pvz33amhb444cias3kfxmkyvypn5ah";
25942565 libraryHaskellDepends = [
25952566 base blaze-builder bytestring containers hashable mmorph mtl text
25962567 transformers unordered-containers
@@ -2601,8 +2572,6 @@ self: {
26012572 benchmarkHaskellDepends = [
26022573 base blaze-builder bytestring criterion deepseq text transformers
26032574 ];
2604− doHaddock = false;
2605− doCheck = false;
26062575 homepage = "https://github.com/chrisdone/lucid";
26072576 description = "Clear to write, read and edit DSL for HTML";
26082577 license = stdenv.lib.licenses.bsd3;
@@ -2624,65 +2593,82 @@ self: {
26242593 test-framework-hunit test-framework-quickcheck2 vector
26252594 vector-th-unbox
26262595 ];
2627− doHaddock = false;
26282596 doCheck = false;
26292597 homepage = "https://github.com/bos/math-functions";
26302598 description = "Special functions and Chebyshev polynomials";
26312599 license = stdenv.lib.licenses.bsd3;
26322600 }) {};
26332601 "megaparsec" = callPackage
2634− ({ mkDerivation, base, bytestring, containers, criterion, deepseq
2635− , exceptions, hspec, hspec-expectations, mtl, QuickCheck
2636− , scientific, text, transformers, weigh
2602+ ({ mkDerivation, base, bytestring, case-insensitive, containers
2603+ , criterion, deepseq, hspec, hspec-discover, hspec-expectations
2604+ , mtl, parser-combinators, QuickCheck, scientific, text
2605+ , transformers, weigh
26372606 }:
26382607 mkDerivation {
26392608 pname = "megaparsec";
2640− version = "5.3.1";
2641− sha256 = "06myn8l6jcbd494i3wr6q27npbbxd6c2gfkd2jdzwbjqjqbpv0j8";
2609+ version = "6.5.0";
2610+ sha256 = "12iggy7qpf8x93jm64zf0g215xwy779bqyfyjk2bhmxqqr1yzgdy";
2611+ revision = "2";
2612+ editedCabalFile = "0ahvqr29ym3g46yv2jxniccyn1ng1yqicqdbamkzm89gjnxd9n25";
26422613 libraryHaskellDepends = [
2643− base bytestring containers deepseq exceptions mtl QuickCheck
2644− scientific text transformers
2614+ base bytestring case-insensitive containers deepseq mtl
2615+ parser-combinators scientific text transformers
26452616 ];
26462617 testHaskellDepends = [
2647− base bytestring containers exceptions hspec hspec-expectations mtl
2648− QuickCheck scientific text transformers
2618+ base bytestring containers hspec hspec-expectations mtl QuickCheck
2619+ scientific text transformers
26492620 ];
2650− benchmarkHaskellDepends = [ base criterion deepseq weigh ];
2651− doHaddock = false;
2652− doCheck = false;
2621+ testToolDepends = [ hspec-discover ];
2622+ benchmarkHaskellDepends = [ base criterion deepseq text weigh ];
26532623 homepage = "https://github.com/mrkkrp/megaparsec";
26542624 description = "Monadic parser combinators";
26552625 license = stdenv.lib.licenses.bsd2;
26562626 }) {};
26572627 "memory" = callPackage
2658− ({ mkDerivation, base, bytestring, deepseq, foundation, ghc-prim
2659− , tasty, tasty-hunit, tasty-quickcheck
2628+ ({ mkDerivation, base, basement, bytestring, deepseq, foundation
2629+ , ghc-prim
26602630 }:
26612631 mkDerivation {
26622632 pname = "memory";
2663− version = "0.14.6";
2664− sha256 = "0q61zxdlgcw7wg244hb3c11qm5agrmnmln0h61sz2mj72xqc1pn7";
2633+ version = "0.14.16";
2634+ sha256 = "03rbszi5d4z9rlbfv8ydrl1xf84xsh8z57g07f7j9qccn9587c3v";
26652635 libraryHaskellDepends = [
2666− base bytestring deepseq foundation ghc-prim
2667− ];
2668− testHaskellDepends = [
2669− base foundation tasty tasty-hunit tasty-quickcheck
2636+ base basement bytestring deepseq foundation ghc-prim
26702637 ];
2671− doHaddock = false;
2672− doCheck = false;
2638+ testHaskellDepends = [ base basement bytestring foundation ];
26732639 homepage = "https://github.com/vincenthz/hs-memory";
26742640 description = "memory and related abstraction stuff";
26752641 license = stdenv.lib.licenses.bsd3;
26762642 }) {};
2643+ "microstache" = callPackage
2644+ ({ mkDerivation, aeson, base, bytestring, containers, deepseq
2645+ , directory, filepath, hspec, parsec, text, transformers
2646+ , unordered-containers, vector
2647+ }:
2648+ mkDerivation {
2649+ pname = "microstache";
2650+ version = "1.0.1.1";
2651+ sha256 = "0851sqr1ppdj6m822635pa3j6qzdf25gyrhkjs25zdry6518bsax";
2652+ revision = "2";
2653+ editedCabalFile = "0rl6vgmjnf1a14kiynh4gnmy6n6kkik9hqj9k5vqw68h4f110i4b";
2654+ libraryHaskellDepends = [
2655+ aeson base bytestring containers deepseq directory filepath parsec
2656+ text transformers unordered-containers vector
2657+ ];
2658+ testHaskellDepends = [
2659+ aeson base bytestring containers hspec parsec text
2660+ ];
2661+ homepage = "https://github.com/phadej/microstache";
2662+ description = "Mustache templates for Haskell";
2663+ license = stdenv.lib.licenses.bsd3;
2664+ }) {};
26772665 "mime-types" = callPackage
26782666 ({ mkDerivation, base, bytestring, containers, text }:
26792667 mkDerivation {
26802668 pname = "mime-types";
2681− version = "0.1.0.7";
2682− sha256 = "1fg9cqpp5lswk8ajlq4f41n12c2v2naz179l8dsz6zisjqj4l5l3";
2669+ version = "0.1.0.8";
2670+ sha256 = "14ccl2842ya17zyj0bpc7vzklbyqvvydpbypn69h2fmhgji192x8";
26832671 libraryHaskellDepends = [ base bytestring containers text ];
2684− doHaddock = false;
2685− doCheck = false;
26862672 homepage = "https://github.com/yesodweb/wai";
26872673 description = "Basic mime-type handling types and functions";
26882674 license = stdenv.lib.licenses.mit;
@@ -2691,15 +2677,11 @@ self: {
26912677 ({ mkDerivation, base, mtl, transformers, transformers-compat }:
26922678 mkDerivation {
26932679 pname = "mmorph";
2694− version = "1.0.9";
2695− sha256 = "0qs5alhy719a14lrs7rnh2qsn1146czg68gvgylf4m5jh4w7vwp1";
2696− revision = "1";
2697− editedCabalFile = "1xxf78qi08qsis2q785s0ra29wjxnxw8pyns0dsqp4a6cybd3mjd";
2680+ version = "1.1.2";
2681+ sha256 = "1gjz1ib968lqybma7my1n19qq6cdj6a7nskrlnwy4jy9jrwzs2n9";
26982682 libraryHaskellDepends = [
26992683 base mtl transformers transformers-compat
27002684 ];
2701− doHaddock = false;
2702− doCheck = false;
27032685 description = "Monad morphisms";
27042686 license = stdenv.lib.licenses.bsd3;
27052687 }) {};
@@ -2719,8 +2701,6 @@ self: {
27192701 base base-compat bytestring directory filepath hspec logging-facade
27202702 temporary
27212703 ];
2722− doHaddock = false;
2723− doCheck = false;
27242704 description = "Support functions for automated testing";
27252705 license = stdenv.lib.licenses.mit;
27262706 }) {};
@@ -2730,13 +2710,11 @@ self: {
27302710 }:
27312711 mkDerivation {
27322712 pname = "monad-control";
2733− version = "1.0.2.2";
2734− sha256 = "0cz4ww3vp96crdqrh7w86rzrs7gs8c1z7rq84yxxhbiz28fs4d0y";
2713+ version = "1.0.2.3";
2714+ sha256 = "1c92833gr6cadidjdp8mlznkpp8lyxl0w3y7d19y8yi3klc3843c";
27352715 libraryHaskellDepends = [
27362716 base stm transformers transformers-base transformers-compat
27372717 ];
2738− doHaddock = false;
2739− doCheck = false;
27402718 homepage = "https://github.com/basvandijk/monad-control";
27412719 description = "Lift control operations, like exception catching, through monad transformers";
27422720 license = stdenv.lib.licenses.bsd3;
@@ -2749,8 +2727,6 @@ self: {
27492727 sha256 = "062c2sn3hc8h50p1mhqkpyv6x8dydz2zh3ridvlfjq9nqimszaky";
27502728 libraryHaskellDepends = [ base ];
27512729 testHaskellDepends = [ base tasty tasty-hunit ];
2752− doHaddock = false;
2753− doCheck = false;
27542730 homepage = "https://github.com/mokus0/monad-loops";
27552731 description = "Monadic loops";
27562732 license = stdenv.lib.licenses.publicDomain;
@@ -2775,8 +2751,6 @@ self: {
27752751 test-framework-hunit test-framework-quickcheck2 test-framework-th
27762752 time
27772753 ];
2778− doHaddock = false;
2779− doCheck = false;
27802754 homepage = "https://github.com/simonmar/monad-par";
27812755 description = "A library for parallel programming based on a monad";
27822756 license = stdenv.lib.licenses.bsd3;
@@ -2792,70 +2766,39 @@ self: {
27922766 libraryHaskellDepends = [
27932767 abstract-par base cereal deepseq mtl random transformers
27942768 ];
2795− doHaddock = false;
2796− doCheck = false;
27972769 homepage = "https://github.com/simonmar/monad-par";
27982770 description = "Combinators and extra features for Par monads";
27992771 license = stdenv.lib.licenses.bsd3;
28002772 }) {};
2801− "monad-unlift" = callPackage
2802− ({ mkDerivation, base, constraints, monad-control, transformers
2803− , transformers-base
2773+ "monad-peel" = callPackage
2774+ ({ mkDerivation, base, extensible-exceptions, HUnit, test-framework
2775+ , test-framework-hunit, transformers
28042776 }:
28052777 mkDerivation {
2806− pname = "monad-unlift";
2807− version = "0.2.0";
2808− sha256 = "03zf2nd00ds12rrbp3qn7pr9vaw1npzswrzcnhc1k0p436366pjb";
2778+ pname = "monad-peel";
2779+ version = "0.2.1.2";
2780+ sha256 = "1x1kr5pk8ksw8xcm19c50jx8m0crf3m3qp73k31dnl9r1w4ykm9d";
28092781 libraryHaskellDepends = [
2810− base constraints monad-control transformers transformers-base
2782+ base extensible-exceptions transformers
28112783 ];
2812− doHaddock = false;
2813− doCheck = false;
2814− homepage = "https://github.com/fpco/monad-unlift";
2815− description = "Typeclasses for representing monad transformer unlifting";
2816− license = stdenv.lib.licenses.mit;
2817− }) {};
2818− "monad-unlift-ref" = callPackage
2819− ({ mkDerivation, base, constraints, exceptions, monad-control
2820− , monad-unlift, mtl, mutable-containers, resourcet, stm
2821− , transformers, transformers-base
2822− }:
2823− mkDerivation {
2824− pname = "monad-unlift-ref";
2825− version = "0.2.0";
2826− sha256 = "1qac8ijilndn4pcdf142f1vpqqaqrnh7zmq0jh86bpnwhhrwqym9";
2827− libraryHaskellDepends = [
2828− base constraints exceptions monad-control monad-unlift mtl
2829− mutable-containers resourcet stm transformers transformers-base
2784+ testHaskellDepends = [
2785+ base extensible-exceptions HUnit test-framework
2786+ test-framework-hunit transformers
28302787 ];
2831− doHaddock = false;
2832− doCheck = false;
2833− homepage = "https://github.com/fpco/monad-unlift";
2834− description = "Typeclasses for representing monad transformer unlifting";
2835− license = stdenv.lib.licenses.mit;
2836− }) {};
2837− "monads-tf" = callPackage
2838− ({ mkDerivation, base, transformers }:
2839− mkDerivation {
2840− pname = "monads-tf";
2841− version = "0.1.0.3";
2842− sha256 = "1wdhskwa6dw8qljbvwpyxj8ca6y95q2np7z4y4q6bpf4anmd5794";
2843− libraryHaskellDepends = [ base transformers ];
2844− doHaddock = false;
2845− doCheck = false;
2846− description = "Monad classes, using type families";
2788+ homepage = "http://andersk.mit.edu/haskell/monad-peel/";
2789+ description = "Lift control operations like exception catching through monad transformers";
28472790 license = stdenv.lib.licenses.bsd3;
28482791 }) {};
28492792 "mono-traversable" = callPackage
2850− ({ mkDerivation, base, bytestring, containers, criterion, foldl
2793+ ({ mkDerivation, base, bytestring, containers, foldl, gauge
28512794 , hashable, hspec, HUnit, mwc-random, QuickCheck, semigroups, split
28522795 , text, transformers, unordered-containers, vector
28532796 , vector-algorithms
28542797 }:
28552798 mkDerivation {
28562799 pname = "mono-traversable";
2857− version = "1.0.2.1";
2858− sha256 = "0smirpwika7d5a98h20jr9jqg41n7vqfy7k31crmn449qfig9ljf";
2800+ version = "1.0.8.1";
2801+ sha256 = "0d9r6z3a8gkhl1j5yq8hjg5wcndi5yixxm9xwbrf4z6pgdwr04lr";
28592802 libraryHaskellDepends = [
28602803 base bytestring containers hashable split text transformers
28612804 unordered-containers vector vector-algorithms
@@ -2864,10 +2807,8 @@ self: {
28642807 base bytestring containers foldl hspec HUnit QuickCheck semigroups
28652808 text transformers unordered-containers vector
28662809 ];
2867− benchmarkHaskellDepends = [ base criterion mwc-random vector ];
2868− doHaddock = false;
2869− doCheck = false;
2870− homepage = "https://github.com/snoyberg/mono-traversable";
2810+ benchmarkHaskellDepends = [ base gauge mwc-random vector ];
2811+ homepage = "https://github.com/snoyberg/mono-traversable#readme";
28712812 description = "Type classes for mapping, folding, and traversing monomorphic containers";
28722813 license = stdenv.lib.licenses.mit;
28732814 }) {};
@@ -2884,8 +2825,6 @@ self: {
28842825 base comonad containers dlist dlist-instances mono-traversable
28852826 semigroupoids semigroups transformers vector-instances
28862827 ];
2887− doHaddock = false;
2888− doCheck = false;
28892828 homepage = "https://github.com/snoyberg/mono-traversable#readme";
28902829 description = "Extra typeclass instances for mono-traversable";
28912830 license = stdenv.lib.licenses.mit;
@@ -2894,56 +2833,41 @@ self: {
28942833 ({ mkDerivation, base, transformers }:
28952834 mkDerivation {
28962835 pname = "mtl";
2897− version = "2.2.1";
2898− sha256 = "1icdbj2rshzn0m1zz5wa7v3xvkf6qw811p4s7jgqwvx1ydwrvrfa";
2899− revision = "1";
2900− editedCabalFile = "0fsa965g9h23mlfjzghmmhcb9dmaq8zpm374gby6iwgdx47q0njb";
2836+ version = "2.2.2";
2837+ sha256 = "1xmy5741h8cyy0d91ahvqdz2hykkk20l8br7lg1rccnkis5g80w8";
29012838 libraryHaskellDepends = [ base transformers ];
2902− doHaddock = false;
2903− doCheck = false;
2904− homepage = "http://github.com/ekmett/mtl";
2839+ homepage = "http://github.com/haskell/mtl";
29052840 description = "Monad classes, using functional dependencies";
29062841 license = stdenv.lib.licenses.bsd3;
29072842 }) {};
29082843 "mutable-containers" = callPackage
2909− ({ mkDerivation, base, containers, criterion, ghc-prim, hspec
2844+ ({ mkDerivation, base, containers, gauge, ghc-prim, hspec
29102845 , mono-traversable, primitive, QuickCheck, vector
29112846 }:
29122847 mkDerivation {
29132848 pname = "mutable-containers";
2914− version = "0.3.3";
2915− sha256 = "1svwa54prfdmhdlmv118lnkwv3jx3rx7v5x30wbdsy39n75kjyks";
2849+ version = "0.3.4";
2850+ sha256 = "0zhkhlvg9yw45fg3srvzx7j81547djpkfw7higdvlj7fmph6c6b4";
29162851 libraryHaskellDepends = [
29172852 base containers ghc-prim mono-traversable primitive vector
29182853 ];
29192854 testHaskellDepends = [
29202855 base containers hspec primitive QuickCheck vector
29212856 ];
2922− benchmarkHaskellDepends = [ base containers criterion ];
2923− doHaddock = false;
2924− doCheck = false;
2925− homepage = "https://github.com/snoyberg/mono-traversable";
2857+ benchmarkHaskellDepends = [ base containers gauge vector ];
2858+ homepage = "https://github.com/snoyberg/mono-traversable#readme";
29262859 description = "Abstactions and concrete implementations of mutable containers";
29272860 license = stdenv.lib.licenses.mit;
29282861 }) {};
29292862 "mwc-random" = callPackage
2930− ({ mkDerivation, base, HUnit, math-functions, primitive, QuickCheck
2931− , statistics, test-framework, test-framework-hunit
2932− , test-framework-quickcheck2, time, vector
2933− }:
2863+ ({ mkDerivation, base, math-functions, primitive, time, vector }:
29342864 mkDerivation {
29352865 pname = "mwc-random";
29362866 version = "0.13.6.0";
29372867 sha256 = "05j7yh0hh9nxic3dijmzv44kc6gzclvamdph7sq7w19wq57k6pq6";
2938− libraryHaskellDepends = [
2939− base math-functions primitive time vector
2940− ];
2941− testHaskellDepends = [
2942− base HUnit QuickCheck statistics test-framework
2943− test-framework-hunit test-framework-quickcheck2 vector
2868+ libraryHaskellDepends = [
2869+ base math-functions primitive time vector
29442870 ];
2945− doHaddock = false;
2946− doCheck = false;
29472871 homepage = "https://github.com/bos/mwc-random";
29482872 description = "Fast, high quality pseudo random number generation";
29492873 license = stdenv.lib.licenses.bsd3;
@@ -2952,12 +2876,11 @@ self: {
29522876 ({ mkDerivation, base, hspec, silently }:
29532877 mkDerivation {
29542878 pname = "nanospec";
2955− version = "0.2.1";
2956− sha256 = "0jq2l1lmy4hcl6r975xcg86xr1y7jfxr3qn27ibsmjbzlnxdkjyv";
2879+ version = "0.2.2";
2880+ sha256 = "1rcmhl9bhyfvanalnf1r86wkx6rq6wdvagnw1h011jcnnb1cq56g";
29572881 libraryHaskellDepends = [ base ];
29582882 testHaskellDepends = [ base hspec silently ];
2959− doHaddock = false;
2960− doCheck = false;
2883+ homepage = "https://github.com/hspec/nanospec#readme";
29612884 description = "A lightweight implementation of a subset of Hspec's API";
29622885 license = stdenv.lib.licenses.mit;
29632886 }) {};
@@ -2965,29 +2888,23 @@ self: {
29652888 ({ mkDerivation }:
29662889 mkDerivation {
29672890 pname = "nats";
2968− version = "1.1.1";
2969− sha256 = "1kfl2yy97nb7q0j17v96rl73xvi3z4db9bk0xychc76dax41n78k";
2891+ version = "1.1.2";
2892+ sha256 = "1v40drmhixck3pz3mdfghamh73l4rp71mzcviipv1y8jhrfxilmr";
2893+ revision = "1";
2894+ editedCabalFile = "1jzyysf758lfindlclqpzqcd0lrgrdv0rnz2lg8g1rvv07x2n7zh";
29702895 doHaddock = false;
2971− doCheck = false;
29722896 homepage = "http://github.com/ekmett/nats/";
29732897 description = "Natural numbers";
29742898 license = stdenv.lib.licenses.bsd3;
29752899 }) {};
29762900 "network" = callPackage
2977− ({ mkDerivation, base, bytestring, doctest, HUnit, test-framework
2978− , test-framework-hunit, unix
2979− }:
2901+ ({ mkDerivation, base, bytestring, doctest, hspec, HUnit, unix }:
29802902 mkDerivation {
29812903 pname = "network";
2982− version = "2.6.3.2";
2983− sha256 = "1dn092zfqmxfbzln6d0khka4gizzjivf2yja9w9hwb5g9q3pfi1m";
2984− revision = "1";
2985− editedCabalFile = "17234sy0vqic8g9wg8gmfmc0by50scjwbdk8bkcl9kjf3fvs4nyx";
2904+ version = "2.6.3.6";
2905+ sha256 = "198mam7ahny48p9fajznbqq16a8ya2gw0xm3gnm1si1rmc4hdplv";
29862906 libraryHaskellDepends = [ base bytestring unix ];
2987− testHaskellDepends = [
2988− base bytestring doctest HUnit test-framework test-framework-hunit
2989− ];
2990− doHaddock = false;
2907+ testHaskellDepends = [ base bytestring doctest hspec HUnit ];
29912908 doCheck = false;
29922909 homepage = "https://github.com/haskell/network";
29932910 description = "Low-level networking interface";
@@ -3008,8 +2925,6 @@ self: {
30082925 base HUnit test-framework test-framework-hunit
30092926 test-framework-quickcheck2
30102927 ];
3011− doHaddock = false;
3012− doCheck = false;
30132928 homepage = "https://github.com/haskell/network-uri";
30142929 description = "URI manipulation";
30152930 license = stdenv.lib.licenses.bsd3;
@@ -3023,8 +2938,6 @@ self: {
30232938 revision = "2";
30242939 editedCabalFile = "04b9vn007hlvsrx4ksd3r8r3kbyaj2kvwxchdrmd4370qzi8p6gs";
30252940 libraryHaskellDepends = [ base ];
3026− doHaddock = false;
3027− doCheck = false;
30282941 description = "locale library";
30292942 license = stdenv.lib.licenses.bsd3;
30302943 }) {};
@@ -3037,94 +2950,78 @@ self: {
30372950 revision = "2";
30382951 editedCabalFile = "1j6ln1dkvhdvnwl33bp0xf9lhc4sybqk0aw42p8cq81xwwzbn7y9";
30392952 libraryHaskellDepends = [ base old-locale ];
3040− doHaddock = false;
3041− doCheck = false;
30422953 description = "Time library";
30432954 license = stdenv.lib.licenses.bsd3;
30442955 }) {};
3045− "options" = callPackage
3046− ({ mkDerivation, base, containers, monads-tf, transformers }:
3047− mkDerivation {
3048− pname = "options";
3049− version = "1.2.1.1";
3050− sha256 = "0qjs0v1ny52w51n5582d4z8wy9h6n0zw1xb5dh686ff5wadflgi8";
3051− libraryHaskellDepends = [ base containers monads-tf transformers ];
3052− doHaddock = false;
3053− doCheck = false;
3054− homepage = "https://john-millikin.com/software/haskell-options/";
3055− description = "A powerful and easy-to-use command-line option parser";
3056− license = stdenv.lib.licenses.mit;
3057− }) {};
30582956 "optparse-applicative" = callPackage
3059− ({ mkDerivation, ansi-wl-pprint, base, process, QuickCheck
3060− , transformers, transformers-compat
2957+ ({ mkDerivation, ansi-wl-pprint, base, bytestring, process
2958+ , QuickCheck, transformers, transformers-compat
30612959 }:
30622960 mkDerivation {
30632961 pname = "optparse-applicative";
3064− version = "0.13.2.0";
3065− sha256 = "18kcjldpzay3k3309rvb9vqrp5b1gqp0hgymynqx7x2kgv7cz0sw";
2962+ version = "0.14.2.0";
2963+ sha256 = "0c3z1mvynlyv1garjbdmdd3npm40dabgm75js4r07cf766c1wd71";
30662964 libraryHaskellDepends = [
30672965 ansi-wl-pprint base process transformers transformers-compat
30682966 ];
3069− testHaskellDepends = [ base QuickCheck ];
3070− doHaddock = false;
3071− doCheck = false;
2967+ testHaskellDepends = [ base bytestring QuickCheck ];
30722968 homepage = "https://github.com/pcapriotti/optparse-applicative";
30732969 description = "Utilities and combinators for parsing command line options";
30742970 license = stdenv.lib.licenses.bsd3;
30752971 }) {};
30762972 "optparse-simple" = callPackage
3077− ({ mkDerivation, base, either, gitrev, optparse-applicative
3078− , template-haskell, transformers
2973+ ({ mkDerivation, base, bytestring, directory, gitrev
2974+ , optparse-applicative, template-haskell, transformers
30792975 }:
30802976 mkDerivation {
30812977 pname = "optparse-simple";
3082− version = "0.0.3";
3083− sha256 = "0zlcvxhx98k1akbv5fzsvwcrmb1rxsmmyaiwkhfrp5dxq6kg0is5";
2978+ version = "0.1.0";
2979+ sha256 = "1g2cf4pcf1fa001z77g8gwnx0cxdpqs1iw9xp0kb9qrxm9gpk3c3";
30842980 libraryHaskellDepends = [
3085− base either gitrev optparse-applicative template-haskell
3086− transformers
2981+ base gitrev optparse-applicative template-haskell transformers
30872982 ];
3088− doHaddock = false;
3089− doCheck = false;
2983+ testHaskellDepends = [ base bytestring directory ];
2984+ homepage = "https://github.com/fpco/optparse-simple#readme";
30902985 description = "Simple interface to optparse-applicative";
30912986 license = stdenv.lib.licenses.bsd3;
30922987 }) {};
30932988 "parallel" = callPackage
3094− ({ mkDerivation, array, base, containers, deepseq }:
2989+ ({ mkDerivation, array, base, containers, deepseq, ghc-prim }:
30952990 mkDerivation {
30962991 pname = "parallel";
3097− version = "3.2.1.1";
3098− sha256 = "05rw8zhpqhx31zi6vg7zpyciaarh24j7g2p613xrpyrnksybjfrj";
3099− libraryHaskellDepends = [ array base containers deepseq ];
3100− doHaddock = false;
3101− doCheck = false;
2992+ version = "3.2.2.0";
2993+ sha256 = "1xkfi96w6yfpppd0nw1rnszdxmvifwzm699ilv6332ra3akm610p";
2994+ libraryHaskellDepends = [ array base containers deepseq ghc-prim ];
31022995 description = "Parallel programming library";
31032996 license = stdenv.lib.licenses.bsd3;
31042997 }) {};
31052998 "parsec" = callPackage
3106− ({ mkDerivation, base, bytestring, mtl, text }:
2999+ ({ mkDerivation, base, bytestring, HUnit, mtl, test-framework
3000+ , test-framework-hunit, text
3001+ }:
31073002 mkDerivation {
31083003 pname = "parsec";
3109− version = "3.1.11";
3110− sha256 = "0vk7q9j2128q191zf1sg0ylj9s9djwayqk9747k0a5fin4f2b1vg";
3004+ version = "3.1.13.0";
3005+ sha256 = "1wc09pyn70p8z6llink10c8pqbh6ikyk554911yfwxv1g91swqbq";
3006+ revision = "1";
3007+ editedCabalFile = "1dpr1wfpykkl6kayp4wnyn0n1zv7pvqksax2i54dhdgjijj8qynd";
31113008 libraryHaskellDepends = [ base bytestring mtl text ];
3112− doHaddock = false;
3113− doCheck = false;
3114− homepage = "https://github.com/aslatter/parsec";
3009+ testHaskellDepends = [
3010+ base HUnit mtl test-framework test-framework-hunit
3011+ ];
3012+ homepage = "https://github.com/hvr/parsec";
31153013 description = "Monadic parser combinators";
31163014 license = stdenv.lib.licenses.bsd3;
31173015 }) {};
3118− "patience" = callPackage
3119− ({ mkDerivation, base, containers }:
3016+ "parser-combinators" = callPackage
3017+ ({ mkDerivation, base }:
31203018 mkDerivation {
3121− pname = "patience";
3122− version = "0.1.1";
3123− sha256 = "0qyv20gqy9pb1acy700ahv70lc6vprcwb26cc7fcpcs4scsc7irm";
3124− libraryHaskellDepends = [ base containers ];
3125− doHaddock = false;
3126− doCheck = false;
3127− description = "Patience diff and longest increasing subsequence";
3019+ pname = "parser-combinators";
3020+ version = "1.0.0";
3021+ sha256 = "1pwfdsklqwvaynwpdzmx1bs35mp6dpsyaqdnzxnqcrxwf5h8sk75";
3022+ libraryHaskellDepends = [ base ];
3023+ homepage = "https://github.com/mrkkrp/parser-combinators";
3024+ description = "Lightweight package providing commonly useful parser combinators";
31283025 license = stdenv.lib.licenses.bsd3;
31293026 }) {};
31303027 "pcre-light" = callPackage
@@ -3135,28 +3032,24 @@ self: {
31353032 sha256 = "0xcyi1fivwg7a92mch5bcqzmrfxzqj42rmb3m8kgs61x4qwpxj82";
31363033 libraryHaskellDepends = [ base bytestring ];
31373034 libraryPkgconfigDepends = [ pcre ];
3138− doHaddock = false;
3139− doCheck = false;
31403035 homepage = "https://github.com/Daniel-Diaz/pcre-light";
31413036 description = "Portable regex library for Perl 5 compatible regular expressions";
31423037 license = stdenv.lib.licenses.bsd3;
31433038 }) {inherit (pkgs) pcre;};
31443039 "pem" = callPackage
3145− ({ mkDerivation, base, base64-bytestring, bytestring, HUnit, mtl
3040+ ({ mkDerivation, base, basement, bytestring, HUnit, memory
31463041 , QuickCheck, test-framework, test-framework-hunit
31473042 , test-framework-quickcheck2
31483043 }:
31493044 mkDerivation {
31503045 pname = "pem";
3151− version = "0.2.2";
3152− sha256 = "162sk5sg22w21wqz5qv8kx6ibxp99v5p20g3nknhm1kddk3hha1p";
3153− libraryHaskellDepends = [ base base64-bytestring bytestring mtl ];
3046+ version = "0.2.4";
3047+ sha256 = "1m7qjsxrd8m88cvkqmr8kscril500j2a9y0iynvksjyjkhdlq33p";
3048+ libraryHaskellDepends = [ base basement bytestring memory ];
31543049 testHaskellDepends = [
31553050 base bytestring HUnit QuickCheck test-framework
31563051 test-framework-hunit test-framework-quickcheck2
31573052 ];
3158− doHaddock = false;
3159− doCheck = false;
31603053 homepage = "http://github.com/vincenthz/hs-pem";
31613054 description = "Privacy Enhanced Mail (PEM) format reader and writer";
31623055 license = stdenv.lib.licenses.bsd3;
@@ -3168,17 +3061,15 @@ self: {
31683061 }:
31693062 mkDerivation {
31703063 pname = "pointed";
3171− version = "5";
3172− sha256 = "05sxac90xv4j8glmf2mxs0smmv6vhia0qaaag5v37ar5a6pvh1l9";
3064+ version = "5.0.1";
3065+ sha256 = "1p91a762xglckscnhpflxzav8byf49a02mli3983i4kpr2jkaimr";
31733066 revision = "1";
3174− editedCabalFile = "170gqax34qch77zzqwq95z2lzq9da8gmfxg1vcll4aphhafwgzzp";
3067+ editedCabalFile = "1ccjmzz3jf5ybrzv7qdwm3qb8rz0yskvi4ackrixyhdk8bg5f3nc";
31753068 libraryHaskellDepends = [
31763069 base comonad containers data-default-class hashable kan-extensions
31773070 semigroupoids semigroups stm tagged transformers
31783071 transformers-compat unordered-containers
31793072 ];
3180− doHaddock = false;
3181− doCheck = false;
31823073 homepage = "http://github.com/ekmett/pointed/";
31833074 description = "Pointed and copointed data";
31843075 license = stdenv.lib.licenses.bsd3;
@@ -3190,42 +3081,36 @@ self: {
31903081 version = "1.12";
31913082 sha256 = "05dya1vdvq29hkhkdlsglzhw7bdn51rvs1javs0q75nf99c66k7m";
31923083 libraryHaskellDepends = [ base bytestring text ];
3193− doHaddock = false;
3194− doCheck = false;
31953084 homepage = "http://code.haskell.org/~malcolm/polyparse/";
31963085 description = "A variety of alternative parser combinator libraries";
31973086 license = "LGPL";
31983087 }) {};
3199− "prelude-extras" = callPackage
3200− ({ mkDerivation, base }:
3088+ "pretty-hex" = callPackage
3089+ ({ mkDerivation, base, bytestring }:
32013090 mkDerivation {
3202− pname = "prelude-extras";
3203− version = "0.4.0.3";
3204− sha256 = "0xzqdf3nl2h0ra4gnslm1m1nsxlsgc0hh6ky3vn578vh11zhifq9";
3205− libraryHaskellDepends = [ base ];
3206− doHaddock = false;
3207− doCheck = false;
3208− homepage = "http://github.com/ekmett/prelude-extras";
3209− description = "Higher order versions of Prelude classes";
3091+ pname = "pretty-hex";
3092+ version = "1.0";
3093+ sha256 = "0ylwkvvjvmpprha9nx83xb8gkhyanhk5fffc0r7lb96n4ch5z6pz";
3094+ libraryHaskellDepends = [ base bytestring ];
3095+ description = "A library for hex dumps of ByteStrings";
32103096 license = stdenv.lib.licenses.bsd3;
32113097 }) {};
32123098 "pretty-show" = callPackage
32133099 ({ mkDerivation, array, base, filepath, ghc-prim, happy
3214− , haskell-lexer, pretty
3100+ , haskell-lexer, pretty, text
32153101 }:
32163102 mkDerivation {
32173103 pname = "pretty-show";
3218− version = "1.6.13";
3219− sha256 = "1kbx72ybrpw0kh5zsd2kdw143qykbmd9lgmsvj57659y0k5l7fjm";
3104+ version = "1.7";
3105+ sha256 = "0br7pkxqqqhby2j2v1g847lgqsrasx56g1jw3dhmjh4flzs6warq";
32203106 isLibrary = true;
32213107 isExecutable = true;
3108+ enableSeparateDataOutput = true;
32223109 libraryHaskellDepends = [
3223− array base filepath ghc-prim haskell-lexer pretty
3110+ array base filepath ghc-prim haskell-lexer pretty text
32243111 ];
32253112 libraryToolDepends = [ happy ];
32263113 executableHaskellDepends = [ base ];
3227− doHaddock = false;
3228− doCheck = false;
32293114 homepage = "http://wiki.github.com/yav/pretty-show";
32303115 description = "Tools for working with derived `Show` instances and generic inspection of values";
32313116 license = stdenv.lib.licenses.mit;
@@ -3234,78 +3119,90 @@ self: {
32343119 ({ mkDerivation, base, ghc-prim, transformers }:
32353120 mkDerivation {
32363121 pname = "primitive";
3237− version = "0.6.2.0";
3238− sha256 = "1q9a537av81c0lvcdzc8i5hqjx3209f5448d1smkyaz22c1dgs5q";
3239− revision = "1";
3240− editedCabalFile = "0d61g8ppsdajdqykl2kc46kq00aamsf12v60ilgrf58dbji9sz56";
3122+ version = "0.6.3.0";
3123+ sha256 = "0mcmbnj08wd6zfwn7xk6zf5hy5zwbla5v78pw0dpymqg9s0gzpnd";
32413124 libraryHaskellDepends = [ base ghc-prim transformers ];
32423125 testHaskellDepends = [ base ghc-prim ];
3243− doHaddock = false;
3244− doCheck = false;
32453126 homepage = "https://github.com/haskell/primitive";
32463127 description = "Primitive memory-related operations";
32473128 license = stdenv.lib.licenses.bsd3;
32483129 }) {};
32493130 "profunctors" = callPackage
32503131 ({ mkDerivation, base, base-orphans, bifunctors, comonad
3251− , contravariant, distributive, tagged, transformers
3132+ , contravariant, distributive, semigroups, tagged, transformers
32523133 }:
32533134 mkDerivation {
32543135 pname = "profunctors";
3255− version = "5.2.1";
3256− sha256 = "0pcwjp813d3mrzb7qf7dzkspf85xnfj1m2snhjgnvwx6vw07w877";
3136+ version = "5.2.2";
3137+ sha256 = "0s1pwjidbn761xk43pmzyvn99hm3psdifjd78ylki7f97aiyd0g9";
3138+ revision = "2";
3139+ editedCabalFile = "1ywlg9z8nlhd2avgb8c6gbkv8zyk7hvc25926bafyg0m0k8y1amq";
32573140 libraryHaskellDepends = [
32583141 base base-orphans bifunctors comonad contravariant distributive
3259− tagged transformers
3142+ semigroups tagged transformers
32603143 ];
3261− doHaddock = false;
3262− doCheck = false;
32633144 homepage = "http://github.com/ekmett/profunctors/";
32643145 description = "Profunctors";
32653146 license = stdenv.lib.licenses.bsd3;
32663147 }) {};
32673148 "psqueues" = callPackage
3268− ({ mkDerivation, array, base, containers, criterion, deepseq
3269− , fingertree-psqueue, ghc-prim, hashable, HUnit, mtl, PSQueue
3270− , QuickCheck, random, tagged, test-framework, test-framework-hunit
3271− , test-framework-quickcheck2, unordered-containers
3149+ ({ mkDerivation, array, base, deepseq, ghc-prim, hashable, HUnit
3150+ , QuickCheck, tagged, test-framework, test-framework-hunit
3151+ , test-framework-quickcheck2
32723152 }:
32733153 mkDerivation {
32743154 pname = "psqueues";
3275− version = "0.2.3.0";
3276− sha256 = "19s36xkbpa8466y56bgcmrqxz7aq1fysliyvw79k2a76bpg9bv95";
3155+ version = "0.2.7.0";
3156+ sha256 = "1sjgc9bxh63kkdp59nbirx3xazr02ia5yhp4f4a0jnq1hj465wsc";
32773157 libraryHaskellDepends = [ base deepseq ghc-prim hashable ];
32783158 testHaskellDepends = [
32793159 array base deepseq ghc-prim hashable HUnit QuickCheck tagged
32803160 test-framework test-framework-hunit test-framework-quickcheck2
32813161 ];
3282− benchmarkHaskellDepends = [
3283− base containers criterion deepseq fingertree-psqueue ghc-prim
3284− hashable mtl PSQueue random unordered-containers
3285− ];
3286− doHaddock = false;
3287− doCheck = false;
32883162 description = "Pure priority search queues";
32893163 license = stdenv.lib.licenses.bsd3;
32903164 }) {};
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+ }) {};
32913184 "quickcheck-instances" = callPackage
3292− ({ mkDerivation, array, base, bytestring, containers, hashable
3293− , old-time, QuickCheck, scientific, text, time
3294− , unordered-containers, vector
3185+ ({ mkDerivation, array, base, base-compat, bytestring
3186+ , case-insensitive, containers, hashable, old-time, QuickCheck
3187+ , scientific, tagged, text, time, transformers, transformers-compat
3188+ , unordered-containers, uuid-types, vector
32953189 }:
32963190 mkDerivation {
32973191 pname = "quickcheck-instances";
3298− version = "0.3.12";
3299− sha256 = "1wwvkzpams7i0j7nk5qj8vvhj8x5zcbgbgrpczszgvshva4bkmfx";
3300− revision = "2";
3301− editedCabalFile = "1v1r7gidkjc2v4dw1id57raqnjqv4rc10pa2l6xhhg0dzrnw28a3";
3192+ version = "0.3.18";
3193+ sha256 = "1bh1pzz5fdcqvzdcirqxna6fnjms02min5md716299g5niz46w55";
3194+ revision = "1";
3195+ editedCabalFile = "1sngfq3v71bvgjsl8cj5kh65m3fziwy8dkvwjzs0kxfrzr87faly";
33023196 libraryHaskellDepends = [
3303− array base bytestring containers hashable old-time QuickCheck
3304− scientific text time unordered-containers vector
3197+ array base base-compat bytestring case-insensitive containers
3198+ hashable old-time QuickCheck scientific tagged text time
3199+ transformers transformers-compat unordered-containers uuid-types
3200+ vector
33053201 ];
3306− doHaddock = false;
3307− doCheck = false;
3308− homepage = "https://github.com/aslatter/qc-instances";
3202+ testHaskellDepends = [
3203+ base containers QuickCheck tagged uuid-types
3204+ ];
3205+ homepage = "https://github.com/phadej/qc-instances";
33093206 description = "Common quickcheck instances";
33103207 license = stdenv.lib.licenses.bsd3;
33113208 }) {};
@@ -3316,8 +3213,6 @@ self: {
33163213 version = "0.2.0";
33173214 sha256 = "08k4v7pkgjf30pv5j2dfv1gqv6hclxlniyq2sps8zq4zswcr2xzv";
33183215 libraryHaskellDepends = [ base HUnit QuickCheck ];
3319− doHaddock = false;
3320− doCheck = false;
33213216 homepage = "https://github.com/hspec/quickcheck-io#readme";
33223217 description = "Use HUnit assertions as QuickCheck properties";
33233218 license = stdenv.lib.licenses.mit;
@@ -3329,8 +3224,6 @@ self: {
33293224 version = "1.0.1.0";
33303225 sha256 = "0s43s1bzbg3gwsjgm7fpyksd1339f0m26dlw2famxwyzgvm0a80k";
33313226 libraryHaskellDepends = [ base QuickCheck ];
3332− doHaddock = false;
3333− doCheck = false;
33343227 homepage = "https://github.com/bos/quickcheck-unicode";
33353228 description = "Generator and shrink functions for testing Unicode-related software";
33363229 license = stdenv.lib.licenses.bsd2;
@@ -3345,8 +3238,6 @@ self: {
33453238 editedCabalFile = "1pv5d7bm2rgap7llp5vjsplrg048gvf0226y0v19gpvdsx7n4rvv";
33463239 libraryHaskellDepends = [ base time ];
33473240 testHaskellDepends = [ base ];
3348− doHaddock = false;
3349− doCheck = false;
33503241 description = "random number library";
33513242 license = stdenv.lib.licenses.bsd3;
33523243 }) {};
@@ -3354,11 +3245,9 @@ self: {
33543245 ({ mkDerivation, base, template-haskell }:
33553246 mkDerivation {
33563247 pname = "reflection";
3357− version = "2.1.2";
3358− sha256 = "0f9w0akbm6p8h7kzgcd2f6nnpw1wy84pqn45vfz1ch5j0hn8h2d9";
3248+ version = "2.1.4";
3249+ sha256 = "0kf4a5ijw6jfnfibjcrpdy9vzh1n6v2pxia8dhyyqdissiwc8bzj";
33593250 libraryHaskellDepends = [ base template-haskell ];
3360− doHaddock = false;
3361− doCheck = false;
33623251 homepage = "http://github.com/ekmett/reflection";
33633252 description = "Reifies arbitrary terms into types that can be reflected back into terms";
33643253 license = stdenv.lib.licenses.bsd3;
@@ -3370,8 +3259,6 @@ self: {
33703259 version = "0.93.2";
33713260 sha256 = "0y1j4h2pg12c853nzmczs263di7xkkmlnsq5dlp5wgbgl49mgp10";
33723261 libraryHaskellDepends = [ array base bytestring containers mtl ];
3373− doHaddock = false;
3374− doCheck = false;
33753262 homepage = "http://sourceforge.net/projects/lazy-regex";
33763263 description = "Replaces/Enhances Text.Regex";
33773264 license = stdenv.lib.licenses.bsd3;
@@ -3385,66 +3272,42 @@ self: {
33853272 libraryHaskellDepends = [
33863273 array base bytestring containers regex-base
33873274 ];
3388− doHaddock = false;
3389− doCheck = false;
33903275 homepage = "http://sourceforge.net/projects/lazy-regex";
33913276 description = "Replaces/Enhances Text.Regex";
33923277 license = stdenv.lib.licenses.bsd3;
33933278 }) {};
3394− "regex-tdfa" = callPackage
3395− ({ mkDerivation, array, base, bytestring, containers, ghc-prim, mtl
3396− , parsec, regex-base
3397− }:
3398− mkDerivation {
3399− pname = "regex-tdfa";
3400− version = "1.2.2";
3401− sha256 = "0f8x8wyr6m21g8dnxvnvalz5bsq37l125l6qhs0fscbvprsxc4nb";
3402− libraryHaskellDepends = [
3403− array base bytestring containers ghc-prim mtl parsec regex-base
3404− ];
3405− doHaddock = false;
3406− doCheck = false;
3407− homepage = "https://github.com/ChrisKuklewicz/regex-tdfa";
3408− description = "Replaces/Enhances Text.Regex";
3409− license = stdenv.lib.licenses.bsd3;
3410− }) {};
34113279 "resourcet" = callPackage
3412− ({ mkDerivation, base, containers, exceptions, hspec, lifted-base
3413− , mmorph, monad-control, mtl, transformers, transformers-base
3414− , transformers-compat
3280+ ({ mkDerivation, base, containers, exceptions, hspec, mtl
3281+ , primitive, transformers, unliftio-core
34153282 }:
34163283 mkDerivation {
34173284 pname = "resourcet";
3418− version = "1.1.9";
3419− sha256 = "1x9f2qz57agl3xljp1wi0ab51p13czrpf6qjp3506rl9dg99j6as";
3285+ version = "1.2.1";
3286+ sha256 = "0rzjzh34s36ssign7akqjnwnjxf11c3511wk7ky0xxy0dqmc2rg7";
34203287 libraryHaskellDepends = [
3421− base containers exceptions lifted-base mmorph monad-control mtl
3422− transformers transformers-base transformers-compat
3288+ base containers exceptions mtl primitive transformers unliftio-core
34233289 ];
3424− testHaskellDepends = [ base hspec lifted-base transformers ];
3425− doHaddock = false;
3426− doCheck = false;
3290+ testHaskellDepends = [ base exceptions hspec transformers ];
34273291 homepage = "http://github.com/snoyberg/conduit";
34283292 description = "Deterministic allocation and freeing of scarce resources";
34293293 license = stdenv.lib.licenses.bsd3;
34303294 }) {};
34313295 "retry" = callPackage
34323296 ({ mkDerivation, base, data-default-class, exceptions, ghc-prim
3433− , hspec, HUnit, mtl, QuickCheck, random, stm, time, transformers
3297+ , hedgehog, HUnit, mtl, random, stm, tasty, tasty-hedgehog
3298+ , tasty-hunit, time, transformers
34343299 }:
34353300 mkDerivation {
34363301 pname = "retry";
3437− version = "0.7.4.2";
3438− sha256 = "0z5ls9z5zcqkk3vbpl4wdgspi98n19m5i8mfian1fyxkf0jkj6sj";
3302+ version = "0.7.6.2";
3303+ sha256 = "0bmrp2h6pf43hr7sd6562qixw755h2xgszj700157pk2hxcz16ad";
34393304 libraryHaskellDepends = [
34403305 base data-default-class exceptions ghc-prim random transformers
34413306 ];
34423307 testHaskellDepends = [
3443− base data-default-class exceptions ghc-prim hspec HUnit mtl
3444− QuickCheck random stm time transformers
3308+ base data-default-class exceptions ghc-prim hedgehog HUnit mtl
3309+ random stm tasty tasty-hedgehog tasty-hunit time transformers
34453310 ];
3446− doHaddock = false;
3447− doCheck = false;
34483311 homepage = "http://github.com/Soostone/retry";
34493312 description = "Retry combinators for monadic actions that may fail";
34503313 license = stdenv.lib.licenses.bsd3;
@@ -3453,32 +3316,14 @@ self: {
34533316 ({ mkDerivation, base, deepseq, QuickCheck }:
34543317 mkDerivation {
34553318 pname = "safe";
3456− version = "0.3.15";
3457− sha256 = "0bbalr2n92akwcgdyl5ff45h8d4waamj1lp7ly6mdgda17k4lpm3";
3319+ version = "0.3.17";
3320+ sha256 = "0p3yaf5slvyz1cyy51jq64c5rlp8yzwim8iy2dlnk42if4gc9ibr";
34583321 libraryHaskellDepends = [ base ];
34593322 testHaskellDepends = [ base deepseq QuickCheck ];
3460− doHaddock = false;
3461− doCheck = false;
34623323 homepage = "https://github.com/ndmitchell/safe#readme";
34633324 description = "Library of safe (exception free) functions";
34643325 license = stdenv.lib.licenses.bsd3;
34653326 }) {};
3466− "safe-exceptions" = callPackage
3467− ({ mkDerivation, base, deepseq, exceptions, hspec, transformers
3468− , void
3469− }:
3470− mkDerivation {
3471− pname = "safe-exceptions";
3472− version = "0.1.6.0";
3473− sha256 = "074dy2f9fbhnh59clpz8c1ljplm1wwqjj7r3i4nv0rcl0khprm3i";
3474− libraryHaskellDepends = [ base deepseq exceptions transformers ];
3475− testHaskellDepends = [ base hspec void ];
3476− doHaddock = false;
3477− doCheck = false;
3478− homepage = "https://github.com/fpco/safe-exceptions#readme";
3479− description = "Safe, consistent, and easy exception handling";
3480− license = stdenv.lib.licenses.mit;
3481− }) {};
34823327 "say" = callPackage
34833328 ({ mkDerivation, base, bytestring, criterion, hspec, temporary
34843329 , text, transformers
@@ -3492,33 +3337,29 @@ self: {
34923337 benchmarkHaskellDepends = [
34933338 base bytestring criterion temporary text
34943339 ];
3495− doHaddock = false;
3496− doCheck = false;
34973340 homepage = "https://github.com/fpco/say#readme";
34983341 description = "Initial project template from stack";
34993342 license = stdenv.lib.licenses.mit;
35003343 }) {};
35013344 "scientific" = callPackage
35023345 ({ mkDerivation, base, binary, bytestring, containers, criterion
3503− , deepseq, ghc-prim, hashable, integer-gmp, integer-logarithms
3504− , primitive, QuickCheck, smallcheck, tasty, tasty-ant-xml
3505− , tasty-hunit, tasty-quickcheck, tasty-smallcheck, text
3346+ , deepseq, hashable, integer-gmp, integer-logarithms, primitive
3347+ , QuickCheck, smallcheck, tasty, tasty-ant-xml, tasty-hunit
3348+ , tasty-quickcheck, tasty-smallcheck, text
35063349 }:
35073350 mkDerivation {
35083351 pname = "scientific";
3509− version = "0.3.5.1";
3510− sha256 = "19hvcqrrm375inqmci516xk32vir7dgw7ini8ij5rkdnrf1fd9jv";
3352+ version = "0.3.6.2";
3353+ sha256 = "03ql2f0ac8bsl524idy9xxa3kxisb2sj3avflzw580j5hzy0m397";
35113354 libraryHaskellDepends = [
3512− base binary bytestring containers deepseq ghc-prim hashable
3513− integer-gmp integer-logarithms primitive text
3355+ base binary bytestring containers deepseq hashable integer-gmp
3356+ integer-logarithms primitive text
35143357 ];
35153358 testHaskellDepends = [
35163359 base binary bytestring QuickCheck smallcheck tasty tasty-ant-xml
35173360 tasty-hunit tasty-quickcheck tasty-smallcheck text
35183361 ];
35193362 benchmarkHaskellDepends = [ base criterion ];
3520− doHaddock = false;
3521− doCheck = false;
35223363 homepage = "https://github.com/basvandijk/scientific";
35233364 description = "Numbers represented using scientific notation";
35243365 license = stdenv.lib.licenses.bsd3;
@@ -3526,24 +3367,22 @@ self: {
35263367 "semigroupoids" = callPackage
35273368 ({ mkDerivation, base, base-orphans, bifunctors, Cabal
35283369 , cabal-doctest, comonad, containers, contravariant, distributive
3529− , doctest, hashable, semigroups, tagged, transformers
3530− , transformers-compat, unordered-containers
3370+ , doctest, hashable, semigroups, tagged, template-haskell
3371+ , transformers, transformers-compat, unordered-containers
35313372 }:
35323373 mkDerivation {
35333374 pname = "semigroupoids";
3534− version = "5.2.1";
3535− sha256 = "006jys6kvckkmbnhf4jc51sh64hamkz464mr8ciiakybrfvixr3r";
3536− revision = "1";
3537− editedCabalFile = "1lb59k2hdz9kbhmpw7bzc0n9pb5x3b9ysglp69dn4yf5xxjw03wx";
3375+ version = "5.2.2";
3376+ sha256 = "17i96y4iqj8clcs090lf6k0ij3j16nj14vsfwz0mm9nd6i4gbpp4";
3377+ revision = "4";
3378+ editedCabalFile = "0pqfrxzypjq6z8lgdkzq4vhcyqkpk5326hny0r6snpc3gm78r4ij";
35383379 setupHaskellDepends = [ base Cabal cabal-doctest ];
35393380 libraryHaskellDepends = [
35403381 base base-orphans bifunctors comonad containers contravariant
3541− distributive hashable semigroups tagged transformers
3542− transformers-compat unordered-containers
3382+ distributive hashable semigroups tagged template-haskell
3383+ transformers transformers-compat unordered-containers
35433384 ];
35443385 testHaskellDepends = [ base doctest ];
3545− doHaddock = false;
3546− doCheck = false;
35473386 homepage = "http://github.com/ekmett/semigroupoids";
35483387 description = "Semigroupoids: Category sans id";
35493388 license = stdenv.lib.licenses.bsd3;
@@ -3552,11 +3391,9 @@ self: {
35523391 ({ mkDerivation, base }:
35533392 mkDerivation {
35543393 pname = "semigroups";
3555− version = "0.18.3";
3556− sha256 = "1jm9wnb5jmwdk4i9qbwfay69ydi76xi0qqi9zqp6wh3jd2c7qa9m";
3394+ version = "0.18.5";
3395+ sha256 = "17g29h62g1k51ghhvzkw72zksjgi6vs6bfipkj81pqw1dsprcamb";
35573396 libraryHaskellDepends = [ base ];
3558− doHaddock = false;
3559− doCheck = false;
35603397 homepage = "http://github.com/ekmett/semigroups/";
35613398 description = "Anything that associates";
35623399 license = stdenv.lib.licenses.bsd3;
@@ -3570,8 +3407,6 @@ self: {
35703407 revision = "1";
35713408 editedCabalFile = "0ny4g3kjys0hqg41mnwrsymy1bwhl8l169kis4y4fa58sb06m4f5";
35723409 libraryHaskellDepends = [ base unix ];
3573− doHaddock = false;
3574− doCheck = false;
35753410 description = "A cross-platform library for setting environment variables";
35763411 license = stdenv.lib.licenses.mit;
35773412 }) {};
@@ -3583,8 +3418,8 @@ self: {
35833418 }:
35843419 mkDerivation {
35853420 pname = "shakespeare";
3586− version = "2.0.13";
3587− sha256 = "03jqmkvsf5ygg3szqr65xpd7c3yjivkbaxvkz683pwx7hqqpyzm6";
3421+ version = "2.0.15";
3422+ sha256 = "1vk4b19zvwy4mpwaq9z3l3kfmz75gfyf7alhh0y112gspgpccm23";
35883423 libraryHaskellDepends = [
35893424 aeson base blaze-html blaze-markup bytestring containers directory
35903425 exceptions ghc-prim parsec process scientific template-haskell text
@@ -3595,8 +3430,6 @@ self: {
35953430 exceptions ghc-prim hspec HUnit parsec process template-haskell
35963431 text time transformers
35973432 ];
3598− doHaddock = false;
3599− doCheck = false;
36003433 homepage = "http://www.yesodweb.com/book/shakespearean-templates";
36013434 description = "A toolkit for making compile-time interpolated templates";
36023435 license = stdenv.lib.licenses.mit;
@@ -3609,8 +3442,6 @@ self: {
36093442 sha256 = "0f9qm3f7y0hpxn6mddhhg51mm1r134qkvd2kr8r6192ka1ijbxnf";
36103443 libraryHaskellDepends = [ base deepseq directory ];
36113444 testHaskellDepends = [ base deepseq directory nanospec temporary ];
3612− doHaddock = false;
3613− doCheck = false;
36143445 homepage = "https://github.com/hspec/silently";
36153446 description = "Prevent or capture writing to stdout and other handles";
36163447 license = stdenv.lib.licenses.bsd3;
@@ -3619,11 +3450,9 @@ self: {
36193450 ({ mkDerivation, base }:
36203451 mkDerivation {
36213452 pname = "simple-reflect";
3622− version = "0.3.2";
3623− sha256 = "1dpcf6w3cf1sfl9bnlsx04x7aghw029glj5d05qzrsnms2rlw8iq";
3453+ version = "0.3.3";
3454+ sha256 = "0ayvrx5cm8n6db21jiyjmk5h93pw7cz1707hih09hlhk9jh5x0h7";
36243455 libraryHaskellDepends = [ base ];
3625− doHaddock = false;
3626− doCheck = false;
36273456 homepage = "http://twanvl.nl/blog/haskell/simple-reflection-of-expressions";
36283457 description = "Simple reflection of expressions containing variables";
36293458 license = stdenv.lib.licenses.bsd3;
@@ -3634,29 +3463,43 @@ self: {
36343463 }:
36353464 mkDerivation {
36363465 pname = "simple-sendfile";
3637− version = "0.2.25";
3638− sha256 = "0k99j9xfcf83c55jmn202hdinhjaa4yn3dal4rvjk2w2rlhqirha";
3639− revision = "1";
3640− editedCabalFile = "1axghvn2iz0gzlc0ics4q8abl15ggwvcwcmly5cxhmc32hqv8y5c";
3466+ version = "0.2.27";
3467+ sha256 = "1bwwqzcm56m2w4ymsa054sxmpbj76h9pvb0jf8zxp8lr41cp51gn";
36413468 libraryHaskellDepends = [ base bytestring network unix ];
36423469 testHaskellDepends = [
36433470 base bytestring conduit conduit-extra directory hspec HUnit network
36443471 process resourcet unix
36453472 ];
3646− doHaddock = false;
3647− doCheck = false;
36483473 description = "Cross platform library for the sendfile system call";
36493474 license = stdenv.lib.licenses.bsd3;
36503475 }) {};
3476+ "siphash" = callPackage
3477+ ({ mkDerivation, base, bytestring, cpu, QuickCheck, test-framework
3478+ , test-framework-quickcheck2
3479+ }:
3480+ mkDerivation {
3481+ pname = "siphash";
3482+ version = "1.0.3";
3483+ sha256 = "1wq5dan30ggjgmravy92ylqjvjv1q7mxrmddr7zc8h6aqr0wx0fg";
3484+ revision = "1";
3485+ editedCabalFile = "1q2dy0ywngm9iv7k6d9gnf860m9hpf62q5qvdzmxw5s629gk4afn";
3486+ enableSeparateDataOutput = true;
3487+ libraryHaskellDepends = [ base bytestring cpu ];
3488+ testHaskellDepends = [
3489+ base bytestring QuickCheck test-framework
3490+ test-framework-quickcheck2
3491+ ];
3492+ homepage = "http://github.com/vincenthz/hs-siphash";
3493+ description = "siphash: a fast short input PRF";
3494+ license = stdenv.lib.licenses.bsd3;
3495+ }) {};
36513496 "smallcheck" = callPackage
36523497 ({ mkDerivation, base, ghc-prim, logict, mtl, pretty }:
36533498 mkDerivation {
36543499 pname = "smallcheck";
3655− version = "1.1.2";
3656− sha256 = "14690ahl3iq99hw638qk0bpmkmspghjz2yh8p1nyccli92y23xjm";
3500+ version = "1.1.5";
3501+ sha256 = "195fj7w3v03d1y1nm2ylavzrwxjcdbq0lb6zsw1dwyx5jmwfc84h";
36573502 libraryHaskellDepends = [ base ghc-prim logict mtl pretty ];
3658− doHaddock = false;
3659− doCheck = false;
36603503 homepage = "https://github.com/feuerbach/smallcheck";
36613504 description = "A property-based testing library";
36623505 license = stdenv.lib.licenses.bsd3;
@@ -3665,236 +3508,175 @@ self: {
36653508 ({ mkDerivation, base, bytestring, cereal, network }:
36663509 mkDerivation {
36673510 pname = "socks";
3668− version = "0.5.5";
3669− sha256 = "0s689w1hh9g8ifl75xhzbv96ir07hwn04b4lgvbxzl8swa9ylir6";
3670− revision = "1";
3671− editedCabalFile = "0nz8q0xvd8y6f42bd1w3q8d8bg1qzl8ggx0a23kb3jb60g36dmvw";
3511+ version = "0.5.6";
3512+ sha256 = "0f44qy74i0n6ll3jym0a2ipafkpw1h67amcpqmj8iq95h21wsqzs";
36723513 libraryHaskellDepends = [ base bytestring cereal network ];
3673− doHaddock = false;
3674− doCheck = false;
36753514 homepage = "http://github.com/vincenthz/hs-socks";
3676− description = "Socks proxy (version 5) implementation";
3515+ description = "Socks proxy (ver 5)";
36773516 license = stdenv.lib.licenses.bsd3;
36783517 }) {};
36793518 "split" = callPackage
36803519 ({ mkDerivation, base, QuickCheck }:
36813520 mkDerivation {
36823521 pname = "split";
3683− version = "0.2.3.2";
3684− sha256 = "0fmnkvq1ky4dgyh1z2mvdal5pw103irvkf4p9d5x8wyl1nnylhs9";
3522+ version = "0.2.3.3";
3523+ sha256 = "04qlmkcyklznl03gsjg95b4nzb6i96gdapqg60rny9szgi7ngk8x";
36853524 libraryHaskellDepends = [ base ];
36863525 testHaskellDepends = [ base QuickCheck ];
3687− doHaddock = false;
3688− doCheck = false;
36893526 description = "Combinator library for splitting lists";
36903527 license = stdenv.lib.licenses.bsd3;
36913528 }) {};
3692− "stackage-curator" = callPackage
3693− ({ mkDerivation, aeson, amazonka, amazonka-core, amazonka-s3, async
3694− , base, base16-bytestring, blaze-html, byteable, bytestring, Cabal
3695− , classy-prelude-conduit, conduit, conduit-extra, containers
3696− , cryptohash, cryptohash-conduit, data-default-class, directory
3697− , exceptions, filepath, hashable, hspec, html-conduit, http-client
3698− , http-client-tls, http-conduit, lucid, mime-types, monad-unlift
3699− , monad-unlift-ref, mono-traversable, mtl, old-locale
3700− , optparse-applicative, optparse-simple, process, QuickCheck
3701− , resourcet, safe, semigroups, stm, store, streaming-commons, syb
3702− , system-fileio, system-filepath, tar, temporary, text, time
3703− , transformers, unix-compat, unordered-containers, utf8-string
3704− , vector, xml-conduit, xml-types, yaml, zlib
3705− }:
3706− mkDerivation {
3707− pname = "stackage-curator";
3708− version = "0.14.5";
3709− sha256 = "11ccjjv6lvivjnkwcgr565hlxgs1sispx561fl1hkxw0mwp1q0hi";
3710− isLibrary = true;
3711− isExecutable = true;
3712− libraryHaskellDepends = [
3713− aeson amazonka amazonka-core amazonka-s3 async base
3714− base16-bytestring blaze-html byteable bytestring Cabal
3715− classy-prelude-conduit conduit conduit-extra containers cryptohash
3716− cryptohash-conduit data-default-class directory exceptions filepath
3717− hashable html-conduit http-client http-client-tls http-conduit
3718− lucid mime-types monad-unlift monad-unlift-ref mono-traversable mtl
3719− old-locale process resourcet safe semigroups stm store
3720− streaming-commons syb system-fileio system-filepath tar temporary
3721− text time transformers unix-compat unordered-containers utf8-string
3722− vector xml-conduit xml-types yaml zlib
3723− ];
3724− executableHaskellDepends = [
3725− aeson base http-client http-client-tls optparse-applicative
3726− optparse-simple system-filepath text
3727− ];
3728− testHaskellDepends = [
3729− base Cabal classy-prelude-conduit containers directory hspec
3730− http-client http-client-tls QuickCheck text yaml
3731− ];
3732− doHaddock = false;
3733− doCheck = false;
3734− homepage = "https://github.com/fpco/stackage-curator";
3735− description = "Tools for curating Stackage bundles";
3736− license = stdenv.lib.licenses.mit;
3737− }) {};
37383529 "statistics" = callPackage
3739− ({ mkDerivation, aeson, base, binary, deepseq, erf, HUnit, ieee754
3740− , math-functions, monad-par, mwc-random, primitive, QuickCheck
3741− , test-framework, test-framework-hunit, test-framework-quickcheck2
3742− , vector, vector-algorithms, vector-binary-instances
3530+ ({ mkDerivation, aeson, base, base-orphans, binary, deepseq, erf
3531+ , HUnit, ieee754, math-functions, monad-par, mwc-random, primitive
3532+ , QuickCheck, test-framework, test-framework-hunit
3533+ , test-framework-quickcheck2, vector, vector-algorithms
3534+ , vector-binary-instances, vector-th-unbox
37433535 }:
37443536 mkDerivation {
37453537 pname = "statistics";
3746− version = "0.13.3.0";
3747− sha256 = "1vc12c3mnpspbycwkl0b22jqrdbg9fpmr1fxdxlmqwl603qy0zvf";
3538+ version = "0.14.0.2";
3539+ sha256 = "0y27gafkib0x0fn39qfn2rkgsfrm09ng35sbb5dwr7rclhnxz59l";
3540+ revision = "2";
3541+ editedCabalFile = "1bx70yqkn62ii17fjv3pig4hklrzkqd09zj67zzjiyjzmn04fir3";
37483542 libraryHaskellDepends = [
3749− aeson base binary deepseq erf math-functions monad-par mwc-random
3750− primitive vector vector-algorithms vector-binary-instances
3543+ aeson base base-orphans binary deepseq erf math-functions monad-par
3544+ mwc-random primitive vector vector-algorithms
3545+ vector-binary-instances vector-th-unbox
37513546 ];
37523547 testHaskellDepends = [
3753− base binary erf HUnit ieee754 math-functions mwc-random primitive
3754− QuickCheck test-framework test-framework-hunit
3548+ aeson base binary erf HUnit ieee754 math-functions mwc-random
3549+ primitive QuickCheck test-framework test-framework-hunit
37553550 test-framework-quickcheck2 vector vector-algorithms
37563551 ];
3757− doHaddock = false;
37583552 doCheck = false;
37593553 homepage = "https://github.com/bos/statistics";
37603554 description = "A library of statistical types, data, and functions";
3761− license = stdenv.lib.licenses.bsd3;
3555+ license = stdenv.lib.licenses.bsd2;
37623556 }) {};
37633557 "stm" = callPackage
37643558 ({ mkDerivation, array, base }:
37653559 mkDerivation {
37663560 pname = "stm";
3767− version = "2.4.4.1";
3768− sha256 = "111kpy1d6f5c0bggh6hyfm86q5p8bq1qbqf6dw2x4l4dxnar16cg";
3769− revision = "1";
3770− editedCabalFile = "0kzw4rw9fgmc4qyxmm1lwifdyrx5r1356150xm14vy4mp86diks9";
3561+ version = "2.4.5.0";
3562+ sha256 = "19sr11a0hqikhvf561b38phz6k3zg9s157a0f5ffvghk7wcdpmri";
37713563 libraryHaskellDepends = [ array base ];
3772− doHaddock = false;
3773− doCheck = false;
3564+ homepage = "https://wiki.haskell.org/Software_transactional_memory";
37743565 description = "Software Transactional Memory";
37753566 license = stdenv.lib.licenses.bsd3;
37763567 }) {};
37773568 "stm-chans" = callPackage
3778− ({ mkDerivation, base, stm }:
3569+ ({ mkDerivation, base, Cabal, stm }:
37793570 mkDerivation {
37803571 pname = "stm-chans";
37813572 version = "3.0.0.4";
37823573 sha256 = "0f27sp09yha43xk9q55sc185jyjs5h7gq2dhsyx6bm9kz9dzqi13";
3574+ revision = "1";
3575+ editedCabalFile = "0v9axxcfszqdmf3dhjxy34ybh22x3r5c48mdnbvjh5i5lp7g7vp2";
3576+ setupHaskellDepends = [ base Cabal ];
37833577 libraryHaskellDepends = [ base stm ];
3784− doHaddock = false;
3785− doCheck = false;
37863578 homepage = "http://code.haskell.org/~wren/";
37873579 description = "Additional types of channels for STM";
37883580 license = stdenv.lib.licenses.bsd3;
37893581 }) {};
37903582 "stm-conduit" = callPackage
37913583 ({ mkDerivation, async, base, cereal, cereal-conduit, conduit
3792− , conduit-combinators, conduit-extra, directory, doctest, ghc-prim
3793− , HUnit, lifted-async, lifted-base, monad-control, monad-loops
3584+ , conduit-extra, directory, doctest, exceptions, HUnit, monad-loops
37943585 , QuickCheck, resourcet, stm, stm-chans, test-framework
37953586 , test-framework-hunit, test-framework-quickcheck2, transformers
3796− , void
3587+ , unliftio
37973588 }:
37983589 mkDerivation {
37993590 pname = "stm-conduit";
3800− version = "3.0.0";
3801− sha256 = "02d83mji1rlijdn315q7fik6jy5q49fjwygd64c9kf4z0qy6cvyg";
3591+ version = "4.0.0";
3592+ sha256 = "0paapljn7nqfzrx889y0n8sszci38mdiaxkgr0bb00ph9246rr7z";
38023593 libraryHaskellDepends = [
3803− async base cereal cereal-conduit conduit conduit-combinators
3804− conduit-extra directory ghc-prim lifted-async lifted-base
3805− monad-control monad-loops resourcet stm stm-chans transformers void
3594+ async base cereal cereal-conduit conduit conduit-extra directory
3595+ exceptions monad-loops resourcet stm stm-chans transformers
3596+ unliftio
38063597 ];
38073598 testHaskellDepends = [
3808− base conduit conduit-combinators directory doctest HUnit QuickCheck
3809− resourcet stm stm-chans test-framework test-framework-hunit
3810− test-framework-quickcheck2 transformers
3599+ base conduit directory doctest HUnit QuickCheck resourcet stm
3600+ stm-chans test-framework test-framework-hunit
3601+ test-framework-quickcheck2 transformers unliftio
38113602 ];
3812− doHaddock = false;
3813− doCheck = false;
38143603 homepage = "https://github.com/cgaebel/stm-conduit";
38153604 description = "Introduces conduits to channels, and promotes using conduits concurrently";
38163605 license = stdenv.lib.licenses.bsd3;
38173606 }) {};
38183607 "store" = callPackage
38193608 ({ mkDerivation, array, async, base, base-orphans
3820− , base64-bytestring, bytestring, conduit, containers, contravariant
3821− , criterion, cryptohash, deepseq, directory, filepath, free
3822− , ghc-prim, hashable, hspec, hspec-smallcheck, integer-gmp
3823− , lifted-base, monad-control, mono-traversable, network, primitive
3824− , resourcet, safe, semigroups, smallcheck, store-core
3825− , streaming-commons, syb, template-haskell, text, th-lift
3609+ , base64-bytestring, bifunctors, bytestring, containers
3610+ , contravariant, criterion, cryptohash, deepseq, directory
3611+ , filepath, free, ghc-prim, hashable, hspec, hspec-smallcheck
3612+ , integer-gmp, lifted-base, monad-control, mono-traversable
3613+ , network, primitive, resourcet, safe, semigroups, smallcheck
3614+ , store-core, syb, template-haskell, text, th-lift
38263615 , th-lift-instances, th-orphans, th-reify-many, th-utilities, time
38273616 , transformers, unordered-containers, vector, void
38283617 }:
38293618 mkDerivation {
38303619 pname = "store";
3831− version = "0.4.3.1";
3832− sha256 = "0h8b91dpp4r1bhdq3k4zcnaby1ka9x6gy8ypbhv47b2mwpnwp09p";
3833− libraryHaskellDepends = [
3834− array async base base-orphans base64-bytestring bytestring conduit
3835− containers contravariant cryptohash deepseq directory filepath free
3836− ghc-prim hashable hspec hspec-smallcheck integer-gmp lifted-base
3837− monad-control mono-traversable network primitive resourcet safe
3838− semigroups smallcheck store-core streaming-commons syb
3620+ version = "0.5.0";
3621+ sha256 = "1ivr2pvfja2plhp625wjv9lbd47vmydp33f31ljwdyzqik2j7vij";
3622+ libraryHaskellDepends = [
3623+ array async base base-orphans base64-bytestring bifunctors
3624+ bytestring containers contravariant cryptohash deepseq directory
3625+ filepath free ghc-prim hashable hspec hspec-smallcheck integer-gmp
3626+ lifted-base monad-control mono-traversable network primitive
3627+ resourcet safe semigroups smallcheck store-core syb
38393628 template-haskell text th-lift th-lift-instances th-orphans
38403629 th-reify-many th-utilities time transformers unordered-containers
38413630 vector void
38423631 ];
38433632 benchmarkHaskellDepends = [
3844− array async base base-orphans base64-bytestring bytestring conduit
3845− containers contravariant criterion cryptohash deepseq directory
3846− filepath free ghc-prim hashable hspec hspec-smallcheck integer-gmp
3847− lifted-base monad-control mono-traversable network primitive
3848− resourcet safe semigroups smallcheck store-core streaming-commons
3849− syb template-haskell text th-lift th-lift-instances th-orphans
3633+ array async base base-orphans base64-bytestring bifunctors
3634+ bytestring containers contravariant criterion cryptohash deepseq
3635+ directory filepath free ghc-prim hashable hspec hspec-smallcheck
3636+ integer-gmp lifted-base monad-control mono-traversable network
3637+ primitive resourcet safe semigroups smallcheck store-core syb
3638+ template-haskell text th-lift th-lift-instances th-orphans
38503639 th-reify-many th-utilities time transformers unordered-containers
38513640 vector void
38523641 ];
3853− doHaddock = false;
38543642 doCheck = false;
38553643 homepage = "https://github.com/fpco/store#readme";
38563644 description = "Fast binary serialization";
38573645 license = stdenv.lib.licenses.mit;
38583646 }) {};
38593647 "store-core" = callPackage
3860− ({ mkDerivation, base, bytestring, fail, ghc-prim, primitive, text
3648+ ({ mkDerivation, base, bytestring, ghc-prim, primitive, text
38613649 , transformers
38623650 }:
38633651 mkDerivation {
38643652 pname = "store-core";
3865− version = "0.4.1";
3866− sha256 = "1d34n2n9vjngxndkbxcqm07sg4cnaq6rlx013rhyjr3aybwqalhl";
3653+ version = "0.4.4";
3654+ sha256 = "1489ydwmq3vd9lz193m5w277wvb9g74ssc1ncfjdry2g0y6czbjv";
38673655 libraryHaskellDepends = [
3868− base bytestring fail ghc-prim primitive text transformers
3656+ base bytestring ghc-prim primitive text transformers
38693657 ];
3870− doHaddock = false;
3871− doCheck = false;
38723658 homepage = "https://github.com/fpco/store#readme";
38733659 description = "Fast and lightweight binary serialization";
38743660 license = stdenv.lib.licenses.mit;
38753661 }) {};
38763662 "streaming-commons" = callPackage
3877− ({ mkDerivation, array, async, base, blaze-builder, bytestring
3878− , criterion, deepseq, directory, hspec, network, process
3879− , QuickCheck, random, stm, text, transformers, unix, zlib
3663+ ({ mkDerivation, array, async, base, bytestring, deepseq, directory
3664+ , gauge, hspec, network, process, QuickCheck, random, stm, text
3665+ , transformers, unix, zlib
38803666 }:
38813667 mkDerivation {
38823668 pname = "streaming-commons";
3883− version = "0.1.17";
3884− sha256 = "1abxyjkn8xc8d33yhqxy1ki01kpzf4hy55f167qg4vk2ig5kh2p5";
3669+ version = "0.2.1.0";
3670+ sha256 = "13fn6qmpiggwpn8lczyydgp77cyzfypwds7wxskrwir4i5cgxlfq";
38853671 libraryHaskellDepends = [
3886− array async base blaze-builder bytestring directory network process
3887− random stm text transformers unix zlib
3672+ array async base bytestring directory network process random stm
3673+ text transformers unix zlib
38883674 ];
38893675 testHaskellDepends = [
3890− array async base blaze-builder bytestring deepseq hspec network
3891− QuickCheck text unix zlib
3892− ];
3893− benchmarkHaskellDepends = [
3894− base blaze-builder bytestring criterion deepseq text
3676+ array async base bytestring deepseq hspec network QuickCheck text
3677+ unix zlib
38953678 ];
3896− doHaddock = false;
3897− doCheck = false;
3679+ benchmarkHaskellDepends = [ base bytestring deepseq gauge text ];
38983680 homepage = "https://github.com/fpco/streaming-commons";
38993681 description = "Common lower-level functions needed by various streaming data libraries";
39003682 license = stdenv.lib.licenses.mit;
@@ -3903,12 +3685,10 @@ self: {
39033685 ({ mkDerivation, base, hspec, QuickCheck }:
39043686 mkDerivation {
39053687 pname = "stringbuilder";
3906− version = "0.5.0";
3907− sha256 = "1ap95xphqnrhv64c2a137wqslkdmb2jjd9ldb17gs1pw48k8hrl9";
3688+ version = "0.5.1";
3689+ sha256 = "1fh3csx1wcssn8xyvl4ip4aprh9l4qyz2kk8mgjvqvc0vb2bsy6q";
39083690 libraryHaskellDepends = [ base ];
39093691 testHaskellDepends = [ base hspec QuickCheck ];
3910− doHaddock = false;
3911− doCheck = false;
39123692 description = "A writer monad for multi-line string literals";
39133693 license = stdenv.lib.licenses.mit;
39143694 }) {};
@@ -3920,46 +3700,10 @@ self: {
39203700 sha256 = "1da2zz7gqm4xbkx5vpd74dayx1svaxyl145fl14mq15lbb77sxdq";
39213701 libraryHaskellDepends = [ base ];
39223702 testHaskellDepends = [ base containers HUnit mtl ];
3923− doHaddock = false;
3924− doCheck = false;
39253703 homepage = "http://www.cs.uu.nl/wiki/GenericProgramming/SYB";
39263704 description = "Scrap Your Boilerplate";
39273705 license = stdenv.lib.licenses.bsd3;
39283706 }) {};
3929− "system-fileio" = callPackage
3930− ({ mkDerivation, base, bytestring, chell, system-filepath
3931− , temporary, text, time, transformers, unix
3932− }:
3933− mkDerivation {
3934− pname = "system-fileio";
3935− version = "0.3.16.3";
3936− sha256 = "1484hcl27s2qcby8ws5djj11q9bz68bspcifz9h5gii2ndy70x9i";
3937− libraryHaskellDepends = [
3938− base bytestring system-filepath text time unix
3939− ];
3940− testHaskellDepends = [
3941− base bytestring chell system-filepath temporary text time
3942− transformers unix
3943− ];
3944− doHaddock = false;
3945− doCheck = false;
3946− homepage = "https://github.com/fpco/haskell-filesystem";
3947− description = "Consistent filesystem interaction across GHC versions (deprecated)";
3948− license = stdenv.lib.licenses.mit;
3949− }) {};
3950− "system-filepath" = callPackage
3951− ({ mkDerivation, base, bytestring, deepseq, text }:
3952− mkDerivation {
3953− pname = "system-filepath";
3954− version = "0.4.13.4";
3955− sha256 = "1yy5zsmmimhg6iaw9fmpwrxvxrgi5s6bfyqfihdsnx4bjvn7sp9l";
3956− libraryHaskellDepends = [ base bytestring deepseq text ];
3957− doHaddock = false;
3958− doCheck = false;
3959− homepage = "https://github.com/fpco/haskell-filesystem";
3960− description = "High-level, byte-based file and directory path manipulations (deprecated)";
3961− license = stdenv.lib.licenses.mit;
3962− }) {};
39633707 "tagged" = callPackage
39643708 ({ mkDerivation, base, deepseq, template-haskell, transformers
39653709 , transformers-compat
@@ -3968,80 +3712,48 @@ self: {
39683712 pname = "tagged";
39693713 version = "0.8.5";
39703714 sha256 = "16cdzh0bw16nvjnyyy5j9s60malhz4nnazw96vxb0xzdap4m2z74";
3971− revision = "1";
3972− editedCabalFile = "15mqdimbgrq5brqljjl7dbxkyrxppap06q53cp7ml7w3l08v5mx8";
3973− libraryHaskellDepends = [
3974− base deepseq template-haskell transformers transformers-compat
3975− ];
3976− doHaddock = false;
3977− doCheck = false;
3978− homepage = "http://github.com/ekmett/tagged";
3979− description = "Haskell 98 phantom types to avoid unsafely passing dummy arguments";
3980− license = stdenv.lib.licenses.bsd3;
3981− }) {};
3982− "tagstream-conduit" = callPackage
3983− ({ mkDerivation, attoparsec, base, blaze-builder, bytestring
3984− , case-insensitive, conduit, conduit-extra, data-default, hspec
3985− , HUnit, QuickCheck, resourcet, text, transformers, xml-conduit
3986− }:
3987− mkDerivation {
3988− pname = "tagstream-conduit";
3989− version = "0.5.5.3";
3990− sha256 = "1arlf7qil9bzcqykda8yyrnncm29jsfjvz5kbcdrbbhqpbqfi5mj";
3715+ revision = "2";
3716+ editedCabalFile = "0r2knfcq0b4s652vlvlnfwxlc2mkc2ra9kl8bp4zdn1awmfy0ia5";
39913717 libraryHaskellDepends = [
3992− attoparsec base blaze-builder bytestring case-insensitive conduit
3993− conduit-extra data-default resourcet text transformers xml-conduit
3994− ];
3995− testHaskellDepends = [
3996− base bytestring conduit hspec HUnit QuickCheck resourcet text
3718+ base deepseq template-haskell transformers transformers-compat
39973719 ];
3998− doHaddock = false;
3999− doCheck = false;
4000− homepage = "http://github.com/yihuang/tagstream-conduit";
4001− description = "streamlined html tag parser";
3720+ homepage = "http://github.com/ekmett/tagged";
3721+ description = "Haskell 98 phantom types to avoid unsafely passing dummy arguments";
40023722 license = stdenv.lib.licenses.bsd3;
40033723 }) {};
40043724 "tar" = callPackage
4005− ({ mkDerivation, array, base, bytestring, bytestring-handle
4006− , containers, criterion, deepseq, directory, filepath, old-time
4007− , QuickCheck, tasty, tasty-quickcheck, time
3725+ ({ mkDerivation, array, base, bytestring, containers, criterion
3726+ , deepseq, directory, filepath, time
40083727 }:
40093728 mkDerivation {
40103729 pname = "tar";
4011− version = "0.5.0.3";
4012− sha256 = "18qq94j9bm91iswnxq2dm5dws5c7wm4k01q2rpf8py35cf3svnfq";
3730+ version = "0.5.1.0";
3731+ sha256 = "0s2brvaxg5fki2jdkccmnpssiy6a3wjh24p6a3dkkdvjcixnk7f8";
40133732 configureFlags = [ "-f-old-time" ];
40143733 libraryHaskellDepends = [
40153734 array base bytestring containers deepseq directory filepath time
40163735 ];
4017− testHaskellDepends = [
4018− array base bytestring bytestring-handle containers deepseq
4019− directory filepath QuickCheck tasty tasty-quickcheck time
4020− ];
40213736 benchmarkHaskellDepends = [
40223737 array base bytestring containers criterion deepseq directory
4023− filepath old-time time
3738+ filepath time
40243739 ];
4025− doHaddock = false;
40263740 doCheck = false;
40273741 description = "Reading, writing and manipulating \".tar\" archive files.";
40283742 license = stdenv.lib.licenses.bsd3;
40293743 }) {};
40303744 "tasty" = callPackage
4031− ({ mkDerivation, ansi-terminal, async, base, clock, containers
4032− , deepseq, mtl, optparse-applicative, regex-tdfa, stm, tagged
4033− , unbounded-delays, unix
3745+ ({ mkDerivation, ansi-terminal, async, base, clock, containers, mtl
3746+ , optparse-applicative, stm, tagged, unbounded-delays, unix
3747+ , wcwidth
40343748 }:
40353749 mkDerivation {
40363750 pname = "tasty";
4037− version = "0.11.2.5";
4038− sha256 = "09qg2ssack4y3vy5dppjpprvg7gss970a0nfv0rq2m87gw5r3i1h";
3751+ version = "1.1.0.2";
3752+ sha256 = "1q3hsy1a6q8xng3m04hp1m10bwamihani30zi25cjhkhmyl4ads7";
40393753 libraryHaskellDepends = [
4040− ansi-terminal async base clock containers deepseq mtl
4041− optparse-applicative regex-tdfa stm tagged unbounded-delays unix
3754+ ansi-terminal async base clock containers mtl optparse-applicative
3755+ stm tagged unbounded-delays unix wcwidth
40423756 ];
4043− doHaddock = false;
4044− doCheck = false;
40453757 homepage = "https://github.com/feuerbach/tasty";
40463758 description = "Modern and extensible testing framework";
40473759 license = stdenv.lib.licenses.mit;
@@ -4053,18 +3765,27 @@ self: {
40533765 }:
40543766 mkDerivation {
40553767 pname = "tasty-ant-xml";
4056− version = "1.1.0";
4057− sha256 = "1xnh4yyzi4m21182n1hr5lak6gkgnpp4m6ixjk19gn4fnzwarz8d";
3768+ version = "1.1.4";
3769+ sha256 = "0v0gsb90kh6hwlgxbclzawsskywc6yf7n8xhiifia97l4y0yx2m8";
40583770 libraryHaskellDepends = [
40593771 base containers directory filepath generic-deriving ghc-prim mtl
40603772 stm tagged tasty transformers xml
40613773 ];
4062− doHaddock = false;
4063− doCheck = false;
40643774 homepage = "http://github.com/ocharles/tasty-ant-xml";
40653775 description = "Render tasty output to XML for Jenkins";
40663776 license = stdenv.lib.licenses.bsd3;
40673777 }) {};
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+ }) {};
40683789 "tasty-golden" = callPackage
40693790 ({ mkDerivation, async, base, bytestring, containers, deepseq
40703791 , directory, filepath, mtl, optparse-applicative, process, tagged
@@ -4072,8 +3793,8 @@ self: {
40723793 }:
40733794 mkDerivation {
40743795 pname = "tasty-golden";
4075− version = "2.3.1.1";
4076− sha256 = "0pcf5hsyp5mmbqn7krdm49jxpkjm6rb4j83j28f76h7q55dzm1wy";
3796+ version = "2.3.2";
3797+ sha256 = "0k3ibjhjc9vcwzrjnl4rnwvfm8l81q347nb7dgvcib6n5wm3s404";
40773798 libraryHaskellDepends = [
40783799 async base bytestring containers deepseq directory filepath mtl
40793800 optparse-applicative process tagged tasty temporary
@@ -4081,22 +3802,36 @@ self: {
40813802 testHaskellDepends = [
40823803 base directory filepath process tasty tasty-hunit temporary-rc
40833804 ];
4084− doHaddock = false;
4085− doCheck = false;
40863805 homepage = "https://github.com/feuerbach/tasty-golden";
40873806 description = "Golden tests support for tasty";
40883807 license = stdenv.lib.licenses.mit;
40893808 }) {};
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+ }) {};
40903827 "tasty-hunit" = callPackage
4091− ({ mkDerivation, base, tasty }:
3828+ ({ mkDerivation, base, call-stack, tasty }:
40923829 mkDerivation {
40933830 pname = "tasty-hunit";
4094− version = "0.9.2";
4095− sha256 = "08qnxaw34wfnzi9irs1jd4d0zczqm3k5ffkd4zwhkz0dflmgq7mf";
4096− libraryHaskellDepends = [ base tasty ];
4097− doHaddock = false;
4098− doCheck = false;
4099− homepage = "http://documentup.com/feuerbach/tasty";
3831+ version = "0.10.0.1";
3832+ sha256 = "0j3hgga6c3s8h5snzivb8a75h96207ia2rlbxzj07xbf4zpkp44g";
3833+ libraryHaskellDepends = [ base call-stack tasty ];
3834+ homepage = "https://github.com/feuerbach/tasty";
41003835 description = "HUnit support for the Tasty test framework";
41013836 license = stdenv.lib.licenses.mit;
41023837 }) {};
@@ -4112,25 +3847,25 @@ self: {
41123847 testHaskellDepends = [
41133848 base bytestring mtl tasty tasty-hunit tasty-quickcheck
41143849 ];
4115− doHaddock = false;
4116− doCheck = false;
41173850 homepage = "https://github.com/vincenthz/tasty-kat";
41183851 description = "Known Answer Tests (KAT) framework for tasty";
41193852 license = stdenv.lib.licenses.mit;
41203853 }) {};
41213854 "tasty-quickcheck" = callPackage
4122− ({ mkDerivation, base, pcre-light, QuickCheck, tagged, tasty
4123− , tasty-hunit
3855+ ({ mkDerivation, base, optparse-applicative, pcre-light, QuickCheck
3856+ , random, tagged, tasty, tasty-hunit
41243857 }:
41253858 mkDerivation {
41263859 pname = "tasty-quickcheck";
4127− version = "0.8.4";
4128− sha256 = "15rjxib5jmjq0hzj47x15kgp3awc73va4cy1pmpf7k3hvfv4qprn";
4129− libraryHaskellDepends = [ base QuickCheck tagged tasty ];
3860+ version = "0.10";
3861+ sha256 = "0vr6szbbz3s5461i0zr8zpq347zfvidfzv5gf3xwxhm0yk731z8h";
3862+ revision = "1";
3863+ editedCabalFile = "1ndkkywcqgb2wj339vgckjv5915da5kd4ixlkaww9fsba3qsrnwx";
3864+ libraryHaskellDepends = [
3865+ base optparse-applicative QuickCheck random tagged tasty
3866+ ];
41303867 testHaskellDepends = [ base pcre-light tasty tasty-hunit ];
4131− doHaddock = false;
4132− doCheck = false;
4133− homepage = "http://documentup.com/feuerbach/tasty";
3868+ homepage = "https://github.com/feuerbach/tasty";
41343869 description = "QuickCheck support for the Tasty test framework";
41353870 license = stdenv.lib.licenses.mit;
41363871 }) {};
@@ -4141,8 +3876,6 @@ self: {
41413876 version = "0.8.1";
41423877 sha256 = "1n66ngzllf3xrlqykwszlkwsi96n5nkm7xbpfq7774vpvfnafjri";
41433878 libraryHaskellDepends = [ async base smallcheck tagged tasty ];
4144− doHaddock = false;
4145− doCheck = false;
41463879 homepage = "http://documentup.com/feuerbach/tasty";
41473880 description = "SmallCheck support for the Tasty test framework";
41483881 license = stdenv.lib.licenses.mit;
@@ -4159,28 +3892,24 @@ self: {
41593892 base haskell-src-exts tasty template-haskell
41603893 ];
41613894 testHaskellDepends = [ base tasty-hunit ];
4162− doHaddock = false;
4163− doCheck = false;
41643895 homepage = "http://github.com/bennofs/tasty-th";
41653896 description = "Automatic tasty test case discovery using TH";
41663897 license = stdenv.lib.licenses.bsd3;
41673898 }) {};
41683899 "temporary" = callPackage
41693900 ({ mkDerivation, base, base-compat, directory, exceptions, filepath
4170− , tasty, tasty-hunit, transformers, unix
3901+ , random, tasty, tasty-hunit, transformers, unix
41713902 }:
41723903 mkDerivation {
41733904 pname = "temporary";
4174− version = "1.2.1.1";
4175− sha256 = "1wq0rc71mp0lw7pkpcbhglf636ni46xnlpsmx6yz8acmwmqj8xsm";
3905+ version = "1.3";
3906+ sha256 = "144qhwfwg37l3k313raf4ssiz16jbgwlm1nf4flgqpsbd69jji4c";
41763907 libraryHaskellDepends = [
4177− base directory exceptions filepath transformers unix
3908+ base directory exceptions filepath random transformers unix
41783909 ];
41793910 testHaskellDepends = [
41803911 base base-compat directory filepath tasty tasty-hunit unix
41813912 ];
4182− doHaddock = false;
4183− doCheck = false;
41843913 homepage = "https://github.com/feuerbach/temporary";
41853914 description = "Portable temporary file and directory support";
41863915 license = stdenv.lib.licenses.bsd3;
@@ -4196,31 +3925,34 @@ self: {
41963925 libraryHaskellDepends = [
41973926 base directory exceptions filepath transformers unix
41983927 ];
4199− doHaddock = false;
4200− doCheck = false;
42013928 homepage = "http://www.github.com/feuerbach/temporary";
42023929 description = "Portable temporary file and directory support for Windows and Unix, based on code from Cabal";
42033930 license = stdenv.lib.licenses.bsd3;
42043931 }) {};
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+ }) {};
42053942 "test-framework" = callPackage
42063943 ({ mkDerivation, ansi-terminal, ansi-wl-pprint, base, containers
42073944 , hostname, old-locale, random, regex-posix, time, xml
42083945 }:
42093946 mkDerivation {
42103947 pname = "test-framework";
4211− version = "0.8.1.1";
4212− sha256 = "0wxjgdvb1c4ykazw774zlx86550848wbsvgjgcrdzcgbb9m650vq";
4213− revision = "2";
4214− editedCabalFile = "1mp1h0fzwxa3xxnbw33lp8hj0rb8vwkd712r5ak8ny5nmawh2c9y";
4215− isLibrary = true;
4216− isExecutable = true;
3948+ version = "0.8.2.0";
3949+ sha256 = "1hhacrzam6b8f10hyldmjw8pb7frdxh04rfg3farxcxwbnhwgbpm";
42173950 libraryHaskellDepends = [
42183951 ansi-terminal ansi-wl-pprint base containers hostname old-locale
42193952 random regex-posix time xml
42203953 ];
4221− doHaddock = false;
42223954 doCheck = false;
4223− homepage = "https://batterseapower.github.io/test-framework/";
3955+ homepage = "http://haskell.github.io/test-framework/";
42243956 description = "Framework for running and organising tests, with HUnit and QuickCheck support";
42253957 license = stdenv.lib.licenses.bsd3;
42263958 }) {};
@@ -4236,8 +3968,6 @@ self: {
42363968 libraryHaskellDepends = [
42373969 base extensible-exceptions HUnit test-framework
42383970 ];
4239− doHaddock = false;
4240− doCheck = false;
42413971 homepage = "https://batterseapower.github.io/test-framework/";
42423972 description = "HUnit support for the test-framework package";
42433973 license = stdenv.lib.licenses.bsd3;
@@ -4250,11 +3980,11 @@ self: {
42503980 pname = "test-framework-quickcheck2";
42513981 version = "0.3.0.4";
42523982 sha256 = "0vj834337r6jzr3258cv68ly2sv5999mklpsrfngyk51kywsyqyp";
3983+ revision = "1";
3984+ editedCabalFile = "147ngmfdkskyg7mwsp5w73a4dbx3rp5s38bci3z03kn1m093lxff";
42533985 libraryHaskellDepends = [
42543986 base extensible-exceptions QuickCheck random test-framework
42553987 ];
4256− doHaddock = false;
4257− doCheck = false;
42583988 homepage = "http://haskell.github.io/test-framework/";
42593989 description = "QuickCheck-2 support for the test-framework package";
42603990 license = stdenv.lib.licenses.bsd3;
@@ -4271,34 +4001,24 @@ self: {
42714001 base haskell-src-exts language-haskell-extract regex-posix
42724002 template-haskell test-framework
42734003 ];
4274− doHaddock = false;
4275− doCheck = false;
42764004 homepage = "http://github.com/finnsson/test-generator";
42774005 description = "Automagically generate the HUnit- and Quickcheck-bulk-code using Template Haskell";
42784006 license = stdenv.lib.licenses.bsd3;
42794007 }) {};
42804008 "text" = callPackage
4281− ({ mkDerivation, array, base, binary, bytestring, deepseq
4282− , directory, ghc-prim, HUnit, integer-gmp, QuickCheck
4283− , quickcheck-unicode, random, test-framework, test-framework-hunit
4284− , test-framework-quickcheck2
4009+ ({ mkDerivation, array, base, binary, bytestring, deepseq, ghc-prim
4010+ , integer-gmp
42854011 }:
42864012 mkDerivation {
42874013 pname = "text";
4288− version = "1.2.2.2";
4289− sha256 = "1y9d0zjs2ls0c574mr5xw7y3y49s62sd3wcn9lhpwz8a6q352iii";
4014+ version = "1.2.3.0";
4015+ sha256 = "06iir7q99rnffzxi8gagn8w1k9m49368sbidgz634fv1gxib3q10";
42904016 configureFlags = [ "-f-integer-simple" ];
42914017 libraryHaskellDepends = [
42924018 array base binary bytestring deepseq ghc-prim integer-gmp
42934019 ];
4294− testHaskellDepends = [
4295− array base binary bytestring deepseq directory ghc-prim HUnit
4296− integer-gmp QuickCheck quickcheck-unicode random test-framework
4297− test-framework-hunit test-framework-quickcheck2
4298− ];
4299− doHaddock = false;
43004020 doCheck = false;
4301− homepage = "https://github.com/bos/text";
4021+ homepage = "https://github.com/haskell/text";
43024022 description = "An efficient packed Unicode text type";
43034023 license = stdenv.lib.licenses.bsd2;
43044024 }) {};
@@ -4318,12 +4038,26 @@ self: {
43184038 random test-framework test-framework-hunit
43194039 test-framework-quickcheck2 text
43204040 ];
4321− doHaddock = false;
43224041 doCheck = false;
43234042 homepage = "https://github.com/bos/text-icu";
43244043 description = "Bindings to the ICU library";
43254044 license = stdenv.lib.licenses.bsd3;
43264045 }) {inherit (pkgs) icu;};
4046+ "text-short" = callPackage
4047+ ({ mkDerivation, base, binary, bytestring, deepseq, ghc-prim
4048+ , hashable, text
4049+ }:
4050+ mkDerivation {
4051+ pname = "text-short";
4052+ version = "0.1.2";
4053+ sha256 = "0rqiwgjkgyfy8596swl0s0x2jqk6ddh2h02qxa32az2cs5kviwmk";
4054+ libraryHaskellDepends = [
4055+ base binary bytestring deepseq ghc-prim hashable text
4056+ ];
4057+ doCheck = false;
4058+ description = "Memory-efficient representation of Unicode text strings";
4059+ license = stdenv.lib.licenses.bsd3;
4060+ }) {};
43274061 "tf-random" = callPackage
43284062 ({ mkDerivation, base, primitive, random, time }:
43294063 mkDerivation {
@@ -4331,8 +4065,6 @@ self: {
43314065 version = "0.5";
43324066 sha256 = "0445r2nns6009fmq0xbfpyv7jpzwv0snccjdg7hwj4xk4z0cwc1f";
43334067 libraryHaskellDepends = [ base primitive random time ];
4334− doHaddock = false;
4335− doCheck = false;
43364068 description = "High-quality splittable pseudorandom number generator";
43374069 license = stdenv.lib.licenses.bsd3;
43384070 }) {};
@@ -4340,14 +4072,14 @@ self: {
43404072 ({ mkDerivation, base, containers, ghc-prim, template-haskell }:
43414073 mkDerivation {
43424074 pname = "th-abstraction";
4343− version = "0.2.5.0";
4344− sha256 = "1fxapnbny5gyys24q8v93i6ipcrmsrs2b95i8kz2dpgg8cc95skp";
4075+ version = "0.2.8.0";
4076+ sha256 = "0n17w4q2ykd0nica4sck2wng6md56rfad8x0icl0l8vnzb9nn4ya";
4077+ revision = "1";
4078+ editedCabalFile = "0yr4bj9ypbls0ysmwrgn2nsjb1xpsb12bjaiwbkzp6nf3kljwnnv";
43454079 libraryHaskellDepends = [
43464080 base containers ghc-prim template-haskell
43474081 ];
43484082 testHaskellDepends = [ base containers template-haskell ];
4349− doHaddock = false;
4350− doCheck = false;
43514083 homepage = "https://github.com/glguy/th-abstraction";
43524084 description = "Nicer interface for reified information about data types";
43534085 license = stdenv.lib.licenses.isc;
@@ -4356,26 +4088,25 @@ self: {
43564088 ({ mkDerivation, base, containers, syb, template-haskell }:
43574089 mkDerivation {
43584090 pname = "th-expand-syns";
4359− version = "0.4.3.0";
4360− sha256 = "17b73q0d5r8xixhvdp0hv4ap96l7s3f2y0j5cknp81b1hyinivlz";
4091+ version = "0.4.4.0";
4092+ sha256 = "01prlvh3py5hq5ccjidfyp9ixq2zd88dkbsidyjrpkja6v8m43yc";
43614093 libraryHaskellDepends = [ base containers syb template-haskell ];
43624094 testHaskellDepends = [ base template-haskell ];
4363− doHaddock = false;
4364− doCheck = false;
43654095 homepage = "https://github.com/DanielSchuessler/th-expand-syns";
43664096 description = "Expands type synonyms in Template Haskell ASTs";
43674097 license = stdenv.lib.licenses.bsd3;
43684098 }) {};
43694099 "th-lift" = callPackage
4370− ({ mkDerivation, base, ghc-prim, template-haskell }:
4100+ ({ mkDerivation, base, ghc-prim, template-haskell, th-abstraction
4101+ }:
43714102 mkDerivation {
43724103 pname = "th-lift";
4373− version = "0.7.7";
4374− sha256 = "1dfb0z42vrmdx579lkam07ic03d3v5y19339a3ca0bwpprpzmihn";
4375− libraryHaskellDepends = [ base ghc-prim template-haskell ];
4104+ version = "0.7.10";
4105+ sha256 = "13c89mr9g4jwrmqxx882ygr1lkvj1chw29p80qv2f3g5wnhlgkmr";
4106+ libraryHaskellDepends = [
4107+ base ghc-prim template-haskell th-abstraction
4108+ ];
43764109 testHaskellDepends = [ base ghc-prim template-haskell ];
4377− doHaddock = false;
4378− doCheck = false;
43794110 homepage = "http://github.com/mboes/th-lift";
43804111 description = "Derive Template Haskell's Lift class for datatypes";
43814112 license = stdenv.lib.licenses.bsd3;
@@ -4394,26 +4125,23 @@ self: {
43944125 testHaskellDepends = [
43954126 base bytestring containers QuickCheck template-haskell text vector
43964127 ];
4397− doHaddock = false;
4398− doCheck = false;
43994128 homepage = "http://github.com/bennofs/th-lift-instances/";
44004129 description = "Lift instances for template-haskell for common data types";
44014130 license = stdenv.lib.licenses.bsd3;
44024131 }) {};
44034132 "th-orphans" = callPackage
4404− ({ mkDerivation, base, hspec, mtl, template-haskell, th-lift
4405− , th-lift-instances, th-reify-many
4133+ ({ mkDerivation, base, hspec, hspec-discover, mtl, template-haskell
4134+ , th-lift, th-lift-instances, th-reify-many
44064135 }:
44074136 mkDerivation {
44084137 pname = "th-orphans";
4409− version = "0.13.4";
4410− sha256 = "0cab6hmyii42p157jhm0sd5jzdlxms4ip2ncrmcmc47dl3pxk5gk";
4138+ version = "0.13.6";
4139+ sha256 = "0sfl3pn9kq9da3ji3lsgzgzy82vz6yvsg80dmakc1jvk7awycibp";
44114140 libraryHaskellDepends = [
44124141 base mtl template-haskell th-lift th-lift-instances th-reify-many
44134142 ];
44144143 testHaskellDepends = [ base hspec template-haskell ];
4415− doHaddock = false;
4416− doCheck = false;
4144+ testToolDepends = [ hspec-discover ];
44174145 description = "Orphan instances for TH datatypes";
44184146 license = stdenv.lib.licenses.bsd3;
44194147 }) {};
@@ -4429,8 +4157,6 @@ self: {
44294157 base containers mtl safe template-haskell th-expand-syns
44304158 ];
44314159 testHaskellDepends = [ base template-haskell ];
4432− doHaddock = false;
4433− doCheck = false;
44344160 homepage = "http://github.com/mgsloan/th-reify-many";
44354161 description = "Recurseively reify template haskell datatype info";
44364162 license = stdenv.lib.licenses.bsd3;
@@ -4451,8 +4177,6 @@ self: {
44514177 base bytestring containers directory filepath hspec primitive syb
44524178 template-haskell text th-orphans vector
44534179 ];
4454− doHaddock = false;
4455− doCheck = false;
44564180 homepage = "https://github.com/fpco/th-utilities#readme";
44574181 description = "Collection of useful functions for use with Template Haskell";
44584182 license = stdenv.lib.licenses.mit;
@@ -4461,14 +4185,12 @@ self: {
44614185 ({ mkDerivation, base, time }:
44624186 mkDerivation {
44634187 pname = "time-locale-compat";
4464− version = "0.1.1.3";
4465− sha256 = "1vdcfr2hp9qh3ag90x6ikbdf42wiqpdylnplffna54bpnilbyi4i";
4188+ version = "0.1.1.4";
4189+ sha256 = "0qmyxf8nz0q6brvplc4s2wsb1bbpq7kb65b69m503g9bgranblgj";
44664190 configureFlags = [ "-f-old-locale" ];
44674191 libraryHaskellDepends = [ base time ];
4468− doHaddock = false;
4469− doCheck = false;
44704192 homepage = "https://github.com/khibino/haskell-time-locale-compat";
4471− description = "Compatibility of TimeLocale between old-locale and time-1.5";
4193+ description = "Compatibile module for time-format locale";
44724194 license = stdenv.lib.licenses.bsd3;
44734195 }) {};
44744196 "tls" = callPackage
@@ -4479,22 +4201,22 @@ self: {
44794201 }:
44804202 mkDerivation {
44814203 pname = "tls";
4482− version = "1.3.11";
4483− sha256 = "00r7zfkdzy7hi6nhzkirp8jjims4kikgjcm3z4a82kw78awqw01z";
4204+ version = "1.4.1";
4205+ sha256 = "1y083724mym28n6xfaz7pcc7zqxdhjpaxpbvzxfbs25qq2px3smv";
44844206 libraryHaskellDepends = [
44854207 asn1-encoding asn1-types async base bytestring cereal cryptonite
44864208 data-default-class memory mtl network transformers x509 x509-store
44874209 x509-validation
44884210 ];
44894211 testHaskellDepends = [
4490− base bytestring cereal cryptonite data-default-class hourglass mtl
4491− QuickCheck tasty tasty-quickcheck x509 x509-validation
4212+ asn1-types base bytestring cereal cryptonite data-default-class
4213+ hourglass mtl QuickCheck tasty tasty-quickcheck x509
4214+ x509-validation
44924215 ];
44934216 benchmarkHaskellDepends = [
4494− base bytestring criterion cryptonite data-default-class hourglass
4495− mtl QuickCheck tasty-quickcheck x509 x509-validation
4217+ asn1-types base bytestring criterion cryptonite data-default-class
4218+ hourglass mtl QuickCheck tasty-quickcheck x509 x509-validation
44964219 ];
4497− doHaddock = false;
44984220 doCheck = false;
44994221 homepage = "http://github.com/vincenthz/hs-tls";
45004222 description = "TLS/SSL protocol native implementation (Server and Client)";
@@ -4504,29 +4226,23 @@ self: {
45044226 ({ mkDerivation, auto-update, base, clock, psqueues, tls }:
45054227 mkDerivation {
45064228 pname = "tls-session-manager";
4507− version = "0.0.0.1";
4508− sha256 = "0bqv6wh771j7n8qqsh02v8c4byybfkr1027k6cz03mszvnz1q9k8";
4509− revision = "1";
4510− editedCabalFile = "0hnhxfqmvkkhf37rr2ir52xyd59070jjm6s6al0alsanid2m4p01";
4229+ version = "0.0.0.2";
4230+ sha256 = "0rvmln545vghsx8zhxp44f0f6pzma8cylarmfhhysy55ipywr1n5";
45114231 libraryHaskellDepends = [ auto-update base clock psqueues tls ];
4512− doHaddock = false;
4513− doCheck = false;
45144232 description = "In-memory TLS session manager";
45154233 license = stdenv.lib.licenses.bsd3;
45164234 }) {};
45174235 "transformers-base" = callPackage
4518− ({ mkDerivation, base, stm, transformers, transformers-compat }:
4236+ ({ mkDerivation, base, base-orphans, stm, transformers
4237+ , transformers-compat
4238+ }:
45194239 mkDerivation {
45204240 pname = "transformers-base";
4521− version = "0.4.4";
4522− sha256 = "11r3slgpgpra6zi2kjg3g60gvv17b1fh6qxipcpk8n86qx7lk8va";
4523− revision = "1";
4524− editedCabalFile = "196pr3a4lhgklyw6nq6rv1j9djwzmvx7xrpp58carxnb55gk06pv";
4241+ version = "0.4.5.2";
4242+ sha256 = "1s256bi0yh0x2hp2gwd30f3mg1cv53zz397dv1yhfsnfzmihrj6h";
45254243 libraryHaskellDepends = [
4526− base stm transformers transformers-compat
4244+ base base-orphans stm transformers transformers-compat
45274245 ];
4528− doHaddock = false;
4529− doCheck = false;
45304246 homepage = "https://github.com/mvv/transformers-base";
45314247 description = "Lift computations from the bottom of a transformer stack";
45324248 license = stdenv.lib.licenses.bsd3;
@@ -4535,15 +4251,33 @@ self: {
45354251 ({ mkDerivation, base, ghc-prim, transformers }:
45364252 mkDerivation {
45374253 pname = "transformers-compat";
4538− version = "0.5.1.4";
4539− sha256 = "17yam0199fh9ndsn9n69jx9nvbsmymzzwbi23dck3dk4q57fz0fq";
4254+ version = "0.6.2";
4255+ sha256 = "1gp4a8kvniwgm8947ghb4iwv4b7wd6ry4kvv4nfnym4agf5j41nw";
4256+ configureFlags = [ "-ffive-three" ];
45404257 libraryHaskellDepends = [ base ghc-prim transformers ];
4541− doHaddock = false;
4542− doCheck = false;
45434258 homepage = "http://github.com/ekmett/transformers-compat/";
4544− 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";
45454260 license = stdenv.lib.licenses.bsd3;
45464261 }) {};
4262+ "typed-process" = callPackage
4263+ ({ mkDerivation, async, base, base64-bytestring, bytestring, hspec
4264+ , process, stm, temporary, transformers
4265+ }:
4266+ mkDerivation {
4267+ pname = "typed-process";
4268+ version = "0.2.2.0";
4269+ sha256 = "0c6gvgvjyncbni9a5bvpbglknd4yclr3d3hfg9bhgahmkj40dva2";
4270+ libraryHaskellDepends = [
4271+ async base bytestring process stm transformers
4272+ ];
4273+ testHaskellDepends = [
4274+ async base base64-bytestring bytestring hspec process stm temporary
4275+ transformers
4276+ ];
4277+ homepage = "https://haskell-lang.org/library/typed-process";
4278+ description = "Run external processes, with strong typing of streams";
4279+ license = stdenv.lib.licenses.mit;
4280+ }) {};
45474281 "unbounded-delays" = callPackage
45484282 ({ mkDerivation, base }:
45494283 mkDerivation {
@@ -4551,8 +4285,6 @@ self: {
45514285 version = "0.1.1.0";
45524286 sha256 = "1ir9fghbrc214c97bwafk5ck6cacxz1pdnq4i18p604d1b8zg9wa";
45534287 libraryHaskellDepends = [ base ];
4554− doHaddock = false;
4555− doCheck = false;
45564288 homepage = "https://github.com/basvandijk/unbounded-delays";
45574289 description = "Unbounded thread delays and timeouts";
45584290 license = stdenv.lib.licenses.bsd3;
@@ -4561,13 +4293,9 @@ self: {
45614293 ({ mkDerivation, base, unix }:
45624294 mkDerivation {
45634295 pname = "unix-compat";
4564− version = "0.4.3.1";
4565− sha256 = "09vykw89x981fywy0w1pci2v8zy3ajyjwh9z2n610vjacmd1v03j";
4566− revision = "2";
4567− editedCabalFile = "0b5jicn8nm53yxxzwlvfcv4xp5rrqp98x5wwqh234wn9x44z54d2";
4296+ version = "0.5.0.1";
4297+ sha256 = "1gdf3h2knbymkivm784vq51mbcyj5y91r480awyxj5cw8gh9kwn2";
45684298 libraryHaskellDepends = [ base unix ];
4569− doHaddock = false;
4570− doCheck = false;
45714299 homepage = "http://github.com/jystic/unix-compat";
45724300 description = "Portable POSIX-compatibility layer";
45734301 license = stdenv.lib.licenses.bsd3;
@@ -4578,32 +4306,62 @@ self: {
45784306 }:
45794307 mkDerivation {
45804308 pname = "unix-time";
4581− version = "0.3.7";
4582− sha256 = "1qdlc9raih8s0m3x8x3n7q3ngh4faw2alv9l78sp6gnx648k0c8i";
4309+ version = "0.3.8";
4310+ sha256 = "051slgpid5cxiaw203ky0ql3823h28fcjs08axkzd4265wrvv8fw";
45834311 libraryHaskellDepends = [ base binary bytestring old-time ];
45844312 testHaskellDepends = [
45854313 base bytestring doctest hspec old-locale old-time QuickCheck time
45864314 ];
4587− doHaddock = false;
4588− doCheck = false;
45894315 description = "Unix time parser/formatter and utilities";
45904316 license = stdenv.lib.licenses.bsd3;
45914317 }) {};
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+ }) {};
4338+ "unliftio-core" = callPackage
4339+ ({ mkDerivation, base, transformers }:
4340+ mkDerivation {
4341+ pname = "unliftio-core";
4342+ version = "0.1.1.0";
4343+ sha256 = "1193fplsjm1lcr05xwvkj1rsyzx74i755f6kw3ikmxbsv0bv0l3m";
4344+ revision = "1";
4345+ editedCabalFile = "16bjwcsaghqqmyi69rq65dn3ydifyfaabq3ns37apdm00mwqbcj2";
4346+ libraryHaskellDepends = [ base transformers ];
4347+ homepage = "https://github.com/fpco/unliftio/tree/master/unliftio-core#readme";
4348+ description = "The MonadUnliftIO typeclass for unlifting monads to IO";
4349+ license = stdenv.lib.licenses.mit;
4350+ }) {};
45924351 "unordered-containers" = callPackage
4593− ({ mkDerivation, base, bytestring, containers, criterion, deepseq
4594− , deepseq-generics, hashable, hashmap, mtl, random
4352+ ({ mkDerivation, base, ChasingBottoms, containers, deepseq
4353+ , hashable, HUnit, QuickCheck, test-framework, test-framework-hunit
4354+ , test-framework-quickcheck2
45954355 }:
45964356 mkDerivation {
45974357 pname = "unordered-containers";
4598− version = "0.2.8.0";
4599− sha256 = "1a7flszhhgyjn0nm9w7cm26jbf6vyx9ij1iij4sl11pjkwsqi8d4";
4358+ version = "0.2.9.0";
4359+ sha256 = "0l4264p0av12cc6i8gls13q8y27x12z2ar4x34n3x59y99fcnc37";
46004360 libraryHaskellDepends = [ base deepseq hashable ];
4601− benchmarkHaskellDepends = [
4602− base bytestring containers criterion deepseq deepseq-generics
4603− hashable hashmap mtl random
4361+ testHaskellDepends = [
4362+ base ChasingBottoms containers hashable HUnit QuickCheck
4363+ test-framework test-framework-hunit test-framework-quickcheck2
46044364 ];
4605− doHaddock = false;
4606− doCheck = false;
46074365 homepage = "https://github.com/tibbe/unordered-containers";
46084366 description = "Efficient hashing-based container types";
46094367 license = stdenv.lib.licenses.bsd3;
@@ -4614,18 +4372,16 @@ self: {
46144372 pname = "utf8-string";
46154373 version = "1.0.1.1";
46164374 sha256 = "0h7imvxkahiy8pzr8cpsimifdfvv18lizrb33k6mnq70rcx9w2zv";
4617− revision = "2";
4618− editedCabalFile = "1b97s9picjl689hcz8scinv7c8k5iaal1livqr0l1l8yc4h0imhr";
4375+ revision = "3";
4376+ editedCabalFile = "02vhj5gykkqa2dyn7s6gn8is1b5fdn9xcqqvlls268g7cpv6rk38";
46194377 libraryHaskellDepends = [ base bytestring ];
4620− doHaddock = false;
4621− doCheck = false;
46224378 homepage = "http://github.com/glguy/utf8-string/";
46234379 description = "Support for reading and writing UTF8 Strings";
46244380 license = stdenv.lib.licenses.bsd3;
46254381 }) {};
46264382 "uuid-types" = callPackage
4627− ({ mkDerivation, base, binary, bytestring, containers, criterion
4628− , deepseq, hashable, random, text
4383+ ({ mkDerivation, base, binary, bytestring, deepseq, hashable
4384+ , random, text
46294385 }:
46304386 mkDerivation {
46314387 pname = "uuid-types";
@@ -4636,56 +4392,43 @@ self: {
46364392 libraryHaskellDepends = [
46374393 base binary bytestring deepseq hashable random text
46384394 ];
4639− benchmarkHaskellDepends = [
4640− base bytestring containers criterion deepseq random
4641− ];
4642− doHaddock = false;
46434395 doCheck = false;
46444396 homepage = "https://github.com/aslatter/uuid";
46454397 description = "Type definitions for Universally Unique Identifiers";
46464398 license = stdenv.lib.licenses.bsd3;
46474399 }) {};
46484400 "vault" = callPackage
4649− ({ mkDerivation, base, containers, hashable, unordered-containers
4401+ ({ mkDerivation, base, containers, hashable, semigroups
4402+ , unordered-containers
46504403 }:
46514404 mkDerivation {
46524405 pname = "vault";
4653− version = "0.3.0.7";
4654− sha256 = "1w36ldr5iv0yiqbvibm7b1c66hf1ps5rbassz348zmi113d8k4cy";
4406+ version = "0.3.1.1";
4407+ sha256 = "0a1fir7gvbj2w894daac5c4c3gy36r6c74yci78lb2nvk431b95j";
46554408 libraryHaskellDepends = [
4656− base containers hashable unordered-containers
4409+ base containers hashable semigroups unordered-containers
46574410 ];
4658− doHaddock = false;
4659− doCheck = false;
46604411 homepage = "https://github.com/HeinrichApfelmus/vault";
46614412 description = "a persistent store for values of arbitrary types";
46624413 license = stdenv.lib.licenses.bsd3;
46634414 }) {};
46644415 "vector" = callPackage
4665− ({ mkDerivation, base, deepseq, ghc-prim, HUnit, primitive
4666− , QuickCheck, random, template-haskell, test-framework
4667− , test-framework-hunit, test-framework-quickcheck2, transformers
4668− }:
4416+ ({ mkDerivation, base, deepseq, ghc-prim, primitive }:
46694417 mkDerivation {
46704418 pname = "vector";
46714419 version = "0.12.0.1";
46724420 sha256 = "0yrx2ypiaxahvaz84af5bi855hd3107kxkbqc8km29nsp5wyw05i";
4673− revision = "1";
4674− editedCabalFile = "1xjv8876kx9vh86w718vdaaai40pwnsiw8368c5h88ch8iqq10qb";
4421+ revision = "3";
4422+ editedCabalFile = "0y5rh8k710i2a3p1h2rghvr5cfg78p5h0kbfi7ifxqqf6pzlyr1x";
46754423 libraryHaskellDepends = [ base deepseq ghc-prim primitive ];
4676− testHaskellDepends = [
4677− base HUnit QuickCheck random template-haskell test-framework
4678− test-framework-hunit test-framework-quickcheck2 transformers
4679− ];
4680− doHaddock = false;
46814424 doCheck = false;
46824425 homepage = "https://github.com/haskell/vector";
46834426 description = "Efficient Arrays";
46844427 license = stdenv.lib.licenses.bsd3;
46854428 }) {};
46864429 "vector-algorithms" = callPackage
4687− ({ mkDerivation, base, bytestring, containers, mtl, mwc-random
4688− , primitive, QuickCheck, vector
4430+ ({ mkDerivation, base, bytestring, containers, primitive
4431+ , QuickCheck, vector
46894432 }:
46904433 mkDerivation {
46914434 pname = "vector-algorithms";
@@ -4696,11 +4439,9 @@ self: {
46964439 isLibrary = true;
46974440 isExecutable = true;
46984441 libraryHaskellDepends = [ base bytestring primitive vector ];
4699− executableHaskellDepends = [ base mtl mwc-random vector ];
47004442 testHaskellDepends = [
47014443 base bytestring containers QuickCheck vector
47024444 ];
4703− doHaddock = false;
47044445 doCheck = false;
47054446 homepage = "http://code.haskell.org/~dolio/";
47064447 description = "Efficient algorithms for vector arrays";
@@ -4712,19 +4453,31 @@ self: {
47124453 }:
47134454 mkDerivation {
47144455 pname = "vector-binary-instances";
4715− version = "0.2.3.5";
4716− sha256 = "0niad09lbxz3cj20qllyj92lwbc013ihw4lby8fv07x5xjx5a4p1";
4456+ version = "0.2.4";
4457+ sha256 = "1y236jb72iab9ska1mc48z6yb0xgwmj45laaqdyjxksd84z7hbrb";
4458+ revision = "1";
4459+ editedCabalFile = "196frl4akhfk7xf1nxzn8lmq99dxhzhsimanswn9yy7ym8zhki4i";
47174460 libraryHaskellDepends = [ base binary vector ];
47184461 testHaskellDepends = [ base binary tasty tasty-quickcheck vector ];
47194462 benchmarkHaskellDepends = [
47204463 base binary bytestring criterion deepseq vector
47214464 ];
4722− doHaddock = false;
4723− doCheck = false;
47244465 homepage = "https://github.com/bos/vector-binary-instances";
47254466 description = "Instances of Data.Binary and Data.Serialize for vector";
47264467 license = stdenv.lib.licenses.bsd3;
47274468 }) {};
4469+ "vector-builder" = callPackage
4470+ ({ mkDerivation, base, base-prelude, semigroups, vector }:
4471+ mkDerivation {
4472+ pname = "vector-builder";
4473+ version = "0.3.4.1";
4474+ sha256 = "1dzbcm6br9cay28hz804n15bwdhbzhysd4hj0fa6ijfwmfb90r6i";
4475+ libraryHaskellDepends = [ base base-prelude semigroups vector ];
4476+ doCheck = false;
4477+ homepage = "https://github.com/nikita-volkov/vector-builder";
4478+ description = "Vector builder";
4479+ license = stdenv.lib.licenses.mit;
4480+ }) {};
47284481 "vector-instances" = callPackage
47294482 ({ mkDerivation, base, comonad, hashable, keys, pointed
47304483 , semigroupoids, semigroups, vector
@@ -4736,8 +4489,6 @@ self: {
47364489 libraryHaskellDepends = [
47374490 base comonad hashable keys pointed semigroupoids semigroups vector
47384491 ];
4739− doHaddock = false;
4740− doCheck = false;
47414492 homepage = "http://github.com/ekmett/vector-instances";
47424493 description = "Orphan Instances for 'Data.Vector'";
47434494 license = stdenv.lib.licenses.bsd3;
@@ -4750,8 +4501,6 @@ self: {
47504501 sha256 = "0d82x55f5vvr1jvaia382m23rs690lg55pvavv8f4ph0y6kd91xy";
47514502 libraryHaskellDepends = [ base template-haskell vector ];
47524503 testHaskellDepends = [ base data-default vector ];
4753− doHaddock = false;
4754− doCheck = false;
47554504 description = "Deriver for Data.Vector.Unboxed using Template Haskell";
47564505 license = stdenv.lib.licenses.bsd3;
47574506 }) {};
@@ -4762,82 +4511,72 @@ self: {
47624511 version = "0.7.2";
47634512 sha256 = "0aygw0yb1h3yhmfl3bkwh5d3h0l4mmsxz7j53vdm6jryl1kgxzyk";
47644513 libraryHaskellDepends = [ base ];
4765− doHaddock = false;
4766− doCheck = false;
47674514 homepage = "http://github.com/ekmett/void";
47684515 description = "A Haskell 98 logically uninhabited data type";
47694516 license = stdenv.lib.licenses.bsd3;
47704517 }) {};
47714518 "wai" = callPackage
4772− ({ mkDerivation, base, blaze-builder, bytestring
4773− , bytestring-builder, hspec, http-types, network, text
4774− , transformers, vault
4519+ ({ mkDerivation, base, bytestring, hspec, hspec-discover
4520+ , http-types, network, text, transformers, vault
47754521 }:
47764522 mkDerivation {
47774523 pname = "wai";
4778− version = "3.2.1.1";
4779− sha256 = "08afasnirja21vr0bmzcywz4w29x736dmdv7h8nnh1l8bn7sd02x";
4524+ version = "3.2.1.2";
4525+ sha256 = "0jr3b2789wa4m6mxkz12ynz4lfsqmgbrcy0am8karyqr3x3528r8";
47804526 libraryHaskellDepends = [
4781− base blaze-builder bytestring bytestring-builder http-types network
4782− text transformers vault
4527+ base bytestring http-types network text transformers vault
47834528 ];
4784− testHaskellDepends = [ base blaze-builder bytestring hspec ];
4785− doHaddock = false;
4786− doCheck = false;
4529+ testHaskellDepends = [ base bytestring hspec ];
4530+ testToolDepends = [ hspec-discover ];
47874531 homepage = "https://github.com/yesodweb/wai";
47884532 description = "Web Application Interface";
47894533 license = stdenv.lib.licenses.mit;
47904534 }) {};
47914535 "wai-conduit" = callPackage
4792− ({ mkDerivation, base, blaze-builder, bytestring, conduit
4793− , http-types, transformers, wai
4536+ ({ mkDerivation, base, bytestring, conduit, http-types
4537+ , transformers, wai
47944538 }:
47954539 mkDerivation {
47964540 pname = "wai-conduit";
4797− version = "3.0.0.3";
4798− sha256 = "1zvsiwjq2mvkb9sjgp3ly9m968m7a2jjzr4id6jpi3mmqykj15z4";
4541+ version = "3.0.0.4";
4542+ sha256 = "07yn41rn2skd5p3wqqa09wa761vj7ibl8l19gh4bi4i8slxhk417";
47994543 libraryHaskellDepends = [
4800− base blaze-builder bytestring conduit http-types transformers wai
4544+ base bytestring conduit http-types transformers wai
48014545 ];
4802− doHaddock = false;
4803− doCheck = false;
48044546 homepage = "https://github.com/yesodweb/wai";
48054547 description = "conduit wrappers for WAI";
48064548 license = stdenv.lib.licenses.mit;
48074549 }) {};
48084550 "warp" = callPackage
4809− ({ mkDerivation, array, async, auto-update, base, blaze-builder
4810− , bytestring, bytestring-builder, case-insensitive, containers
4811− , criterion, directory, doctest, ghc-prim, hashable, hspec, HTTP
4812− , http-date, http-types, http2, HUnit, iproute, lifted-base
4813− , network, process, QuickCheck, silently, simple-sendfile, stm
4814− , streaming-commons, text, time, transformers, unix, unix-compat
4815− , vault, wai, word8
4551+ ({ mkDerivation, array, async, auto-update, base, bsb-http-chunked
4552+ , bytestring, case-insensitive, containers, directory, doctest
4553+ , gauge, ghc-prim, hashable, hspec, http-client, http-date
4554+ , http-types, http2, HUnit, iproute, lifted-base, network, process
4555+ , QuickCheck, silently, simple-sendfile, stm, streaming-commons
4556+ , text, time, transformers, unix, unix-compat, vault, wai, word8
48164557 }:
48174558 mkDerivation {
48184559 pname = "warp";
4819− version = "3.2.13";
4820− sha256 = "0964l8xcbdqnrz0mnk0b732n66i7q8grwzzax96mqbh15ps5nfcj";
4560+ version = "3.2.23";
4561+ sha256 = "12v9qhi4hyp0sb90yddsax16jj7x47nmqwn53sv7b5nszcxgzam0";
48214562 libraryHaskellDepends = [
4822− array async auto-update base blaze-builder bytestring
4823− bytestring-builder case-insensitive containers ghc-prim hashable
4824− http-date http-types http2 iproute network simple-sendfile stm
4825− streaming-commons text unix unix-compat vault wai word8
4563+ array async auto-update base bsb-http-chunked bytestring
4564+ case-insensitive containers ghc-prim hashable http-date http-types
4565+ http2 iproute network simple-sendfile stm streaming-commons text
4566+ unix unix-compat vault wai word8
48264567 ];
48274568 testHaskellDepends = [
4828− array async auto-update base blaze-builder bytestring
4829− bytestring-builder case-insensitive containers directory doctest
4830− ghc-prim hashable hspec HTTP http-date http-types http2 HUnit
4831− iproute lifted-base network process QuickCheck silently
4832− simple-sendfile stm streaming-commons text time transformers unix
4833− unix-compat vault wai word8
4569+ array async auto-update base bsb-http-chunked bytestring
4570+ case-insensitive containers directory doctest ghc-prim hashable
4571+ hspec http-client http-date http-types http2 HUnit iproute
4572+ lifted-base network process QuickCheck silently simple-sendfile stm
4573+ streaming-commons text time transformers unix unix-compat vault wai
4574+ word8
48344575 ];
48354576 benchmarkHaskellDepends = [
4836− auto-update base bytestring containers criterion hashable http-date
4577+ auto-update base bytestring containers gauge hashable http-date
48374578 http-types network unix unix-compat
48384579 ];
4839− doHaddock = false;
4840− doCheck = false;
48414580 homepage = "http://github.com/yesodweb/wai";
48424581 description = "A fast, light-weight web server for WAI applications";
48434582 license = stdenv.lib.licenses.mit;
@@ -4848,18 +4587,43 @@ self: {
48484587 }:
48494588 mkDerivation {
48504589 pname = "warp-tls";
4851− version = "3.2.4";
4852− sha256 = "05vfjlgi574nnydfmfpyp3q6mf389iyj9mv94djnm8d1izasml85";
4590+ version = "3.2.4.3";
4591+ sha256 = "17gj295fr98l7mkz2gdz6kahdnmja0sql3kvy2zab6q168g53kc4";
48534592 libraryHaskellDepends = [
48544593 base bytestring cryptonite data-default-class network
48554594 streaming-commons tls tls-session-manager wai warp
48564595 ];
4857− doHaddock = false;
4858− doCheck = false;
48594596 homepage = "http://github.com/yesodweb/wai";
48604597 description = "HTTP over TLS support for Warp via the TLS package";
48614598 license = stdenv.lib.licenses.mit;
48624599 }) {};
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+ }) {};
4613+ "weigh" = callPackage
4614+ ({ mkDerivation, base, deepseq, mtl, process, split, temporary }:
4615+ mkDerivation {
4616+ pname = "weigh";
4617+ version = "0.0.12";
4618+ sha256 = "0zw2a997gxgdzqmd7j730kxgynzmjvvlkw84dajmfzf1v9pbij7x";
4619+ libraryHaskellDepends = [
4620+ base deepseq mtl process split temporary
4621+ ];
4622+ testHaskellDepends = [ base deepseq ];
4623+ homepage = "https://github.com/fpco/weigh#readme";
4624+ description = "Measure allocations of a Haskell functions/values";
4625+ license = stdenv.lib.licenses.bsd3;
4626+ }) {};
48634627 "with-location" = callPackage
48644628 ({ mkDerivation, base, hspec }:
48654629 mkDerivation {
@@ -4868,12 +4632,26 @@ self: {
48684632 sha256 = "1rzxvsyh8x3ql3zh7gyw9hjx9bl4v73h0y5kzgaxcfcdn86dg49c";
48694633 libraryHaskellDepends = [ base ];
48704634 testHaskellDepends = [ base hspec ];
4871− doHaddock = false;
4872− doCheck = false;
48734635 homepage = "https://github.com/sol/with-location#readme";
48744636 description = "Use ImplicitParams-based source locations in a backward compatible way";
48754637 license = stdenv.lib.licenses.mit;
48764638 }) {};
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+ }) {};
48774655 "word8" = callPackage
48784656 ({ mkDerivation, base, bytestring, criterion, hspec }:
48794657 mkDerivation {
@@ -4883,8 +4661,6 @@ self: {
48834661 libraryHaskellDepends = [ base ];
48844662 testHaskellDepends = [ base hspec ];
48854663 benchmarkHaskellDepends = [ base bytestring criterion ];
4886− doHaddock = false;
4887− doCheck = false;
48884664 description = "Word8 library";
48894665 license = stdenv.lib.licenses.bsd3;
48904666 }) {};
@@ -4895,10 +4671,10 @@ self: {
48954671 }:
48964672 mkDerivation {
48974673 pname = "x509";
4898− version = "1.7.2";
4899− sha256 = "0yyfw07bw73gkh93z653lnncc30wj3g3rf26cwxjpyxvwalia0yw";
4674+ version = "1.7.3";
4675+ sha256 = "0mkk29g32fs70bqkikg83v45h9jig9c8aail3mrdqwxpkfa0yx21";
49004676 revision = "1";
4901− editedCabalFile = "07mphpmj4zk5mzhp5x50a7q6w134kgymf557dcgbp643cbkcmc66";
4677+ editedCabalFile = "06zzirygvzp0ssdg9blipdwmd0b41p4gxh3ldai7ngjyjsdclwsx";
49024678 libraryHaskellDepends = [
49034679 asn1-encoding asn1-parse asn1-types base bytestring containers
49044680 cryptonite hourglass memory mtl pem
@@ -4907,8 +4683,6 @@ self: {
49074683 asn1-types base bytestring cryptonite hourglass mtl tasty
49084684 tasty-quickcheck
49094685 ];
4910− doHaddock = false;
4911− doCheck = false;
49124686 homepage = "http://github.com/vincenthz/hs-certificate";
49134687 description = "X509 reader and writer";
49144688 license = stdenv.lib.licenses.bsd3;
@@ -4920,15 +4694,13 @@ self: {
49204694 }:
49214695 mkDerivation {
49224696 pname = "x509-store";
4923− version = "1.6.5";
4924− sha256 = "1lg9gy0bmzjmlk4gfnzx2prfar1qha4hfjsw8yvjg33zm0fv3ahs";
4697+ version = "1.6.6";
4698+ sha256 = "0dbndqmnmyixxc7308nyq3zlkhz9dff4rbcw2a49c77rbicny9va";
49254699 libraryHaskellDepends = [
49264700 asn1-encoding asn1-types base bytestring containers cryptonite
49274701 directory filepath mtl pem x509
49284702 ];
49294703 testHaskellDepends = [ base bytestring tasty tasty-hunit x509 ];
4930− doHaddock = false;
4931− doCheck = false;
49324704 homepage = "http://github.com/vincenthz/hs-certificate";
49334705 description = "X.509 collection accessing and storing methods";
49344706 license = stdenv.lib.licenses.bsd3;
@@ -4945,34 +4717,29 @@ self: {
49454717 base bytestring containers directory filepath mtl pem process x509
49464718 x509-store
49474719 ];
4948− doHaddock = false;
4949− doCheck = false;
49504720 homepage = "http://github.com/vincenthz/hs-certificate";
49514721 description = "Handle per-operating-system X.509 accessors and storage";
49524722 license = stdenv.lib.licenses.bsd3;
49534723 }) {};
49544724 "x509-validation" = callPackage
4955− ({ mkDerivation, asn1-encoding, asn1-types, base, byteable
4956− , bytestring, containers, cryptonite, data-default-class, hourglass
4957− , memory, mtl, pem, tasty, tasty-hunit, x509, x509-store
4725+ ({ mkDerivation, asn1-encoding, asn1-types, base, bytestring
4726+ , containers, cryptonite, data-default-class, hourglass, memory
4727+ , mtl, pem, tasty, tasty-hunit, x509, x509-store
49584728 }:
49594729 mkDerivation {
49604730 pname = "x509-validation";
4961− version = "1.6.9";
4962− sha256 = "005m5jxjz5cx3lriayv4a17xa19qc2qxw7kz2f9wvj7hgjnwww44";
4731+ version = "1.6.10";
4732+ sha256 = "1ms51scawldgyfcim5a2qlgyn3rnrclyh205d6djaa1569vrs73n";
49634733 revision = "1";
4964− editedCabalFile = "02n9s0wizi4wivs6is4cyapqjjnbrx3zdk34q0cnlfsvbbvyhjax";
4734+ editedCabalFile = "1isap8v1gh31q4pj3gn155ya8nd1da0a5a3cryqh4yhf0ivbwl0w";
49654735 libraryHaskellDepends = [
4966− asn1-encoding asn1-types base byteable bytestring containers
4967− cryptonite data-default-class hourglass memory mtl pem x509
4968− x509-store
4736+ asn1-encoding asn1-types base bytestring containers cryptonite
4737+ data-default-class hourglass memory mtl pem x509 x509-store
49694738 ];
49704739 testHaskellDepends = [
49714740 asn1-encoding asn1-types base bytestring cryptonite
49724741 data-default-class hourglass tasty tasty-hunit x509 x509-store
49734742 ];
4974− doHaddock = false;
4975− doCheck = false;
49764743 homepage = "http://github.com/vincenthz/hs-certificate";
49774744 description = "X.509 Certificate and CRL validation";
49784745 license = stdenv.lib.licenses.bsd3;
@@ -4984,33 +4751,29 @@ self: {
49844751 version = "1.3.14";
49854752 sha256 = "0g814lj7vaxvib2g3r734221k80k7ap9czv9hinifn8syals3l9j";
49864753 libraryHaskellDepends = [ base bytestring text ];
4987− doHaddock = false;
4988− doCheck = false;
49894754 homepage = "http://code.galois.com";
49904755 description = "A simple XML library";
49914756 license = stdenv.lib.licenses.bsd3;
49924757 }) {};
49934758 "xml-conduit" = callPackage
4994− ({ mkDerivation, attoparsec, base, blaze-builder, blaze-html
4995− , blaze-markup, bytestring, conduit, conduit-extra, containers
4996− , data-default, deepseq, hspec, HUnit, monad-control, resourcet
4997− , text, transformers, xml-types
4759+ ({ mkDerivation, attoparsec, base, blaze-html, blaze-markup
4760+ , bytestring, conduit, conduit-extra, containers
4761+ , data-default-class, deepseq, hspec, HUnit, monad-control
4762+ , resourcet, text, transformers, xml-types
49984763 }:
49994764 mkDerivation {
50004765 pname = "xml-conduit";
5001− version = "1.5.1";
5002− sha256 = "0d4pb9d0mdz9djh8aiy5r8088rqh7w34mbqmg8mmaq1i7vx2dzks";
4766+ version = "1.8.0";
4767+ sha256 = "0di0ll2p4ykqnlipf2jrlalirxdf9wkli292245rgr3vcb9vz0h3";
50034768 libraryHaskellDepends = [
5004− attoparsec base blaze-builder blaze-html blaze-markup bytestring
5005− conduit conduit-extra containers data-default deepseq monad-control
4769+ attoparsec base blaze-html blaze-markup bytestring conduit
4770+ conduit-extra containers data-default-class deepseq monad-control
50064771 resourcet text transformers xml-types
50074772 ];
50084773 testHaskellDepends = [
50094774 base blaze-markup bytestring conduit containers hspec HUnit
50104775 resourcet text transformers xml-types
50114776 ];
5012− doHaddock = false;
5013− doCheck = false;
50144777 homepage = "http://github.com/snoyberg/xml";
50154778 description = "Pure-Haskell utilities for dealing with XML with the conduit package";
50164779 license = stdenv.lib.licenses.mit;
@@ -5022,23 +4785,20 @@ self: {
50224785 version = "0.3.6";
50234786 sha256 = "1jgqxsa9p2q3h6nymbfmvhldqrqlwrhrzmwadlyc0li50x0d8dwr";
50244787 libraryHaskellDepends = [ base deepseq text ];
5025− doHaddock = false;
5026− doCheck = false;
50274788 homepage = "https://john-millikin.com/software/haskell-xml/";
50284789 description = "Basic types for representing XML";
50294790 license = stdenv.lib.licenses.mit;
50304791 }) {};
50314792 "yaml" = callPackage
5032− ({ mkDerivation, aeson, aeson-qq, attoparsec, base, base-compat
5033− , bytestring, conduit, containers, directory, filepath, hspec
5034− , HUnit, mockery, resourcet, scientific, semigroups
5035− , template-haskell, temporary, text, transformers
5036− , unordered-containers, vector
4793+ ({ mkDerivation, aeson, attoparsec, base, base-compat, bytestring
4794+ , conduit, containers, directory, filepath, hspec, HUnit, mockery
4795+ , resourcet, scientific, semigroups, template-haskell, temporary
4796+ , text, transformers, unordered-containers, vector
50374797 }:
50384798 mkDerivation {
50394799 pname = "yaml";
5040− version = "0.8.23.3";
5041− sha256 = "0hvmxl8krh8m3804d1nrvgmbirvw11a8iy80ciq4rg0csmz5r1fc";
4800+ version = "0.8.32";
4801+ sha256 = "0cbsyh4ilvjzq1q7pxls43k6pdqxg1l85xzibcwpbvmlvrizh86w";
50424802 isLibrary = true;
50434803 isExecutable = true;
50444804 libraryHaskellDepends = [
@@ -5046,51 +4806,27 @@ self: {
50464806 filepath resourcet scientific semigroups template-haskell text
50474807 transformers unordered-containers vector
50484808 ];
5049− executableHaskellDepends = [ aeson base bytestring ];
50504809 testHaskellDepends = [
5051− aeson aeson-qq base base-compat bytestring conduit directory hspec
5052− HUnit mockery resourcet temporary text transformers
4810+ aeson attoparsec base base-compat bytestring conduit containers
4811+ directory filepath hspec HUnit mockery resourcet scientific
4812+ semigroups template-haskell temporary text transformers
50534813 unordered-containers vector
50544814 ];
5055− doHaddock = false;
5056− doCheck = false;
5057− homepage = "http://github.com/snoyberg/yaml/";
4815+ homepage = "https://github.com/snoyberg/yaml#readme";
50584816 description = "Support for parsing and rendering YAML documents";
50594817 license = stdenv.lib.licenses.bsd3;
50604818 }) {};
50614819 "zlib" = callPackage
5062− ({ mkDerivation, base, bytestring, QuickCheck, tasty, tasty-hunit
5063− , tasty-quickcheck, zlib
5064− }:
4820+ ({ mkDerivation, base, bytestring, zlib }:
50654821 mkDerivation {
50664822 pname = "zlib";
5067− version = "0.6.1.2";
5068− sha256 = "1fx2k2qmgm2dj3fkxx2ry945fpdn02d4dkihjxma21xgdiilxsz4";
4823+ version = "0.6.2";
4824+ sha256 = "1vbzf0awb6zb456xf48za1kl22018646cfzq4frvxgb9ay97vk0d";
50694825 libraryHaskellDepends = [ base bytestring ];
50704826 librarySystemDepends = [ zlib ];
5071− testHaskellDepends = [
5072− base bytestring QuickCheck tasty tasty-hunit tasty-quickcheck
5073− ];
5074− doHaddock = false;
50754827 doCheck = false;
50764828 description = "Compression and decompression in the gzip and zlib formats";
50774829 license = stdenv.lib.licenses.bsd3;
50784830 }) {inherit (pkgs) zlib;};
5079− "zlib-bindings" = callPackage
5080− ({ mkDerivation, base, bytestring, hspec, QuickCheck, zlib }:
5081− mkDerivation {
5082− pname = "zlib-bindings";
5083− version = "0.1.1.5";
5084− sha256 = "02ciywlz4wdlymgc3jsnicz9kzvymjw1www2163gxidnz4wb8fy8";
5085− revision = "2";
5086− editedCabalFile = "0fq49694gqkab8m0vq4i879blswczwd66n7xh4r4gwiahf0ryvqc";
5087− libraryHaskellDepends = [ base bytestring zlib ];
5088− testHaskellDepends = [ base bytestring hspec QuickCheck zlib ];
5089− doHaddock = false;
5090− doCheck = false;
5091− homepage = "http://github.com/snapframework/zlib-bindings";
5092− description = "Low-level bindings to the zlib package";
5093− license = stdenv.lib.licenses.bsd3;
5094− }) {};
50954831
50964832}
nix/haskellPackages/default.nixdeleted−164
@@ -1,164 +0,0 @@
1−# Generated by stackage2nix 0.3.0 from "../../stack.yaml"
2−{ nixpkgs ? import <nixpkgs> {} }:
3−
4−with nixpkgs;
5−let
6− inherit (stdenv.lib) extends;
7− stackagePackages = self: import ./packages.nix { inherit pkgs stdenv; inherit (self) callPackage; };
8− stackageConfig = callPackage ./configuration-packages.nix {};
9− stackPackages =
10− { pkgs, stdenv, callPackage }:
11−
12− self: {
13− "Cabal" = callPackage
14− ({ mkDerivation, array, base, binary, bytestring, containers
15− , deepseq, directory, filepath, pretty, process, QuickCheck, tagged
16− , tar, tasty, tasty-hunit, tasty-quickcheck, time, unix
17− }:
18− mkDerivation {
19− pname = "Cabal";
20− version = "2.0.0.2";
21− sha256 = "0chhl2113jbahd5gychx9rdqj1aw22h7dyj6z44871hzqxngx6bc";
22− libraryHaskellDepends = [
23− array base binary bytestring containers deepseq directory filepath
24− pretty process time unix
25− ];
26− testHaskellDepends = [
27− array base bytestring containers directory filepath pretty
28− QuickCheck tagged tar tasty tasty-hunit tasty-quickcheck
29− ];
30− doHaddock = false;
31− doCheck = false;
32− homepage = "http://www.haskell.org/cabal/";
33− description = "A framework for packaging Haskell software";
34− license = stdenv.lib.licenses.bsd3;
35− }) {};
36− "cabal2nix" = callPackage
37− ({ mkDerivation, aeson, ansi-wl-pprint, base, bytestring, Cabal
38− , cabal-doctest, containers, deepseq, directory
39− , distribution-nixpkgs, doctest, filepath, hackage-db, hopenssl
40− , language-nix, lens, monad-par, monad-par-extras, mtl
41− , optparse-applicative, pretty, process, split, text, time
42− , transformers, utf8-string, yaml
43− }:
44− mkDerivation {
45− pname = "cabal2nix";
46− version = "2.5";
47− sha256 = "19ywslwarwk84anfq78y249krqnddi2yyh66l78a88xfsh002abp";
48− isLibrary = true;
49− isExecutable = true;
50− setupHaskellDepends = [ base Cabal cabal-doctest ];
51− libraryHaskellDepends = [
52− aeson ansi-wl-pprint base bytestring Cabal containers deepseq
53− directory distribution-nixpkgs filepath hackage-db hopenssl
54− language-nix lens optparse-applicative pretty process split text
55− transformers yaml
56− ];
57− executableHaskellDepends = [
58− aeson ansi-wl-pprint base bytestring Cabal containers deepseq
59− directory distribution-nixpkgs filepath hackage-db hopenssl
60− language-nix lens monad-par monad-par-extras mtl
61− optparse-applicative pretty process split text time transformers
62− utf8-string yaml
63− ];
64− testHaskellDepends = [
65− aeson ansi-wl-pprint base bytestring Cabal containers deepseq
66− directory distribution-nixpkgs doctest filepath hackage-db hopenssl
67− language-nix lens optparse-applicative pretty process split text
68− transformers yaml
69− ];
70− doHaddock = false;
71− doCheck = false;
72− homepage = "https://github.com/nixos/cabal2nix#readme";
73− description = "Convert Cabal files into Nix build instructions";
74− license = stdenv.lib.licenses.bsd3;
75− }) {};
76− "stackage-curator" = callPackage
77− ({ mkDerivation, aeson, amazonka, amazonka-core, amazonka-s3, async
78− , base, base16-bytestring, blaze-html, byteable, bytestring, Cabal
79− , classy-prelude-conduit, conduit, conduit-extra, containers
80− , cryptohash, cryptohash-conduit, data-default-class, directory
81− , exceptions, filepath, hashable, hspec, html-conduit, http-client
82− , http-client-tls, http-conduit, lucid, mime-types, monad-unlift
83− , monad-unlift-ref, mono-traversable, mtl, old-locale
84− , optparse-applicative, optparse-simple, process, QuickCheck
85− , resourcet, safe, semigroups, stm, store, streaming-commons, syb
86− , system-fileio, system-filepath, tar, temporary, text, time
87− , transformers, unix-compat, unordered-containers, utf8-string
88− , vector, xml-conduit, xml-types, yaml, zlib
89− }:
90− mkDerivation {
91− pname = "stackage-curator";
92− version = "0.15.0.0";
93− sha256 = "0z84ywxh4zb996b0ir8hjl9pwdcb0ds0pgq6i8sfxmj5nrw5yjn5";
94− isLibrary = true;
95− isExecutable = true;
96− libraryHaskellDepends = [
97− aeson amazonka amazonka-core amazonka-s3 async base
98− base16-bytestring blaze-html byteable bytestring Cabal
99− classy-prelude-conduit conduit conduit-extra containers cryptohash
100− cryptohash-conduit data-default-class directory exceptions filepath
101− hashable html-conduit http-client http-client-tls http-conduit
102− lucid mime-types monad-unlift monad-unlift-ref mono-traversable mtl
103− old-locale process resourcet safe semigroups stm store
104− streaming-commons syb system-fileio system-filepath tar temporary
105− text time transformers unix-compat unordered-containers utf8-string
106− vector xml-conduit xml-types yaml zlib
107− ];
108− executableHaskellDepends = [
109− aeson base http-client http-client-tls optparse-applicative
110− optparse-simple system-filepath text
111− ];
112− testHaskellDepends = [
113− base Cabal classy-prelude-conduit containers directory hspec
114− http-client http-client-tls QuickCheck text yaml
115− ];
116− doHaddock = false;
117− doCheck = false;
118− homepage = "https://github.com/fpco/stackage-curator";
119− description = "Tools for curating Stackage bundles";
120− license = stdenv.lib.licenses.mit;
121− }) {};
122− "stackage2nix" = callPackage
123− ({ mkDerivation, aeson, base, bytestring, Cabal, cabal2nix
124− , containers, deepseq, distribution-nixpkgs, exceptions, filepath
125− , gitlib, gitlib-libgit2, hopenssl, hspec, inflections
126− , language-nix, lens, network-uri, optparse-applicative, pretty
127− , QuickCheck, shakespeare, stackage-curator, text
128− , unordered-containers, yaml
129− }:
130− mkDerivation {
131− pname = "stackage2nix";
132− version = "0.3.0";
133− src = ../../.;
134− isLibrary = true;
135− isExecutable = true;
136− libraryHaskellDepends = [
137− aeson base bytestring Cabal cabal2nix containers deepseq
138− distribution-nixpkgs exceptions filepath gitlib gitlib-libgit2
139− hopenssl inflections language-nix lens network-uri
140− optparse-applicative pretty QuickCheck stackage-curator text
141− unordered-containers yaml
142− ];
143− executableHaskellDepends = [ base ];
144− testHaskellDepends = [
145− base bytestring Cabal hspec pretty shakespeare text yaml
146− ];
147− doHaddock = false;
148− doCheck = false;
149− homepage = "https://github.com/4e6/stackage2nix#readme";
150− description = "Convert Stack files into Nix build instructions";
151− license = stdenv.lib.licenses.bsd3;
152− }) {};
153− };
154−
155− pkgOverrides = self: stackPackages {
156− inherit pkgs stdenv;
157− inherit (self) callPackage;
158− };
159−
160−in callPackage (nixpkgs.path + "/pkgs/development/haskell-modules") {
161− ghc = pkgs.haskell.compiler.ghc802;
162− compilerConfig = self: extends pkgOverrides (extends stackageConfig (stackagePackages self));
163− haskellLib = callPackage (nixpkgs.path + "/pkgs/development/haskell-modules/lib.nix") {};
164−}
nix/lib.nix+1−1
@@ -23,7 +23,7 @@ rec {
2323 buildInputs = [ git ];
2424 installPhase = ''
2525 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
2727 '';
2828 SSL_CERT_FILE="${cacert}/etc/ssl/certs/ca-bundle.crt";
2929 };
nix/stackage/default.nixdeleted−24
@@ -1,24 +0,0 @@
1−{ nixpkgs ? import <nixpkgs> {}
2−, lts ? "lts-9.0" }:
3−
4−with nixpkgs;
5−let
6− lib = callPackage ../lib.nix {};
7− stackage2nix = import ../stackage2nix { inherit nixpkgs; };
8−in stdenv.mkDerivation {
9− name = "stackage";
10− phases = [ "installPhase" ];
11− buildInputs = [ stackage2nix ];
12−
13− installPhase = ''
14− export HOME=$TMP
15− mkdir -p $out
16− pushd $out
17− stackage2nix --resolver ${lts}
18− popd
19− '';
20−
21− LANG="en_US.UTF-8";
22− SSL_CERT_FILE="${cacert}/etc/ssl/certs/ca-bundle.crt";
23− NIX_PATH="nixpkgs=${nixpkgs.path}";
24−}
nix/stackage2nix/default.nix+1−1
@@ -3,7 +3,7 @@
33with nixpkgs;
44let
55 lib = callPackage ../lib.nix {};
6− haskellPackages = import ../haskellPackages { inherit nixpkgs; };
6+ haskellPackages = import ../haskell-packages { inherit nixpkgs; };
77in stdenv.mkDerivation rec {
88 name = "stackage2nix-${version}";
99 version = haskellPackages.stackage2nix.version;
src/AllCabalHashes.hs+27−21
@@ -3,14 +3,14 @@ module AllCabalHashes where
33import Control.Lens hiding ((<.>))
44import Data.Aeson as A
55import Data.ByteString as BS
6−import Data.ByteString.Lazy as BSL
6+import Data.ByteString.Char8 as B8
77import Data.Map as M
8+import Data.Tagged (Tagged(..))
89import Data.Text as T
9−import Data.Text.Encoding as T
1010import Distribution.Nixpkgs.Hashes as NH
1111import Distribution.Package
1212import Distribution.PackageDescription
13−import Distribution.PackageDescription.Parse
13+import Distribution.PackageDescription.Parsec
1414import Distribution.Text ( display )
1515import Git
1616import Git.Libgit2 as Libgit2
@@ -41,28 +41,34 @@ readPackageByHash repoDir sha1Hash = do
4141 let repoOpts = defaultRepositoryOptions { repoPath = repoDir }
4242 repo <- openLgRepository repoOpts
4343 buf <- runLgRepository repo $ do
44− BlobObj (Blob _ contents) <- lookupObject =<< parseOid sha1Hash
45− case contents of
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)
52− let
53− hash = printSHA256 (digest (digestByName "sha256") buf)
54− pkg = setCabalFileHash hash cabal
55− return (pkg, hash)
44+ oid <- parseOid sha1Hash
45+ catBlob (Tagged oid)
46+ parseCabal ("Git SHA1 " ++ show sha1Hash) buf
5647
5748readPackageByName :: FilePath -> PackageIdentifier -> IO (GenericPackageDescription, SHA256Hash)
5849readPackageByName repoDir (PackageIdentifier name version) = do
59− let cabalFile = repoDir </> unPackageName name </> display version </> unPackageName name <.> "cabal"
60− buf <- BS.readFile cabalFile
61− cabal <- case parseGenericPackageDescription (T.unpack $ T.decodeUtf8 buf) of
62− ParseOk _ a -> return a
63− ParseFailed err -> fail (cabalFile ++ ": " ++ show err)
50+ let cabalFile = unPackageName name </> display version </> unPackageName name <.> "cabal"
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
67+ cabal <- let (_, res) = runParseResult (parseGenericPackageDescription blob)
68+ in case res of Right a -> return a
69+ Left (_, err) -> fail (what ++ ": " ++ show err)
6470 let
65− hash = NH.printSHA256 (SSL.digest (SSL.digestByName "sha256") buf)
71+ hash = NH.printSHA256 (SSL.digest (SSL.digestByName "sha256") blob)
6672 pkg = setCabalFileHash hash cabal
6773 return (pkg, hash)
6874
src/Distribution/Nixpkgs/Haskell/FromStack.hs+12−7
@@ -26,12 +26,15 @@ data PackageSetConfig = PackageSetConfig
2626 , targetCompiler :: CompilerInfo }
2727
2828data PackageConfig = PackageConfig
29− { enableCheck :: Bool
30− , enableHaddock :: Bool }
29+ { enableCheck :: Bool
30+ , enableHaddock :: Bool }
3131
3232removeTests :: GenericPackageDescription -> GenericPackageDescription
3333removeTests gd = gd { condTestSuites = [] }
3434
35+removeBenches :: GenericPackageDescription -> GenericPackageDescription
36+removeBenches gd = gd { condBenchmarks = [] }
37+
3538planDependencies :: PackagePlan -> [Dependency]
3639planDependencies = map makeDependency . Map.toList . sdPackages . ppDesc
3740 where
@@ -57,19 +60,22 @@ fromPackage conf pconf plan pkg =
5760 configureTests
5861 | pcTests constraints == Don'tBuild = removeTests
5962 | otherwise = id
63+ configureBenches
64+ | pcBenches constraints == Don'tBuild = removeBenches
65+ | otherwise = id
6066 flags = Map.toList (pcFlagOverrides constraints)
6167 (descr, missingDeps) = finalizeGenericPackageDescription
6268 (haskellResolver conf)
6369 (targetPlatform conf)
6470 (targetCompiler conf)
65− flags
71+ (mkFlagAssignment flags)
6672 (planDependencies plan)
67− (configureTests (pkgCabal pkg))
73+ (configureBenches . configureTests $ pkgCabal pkg)
6874 genericDrv = fromPackageDescription
6975 (haskellResolver conf)
7076 (nixpkgsResolver conf)
7177 missingDeps
72− flags
78+ (mkFlagAssignment flags)
7379 descr
7480 depName (Dependency name _) = name
7581 testDeps = setOf
@@ -91,6 +97,5 @@ finalizePackage :: Package -> PackageConfig -> Derivation -> Derivation
9197finalizePackage pkg pconf drv = drv
9298 & src .~ pkgSource pkg
9399 & doCheck &&~ enableCheck pconf
100+ & testDepends %~ (if enableCheck pconf then id else const mempty)
94101 & runHaddock &&~ enableHaddock pconf
95− -- Will never run benchmarks
96− & benchmarkDepends .~ mempty
src/Distribution/Nixpkgs/Haskell/FromStack/Package.hs+32−12
@@ -1,10 +1,10 @@
11module Distribution.Nixpkgs.Haskell.FromStack.Package where
22
33import Control.Lens
4−import Data.Graph (Graph, Vertex)
54import Data.Foldable as F
5+import Data.Function (on)
6+import Data.Graph (Graph, Vertex)
67import Data.Maybe
7−import Data.Monoid
88import Data.Ord as O
99import Distribution.Text (display, disp)
1010import Distribution.Package (unPackageName, packageName)
@@ -21,12 +21,21 @@ import qualified Data.Map as Map
2121import qualified Data.Set as Set
2222
2323data Node = Node
24− { _nodeDerivation :: Derivation
25− , _nodeTestDepends :: Set.Set String
26− , _nodeOtherDepends :: Set.Set String }
24+ { _nodeDerivation :: Derivation
25+ , _nodeTestDepends :: Set.Set String
26+ , _nodeBenchmarkDepends :: Set.Set String
27+ , _nodeExecutableDepends :: Set.Set String
28+ , _nodeSetupDepends :: Set.Set String
29+ , _nodeOtherDepends :: Set.Set String }
2730
2831makeLenses ''Node
2932
33+instance Eq Node where
34+ (==) = (==) `on` nodeName
35+
36+instance Ord Node where
37+ compare = compare `on` nodeName
38+
3039mkNode :: Derivation -> Node
3140mkNode _nodeDerivation = Node{..}
3241 where
@@ -34,17 +43,27 @@ mkNode _nodeDerivation = Node{..}
3443 . Set.filter isFromHackage
3544 $ view (s . (haskell <> tool)) _nodeDerivation
3645 _nodeTestDepends = haskellDependencies testDepends
46+ _nodeBenchmarkDepends = haskellDependencies benchmarkDepends
47+ _nodeExecutableDepends = haskellDependencies executableDepends
48+ _nodeSetupDepends = haskellDependencies setupDepends
3749 _nodeOtherDepends = haskellDependencies (executableDepends <> libraryDepends)
3850
3951nodeName :: Node -> String
4052nodeName = unPackageName . packageName . view (nodeDerivation . pkgid)
4153
54+nodeCycleDepends :: Node -> Set.Set String
55+nodeCycleDepends = _nodeTestDepends <> _nodeOtherDepends
56+
4257nodeDepends :: Node -> Set.Set String
43−nodeDepends = _nodeTestDepends <> _nodeOtherDepends
58+nodeDepends = _nodeTestDepends
59+ <> _nodeOtherDepends
60+ <> _nodeBenchmarkDepends
61+ <> _nodeExecutableDepends
62+ <> _nodeSetupDepends
4463
4564findCycles :: [Node] -> [[Node]]
4665findCycles nodes = mapMaybe cyclic $
47− Graph.stronglyConnComp [(node, nodeName node, Set.toList $ nodeDepends node) | node <- nodes]
66+ Graph.stronglyConnComp [(node, nodeName node, Set.toList $ nodeCycleDepends node) | node <- nodes]
4867 where
4968 cyclic (Graph.AcyclicSCC _) = Nothing
5069 cyclic (Graph.CyclicSCC c) = Just c
@@ -68,12 +87,13 @@ buildNodeGraph :: [Node] -> (Graph, FromVertex, FromKey)
6887buildNodeGraph nodes = Graph.graphFromEdges
6988 [(node, nodeName node, Set.toList $ nodeDepends node) | node <- nodes]
7089
71−reachableDependencies :: [Node] -> [Node] -> [Node]
72−reachableDependencies keyNodes nodes = view _1 . fromVertex <$> reachableVertices
90+reachableDependencies :: [Node] -> [Node] -> Set.Set Node
91+reachableDependencies keyNodes nodes = Set.map (view _1 . fromVertex) reachableVerticesS
7392 where
7493 (graph, fromVertex, fromKey) = buildNodeGraph nodes
7594 keys = mapMaybe (fromKey . nodeName) keyNodes
76− reachableVertices = concatMap F.toList $ Graph.dfs graph keys
95+ reachableVerticesS = F.foldr1 Set.union
96+ $ (Set.fromList . F.toList) <$> Graph.dfs graph keys
7797
7898-- pretty printing
7999
@@ -85,9 +105,9 @@ isFromHackage b = case view (reference . Nix.path) b of
85105
86106pPrintOutConfig :: SystemInfo -> [Node] -> Doc
87107pPrintOutConfig systemInfo nodes = vcat
88− [ "{ pkgs }:"
108+ [ "{ pkgs, haskellLib }:"
89109 , ""
90− , "with pkgs.haskell.lib; self: super: {"
110+ , "with haskellLib; self: super: {"
91111 , ""
92112 , " # core packages"
93113 , nest 2 $ vcat $
src/Distribution/Nixpkgs/Haskell/Packages/PrettyPrinting.hs+2
@@ -2,6 +2,8 @@ module Distribution.Nixpkgs.Haskell.Packages.PrettyPrinting where
22
33import Language.Nix.PrettyPrinting
44
5+import Prelude hiding ((<>))
6+
57compilerConfig :: Doc -> Doc
68compilerConfig body =
79 funargsCurried ["self", "super"] <+> body
src/Distribution/Nixpkgs/Haskell/Stack.hs+22−42
@@ -1,4 +1,3 @@
1−{-# LANGUAGE CPP #-}
21module Distribution.Nixpkgs.Haskell.Stack where
32
43import Control.Lens
@@ -9,6 +8,7 @@ import Distribution.Nixpkgs.Fetch
98import Distribution.Nixpkgs.Haskell.Derivation
109import Distribution.Nixpkgs.Haskell.FromCabal as FromCabal
1110import Distribution.Nixpkgs.Haskell.FromStack as FromStack
11+import Distribution.Nixpkgs.Haskell.Hackage as DB
1212import Distribution.Nixpkgs.Haskell.PackageSourceSpec as PackageSourceSpec
1313import Distribution.PackageDescription as PackageDescription
1414import Distribution.System as System
@@ -16,44 +16,25 @@ import Network.URI as URI
1616import Stack.Config
1717
1818
19−newtype HackageDb = HackageDb { fromHackageDB :: T.Text }
20− deriving (Eq, Ord, Show)
21−
22−makePrisms ''HackageDb
23−
24−unHackageDb :: HackageDb -> String
25−unHackageDb = T.unpack . fromHackageDB
2619
2720data StackPackagesConfig = StackPackagesConfig
28− { _spcHaskellResolver :: !HaskellResolver
29− , _spcNixpkgsResolver :: !NixpkgsResolver
30− , _spcTargetPlatform :: !Platform
31− , _spcTargetCompiler :: !CompilerInfo
32− , _spcFlagAssignment :: !FlagAssignment
33− , _spcDoCheckPackages :: !Bool
34− , _spcDoHaddockPackages :: !Bool
35− , _spcDoCheckStackage :: !Bool
36− , _spcDoHaddockStackage :: !Bool
21+ { _spcHaskellResolver :: HaskellResolver
22+ , _spcNixpkgsResolver :: NixpkgsResolver
23+ , _spcTargetPlatform :: Platform
24+ , _spcTargetCompiler :: CompilerInfo
25+ , _spcFlagAssignment :: FlagAssignment
26+ , _spcDoCheckPackages :: Bool
27+ , _spcDoHaddockPackages :: Bool
3728 }
3829
3930makeLenses ''StackPackagesConfig
4031
41−getStackPackageFromDb
42− :: Maybe HackageDb
43− -> StackPackage
44− -> IO Package
45−getStackPackageFromDb optHackageDb stackPackage =
46−#if MIN_VERSION_cabal2nix(2,6,0)
47− PackageSourceSpec.getPackage
32+getStackPackageFromDb :: DB.HackageDB -> StackPackage -> IO Package
33+getStackPackageFromDb hackageDb stackPackage = do
34+ PackageSourceSpec.getPackage'
4835 False
49− (unHackageDb <$> optHackageDb)
50− Nothing
51− (stackLocationToSource (stackPackage ^. spLocation) (stackPackage ^. spDir))
52−#else
53− PackageSourceSpec.getPackage
54− (unHackageDb <$> optHackageDb)
36+ (pure hackageDb)
5537 (stackLocationToSource (stackPackage ^. spLocation) (stackPackage ^. spDir))
56−#endif
5738
5839stackLocationToSource
5940 :: PackageLocation
@@ -61,22 +42,22 @@ stackLocationToSource
6142 -> Maybe FilePath
6243 -> Source
6344stackLocationToSource pl mCabalDir = case pl of
64− HackagePackage p -> Source
65− { sourceUrl = "cabal://" ++ T.unpack p
45+ PlIndex p -> Source
46+ { sourceUrl = "cabal://" ++ T.unpack (p ^. piNameVersion)
6647 , sourceRevision = mempty
6748 , sourceHash = UnknownHash
6849 , sourceCabalDir = cabalDir }
69− StackFilePath p -> Source
50+ PlFilePath p -> Source
7051 { sourceUrl = p
7152 , sourceRevision = mempty
7253 , sourceHash = UnknownHash
7354 , sourceCabalDir = cabalDir }
74− StackUri uri -> Source
55+ PlUri uri -> Source
7556 { sourceUrl = URI.uriToString id uri mempty
7657 , sourceRevision = mempty
7758 , sourceHash = UnknownHash
7859 , sourceCabalDir = cabalDir }
79− StackRepo r -> Source
60+ PlRepo r -> Source
8061 { sourceUrl = T.unpack $ r ^. rUri
8162 , sourceRevision = T.unpack $ r ^. rCommit
8263 , sourceHash = UnknownHash
@@ -86,18 +67,17 @@ stackLocationToSource pl mCabalDir = case pl of
8667
8768packageDerivation
8869 :: StackPackagesConfig
89− -> Maybe HackageDb
70+ -> DB.HackageDB
9071 -> StackPackage
9172 -> IO Derivation
92−packageDerivation conf optHackageDb stackPackage = do
93− pkg <- getStackPackageFromDb optHackageDb stackPackage
73+packageDerivation conf hackageDb stackPackage = do
74+ pkg <- getStackPackageFromDb hackageDb stackPackage
9475 let
9576 drv = genericPackageDerivation conf pkg
9677 & subpath %~ flip fromMaybe (stackPackage ^. spDir)
97− isExtraDep = stackPackage ^. spExtraDep
9878 pconf = PackageConfig
99− { enableCheck = if isExtraDep then conf ^. spcDoCheckStackage else conf ^. spcDoCheckPackages
100− , enableHaddock = if isExtraDep then conf ^. spcDoHaddockStackage else conf ^. spcDoHaddockPackages }
79+ { enableCheck = conf ^. spcDoCheckPackages
80+ , enableHaddock = conf ^. spcDoHaddockPackages }
10181 return $ finalizePackage pkg pconf drv
10282
10383genericPackageDerivation
src/Distribution/Nixpkgs/Haskell/Stack/PrettyPrinting.hs+103−28
@@ -15,13 +15,16 @@ import Distribution.Text
1515import Distribution.Version (Version)
1616import qualified Language.Nix.FilePath as Nix
1717import Language.Nix.PrettyPrinting as PP
18+import Stack.Config (StackResolver, unStackResolver)
19+
20+import Prelude hiding ((<>))
1821
1922
2023data OverrideConfig = OverrideConfig
21− { _ocGhc :: !Version
22− , _ocStackagePackages :: !FilePath
23− , _ocStackageConfig :: !FilePath
24− , _ocNixpkgs :: !FilePath
24+ { _ocGhc :: Version
25+ , _ocStackagePackages :: FilePath
26+ , _ocStackageConfig :: FilePath
27+ , _ocNixpkgs :: FilePath
2528 }
2629
2730makeLenses ''OverrideConfig
@@ -29,6 +32,11 @@ makeLenses ''OverrideConfig
2932systemNixpkgs :: Doc
3033systemNixpkgs = "<nixpkgs>"
3134
35+renderNixpkgs :: FilePath -> Doc
36+renderNixpkgs nixpkgsPath
37+ | fromString nixpkgsPath == systemNixpkgs = systemNixpkgs
38+ | otherwise = disp $ (fromString nixpkgsPath :: Nix.FilePath)
39+
3240hasField :: Lens' a (Maybe b) -> a -> Bool
3341hasField p = views p isJust
3442
@@ -42,33 +50,25 @@ overridePackages = PP.packageSetConfig . PP.cat . F.toList . fmap callPackage
4250
4351importStackagePackages :: FilePath -> Doc
4452importStackagePackages path = hsep
45− [ funarg "self", "import", disp (fromString path :: Nix.FilePath), "{"
46− , "inherit pkgs stdenv;"
47− , "inherit (self) callPackage;"
48− , "}"
49− ]
53+ ["import", disp (fromString path :: Nix.FilePath)]
5054
51−callStackageConfig :: FilePath -> Doc
52−callStackageConfig path = hsep
53− [ "callPackage", disp (fromString path :: Nix.FilePath), "{}"]
55+importStackageConfig :: FilePath -> Doc
56+importStackageConfig path = hsep
57+ ["import ", disp (fromString path :: Nix.FilePath), "{ inherit pkgs haskellLib; }"]
5458
5559overrideHaskellPackages :: OverrideConfig -> NonEmpty Derivation -> Doc
56−overrideHaskellPackages oc packages =
57− let
58− nixpkgs = if oc ^. ocNixpkgs . to fromString == systemNixpkgs
59− then systemNixpkgs
60− else (disp . (fromString :: FilePath -> Nix.FilePath)) (oc ^. ocNixpkgs)
61− in vcat
60+overrideHaskellPackages oc packages = vcat
6261 [ funargs
63− [ "nixpkgs ? import " <> nixpkgs <> " {}"
62+ [ "nixpkgs ? import " <> renderNixpkgs (oc ^. ocNixpkgs) <> " {}"
6463 ]
6564 , ""
6665 , "with nixpkgs;"
6766 , "let"
6867 , nest 2 "inherit (stdenv.lib) extends;"
6968 , nest 2 $ vcat
70− [ attr "stackagePackages" . importStackagePackages $ oc ^. ocStackagePackages
71− , attr "stackageConfig" . callStackageConfig $ oc ^. ocStackageConfig ]
69+ [ attr "haskellLib" "callPackage (nixpkgs.path + \"/pkgs/development/haskell-modules/lib.nix\") {}"
70+ , attr "stackagePackages" . importStackagePackages $ oc ^. ocStackagePackages
71+ , attr "stackageConfig" . importStackageConfig $ oc ^. ocStackageConfig ]
7272 , nest 2 $ vcat
7373 [ "stackPackages ="
7474 , nest 2 $ overridePackages packages <> semi
@@ -77,17 +77,92 @@ overrideHaskellPackages oc packages =
7777 , nest 2 "inherit pkgs stdenv;"
7878 , nest 2 "inherit (self) callPackage;"
7979 , "};"
80− , ""
81− ]
80+ ]
8281 , "in callPackage (nixpkgs.path + \"/pkgs/development/haskell-modules\") {"
8382 , nest 2 $ vcat
84− [ attr "ghc" ("pkgs.haskell.compiler." <> toNixGhcVersion (oc ^. ocGhc))
85− , attr "compilerConfig" "self: extends pkgOverrides (extends stackageConfig (stackagePackages self))"
86− , attr "haskellLib" "callPackage (nixpkgs.path + \"/pkgs/development/haskell-modules/lib.nix\") {}"
83+ [ attr "ghc" ("pkgs.haskell.compiler." <> nixGhc)
84+ , attr "buildHaskellPackages" ("buildPackages.haskell.packages." <> nixGhc)
85+ , attr "compilerConfig" "self: extends pkgOverrides (stackageConfig self)"
86+ , attr "initialPackages" "stackagePackages"
87+ , attr "configurationCommon" "args: self: super: {}"
88+ , "inherit haskellLib;"
89+ ]
90+ , "}"
91+ ]
92+ where
93+ nixGhc = toNixGhcVersion (oc ^. ocGhc)
94+
95+overrideStackage :: StackResolver -> FilePath -> NonEmpty Derivation -> Doc
96+overrideStackage stackResolver nixpkgsPath packages = vcat
97+ [ funargs
98+ [ "nixpkgs ? import " <> renderNixpkgs nixpkgsPath <> " {}"
99+ ]
100+ , ""
101+ , "let"
102+ , nest 2 $ vcat
103+ [ "stackPackages ="
104+ , nest 2 $ overridePackages packages <> semi
87105 ]
106+ , "in nixpkgs.haskell.packages.stackage." <> toNixStackResolver stackResolver <> ".override {"
107+ , nest 2
108+ $ attr "packageSetConfig" "self: super: stackPackages { inherit (nixpkgs) pkgs stdenv; inherit (self) callPackage; } super"
88109 , "}"
89110 ]
90111
112+pPrintHaskellPackages :: OverrideConfig -> Doc
113+pPrintHaskellPackages oc = vcat
114+ [ funargs
115+ [ "callPackage"
116+ , "buildPackages"
117+ , "pkgs"
118+ , "stdenv"
119+ , "lib"
120+ , "overrides ? (self: super: {})"
121+ , "packageSetConfig ? (self: super: {})"
122+ ]
123+ , ""
124+ , "let"
125+ , nest 2 $ vcat
126+ [ "inherit (lib) extends makeExtensible;"
127+ , attr "haskellLib" "pkgs.haskell.lib"
128+ , "inherit (haskellLib) makePackageSet;"
129+ , ""
130+ , attr "haskellPackages" $ vcat
131+ [ "pkgs.callPackage makePackageSet {"
132+ , nest 2 $ vcat
133+ [ attr "ghc" ("buildPackages.haskell.compiler." <> toNixGhcVersion (oc ^. ocGhc))
134+ , attr "buildHaskellPackages" ("buildPackages.haskell.packages." <> toNixGhcVersion (oc ^. ocGhc))
135+ , attr "package-set" . importStackagePackages $ oc ^. ocStackagePackages
136+ , "inherit stdenv haskellLib extensible-self;"
137+ ]
138+ , "}"
139+ ]
140+ , ""
141+ , attr "compilerConfig" . importStackageConfig $ oc ^. ocStackageConfig
142+ , ""
143+ , attr "configurationCommon" "if builtins.pathExists ./configuration-common.nix then import ./configuration-common.nix { inherit pkgs haskellLib; } else self: super: {}"
144+ , attr "configurationNix" "import (pkgs.path + \"/pkgs/development/haskell-modules/configuration-nix.nix\") { inherit pkgs haskellLib; }"
145+ , ""
146+ , attr "extensible-self" "makeExtensible (extends overrides (extends configurationCommon (extends packageSetConfig (extends compilerConfig (extends configurationNix haskellPackages)))))"
147+ ]
148+ , ""
149+ , "in extensible-self"
150+ ]
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+
91161toNixGhcVersion :: Version -> Doc
92−toNixGhcVersion =
93− (<>) "ghc" . text . L.filter (/= '.') . show . disp
162+toNixGhcVersion = (<>) "ghc" . toNixVersion . show . disp
163+
164+toNixStackResolver :: StackResolver -> Doc
165+toNixStackResolver = toNixVersion . unStackResolver
166+
167+toNixVersion :: String -> Doc
168+toNixVersion = text . L.filter (/= '.')
src/LtsHaskell.hs+11−15
@@ -1,4 +1,3 @@
1−{-# LANGUAGE CPP #-}
21module LtsHaskell where
32
43import AllCabalHashes
@@ -24,6 +23,7 @@ import Stackage.BuildPlan
2423import Stackage.Types (SystemInfo(..))
2524import System.FilePath as Path
2625
26+import qualified Distribution.Nixpkgs.Haskell.Hackage as DB
2727import qualified Data.Yaml as Yaml
2828import qualified Data.Map as Map
2929import qualified Data.Set as Set
@@ -47,21 +47,17 @@ getPackageFromRepo allCabalHashesPath mSha1Hash pkgId = do
4747 (error (display pkgId ++ ": meta data has no SHA256 hash for the tarball"))
4848 (view (mHashes . at "SHA256") meta)
4949 source = DerivationSource "url" ("mirror://hackage/" ++ display pkgId ++ ".tar.gz") "" tarballSHA256
50−#if MIN_VERSION_cabal2nix(2,6,0)
5150 return $ Package source False pkgDesc
52−#else
53− return $ Package source pkgDesc
54−#endif
5551
56−getPackageFromDb :: Maybe HackageDb -> PackageIdentifier -> IO Package
57−getPackageFromDb mHackageDb pkgId =
58− getStackPackageFromDb mHackageDb
59− $ StackPackage (HackagePackage (T.pack $ Text.display pkgId)) True Nothing
52+getPackageFromDb :: DB.HackageDB -> PackageIdentifier -> IO Package
53+getPackageFromDb hackageDb pkgId =
54+ getStackPackageFromDb hackageDb
55+ $ StackPackage (PlIndex $ PackageIndex (T.pack $ Text.display pkgId) Nothing) True Nothing
6056
61−loadPackage :: Maybe HackageDb -> FilePath -> Maybe SHA1Hash -> PackageIdentifier -> IO Package
62−loadPackage mHackageDb allCabalHashesPath mSha1Hash pkgId =
57+loadPackage :: DB.HackageDB -> FilePath -> Maybe SHA1Hash -> PackageIdentifier -> IO Package
58+loadPackage hackageDb allCabalHashesPath mSha1Hash pkgId =
6359 getPackageFromRepo allCabalHashesPath mSha1Hash pkgId
64− `catchIOError` const (getPackageFromDb mHackageDb pkgId)
60+ `catchIOError` const (getPackageFromDb hackageDb pkgId)
6561
6662ghcCompilerInfo :: Version -> CompilerInfo
6763ghcCompilerInfo v = CompilerInfo
@@ -77,18 +73,18 @@ buildPlanContainsDependency packageVersions (Dependency depName versionRange) =
7773 maybe False (`withinRange` versionRange) $ Map.lookup depName packageVersions
7874
7975buildPackageSetConfig
80− :: Maybe HackageDb
76+ :: DB.HackageDB
8177 -> FilePath
8278 -> FilePath
8379 -> BuildPlan
8480 -> IO PackageSetConfig
85−buildPackageSetConfig mHackageDb optAllCabalHashes optNixpkgsRepository buildPlan = do
81+buildPackageSetConfig hackageDb optAllCabalHashes optNixpkgsRepository buildPlan = do
8682 nixpkgs <- readNixpkgPackageMap optNixpkgsRepository Nothing
8783 let
8884 systemInfo = bpSystemInfo buildPlan
8985 packageVersions = fmap ppVersion (bpPackages buildPlan) `Map.union` siCorePackages systemInfo
9086 return PackageSetConfig
91− { packageLoader = loadPackage mHackageDb optAllCabalHashes
87+ { packageLoader = loadPackage hackageDb optAllCabalHashes
9288 , targetPlatform = Platform (siArch systemInfo) (siOS systemInfo)
9389 , targetCompiler = ghcCompilerInfo (siGhcVersion systemInfo)
9490 , nixpkgsResolver = resolve (Map.map (Set.map (over path ("pkgs":))) nixpkgs)
src/Runner.hs+134−66
@@ -3,13 +3,17 @@ module Runner ( run ) where
33import Control.Lens
44import Data.Foldable as F
55import Data.List as L
6+import Data.Maybe (fromMaybe)
7+import Data.Semigroup ((<>))
68import Distribution.Nixpkgs.Haskell.FromStack
79import Distribution.Nixpkgs.Haskell.FromStack.Package
10+import Distribution.Nixpkgs.Haskell.Hackage as DB
11+import Distribution.Nixpkgs.Haskell.PackageSourceSpec (loadHackageDB)
812import Distribution.Nixpkgs.Haskell.Stack
913import Distribution.Nixpkgs.Haskell.Stack.PrettyPrinting as PP
1014import Distribution.Version (Version)
1115import Distribution.Compiler (AbiTag(..), unknownCompilerInfo)
12−import Distribution.Package (mkPackageName, pkgName)
16+import Distribution.Package (PackageName, mkPackageName, pkgName)
1317import Distribution.Text as Text (display)
1418import Language.Nix as Nix
1519import Options.Applicative
@@ -21,87 +25,153 @@ import Stackage.Types
2125import System.IO (withFile, IOMode(..), hPutStrLn)
2226import Text.PrettyPrint.HughesPJClass (Doc, render)
2327
24−import qualified Data.Set as Set
28+import qualified Data.List.NonEmpty as NE
2529import qualified Data.Map as Map
30+import qualified Data.Set as Set
2631import qualified LtsHaskell as LH
2732
28−
2933run :: IO ()
3034run = do
3135 opts <- execParser pinfo
36+ hackageDb <- loadHackageDB (opts ^. optHackageDb) Nothing
37+ let
38+ -- With optparse-applicative it seems there's no way to make
39+ -- 'StackageOptions' optional for Stackage override and required in
40+ -- other cases
41+ missingErr = error . ("Missing required parameter: " <>)
42+ sopts = StackageOptions
43+ (fromMaybe (missingErr "--all-cabal-hashes") (opts ^. optAllCabalHashesRepo) )
44+ (fromMaybe (missingErr "--lts-haskell") (opts ^. optLtsHaskellRepo))
45+
3246 case opts ^. optConfigOrigin of
33− -- Generate build derivation from stack.yaml file
34− OriginStackYaml stackYaml -> do
47+ -- Generate Stackage packages from stack.yaml resolver
48+ OriginStackYaml stackYaml buildTarget -> do
3549 stackConf <- either fail pure =<< readStackConfig stackYaml
36− let buildPlanFile = LH.buildPlanFilePath (opts ^. optLtsHaskellRepo) (stackConf ^. scResolver)
37− buildPlan <- LH.loadBuildPlan buildPlanFile
38− packageSetConfig <- LH.buildPackageSetConfig
39− (opts ^. optHackageDb)
40− (opts ^. optAllCabalHashesRepo)
41− (opts ^. optNixpkgsRepository)
42− buildPlan
4350 let
44− overrideConfig = mkOverrideConfig opts (siGhcVersion $ bpSystemInfo buildPlan)
51+ stackResolver = stackConf ^. scResolver
4552 stackPackagesConfig = mkStackPackagesConfig opts
46− stackConfPackages <- traverse (packageDerivation stackPackagesConfig (opts ^. optHackageDb))
53+ stackExtraDepsConfig = stackPackagesConfig
54+ & spcDoCheckPackages .~ False
55+ & spcDoHaddockPackages .~ False
56+ stackConfPackages <- traverse (fmap mkNode . packageDerivation stackPackagesConfig hackageDb)
4757 $ stackConf ^. scPackages
58+ stackConfExtraDeps <- traverse (fmap mkNode . packageDerivation stackExtraDepsConfig hackageDb)
59+ $ stackConf ^. scExtraDeps
4860 let
49− reachable = Set.map mkPackageName
50− $ F.foldr1 Set.union
51− $ nodeDepends . mkNode <$> stackConfPackages
52− s2nLoader mHash pkgId =
53− if pkgName pkgId `Set.member` reachable
54− then packageLoader packageSetConfig Nothing pkgId
55− else packageLoader packageSetConfig mHash pkgId
56− s2nPackageSetConfig = packageSetConfig { packageLoader = s2nLoader }
57− s2nPackageConfig = PackageConfig
58− { enableCheck = opts ^. optDoCheckStackage
59− , enableHaddock = opts ^. optDoHaddockStackage }
60− stackagePackages <- traverse (uncurry (buildNode s2nPackageSetConfig s2nPackageConfig))
61− $ Map.toList (bpPackages buildPlan)
61+ stackConfAllPackages = maybe stackConfPackages ((<>) stackConfPackages)
62+ $ NE.nonEmpty stackConfExtraDeps
6263
63− let
64− -- Find all reachable dependencies in stackage set to stick into
65− -- stackage packages file. This is performed on the full stackage
66− -- set rather than pruning stackage packages beforehand because
67− -- stackage does not concern itself with build tools while cabal2nix
68− -- does: pruning only after generating full set of packages allows
69− -- us to make sure all those extra dependencies are explicitly
70− -- listed as well.
71− reachableStackagePackages = case opts ^. optOutPackagesClosure of
72− True -> flip reachableDependencies stackagePackages
73− -- Originally reachable nodes are root nodes
74− $ L.filter (\n -> mkPackageName (nodeName n) `Set.member` reachable) stackagePackages
75− False -> stackagePackages
76− -- Sort final packages to make the order consistent
77− nodes = L.sortOn nodeName reachableStackagePackages
78− writeOutFile buildPlanFile (opts ^. optOutStackagePackages)
79− $ pPrintOutPackages (view nodeDerivation <$> nodes)
80− writeOutFile buildPlanFile (opts ^. optOutStackageConfig)
81− $ pPrintOutConfig (bpSystemInfo buildPlan) nodes
82− writeOutFile (stackYaml ^. syFilePath) (opts ^. optOutDerivation)
83− $ PP.overrideHaskellPackages overrideConfig stackConfPackages
64+ case buildTarget of
65+ TargetStackageClosure -> do
66+ (buildPlanFile, buildPlan, packageSetConfig) <- loadStackageBuildPlan hackageDb stackResolver opts sopts
67+ let
68+ overrideConfig = mkOverrideConfig opts (siGhcVersion $ bpSystemInfo buildPlan)
69+ stackageSetConfig = if opts ^. optTweaks . tExtraDepsRevisionLatest
70+ then extraDepsLatestConfig stackConfAllPackages packageSetConfig
71+ else packageSetConfig
72+ stackagePackages <- buildStackagePackages stackageSetConfig buildPlan
73+ let
74+ reachable = reachableDeps stackConfAllPackages
75+ -- Nixpkgs generic-builder puts hscolour on path for all libraries
76+ withHscolour pkgs =
77+ let hscolour = F.find ((== "hscolour") . nodeName) stackagePackages
78+ in maybe pkgs (`Set.insert` pkgs) hscolour
79+ -- Find all reachable dependencies in stackage set to stick into
80+ -- stackage packages file. This is performed on the full stackage
81+ -- set rather than pruning stackage packages beforehand because
82+ -- stackage does not concern itself with build tools while cabal2nix
83+ -- does: pruning only after generating full set of packages allows
84+ -- us to make sure all those extra dependencies are explicitly
85+ -- listed as well.
86+ nodes = Set.toAscList
87+ $ withHscolour
88+ $ flip reachableDependencies stackagePackages
89+ -- Originally reachable nodes are root nodes
90+ $ L.filter (\n -> mkPackageName (nodeName n) `Set.member` reachable) stackagePackages
91+ writeOutFile buildPlanFile (opts ^. optOutStackagePackages)
92+ $ pPrintOutPackages (view nodeDerivation <$> nodes)
93+ writeOutFile buildPlanFile (opts ^. optOutStackageConfig)
94+ $ pPrintOutConfig (bpSystemInfo buildPlan) nodes
95+ writeOutFile (stackYaml ^. syFilePath) (opts ^. optOutDerivation)
96+ $ PP.overrideHaskellPackages overrideConfig (view nodeDerivation <$> stackConfAllPackages)
97+
98+ TargetStackagePackages -> do
99+ (buildPlanFile, buildPlan, packageSetConfig) <- loadStackageBuildPlan hackageDb stackResolver opts sopts
100+ let
101+ overrideConfig = mkOverrideConfig opts (siGhcVersion $ bpSystemInfo buildPlan)
102+ stackageSetConfig = if opts ^. optTweaks . tExtraDepsRevisionLatest
103+ then extraDepsLatestConfig stackConfAllPackages packageSetConfig
104+ else packageSetConfig
105+ -- stackageLoader mHash pkgId =
106+ -- if pkgName pkgId `Set.member` reachable
107+ -- then packageLoader packageSetConfig Nothing pkgId
108+ -- else packageLoader packageSetConfig mHash pkgId
109+ -- stackageSetConfig = packageSetConfig { packageLoader = stackageLoader }
110+ nodes <- buildStackagePackages stackageSetConfig buildPlan
111+ writeOutFile buildPlanFile (opts ^. optOutStackagePackages)
112+ $ pPrintOutPackages (view nodeDerivation <$> nodes)
113+ writeOutFile buildPlanFile (opts ^. optOutStackageConfig)
114+ $ pPrintOutConfig (bpSystemInfo buildPlan) nodes
115+ writeOutFile (stackYaml ^. syFilePath) (opts ^. optOutDerivation)
116+ $ PP.overrideHaskellPackages overrideConfig (view nodeDerivation <$> stackConfAllPackages)
117+
118+ TargetStackageOverride -> do
119+ writeOutFile (stackYaml ^. syFilePath) (opts ^. optOutDerivation)
120+ $ PP.overrideStackage
121+ (stackConf ^. scResolver)
122+ (opts ^. optNixpkgsRepository)
123+ (view nodeDerivation <$> stackConfAllPackages)
124+ writeOutFile (stackYaml ^. syFilePath) (opts ^. optOutStackYamlPackages)
125+ $ PP.stackYamlPackages (view nodeDerivation <$> stackConfPackages)
84126
85127 -- Generate Stackage packages from resolver
86128 OriginResolver stackResolver -> do
87− let
88− buildPlanFile = LH.buildPlanFilePath (opts ^. optLtsHaskellRepo) stackResolver
89− packageConfig = PackageConfig
90− { enableCheck = opts ^. optDoCheckStackage
91− , enableHaddock = opts ^. optDoHaddockStackage }
92− buildPlan <- LH.loadBuildPlan buildPlanFile
93− packageSetConfig <- LH.buildPackageSetConfig
94− (opts ^. optHackageDb)
95− (opts ^. optAllCabalHashesRepo)
96− (opts ^. optNixpkgsRepository)
97− buildPlan
98− nodes <- traverse (uncurry (buildNode packageSetConfig packageConfig))
99− $ Map.toList (bpPackages buildPlan)
100−
129+ (buildPlanFile, buildPlan, packageSetConfig) <- loadStackageBuildPlan hackageDb stackResolver opts sopts
130+ nodes <- buildStackagePackages packageSetConfig buildPlan
131+ let overrideConfig = mkOverrideConfig opts (siGhcVersion $ bpSystemInfo buildPlan)
101132 writeOutFile buildPlanFile (opts ^. optOutStackagePackages)
102133 $ pPrintOutPackages (view nodeDerivation <$> nodes)
103134 writeOutFile buildPlanFile (opts ^. optOutStackageConfig)
104135 $ pPrintOutConfig (bpSystemInfo buildPlan) nodes
136+ writeOutFile buildPlanFile (opts ^. optOutDerivation)
137+ $ PP.pPrintHaskellPackages overrideConfig
138+
139+loadStackageBuildPlan :: DB.HackageDB -> StackResolver -> Options -> StackageOptions -> IO (FilePath, BuildPlan, PackageSetConfig)
140+loadStackageBuildPlan hackageDb stackResolver opts sopts = do
141+ let buildPlanFile = LH.buildPlanFilePath (sopts ^. soptLtsHaskellRepo) stackResolver
142+ buildPlan <- LH.loadBuildPlan buildPlanFile
143+ packageSetConfig <- LH.buildPackageSetConfig
144+ hackageDb
145+ (sopts ^. soptAllCabalHashesRepo)
146+ (opts ^. optNixpkgsRepository)
147+ buildPlan
148+ return (buildPlanFile, buildPlan, packageSetConfig)
149+
150+buildStackagePackages :: PackageSetConfig -> BuildPlan -> IO [Node]
151+buildStackagePackages packageSetConfig buildPlan = do
152+ let
153+ stackagePackageConfig = PackageConfig
154+ { enableCheck = True
155+ , enableHaddock = True }
156+ traverse (uncurry (buildNode packageSetConfig stackagePackageConfig))
157+ $ Map.toAscList (bpPackages buildPlan)
158+
159+reachableDeps :: Traversable t => t Node -> Set.Set PackageName
160+reachableDeps = Set.map mkPackageName
161+ . F.foldr1 Set.union
162+ . fmap nodeDepends
163+
164+-- Return 'PackageSetConfig' with package loader that loads latest Hackage
165+-- revison for direct (reachable) dependencies of input packages
166+extraDepsLatestConfig :: Traversable t => t Node -> PackageSetConfig -> PackageSetConfig
167+extraDepsLatestConfig packages packageSetConfig =
168+ let
169+ reachable = reachableDeps packages
170+ stackageLoader mHash pkgId =
171+ if pkgName pkgId `Set.member` reachable
172+ then packageLoader packageSetConfig Nothing pkgId
173+ else packageLoader packageSetConfig mHash pkgId
174+ in packageSetConfig { packageLoader = stackageLoader }
105175
106176writeOutFile :: Show source => source -> FilePath -> Doc -> IO ()
107177writeOutFile source filePath contents =
@@ -122,8 +192,6 @@ mkStackPackagesConfig opts = StackPackagesConfig
122192 , _spcNixpkgsResolver = \i -> Just (Nix.binding # (i, Nix.path # [i]))
123193 , _spcTargetPlatform = opts ^. optPlatform
124194 , _spcTargetCompiler = unknownCompilerInfo (opts ^. optCompilerId) NoAbiTag
125− , _spcFlagAssignment = []
195+ , _spcFlagAssignment = mempty
126196 , _spcDoCheckPackages = opts ^. optDoCheckPackages
127− , _spcDoHaddockPackages = opts ^. optDoHaddockPackages
128− , _spcDoCheckStackage = opts ^. optDoCheckStackage
129− , _spcDoHaddockStackage = opts ^. optDoHaddockStackage }
197+ , _spcDoHaddockPackages = opts ^. optDoHaddockPackages }
src/Runner/Cli.hs+84−50
@@ -5,69 +5,86 @@ import Data.Monoid ( (<>) )
55import Data.Text as T
66import qualified Distribution.Compat.ReadP as P
77import Distribution.Compiler as Compiler
8−import Distribution.Nixpkgs.Haskell.Stack
98import Distribution.System as System
109import qualified Distribution.Text as Text
1110import Options.Applicative as Opts
1211import Paths_stackage2nix ( version )
1312import Stack.Config
1413import Stack.Types
15−import System.Environment
1614import System.FilePath
1715
16+data Tweaks = Tweaks
17+ { _tExtraDepsRevisionLatest :: Bool
18+ } deriving (Show)
19+
20+makeLenses ''Tweaks
21+
22+-- | What will be generated
23+data Target
24+ = TargetStackagePackages
25+ | TargetStackageClosure
26+ | TargetStackageOverride
27+ deriving (Show)
28+
29+makePrisms ''Target
30+
1831-- | Source that would be used to produce target derivation
1932data ConfigOrigin
2033 = OriginResolver StackResolver
2134 -- ^ Resolver to generate Stackage LTS
22− | OriginStackYaml StackYaml
35+ | OriginStackYaml StackYaml Target
2336 -- ^ Stack config to generate build derivation
2437 deriving (Show)
2538
2639makePrisms ''ConfigOrigin
2740
41+data StackageOptions = StackageOptions
42+ { _soptAllCabalHashesRepo :: FilePath
43+ , _soptLtsHaskellRepo :: FilePath
44+ } deriving (Show)
45+
46+makeLenses ''StackageOptions
47+
2848data Options = Options
29− { _optAllCabalHashesRepo :: FilePath
30− , _optLtsHaskellRepo :: FilePath
31− , _optOutStackagePackages :: FilePath
32− , _optOutStackageConfig :: FilePath
33− , _optOutPackagesClosure :: Bool
34− , _optOutDerivation :: FilePath
35− , _optDoCheckPackages :: Bool
36− , _optDoHaddockPackages :: Bool
37− , _optDoCheckStackage :: Bool
38− , _optDoHaddockStackage :: Bool
39− , _optHackageDb :: (Maybe HackageDb)
40− , _optNixpkgsRepository :: FilePath
41− , _optCompilerId :: CompilerId
42− , _optPlatform :: Platform
43− , _optConfigOrigin :: ConfigOrigin
49+ { _optAllCabalHashesRepo :: Maybe FilePath
50+ , _optLtsHaskellRepo :: Maybe FilePath
51+ , _optOutStackagePackages :: FilePath
52+ , _optOutStackageConfig :: FilePath
53+ , _optOutDerivation :: FilePath
54+ , _optOutStackYamlPackages :: FilePath
55+ , _optDoCheckPackages :: Bool
56+ , _optDoHaddockPackages :: Bool
57+ , _optTweaks :: Tweaks
58+ , _optHackageDb :: Maybe FilePath
59+ , _optNixpkgsRepository :: FilePath
60+ , _optCompilerId :: CompilerId
61+ , _optPlatform :: Platform
62+ , _optConfigOrigin :: ConfigOrigin
4463 } deriving (Show)
4564
4665makeLenses ''Options
4766
48−envStackYaml :: IO (Maybe StackYaml)
49−envStackYaml = fmap mkStackYaml <$> lookupEnv "STACK_YAML"
50−
5167mkStackYaml :: FilePath -> StackYaml
5268mkStackYaml p = case splitFileName p of
5369 (dir, "") -> StackYaml dir "stack.yaml"
5470 (dir, ".") -> StackYaml dir "stack.yaml"
5571 (_ , "..") -> StackYaml p "stack.yaml"
56− (dir, file) -> StackYaml dir file
72+ (dir, file) -> case splitExtension file of
73+ (_, "") -> StackYaml p "stack.yaml"
74+ _ -> StackYaml dir file
5775
5876options :: Parser Options
5977options = Options
60− <$> allCabalHashesRepo
61− <*> ltsHaskellRepo
78+ <$> optional allCabalHashesRepo
79+ <*> optional ltsHaskellRepo
6280 <*> outStackagePackages
6381 <*> outStackageConfig
64− <*> outPackagesClosure
6582 <*> outDerivation
83+ <*> outStackYamlPackages
6684 <*> doCheckPackages
6785 <*> doHaddockPackages
68− <*> doCheckStackage
69− <*> doHaddockStackage
70− <*> optional hackageDb
86+ <*> tweaks
87+ <*> optional optionHackageDb
7188 <*> nixpkgsRepository
7289 <*> compilerId
7390 <*> platform
@@ -117,11 +134,6 @@ outStackageConfig = option str
117134 <> value "configuration-packages.nix"
118135 <> showDefaultWith id)
119136
120−outPackagesClosure :: Parser Bool
121−outPackagesClosure = flag True False
122− ( long "no-packages-closure"
123− <> help "produce full set of stackage packages, not just dependencies" )
124−
125137outDerivation :: Parser FilePath
126138outDerivation = option str
127139 ( long "out-derivation"
@@ -130,6 +142,14 @@ outDerivation = option str
130142 <> value "default.nix"
131143 <> showDefaultWith id )
132144
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+
133153doCheckPackages :: Parser Bool
134154doCheckPackages = flag True False
135155 ( long "no-check"
@@ -140,15 +160,23 @@ doHaddockPackages = flag True False
140160 ( long "no-haddock"
141161 <> help "disable haddock for project packages")
142162
143−doCheckStackage :: Parser Bool
144−doCheckStackage = switch
145− ( long "do-check-stackage"
146− <> help "enable tests for Stackage packages" )
163+withStackage :: Parser ()
164+withStackage = flag' ()
165+ ( long "with-stackage"
166+ <> help "generate full Stackage" )
147167
148−doHaddockStackage :: Parser Bool
149−doHaddockStackage = switch
150− ( long "do-haddock-stackage"
151− <> help "enable haddock for Stackage packages" )
168+withStackageClosure :: Parser ()
169+withStackageClosure = flag' ()
170+ ( long "with-stackage-closure"
171+ <> help "generate Stackage subset containing only build dependencies" )
172+
173+extraDepsRevisionLatest :: Parser Bool
174+extraDepsRevisionLatest = switch
175+ ( long "extra-deps-revision-latest"
176+ <> help "Changes algorithm for the dependencies generation of the stack.yaml extra-deps. Default one is to generate exact revision defined in the Stackage config. With this flag enabled, direct dependencies of the stack.yaml extra-deps will be generated with the latest revision available on Hackage. This may help when Cabal fails to resolve dependencies of extra-deps, and dependences are fixed in the latest revision" )
177+
178+tweaks :: Parser Tweaks
179+tweaks = Tweaks <$> extraDepsRevisionLatest
152180
153181resolver :: Parser StackResolver
154182resolver = StackResolver <$> option text
@@ -160,18 +188,24 @@ stackYamlArg = mkStackYaml <$> Opts.argument str
160188 ( metavar "STACK_YAML"
161189 <> help "path to stack.yaml file or directory" )
162190
191+target :: Parser Target
192+target =
193+ withStackage *> pure TargetStackagePackages <|>
194+ withStackageClosure *> pure TargetStackageClosure <|>
195+ pure TargetStackageOverride
196+
163197configOrigin :: Parser ConfigOrigin
164−configOrigin = OriginResolver <$> resolver
165− <|> OriginStackYaml <$> stackYamlArg
198+configOrigin =
199+ OriginStackYaml <$> stackYamlArg <*> target <|>
200+ OriginResolver <$> resolver
166201
167−-- inherited from cabal2nix
202+-- required for cabal2nix
168203
169−hackageDb :: Parser HackageDb
170−hackageDb = HackageDb <$>
171− option text
172− ( long "hackage-db"
173− <> metavar "HACKAGE_DB"
174− <> help "path to the local hackage db in tar format" )
204+optionHackageDb :: Parser FilePath
205+optionHackageDb = option str
206+ ( long "hackage-db"
207+ <> metavar "HACKAGE_DB"
208+ <> help "path to the local hackage db in tar format" )
175209
176210cabalFlag :: Parser CabalFlag
177211cabalFlag = CabalFlag <$>
src/Stack/Config.hs+118−49
@@ -3,19 +3,17 @@
33module Stack.Config where
44
55import Control.Lens
6−import Data.Bifunctor
76import Data.ByteString as BS
87import Data.Coerce
9−import Data.Foldable as F
8+import Data.List as L
109import Data.List.NonEmpty as NE
1110import Data.Maybe
12−import Data.Semigroup (sconcat)
1311import Data.Text as T
1412import Data.Yaml
1513import Network.URI
1614import Stack.Config.Yaml as Yaml
1715import Stack.Types
18−import System.FilePath
16+import System.FilePath as FilePath
1917
2018
2119newtype StackResolver = StackResolver { fromStackResolver :: Text }
@@ -30,95 +28,166 @@ newtype Vcs = Vcs { fromVcs :: Text }
3028 deriving (Eq, Ord, Show)
3129
3230data Repo = Repo
33− { _rVcs :: !Vcs
34− , _rUri :: !Text
35− , _rCommit :: !Text
31+ { _rVcs :: Vcs
32+ , _rUri :: Text
33+ , _rCommit :: Text
3634 } deriving (Eq, Ord, Show)
3735
3836makeLenses ''Repo
3937
38+data PackageRevision
39+ = PrSha256 Text
40+ | PrRev Text
41+ deriving (Eq, Ord, Show)
42+
43+makePrisms ''PackageRevision
44+
45+data PackageIndex = PackageIndex
46+ { _piNameVersion :: Text
47+ , _piRevision :: Maybe PackageRevision
48+ } deriving (Eq, Ord, Show)
49+
50+makeLenses ''PackageIndex
51+
4052data PackageLocation
41− = HackagePackage Text
42− | StackFilePath FilePath
43− | StackUri URI
44− | StackRepo Repo
53+ = PlIndex PackageIndex
54+ | PlFilePath FilePath
55+ | PlUri URI
56+ | PlRepo Repo
4557 deriving (Eq, Ord, Show)
4658
4759makePrisms ''PackageLocation
4860
4961data StackPackage = StackPackage
50− { _spLocation :: !PackageLocation
51− , _spExtraDep :: !Bool
62+ { _spLocation :: PackageLocation
63+ , _spExtraDep :: Bool
5264 -- | Subdirectory containing the cabal file if any specified.
53− , _spDir :: !(Maybe FilePath)
65+ , _spDir :: Maybe FilePath
5466 } deriving (Eq, Ord, Show)
5567
5668makeLenses ''StackPackage
5769
5870data StackConfig = StackConfig
59− { _scResolver :: !StackResolver
60− , _scPackages :: !(NonEmpty StackPackage)
71+ { _scResolver :: StackResolver
72+ , _scPackages :: NonEmpty StackPackage
73+ , _scExtraDeps :: [StackPackage]
6174 } deriving (Eq, Ord, Show)
6275
6376makeLenses ''StackConfig
6477
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+
6586fromYamlConfig :: Yaml.Config -> StackConfig
6687fromYamlConfig c = StackConfig{..}
6788 where
6889 _scResolver = coerce $ c ^. cResolver
69− _scPackages = F.foldr (NE.<|) neYamlPackages yamlExtraDeps
70− neYamlPackages = fromMaybe (pure defaultPackage)
71− . fmap sconcat $ NE.nonEmpty yamlPackages
72− yamlPackages = fromYamlPackage <$> (fromMaybe mempty (c ^. cPackages))
73− yamlExtraDeps = fromYamlExtraDep <$> fromMaybe mempty (c ^. cExtraDeps)
74− defaultPackage = StackPackage (StackFilePath ".") False Nothing
90+ -- 'nub' replicates Stack behavior of having a Set of packages rather than list
91+ _scPackages = NE.nub nePackages
92+ _scExtraDeps = L.nub $ extraDeps ++ yamlExtraDeps
93+ nePackages = fromMaybe (pure defaultPackage)
94+ $ NE.nonEmpty packages
95+ -- yaml packages section can contain extra-deps
96+ (extraDeps, packages) = L.partition (view spExtraDep) yamlPackages
97+ yamlPackages = L.concatMap NE.toList
98+ $ fromYamlPackage packagesSimplePath False
99+ <$> fromMaybe mempty (c ^. cPackages)
100+ yamlExtraDeps = L.concatMap NE.toList
101+ $ fromYamlPackage extraDepsSimplePath True
102+ <$> fromMaybe mempty (c ^. cExtraDeps)
103+ defaultPackage = StackPackage (PlFilePath ".") False Nothing
104+
105+-- | Simple string in a packages section can be an URI or FilePath location
106+packagesSimplePath :: Text -> StackPackage
107+packagesSimplePath t = StackPackage (parseSimplePath t) False Nothing
108+
109+-- | Parse location as URI or a FilePath
110+parseSimplePath :: Text -> PackageLocation
111+parseSimplePath (T.unpack -> p) = maybe (PlFilePath p) PlUri $ parseURI p
112+
113+-- | Simple string in an extra-deps section can be an URI or FilePath or PackageIndex name-version
114+extraDepsSimplePath :: Text -> StackPackage
115+extraDepsSimplePath t = StackPackage loc True Nothing
116+ where
117+ loc = maybe (parsePackageIndex t) PlUri $ parseURI (T.unpack t)
118+
119+-- TODO: support new package index format with hash and revision
120+parsePackageIndex :: Text -> PackageLocation
121+parsePackageIndex t = if isFilePath t
122+ then PlFilePath (T.unpack t)
123+ else PlIndex $ PackageIndex t Nothing
75124
125+-- Determine wether package is file path
126+isFilePath :: Text -> Bool
127+isFilePath = T.any (== FilePath.pathSeparator)
76128
129+-- | A single 'Yaml.Package' can result in multiple actual
130+-- packages if it has multiple subdirs specified.
77131fromYamlPackage
78− :: Yaml.Package
79− -- ^ A single 'Yaml.Package' can result in multiple actual
80− -- packages if it has multiple subdirs specified.
132+ :: (Text -> StackPackage)
133+ -> Bool
134+ -> Yaml.Package
81135 -> NonEmpty StackPackage
82−fromYamlPackage = \case
83− Yaml.Simple p ->
84− unroll Nothing $ StackPackage (parseSimplePath p) False
85− Yaml.LocationSimple (Location p extraDep ms) ->
136+fromYamlPackage fromSimple isExtraDep = \case
137+ Yaml.PSimple p ->
138+ pure (fromSimple p)
139+ Yaml.PLocationSimple (Location p extraDep ms) ->
86140 unroll ms $ StackPackage (parseSimplePath p) (fromMaybe False extraDep)
87− Yaml.LocationGit (Location git extraDep ms) ->
88− unroll ms $ StackPackage (StackRepo $ fromYamlGit git) (fromMaybe False extraDep)
89− Yaml.LocationHg (Location hg extraDep ms) ->
90− unroll ms $ StackPackage (StackRepo $ fromYamlHg hg) (fromMaybe False extraDep)
141+ Yaml.PLocationGit loc ->
142+ mkStackPackageRepo fromYamlGit loc
143+ Yaml.PLocationHg loc ->
144+ mkStackPackageRepo fromYamlHg loc
145+ Yaml.PArchive a ->
146+ unroll (a ^. aSubdirs) $ StackPackage (a ^. aArchive . to parseSimplePath) isExtraDep
147+ Yaml.PNewGit ng -> unroll (ng ^. ngSubdirs)
148+ $ StackPackage (PlRepo $ fromYamlNewGit ng) isExtraDep
149+ Yaml.PNewHg nh -> unroll (nh ^. nhSubdirs)
150+ $ StackPackage (PlRepo $ fromYamlNewHg nh) isExtraDep
91151 where
92− parseSimplePath (T.unpack -> p) = maybe (StackFilePath p) StackUri $ parseURI p
152+ mkStackPackageRepo f loc = unroll (loc ^. lSubdirs)
153+ $ StackPackage (PlRepo (loc ^. lLocation . to f)) (fromMaybe isExtraDep $ loc ^. lExtraDep)
93154 -- Each package gets a single directory with cabal file in it. If
94155 -- it's not specified, path is empty.
95156 unroll subs p = case subs of
96157 Just (x : xs) -> NE.map (p . Just) (x :| xs)
97158 _ -> p Nothing :| []
98159
99−fromYamlExtraDep :: Text -> StackPackage
100−fromYamlExtraDep t = StackPackage (HackagePackage t) True Nothing
101−
102160fromYamlGit :: Yaml.Git -> Repo
103−fromYamlGit yg = Repo{..}
104− where
105− _rVcs = Vcs "git"
106− _rUri = yg ^. gGit
107− _rCommit = yg ^. gCommit
161+fromYamlGit yg = Repo
162+ { _rVcs = Vcs "git"
163+ , _rUri = yg ^. gGit
164+ , _rCommit = yg ^. gCommit }
108165
109166fromYamlHg :: Yaml.Hg -> Repo
110−fromYamlHg yh = Repo{..}
111− where
112− _rVcs = Vcs "hg"
113− _rUri = yh ^. hHg
114− _rCommit = yh ^. hCommit
167+fromYamlHg yh = Repo
168+ { _rVcs = Vcs "hg"
169+ , _rUri = yh ^. hHg
170+ , _rCommit = yh ^. hCommit }
171+
172+fromYamlNewGit :: NewGit -> Repo
173+fromYamlNewGit ng = Repo
174+ { _rVcs = Vcs "git"
175+ , _rUri = ng ^. ngGit
176+ , _rCommit = ng ^. ngCommit }
177+
178+fromYamlNewHg :: NewHg -> Repo
179+fromYamlNewHg nh = Repo
180+ { _rVcs = Vcs "hg"
181+ , _rUri = nh ^. nhHg
182+ , _rCommit = nh ^. nhCommit }
115183
116184readStackConfig :: StackYaml -> IO (Either String StackConfig)
117185readStackConfig stackYaml = do
118186 let
119187 relativeToStackYaml = \case
120− StackFilePath p -> StackFilePath $ stackYaml ^. syDirName </> p
188+ PlFilePath p -> PlFilePath $ stackYaml ^. syDirName </> p
121189 packageLocation -> packageLocation
122190 mkStackConfig = over (scPackages . traversed . spLocation) relativeToStackYaml
191+ . over (scExtraDeps . traversed . spLocation) relativeToStackYaml
123192 . fromYamlConfig
124− second mkStackConfig . decodeEither <$> BS.readFile (stackYaml ^. syFilePath)
193+ bimap show mkStackConfig . decodeEither' <$> BS.readFile (stackYaml ^. syFilePath)
src/Stack/Config/Yaml.hs+63−26
@@ -8,60 +8,97 @@ import Data.Text as T
88import Stack.Config.TH
99
1010data Location a = Location
11− { _lLocation :: !a
12− , _lExtraDep :: !(Maybe Bool)
13− , _lSubdirs :: !(Maybe [FilePath])
11+ { _lLocation :: a
12+ , _lExtraDep :: Maybe Bool
13+ , _lSubdirs :: Maybe [FilePath]
1414 } deriving (Eq, Show)
1515
1616makeLenses ''Location
17−
1817deriveJSON jsonOpts ''Location
1918
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+
2028data Git = Git
21− { _gGit :: !Text
22− , _gCommit :: !Text
29+ { _gGit :: Text
30+ , _gCommit :: Text
2331 } deriving (Eq, Show)
2432
2533makeLenses ''Git
26−
2734deriveJSON jsonOpts ''Git
2835
2936data Hg = Hg
30− { _hHg :: !Text
31− , _hCommit :: !Text
37+ { _hHg :: Text
38+ , _hCommit :: Text
3239 } deriving (Eq, Show)
3340
3441makeLenses ''Hg
35−
3642deriveJSON jsonOpts ''Hg
3743
44+-- New syntax
45+
46+data NewGit = NewGit
47+ { _ngGit :: Text
48+ , _ngCommit :: Text
49+ , _ngSubdirs :: Maybe [FilePath]
50+ } deriving (Eq, Show)
51+
52+makeLenses ''NewGit
53+deriveJSON jsonOpts ''NewGit
54+
55+data NewHg = NewHg
56+ { _nhHg :: Text
57+ , _nhCommit :: Text
58+ , _nhSubdirs :: Maybe [FilePath]
59+ } deriving (Eq, Show)
60+
61+makeLenses ''NewHg
62+deriveJSON jsonOpts ''NewHg
63+
3864data Package
39− = Simple Text
40− | LocationSimple (Location Text)
41− | LocationGit (Location Git)
42− | LocationHg (Location Hg)
65+ = PSimple Text
66+ | PLocationSimple (Location Text)
67+ | PLocationGit (Location Git)
68+ | PLocationHg (Location Hg)
69+ | PArchive Archive
70+ | PNewGit NewGit
71+ | PNewHg NewHg
4372 deriving (Eq, Show)
4473
4574makePrisms ''Package
4675
4776instance FromJSON Package where
4877 parseJSON v =
49− (Simple <$> parseJSON v) <|>
50− (LocationSimple <$> parseJSON v) <|>
51− (LocationGit <$> parseJSON v) <|>
52− (LocationHg <$> parseJSON v)
78+ (PSimple <$> parseJSON v) <|>
79+ (PLocationSimple <$> parseJSON v) <|>
80+ (PLocationGit <$> parseJSON v) <|>
81+ (PLocationHg <$> parseJSON v) <|>
82+ (PArchive <$> parseJSON v) <|>
83+ (PNewGit <$> parseJSON v) <|>
84+ (PNewHg <$> parseJSON v)
5385
5486instance ToJSON Package where
5587 toJSON = \case
56− Simple t -> toJSON t
57− LocationSimple t -> toJSON t
58− LocationGit t -> toJSON t
59− LocationHg t -> toJSON t
60−
88+ PSimple t -> toJSON t
89+ PLocationSimple t -> toJSON t
90+ PLocationGit t -> toJSON t
91+ PLocationHg t -> toJSON t
92+ PArchive t -> toJSON t
93+ PNewGit t -> toJSON t
94+ PNewHg t -> toJSON t
95+
96+-- To support both old and new syntax, we allow all variants of package
97+-- definitions in "packages" and "extra-deps" sections
6198data Config = Config
62− { _cResolver :: !Text
63− , _cPackages :: !(Maybe [Package])
64− , _cExtraDeps :: !(Maybe [Text])
99+ { _cResolver :: Text
100+ , _cPackages :: Maybe [Package]
101+ , _cExtraDeps :: Maybe [Package]
65102 } deriving (Eq, Show)
66103
67104makeLenses ''Config
src/Stack/Types.hs+2−4
@@ -1,5 +1,3 @@
1−{-# LANGUAGE TemplateHaskell #-}
2−
31module Stack.Types where
42
53import Control.Lens
@@ -8,8 +6,8 @@ import System.FilePath
86
97
108data StackYaml = StackYaml
11− { _syDirName :: !FilePath
12− , _syFileName :: !FilePath }
9+ { _syDirName :: FilePath
10+ , _syFileName :: FilePath }
1311 deriving (Ord, Eq, Show)
1412
1513makeLenses ''StackYaml
stack-ghc-7103.yamldeleted−22
@@ -1,22 +0,0 @@
1−resolver: lts-6.35
2−extra-deps:
3− - amazonka-1.4.5
4− - amazonka-core-1.4.5
5− - amazonka-s3-1.4.5
6− - Cabal-2.0.0.2
7− - cabal2nix-2.5
8− - chunked-data-0.3.0
9− - classy-prelude-1.2.0.1
10− - classy-prelude-conduit-1.2.0
11− - conduit-combinators-1.1.1
12− - distribution-nixpkgs-1.1
13− - hopenssl-2.2.1
14− - http-client-0.5.7.1
15− - http-client-tls-0.3.5.1
16− - http-conduit-2.2.3.2
17− - mono-traversable-1.0.4.0
18− - mono-traversable-instances-0.1.0.0
19− - stackage-curator-0.15.1.0
20− - store-0.4.3.2
21− - store-core-0.4.1
22− - th-utilities-0.2.0.1
stack-ghc-802.yamldeleted−7
@@ -1,7 +0,0 @@
1−resolver: lts-9.17
2−extra-deps:
3−- Cabal-2.0.0.2
4−- cabal2nix-2.5
5−- stackage-curator-0.15.0.0
6−nix:
7− packages: [icu openssl zlib]
stack-ghc-821.yamldeleted−4
@@ -1,4 +0,0 @@
1−resolver: nightly-2017-11-24
2−extra-deps:
3− - cabal2nix-2.5
4− - hackage-db-1.22
stack-ghc-822.yamldeleted−1
@@ -1 +0,0 @@
1−resolver: nightly-2017-12-08
stack.yamlmode 120000 → 100644+11−1
@@ -1 +0,0 @@
1−stack-ghc-802.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+10−7
@@ -1,7 +1,7 @@
11name: stackage2nix
2−version: 0.4.0
2+version: 0.7.2
33synopsis: Convert Stack files into Nix build instructions.
4−homepage: https://github.com/4e6/stackage2nix#readme
4+homepage: https://github.com/typeable/stackage2nix#readme
55license: BSD3
66license-file: LICENSE
77author: Dmitry Bushev
@@ -31,11 +31,11 @@ library
3131 , LtsHaskell
3232 , Paths_stackage2nix
3333 build-depends: base > 4.7 && < 5
34− , Cabal > 1.24
34+ , Cabal > 2.2
3535 , QuickCheck
3636 , aeson
3737 , bytestring
38− , cabal2nix >= 2.5
38+ , cabal2nix >= 2.7.2
3939 , containers
4040 , deepseq
4141 , distribution-nixpkgs >= 1.1
@@ -44,13 +44,14 @@ library
4444 , gitlib > 3
4545 , gitlib-libgit2 > 3
4646 , hopenssl > 2.2
47− , inflections
47+ , inflections >= 0.3
4848 , language-nix
4949 , lens
5050 , network-uri
5151 , optparse-applicative
5252 , pretty
5353 , stackage-curator >= 0.15
54+ , tagged
5455 , text
5556 , unordered-containers
5657 , yaml
@@ -59,7 +60,7 @@ library
5960 , RecordWildCards
6061 , TemplateHaskell
6162 default-language: Haskell2010
62− ghc-options: -Wall -funbox-strict-fields
63+ ghc-options: -Wall
6364
6465executable stackage2nix
6566 hs-source-dirs: stackage2nix
@@ -77,6 +78,7 @@ test-suite spec
7778 , Cabal
7879 , bytestring
7980 , hspec
81+ , network-uri
8082 , pretty
8183 , shakespeare
8284 , stackage2nix
@@ -86,9 +88,10 @@ test-suite spec
8688 other-modules: Language.Nix.FilePathSpec
8789 , PrettyPrintingSpec
8890 , Stack.Config.YamlSpec
91+ , Stack.ConfigSpec
8992 ghc-options: -Wall -threaded -rtsopts -with-rtsopts=-N
9093 default-language: Haskell2010
9194
9295source-repository head
9396 type: git
94− location: https://github.com/4e6/stackage2nix
97+ location: https://github.com/typeable/stackage2nix
test/Stack/Config/YamlSpec.hs+97−13
@@ -1,7 +1,7 @@
11{-# LANGUAGE OverloadedStrings #-}
22{-# LANGUAGE QuasiQuotes #-}
33
4−module Stack.Config.YamlSpec where
4+module Stack.Config.YamlSpec (spec) where
55
66import Data.ByteString
77import Data.Text.Encoding as T
@@ -39,10 +39,48 @@ extra-deps:
3939- acme-missiles-0.3
4040|]
4141
42+-- | New yaml config support all package definitions in "extra-deps" section
43+configNewYaml :: ByteString
44+configNewYaml = T.encodeUtf8 [st|
45+resolver: lts-3.7
46+packages:
47+ - .
48+ - location: dir1/dir2
49+ - location: https://example.com/foo/bar/baz-0.0.2.tar.gz
50+ extra-dep: true
51+ - location:
52+ git: git@github.com:commercialhaskell/stack.git
53+ commit: 6a86ee32e5b869a877151f74064572225e1a0398
54+ - location:
55+ git: git@github.com:example/mega-repo
56+ commit: 6a86ee32e5b869a877151f74064572225e1a0000
57+ subdirs:
58+ - subdir1
59+ - subdir2
60+# Comment
61+extra-deps:
62+ - acme-missiles-0.3
63+ - acme-missiles-hash-0.4@sha256:2ba66a092a32593880a87fb00f3213762d7bca65a687d45965778deb8694c5d1
64+ - acme-missiles-rev-0.5@rev:0
65+ - git: git@github.com:commercialhaskell/stack.git
66+ commit: 6a86ee32e5b869a877151f74064572225e1a0398
67+ - git: git@github.com:example/mega-repo
68+ commit: 6a86ee32e5b869a877151f74064572225e1a0000
69+ subdirs:
70+ - subdir1
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
78+|]
79+
4280configMinimal :: Config
4381configMinimal = Config
4482 { _cResolver = "lts-8.15"
45− , _cPackages = Just [ Simple "." ]
83+ , _cPackages = Just [ PSimple "." ]
4684 , _cExtraDeps = Nothing
4785 }
4886
@@ -50,27 +88,73 @@ config :: Config
5088config = Config
5189 { _cResolver = "lts-3.7"
5290 , _cPackages = Just
53− [ Simple "."
54− , LocationSimple (Location "dir1/dir2" Nothing Nothing)
55− , LocationSimple (Location "https://example.com/foo/bar/baz-0.0.2.tar.gz" (Just True) Nothing)
56− , LocationGit $ Location
91+ [ PSimple "."
92+ , PLocationSimple (Location "dir1/dir2" Nothing Nothing)
93+ , PLocationSimple (Location "https://example.com/foo/bar/baz-0.0.2.tar.gz" (Just True) Nothing)
94+ , PLocationGit $ Location
5795 (Git
5896 "git@github.com:commercialhaskell/stack.git"
5997 "6a86ee32e5b869a877151f74064572225e1a0398")
6098 Nothing Nothing
61− , LocationGit (Location
99+ , PLocationGit (Location
62100 (Git
63101 "git@github.com:example/mega-repo"
64102 "6a86ee32e5b869a877151f74064572225e1a0000")
65103 Nothing (Just ["subdir1", "subdir2"]))
66104 ]
67105 , _cExtraDeps = Just
68− ["acme-missiles-0.3"]
106+ [PSimple "acme-missiles-0.3"]
107+ }
108+
109+configNew :: Config
110+configNew = Config
111+ { _cResolver = "lts-3.7"
112+ , _cPackages = Just
113+ [ PSimple "."
114+ , PLocationSimple (Location "dir1/dir2" Nothing Nothing)
115+ , PLocationSimple (Location "https://example.com/foo/bar/baz-0.0.2.tar.gz" (Just True) Nothing)
116+ , PLocationGit $ Location
117+ (Git
118+ "git@github.com:commercialhaskell/stack.git"
119+ "6a86ee32e5b869a877151f74064572225e1a0398")
120+ Nothing Nothing
121+ , PLocationGit (Location
122+ (Git
123+ "git@github.com:example/mega-repo"
124+ "6a86ee32e5b869a877151f74064572225e1a0000")
125+ Nothing (Just ["subdir1", "subdir2"]))
126+ ]
127+ , _cExtraDeps = Just
128+ [ PSimple "acme-missiles-0.3"
129+ , PSimple "acme-missiles-hash-0.4@sha256:2ba66a092a32593880a87fb00f3213762d7bca65a687d45965778deb8694c5d1"
130+ , PSimple "acme-missiles-rev-0.5@rev:0"
131+ , PNewGit $ NewGit
132+ "git@github.com:commercialhaskell/stack.git"
133+ "6a86ee32e5b869a877151f74064572225e1a0398"
134+ Nothing
135+ , PNewGit $ NewGit
136+ "git@github.com:example/mega-repo"
137+ "6a86ee32e5b869a877151f74064572225e1a0000"
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
147+ ]
69148 }
70149
71150spec :: Spec
72−spec = describe "Parse" $ do
73− specify "config-minimal" $
74− (Y.decode configYamlMinimal :: Maybe Config) `shouldBe` Just configMinimal
75− specify "config-full" $
76− (Y.decode configYaml :: Maybe Config) `shouldBe` Just config
151+spec = describe "Config" $ do
152+ specify "minimal" $
153+ (decodeMaybe configYamlMinimal :: Maybe Config) `shouldBe` Just configMinimal
154+ specify "full" $
155+ (decodeMaybe configYaml :: Maybe Config) `shouldBe` Just config
156+ specify "new" $
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+ }