git.iko.soy/typeable/cabal2nix
on master help sign in
Re-generate Cabal files with new pretty-show build input (and some cosmetic).
commitfe8bdd91991f7e489438d5c6050accaeab15ce7e authorPeter Simons <simons@cryp.to> dateTue 1 Sep 2015, 13:31 (11 years ago) parenta921749
9 files changed+49−49
compare with master
unifiedsplit
cabal2nix/cabal2nix.cabal+6−6 cabal2nix/package.yaml+5−5 distribution-nixpkgs/distribution-nixpkgs.cabal+18−19 distribution-nixpkgs/package.yaml+9−9 hackage2nix/hackage2nix.cabal+2−2 hackage2nix/package.yaml+2−2 language-nix/language-nix.cabal+2−2 language-nix/package.yaml+2−2 release-cabal2nix.nix+3−2
cabal2nix/cabal2nix.cabal+6−6
@@ -25,17 +25,17 @@ executable cabal2nix
2525 src
2626 ghc-options: -Wall
2727 build-depends:
28− base < 5
29− , Cabal >= 1.22.2
30− , ansi-wl-pprint
28+ ansi-wl-pprint
3129 , base < 5
30+ , Cabal >= 1.22.2
3231 , containers
32+ , distribution-nixpkgs
33+ , language-nix
3334 , lens
35+ , lens-construction-helper
3436 , optparse-applicative
3537 , pretty >= 1.1.2
36− , language-nix
37− , distribution-nixpkgs
38− , lens-construction-helper
38+ , pretty-show
3939 other-modules:
4040 Paths_cabal2nix
4141 default-language: Haskell2010
cabal2nix/package.yaml+5−5
@@ -10,17 +10,17 @@ category: Distribution
1010ghc-options: -Wall
1111
1212dependencies:
13− - base < 5
14− - Cabal >= 1.22.2
1513 - ansi-wl-pprint
1614 - base < 5
15+ - Cabal >= 1.22.2
1716 - containers
17+ - distribution-nixpkgs
18+ - language-nix
1819 - lens
20+ - lens-construction-helper
1921 - optparse-applicative
2022 - pretty >= 1.1.2
21− - language-nix
22− - distribution-nixpkgs
23− - lens-construction-helper
23+ - pretty-show
2424
2525executables:
2626 cabal2nix:
distribution-nixpkgs/distribution-nixpkgs.cabal+18−19
@@ -24,28 +24,27 @@ library
2424 src
2525 ghc-options: -Wall
2626 build-depends:
27− base < 5
28− , Cabal >= 1.22.2
29− , SHA
30− , aeson
27+ aeson
3128 , base < 5
3229 , bytestring
30+ , Cabal >= 1.22.2
3331 , containers
32+ , deepseq
3433 , deepseq-generics
3534 , directory
35+ , doctest
3636 , filepath
3737 , hackage-db
38+ , hspec
39+ , language-nix
3840 , lens
41+ , lens-construction-helper
3942 , pretty >= 1.1.2
4043 , process
44+ , SHA
4145 , split
4246 , transformers
4347 , utf8-string
44− , lens-construction-helper
45− , language-nix
46− , deepseq
47− , doctest
48− , hspec
4948 exposed-modules:
5049 Distribution.Nixpkgs.Fetch
5150 Distribution.Nixpkgs.Haskell
@@ -60,14 +59,15 @@ library
6059 Distribution.Nixpkgs.Haskell.FromCabal.License
6160 Distribution.Nixpkgs.Haskell.FromCabal.Name
6261 Distribution.Nixpkgs.Haskell.FromCabal.Normalize
62+ Distribution.Nixpkgs.Haskell.FromCabal.Platform
6363 Distribution.Nixpkgs.Haskell.FromCabal.PostProcess
6464 Distribution.Nixpkgs.Haskell.Hackage
6565 Distribution.Nixpkgs.Haskell.HackageGit
6666 Distribution.Nixpkgs.Haskell.OrphanInstances
67+ Distribution.Nixpkgs.Haskell.PackageSourceSpec
6768 Distribution.Nixpkgs.License
6869 Distribution.Nixpkgs.Meta
6970 Distribution.Nixpkgs.PackageMap
70− Distribution.Nixpkgs.Haskell.PackageSourceSpec
7171 other-modules:
7272 Internal.PrettyPrinting
7373 default-language: Haskell2010
@@ -79,27 +79,26 @@ test-suite spec
7979 test
8080 ghc-options: -Wall
8181 build-depends:
82− base < 5
83− , Cabal >= 1.22.2
84− , SHA
85− , aeson
82+ aeson
8683 , base < 5
8784 , bytestring
85+ , Cabal >= 1.22.2
8886 , containers
87+ , deepseq
8988 , deepseq-generics
9089 , directory
90+ , doctest
9191 , filepath
9292 , hackage-db
93+ , hspec
94+ , language-nix
9395 , lens
96+ , lens-construction-helper
9497 , pretty >= 1.1.2
9598 , process
99+ , SHA
96100 , split
97101 , transformers
98102 , utf8-string
99− , lens-construction-helper
100− , language-nix
101− , deepseq
102− , doctest
103− , hspec
104103 , distribution-nixpkgs
105104 default-language: Haskell2010
distribution-nixpkgs/package.yaml+9−9
@@ -10,28 +10,27 @@ category: Distribution
1010ghc-options: -Wall
1111
1212dependencies:
13− - base < 5
14− - Cabal >= 1.22.2
15− - SHA
1613 - aeson
1714 - base < 5
1815 - bytestring
16+ - Cabal >= 1.22.2
1917 - containers
18+ - deepseq
2019 - deepseq-generics
2120 - directory
21+ - doctest
2222 - filepath
2323 - hackage-db
24+ - hspec
25+ - language-nix
2426 - lens
27+ - lens-construction-helper
2528 - pretty >= 1.1.2
2629 - process
30+ - SHA
2731 - split
2832 - transformers
2933 - utf8-string
30− - lens-construction-helper
31− - language-nix
32− - deepseq
33− - doctest
34− - hspec
3534
3635library:
3736 source-dirs: src
@@ -49,14 +48,15 @@ library:
4948 - Distribution.Nixpkgs.Haskell.FromCabal.License
5049 - Distribution.Nixpkgs.Haskell.FromCabal.Name
5150 - Distribution.Nixpkgs.Haskell.FromCabal.Normalize
51+ - Distribution.Nixpkgs.Haskell.FromCabal.Platform
5252 - Distribution.Nixpkgs.Haskell.FromCabal.PostProcess
5353 - Distribution.Nixpkgs.Haskell.Hackage
5454 - Distribution.Nixpkgs.Haskell.HackageGit
5555 - Distribution.Nixpkgs.Haskell.OrphanInstances
56+ - Distribution.Nixpkgs.Haskell.PackageSourceSpec
5657 - Distribution.Nixpkgs.License
5758 - Distribution.Nixpkgs.Meta
5859 - Distribution.Nixpkgs.PackageMap
59− - Distribution.Nixpkgs.Haskell.PackageSourceSpec
6060
6161tests:
6262 spec:
hackage2nix/hackage2nix.cabal+2−2
@@ -28,15 +28,15 @@ executable hackage2nix
2828 base < 5
2929 , Cabal >= 1.22.2
3030 , containers
31+ , distribution-nixpkgs
3132 , filepath
33+ , language-nix
3234 , lens
3335 , monad-par
3436 , monad-par-extras
3537 , mtl
3638 , optparse-applicative
3739 , pretty >= 1.1.2
38− , language-nix
39− , distribution-nixpkgs
4040 other-modules:
4141 Paths_hackage2nix
4242 default-language: Haskell2010
hackage2nix/package.yaml+2−2
@@ -13,15 +13,15 @@ dependencies:
1313 - base < 5
1414 - Cabal >= 1.22.2
1515 - containers
16+ - distribution-nixpkgs
1617 - filepath
18+ - language-nix
1719 - lens
1820 - monad-par
1921 - monad-par-extras
2022 - mtl
2123 - optparse-applicative
2224 - pretty >= 1.1.2
23− - language-nix
24− - distribution-nixpkgs
2525
2626executables:
2727 hackage2nix:
language-nix/language-nix.cabal+2−2
@@ -25,12 +25,12 @@ library
2525 ghc-options: -Wall
2626 build-depends:
2727 base < 5
28+ , data-default-class
2829 , deepseq-generics
2930 , lens
31+ , lens-construction-helper
3032 , pretty >= 1.1.2
3133 , regex-posix
32− , lens-construction-helper
33− , data-default-class
3434 exposed-modules:
3535 Language.Nix
3636 Language.Nix.Binding
language-nix/package.yaml+2−2
@@ -11,12 +11,12 @@ ghc-options: -Wall
1111
1212dependencies:
1313 - base < 5
14+ - data-default-class
1415 - deepseq-generics
1516 - lens
17+ - lens-construction-helper
1618 - pretty >= 1.1.2
1719 - regex-posix
18− - lens-construction-helper
19− - data-default-class
2020
2121library:
2222 source-dirs: src
release-cabal2nix.nix+3−2
@@ -1,6 +1,7 @@
11{ mkDerivation, ansi-wl-pprint, base, Cabal, containers
22, distribution-nixpkgs, language-nix, lens
3−, lens-construction-helper, optparse-applicative, pretty, stdenv
3+, lens-construction-helper, optparse-applicative, pretty
4+, pretty-show, stdenv
45}:
56mkDerivation {
67 pname = "cabal2nix";
@@ -11,7 +12,7 @@ mkDerivation {
1112 executableHaskellDepends = [
1213 ansi-wl-pprint base Cabal containers distribution-nixpkgs
1314 language-nix lens lens-construction-helper optparse-applicative
14− pretty
15+ pretty pretty-show
1516 ];
1617 homepage = "https://github.com/nixos/cabal2nix#readme";
1718 description = "Convert Cabal files into Nix build instructions";