git.iko.soy/typeable/stackage2nix
on master help sign in
swap
a78e43348 ahead, 0 behind
.travis.yml+5−7
since splitsnapshots
unifiedsplit
@@ -12,15 +12,10 @@ cache:
12 - $HOME/.local/bin
12 - $HOME/.local/bin
13 - $HOME/.stack
13 - $HOME/.stack
14
14
15−env:
16− - STACK_YAML=stack-ghc-802.yaml
17− - STACK_YAML=stack-ghc-821.yaml
18− - STACK_YAML=stack-ghc-822.yaml
19−
20jobs:
15jobs:
21 include:
16 include:
17+ - stage: build
22 - stage: bootstrap
18 - stage: bootstrap
23− env: STACK_YAML=stack-ghc-802.yaml
24 install:
19 install:
25 # Install Nix
20 # Install Nix
26 - mkdir -p ~/.nix
21 - mkdir -p ~/.nix
@@ -29,8 +24,11 @@ jobs:
29 - sudo mount --bind ~/.nix /nix
24 - sudo mount --bind ~/.nix /nix
30 - curl https://nixos.org/nix/install | sh
25 - curl https://nixos.org/nix/install | sh
31 - source ~/.nix-profile/etc/profile.d/nix.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
32 script:
30 script:
33− - nix-env -i cabal-install
31+ - nix-env -i cabal-install nix-prefetch-scripts
34 - cabal update
32 - cabal update
35 - nix-build nix/stackage2nix --dry-run
33 - nix-build nix/stackage2nix --dry-run
36 - ./ci-stackage2nix --dry-run
34 - ./ci-stackage2nix --dry-run
CHANGELOG.md+41−10
@@ -1,18 +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
2
5
3−- Initial Hackage release
6+# 0.7.1
4−- Add CHANGELOG.md
7+- Generate stack packages `stack-yaml-packages.nix`
5
8
6−# 0.4.0
9+# 0.7.0
7−- Add `--resolver` option to generate full stackage packages set
10+- Add compatibility with nixos-18.03
8−- Add Nix wrapper, see `nix/README.md`
11+- Drop compatibility with nixos-17-09
9−- Upd support cabal2nix >2.5
12+- Add partial support for new stack extra-deps syntax.
10−- Fix honor `--hackage-db` flag
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
11
22
12# 0.5.0
23# 0.5.0
13- Add `--with-stackage` and `--with-stackage-closure` flag generates stackage
24- Add `--with-stackage` and `--with-stackage-closure` flag generates stackage
14−- Upd override of stackage packages generated by default
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.
15−- Upd generated Stackage packages with `doCheck` and `runHaddock` enabled by default
34+- Upd generated Stackage packages with `doCheck` and `runHaddock` enabled by
35+ default
16- Remove `--do-check-stackage` flag (enabled by default)
36- Remove `--do-check-stackage` flag (enabled by default)
17- Remove `--do-haddock-stackage` flag (enabled by default)
37- Remove `--do-haddock-stackage` flag (enabled by default)
18- Remove `--no-packages-closure` flag (use `--with-stackage-closure`)
38- Remove `--no-packages-closure` flag (use `--with-stackage-closure`)
39+- Remove `cabal2nix < 2.7.2` support #45
40+
41+# 0.4.0
42+- Add `--resolver` option to generate full stackage packages set
43+- Add Nix wrapper, see `nix/README.md`
44+- Upd support cabal2nix >2.5
45+- Fix honor `--hackage-db` flag
46+
47+# 0.3.0
48+- Initial Hackage release
49+- Add CHANGELOG.md
README.md+50−44
@@ -1,75 +1,81 @@
1−# stackage2nix
1+# stackage2nix (DEPRECATED)
2
2
3[![Build Status](https://travis-ci.org/typeable/stackage2nix.svg?branch=master)](https://travis-ci.org/typeable/stackage2nix)
3[![Build Status](https://travis-ci.org/typeable/stackage2nix.svg?branch=master)](https://travis-ci.org/typeable/stackage2nix)
4
4
5`stackage2nix` converts a Stack file into a Nix Haskell packages set.
5`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.
7
6
8−## Install
7+# Create build derivation from stack.yaml
9
8
10−You can install `stackage2nix` from the Nix expression:
9+## Generate targets from stack.yaml only
11
10
12```
11```
13−nix-env -i -f ./nix/stackage2nix
12+stack exec -- stackage2nix .
14```
13```
15
14
16−It provides pre-configured wrapper around the raw executable with runtime
15+Command creates file `default.nix` which overrides `haskell.packages.stackage`
17−`PATH` and all auxiliary flags set up.
16+packages set. You should use
18−
17+[typeable/nixpkgs-stackage](https://github.com/typeable/nixpkgs-stackage) overlay that
19−## Build project
18+adds LTS Stackage packages to Nixpkgs.
20
19
21−Generate derivations from `stack.yaml` config using Nix wrapper:
20+Build package with overlay installed:
22
21
23−``` bash
22+```
24−stackage2nix ./stack.yaml
23+nix-build -A stackage2nix
25```
24```
26
25
27−if you're using the raw executable, you should supply additional flags. See
26+## Generate Stackage packages for the build
28−section 'Flags' below for details.
29
27
30−This command will result in a Haskell packages set, similar to
28+If you don't want to use Stackage overlay, stackage2nix can generate required
31−`pkgs.haskell.packages.<compiler>`, containing only packages that are required
29+packages with `--with-stackage-closure` flag.
32−to build targets listed in `stackage.yaml`. To build a package run:
33
30
34``` bash
31``` bash
35−nix-build -A my-package
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
36```
37```
37
38
38−## Build stackage
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).
39
45
40−Generate complete Stackage packages set from resolver:
46+### stackage2nix wrapper
41
47
48+You can use stackage2nix wrapper from `nix` directory that adds required flags:
49+
42−``` bash
50+```
43−stackage2nix --resolver lts-9.0
51+nix-env -i -f ./nix/stackage2nix
52+stackage2nix --with-stackage-closure ./stack.yaml
44```
53```
45
54
46−## Flags
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`
47
62
48```
63```
49−stackage2nix \
64+nix-env -i -f ./nix/stackage2nix
50− --lts-haskell "$LTS_HASKELL_REPO" \
65+stackage2nix --with-stackage ./stack.yaml
51− --all-cabal-hashes "$ALL_CABAL_HASHES_REPO" \
52− .
53```
66```
54
67
55−`stackage2nix` has three required arguments:
68+## Generate Stackage from LTS resolver
56−- `--lts-haskell` - path to [fpco/lts-haskell](https://github.com/fpco/lts-haskell)
57−- `--all-cabal-hashes` - path to [commercialhaskell/all-cabal-hashes](https://github.com/commercialhaskell/all-cabal-hashes) checked out to `hackage` branch
58−- `.` - path to stack.yaml file or directory
59−
60−Produced Nix derivation split on following files:
61−- packages.nix - Base Stackage packages set
62−- configuration-packages.nix - Compiler configuration
63−- default.nix - Final Haskell packages set with all overrides applied
64
69
65−A particular package from result Haskell packages set can be built with:
70+You can also generate only Stackage packages set from the resolver:
66
71
67```
72```
68−nix-build -A <package-name>
73+nix-env -i -f ./nix/stackage2nix
74+stackage2nix --resolver lts-10.0
69```
75```
70
76
71−See also the [blog post](https://blog.typeable.io/posts/2017-08-24-stackage2nix.html)
77+This command will produce Stackage packages `packages.nix`, packages config
72−about history and motivation behind the project.
78+`configuration-packages.nix` and a Haskell packages set `default.nix`.
73
79
74## Runtime dependencies
80## Runtime dependencies
75
81
@@ -85,9 +91,9 @@ Complex projects may require some extra customization.
85Snippet `override.nix` below shows a minimal example of how to apply additional
91Snippet `override.nix` below shows a minimal example of how to apply additional
86overrides on top of Haskell packages set produced by `stackage2nix`.
92overrides on top of Haskell packages set produced by `stackage2nix`.
87
93
88−```
94+``` nix
89with import <nixpkgs> {};
95with import <nixpkgs> {};
90−with pkgs.haskell.lib;
96+with haskell.lib;
91let haskellPackages = import ./. {};
97let haskellPackages = import ./. {};
92in haskellPackages.override {
98in haskellPackages.override {
93 overrides = self: super: {
99 overrides = self: super: {
@@ -104,9 +110,9 @@ For more complex overrides and detailed information on how to work with Haskell
104
110
105## Tests
111## Tests
106
112
107−Integration tests that build stackage2nix form different stack configs:
113+Integration tests that build stackage2nix form different yaml configs:
108
114
109−```
115+``` bash
110STACKAGE_REPO=<path/to/stackage/repo> \
116STACKAGE_REPO=<path/to/stackage/repo> \
111ALL_CABAL_HASHES=<path/to/all-cabal-hashes/repo> \
117ALL_CABAL_HASHES=<path/to/all-cabal-hashes/repo> \
112STACK_FILE=stack-ghc-7103.yaml \
118STACK_FILE=stack-ghc-7103.yaml \
ci-stackage2nix+8−7
@@ -4,22 +4,23 @@ set -e
4
4
5STACKAGE2NIX_WORK_DIR=${STACKAGE2NIX_WORK_DIR:-$HOME}
5STACKAGE2NIX_WORK_DIR=${STACKAGE2NIX_WORK_DIR:-$HOME}
6STACKAGE_REPO=${STACKAGE_REPO:-$STACKAGE2NIX_WORK_DIR/lts-haskell}
6STACKAGE_REPO=${STACKAGE_REPO:-$STACKAGE2NIX_WORK_DIR/lts-haskell}
7−ALL_CABAL_HASHES_DIR=${ALL_CABAL_HASHES_DIR:-$STACKAGE2NIX_WORK_DIR/all-cabal-hashes}
7+ALL_CABAL_HASHES_REPO=${ALL_CABAL_HASHES_REPO:-$STACKAGE2NIX_WORK_DIR/all-cabal-hashes}
8−STACK_FILE=${STACK_FILE:-.}
8+STACK_FILE=${STACK_YAML:-stack.yaml}
9
9
10if [ ! -d "$STACKAGE_REPO" ]; then
10if [ ! -d "$STACKAGE_REPO" ]; then
11− git clone --depth 1 https://github.com/fpco/lts-haskell.git "$STACKAGE_REPO"
11+ git clone --depth 1 https://github.com/commercialhaskell/lts-haskell.git "$STACKAGE_REPO"
12fi
12fi
13
13
14−if [ ! -d "$ALL_CABAL_HASHES_DIR" ]; then
14+if [ ! -d "$ALL_CABAL_HASHES_REPO" ]; then
15− git clone --branch hackage https://github.com/commercialhaskell/all-cabal-hashes.git "$ALL_CABAL_HASHES_DIR"
15+ git clone --branch hackage https://github.com/commercialhaskell/all-cabal-hashes.git "$ALL_CABAL_HASHES_REPO"
16fi
16fi
17
17
18set -x
18set -x
19−time stack exec -- stackage2nix \
19+time stackage2nix \
20 --lts-haskell "$STACKAGE_REPO" \
20 --lts-haskell "$STACKAGE_REPO" \
21− --all-cabal-hashes "$ALL_CABAL_HASHES_DIR" \
21+ --all-cabal-hashes "$ALL_CABAL_HASHES_REPO" \
22 --hackage-db "$HOME/.cabal/packages/hackage.haskell.org/01-index.tar" \
22 --hackage-db "$HOME/.cabal/packages/hackage.haskell.org/01-index.tar" \
23+ --with-stackage-closure \
23 "$STACK_FILE"
24 "$STACK_FILE"
24
25
25nix-build -o "result-$(basename $STACK_FILE)" -A stackage2nix "$@"
26nix-build -o "result-$(basename $STACK_FILE)" -A stackage2nix "$@"
nix/README.md+2−18
@@ -4,7 +4,7 @@ Nix infrastructure.
4
4
5## stackage2nix
5## stackage2nix
6
6
7−Directory contains ready-to-use `stackage2nix` wrapper with
7+Provides ready-to-use `stackage2nix` wrapper with
8`--all-cabal-hashes` and `--lts-haskell` flags set up. It also has all
8`--all-cabal-hashes` and `--lts-haskell` flags set up. It also has all
9required executables on `PATH`.
9required executables on `PATH`.
10
10
@@ -12,25 +12,9 @@ Install stackage2nix:
12
12
13```
13```
14$ nix-env -i -f ./stackage2nix
14$ 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
31```
15```
32
16
33−## haskellPackages
17+## haskell-packages
34
18
35Directory contains Stackage LTS packages generated by `stackage2nix` from this
19Directory contains Stackage LTS packages generated by `stackage2nix` from this
36project's `stack.yaml`.
20project's `stack.yaml`.
nix/haskell-packages/configuration-packages.nix+7−11
@@ -1,7 +1,7 @@
1−# Generated by stackage2nix 0.4.0 from "/home/dbushev/projects/fpco/lts-haskell/lts-9.17.yaml"
1+# Generated by stackage2nix 0.7.1 from "/home/dbushev/projects/commercialhaskell/lts-haskell/lts-12.2.yaml"
2−{ pkgs }:
2+{ pkgs, haskellLib }:
3
3
4−with pkgs.haskell.lib; self: super: {
4+with haskellLib; self: super: {
5
5
6 # core packages
6 # core packages
7 "array" = null;
7 "array" = null;
@@ -16,29 +16,25 @@ with pkgs.haskell.lib; self: super: {
16 "ghc-boot-th" = null;
16 "ghc-boot-th" = null;
17 "ghc-prim" = null;
17 "ghc-prim" = null;
18 "ghci" = null;
18 "ghci" = null;
19− "hoopl" = null;
20 "hpc" = null;
19 "hpc" = null;
21 "integer-gmp" = null;
20 "integer-gmp" = null;
22 "pretty" = null;
21 "pretty" = null;
23 "process" = null;
22 "process" = null;
24 "rts" = null;
23 "rts" = null;
25 "template-haskell" = null;
24 "template-haskell" = null;
25+ "terminfo" = null;
26 "time" = null;
26 "time" = null;
27 "transformers" = null;
27 "transformers" = null;
28 "unix" = null;
28 "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
30 "stringbuilder" = dontCheck super.stringbuilder;
30 "stringbuilder" = dontCheck super.stringbuilder;
31 "hspec-discover" = dontCheck super.hspec-discover;
31 "hspec-discover" = dontCheck super.hspec-discover;
32− "optparse-applicative" = dontCheck super.optparse-applicative;
33− "clock" = dontCheck super.clock;
34 "exceptions" = dontCheck super.exceptions;
32 "exceptions" = dontCheck super.exceptions;
35− "base-compat" = dontCheck super.base-compat;
36 "temporary" = dontCheck super.temporary;
33 "temporary" = dontCheck super.temporary;
37 "silently" = dontCheck super.silently;
34 "silently" = dontCheck super.silently;
35+ "hashable" = dontCheck super.hashable;
38 "async" = dontCheck super.async;
36 "async" = dontCheck super.async;
39− "text" = dontCheck super.text;
37+ "clock" = dontCheck super.clock;
40 "nanospec" = dontCheck super.nanospec;
38 "nanospec" = dontCheck super.nanospec;
41− # break cycle: statistics monad-par mwc-random vector-algorithms
42− "mwc-random" = dontCheck super.mwc-random;
43
39
44}
40}
nix/haskell-packages/default.nix+132−107
@@ -1,162 +1,187 @@
1−# Generated by stackage2nix 0.4.0 from "./stack-ghc-802.yaml"
1+# Generated by stackage2nix 0.7.1 from "../../stack.yaml"
2{ nixpkgs ? import <nixpkgs> {} }:
2{ nixpkgs ? import <nixpkgs> {} }:
3
3
4with nixpkgs;
4with nixpkgs;
5let
5let
6 inherit (stdenv.lib) extends;
6 inherit (stdenv.lib) extends;
7− stackagePackages = self: import ./packages.nix { inherit pkgs stdenv; inherit (self) callPackage; };
7+ haskellLib = callPackage (nixpkgs.path + "/pkgs/development/haskell-modules/lib.nix") {};
8+ stackagePackages = import ./packages.nix;
8− stackageConfig = callPackage ./configuration-packages.nix {};
9+ stackageConfig = import ./configuration-packages.nix { inherit pkgs haskellLib; };
9 stackPackages =
10 stackPackages =
10 { pkgs, stdenv, callPackage }:
11 { pkgs, stdenv, callPackage }:
11−
12+
12 self: {
13 self: {
13− "Cabal" = callPackage
14+ "stackage2nix" = callPackage
14− ({ mkDerivation, array, base, binary, bytestring, containers
15+ ({ mkDerivation, aeson, base, bytestring, Cabal, cabal2nix
15− , deepseq, directory, filepath, pretty, process, QuickCheck, tagged
16+ , containers, deepseq, distribution-nixpkgs, exceptions, filepath
16− , tar, tasty, tasty-hunit, tasty-quickcheck, time, unix
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
17 }:
21 }:
18 mkDerivation {
22 mkDerivation {
19− pname = "Cabal";
23+ pname = "stackage2nix";
20− version = "2.0.0.2";
24+ version = "0.7.1";
21− sha256 = "0chhl2113jbahd5gychx9rdqj1aw22h7dyj6z44871hzqxngx6bc";
25+ src = ../../.;
26+ isLibrary = true;
27+ isExecutable = true;
22 libraryHaskellDepends = [
28 libraryHaskellDepends = [
23− array base binary bytestring containers deepseq directory filepath
29+ aeson base bytestring Cabal cabal2nix containers deepseq
24− pretty process time unix
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
25 ];
34 ];
35+ executableHaskellDepends = [ base ];
26 testHaskellDepends = [
36 testHaskellDepends = [
27− array base bytestring containers directory filepath pretty
37+ base bytestring Cabal hspec network-uri pretty shakespeare text
28− QuickCheck tagged tar tasty tasty-hunit tasty-quickcheck
38+ yaml
29 ];
39 ];
30− doHaddock = false;
40+ homepage = "https://github.com/typeable/stackage2nix#readme";
31− doCheck = false;
41+ description = "Convert Stack files into Nix build instructions";
32− homepage = "http://www.haskell.org/cabal/";
33− description = "A framework for packaging Haskell software";
34 license = stdenv.lib.licenses.bsd3;
42 license = stdenv.lib.licenses.bsd3;
35 }) {};
43 }) {};
36− "cabal2nix" = callPackage
44+ "yaml" = callPackage
37− ({ mkDerivation, aeson, ansi-wl-pprint, base, bytestring, Cabal
45+ ({ mkDerivation, aeson, attoparsec, base, bytestring, conduit
38− , cabal-doctest, containers, deepseq, directory
46+ , containers, directory, filepath, resourcet, scientific
39− , distribution-nixpkgs, doctest, filepath, hackage-db, hopenssl
47+ , semigroups, template-haskell, text, transformers
40− , language-nix, lens, monad-par, monad-par-extras, mtl
48+ , unordered-containers, vector
41− , optparse-applicative, pretty, process, split, text, time
42− , transformers, utf8-string, yaml
43 }:
49 }:
44 mkDerivation {
50 mkDerivation {
45− pname = "cabal2nix";
51+ pname = "yaml";
46− version = "2.5";
52+ version = "0.8.31.1";
47− sha256 = "19ywslwarwk84anfq78y249krqnddi2yyh66l78a88xfsh002abp";
53+ sha256 = "1ba1451917e6cb1df6081e2e14c2e4dcec6969b9b25a5d72db96942c3e6d8b53";
48 isLibrary = true;
54 isLibrary = true;
49 isExecutable = true;
55 isExecutable = true;
50− setupHaskellDepends = [ base Cabal cabal-doctest ];
51 libraryHaskellDepends = [
56 libraryHaskellDepends = [
52− aeson ansi-wl-pprint base bytestring Cabal containers deepseq
57+ aeson attoparsec base bytestring conduit containers directory
53− directory distribution-nixpkgs filepath hackage-db hopenssl
58+ filepath resourcet scientific semigroups template-haskell text
54− language-nix lens optparse-applicative pretty process split text
55− transformers yaml
59+ transformers unordered-containers vector
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 ];
60 ];
70 doHaddock = false;
61 doHaddock = false;
71 doCheck = false;
62 doCheck = false;
72− homepage = "https://github.com/nixos/cabal2nix#readme";
63+ homepage = "http://github.com/snoyberg/yaml/";
73− description = "Convert Cabal files into Nix build instructions";
64+ description = "Support for parsing and rendering YAML documents";
74 license = stdenv.lib.licenses.bsd3;
65 license = stdenv.lib.licenses.bsd3;
75 }) {};
66 }) {};
76 "stackage-curator" = callPackage
67 "stackage-curator" = callPackage
77 ({ mkDerivation, aeson, amazonka, amazonka-core, amazonka-s3, async
68 ({ mkDerivation, aeson, amazonka, amazonka-core, amazonka-s3, async
78− , base, base16-bytestring, blaze-html, byteable, bytestring, Cabal
69+ , base, blaze-html, bytestring, Cabal, classy-prelude-conduit
79− , classy-prelude-conduit, conduit, conduit-extra, containers
70+ , conduit, conduit-extra, containers, cryptonite
80− , cryptohash, cryptohash-conduit, data-default-class, directory
71+ , cryptonite-conduit, data-default-class, directory, exceptions
81− , exceptions, filepath, hashable, hspec, html-conduit, http-client
72+ , fetchgit, filepath, hashable, html-conduit, http-client
82− , http-client-tls, http-conduit, lucid, mime-types, monad-unlift
73+ , http-client-tls, http-conduit, lucid, memory, mime-types
83− , monad-unlift-ref, mono-traversable, mtl, old-locale
74+ , mono-traversable, mtl, old-locale, optparse-applicative
84− , optparse-applicative, optparse-simple, process, QuickCheck
85− , resourcet, safe, semigroups, stm, store, streaming-commons, syb
75+ , optparse-simple, process, resourcet, safe, semigroups, stm, store
86− , system-fileio, system-filepath, tar, temporary, text, time
76+ , streaming-commons, syb, tar, temporary, text, time, transformers
87− , transformers, unix-compat, unordered-containers, utf8-string
77+ , unix-compat, unordered-containers, utf8-string, vector
88− , vector, xml-conduit, xml-types, yaml, zlib
78+ , xml-conduit, xml-types, yaml, zlib
89 }:
79 }:
90 mkDerivation {
80 mkDerivation {
91 pname = "stackage-curator";
81 pname = "stackage-curator";
92− version = "0.15.0.0";
82+ version = "0.17.0.0";
93− sha256 = "0z84ywxh4zb996b0ir8hjl9pwdcb0ds0pgq6i8sfxmj5nrw5yjn5";
83+ src = fetchgit {
84+ url = "https://github.com/fpco/stackage-curator.git";
85+ sha256 = "0hymmzn59aszqxqs5s0mba8pzrky8wpkmy7hdgaxqrhg0syc6mkw";
86+ rev = "73c5ed06602990c33d3fec1711e27875f283b6bf";
87+ };
94 isLibrary = true;
88 isLibrary = true;
95 isExecutable = true;
89 isExecutable = true;
96 libraryHaskellDepends = [
90 libraryHaskellDepends = [
97− aeson amazonka amazonka-core amazonka-s3 async base
91+ aeson amazonka amazonka-core amazonka-s3 async base blaze-html
98− base16-bytestring blaze-html byteable bytestring Cabal
99− classy-prelude-conduit conduit conduit-extra containers cryptohash
92+ bytestring Cabal classy-prelude-conduit conduit conduit-extra
100− cryptohash-conduit data-default-class directory exceptions filepath
93+ containers cryptonite cryptonite-conduit data-default-class
101− hashable html-conduit http-client http-client-tls http-conduit
94+ directory exceptions filepath hashable html-conduit http-client
102− lucid mime-types monad-unlift monad-unlift-ref mono-traversable mtl
95+ http-client-tls http-conduit lucid memory mime-types
103− old-locale process resourcet safe semigroups stm store
96+ mono-traversable mtl old-locale process resourcet safe semigroups
104− streaming-commons syb system-fileio system-filepath tar temporary
97+ stm store streaming-commons syb tar temporary text time
105− text time transformers unix-compat unordered-containers utf8-string
98+ transformers unix-compat unordered-containers utf8-string vector
106− vector xml-conduit xml-types yaml zlib
99+ xml-conduit xml-types yaml zlib
107 ];
100 ];
108 executableHaskellDepends = [
101 executableHaskellDepends = [
109− aeson base http-client http-client-tls optparse-applicative
102+ aeson amazonka amazonka-core amazonka-s3 async base blaze-html
110− optparse-simple system-filepath text
111− ];
112− testHaskellDepends = [
113− base Cabal classy-prelude-conduit containers directory hspec
103+ bytestring Cabal classy-prelude-conduit conduit conduit-extra
114− http-client http-client-tls QuickCheck text yaml
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
115 ];
112 ];
116 doHaddock = false;
113 doHaddock = false;
117 doCheck = false;
114 doCheck = false;
118− homepage = "https://github.com/fpco/stackage-curator";
115+ homepage = "https://github.com/fpco/stackage-curator#readme";
119 description = "Tools for curating Stackage bundles";
116 description = "Tools for curating Stackage bundles";
120 license = stdenv.lib.licenses.mit;
117 license = stdenv.lib.licenses.mit;
121 }) {};
118 }) {};
122− "stackage2nix" = callPackage
119+ "gitlib" = callPackage
123− ({ mkDerivation, aeson, base, bytestring, Cabal, cabal2nix
120+ ({ mkDerivation, base, base16-bytestring, bytestring, conduit
124− , containers, deepseq, distribution-nixpkgs, exceptions, filepath
121+ , conduit-combinators, containers, directory, exceptions, fetchgit
125− , gitlib, gitlib-libgit2, hopenssl, hspec, inflections
122+ , filepath, hashable, mtl, resourcet, semigroups, tagged, text
126− , language-nix, lens, network-uri, optparse-applicative, pretty
123+ , time, transformers, unix, unliftio, unliftio-core
127− , QuickCheck, shakespeare, stackage-curator, text
128− , unordered-containers, yaml
124+ , unordered-containers
129 }:
125 }:
130 mkDerivation {
126 mkDerivation {
131− pname = "stackage2nix";
127+ pname = "gitlib";
132− version = "0.4.0";
128+ version = "3.1.2";
133− src = ../../.;
129+ src = fetchgit {
134− isLibrary = true;
130+ url = "https://github.com/jwiegley/gitlib.git";
135− isExecutable = true;
131+ sha256 = "0rp6lnbbbf9m6fvmx7mzknrk89ly0gbqaxsfx38cn6qdy7r54xcm";
132+ rev = "70c99759b8b9377f67492fe29afb32f05882409d";
133+ };
134+ postUnpack = "sourceRoot+=/gitlib; echo source root reset to $sourceRoot";
136 libraryHaskellDepends = [
135 libraryHaskellDepends = [
137− aeson base bytestring Cabal cabal2nix containers deepseq
136+ base base16-bytestring bytestring conduit conduit-combinators
138− distribution-nixpkgs exceptions filepath gitlib gitlib-libgit2
137+ containers directory exceptions filepath hashable mtl resourcet
139− hopenssl inflections language-nix lens network-uri
138+ semigroups tagged text time transformers unix unliftio
140− optparse-applicative pretty QuickCheck stackage-curator text
141− unordered-containers yaml
139+ unliftio-core unordered-containers
142 ];
140 ];
143− executableHaskellDepends = [ base ];
141+ doHaddock = false;
144− testHaskellDepends = [
142+ doCheck = false;
145− base bytestring Cabal hspec pretty shakespeare text yaml
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
146 ];
168 ];
147− homepage = "https://github.com/4e6/stackage2nix#readme";
169+ doHaddock = false;
148− description = "Convert Stack files into Nix build instructions";
170+ doCheck = false;
171+ description = "Libgit2 backend for gitlib";
149− license = stdenv.lib.licenses.bsd3;
172+ license = stdenv.lib.licenses.mit;
150 }) {};
173 }) {};
151 };
174 };
152−
175+
153 pkgOverrides = self: stackPackages {
176 pkgOverrides = self: stackPackages {
154 inherit pkgs stdenv;
177 inherit pkgs stdenv;
155 inherit (self) callPackage;
178 inherit (self) callPackage;
156 };
179 };
157−
158in callPackage (nixpkgs.path + "/pkgs/development/haskell-modules") {
180in callPackage (nixpkgs.path + "/pkgs/development/haskell-modules") {
159− ghc = pkgs.haskell.compiler.ghc802;
181+ ghc = pkgs.haskell.compiler.ghc843;
182+ buildHaskellPackages = buildPackages.haskell.packages.ghc843;
160− compilerConfig = self: extends pkgOverrides (extends stackageConfig (stackagePackages self));
183+ compilerConfig = self: extends pkgOverrides (stackageConfig self);
161− haskellLib = callPackage (nixpkgs.path + "/pkgs/development/haskell-modules/lib.nix") {};
184+ initialPackages = stackagePackages;
185+ configurationCommon = args: self: super: {};
186+ inherit haskellLib;
162}
187}
nix/haskell-packages/packages.nix+1674−1852
@@ -1,57 +1,83 @@
1−# Generated by stackage2nix 0.4.0 from "/home/dbushev/projects/fpco/lts-haskell/lts-9.17.yaml"
1+# Generated by stackage2nix 0.7.1 from "/home/dbushev/projects/commercialhaskell/lts-haskell/lts-12.2.yaml"
2{ pkgs, stdenv, callPackage }:
2{ pkgs, stdenv, callPackage }:
3
3
4self: {
4self: {
5 "Cabal" = callPackage
5 "Cabal" = callPackage
6 ({ mkDerivation, array, base, binary, bytestring, containers
6 ({ mkDerivation, array, base, binary, bytestring, containers
7− , deepseq, directory, filepath, pretty, process, time, unix
7+ , deepseq, directory, filepath, mtl, parsec, pretty, process, text
8+ , time, transformers, unix
8 }:
9 }:
9 mkDerivation {
10 mkDerivation {
10 pname = "Cabal";
11 pname = "Cabal";
11− version = "1.24.2.0";
12+ version = "2.2.0.1";
12− sha256 = "0h33v1716wkqh9wvq2wynvhwzkjjhg4aav0a1i3cmyq36n7fpl5p";
13+ sha256 = "0yqa6fm9jvr0ka6b1mf17bf43092dc1bai6mqyiwwwyz0h9k1d82";
13− revision = "2";
14+ setupHaskellDepends = [ mtl parsec ];
14− editedCabalFile = "15ncrm7x2lg4hn0m5mhc8hy769bzhmajsm6l9i6536plfs2bbbdj";
15 libraryHaskellDepends = [
15 libraryHaskellDepends = [
16 array base binary bytestring containers deepseq directory filepath
16 array base binary bytestring containers deepseq directory filepath
17− pretty process time unix
17+ mtl parsec pretty process text time transformers unix
18 ];
18 ];
19− doHaddock = false;
20 doCheck = false;
19 doCheck = false;
21 homepage = "http://www.haskell.org/cabal/";
20 homepage = "http://www.haskell.org/cabal/";
22 description = "A framework for packaging Haskell software";
21 description = "A framework for packaging Haskell software";
23 license = stdenv.lib.licenses.bsd3;
22 license = stdenv.lib.licenses.bsd3;
24 }) {};
23 }) {};
24+ "ChasingBottoms" = callPackage
25+ ({ mkDerivation, array, base, containers, mtl, QuickCheck, random
26+ , syb
27+ }:
28+ mkDerivation {
29+ pname = "ChasingBottoms";
30+ version = "1.3.1.4";
31+ sha256 = "06cynx6hcbfpky7qq3b3mjjgwbnaxkwin3znbwq4b9ikiw0ng633";
32+ libraryHaskellDepends = [
33+ base containers mtl QuickCheck random syb
34+ ];
35+ testHaskellDepends = [
36+ array base containers mtl QuickCheck random syb
37+ ];
38+ description = "For testing partial and infinite values";
39+ license = stdenv.lib.licenses.mit;
40+ }) {};
25 "Glob" = callPackage
41 "Glob" = callPackage
26 ({ mkDerivation, base, containers, directory, dlist, filepath
42 ({ mkDerivation, base, containers, directory, dlist, filepath
43+ , HUnit, QuickCheck, test-framework, test-framework-hunit
27− , transformers, transformers-compat
44+ , test-framework-quickcheck2, transformers, transformers-compat
28 }:
45 }:
29 mkDerivation {
46 mkDerivation {
30 pname = "Glob";
47 pname = "Glob";
31− version = "0.8.0";
48+ version = "0.9.2";
32− sha256 = "15p8nbi19mhl3iisngbawmdpvk8paaqq4248fqgan63q1sz13w1q";
49+ sha256 = "1rbwcq9w9951qsnp13vqcm9r01yax2yh1wk8s4zxa3ckk9717iwg";
33 libraryHaskellDepends = [
50 libraryHaskellDepends = [
34 base containers directory dlist filepath transformers
51 base containers directory dlist filepath transformers
35 transformers-compat
52 transformers-compat
36 ];
53 ];
37− doHaddock = false;
54+ testHaskellDepends = [
38− doCheck = false;
55+ base containers directory dlist filepath HUnit QuickCheck
56+ test-framework test-framework-hunit test-framework-quickcheck2
57+ transformers transformers-compat
58+ ];
39 homepage = "http://iki.fi/matti.niemenmaa/glob/";
59 homepage = "http://iki.fi/matti.niemenmaa/glob/";
40 description = "Globbing library";
60 description = "Globbing library";
41 license = stdenv.lib.licenses.bsd3;
61 license = stdenv.lib.licenses.bsd3;
42 }) {};
62 }) {};
43 "HTTP" = callPackage
63 "HTTP" = callPackage
44− ({ mkDerivation, array, base, bytestring, mtl, network, network-uri
64+ ({ mkDerivation, array, base, bytestring, case-insensitive, conduit
45− , parsec, time
65+ , conduit-extra, deepseq, http-types, httpd-shed, HUnit, mtl
66+ , network, network-uri, parsec, pureMD5, split, test-framework
67+ , test-framework-hunit, time, wai, warp
46 }:
68 }:
47 mkDerivation {
69 mkDerivation {
48 pname = "HTTP";
70 pname = "HTTP";
49− version = "4000.3.8";
71+ version = "4000.3.12";
50− sha256 = "1w6d17xn58f55xw84rql48ad8npzw93k7b46ibx8x4xsl6q5jfk0";
72+ sha256 = "140r6qy1ay25piv0z3hih11zhigyi08nkwc32097j43pjff6mzx3";
51 libraryHaskellDepends = [
73 libraryHaskellDepends = [
52 array base bytestring mtl network network-uri parsec time
74 array base bytestring mtl network network-uri parsec time
53 ];
75 ];
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+ ];
55 doCheck = false;
81 doCheck = false;
56 homepage = "https://github.com/haskell/HTTP";
82 homepage = "https://github.com/haskell/HTTP";
57 description = "A library for client-side HTTP";
83 description = "A library for client-side HTTP";
@@ -61,77 +87,50 @@ self: {
61 ({ mkDerivation, base, call-stack, deepseq, filepath }:
87 ({ mkDerivation, base, call-stack, deepseq, filepath }:
62 mkDerivation {
88 mkDerivation {
63 pname = "HUnit";
89 pname = "HUnit";
64− version = "1.5.0.0";
90+ version = "1.6.0.0";
65− sha256 = "186ykl7vxlfgkd2k8k1rq7yzcryzjpqwmn4ci1nn9h6irqbivib5";
91+ sha256 = "1pnhwqq5v8h48gbp3ibv3skfj25mf4zs5svxcavq93p9cswycj3l";
66 libraryHaskellDepends = [ base call-stack deepseq ];
92 libraryHaskellDepends = [ base call-stack deepseq ];
67 testHaskellDepends = [ base call-stack deepseq filepath ];
93 testHaskellDepends = [ base call-stack deepseq filepath ];
68− doHaddock = false;
69− doCheck = false;
70 homepage = "https://github.com/hspec/HUnit#readme";
94 homepage = "https://github.com/hspec/HUnit#readme";
71 description = "A unit testing framework for Haskell";
95 description = "A unit testing framework for Haskell";
72 license = stdenv.lib.licenses.bsd3;
96 license = stdenv.lib.licenses.bsd3;
73 }) {};
97 }) {};
74− "MonadRandom" = callPackage
98+ "Only" = callPackage
75− ({ mkDerivation, base, fail, mtl, primitive, random, transformers
99+ ({ mkDerivation, base, deepseq }:
76− , transformers-compat
77− }:
78 mkDerivation {
100 mkDerivation {
79− pname = "MonadRandom";
101+ pname = "Only";
80− version = "0.5.1";
102+ version = "0.1";
81− sha256 = "11qdfghizww810vdj9ac1f5qr5kdmrk40l6w6qh311bjh290ygwy";
103+ sha256 = "0rdj3a629fk2vp121jq8mf2smkblrz5w3cxhlsyx6my2x29s2ymb";
104+ revision = "1";
105+ editedCabalFile = "1ahk7p34kmh041mz7lyc10nhcxgv2i4z8nvzxvqm2x34gslmsbzr";
82− libraryHaskellDepends = [
106+ libraryHaskellDepends = [ base deepseq ];
83− base fail mtl primitive random transformers transformers-compat
107+ description = "The 1-tuple type or single-value \"collection\"";
84− ];
85− doHaddock = false;
86− doCheck = false;
87− description = "Random-number generation monad";
88 license = stdenv.lib.licenses.bsd3;
108 license = stdenv.lib.licenses.bsd3;
89 }) {};
109 }) {};
90 "QuickCheck" = callPackage
110 "QuickCheck" = callPackage
91− ({ mkDerivation, base, containers, random, template-haskell
111+ ({ mkDerivation, base, containers, deepseq, random
92− , test-framework, tf-random, transformers
112+ , template-haskell, tf-random, transformers
93 }:
113 }:
94 mkDerivation {
114 mkDerivation {
95 pname = "QuickCheck";
115 pname = "QuickCheck";
96− version = "2.9.2";
116+ version = "2.11.3";
97− sha256 = "119np67qvx8hyp9vkg4gr2wv3lj3j6ay2vl4hxspkg43ymb1cp0m";
117+ sha256 = "0xhqk35fkzlbjcqbabg6962jkv8d688nzmz7ng4bm84x2d95d328";
98 libraryHaskellDepends = [
118 libraryHaskellDepends = [
99− base containers random template-haskell tf-random transformers
119+ base containers deepseq random template-haskell tf-random
100− ];
120+ transformers
101− testHaskellDepends = [
102− base containers template-haskell test-framework
103 ];
121 ];
104− doHaddock = false;
122+ testHaskellDepends = [ base ];
105− doCheck = false;
106 homepage = "https://github.com/nick8325/quickcheck";
123 homepage = "https://github.com/nick8325/quickcheck";
107 description = "Automatic testing of Haskell programs";
124 description = "Automatic testing of Haskell programs";
108 license = stdenv.lib.licenses.bsd3;
125 license = stdenv.lib.licenses.bsd3;
109 }) {};
126 }) {};
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− }) {};
126 "StateVar" = callPackage
127 "StateVar" = callPackage
127 ({ mkDerivation, base, stm, transformers }:
128 ({ mkDerivation, base, stm, transformers }:
128 mkDerivation {
129 mkDerivation {
129 pname = "StateVar";
130 pname = "StateVar";
130− version = "1.1.0.4";
131+ version = "1.1.1.0";
131− sha256 = "1dzz9l0haswgag9x56q7n57kw18v7nhmzkjyr61nz9y9npn8vmks";
132+ sha256 = "102f4x240zj3jwa7gx6vp813j76cjhlc3zbi9i5kiz6268kcv28s";
132 libraryHaskellDepends = [ base stm transformers ];
133 libraryHaskellDepends = [ base stm transformers ];
133− doHaddock = false;
134− doCheck = false;
135 homepage = "https://github.com/haskell-opengl/StateVar";
134 homepage = "https://github.com/haskell-opengl/StateVar";
136 description = "State variables";
135 description = "State variables";
137 license = stdenv.lib.licenses.bsd3;
136 license = stdenv.lib.licenses.bsd3;
@@ -143,8 +142,6 @@ self: {
143 version = "0.3";
142 version = "0.3";
144 sha256 = "18jwswjxwzc9bjiy4ds6hw2a74ki797jmfcifxd2ga4kh7ri1ah9";
143 sha256 = "18jwswjxwzc9bjiy4ds6hw2a74ki797jmfcifxd2ga4kh7ri1ah9";
145 libraryHaskellDepends = [ array base containers random time ];
144 libraryHaskellDepends = [ array base containers random time ];
146− doHaddock = false;
147− doCheck = false;
148 homepage = "https://github.com/rrnewton/haskell-lockfree/wiki";
145 homepage = "https://github.com/rrnewton/haskell-lockfree/wiki";
149 description = "Abstract, parameterized interface to mutable Deques";
146 description = "Abstract, parameterized interface to mutable Deques";
150 license = stdenv.lib.licenses.bsd3;
147 license = stdenv.lib.licenses.bsd3;
@@ -156,64 +153,49 @@ self: {
156 version = "0.3.3";
153 version = "0.3.3";
157 sha256 = "0q6qsniw4wks2pw6wzncb1p1j3k6al5njnvm2v5n494hplwqg2i4";
154 sha256 = "0q6qsniw4wks2pw6wzncb1p1j3k6al5njnvm2v5n494hplwqg2i4";
158 libraryHaskellDepends = [ base deepseq ];
155 libraryHaskellDepends = [ base deepseq ];
159− doHaddock = false;
160− doCheck = false;
161 homepage = "https://github.com/simonmar/monad-par";
156 homepage = "https://github.com/simonmar/monad-par";
162 description = "Type classes generalizing the functionality of the 'monad-par' library";
157 description = "Type classes generalizing the functionality of the 'monad-par' library";
163 license = stdenv.lib.licenses.bsd3;
158 license = stdenv.lib.licenses.bsd3;
164 }) {};
159 }) {};
165 "adjunctions" = callPackage
160 "adjunctions" = callPackage
166 ({ mkDerivation, array, base, comonad, containers, contravariant
161 ({ mkDerivation, array, base, comonad, containers, contravariant
162+ , distributive, free, generic-deriving, hspec, hspec-discover, mtl
167− , distributive, free, mtl, profunctors, semigroupoids, semigroups
163+ , profunctors, semigroupoids, semigroups, tagged, transformers
168− , tagged, transformers, transformers-compat, void
164+ , transformers-compat, void
169 }:
165 }:
170 mkDerivation {
166 mkDerivation {
171 pname = "adjunctions";
167 pname = "adjunctions";
172− version = "4.3";
168+ version = "4.4";
173− sha256 = "1k1ykisf96i4g2zm47c45md7p42c4vsp9r73392pz1g8mx7s2j5r";
169+ sha256 = "1sbal7cbhm12crfnfhkk322jnzgx7lhw3jzq0p463bipagsjwz2h";
174 revision = "1";
170 revision = "1";
175− editedCabalFile = "1079l9szyr7ybi9wcvv1vjsjfrqirkn9z3j7dann8vbk81a4z37q";
171+ editedCabalFile = "0582nnn3fab63nd7ng8smk2c8j7pciiyzfj1na34wqid2hs675as";
176 libraryHaskellDepends = [
172 libraryHaskellDepends = [
177 array base comonad containers contravariant distributive free mtl
173 array base comonad containers contravariant distributive free mtl
178 profunctors semigroupoids semigroups tagged transformers
174 profunctors semigroupoids semigroups tagged transformers
179 transformers-compat void
175 transformers-compat void
180 ];
176 ];
181− doHaddock = false;
177+ testHaskellDepends = [ base distributive generic-deriving hspec ];
182− doCheck = false;
178+ testToolDepends = [ hspec-discover ];
183 homepage = "http://github.com/ekmett/adjunctions/";
179 homepage = "http://github.com/ekmett/adjunctions/";
184 description = "Adjunctions and representable functors";
180 description = "Adjunctions and representable functors";
185 license = stdenv.lib.licenses.bsd3;
181 license = stdenv.lib.licenses.bsd3;
186 }) {};
182 }) {};
187 "aeson" = callPackage
183 "aeson" = callPackage
188− ({ mkDerivation, attoparsec, base, base-compat, base-orphans
184+ ({ mkDerivation, attoparsec, base, base-compat, bytestring
189− , base16-bytestring, bytestring, containers, deepseq, directory
190− , dlist, filepath, generic-deriving, ghc-prim, hashable
185+ , containers, deepseq, dlist, ghc-prim, hashable, scientific
191− , hashable-time, HUnit, integer-logarithms, QuickCheck
192− , quickcheck-instances, scientific, tagged, template-haskell
186+ , tagged, template-haskell, text, th-abstraction, time
193− , test-framework, test-framework-hunit, test-framework-quickcheck2
194− , text, time, time-locale-compat, unordered-containers, uuid-types
187+ , time-locale-compat, unordered-containers, uuid-types, vector
195− , vector
196 }:
188 }:
197 mkDerivation {
189 mkDerivation {
198 pname = "aeson";
190 pname = "aeson";
199− version = "1.1.2.0";
191+ version = "1.3.1.1";
200− sha256 = "1zy5z8pzvh53qkjm0nm3f4rwqfqg3867ck8ncd6mrxpcyvxqqj1p";
192+ sha256 = "1i1ig840fvsb1lnklcv32zsc0zscirc301lw1mpfxhc6h4pk0gw4";
201− revision = "1";
202− editedCabalFile = "06acsik1qcn5r1z1y3n7iw5h8x0h3hdcjii0bq9nf9ncvc71h1d4";
203 libraryHaskellDepends = [
193 libraryHaskellDepends = [
204 attoparsec base base-compat bytestring containers deepseq dlist
194 attoparsec base base-compat bytestring containers deepseq dlist
205− ghc-prim hashable scientific tagged template-haskell text time
195+ ghc-prim hashable scientific tagged template-haskell text
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
196+ th-abstraction time time-locale-compat unordered-containers
197+ uuid-types vector
215 ];
198 ];
216− doHaddock = false;
217 doCheck = false;
199 doCheck = false;
218 homepage = "https://github.com/bos/aeson";
200 homepage = "https://github.com/bos/aeson";
219 description = "Fast JSON parsing and encoding";
201 description = "Fast JSON parsing and encoding";
@@ -225,8 +207,8 @@ self: {
225 }:
207 }:
226 mkDerivation {
208 mkDerivation {
227 pname = "aeson-pretty";
209 pname = "aeson-pretty";
228− version = "0.8.5";
210+ version = "0.8.7";
229− sha256 = "1yd98972srlbkn0f2jhrb3f443j9wnq2fnw5gbxjxzmkcinfh5yx";
211+ sha256 = "1m977gs0s9gf3lwzlbs5y7bl6ansc5pywmn2qjk09l5bwg2yrhf1";
230 isLibrary = true;
212 isLibrary = true;
231 isExecutable = true;
213 isExecutable = true;
232 libraryHaskellDepends = [
214 libraryHaskellDepends = [
@@ -236,87 +218,62 @@ self: {
236 executableHaskellDepends = [
218 executableHaskellDepends = [
237 aeson attoparsec base bytestring cmdargs
219 aeson attoparsec base bytestring cmdargs
238 ];
220 ];
239− doHaddock = false;
240− doCheck = false;
241 homepage = "http://github.com/informatikr/aeson-pretty";
221 homepage = "http://github.com/informatikr/aeson-pretty";
242 description = "JSON pretty-printing library and command-line tool";
222 description = "JSON pretty-printing library and command-line tool";
243 license = stdenv.lib.licenses.bsd3;
223 license = stdenv.lib.licenses.bsd3;
244 }) {};
224 }) {};
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− }) {};
268 "amazonka" = callPackage
225 "amazonka" = callPackage
269 ({ mkDerivation, amazonka-core, base, bytestring, conduit
226 ({ mkDerivation, amazonka-core, base, bytestring, conduit
270− , conduit-extra, directory, exceptions, http-conduit, ini, mmorph
227+ , conduit-extra, directory, exceptions, http-client, http-conduit
271− , monad-control, mtl, resourcet, retry, tasty, tasty-hunit, text
228+ , http-types, ini, mmorph, monad-control, mtl, resourcet, retry
272− , time, transformers, transformers-base, transformers-compat
229+ , tasty, tasty-hunit, text, time, transformers, transformers-base
230+ , transformers-compat, void
273 }:
231 }:
274 mkDerivation {
232 mkDerivation {
275 pname = "amazonka";
233 pname = "amazonka";
276− version = "1.4.5";
234+ version = "1.6.0";
277− sha256 = "0p48ra5hns9kpnsgr40imj0zgnd311ww2kk4lz4nnjpa1ppvgrw6";
235+ sha256 = "07647x7lq9kaq6bqh38rvdiajji4ks6s7nvxv2xi4v4lhwn8j89p";
278 libraryHaskellDepends = [
236 libraryHaskellDepends = [
279 amazonka-core base bytestring conduit conduit-extra directory
237 amazonka-core base bytestring conduit conduit-extra directory
280− exceptions http-conduit ini mmorph monad-control mtl resourcet
238+ exceptions http-client http-conduit http-types ini mmorph
239+ monad-control mtl resourcet retry text time transformers
281− retry text time transformers transformers-base transformers-compat
240+ transformers-base transformers-compat void
282 ];
241 ];
283 testHaskellDepends = [ base tasty tasty-hunit ];
242 testHaskellDepends = [ base tasty tasty-hunit ];
284− doHaddock = false;
285− doCheck = false;
286 homepage = "https://github.com/brendanhay/amazonka";
243 homepage = "https://github.com/brendanhay/amazonka";
287 description = "Comprehensive Amazon Web Services SDK";
244 description = "Comprehensive Amazon Web Services SDK";
288− license = "unknown";
245+ license = stdenv.lib.licenses.mpl20;
289 }) {};
246 }) {};
290 "amazonka-core" = callPackage
247 "amazonka-core" = callPackage
291 ({ mkDerivation, aeson, attoparsec, base, bifunctors, bytestring
248 ({ mkDerivation, aeson, attoparsec, base, bifunctors, bytestring
292− , case-insensitive, conduit, conduit-extra, cryptonite, deepseq
249+ , case-insensitive, conduit, conduit-extra, cryptonite
250+ , data-ordlist, deepseq, exceptions, hashable, http-client
293− , exceptions, hashable, http-conduit, http-types, lens, memory, mtl
251+ , http-conduit, http-types, lens, memory, mtl, QuickCheck
294− , QuickCheck, quickcheck-unicode, resourcet, scientific, semigroups
252+ , quickcheck-unicode, resourcet, scientific, semigroups, tagged
295− , tagged, tasty, tasty-hunit, tasty-quickcheck, template-haskell
253+ , tasty, tasty-hunit, tasty-quickcheck, template-haskell, text
296− , text, time, transformers, transformers-compat
254+ , time, transformers, transformers-compat, unordered-containers
297− , unordered-containers, xml-conduit, xml-types
255+ , xml-conduit, xml-types
298 }:
256 }:
299 mkDerivation {
257 mkDerivation {
300 pname = "amazonka-core";
258 pname = "amazonka-core";
301− version = "1.4.5";
259+ version = "1.6.0";
302− sha256 = "0zzfrn4m7ixs7dxw2n7d6ajfb9h8bnbk8pw1hw8w48nprv8f24yv";
260+ sha256 = "1j9x17zhyxrg4ds5pdxfjdb4z7hpzn42cydx34j25h5d9avwbqdg";
303 libraryHaskellDepends = [
261 libraryHaskellDepends = [
304 aeson attoparsec base bifunctors bytestring case-insensitive
262 aeson attoparsec base bifunctors bytestring case-insensitive
305 conduit conduit-extra cryptonite deepseq exceptions hashable
263 conduit conduit-extra cryptonite deepseq exceptions hashable
306− http-conduit http-types lens memory mtl resourcet scientific
264+ http-client http-conduit http-types lens memory mtl resourcet
307− semigroups tagged text time transformers transformers-compat
265+ scientific semigroups tagged text time transformers
308− unordered-containers xml-conduit xml-types
266+ transformers-compat unordered-containers xml-conduit xml-types
309 ];
267 ];
310 testHaskellDepends = [
268 testHaskellDepends = [
311− aeson base bytestring case-insensitive http-types QuickCheck
269+ aeson base bytestring case-insensitive conduit data-ordlist
312− quickcheck-unicode tasty tasty-hunit tasty-quickcheck
270+ http-conduit http-types lens QuickCheck quickcheck-unicode tasty
313− template-haskell text time
271+ tasty-hunit tasty-quickcheck template-haskell text time
314 ];
272 ];
315− doHaddock = false;
316 doCheck = false;
273 doCheck = false;
317 homepage = "https://github.com/brendanhay/amazonka";
274 homepage = "https://github.com/brendanhay/amazonka";
318 description = "Core data types and functionality for Amazonka libraries";
275 description = "Core data types and functionality for Amazonka libraries";
319− license = "unknown";
276+ license = stdenv.lib.licenses.mpl20;
320 }) {};
277 }) {};
321 "amazonka-s3" = callPackage
278 "amazonka-s3" = callPackage
322 ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
279 ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
@@ -324,18 +281,16 @@ self: {
324 }:
281 }:
325 mkDerivation {
282 mkDerivation {
326 pname = "amazonka-s3";
283 pname = "amazonka-s3";
327− version = "1.4.5";
284+ version = "1.6.0";
328− sha256 = "1bg45wxcvizdi7j5jggvblxwhd3f7sfy1j0jaq2ajfxcdsb7wabq";
285+ sha256 = "0irz8vyklapjy3w3qasidpvq4hk2qwkmhrnrd23sf4yzs2xqx8gc";
329 libraryHaskellDepends = [ amazonka-core base lens text ];
286 libraryHaskellDepends = [ amazonka-core base lens text ];
330 testHaskellDepends = [
287 testHaskellDepends = [
331 amazonka-core amazonka-test base bytestring tasty tasty-hunit text
288 amazonka-core amazonka-test base bytestring tasty tasty-hunit text
332 time unordered-containers
289 time unordered-containers
333 ];
290 ];
334− doHaddock = false;
335− doCheck = false;
336 homepage = "https://github.com/brendanhay/amazonka";
291 homepage = "https://github.com/brendanhay/amazonka";
337 description = "Amazon Simple Storage Service SDK";
292 description = "Amazon Simple Storage Service SDK";
338− license = "unknown";
293+ license = stdenv.lib.licenses.mpl20;
339 }) {};
294 }) {};
340 "amazonka-test" = callPackage
295 "amazonka-test" = callPackage
341 ({ mkDerivation, aeson, amazonka-core, base, bifunctors, bytestring
296 ({ mkDerivation, aeson, amazonka-core, base, bifunctors, bytestring
@@ -346,32 +301,27 @@ self: {
346 }:
301 }:
347 mkDerivation {
302 mkDerivation {
348 pname = "amazonka-test";
303 pname = "amazonka-test";
349− version = "1.4.5";
304+ version = "1.6.0";
350− sha256 = "0fjynyb85px3mbf85jf1xvs7n21622w60lasshgjy42brp5p524q";
305+ sha256 = "0a6xfp97hijhqmhj9nv4aqax08ry8y809jpjhyj2819p01wvga26";
351 libraryHaskellDepends = [
306 libraryHaskellDepends = [
352 aeson amazonka-core base bifunctors bytestring case-insensitive
307 aeson amazonka-core base bifunctors bytestring case-insensitive
353 conduit conduit-extra groom http-client http-types process
308 conduit conduit-extra groom http-client http-types process
354 resourcet tasty tasty-hunit template-haskell temporary text time
309 resourcet tasty tasty-hunit template-haskell temporary text time
355 unordered-containers yaml
310 unordered-containers yaml
356 ];
311 ];
357− doHaddock = false;
358− doCheck = false;
359 homepage = "https://github.com/brendanhay/amazonka";
312 homepage = "https://github.com/brendanhay/amazonka";
360 description = "Common functionality for Amazonka library test-suites";
313 description = "Common functionality for Amazonka library test-suites";
361− license = "unknown";
314+ license = stdenv.lib.licenses.mpl20;
362 }) {};
315 }) {};
363 "ansi-terminal" = callPackage
316 "ansi-terminal" = callPackage
364− ({ mkDerivation, base }:
317+ ({ mkDerivation, base, colour }:
365 mkDerivation {
318 mkDerivation {
366 pname = "ansi-terminal";
319 pname = "ansi-terminal";
367− version = "0.6.3.1";
320+ version = "0.8.0.4";
368− sha256 = "15c0c0vb66y3mr11kcvgjf4h0f7dqg7k1xq7zzq9fy11r7h9i3s5";
321+ sha256 = "0428gq8m3fdnb7ldcsyk97qcch76hcxbgh2666p6f76fs2qbhg7b";
369 isLibrary = true;
322 isLibrary = true;
370 isExecutable = true;
323 isExecutable = true;
371− libraryHaskellDepends = [ base ];
324+ libraryHaskellDepends = [ base colour ];
372− executableHaskellDepends = [ base ];
373− doHaddock = false;
374− doCheck = false;
375 homepage = "https://github.com/feuerbach/ansi-terminal";
325 homepage = "https://github.com/feuerbach/ansi-terminal";
376 description = "Simple ANSI terminal support, with Windows compatibility";
326 description = "Simple ANSI terminal support, with Windows compatibility";
377 license = stdenv.lib.licenses.bsd3;
327 license = stdenv.lib.licenses.bsd3;
@@ -380,14 +330,11 @@ self: {
380 ({ mkDerivation, ansi-terminal, base }:
330 ({ mkDerivation, ansi-terminal, base }:
381 mkDerivation {
331 mkDerivation {
382 pname = "ansi-wl-pprint";
332 pname = "ansi-wl-pprint";
383− version = "0.6.7.3";
333+ version = "0.6.8.2";
384− sha256 = "025pyphsjf0dnbrmj5nscbi6gzyigwgp3ifxb3psn7kji6mfr29p";
334+ sha256 = "0gnb4mkqryv08vncxnj0bzwcnd749613yw3cxfzw6y3nsldp4c56";
385 isLibrary = true;
335 isLibrary = true;
386 isExecutable = true;
336 isExecutable = true;
387 libraryHaskellDepends = [ ansi-terminal base ];
337 libraryHaskellDepends = [ ansi-terminal base ];
388− executableHaskellDepends = [ ansi-terminal base ];
389− doHaddock = false;
390− doCheck = false;
391 homepage = "http://github.com/ekmett/ansi-wl-pprint";
338 homepage = "http://github.com/ekmett/ansi-wl-pprint";
392 description = "The Wadler/Leijen Pretty Printer for colored ANSI terminal output";
339 description = "The Wadler/Leijen Pretty Printer for colored ANSI terminal output";
393 license = stdenv.lib.licenses.bsd3;
340 license = stdenv.lib.licenses.bsd3;
@@ -399,8 +346,6 @@ self: {
399 version = "0.1.4";
346 version = "0.1.4";
400 sha256 = "09jb9ij78fdkz2qk66rw99q19qnm504dpv0yq0pjsl6xwjmndsjq";
347 sha256 = "09jb9ij78fdkz2qk66rw99q19qnm504dpv0yq0pjsl6xwjmndsjq";
401 libraryHaskellDepends = [ base bytestring ];
348 libraryHaskellDepends = [ base bytestring ];
402− doHaddock = false;
403− doCheck = false;
404 description = "A simple applicative parser";
349 description = "A simple applicative parser";
405 license = stdenv.lib.licenses.bsd3;
350 license = stdenv.lib.licenses.bsd3;
406 }) {};
351 }) {};
@@ -417,8 +362,6 @@ self: {
417 asn1-types base bytestring hourglass mtl tasty tasty-quickcheck
362 asn1-types base bytestring hourglass mtl tasty tasty-quickcheck
418 text
363 text
419 ];
364 ];
420− doHaddock = false;
421− doCheck = false;
422 homepage = "http://github.com/vincenthz/hs-asn1";
365 homepage = "http://github.com/vincenthz/hs-asn1";
423 description = "ASN1 data reader and writer in RAW, BER and DER forms";
366 description = "ASN1 data reader and writer in RAW, BER and DER forms";
424 license = stdenv.lib.licenses.bsd3;
367 license = stdenv.lib.licenses.bsd3;
@@ -432,8 +375,6 @@ self: {
432 libraryHaskellDepends = [
375 libraryHaskellDepends = [
433 asn1-encoding asn1-types base bytestring
376 asn1-encoding asn1-types base bytestring
434 ];
377 ];
435− doHaddock = false;
436− doCheck = false;
437 homepage = "https://github.com/vincenthz/hs-asn1";
378 homepage = "https://github.com/vincenthz/hs-asn1";
438 description = "Simple monadic parser for ASN1 stream types";
379 description = "Simple monadic parser for ASN1 stream types";
439 license = stdenv.lib.licenses.bsd3;
380 license = stdenv.lib.licenses.bsd3;
@@ -445,48 +386,47 @@ self: {
445 version = "0.3.2";
386 version = "0.3.2";
446 sha256 = "05vjchyqiy9n275cygffhn0ma7fz7jx52j0dcdm9qm8h9bziymqc";
387 sha256 = "05vjchyqiy9n275cygffhn0ma7fz7jx52j0dcdm9qm8h9bziymqc";
447 libraryHaskellDepends = [ base bytestring hourglass memory ];
388 libraryHaskellDepends = [ base bytestring hourglass memory ];
448− doHaddock = false;
449− doCheck = false;
450 homepage = "http://github.com/vincenthz/hs-asn1-types";
389 homepage = "http://github.com/vincenthz/hs-asn1-types";
451 description = "ASN.1 types";
390 description = "ASN.1 types";
452 license = stdenv.lib.licenses.bsd3;
391 license = stdenv.lib.licenses.bsd3;
453 }) {};
392 }) {};
454 "async" = callPackage
393 "async" = callPackage
455− ({ mkDerivation, base, HUnit, stm, test-framework
394+ ({ mkDerivation, base, hashable, HUnit, stm, test-framework
456 , test-framework-hunit
395 , test-framework-hunit
457 }:
396 }:
458 mkDerivation {
397 mkDerivation {
459 pname = "async";
398 pname = "async";
460− version = "2.1.1.1";
399+ version = "2.2.1";
461− sha256 = "1qj4fp1ynwg0l453gmm27vgkzb5k5m2hzdlg5rdqi9kf8rqy90yd";
400+ sha256 = "09whscli1q5z7lzyq9rfk0bq1ydplh6pjmc6qv0x668k5818c2wg";
401+ isLibrary = true;
402+ isExecutable = true;
462− libraryHaskellDepends = [ base stm ];
403+ libraryHaskellDepends = [ base hashable stm ];
463 testHaskellDepends = [
404 testHaskellDepends = [
464− base HUnit test-framework test-framework-hunit
405+ base HUnit stm test-framework test-framework-hunit
465 ];
406 ];
466− doHaddock = false;
467− doCheck = false;
468 homepage = "https://github.com/simonmar/async";
407 homepage = "https://github.com/simonmar/async";
469 description = "Run IO operations asynchronously and wait for their results";
408 description = "Run IO operations asynchronously and wait for their results";
470 license = stdenv.lib.licenses.bsd3;
409 license = stdenv.lib.licenses.bsd3;
471 }) {};
410 }) {};
472 "attoparsec" = callPackage
411 "attoparsec" = callPackage
473− ({ mkDerivation, array, base, bytestring, containers, deepseq
412+ ({ mkDerivation, array, base, bytestring, case-insensitive
474− , QuickCheck, quickcheck-unicode, scientific, tasty
413+ , containers, criterion, deepseq, directory, filepath, ghc-prim
475− , tasty-quickcheck, text, transformers, vector
414+ , http-types, parsec, scientific, text, transformers
415+ , unordered-containers, vector
476 }:
416 }:
477 mkDerivation {
417 mkDerivation {
478 pname = "attoparsec";
418 pname = "attoparsec";
479− version = "0.13.1.0";
419+ version = "0.13.2.2";
480− sha256 = "0r1zrrkbqv8w4pb459fj5izd1h85p9nrsp3gyzj7qiayjpa79p2j";
420+ sha256 = "0j6qcwd146yzlkc9mcvzvnixsyl65n2a68l28322q5v9p4g4g4yx";
481 libraryHaskellDepends = [
421 libraryHaskellDepends = [
482 array base bytestring containers deepseq scientific text
422 array base bytestring containers deepseq scientific text
483 transformers
423 transformers
484 ];
424 ];
485− testHaskellDepends = [
425+ benchmarkHaskellDepends = [
486− array base bytestring deepseq QuickCheck quickcheck-unicode
426+ array base bytestring case-insensitive containers criterion deepseq
427+ directory filepath ghc-prim http-types parsec scientific text
487− scientific tasty tasty-quickcheck text transformers vector
428+ transformers unordered-containers vector
488 ];
429 ];
489− doHaddock = false;
490 doCheck = false;
430 doCheck = false;
491 homepage = "https://github.com/bos/attoparsec";
431 homepage = "https://github.com/bos/attoparsec";
492 description = "Fast combinator parsing for bytestrings and text";
432 description = "Fast combinator parsing for bytestrings and text";
@@ -499,39 +439,60 @@ self: {
499 version = "0.1.4";
439 version = "0.1.4";
500 sha256 = "09dlh2alsx2mw5kvj931yhbj0aw7jmly2cm9xbscm2sf098w35jy";
440 sha256 = "09dlh2alsx2mw5kvj931yhbj0aw7jmly2cm9xbscm2sf098w35jy";
501 libraryHaskellDepends = [ base ];
441 libraryHaskellDepends = [ base ];
502− doHaddock = false;
503− doCheck = false;
504 homepage = "https://github.com/yesodweb/wai";
442 homepage = "https://github.com/yesodweb/wai";
505 description = "Efficiently run periodic, on-demand actions";
443 description = "Efficiently run periodic, on-demand actions";
506 license = stdenv.lib.licenses.mit;
444 license = stdenv.lib.licenses.mit;
507 }) {};
445 }) {};
508 "base-compat" = callPackage
446 "base-compat" = callPackage
509− ({ mkDerivation, base, hspec, QuickCheck, unix }:
447+ ({ mkDerivation, base, unix }:
510 mkDerivation {
448 mkDerivation {
511 pname = "base-compat";
449 pname = "base-compat";
512− version = "0.9.3";
450+ version = "0.10.4";
513− sha256 = "0452l6zf6fjhy4kxqwv6i6hhg6yfx4wcg450k3axpyj30l7jnq3x";
451+ sha256 = "0ksp990gxs731mq19rzbxrbs43nazfljjc8krlx5bjqblw3kfs8d";
514 libraryHaskellDepends = [ base unix ];
452 libraryHaskellDepends = [ base unix ];
515− testHaskellDepends = [ base hspec QuickCheck ];
516− doHaddock = false;
517− doCheck = false;
518 description = "A compatibility layer for base";
453 description = "A compatibility layer for base";
519 license = stdenv.lib.licenses.mit;
454 license = stdenv.lib.licenses.mit;
520 }) {};
455 }) {};
456+ "base-compat-batteries" = callPackage
457+ ({ mkDerivation, base, base-compat, hspec, hspec-discover
458+ , QuickCheck
459+ }:
460+ mkDerivation {
461+ pname = "base-compat-batteries";
462+ version = "0.10.1";
463+ sha256 = "1j8ky6241mj1ymbwm9scvyvbknj7n2r56cnkg9y1zf2xwjpqnmqm";
464+ libraryHaskellDepends = [ base base-compat ];
465+ testHaskellDepends = [ base hspec QuickCheck ];
466+ testToolDepends = [ hspec-discover ];
467+ description = "base-compat with extra batteries";
468+ license = stdenv.lib.licenses.mit;
469+ }) {};
521 "base-orphans" = callPackage
470 "base-orphans" = callPackage
522− ({ mkDerivation, base, ghc-prim, hspec, QuickCheck }:
471+ ({ mkDerivation, base, ghc-prim, hspec, hspec-discover, QuickCheck
472+ }:
523 mkDerivation {
473 mkDerivation {
524 pname = "base-orphans";
474 pname = "base-orphans";
525− version = "0.6";
475+ version = "0.7";
526− sha256 = "03mdww5j0gwai7aqlx3m71ldmjcr99jzpkcclzjfclk6a6kjla67";
476+ sha256 = "057f9npnqk71ccfh95djfkpd54dzazphj06grwxa3fyhwcwxrb8a";
527 libraryHaskellDepends = [ base ghc-prim ];
477 libraryHaskellDepends = [ base ghc-prim ];
528 testHaskellDepends = [ base hspec QuickCheck ];
478 testHaskellDepends = [ base hspec QuickCheck ];
529− doHaddock = false;
479+ testToolDepends = [ hspec-discover ];
530− doCheck = false;
531 homepage = "https://github.com/haskell-compat/base-orphans#readme";
480 homepage = "https://github.com/haskell-compat/base-orphans#readme";
532 description = "Backwards-compatible orphan instances for base";
481 description = "Backwards-compatible orphan instances for base";
533 license = stdenv.lib.licenses.mit;
482 license = stdenv.lib.licenses.mit;
534 }) {};
483 }) {};
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+ }) {};
535 "base16-bytestring" = callPackage
496 "base16-bytestring" = callPackage
536 ({ mkDerivation, base, bytestring, ghc-prim }:
497 ({ mkDerivation, base, bytestring, ghc-prim }:
537 mkDerivation {
498 mkDerivation {
@@ -539,8 +500,6 @@ self: {
539 version = "0.1.1.6";
500 version = "0.1.1.6";
540 sha256 = "0jf40m3yijqw6wd1rwwvviww46fasphaay9m9rgqyhf5aahnbzjs";
501 sha256 = "0jf40m3yijqw6wd1rwwvviww46fasphaay9m9rgqyhf5aahnbzjs";
541 libraryHaskellDepends = [ base bytestring ghc-prim ];
502 libraryHaskellDepends = [ base bytestring ghc-prim ];
542− doHaddock = false;
543− doCheck = false;
544 homepage = "http://github.com/bos/base16-bytestring";
503 homepage = "http://github.com/bos/base16-bytestring";
545 description = "Fast base16 (hex) encoding and decoding for ByteStrings";
504 description = "Fast base16 (hex) encoding and decoding for ByteStrings";
546 license = stdenv.lib.licenses.bsd3;
505 license = stdenv.lib.licenses.bsd3;
@@ -558,8 +517,6 @@ self: {
558 base bytestring containers HUnit QuickCheck test-framework
517 base bytestring containers HUnit QuickCheck test-framework
559 test-framework-hunit test-framework-quickcheck2
518 test-framework-hunit test-framework-quickcheck2
560 ];
519 ];
561− doHaddock = false;
562− doCheck = false;
563 homepage = "https://github.com/bos/base64-bytestring";
520 homepage = "https://github.com/bos/base64-bytestring";
564 description = "Fast base64 encoding and decoding for ByteStrings";
521 description = "Fast base64 encoding and decoding for ByteStrings";
565 license = stdenv.lib.licenses.bsd3;
522 license = stdenv.lib.licenses.bsd3;
@@ -568,53 +525,47 @@ self: {
568 ({ mkDerivation, base, ghc-prim }:
525 ({ mkDerivation, base, ghc-prim }:
569 mkDerivation {
526 mkDerivation {
570 pname = "basement";
527 pname = "basement";
571− version = "0.0.4";
528+ version = "0.0.8";
572− sha256 = "1zdqv8dbzv8jx6z8fcghinbnxdc5fb97i7sdfswdr1fcp8jq6i38";
529+ sha256 = "194jw567di4q2758943q9rrwkbf9gl261my7qc21i9xhyabipx67";
573 libraryHaskellDepends = [ base ghc-prim ];
530 libraryHaskellDepends = [ base ghc-prim ];
574− doHaddock = false;
575− doCheck = false;
576− homepage = "https://github.com/haskell-foundation/foundation";
531+ homepage = "https://github.com/haskell-foundation/foundation#readme";
577 description = "Foundation scrap box of array & string";
532 description = "Foundation scrap box of array & string";
578 license = stdenv.lib.licenses.bsd3;
533 license = stdenv.lib.licenses.bsd3;
579 }) {};
534 }) {};
580 "basic-prelude" = callPackage
535 "basic-prelude" = callPackage
581 ({ mkDerivation, base, bytestring, containers, filepath, hashable
536 ({ mkDerivation, base, bytestring, containers, filepath, hashable
582− , lifted-base, ReadArgs, safe, text, transformers
583− , unordered-containers, vector
537+ , text, transformers, unordered-containers, vector
584 }:
538 }:
585 mkDerivation {
539 mkDerivation {
586 pname = "basic-prelude";
540 pname = "basic-prelude";
587− version = "0.6.1.1";
541+ version = "0.7.0";
588− sha256 = "1irfz57w4966y1vxkgh6bqxdlw3jijwz1pmq3qz9748linnpicgp";
542+ sha256 = "0yckmnvm6i4vw0mykj4fzl4ldsf67v8d2h0vp1bakyj84n4myx8h";
589 libraryHaskellDepends = [
543 libraryHaskellDepends = [
590− base bytestring containers filepath hashable lifted-base ReadArgs
544+ base bytestring containers filepath hashable text transformers
591− safe text transformers unordered-containers vector
545+ unordered-containers vector
592 ];
546 ];
593− doHaddock = false;
594− doCheck = false;
595− homepage = "https://github.com/snoyberg/basic-prelude";
547+ homepage = "https://github.com/snoyberg/basic-prelude#readme";
596 description = "An enhanced core prelude; a common foundation for alternate preludes";
548 description = "An enhanced core prelude; a common foundation for alternate preludes";
597 license = stdenv.lib.licenses.mit;
549 license = stdenv.lib.licenses.mit;
598 }) {};
550 }) {};
599 "bifunctors" = callPackage
551 "bifunctors" = callPackage
600 ({ mkDerivation, base, base-orphans, comonad, containers, hspec
552 ({ mkDerivation, base, base-orphans, comonad, containers, hspec
601− , QuickCheck, semigroups, tagged, template-haskell, transformers
553+ , hspec-discover, QuickCheck, semigroups, tagged, template-haskell
602− , transformers-compat
554+ , th-abstraction, transformers, transformers-compat
603 }:
555 }:
604 mkDerivation {
556 mkDerivation {
605 pname = "bifunctors";
557 pname = "bifunctors";
606− version = "5.4.2";
558+ version = "5.5.3";
607− sha256 = "13fwvw1102ik96pgi85i34kisz1h237vgw88ywsgifsah9kh4qiq";
559+ sha256 = "1jn9rxg643xnlhrknmjz88nblcpsr45xwjkwwnn5nxpasa7m4d6l";
608 libraryHaskellDepends = [
560 libraryHaskellDepends = [
609 base base-orphans comonad containers semigroups tagged
561 base base-orphans comonad containers semigroups tagged
610− template-haskell transformers transformers-compat
562+ template-haskell th-abstraction transformers
611 ];
563 ];
612 testHaskellDepends = [
564 testHaskellDepends = [
613 base hspec QuickCheck template-haskell transformers
565 base hspec QuickCheck template-haskell transformers
614 transformers-compat
566 transformers-compat
615 ];
567 ];
616− doHaddock = false;
568+ testToolDepends = [ hspec-discover ];
617− doCheck = false;
618 homepage = "http://github.com/ekmett/bifunctors/";
569 homepage = "http://github.com/ekmett/bifunctors/";
619 description = "Bifunctors";
570 description = "Bifunctors";
620 license = stdenv.lib.licenses.bsd3;
571 license = stdenv.lib.licenses.bsd3;
@@ -623,11 +574,9 @@ self: {
623 ({ mkDerivation, base }:
574 ({ mkDerivation, base }:
624 mkDerivation {
575 mkDerivation {
625 pname = "bindings-DSL";
576 pname = "bindings-DSL";
626− version = "1.0.23";
577+ version = "1.0.25";
627− sha256 = "1rqhkk8hn1xjl3705dvakxx93q89vp0fw22v2cbrlapbir27cv7b";
578+ sha256 = "0kqrd78nspl3lk4a0fqn47d8dirjg3b24dkvkigcrlb81hw35pk3";
628 libraryHaskellDepends = [ base ];
579 libraryHaskellDepends = [ base ];
629− doHaddock = false;
630− doCheck = false;
631 homepage = "https://github.com/jwiegley/bindings-dsl/wiki";
580 homepage = "https://github.com/jwiegley/bindings-dsl/wiki";
632 description = "FFI domain specific language, on top of hsc2hs";
581 description = "FFI domain specific language, on top of hsc2hs";
633 license = stdenv.lib.licenses.bsd3;
582 license = stdenv.lib.licenses.bsd3;
@@ -639,62 +588,56 @@ self: {
639 }:
588 }:
640 mkDerivation {
589 mkDerivation {
641 pname = "blaze-builder";
590 pname = "blaze-builder";
642− version = "0.4.0.2";
591+ version = "0.4.1.0";
643− sha256 = "1m33y6p5xldni8p4fzg8fmsyqvkfmnimdamr1xjnsmgm3dkf9lws";
592+ sha256 = "05681dih2d8s96an945wkbwl05w8ddbcfx8n3r3ck79ydyb8pz4i";
644 libraryHaskellDepends = [ base bytestring deepseq text ];
593 libraryHaskellDepends = [ base bytestring deepseq text ];
645 testHaskellDepends = [
594 testHaskellDepends = [
646 base bytestring HUnit QuickCheck test-framework
595 base bytestring HUnit QuickCheck test-framework
647 test-framework-hunit test-framework-quickcheck2 text utf8-string
596 test-framework-hunit test-framework-quickcheck2 text utf8-string
648 ];
597 ];
649− doHaddock = false;
650− doCheck = false;
651 homepage = "http://github.com/lpsmith/blaze-builder";
598 homepage = "http://github.com/lpsmith/blaze-builder";
652 description = "Efficient buffered output";
599 description = "Efficient buffered output";
653 license = stdenv.lib.licenses.bsd3;
600 license = stdenv.lib.licenses.bsd3;
654 }) {};
601 }) {};
655 "blaze-html" = callPackage
602 "blaze-html" = callPackage
656 ({ mkDerivation, base, blaze-builder, blaze-markup, bytestring
603 ({ mkDerivation, base, blaze-builder, blaze-markup, bytestring
657− , containers, HUnit, QuickCheck, test-framework
604+ , text
658− , test-framework-hunit, test-framework-quickcheck2, text
659 }:
605 }:
660 mkDerivation {
606 mkDerivation {
661 pname = "blaze-html";
607 pname = "blaze-html";
662− version = "0.9.0.1";
608+ version = "0.9.1.1";
663− sha256 = "0r0acv47nh75bmf7kjyfvhcwz8f02rn9x0a1l80pzgyczfrsmkmf";
609+ sha256 = "06xv8fqhclfjj61z74cgggn4lmx1s7diakxg84mnkgfvk11983pa";
664 libraryHaskellDepends = [
610 libraryHaskellDepends = [
665 base blaze-builder blaze-markup bytestring text
611 base blaze-builder blaze-markup bytestring text
666 ];
612 ];
667− testHaskellDepends = [
668− base blaze-builder blaze-markup bytestring containers HUnit
669− QuickCheck test-framework test-framework-hunit
670− test-framework-quickcheck2 text
671− ];
672− doHaddock = false;
673 doCheck = false;
613 doCheck = false;
674 homepage = "http://jaspervdj.be/blaze";
614 homepage = "http://jaspervdj.be/blaze";
675 description = "A blazingly fast HTML combinator library for Haskell";
615 description = "A blazingly fast HTML combinator library for Haskell";
676 license = stdenv.lib.licenses.bsd3;
616 license = stdenv.lib.licenses.bsd3;
677 }) {};
617 }) {};
678 "blaze-markup" = callPackage
618 "blaze-markup" = callPackage
679− ({ mkDerivation, base, blaze-builder, bytestring, containers, HUnit
619+ ({ mkDerivation, base, blaze-builder, bytestring, text }:
680− , QuickCheck, test-framework, test-framework-hunit
681− , test-framework-quickcheck2, text
682− }:
683 mkDerivation {
620 mkDerivation {
684 pname = "blaze-markup";
621 pname = "blaze-markup";
685− version = "0.8.0.0";
622+ version = "0.8.2.1";
686− sha256 = "03sl7xs6vk4zxbjszgyjpsppi1cknswg7z7rswz2f0rq62wwpq8r";
623+ sha256 = "0ih1c3qahkdgzbqihdhny5s313l2m66fbb88w8jbx7yz56y7rawh";
687 libraryHaskellDepends = [ base blaze-builder bytestring text ];
624 libraryHaskellDepends = [ base blaze-builder bytestring text ];
688− testHaskellDepends = [
689− base blaze-builder bytestring containers HUnit QuickCheck
690− test-framework test-framework-hunit test-framework-quickcheck2 text
691− ];
692− doHaddock = false;
693 doCheck = false;
625 doCheck = false;
694 homepage = "http://jaspervdj.be/blaze";
626 homepage = "http://jaspervdj.be/blaze";
695 description = "A blazingly fast markup combinator library for Haskell";
627 description = "A blazingly fast markup combinator library for Haskell";
696 license = stdenv.lib.licenses.bsd3;
628 license = stdenv.lib.licenses.bsd3;
697 }) {};
629 }) {};
630+ "bsb-http-chunked" = callPackage
631+ ({ mkDerivation, base, bytestring, bytestring-builder }:
632+ mkDerivation {
633+ pname = "bsb-http-chunked";
634+ version = "0.0.0.2";
635+ sha256 = "1x6m6xkrcw6jiaig1bb2wb5pqyw31x8xr9k9pxgq2g3ng44pbjr8";
636+ libraryHaskellDepends = [ base bytestring bytestring-builder ];
637+ homepage = "http://github.com/sjakobi/bsb-http-chunked";
638+ description = "Chunked HTTP transfer encoding for bytestring builders";
639+ license = stdenv.lib.licenses.bsd3;
640+ }) {};
698 "byteable" = callPackage
641 "byteable" = callPackage
699 ({ mkDerivation, base, bytestring }:
642 ({ mkDerivation, base, bytestring }:
700 mkDerivation {
643 mkDerivation {
@@ -703,28 +646,10 @@ self: {
703 sha256 = "1qizg0kxxjqnd3cbrjhhidk5pbbciz0pb3z5kzikjjxnnnhk8fr4";
646 sha256 = "1qizg0kxxjqnd3cbrjhhidk5pbbciz0pb3z5kzikjjxnnnhk8fr4";
704 enableSeparateDataOutput = true;
647 enableSeparateDataOutput = true;
705 libraryHaskellDepends = [ base bytestring ];
648 libraryHaskellDepends = [ base bytestring ];
706− doHaddock = false;
707− doCheck = false;
708 homepage = "http://github.com/vincenthz/hs-byteable";
649 homepage = "http://github.com/vincenthz/hs-byteable";
709 description = "Type class for sequence of bytes";
650 description = "Type class for sequence of bytes";
710 license = stdenv.lib.licenses.bsd3;
651 license = stdenv.lib.licenses.bsd3;
711 }) {};
652 }) {};
712− "bytedump" = callPackage
713− ({ mkDerivation, base, bytestring }:
714− mkDerivation {
715− pname = "bytedump";
716− version = "1.0";
717− sha256 = "1pf01mna3isx3i7m50yz3pw5ygz5sg8i8pshjb3yw8q41w2ba5xf";
718− isLibrary = true;
719− isExecutable = true;
720− enableSeparateDataOutput = true;
721− libraryHaskellDepends = [ base bytestring ];
722− doHaddock = false;
723− doCheck = false;
724− homepage = "http://github.com/vincenthz/hs-bytedump";
725− description = "Flexible byte dump helpers for human readers";
726− license = stdenv.lib.licenses.bsd3;
727− }) {};
728 "byteorder" = callPackage
653 "byteorder" = callPackage
729 ({ mkDerivation, base }:
654 ({ mkDerivation, base }:
730 mkDerivation {
655 mkDerivation {
@@ -732,8 +657,6 @@ self: {
732 version = "1.0.4";
657 version = "1.0.4";
733 sha256 = "06995paxbxk8lldvarqpb3ygcjbg4v8dk4scib1rjzwlhssvn85x";
658 sha256 = "06995paxbxk8lldvarqpb3ygcjbg4v8dk4scib1rjzwlhssvn85x";
734 libraryHaskellDepends = [ base ];
659 libraryHaskellDepends = [ base ];
735− doHaddock = false;
736− doCheck = false;
737 homepage = "http://community.haskell.org/~aslatter/code/byteorder";
660 homepage = "http://community.haskell.org/~aslatter/code/byteorder";
738 description = "Exposes the native endianness or byte ordering of the system";
661 description = "Exposes the native endianness or byte ordering of the system";
739 license = stdenv.lib.licenses.bsd3;
662 license = stdenv.lib.licenses.bsd3;
@@ -746,59 +669,50 @@ self: {
746 sha256 = "1hnvjac28y44yn78c9vdp1zvrknvlw98ky3g4n5vivr16rvh8x3d";
669 sha256 = "1hnvjac28y44yn78c9vdp1zvrknvlw98ky3g4n5vivr16rvh8x3d";
747 libraryHaskellDepends = [ base bytestring deepseq ];
670 libraryHaskellDepends = [ base bytestring deepseq ];
748 doHaddock = false;
671 doHaddock = false;
749− doCheck = false;
750 description = "The new bytestring builder, packaged outside of GHC";
672 description = "The new bytestring builder, packaged outside of GHC";
751 license = stdenv.lib.licenses.bsd3;
673 license = stdenv.lib.licenses.bsd3;
752 }) {};
674 }) {};
753− "bytestring-handle" = callPackage
675+ "cabal-doctest" = callPackage
754− ({ mkDerivation, base, bytestring }:
676+ ({ mkDerivation, base, Cabal, directory, filepath }:
755 mkDerivation {
677 mkDerivation {
756− pname = "bytestring-handle";
678+ pname = "cabal-doctest";
757− version = "0.1.0.6";
679+ version = "1.0.6";
758− sha256 = "18f17aja1ivhr3zyg2cccn2m03hdn5jf5410dndkhf12gvgiqs7y";
680+ sha256 = "0bgd4jdmzxq5y465r4sf4jv2ix73yvblnr4c9wyazazafddamjny";
681+ revision = "1";
682+ editedCabalFile = "1bk85avgc93yvcggwbk01fy8nvg6753wgmaanhkry0hz55h7mpld";
759− libraryHaskellDepends = [ base bytestring ];
683+ libraryHaskellDepends = [ base Cabal directory filepath ];
760− doHaddock = false;
684+ homepage = "https://github.com/phadej/cabal-doctest";
761− doCheck = false;
685+ description = "A Setup.hs helper for doctests running";
762− homepage = "http://hub.darcs.net/ganesh/bytestring-handle";
763− description = "ByteString-backed Handles";
764 license = stdenv.lib.licenses.bsd3;
686 license = stdenv.lib.licenses.bsd3;
765 }) {};
687 }) {};
766 "cabal2nix" = callPackage
688 "cabal2nix" = callPackage
767 ({ mkDerivation, aeson, ansi-wl-pprint, base, bytestring, Cabal
689 ({ mkDerivation, aeson, ansi-wl-pprint, base, bytestring, Cabal
768− , cabal-doctest, containers, deepseq, directory
690+ , containers, deepseq, directory, distribution-nixpkgs, filepath
769− , distribution-nixpkgs, doctest, filepath, hackage-db, hopenssl
770− , language-nix, lens, monad-par, monad-par-extras, mtl
691+ , hackage-db, hopenssl, hpack, language-nix, lens, monad-par
771− , optparse-applicative, pretty, process, split, text, time
692+ , monad-par-extras, mtl, optparse-applicative, pretty, process
772− , transformers, utf8-string, yaml
693+ , split, tasty, tasty-golden, text, time, transformers, yaml
773 }:
694 }:
774 mkDerivation {
695 mkDerivation {
775 pname = "cabal2nix";
696 pname = "cabal2nix";
776− version = "2.3.1";
697+ version = "2.9.3";
777− sha256 = "0xi4mj8gyb2k9a43dp49wc84sbxpv9sfa8cmzfp0mkak0alwqahj";
698+ sha256 = "10l1k8rilf032v6pchwhxaq53mr0d08h6xkllidc3c7wfkzcx7qj";
778 isLibrary = true;
699 isLibrary = true;
779 isExecutable = true;
700 isExecutable = true;
780− setupHaskellDepends = [ base Cabal cabal-doctest ];
781 libraryHaskellDepends = [
701 libraryHaskellDepends = [
782 aeson ansi-wl-pprint base bytestring Cabal containers deepseq
702 aeson ansi-wl-pprint base bytestring Cabal containers deepseq
783− directory distribution-nixpkgs filepath hackage-db hopenssl
703+ directory distribution-nixpkgs filepath hackage-db hopenssl hpack
784 language-nix lens optparse-applicative pretty process split text
704 language-nix lens optparse-applicative pretty process split text
785− transformers yaml
705+ time transformers yaml
786 ];
706 ];
787 executableHaskellDepends = [
707 executableHaskellDepends = [
788− aeson ansi-wl-pprint base bytestring Cabal containers deepseq
708+ aeson base bytestring Cabal containers directory
789− directory distribution-nixpkgs filepath hackage-db hopenssl
709+ distribution-nixpkgs filepath hopenssl language-nix lens monad-par
790− language-nix lens monad-par monad-par-extras mtl
791− optparse-applicative pretty process split text time transformers
710+ monad-par-extras mtl optparse-applicative pretty
792− utf8-string yaml
793 ];
711 ];
794 testHaskellDepends = [
712 testHaskellDepends = [
795− aeson ansi-wl-pprint base bytestring Cabal containers deepseq
713+ base Cabal containers directory filepath language-nix lens pretty
796− directory distribution-nixpkgs doctest filepath hackage-db hopenssl
714+ process tasty tasty-golden
797− language-nix lens optparse-applicative pretty process split text
798− transformers yaml
799 ];
715 ];
800− doHaddock = false;
801− doCheck = false;
802 homepage = "https://github.com/nixos/cabal2nix#readme";
716 homepage = "https://github.com/nixos/cabal2nix#readme";
803 description = "Convert Cabal files into Nix build instructions";
717 description = "Convert Cabal files into Nix build instructions";
804 license = stdenv.lib.licenses.bsd3;
718 license = stdenv.lib.licenses.bsd3;
@@ -811,33 +725,54 @@ self: {
811 sha256 = "1qmihf5jafmc79sk52l6gpx75f5bnla2lp62kh3p34x3j84mwpzj";
725 sha256 = "1qmihf5jafmc79sk52l6gpx75f5bnla2lp62kh3p34x3j84mwpzj";
812 libraryHaskellDepends = [ base ];
726 libraryHaskellDepends = [ base ];
813 testHaskellDepends = [ base nanospec ];
727 testHaskellDepends = [ base nanospec ];
814− doHaddock = false;
815− doCheck = false;
816 homepage = "https://github.com/sol/call-stack#readme";
728 homepage = "https://github.com/sol/call-stack#readme";
817 description = "Use GHC call-stacks in a backward compatible way";
729 description = "Use GHC call-stacks in a backward compatible way";
818 license = stdenv.lib.licenses.mit;
730 license = stdenv.lib.licenses.mit;
819 }) {};
731 }) {};
820 "case-insensitive" = callPackage
732 "case-insensitive" = callPackage
821− ({ mkDerivation, base, bytestring, deepseq, hashable, text }:
733+ ({ mkDerivation, base, bytestring, criterion, deepseq, hashable
734+ , HUnit, test-framework, test-framework-hunit, text
735+ }:
822 mkDerivation {
736 mkDerivation {
823 pname = "case-insensitive";
737 pname = "case-insensitive";
824− version = "1.2.0.10";
738+ version = "1.2.0.11";
825− sha256 = "0v1hclvv0516fnlj5j2izd9xmakl7dshi9cb32iz6dgvzx01qck6";
739+ sha256 = "1qrpxfirsxckg7jv28f5ah2qc8lh95hp7rnqkbqs1ahcwlbnvkm7";
826 libraryHaskellDepends = [ base bytestring deepseq hashable text ];
740 libraryHaskellDepends = [ base bytestring deepseq hashable text ];
827− doHaddock = false;
741+ testHaskellDepends = [
828− doCheck = false;
742+ base bytestring HUnit test-framework test-framework-hunit text
743+ ];
744+ benchmarkHaskellDepends = [ base bytestring criterion deepseq ];
829 homepage = "https://github.com/basvandijk/case-insensitive";
745 homepage = "https://github.com/basvandijk/case-insensitive";
830 description = "Case insensitive string comparison";
746 description = "Case insensitive string comparison";
831 license = stdenv.lib.licenses.bsd3;
747 license = stdenv.lib.licenses.bsd3;
832 }) {};
748 }) {};
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+ }) {};
833 "cereal" = callPackage
768 "cereal" = callPackage
834 ({ mkDerivation, array, base, bytestring, containers, ghc-prim
769 ({ mkDerivation, array, base, bytestring, containers, ghc-prim
835 , QuickCheck, test-framework, test-framework-quickcheck2
770 , QuickCheck, test-framework, test-framework-quickcheck2
836 }:
771 }:
837 mkDerivation {
772 mkDerivation {
838 pname = "cereal";
773 pname = "cereal";
839− version = "0.5.4.0";
774+ version = "0.5.5.0";
840− sha256 = "1rzyr8r9pjlgas5pc8n776r22i0ficanq05ypqrs477jxxd6rjns";
775+ sha256 = "08k8y6nf3n8h8gzw4a44mssy7rhgpmfj28lhczjz4vgszc7k55qb";
841 libraryHaskellDepends = [
776 libraryHaskellDepends = [
842 array base bytestring containers ghc-prim
777 array base bytestring containers ghc-prim
843 ];
778 ];
@@ -845,8 +780,6 @@ self: {
845 base bytestring QuickCheck test-framework
780 base bytestring QuickCheck test-framework
846 test-framework-quickcheck2
781 test-framework-quickcheck2
847 ];
782 ];
848− doHaddock = false;
849− doCheck = false;
850 homepage = "https://github.com/GaloisInc/cereal";
783 homepage = "https://github.com/GaloisInc/cereal";
851 description = "A binary serialization library";
784 description = "A binary serialization library";
852 license = stdenv.lib.licenses.bsd3;
785 license = stdenv.lib.licenses.bsd3;
@@ -857,106 +790,77 @@ self: {
857 }:
790 }:
858 mkDerivation {
791 mkDerivation {
859 pname = "cereal-conduit";
792 pname = "cereal-conduit";
860− version = "0.7.3";
793+ version = "0.8.0";
861− sha256 = "18h09j16m4yc4fcp80x7m1p2c87q6f628z36y8bnxbcjc9m95gq5";
794+ sha256 = "1srr7agvgfw78q5s1npjq5sgynvhjgllpihiv37ylkwqm4c4ap6r";
795+ revision = "1";
796+ editedCabalFile = "1imyl3g2bni8bc6kajr857xh94fscphksj3286pxfpa8yp9vqqpc";
862 libraryHaskellDepends = [
797 libraryHaskellDepends = [
863 base bytestring cereal conduit resourcet transformers
798 base bytestring cereal conduit resourcet transformers
864 ];
799 ];
865 testHaskellDepends = [
800 testHaskellDepends = [
866− base bytestring cereal conduit HUnit mtl resourcet transformers
801+ base bytestring cereal conduit HUnit mtl transformers
867 ];
802 ];
868− doHaddock = false;
869− doCheck = false;
870 homepage = "https://github.com/snoyberg/conduit";
803 homepage = "https://github.com/snoyberg/conduit";
871 description = "Turn Data.Serialize Gets and Puts into Sources, Sinks, and Conduits";
804 description = "Turn Data.Serialize Gets and Puts into Sources, Sinks, and Conduits";
872 license = stdenv.lib.licenses.bsd3;
805 license = stdenv.lib.licenses.bsd3;
873 }) {};
806 }) {};
874− "chell" = callPackage
875− ({ mkDerivation, ansi-terminal, base, bytestring, options, patience
876− , random, template-haskell, text, transformers
877− }:
878− mkDerivation {
879− pname = "chell";
880− version = "0.4.0.1";
881− sha256 = "0lb95abzxl4a87nfqxsxpb3a39pd52cci43hcvj8615hyhqvs2jz";
882− libraryHaskellDepends = [
883− ansi-terminal base bytestring options patience random
884− template-haskell text transformers
885− ];
886− doHaddock = false;
887− doCheck = false;
888− homepage = "https://john-millikin.com/software/chell/";
889− description = "A simple and intuitive library for automated testing";
890− license = stdenv.lib.licenses.mit;
891− }) {};
892 "chunked-data" = callPackage
807 "chunked-data" = callPackage
893 ({ mkDerivation, base, bytestring, containers, semigroups, text
808 ({ mkDerivation, base, bytestring, containers, semigroups, text
894 , transformers, vector
809 , transformers, vector
895 }:
810 }:
896 mkDerivation {
811 mkDerivation {
897 pname = "chunked-data";
812 pname = "chunked-data";
898− version = "0.3.0";
813+ version = "0.3.1";
899− sha256 = "0bszq6fijnr4pmadzz89smj7kfmzx0ca3wd9ga8gv0in9jk9vgp1";
814+ sha256 = "16m7y7fwrirbjbqqcsfmr4yxa9qvfax6r7pw0zl9ky71ms0wa47p";
900 libraryHaskellDepends = [
815 libraryHaskellDepends = [
901 base bytestring containers semigroups text transformers vector
816 base bytestring containers semigroups text transformers vector
902 ];
817 ];
903− doHaddock = false;
904− doCheck = false;
905− homepage = "https://github.com/snoyberg/mono-traversable";
818+ homepage = "https://github.com/snoyberg/mono-traversable#readme";
906 description = "Typeclasses for dealing with various chunked data representations";
819 description = "Typeclasses for dealing with various chunked data representations";
907 license = stdenv.lib.licenses.mit;
820 license = stdenv.lib.licenses.mit;
908 }) {};
821 }) {};
909 "classy-prelude" = callPackage
822 "classy-prelude" = callPackage
910 ({ mkDerivation, async, base, basic-prelude, bifunctors, bytestring
823 ({ mkDerivation, async, base, basic-prelude, bifunctors, bytestring
911− , chunked-data, containers, deepseq, dlist, exceptions, ghc-prim
824+ , chunked-data, containers, deepseq, dlist, ghc-prim, hashable
912− , hashable, hspec, lifted-async, lifted-base, monad-unlift
913− , mono-traversable, mono-traversable-instances, mtl
825+ , hspec, mono-traversable, mono-traversable-instances, mtl
914− , mutable-containers, primitive, QuickCheck, safe-exceptions, say
826+ , mutable-containers, primitive, QuickCheck, say, semigroups, stm
915− , semigroups, stm, stm-chans, text, time, time-locale-compat
827+ , stm-chans, text, time, transformers, unliftio
916− , transformers, transformers-base, unordered-containers, vector
917− , vector-instances
828+ , unordered-containers, vector, vector-instances
918 }:
829 }:
919 mkDerivation {
830 mkDerivation {
920 pname = "classy-prelude";
831 pname = "classy-prelude";
921− version = "1.2.0.1";
832+ version = "1.4.0";
922− sha256 = "0d7s3z4vbp2pq696m0yc1ccd51d3qvz7f50ya7xijfx7771y0zm4";
833+ sha256 = "1q7r4lnrxjsh7rj5nr0cs22ddp9m6maa7bzbkarxw3xbfrb2afrb";
923 libraryHaskellDepends = [
834 libraryHaskellDepends = [
924 async base basic-prelude bifunctors bytestring chunked-data
835 async base basic-prelude bifunctors bytestring chunked-data
925− containers deepseq dlist exceptions ghc-prim hashable lifted-async
836+ containers deepseq dlist ghc-prim hashable mono-traversable
926− lifted-base monad-unlift mono-traversable
927− mono-traversable-instances mtl mutable-containers primitive
837+ mono-traversable-instances mtl mutable-containers primitive say
928− safe-exceptions say semigroups stm stm-chans text time
838+ semigroups stm stm-chans text time transformers unliftio
929− time-locale-compat transformers transformers-base
930 unordered-containers vector vector-instances
839 unordered-containers vector vector-instances
931 ];
840 ];
932 testHaskellDepends = [
841 testHaskellDepends = [
933 base containers hspec QuickCheck transformers unordered-containers
842 base containers hspec QuickCheck transformers unordered-containers
934 ];
843 ];
935− doHaddock = false;
936− doCheck = false;
937− homepage = "https://github.com/snoyberg/mono-traversable";
844+ homepage = "https://github.com/snoyberg/mono-traversable#readme";
938 description = "A typeclass-based Prelude";
845 description = "A typeclass-based Prelude";
939 license = stdenv.lib.licenses.mit;
846 license = stdenv.lib.licenses.mit;
940 }) {};
847 }) {};
941 "classy-prelude-conduit" = callPackage
848 "classy-prelude-conduit" = callPackage
942− ({ mkDerivation, base, bytestring, classy-prelude, conduit
849+ ({ mkDerivation, base, bytestring, classy-prelude, conduit, hspec
943− , conduit-combinators, hspec, monad-control, QuickCheck, resourcet
850+ , monad-control, QuickCheck, resourcet, transformers, void
944− , transformers, void
945 }:
851 }:
946 mkDerivation {
852 mkDerivation {
947 pname = "classy-prelude-conduit";
853 pname = "classy-prelude-conduit";
948− version = "1.2.0";
854+ version = "1.4.0";
949− sha256 = "0zzc6095205qf58qnnagfnb90svlc0m4hw2q79kd4x6d8b80s294";
855+ sha256 = "096466cyyxxmg3jpq705xjjc4r7v9b607hgbys8vybjlldkjbvrr";
950 libraryHaskellDepends = [
856 libraryHaskellDepends = [
951− base bytestring classy-prelude conduit conduit-combinators
857+ base bytestring classy-prelude conduit monad-control resourcet
952− monad-control resourcet transformers void
858+ transformers void
953 ];
859 ];
954 testHaskellDepends = [
860 testHaskellDepends = [
955 base bytestring conduit hspec QuickCheck transformers
861 base bytestring conduit hspec QuickCheck transformers
956 ];
862 ];
957− doHaddock = false;
958− doCheck = false;
959− homepage = "https://github.com/snoyberg/mono-traversable";
863+ homepage = "https://github.com/snoyberg/mono-traversable#readme";
960 description = "classy-prelude together with conduit functions";
864 description = "classy-prelude together with conduit functions";
961 license = stdenv.lib.licenses.mit;
865 license = stdenv.lib.licenses.mit;
962 }) {};
866 }) {};
@@ -968,8 +872,6 @@ self: {
968 sha256 = "07v91s20halsqjmziqb1sqjp2sjpckl9by7y28aaklwqi2bh2rl8";
872 sha256 = "07v91s20halsqjmziqb1sqjp2sjpckl9by7y28aaklwqi2bh2rl8";
969 libraryHaskellDepends = [ base ];
873 libraryHaskellDepends = [ base ];
970 testHaskellDepends = [ base tasty tasty-quickcheck ];
874 testHaskellDepends = [ base tasty tasty-quickcheck ];
971− doHaddock = false;
972− doCheck = false;
973 homepage = "https://github.com/corsis/clock";
875 homepage = "https://github.com/corsis/clock";
974 description = "High-resolution clock functions: monotonic, realtime, cputime";
876 description = "High-resolution clock functions: monotonic, realtime, cputime";
975 license = stdenv.lib.licenses.bsd3;
877 license = stdenv.lib.licenses.bsd3;
@@ -980,18 +882,13 @@ self: {
980 }:
882 }:
981 mkDerivation {
883 mkDerivation {
982 pname = "cmdargs";
884 pname = "cmdargs";
983− version = "0.10.18";
885+ version = "0.10.20";
984− sha256 = "1lnmcsf6p9yrwwz1zvrw5lbc32xpff7b70yz4ylawaflnlz6wrlh";
886+ sha256 = "0cbkmgrcnwgigg6z88y3c09gm7g6dwm7gzbgr53h8k1xik29s9hf";
985 isLibrary = true;
887 isLibrary = true;
986 isExecutable = true;
888 isExecutable = true;
987 libraryHaskellDepends = [
889 libraryHaskellDepends = [
988 base filepath process template-haskell transformers
890 base filepath process template-haskell transformers
989 ];
891 ];
990− executableHaskellDepends = [
991− base filepath process template-haskell transformers
992− ];
993− doHaddock = false;
994− doCheck = false;
995 homepage = "https://github.com/ndmitchell/cmdargs#readme";
892 homepage = "https://github.com/ndmitchell/cmdargs#readme";
996 description = "Command line argument processing";
893 description = "Command line argument processing";
997 license = stdenv.lib.licenses.bsd3;
894 license = stdenv.lib.licenses.bsd3;
@@ -1004,12 +901,23 @@ self: {
1004 sha256 = "1491frk4jx6dlhifky9dvcxbsbcfssrz979a5hp5zn061rh8cp76";
901 sha256 = "1491frk4jx6dlhifky9dvcxbsbcfssrz979a5hp5zn061rh8cp76";
1005 libraryHaskellDepends = [ base ];
902 libraryHaskellDepends = [ base ];
1006 testHaskellDepends = [ base ];
903 testHaskellDepends = [ base ];
1007− doHaddock = false;
1008− doCheck = false;
1009 homepage = "https://github.com/RyanGlScott/code-page";
904 homepage = "https://github.com/RyanGlScott/code-page";
1010 description = "Windows code page library for Haskell";
905 description = "Windows code page library for Haskell";
1011 license = stdenv.lib.licenses.bsd3;
906 license = stdenv.lib.licenses.bsd3;
1012 }) {};
907 }) {};
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+ }) {};
1013 "comonad" = callPackage
921 "comonad" = callPackage
1014 ({ mkDerivation, base, Cabal, cabal-doctest, containers
922 ({ mkDerivation, base, Cabal, cabal-doctest, containers
1015 , contravariant, distributive, doctest, semigroups, tagged
923 , contravariant, distributive, doctest, semigroups, tagged
@@ -1017,97 +925,97 @@ self: {
1017 }:
925 }:
1018 mkDerivation {
926 mkDerivation {
1019 pname = "comonad";
927 pname = "comonad";
1020− version = "5.0.2";
928+ version = "5.0.4";
1021− sha256 = "115pai560rllsmym76bj787kwz5xx19y8bl6262005nddqwzxc0v";
929+ sha256 = "09g870c4flp4k3fgbibsd0mmfjani1qcpbcl685v8x89kxzrva3q";
1022− revision = "1";
1023− editedCabalFile = "1lnsnx8p3wlfhd1xfc68za3b00vq77z2m6b0vqiw2laqmpj9akcw";
1024 setupHaskellDepends = [ base Cabal cabal-doctest ];
930 setupHaskellDepends = [ base Cabal cabal-doctest ];
1025 libraryHaskellDepends = [
931 libraryHaskellDepends = [
1026 base containers contravariant distributive semigroups tagged
932 base containers contravariant distributive semigroups tagged
1027 transformers transformers-compat
933 transformers transformers-compat
1028 ];
934 ];
1029 testHaskellDepends = [ base doctest ];
935 testHaskellDepends = [ base doctest ];
1030− doHaddock = false;
1031− doCheck = false;
1032 homepage = "http://github.com/ekmett/comonad/";
936 homepage = "http://github.com/ekmett/comonad/";
1033 description = "Comonads";
937 description = "Comonads";
1034 license = stdenv.lib.licenses.bsd3;
938 license = stdenv.lib.licenses.bsd3;
1035 }) {};
939 }) {};
1036− "conduit" = callPackage
940+ "concurrent-output" = callPackage
1037− ({ mkDerivation, base, containers, exceptions, hspec, lifted-base
941+ ({ mkDerivation, ansi-terminal, async, base, directory, exceptions
1038− , mmorph, monad-control, mtl, primitive, QuickCheck, resourcet
942+ , process, stm, terminal-size, text, transformers, unix
1039− , safe, split, transformers, transformers-base, transformers-compat
1040 }:
943 }:
1041 mkDerivation {
944 mkDerivation {
1042− pname = "conduit";
945+ pname = "concurrent-output";
1043− version = "1.2.12.1";
946+ version = "1.10.6";
1044− sha256 = "0zl6gflh7y36y2vypjhqx13nhkk5y3h12c1zj7kjfclrmwnvnwh0";
947+ sha256 = "1qlp1vij4qgcrkw8ym5xdc0pgfwklbhsfh56sgayy3cvpvcac093";
1045 libraryHaskellDepends = [
948 libraryHaskellDepends = [
1046− base exceptions lifted-base mmorph monad-control mtl primitive
949+ ansi-terminal async base directory exceptions process stm
1047− resourcet transformers transformers-base transformers-compat
1048− ];
1049− testHaskellDepends = [
1050− base containers exceptions hspec mtl QuickCheck resourcet safe
1051− split transformers
950+ terminal-size text transformers unix
1052 ];
951 ];
1053− doHaddock = false;
952+ description = "Ungarble output from several threads or commands";
1054− doCheck = false;
1055− homepage = "http://github.com/snoyberg/conduit";
1056− description = "Streaming data processing library";
1057− license = stdenv.lib.licenses.mit;
953+ license = stdenv.lib.licenses.bsd2;
1058 }) {};
954 }) {};
1059− "conduit-combinators" = callPackage
955+ "conduit" = callPackage
1060− ({ mkDerivation, base, base16-bytestring, base64-bytestring
956+ ({ mkDerivation, base, bytestring, containers, deepseq, directory
1061− , bytestring, chunked-data, conduit, conduit-extra, containers
957+ , exceptions, filepath, gauge, hspec, kan-extensions
1062− , directory, filepath, hspec, monad-control, mono-traversable, mtl
1063− , mwc-random, primitive, QuickCheck, resourcet, safe, silently
958+ , mono-traversable, mtl, mwc-random, primitive, QuickCheck
1064− , text, transformers, transformers-base, unix, unix-compat, vector
959+ , resourcet, safe, silently, split, text, transformers, unix
1065− , void
960+ , unliftio, unliftio-core, vector
1066 }:
961 }:
1067 mkDerivation {
962 mkDerivation {
1068− pname = "conduit-combinators";
963+ pname = "conduit";
1069− version = "1.1.1";
964+ version = "1.3.0.3";
1070− sha256 = "0609miq03lq9visfb2dqqsxghmvgzm24pq39mqby1jnnah6yh8m0";
965+ sha256 = "1sangm0qqi9dzlq95746a3kl14k8b09592a423shxjf2a0b1yx5v";
1071 libraryHaskellDepends = [
966 libraryHaskellDepends = [
1072− base base16-bytestring base64-bytestring bytestring chunked-data
1073− conduit conduit-extra filepath monad-control mono-traversable
967+ base bytestring directory exceptions filepath mono-traversable mtl
1074− mwc-random primitive resourcet text transformers transformers-base
968+ primitive resourcet text transformers unix unliftio-core vector
1075− unix unix-compat vector void
1076 ];
969 ];
1077 testHaskellDepends = [
970 testHaskellDepends = [
1078− base base16-bytestring base64-bytestring bytestring chunked-data
1079− conduit containers directory filepath hspec mono-traversable mtl
971+ base bytestring containers directory exceptions filepath hspec
972+ mono-traversable mtl QuickCheck resourcet safe silently split text
973+ transformers unliftio vector
974+ ];
975+ benchmarkHaskellDepends = [
976+ base containers deepseq gauge hspec kan-extensions mwc-random
1080− mwc-random QuickCheck safe silently text transformers vector
977+ transformers vector
1081 ];
978 ];
979+ homepage = "http://github.com/snoyberg/conduit";
980+ description = "Streaming data processing library";
981+ license = stdenv.lib.licenses.mit;
982+ }) {};
983+ "conduit-combinators" = callPackage
984+ ({ mkDerivation, base }:
985+ mkDerivation {
986+ pname = "conduit-combinators";
987+ version = "1.3.0";
988+ sha256 = "1lz70vwp4y4lpsivxl0cshq7aq3968rh48r6rjvpyaj2l0bdj5wp";
989+ libraryHaskellDepends = [ base ];
1082 doHaddock = false;
990 doHaddock = false;
1083− doCheck = false;
1084− homepage = "https://github.com/snoyberg/mono-traversable";
991+ homepage = "https://github.com/snoyberg/mono-traversable#readme";
1085− description = "Commonly used conduit functions, for both chunked and unchunked data";
992+ description = "DEPRECATED Functionality merged into the conduit package itself";
1086 license = stdenv.lib.licenses.mit;
993 license = stdenv.lib.licenses.mit;
1087 }) {};
994 }) {};
1088 "conduit-extra" = callPackage
995 "conduit-extra" = callPackage
1089− ({ mkDerivation, async, attoparsec, base, blaze-builder, bytestring
996+ ({ mkDerivation, async, attoparsec, base, bytestring
1090 , bytestring-builder, conduit, directory, exceptions, filepath
997 , bytestring-builder, conduit, directory, exceptions, filepath
1091− , hspec, monad-control, network, primitive, process, QuickCheck
998+ , gauge, hspec, network, primitive, process, QuickCheck, resourcet
1092− , resourcet, stm, streaming-commons, text, transformers
999+ , stm, streaming-commons, text, transformers, transformers-base
1093− , transformers-base
1000+ , typed-process, unliftio-core
1094 }:
1001 }:
1095 mkDerivation {
1002 mkDerivation {
1096 pname = "conduit-extra";
1003 pname = "conduit-extra";
1097− version = "1.1.17";
1004+ version = "1.3.0";
1098− sha256 = "01haq94kf4jsqrhs6j2kkvxrw4iqhvhnd9rcrqpkdbp1dil493kn";
1005+ sha256 = "1bi2b6kdzy5f9glq46jzsk02has95jkxqz0cchpbmnakzhjwjh9c";
1099 libraryHaskellDepends = [
1006 libraryHaskellDepends = [
1100− async attoparsec base blaze-builder bytestring conduit directory
1007+ async attoparsec base bytestring conduit directory filepath network
1101− exceptions filepath monad-control network primitive process
1102− resourcet stm streaming-commons text transformers transformers-base
1008+ primitive process resourcet stm streaming-commons text transformers
1009+ typed-process unliftio-core
1103 ];
1010 ];
1104 testHaskellDepends = [
1011 testHaskellDepends = [
1105− async attoparsec base blaze-builder bytestring bytestring-builder
1012+ async attoparsec base bytestring bytestring-builder conduit
1106− conduit directory exceptions hspec process QuickCheck resourcet stm
1013+ directory exceptions hspec process QuickCheck resourcet stm
1107 streaming-commons text transformers transformers-base
1014 streaming-commons text transformers transformers-base
1108 ];
1015 ];
1109− doHaddock = false;
1016+ benchmarkHaskellDepends = [
1110− doCheck = false;
1017+ base bytestring bytestring-builder conduit gauge transformers
1018+ ];
1111 homepage = "http://github.com/snoyberg/conduit";
1019 homepage = "http://github.com/snoyberg/conduit";
1112 description = "Batteries included conduit: adapters for common libraries";
1020 description = "Batteries included conduit: adapters for common libraries";
1113 license = stdenv.lib.licenses.mit;
1021 license = stdenv.lib.licenses.mit;
@@ -1125,66 +1033,61 @@ self: {
1125 base byteable bytestring containers data-default-class network
1033 base byteable bytestring containers data-default-class network
1126 socks tls x509 x509-store x509-system x509-validation
1034 socks tls x509 x509-store x509-system x509-validation
1127 ];
1035 ];
1128− doHaddock = false;
1129− doCheck = false;
1130 homepage = "http://github.com/vincenthz/hs-connection";
1036 homepage = "http://github.com/vincenthz/hs-connection";
1131 description = "Simple and easy network connections API";
1037 description = "Simple and easy network connections API";
1132 license = stdenv.lib.licenses.bsd3;
1038 license = stdenv.lib.licenses.bsd3;
1133 }) {};
1039 }) {};
1134 "constraints" = callPackage
1040 "constraints" = callPackage
1135− ({ mkDerivation, base, binary, deepseq, ghc-prim, hashable, mtl
1041+ ({ mkDerivation, base, binary, deepseq, ghc-prim, hashable, hspec
1042+ , hspec-discover, mtl, semigroups, transformers
1136− , transformers, transformers-compat
1043+ , transformers-compat
1137 }:
1044 }:
1138 mkDerivation {
1045 mkDerivation {
1139 pname = "constraints";
1046 pname = "constraints";
1140− version = "0.9.1";
1047+ version = "0.10.1";
1141− sha256 = "11d76051i2a335bvack04dqvsz4zhgcms1jxlvy4a4c670l02vi7";
1048+ sha256 = "1xy3vv78jxc17hm0z7qqspxjwv7l2jbcbj670yrl2f053qkfr02q";
1142 libraryHaskellDepends = [
1049 libraryHaskellDepends = [
1143− base binary deepseq ghc-prim hashable mtl transformers
1050+ base binary deepseq ghc-prim hashable mtl semigroups transformers
1144 transformers-compat
1051 transformers-compat
1145 ];
1052 ];
1146− doHaddock = false;
1053+ testHaskellDepends = [ base hspec ];
1147− doCheck = false;
1054+ testToolDepends = [ hspec-discover ];
1148 homepage = "http://github.com/ekmett/constraints/";
1055 homepage = "http://github.com/ekmett/constraints/";
1149 description = "Constraint manipulation";
1056 description = "Constraint manipulation";
1150 license = stdenv.lib.licenses.bsd2;
1057 license = stdenv.lib.licenses.bsd2;
1151 }) {};
1058 }) {};
1152 "contravariant" = callPackage
1059 "contravariant" = callPackage
1153− ({ mkDerivation, base, semigroups, StateVar, transformers
1060+ ({ mkDerivation, base, StateVar, transformers, transformers-compat
1154− , transformers-compat, void
1155 }:
1061 }:
1156 mkDerivation {
1062 mkDerivation {
1157 pname = "contravariant";
1063 pname = "contravariant";
1158− version = "1.4";
1064+ version = "1.4.1";
1159− sha256 = "117fff8kkrvlmr8cb2jpj71z7lf2pdiyks6ilyx89mry6zqnsrp1";
1065+ sha256 = "1vfhk8c5cxmmakx7rflap1ipkx5q0j5vnlrcz7yz6y53kxhksgf9";
1066+ revision = "1";
1067+ editedCabalFile = "0qj5nymccrb9p0cd6hffsy90jidjng14g9yv95z8v6h4q84sbzvx";
1160 libraryHaskellDepends = [
1068 libraryHaskellDepends = [
1161− base semigroups StateVar transformers transformers-compat void
1069+ base StateVar transformers transformers-compat
1162 ];
1070 ];
1163− doHaddock = false;
1164− doCheck = false;
1165 homepage = "http://github.com/ekmett/contravariant/";
1071 homepage = "http://github.com/ekmett/contravariant/";
1166 description = "Contravariant functors";
1072 description = "Contravariant functors";
1167 license = stdenv.lib.licenses.bsd3;
1073 license = stdenv.lib.licenses.bsd3;
1168 }) {};
1074 }) {};
1169 "cookie" = callPackage
1075 "cookie" = callPackage
1170− ({ mkDerivation, base, blaze-builder, bytestring
1076+ ({ mkDerivation, base, bytestring, data-default-class, deepseq
1171− , data-default-class, deepseq, HUnit, old-locale, QuickCheck, tasty
1172− , tasty-hunit, tasty-quickcheck, text, time
1077+ , HUnit, QuickCheck, tasty, tasty-hunit, tasty-quickcheck, text
1078+ , time
1173 }:
1079 }:
1174 mkDerivation {
1080 mkDerivation {
1175 pname = "cookie";
1081 pname = "cookie";
1176− version = "0.4.3";
1082+ version = "0.4.4";
1177− sha256 = "0qpdydhb9gw590ffabqg70x7xvjpg8l74idqnrfbhv5yrr7hryzv";
1083+ sha256 = "1qy09i0jh2z9i9avy2khf8a8afq4fqgnv0fyrszgfg4kmq2fsi9j";
1178 libraryHaskellDepends = [
1084 libraryHaskellDepends = [
1179− base blaze-builder bytestring data-default-class deepseq old-locale
1085+ base bytestring data-default-class deepseq text time
1180− text time
1181 ];
1086 ];
1182 testHaskellDepends = [
1087 testHaskellDepends = [
1183− base blaze-builder bytestring HUnit QuickCheck tasty tasty-hunit
1088+ base bytestring HUnit QuickCheck tasty tasty-hunit tasty-quickcheck
1184− tasty-quickcheck text time
1089+ text time
1185 ];
1090 ];
1186− doHaddock = false;
1187− doCheck = false;
1188 homepage = "http://github.com/snoyberg/cookie";
1091 homepage = "http://github.com/snoyberg/cookie";
1189 description = "HTTP cookie parsing and rendering";
1092 description = "HTTP cookie parsing and rendering";
1190 license = stdenv.lib.licenses.mit;
1093 license = stdenv.lib.licenses.mit;
@@ -1204,15 +1107,99 @@ self: {
1204 executableHaskellDepends = [
1107 executableHaskellDepends = [
1205 base directory old-locale old-time polyparse
1108 base directory old-locale old-time polyparse
1206 ];
1109 ];
1207− doHaddock = false;
1208− doCheck = false;
1209 homepage = "http://projects.haskell.org/cpphs/";
1110 homepage = "http://projects.haskell.org/cpphs/";
1210 description = "A liberalised re-implementation of cpp, the C pre-processor";
1111 description = "A liberalised re-implementation of cpp, the C pre-processor";
1211 license = "LGPL";
1112 license = "LGPL";
1212 }) {};
1113 }) {};
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+ }) {};
1213 "cryptohash" = callPackage
1199 "cryptohash" = callPackage
1214− ({ mkDerivation, base, byteable, bytestring, cryptonite, ghc-prim
1200+ ({ mkDerivation, base, byteable, bytestring, criterion, cryptonite
1215− , HUnit, memory, QuickCheck, tasty, tasty-hunit, tasty-quickcheck
1201+ , ghc-prim, HUnit, memory, QuickCheck, tasty, tasty-hunit
1202+ , tasty-quickcheck
1216 }:
1203 }:
1217 mkDerivation {
1204 mkDerivation {
1218 pname = "cryptohash";
1205 pname = "cryptohash";
@@ -1225,49 +1212,54 @@ self: {
1225 base byteable bytestring HUnit QuickCheck tasty tasty-hunit
1212 base byteable bytestring HUnit QuickCheck tasty tasty-hunit
1226 tasty-quickcheck
1213 tasty-quickcheck
1227 ];
1214 ];
1228− doHaddock = false;
1215+ benchmarkHaskellDepends = [ base byteable bytestring criterion ];
1229− doCheck = false;
1230 homepage = "http://github.com/vincenthz/hs-cryptohash";
1216 homepage = "http://github.com/vincenthz/hs-cryptohash";
1231 description = "collection of crypto hashes, fast, pure and practical";
1217 description = "collection of crypto hashes, fast, pure and practical";
1232 license = stdenv.lib.licenses.bsd3;
1218 license = stdenv.lib.licenses.bsd3;
1233 }) {};
1219 }) {};
1234− "cryptohash-conduit" = callPackage
1220+ "cryptonite" = callPackage
1235− ({ mkDerivation, base, bytestring, conduit, conduit-extra
1221+ ({ mkDerivation, base, basement, bytestring, deepseq, gauge
1236− , cryptohash, resourcet, transformers
1222+ , ghc-prim, integer-gmp, memory, random, tasty, tasty-hunit
1223+ , tasty-kat, tasty-quickcheck
1237 }:
1224 }:
1238 mkDerivation {
1225 mkDerivation {
1239− pname = "cryptohash-conduit";
1226+ pname = "cryptonite";
1240− version = "0.1.1";
1227+ version = "0.25";
1241− sha256 = "1kmlskgb0jx8hkzdncr24aqir9k1kyfcb2rypvkdld1yin4nslga";
1228+ sha256 = "131wbbdr5yavs5k1ah9sz6fqx1ffyvaxf66pwjzsfc47mwc1mgl9";
1242 libraryHaskellDepends = [
1229 libraryHaskellDepends = [
1243− base bytestring conduit conduit-extra cryptohash resourcet
1230+ base basement bytestring deepseq ghc-prim integer-gmp memory
1244− transformers
1245 ];
1231 ];
1246− doHaddock = false;
1232+ testHaskellDepends = [
1247− doCheck = false;
1233+ base bytestring memory tasty tasty-hunit tasty-kat tasty-quickcheck
1248− homepage = "http://github.com/vincenthz/hs-cryptohash-conduit";
1234+ ];
1249− description = "cryptohash conduit";
1235+ benchmarkHaskellDepends = [
1236+ base bytestring deepseq gauge memory random
1237+ ];
1238+ homepage = "https://github.com/haskell-crypto/cryptonite";
1239+ description = "Cryptography Primitives sink";
1250 license = stdenv.lib.licenses.bsd3;
1240 license = stdenv.lib.licenses.bsd3;
1251 }) {};
1241 }) {};
1252− "cryptonite" = callPackage
1242+ "cryptonite-conduit" = callPackage
1253− ({ mkDerivation, base, bytestring, deepseq, foundation, ghc-prim
1243+ ({ mkDerivation, base, bytestring, conduit, conduit-combinators
1254− , integer-gmp, memory, tasty, tasty-hunit, tasty-kat
1244+ , conduit-extra, cryptonite, exceptions, memory, resourcet, tasty
1255− , tasty-quickcheck
1245+ , tasty-hunit, tasty-quickcheck, transformers
1256 }:
1246 }:
1257 mkDerivation {
1247 mkDerivation {
1258− pname = "cryptonite";
1248+ pname = "cryptonite-conduit";
1259− version = "0.23";
1249+ version = "0.2.2";
1260− sha256 = "1680dxgmnjgj083jhsw3rlljwaw0zqi5099m59x6kwqkxhn1qjpf";
1250+ sha256 = "1bldcmda4xh52mw1wfrjljv8crhw3al7v7kv1j0vidvr7ymnjpbh";
1251+ revision = "1";
1252+ editedCabalFile = "1hh2nzfz4qpxgivfilgk4ll416lph8b2fdkzpzrmqfjglivydfmz";
1261 libraryHaskellDepends = [
1253 libraryHaskellDepends = [
1262− base bytestring deepseq foundation ghc-prim integer-gmp memory
1254+ base bytestring conduit conduit-extra cryptonite exceptions memory
1255+ resourcet transformers
1263 ];
1256 ];
1264 testHaskellDepends = [
1257 testHaskellDepends = [
1258+ base bytestring conduit conduit-combinators cryptonite memory tasty
1265− base bytestring memory tasty tasty-hunit tasty-kat tasty-quickcheck
1259+ tasty-hunit tasty-quickcheck
1266 ];
1260 ];
1267− doHaddock = false;
1268− doCheck = false;
1269− homepage = "https://github.com/haskell-crypto/cryptonite";
1261+ homepage = "https://github.com/haskell-crypto/cryptonite-conduit";
1270− description = "Cryptography Primitives sink";
1262+ description = "cryptonite conduit";
1271 license = stdenv.lib.licenses.bsd3;
1263 license = stdenv.lib.licenses.bsd3;
1272 }) {};
1264 }) {};
1273 "data-default" = callPackage
1265 "data-default" = callPackage
@@ -1283,8 +1275,6 @@ self: {
1283 base data-default-class data-default-instances-containers
1275 base data-default-class data-default-instances-containers
1284 data-default-instances-dlist data-default-instances-old-locale
1276 data-default-instances-dlist data-default-instances-old-locale
1285 ];
1277 ];
1286− doHaddock = false;
1287− doCheck = false;
1288 description = "A class for types with a default value";
1278 description = "A class for types with a default value";
1289 license = stdenv.lib.licenses.bsd3;
1279 license = stdenv.lib.licenses.bsd3;
1290 }) {};
1280 }) {};
@@ -1295,8 +1285,6 @@ self: {
1295 version = "0.1.2.0";
1285 version = "0.1.2.0";
1296 sha256 = "0miyjz8d4jyvqf2vp60lyfbnflx6cj2k8apmm9ly1hq0y0iv80ag";
1286 sha256 = "0miyjz8d4jyvqf2vp60lyfbnflx6cj2k8apmm9ly1hq0y0iv80ag";
1297 libraryHaskellDepends = [ base ];
1287 libraryHaskellDepends = [ base ];
1298− doHaddock = false;
1299− doCheck = false;
1300 description = "A class for types with a default value";
1288 description = "A class for types with a default value";
1301 license = stdenv.lib.licenses.bsd3;
1289 license = stdenv.lib.licenses.bsd3;
1302 }) {};
1290 }) {};
@@ -1307,8 +1295,6 @@ self: {
1307 version = "0.0.1";
1295 version = "0.0.1";
1308 sha256 = "06h8xka031w752a7cjlzghvr8adqbl95xj9z5zc1b62w02phfpm5";
1296 sha256 = "06h8xka031w752a7cjlzghvr8adqbl95xj9z5zc1b62w02phfpm5";
1309 libraryHaskellDepends = [ base containers data-default-class ];
1297 libraryHaskellDepends = [ base containers data-default-class ];
1310− doHaddock = false;
1311− doCheck = false;
1312 description = "Default instances for types in containers";
1298 description = "Default instances for types in containers";
1313 license = stdenv.lib.licenses.bsd3;
1299 license = stdenv.lib.licenses.bsd3;
1314 }) {};
1300 }) {};
@@ -1319,8 +1305,6 @@ self: {
1319 version = "0.0.1";
1305 version = "0.0.1";
1320 sha256 = "0narkdqiprhgayjiawrr4390h4rq4pl2pb6mvixbv2phrc8kfs3x";
1306 sha256 = "0narkdqiprhgayjiawrr4390h4rq4pl2pb6mvixbv2phrc8kfs3x";
1321 libraryHaskellDepends = [ base data-default-class dlist ];
1307 libraryHaskellDepends = [ base data-default-class dlist ];
1322− doHaddock = false;
1323− doCheck = false;
1324 description = "Default instances for types in dlist";
1308 description = "Default instances for types in dlist";
1325 license = stdenv.lib.licenses.bsd3;
1309 license = stdenv.lib.licenses.bsd3;
1326 }) {};
1310 }) {};
@@ -1331,27 +1315,32 @@ self: {
1331 version = "0.0.1";
1315 version = "0.0.1";
1332 sha256 = "00h81i5phib741yj517p8mbnc48myvfj8axzsw44k34m48lv1lv0";
1316 sha256 = "00h81i5phib741yj517p8mbnc48myvfj8axzsw44k34m48lv1lv0";
1333 libraryHaskellDepends = [ base data-default-class old-locale ];
1317 libraryHaskellDepends = [ base data-default-class old-locale ];
1334− doHaddock = false;
1335− doCheck = false;
1336 description = "Default instances for types in old-locale";
1318 description = "Default instances for types in old-locale";
1337 license = stdenv.lib.licenses.bsd3;
1319 license = stdenv.lib.licenses.bsd3;
1338 }) {};
1320 }) {};
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+ }) {};
1339 "distribution-nixpkgs" = callPackage
1331 "distribution-nixpkgs" = callPackage
1340 ({ mkDerivation, aeson, base, bytestring, Cabal, containers
1332 ({ mkDerivation, aeson, base, bytestring, Cabal, containers
1341− , deepseq, doctest, hspec, language-nix, lens, pretty, process
1333+ , deepseq, hspec, language-nix, lens, pretty, process, split
1342− , split
1343 }:
1334 }:
1344 mkDerivation {
1335 mkDerivation {
1345 pname = "distribution-nixpkgs";
1336 pname = "distribution-nixpkgs";
1346− version = "1.1";
1337+ version = "1.1.1";
1347− sha256 = "15m881mrhpqg1xjdjz65ym8pajp1nijrcvb6dx3vv55430cjw1qx";
1338+ sha256 = "1694crd3l9cyc0c5xvqmx62154519g2cnpzc5qmlypwrk258bssm";
1348 libraryHaskellDepends = [
1339 libraryHaskellDepends = [
1349 aeson base bytestring Cabal containers deepseq language-nix lens
1340 aeson base bytestring Cabal containers deepseq language-nix lens
1350 pretty process split
1341 pretty process split
1351 ];
1342 ];
1352− testHaskellDepends = [ base deepseq doctest hspec lens ];
1343+ testHaskellDepends = [ base deepseq hspec lens ];
1353− doHaddock = false;
1354− doCheck = false;
1355 homepage = "https://github.com/peti/distribution-nixpkgs#readme";
1344 homepage = "https://github.com/peti/distribution-nixpkgs#readme";
1356 description = "Types and functions to manipulate the Nixpkgs distribution";
1345 description = "Types and functions to manipulate the Nixpkgs distribution";
1357 license = stdenv.lib.licenses.bsd3;
1346 license = stdenv.lib.licenses.bsd3;
@@ -1365,28 +1354,25 @@ self: {
1365 pname = "distributive";
1354 pname = "distributive";
1366 version = "0.5.3";
1355 version = "0.5.3";
1367 sha256 = "0y566r97sfyvhsmd4yxiz4ns2mqgwf5bdbp56wgxl6wlkidq0wwi";
1356 sha256 = "0y566r97sfyvhsmd4yxiz4ns2mqgwf5bdbp56wgxl6wlkidq0wwi";
1368− revision = "1";
1357+ revision = "6";
1369− editedCabalFile = "0hsq03i0qa0jvw7kaaqic40zvfkzhkd25dgvbdg6hjzylf1k1gax";
1358+ editedCabalFile = "06bd38rf31yrvvy989r44pm0id3dsxwcp6nxg7wk6ccj3n2b8rzk";
1370 setupHaskellDepends = [ base Cabal cabal-doctest ];
1359 setupHaskellDepends = [ base Cabal cabal-doctest ];
1371 libraryHaskellDepends = [
1360 libraryHaskellDepends = [
1372 base base-orphans tagged transformers transformers-compat
1361 base base-orphans tagged transformers transformers-compat
1373 ];
1362 ];
1374 testHaskellDepends = [ base doctest generic-deriving hspec ];
1363 testHaskellDepends = [ base doctest generic-deriving hspec ];
1375− doHaddock = false;
1376− doCheck = false;
1377 homepage = "http://github.com/ekmett/distributive/";
1364 homepage = "http://github.com/ekmett/distributive/";
1378 description = "Distributive functors -- Dual to Traversable";
1365 description = "Distributive functors -- Dual to Traversable";
1379 license = stdenv.lib.licenses.bsd3;
1366 license = stdenv.lib.licenses.bsd3;
1380 }) {};
1367 }) {};
1381 "dlist" = callPackage
1368 "dlist" = callPackage
1382− ({ mkDerivation, base, deepseq }:
1369+ ({ mkDerivation, base, Cabal, deepseq, QuickCheck }:
1383 mkDerivation {
1370 mkDerivation {
1384 pname = "dlist";
1371 pname = "dlist";
1385− version = "0.8.0.3";
1372+ version = "0.8.0.4";
1386− sha256 = "0brgai4vs7xz29p06kd6gzg5bpa8iy3k7yzgcc44izspd74q4rw7";
1373+ sha256 = "0yirrh0s6acjy9hhvf5fqg2d6q5y6gm9xs04v6w1imndh1xqdwdc";
1387 libraryHaskellDepends = [ base deepseq ];
1374 libraryHaskellDepends = [ base deepseq ];
1388− doHaddock = false;
1375+ testHaskellDepends = [ base Cabal QuickCheck ];
1389− doCheck = false;
1390 homepage = "https://github.com/spl/dlist";
1376 homepage = "https://github.com/spl/dlist";
1391 description = "Difference lists";
1377 description = "Difference lists";
1392 license = stdenv.lib.licenses.bsd3;
1378 license = stdenv.lib.licenses.bsd3;
@@ -1398,8 +1384,6 @@ self: {
1398 version = "0.1.1.1";
1384 version = "0.1.1.1";
1399 sha256 = "0nsgrr25r4qxv2kpn7i20hra8jjkyllxfrhh5hml3ysjdz010jni";
1385 sha256 = "0nsgrr25r4qxv2kpn7i20hra8jjkyllxfrhh5hml3ysjdz010jni";
1400 libraryHaskellDepends = [ base dlist semigroups ];
1386 libraryHaskellDepends = [ base dlist semigroups ];
1401− doHaddock = false;
1402− doCheck = false;
1403 homepage = "https://github.com/gregwebs/dlist-instances";
1387 homepage = "https://github.com/gregwebs/dlist-instances";
1404 description = "Difference lists instances";
1388 description = "Difference lists instances";
1405 license = stdenv.lib.licenses.bsd3;
1389 license = stdenv.lib.licenses.bsd3;
@@ -1412,21 +1396,23 @@ self: {
1412 }:
1396 }:
1413 mkDerivation {
1397 mkDerivation {
1414 pname = "doctest";
1398 pname = "doctest";
1415− version = "0.11.4";
1399+ version = "0.16.0";
1416− sha256 = "09a170wr13p2c0w085d7qbf2blrvj1qmg92j61xqi17rwdwkvyjs";
1400+ sha256 = "0hkccch65s3kp0b36h7bqhilnpi4bx8kngncm7ma9vbd3dwacjdv";
1417 isLibrary = true;
1401 isLibrary = true;
1418 isExecutable = true;
1402 isExecutable = true;
1419 libraryHaskellDepends = [
1403 libraryHaskellDepends = [
1420 base base-compat code-page deepseq directory filepath ghc ghc-paths
1404 base base-compat code-page deepseq directory filepath ghc ghc-paths
1421 process syb transformers
1405 process syb transformers
1422 ];
1406 ];
1423− executableHaskellDepends = [ base ];
1407+ executableHaskellDepends = [
1408+ base base-compat code-page deepseq directory filepath ghc ghc-paths
1409+ process syb transformers
1410+ ];
1424 testHaskellDepends = [
1411 testHaskellDepends = [
1425 base base-compat code-page deepseq directory filepath ghc ghc-paths
1412 base base-compat code-page deepseq directory filepath ghc ghc-paths
1426 hspec HUnit mockery process QuickCheck setenv silently
1413 hspec HUnit mockery process QuickCheck setenv silently
1427 stringbuilder syb transformers with-location
1414 stringbuilder syb transformers with-location
1428 ];
1415 ];
1429− doHaddock = false;
1430 doCheck = false;
1416 doCheck = false;
1431 homepage = "https://github.com/sol/doctest#readme";
1417 homepage = "https://github.com/sol/doctest#readme";
1432 description = "Test interactive Haskell examples";
1418 description = "Test interactive Haskell examples";
@@ -1436,35 +1422,25 @@ self: {
1436 ({ mkDerivation, base, directory, filepath, time, unix }:
1422 ({ mkDerivation, base, directory, filepath, time, unix }:
1437 mkDerivation {
1423 mkDerivation {
1438 pname = "easy-file";
1424 pname = "easy-file";
1439− version = "0.2.1";
1425+ version = "0.2.2";
1440− sha256 = "0v75081bx4qzlqy29hh639nzlr7dncwza3qxbzm9njc4jarf31pz";
1426+ sha256 = "0zmlcz723051qpn8l8vi51c5rx1blwrw4094jcshkmj8p9r2xxaj";
1441 libraryHaskellDepends = [ base directory filepath time unix ];
1427 libraryHaskellDepends = [ base directory filepath time unix ];
1442− doHaddock = false;
1443− doCheck = false;
1444 homepage = "http://github.com/kazu-yamamoto/easy-file";
1428 homepage = "http://github.com/kazu-yamamoto/easy-file";
1445 description = "Cross-platform File handling";
1429 description = "Cross-platform File handling";
1446 license = stdenv.lib.licenses.bsd3;
1430 license = stdenv.lib.licenses.bsd3;
1447 }) {};
1431 }) {};
1448− "either" = callPackage
1432+ "entropy" = callPackage
1449− ({ mkDerivation, base, bifunctors, exceptions, free, mmorph
1433+ ({ mkDerivation, base, bytestring, Cabal, directory, filepath
1450− , monad-control, MonadRandom, mtl, profunctors, semigroupoids
1434+ , process, unix
1451− , semigroups, transformers, transformers-base
1452 }:
1435 }:
1453 mkDerivation {
1436 mkDerivation {
1454− pname = "either";
1437+ pname = "entropy";
1455− version = "4.4.1.1";
1438+ version = "0.4.1.1";
1456− sha256 = "1lrlwqqnm6ibfcydlv5qvvssw7bm0c6yypy0rayjzv1znq7wp1xh";
1439+ sha256 = "1ahz5g148l6sax3dy505na2513i99c7bxix68jja5kbx4f271zcf";
1457− revision = "2";
1440+ setupHaskellDepends = [ base Cabal directory filepath process ];
1458− editedCabalFile = "1n7792mcrvfh31qrbj8mpnx372s03kz83mypj7l4fm5h6zi4a3hs";
1459− libraryHaskellDepends = [
1441+ libraryHaskellDepends = [ base bytestring unix ];
1460− base bifunctors exceptions free mmorph monad-control MonadRandom
1461− mtl profunctors semigroupoids semigroups transformers
1462− transformers-base
1463− ];
1464− doHaddock = false;
1465− doCheck = false;
1466− homepage = "http://github.com/ekmett/either/";
1442+ homepage = "https://github.com/TomMD/entropy";
1467− description = "An either monad transformer";
1443+ description = "A platform independent entropy source";
1468 license = stdenv.lib.licenses.bsd3;
1444 license = stdenv.lib.licenses.bsd3;
1469 }) {};
1445 }) {};
1470 "erf" = callPackage
1446 "erf" = callPackage
@@ -1474,31 +1450,28 @@ self: {
1474 version = "2.0.0.0";
1450 version = "2.0.0.0";
1475 sha256 = "0dxk2r32ajmmc05vaxcp0yw6vgv4lkbmh8jcshncn98xgsfbgw14";
1451 sha256 = "0dxk2r32ajmmc05vaxcp0yw6vgv4lkbmh8jcshncn98xgsfbgw14";
1476 libraryHaskellDepends = [ base ];
1452 libraryHaskellDepends = [ base ];
1477− doHaddock = false;
1478− doCheck = false;
1479 description = "The error function, erf, and related functions";
1453 description = "The error function, erf, and related functions";
1480 license = stdenv.lib.licenses.bsd3;
1454 license = stdenv.lib.licenses.bsd3;
1481 }) {};
1455 }) {};
1482 "exceptions" = callPackage
1456 "exceptions" = callPackage
1483 ({ mkDerivation, base, mtl, QuickCheck, stm, template-haskell
1457 ({ mkDerivation, base, mtl, QuickCheck, stm, template-haskell
1484− , test-framework, test-framework-quickcheck2, transformers
1458+ , test-framework, test-framework-hunit, test-framework-quickcheck2
1485− , transformers-compat
1459+ , transformers, transformers-compat
1486 }:
1460 }:
1487 mkDerivation {
1461 mkDerivation {
1488 pname = "exceptions";
1462 pname = "exceptions";
1489− version = "0.8.3";
1463+ version = "0.10.0";
1490− sha256 = "1gl7xzffsqmigam6zg0jsglncgzxqafld2p6kb7ccp9xirzdjsjd";
1464+ sha256 = "1ms9zansv0pwzwdjncvx4kf18lnkjy2p61hvjhvxmjx5bqp93p8y";
1491− revision = "2";
1465+ revision = "1";
1492− editedCabalFile = "1vl59j0l7m53hkzlcfmdbqbab8dk4lp9gzwryn7nsr6ylg94wayw";
1466+ editedCabalFile = "1ydvmhi9bj7b1md3wd4l2z2lccgyjgv3ha8milmy2l4lad9xh6xy";
1493 libraryHaskellDepends = [
1467 libraryHaskellDepends = [
1494 base mtl stm template-haskell transformers transformers-compat
1468 base mtl stm template-haskell transformers transformers-compat
1495 ];
1469 ];
1496 testHaskellDepends = [
1470 testHaskellDepends = [
1497 base mtl QuickCheck stm template-haskell test-framework
1471 base mtl QuickCheck stm template-haskell test-framework
1498− test-framework-quickcheck2 transformers transformers-compat
1472+ test-framework-hunit test-framework-quickcheck2 transformers
1473+ transformers-compat
1499 ];
1474 ];
1500− doHaddock = false;
1501− doCheck = false;
1502 homepage = "http://github.com/ekmett/exceptions/";
1475 homepage = "http://github.com/ekmett/exceptions/";
1503 description = "Extensible optionally-pure exceptions";
1476 description = "Extensible optionally-pure exceptions";
1504 license = stdenv.lib.licenses.bsd3;
1477 license = stdenv.lib.licenses.bsd3;
@@ -1510,114 +1483,111 @@ self: {
1510 version = "0.1.1.4";
1483 version = "0.1.1.4";
1511 sha256 = "1273nqws9ij1rp1bsq5jc7k2jxpqa0svawdbim05lf302y0firbc";
1484 sha256 = "1273nqws9ij1rp1bsq5jc7k2jxpqa0svawdbim05lf302y0firbc";
1512 libraryHaskellDepends = [ base ];
1485 libraryHaskellDepends = [ base ];
1513− doHaddock = false;
1514− doCheck = false;
1515 description = "Extensible exceptions";
1486 description = "Extensible exceptions";
1516 license = stdenv.lib.licenses.bsd3;
1487 license = stdenv.lib.licenses.bsd3;
1517 }) {};
1488 }) {};
1518− "fail" = callPackage
1519− ({ mkDerivation }:
1520− mkDerivation {
1521− pname = "fail";
1522− version = "4.9.0.0";
1523− sha256 = "18nlj6xvnggy61gwbyrpmvbdkq928wv0wx2zcsljb52kbhddnp3d";
1524− doHaddock = false;
1525− doCheck = false;
1526− homepage = "https://prime.haskell.org/wiki/Libraries/Proposals/MonadFail";
1527− description = "Forward-compatible MonadFail class";
1528− license = stdenv.lib.licenses.bsd3;
1529− }) {};
1530 "fast-logger" = callPackage
1489 "fast-logger" = callPackage
1531 ({ mkDerivation, array, auto-update, base, bytestring, directory
1490 ({ mkDerivation, array, auto-update, base, bytestring, directory
1532 , easy-file, filepath, hspec, text, unix, unix-time
1491 , easy-file, filepath, hspec, text, unix, unix-time
1533 }:
1492 }:
1534 mkDerivation {
1493 mkDerivation {
1535 pname = "fast-logger";
1494 pname = "fast-logger";
1536− version = "2.4.10";
1495+ version = "2.4.11";
1537− sha256 = "13b7rrv8dw574k6lbl96nar67fx81058gvilsc42v0lgm38sbi6y";
1496+ sha256 = "1ad2vq4nifdxshqk9yrmghqizhkgybfz134kpr6padglb2mxxrdv";
1538 libraryHaskellDepends = [
1497 libraryHaskellDepends = [
1539 array auto-update base bytestring directory easy-file filepath text
1498 array auto-update base bytestring directory easy-file filepath text
1540 unix unix-time
1499 unix unix-time
1541 ];
1500 ];
1542 testHaskellDepends = [ base bytestring directory hspec ];
1501 testHaskellDepends = [ base bytestring directory hspec ];
1543− doHaddock = false;
1544− doCheck = false;
1545 homepage = "https://github.com/kazu-yamamoto/logger";
1502 homepage = "https://github.com/kazu-yamamoto/logger";
1546 description = "A fast logging system";
1503 description = "A fast logging system";
1547 license = stdenv.lib.licenses.bsd3;
1504 license = stdenv.lib.licenses.bsd3;
1548 }) {};
1505 }) {};
1549 "foldl" = callPackage
1506 "foldl" = callPackage
1550 ({ mkDerivation, base, bytestring, comonad, containers
1507 ({ mkDerivation, base, bytestring, comonad, containers
1551− , contravariant, hashable, mwc-random, primitive, profunctors, text
1508+ , contravariant, criterion, hashable, mwc-random, primitive
1509+ , profunctors, semigroupoids, semigroups, text, transformers
1552− , transformers, unordered-containers, vector
1510+ , unordered-containers, vector, vector-builder
1553 }:
1511 }:
1554 mkDerivation {
1512 mkDerivation {
1555 pname = "foldl";
1513 pname = "foldl";
1556− version = "1.2.5";
1514+ version = "1.4.2";
1557− sha256 = "0jzc00dqwkr3kvy40f8f9klh24s8zvhfk2flrlyichc6zcy5qbda";
1515+ sha256 = "14ccc2spv63v7vipfrmk8jbbw2x1dkkxsyzqzcpnkzjw0yg4ghc9";
1558− revision = "1";
1559− editedCabalFile = "02lk5838594mi15bylz2kpcm1c4akbsswj73i7k8xw4ns66iaq04";
1560 libraryHaskellDepends = [
1516 libraryHaskellDepends = [
1561 base bytestring comonad containers contravariant hashable
1517 base bytestring comonad containers contravariant hashable
1562− mwc-random primitive profunctors text transformers
1518+ mwc-random primitive profunctors semigroupoids semigroups text
1563− unordered-containers vector
1519+ transformers unordered-containers vector vector-builder
1564 ];
1520 ];
1565− doHaddock = false;
1521+ benchmarkHaskellDepends = [ base criterion ];
1566− doCheck = false;
1567 description = "Composable, streaming, and efficient left folds";
1522 description = "Composable, streaming, and efficient left folds";
1568 license = stdenv.lib.licenses.bsd3;
1523 license = stdenv.lib.licenses.bsd3;
1569 }) {};
1524 }) {};
1570 "foundation" = callPackage
1525 "foundation" = callPackage
1571− ({ mkDerivation, base, basement, ghc-prim }:
1526+ ({ mkDerivation, base, basement, gauge, ghc-prim }:
1572 mkDerivation {
1527 mkDerivation {
1573 pname = "foundation";
1528 pname = "foundation";
1574− version = "0.0.17";
1529+ version = "0.0.21";
1575− sha256 = "00f2p47h715fjb3rpsxlf4jskgwk9sz5p692r09gspspqmrs5l84";
1530+ sha256 = "1q43y8wfj0wf9gdq2kzphwjwq6m5pvryy1lqgk954aq5z3ks1lsf";
1576− revision = "1";
1577− editedCabalFile = "15y38y0mj4vc694jwh3cjgnq8xv5vv7954g633f7mw5f0hb3yxkn";
1578 libraryHaskellDepends = [ base basement ghc-prim ];
1531 libraryHaskellDepends = [ base basement ghc-prim ];
1579 testHaskellDepends = [ base basement ];
1532 testHaskellDepends = [ base basement ];
1580− doHaddock = false;
1533+ benchmarkHaskellDepends = [ base basement gauge ];
1581− doCheck = false;
1582 homepage = "https://github.com/haskell-foundation/foundation";
1534 homepage = "https://github.com/haskell-foundation/foundation";
1583 description = "Alternative prelude with batteries and no dependencies";
1535 description = "Alternative prelude with batteries and no dependencies";
1584 license = stdenv.lib.licenses.bsd3;
1536 license = stdenv.lib.licenses.bsd3;
1585 }) {};
1537 }) {};
1586 "free" = callPackage
1538 "free" = callPackage
1587 ({ mkDerivation, base, bifunctors, comonad, containers
1539 ({ mkDerivation, base, bifunctors, comonad, containers
1588− , distributive, exceptions, mtl, prelude-extras, profunctors
1540+ , distributive, exceptions, mtl, profunctors, semigroupoids
1589− , semigroupoids, semigroups, template-haskell, transformers
1541+ , semigroups, template-haskell, transformers, transformers-base
1590 , transformers-compat
1542 , transformers-compat
1591 }:
1543 }:
1592 mkDerivation {
1544 mkDerivation {
1593 pname = "free";
1545 pname = "free";
1594− version = "4.12.4";
1546+ version = "5.0.2";
1595− sha256 = "1147s393442xf4gkpbq0rd1p286vmykgx85mxhk5d1c7wfm4bzn9";
1547+ sha256 = "15m3n9vhz7z3kzv1w3wlfa3x8jp4cbrkwmrcjr7jlx39iqffn1gg";
1596 libraryHaskellDepends = [
1548 libraryHaskellDepends = [
1597 base bifunctors comonad containers distributive exceptions mtl
1549 base bifunctors comonad containers distributive exceptions mtl
1598− prelude-extras profunctors semigroupoids semigroups
1550+ profunctors semigroupoids semigroups template-haskell transformers
1599− template-haskell transformers transformers-compat
1551+ transformers-base transformers-compat
1600 ];
1552 ];
1601− doHaddock = false;
1602− doCheck = false;
1603 homepage = "http://github.com/ekmett/free/";
1553 homepage = "http://github.com/ekmett/free/";
1604 description = "Monads for free";
1554 description = "Monads for free";
1605 license = stdenv.lib.licenses.bsd3;
1555 license = stdenv.lib.licenses.bsd3;
1606 }) {};
1556 }) {};
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+ }) {};
1607 "generic-deriving" = callPackage
1576 "generic-deriving" = callPackage
1608− ({ mkDerivation, base, containers, ghc-prim, hspec
1577+ ({ mkDerivation, base, containers, ghc-prim, hspec, hspec-discover
1609− , template-haskell
1578+ , template-haskell, th-abstraction
1610 }:
1579 }:
1611 mkDerivation {
1580 mkDerivation {
1612 pname = "generic-deriving";
1581 pname = "generic-deriving";
1613− version = "1.11.2";
1582+ version = "1.12.2";
1614− sha256 = "1y92q4dmbyc24hjjvq02474s9grwabxffn16y31gzaqhm0m0z5i9";
1583+ sha256 = "1i7d6cpj9yhaqb79zays3nqchhaacacjz9bkc0zlwj73y5gvi22n";
1584+ revision = "1";
1585+ editedCabalFile = "0gr20ypr6s0183wmrhmia0zvpbn4dmfyr3wksrkrqj4i8nhj42fz";
1615 libraryHaskellDepends = [
1586 libraryHaskellDepends = [
1616− base containers ghc-prim template-haskell
1587+ base containers ghc-prim template-haskell th-abstraction
1617 ];
1588 ];
1618 testHaskellDepends = [ base hspec template-haskell ];
1589 testHaskellDepends = [ base hspec template-haskell ];
1619− doHaddock = false;
1590+ testToolDepends = [ hspec-discover ];
1620− doCheck = false;
1621 homepage = "https://github.com/dreixel/generic-deriving";
1591 homepage = "https://github.com/dreixel/generic-deriving";
1622 description = "Generic programming library for generalised deriving";
1592 description = "Generic programming library for generalised deriving";
1623 license = stdenv.lib.licenses.bsd3;
1593 license = stdenv.lib.licenses.bsd3;
@@ -1628,111 +1598,13 @@ self: {
1628 pname = "ghc-paths";
1598 pname = "ghc-paths";
1629 version = "0.1.0.9";
1599 version = "0.1.0.9";
1630 sha256 = "0ibrr1dxa35xx20cpp8jzgfak1rdmy344dfwq4vlq013c6w8z9mg";
1600 sha256 = "0ibrr1dxa35xx20cpp8jzgfak1rdmy344dfwq4vlq013c6w8z9mg";
1631− revision = "2";
1601+ revision = "3";
1632− editedCabalFile = "1gs6biqbcabgmrwhc1bq1bdaxdwwh26v4mpvj5c7cfyigc64gwyk";
1602+ editedCabalFile = "1gx47xbm3qviqccnbsibzkfnlzljvls33jh1ry4l506yvfnf4j10";
1633 setupHaskellDepends = [ base Cabal directory ];
1603 setupHaskellDepends = [ base Cabal directory ];
1634 libraryHaskellDepends = [ base ];
1604 libraryHaskellDepends = [ base ];
1635− doHaddock = false;
1636− doCheck = false;
1637 description = "Knowledge of GHC's installation directories";
1605 description = "Knowledge of GHC's installation directories";
1638 license = stdenv.lib.licenses.bsd3;
1606 license = stdenv.lib.licenses.bsd3;
1639 }) {};
1607 }) {};
1640− "git" = callPackage
1641− ({ mkDerivation, base, byteable, bytedump, bytestring, containers
1642− , cryptonite, hourglass, memory, mtl, patience, random
1643− , system-fileio, system-filepath, tasty, tasty-quickcheck
1644− , unix-compat, utf8-string, vector, zlib, zlib-bindings
1645− }:
1646− mkDerivation {
1647− pname = "git";
1648− version = "0.2.0";
1649− sha256 = "1a4frn53qs31s6rqldw91zmc0i0gr33zm10y9ailqasbsgyxqwyp";
1650− enableSeparateDataOutput = true;
1651− libraryHaskellDepends = [
1652− base byteable bytestring containers cryptonite hourglass memory mtl
1653− patience random system-fileio system-filepath unix-compat
1654− utf8-string vector zlib zlib-bindings
1655− ];
1656− testHaskellDepends = [
1657− base bytedump bytestring hourglass tasty tasty-quickcheck
1658− ];
1659− doHaddock = false;
1660− doCheck = false;
1661− homepage = "https://github.com/vincenthz/hs-git";
1662− description = "Git operations in haskell";
1663− license = stdenv.lib.licenses.bsd3;
1664− }) {};
1665− "gitlib" = callPackage
1666− ({ mkDerivation, base, base16-bytestring, bytestring, conduit
1667− , conduit-combinators, containers, directory, exceptions, filepath
1668− , hashable, lifted-async, lifted-base, monad-control, mtl
1669− , resourcet, semigroups, tagged, text, time, transformers, unix
1670− , unordered-containers
1671− }:
1672− mkDerivation {
1673− pname = "gitlib";
1674− version = "3.1.1";
1675− sha256 = "1vwmyfmqlly351jq9pgjhcfhnxvrhzkd4lfq7qpsa37vca5pas6x";
1676− libraryHaskellDepends = [
1677− base base16-bytestring bytestring conduit conduit-combinators
1678− containers directory exceptions filepath hashable lifted-async
1679− lifted-base monad-control mtl resourcet semigroups tagged text time
1680− transformers unix unordered-containers
1681− ];
1682− doHaddock = false;
1683− doCheck = false;
1684− description = "API library for working with Git repositories";
1685− license = stdenv.lib.licenses.mit;
1686− }) {};
1687− "gitlib-libgit2" = callPackage
1688− ({ mkDerivation, base, bytestring, conduit, conduit-combinators
1689− , containers, directory, exceptions, fast-logger, filepath, gitlib
1690− , gitlib-test, hlibgit2, hspec, hspec-expectations, HUnit
1691− , lifted-async, lifted-base, mmorph, monad-control, monad-loops
1692− , mtl, resourcet, stm, stm-conduit, tagged, template-haskell, text
1693− , text-icu, time, transformers, transformers-base
1694− }:
1695− mkDerivation {
1696− pname = "gitlib-libgit2";
1697− version = "3.1.1";
1698− sha256 = "1fv8r2w0fd9m7chrccmf5kw0pr2v0k2r2l0d782galdvq7mhca7w";
1699− revision = "1";
1700− editedCabalFile = "0v510c4sd6zwwf6mbc6gfv5sin91ckw4v6c844wrfksi9gdq3shm";
1701− libraryHaskellDepends = [
1702− base bytestring conduit conduit-combinators containers directory
1703− exceptions fast-logger filepath gitlib hlibgit2 lifted-async
1704− lifted-base mmorph monad-control monad-loops mtl resourcet stm
1705− stm-conduit tagged template-haskell text text-icu time transformers
1706− transformers-base
1707− ];
1708− testHaskellDepends = [
1709− base exceptions gitlib gitlib-test hspec hspec-expectations HUnit
1710− transformers
1711− ];
1712− doHaddock = false;
1713− doCheck = false;
1714− description = "Libgit2 backend for gitlib";
1715− license = stdenv.lib.licenses.mit;
1716− }) {};
1717− "gitlib-test" = callPackage
1718− ({ mkDerivation, base, bytestring, conduit, conduit-combinators
1719− , exceptions, gitlib, hspec, hspec-expectations, HUnit
1720− , monad-control, tagged, text, time, transformers
1721− }:
1722− mkDerivation {
1723− pname = "gitlib-test";
1724− version = "3.1.0.3";
1725− sha256 = "07r970d6m15gri6xim71kl2vvml85jlb0vc51zb67gfsd6iby2py";
1726− libraryHaskellDepends = [
1727− base bytestring conduit conduit-combinators exceptions gitlib hspec
1728− hspec-expectations HUnit monad-control tagged text time
1729− transformers
1730− ];
1731− doHaddock = false;
1732− doCheck = false;
1733− description = "Test library for confirming gitlib backend compliance";
1734− license = stdenv.lib.licenses.mit;
1735− }) {};
1736 "gitrev" = callPackage
1608 "gitrev" = callPackage
1737 ({ mkDerivation, base, base-compat, directory, filepath, process
1609 ({ mkDerivation, base, base-compat, directory, filepath, process
1738 , template-haskell
1610 , template-haskell
@@ -1744,8 +1616,6 @@ self: {
1744 libraryHaskellDepends = [
1616 libraryHaskellDepends = [
1745 base base-compat directory filepath process template-haskell
1617 base base-compat directory filepath process template-haskell
1746 ];
1618 ];
1747− doHaddock = false;
1748− doCheck = false;
1749 homepage = "https://github.com/acfoltzer/gitrev";
1619 homepage = "https://github.com/acfoltzer/gitrev";
1750 description = "Compile git revision info into Haskell projects";
1620 description = "Compile git revision info into Haskell projects";
1751 license = stdenv.lib.licenses.bsd3;
1621 license = stdenv.lib.licenses.bsd3;
@@ -1760,28 +1630,25 @@ self: {
1760 isExecutable = true;
1630 isExecutable = true;
1761 libraryHaskellDepends = [ base haskell-src-exts ];
1631 libraryHaskellDepends = [ base haskell-src-exts ];
1762 executableHaskellDepends = [ base ];
1632 executableHaskellDepends = [ base ];
1763− doHaddock = false;
1764− doCheck = false;
1765 description = "Pretty printing for well-behaved Show instances";
1633 description = "Pretty printing for well-behaved Show instances";
1766 license = stdenv.lib.licenses.bsd3;
1634 license = stdenv.lib.licenses.bsd3;
1767 }) {};
1635 }) {};
1768 "hackage-db" = callPackage
1636 "hackage-db" = callPackage
1769− ({ mkDerivation, base, bytestring, Cabal, containers, directory
1637+ ({ mkDerivation, aeson, base, bytestring, Cabal, containers
1770− , filepath, tar, utf8-string
1638+ , directory, filepath, tar, time, utf8-string
1771 }:
1639 }:
1772 mkDerivation {
1640 mkDerivation {
1773 pname = "hackage-db";
1641 pname = "hackage-db";
1774− version = "1.22";
1642+ version = "2.0.1";
1775− sha256 = "0rhh7w4929zkwzv10ika952yiw4dkffqd8f79f1bl76lz1la6cjd";
1643+ sha256 = "13ggj72i8dxwh3qwznnqxbr00nvsbapyyhzx5zybfacddnpw3aph";
1776− revision = "1";
1644+ isLibrary = true;
1777− editedCabalFile = "0xj3wwf0wl8qfcz4zsxw0r6f79rg7h010jfv54gsiyzwpf67l9xm";
1645+ isExecutable = true;
1778 libraryHaskellDepends = [
1646 libraryHaskellDepends = [
1779− base bytestring Cabal containers directory filepath tar utf8-string
1647+ aeson base bytestring Cabal containers directory filepath tar time
1648+ utf8-string
1780 ];
1649 ];
1781− doHaddock = false;
1782− doCheck = false;
1783− homepage = "http://github.com/peti/hackage-db";
1650+ homepage = "https://github.com/peti/hackage-db#readme";
1784− description = "access Hackage's package database via Data.Map";
1651+ description = "Access Hackage's package database via Data.Map";
1785 license = stdenv.lib.licenses.bsd3;
1652 license = stdenv.lib.licenses.bsd3;
1786 }) {};
1653 }) {};
1787 "happy" = callPackage
1654 "happy" = callPackage
@@ -1790,8 +1657,10 @@ self: {
1790 }:
1657 }:
1791 mkDerivation {
1658 mkDerivation {
1792 pname = "happy";
1659 pname = "happy";
1793− version = "1.19.8";
1660+ version = "1.19.9";
1794− sha256 = "186ky3bly0i3cc56qk3r7j7pxh2108aackq4n2lli7jmbnb3kxsd";
1661+ sha256 = "138xpxdb7x62lpmgmb6b3v3vgdqqvqn4273jaap3mjmc2gla709y";
1662+ revision = "2";
1663+ editedCabalFile = "1zxi8zfwiwxidrhr0yj5srpzp32z66sld9xv0k4yz7046rkl3577";
1795 isLibrary = false;
1664 isLibrary = false;
1796 isExecutable = true;
1665 isExecutable = true;
1797 setupHaskellDepends = [ base Cabal directory filepath ];
1666 setupHaskellDepends = [ base Cabal directory filepath ];
@@ -1804,16 +1673,14 @@ self: {
1804 license = stdenv.lib.licenses.bsd2;
1673 license = stdenv.lib.licenses.bsd2;
1805 }) {};
1674 }) {};
1806 "hashable" = callPackage
1675 "hashable" = callPackage
1807− ({ mkDerivation, base, bytestring, deepseq, ghc-prim, HUnit
1676+ ({ mkDerivation, base, bytestring, criterion, deepseq, ghc-prim
1808− , integer-gmp, QuickCheck, random, test-framework
1677+ , HUnit, integer-gmp, QuickCheck, random, siphash, test-framework
1809 , test-framework-hunit, test-framework-quickcheck2, text, unix
1678 , test-framework-hunit, test-framework-quickcheck2, text, unix
1810 }:
1679 }:
1811 mkDerivation {
1680 mkDerivation {
1812 pname = "hashable";
1681 pname = "hashable";
1813− version = "1.2.6.1";
1682+ version = "1.2.7.0";
1814− sha256 = "0ymv2mcrrgbdc2w39rib171fwnhg7fgp0sy4h8amrh1vw64qgjll";
1683+ sha256 = "1gra8gq3kb7b2sd845h55yxlrfqx3ii004c6vjhga8v0b30fzdgc";
1815− revision = "2";
1816− editedCabalFile = "0w4756sa04nk2bw3vnysb0y9d09zzg3c77aydkjfxz1hnl1dvnjn";
1817 isLibrary = true;
1684 isLibrary = true;
1818 isExecutable = true;
1685 isExecutable = true;
1819 libraryHaskellDepends = [
1686 libraryHaskellDepends = [
@@ -1823,22 +1690,24 @@ self: {
1823 base bytestring ghc-prim HUnit QuickCheck random test-framework
1690 base bytestring ghc-prim HUnit QuickCheck random test-framework
1824 test-framework-hunit test-framework-quickcheck2 text unix
1691 test-framework-hunit test-framework-quickcheck2 text unix
1825 ];
1692 ];
1826− doHaddock = false;
1693+ benchmarkHaskellDepends = [
1827− doCheck = false;
1694+ base bytestring criterion ghc-prim integer-gmp siphash text
1695+ ];
1828 homepage = "http://github.com/tibbe/hashable";
1696 homepage = "http://github.com/tibbe/hashable";
1829 description = "A class for types that can be converted to a hash value";
1697 description = "A class for types that can be converted to a hash value";
1830 license = stdenv.lib.licenses.bsd3;
1698 license = stdenv.lib.licenses.bsd3;
1831 }) {};
1699 }) {};
1832− "hashable-time" = callPackage
1700+ "hashtables" = callPackage
1833− ({ mkDerivation, base, hashable, time }:
1701+ ({ mkDerivation, base, ghc-prim, hashable, primitive, vector }:
1834 mkDerivation {
1702 mkDerivation {
1835− pname = "hashable-time";
1703+ pname = "hashtables";
1836− version = "0.2.0.1";
1704+ version = "1.2.3.1";
1837− sha256 = "0k932nyd08l3xxbh2g3n76py2f4kd9yw4s5a065vjz0xp6wjnxdm";
1705+ sha256 = "1giw9caajr07slf09j7zry9b0kvm4yj9q78zy1mawzi6gk3wglcg";
1838− libraryHaskellDepends = [ base hashable time ];
1706+ libraryHaskellDepends = [
1839− doHaddock = false;
1707+ base ghc-prim hashable primitive vector
1840− doCheck = false;
1708+ ];
1841− description = "Hashable instances for Data.Time";
1709+ homepage = "http://github.com/gregorycollins/hashtables";
1710+ description = "Mutable hash tables in the ST monad";
1842 license = stdenv.lib.licenses.bsd3;
1711 license = stdenv.lib.licenses.bsd3;
1843 }) {};
1712 }) {};
1844 "haskell-lexer" = callPackage
1713 "haskell-lexer" = callPackage
@@ -1848,8 +1717,6 @@ self: {
1848 version = "1.0.1";
1717 version = "1.0.1";
1849 sha256 = "0rj3r1pk88hh3sk3mj61whp8czz5kpxhbc78xlr04bxwqjrjmm6p";
1718 sha256 = "0rj3r1pk88hh3sk3mj61whp8czz5kpxhbc78xlr04bxwqjrjmm6p";
1850 libraryHaskellDepends = [ base ];
1719 libraryHaskellDepends = [ base ];
1851− doHaddock = false;
1852− doCheck = false;
1853 description = "A fully compliant Haskell 98 lexer";
1720 description = "A fully compliant Haskell 98 lexer";
1854 license = stdenv.lib.licenses.bsd3;
1721 license = stdenv.lib.licenses.bsd3;
1855 }) {};
1722 }) {};
@@ -1860,39 +1727,78 @@ self: {
1860 }:
1727 }:
1861 mkDerivation {
1728 mkDerivation {
1862 pname = "haskell-src-exts";
1729 pname = "haskell-src-exts";
1863− version = "1.18.2";
1730+ version = "1.20.2";
1864− sha256 = "0hq9f6r67gkhad4cc4dhahrwrz9kxfibhk8qrw5j0p7cvh23hn1i";
1731+ sha256 = "1sm3z4v1p5yffg01ldgavz71s3bvfhjfa13k428rk14bpkl8crlz";
1865 libraryHaskellDepends = [ array base cpphs ghc-prim pretty ];
1732 libraryHaskellDepends = [ array base cpphs ghc-prim pretty ];
1866 libraryToolDepends = [ happy ];
1733 libraryToolDepends = [ happy ];
1867 testHaskellDepends = [
1734 testHaskellDepends = [
1868 base containers directory filepath mtl pretty-show smallcheck tasty
1735 base containers directory filepath mtl pretty-show smallcheck tasty
1869 tasty-golden tasty-smallcheck
1736 tasty-golden tasty-smallcheck
1870 ];
1737 ];
1871− doHaddock = false;
1872− doCheck = false;
1873 homepage = "https://github.com/haskell-suite/haskell-src-exts";
1738 homepage = "https://github.com/haskell-suite/haskell-src-exts";
1874 description = "Manipulating Haskell source: abstract syntax, lexer, parser, and pretty-printer";
1739 description = "Manipulating Haskell source: abstract syntax, lexer, parser, and pretty-printer";
1875 license = stdenv.lib.licenses.bsd3;
1740 license = stdenv.lib.licenses.bsd3;
1876 }) {};
1741 }) {};
1877− "haskell-src-meta" = callPackage
1742+ "haskell-src-meta" = callPackage
1878− ({ mkDerivation, base, haskell-src-exts, HUnit, pretty, syb
1743+ ({ mkDerivation, base, haskell-src-exts, HUnit, pretty, syb
1879− , template-haskell, test-framework, test-framework-hunit
1744+ , template-haskell, test-framework, test-framework-hunit
1880− , th-orphans
1745+ , th-orphans
1746+ }:
1747+ mkDerivation {
1748+ pname = "haskell-src-meta";
1749+ version = "0.8.0.3";
1750+ sha256 = "08jq156zv4m0fjq6712n99c1jwxnpa6kj6sq8ch0r1l0a1ay6ww4";
1751+ libraryHaskellDepends = [
1752+ base haskell-src-exts pretty syb template-haskell th-orphans
1753+ ];
1754+ testHaskellDepends = [
1755+ base haskell-src-exts HUnit pretty template-haskell test-framework
1756+ test-framework-hunit
1757+ ];
1758+ description = "Parse source to template-haskell abstract syntax";
1759+ license = stdenv.lib.licenses.bsd3;
1760+ }) {};
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
1881 }:
1785 }:
1882 mkDerivation {
1786 mkDerivation {
1883− pname = "haskell-src-meta";
1787+ pname = "hedgehog";
1884− version = "0.8.0.1";
1788+ version = "0.6";
1885− sha256 = "1i5f21mx061k50nl3pvvffjqsbvvldl50y8d4b9b31g63l0jg5q9";
1789+ sha256 = "0c3y4gvl1i2r54ayha2kw5i2gdpd8nfzfzjly5vhxm13ylygwvxq";
1886 libraryHaskellDepends = [
1790 libraryHaskellDepends = [
1887− base haskell-src-exts pretty syb template-haskell th-orphans
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
1888 ];
1796 ];
1889 testHaskellDepends = [
1797 testHaskellDepends = [
1890− base haskell-src-exts HUnit pretty template-haskell test-framework
1798+ base containers pretty-show semigroups text transformers
1891− test-framework-hunit
1892 ];
1799 ];
1893− doHaddock = false;
1800+ homepage = "https://hedgehog.qa";
1894− doCheck = false;
1801+ description = "Hedgehog will eat all your bugs";
1895− description = "Parse source to template-haskell abstract syntax";
1896 license = stdenv.lib.licenses.bsd3;
1802 license = stdenv.lib.licenses.bsd3;
1897 }) {};
1803 }) {};
1898 "hex" = callPackage
1804 "hex" = callPackage
@@ -1902,8 +1808,6 @@ self: {
1902 version = "0.1.2";
1808 version = "0.1.2";
1903 sha256 = "1v31xiaivrrn0q2jz8919wvkjplv1kxna5ajhsj701fqxm1i5vhj";
1809 sha256 = "1v31xiaivrrn0q2jz8919wvkjplv1kxna5ajhsj701fqxm1i5vhj";
1904 libraryHaskellDepends = [ base bytestring ];
1810 libraryHaskellDepends = [ base bytestring ];
1905− doHaddock = false;
1906− doCheck = false;
1907 description = "Convert strings into hexadecimal and back";
1811 description = "Convert strings into hexadecimal and back";
1908 license = stdenv.lib.licenses.bsd3;
1812 license = stdenv.lib.licenses.bsd3;
1909 }) {};
1813 }) {};
@@ -1917,8 +1821,6 @@ self: {
1917 librarySystemDepends = [ openssl ];
1821 librarySystemDepends = [ openssl ];
1918 testHaskellDepends = [ base process ];
1822 testHaskellDepends = [ base process ];
1919 testToolDepends = [ git ];
1823 testToolDepends = [ git ];
1920− doHaddock = false;
1921− doCheck = false;
1922 description = "Low-level bindings to libgit2";
1824 description = "Low-level bindings to libgit2";
1923 license = stdenv.lib.licenses.mit;
1825 license = stdenv.lib.licenses.mit;
1924 }) {inherit (pkgs) git; inherit (pkgs) openssl;};
1826 }) {inherit (pkgs) git; inherit (pkgs) openssl;};
@@ -1934,8 +1836,6 @@ self: {
1934 libraryHaskellDepends = [ base bytestring ];
1836 libraryHaskellDepends = [ base bytestring ];
1935 librarySystemDepends = [ openssl ];
1837 librarySystemDepends = [ openssl ];
1936 testHaskellDepends = [ base doctest HUnit ];
1838 testHaskellDepends = [ base doctest HUnit ];
1937− doHaddock = false;
1938− doCheck = false;
1939 homepage = "http://github.com/peti/hopenssl";
1839 homepage = "http://github.com/peti/hopenssl";
1940 description = "FFI Bindings to OpenSSL's EVP Digest Interface";
1840 description = "FFI Bindings to OpenSSL's EVP Digest Interface";
1941 license = stdenv.lib.licenses.bsd3;
1841 license = stdenv.lib.licenses.bsd3;
@@ -1947,29 +1847,79 @@ self: {
1947 version = "1.0";
1847 version = "1.0";
1948 sha256 = "0p6gm4328946qxc295zb6vhwhf07l1fma82vd0siylnsnsqxlhwv";
1848 sha256 = "0p6gm4328946qxc295zb6vhwhf07l1fma82vd0siylnsnsqxlhwv";
1949 libraryHaskellDepends = [ base ];
1849 libraryHaskellDepends = [ base ];
1950− doHaddock = false;
1951− doCheck = false;
1952 description = "A very simple package providing a cross-platform means of determining the hostname";
1850 description = "A very simple package providing a cross-platform means of determining the hostname";
1953 license = stdenv.lib.licenses.bsd3;
1851 license = stdenv.lib.licenses.bsd3;
1954 }) {};
1852 }) {};
1955 "hourglass" = callPackage
1853 "hourglass" = callPackage
1956− ({ mkDerivation, base, deepseq, mtl, old-locale, tasty, tasty-hunit
1854+ ({ mkDerivation, base, bytestring, deepseq, gauge, mtl, old-locale
1957− , tasty-quickcheck, time
1855+ , tasty, tasty-hunit, tasty-quickcheck, time
1958 }:
1856 }:
1959 mkDerivation {
1857 mkDerivation {
1960 pname = "hourglass";
1858 pname = "hourglass";
1961− version = "0.2.10";
1859+ version = "0.2.11";
1962− sha256 = "104d1yd84hclprg740nkz60vx589mnm094zriw6zczbgg8nkclym";
1860+ sha256 = "0lag9sgj7ndrbfmab6jhszlv413agg0zzaj5r9f2fmf07wqbp9hq";
1963 libraryHaskellDepends = [ base deepseq ];
1861 libraryHaskellDepends = [ base deepseq ];
1964 testHaskellDepends = [
1862 testHaskellDepends = [
1965 base deepseq mtl old-locale tasty tasty-hunit tasty-quickcheck time
1863 base deepseq mtl old-locale tasty tasty-hunit tasty-quickcheck time
1966 ];
1864 ];
1967− doHaddock = false;
1865+ benchmarkHaskellDepends = [
1968− doCheck = false;
1866+ base bytestring deepseq gauge mtl old-locale time
1867+ ];
1969 homepage = "https://github.com/vincenthz/hs-hourglass";
1868 homepage = "https://github.com/vincenthz/hs-hourglass";
1970 description = "simple performant time related library";
1869 description = "simple performant time related library";
1971 license = stdenv.lib.licenses.bsd3;
1870 license = stdenv.lib.licenses.bsd3;
1972 }) {};
1871 }) {};
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+ }) {};
1973 "hspec" = callPackage
1923 "hspec" = callPackage
1974 ({ mkDerivation, base, call-stack, directory, hspec-core
1924 ({ mkDerivation, base, call-stack, directory, hspec-core
1975 , hspec-discover, hspec-expectations, hspec-meta, HUnit, QuickCheck
1925 , hspec-discover, hspec-expectations, hspec-meta, HUnit, QuickCheck
@@ -1977,8 +1927,8 @@ self: {
1977 }:
1927 }:
1978 mkDerivation {
1928 mkDerivation {
1979 pname = "hspec";
1929 pname = "hspec";
1980− version = "2.4.4";
1930+ version = "2.5.5";
1981− sha256 = "08fg8w38xbhidw3pfn13ag3mnpp3rb1lzp7xpq47cncwv92k46mh";
1931+ sha256 = "1yv4k5b5kkig2q3waj28587sq28wms7wfav5a3lq4dra6jybimfm";
1982 libraryHaskellDepends = [
1932 libraryHaskellDepends = [
1983 base call-stack hspec-core hspec-discover hspec-expectations HUnit
1933 base call-stack hspec-core hspec-discover hspec-expectations HUnit
1984 QuickCheck transformers
1934 QuickCheck transformers
@@ -1988,52 +1938,50 @@ self: {
1988 hspec-expectations hspec-meta HUnit QuickCheck stringbuilder
1938 hspec-expectations hspec-meta HUnit QuickCheck stringbuilder
1989 transformers
1939 transformers
1990 ];
1940 ];
1991− doHaddock = false;
1992− doCheck = false;
1993 homepage = "http://hspec.github.io/";
1941 homepage = "http://hspec.github.io/";
1994 description = "A Testing Framework for Haskell";
1942 description = "A Testing Framework for Haskell";
1995 license = stdenv.lib.licenses.mit;
1943 license = stdenv.lib.licenses.mit;
1996 }) {};
1944 }) {};
1997 "hspec-core" = callPackage
1945 "hspec-core" = callPackage
1998− ({ mkDerivation, ansi-terminal, array, async, base, call-stack
1946+ ({ mkDerivation, ansi-terminal, array, base, call-stack, clock
1999 , deepseq, directory, filepath, hspec-expectations, hspec-meta
1947 , deepseq, directory, filepath, hspec-expectations, hspec-meta
2000 , HUnit, process, QuickCheck, quickcheck-io, random, setenv
1948 , HUnit, process, QuickCheck, quickcheck-io, random, setenv
2001− , silently, temporary, tf-random, time, transformers
1949+ , silently, stm, temporary, tf-random, transformers
2002 }:
1950 }:
2003 mkDerivation {
1951 mkDerivation {
2004 pname = "hspec-core";
1952 pname = "hspec-core";
2005− version = "2.4.4";
1953+ version = "2.5.5";
2006− sha256 = "1pxzr3l8b9640mh904n51nwlr2338wak23781s48a9kzvwf347b0";
1954+ sha256 = "1vfrqlpn32s9wiykmkxbnrnd5p56yznw20pf8fwzw78ar4wpz55x";
2007 libraryHaskellDepends = [
1955 libraryHaskellDepends = [
2008− ansi-terminal array async base call-stack deepseq directory
1956+ ansi-terminal array base call-stack clock deepseq directory
2009 filepath hspec-expectations HUnit QuickCheck quickcheck-io random
1957 filepath hspec-expectations HUnit QuickCheck quickcheck-io random
2010− setenv tf-random time transformers
1958+ setenv stm tf-random transformers
2011 ];
1959 ];
2012 testHaskellDepends = [
1960 testHaskellDepends = [
2013− ansi-terminal array async base call-stack deepseq directory
1961+ ansi-terminal array base call-stack clock deepseq directory
2014 filepath hspec-expectations hspec-meta HUnit process QuickCheck
1962 filepath hspec-expectations hspec-meta HUnit process QuickCheck
2015− quickcheck-io random setenv silently temporary tf-random time
1963+ quickcheck-io random setenv silently stm temporary tf-random
2016 transformers
1964 transformers
2017 ];
1965 ];
2018− doHaddock = false;
1966+ testTarget = "--test-option=--skip --test-option='Test.Hspec.Core.Runner.hspecResult runs specs in parallel'";
2019− doCheck = false;
2020 homepage = "http://hspec.github.io/";
1967 homepage = "http://hspec.github.io/";
2021 description = "A Testing Framework for Haskell";
1968 description = "A Testing Framework for Haskell";
2022 license = stdenv.lib.licenses.mit;
1969 license = stdenv.lib.licenses.mit;
2023 }) {};
1970 }) {};
2024 "hspec-discover" = callPackage
1971 "hspec-discover" = callPackage
2025− ({ mkDerivation, base, directory, filepath, hspec-meta }:
1972+ ({ mkDerivation, base, directory, filepath, hspec-meta, QuickCheck
1973+ }:
2026 mkDerivation {
1974 mkDerivation {
2027 pname = "hspec-discover";
1975 pname = "hspec-discover";
2028− version = "2.4.4";
1976+ version = "2.5.5";
2029− sha256 = "0isx9nc59nw8pkh4r6ynd55dghqnzgrzn9pvrq6ail1y5z3knhkn";
1977+ sha256 = "04aidzi91ccr9bygmfkjzshz34z9vh8wvqj4zinx2clxq6r7gqfz";
2030 isLibrary = true;
1978 isLibrary = true;
2031 isExecutable = true;
1979 isExecutable = true;
2032 libraryHaskellDepends = [ base directory filepath ];
1980 libraryHaskellDepends = [ base directory filepath ];
2033 executableHaskellDepends = [ base directory filepath ];
1981 executableHaskellDepends = [ base directory filepath ];
1982+ testHaskellDepends = [
2034− testHaskellDepends = [ base directory filepath hspec-meta ];
1983+ base directory filepath hspec-meta QuickCheck
2035− doHaddock = false;
1984+ ];
2036− doCheck = false;
2037 homepage = "http://hspec.github.io/";
1985 homepage = "http://hspec.github.io/";
2038 description = "Automatically discover and run Hspec tests";
1986 description = "Automatically discover and run Hspec tests";
2039 license = stdenv.lib.licenses.mit;
1987 license = stdenv.lib.licenses.mit;
@@ -2046,8 +1994,6 @@ self: {
2046 sha256 = "1vxl9zazbaapijr6zmcj72j9wf7ka1pirrjbwddwwddg3zm0g5l1";
1994 sha256 = "1vxl9zazbaapijr6zmcj72j9wf7ka1pirrjbwddwwddg3zm0g5l1";
2047 libraryHaskellDepends = [ base call-stack HUnit ];
1995 libraryHaskellDepends = [ base call-stack HUnit ];
2048 testHaskellDepends = [ base call-stack HUnit nanospec ];
1996 testHaskellDepends = [ base call-stack HUnit nanospec ];
2049− doHaddock = false;
2050− doCheck = false;
2051 homepage = "https://github.com/hspec/hspec-expectations#readme";
1997 homepage = "https://github.com/hspec/hspec-expectations#readme";
2052 description = "Catchy combinators for HUnit";
1998 description = "Catchy combinators for HUnit";
2053 license = stdenv.lib.licenses.mit;
1999 license = stdenv.lib.licenses.mit;
@@ -2058,16 +2004,12 @@ self: {
2058 }:
2004 }:
2059 mkDerivation {
2005 mkDerivation {
2060 pname = "hspec-megaparsec";
2006 pname = "hspec-megaparsec";
2061− version = "0.3.1";
2007+ version = "1.0.0";
2062− sha256 = "0kaif74f1qq92nvksnq12h0imsrr02q1nawgprbg1s9cpilq2vw2";
2008+ sha256 = "1dafrbzjm7rzwvcpjpk3bsg7bd111xfij94n17sh8wfykzhim5hl";
2063 libraryHaskellDepends = [
2009 libraryHaskellDepends = [
2064 base containers hspec-expectations megaparsec
2010 base containers hspec-expectations megaparsec
2065 ];
2011 ];
2066− testHaskellDepends = [
2067− base containers hspec hspec-expectations megaparsec
2012+ testHaskellDepends = [ base hspec hspec-expectations megaparsec ];
2068− ];
2069− doHaddock = false;
2070− doCheck = false;
2071 homepage = "https://github.com/mrkkrp/hspec-megaparsec";
2013 homepage = "https://github.com/mrkkrp/hspec-megaparsec";
2072 description = "Utility functions for testing Megaparsec parsers with Hspec";
2014 description = "Utility functions for testing Megaparsec parsers with Hspec";
2073 license = stdenv.lib.licenses.bsd3;
2015 license = stdenv.lib.licenses.bsd3;
@@ -2079,8 +2021,8 @@ self: {
2079 }:
2021 }:
2080 mkDerivation {
2022 mkDerivation {
2081 pname = "hspec-meta";
2023 pname = "hspec-meta";
2082− version = "2.4.4";
2024+ version = "2.4.6";
2083− sha256 = "117n4j56wfh48xj02mv0wkp10bkr2xkyvwg7n7r2ynp03wrf9ykm";
2025+ sha256 = "0qmvk01n79j6skn79r6zalg2pd0x0nqqn9qn8mhg0pgyzcdnfc9b";
2084 isLibrary = true;
2026 isLibrary = true;
2085 isExecutable = true;
2027 isExecutable = true;
2086 libraryHaskellDepends = [
2028 libraryHaskellDepends = [
@@ -2093,74 +2035,71 @@ self: {
2093 filepath hspec-expectations HUnit QuickCheck quickcheck-io random
2035 filepath hspec-expectations HUnit QuickCheck quickcheck-io random
2094 setenv time transformers
2036 setenv time transformers
2095 ];
2037 ];
2096− doHaddock = false;
2097− doCheck = false;
2098 homepage = "http://hspec.github.io/";
2038 homepage = "http://hspec.github.io/";
2099 description = "A version of Hspec which is used to test Hspec itself";
2039 description = "A version of Hspec which is used to test Hspec itself";
2100 license = stdenv.lib.licenses.mit;
2040 license = stdenv.lib.licenses.mit;
2101 }) {};
2041 }) {};
2102 "hspec-smallcheck" = callPackage
2042 "hspec-smallcheck" = callPackage
2103− ({ mkDerivation, base, hspec, hspec-core, QuickCheck, smallcheck }:
2043+ ({ mkDerivation, base, base-orphans, call-stack, hspec, hspec-core
2044+ , HUnit, QuickCheck, smallcheck
2045+ }:
2104 mkDerivation {
2046 mkDerivation {
2105 pname = "hspec-smallcheck";
2047 pname = "hspec-smallcheck";
2106− version = "0.4.2";
2048+ version = "0.5.2";
2107− sha256 = "1lsy71ri0lfvs6w1drwa4p69bcy0nrpb62dah3bg4vqwxfrd82ds";
2049+ sha256 = "06c1ym793zkdwi4bxk5f4l7m1n1bg5jmnm0p68q2pa9rlhk1lc4s";
2108− libraryHaskellDepends = [ base hspec-core smallcheck ];
2050+ libraryHaskellDepends = [
2051+ base call-stack hspec-core HUnit smallcheck
2052+ ];
2109 testHaskellDepends = [
2053 testHaskellDepends = [
2110− base hspec hspec-core QuickCheck smallcheck
2054+ base base-orphans call-stack hspec hspec-core HUnit QuickCheck
2055+ smallcheck
2111 ];
2056 ];
2112− doHaddock = false;
2113− doCheck = false;
2114 homepage = "http://hspec.github.io/";
2057 homepage = "http://hspec.github.io/";
2115 description = "SmallCheck support for the Hspec testing framework";
2058 description = "SmallCheck support for the Hspec testing framework";
2116 license = stdenv.lib.licenses.mit;
2059 license = stdenv.lib.licenses.mit;
2117 }) {};
2060 }) {};
2118 "html-conduit" = callPackage
2061 "html-conduit" = callPackage
2119− ({ mkDerivation, base, bytestring, conduit, conduit-extra
2062+ ({ mkDerivation, attoparsec, base, bytestring, conduit
2120− , containers, hspec, HUnit, resourcet, tagstream-conduit, text
2063+ , conduit-extra, containers, deepseq, hspec, HUnit, resourcet, text
2121 , transformers, xml-conduit, xml-types
2064 , transformers, xml-conduit, xml-types
2122 }:
2065 }:
2123 mkDerivation {
2066 mkDerivation {
2124 pname = "html-conduit";
2067 pname = "html-conduit";
2125− version = "1.2.1.2";
2068+ version = "1.3.1";
2126− sha256 = "172ip4rkn2y3mpzjrj2h3nrmxrf90gcl8ax6dgdhrdjsyg4h8vjk";
2069+ sha256 = "0dg3sblihi93qn6ax1cwha0cng4zlpmic83ckdylq7s7kwa3rhbi";
2127 libraryHaskellDepends = [
2070 libraryHaskellDepends = [
2128− base bytestring conduit conduit-extra containers resourcet
2071+ attoparsec base bytestring conduit conduit-extra containers
2129− tagstream-conduit text transformers xml-conduit xml-types
2072+ resourcet text transformers xml-conduit xml-types
2130 ];
2073 ];
2131 testHaskellDepends = [
2074 testHaskellDepends = [
2132− base bytestring containers hspec HUnit xml-conduit
2075+ base bytestring containers deepseq hspec HUnit text xml-conduit
2133 ];
2076 ];
2134− doHaddock = false;
2135− doCheck = false;
2136 homepage = "https://github.com/snoyberg/xml";
2077 homepage = "https://github.com/snoyberg/xml";
2137 description = "Parse HTML documents using xml-conduit datatypes";
2078 description = "Parse HTML documents using xml-conduit datatypes";
2138 license = stdenv.lib.licenses.mit;
2079 license = stdenv.lib.licenses.mit;
2139 }) {};
2080 }) {};
2140 "http-client" = callPackage
2081 "http-client" = callPackage
2141− ({ mkDerivation, array, async, base, base64-bytestring
2082+ ({ mkDerivation, array, async, base, blaze-builder, bytestring
2142− , blaze-builder, bytestring, case-insensitive, containers, cookie
2083+ , case-insensitive, containers, cookie, deepseq, directory
2143− , deepseq, directory, exceptions, filepath, ghc-prim, hspec
2084+ , exceptions, filepath, ghc-prim, hspec, http-types, memory
2144− , http-types, mime-types, monad-control, network, network-uri
2085+ , mime-types, monad-control, network, network-uri, random, stm
2145− , random, streaming-commons, text, time, transformers, zlib
2086+ , streaming-commons, text, time, transformers, zlib
2146 }:
2087 }:
2147 mkDerivation {
2088 mkDerivation {
2148 pname = "http-client";
2089 pname = "http-client";
2149− version = "0.5.7.1";
2090+ version = "0.5.13.1";
2150− sha256 = "19cvnnfcjj2m3pgs6ivyjs21rw9wx5ynarh6hvb27a76cscai2fy";
2091+ sha256 = "0szwbgvkkdz56lgi91armkagmb7nnfwbpp4j7cm9zhmffv3ba8g1";
2151 libraryHaskellDepends = [
2092 libraryHaskellDepends = [
2152− array base base64-bytestring blaze-builder bytestring
2093+ array base blaze-builder bytestring case-insensitive containers
2153− case-insensitive containers cookie deepseq exceptions filepath
2094+ cookie deepseq exceptions filepath ghc-prim http-types memory
2154− ghc-prim http-types mime-types network network-uri random
2095+ mime-types network network-uri random stm streaming-commons text
2155− streaming-commons text time transformers
2096+ time transformers
2156 ];
2097 ];
2157 testHaskellDepends = [
2098 testHaskellDepends = [
2158− async base base64-bytestring blaze-builder bytestring
2099+ async base blaze-builder bytestring case-insensitive containers
2159− case-insensitive containers deepseq directory hspec http-types
2100+ deepseq directory hspec http-types monad-control network
2160− monad-control network network-uri streaming-commons text time
2101+ network-uri streaming-commons text time transformers zlib
2161− transformers zlib
2162 ];
2102 ];
2163− doHaddock = false;
2164 doCheck = false;
2103 doCheck = false;
2165 homepage = "https://github.com/snoyberg/http-client";
2104 homepage = "https://github.com/snoyberg/http-client";
2166 description = "An HTTP client engine";
2105 description = "An HTTP client engine";
@@ -2168,21 +2107,23 @@ self: {
2168 }) {};
2107 }) {};
2169 "http-client-tls" = callPackage
2108 "http-client-tls" = callPackage
2170 ({ mkDerivation, base, bytestring, case-insensitive, connection
2109 ({ mkDerivation, base, bytestring, case-insensitive, connection
2171− , containers, cryptonite, data-default-class, exceptions, hspec
2110+ , containers, cryptonite, data-default-class, exceptions, gauge
2172− , http-client, http-types, memory, network, network-uri, text, tls
2111+ , hspec, http-client, http-types, memory, network, network-uri
2173− , transformers
2112+ , text, tls, transformers
2174 }:
2113 }:
2175 mkDerivation {
2114 mkDerivation {
2176 pname = "http-client-tls";
2115 pname = "http-client-tls";
2177− version = "0.3.5.1";
2116+ version = "0.3.5.3";
2178− sha256 = "0n4mi8z77qaggfyq17z79cl304nf1f4h6gag60v4wjwghvmj7yn1";
2117+ sha256 = "0qj3pcpgbsfsc4m52dz35khhl4hf1i0nmcpa445z82d9567vy6j7";
2179 libraryHaskellDepends = [
2118 libraryHaskellDepends = [
2180 base bytestring case-insensitive connection containers cryptonite
2119 base bytestring case-insensitive connection containers cryptonite
2181 data-default-class exceptions http-client http-types memory network
2120 data-default-class exceptions http-client http-types memory network
2182 network-uri text tls transformers
2121 network-uri text tls transformers
2183 ];
2122 ];
2123+ testHaskellDepends = [
2184− testHaskellDepends = [ base hspec http-client http-types ];
2124+ base connection hspec http-client http-types
2185− doHaddock = false;
2125+ ];
2126+ benchmarkHaskellDepends = [ base gauge http-client ];
2186 doCheck = false;
2127 doCheck = false;
2187 homepage = "https://github.com/snoyberg/http-client";
2128 homepage = "https://github.com/snoyberg/http-client";
2188 description = "http-client backend using the connection package and tls library";
2129 description = "http-client backend using the connection package and tls library";
@@ -2191,29 +2132,28 @@ self: {
2191 "http-conduit" = callPackage
2132 "http-conduit" = callPackage
2192 ({ mkDerivation, aeson, base, blaze-builder, bytestring
2133 ({ mkDerivation, aeson, base, blaze-builder, bytestring
2193 , case-insensitive, conduit, conduit-extra, connection, cookie
2134 , case-insensitive, conduit, conduit-extra, connection, cookie
2194− , data-default-class, exceptions, hspec, http-client
2135+ , data-default-class, hspec, http-client, http-client-tls
2195− , http-client-tls, http-types, HUnit, lifted-base, monad-control
2196− , mtl, network, resourcet, streaming-commons, temporary, text, time
2136+ , http-types, HUnit, mtl, network, resourcet, streaming-commons
2137+ , temporary, text, time, transformers, unliftio, unliftio-core
2197− , transformers, utf8-string, wai, wai-conduit, warp, warp-tls
2138+ , utf8-string, wai, wai-conduit, warp, warp-tls
2198 }:
2139 }:
2199 mkDerivation {
2140 mkDerivation {
2200 pname = "http-conduit";
2141 pname = "http-conduit";
2201− version = "2.2.3.2";
2142+ version = "2.3.2";
2202− sha256 = "1f0yqka43gp7vhv7yr4q6pqr8qw0qq2yh4y2lnayhc876zpw6ng3";
2143+ sha256 = "1iay4hr0mj8brkxvgkv1liqa8irl9axfc3qhn8qsvcyq4n1l95km";
2144+ revision = "1";
2145+ editedCabalFile = "0g6rg8r33q5rmrx5287vjfcqwjacchgzyfc8aqqrhrfz3fq5ll0g";
2203 libraryHaskellDepends = [
2146 libraryHaskellDepends = [
2204− aeson base bytestring conduit conduit-extra exceptions http-client
2147+ aeson base bytestring conduit conduit-extra http-client
2205− http-client-tls http-types lifted-base monad-control mtl resourcet
2148+ http-client-tls http-types mtl resourcet transformers unliftio-core
2206− transformers
2207 ];
2149 ];
2208 testHaskellDepends = [
2150 testHaskellDepends = [
2209 aeson base blaze-builder bytestring case-insensitive conduit
2151 aeson base blaze-builder bytestring case-insensitive conduit
2210 conduit-extra connection cookie data-default-class hspec
2152 conduit-extra connection cookie data-default-class hspec
2211− http-client http-types HUnit lifted-base network resourcet
2153+ http-client http-types HUnit network resourcet streaming-commons
2212− streaming-commons temporary text time transformers utf8-string wai
2154+ temporary text time transformers unliftio utf8-string wai
2213 wai-conduit warp warp-tls
2155 wai-conduit warp warp-tls
2214 ];
2156 ];
2215− doHaddock = false;
2216− doCheck = false;
2217 homepage = "http://www.yesodweb.com/book/http-conduit";
2157 homepage = "http://www.yesodweb.com/book/http-conduit";
2218 description = "HTTP client package with conduit interface and HTTPS support";
2158 description = "HTTP client package with conduit interface and HTTPS support";
2219 license = stdenv.lib.licenses.bsd3;
2159 license = stdenv.lib.licenses.bsd3;
@@ -2224,44 +2164,39 @@ self: {
2224 }:
2164 }:
2225 mkDerivation {
2165 mkDerivation {
2226 pname = "http-date";
2166 pname = "http-date";
2227− version = "0.0.6.1";
2167+ version = "0.0.7";
2228− sha256 = "0dknh28kyarnzqrsc80ssalxjrq0qbv7ir49247p2grb7rh0dqgj";
2168+ sha256 = "1hpzs646qqzp2g2qy7rx1bf3knf1hw38n82vcq6bs4mm1xzdryff";
2229− libraryHaskellDepends = [ array attoparsec base bytestring ];
2169+ libraryHaskellDepends = [ array attoparsec base bytestring time ];
2230 testHaskellDepends = [
2170 testHaskellDepends = [
2231 base bytestring doctest hspec old-locale time
2171 base bytestring doctest hspec old-locale time
2232 ];
2172 ];
2233− doHaddock = false;
2234− doCheck = false;
2235 description = "HTTP Date parser/formatter";
2173 description = "HTTP Date parser/formatter";
2236 license = stdenv.lib.licenses.bsd3;
2174 license = stdenv.lib.licenses.bsd3;
2237 }) {};
2175 }) {};
2238 "http-types" = callPackage
2176 "http-types" = callPackage
2239− ({ mkDerivation, array, base, blaze-builder, bytestring
2177+ ({ mkDerivation, array, base, bytestring, case-insensitive, doctest
2240− , case-insensitive, doctest, hspec, QuickCheck
2241− , quickcheck-instances, text
2178+ , hspec, QuickCheck, quickcheck-instances, text
2242 }:
2179 }:
2243 mkDerivation {
2180 mkDerivation {
2244 pname = "http-types";
2181 pname = "http-types";
2245− version = "0.9.1";
2182+ version = "0.12.1";
2246− sha256 = "0l7mnvqyppxpnq6ds4a9f395zdbl22z3sxiry1myfs8wvj669vbv";
2183+ sha256 = "1wv9k6nlvkdsxwlr7gaynphvzmvi5211gvwq96mbcxgk51a739rz";
2247 libraryHaskellDepends = [
2184 libraryHaskellDepends = [
2248− array base blaze-builder bytestring case-insensitive text
2185+ array base bytestring case-insensitive text
2249 ];
2186 ];
2250 testHaskellDepends = [
2187 testHaskellDepends = [
2251− base blaze-builder bytestring doctest hspec QuickCheck
2188+ base bytestring doctest hspec QuickCheck quickcheck-instances text
2252− quickcheck-instances text
2253 ];
2189 ];
2254− doHaddock = false;
2255− doCheck = false;
2256 homepage = "https://github.com/aristidb/http-types";
2190 homepage = "https://github.com/aristidb/http-types";
2257 description = "Generic HTTP types for Haskell (for both client and server code)";
2191 description = "Generic HTTP types for Haskell (for both client and server code)";
2258 license = stdenv.lib.licenses.bsd3;
2192 license = stdenv.lib.licenses.bsd3;
2259 }) {};
2193 }) {};
2260 "http2" = callPackage
2194 "http2" = callPackage
2261 ({ mkDerivation, aeson, aeson-pretty, array, base, bytestring
2195 ({ mkDerivation, aeson, aeson-pretty, array, base, bytestring
2262− , bytestring-builder, case-insensitive, containers, directory
2196+ , bytestring-builder, case-insensitive, containers, criterion
2263− , doctest, filepath, Glob, hex, hspec, psqueues, stm, text
2197+ , directory, doctest, filepath, Glob, hashtables, heaps, hex, hspec
2264− , unordered-containers, vector, word8
2198+ , mwc-random, psqueues, stm, text, unordered-containers, vector
2199+ , word8
2265 }:
2200 }:
2266 mkDerivation {
2201 mkDerivation {
2267 pname = "http2";
2202 pname = "http2";
@@ -2273,22 +2208,33 @@ self: {
2273 array base bytestring bytestring-builder case-insensitive
2208 array base bytestring bytestring-builder case-insensitive
2274 containers psqueues stm
2209 containers psqueues stm
2275 ];
2210 ];
2276− executableHaskellDepends = [
2277− aeson aeson-pretty array base bytestring bytestring-builder
2278− case-insensitive containers directory filepath hex text
2279− unordered-containers vector word8
2280− ];
2281 testHaskellDepends = [
2211 testHaskellDepends = [
2282 aeson aeson-pretty array base bytestring bytestring-builder
2212 aeson aeson-pretty array base bytestring bytestring-builder
2283 case-insensitive containers directory doctest filepath Glob hex
2213 case-insensitive containers directory doctest filepath Glob hex
2284 hspec psqueues stm text unordered-containers vector word8
2214 hspec psqueues stm text unordered-containers vector word8
2285 ];
2215 ];
2286− doHaddock = false;
2216+ benchmarkHaskellDepends = [
2287− doCheck = false;
2217+ array base bytestring case-insensitive containers criterion
2218+ hashtables heaps mwc-random psqueues stm
2219+ ];
2288 homepage = "https://github.com/kazu-yamamoto/http2";
2220 homepage = "https://github.com/kazu-yamamoto/http2";
2289 description = "HTTP/2 library including frames, priority queues and HPACK";
2221 description = "HTTP/2 library including frames, priority queues and HPACK";
2290 license = stdenv.lib.licenses.bsd3;
2222 license = stdenv.lib.licenses.bsd3;
2291 }) {};
2223 }) {};
2224+ "httpd-shed" = callPackage
2225+ ({ mkDerivation, base, network, network-uri }:
2226+ mkDerivation {
2227+ pname = "httpd-shed";
2228+ version = "0.4.0.3";
2229+ sha256 = "064jy1mqhnf1hvq6s04wlhmp916rd522x58djb9qixv13vc8gzxh";
2230+ revision = "1";
2231+ editedCabalFile = "159cjn9j8lq00gj2yvrzp81r37av25f83chsimp88h55zm9z8akw";
2232+ isLibrary = true;
2233+ isExecutable = true;
2234+ libraryHaskellDepends = [ base network network-uri ];
2235+ description = "A simple web-server with an interact style API";
2236+ license = stdenv.lib.licenses.bsd3;
2237+ }) {};
2292 "ieee754" = callPackage
2238 "ieee754" = callPackage
2293 ({ mkDerivation, base }:
2239 ({ mkDerivation, base }:
2294 mkDerivation {
2240 mkDerivation {
@@ -2296,28 +2242,25 @@ self: {
2296 version = "0.8.0";
2242 version = "0.8.0";
2297 sha256 = "1lcs521g9lzy9d7337vg4w7q7s8500rfqy7rcifcz6pm6yfgyb8f";
2243 sha256 = "1lcs521g9lzy9d7337vg4w7q7s8500rfqy7rcifcz6pm6yfgyb8f";
2298 libraryHaskellDepends = [ base ];
2244 libraryHaskellDepends = [ base ];
2299− doHaddock = false;
2300− doCheck = false;
2301 homepage = "http://github.com/patperry/hs-ieee754";
2245 homepage = "http://github.com/patperry/hs-ieee754";
2302 description = "Utilities for dealing with IEEE floating point numbers";
2246 description = "Utilities for dealing with IEEE floating point numbers";
2303 license = stdenv.lib.licenses.bsd3;
2247 license = stdenv.lib.licenses.bsd3;
2304 }) {};
2248 }) {};
2305 "inflections" = callPackage
2249 "inflections" = callPackage
2306− ({ mkDerivation, base, exceptions, hspec, hspec-megaparsec
2250+ ({ mkDerivation, base, containers, exceptions, hspec
2251+ , hspec-megaparsec, megaparsec, QuickCheck, text
2307− , megaparsec, QuickCheck, text, unordered-containers
2252+ , unordered-containers
2308 }:
2253 }:
2309 mkDerivation {
2254 mkDerivation {
2310 pname = "inflections";
2255 pname = "inflections";
2311− version = "0.3.0.0";
2256+ version = "0.4.0.3";
2312− sha256 = "1w96i4rnsxxzrjjvqzjs7dqbs4h4nrdw84cxvizb4bq19y0cp483";
2257+ sha256 = "028dj9pgs5g6qb9x1hc8r4rn0rznr1ynn79vln48k2llyf2r38dx";
2313 libraryHaskellDepends = [
2258 libraryHaskellDepends = [
2314 base exceptions megaparsec text unordered-containers
2259 base exceptions megaparsec text unordered-containers
2315 ];
2260 ];
2316 testHaskellDepends = [
2261 testHaskellDepends = [
2317− base hspec hspec-megaparsec megaparsec QuickCheck text
2262+ base containers hspec hspec-megaparsec megaparsec QuickCheck text
2318 ];
2263 ];
2319− doHaddock = false;
2320− doCheck = false;
2321 homepage = "https://github.com/stackbuilders/inflections-hs";
2264 homepage = "https://github.com/stackbuilders/inflections-hs";
2322 description = "Inflections library for Haskell";
2265 description = "Inflections library for Haskell";
2323 license = stdenv.lib.licenses.mit;
2266 license = stdenv.lib.licenses.mit;
@@ -2326,13 +2269,13 @@ self: {
2326 ({ mkDerivation, attoparsec, base, text, unordered-containers }:
2269 ({ mkDerivation, attoparsec, base, text, unordered-containers }:
2327 mkDerivation {
2270 mkDerivation {
2328 pname = "ini";
2271 pname = "ini";
2329− version = "0.3.5";
2272+ version = "0.3.6";
2330− sha256 = "1iicavbjr4qmlcdxh32cgqxlxd80xvzyxxskrs3hji1qzrnq7lxz";
2273+ sha256 = "1n9wsl7nz910bc8jx9ps7pvpql4hlnryjkqbdpfq0phjb9sf7fzw";
2274+ revision = "1";
2275+ editedCabalFile = "0gfikdal67aws20i5r4wg4r0lgn844glykcn3nnmbmyvwsks049l";
2331 libraryHaskellDepends = [
2276 libraryHaskellDepends = [
2332 attoparsec base text unordered-containers
2277 attoparsec base text unordered-containers
2333 ];
2278 ];
2334− doHaddock = false;
2335− doCheck = false;
2336 homepage = "http://github.com/chrisdone/ini";
2279 homepage = "http://github.com/chrisdone/ini";
2337 description = "Quick and easy configuration files in the INI format";
2280 description = "Quick and easy configuration files in the INI format";
2338 license = stdenv.lib.licenses.bsd3;
2281 license = stdenv.lib.licenses.bsd3;
@@ -2341,23 +2284,62 @@ self: {
2341 ({ mkDerivation, array, base, ghc-prim, integer-gmp }:
2284 ({ mkDerivation, array, base, ghc-prim, integer-gmp }:
2342 mkDerivation {
2285 mkDerivation {
2343 pname = "integer-logarithms";
2286 pname = "integer-logarithms";
2344− version = "1.0.2";
2287+ version = "1.0.2.1";
2345− sha256 = "0w5mhak181zi6qr5h2zbcs9ymaqacisp9jwk99naz6s8zz5rq1ii";
2288+ sha256 = "1wj8kgjg5bn2yrs4zh9qfjv85cx6w998j9pi39yrbv305944mb9j";
2346 libraryHaskellDepends = [ array base ghc-prim integer-gmp ];
2289 libraryHaskellDepends = [ array base ghc-prim integer-gmp ];
2347− doHaddock = false;
2348 doCheck = false;
2290 doCheck = false;
2349 homepage = "https://github.com/phadej/integer-logarithms";
2291 homepage = "https://github.com/phadej/integer-logarithms";
2350 description = "Integer logarithms";
2292 description = "Integer logarithms";
2351 license = stdenv.lib.licenses.mit;
2293 license = stdenv.lib.licenses.mit;
2352 }) {};
2294 }) {};
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+ }) {};
2353 "iproute" = callPackage
2335 "iproute" = callPackage
2354 ({ mkDerivation, appar, base, byteorder, containers, doctest, hspec
2336 ({ mkDerivation, appar, base, byteorder, containers, doctest, hspec
2355 , network, QuickCheck, safe
2337 , network, QuickCheck, safe
2356 }:
2338 }:
2357 mkDerivation {
2339 mkDerivation {
2358 pname = "iproute";
2340 pname = "iproute";
2359− version = "1.7.1";
2341+ version = "1.7.5";
2360− sha256 = "1viyxq3m1aifl05w0hxwrhhhcfpmvwz4ymil2gngi4nfm0yd1f2p";
2342+ sha256 = "1vw1nm3s8vz1hqnjnqd3wh5rr4q3m2r4izn5ynhf93h9185qwqzd";
2361 libraryHaskellDepends = [
2343 libraryHaskellDepends = [
2362 appar base byteorder containers network
2344 appar base byteorder containers network
2363 ];
2345 ];
@@ -2365,48 +2347,68 @@ self: {
2365 appar base byteorder containers doctest hspec network QuickCheck
2347 appar base byteorder containers doctest hspec network QuickCheck
2366 safe
2348 safe
2367 ];
2349 ];
2368− doHaddock = false;
2369− doCheck = false;
2370 homepage = "http://www.mew.org/~kazu/proj/iproute/";
2350 homepage = "http://www.mew.org/~kazu/proj/iproute/";
2371 description = "IP Routing Table";
2351 description = "IP Routing Table";
2372 license = stdenv.lib.licenses.bsd3;
2352 license = stdenv.lib.licenses.bsd3;
2373 }) {};
2353 }) {};
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+ }) {};
2374 "kan-extensions" = callPackage
2380 "kan-extensions" = callPackage
2375 ({ mkDerivation, adjunctions, array, base, comonad, containers
2381 ({ mkDerivation, adjunctions, array, base, comonad, containers
2376− , contravariant, distributive, fail, free, mtl, semigroupoids
2382+ , contravariant, distributive, free, invariant, mtl, profunctors
2377− , tagged, transformers
2383+ , semigroupoids, tagged, transformers, transformers-compat
2378 }:
2384 }:
2379 mkDerivation {
2385 mkDerivation {
2380 pname = "kan-extensions";
2386 pname = "kan-extensions";
2381− version = "5.0.2";
2387+ version = "5.2";
2382− sha256 = "0bj88bgwxlx490f5r979idsm9dpdsb0ldzar9sa0jhj2jn2xx7hw";
2388+ sha256 = "1lyvyiwwh962j2nnnsqzlvp5zq6z8p3spvhmji99cjvldxc7wwkb";
2383 libraryHaskellDepends = [
2389 libraryHaskellDepends = [
2384 adjunctions array base comonad containers contravariant
2390 adjunctions array base comonad containers contravariant
2385− distributive fail free mtl semigroupoids tagged transformers
2391+ distributive free invariant mtl profunctors semigroupoids tagged
2392+ transformers transformers-compat
2386 ];
2393 ];
2387− doHaddock = false;
2388− doCheck = false;
2389 homepage = "http://github.com/ekmett/kan-extensions/";
2394 homepage = "http://github.com/ekmett/kan-extensions/";
2390− 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";
2391 license = stdenv.lib.licenses.bsd3;
2396 license = stdenv.lib.licenses.bsd3;
2392 }) {};
2397 }) {};
2393 "keys" = callPackage
2398 "keys" = callPackage
2394 ({ mkDerivation, array, base, comonad, containers, free, hashable
2399 ({ mkDerivation, array, base, comonad, containers, free, hashable
2395− , semigroupoids, semigroups, transformers, transformers-compat
2400+ , semigroupoids, semigroups, tagged, transformers
2396− , unordered-containers
2401+ , transformers-compat, unordered-containers
2397 }:
2402 }:
2398 mkDerivation {
2403 mkDerivation {
2399 pname = "keys";
2404 pname = "keys";
2400− version = "3.11";
2405+ version = "3.12.1";
2401− sha256 = "1cn45h27hxwb4ci1iyd2qn0fzyb2y85qq4821a9xm37bwsvrgwqc";
2406+ sha256 = "1yqm4gpshsgswx6w78z64c83gpydh6jhgslx2lnc10nzhy0s9kkz";
2402− revision = "1";
2403− editedCabalFile = "1lyg4wyi7mkqvbfl9lvfln3j4vys47jih56zyjba7nx36kbw185i";
2404 libraryHaskellDepends = [
2407 libraryHaskellDepends = [
2405 array base comonad containers free hashable semigroupoids
2408 array base comonad containers free hashable semigroupoids
2406− semigroups transformers transformers-compat unordered-containers
2409+ semigroups tagged transformers transformers-compat
2410+ unordered-containers
2407 ];
2411 ];
2408− doHaddock = false;
2409− doCheck = false;
2410 homepage = "http://github.com/ekmett/keys/";
2412 homepage = "http://github.com/ekmett/keys/";
2411 description = "Keyed functors and containers";
2413 description = "Keyed functors and containers";
2412 license = stdenv.lib.licenses.bsd3;
2414 license = stdenv.lib.licenses.bsd3;
@@ -2418,8 +2420,6 @@ self: {
2418 version = "0.2.4";
2420 version = "0.2.4";
2419 sha256 = "1nxcs7g8a1sp91bzpy4cj6s31k5pvc3gvig04cbrggv5cvjidnhl";
2421 sha256 = "1nxcs7g8a1sp91bzpy4cj6s31k5pvc3gvig04cbrggv5cvjidnhl";
2420 libraryHaskellDepends = [ base regex-posix template-haskell ];
2422 libraryHaskellDepends = [ base regex-posix template-haskell ];
2421− doHaddock = false;
2422− doCheck = false;
2423 homepage = "http://github.com/finnsson/template-helper";
2423 homepage = "http://github.com/finnsson/template-helper";
2424 description = "Module to automatically extract functions from the local code";
2424 description = "Module to automatically extract functions from the local code";
2425 license = stdenv.lib.licenses.bsd3;
2425 license = stdenv.lib.licenses.bsd3;
@@ -2440,8 +2440,6 @@ self: {
2440 testHaskellDepends = [
2440 testHaskellDepends = [
2441 base base-compat Cabal deepseq doctest lens pretty QuickCheck
2441 base base-compat Cabal deepseq doctest lens pretty QuickCheck
2442 ];
2442 ];
2443− doHaddock = false;
2444− doCheck = false;
2445 homepage = "https://github.com/peti/language-nix#readme";
2443 homepage = "https://github.com/peti/language-nix#readme";
2446 description = "Data types and useful functions to represent and manipulate the Nix language";
2444 description = "Data types and useful functions to represent and manipulate the Nix language";
2447 license = stdenv.lib.licenses.bsd3;
2445 license = stdenv.lib.licenses.bsd3;
@@ -2449,9 +2447,9 @@ self: {
2449 "lens" = callPackage
2447 "lens" = callPackage
2450 ({ mkDerivation, array, base, base-orphans, bifunctors, bytestring
2448 ({ mkDerivation, array, base, base-orphans, bifunctors, bytestring
2451 , Cabal, cabal-doctest, call-stack, comonad, containers
2449 , Cabal, cabal-doctest, call-stack, comonad, containers
2452− , contravariant, deepseq, directory, distributive, doctest
2450+ , contravariant, criterion, deepseq, directory, distributive
2453− , exceptions, filepath, free, generic-deriving, ghc-prim, hashable
2451+ , doctest, exceptions, filepath, free, generic-deriving, ghc-prim
2454− , HUnit, kan-extensions, mtl, nats, parallel, profunctors
2452+ , hashable, HUnit, kan-extensions, mtl, nats, parallel, profunctors
2455 , QuickCheck, reflection, semigroupoids, semigroups, simple-reflect
2453 , QuickCheck, reflection, semigroupoids, semigroups, simple-reflect
2456 , tagged, template-haskell, test-framework, test-framework-hunit
2454 , tagged, template-haskell, test-framework, test-framework-hunit
2457 , test-framework-quickcheck2, test-framework-th, text
2455 , test-framework-quickcheck2, test-framework-th, text
@@ -2460,8 +2458,10 @@ self: {
2460 }:
2458 }:
2461 mkDerivation {
2459 mkDerivation {
2462 pname = "lens";
2460 pname = "lens";
2463− version = "4.15.4";
2461+ version = "4.16.1";
2464− sha256 = "1lkwlnhgpgnsz046mw4qs0fa7h4l012gilrr3nf3spllsy3pnbkl";
2462+ sha256 = "1im4drhbydbawd6i0jsrzpqihnmx4ywpkg7yg94ddwsw3mxwkgpm";
2463+ revision = "2";
2464+ editedCabalFile = "11h83lj5mba4grhz1qx3irz10ysm9c3k7k6i6xv2cr60q8xin3ri";
2465 setupHaskellDepends = [ base Cabal cabal-doctest filepath ];
2465 setupHaskellDepends = [ base Cabal cabal-doctest filepath ];
2466 libraryHaskellDepends = [
2466 libraryHaskellDepends = [
2467 array base base-orphans bifunctors bytestring call-stack comonad
2467 array base base-orphans bifunctors bytestring call-stack comonad
@@ -2478,43 +2478,52 @@ self: {
2478 test-framework-quickcheck2 test-framework-th text transformers
2478 test-framework-quickcheck2 test-framework-th text transformers
2479 unordered-containers vector
2479 unordered-containers vector
2480 ];
2480 ];
2481− doHaddock = false;
2481+ benchmarkHaskellDepends = [
2482− doCheck = false;
2482+ base bytestring comonad containers criterion deepseq
2483+ generic-deriving transformers unordered-containers vector
2484+ ];
2483 homepage = "http://github.com/ekmett/lens/";
2485 homepage = "http://github.com/ekmett/lens/";
2484 description = "Lenses, Folds and Traversals";
2486 description = "Lenses, Folds and Traversals";
2485 license = stdenv.lib.licenses.bsd2;
2487 license = stdenv.lib.licenses.bsd2;
2486 }) {};
2488 }) {};
2487 "lifted-async" = callPackage
2489 "lifted-async" = callPackage
2488− ({ mkDerivation, async, base, constraints, HUnit, lifted-base
2490+ ({ mkDerivation, async, base, constraints, criterion, deepseq
2489− , monad-control, mtl, tasty, tasty-hunit, tasty-th
2491+ , HUnit, lifted-base, monad-control, mtl, tasty
2490− , transformers-base
2492+ , tasty-expected-failure, tasty-hunit, tasty-th, transformers-base
2491 }:
2493 }:
2492 mkDerivation {
2494 mkDerivation {
2493 pname = "lifted-async";
2495 pname = "lifted-async";
2494− version = "0.9.3";
2496+ version = "0.10.0.2";
2495− sha256 = "0qdlc64kf02g97rzpragm4943ppy2cx74kbjcpbv32jcyc3q75wp";
2497+ sha256 = "1073r512c1x2m1v0jar9bwqg656slg7jd1jhsyj6m8awgx1l1mwf";
2496 libraryHaskellDepends = [
2498 libraryHaskellDepends = [
2497 async base constraints lifted-base monad-control transformers-base
2499 async base constraints lifted-base monad-control transformers-base
2498 ];
2500 ];
2499 testHaskellDepends = [
2501 testHaskellDepends = [
2500− async base HUnit lifted-base monad-control mtl tasty tasty-hunit
2502+ async base HUnit lifted-base monad-control mtl tasty
2501− tasty-th
2503+ tasty-expected-failure tasty-hunit tasty-th
2502 ];
2504 ];
2503− doHaddock = false;
2505+ benchmarkHaskellDepends = [ async base criterion deepseq ];
2504− doCheck = false;
2505 homepage = "https://github.com/maoe/lifted-async";
2506 homepage = "https://github.com/maoe/lifted-async";
2506 description = "Run lifted IO operations asynchronously and wait for their results";
2507 description = "Run lifted IO operations asynchronously and wait for their results";
2507 license = stdenv.lib.licenses.bsd3;
2508 license = stdenv.lib.licenses.bsd3;
2508 }) {};
2509 }) {};
2509 "lifted-base" = callPackage
2510 "lifted-base" = callPackage
2510− ({ mkDerivation, base, monad-control, transformers-base }:
2511+ ({ mkDerivation, base, criterion, HUnit, monad-control, monad-peel
2512+ , test-framework, test-framework-hunit, transformers
2513+ , transformers-base, transformers-compat
2514+ }:
2511 mkDerivation {
2515 mkDerivation {
2512 pname = "lifted-base";
2516 pname = "lifted-base";
2513− version = "0.2.3.11";
2517+ version = "0.2.3.12";
2514− sha256 = "1ass00wfa91z5xp2xmm97xrvwm7j5hdkxid5cqvr3xbwrsgpmi4f";
2518+ sha256 = "1i8p8d3rkdh21bhgjjh32vd7qqjr7jq7p59qds0aw2kmargsjd61";
2515 libraryHaskellDepends = [ base monad-control transformers-base ];
2519 libraryHaskellDepends = [ base monad-control transformers-base ];
2516− doHaddock = false;
2520+ testHaskellDepends = [
2517− doCheck = false;
2521+ base HUnit monad-control test-framework test-framework-hunit
2522+ transformers transformers-base transformers-compat
2523+ ];
2524+ benchmarkHaskellDepends = [
2525+ base criterion monad-control monad-peel transformers
2526+ ];
2518 homepage = "https://github.com/basvandijk/lifted-base";
2527 homepage = "https://github.com/basvandijk/lifted-base";
2519 description = "lifted IO operations from the base library";
2528 description = "lifted IO operations from the base library";
2520 license = stdenv.lib.licenses.bsd3;
2529 license = stdenv.lib.licenses.bsd3;
@@ -2527,8 +2536,6 @@ self: {
2527 sha256 = "0d0lwxxgd16is9aw6v3ps4r9prv3dj8xscmm45fvzq3nicjiawcf";
2536 sha256 = "0d0lwxxgd16is9aw6v3ps4r9prv3dj8xscmm45fvzq3nicjiawcf";
2528 libraryHaskellDepends = [ base call-stack transformers ];
2537 libraryHaskellDepends = [ base call-stack transformers ];
2529 testHaskellDepends = [ base hspec ];
2538 testHaskellDepends = [ base hspec ];
2530− doHaddock = false;
2531− doCheck = false;
2532 homepage = "https://github.com/sol/logging-facade#readme";
2539 homepage = "https://github.com/sol/logging-facade#readme";
2533 description = "Simple logging abstraction that allows multiple back-ends";
2540 description = "Simple logging abstraction that allows multiple back-ends";
2534 license = stdenv.lib.licenses.mit;
2541 license = stdenv.lib.licenses.mit;
@@ -2540,21 +2547,21 @@ self: {
2540 version = "0.6.0.2";
2547 version = "0.6.0.2";
2541 sha256 = "07hnirv6snnym2r7iijlfz00b60jpy2856zvqxh989q0in7bd0hi";
2548 sha256 = "07hnirv6snnym2r7iijlfz00b60jpy2856zvqxh989q0in7bd0hi";
2542 libraryHaskellDepends = [ base mtl ];
2549 libraryHaskellDepends = [ base mtl ];
2543− doHaddock = false;
2544− doCheck = false;
2545 homepage = "http://code.haskell.org/~dolio/";
2550 homepage = "http://code.haskell.org/~dolio/";
2546 description = "A backtracking logic-programming monad";
2551 description = "A backtracking logic-programming monad";
2547 license = stdenv.lib.licenses.bsd3;
2552 license = stdenv.lib.licenses.bsd3;
2548 }) {};
2553 }) {};
2549 "lucid" = callPackage
2554 "lucid" = callPackage
2550 ({ mkDerivation, base, bifunctors, blaze-builder, bytestring
2555 ({ mkDerivation, base, bifunctors, blaze-builder, bytestring
2551− , containers, hashable, hspec, HUnit, mmorph, mtl, parsec, text
2556+ , containers, criterion, deepseq, hashable, hspec, HUnit, mmorph
2552− , transformers, unordered-containers
2557+ , mtl, parsec, text, transformers, unordered-containers
2553 }:
2558 }:
2554 mkDerivation {
2559 mkDerivation {
2555 pname = "lucid";
2560 pname = "lucid";
2556− version = "2.9.9";
2561+ version = "2.9.10";
2557− sha256 = "0cqdlm1kamfn8kv3r3vphz16j2xi9yf15kpb6440rhsyvwddbani";
2562+ sha256 = "14238cnrvkbr81hpaqg1r342sryj8k0p6igkwf140s9phfpdzry0";
2563+ revision = "1";
2564+ editedCabalFile = "0n94x2havrvks85z8azsa4pvz33amhb444cias3kfxmkyvypn5ah";
2558 libraryHaskellDepends = [
2565 libraryHaskellDepends = [
2559 base blaze-builder bytestring containers hashable mmorph mtl text
2566 base blaze-builder bytestring containers hashable mmorph mtl text
2560 transformers unordered-containers
2567 transformers unordered-containers
@@ -2562,8 +2569,9 @@ self: {
2562 testHaskellDepends = [
2569 testHaskellDepends = [
2563 base bifunctors hspec HUnit mtl parsec text
2570 base bifunctors hspec HUnit mtl parsec text
2564 ];
2571 ];
2565− doHaddock = false;
2572+ benchmarkHaskellDepends = [
2566− doCheck = false;
2573+ base blaze-builder bytestring criterion deepseq text transformers
2574+ ];
2567 homepage = "https://github.com/chrisdone/lucid";
2575 homepage = "https://github.com/chrisdone/lucid";
2568 description = "Clear to write, read and edit DSL for HTML";
2576 description = "Clear to write, read and edit DSL for HTML";
2569 license = stdenv.lib.licenses.bsd3;
2577 license = stdenv.lib.licenses.bsd3;
@@ -2585,62 +2593,82 @@ self: {
2585 test-framework-hunit test-framework-quickcheck2 vector
2593 test-framework-hunit test-framework-quickcheck2 vector
2586 vector-th-unbox
2594 vector-th-unbox
2587 ];
2595 ];
2588− doHaddock = false;
2589 doCheck = false;
2596 doCheck = false;
2590 homepage = "https://github.com/bos/math-functions";
2597 homepage = "https://github.com/bos/math-functions";
2591 description = "Special functions and Chebyshev polynomials";
2598 description = "Special functions and Chebyshev polynomials";
2592 license = stdenv.lib.licenses.bsd3;
2599 license = stdenv.lib.licenses.bsd3;
2593 }) {};
2600 }) {};
2594 "megaparsec" = callPackage
2601 "megaparsec" = callPackage
2595− ({ mkDerivation, base, bytestring, containers, deepseq, exceptions
2602+ ({ mkDerivation, base, bytestring, case-insensitive, containers
2603+ , criterion, deepseq, hspec, hspec-discover, hspec-expectations
2596− , hspec, hspec-expectations, mtl, QuickCheck, scientific, text
2604+ , mtl, parser-combinators, QuickCheck, scientific, text
2597− , transformers
2605+ , transformers, weigh
2598 }:
2606 }:
2599 mkDerivation {
2607 mkDerivation {
2600 pname = "megaparsec";
2608 pname = "megaparsec";
2601− version = "5.3.1";
2609+ version = "6.5.0";
2602− sha256 = "06myn8l6jcbd494i3wr6q27npbbxd6c2gfkd2jdzwbjqjqbpv0j8";
2610+ sha256 = "12iggy7qpf8x93jm64zf0g215xwy779bqyfyjk2bhmxqqr1yzgdy";
2611+ revision = "2";
2612+ editedCabalFile = "0ahvqr29ym3g46yv2jxniccyn1ng1yqicqdbamkzm89gjnxd9n25";
2603 libraryHaskellDepends = [
2613 libraryHaskellDepends = [
2604− base bytestring containers deepseq exceptions mtl QuickCheck
2614+ base bytestring case-insensitive containers deepseq mtl
2605− scientific text transformers
2615+ parser-combinators scientific text transformers
2606 ];
2616 ];
2607 testHaskellDepends = [
2617 testHaskellDepends = [
2608− base bytestring containers exceptions hspec hspec-expectations mtl
2618+ base bytestring containers hspec hspec-expectations mtl QuickCheck
2609− QuickCheck scientific text transformers
2619+ scientific text transformers
2610 ];
2620 ];
2611− doHaddock = false;
2621+ testToolDepends = [ hspec-discover ];
2612− doCheck = false;
2622+ benchmarkHaskellDepends = [ base criterion deepseq text weigh ];
2613 homepage = "https://github.com/mrkkrp/megaparsec";
2623 homepage = "https://github.com/mrkkrp/megaparsec";
2614 description = "Monadic parser combinators";
2624 description = "Monadic parser combinators";
2615 license = stdenv.lib.licenses.bsd2;
2625 license = stdenv.lib.licenses.bsd2;
2616 }) {};
2626 }) {};
2617 "memory" = callPackage
2627 "memory" = callPackage
2618− ({ mkDerivation, base, basement, bytestring, deepseq, ghc-prim
2628+ ({ mkDerivation, base, basement, bytestring, deepseq, foundation
2619− , tasty, tasty-hunit, tasty-quickcheck
2629+ , ghc-prim
2620 }:
2630 }:
2621 mkDerivation {
2631 mkDerivation {
2622 pname = "memory";
2632 pname = "memory";
2623− version = "0.14.9";
2633+ version = "0.14.16";
2624− sha256 = "1v8fjw0dgnyw6jhrpzfyxf63ky1lyrfapb8x28lj25q2xw6zx8s5";
2634+ sha256 = "03rbszi5d4z9rlbfv8ydrl1xf84xsh8z57g07f7j9qccn9587c3v";
2625 libraryHaskellDepends = [
2635 libraryHaskellDepends = [
2626− base basement bytestring deepseq ghc-prim
2636+ base basement bytestring deepseq foundation ghc-prim
2627 ];
2637 ];
2628− testHaskellDepends = [ base tasty tasty-hunit tasty-quickcheck ];
2638+ testHaskellDepends = [ base basement bytestring foundation ];
2629− doHaddock = false;
2630− doCheck = false;
2631 homepage = "https://github.com/vincenthz/hs-memory";
2639 homepage = "https://github.com/vincenthz/hs-memory";
2632 description = "memory and related abstraction stuff";
2640 description = "memory and related abstraction stuff";
2633 license = stdenv.lib.licenses.bsd3;
2641 license = stdenv.lib.licenses.bsd3;
2634 }) {};
2642 }) {};
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+ }) {};
2635 "mime-types" = callPackage
2665 "mime-types" = callPackage
2636 ({ mkDerivation, base, bytestring, containers, text }:
2666 ({ mkDerivation, base, bytestring, containers, text }:
2637 mkDerivation {
2667 mkDerivation {
2638 pname = "mime-types";
2668 pname = "mime-types";
2639− version = "0.1.0.7";
2669+ version = "0.1.0.8";
2640− sha256 = "1fg9cqpp5lswk8ajlq4f41n12c2v2naz179l8dsz6zisjqj4l5l3";
2670+ sha256 = "14ccl2842ya17zyj0bpc7vzklbyqvvydpbypn69h2fmhgji192x8";
2641 libraryHaskellDepends = [ base bytestring containers text ];
2671 libraryHaskellDepends = [ base bytestring containers text ];
2642− doHaddock = false;
2643− doCheck = false;
2644 homepage = "https://github.com/yesodweb/wai";
2672 homepage = "https://github.com/yesodweb/wai";
2645 description = "Basic mime-type handling types and functions";
2673 description = "Basic mime-type handling types and functions";
2646 license = stdenv.lib.licenses.mit;
2674 license = stdenv.lib.licenses.mit;
@@ -2649,15 +2677,11 @@ self: {
2649 ({ mkDerivation, base, mtl, transformers, transformers-compat }:
2677 ({ mkDerivation, base, mtl, transformers, transformers-compat }:
2650 mkDerivation {
2678 mkDerivation {
2651 pname = "mmorph";
2679 pname = "mmorph";
2652− version = "1.0.9";
2680+ version = "1.1.2";
2653− sha256 = "0qs5alhy719a14lrs7rnh2qsn1146czg68gvgylf4m5jh4w7vwp1";
2681+ sha256 = "1gjz1ib968lqybma7my1n19qq6cdj6a7nskrlnwy4jy9jrwzs2n9";
2654− revision = "1";
2655− editedCabalFile = "1xxf78qi08qsis2q785s0ra29wjxnxw8pyns0dsqp4a6cybd3mjd";
2656 libraryHaskellDepends = [
2682 libraryHaskellDepends = [
2657 base mtl transformers transformers-compat
2683 base mtl transformers transformers-compat
2658 ];
2684 ];
2659− doHaddock = false;
2660− doCheck = false;
2661 description = "Monad morphisms";
2685 description = "Monad morphisms";
2662 license = stdenv.lib.licenses.bsd3;
2686 license = stdenv.lib.licenses.bsd3;
2663 }) {};
2687 }) {};
@@ -2677,8 +2701,6 @@ self: {
2677 base base-compat bytestring directory filepath hspec logging-facade
2701 base base-compat bytestring directory filepath hspec logging-facade
2678 temporary
2702 temporary
2679 ];
2703 ];
2680− doHaddock = false;
2681− doCheck = false;
2682 description = "Support functions for automated testing";
2704 description = "Support functions for automated testing";
2683 license = stdenv.lib.licenses.mit;
2705 license = stdenv.lib.licenses.mit;
2684 }) {};
2706 }) {};
@@ -2688,13 +2710,11 @@ self: {
2688 }:
2710 }:
2689 mkDerivation {
2711 mkDerivation {
2690 pname = "monad-control";
2712 pname = "monad-control";
2691− version = "1.0.2.2";
2713+ version = "1.0.2.3";
2692− sha256 = "0cz4ww3vp96crdqrh7w86rzrs7gs8c1z7rq84yxxhbiz28fs4d0y";
2714+ sha256 = "1c92833gr6cadidjdp8mlznkpp8lyxl0w3y7d19y8yi3klc3843c";
2693 libraryHaskellDepends = [
2715 libraryHaskellDepends = [
2694 base stm transformers transformers-base transformers-compat
2716 base stm transformers transformers-base transformers-compat
2695 ];
2717 ];
2696− doHaddock = false;
2697− doCheck = false;
2698 homepage = "https://github.com/basvandijk/monad-control";
2718 homepage = "https://github.com/basvandijk/monad-control";
2699 description = "Lift control operations, like exception catching, through monad transformers";
2719 description = "Lift control operations, like exception catching, through monad transformers";
2700 license = stdenv.lib.licenses.bsd3;
2720 license = stdenv.lib.licenses.bsd3;
@@ -2707,8 +2727,6 @@ self: {
2707 sha256 = "062c2sn3hc8h50p1mhqkpyv6x8dydz2zh3ridvlfjq9nqimszaky";
2727 sha256 = "062c2sn3hc8h50p1mhqkpyv6x8dydz2zh3ridvlfjq9nqimszaky";
2708 libraryHaskellDepends = [ base ];
2728 libraryHaskellDepends = [ base ];
2709 testHaskellDepends = [ base tasty tasty-hunit ];
2729 testHaskellDepends = [ base tasty tasty-hunit ];
2710− doHaddock = false;
2711− doCheck = false;
2712 homepage = "https://github.com/mokus0/monad-loops";
2730 homepage = "https://github.com/mokus0/monad-loops";
2713 description = "Monadic loops";
2731 description = "Monadic loops";
2714 license = stdenv.lib.licenses.publicDomain;
2732 license = stdenv.lib.licenses.publicDomain;
@@ -2733,8 +2751,6 @@ self: {
2733 test-framework-hunit test-framework-quickcheck2 test-framework-th
2751 test-framework-hunit test-framework-quickcheck2 test-framework-th
2734 time
2752 time
2735 ];
2753 ];
2736− doHaddock = false;
2737− doCheck = false;
2738 homepage = "https://github.com/simonmar/monad-par";
2754 homepage = "https://github.com/simonmar/monad-par";
2739 description = "A library for parallel programming based on a monad";
2755 description = "A library for parallel programming based on a monad";
2740 license = stdenv.lib.licenses.bsd3;
2756 license = stdenv.lib.licenses.bsd3;
@@ -2750,69 +2766,39 @@ self: {
2750 libraryHaskellDepends = [
2766 libraryHaskellDepends = [
2751 abstract-par base cereal deepseq mtl random transformers
2767 abstract-par base cereal deepseq mtl random transformers
2752 ];
2768 ];
2753− doHaddock = false;
2754− doCheck = false;
2755 homepage = "https://github.com/simonmar/monad-par";
2769 homepage = "https://github.com/simonmar/monad-par";
2756 description = "Combinators and extra features for Par monads";
2770 description = "Combinators and extra features for Par monads";
2757 license = stdenv.lib.licenses.bsd3;
2771 license = stdenv.lib.licenses.bsd3;
2758 }) {};
2772 }) {};
2759− "monad-unlift" = callPackage
2773+ "monad-peel" = callPackage
2760− ({ mkDerivation, base, constraints, monad-control, transformers
2774+ ({ mkDerivation, base, extensible-exceptions, HUnit, test-framework
2761− , transformers-base
2775+ , test-framework-hunit, transformers
2762 }:
2776 }:
2763 mkDerivation {
2777 mkDerivation {
2764− pname = "monad-unlift";
2778+ pname = "monad-peel";
2765− version = "0.2.0";
2779+ version = "0.2.1.2";
2766− sha256 = "03zf2nd00ds12rrbp3qn7pr9vaw1npzswrzcnhc1k0p436366pjb";
2780+ sha256 = "1x1kr5pk8ksw8xcm19c50jx8m0crf3m3qp73k31dnl9r1w4ykm9d";
2767 libraryHaskellDepends = [
2781 libraryHaskellDepends = [
2768− base constraints monad-control transformers transformers-base
2782+ base extensible-exceptions transformers
2769 ];
2783 ];
2770− doHaddock = false;
2784+ testHaskellDepends = [
2771− doCheck = false;
2785+ base extensible-exceptions HUnit test-framework
2772− homepage = "https://github.com/fpco/monad-unlift";
2786+ test-framework-hunit transformers
2773− description = "Typeclasses for representing monad transformer unlifting";
2774− license = stdenv.lib.licenses.mit;
2775− }) {};
2776− "monad-unlift-ref" = callPackage
2777− ({ mkDerivation, base, constraints, exceptions, monad-control
2778− , monad-unlift, mtl, mutable-containers, resourcet, stm
2779− , transformers, transformers-base
2780− }:
2781− mkDerivation {
2782− pname = "monad-unlift-ref";
2783− version = "0.2.1";
2784− sha256 = "078xjz3a6rgqqgf8zg9ngspixf9pgch845l6gs5ssy3l54wra18g";
2785− libraryHaskellDepends = [
2786− base constraints exceptions monad-control monad-unlift mtl
2787− mutable-containers resourcet stm transformers transformers-base
2788 ];
2787 ];
2789− doHaddock = false;
2788+ homepage = "http://andersk.mit.edu/haskell/monad-peel/";
2790− doCheck = false;
2789+ description = "Lift control operations like exception catching through monad transformers";
2791− homepage = "https://github.com/fpco/monad-unlift";
2792− description = "Typeclasses for representing monad transformer unlifting";
2793− license = stdenv.lib.licenses.mit;
2794− }) {};
2795− "monads-tf" = callPackage
2796− ({ mkDerivation, base, transformers }:
2797− mkDerivation {
2798− pname = "monads-tf";
2799− version = "0.1.0.3";
2800− sha256 = "1wdhskwa6dw8qljbvwpyxj8ca6y95q2np7z4y4q6bpf4anmd5794";
2801− libraryHaskellDepends = [ base transformers ];
2802− doHaddock = false;
2803− doCheck = false;
2804− description = "Monad classes, using type families";
2805 license = stdenv.lib.licenses.bsd3;
2790 license = stdenv.lib.licenses.bsd3;
2806 }) {};
2791 }) {};
2807 "mono-traversable" = callPackage
2792 "mono-traversable" = callPackage
2808− ({ mkDerivation, base, bytestring, containers, foldl, hashable
2793+ ({ mkDerivation, base, bytestring, containers, foldl, gauge
2809− , hspec, HUnit, QuickCheck, semigroups, split, text, transformers
2794+ , hashable, hspec, HUnit, mwc-random, QuickCheck, semigroups, split
2810− , unordered-containers, vector, vector-algorithms
2795+ , text, transformers, unordered-containers, vector
2796+ , vector-algorithms
2811 }:
2797 }:
2812 mkDerivation {
2798 mkDerivation {
2813 pname = "mono-traversable";
2799 pname = "mono-traversable";
2814− version = "1.0.4.0";
2800+ version = "1.0.8.1";
2815− sha256 = "0qwmzjf25gradzajr4f9zw3a48m4hw26qvqnb134daqkyxpkzf13";
2801+ sha256 = "0d9r6z3a8gkhl1j5yq8hjg5wcndi5yixxm9xwbrf4z6pgdwr04lr";
2816 libraryHaskellDepends = [
2802 libraryHaskellDepends = [
2817 base bytestring containers hashable split text transformers
2803 base bytestring containers hashable split text transformers
2818 unordered-containers vector vector-algorithms
2804 unordered-containers vector vector-algorithms
@@ -2821,9 +2807,8 @@ self: {
2821 base bytestring containers foldl hspec HUnit QuickCheck semigroups
2807 base bytestring containers foldl hspec HUnit QuickCheck semigroups
2822 text transformers unordered-containers vector
2808 text transformers unordered-containers vector
2823 ];
2809 ];
2824− doHaddock = false;
2810+ benchmarkHaskellDepends = [ base gauge mwc-random vector ];
2825− doCheck = false;
2826− homepage = "https://github.com/snoyberg/mono-traversable";
2811+ homepage = "https://github.com/snoyberg/mono-traversable#readme";
2827 description = "Type classes for mapping, folding, and traversing monomorphic containers";
2812 description = "Type classes for mapping, folding, and traversing monomorphic containers";
2828 license = stdenv.lib.licenses.mit;
2813 license = stdenv.lib.licenses.mit;
2829 }) {};
2814 }) {};
@@ -2840,8 +2825,6 @@ self: {
2840 base comonad containers dlist dlist-instances mono-traversable
2825 base comonad containers dlist dlist-instances mono-traversable
2841 semigroupoids semigroups transformers vector-instances
2826 semigroupoids semigroups transformers vector-instances
2842 ];
2827 ];
2843− doHaddock = false;
2844− doCheck = false;
2845 homepage = "https://github.com/snoyberg/mono-traversable#readme";
2828 homepage = "https://github.com/snoyberg/mono-traversable#readme";
2846 description = "Extra typeclass instances for mono-traversable";
2829 description = "Extra typeclass instances for mono-traversable";
2847 license = stdenv.lib.licenses.mit;
2830 license = stdenv.lib.licenses.mit;
@@ -2850,55 +2833,41 @@ self: {
2850 ({ mkDerivation, base, transformers }:
2833 ({ mkDerivation, base, transformers }:
2851 mkDerivation {
2834 mkDerivation {
2852 pname = "mtl";
2835 pname = "mtl";
2853− version = "2.2.1";
2836+ version = "2.2.2";
2854− sha256 = "1icdbj2rshzn0m1zz5wa7v3xvkf6qw811p4s7jgqwvx1ydwrvrfa";
2837+ sha256 = "1xmy5741h8cyy0d91ahvqdz2hykkk20l8br7lg1rccnkis5g80w8";
2855− revision = "1";
2856− editedCabalFile = "0fsa965g9h23mlfjzghmmhcb9dmaq8zpm374gby6iwgdx47q0njb";
2857 libraryHaskellDepends = [ base transformers ];
2838 libraryHaskellDepends = [ base transformers ];
2858− doHaddock = false;
2859− doCheck = false;
2860− homepage = "http://github.com/ekmett/mtl";
2839+ homepage = "http://github.com/haskell/mtl";
2861 description = "Monad classes, using functional dependencies";
2840 description = "Monad classes, using functional dependencies";
2862 license = stdenv.lib.licenses.bsd3;
2841 license = stdenv.lib.licenses.bsd3;
2863 }) {};
2842 }) {};
2864 "mutable-containers" = callPackage
2843 "mutable-containers" = callPackage
2865− ({ mkDerivation, base, containers, ghc-prim, hspec
2844+ ({ mkDerivation, base, containers, gauge, ghc-prim, hspec
2866 , mono-traversable, primitive, QuickCheck, vector
2845 , mono-traversable, primitive, QuickCheck, vector
2867 }:
2846 }:
2868 mkDerivation {
2847 mkDerivation {
2869 pname = "mutable-containers";
2848 pname = "mutable-containers";
2870− version = "0.3.3";
2849+ version = "0.3.4";
2871− sha256 = "1svwa54prfdmhdlmv118lnkwv3jx3rx7v5x30wbdsy39n75kjyks";
2850+ sha256 = "0zhkhlvg9yw45fg3srvzx7j81547djpkfw7higdvlj7fmph6c6b4";
2872 libraryHaskellDepends = [
2851 libraryHaskellDepends = [
2873 base containers ghc-prim mono-traversable primitive vector
2852 base containers ghc-prim mono-traversable primitive vector
2874 ];
2853 ];
2875 testHaskellDepends = [
2854 testHaskellDepends = [
2876 base containers hspec primitive QuickCheck vector
2855 base containers hspec primitive QuickCheck vector
2877 ];
2856 ];
2878− doHaddock = false;
2857+ benchmarkHaskellDepends = [ base containers gauge vector ];
2879− doCheck = false;
2880− homepage = "https://github.com/snoyberg/mono-traversable";
2858+ homepage = "https://github.com/snoyberg/mono-traversable#readme";
2881 description = "Abstactions and concrete implementations of mutable containers";
2859 description = "Abstactions and concrete implementations of mutable containers";
2882 license = stdenv.lib.licenses.mit;
2860 license = stdenv.lib.licenses.mit;
2883 }) {};
2861 }) {};
2884 "mwc-random" = callPackage
2862 "mwc-random" = callPackage
2885− ({ mkDerivation, base, HUnit, math-functions, primitive, QuickCheck
2863+ ({ mkDerivation, base, math-functions, primitive, time, vector }:
2886− , statistics, test-framework, test-framework-hunit
2887− , test-framework-quickcheck2, time, vector
2888− }:
2889 mkDerivation {
2864 mkDerivation {
2890 pname = "mwc-random";
2865 pname = "mwc-random";
2891 version = "0.13.6.0";
2866 version = "0.13.6.0";
2892 sha256 = "05j7yh0hh9nxic3dijmzv44kc6gzclvamdph7sq7w19wq57k6pq6";
2867 sha256 = "05j7yh0hh9nxic3dijmzv44kc6gzclvamdph7sq7w19wq57k6pq6";
2893− libraryHaskellDepends = [
2868+ libraryHaskellDepends = [
2894− base math-functions primitive time vector
2869+ base math-functions primitive time vector
2895− ];
2896− testHaskellDepends = [
2897− base HUnit QuickCheck statistics test-framework
2898− test-framework-hunit test-framework-quickcheck2 vector
2899 ];
2870 ];
2900− doHaddock = false;
2901− doCheck = false;
2902 homepage = "https://github.com/bos/mwc-random";
2871 homepage = "https://github.com/bos/mwc-random";
2903 description = "Fast, high quality pseudo random number generation";
2872 description = "Fast, high quality pseudo random number generation";
2904 license = stdenv.lib.licenses.bsd3;
2873 license = stdenv.lib.licenses.bsd3;
@@ -2907,12 +2876,11 @@ self: {
2907 ({ mkDerivation, base, hspec, silently }:
2876 ({ mkDerivation, base, hspec, silently }:
2908 mkDerivation {
2877 mkDerivation {
2909 pname = "nanospec";
2878 pname = "nanospec";
2910− version = "0.2.1";
2879+ version = "0.2.2";
2911− sha256 = "0jq2l1lmy4hcl6r975xcg86xr1y7jfxr3qn27ibsmjbzlnxdkjyv";
2880+ sha256 = "1rcmhl9bhyfvanalnf1r86wkx6rq6wdvagnw1h011jcnnb1cq56g";
2912 libraryHaskellDepends = [ base ];
2881 libraryHaskellDepends = [ base ];
2913 testHaskellDepends = [ base hspec silently ];
2882 testHaskellDepends = [ base hspec silently ];
2914− doHaddock = false;
2883+ homepage = "https://github.com/hspec/nanospec#readme";
2915− doCheck = false;
2916 description = "A lightweight implementation of a subset of Hspec's API";
2884 description = "A lightweight implementation of a subset of Hspec's API";
2917 license = stdenv.lib.licenses.mit;
2885 license = stdenv.lib.licenses.mit;
2918 }) {};
2886 }) {};
@@ -2920,29 +2888,23 @@ self: {
2920 ({ mkDerivation }:
2888 ({ mkDerivation }:
2921 mkDerivation {
2889 mkDerivation {
2922 pname = "nats";
2890 pname = "nats";
2923− version = "1.1.1";
2891+ version = "1.1.2";
2924− sha256 = "1kfl2yy97nb7q0j17v96rl73xvi3z4db9bk0xychc76dax41n78k";
2892+ sha256 = "1v40drmhixck3pz3mdfghamh73l4rp71mzcviipv1y8jhrfxilmr";
2893+ revision = "1";
2894+ editedCabalFile = "1jzyysf758lfindlclqpzqcd0lrgrdv0rnz2lg8g1rvv07x2n7zh";
2925 doHaddock = false;
2895 doHaddock = false;
2926− doCheck = false;
2927 homepage = "http://github.com/ekmett/nats/";
2896 homepage = "http://github.com/ekmett/nats/";
2928 description = "Natural numbers";
2897 description = "Natural numbers";
2929 license = stdenv.lib.licenses.bsd3;
2898 license = stdenv.lib.licenses.bsd3;
2930 }) {};
2899 }) {};
2931 "network" = callPackage
2900 "network" = callPackage
2932− ({ mkDerivation, base, bytestring, doctest, HUnit, test-framework
2901+ ({ mkDerivation, base, bytestring, doctest, hspec, HUnit, unix }:
2933− , test-framework-hunit, unix
2934− }:
2935 mkDerivation {
2902 mkDerivation {
2936 pname = "network";
2903 pname = "network";
2937− version = "2.6.3.2";
2904+ version = "2.6.3.6";
2938− sha256 = "1dn092zfqmxfbzln6d0khka4gizzjivf2yja9w9hwb5g9q3pfi1m";
2905+ sha256 = "198mam7ahny48p9fajznbqq16a8ya2gw0xm3gnm1si1rmc4hdplv";
2939− revision = "1";
2940− editedCabalFile = "17234sy0vqic8g9wg8gmfmc0by50scjwbdk8bkcl9kjf3fvs4nyx";
2941 libraryHaskellDepends = [ base bytestring unix ];
2906 libraryHaskellDepends = [ base bytestring unix ];
2942− testHaskellDepends = [
2907+ testHaskellDepends = [ base bytestring doctest hspec HUnit ];
2943− base bytestring doctest HUnit test-framework test-framework-hunit
2944− ];
2945− doHaddock = false;
2946 doCheck = false;
2908 doCheck = false;
2947 homepage = "https://github.com/haskell/network";
2909 homepage = "https://github.com/haskell/network";
2948 description = "Low-level networking interface";
2910 description = "Low-level networking interface";
@@ -2963,8 +2925,6 @@ self: {
2963 base HUnit test-framework test-framework-hunit
2925 base HUnit test-framework test-framework-hunit
2964 test-framework-quickcheck2
2926 test-framework-quickcheck2
2965 ];
2927 ];
2966− doHaddock = false;
2967− doCheck = false;
2968 homepage = "https://github.com/haskell/network-uri";
2928 homepage = "https://github.com/haskell/network-uri";
2969 description = "URI manipulation";
2929 description = "URI manipulation";
2970 license = stdenv.lib.licenses.bsd3;
2930 license = stdenv.lib.licenses.bsd3;
@@ -2978,8 +2938,6 @@ self: {
2978 revision = "2";
2938 revision = "2";
2979 editedCabalFile = "04b9vn007hlvsrx4ksd3r8r3kbyaj2kvwxchdrmd4370qzi8p6gs";
2939 editedCabalFile = "04b9vn007hlvsrx4ksd3r8r3kbyaj2kvwxchdrmd4370qzi8p6gs";
2980 libraryHaskellDepends = [ base ];
2940 libraryHaskellDepends = [ base ];
2981− doHaddock = false;
2982− doCheck = false;
2983 description = "locale library";
2941 description = "locale library";
2984 license = stdenv.lib.licenses.bsd3;
2942 license = stdenv.lib.licenses.bsd3;
2985 }) {};
2943 }) {};
@@ -2992,95 +2950,78 @@ self: {
2992 revision = "2";
2950 revision = "2";
2993 editedCabalFile = "1j6ln1dkvhdvnwl33bp0xf9lhc4sybqk0aw42p8cq81xwwzbn7y9";
2951 editedCabalFile = "1j6ln1dkvhdvnwl33bp0xf9lhc4sybqk0aw42p8cq81xwwzbn7y9";
2994 libraryHaskellDepends = [ base old-locale ];
2952 libraryHaskellDepends = [ base old-locale ];
2995− doHaddock = false;
2996− doCheck = false;
2997 description = "Time library";
2953 description = "Time library";
2998 license = stdenv.lib.licenses.bsd3;
2954 license = stdenv.lib.licenses.bsd3;
2999 }) {};
2955 }) {};
3000− "options" = callPackage
3001− ({ mkDerivation, base, containers, monads-tf, transformers }:
3002− mkDerivation {
3003− pname = "options";
3004− version = "1.2.1.1";
3005− sha256 = "0qjs0v1ny52w51n5582d4z8wy9h6n0zw1xb5dh686ff5wadflgi8";
3006− libraryHaskellDepends = [ base containers monads-tf transformers ];
3007− doHaddock = false;
3008− doCheck = false;
3009− homepage = "https://john-millikin.com/software/haskell-options/";
3010− description = "A powerful and easy-to-use command-line option parser";
3011− license = stdenv.lib.licenses.mit;
3012− }) {};
3013 "optparse-applicative" = callPackage
2956 "optparse-applicative" = callPackage
3014− ({ mkDerivation, ansi-wl-pprint, base, process, QuickCheck
2957+ ({ mkDerivation, ansi-wl-pprint, base, bytestring, process
3015− , transformers, transformers-compat
2958+ , QuickCheck, transformers, transformers-compat
3016 }:
2959 }:
3017 mkDerivation {
2960 mkDerivation {
3018 pname = "optparse-applicative";
2961 pname = "optparse-applicative";
3019− version = "0.13.2.0";
2962+ version = "0.14.2.0";
3020− sha256 = "18kcjldpzay3k3309rvb9vqrp5b1gqp0hgymynqx7x2kgv7cz0sw";
2963+ sha256 = "0c3z1mvynlyv1garjbdmdd3npm40dabgm75js4r07cf766c1wd71";
3021 libraryHaskellDepends = [
2964 libraryHaskellDepends = [
3022 ansi-wl-pprint base process transformers transformers-compat
2965 ansi-wl-pprint base process transformers transformers-compat
3023 ];
2966 ];
3024− testHaskellDepends = [ base QuickCheck ];
2967+ testHaskellDepends = [ base bytestring QuickCheck ];
3025− doHaddock = false;
3026− doCheck = false;
3027 homepage = "https://github.com/pcapriotti/optparse-applicative";
2968 homepage = "https://github.com/pcapriotti/optparse-applicative";
3028 description = "Utilities and combinators for parsing command line options";
2969 description = "Utilities and combinators for parsing command line options";
3029 license = stdenv.lib.licenses.bsd3;
2970 license = stdenv.lib.licenses.bsd3;
3030 }) {};
2971 }) {};
3031 "optparse-simple" = callPackage
2972 "optparse-simple" = callPackage
3032− ({ mkDerivation, base, bytestring, directory, either, gitrev
2973+ ({ mkDerivation, base, bytestring, directory, gitrev
3033 , optparse-applicative, template-haskell, transformers
2974 , optparse-applicative, template-haskell, transformers
3034 }:
2975 }:
3035 mkDerivation {
2976 mkDerivation {
3036 pname = "optparse-simple";
2977 pname = "optparse-simple";
3037− version = "0.0.4";
2978+ version = "0.1.0";
3038− sha256 = "1md24dlz6949rqv6y2x9d5r07lrqw42c21kdy09nk5y8r3mq43x0";
2979+ sha256 = "1g2cf4pcf1fa001z77g8gwnx0cxdpqs1iw9xp0kb9qrxm9gpk3c3";
3039 libraryHaskellDepends = [
2980 libraryHaskellDepends = [
3040− base either gitrev optparse-applicative template-haskell
2981+ base gitrev optparse-applicative template-haskell transformers
3041− transformers
3042 ];
2982 ];
3043 testHaskellDepends = [ base bytestring directory ];
2983 testHaskellDepends = [ base bytestring directory ];
3044− doHaddock = false;
2984+ homepage = "https://github.com/fpco/optparse-simple#readme";
3045− doCheck = false;
3046 description = "Simple interface to optparse-applicative";
2985 description = "Simple interface to optparse-applicative";
3047 license = stdenv.lib.licenses.bsd3;
2986 license = stdenv.lib.licenses.bsd3;
3048 }) {};
2987 }) {};
3049 "parallel" = callPackage
2988 "parallel" = callPackage
3050− ({ mkDerivation, array, base, containers, deepseq }:
2989+ ({ mkDerivation, array, base, containers, deepseq, ghc-prim }:
3051 mkDerivation {
2990 mkDerivation {
3052 pname = "parallel";
2991 pname = "parallel";
3053− version = "3.2.1.1";
2992+ version = "3.2.2.0";
3054− sha256 = "05rw8zhpqhx31zi6vg7zpyciaarh24j7g2p613xrpyrnksybjfrj";
2993+ sha256 = "1xkfi96w6yfpppd0nw1rnszdxmvifwzm699ilv6332ra3akm610p";
3055− libraryHaskellDepends = [ array base containers deepseq ];
2994+ libraryHaskellDepends = [ array base containers deepseq ghc-prim ];
3056− doHaddock = false;
3057− doCheck = false;
3058 description = "Parallel programming library";
2995 description = "Parallel programming library";
3059 license = stdenv.lib.licenses.bsd3;
2996 license = stdenv.lib.licenses.bsd3;
3060 }) {};
2997 }) {};
3061 "parsec" = callPackage
2998 "parsec" = callPackage
3062− ({ mkDerivation, base, bytestring, mtl, text }:
2999+ ({ mkDerivation, base, bytestring, HUnit, mtl, test-framework
3000+ , test-framework-hunit, text
3001+ }:
3063 mkDerivation {
3002 mkDerivation {
3064 pname = "parsec";
3003 pname = "parsec";
3065− version = "3.1.11";
3004+ version = "3.1.13.0";
3066− sha256 = "0vk7q9j2128q191zf1sg0ylj9s9djwayqk9747k0a5fin4f2b1vg";
3005+ sha256 = "1wc09pyn70p8z6llink10c8pqbh6ikyk554911yfwxv1g91swqbq";
3006+ revision = "1";
3007+ editedCabalFile = "1dpr1wfpykkl6kayp4wnyn0n1zv7pvqksax2i54dhdgjijj8qynd";
3067 libraryHaskellDepends = [ base bytestring mtl text ];
3008 libraryHaskellDepends = [ base bytestring mtl text ];
3068− doHaddock = false;
3009+ testHaskellDepends = [
3069− doCheck = false;
3010+ base HUnit mtl test-framework test-framework-hunit
3011+ ];
3070− homepage = "https://github.com/aslatter/parsec";
3012+ homepage = "https://github.com/hvr/parsec";
3071 description = "Monadic parser combinators";
3013 description = "Monadic parser combinators";
3072 license = stdenv.lib.licenses.bsd3;
3014 license = stdenv.lib.licenses.bsd3;
3073 }) {};
3015 }) {};
3074− "patience" = callPackage
3016+ "parser-combinators" = callPackage
3075− ({ mkDerivation, base, containers }:
3017+ ({ mkDerivation, base }:
3076 mkDerivation {
3018 mkDerivation {
3077− pname = "patience";
3019+ pname = "parser-combinators";
3078− version = "0.1.1";
3020+ version = "1.0.0";
3079− sha256 = "0qyv20gqy9pb1acy700ahv70lc6vprcwb26cc7fcpcs4scsc7irm";
3021+ sha256 = "1pwfdsklqwvaynwpdzmx1bs35mp6dpsyaqdnzxnqcrxwf5h8sk75";
3080− libraryHaskellDepends = [ base containers ];
3022+ libraryHaskellDepends = [ base ];
3081− doHaddock = false;
3023+ homepage = "https://github.com/mrkkrp/parser-combinators";
3082− doCheck = false;
3024+ description = "Lightweight package providing commonly useful parser combinators";
3083− description = "Patience diff and longest increasing subsequence";
3084 license = stdenv.lib.licenses.bsd3;
3025 license = stdenv.lib.licenses.bsd3;
3085 }) {};
3026 }) {};
3086 "pcre-light" = callPackage
3027 "pcre-light" = callPackage
@@ -3091,29 +3032,24 @@ self: {
3091 sha256 = "0xcyi1fivwg7a92mch5bcqzmrfxzqj42rmb3m8kgs61x4qwpxj82";
3032 sha256 = "0xcyi1fivwg7a92mch5bcqzmrfxzqj42rmb3m8kgs61x4qwpxj82";
3092 libraryHaskellDepends = [ base bytestring ];
3033 libraryHaskellDepends = [ base bytestring ];
3093 libraryPkgconfigDepends = [ pcre ];
3034 libraryPkgconfigDepends = [ pcre ];
3094− doHaddock = false;
3095− doCheck = false;
3096 homepage = "https://github.com/Daniel-Diaz/pcre-light";
3035 homepage = "https://github.com/Daniel-Diaz/pcre-light";
3097 description = "Portable regex library for Perl 5 compatible regular expressions";
3036 description = "Portable regex library for Perl 5 compatible regular expressions";
3098 license = stdenv.lib.licenses.bsd3;
3037 license = stdenv.lib.licenses.bsd3;
3099 }) {inherit (pkgs) pcre;};
3038 }) {inherit (pkgs) pcre;};
3100 "pem" = callPackage
3039 "pem" = callPackage
3101− ({ mkDerivation, base, base64-bytestring, bytestring, HUnit, mtl
3040+ ({ mkDerivation, base, basement, bytestring, HUnit, memory
3102 , QuickCheck, test-framework, test-framework-hunit
3041 , QuickCheck, test-framework, test-framework-hunit
3103 , test-framework-quickcheck2
3042 , test-framework-quickcheck2
3104 }:
3043 }:
3105 mkDerivation {
3044 mkDerivation {
3106 pname = "pem";
3045 pname = "pem";
3107− version = "0.2.2";
3046+ version = "0.2.4";
3108− sha256 = "162sk5sg22w21wqz5qv8kx6ibxp99v5p20g3nknhm1kddk3hha1p";
3047+ sha256 = "1m7qjsxrd8m88cvkqmr8kscril500j2a9y0iynvksjyjkhdlq33p";
3109− enableSeparateDataOutput = true;
3110− libraryHaskellDepends = [ base base64-bytestring bytestring mtl ];
3048+ libraryHaskellDepends = [ base basement bytestring memory ];
3111 testHaskellDepends = [
3049 testHaskellDepends = [
3112 base bytestring HUnit QuickCheck test-framework
3050 base bytestring HUnit QuickCheck test-framework
3113 test-framework-hunit test-framework-quickcheck2
3051 test-framework-hunit test-framework-quickcheck2
3114 ];
3052 ];
3115− doHaddock = false;
3116− doCheck = false;
3117 homepage = "http://github.com/vincenthz/hs-pem";
3053 homepage = "http://github.com/vincenthz/hs-pem";
3118 description = "Privacy Enhanced Mail (PEM) format reader and writer";
3054 description = "Privacy Enhanced Mail (PEM) format reader and writer";
3119 license = stdenv.lib.licenses.bsd3;
3055 license = stdenv.lib.licenses.bsd3;
@@ -3125,17 +3061,15 @@ self: {
3125 }:
3061 }:
3126 mkDerivation {
3062 mkDerivation {
3127 pname = "pointed";
3063 pname = "pointed";
3128− version = "5";
3064+ version = "5.0.1";
3129− sha256 = "05sxac90xv4j8glmf2mxs0smmv6vhia0qaaag5v37ar5a6pvh1l9";
3065+ sha256 = "1p91a762xglckscnhpflxzav8byf49a02mli3983i4kpr2jkaimr";
3130 revision = "1";
3066 revision = "1";
3131− editedCabalFile = "170gqax34qch77zzqwq95z2lzq9da8gmfxg1vcll4aphhafwgzzp";
3067+ editedCabalFile = "1ccjmzz3jf5ybrzv7qdwm3qb8rz0yskvi4ackrixyhdk8bg5f3nc";
3132 libraryHaskellDepends = [
3068 libraryHaskellDepends = [
3133 base comonad containers data-default-class hashable kan-extensions
3069 base comonad containers data-default-class hashable kan-extensions
3134 semigroupoids semigroups stm tagged transformers
3070 semigroupoids semigroups stm tagged transformers
3135 transformers-compat unordered-containers
3071 transformers-compat unordered-containers
3136 ];
3072 ];
3137− doHaddock = false;
3138− doCheck = false;
3139 homepage = "http://github.com/ekmett/pointed/";
3073 homepage = "http://github.com/ekmett/pointed/";
3140 description = "Pointed and copointed data";
3074 description = "Pointed and copointed data";
3141 license = stdenv.lib.licenses.bsd3;
3075 license = stdenv.lib.licenses.bsd3;
@@ -3147,43 +3081,36 @@ self: {
3147 version = "1.12";
3081 version = "1.12";
3148 sha256 = "05dya1vdvq29hkhkdlsglzhw7bdn51rvs1javs0q75nf99c66k7m";
3082 sha256 = "05dya1vdvq29hkhkdlsglzhw7bdn51rvs1javs0q75nf99c66k7m";
3149 libraryHaskellDepends = [ base bytestring text ];
3083 libraryHaskellDepends = [ base bytestring text ];
3150− doHaddock = false;
3151− doCheck = false;
3152 homepage = "http://code.haskell.org/~malcolm/polyparse/";
3084 homepage = "http://code.haskell.org/~malcolm/polyparse/";
3153 description = "A variety of alternative parser combinator libraries";
3085 description = "A variety of alternative parser combinator libraries";
3154 license = "LGPL";
3086 license = "LGPL";
3155 }) {};
3087 }) {};
3156− "prelude-extras" = callPackage
3088+ "pretty-hex" = callPackage
3157− ({ mkDerivation, base }:
3089+ ({ mkDerivation, base, bytestring }:
3158 mkDerivation {
3090 mkDerivation {
3159− pname = "prelude-extras";
3091+ pname = "pretty-hex";
3160− version = "0.4.0.3";
3092+ version = "1.0";
3161− sha256 = "0xzqdf3nl2h0ra4gnslm1m1nsxlsgc0hh6ky3vn578vh11zhifq9";
3093+ sha256 = "0ylwkvvjvmpprha9nx83xb8gkhyanhk5fffc0r7lb96n4ch5z6pz";
3162− libraryHaskellDepends = [ base ];
3094+ libraryHaskellDepends = [ base bytestring ];
3163− doHaddock = false;
3095+ description = "A library for hex dumps of ByteStrings";
3164− doCheck = false;
3165− homepage = "http://github.com/ekmett/prelude-extras";
3166− description = "Higher order versions of Prelude classes";
3167 license = stdenv.lib.licenses.bsd3;
3096 license = stdenv.lib.licenses.bsd3;
3168 }) {};
3097 }) {};
3169 "pretty-show" = callPackage
3098 "pretty-show" = callPackage
3170 ({ mkDerivation, array, base, filepath, ghc-prim, happy
3099 ({ mkDerivation, array, base, filepath, ghc-prim, happy
3171− , haskell-lexer, pretty
3100+ , haskell-lexer, pretty, text
3172 }:
3101 }:
3173 mkDerivation {
3102 mkDerivation {
3174 pname = "pretty-show";
3103 pname = "pretty-show";
3175− version = "1.6.13";
3104+ version = "1.7";
3176− sha256 = "1kbx72ybrpw0kh5zsd2kdw143qykbmd9lgmsvj57659y0k5l7fjm";
3105+ sha256 = "0br7pkxqqqhby2j2v1g847lgqsrasx56g1jw3dhmjh4flzs6warq";
3177 isLibrary = true;
3106 isLibrary = true;
3178 isExecutable = true;
3107 isExecutable = true;
3179 enableSeparateDataOutput = true;
3108 enableSeparateDataOutput = true;
3180 libraryHaskellDepends = [
3109 libraryHaskellDepends = [
3181− array base filepath ghc-prim haskell-lexer pretty
3110+ array base filepath ghc-prim haskell-lexer pretty text
3182 ];
3111 ];
3183 libraryToolDepends = [ happy ];
3112 libraryToolDepends = [ happy ];
3184 executableHaskellDepends = [ base ];
3113 executableHaskellDepends = [ base ];
3185− doHaddock = false;
3186− doCheck = false;
3187 homepage = "http://wiki.github.com/yav/pretty-show";
3114 homepage = "http://wiki.github.com/yav/pretty-show";
3188 description = "Tools for working with derived `Show` instances and generic inspection of values";
3115 description = "Tools for working with derived `Show` instances and generic inspection of values";
3189 license = stdenv.lib.licenses.mit;
3116 license = stdenv.lib.licenses.mit;
@@ -3192,32 +3119,28 @@ self: {
3192 ({ mkDerivation, base, ghc-prim, transformers }:
3119 ({ mkDerivation, base, ghc-prim, transformers }:
3193 mkDerivation {
3120 mkDerivation {
3194 pname = "primitive";
3121 pname = "primitive";
3195− version = "0.6.2.0";
3122+ version = "0.6.3.0";
3196− sha256 = "1q9a537av81c0lvcdzc8i5hqjx3209f5448d1smkyaz22c1dgs5q";
3123+ sha256 = "0mcmbnj08wd6zfwn7xk6zf5hy5zwbla5v78pw0dpymqg9s0gzpnd";
3197− revision = "1";
3198− editedCabalFile = "0d61g8ppsdajdqykl2kc46kq00aamsf12v60ilgrf58dbji9sz56";
3199 libraryHaskellDepends = [ base ghc-prim transformers ];
3124 libraryHaskellDepends = [ base ghc-prim transformers ];
3200 testHaskellDepends = [ base ghc-prim ];
3125 testHaskellDepends = [ base ghc-prim ];
3201− doHaddock = false;
3202− doCheck = false;
3203 homepage = "https://github.com/haskell/primitive";
3126 homepage = "https://github.com/haskell/primitive";
3204 description = "Primitive memory-related operations";
3127 description = "Primitive memory-related operations";
3205 license = stdenv.lib.licenses.bsd3;
3128 license = stdenv.lib.licenses.bsd3;
3206 }) {};
3129 }) {};
3207 "profunctors" = callPackage
3130 "profunctors" = callPackage
3208 ({ mkDerivation, base, base-orphans, bifunctors, comonad
3131 ({ mkDerivation, base, base-orphans, bifunctors, comonad
3209− , contravariant, distributive, tagged, transformers
3132+ , contravariant, distributive, semigroups, tagged, transformers
3210 }:
3133 }:
3211 mkDerivation {
3134 mkDerivation {
3212 pname = "profunctors";
3135 pname = "profunctors";
3213− version = "5.2.1";
3136+ version = "5.2.2";
3214− sha256 = "0pcwjp813d3mrzb7qf7dzkspf85xnfj1m2snhjgnvwx6vw07w877";
3137+ sha256 = "0s1pwjidbn761xk43pmzyvn99hm3psdifjd78ylki7f97aiyd0g9";
3138+ revision = "2";
3139+ editedCabalFile = "1ywlg9z8nlhd2avgb8c6gbkv8zyk7hvc25926bafyg0m0k8y1amq";
3215 libraryHaskellDepends = [
3140 libraryHaskellDepends = [
3216 base base-orphans bifunctors comonad contravariant distributive
3141 base base-orphans bifunctors comonad contravariant distributive
3217− tagged transformers
3142+ semigroups tagged transformers
3218 ];
3143 ];
3219− doHaddock = false;
3220− doCheck = false;
3221 homepage = "http://github.com/ekmett/profunctors/";
3144 homepage = "http://github.com/ekmett/profunctors/";
3222 description = "Profunctors";
3145 description = "Profunctors";
3223 license = stdenv.lib.licenses.bsd3;
3146 license = stdenv.lib.licenses.bsd3;
@@ -3229,36 +3152,57 @@ self: {
3229 }:
3152 }:
3230 mkDerivation {
3153 mkDerivation {
3231 pname = "psqueues";
3154 pname = "psqueues";
3232− version = "0.2.4.0";
3155+ version = "0.2.7.0";
3233− sha256 = "1lbjm6mnw91qg1ik73mwh48cq79k4kkaj4l380ilqp0p05a386j9";
3156+ sha256 = "1sjgc9bxh63kkdp59nbirx3xazr02ia5yhp4f4a0jnq1hj465wsc";
3234 libraryHaskellDepends = [ base deepseq ghc-prim hashable ];
3157 libraryHaskellDepends = [ base deepseq ghc-prim hashable ];
3235 testHaskellDepends = [
3158 testHaskellDepends = [
3236 array base deepseq ghc-prim hashable HUnit QuickCheck tagged
3159 array base deepseq ghc-prim hashable HUnit QuickCheck tagged
3237 test-framework test-framework-hunit test-framework-quickcheck2
3160 test-framework test-framework-hunit test-framework-quickcheck2
3238 ];
3161 ];
3239− doHaddock = false;
3240− doCheck = false;
3241 description = "Pure priority search queues";
3162 description = "Pure priority search queues";
3242 license = stdenv.lib.licenses.bsd3;
3163 license = stdenv.lib.licenses.bsd3;
3243 }) {};
3164 }) {};
3165+ "pureMD5" = callPackage
3166+ ({ mkDerivation, base, binary, bytestring, cereal, crypto-api
3167+ , crypto-api-tests, pretty-hex, QuickCheck, tagged, test-framework
3168+ , test-framework-quickcheck2
3169+ }:
3170+ mkDerivation {
3171+ pname = "pureMD5";
3172+ version = "2.1.3";
3173+ sha256 = "0zdilz41cla2ck7mcw1a9702gyg2abq94mqahr4vci9sbs53bwxy";
3174+ libraryHaskellDepends = [
3175+ base binary bytestring cereal crypto-api tagged
3176+ ];
3177+ testHaskellDepends = [
3178+ base binary bytestring cereal crypto-api-tests pretty-hex
3179+ QuickCheck test-framework test-framework-quickcheck2
3180+ ];
3181+ description = "A Haskell-only implementation of the MD5 digest (hash) algorithm";
3182+ license = stdenv.lib.licenses.bsd3;
3183+ }) {};
3244 "quickcheck-instances" = callPackage
3184 "quickcheck-instances" = callPackage
3245− ({ mkDerivation, array, base, bytestring, containers, hashable
3185+ ({ mkDerivation, array, base, base-compat, bytestring
3246− , old-time, QuickCheck, scientific, text, time
3186+ , case-insensitive, containers, hashable, old-time, QuickCheck
3187+ , scientific, tagged, text, time, transformers, transformers-compat
3247− , unordered-containers, vector
3188+ , unordered-containers, uuid-types, vector
3248 }:
3189 }:
3249 mkDerivation {
3190 mkDerivation {
3250 pname = "quickcheck-instances";
3191 pname = "quickcheck-instances";
3251− version = "0.3.12";
3192+ version = "0.3.18";
3252− sha256 = "1wwvkzpams7i0j7nk5qj8vvhj8x5zcbgbgrpczszgvshva4bkmfx";
3193+ sha256 = "1bh1pzz5fdcqvzdcirqxna6fnjms02min5md716299g5niz46w55";
3253− revision = "2";
3194+ revision = "1";
3254− editedCabalFile = "1v1r7gidkjc2v4dw1id57raqnjqv4rc10pa2l6xhhg0dzrnw28a3";
3195+ editedCabalFile = "1sngfq3v71bvgjsl8cj5kh65m3fziwy8dkvwjzs0kxfrzr87faly";
3255 libraryHaskellDepends = [
3196 libraryHaskellDepends = [
3197+ array base base-compat bytestring case-insensitive containers
3256− array base bytestring containers hashable old-time QuickCheck
3198+ hashable old-time QuickCheck scientific tagged text time
3257− scientific text time unordered-containers vector
3199+ transformers transformers-compat unordered-containers uuid-types
3200+ vector
3258 ];
3201 ];
3259− doHaddock = false;
3202+ testHaskellDepends = [
3260− doCheck = false;
3203+ base containers QuickCheck tagged uuid-types
3204+ ];
3261− homepage = "https://github.com/aslatter/qc-instances";
3205+ homepage = "https://github.com/phadej/qc-instances";
3262 description = "Common quickcheck instances";
3206 description = "Common quickcheck instances";
3263 license = stdenv.lib.licenses.bsd3;
3207 license = stdenv.lib.licenses.bsd3;
3264 }) {};
3208 }) {};
@@ -3269,8 +3213,6 @@ self: {
3269 version = "0.2.0";
3213 version = "0.2.0";
3270 sha256 = "08k4v7pkgjf30pv5j2dfv1gqv6hclxlniyq2sps8zq4zswcr2xzv";
3214 sha256 = "08k4v7pkgjf30pv5j2dfv1gqv6hclxlniyq2sps8zq4zswcr2xzv";
3271 libraryHaskellDepends = [ base HUnit QuickCheck ];
3215 libraryHaskellDepends = [ base HUnit QuickCheck ];
3272− doHaddock = false;
3273− doCheck = false;
3274 homepage = "https://github.com/hspec/quickcheck-io#readme";
3216 homepage = "https://github.com/hspec/quickcheck-io#readme";
3275 description = "Use HUnit assertions as QuickCheck properties";
3217 description = "Use HUnit assertions as QuickCheck properties";
3276 license = stdenv.lib.licenses.mit;
3218 license = stdenv.lib.licenses.mit;
@@ -3282,8 +3224,6 @@ self: {
3282 version = "1.0.1.0";
3224 version = "1.0.1.0";
3283 sha256 = "0s43s1bzbg3gwsjgm7fpyksd1339f0m26dlw2famxwyzgvm0a80k";
3225 sha256 = "0s43s1bzbg3gwsjgm7fpyksd1339f0m26dlw2famxwyzgvm0a80k";
3284 libraryHaskellDepends = [ base QuickCheck ];
3226 libraryHaskellDepends = [ base QuickCheck ];
3285− doHaddock = false;
3286− doCheck = false;
3287 homepage = "https://github.com/bos/quickcheck-unicode";
3227 homepage = "https://github.com/bos/quickcheck-unicode";
3288 description = "Generator and shrink functions for testing Unicode-related software";
3228 description = "Generator and shrink functions for testing Unicode-related software";
3289 license = stdenv.lib.licenses.bsd2;
3229 license = stdenv.lib.licenses.bsd2;
@@ -3298,8 +3238,6 @@ self: {
3298 editedCabalFile = "1pv5d7bm2rgap7llp5vjsplrg048gvf0226y0v19gpvdsx7n4rvv";
3238 editedCabalFile = "1pv5d7bm2rgap7llp5vjsplrg048gvf0226y0v19gpvdsx7n4rvv";
3299 libraryHaskellDepends = [ base time ];
3239 libraryHaskellDepends = [ base time ];
3300 testHaskellDepends = [ base ];
3240 testHaskellDepends = [ base ];
3301− doHaddock = false;
3302− doCheck = false;
3303 description = "random number library";
3241 description = "random number library";
3304 license = stdenv.lib.licenses.bsd3;
3242 license = stdenv.lib.licenses.bsd3;
3305 }) {};
3243 }) {};
@@ -3307,11 +3245,9 @@ self: {
3307 ({ mkDerivation, base, template-haskell }:
3245 ({ mkDerivation, base, template-haskell }:
3308 mkDerivation {
3246 mkDerivation {
3309 pname = "reflection";
3247 pname = "reflection";
3310− version = "2.1.2";
3248+ version = "2.1.4";
3311− sha256 = "0f9w0akbm6p8h7kzgcd2f6nnpw1wy84pqn45vfz1ch5j0hn8h2d9";
3249+ sha256 = "0kf4a5ijw6jfnfibjcrpdy9vzh1n6v2pxia8dhyyqdissiwc8bzj";
3312 libraryHaskellDepends = [ base template-haskell ];
3250 libraryHaskellDepends = [ base template-haskell ];
3313− doHaddock = false;
3314− doCheck = false;
3315 homepage = "http://github.com/ekmett/reflection";
3251 homepage = "http://github.com/ekmett/reflection";
3316 description = "Reifies arbitrary terms into types that can be reflected back into terms";
3252 description = "Reifies arbitrary terms into types that can be reflected back into terms";
3317 license = stdenv.lib.licenses.bsd3;
3253 license = stdenv.lib.licenses.bsd3;
@@ -3323,8 +3259,6 @@ self: {
3323 version = "0.93.2";
3259 version = "0.93.2";
3324 sha256 = "0y1j4h2pg12c853nzmczs263di7xkkmlnsq5dlp5wgbgl49mgp10";
3260 sha256 = "0y1j4h2pg12c853nzmczs263di7xkkmlnsq5dlp5wgbgl49mgp10";
3325 libraryHaskellDepends = [ array base bytestring containers mtl ];
3261 libraryHaskellDepends = [ array base bytestring containers mtl ];
3326− doHaddock = false;
3327− doCheck = false;
3328 homepage = "http://sourceforge.net/projects/lazy-regex";
3262 homepage = "http://sourceforge.net/projects/lazy-regex";
3329 description = "Replaces/Enhances Text.Regex";
3263 description = "Replaces/Enhances Text.Regex";
3330 license = stdenv.lib.licenses.bsd3;
3264 license = stdenv.lib.licenses.bsd3;
@@ -3338,66 +3272,42 @@ self: {
3338 libraryHaskellDepends = [
3272 libraryHaskellDepends = [
3339 array base bytestring containers regex-base
3273 array base bytestring containers regex-base
3340 ];
3274 ];
3341− doHaddock = false;
3342− doCheck = false;
3343 homepage = "http://sourceforge.net/projects/lazy-regex";
3275 homepage = "http://sourceforge.net/projects/lazy-regex";
3344 description = "Replaces/Enhances Text.Regex";
3276 description = "Replaces/Enhances Text.Regex";
3345 license = stdenv.lib.licenses.bsd3;
3277 license = stdenv.lib.licenses.bsd3;
3346 }) {};
3278 }) {};
3347− "regex-tdfa" = callPackage
3348− ({ mkDerivation, array, base, bytestring, containers, ghc-prim, mtl
3349− , parsec, regex-base
3350− }:
3351− mkDerivation {
3352− pname = "regex-tdfa";
3353− version = "1.2.2";
3354− sha256 = "0f8x8wyr6m21g8dnxvnvalz5bsq37l125l6qhs0fscbvprsxc4nb";
3355− libraryHaskellDepends = [
3356− array base bytestring containers ghc-prim mtl parsec regex-base
3357− ];
3358− doHaddock = false;
3359− doCheck = false;
3360− homepage = "https://github.com/ChrisKuklewicz/regex-tdfa";
3361− description = "Replaces/Enhances Text.Regex";
3362− license = stdenv.lib.licenses.bsd3;
3363− }) {};
3364 "resourcet" = callPackage
3279 "resourcet" = callPackage
3365− ({ mkDerivation, base, containers, exceptions, hspec, lifted-base
3280+ ({ mkDerivation, base, containers, exceptions, hspec, mtl
3366− , mmorph, monad-control, mtl, transformers, transformers-base
3281+ , primitive, transformers, unliftio-core
3367− , transformers-compat
3368 }:
3282 }:
3369 mkDerivation {
3283 mkDerivation {
3370 pname = "resourcet";
3284 pname = "resourcet";
3371− version = "1.1.9";
3285+ version = "1.2.1";
3372− sha256 = "1x9f2qz57agl3xljp1wi0ab51p13czrpf6qjp3506rl9dg99j6as";
3286+ sha256 = "0rzjzh34s36ssign7akqjnwnjxf11c3511wk7ky0xxy0dqmc2rg7";
3373 libraryHaskellDepends = [
3287 libraryHaskellDepends = [
3374− base containers exceptions lifted-base mmorph monad-control mtl
3288+ base containers exceptions mtl primitive transformers unliftio-core
3375− transformers transformers-base transformers-compat
3376 ];
3289 ];
3377− testHaskellDepends = [ base hspec lifted-base transformers ];
3290+ testHaskellDepends = [ base exceptions hspec transformers ];
3378− doHaddock = false;
3379− doCheck = false;
3380 homepage = "http://github.com/snoyberg/conduit";
3291 homepage = "http://github.com/snoyberg/conduit";
3381 description = "Deterministic allocation and freeing of scarce resources";
3292 description = "Deterministic allocation and freeing of scarce resources";
3382 license = stdenv.lib.licenses.bsd3;
3293 license = stdenv.lib.licenses.bsd3;
3383 }) {};
3294 }) {};
3384 "retry" = callPackage
3295 "retry" = callPackage
3385 ({ mkDerivation, base, data-default-class, exceptions, ghc-prim
3296 ({ mkDerivation, base, data-default-class, exceptions, ghc-prim
3297+ , hedgehog, HUnit, mtl, random, stm, tasty, tasty-hedgehog
3386− , hspec, HUnit, mtl, QuickCheck, random, stm, time, transformers
3298+ , tasty-hunit, time, transformers
3387 }:
3299 }:
3388 mkDerivation {
3300 mkDerivation {
3389 pname = "retry";
3301 pname = "retry";
3390− version = "0.7.4.3";
3302+ version = "0.7.6.2";
3391− sha256 = "0i47gmlljz00fwf2qwkrh24hgsyw5sz2npaighx4wxvykf00d390";
3303+ sha256 = "0bmrp2h6pf43hr7sd6562qixw755h2xgszj700157pk2hxcz16ad";
3392 libraryHaskellDepends = [
3304 libraryHaskellDepends = [
3393 base data-default-class exceptions ghc-prim random transformers
3305 base data-default-class exceptions ghc-prim random transformers
3394 ];
3306 ];
3395 testHaskellDepends = [
3307 testHaskellDepends = [
3396− base data-default-class exceptions ghc-prim hspec HUnit mtl
3308+ base data-default-class exceptions ghc-prim hedgehog HUnit mtl
3397− QuickCheck random stm time transformers
3309+ random stm tasty tasty-hedgehog tasty-hunit time transformers
3398 ];
3310 ];
3399− doHaddock = false;
3400− doCheck = false;
3401 homepage = "http://github.com/Soostone/retry";
3311 homepage = "http://github.com/Soostone/retry";
3402 description = "Retry combinators for monadic actions that may fail";
3312 description = "Retry combinators for monadic actions that may fail";
3403 license = stdenv.lib.licenses.bsd3;
3313 license = stdenv.lib.licenses.bsd3;
@@ -3406,35 +3316,17 @@ self: {
3406 ({ mkDerivation, base, deepseq, QuickCheck }:
3316 ({ mkDerivation, base, deepseq, QuickCheck }:
3407 mkDerivation {
3317 mkDerivation {
3408 pname = "safe";
3318 pname = "safe";
3409− version = "0.3.15";
3319+ version = "0.3.17";
3410− sha256 = "0bbalr2n92akwcgdyl5ff45h8d4waamj1lp7ly6mdgda17k4lpm3";
3320+ sha256 = "0p3yaf5slvyz1cyy51jq64c5rlp8yzwim8iy2dlnk42if4gc9ibr";
3411 libraryHaskellDepends = [ base ];
3321 libraryHaskellDepends = [ base ];
3412 testHaskellDepends = [ base deepseq QuickCheck ];
3322 testHaskellDepends = [ base deepseq QuickCheck ];
3413− doHaddock = false;
3414− doCheck = false;
3415 homepage = "https://github.com/ndmitchell/safe#readme";
3323 homepage = "https://github.com/ndmitchell/safe#readme";
3416 description = "Library of safe (exception free) functions";
3324 description = "Library of safe (exception free) functions";
3417 license = stdenv.lib.licenses.bsd3;
3325 license = stdenv.lib.licenses.bsd3;
3418 }) {};
3326 }) {};
3419− "safe-exceptions" = callPackage
3420− ({ mkDerivation, base, deepseq, exceptions, hspec, transformers
3421− , void
3422− }:
3423− mkDerivation {
3424− pname = "safe-exceptions";
3425− version = "0.1.6.0";
3426− sha256 = "074dy2f9fbhnh59clpz8c1ljplm1wwqjj7r3i4nv0rcl0khprm3i";
3427− libraryHaskellDepends = [ base deepseq exceptions transformers ];
3428− testHaskellDepends = [ base hspec void ];
3429− doHaddock = false;
3430− doCheck = false;
3431− homepage = "https://github.com/fpco/safe-exceptions#readme";
3432− description = "Safe, consistent, and easy exception handling";
3433− license = stdenv.lib.licenses.mit;
3434− }) {};
3435 "say" = callPackage
3327 "say" = callPackage
3436− ({ mkDerivation, base, bytestring, hspec, temporary, text
3328+ ({ mkDerivation, base, bytestring, criterion, hspec, temporary
3437− , transformers
3329+ , text, transformers
3438 }:
3330 }:
3439 mkDerivation {
3331 mkDerivation {
3440 pname = "say";
3332 pname = "say";
@@ -3442,24 +3334,23 @@ self: {
3442 sha256 = "0h7w49v9manw7yml2bms11sf6znsfkmdr87c7d8ax8l1xnadnvzj";
3334 sha256 = "0h7w49v9manw7yml2bms11sf6znsfkmdr87c7d8ax8l1xnadnvzj";
3443 libraryHaskellDepends = [ base bytestring text transformers ];
3335 libraryHaskellDepends = [ base bytestring text transformers ];
3444 testHaskellDepends = [ base bytestring hspec temporary text ];
3336 testHaskellDepends = [ base bytestring hspec temporary text ];
3445− doHaddock = false;
3337+ benchmarkHaskellDepends = [
3446− doCheck = false;
3338+ base bytestring criterion temporary text
3339+ ];
3447 homepage = "https://github.com/fpco/say#readme";
3340 homepage = "https://github.com/fpco/say#readme";
3448 description = "Initial project template from stack";
3341 description = "Initial project template from stack";
3449 license = stdenv.lib.licenses.mit;
3342 license = stdenv.lib.licenses.mit;
3450 }) {};
3343 }) {};
3451 "scientific" = callPackage
3344 "scientific" = callPackage
3452− ({ mkDerivation, base, binary, bytestring, containers, deepseq
3345+ ({ mkDerivation, base, binary, bytestring, containers, criterion
3453− , hashable, integer-gmp, integer-logarithms, primitive, QuickCheck
3346+ , deepseq, hashable, integer-gmp, integer-logarithms, primitive
3454− , smallcheck, tasty, tasty-ant-xml, tasty-hunit, tasty-quickcheck
3347+ , QuickCheck, smallcheck, tasty, tasty-ant-xml, tasty-hunit
3455− , tasty-smallcheck, text
3348+ , tasty-quickcheck, tasty-smallcheck, text
3456 }:
3349 }:
3457 mkDerivation {
3350 mkDerivation {
3458 pname = "scientific";
3351 pname = "scientific";
3459− version = "0.3.5.2";
3352+ version = "0.3.6.2";
3460− sha256 = "0msnjz7ml0zycw9bssslxbg0nigziw7vs5km4q3vjbs8jpzpkr2w";
3353+ sha256 = "03ql2f0ac8bsl524idy9xxa3kxisb2sj3avflzw580j5hzy0m397";
3461− revision = "1";
3462− editedCabalFile = "1gnz52yrd9bnq4qvd4v9kd00clx0sfbh64phafdq5g2hbk9yrg0v";
3463 libraryHaskellDepends = [
3354 libraryHaskellDepends = [
3464 base binary bytestring containers deepseq hashable integer-gmp
3355 base binary bytestring containers deepseq hashable integer-gmp
3465 integer-logarithms primitive text
3356 integer-logarithms primitive text
@@ -3468,8 +3359,7 @@ self: {
3468 base binary bytestring QuickCheck smallcheck tasty tasty-ant-xml
3359 base binary bytestring QuickCheck smallcheck tasty tasty-ant-xml
3469 tasty-hunit tasty-quickcheck tasty-smallcheck text
3360 tasty-hunit tasty-quickcheck tasty-smallcheck text
3470 ];
3361 ];
3471− doHaddock = false;
3362+ benchmarkHaskellDepends = [ base criterion ];
3472− doCheck = false;
3473 homepage = "https://github.com/basvandijk/scientific";
3363 homepage = "https://github.com/basvandijk/scientific";
3474 description = "Numbers represented using scientific notation";
3364 description = "Numbers represented using scientific notation";
3475 license = stdenv.lib.licenses.bsd3;
3365 license = stdenv.lib.licenses.bsd3;
@@ -3477,24 +3367,22 @@ self: {
3477 "semigroupoids" = callPackage
3367 "semigroupoids" = callPackage
3478 ({ mkDerivation, base, base-orphans, bifunctors, Cabal
3368 ({ mkDerivation, base, base-orphans, bifunctors, Cabal
3479 , cabal-doctest, comonad, containers, contravariant, distributive
3369 , cabal-doctest, comonad, containers, contravariant, distributive
3480− , doctest, hashable, semigroups, tagged, transformers
3370+ , doctest, hashable, semigroups, tagged, template-haskell
3481− , transformers-compat, unordered-containers
3371+ , transformers, transformers-compat, unordered-containers
3482 }:
3372 }:
3483 mkDerivation {
3373 mkDerivation {
3484 pname = "semigroupoids";
3374 pname = "semigroupoids";
3485− version = "5.2.1";
3375+ version = "5.2.2";
3486− sha256 = "006jys6kvckkmbnhf4jc51sh64hamkz464mr8ciiakybrfvixr3r";
3376+ sha256 = "17i96y4iqj8clcs090lf6k0ij3j16nj14vsfwz0mm9nd6i4gbpp4";
3487− revision = "2";
3377+ revision = "4";
3488− editedCabalFile = "049j2jl6f5mxqnavi1aadx37j4bk5xksvkxsl43hp4rg7n53p11z";
3378+ editedCabalFile = "0pqfrxzypjq6z8lgdkzq4vhcyqkpk5326hny0r6snpc3gm78r4ij";
3489 setupHaskellDepends = [ base Cabal cabal-doctest ];
3379 setupHaskellDepends = [ base Cabal cabal-doctest ];
3490 libraryHaskellDepends = [
3380 libraryHaskellDepends = [
3491 base base-orphans bifunctors comonad containers contravariant
3381 base base-orphans bifunctors comonad containers contravariant
3492− distributive hashable semigroups tagged transformers
3382+ distributive hashable semigroups tagged template-haskell
3493− transformers-compat unordered-containers
3383+ transformers transformers-compat unordered-containers
3494 ];
3384 ];
3495 testHaskellDepends = [ base doctest ];
3385 testHaskellDepends = [ base doctest ];
3496− doHaddock = false;
3497− doCheck = false;
3498 homepage = "http://github.com/ekmett/semigroupoids";
3386 homepage = "http://github.com/ekmett/semigroupoids";
3499 description = "Semigroupoids: Category sans id";
3387 description = "Semigroupoids: Category sans id";
3500 license = stdenv.lib.licenses.bsd3;
3388 license = stdenv.lib.licenses.bsd3;
@@ -3503,11 +3391,9 @@ self: {
3503 ({ mkDerivation, base }:
3391 ({ mkDerivation, base }:
3504 mkDerivation {
3392 mkDerivation {
3505 pname = "semigroups";
3393 pname = "semigroups";
3506− version = "0.18.3";
3394+ version = "0.18.5";
3507− sha256 = "1jm9wnb5jmwdk4i9qbwfay69ydi76xi0qqi9zqp6wh3jd2c7qa9m";
3395+ sha256 = "17g29h62g1k51ghhvzkw72zksjgi6vs6bfipkj81pqw1dsprcamb";
3508 libraryHaskellDepends = [ base ];
3396 libraryHaskellDepends = [ base ];
3509− doHaddock = false;
3510− doCheck = false;
3511 homepage = "http://github.com/ekmett/semigroups/";
3397 homepage = "http://github.com/ekmett/semigroups/";
3512 description = "Anything that associates";
3398 description = "Anything that associates";
3513 license = stdenv.lib.licenses.bsd3;
3399 license = stdenv.lib.licenses.bsd3;
@@ -3521,8 +3407,6 @@ self: {
3521 revision = "1";
3407 revision = "1";
3522 editedCabalFile = "0ny4g3kjys0hqg41mnwrsymy1bwhl8l169kis4y4fa58sb06m4f5";
3408 editedCabalFile = "0ny4g3kjys0hqg41mnwrsymy1bwhl8l169kis4y4fa58sb06m4f5";
3523 libraryHaskellDepends = [ base unix ];
3409 libraryHaskellDepends = [ base unix ];
3524− doHaddock = false;
3525− doCheck = false;
3526 description = "A cross-platform library for setting environment variables";
3410 description = "A cross-platform library for setting environment variables";
3527 license = stdenv.lib.licenses.mit;
3411 license = stdenv.lib.licenses.mit;
3528 }) {};
3412 }) {};
@@ -3534,8 +3418,8 @@ self: {
3534 }:
3418 }:
3535 mkDerivation {
3419 mkDerivation {
3536 pname = "shakespeare";
3420 pname = "shakespeare";
3537− version = "2.0.14.1";
3421+ version = "2.0.15";
3538− sha256 = "02pahbvibll4jmbq6p5vxr2r4mmrfx3h0c8v6qbj4rlq96lc6a23";
3422+ sha256 = "1vk4b19zvwy4mpwaq9z3l3kfmz75gfyf7alhh0y112gspgpccm23";
3539 libraryHaskellDepends = [
3423 libraryHaskellDepends = [
3540 aeson base blaze-html blaze-markup bytestring containers directory
3424 aeson base blaze-html blaze-markup bytestring containers directory
3541 exceptions ghc-prim parsec process scientific template-haskell text
3425 exceptions ghc-prim parsec process scientific template-haskell text
@@ -3546,8 +3430,6 @@ self: {
3546 exceptions ghc-prim hspec HUnit parsec process template-haskell
3430 exceptions ghc-prim hspec HUnit parsec process template-haskell
3547 text time transformers
3431 text time transformers
3548 ];
3432 ];
3549− doHaddock = false;
3550− doCheck = false;
3551 homepage = "http://www.yesodweb.com/book/shakespearean-templates";
3433 homepage = "http://www.yesodweb.com/book/shakespearean-templates";
3552 description = "A toolkit for making compile-time interpolated templates";
3434 description = "A toolkit for making compile-time interpolated templates";
3553 license = stdenv.lib.licenses.mit;
3435 license = stdenv.lib.licenses.mit;
@@ -3560,8 +3442,6 @@ self: {
3560 sha256 = "0f9qm3f7y0hpxn6mddhhg51mm1r134qkvd2kr8r6192ka1ijbxnf";
3442 sha256 = "0f9qm3f7y0hpxn6mddhhg51mm1r134qkvd2kr8r6192ka1ijbxnf";
3561 libraryHaskellDepends = [ base deepseq directory ];
3443 libraryHaskellDepends = [ base deepseq directory ];
3562 testHaskellDepends = [ base deepseq directory nanospec temporary ];
3444 testHaskellDepends = [ base deepseq directory nanospec temporary ];
3563− doHaddock = false;
3564− doCheck = false;
3565 homepage = "https://github.com/hspec/silently";
3445 homepage = "https://github.com/hspec/silently";
3566 description = "Prevent or capture writing to stdout and other handles";
3446 description = "Prevent or capture writing to stdout and other handles";
3567 license = stdenv.lib.licenses.bsd3;
3447 license = stdenv.lib.licenses.bsd3;
@@ -3570,11 +3450,9 @@ self: {
3570 ({ mkDerivation, base }:
3450 ({ mkDerivation, base }:
3571 mkDerivation {
3451 mkDerivation {
3572 pname = "simple-reflect";
3452 pname = "simple-reflect";
3573− version = "0.3.2";
3453+ version = "0.3.3";
3574− sha256 = "1dpcf6w3cf1sfl9bnlsx04x7aghw029glj5d05qzrsnms2rlw8iq";
3454+ sha256 = "0ayvrx5cm8n6db21jiyjmk5h93pw7cz1707hih09hlhk9jh5x0h7";
3575 libraryHaskellDepends = [ base ];
3455 libraryHaskellDepends = [ base ];
3576− doHaddock = false;
3577− doCheck = false;
3578 homepage = "http://twanvl.nl/blog/haskell/simple-reflection-of-expressions";
3456 homepage = "http://twanvl.nl/blog/haskell/simple-reflection-of-expressions";
3579 description = "Simple reflection of expressions containing variables";
3457 description = "Simple reflection of expressions containing variables";
3580 license = stdenv.lib.licenses.bsd3;
3458 license = stdenv.lib.licenses.bsd3;
@@ -3585,29 +3463,43 @@ self: {
3585 }:
3463 }:
3586 mkDerivation {
3464 mkDerivation {
3587 pname = "simple-sendfile";
3465 pname = "simple-sendfile";
3588− version = "0.2.25";
3466+ version = "0.2.27";
3589− sha256 = "0k99j9xfcf83c55jmn202hdinhjaa4yn3dal4rvjk2w2rlhqirha";
3467+ sha256 = "1bwwqzcm56m2w4ymsa054sxmpbj76h9pvb0jf8zxp8lr41cp51gn";
3590− revision = "1";
3591− editedCabalFile = "1axghvn2iz0gzlc0ics4q8abl15ggwvcwcmly5cxhmc32hqv8y5c";
3592 libraryHaskellDepends = [ base bytestring network unix ];
3468 libraryHaskellDepends = [ base bytestring network unix ];
3593 testHaskellDepends = [
3469 testHaskellDepends = [
3594 base bytestring conduit conduit-extra directory hspec HUnit network
3470 base bytestring conduit conduit-extra directory hspec HUnit network
3595 process resourcet unix
3471 process resourcet unix
3596 ];
3472 ];
3597− doHaddock = false;
3598− doCheck = false;
3599 description = "Cross platform library for the sendfile system call";
3473 description = "Cross platform library for the sendfile system call";
3600 license = stdenv.lib.licenses.bsd3;
3474 license = stdenv.lib.licenses.bsd3;
3601 }) {};
3475 }) {};
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+ }) {};
3602 "smallcheck" = callPackage
3496 "smallcheck" = callPackage
3603 ({ mkDerivation, base, ghc-prim, logict, mtl, pretty }:
3497 ({ mkDerivation, base, ghc-prim, logict, mtl, pretty }:
3604 mkDerivation {
3498 mkDerivation {
3605 pname = "smallcheck";
3499 pname = "smallcheck";
3606− version = "1.1.2";
3500+ version = "1.1.5";
3607− sha256 = "14690ahl3iq99hw638qk0bpmkmspghjz2yh8p1nyccli92y23xjm";
3501+ sha256 = "195fj7w3v03d1y1nm2ylavzrwxjcdbq0lb6zsw1dwyx5jmwfc84h";
3608 libraryHaskellDepends = [ base ghc-prim logict mtl pretty ];
3502 libraryHaskellDepends = [ base ghc-prim logict mtl pretty ];
3609− doHaddock = false;
3610− doCheck = false;
3611 homepage = "https://github.com/feuerbach/smallcheck";
3503 homepage = "https://github.com/feuerbach/smallcheck";
3612 description = "A property-based testing library";
3504 description = "A property-based testing library";
3613 license = stdenv.lib.licenses.bsd3;
3505 license = stdenv.lib.licenses.bsd3;
@@ -3616,225 +3508,175 @@ self: {
3616 ({ mkDerivation, base, bytestring, cereal, network }:
3508 ({ mkDerivation, base, bytestring, cereal, network }:
3617 mkDerivation {
3509 mkDerivation {
3618 pname = "socks";
3510 pname = "socks";
3619− version = "0.5.5";
3511+ version = "0.5.6";
3620− sha256 = "0s689w1hh9g8ifl75xhzbv96ir07hwn04b4lgvbxzl8swa9ylir6";
3512+ sha256 = "0f44qy74i0n6ll3jym0a2ipafkpw1h67amcpqmj8iq95h21wsqzs";
3621− revision = "1";
3622− editedCabalFile = "0nz8q0xvd8y6f42bd1w3q8d8bg1qzl8ggx0a23kb3jb60g36dmvw";
3623 libraryHaskellDepends = [ base bytestring cereal network ];
3513 libraryHaskellDepends = [ base bytestring cereal network ];
3624− doHaddock = false;
3625− doCheck = false;
3626 homepage = "http://github.com/vincenthz/hs-socks";
3514 homepage = "http://github.com/vincenthz/hs-socks";
3627− description = "Socks proxy (version 5) implementation";
3515+ description = "Socks proxy (ver 5)";
3628 license = stdenv.lib.licenses.bsd3;
3516 license = stdenv.lib.licenses.bsd3;
3629 }) {};
3517 }) {};
3630 "split" = callPackage
3518 "split" = callPackage
3631 ({ mkDerivation, base, QuickCheck }:
3519 ({ mkDerivation, base, QuickCheck }:
3632 mkDerivation {
3520 mkDerivation {
3633 pname = "split";
3521 pname = "split";
3634− version = "0.2.3.2";
3522+ version = "0.2.3.3";
3635− sha256 = "0fmnkvq1ky4dgyh1z2mvdal5pw103irvkf4p9d5x8wyl1nnylhs9";
3523+ sha256 = "04qlmkcyklznl03gsjg95b4nzb6i96gdapqg60rny9szgi7ngk8x";
3636 libraryHaskellDepends = [ base ];
3524 libraryHaskellDepends = [ base ];
3637 testHaskellDepends = [ base QuickCheck ];
3525 testHaskellDepends = [ base QuickCheck ];
3638− doHaddock = false;
3639− doCheck = false;
3640 description = "Combinator library for splitting lists";
3526 description = "Combinator library for splitting lists";
3641 license = stdenv.lib.licenses.bsd3;
3527 license = stdenv.lib.licenses.bsd3;
3642 }) {};
3528 }) {};
3643− "stackage-curator" = callPackage
3644− ({ mkDerivation, aeson, amazonka, amazonka-core, amazonka-s3, async
3645− , base, base16-bytestring, blaze-html, byteable, bytestring, Cabal
3646− , classy-prelude-conduit, conduit, conduit-extra, containers
3647− , cryptohash, cryptohash-conduit, data-default-class, directory
3648− , exceptions, filepath, hashable, hspec, html-conduit, http-client
3649− , http-client-tls, http-conduit, lucid, mime-types, monad-unlift
3650− , monad-unlift-ref, mono-traversable, mtl, old-locale
3651− , optparse-applicative, optparse-simple, process, QuickCheck
3652− , resourcet, safe, semigroups, stm, store, streaming-commons, syb
3653− , system-fileio, system-filepath, tar, temporary, text, time
3654− , transformers, unix-compat, unordered-containers, utf8-string
3655− , vector, xml-conduit, xml-types, yaml, zlib
3656− }:
3657− mkDerivation {
3658− pname = "stackage-curator";
3659− version = "0.14.5";
3660− sha256 = "11ccjjv6lvivjnkwcgr565hlxgs1sispx561fl1hkxw0mwp1q0hi";
3661− isLibrary = true;
3662− isExecutable = true;
3663− libraryHaskellDepends = [
3664− aeson amazonka amazonka-core amazonka-s3 async base
3665− base16-bytestring blaze-html byteable bytestring Cabal
3666− classy-prelude-conduit conduit conduit-extra containers cryptohash
3667− cryptohash-conduit data-default-class directory exceptions filepath
3668− hashable html-conduit http-client http-client-tls http-conduit
3669− lucid mime-types monad-unlift monad-unlift-ref mono-traversable mtl
3670− old-locale process resourcet safe semigroups stm store
3671− streaming-commons syb system-fileio system-filepath tar temporary
3672− text time transformers unix-compat unordered-containers utf8-string
3673− vector xml-conduit xml-types yaml zlib
3674− ];
3675− executableHaskellDepends = [
3676− aeson base http-client http-client-tls optparse-applicative
3677− optparse-simple system-filepath text
3678− ];
3679− testHaskellDepends = [
3680− base Cabal classy-prelude-conduit containers directory hspec
3681− http-client http-client-tls QuickCheck text yaml
3682− ];
3683− doHaddock = false;
3684− doCheck = false;
3685− homepage = "https://github.com/fpco/stackage-curator";
3686− description = "Tools for curating Stackage bundles";
3687− license = stdenv.lib.licenses.mit;
3688− }) {};
3689 "statistics" = callPackage
3529 "statistics" = callPackage
3690− ({ mkDerivation, aeson, base, binary, deepseq, erf, HUnit, ieee754
3530+ ({ mkDerivation, aeson, base, base-orphans, binary, deepseq, erf
3691− , math-functions, monad-par, mwc-random, primitive, QuickCheck
3531+ , HUnit, ieee754, math-functions, monad-par, mwc-random, primitive
3692− , test-framework, test-framework-hunit, test-framework-quickcheck2
3532+ , QuickCheck, test-framework, test-framework-hunit
3533+ , test-framework-quickcheck2, vector, vector-algorithms
3693− , vector, vector-algorithms, vector-binary-instances
3534+ , vector-binary-instances, vector-th-unbox
3694 }:
3535 }:
3695 mkDerivation {
3536 mkDerivation {
3696 pname = "statistics";
3537 pname = "statistics";
3697− version = "0.13.3.0";
3538+ version = "0.14.0.2";
3698− sha256 = "1vc12c3mnpspbycwkl0b22jqrdbg9fpmr1fxdxlmqwl603qy0zvf";
3539+ sha256 = "0y27gafkib0x0fn39qfn2rkgsfrm09ng35sbb5dwr7rclhnxz59l";
3540+ revision = "2";
3541+ editedCabalFile = "1bx70yqkn62ii17fjv3pig4hklrzkqd09zj67zzjiyjzmn04fir3";
3699 libraryHaskellDepends = [
3542 libraryHaskellDepends = [
3700− aeson base binary deepseq erf math-functions monad-par mwc-random
3543+ aeson base base-orphans binary deepseq erf math-functions monad-par
3701− primitive vector vector-algorithms vector-binary-instances
3544+ mwc-random primitive vector vector-algorithms
3545+ vector-binary-instances vector-th-unbox
3702 ];
3546 ];
3703 testHaskellDepends = [
3547 testHaskellDepends = [
3704− base binary erf HUnit ieee754 math-functions mwc-random primitive
3548+ aeson base binary erf HUnit ieee754 math-functions mwc-random
3705− QuickCheck test-framework test-framework-hunit
3549+ primitive QuickCheck test-framework test-framework-hunit
3706 test-framework-quickcheck2 vector vector-algorithms
3550 test-framework-quickcheck2 vector vector-algorithms
3707 ];
3551 ];
3708− doHaddock = false;
3709 doCheck = false;
3552 doCheck = false;
3710 homepage = "https://github.com/bos/statistics";
3553 homepage = "https://github.com/bos/statistics";
3711 description = "A library of statistical types, data, and functions";
3554 description = "A library of statistical types, data, and functions";
3712− license = stdenv.lib.licenses.bsd3;
3555+ license = stdenv.lib.licenses.bsd2;
3713 }) {};
3556 }) {};
3714 "stm" = callPackage
3557 "stm" = callPackage
3715 ({ mkDerivation, array, base }:
3558 ({ mkDerivation, array, base }:
3716 mkDerivation {
3559 mkDerivation {
3717 pname = "stm";
3560 pname = "stm";
3718− version = "2.4.4.1";
3561+ version = "2.4.5.0";
3719− sha256 = "111kpy1d6f5c0bggh6hyfm86q5p8bq1qbqf6dw2x4l4dxnar16cg";
3562+ sha256 = "19sr11a0hqikhvf561b38phz6k3zg9s157a0f5ffvghk7wcdpmri";
3720− revision = "1";
3721− editedCabalFile = "0kzw4rw9fgmc4qyxmm1lwifdyrx5r1356150xm14vy4mp86diks9";
3722 libraryHaskellDepends = [ array base ];
3563 libraryHaskellDepends = [ array base ];
3723− doHaddock = false;
3564+ homepage = "https://wiki.haskell.org/Software_transactional_memory";
3724− doCheck = false;
3725 description = "Software Transactional Memory";
3565 description = "Software Transactional Memory";
3726 license = stdenv.lib.licenses.bsd3;
3566 license = stdenv.lib.licenses.bsd3;
3727 }) {};
3567 }) {};
3728 "stm-chans" = callPackage
3568 "stm-chans" = callPackage
3729− ({ mkDerivation, base, stm }:
3569+ ({ mkDerivation, base, Cabal, stm }:
3730 mkDerivation {
3570 mkDerivation {
3731 pname = "stm-chans";
3571 pname = "stm-chans";
3732 version = "3.0.0.4";
3572 version = "3.0.0.4";
3733 sha256 = "0f27sp09yha43xk9q55sc185jyjs5h7gq2dhsyx6bm9kz9dzqi13";
3573 sha256 = "0f27sp09yha43xk9q55sc185jyjs5h7gq2dhsyx6bm9kz9dzqi13";
3574+ revision = "1";
3575+ editedCabalFile = "0v9axxcfszqdmf3dhjxy34ybh22x3r5c48mdnbvjh5i5lp7g7vp2";
3576+ setupHaskellDepends = [ base Cabal ];
3734 libraryHaskellDepends = [ base stm ];
3577 libraryHaskellDepends = [ base stm ];
3735− doHaddock = false;
3736− doCheck = false;
3737 homepage = "http://code.haskell.org/~wren/";
3578 homepage = "http://code.haskell.org/~wren/";
3738 description = "Additional types of channels for STM";
3579 description = "Additional types of channels for STM";
3739 license = stdenv.lib.licenses.bsd3;
3580 license = stdenv.lib.licenses.bsd3;
3740 }) {};
3581 }) {};
3741 "stm-conduit" = callPackage
3582 "stm-conduit" = callPackage
3742 ({ mkDerivation, async, base, cereal, cereal-conduit, conduit
3583 ({ mkDerivation, async, base, cereal, cereal-conduit, conduit
3743− , conduit-combinators, conduit-extra, directory, doctest, ghc-prim
3584+ , conduit-extra, directory, doctest, exceptions, HUnit, monad-loops
3744− , HUnit, lifted-async, lifted-base, monad-control, monad-loops
3745 , QuickCheck, resourcet, stm, stm-chans, test-framework
3585 , QuickCheck, resourcet, stm, stm-chans, test-framework
3746 , test-framework-hunit, test-framework-quickcheck2, transformers
3586 , test-framework-hunit, test-framework-quickcheck2, transformers
3747− , void
3587+ , unliftio
3748 }:
3588 }:
3749 mkDerivation {
3589 mkDerivation {
3750 pname = "stm-conduit";
3590 pname = "stm-conduit";
3751− version = "3.0.0";
3591+ version = "4.0.0";
3752− sha256 = "02d83mji1rlijdn315q7fik6jy5q49fjwygd64c9kf4z0qy6cvyg";
3592+ sha256 = "0paapljn7nqfzrx889y0n8sszci38mdiaxkgr0bb00ph9246rr7z";
3753− revision = "1";
3754− editedCabalFile = "0wmjqypqjw9irmpsmra6zbj1sa4l14xnx5xpaz2zvfsk4x90qyyg";
3755 libraryHaskellDepends = [
3593 libraryHaskellDepends = [
3756− async base cereal cereal-conduit conduit conduit-combinators
3594+ async base cereal cereal-conduit conduit conduit-extra directory
3757− conduit-extra directory ghc-prim lifted-async lifted-base
3758− monad-control monad-loops resourcet stm stm-chans transformers void
3595+ exceptions monad-loops resourcet stm stm-chans transformers
3596+ unliftio
3759 ];
3597 ];
3760 testHaskellDepends = [
3598 testHaskellDepends = [
3761− base conduit conduit-combinators directory doctest HUnit QuickCheck
3599+ base conduit directory doctest HUnit QuickCheck resourcet stm
3762− resourcet stm stm-chans test-framework test-framework-hunit
3600+ stm-chans test-framework test-framework-hunit
3763− test-framework-quickcheck2 transformers
3601+ test-framework-quickcheck2 transformers unliftio
3764 ];
3602 ];
3765− doHaddock = false;
3766− doCheck = false;
3767 homepage = "https://github.com/cgaebel/stm-conduit";
3603 homepage = "https://github.com/cgaebel/stm-conduit";
3768 description = "Introduces conduits to channels, and promotes using conduits concurrently";
3604 description = "Introduces conduits to channels, and promotes using conduits concurrently";
3769 license = stdenv.lib.licenses.bsd3;
3605 license = stdenv.lib.licenses.bsd3;
3770 }) {};
3606 }) {};
3771 "store" = callPackage
3607 "store" = callPackage
3772 ({ mkDerivation, array, async, base, base-orphans
3608 ({ mkDerivation, array, async, base, base-orphans
3773− , base64-bytestring, bytestring, conduit, containers, contravariant
3609+ , base64-bytestring, bifunctors, bytestring, containers
3774− , cryptohash, deepseq, directory, filepath, free, ghc-prim
3610+ , contravariant, criterion, cryptohash, deepseq, directory
3775− , hashable, hspec, hspec-smallcheck, integer-gmp, lifted-base
3611+ , filepath, free, ghc-prim, hashable, hspec, hspec-smallcheck
3776− , monad-control, mono-traversable, network, primitive, resourcet
3612+ , integer-gmp, lifted-base, monad-control, mono-traversable
3777− , safe, semigroups, smallcheck, store-core, streaming-commons, syb
3613+ , network, primitive, resourcet, safe, semigroups, smallcheck
3778− , template-haskell, text, th-lift, th-lift-instances, th-orphans
3614+ , store-core, syb, template-haskell, text, th-lift
3779− , th-reify-many, th-utilities, time, transformers
3615+ , th-lift-instances, th-orphans, th-reify-many, th-utilities, time
3780− , unordered-containers, vector, void
3616+ , transformers, unordered-containers, vector, void
3781 }:
3617 }:
3782 mkDerivation {
3618 mkDerivation {
3783 pname = "store";
3619 pname = "store";
3784− version = "0.4.3.2";
3620+ version = "0.5.0";
3785− sha256 = "13ihh1n42j9lq2dhkcgisds7bzm7nm4a02abk8vadracn4a7r97c";
3621+ sha256 = "1ivr2pvfja2plhp625wjv9lbd47vmydp33f31ljwdyzqik2j7vij";
3786− libraryHaskellDepends = [
3622+ libraryHaskellDepends = [
3787− array async base base-orphans base64-bytestring bytestring conduit
3623+ array async base base-orphans base64-bytestring bifunctors
3788− containers contravariant cryptohash deepseq directory filepath free
3624+ bytestring containers contravariant cryptohash deepseq directory
3789− ghc-prim hashable hspec hspec-smallcheck integer-gmp lifted-base
3625+ filepath free ghc-prim hashable hspec hspec-smallcheck integer-gmp
3790− monad-control mono-traversable network primitive resourcet safe
3626+ lifted-base monad-control mono-traversable network primitive
3791− semigroups smallcheck store-core streaming-commons syb
3627+ resourcet safe semigroups smallcheck store-core syb
3628+ template-haskell text th-lift th-lift-instances th-orphans
3629+ th-reify-many th-utilities time transformers unordered-containers
3630+ vector void
3631+ ];
3632+ benchmarkHaskellDepends = [
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
3792 template-haskell text th-lift th-lift-instances th-orphans
3638 template-haskell text th-lift th-lift-instances th-orphans
3793 th-reify-many th-utilities time transformers unordered-containers
3639 th-reify-many th-utilities time transformers unordered-containers
3794 vector void
3640 vector void
3795 ];
3641 ];
3796− doHaddock = false;
3797 doCheck = false;
3642 doCheck = false;
3798 homepage = "https://github.com/fpco/store#readme";
3643 homepage = "https://github.com/fpco/store#readme";
3799 description = "Fast binary serialization";
3644 description = "Fast binary serialization";
3800 license = stdenv.lib.licenses.mit;
3645 license = stdenv.lib.licenses.mit;
3801 }) {};
3646 }) {};
3802 "store-core" = callPackage
3647 "store-core" = callPackage
3803− ({ mkDerivation, base, bytestring, fail, ghc-prim, primitive, text
3648+ ({ mkDerivation, base, bytestring, ghc-prim, primitive, text
3804 , transformers
3649 , transformers
3805 }:
3650 }:
3806 mkDerivation {
3651 mkDerivation {
3807 pname = "store-core";
3652 pname = "store-core";
3808− version = "0.4.1";
3653+ version = "0.4.4";
3809− sha256 = "1d34n2n9vjngxndkbxcqm07sg4cnaq6rlx013rhyjr3aybwqalhl";
3654+ sha256 = "1489ydwmq3vd9lz193m5w277wvb9g74ssc1ncfjdry2g0y6czbjv";
3810 libraryHaskellDepends = [
3655 libraryHaskellDepends = [
3811− base bytestring fail ghc-prim primitive text transformers
3656+ base bytestring ghc-prim primitive text transformers
3812 ];
3657 ];
3813− doHaddock = false;
3814− doCheck = false;
3815 homepage = "https://github.com/fpco/store#readme";
3658 homepage = "https://github.com/fpco/store#readme";
3816 description = "Fast and lightweight binary serialization";
3659 description = "Fast and lightweight binary serialization";
3817 license = stdenv.lib.licenses.mit;
3660 license = stdenv.lib.licenses.mit;
3818 }) {};
3661 }) {};
3819 "streaming-commons" = callPackage
3662 "streaming-commons" = callPackage
3820− ({ mkDerivation, array, async, base, blaze-builder, bytestring
3663+ ({ mkDerivation, array, async, base, bytestring, deepseq, directory
3821− , deepseq, directory, hspec, network, process, QuickCheck, random
3664+ , gauge, hspec, network, process, QuickCheck, random, stm, text
3822− , stm, text, transformers, unix, zlib
3665+ , transformers, unix, zlib
3823 }:
3666 }:
3824 mkDerivation {
3667 mkDerivation {
3825 pname = "streaming-commons";
3668 pname = "streaming-commons";
3826− version = "0.1.17";
3669+ version = "0.2.1.0";
3827− sha256 = "1abxyjkn8xc8d33yhqxy1ki01kpzf4hy55f167qg4vk2ig5kh2p5";
3670+ sha256 = "13fn6qmpiggwpn8lczyydgp77cyzfypwds7wxskrwir4i5cgxlfq";
3828 libraryHaskellDepends = [
3671 libraryHaskellDepends = [
3829− array async base blaze-builder bytestring directory network process
3672+ array async base bytestring directory network process random stm
3830− random stm text transformers unix zlib
3673+ text transformers unix zlib
3831 ];
3674 ];
3832 testHaskellDepends = [
3675 testHaskellDepends = [
3833− array async base blaze-builder bytestring deepseq hspec network
3676+ array async base bytestring deepseq hspec network QuickCheck text
3834− QuickCheck text unix zlib
3677+ unix zlib
3835 ];
3678 ];
3836− doHaddock = false;
3679+ benchmarkHaskellDepends = [ base bytestring deepseq gauge text ];
3837− doCheck = false;
3838 homepage = "https://github.com/fpco/streaming-commons";
3680 homepage = "https://github.com/fpco/streaming-commons";
3839 description = "Common lower-level functions needed by various streaming data libraries";
3681 description = "Common lower-level functions needed by various streaming data libraries";
3840 license = stdenv.lib.licenses.mit;
3682 license = stdenv.lib.licenses.mit;
@@ -3843,12 +3685,10 @@ self: {
3843 ({ mkDerivation, base, hspec, QuickCheck }:
3685 ({ mkDerivation, base, hspec, QuickCheck }:
3844 mkDerivation {
3686 mkDerivation {
3845 pname = "stringbuilder";
3687 pname = "stringbuilder";
3846− version = "0.5.0";
3688+ version = "0.5.1";
3847− sha256 = "1ap95xphqnrhv64c2a137wqslkdmb2jjd9ldb17gs1pw48k8hrl9";
3689+ sha256 = "1fh3csx1wcssn8xyvl4ip4aprh9l4qyz2kk8mgjvqvc0vb2bsy6q";
3848 libraryHaskellDepends = [ base ];
3690 libraryHaskellDepends = [ base ];
3849 testHaskellDepends = [ base hspec QuickCheck ];
3691 testHaskellDepends = [ base hspec QuickCheck ];
3850− doHaddock = false;
3851− doCheck = false;
3852 description = "A writer monad for multi-line string literals";
3692 description = "A writer monad for multi-line string literals";
3853 license = stdenv.lib.licenses.mit;
3693 license = stdenv.lib.licenses.mit;
3854 }) {};
3694 }) {};
@@ -3860,46 +3700,10 @@ self: {
3860 sha256 = "1da2zz7gqm4xbkx5vpd74dayx1svaxyl145fl14mq15lbb77sxdq";
3700 sha256 = "1da2zz7gqm4xbkx5vpd74dayx1svaxyl145fl14mq15lbb77sxdq";
3861 libraryHaskellDepends = [ base ];
3701 libraryHaskellDepends = [ base ];
3862 testHaskellDepends = [ base containers HUnit mtl ];
3702 testHaskellDepends = [ base containers HUnit mtl ];
3863− doHaddock = false;
3864− doCheck = false;
3865 homepage = "http://www.cs.uu.nl/wiki/GenericProgramming/SYB";
3703 homepage = "http://www.cs.uu.nl/wiki/GenericProgramming/SYB";
3866 description = "Scrap Your Boilerplate";
3704 description = "Scrap Your Boilerplate";
3867 license = stdenv.lib.licenses.bsd3;
3705 license = stdenv.lib.licenses.bsd3;
3868 }) {};
3706 }) {};
3869− "system-fileio" = callPackage
3870− ({ mkDerivation, base, bytestring, chell, system-filepath
3871− , temporary, text, time, transformers, unix
3872− }:
3873− mkDerivation {
3874− pname = "system-fileio";
3875− version = "0.3.16.3";
3876− sha256 = "1484hcl27s2qcby8ws5djj11q9bz68bspcifz9h5gii2ndy70x9i";
3877− libraryHaskellDepends = [
3878− base bytestring system-filepath text time unix
3879− ];
3880− testHaskellDepends = [
3881− base bytestring chell system-filepath temporary text time
3882− transformers unix
3883− ];
3884− doHaddock = false;
3885− doCheck = false;
3886− homepage = "https://github.com/fpco/haskell-filesystem";
3887− description = "Consistent filesystem interaction across GHC versions (deprecated)";
3888− license = stdenv.lib.licenses.mit;
3889− }) {};
3890− "system-filepath" = callPackage
3891− ({ mkDerivation, base, bytestring, deepseq, text }:
3892− mkDerivation {
3893− pname = "system-filepath";
3894− version = "0.4.13.4";
3895− sha256 = "1yy5zsmmimhg6iaw9fmpwrxvxrgi5s6bfyqfihdsnx4bjvn7sp9l";
3896− libraryHaskellDepends = [ base bytestring deepseq text ];
3897− doHaddock = false;
3898− doCheck = false;
3899− homepage = "https://github.com/fpco/haskell-filesystem";
3900− description = "High-level, byte-based file and directory path manipulations (deprecated)";
3901− license = stdenv.lib.licenses.mit;
3902− }) {};
3903 "tagged" = callPackage
3707 "tagged" = callPackage
3904 ({ mkDerivation, base, deepseq, template-haskell, transformers
3708 ({ mkDerivation, base, deepseq, template-haskell, transformers
3905 , transformers-compat
3709 , transformers-compat
@@ -3908,76 +3712,48 @@ self: {
3908 pname = "tagged";
3712 pname = "tagged";
3909 version = "0.8.5";
3713 version = "0.8.5";
3910 sha256 = "16cdzh0bw16nvjnyyy5j9s60malhz4nnazw96vxb0xzdap4m2z74";
3714 sha256 = "16cdzh0bw16nvjnyyy5j9s60malhz4nnazw96vxb0xzdap4m2z74";
3911− revision = "1";
3715+ revision = "2";
3912− editedCabalFile = "15mqdimbgrq5brqljjl7dbxkyrxppap06q53cp7ml7w3l08v5mx8";
3716+ editedCabalFile = "0r2knfcq0b4s652vlvlnfwxlc2mkc2ra9kl8bp4zdn1awmfy0ia5";
3913− libraryHaskellDepends = [
3914− base deepseq template-haskell transformers transformers-compat
3915− ];
3916− doHaddock = false;
3917− doCheck = false;
3918− homepage = "http://github.com/ekmett/tagged";
3919− description = "Haskell 98 phantom types to avoid unsafely passing dummy arguments";
3920− license = stdenv.lib.licenses.bsd3;
3921− }) {};
3922− "tagstream-conduit" = callPackage
3923− ({ mkDerivation, attoparsec, base, blaze-builder, bytestring
3924− , case-insensitive, conduit, conduit-extra, data-default, hspec
3925− , HUnit, QuickCheck, resourcet, text, transformers, xml-conduit
3926− }:
3927− mkDerivation {
3928− pname = "tagstream-conduit";
3929− version = "0.5.5.3";
3930− sha256 = "1arlf7qil9bzcqykda8yyrnncm29jsfjvz5kbcdrbbhqpbqfi5mj";
3931 libraryHaskellDepends = [
3717 libraryHaskellDepends = [
3932− attoparsec base blaze-builder bytestring case-insensitive conduit
3718+ base deepseq template-haskell transformers transformers-compat
3933− conduit-extra data-default resourcet text transformers xml-conduit
3934− ];
3935− testHaskellDepends = [
3936− base bytestring conduit hspec HUnit QuickCheck resourcet text
3937 ];
3719 ];
3938− doHaddock = false;
3939− doCheck = false;
3940− homepage = "http://github.com/yihuang/tagstream-conduit";
3720+ homepage = "http://github.com/ekmett/tagged";
3941− description = "streamlined html tag parser";
3721+ description = "Haskell 98 phantom types to avoid unsafely passing dummy arguments";
3942 license = stdenv.lib.licenses.bsd3;
3722 license = stdenv.lib.licenses.bsd3;
3943 }) {};
3723 }) {};
3944 "tar" = callPackage
3724 "tar" = callPackage
3945− ({ mkDerivation, array, base, bytestring, bytestring-handle
3725+ ({ mkDerivation, array, base, bytestring, containers, criterion
3946− , containers, deepseq, directory, filepath, QuickCheck, tasty
3726+ , deepseq, directory, filepath, time
3947− , tasty-quickcheck, time
3948 }:
3727 }:
3949 mkDerivation {
3728 mkDerivation {
3950 pname = "tar";
3729 pname = "tar";
3951− version = "0.5.0.3";
3730+ version = "0.5.1.0";
3952− sha256 = "18qq94j9bm91iswnxq2dm5dws5c7wm4k01q2rpf8py35cf3svnfq";
3731+ sha256 = "0s2brvaxg5fki2jdkccmnpssiy6a3wjh24p6a3dkkdvjcixnk7f8";
3953 configureFlags = [ "-f-old-time" ];
3732 configureFlags = [ "-f-old-time" ];
3954 libraryHaskellDepends = [
3733 libraryHaskellDepends = [
3955 array base bytestring containers deepseq directory filepath time
3734 array base bytestring containers deepseq directory filepath time
3956 ];
3735 ];
3957− testHaskellDepends = [
3736+ benchmarkHaskellDepends = [
3958− array base bytestring bytestring-handle containers deepseq
3737+ array base bytestring containers criterion deepseq directory
3959− directory filepath QuickCheck tasty tasty-quickcheck time
3738+ filepath time
3960 ];
3739 ];
3961− doHaddock = false;
3962 doCheck = false;
3740 doCheck = false;
3963 description = "Reading, writing and manipulating \".tar\" archive files.";
3741 description = "Reading, writing and manipulating \".tar\" archive files.";
3964 license = stdenv.lib.licenses.bsd3;
3742 license = stdenv.lib.licenses.bsd3;
3965 }) {};
3743 }) {};
3966 "tasty" = callPackage
3744 "tasty" = callPackage
3967− ({ mkDerivation, ansi-terminal, async, base, clock, containers
3745+ ({ mkDerivation, ansi-terminal, async, base, clock, containers, mtl
3968− , deepseq, mtl, optparse-applicative, regex-tdfa, stm, tagged
3746+ , optparse-applicative, stm, tagged, unbounded-delays, unix
3969− , unbounded-delays, unix
3747+ , wcwidth
3970 }:
3748 }:
3971 mkDerivation {
3749 mkDerivation {
3972 pname = "tasty";
3750 pname = "tasty";
3973− version = "0.11.3";
3751+ version = "1.1.0.2";
3974− sha256 = "1g5394akq4j7y93b7cqwqf9lacqh2k21rrj6srbnh2sg97ng7j1b";
3752+ sha256 = "1q3hsy1a6q8xng3m04hp1m10bwamihani30zi25cjhkhmyl4ads7";
3975 libraryHaskellDepends = [
3753 libraryHaskellDepends = [
3976− ansi-terminal async base clock containers deepseq mtl
3754+ ansi-terminal async base clock containers mtl optparse-applicative
3977− optparse-applicative regex-tdfa stm tagged unbounded-delays unix
3755+ stm tagged unbounded-delays unix wcwidth
3978 ];
3756 ];
3979− doHaddock = false;
3980− doCheck = false;
3981 homepage = "https://github.com/feuerbach/tasty";
3757 homepage = "https://github.com/feuerbach/tasty";
3982 description = "Modern and extensible testing framework";
3758 description = "Modern and extensible testing framework";
3983 license = stdenv.lib.licenses.mit;
3759 license = stdenv.lib.licenses.mit;
@@ -3989,18 +3765,27 @@ self: {
3989 }:
3765 }:
3990 mkDerivation {
3766 mkDerivation {
3991 pname = "tasty-ant-xml";
3767 pname = "tasty-ant-xml";
3992− version = "1.1.1";
3768+ version = "1.1.4";
3993− sha256 = "0asvz2jjk1zf3ylps1277kf4yy6bifascblsd3vjfk9k9rh52w3j";
3769+ sha256 = "0v0gsb90kh6hwlgxbclzawsskywc6yf7n8xhiifia97l4y0yx2m8";
3994 libraryHaskellDepends = [
3770 libraryHaskellDepends = [
3995 base containers directory filepath generic-deriving ghc-prim mtl
3771 base containers directory filepath generic-deriving ghc-prim mtl
3996 stm tagged tasty transformers xml
3772 stm tagged tasty transformers xml
3997 ];
3773 ];
3998− doHaddock = false;
3999− doCheck = false;
4000 homepage = "http://github.com/ocharles/tasty-ant-xml";
3774 homepage = "http://github.com/ocharles/tasty-ant-xml";
4001 description = "Render tasty output to XML for Jenkins";
3775 description = "Render tasty output to XML for Jenkins";
4002 license = stdenv.lib.licenses.bsd3;
3776 license = stdenv.lib.licenses.bsd3;
4003 }) {};
3777 }) {};
3778+ "tasty-expected-failure" = callPackage
3779+ ({ mkDerivation, base, tagged, tasty }:
3780+ mkDerivation {
3781+ pname = "tasty-expected-failure";
3782+ version = "0.11.1.1";
3783+ sha256 = "1i2s809m644b7hgiblqay9j364r3fjj1rwbrahsn1pgr5q6mr6ji";
3784+ libraryHaskellDepends = [ base tagged tasty ];
3785+ homepage = "http://github.com/nomeata/tasty-expected-failure";
3786+ description = "Mark tasty tests as failure expected";
3787+ license = stdenv.lib.licenses.mit;
3788+ }) {};
4004 "tasty-golden" = callPackage
3789 "tasty-golden" = callPackage
4005 ({ mkDerivation, async, base, bytestring, containers, deepseq
3790 ({ mkDerivation, async, base, bytestring, containers, deepseq
4006 , directory, filepath, mtl, optparse-applicative, process, tagged
3791 , directory, filepath, mtl, optparse-applicative, process, tagged
@@ -4008,8 +3793,8 @@ self: {
4008 }:
3793 }:
4009 mkDerivation {
3794 mkDerivation {
4010 pname = "tasty-golden";
3795 pname = "tasty-golden";
4011− version = "2.3.1.1";
3796+ version = "2.3.2";
4012− sha256 = "0pcf5hsyp5mmbqn7krdm49jxpkjm6rb4j83j28f76h7q55dzm1wy";
3797+ sha256 = "0k3ibjhjc9vcwzrjnl4rnwvfm8l81q347nb7dgvcib6n5wm3s404";
4013 libraryHaskellDepends = [
3798 libraryHaskellDepends = [
4014 async base bytestring containers deepseq directory filepath mtl
3799 async base bytestring containers deepseq directory filepath mtl
4015 optparse-applicative process tagged tasty temporary
3800 optparse-applicative process tagged tasty temporary
@@ -4017,22 +3802,36 @@ self: {
4017 testHaskellDepends = [
3802 testHaskellDepends = [
4018 base directory filepath process tasty tasty-hunit temporary-rc
3803 base directory filepath process tasty tasty-hunit temporary-rc
4019 ];
3804 ];
4020− doHaddock = false;
4021− doCheck = false;
4022 homepage = "https://github.com/feuerbach/tasty-golden";
3805 homepage = "https://github.com/feuerbach/tasty-golden";
4023 description = "Golden tests support for tasty";
3806 description = "Golden tests support for tasty";
4024 license = stdenv.lib.licenses.mit;
3807 license = stdenv.lib.licenses.mit;
4025 }) {};
3808 }) {};
3809+ "tasty-hedgehog" = callPackage
3810+ ({ mkDerivation, base, hedgehog, tagged, tasty
3811+ , tasty-expected-failure
3812+ }:
3813+ mkDerivation {
3814+ pname = "tasty-hedgehog";
3815+ version = "0.2.0.0";
3816+ sha256 = "10m1akbiblnjq9ljk469725k30b254d36d267rk51z2f171py42s";
3817+ revision = "4";
3818+ editedCabalFile = "04d7lhn0dlqna0pqz7wxmz2y6vq7qar2m2g432z38cvm5na9w4y0";
3819+ libraryHaskellDepends = [ base hedgehog tagged tasty ];
3820+ testHaskellDepends = [
3821+ base hedgehog tasty tasty-expected-failure
3822+ ];
3823+ homepage = "https://github.com/qfpl/tasty-hedgehog";
3824+ description = "Integration for tasty and hedgehog";
3825+ license = stdenv.lib.licenses.bsd3;
3826+ }) {};
4026 "tasty-hunit" = callPackage
3827 "tasty-hunit" = callPackage
4027− ({ mkDerivation, base, tasty }:
3828+ ({ mkDerivation, base, call-stack, tasty }:
4028 mkDerivation {
3829 mkDerivation {
4029 pname = "tasty-hunit";
3830 pname = "tasty-hunit";
4030− version = "0.9.2";
3831+ version = "0.10.0.1";
4031− sha256 = "08qnxaw34wfnzi9irs1jd4d0zczqm3k5ffkd4zwhkz0dflmgq7mf";
3832+ sha256 = "0j3hgga6c3s8h5snzivb8a75h96207ia2rlbxzj07xbf4zpkp44g";
4032− libraryHaskellDepends = [ base tasty ];
3833+ libraryHaskellDepends = [ base call-stack tasty ];
4033− doHaddock = false;
4034− doCheck = false;
4035− homepage = "http://documentup.com/feuerbach/tasty";
3834+ homepage = "https://github.com/feuerbach/tasty";
4036 description = "HUnit support for the Tasty test framework";
3835 description = "HUnit support for the Tasty test framework";
4037 license = stdenv.lib.licenses.mit;
3836 license = stdenv.lib.licenses.mit;
4038 }) {};
3837 }) {};
@@ -4048,25 +3847,25 @@ self: {
4048 testHaskellDepends = [
3847 testHaskellDepends = [
4049 base bytestring mtl tasty tasty-hunit tasty-quickcheck
3848 base bytestring mtl tasty tasty-hunit tasty-quickcheck
4050 ];
3849 ];
4051− doHaddock = false;
4052− doCheck = false;
4053 homepage = "https://github.com/vincenthz/tasty-kat";
3850 homepage = "https://github.com/vincenthz/tasty-kat";
4054 description = "Known Answer Tests (KAT) framework for tasty";
3851 description = "Known Answer Tests (KAT) framework for tasty";
4055 license = stdenv.lib.licenses.mit;
3852 license = stdenv.lib.licenses.mit;
4056 }) {};
3853 }) {};
4057 "tasty-quickcheck" = callPackage
3854 "tasty-quickcheck" = callPackage
4058− ({ mkDerivation, base, pcre-light, QuickCheck, tagged, tasty
3855+ ({ mkDerivation, base, optparse-applicative, pcre-light, QuickCheck
4059− , tasty-hunit
3856+ , random, tagged, tasty, tasty-hunit
4060 }:
3857 }:
4061 mkDerivation {
3858 mkDerivation {
4062 pname = "tasty-quickcheck";
3859 pname = "tasty-quickcheck";
4063− version = "0.8.4";
3860+ version = "0.10";
4064− sha256 = "15rjxib5jmjq0hzj47x15kgp3awc73va4cy1pmpf7k3hvfv4qprn";
3861+ sha256 = "0vr6szbbz3s5461i0zr8zpq347zfvidfzv5gf3xwxhm0yk731z8h";
3862+ revision = "1";
3863+ editedCabalFile = "1ndkkywcqgb2wj339vgckjv5915da5kd4ixlkaww9fsba3qsrnwx";
4065− libraryHaskellDepends = [ base QuickCheck tagged tasty ];
3864+ libraryHaskellDepends = [
3865+ base optparse-applicative QuickCheck random tagged tasty
3866+ ];
4066 testHaskellDepends = [ base pcre-light tasty tasty-hunit ];
3867 testHaskellDepends = [ base pcre-light tasty tasty-hunit ];
4067− doHaddock = false;
4068− doCheck = false;
4069− homepage = "http://documentup.com/feuerbach/tasty";
3868+ homepage = "https://github.com/feuerbach/tasty";
4070 description = "QuickCheck support for the Tasty test framework";
3869 description = "QuickCheck support for the Tasty test framework";
4071 license = stdenv.lib.licenses.mit;
3870 license = stdenv.lib.licenses.mit;
4072 }) {};
3871 }) {};
@@ -4077,8 +3876,6 @@ self: {
4077 version = "0.8.1";
3876 version = "0.8.1";
4078 sha256 = "1n66ngzllf3xrlqykwszlkwsi96n5nkm7xbpfq7774vpvfnafjri";
3877 sha256 = "1n66ngzllf3xrlqykwszlkwsi96n5nkm7xbpfq7774vpvfnafjri";
4079 libraryHaskellDepends = [ async base smallcheck tagged tasty ];
3878 libraryHaskellDepends = [ async base smallcheck tagged tasty ];
4080− doHaddock = false;
4081− doCheck = false;
4082 homepage = "http://documentup.com/feuerbach/tasty";
3879 homepage = "http://documentup.com/feuerbach/tasty";
4083 description = "SmallCheck support for the Tasty test framework";
3880 description = "SmallCheck support for the Tasty test framework";
4084 license = stdenv.lib.licenses.mit;
3881 license = stdenv.lib.licenses.mit;
@@ -4095,28 +3892,24 @@ self: {
4095 base haskell-src-exts tasty template-haskell
3892 base haskell-src-exts tasty template-haskell
4096 ];
3893 ];
4097 testHaskellDepends = [ base tasty-hunit ];
3894 testHaskellDepends = [ base tasty-hunit ];
4098− doHaddock = false;
4099− doCheck = false;
4100 homepage = "http://github.com/bennofs/tasty-th";
3895 homepage = "http://github.com/bennofs/tasty-th";
4101 description = "Automatic tasty test case discovery using TH";
3896 description = "Automatic tasty test case discovery using TH";
4102 license = stdenv.lib.licenses.bsd3;
3897 license = stdenv.lib.licenses.bsd3;
4103 }) {};
3898 }) {};
4104 "temporary" = callPackage
3899 "temporary" = callPackage
4105 ({ mkDerivation, base, base-compat, directory, exceptions, filepath
3900 ({ mkDerivation, base, base-compat, directory, exceptions, filepath
4106− , tasty, tasty-hunit, transformers, unix
3901+ , random, tasty, tasty-hunit, transformers, unix
4107 }:
3902 }:
4108 mkDerivation {
3903 mkDerivation {
4109 pname = "temporary";
3904 pname = "temporary";
4110− version = "1.2.1.1";
3905+ version = "1.3";
4111− sha256 = "1wq0rc71mp0lw7pkpcbhglf636ni46xnlpsmx6yz8acmwmqj8xsm";
3906+ sha256 = "144qhwfwg37l3k313raf4ssiz16jbgwlm1nf4flgqpsbd69jji4c";
4112 libraryHaskellDepends = [
3907 libraryHaskellDepends = [
4113− base directory exceptions filepath transformers unix
3908+ base directory exceptions filepath random transformers unix
4114 ];
3909 ];
4115 testHaskellDepends = [
3910 testHaskellDepends = [
4116 base base-compat directory filepath tasty tasty-hunit unix
3911 base base-compat directory filepath tasty tasty-hunit unix
4117 ];
3912 ];
4118− doHaddock = false;
4119− doCheck = false;
4120 homepage = "https://github.com/feuerbach/temporary";
3913 homepage = "https://github.com/feuerbach/temporary";
4121 description = "Portable temporary file and directory support";
3914 description = "Portable temporary file and directory support";
4122 license = stdenv.lib.licenses.bsd3;
3915 license = stdenv.lib.licenses.bsd3;
@@ -4132,31 +3925,34 @@ self: {
4132 libraryHaskellDepends = [
3925 libraryHaskellDepends = [
4133 base directory exceptions filepath transformers unix
3926 base directory exceptions filepath transformers unix
4134 ];
3927 ];
4135− doHaddock = false;
4136− doCheck = false;
4137 homepage = "http://www.github.com/feuerbach/temporary";
3928 homepage = "http://www.github.com/feuerbach/temporary";
4138 description = "Portable temporary file and directory support for Windows and Unix, based on code from Cabal";
3929 description = "Portable temporary file and directory support for Windows and Unix, based on code from Cabal";
4139 license = stdenv.lib.licenses.bsd3;
3930 license = stdenv.lib.licenses.bsd3;
4140 }) {};
3931 }) {};
3932+ "terminal-size" = callPackage
3933+ ({ mkDerivation, base }:
3934+ mkDerivation {
3935+ pname = "terminal-size";
3936+ version = "0.3.2.1";
3937+ sha256 = "0n4nvj3dbj9gxfnprgish45asn9z4dipv9j98s8i7g2n8yb3xhmm";
3938+ libraryHaskellDepends = [ base ];
3939+ description = "Get terminal window height and width";
3940+ license = stdenv.lib.licenses.bsd3;
3941+ }) {};
4141 "test-framework" = callPackage
3942 "test-framework" = callPackage
4142 ({ mkDerivation, ansi-terminal, ansi-wl-pprint, base, containers
3943 ({ mkDerivation, ansi-terminal, ansi-wl-pprint, base, containers
4143 , hostname, old-locale, random, regex-posix, time, xml
3944 , hostname, old-locale, random, regex-posix, time, xml
4144 }:
3945 }:
4145 mkDerivation {
3946 mkDerivation {
4146 pname = "test-framework";
3947 pname = "test-framework";
4147− version = "0.8.1.1";
3948+ version = "0.8.2.0";
4148− sha256 = "0wxjgdvb1c4ykazw774zlx86550848wbsvgjgcrdzcgbb9m650vq";
3949+ sha256 = "1hhacrzam6b8f10hyldmjw8pb7frdxh04rfg3farxcxwbnhwgbpm";
4149− revision = "2";
4150− editedCabalFile = "1mp1h0fzwxa3xxnbw33lp8hj0rb8vwkd712r5ak8ny5nmawh2c9y";
4151− isLibrary = true;
4152− isExecutable = true;
4153 libraryHaskellDepends = [
3950 libraryHaskellDepends = [
4154 ansi-terminal ansi-wl-pprint base containers hostname old-locale
3951 ansi-terminal ansi-wl-pprint base containers hostname old-locale
4155 random regex-posix time xml
3952 random regex-posix time xml
4156 ];
3953 ];
4157− doHaddock = false;
4158 doCheck = false;
3954 doCheck = false;
4159− homepage = "https://batterseapower.github.io/test-framework/";
3955+ homepage = "http://haskell.github.io/test-framework/";
4160 description = "Framework for running and organising tests, with HUnit and QuickCheck support";
3956 description = "Framework for running and organising tests, with HUnit and QuickCheck support";
4161 license = stdenv.lib.licenses.bsd3;
3957 license = stdenv.lib.licenses.bsd3;
4162 }) {};
3958 }) {};
@@ -4172,8 +3968,6 @@ self: {
4172 libraryHaskellDepends = [
3968 libraryHaskellDepends = [
4173 base extensible-exceptions HUnit test-framework
3969 base extensible-exceptions HUnit test-framework
4174 ];
3970 ];
4175− doHaddock = false;
4176− doCheck = false;
4177 homepage = "https://batterseapower.github.io/test-framework/";
3971 homepage = "https://batterseapower.github.io/test-framework/";
4178 description = "HUnit support for the test-framework package";
3972 description = "HUnit support for the test-framework package";
4179 license = stdenv.lib.licenses.bsd3;
3973 license = stdenv.lib.licenses.bsd3;
@@ -4186,11 +3980,11 @@ self: {
4186 pname = "test-framework-quickcheck2";
3980 pname = "test-framework-quickcheck2";
4187 version = "0.3.0.4";
3981 version = "0.3.0.4";
4188 sha256 = "0vj834337r6jzr3258cv68ly2sv5999mklpsrfngyk51kywsyqyp";
3982 sha256 = "0vj834337r6jzr3258cv68ly2sv5999mklpsrfngyk51kywsyqyp";
3983+ revision = "1";
3984+ editedCabalFile = "147ngmfdkskyg7mwsp5w73a4dbx3rp5s38bci3z03kn1m093lxff";
4189 libraryHaskellDepends = [
3985 libraryHaskellDepends = [
4190 base extensible-exceptions QuickCheck random test-framework
3986 base extensible-exceptions QuickCheck random test-framework
4191 ];
3987 ];
4192− doHaddock = false;
4193− doCheck = false;
4194 homepage = "http://haskell.github.io/test-framework/";
3988 homepage = "http://haskell.github.io/test-framework/";
4195 description = "QuickCheck-2 support for the test-framework package";
3989 description = "QuickCheck-2 support for the test-framework package";
4196 license = stdenv.lib.licenses.bsd3;
3990 license = stdenv.lib.licenses.bsd3;
@@ -4207,34 +4001,24 @@ self: {
4207 base haskell-src-exts language-haskell-extract regex-posix
4001 base haskell-src-exts language-haskell-extract regex-posix
4208 template-haskell test-framework
4002 template-haskell test-framework
4209 ];
4003 ];
4210− doHaddock = false;
4211− doCheck = false;
4212 homepage = "http://github.com/finnsson/test-generator";
4004 homepage = "http://github.com/finnsson/test-generator";
4213 description = "Automagically generate the HUnit- and Quickcheck-bulk-code using Template Haskell";
4005 description = "Automagically generate the HUnit- and Quickcheck-bulk-code using Template Haskell";
4214 license = stdenv.lib.licenses.bsd3;
4006 license = stdenv.lib.licenses.bsd3;
4215 }) {};
4007 }) {};
4216 "text" = callPackage
4008 "text" = callPackage
4217− ({ mkDerivation, array, base, binary, bytestring, deepseq
4009+ ({ mkDerivation, array, base, binary, bytestring, deepseq, ghc-prim
4218− , directory, ghc-prim, HUnit, integer-gmp, QuickCheck
4010+ , integer-gmp
4219− , quickcheck-unicode, random, test-framework, test-framework-hunit
4220− , test-framework-quickcheck2
4221 }:
4011 }:
4222 mkDerivation {
4012 mkDerivation {
4223 pname = "text";
4013 pname = "text";
4224− version = "1.2.2.2";
4014+ version = "1.2.3.0";
4225− sha256 = "1y9d0zjs2ls0c574mr5xw7y3y49s62sd3wcn9lhpwz8a6q352iii";
4015+ sha256 = "06iir7q99rnffzxi8gagn8w1k9m49368sbidgz634fv1gxib3q10";
4226 configureFlags = [ "-f-integer-simple" ];
4016 configureFlags = [ "-f-integer-simple" ];
4227 libraryHaskellDepends = [
4017 libraryHaskellDepends = [
4228 array base binary bytestring deepseq ghc-prim integer-gmp
4018 array base binary bytestring deepseq ghc-prim integer-gmp
4229 ];
4019 ];
4230− testHaskellDepends = [
4231− array base binary bytestring deepseq directory ghc-prim HUnit
4232− integer-gmp QuickCheck quickcheck-unicode random test-framework
4233− test-framework-hunit test-framework-quickcheck2
4234− ];
4235− doHaddock = false;
4236 doCheck = false;
4020 doCheck = false;
4237− homepage = "https://github.com/bos/text";
4021+ homepage = "https://github.com/haskell/text";
4238 description = "An efficient packed Unicode text type";
4022 description = "An efficient packed Unicode text type";
4239 license = stdenv.lib.licenses.bsd2;
4023 license = stdenv.lib.licenses.bsd2;
4240 }) {};
4024 }) {};
@@ -4254,12 +4038,26 @@ self: {
4254 random test-framework test-framework-hunit
4038 random test-framework test-framework-hunit
4255 test-framework-quickcheck2 text
4039 test-framework-quickcheck2 text
4256 ];
4040 ];
4257− doHaddock = false;
4258 doCheck = false;
4041 doCheck = false;
4259 homepage = "https://github.com/bos/text-icu";
4042 homepage = "https://github.com/bos/text-icu";
4260 description = "Bindings to the ICU library";
4043 description = "Bindings to the ICU library";
4261 license = stdenv.lib.licenses.bsd3;
4044 license = stdenv.lib.licenses.bsd3;
4262 }) {inherit (pkgs) icu;};
4045 }) {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+ }) {};
4263 "tf-random" = callPackage
4061 "tf-random" = callPackage
4264 ({ mkDerivation, base, primitive, random, time }:
4062 ({ mkDerivation, base, primitive, random, time }:
4265 mkDerivation {
4063 mkDerivation {
@@ -4267,8 +4065,6 @@ self: {
4267 version = "0.5";
4065 version = "0.5";
4268 sha256 = "0445r2nns6009fmq0xbfpyv7jpzwv0snccjdg7hwj4xk4z0cwc1f";
4066 sha256 = "0445r2nns6009fmq0xbfpyv7jpzwv0snccjdg7hwj4xk4z0cwc1f";
4269 libraryHaskellDepends = [ base primitive random time ];
4067 libraryHaskellDepends = [ base primitive random time ];
4270− doHaddock = false;
4271− doCheck = false;
4272 description = "High-quality splittable pseudorandom number generator";
4068 description = "High-quality splittable pseudorandom number generator";
4273 license = stdenv.lib.licenses.bsd3;
4069 license = stdenv.lib.licenses.bsd3;
4274 }) {};
4070 }) {};
@@ -4276,14 +4072,14 @@ self: {
4276 ({ mkDerivation, base, containers, ghc-prim, template-haskell }:
4072 ({ mkDerivation, base, containers, ghc-prim, template-haskell }:
4277 mkDerivation {
4073 mkDerivation {
4278 pname = "th-abstraction";
4074 pname = "th-abstraction";
4279− version = "0.2.6.0";
4075+ version = "0.2.8.0";
4280− sha256 = "0g42h6wnj2awc5ryhbvx009wd8w75pn66bjzsq1z4s3xajd2hbp5";
4076+ sha256 = "0n17w4q2ykd0nica4sck2wng6md56rfad8x0icl0l8vnzb9nn4ya";
4077+ revision = "1";
4078+ editedCabalFile = "0yr4bj9ypbls0ysmwrgn2nsjb1xpsb12bjaiwbkzp6nf3kljwnnv";
4281 libraryHaskellDepends = [
4079 libraryHaskellDepends = [
4282 base containers ghc-prim template-haskell
4080 base containers ghc-prim template-haskell
4283 ];
4081 ];
4284 testHaskellDepends = [ base containers template-haskell ];
4082 testHaskellDepends = [ base containers template-haskell ];
4285− doHaddock = false;
4286− doCheck = false;
4287 homepage = "https://github.com/glguy/th-abstraction";
4083 homepage = "https://github.com/glguy/th-abstraction";
4288 description = "Nicer interface for reified information about data types";
4084 description = "Nicer interface for reified information about data types";
4289 license = stdenv.lib.licenses.isc;
4085 license = stdenv.lib.licenses.isc;
@@ -4292,26 +4088,25 @@ self: {
4292 ({ mkDerivation, base, containers, syb, template-haskell }:
4088 ({ mkDerivation, base, containers, syb, template-haskell }:
4293 mkDerivation {
4089 mkDerivation {
4294 pname = "th-expand-syns";
4090 pname = "th-expand-syns";
4295− version = "0.4.3.0";
4091+ version = "0.4.4.0";
4296− sha256 = "17b73q0d5r8xixhvdp0hv4ap96l7s3f2y0j5cknp81b1hyinivlz";
4092+ sha256 = "01prlvh3py5hq5ccjidfyp9ixq2zd88dkbsidyjrpkja6v8m43yc";
4297 libraryHaskellDepends = [ base containers syb template-haskell ];
4093 libraryHaskellDepends = [ base containers syb template-haskell ];
4298 testHaskellDepends = [ base template-haskell ];
4094 testHaskellDepends = [ base template-haskell ];
4299− doHaddock = false;
4300− doCheck = false;
4301 homepage = "https://github.com/DanielSchuessler/th-expand-syns";
4095 homepage = "https://github.com/DanielSchuessler/th-expand-syns";
4302 description = "Expands type synonyms in Template Haskell ASTs";
4096 description = "Expands type synonyms in Template Haskell ASTs";
4303 license = stdenv.lib.licenses.bsd3;
4097 license = stdenv.lib.licenses.bsd3;
4304 }) {};
4098 }) {};
4305 "th-lift" = callPackage
4099 "th-lift" = callPackage
4306− ({ mkDerivation, base, ghc-prim, template-haskell }:
4100+ ({ mkDerivation, base, ghc-prim, template-haskell, th-abstraction
4101+ }:
4307 mkDerivation {
4102 mkDerivation {
4308 pname = "th-lift";
4103 pname = "th-lift";
4309− version = "0.7.7";
4104+ version = "0.7.10";
4310− sha256 = "1dfb0z42vrmdx579lkam07ic03d3v5y19339a3ca0bwpprpzmihn";
4105+ sha256 = "13c89mr9g4jwrmqxx882ygr1lkvj1chw29p80qv2f3g5wnhlgkmr";
4311− libraryHaskellDepends = [ base ghc-prim template-haskell ];
4106+ libraryHaskellDepends = [
4107+ base ghc-prim template-haskell th-abstraction
4108+ ];
4312 testHaskellDepends = [ base ghc-prim template-haskell ];
4109 testHaskellDepends = [ base ghc-prim template-haskell ];
4313− doHaddock = false;
4314− doCheck = false;
4315 homepage = "http://github.com/mboes/th-lift";
4110 homepage = "http://github.com/mboes/th-lift";
4316 description = "Derive Template Haskell's Lift class for datatypes";
4111 description = "Derive Template Haskell's Lift class for datatypes";
4317 license = stdenv.lib.licenses.bsd3;
4112 license = stdenv.lib.licenses.bsd3;
@@ -4330,26 +4125,23 @@ self: {
4330 testHaskellDepends = [
4125 testHaskellDepends = [
4331 base bytestring containers QuickCheck template-haskell text vector
4126 base bytestring containers QuickCheck template-haskell text vector
4332 ];
4127 ];
4333− doHaddock = false;
4334− doCheck = false;
4335 homepage = "http://github.com/bennofs/th-lift-instances/";
4128 homepage = "http://github.com/bennofs/th-lift-instances/";
4336 description = "Lift instances for template-haskell for common data types";
4129 description = "Lift instances for template-haskell for common data types";
4337 license = stdenv.lib.licenses.bsd3;
4130 license = stdenv.lib.licenses.bsd3;
4338 }) {};
4131 }) {};
4339 "th-orphans" = callPackage
4132 "th-orphans" = callPackage
4340− ({ mkDerivation, base, hspec, mtl, template-haskell, th-lift
4133+ ({ mkDerivation, base, hspec, hspec-discover, mtl, template-haskell
4341− , th-lift-instances, th-reify-many
4134+ , th-lift, th-lift-instances, th-reify-many
4342 }:
4135 }:
4343 mkDerivation {
4136 mkDerivation {
4344 pname = "th-orphans";
4137 pname = "th-orphans";
4345− version = "0.13.4";
4138+ version = "0.13.6";
4346− sha256 = "0cab6hmyii42p157jhm0sd5jzdlxms4ip2ncrmcmc47dl3pxk5gk";
4139+ sha256 = "0sfl3pn9kq9da3ji3lsgzgzy82vz6yvsg80dmakc1jvk7awycibp";
4347 libraryHaskellDepends = [
4140 libraryHaskellDepends = [
4348 base mtl template-haskell th-lift th-lift-instances th-reify-many
4141 base mtl template-haskell th-lift th-lift-instances th-reify-many
4349 ];
4142 ];
4350 testHaskellDepends = [ base hspec template-haskell ];
4143 testHaskellDepends = [ base hspec template-haskell ];
4351− doHaddock = false;
4144+ testToolDepends = [ hspec-discover ];
4352− doCheck = false;
4353 description = "Orphan instances for TH datatypes";
4145 description = "Orphan instances for TH datatypes";
4354 license = stdenv.lib.licenses.bsd3;
4146 license = stdenv.lib.licenses.bsd3;
4355 }) {};
4147 }) {};
@@ -4365,8 +4157,6 @@ self: {
4365 base containers mtl safe template-haskell th-expand-syns
4157 base containers mtl safe template-haskell th-expand-syns
4366 ];
4158 ];
4367 testHaskellDepends = [ base template-haskell ];
4159 testHaskellDepends = [ base template-haskell ];
4368− doHaddock = false;
4369− doCheck = false;
4370 homepage = "http://github.com/mgsloan/th-reify-many";
4160 homepage = "http://github.com/mgsloan/th-reify-many";
4371 description = "Recurseively reify template haskell datatype info";
4161 description = "Recurseively reify template haskell datatype info";
4372 license = stdenv.lib.licenses.bsd3;
4162 license = stdenv.lib.licenses.bsd3;
@@ -4387,8 +4177,6 @@ self: {
4387 base bytestring containers directory filepath hspec primitive syb
4177 base bytestring containers directory filepath hspec primitive syb
4388 template-haskell text th-orphans vector
4178 template-haskell text th-orphans vector
4389 ];
4179 ];
4390− doHaddock = false;
4391− doCheck = false;
4392 homepage = "https://github.com/fpco/th-utilities#readme";
4180 homepage = "https://github.com/fpco/th-utilities#readme";
4393 description = "Collection of useful functions for use with Template Haskell";
4181 description = "Collection of useful functions for use with Template Haskell";
4394 license = stdenv.lib.licenses.mit;
4182 license = stdenv.lib.licenses.mit;
@@ -4397,36 +4185,38 @@ self: {
4397 ({ mkDerivation, base, time }:
4185 ({ mkDerivation, base, time }:
4398 mkDerivation {
4186 mkDerivation {
4399 pname = "time-locale-compat";
4187 pname = "time-locale-compat";
4400− version = "0.1.1.3";
4188+ version = "0.1.1.4";
4401− sha256 = "1vdcfr2hp9qh3ag90x6ikbdf42wiqpdylnplffna54bpnilbyi4i";
4189+ sha256 = "0qmyxf8nz0q6brvplc4s2wsb1bbpq7kb65b69m503g9bgranblgj";
4402 configureFlags = [ "-f-old-locale" ];
4190 configureFlags = [ "-f-old-locale" ];
4403 libraryHaskellDepends = [ base time ];
4191 libraryHaskellDepends = [ base time ];
4404− doHaddock = false;
4405− doCheck = false;
4406 homepage = "https://github.com/khibino/haskell-time-locale-compat";
4192 homepage = "https://github.com/khibino/haskell-time-locale-compat";
4407− description = "Compatibility of TimeLocale between old-locale and time-1.5";
4193+ description = "Compatibile module for time-format locale";
4408 license = stdenv.lib.licenses.bsd3;
4194 license = stdenv.lib.licenses.bsd3;
4409 }) {};
4195 }) {};
4410 "tls" = callPackage
4196 "tls" = callPackage
4411 ({ mkDerivation, asn1-encoding, asn1-types, async, base, bytestring
4197 ({ mkDerivation, asn1-encoding, asn1-types, async, base, bytestring
4412− , cereal, cryptonite, data-default-class, hourglass, memory, mtl
4198+ , cereal, criterion, cryptonite, data-default-class, hourglass
4413− , network, QuickCheck, tasty, tasty-quickcheck, transformers, x509
4199+ , memory, mtl, network, QuickCheck, tasty, tasty-quickcheck
4414− , x509-store, x509-validation
4200+ , transformers, x509, x509-store, x509-validation
4415 }:
4201 }:
4416 mkDerivation {
4202 mkDerivation {
4417 pname = "tls";
4203 pname = "tls";
4418− version = "1.3.11";
4204+ version = "1.4.1";
4419− sha256 = "00r7zfkdzy7hi6nhzkirp8jjims4kikgjcm3z4a82kw78awqw01z";
4205+ sha256 = "1y083724mym28n6xfaz7pcc7zqxdhjpaxpbvzxfbs25qq2px3smv";
4420 libraryHaskellDepends = [
4206 libraryHaskellDepends = [
4421 asn1-encoding asn1-types async base bytestring cereal cryptonite
4207 asn1-encoding asn1-types async base bytestring cereal cryptonite
4422 data-default-class memory mtl network transformers x509 x509-store
4208 data-default-class memory mtl network transformers x509 x509-store
4423 x509-validation
4209 x509-validation
4424 ];
4210 ];
4425 testHaskellDepends = [
4211 testHaskellDepends = [
4426− base bytestring cereal cryptonite data-default-class hourglass mtl
4212+ asn1-types base bytestring cereal cryptonite data-default-class
4213+ hourglass mtl QuickCheck tasty tasty-quickcheck x509
4214+ x509-validation
4215+ ];
4216+ benchmarkHaskellDepends = [
4217+ asn1-types base bytestring criterion cryptonite data-default-class
4427− QuickCheck tasty tasty-quickcheck x509 x509-validation
4218+ hourglass mtl QuickCheck tasty-quickcheck x509 x509-validation
4428 ];
4219 ];
4429− doHaddock = false;
4430 doCheck = false;
4220 doCheck = false;
4431 homepage = "http://github.com/vincenthz/hs-tls";
4221 homepage = "http://github.com/vincenthz/hs-tls";
4432 description = "TLS/SSL protocol native implementation (Server and Client)";
4222 description = "TLS/SSL protocol native implementation (Server and Client)";
@@ -4436,29 +4226,23 @@ self: {
4436 ({ mkDerivation, auto-update, base, clock, psqueues, tls }:
4226 ({ mkDerivation, auto-update, base, clock, psqueues, tls }:
4437 mkDerivation {
4227 mkDerivation {
4438 pname = "tls-session-manager";
4228 pname = "tls-session-manager";
4439− version = "0.0.0.1";
4229+ version = "0.0.0.2";
4440− sha256 = "0bqv6wh771j7n8qqsh02v8c4byybfkr1027k6cz03mszvnz1q9k8";
4230+ sha256 = "0rvmln545vghsx8zhxp44f0f6pzma8cylarmfhhysy55ipywr1n5";
4441− revision = "1";
4442− editedCabalFile = "0hnhxfqmvkkhf37rr2ir52xyd59070jjm6s6al0alsanid2m4p01";
4443 libraryHaskellDepends = [ auto-update base clock psqueues tls ];
4231 libraryHaskellDepends = [ auto-update base clock psqueues tls ];
4444− doHaddock = false;
4445− doCheck = false;
4446 description = "In-memory TLS session manager";
4232 description = "In-memory TLS session manager";
4447 license = stdenv.lib.licenses.bsd3;
4233 license = stdenv.lib.licenses.bsd3;
4448 }) {};
4234 }) {};
4449 "transformers-base" = callPackage
4235 "transformers-base" = callPackage
4450− ({ mkDerivation, base, stm, transformers, transformers-compat }:
4236+ ({ mkDerivation, base, base-orphans, stm, transformers
4237+ , transformers-compat
4238+ }:
4451 mkDerivation {
4239 mkDerivation {
4452 pname = "transformers-base";
4240 pname = "transformers-base";
4453− version = "0.4.4";
4241+ version = "0.4.5.2";
4454− sha256 = "11r3slgpgpra6zi2kjg3g60gvv17b1fh6qxipcpk8n86qx7lk8va";
4242+ sha256 = "1s256bi0yh0x2hp2gwd30f3mg1cv53zz397dv1yhfsnfzmihrj6h";
4455− revision = "1";
4456− editedCabalFile = "196pr3a4lhgklyw6nq6rv1j9djwzmvx7xrpp58carxnb55gk06pv";
4457 libraryHaskellDepends = [
4243 libraryHaskellDepends = [
4458− base stm transformers transformers-compat
4244+ base base-orphans stm transformers transformers-compat
4459 ];
4245 ];
4460− doHaddock = false;
4461− doCheck = false;
4462 homepage = "https://github.com/mvv/transformers-base";
4246 homepage = "https://github.com/mvv/transformers-base";
4463 description = "Lift computations from the bottom of a transformer stack";
4247 description = "Lift computations from the bottom of a transformer stack";
4464 license = stdenv.lib.licenses.bsd3;
4248 license = stdenv.lib.licenses.bsd3;
@@ -4467,15 +4251,33 @@ self: {
4467 ({ mkDerivation, base, ghc-prim, transformers }:
4251 ({ mkDerivation, base, ghc-prim, transformers }:
4468 mkDerivation {
4252 mkDerivation {
4469 pname = "transformers-compat";
4253 pname = "transformers-compat";
4470− version = "0.5.1.4";
4254+ version = "0.6.2";
4471− sha256 = "17yam0199fh9ndsn9n69jx9nvbsmymzzwbi23dck3dk4q57fz0fq";
4255+ sha256 = "1gp4a8kvniwgm8947ghb4iwv4b7wd6ry4kvv4nfnym4agf5j41nw";
4256+ configureFlags = [ "-ffive-three" ];
4472 libraryHaskellDepends = [ base ghc-prim transformers ];
4257 libraryHaskellDepends = [ base ghc-prim transformers ];
4473− doHaddock = false;
4474− doCheck = false;
4475 homepage = "http://github.com/ekmett/transformers-compat/";
4258 homepage = "http://github.com/ekmett/transformers-compat/";
4476− 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";
4477 license = stdenv.lib.licenses.bsd3;
4260 license = stdenv.lib.licenses.bsd3;
4478 }) {};
4261 }) {};
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+ }) {};
4479 "unbounded-delays" = callPackage
4281 "unbounded-delays" = callPackage
4480 ({ mkDerivation, base }:
4282 ({ mkDerivation, base }:
4481 mkDerivation {
4283 mkDerivation {
@@ -4483,8 +4285,6 @@ self: {
4483 version = "0.1.1.0";
4285 version = "0.1.1.0";
4484 sha256 = "1ir9fghbrc214c97bwafk5ck6cacxz1pdnq4i18p604d1b8zg9wa";
4286 sha256 = "1ir9fghbrc214c97bwafk5ck6cacxz1pdnq4i18p604d1b8zg9wa";
4485 libraryHaskellDepends = [ base ];
4287 libraryHaskellDepends = [ base ];
4486− doHaddock = false;
4487− doCheck = false;
4488 homepage = "https://github.com/basvandijk/unbounded-delays";
4288 homepage = "https://github.com/basvandijk/unbounded-delays";
4489 description = "Unbounded thread delays and timeouts";
4289 description = "Unbounded thread delays and timeouts";
4490 license = stdenv.lib.licenses.bsd3;
4290 license = stdenv.lib.licenses.bsd3;
@@ -4493,13 +4293,9 @@ self: {
4493 ({ mkDerivation, base, unix }:
4293 ({ mkDerivation, base, unix }:
4494 mkDerivation {
4294 mkDerivation {
4495 pname = "unix-compat";
4295 pname = "unix-compat";
4496− version = "0.4.3.1";
4296+ version = "0.5.0.1";
4497− sha256 = "09vykw89x981fywy0w1pci2v8zy3ajyjwh9z2n610vjacmd1v03j";
4297+ sha256 = "1gdf3h2knbymkivm784vq51mbcyj5y91r480awyxj5cw8gh9kwn2";
4498− revision = "2";
4499− editedCabalFile = "0b5jicn8nm53yxxzwlvfcv4xp5rrqp98x5wwqh234wn9x44z54d2";
4500 libraryHaskellDepends = [ base unix ];
4298 libraryHaskellDepends = [ base unix ];
4501− doHaddock = false;
4502− doCheck = false;
4503 homepage = "http://github.com/jystic/unix-compat";
4299 homepage = "http://github.com/jystic/unix-compat";
4504 description = "Portable POSIX-compatibility layer";
4300 description = "Portable POSIX-compatibility layer";
4505 license = stdenv.lib.licenses.bsd3;
4301 license = stdenv.lib.licenses.bsd3;
@@ -4510,26 +4306,62 @@ self: {
4510 }:
4306 }:
4511 mkDerivation {
4307 mkDerivation {
4512 pname = "unix-time";
4308 pname = "unix-time";
4513− version = "0.3.7";
4309+ version = "0.3.8";
4514− sha256 = "1qdlc9raih8s0m3x8x3n7q3ngh4faw2alv9l78sp6gnx648k0c8i";
4310+ sha256 = "051slgpid5cxiaw203ky0ql3823h28fcjs08axkzd4265wrvv8fw";
4515 libraryHaskellDepends = [ base binary bytestring old-time ];
4311 libraryHaskellDepends = [ base binary bytestring old-time ];
4516 testHaskellDepends = [
4312 testHaskellDepends = [
4517 base bytestring doctest hspec old-locale old-time QuickCheck time
4313 base bytestring doctest hspec old-locale old-time QuickCheck time
4518 ];
4314 ];
4519− doHaddock = false;
4520− doCheck = false;
4521 description = "Unix time parser/formatter and utilities";
4315 description = "Unix time parser/formatter and utilities";
4522 license = stdenv.lib.licenses.bsd3;
4316 license = stdenv.lib.licenses.bsd3;
4523 }) {};
4317 }) {};
4318+ "unliftio" = callPackage
4319+ ({ mkDerivation, async, base, deepseq, directory, filepath, hspec
4320+ , process, stm, time, transformers, unix, unliftio-core
4321+ }:
4322+ mkDerivation {
4323+ pname = "unliftio";
4324+ version = "0.2.7.0";
4325+ sha256 = "0qql93lq5w7qghl454cc3s1i8v1jb4h08n82fqkw0kli4g3g9njs";
4326+ libraryHaskellDepends = [
4327+ async base deepseq directory filepath process stm time transformers
4328+ unix unliftio-core
4329+ ];
4330+ testHaskellDepends = [
4331+ async base deepseq directory filepath hspec process stm time
4332+ transformers unix unliftio-core
4333+ ];
4334+ homepage = "https://github.com/fpco/unliftio/tree/master/unliftio#readme";
4335+ description = "The MonadUnliftIO typeclass for unlifting monads to IO (batteries included)";
4336+ license = stdenv.lib.licenses.mit;
4337+ }) {};
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+ }) {};
4524 "unordered-containers" = callPackage
4351 "unordered-containers" = callPackage
4525− ({ mkDerivation, base, deepseq, hashable }:
4352+ ({ mkDerivation, base, ChasingBottoms, containers, deepseq
4353+ , hashable, HUnit, QuickCheck, test-framework, test-framework-hunit
4354+ , test-framework-quickcheck2
4355+ }:
4526 mkDerivation {
4356 mkDerivation {
4527 pname = "unordered-containers";
4357 pname = "unordered-containers";
4528− version = "0.2.8.0";
4358+ version = "0.2.9.0";
4529− sha256 = "1a7flszhhgyjn0nm9w7cm26jbf6vyx9ij1iij4sl11pjkwsqi8d4";
4359+ sha256 = "0l4264p0av12cc6i8gls13q8y27x12z2ar4x34n3x59y99fcnc37";
4530 libraryHaskellDepends = [ base deepseq hashable ];
4360 libraryHaskellDepends = [ base deepseq hashable ];
4531− doHaddock = false;
4361+ testHaskellDepends = [
4532− doCheck = false;
4362+ base ChasingBottoms containers hashable HUnit QuickCheck
4363+ test-framework test-framework-hunit test-framework-quickcheck2
4364+ ];
4533 homepage = "https://github.com/tibbe/unordered-containers";
4365 homepage = "https://github.com/tibbe/unordered-containers";
4534 description = "Efficient hashing-based container types";
4366 description = "Efficient hashing-based container types";
4535 license = stdenv.lib.licenses.bsd3;
4367 license = stdenv.lib.licenses.bsd3;
@@ -4540,11 +4372,9 @@ self: {
4540 pname = "utf8-string";
4372 pname = "utf8-string";
4541 version = "1.0.1.1";
4373 version = "1.0.1.1";
4542 sha256 = "0h7imvxkahiy8pzr8cpsimifdfvv18lizrb33k6mnq70rcx9w2zv";
4374 sha256 = "0h7imvxkahiy8pzr8cpsimifdfvv18lizrb33k6mnq70rcx9w2zv";
4543− revision = "2";
4375+ revision = "3";
4544− editedCabalFile = "1b97s9picjl689hcz8scinv7c8k5iaal1livqr0l1l8yc4h0imhr";
4376+ editedCabalFile = "02vhj5gykkqa2dyn7s6gn8is1b5fdn9xcqqvlls268g7cpv6rk38";
4545 libraryHaskellDepends = [ base bytestring ];
4377 libraryHaskellDepends = [ base bytestring ];
4546− doHaddock = false;
4547− doCheck = false;
4548 homepage = "http://github.com/glguy/utf8-string/";
4378 homepage = "http://github.com/glguy/utf8-string/";
4549 description = "Support for reading and writing UTF8 Strings";
4379 description = "Support for reading and writing UTF8 Strings";
4550 license = stdenv.lib.licenses.bsd3;
4380 license = stdenv.lib.licenses.bsd3;
@@ -4562,53 +4392,43 @@ self: {
4562 libraryHaskellDepends = [
4392 libraryHaskellDepends = [
4563 base binary bytestring deepseq hashable random text
4393 base binary bytestring deepseq hashable random text
4564 ];
4394 ];
4565− doHaddock = false;
4566 doCheck = false;
4395 doCheck = false;
4567 homepage = "https://github.com/aslatter/uuid";
4396 homepage = "https://github.com/aslatter/uuid";
4568 description = "Type definitions for Universally Unique Identifiers";
4397 description = "Type definitions for Universally Unique Identifiers";
4569 license = stdenv.lib.licenses.bsd3;
4398 license = stdenv.lib.licenses.bsd3;
4570 }) {};
4399 }) {};
4571 "vault" = callPackage
4400 "vault" = callPackage
4572− ({ mkDerivation, base, containers, hashable, unordered-containers
4401+ ({ mkDerivation, base, containers, hashable, semigroups
4402+ , unordered-containers
4573 }:
4403 }:
4574 mkDerivation {
4404 mkDerivation {
4575 pname = "vault";
4405 pname = "vault";
4576− version = "0.3.0.7";
4406+ version = "0.3.1.1";
4577− sha256 = "1w36ldr5iv0yiqbvibm7b1c66hf1ps5rbassz348zmi113d8k4cy";
4407+ sha256 = "0a1fir7gvbj2w894daac5c4c3gy36r6c74yci78lb2nvk431b95j";
4578 libraryHaskellDepends = [
4408 libraryHaskellDepends = [
4579− base containers hashable unordered-containers
4409+ base containers hashable semigroups unordered-containers
4580 ];
4410 ];
4581− doHaddock = false;
4582− doCheck = false;
4583 homepage = "https://github.com/HeinrichApfelmus/vault";
4411 homepage = "https://github.com/HeinrichApfelmus/vault";
4584 description = "a persistent store for values of arbitrary types";
4412 description = "a persistent store for values of arbitrary types";
4585 license = stdenv.lib.licenses.bsd3;
4413 license = stdenv.lib.licenses.bsd3;
4586 }) {};
4414 }) {};
4587 "vector" = callPackage
4415 "vector" = callPackage
4588− ({ mkDerivation, base, deepseq, ghc-prim, HUnit, primitive
4416+ ({ mkDerivation, base, deepseq, ghc-prim, primitive }:
4589− , QuickCheck, random, template-haskell, test-framework
4590− , test-framework-hunit, test-framework-quickcheck2, transformers
4591− }:
4592 mkDerivation {
4417 mkDerivation {
4593 pname = "vector";
4418 pname = "vector";
4594 version = "0.12.0.1";
4419 version = "0.12.0.1";
4595 sha256 = "0yrx2ypiaxahvaz84af5bi855hd3107kxkbqc8km29nsp5wyw05i";
4420 sha256 = "0yrx2ypiaxahvaz84af5bi855hd3107kxkbqc8km29nsp5wyw05i";
4596− revision = "1";
4421+ revision = "3";
4597− editedCabalFile = "1xjv8876kx9vh86w718vdaaai40pwnsiw8368c5h88ch8iqq10qb";
4422+ editedCabalFile = "0y5rh8k710i2a3p1h2rghvr5cfg78p5h0kbfi7ifxqqf6pzlyr1x";
4598 libraryHaskellDepends = [ base deepseq ghc-prim primitive ];
4423 libraryHaskellDepends = [ base deepseq ghc-prim primitive ];
4599− testHaskellDepends = [
4600− base HUnit QuickCheck random template-haskell test-framework
4601− test-framework-hunit test-framework-quickcheck2 transformers
4602− ];
4603− doHaddock = false;
4604 doCheck = false;
4424 doCheck = false;
4605 homepage = "https://github.com/haskell/vector";
4425 homepage = "https://github.com/haskell/vector";
4606 description = "Efficient Arrays";
4426 description = "Efficient Arrays";
4607 license = stdenv.lib.licenses.bsd3;
4427 license = stdenv.lib.licenses.bsd3;
4608 }) {};
4428 }) {};
4609 "vector-algorithms" = callPackage
4429 "vector-algorithms" = callPackage
4610− ({ mkDerivation, base, bytestring, containers, mtl, mwc-random
4430+ ({ mkDerivation, base, bytestring, containers, primitive
4611− , primitive, QuickCheck, vector
4431+ , QuickCheck, vector
4612 }:
4432 }:
4613 mkDerivation {
4433 mkDerivation {
4614 pname = "vector-algorithms";
4434 pname = "vector-algorithms";
@@ -4619,32 +4439,45 @@ self: {
4619 isLibrary = true;
4439 isLibrary = true;
4620 isExecutable = true;
4440 isExecutable = true;
4621 libraryHaskellDepends = [ base bytestring primitive vector ];
4441 libraryHaskellDepends = [ base bytestring primitive vector ];
4622− executableHaskellDepends = [ base mtl mwc-random vector ];
4623 testHaskellDepends = [
4442 testHaskellDepends = [
4624 base bytestring containers QuickCheck vector
4443 base bytestring containers QuickCheck vector
4625 ];
4444 ];
4626− doHaddock = false;
4627 doCheck = false;
4445 doCheck = false;
4628 homepage = "http://code.haskell.org/~dolio/";
4446 homepage = "http://code.haskell.org/~dolio/";
4629 description = "Efficient algorithms for vector arrays";
4447 description = "Efficient algorithms for vector arrays";
4630 license = stdenv.lib.licenses.bsd3;
4448 license = stdenv.lib.licenses.bsd3;
4631 }) {};
4449 }) {};
4632 "vector-binary-instances" = callPackage
4450 "vector-binary-instances" = callPackage
4451+ ({ mkDerivation, base, binary, bytestring, criterion, deepseq
4633− ({ mkDerivation, base, binary, tasty, tasty-quickcheck, vector }:
4452+ , tasty, tasty-quickcheck, vector
4453+ }:
4634 mkDerivation {
4454 mkDerivation {
4635 pname = "vector-binary-instances";
4455 pname = "vector-binary-instances";
4636− version = "0.2.3.5";
4456+ version = "0.2.4";
4637− sha256 = "0niad09lbxz3cj20qllyj92lwbc013ihw4lby8fv07x5xjx5a4p1";
4457+ sha256 = "1y236jb72iab9ska1mc48z6yb0xgwmj45laaqdyjxksd84z7hbrb";
4638 revision = "1";
4458 revision = "1";
4639− editedCabalFile = "0yk61mifvcc31vancsfsd0vskqh5k3a3znx1rbz8wzcs4ijjzh48";
4459+ editedCabalFile = "196frl4akhfk7xf1nxzn8lmq99dxhzhsimanswn9yy7ym8zhki4i";
4640 libraryHaskellDepends = [ base binary vector ];
4460 libraryHaskellDepends = [ base binary vector ];
4641 testHaskellDepends = [ base binary tasty tasty-quickcheck vector ];
4461 testHaskellDepends = [ base binary tasty tasty-quickcheck vector ];
4642− doHaddock = false;
4462+ benchmarkHaskellDepends = [
4643− doCheck = false;
4463+ base binary bytestring criterion deepseq vector
4464+ ];
4644 homepage = "https://github.com/bos/vector-binary-instances";
4465 homepage = "https://github.com/bos/vector-binary-instances";
4645 description = "Instances of Data.Binary and Data.Serialize for vector";
4466 description = "Instances of Data.Binary and Data.Serialize for vector";
4646 license = stdenv.lib.licenses.bsd3;
4467 license = stdenv.lib.licenses.bsd3;
4647 }) {};
4468 }) {};
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+ }) {};
4648 "vector-instances" = callPackage
4481 "vector-instances" = callPackage
4649 ({ mkDerivation, base, comonad, hashable, keys, pointed
4482 ({ mkDerivation, base, comonad, hashable, keys, pointed
4650 , semigroupoids, semigroups, vector
4483 , semigroupoids, semigroups, vector
@@ -4656,8 +4489,6 @@ self: {
4656 libraryHaskellDepends = [
4489 libraryHaskellDepends = [
4657 base comonad hashable keys pointed semigroupoids semigroups vector
4490 base comonad hashable keys pointed semigroupoids semigroups vector
4658 ];
4491 ];
4659− doHaddock = false;
4660− doCheck = false;
4661 homepage = "http://github.com/ekmett/vector-instances";
4492 homepage = "http://github.com/ekmett/vector-instances";
4662 description = "Orphan Instances for 'Data.Vector'";
4493 description = "Orphan Instances for 'Data.Vector'";
4663 license = stdenv.lib.licenses.bsd3;
4494 license = stdenv.lib.licenses.bsd3;
@@ -4670,8 +4501,6 @@ self: {
4670 sha256 = "0d82x55f5vvr1jvaia382m23rs690lg55pvavv8f4ph0y6kd91xy";
4501 sha256 = "0d82x55f5vvr1jvaia382m23rs690lg55pvavv8f4ph0y6kd91xy";
4671 libraryHaskellDepends = [ base template-haskell vector ];
4502 libraryHaskellDepends = [ base template-haskell vector ];
4672 testHaskellDepends = [ base data-default vector ];
4503 testHaskellDepends = [ base data-default vector ];
4673− doHaddock = false;
4674− doCheck = false;
4675 description = "Deriver for Data.Vector.Unboxed using Template Haskell";
4504 description = "Deriver for Data.Vector.Unboxed using Template Haskell";
4676 license = stdenv.lib.licenses.bsd3;
4505 license = stdenv.lib.licenses.bsd3;
4677 }) {};
4506 }) {};
@@ -4682,77 +4511,72 @@ self: {
4682 version = "0.7.2";
4511 version = "0.7.2";
4683 sha256 = "0aygw0yb1h3yhmfl3bkwh5d3h0l4mmsxz7j53vdm6jryl1kgxzyk";
4512 sha256 = "0aygw0yb1h3yhmfl3bkwh5d3h0l4mmsxz7j53vdm6jryl1kgxzyk";
4684 libraryHaskellDepends = [ base ];
4513 libraryHaskellDepends = [ base ];
4685− doHaddock = false;
4686− doCheck = false;
4687 homepage = "http://github.com/ekmett/void";
4514 homepage = "http://github.com/ekmett/void";
4688 description = "A Haskell 98 logically uninhabited data type";
4515 description = "A Haskell 98 logically uninhabited data type";
4689 license = stdenv.lib.licenses.bsd3;
4516 license = stdenv.lib.licenses.bsd3;
4690 }) {};
4517 }) {};
4691 "wai" = callPackage
4518 "wai" = callPackage
4692− ({ mkDerivation, base, blaze-builder, bytestring
4519+ ({ mkDerivation, base, bytestring, hspec, hspec-discover
4693− , bytestring-builder, hspec, http-types, network, text
4694− , transformers, vault
4520+ , http-types, network, text, transformers, vault
4695 }:
4521 }:
4696 mkDerivation {
4522 mkDerivation {
4697 pname = "wai";
4523 pname = "wai";
4698− version = "3.2.1.1";
4524+ version = "3.2.1.2";
4699− sha256 = "08afasnirja21vr0bmzcywz4w29x736dmdv7h8nnh1l8bn7sd02x";
4525+ sha256 = "0jr3b2789wa4m6mxkz12ynz4lfsqmgbrcy0am8karyqr3x3528r8";
4700 libraryHaskellDepends = [
4526 libraryHaskellDepends = [
4701− base blaze-builder bytestring bytestring-builder http-types network
4702− text transformers vault
4527+ base bytestring http-types network text transformers vault
4703 ];
4528 ];
4704− testHaskellDepends = [ base blaze-builder bytestring hspec ];
4529+ testHaskellDepends = [ base bytestring hspec ];
4705− doHaddock = false;
4530+ testToolDepends = [ hspec-discover ];
4706− doCheck = false;
4707 homepage = "https://github.com/yesodweb/wai";
4531 homepage = "https://github.com/yesodweb/wai";
4708 description = "Web Application Interface";
4532 description = "Web Application Interface";
4709 license = stdenv.lib.licenses.mit;
4533 license = stdenv.lib.licenses.mit;
4710 }) {};
4534 }) {};
4711 "wai-conduit" = callPackage
4535 "wai-conduit" = callPackage
4712− ({ mkDerivation, base, blaze-builder, bytestring, conduit
4536+ ({ mkDerivation, base, bytestring, conduit, http-types
4713− , http-types, transformers, wai
4537+ , transformers, wai
4714 }:
4538 }:
4715 mkDerivation {
4539 mkDerivation {
4716 pname = "wai-conduit";
4540 pname = "wai-conduit";
4717− version = "3.0.0.3";
4541+ version = "3.0.0.4";
4718− sha256 = "1zvsiwjq2mvkb9sjgp3ly9m968m7a2jjzr4id6jpi3mmqykj15z4";
4542+ sha256 = "07yn41rn2skd5p3wqqa09wa761vj7ibl8l19gh4bi4i8slxhk417";
4719 libraryHaskellDepends = [
4543 libraryHaskellDepends = [
4720− base blaze-builder bytestring conduit http-types transformers wai
4544+ base bytestring conduit http-types transformers wai
4721 ];
4545 ];
4722− doHaddock = false;
4723− doCheck = false;
4724 homepage = "https://github.com/yesodweb/wai";
4546 homepage = "https://github.com/yesodweb/wai";
4725 description = "conduit wrappers for WAI";
4547 description = "conduit wrappers for WAI";
4726 license = stdenv.lib.licenses.mit;
4548 license = stdenv.lib.licenses.mit;
4727 }) {};
4549 }) {};
4728 "warp" = callPackage
4550 "warp" = callPackage
4729− ({ mkDerivation, array, async, auto-update, base, blaze-builder
4551+ ({ mkDerivation, array, async, auto-update, base, bsb-http-chunked
4730− , bytestring, bytestring-builder, case-insensitive, containers
4552+ , bytestring, case-insensitive, containers, directory, doctest
4731− , directory, doctest, ghc-prim, hashable, hspec, HTTP, http-date
4553+ , gauge, ghc-prim, hashable, hspec, http-client, http-date
4732 , http-types, http2, HUnit, iproute, lifted-base, network, process
4554 , http-types, http2, HUnit, iproute, lifted-base, network, process
4733 , QuickCheck, silently, simple-sendfile, stm, streaming-commons
4555 , QuickCheck, silently, simple-sendfile, stm, streaming-commons
4734 , text, time, transformers, unix, unix-compat, vault, wai, word8
4556 , text, time, transformers, unix, unix-compat, vault, wai, word8
4735 }:
4557 }:
4736 mkDerivation {
4558 mkDerivation {
4737 pname = "warp";
4559 pname = "warp";
4738− version = "3.2.13";
4560+ version = "3.2.23";
4739− sha256 = "0964l8xcbdqnrz0mnk0b732n66i7q8grwzzax96mqbh15ps5nfcj";
4561+ sha256 = "12v9qhi4hyp0sb90yddsax16jj7x47nmqwn53sv7b5nszcxgzam0";
4740 libraryHaskellDepends = [
4562 libraryHaskellDepends = [
4741− array async auto-update base blaze-builder bytestring
4563+ array async auto-update base bsb-http-chunked bytestring
4742− bytestring-builder case-insensitive containers ghc-prim hashable
4564+ case-insensitive containers ghc-prim hashable http-date http-types
4743− http-date http-types http2 iproute network simple-sendfile stm
4565+ http2 iproute network simple-sendfile stm streaming-commons text
4744− streaming-commons text unix unix-compat vault wai word8
4566+ unix unix-compat vault wai word8
4745 ];
4567 ];
4746 testHaskellDepends = [
4568 testHaskellDepends = [
4747− array async auto-update base blaze-builder bytestring
4569+ array async auto-update base bsb-http-chunked bytestring
4748− bytestring-builder case-insensitive containers directory doctest
4570+ case-insensitive containers directory doctest ghc-prim hashable
4749− ghc-prim hashable hspec HTTP http-date http-types http2 HUnit
4571+ hspec http-client http-date http-types http2 HUnit iproute
4750− iproute lifted-base network process QuickCheck silently
4572+ lifted-base network process QuickCheck silently simple-sendfile stm
4751− simple-sendfile stm streaming-commons text time transformers unix
4573+ streaming-commons text time transformers unix unix-compat vault wai
4752− unix-compat vault wai word8
4574+ word8
4575+ ];
4576+ benchmarkHaskellDepends = [
4577+ auto-update base bytestring containers gauge hashable http-date
4578+ http-types network unix unix-compat
4753 ];
4579 ];
4754− doHaddock = false;
4755− doCheck = false;
4756 homepage = "http://github.com/yesodweb/wai";
4580 homepage = "http://github.com/yesodweb/wai";
4757 description = "A fast, light-weight web server for WAI applications";
4581 description = "A fast, light-weight web server for WAI applications";
4758 license = stdenv.lib.licenses.mit;
4582 license = stdenv.lib.licenses.mit;
@@ -4763,18 +4587,43 @@ self: {
4763 }:
4587 }:
4764 mkDerivation {
4588 mkDerivation {
4765 pname = "warp-tls";
4589 pname = "warp-tls";
4766− version = "3.2.4";
4590+ version = "3.2.4.3";
4767− sha256 = "05vfjlgi574nnydfmfpyp3q6mf389iyj9mv94djnm8d1izasml85";
4591+ sha256 = "17gj295fr98l7mkz2gdz6kahdnmja0sql3kvy2zab6q168g53kc4";
4768 libraryHaskellDepends = [
4592 libraryHaskellDepends = [
4769 base bytestring cryptonite data-default-class network
4593 base bytestring cryptonite data-default-class network
4770 streaming-commons tls tls-session-manager wai warp
4594 streaming-commons tls tls-session-manager wai warp
4771 ];
4595 ];
4772− doHaddock = false;
4773− doCheck = false;
4774 homepage = "http://github.com/yesodweb/wai";
4596 homepage = "http://github.com/yesodweb/wai";
4775 description = "HTTP over TLS support for Warp via the TLS package";
4597 description = "HTTP over TLS support for Warp via the TLS package";
4776 license = stdenv.lib.licenses.mit;
4598 license = stdenv.lib.licenses.mit;
4777 }) {};
4599 }) {};
4600+ "wcwidth" = callPackage
4601+ ({ mkDerivation, base, containers }:
4602+ mkDerivation {
4603+ pname = "wcwidth";
4604+ version = "0.0.2";
4605+ sha256 = "1n1fq7v64b59ajf5g50iqj9sa34wm7s2j3viay0kxpmvlcv8gipz";
4606+ isLibrary = true;
4607+ isExecutable = true;
4608+ libraryHaskellDepends = [ base containers ];
4609+ homepage = "http://github.com/solidsnack/wcwidth/";
4610+ description = "Native wcwidth";
4611+ license = stdenv.lib.licenses.bsd3;
4612+ }) {};
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+ }) {};
4778 "with-location" = callPackage
4627 "with-location" = callPackage
4779 ({ mkDerivation, base, hspec }:
4628 ({ mkDerivation, base, hspec }:
4780 mkDerivation {
4629 mkDerivation {
@@ -4783,22 +4632,35 @@ self: {
4783 sha256 = "1rzxvsyh8x3ql3zh7gyw9hjx9bl4v73h0y5kzgaxcfcdn86dg49c";
4632 sha256 = "1rzxvsyh8x3ql3zh7gyw9hjx9bl4v73h0y5kzgaxcfcdn86dg49c";
4784 libraryHaskellDepends = [ base ];
4633 libraryHaskellDepends = [ base ];
4785 testHaskellDepends = [ base hspec ];
4634 testHaskellDepends = [ base hspec ];
4786− doHaddock = false;
4787− doCheck = false;
4788 homepage = "https://github.com/sol/with-location#readme";
4635 homepage = "https://github.com/sol/with-location#readme";
4789 description = "Use ImplicitParams-based source locations in a backward compatible way";
4636 description = "Use ImplicitParams-based source locations in a backward compatible way";
4790 license = stdenv.lib.licenses.mit;
4637 license = stdenv.lib.licenses.mit;
4791 }) {};
4638 }) {};
4639+ "wl-pprint-annotated" = callPackage
4640+ ({ mkDerivation, base, containers, deepseq, tasty, tasty-hunit
4641+ , text
4642+ }:
4643+ mkDerivation {
4644+ pname = "wl-pprint-annotated";
4645+ version = "0.1.0.0";
4646+ sha256 = "0c2996x5gdrif1l0lfwlqnka7xp5diac74rckv0jasv2i0333kmp";
4647+ libraryHaskellDepends = [ base containers deepseq text ];
4648+ testHaskellDepends = [
4649+ base containers deepseq tasty tasty-hunit text
4650+ ];
4651+ homepage = "https://github.com/minad/wl-pprint-annotated#readme";
4652+ description = "Wadler/Leijen pretty printer with annotations and slightly modernized API";
4653+ license = stdenv.lib.licenses.bsd3;
4654+ }) {};
4792 "word8" = callPackage
4655 "word8" = callPackage
4793− ({ mkDerivation, base, hspec }:
4656+ ({ mkDerivation, base, bytestring, criterion, hspec }:
4794 mkDerivation {
4657 mkDerivation {
4795 pname = "word8";
4658 pname = "word8";
4796 version = "0.1.3";
4659 version = "0.1.3";
4797 sha256 = "12jx7f13d2h1djq4fh4dyrab61sm49mj1w61j3rzp2vjfm696c16";
4660 sha256 = "12jx7f13d2h1djq4fh4dyrab61sm49mj1w61j3rzp2vjfm696c16";
4798 libraryHaskellDepends = [ base ];
4661 libraryHaskellDepends = [ base ];
4799 testHaskellDepends = [ base hspec ];
4662 testHaskellDepends = [ base hspec ];
4800− doHaddock = false;
4663+ benchmarkHaskellDepends = [ base bytestring criterion ];
4801− doCheck = false;
4802 description = "Word8 library";
4664 description = "Word8 library";
4803 license = stdenv.lib.licenses.bsd3;
4665 license = stdenv.lib.licenses.bsd3;
4804 }) {};
4666 }) {};
@@ -4809,10 +4671,10 @@ self: {
4809 }:
4671 }:
4810 mkDerivation {
4672 mkDerivation {
4811 pname = "x509";
4673 pname = "x509";
4812− version = "1.7.2";
4674+ version = "1.7.3";
4813− sha256 = "0yyfw07bw73gkh93z653lnncc30wj3g3rf26cwxjpyxvwalia0yw";
4675+ sha256 = "0mkk29g32fs70bqkikg83v45h9jig9c8aail3mrdqwxpkfa0yx21";
4814 revision = "1";
4676 revision = "1";
4815− editedCabalFile = "07mphpmj4zk5mzhp5x50a7q6w134kgymf557dcgbp643cbkcmc66";
4677+ editedCabalFile = "06zzirygvzp0ssdg9blipdwmd0b41p4gxh3ldai7ngjyjsdclwsx";
4816 libraryHaskellDepends = [
4678 libraryHaskellDepends = [
4817 asn1-encoding asn1-parse asn1-types base bytestring containers
4679 asn1-encoding asn1-parse asn1-types base bytestring containers
4818 cryptonite hourglass memory mtl pem
4680 cryptonite hourglass memory mtl pem
@@ -4821,8 +4683,6 @@ self: {
4821 asn1-types base bytestring cryptonite hourglass mtl tasty
4683 asn1-types base bytestring cryptonite hourglass mtl tasty
4822 tasty-quickcheck
4684 tasty-quickcheck
4823 ];
4685 ];
4824− doHaddock = false;
4825− doCheck = false;
4826 homepage = "http://github.com/vincenthz/hs-certificate";
4686 homepage = "http://github.com/vincenthz/hs-certificate";
4827 description = "X509 reader and writer";
4687 description = "X509 reader and writer";
4828 license = stdenv.lib.licenses.bsd3;
4688 license = stdenv.lib.licenses.bsd3;
@@ -4834,15 +4694,13 @@ self: {
4834 }:
4694 }:
4835 mkDerivation {
4695 mkDerivation {
4836 pname = "x509-store";
4696 pname = "x509-store";
4837− version = "1.6.5";
4697+ version = "1.6.6";
4838− sha256 = "1lg9gy0bmzjmlk4gfnzx2prfar1qha4hfjsw8yvjg33zm0fv3ahs";
4698+ sha256 = "0dbndqmnmyixxc7308nyq3zlkhz9dff4rbcw2a49c77rbicny9va";
4839 libraryHaskellDepends = [
4699 libraryHaskellDepends = [
4840 asn1-encoding asn1-types base bytestring containers cryptonite
4700 asn1-encoding asn1-types base bytestring containers cryptonite
4841 directory filepath mtl pem x509
4701 directory filepath mtl pem x509
4842 ];
4702 ];
4843 testHaskellDepends = [ base bytestring tasty tasty-hunit x509 ];
4703 testHaskellDepends = [ base bytestring tasty tasty-hunit x509 ];
4844− doHaddock = false;
4845− doCheck = false;
4846 homepage = "http://github.com/vincenthz/hs-certificate";
4704 homepage = "http://github.com/vincenthz/hs-certificate";
4847 description = "X.509 collection accessing and storing methods";
4705 description = "X.509 collection accessing and storing methods";
4848 license = stdenv.lib.licenses.bsd3;
4706 license = stdenv.lib.licenses.bsd3;
@@ -4859,34 +4717,29 @@ self: {
4859 base bytestring containers directory filepath mtl pem process x509
4717 base bytestring containers directory filepath mtl pem process x509
4860 x509-store
4718 x509-store
4861 ];
4719 ];
4862− doHaddock = false;
4863− doCheck = false;
4864 homepage = "http://github.com/vincenthz/hs-certificate";
4720 homepage = "http://github.com/vincenthz/hs-certificate";
4865 description = "Handle per-operating-system X.509 accessors and storage";
4721 description = "Handle per-operating-system X.509 accessors and storage";
4866 license = stdenv.lib.licenses.bsd3;
4722 license = stdenv.lib.licenses.bsd3;
4867 }) {};
4723 }) {};
4868 "x509-validation" = callPackage
4724 "x509-validation" = callPackage
4869− ({ mkDerivation, asn1-encoding, asn1-types, base, byteable
4725+ ({ mkDerivation, asn1-encoding, asn1-types, base, bytestring
4870− , bytestring, containers, cryptonite, data-default-class, hourglass
4726+ , containers, cryptonite, data-default-class, hourglass, memory
4871− , memory, mtl, pem, tasty, tasty-hunit, x509, x509-store
4727+ , mtl, pem, tasty, tasty-hunit, x509, x509-store
4872 }:
4728 }:
4873 mkDerivation {
4729 mkDerivation {
4874 pname = "x509-validation";
4730 pname = "x509-validation";
4875− version = "1.6.9";
4731+ version = "1.6.10";
4876− sha256 = "005m5jxjz5cx3lriayv4a17xa19qc2qxw7kz2f9wvj7hgjnwww44";
4732+ sha256 = "1ms51scawldgyfcim5a2qlgyn3rnrclyh205d6djaa1569vrs73n";
4877 revision = "1";
4733 revision = "1";
4878− editedCabalFile = "02n9s0wizi4wivs6is4cyapqjjnbrx3zdk34q0cnlfsvbbvyhjax";
4734+ editedCabalFile = "1isap8v1gh31q4pj3gn155ya8nd1da0a5a3cryqh4yhf0ivbwl0w";
4879 libraryHaskellDepends = [
4735 libraryHaskellDepends = [
4880− asn1-encoding asn1-types base byteable bytestring containers
4736+ asn1-encoding asn1-types base bytestring containers cryptonite
4881− cryptonite data-default-class hourglass memory mtl pem x509
4737+ data-default-class hourglass memory mtl pem x509 x509-store
4882− x509-store
4883 ];
4738 ];
4884 testHaskellDepends = [
4739 testHaskellDepends = [
4885 asn1-encoding asn1-types base bytestring cryptonite
4740 asn1-encoding asn1-types base bytestring cryptonite
4886 data-default-class hourglass tasty tasty-hunit x509 x509-store
4741 data-default-class hourglass tasty tasty-hunit x509 x509-store
4887 ];
4742 ];
4888− doHaddock = false;
4889− doCheck = false;
4890 homepage = "http://github.com/vincenthz/hs-certificate";
4743 homepage = "http://github.com/vincenthz/hs-certificate";
4891 description = "X.509 Certificate and CRL validation";
4744 description = "X.509 Certificate and CRL validation";
4892 license = stdenv.lib.licenses.bsd3;
4745 license = stdenv.lib.licenses.bsd3;
@@ -4898,33 +4751,29 @@ self: {
4898 version = "1.3.14";
4751 version = "1.3.14";
4899 sha256 = "0g814lj7vaxvib2g3r734221k80k7ap9czv9hinifn8syals3l9j";
4752 sha256 = "0g814lj7vaxvib2g3r734221k80k7ap9czv9hinifn8syals3l9j";
4900 libraryHaskellDepends = [ base bytestring text ];
4753 libraryHaskellDepends = [ base bytestring text ];
4901− doHaddock = false;
4902− doCheck = false;
4903 homepage = "http://code.galois.com";
4754 homepage = "http://code.galois.com";
4904 description = "A simple XML library";
4755 description = "A simple XML library";
4905 license = stdenv.lib.licenses.bsd3;
4756 license = stdenv.lib.licenses.bsd3;
4906 }) {};
4757 }) {};
4907 "xml-conduit" = callPackage
4758 "xml-conduit" = callPackage
4908− ({ mkDerivation, attoparsec, base, blaze-builder, blaze-html
4759+ ({ mkDerivation, attoparsec, base, blaze-html, blaze-markup
4909− , blaze-markup, bytestring, conduit, conduit-extra, containers
4760+ , bytestring, conduit, conduit-extra, containers
4910− , data-default, deepseq, hspec, HUnit, monad-control, resourcet
4761+ , data-default-class, deepseq, hspec, HUnit, monad-control
4911− , text, transformers, xml-types
4762+ , resourcet, text, transformers, xml-types
4912 }:
4763 }:
4913 mkDerivation {
4764 mkDerivation {
4914 pname = "xml-conduit";
4765 pname = "xml-conduit";
4915− version = "1.5.1";
4766+ version = "1.8.0";
4916− sha256 = "0d4pb9d0mdz9djh8aiy5r8088rqh7w34mbqmg8mmaq1i7vx2dzks";
4767+ sha256 = "0di0ll2p4ykqnlipf2jrlalirxdf9wkli292245rgr3vcb9vz0h3";
4917 libraryHaskellDepends = [
4768 libraryHaskellDepends = [
4918− attoparsec base blaze-builder blaze-html blaze-markup bytestring
4769+ attoparsec base blaze-html blaze-markup bytestring conduit
4919− conduit conduit-extra containers data-default deepseq monad-control
4770+ conduit-extra containers data-default-class deepseq monad-control
4920 resourcet text transformers xml-types
4771 resourcet text transformers xml-types
4921 ];
4772 ];
4922 testHaskellDepends = [
4773 testHaskellDepends = [
4923 base blaze-markup bytestring conduit containers hspec HUnit
4774 base blaze-markup bytestring conduit containers hspec HUnit
4924 resourcet text transformers xml-types
4775 resourcet text transformers xml-types
4925 ];
4776 ];
4926− doHaddock = false;
4927− doCheck = false;
4928 homepage = "http://github.com/snoyberg/xml";
4777 homepage = "http://github.com/snoyberg/xml";
4929 description = "Pure-Haskell utilities for dealing with XML with the conduit package";
4778 description = "Pure-Haskell utilities for dealing with XML with the conduit package";
4930 license = stdenv.lib.licenses.mit;
4779 license = stdenv.lib.licenses.mit;
@@ -4936,23 +4785,20 @@ self: {
4936 version = "0.3.6";
4785 version = "0.3.6";
4937 sha256 = "1jgqxsa9p2q3h6nymbfmvhldqrqlwrhrzmwadlyc0li50x0d8dwr";
4786 sha256 = "1jgqxsa9p2q3h6nymbfmvhldqrqlwrhrzmwadlyc0li50x0d8dwr";
4938 libraryHaskellDepends = [ base deepseq text ];
4787 libraryHaskellDepends = [ base deepseq text ];
4939− doHaddock = false;
4940− doCheck = false;
4941 homepage = "https://john-millikin.com/software/haskell-xml/";
4788 homepage = "https://john-millikin.com/software/haskell-xml/";
4942 description = "Basic types for representing XML";
4789 description = "Basic types for representing XML";
4943 license = stdenv.lib.licenses.mit;
4790 license = stdenv.lib.licenses.mit;
4944 }) {};
4791 }) {};
4945 "yaml" = callPackage
4792 "yaml" = callPackage
4946− ({ mkDerivation, aeson, aeson-qq, attoparsec, base, base-compat
4793+ ({ mkDerivation, aeson, attoparsec, base, base-compat, bytestring
4947− , bytestring, conduit, containers, directory, filepath, hspec
4794+ , conduit, containers, directory, filepath, hspec, HUnit, mockery
4948− , HUnit, mockery, resourcet, scientific, semigroups
4795+ , resourcet, scientific, semigroups, template-haskell, temporary
4949− , template-haskell, temporary, text, transformers
4950− , unordered-containers, vector
4796+ , text, transformers, unordered-containers, vector
4951 }:
4797 }:
4952 mkDerivation {
4798 mkDerivation {
4953 pname = "yaml";
4799 pname = "yaml";
4954− version = "0.8.25";
4800+ version = "0.8.32";
4955− sha256 = "16bx7vkj455796wdklh8h13zm98h5m81dl8np0sjbx9hcsrfdbyp";
4801+ sha256 = "0cbsyh4ilvjzq1q7pxls43k6pdqxg1l85xzibcwpbvmlvrizh86w";
4956 isLibrary = true;
4802 isLibrary = true;
4957 isExecutable = true;
4803 isExecutable = true;
4958 libraryHaskellDepends = [
4804 libraryHaskellDepends = [
@@ -4960,51 +4806,27 @@ self: {
4960 filepath resourcet scientific semigroups template-haskell text
4806 filepath resourcet scientific semigroups template-haskell text
4961 transformers unordered-containers vector
4807 transformers unordered-containers vector
4962 ];
4808 ];
4963− executableHaskellDepends = [ aeson base bytestring ];
4964 testHaskellDepends = [
4809 testHaskellDepends = [
4965− aeson aeson-qq base base-compat bytestring conduit directory hspec
4810+ aeson attoparsec base base-compat bytestring conduit containers
4811+ directory filepath hspec HUnit mockery resourcet scientific
4966− HUnit mockery resourcet temporary text transformers
4812+ semigroups template-haskell temporary text transformers
4967 unordered-containers vector
4813 unordered-containers vector
4968 ];
4814 ];
4969− doHaddock = false;
4970− doCheck = false;
4971− homepage = "http://github.com/snoyberg/yaml/";
4815+ homepage = "https://github.com/snoyberg/yaml#readme";
4972 description = "Support for parsing and rendering YAML documents";
4816 description = "Support for parsing and rendering YAML documents";
4973 license = stdenv.lib.licenses.bsd3;
4817 license = stdenv.lib.licenses.bsd3;
4974 }) {};
4818 }) {};
4975 "zlib" = callPackage
4819 "zlib" = callPackage
4976− ({ mkDerivation, base, bytestring, QuickCheck, tasty, tasty-hunit
4820+ ({ mkDerivation, base, bytestring, zlib }:
4977− , tasty-quickcheck, zlib
4978− }:
4979 mkDerivation {
4821 mkDerivation {
4980 pname = "zlib";
4822 pname = "zlib";
4981− version = "0.6.1.2";
4823+ version = "0.6.2";
4982− sha256 = "1fx2k2qmgm2dj3fkxx2ry945fpdn02d4dkihjxma21xgdiilxsz4";
4824+ sha256 = "1vbzf0awb6zb456xf48za1kl22018646cfzq4frvxgb9ay97vk0d";
4983 libraryHaskellDepends = [ base bytestring ];
4825 libraryHaskellDepends = [ base bytestring ];
4984 librarySystemDepends = [ zlib ];
4826 librarySystemDepends = [ zlib ];
4985− testHaskellDepends = [
4986− base bytestring QuickCheck tasty tasty-hunit tasty-quickcheck
4987− ];
4988− doHaddock = false;
4989 doCheck = false;
4827 doCheck = false;
4990 description = "Compression and decompression in the gzip and zlib formats";
4828 description = "Compression and decompression in the gzip and zlib formats";
4991 license = stdenv.lib.licenses.bsd3;
4829 license = stdenv.lib.licenses.bsd3;
4992 }) {inherit (pkgs) zlib;};
4830 }) {inherit (pkgs) zlib;};
4993− "zlib-bindings" = callPackage
4994− ({ mkDerivation, base, bytestring, hspec, QuickCheck, zlib }:
4995− mkDerivation {
4996− pname = "zlib-bindings";
4997− version = "0.1.1.5";
4998− sha256 = "02ciywlz4wdlymgc3jsnicz9kzvymjw1www2163gxidnz4wb8fy8";
4999− revision = "2";
5000− editedCabalFile = "0fq49694gqkab8m0vq4i879blswczwd66n7xh4r4gwiahf0ryvqc";
5001− libraryHaskellDepends = [ base bytestring zlib ];
5002− testHaskellDepends = [ base bytestring hspec QuickCheck zlib ];
5003− doHaddock = false;
5004− doCheck = false;
5005− homepage = "http://github.com/snapframework/zlib-bindings";
5006− description = "Low-level bindings to the zlib package";
5007− license = stdenv.lib.licenses.bsd3;
5008− }) {};
5009
4831
5010}
4832}
nix/lib.nix+1−1
@@ -23,7 +23,7 @@ rec {
23 buildInputs = [ git ];
23 buildInputs = [ git ];
24 installPhase = ''
24 installPhase = ''
25 mkdir -p $out
25 mkdir -p $out
26− git clone --branch hackage https://github.com/commercialhaskell/all-cabal-hashes.git $out
26+ git clone --bare --branch hackage https://github.com/commercialhaskell/all-cabal-hashes.git $out
27 '';
27 '';
28 SSL_CERT_FILE="${cacert}/etc/ssl/certs/ca-bundle.crt";
28 SSL_CERT_FILE="${cacert}/etc/ssl/certs/ca-bundle.crt";
29 };
29 };
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−}
src/AllCabalHashes.hs+27−21
@@ -3,14 +3,14 @@ module AllCabalHashes where
3import Control.Lens hiding ((<.>))
3import Control.Lens hiding ((<.>))
4import Data.Aeson as A
4import Data.Aeson as A
5import Data.ByteString as BS
5import Data.ByteString as BS
6−import Data.ByteString.Lazy as BSL
6+import Data.ByteString.Char8 as B8
7import Data.Map as M
7import Data.Map as M
8+import Data.Tagged (Tagged(..))
8import Data.Text as T
9import Data.Text as T
9−import Data.Text.Encoding as T
10import Distribution.Nixpkgs.Hashes as NH
10import Distribution.Nixpkgs.Hashes as NH
11import Distribution.Package
11import Distribution.Package
12import Distribution.PackageDescription
12import Distribution.PackageDescription
13−import Distribution.PackageDescription.Parse
13+import Distribution.PackageDescription.Parsec
14import Distribution.Text ( display )
14import Distribution.Text ( display )
15import Git
15import Git
16import Git.Libgit2 as Libgit2
16import Git.Libgit2 as Libgit2
@@ -41,28 +41,34 @@ readPackageByHash repoDir sha1Hash = do
41 let repoOpts = defaultRepositoryOptions { repoPath = repoDir }
41 let repoOpts = defaultRepositoryOptions { repoPath = repoDir }
42 repo <- openLgRepository repoOpts
42 repo <- openLgRepository repoOpts
43 buf <- runLgRepository repo $ do
43 buf <- runLgRepository repo $ do
44− BlobObj (Blob _ contents) <- lookupObject =<< parseOid sha1Hash
44+ oid <- parseOid sha1Hash
45− case contents of
45+ catBlob (Tagged oid)
46− BlobString bs -> return bs
47− BlobStringLazy bsl -> return $ BSL.toStrict bsl
48− _ -> fail $ "Git SHA1 " ++ show sha1Hash ++ ": expected single Blob"
49− cabal <- case parseGenericPackageDescription (T.unpack $ T.decodeUtf8 buf) of
50− ParseOk _ a -> return a
51− ParseFailed err -> fail ("Git SHA1 " ++ show sha1Hash ++ ": " ++ show err)
46+ parseCabal ("Git SHA1 " ++ show sha1Hash) buf
52− let
53− hash = printSHA256 (digest (digestByName "sha256") buf)
54− pkg = setCabalFileHash hash cabal
55− return (pkg, hash)
56
47
57readPackageByName :: FilePath -> PackageIdentifier -> IO (GenericPackageDescription, SHA256Hash)
48readPackageByName :: FilePath -> PackageIdentifier -> IO (GenericPackageDescription, SHA256Hash)
58readPackageByName repoDir (PackageIdentifier name version) = do
49readPackageByName repoDir (PackageIdentifier name version) = do
59− let cabalFile = repoDir </> unPackageName name </> display version </> unPackageName name <.> "cabal"
50+ let cabalFile = unPackageName name </> display version </> unPackageName name <.> "cabal"
60− buf <- BS.readFile cabalFile
51+ let repoOpts = defaultRepositoryOptions { repoPath = repoDir }
52+ repo <- openLgRepository repoOpts
53+ buf <- runLgRepository repo $ do
54+ headCommit <- resolveReference "HEAD" >>= \case
55+ Nothing -> fail "Failed to parse HEAD ref"
56+ Just oid -> lookupCommit $ Tagged oid
57+ blobOid <- commitTreeEntry headCommit (B8.pack cabalFile) >>= \case
58+ Nothing -> fail (cabalFile ++ ": no such file at HEAD")
59+ Just (BlobEntry oid PlainBlob) -> pure oid
60+ Just (BlobEntry _ _) -> fail (cabalFile ++ " is not a plain blob")
61+ _ -> fail (cabalFile ++ " points to a non-blob!")
62+ catBlob blobOid
63+ parseCabal cabalFile buf
64+
65+parseCabal :: String -> BS.ByteString -> IO (GenericPackageDescription, SHA256Hash)
66+parseCabal what blob = do
61− cabal <- case parseGenericPackageDescription (T.unpack $ T.decodeUtf8 buf) of
67+ cabal <- let (_, res) = runParseResult (parseGenericPackageDescription blob)
62− ParseOk _ a -> return a
68+ in case res of Right a -> return a
63− ParseFailed err -> fail (cabalFile ++ ": " ++ show err)
69+ Left (_, err) -> fail (what ++ ": " ++ show err)
64 let
70 let
65− hash = NH.printSHA256 (SSL.digest (SSL.digestByName "sha256") buf)
71+ hash = NH.printSHA256 (SSL.digest (SSL.digestByName "sha256") blob)
66 pkg = setCabalFileHash hash cabal
72 pkg = setCabalFileHash hash cabal
67 return (pkg, hash)
73 return (pkg, hash)
68
74
src/Distribution/Nixpkgs/Haskell/FromStack.hs+3−2
@@ -68,14 +68,14 @@ fromPackage conf pconf plan pkg =
68 (haskellResolver conf)
68 (haskellResolver conf)
69 (targetPlatform conf)
69 (targetPlatform conf)
70 (targetCompiler conf)
70 (targetCompiler conf)
71− flags
71+ (mkFlagAssignment flags)
72 (planDependencies plan)
72 (planDependencies plan)
73 (configureBenches . configureTests $ pkgCabal pkg)
73 (configureBenches . configureTests $ pkgCabal pkg)
74 genericDrv = fromPackageDescription
74 genericDrv = fromPackageDescription
75 (haskellResolver conf)
75 (haskellResolver conf)
76 (nixpkgsResolver conf)
76 (nixpkgsResolver conf)
77 missingDeps
77 missingDeps
78− flags
78+ (mkFlagAssignment flags)
79 descr
79 descr
80 depName (Dependency name _) = name
80 depName (Dependency name _) = name
81 testDeps = setOf
81 testDeps = setOf
@@ -97,4 +97,5 @@ finalizePackage :: Package -> PackageConfig -> Derivation -> Derivation
97finalizePackage pkg pconf drv = drv
97finalizePackage pkg pconf drv = drv
98 & src .~ pkgSource pkg
98 & src .~ pkgSource pkg
99 & doCheck &&~ enableCheck pconf
99 & doCheck &&~ enableCheck pconf
100+ & testDepends %~ (if enableCheck pconf then id else const mempty)
100 & runHaddock &&~ enableHaddock pconf
101 & runHaddock &&~ enableHaddock pconf
src/Distribution/Nixpkgs/Haskell/FromStack/Package.hs−1
@@ -5,7 +5,6 @@ import Data.Foldable as F
5import Data.Function (on)
5import Data.Function (on)
6import Data.Graph (Graph, Vertex)
6import Data.Graph (Graph, Vertex)
7import Data.Maybe
7import Data.Maybe
8−import Data.Monoid
9import Data.Ord as O
8import Data.Ord as O
10import Distribution.Text (display, disp)
9import Distribution.Text (display, disp)
11import Distribution.Package (unPackageName, packageName)
10import Distribution.Package (unPackageName, packageName)
src/Distribution/Nixpkgs/Haskell/Packages/PrettyPrinting.hs+2
@@ -2,6 +2,8 @@ module Distribution.Nixpkgs.Haskell.Packages.PrettyPrinting where
2
2
3import Language.Nix.PrettyPrinting
3import Language.Nix.PrettyPrinting
4
4
5+import Prelude hiding ((<>))
6+
5compilerConfig :: Doc -> Doc
7compilerConfig :: Doc -> Doc
6compilerConfig body =
8compilerConfig body =
7 funargsCurried ["self", "super"] <+> body
9 funargsCurried ["self", "super"] <+> body
src/Distribution/Nixpkgs/Haskell/Stack.hs+15−33
@@ -1,4 +1,3 @@
1−{-# LANGUAGE CPP #-}
2module Distribution.Nixpkgs.Haskell.Stack where
1module Distribution.Nixpkgs.Haskell.Stack where
3
2
4import Control.Lens
3import Control.Lens
@@ -9,6 +8,7 @@ import Distribution.Nixpkgs.Fetch
9import Distribution.Nixpkgs.Haskell.Derivation
8import Distribution.Nixpkgs.Haskell.Derivation
10import Distribution.Nixpkgs.Haskell.FromCabal as FromCabal
9import Distribution.Nixpkgs.Haskell.FromCabal as FromCabal
11import Distribution.Nixpkgs.Haskell.FromStack as FromStack
10import Distribution.Nixpkgs.Haskell.FromStack as FromStack
11+import Distribution.Nixpkgs.Haskell.Hackage as DB
12import Distribution.Nixpkgs.Haskell.PackageSourceSpec as PackageSourceSpec
12import Distribution.Nixpkgs.Haskell.PackageSourceSpec as PackageSourceSpec
13import Distribution.PackageDescription as PackageDescription
13import Distribution.PackageDescription as PackageDescription
14import Distribution.System as System
14import Distribution.System as System
@@ -16,13 +16,6 @@ import Network.URI as URI
16import Stack.Config
16import Stack.Config
17
17
18
18
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
26
19
27data StackPackagesConfig = StackPackagesConfig
20data StackPackagesConfig = StackPackagesConfig
28 { _spcHaskellResolver :: HaskellResolver
21 { _spcHaskellResolver :: HaskellResolver
@@ -36,22 +29,12 @@ data StackPackagesConfig = StackPackagesConfig
36
29
37makeLenses ''StackPackagesConfig
30makeLenses ''StackPackagesConfig
38
31
39−getStackPackageFromDb
32+getStackPackageFromDb :: DB.HackageDB -> StackPackage -> IO Package
40− :: Maybe HackageDb
41− -> StackPackage
42− -> IO Package
43−getStackPackageFromDb optHackageDb stackPackage =
33+getStackPackageFromDb hackageDb stackPackage = do
44−#if MIN_VERSION_cabal2nix(2,6,0)
45− PackageSourceSpec.getPackage
34+ PackageSourceSpec.getPackage'
46 False
35 False
47− (unHackageDb <$> optHackageDb)
36+ (pure hackageDb)
48− Nothing
49− (stackLocationToSource (stackPackage ^. spLocation) (stackPackage ^. spDir))
50−#else
51− PackageSourceSpec.getPackage
52− (unHackageDb <$> optHackageDb)
53 (stackLocationToSource (stackPackage ^. spLocation) (stackPackage ^. spDir))
37 (stackLocationToSource (stackPackage ^. spLocation) (stackPackage ^. spDir))
54−#endif
55
38
56stackLocationToSource
39stackLocationToSource
57 :: PackageLocation
40 :: PackageLocation
@@ -59,22 +42,22 @@ stackLocationToSource
59 -> Maybe FilePath
42 -> Maybe FilePath
60 -> Source
43 -> Source
61stackLocationToSource pl mCabalDir = case pl of
44stackLocationToSource pl mCabalDir = case pl of
62− HackagePackage p -> Source
45+ PlIndex p -> Source
63− { sourceUrl = "cabal://" ++ T.unpack p
46+ { sourceUrl = "cabal://" ++ T.unpack (p ^. piNameVersion)
64 , sourceRevision = mempty
47 , sourceRevision = mempty
65 , sourceHash = UnknownHash
48 , sourceHash = UnknownHash
66 , sourceCabalDir = cabalDir }
49 , sourceCabalDir = cabalDir }
67− StackFilePath p -> Source
50+ PlFilePath p -> Source
68 { sourceUrl = p
51 { sourceUrl = p
69 , sourceRevision = mempty
52 , sourceRevision = mempty
70 , sourceHash = UnknownHash
53 , sourceHash = UnknownHash
71 , sourceCabalDir = cabalDir }
54 , sourceCabalDir = cabalDir }
72− StackUri uri -> Source
55+ PlUri uri -> Source
73 { sourceUrl = URI.uriToString id uri mempty
56 { sourceUrl = URI.uriToString id uri mempty
74 , sourceRevision = mempty
57 , sourceRevision = mempty
75 , sourceHash = UnknownHash
58 , sourceHash = UnknownHash
76 , sourceCabalDir = cabalDir }
59 , sourceCabalDir = cabalDir }
77− StackRepo r -> Source
60+ PlRepo r -> Source
78 { sourceUrl = T.unpack $ r ^. rUri
61 { sourceUrl = T.unpack $ r ^. rUri
79 , sourceRevision = T.unpack $ r ^. rCommit
62 , sourceRevision = T.unpack $ r ^. rCommit
80 , sourceHash = UnknownHash
63 , sourceHash = UnknownHash
@@ -84,18 +67,17 @@ stackLocationToSource pl mCabalDir = case pl of
84
67
85packageDerivation
68packageDerivation
86 :: StackPackagesConfig
69 :: StackPackagesConfig
87− -> Maybe HackageDb
70+ -> DB.HackageDB
88 -> StackPackage
71 -> StackPackage
89 -> IO Derivation
72 -> IO Derivation
90−packageDerivation conf optHackageDb stackPackage = do
73+packageDerivation conf hackageDb stackPackage = do
91− pkg <- getStackPackageFromDb optHackageDb stackPackage
74+ pkg <- getStackPackageFromDb hackageDb stackPackage
92 let
75 let
93 drv = genericPackageDerivation conf pkg
76 drv = genericPackageDerivation conf pkg
94 & subpath %~ flip fromMaybe (stackPackage ^. spDir)
77 & subpath %~ flip fromMaybe (stackPackage ^. spDir)
95− isExtraDep = stackPackage ^. spExtraDep
96 pconf = PackageConfig
78 pconf = PackageConfig
97− { enableCheck = isExtraDep || conf ^. spcDoCheckPackages
79+ { enableCheck = conf ^. spcDoCheckPackages
98− , enableHaddock = isExtraDep || conf ^. spcDoHaddockPackages }
80+ , enableHaddock = conf ^. spcDoHaddockPackages }
99 return $ finalizePackage pkg pconf drv
81 return $ finalizePackage pkg pconf drv
100
82
101genericPackageDerivation
83genericPackageDerivation
src/Distribution/Nixpkgs/Haskell/Stack/PrettyPrinting.hs+51−24
@@ -17,12 +17,14 @@ import qualified Language.Nix.FilePath as Nix
17import Language.Nix.PrettyPrinting as PP
17import Language.Nix.PrettyPrinting as PP
18import Stack.Config (StackResolver, unStackResolver)
18import Stack.Config (StackResolver, unStackResolver)
19
19
20+import Prelude hiding ((<>))
21+
20
22
21data OverrideConfig = OverrideConfig
23data OverrideConfig = OverrideConfig
22− { _ocGhc :: !Version
24+ { _ocGhc :: Version
23− , _ocStackagePackages :: !FilePath
25+ , _ocStackagePackages :: FilePath
24− , _ocStackageConfig :: !FilePath
26+ , _ocStackageConfig :: FilePath
25− , _ocNixpkgs :: !FilePath
27+ , _ocNixpkgs :: FilePath
26 }
28 }
27
29
28makeLenses ''OverrideConfig
30makeLenses ''OverrideConfig
@@ -75,11 +77,11 @@ overrideHaskellPackages oc packages = vcat
75 , nest 2 "inherit pkgs stdenv;"
77 , nest 2 "inherit pkgs stdenv;"
76 , nest 2 "inherit (self) callPackage;"
78 , nest 2 "inherit (self) callPackage;"
77 , "};"
79 , "};"
78− , ""
79− ]
80+ ]
80 , "in callPackage (nixpkgs.path + \"/pkgs/development/haskell-modules\") {"
81 , "in callPackage (nixpkgs.path + \"/pkgs/development/haskell-modules\") {"
81 , nest 2 $ vcat
82 , nest 2 $ vcat
82− [ attr "ghc" ("pkgs.haskell.compiler." <> toNixGhcVersion (oc ^. ocGhc))
83+ [ attr "ghc" ("pkgs.haskell.compiler." <> nixGhc)
84+ , attr "buildHaskellPackages" ("buildPackages.haskell.packages." <> nixGhc)
83 , attr "compilerConfig" "self: extends pkgOverrides (stackageConfig self)"
85 , attr "compilerConfig" "self: extends pkgOverrides (stackageConfig self)"
84 , attr "initialPackages" "stackagePackages"
86 , attr "initialPackages" "stackagePackages"
85 , attr "configurationCommon" "args: self: super: {}"
87 , attr "configurationCommon" "args: self: super: {}"
@@ -87,6 +89,8 @@ overrideHaskellPackages oc packages = vcat
87 ]
89 ]
88 , "}"
90 , "}"
89 ]
91 ]
92+ where
93+ nixGhc = toNixGhcVersion (oc ^. ocGhc)
90
94
91overrideStackage :: StackResolver -> FilePath -> NonEmpty Derivation -> Doc
95overrideStackage :: StackResolver -> FilePath -> NonEmpty Derivation -> Doc
92overrideStackage stackResolver nixpkgsPath packages = vcat
96overrideStackage stackResolver nixpkgsPath packages = vcat
@@ -106,31 +110,54 @@ overrideStackage stackResolver nixpkgsPath packages = vcat
106 ]
110 ]
107
111
108pPrintHaskellPackages :: OverrideConfig -> Doc
112pPrintHaskellPackages :: OverrideConfig -> Doc
109−pPrintHaskellPackages oc =
113+pPrintHaskellPackages oc = vcat
110− let
111− nixpkgs = if oc ^. ocNixpkgs . to fromString == systemNixpkgs
112− then systemNixpkgs
113− else (disp . (fromString :: FilePath -> Nix.FilePath)) (oc ^. ocNixpkgs)
114− in vcat
115 [ funargs
114 [ funargs
116− [ "nixpkgs ? import " <> nixpkgs <> " {}"
115+ [ "callPackage"
116+ , "buildPackages"
117+ , "pkgs"
118+ , "stdenv"
119+ , "lib"
120+ , "overrides ? (self: super: {})"
121+ , "packageSetConfig ? (self: super: {})"
117 ]
122 ]
118 , ""
123 , ""
119− , "with nixpkgs; let"
124+ , "let"
120− , nest 2 $ vcat
121− [ attr "haskellLib" "callPackage (nixpkgs.path + /pkgs/development/haskell-modules/lib.nix) {}"
122− ]
123− , "in callPackage (nixpkgs.path + /pkgs/development/haskell-modules) {"
124 , nest 2 $ vcat
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
125− [ attr "ghc" ("pkgs.haskell.compiler." <> toNixGhcVersion (oc ^. ocGhc))
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+ , ""
126 , attr "compilerConfig" . importStackageConfig $ oc ^. ocStackageConfig
141 , attr "compilerConfig" . importStackageConfig $ oc ^. ocStackageConfig
127− , attr "initialPackages" . importStackagePackages $ oc ^. ocStackagePackages
142+ , ""
128− , attr "configurationCommon" "if builtins.pathExists ./configuration-common.nix then import ./configuration-common.nix else args: self: super: {}"
143+ , attr "configurationCommon" "if builtins.pathExists ./configuration-common.nix then import ./configuration-common.nix { inherit pkgs haskellLib; } else self: super: {}"
129− , "inherit haskellLib;"
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)))))"
130 ]
147 ]
131− , "}"
148+ , ""
149+ , "in extensible-self"
132 ]
150 ]
133
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+
134toNixGhcVersion :: Version -> Doc
161toNixGhcVersion :: Version -> Doc
135toNixGhcVersion = (<>) "ghc" . toNixVersion . show . disp
162toNixGhcVersion = (<>) "ghc" . toNixVersion . show . disp
136
163
src/LtsHaskell.hs+11−15
@@ -1,4 +1,3 @@
1−{-# LANGUAGE CPP #-}
2module LtsHaskell where
1module LtsHaskell where
3
2
4import AllCabalHashes
3import AllCabalHashes
@@ -24,6 +23,7 @@ import Stackage.BuildPlan
24import Stackage.Types (SystemInfo(..))
23import Stackage.Types (SystemInfo(..))
25import System.FilePath as Path
24import System.FilePath as Path
26
25
26+import qualified Distribution.Nixpkgs.Haskell.Hackage as DB
27import qualified Data.Yaml as Yaml
27import qualified Data.Yaml as Yaml
28import qualified Data.Map as Map
28import qualified Data.Map as Map
29import qualified Data.Set as Set
29import qualified Data.Set as Set
@@ -47,21 +47,17 @@ getPackageFromRepo allCabalHashesPath mSha1Hash pkgId = do
47 (error (display pkgId ++ ": meta data has no SHA256 hash for the tarball"))
47 (error (display pkgId ++ ": meta data has no SHA256 hash for the tarball"))
48 (view (mHashes . at "SHA256") meta)
48 (view (mHashes . at "SHA256") meta)
49 source = DerivationSource "url" ("mirror://hackage/" ++ display pkgId ++ ".tar.gz") "" tarballSHA256
49 source = DerivationSource "url" ("mirror://hackage/" ++ display pkgId ++ ".tar.gz") "" tarballSHA256
50−#if MIN_VERSION_cabal2nix(2,6,0)
51 return $ Package source False pkgDesc
50 return $ Package source False pkgDesc
52−#else
53− return $ Package source pkgDesc
54−#endif
55
51
56−getPackageFromDb :: Maybe HackageDb -> PackageIdentifier -> IO Package
52+getPackageFromDb :: DB.HackageDB -> PackageIdentifier -> IO Package
57−getPackageFromDb mHackageDb pkgId =
53+getPackageFromDb hackageDb pkgId =
58− getStackPackageFromDb mHackageDb
54+ getStackPackageFromDb hackageDb
59− $ StackPackage (HackagePackage (T.pack $ Text.display pkgId)) True Nothing
55+ $ StackPackage (PlIndex $ PackageIndex (T.pack $ Text.display pkgId) Nothing) True Nothing
60
56
61−loadPackage :: Maybe HackageDb -> FilePath -> Maybe SHA1Hash -> PackageIdentifier -> IO Package
57+loadPackage :: DB.HackageDB -> FilePath -> Maybe SHA1Hash -> PackageIdentifier -> IO Package
62−loadPackage mHackageDb allCabalHashesPath mSha1Hash pkgId =
58+loadPackage hackageDb allCabalHashesPath mSha1Hash pkgId =
63 getPackageFromRepo allCabalHashesPath mSha1Hash pkgId
59 getPackageFromRepo allCabalHashesPath mSha1Hash pkgId
64− `catchIOError` const (getPackageFromDb mHackageDb pkgId)
60+ `catchIOError` const (getPackageFromDb hackageDb pkgId)
65
61
66ghcCompilerInfo :: Version -> CompilerInfo
62ghcCompilerInfo :: Version -> CompilerInfo
67ghcCompilerInfo v = CompilerInfo
63ghcCompilerInfo v = CompilerInfo
@@ -77,18 +73,18 @@ buildPlanContainsDependency packageVersions (Dependency depName versionRange) =
77 maybe False (`withinRange` versionRange) $ Map.lookup depName packageVersions
73 maybe False (`withinRange` versionRange) $ Map.lookup depName packageVersions
78
74
79buildPackageSetConfig
75buildPackageSetConfig
80− :: Maybe HackageDb
76+ :: DB.HackageDB
81 -> FilePath
77 -> FilePath
82 -> FilePath
78 -> FilePath
83 -> BuildPlan
79 -> BuildPlan
84 -> IO PackageSetConfig
80 -> IO PackageSetConfig
85−buildPackageSetConfig mHackageDb optAllCabalHashes optNixpkgsRepository buildPlan = do
81+buildPackageSetConfig hackageDb optAllCabalHashes optNixpkgsRepository buildPlan = do
86 nixpkgs <- readNixpkgPackageMap optNixpkgsRepository Nothing
82 nixpkgs <- readNixpkgPackageMap optNixpkgsRepository Nothing
87 let
83 let
88 systemInfo = bpSystemInfo buildPlan
84 systemInfo = bpSystemInfo buildPlan
89 packageVersions = fmap ppVersion (bpPackages buildPlan) `Map.union` siCorePackages systemInfo
85 packageVersions = fmap ppVersion (bpPackages buildPlan) `Map.union` siCorePackages systemInfo
90 return PackageSetConfig
86 return PackageSetConfig
91− { packageLoader = loadPackage mHackageDb optAllCabalHashes
87+ { packageLoader = loadPackage hackageDb optAllCabalHashes
92 , targetPlatform = Platform (siArch systemInfo) (siOS systemInfo)
88 , targetPlatform = Platform (siArch systemInfo) (siOS systemInfo)
93 , targetCompiler = ghcCompilerInfo (siGhcVersion systemInfo)
89 , targetCompiler = ghcCompilerInfo (siGhcVersion systemInfo)
94 , nixpkgsResolver = resolve (Map.map (Set.map (over path ("pkgs":))) nixpkgs)
90 , nixpkgsResolver = resolve (Map.map (Set.map (over path ("pkgs":))) nixpkgs)
src/Runner.hs+60−28
@@ -7,11 +7,13 @@ import Data.Maybe (fromMaybe)
7import Data.Semigroup ((<>))
7import Data.Semigroup ((<>))
8import Distribution.Nixpkgs.Haskell.FromStack
8import Distribution.Nixpkgs.Haskell.FromStack
9import Distribution.Nixpkgs.Haskell.FromStack.Package
9import Distribution.Nixpkgs.Haskell.FromStack.Package
10+import Distribution.Nixpkgs.Haskell.Hackage as DB
11+import Distribution.Nixpkgs.Haskell.PackageSourceSpec (loadHackageDB)
10import Distribution.Nixpkgs.Haskell.Stack
12import Distribution.Nixpkgs.Haskell.Stack
11import Distribution.Nixpkgs.Haskell.Stack.PrettyPrinting as PP
13import Distribution.Nixpkgs.Haskell.Stack.PrettyPrinting as PP
12import Distribution.Version (Version)
14import Distribution.Version (Version)
13import Distribution.Compiler (AbiTag(..), unknownCompilerInfo)
15import Distribution.Compiler (AbiTag(..), unknownCompilerInfo)
14−import Distribution.Package (mkPackageName, pkgName)
16+import Distribution.Package (PackageName, mkPackageName, pkgName)
15import Distribution.Text as Text (display)
17import Distribution.Text as Text (display)
16import Language.Nix as Nix
18import Language.Nix as Nix
17import Options.Applicative
19import Options.Applicative
@@ -23,16 +25,18 @@ import Stackage.Types
23import System.IO (withFile, IOMode(..), hPutStrLn)
25import System.IO (withFile, IOMode(..), hPutStrLn)
24import Text.PrettyPrint.HughesPJClass (Doc, render)
26import Text.PrettyPrint.HughesPJClass (Doc, render)
25
27
26−import qualified Data.Set as Set
28+import qualified Data.List.NonEmpty as NE
27import qualified Data.Map as Map
29import qualified Data.Map as Map
30+import qualified Data.Set as Set
28import qualified LtsHaskell as LH
31import qualified LtsHaskell as LH
29
32
30run :: IO ()
33run :: IO ()
31run = do
34run = do
32 opts <- execParser pinfo
35 opts <- execParser pinfo
36+ hackageDb <- loadHackageDB (opts ^. optHackageDb) Nothing
33 let
37 let
34 -- With optparse-applicative it seems there's no way to make
38 -- With optparse-applicative it seems there's no way to make
35− -- 'StackageOptions' optional for stackage override and required in
39+ -- 'StackageOptions' optional for Stackage override and required in
36 -- other cases
40 -- other cases
37 missingErr = error . ("Missing required parameter: " <>)
41 missingErr = error . ("Missing required parameter: " <>)
38 sopts = StackageOptions
42 sopts = StackageOptions
@@ -46,25 +50,28 @@ run = do
46 let
50 let
47 stackResolver = stackConf ^. scResolver
51 stackResolver = stackConf ^. scResolver
48 stackPackagesConfig = mkStackPackagesConfig opts
52 stackPackagesConfig = mkStackPackagesConfig opts
53+ stackExtraDepsConfig = stackPackagesConfig
54+ & spcDoCheckPackages .~ False
55+ & spcDoHaddockPackages .~ False
49− stackConfPackages <- traverse (packageDerivation stackPackagesConfig (opts ^. optHackageDb))
56+ stackConfPackages <- traverse (fmap mkNode . packageDerivation stackPackagesConfig hackageDb)
50 $ stackConf ^. scPackages
57 $ stackConf ^. scPackages
58+ stackConfExtraDeps <- traverse (fmap mkNode . packageDerivation stackExtraDepsConfig hackageDb)
59+ $ stackConf ^. scExtraDeps
51 let
60 let
52− reachable = Set.map mkPackageName
61+ stackConfAllPackages = maybe stackConfPackages ((<>) stackConfPackages)
53− $ F.foldr1 Set.union
62+ $ NE.nonEmpty stackConfExtraDeps
54− $ nodeDepends . mkNode <$> stackConfPackages
55
63
56 case buildTarget of
64 case buildTarget of
57 TargetStackageClosure -> do
65 TargetStackageClosure -> do
58− (buildPlanFile, buildPlan, packageSetConfig) <- loadStackageBuildPlan stackResolver opts sopts
66+ (buildPlanFile, buildPlan, packageSetConfig) <- loadStackageBuildPlan hackageDb stackResolver opts sopts
59 let
67 let
60 overrideConfig = mkOverrideConfig opts (siGhcVersion $ bpSystemInfo buildPlan)
68 overrideConfig = mkOverrideConfig opts (siGhcVersion $ bpSystemInfo buildPlan)
61− stackageLoader mHash pkgId =
69+ stackageSetConfig = if opts ^. optTweaks . tExtraDepsRevisionLatest
62− if pkgName pkgId `Set.member` reachable
70+ then extraDepsLatestConfig stackConfAllPackages packageSetConfig
63− then packageLoader packageSetConfig Nothing pkgId
64− else packageLoader packageSetConfig mHash pkgId
71+ else packageSetConfig
65− stackageSetConfig = packageSetConfig { packageLoader = stackageLoader }
66 stackagePackages <- buildStackagePackages stackageSetConfig buildPlan
72 stackagePackages <- buildStackagePackages stackageSetConfig buildPlan
67 let
73 let
74+ reachable = reachableDeps stackConfAllPackages
68 -- Nixpkgs generic-builder puts hscolour on path for all libraries
75 -- Nixpkgs generic-builder puts hscolour on path for all libraries
69 withHscolour pkgs =
76 withHscolour pkgs =
70 let hscolour = F.find ((== "hscolour") . nodeName) stackagePackages
77 let hscolour = F.find ((== "hscolour") . nodeName) stackagePackages
@@ -86,32 +93,40 @@ run = do
86 writeOutFile buildPlanFile (opts ^. optOutStackageConfig)
93 writeOutFile buildPlanFile (opts ^. optOutStackageConfig)
87 $ pPrintOutConfig (bpSystemInfo buildPlan) nodes
94 $ pPrintOutConfig (bpSystemInfo buildPlan) nodes
88 writeOutFile (stackYaml ^. syFilePath) (opts ^. optOutDerivation)
95 writeOutFile (stackYaml ^. syFilePath) (opts ^. optOutDerivation)
89− $ PP.overrideHaskellPackages overrideConfig stackConfPackages
96+ $ PP.overrideHaskellPackages overrideConfig (view nodeDerivation <$> stackConfAllPackages)
90
97
91 TargetStackagePackages -> do
98 TargetStackagePackages -> do
92− (buildPlanFile, buildPlan, packageSetConfig) <- loadStackageBuildPlan stackResolver opts sopts
99+ (buildPlanFile, buildPlan, packageSetConfig) <- loadStackageBuildPlan hackageDb stackResolver opts sopts
93 let
100 let
94 overrideConfig = mkOverrideConfig opts (siGhcVersion $ bpSystemInfo buildPlan)
101 overrideConfig = mkOverrideConfig opts (siGhcVersion $ bpSystemInfo buildPlan)
102+ stackageSetConfig = if opts ^. optTweaks . tExtraDepsRevisionLatest
103+ then extraDepsLatestConfig stackConfAllPackages packageSetConfig
104+ else packageSetConfig
95− stackageLoader mHash pkgId =
105+ -- stackageLoader mHash pkgId =
96− if pkgName pkgId `Set.member` reachable
106+ -- if pkgName pkgId `Set.member` reachable
97− then packageLoader packageSetConfig Nothing pkgId
107+ -- then packageLoader packageSetConfig Nothing pkgId
98− else packageLoader packageSetConfig mHash pkgId
108+ -- else packageLoader packageSetConfig mHash pkgId
99− stackageSetConfig = packageSetConfig { packageLoader = stackageLoader }
109+ -- stackageSetConfig = packageSetConfig { packageLoader = stackageLoader }
100 nodes <- buildStackagePackages stackageSetConfig buildPlan
110 nodes <- buildStackagePackages stackageSetConfig buildPlan
101 writeOutFile buildPlanFile (opts ^. optOutStackagePackages)
111 writeOutFile buildPlanFile (opts ^. optOutStackagePackages)
102 $ pPrintOutPackages (view nodeDerivation <$> nodes)
112 $ pPrintOutPackages (view nodeDerivation <$> nodes)
103 writeOutFile buildPlanFile (opts ^. optOutStackageConfig)
113 writeOutFile buildPlanFile (opts ^. optOutStackageConfig)
104 $ pPrintOutConfig (bpSystemInfo buildPlan) nodes
114 $ pPrintOutConfig (bpSystemInfo buildPlan) nodes
105 writeOutFile (stackYaml ^. syFilePath) (opts ^. optOutDerivation)
115 writeOutFile (stackYaml ^. syFilePath) (opts ^. optOutDerivation)
106− $ PP.overrideHaskellPackages overrideConfig stackConfPackages
116+ $ PP.overrideHaskellPackages overrideConfig (view nodeDerivation <$> stackConfAllPackages)
107
117
108− TargetStackageOverride ->
118+ TargetStackageOverride -> do
109 writeOutFile (stackYaml ^. syFilePath) (opts ^. optOutDerivation)
119 writeOutFile (stackYaml ^. syFilePath) (opts ^. optOutDerivation)
120+ $ PP.overrideStackage
121+ (stackConf ^. scResolver)
110− $ PP.overrideStackage (stackConf ^. scResolver) (opts ^. optNixpkgsRepository) stackConfPackages
122+ (opts ^. optNixpkgsRepository)
123+ (view nodeDerivation <$> stackConfAllPackages)
124+ writeOutFile (stackYaml ^. syFilePath) (opts ^. optOutStackYamlPackages)
125+ $ PP.stackYamlPackages (view nodeDerivation <$> stackConfPackages)
111
126
112 -- Generate Stackage packages from resolver
127 -- Generate Stackage packages from resolver
113 OriginResolver stackResolver -> do
128 OriginResolver stackResolver -> do
114− (buildPlanFile, buildPlan, packageSetConfig) <- loadStackageBuildPlan stackResolver opts sopts
129+ (buildPlanFile, buildPlan, packageSetConfig) <- loadStackageBuildPlan hackageDb stackResolver opts sopts
115 nodes <- buildStackagePackages packageSetConfig buildPlan
130 nodes <- buildStackagePackages packageSetConfig buildPlan
116 let overrideConfig = mkOverrideConfig opts (siGhcVersion $ bpSystemInfo buildPlan)
131 let overrideConfig = mkOverrideConfig opts (siGhcVersion $ bpSystemInfo buildPlan)
117 writeOutFile buildPlanFile (opts ^. optOutStackagePackages)
132 writeOutFile buildPlanFile (opts ^. optOutStackagePackages)
@@ -121,12 +136,12 @@ run = do
121 writeOutFile buildPlanFile (opts ^. optOutDerivation)
136 writeOutFile buildPlanFile (opts ^. optOutDerivation)
122 $ PP.pPrintHaskellPackages overrideConfig
137 $ PP.pPrintHaskellPackages overrideConfig
123
138
124−loadStackageBuildPlan :: StackResolver -> Options -> StackageOptions -> IO (FilePath, BuildPlan, PackageSetConfig)
139+loadStackageBuildPlan :: DB.HackageDB -> StackResolver -> Options -> StackageOptions -> IO (FilePath, BuildPlan, PackageSetConfig)
125−loadStackageBuildPlan stackResolver opts sopts = do
140+loadStackageBuildPlan hackageDb stackResolver opts sopts = do
126 let buildPlanFile = LH.buildPlanFilePath (sopts ^. soptLtsHaskellRepo) stackResolver
141 let buildPlanFile = LH.buildPlanFilePath (sopts ^. soptLtsHaskellRepo) stackResolver
127 buildPlan <- LH.loadBuildPlan buildPlanFile
142 buildPlan <- LH.loadBuildPlan buildPlanFile
128 packageSetConfig <- LH.buildPackageSetConfig
143 packageSetConfig <- LH.buildPackageSetConfig
129− (opts ^. optHackageDb)
144+ hackageDb
130 (sopts ^. soptAllCabalHashesRepo)
145 (sopts ^. soptAllCabalHashesRepo)
131 (opts ^. optNixpkgsRepository)
146 (opts ^. optNixpkgsRepository)
132 buildPlan
147 buildPlan
@@ -141,6 +156,23 @@ buildStackagePackages packageSetConfig buildPlan = do
141 traverse (uncurry (buildNode packageSetConfig stackagePackageConfig))
156 traverse (uncurry (buildNode packageSetConfig stackagePackageConfig))
142 $ Map.toAscList (bpPackages buildPlan)
157 $ Map.toAscList (bpPackages buildPlan)
143
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 }
175+
144writeOutFile :: Show source => source -> FilePath -> Doc -> IO ()
176writeOutFile :: Show source => source -> FilePath -> Doc -> IO ()
145writeOutFile source filePath contents =
177writeOutFile source filePath contents =
146 withFile filePath WriteMode $ \h -> do
178 withFile filePath WriteMode $ \h -> do
@@ -160,6 +192,6 @@ mkStackPackagesConfig opts = StackPackagesConfig
160 , _spcNixpkgsResolver = \i -> Just (Nix.binding # (i, Nix.path # [i]))
192 , _spcNixpkgsResolver = \i -> Just (Nix.binding # (i, Nix.path # [i]))
161 , _spcTargetPlatform = opts ^. optPlatform
193 , _spcTargetPlatform = opts ^. optPlatform
162 , _spcTargetCompiler = unknownCompilerInfo (opts ^. optCompilerId) NoAbiTag
194 , _spcTargetCompiler = unknownCompilerInfo (opts ^. optCompilerId) NoAbiTag
163− , _spcFlagAssignment = []
195+ , _spcFlagAssignment = mempty
164 , _spcDoCheckPackages = opts ^. optDoCheckPackages
196 , _spcDoCheckPackages = opts ^. optDoCheckPackages
165 , _spcDoHaddockPackages = opts ^. optDoHaddockPackages }
197 , _spcDoHaddockPackages = opts ^. optDoHaddockPackages }
src/Runner/Cli.hs+47−25
@@ -5,16 +5,20 @@ import Data.Monoid ( (<>) )
5import Data.Text as T
5import Data.Text as T
6import qualified Distribution.Compat.ReadP as P
6import qualified Distribution.Compat.ReadP as P
7import Distribution.Compiler as Compiler
7import Distribution.Compiler as Compiler
8−import Distribution.Nixpkgs.Haskell.Stack
9import Distribution.System as System
8import Distribution.System as System
10import qualified Distribution.Text as Text
9import qualified Distribution.Text as Text
11import Options.Applicative as Opts
10import Options.Applicative as Opts
12import Paths_stackage2nix ( version )
11import Paths_stackage2nix ( version )
13import Stack.Config
12import Stack.Config
14import Stack.Types
13import Stack.Types
15−import System.Environment
16import System.FilePath
14import System.FilePath
17
15
16+data Tweaks = Tweaks
17+ { _tExtraDepsRevisionLatest :: Bool
18+ } deriving (Show)
19+
20+makeLenses ''Tweaks
21+
18-- | What will be generated
22-- | What will be generated
19data Target
23data Target
20 = TargetStackagePackages
24 = TargetStackagePackages
@@ -42,31 +46,32 @@ data StackageOptions = StackageOptions
42makeLenses ''StackageOptions
46makeLenses ''StackageOptions
43
47
44data Options = Options
48data Options = Options
45− { _optAllCabalHashesRepo :: Maybe FilePath
49+ { _optAllCabalHashesRepo :: Maybe FilePath
46− , _optLtsHaskellRepo :: Maybe FilePath
50+ , _optLtsHaskellRepo :: Maybe FilePath
47− , _optOutStackagePackages :: FilePath
51+ , _optOutStackagePackages :: FilePath
48− , _optOutStackageConfig :: FilePath
52+ , _optOutStackageConfig :: FilePath
49− , _optOutDerivation :: FilePath
53+ , _optOutDerivation :: FilePath
54+ , _optOutStackYamlPackages :: FilePath
50− , _optDoCheckPackages :: Bool
55+ , _optDoCheckPackages :: Bool
51− , _optDoHaddockPackages :: Bool
56+ , _optDoHaddockPackages :: Bool
57+ , _optTweaks :: Tweaks
52− , _optHackageDb :: Maybe HackageDb
58+ , _optHackageDb :: Maybe FilePath
53− , _optNixpkgsRepository :: FilePath
59+ , _optNixpkgsRepository :: FilePath
54− , _optCompilerId :: CompilerId
60+ , _optCompilerId :: CompilerId
55− , _optPlatform :: Platform
61+ , _optPlatform :: Platform
56− , _optConfigOrigin :: ConfigOrigin
62+ , _optConfigOrigin :: ConfigOrigin
57 } deriving (Show)
63 } deriving (Show)
58
64
59makeLenses ''Options
65makeLenses ''Options
60
66
61−envStackYaml :: IO (Maybe StackYaml)
62−envStackYaml = fmap mkStackYaml <$> lookupEnv "STACK_YAML"
63−
64mkStackYaml :: FilePath -> StackYaml
67mkStackYaml :: FilePath -> StackYaml
65mkStackYaml p = case splitFileName p of
68mkStackYaml p = case splitFileName p of
66 (dir, "") -> StackYaml dir "stack.yaml"
69 (dir, "") -> StackYaml dir "stack.yaml"
67 (dir, ".") -> StackYaml dir "stack.yaml"
70 (dir, ".") -> StackYaml dir "stack.yaml"
68 (_ , "..") -> StackYaml p "stack.yaml"
71 (_ , "..") -> StackYaml p "stack.yaml"
72+ (dir, file) -> case splitExtension file of
73+ (_, "") -> StackYaml p "stack.yaml"
69− (dir, file) -> StackYaml dir file
74+ _ -> StackYaml dir file
70
75
71options :: Parser Options
76options :: Parser Options
72options = Options
77options = Options
@@ -75,9 +80,11 @@ options = Options
75 <*> outStackagePackages
80 <*> outStackagePackages
76 <*> outStackageConfig
81 <*> outStackageConfig
77 <*> outDerivation
82 <*> outDerivation
83+ <*> outStackYamlPackages
78 <*> doCheckPackages
84 <*> doCheckPackages
79 <*> doHaddockPackages
85 <*> doHaddockPackages
86+ <*> tweaks
80− <*> optional hackageDb
87+ <*> optional optionHackageDb
81 <*> nixpkgsRepository
88 <*> nixpkgsRepository
82 <*> compilerId
89 <*> compilerId
83 <*> platform
90 <*> platform
@@ -135,6 +142,14 @@ outDerivation = option str
135 <> value "default.nix"
142 <> value "default.nix"
136 <> showDefaultWith id )
143 <> showDefaultWith id )
137
144
145+outStackYamlPackages :: Parser FilePath
146+outStackYamlPackages = option str
147+ ( long "out-stack-yaml-packages"
148+ <> metavar "NIX_FILE"
149+ <> help "path to output stackage.yaml packages list"
150+ <> value "stack-yaml-packages.nix"
151+ <> showDefaultWith id )
152+
138doCheckPackages :: Parser Bool
153doCheckPackages :: Parser Bool
139doCheckPackages = flag True False
154doCheckPackages = flag True False
140 ( long "no-check"
155 ( long "no-check"
@@ -155,6 +170,14 @@ withStackageClosure = flag' ()
155 ( long "with-stackage-closure"
170 ( long "with-stackage-closure"
156 <> help "generate Stackage subset containing only build dependencies" )
171 <> help "generate Stackage subset containing only build dependencies" )
157
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
180+
158resolver :: Parser StackResolver
181resolver :: Parser StackResolver
159resolver = StackResolver <$> option text
182resolver = StackResolver <$> option text
160 ( long "resolver"
183 ( long "resolver"
@@ -178,12 +201,11 @@ configOrigin =
178
201
179-- required for cabal2nix
202-- required for cabal2nix
180
203
181−hackageDb :: Parser HackageDb
204+optionHackageDb :: Parser FilePath
182−hackageDb = HackageDb <$>
205+optionHackageDb = option str
183− option text
184− ( long "hackage-db"
206+ ( long "hackage-db"
185− <> metavar "HACKAGE_DB"
207+ <> metavar "HACKAGE_DB"
186− <> help "path to the local hackage db in tar format" )
208+ <> help "path to the local hackage db in tar format" )
187
209
188cabalFlag :: Parser CabalFlag
210cabalFlag :: Parser CabalFlag
189cabalFlag = CabalFlag <$>
211cabalFlag = CabalFlag <$>
src/Stack/Config.hs+118−49
@@ -3,19 +3,17 @@
3module Stack.Config where
3module Stack.Config where
4
4
5import Control.Lens
5import Control.Lens
6−import Data.Bifunctor
7import Data.ByteString as BS
6import Data.ByteString as BS
8import Data.Coerce
7import Data.Coerce
9−import Data.Foldable as F
8+import Data.List as L
10import Data.List.NonEmpty as NE
9import Data.List.NonEmpty as NE
11import Data.Maybe
10import Data.Maybe
12−import Data.Semigroup (sconcat)
13import Data.Text as T
11import Data.Text as T
14import Data.Yaml
12import Data.Yaml
15import Network.URI
13import Network.URI
16import Stack.Config.Yaml as Yaml
14import Stack.Config.Yaml as Yaml
17import Stack.Types
15import Stack.Types
18−import System.FilePath
16+import System.FilePath as FilePath
19
17
20
18
21newtype StackResolver = StackResolver { fromStackResolver :: Text }
19newtype StackResolver = StackResolver { fromStackResolver :: Text }
@@ -30,95 +28,166 @@ newtype Vcs = Vcs { fromVcs :: Text }
30 deriving (Eq, Ord, Show)
28 deriving (Eq, Ord, Show)
31
29
32data Repo = Repo
30data Repo = Repo
33− { _rVcs :: !Vcs
31+ { _rVcs :: Vcs
34− , _rUri :: !Text
32+ , _rUri :: Text
35− , _rCommit :: !Text
33+ , _rCommit :: Text
36 } deriving (Eq, Ord, Show)
34 } deriving (Eq, Ord, Show)
37
35
38makeLenses ''Repo
36makeLenses ''Repo
39
37
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+
40data PackageLocation
52data PackageLocation
41− = HackagePackage Text
53+ = PlIndex PackageIndex
42− | StackFilePath FilePath
54+ | PlFilePath FilePath
43− | StackUri URI
55+ | PlUri URI
44− | StackRepo Repo
56+ | PlRepo Repo
45 deriving (Eq, Ord, Show)
57 deriving (Eq, Ord, Show)
46
58
47makePrisms ''PackageLocation
59makePrisms ''PackageLocation
48
60
49data StackPackage = StackPackage
61data StackPackage = StackPackage
50− { _spLocation :: !PackageLocation
62+ { _spLocation :: PackageLocation
51− , _spExtraDep :: !Bool
63+ , _spExtraDep :: Bool
52 -- | Subdirectory containing the cabal file if any specified.
64 -- | Subdirectory containing the cabal file if any specified.
53− , _spDir :: !(Maybe FilePath)
65+ , _spDir :: Maybe FilePath
54 } deriving (Eq, Ord, Show)
66 } deriving (Eq, Ord, Show)
55
67
56makeLenses ''StackPackage
68makeLenses ''StackPackage
57
69
58data StackConfig = StackConfig
70data StackConfig = StackConfig
59− { _scResolver :: !StackResolver
71+ { _scResolver :: StackResolver
60− , _scPackages :: !(NonEmpty StackPackage)
72+ , _scPackages :: NonEmpty StackPackage
73+ , _scExtraDeps :: [StackPackage]
61 } deriving (Eq, Ord, Show)
74 } deriving (Eq, Ord, Show)
62
75
63makeLenses ''StackConfig
76makeLenses ''StackConfig
64
77
78+scAllPackages :: Getter StackConfig (NonEmpty StackPackage)
79+scAllPackages = to allPs
80+ where
81+ allPs sc = maybe ps ((<>) ps) (NE.nonEmpty ed)
82+ where
83+ ps = sc ^. scPackages
84+ ed = sc ^. scExtraDeps
85+
65fromYamlConfig :: Yaml.Config -> StackConfig
86fromYamlConfig :: Yaml.Config -> StackConfig
66fromYamlConfig c = StackConfig{..}
87fromYamlConfig c = StackConfig{..}
67 where
88 where
68 _scResolver = coerce $ c ^. cResolver
89 _scResolver = coerce $ c ^. cResolver
69− _scPackages = F.foldr (NE.<|) neYamlPackages yamlExtraDeps
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
70− neYamlPackages = fromMaybe (pure defaultPackage)
93+ nePackages = fromMaybe (pure defaultPackage)
71− . fmap sconcat $ NE.nonEmpty yamlPackages
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
72− yamlPackages = fromYamlPackage <$> (fromMaybe mempty (c ^. cPackages))
99+ <$> fromMaybe mempty (c ^. cPackages)
100+ yamlExtraDeps = L.concatMap NE.toList
101+ $ fromYamlPackage extraDepsSimplePath True
73− yamlExtraDeps = fromYamlExtraDep <$> fromMaybe mempty (c ^. cExtraDeps)
102+ <$> fromMaybe mempty (c ^. cExtraDeps)
74− defaultPackage = StackPackage (StackFilePath ".") False Nothing
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
75
124
125+-- Determine wether package is file path
126+isFilePath :: Text -> Bool
127+isFilePath = T.any (== FilePath.pathSeparator)
76
128
129+-- | A single 'Yaml.Package' can result in multiple actual
130+-- packages if it has multiple subdirs specified.
77fromYamlPackage
131fromYamlPackage
78− :: Yaml.Package
132+ :: (Text -> StackPackage)
133+ -> Bool
79− -- ^ A single 'Yaml.Package' can result in multiple actual
134+ -> Yaml.Package
80− -- packages if it has multiple subdirs specified.
81 -> NonEmpty StackPackage
135 -> NonEmpty StackPackage
82−fromYamlPackage = \case
136+fromYamlPackage fromSimple isExtraDep = \case
83− Yaml.Simple p ->
137+ Yaml.PSimple p ->
84− unroll Nothing $ StackPackage (parseSimplePath p) False
138+ pure (fromSimple p)
85− Yaml.LocationSimple (Location p extraDep ms) ->
139+ Yaml.PLocationSimple (Location p extraDep ms) ->
86 unroll ms $ StackPackage (parseSimplePath p) (fromMaybe False extraDep)
140 unroll ms $ StackPackage (parseSimplePath p) (fromMaybe False extraDep)
87− Yaml.LocationGit (Location git extraDep ms) ->
141+ Yaml.PLocationGit loc ->
88− unroll ms $ StackPackage (StackRepo $ fromYamlGit git) (fromMaybe False extraDep)
142+ mkStackPackageRepo fromYamlGit loc
89− Yaml.LocationHg (Location hg extraDep ms) ->
143+ Yaml.PLocationHg loc ->
90− unroll ms $ StackPackage (StackRepo $ fromYamlHg hg) (fromMaybe False extraDep)
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
91 where
151 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)
93 -- Each package gets a single directory with cabal file in it. If
154 -- Each package gets a single directory with cabal file in it. If
94 -- it's not specified, path is empty.
155 -- it's not specified, path is empty.
95 unroll subs p = case subs of
156 unroll subs p = case subs of
96 Just (x : xs) -> NE.map (p . Just) (x :| xs)
157 Just (x : xs) -> NE.map (p . Just) (x :| xs)
97 _ -> p Nothing :| []
158 _ -> p Nothing :| []
98
159
99−fromYamlExtraDep :: Text -> StackPackage
100−fromYamlExtraDep t = StackPackage (HackagePackage t) True Nothing
101−
102fromYamlGit :: Yaml.Git -> Repo
160fromYamlGit :: Yaml.Git -> Repo
103−fromYamlGit yg = Repo{..}
161+fromYamlGit yg = Repo
104− where
105− _rVcs = Vcs "git"
162+ { _rVcs = Vcs "git"
106− _rUri = yg ^. gGit
163+ , _rUri = yg ^. gGit
107− _rCommit = yg ^. gCommit
164+ , _rCommit = yg ^. gCommit }
108
165
109fromYamlHg :: Yaml.Hg -> Repo
166fromYamlHg :: Yaml.Hg -> Repo
110−fromYamlHg yh = Repo{..}
167+fromYamlHg yh = Repo
111− where
112− _rVcs = Vcs "hg"
168+ { _rVcs = Vcs "hg"
113− _rUri = yh ^. hHg
169+ , _rUri = yh ^. hHg
114− _rCommit = yh ^. hCommit
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 }
115
183
116readStackConfig :: StackYaml -> IO (Either String StackConfig)
184readStackConfig :: StackYaml -> IO (Either String StackConfig)
117readStackConfig stackYaml = do
185readStackConfig stackYaml = do
118 let
186 let
119 relativeToStackYaml = \case
187 relativeToStackYaml = \case
120− StackFilePath p -> StackFilePath $ stackYaml ^. syDirName </> p
188+ PlFilePath p -> PlFilePath $ stackYaml ^. syDirName </> p
121 packageLocation -> packageLocation
189 packageLocation -> packageLocation
122 mkStackConfig = over (scPackages . traversed . spLocation) relativeToStackYaml
190 mkStackConfig = over (scPackages . traversed . spLocation) relativeToStackYaml
191+ . over (scExtraDeps . traversed . spLocation) relativeToStackYaml
123 . fromYamlConfig
192 . 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
8import Stack.Config.TH
8import Stack.Config.TH
9
9
10data Location a = Location
10data Location a = Location
11− { _lLocation :: !a
11+ { _lLocation :: a
12− , _lExtraDep :: !(Maybe Bool)
12+ , _lExtraDep :: Maybe Bool
13− , _lSubdirs :: !(Maybe [FilePath])
13+ , _lSubdirs :: Maybe [FilePath]
14 } deriving (Eq, Show)
14 } deriving (Eq, Show)
15
15
16makeLenses ''Location
16makeLenses ''Location
17−
18deriveJSON jsonOpts ''Location
17deriveJSON jsonOpts ''Location
19
18
19+data Archive = Archive
20+ { _aArchive :: Text
21+ , _aSha256 :: Maybe Text
22+ , _aSubdirs :: Maybe [FilePath]
23+ } deriving (Eq, Show)
24+
25+makeLenses ''Archive
26+deriveJSON jsonOpts ''Archive
27+
20data Git = Git
28data Git = Git
21− { _gGit :: !Text
29+ { _gGit :: Text
22− , _gCommit :: !Text
30+ , _gCommit :: Text
23 } deriving (Eq, Show)
31 } deriving (Eq, Show)
24
32
25makeLenses ''Git
33makeLenses ''Git
26−
27deriveJSON jsonOpts ''Git
34deriveJSON jsonOpts ''Git
28
35
29data Hg = Hg
36data Hg = Hg
30− { _hHg :: !Text
37+ { _hHg :: Text
31− , _hCommit :: !Text
38+ , _hCommit :: Text
32 } deriving (Eq, Show)
39 } deriving (Eq, Show)
33
40
34makeLenses ''Hg
41makeLenses ''Hg
35−
36deriveJSON jsonOpts ''Hg
42deriveJSON jsonOpts ''Hg
37
43
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+
38data Package
64data Package
39− = Simple Text
65+ = PSimple Text
40− | LocationSimple (Location Text)
66+ | PLocationSimple (Location Text)
41− | LocationGit (Location Git)
67+ | PLocationGit (Location Git)
42− | LocationHg (Location Hg)
68+ | PLocationHg (Location Hg)
69+ | PArchive Archive
70+ | PNewGit NewGit
71+ | PNewHg NewHg
43 deriving (Eq, Show)
72 deriving (Eq, Show)
44
73
45makePrisms ''Package
74makePrisms ''Package
46
75
47instance FromJSON Package where
76instance FromJSON Package where
48 parseJSON v =
77 parseJSON v =
49− (Simple <$> parseJSON v) <|>
78+ (PSimple <$> parseJSON v) <|>
50− (LocationSimple <$> parseJSON v) <|>
79+ (PLocationSimple <$> parseJSON v) <|>
51− (LocationGit <$> parseJSON v) <|>
80+ (PLocationGit <$> parseJSON v) <|>
81+ (PLocationHg <$> parseJSON v) <|>
82+ (PArchive <$> parseJSON v) <|>
83+ (PNewGit <$> parseJSON v) <|>
52− (LocationHg <$> parseJSON v)
84+ (PNewHg <$> parseJSON v)
53
85
54instance ToJSON Package where
86instance ToJSON Package where
55 toJSON = \case
87 toJSON = \case
56− Simple t -> toJSON t
88+ PSimple t -> toJSON t
57− LocationSimple t -> toJSON t
89+ PLocationSimple t -> toJSON t
58− LocationGit t -> toJSON t
90+ PLocationGit t -> toJSON t
59− LocationHg t -> toJSON t
91+ PLocationHg t -> toJSON t
60−
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
61data Config = Config
98data Config = Config
62− { _cResolver :: !Text
99+ { _cResolver :: Text
63− , _cPackages :: !(Maybe [Package])
100+ , _cPackages :: Maybe [Package]
64− , _cExtraDeps :: !(Maybe [Text])
101+ , _cExtraDeps :: Maybe [Package]
65 } deriving (Eq, Show)
102 } deriving (Eq, Show)
66
103
67makeLenses ''Config
104makeLenses ''Config
src/Stack/Types.hs+2−4
@@ -1,5 +1,3 @@
1−{-# LANGUAGE TemplateHaskell #-}
2−
3module Stack.Types where
1module Stack.Types where
4
2
5import Control.Lens
3import Control.Lens
@@ -8,8 +6,8 @@ import System.FilePath
8
6
9
7
10data StackYaml = StackYaml
8data StackYaml = StackYaml
11− { _syDirName :: !FilePath
9+ { _syDirName :: FilePath
12− , _syFileName :: !FilePath }
10+ , _syFileName :: FilePath }
13 deriving (Ord, Eq, Show)
11 deriving (Ord, Eq, Show)
14
12
15makeLenses ''StackYaml
13makeLenses ''StackYaml
stack-ghc-7103.yamldeleted−26
@@ -1,26 +0,0 @@
1−resolver: lts-6.35
2−extra-deps:
3− - aeson-1.2.3.0
4− - amazonka-1.4.5
5− - amazonka-core-1.4.5
6− - amazonka-s3-1.4.5
7− - Cabal-2.0.0.2
8− - cabal2nix-2.5
9− - chunked-data-0.3.0
10− - classy-prelude-1.2.0.1
11− - classy-prelude-conduit-1.2.0
12− - conduit-combinators-1.1.1
13− - distribution-nixpkgs-1.1
14− - hopenssl-2.2.1
15− - http-client-0.5.7.1
16− - http-client-tls-0.3.5.1
17− - http-conduit-2.2.3.2
18− - inflections-0.3.0.0
19− - megaparsec-5.3.1
20− - mono-traversable-1.0.4.0
21− - mono-traversable-instances-0.1.0.0
22− - stackage-curator-0.15.1.0
23− - store-0.4.3.2
24− - store-core-0.4.1
25− - th-abstraction-0.2.6.0
26− - 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: lts-10.0
stack.yamlmode 120000 → 100644+11−1
@@ -1 +0,0 @@
1−stack-ghc-822.yaml
@@ -0,0 +1,11 @@
1+resolver: lts-12.2
2+extra-deps:
3+ - yaml-0.8.31.1
4+ - git: https://github.com/fpco/stackage-curator.git
5+ commit: 73c5ed06602990c33d3fec1711e27875f283b6bf
6+ - git: https://github.com/jwiegley/gitlib.git
7+ commit: 70c99759b8b9377f67492fe29afb32f05882409d
8+ subdirs:
9+ - gitlib
10+ - gitlib-libgit2
11+
stackage2nix.cabal+6−3
@@ -1,5 +1,5 @@
1name: stackage2nix
1name: stackage2nix
2−version: 0.5.0
2+version: 0.7.2
3synopsis: Convert Stack files into Nix build instructions.
3synopsis: Convert Stack files into Nix build instructions.
4homepage: https://github.com/typeable/stackage2nix#readme
4homepage: https://github.com/typeable/stackage2nix#readme
5license: BSD3
5license: BSD3
@@ -31,11 +31,11 @@ library
31 , LtsHaskell
31 , LtsHaskell
32 , Paths_stackage2nix
32 , Paths_stackage2nix
33 build-depends: base > 4.7 && < 5
33 build-depends: base > 4.7 && < 5
34− , Cabal > 1.24
34+ , Cabal > 2.2
35 , QuickCheck
35 , QuickCheck
36 , aeson
36 , aeson
37 , bytestring
37 , bytestring
38− , cabal2nix >= 2.5
38+ , cabal2nix >= 2.7.2
39 , containers
39 , containers
40 , deepseq
40 , deepseq
41 , distribution-nixpkgs >= 1.1
41 , distribution-nixpkgs >= 1.1
@@ -51,6 +51,7 @@ library
51 , optparse-applicative
51 , optparse-applicative
52 , pretty
52 , pretty
53 , stackage-curator >= 0.15
53 , stackage-curator >= 0.15
54+ , tagged
54 , text
55 , text
55 , unordered-containers
56 , unordered-containers
56 , yaml
57 , yaml
@@ -77,6 +78,7 @@ test-suite spec
77 , Cabal
78 , Cabal
78 , bytestring
79 , bytestring
79 , hspec
80 , hspec
81+ , network-uri
80 , pretty
82 , pretty
81 , shakespeare
83 , shakespeare
82 , stackage2nix
84 , stackage2nix
@@ -86,6 +88,7 @@ test-suite spec
86 other-modules: Language.Nix.FilePathSpec
88 other-modules: Language.Nix.FilePathSpec
87 , PrettyPrintingSpec
89 , PrettyPrintingSpec
88 , Stack.Config.YamlSpec
90 , Stack.Config.YamlSpec
91+ , Stack.ConfigSpec
89 ghc-options: -Wall -threaded -rtsopts -with-rtsopts=-N
92 ghc-options: -Wall -threaded -rtsopts -with-rtsopts=-N
90 default-language: Haskell2010
93 default-language: Haskell2010
91
94
test/Stack/Config/YamlSpec.hs+97−13
@@ -1,7 +1,7 @@
1{-# LANGUAGE OverloadedStrings #-}
1{-# LANGUAGE OverloadedStrings #-}
2{-# LANGUAGE QuasiQuotes #-}
2{-# LANGUAGE QuasiQuotes #-}
3
3
4−module Stack.Config.YamlSpec where
4+module Stack.Config.YamlSpec (spec) where
5
5
6import Data.ByteString
6import Data.ByteString
7import Data.Text.Encoding as T
7import Data.Text.Encoding as T
@@ -39,10 +39,48 @@ extra-deps:
39- acme-missiles-0.3
39- acme-missiles-0.3
40|]
40|]
41
41
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+
42configMinimal :: Config
80configMinimal :: Config
43configMinimal = Config
81configMinimal = Config
44 { _cResolver = "lts-8.15"
82 { _cResolver = "lts-8.15"
45− , _cPackages = Just [ Simple "." ]
83+ , _cPackages = Just [ PSimple "." ]
46 , _cExtraDeps = Nothing
84 , _cExtraDeps = Nothing
47 }
85 }
48
86
@@ -50,27 +88,73 @@ config :: Config
50config = Config
88config = Config
51 { _cResolver = "lts-3.7"
89 { _cResolver = "lts-3.7"
52 , _cPackages = Just
90 , _cPackages = Just
53− [ Simple "."
91+ [ PSimple "."
54− , LocationSimple (Location "dir1/dir2" Nothing Nothing)
92+ , PLocationSimple (Location "dir1/dir2" Nothing Nothing)
55− , LocationSimple (Location "https://example.com/foo/bar/baz-0.0.2.tar.gz" (Just True) Nothing)
93+ , PLocationSimple (Location "https://example.com/foo/bar/baz-0.0.2.tar.gz" (Just True) Nothing)
56− , LocationGit $ Location
94+ , PLocationGit $ Location
57 (Git
95 (Git
58 "git@github.com:commercialhaskell/stack.git"
96 "git@github.com:commercialhaskell/stack.git"
59 "6a86ee32e5b869a877151f74064572225e1a0398")
97 "6a86ee32e5b869a877151f74064572225e1a0398")
60 Nothing Nothing
98 Nothing Nothing
61− , LocationGit (Location
99+ , PLocationGit (Location
62 (Git
100 (Git
63 "git@github.com:example/mega-repo"
101 "git@github.com:example/mega-repo"
64 "6a86ee32e5b869a877151f74064572225e1a0000")
102 "6a86ee32e5b869a877151f74064572225e1a0000")
65 Nothing (Just ["subdir1", "subdir2"]))
103 Nothing (Just ["subdir1", "subdir2"]))
66 ]
104 ]
67 , _cExtraDeps = Just
105 , _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+ ]
69 }
148 }
70
149
71spec :: Spec
150spec :: Spec
72−spec = describe "Parse" $ do
151+spec = describe "Config" $ do
73− specify "config-minimal" $
152+ specify "minimal" $
74− (Y.decode configYamlMinimal :: Maybe Config) `shouldBe` Just configMinimal
153+ (decodeMaybe configYamlMinimal :: Maybe Config) `shouldBe` Just configMinimal
75− specify "config-full" $
154+ specify "full" $
76− (Y.decode configYaml :: Maybe Config) `shouldBe` Just config
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+ }