@@ -18,8 +18,8 @@ let
1818 version = "0.7.2";
1919 src = pkgs.fetchgit {
2020 url = "https://github.com/typeable/stackage2nix.git";
21− rev = "327867dc8384e740b72d82217ded0da5ea3b288c";
22− sha256 = "1gc9nk5x7q3xnmm8jphs12ddc7mjgsnh5dkvnfxfyhw4245jk4jm";
21+ rev = "80194259a7ce6f539b2858f83b75dd5d79e4eaa3";
22+ sha256 = "05qdwadfq264cm8xlzh320riv826rkh93r3msxvaij0hlbggck22";
2323 };
2424 isLibrary = true;
2525 isExecutable = true;
@@ -37,29 +37,6 @@ let
3737 description = "Convert Stack files into Nix build instructions";
3838 license = stdenv.lib.licenses.bsd3;
3939 }) {};
40− "yaml" = callPackage
41− ({ mkDerivation, aeson, attoparsec, base, bytestring, conduit
42− , containers, directory, filepath, resourcet, scientific
43− , semigroups, template-haskell, text, transformers
44− , unordered-containers, vector
45− }:
46− mkDerivation {
47− pname = "yaml";
48− version = "0.8.31.1";
49− sha256 = "1ba1451917e6cb1df6081e2e14c2e4dcec6969b9b25a5d72db96942c3e6d8b53";
50− isLibrary = true;
51− isExecutable = true;
52− libraryHaskellDepends = [
53− aeson attoparsec base bytestring conduit containers directory
54− filepath resourcet scientific semigroups template-haskell text
55− transformers unordered-containers vector
56− ];
57− doHaddock = false;
58− doCheck = false;
59− homepage = "http://github.com/snoyberg/yaml/";
60− description = "Support for parsing and rendering YAML documents";
61− license = stdenv.lib.licenses.bsd3;
62− }) {};
6340 "stackage-curator" = callPackage
6441 ({ mkDerivation, aeson, amazonka, amazonka-core, amazonka-s3, async
6542 , base, blaze-html, bytestring, Cabal, classy-prelude-conduit
@@ -78,8 +55,8 @@ let
7855 version = "0.17.0.0";
7956 src = fetchgit {
8057 url = "https://github.com/fpco/stackage-curator.git";
81− sha256 = "0hymmzn59aszqxqs5s0mba8pzrky8wpkmy7hdgaxqrhg0syc6mkw";
82− rev = "73c5ed06602990c33d3fec1711e27875f283b6bf";
58+ sha256 = "001zmm8q01nin2kgdrx174pm6fkybvkhhnvvl9fkv71a6l2hcviw";
59+ rev = "c25cf6959a1d1b3129b18855ddbc7974324cc422";
8360 };
8461 isLibrary = true;
8562 isExecutable = true;
@@ -114,6 +91,64 @@ let
11491 description = "Tools for curating Stackage bundles";
11592 license = stdenv.lib.licenses.mit;
11693 }) {};
94+ "cabal2nix" = callPackage
95+ ({ mkDerivation, aeson, ansi-wl-pprint, base, bytestring, Cabal
96+ , containers, deepseq, directory, distribution-nixpkgs, fetchgit, filepath
97+ , hackage-db, hopenssl, hpack, language-nix, lens, monad-par
98+ , monad-par-extras, mtl, optparse-applicative, pretty, process
99+ , split, tasty, tasty-golden, text, time, transformers, yaml
100+ }:
101+ mkDerivation {
102+ pname = "cabal2nix";
103+ version = "2.14.4";
104+ src = fetchgit {
105+ url = "https://github.com/typeable/cabal2nix.git";
106+ rev = "d88a8fac1ad5766e73c0426f13eef086be022973";
107+ sha256 = "0shpskvnrjihmnkp0ykqyh8a232fkpjdann0j8q37dk97dlilsc5";
108+ };
109+ isLibrary = true;
110+ isExecutable = true;
111+ libraryHaskellDepends = [
112+ aeson ansi-wl-pprint base bytestring Cabal containers deepseq
113+ directory distribution-nixpkgs filepath hackage-db hopenssl hpack
114+ language-nix lens optparse-applicative pretty process split text
115+ time transformers yaml
116+ ];
117+ executableHaskellDepends = [
118+ aeson base bytestring Cabal containers directory
119+ distribution-nixpkgs filepath hopenssl language-nix lens monad-par
120+ monad-par-extras mtl optparse-applicative pretty
121+ ];
122+ testHaskellDepends = [
123+ base Cabal containers directory filepath language-nix lens pretty
124+ process tasty tasty-golden
125+ ];
126+ doCheck = false;
127+ preCheck = ''
128+ export PATH="$PWD/dist/build/cabal2nix:$PATH"
129+ export HOME="$TMPDIR/home"
130+ '';
131+ homepage = "https://github.com/nixos/cabal2nix#readme";
132+ description = "Convert Cabal files into Nix build instructions";
133+ license = stdenv.lib.licenses.bsd3;
134+ }) {};
135+ "distribution-nixpkgs" = callPackage
136+ ({ mkDerivation, aeson, base, bytestring, Cabal, containers
137+ , deepseq, hspec, language-nix, lens, pretty, process, split
138+ }:
139+ mkDerivation {
140+ pname = "distribution-nixpkgs";
141+ version = "1.3.1";
142+ sha256 = "1113qizh931inpim0ajfwihcvlp26n1l4bf36v0jakd34k70mm8g";
143+ libraryHaskellDepends = [
144+ aeson base bytestring Cabal containers deepseq language-nix lens
145+ pretty process split
146+ ];
147+ testHaskellDepends = [ base deepseq hspec lens ];
148+ homepage = "https://github.com/peti/distribution-nixpkgs#readme";
149+ description = "Types and functions to manipulate the Nixpkgs distribution";
150+ license = stdenv.lib.licenses.bsd3;
151+ }) {};
117152 "gitlib" = callPackage
118153 ({ mkDerivation, base, base16-bytestring, bytestring, conduit
119154 , conduit-combinators, containers, directory, exceptions, fetchgit
@@ -126,8 +161,8 @@ let
126161 version = "3.1.2";
127162 src = fetchgit {
128163 url = "https://github.com/jwiegley/gitlib.git";
129− sha256 = "0rp6lnbbbf9m6fvmx7mzknrk89ly0gbqaxsfx38cn6qdy7r54xcm";
130− rev = "70c99759b8b9377f67492fe29afb32f05882409d";
164+ sha256 = "1fjn9r1hdcmj7d9g1cg8f8snls3mq04673bxcckilys4v2g9sfl8";
165+ rev = "6ebdab95c116ef946d1aaa1d4a69da6ac07415af";
131166 };
132167 postUnpack = "sourceRoot+=/gitlib; echo source root reset to $sourceRoot";
133168 libraryHaskellDepends = [
@@ -151,11 +186,11 @@ let
151186 }:
152187 mkDerivation {
153188 pname = "gitlib-libgit2";
154− version = "3.1.1";
189+ version = "3.1.2";
155190 src = fetchgit {
156191 url = "https://github.com/jwiegley/gitlib.git";
157− sha256 = "0rp6lnbbbf9m6fvmx7mzknrk89ly0gbqaxsfx38cn6qdy7r54xcm";
158− rev = "70c99759b8b9377f67492fe29afb32f05882409d";
192+ sha256 = "1fjn9r1hdcmj7d9g1cg8f8snls3mq04673bxcckilys4v2g9sfl8";
193+ rev = "6ebdab95c116ef946d1aaa1d4a69da6ac07415af";
159194 };
160195 postUnpack = "sourceRoot+=/gitlib-libgit2; echo source root reset to $sourceRoot";
161196 libraryHaskellDepends = [
@@ -169,7 +204,23 @@ let
169204 description = "Libgit2 backend for gitlib";
170205 license = stdenv.lib.licenses.mit;
171206 }) {};
207+ "hlibgit2" = callPackage
208+ ({ mkDerivation, base, bindings-DSL, git, openssl, process, zlib }:
209+ mkDerivation {
210+ pname = "hlibgit2";
211+ version = "0.18.0.16";
212+ sha256 = "0plfzxzgph7iilwp434ndcw7pia47n96hcfa32fs7q5gz8kl17hr";
213+ libraryHaskellDepends = [ base bindings-DSL zlib ];
214+ librarySystemDepends = [ openssl ];
215+ postUnpack = ''
216+ sed -i 's/-Wno-format//' $sourceRoot/hlibgit2.cabal
217+ '';
218+ testHaskellDepends = [ base process ];
219+ testToolDepends = [ git ];
220+ description = "Low-level bindings to libgit2";
221+ license = stdenv.lib.licenses.mit;
222+ }) {inherit (pkgs) git; inherit (pkgs) openssl;};
172223 };
173−in nixpkgs.haskell.packages.stackage.lts-122.override {
224+in nixpkgs.haskell.packages.stackage.lts-1321.override {
174225 packageSetConfig = self: super: stackPackages { inherit (nixpkgs) pkgs stdenv; inherit (self) callPackage; } super;
175226}