6efd657 · typeable/cabal2nix

git.iko.soy/typeable/cabal2nix

cabal2nix.cabal: the new AGPL license is available only in Cabal 1.18.x or later

Supporting GHC 6.x with such a recent version of Cabal becomes unfeasible, IMHO, so we're dropping those builds.

commit6efd65709d62337bb04888da746a1d443f81ae47 authorPeter Simons <simons@cryp.to> dateFri 3 Oct 2014, 21:44 (12 years ago) parentbaa4880

2 files changed+8−5

compare with master

unifiedsplit

cabal2nix.cabal+3−3 release.nix+5−2

cabal2nix.cabal+3−3

@@ -10,7 +10,7 @@ Category: Distribution

1010Synopsis: Convert Cabal files into Nix build instructions

1111Cabal-Version: >= 1.8

1212Build-Type: Custom

13−Tested-With: GHC >= 6.10.4 && <= 7.8.3

13+Tested-With: GHC >= 7.0.4 && <= 7.8.3

1414Data-files: README.md

1515Description:

1616 The @cabal2nix@ utility converts Cabal files into Nix build instructions. The

@@ -57,7 +57,7 @@ Source-Repository head

5757Executable cabal2nix

5858 main-is: cabal2nix.hs

5959 hs-source-dirs: src

60− Build-Depends: base >= 3 && < 5, regex-posix, pretty, Cabal >= 1.16,

60+ Build-Depends: base >= 3 && < 5, regex-posix, pretty, Cabal >= 1.18,

6161 filepath, directory, process, hackage-db, transformers

6262 Extensions: PatternGuards, RecordWildCards, CPP

6363 Ghc-Options: -Wall

@@ -79,7 +79,7 @@ Executable cabal2nix

7979Executable hackage4nix

8080 main-is: hackage4nix.hs

8181 hs-source-dirs: src

82− Build-Depends: base >= 3 && < 5, regex-posix, pretty, Cabal >= 1.16,

82+ Build-Depends: base >= 3 && < 5, regex-posix, pretty, Cabal >= 1.18,

8383 mtl, containers, directory, filepath, hackage-db, transformers, process

8484 Extensions: PatternGuards, RecordWildCards, CPP

8585 Ghc-Options: -Wall

release.nix+5−2

@@ -3,7 +3,7 @@

33{ cabal2nixSrc ? { outPath = ./.; revCount = 0; gitTag = "dirty"; }

44, releaseBuild ? false

55, supportedPlatforms ? if releaseBuild then ["i686-linux" "x86_64-linux" "x86_64-darwin"] else ["x86_64-linux"]

6−, supportedCompilers ? if releaseBuild then ["ghc783"] else ["ghc6104" "ghc6123" "ghc704" "ghc722" "ghc742" "ghc763" "ghc783" "ghcHEAD"]

6+, supportedCompilers ? if releaseBuild then ["ghc783"] else ["ghc704" "ghc722" "ghc742" "ghc763" "ghc783" "ghcHEAD"]

77}:

99let

@@ -14,6 +14,9 @@ in

1414 let

1515 pkgs = import <nixpkgs> { inherit system; };

1616 haskellPackages = pkgs.lib.getAttrFromPath ["haskellPackages_${ghcVer}"] pkgs;

17+ nativeCabal = pkgs.stdenv.lib.versionOlder "7.8" haskellPackages.ghc.version;

18+ Cabal = if nativeCabal then null else haskellPackages.Cabal_1_18_1_3;

19+ hackageDb = haskellPackages.hackageDb.override { Cabal = Cabal; };

1720 in

1821 haskellPackages.cabal.mkDerivation (self: {

1922 pname = "cabal2nix";

@@ -23,7 +26,7 @@ in

2326 isExecutable = true;

2427 buildDepends = with haskellPackages; [ Cabal filepath hackageDb mtl regexPosix transformers ];

2528 testDepends = with haskellPackages; [ doctest ];

26− doCheck = self.stdenv.lib.versionOlder "7.6" self.ghc.version;

29+ doCheck = nativeCabal;

2730 meta = {

2831 homepage = "http://github.com/NixOS/cabal2nix";

2932 description = "Convert Cabal files into Nix build instructions";