@@ -2,8 +2,8 @@
3{ cabal2nixSrc ? { outPath = ./.; revCount = 0; gitTag = "dirty"; }
3{ cabal2nixSrc ? { outPath = ./.; revCount = 0; gitTag = "dirty"; }
4, releaseBuild ? false
4, releaseBuild ? false
5−, supportedPlatforms ? if releaseBuild then ["i686-linux" "x86_64-linux" /*"x86_64-darwin"*/] else ["x86_64-linux"]
5+, supportedPlatforms ? ["x86_64-linux"] ++ (if releaseBuild then ["i686-linux" /*"x86_64-darwin"*/] else [])
6−, supportedCompilers ? if true then ["ghc784"] else ["ghc704" "ghc722" "ghc742" "ghc763" "ghc784" /*"ghcHEAD"*/]
6+, supportedCompilers ? [/*"ghc704" "ghc722" "ghc742" "ghc763"*/ "ghc784" /*"ghcHEAD"*/]
@@ -13,28 +13,27 @@ in
13 cabal2nix = genAttrs supportedCompilers (ghcVer: genAttrs supportedPlatforms (system:
13 cabal2nix = genAttrs supportedCompilers (ghcVer: genAttrs supportedPlatforms (system:
15 pkgs = import <nixpkgs> { inherit system; };
15 pkgs = import <nixpkgs> { inherit system; };
16− haskellPackages = pkgs.lib.getAttrFromPath ["haskellPackages_${ghcVer}"] pkgs;
16+ haskellPackages = pkgs.lib.getAttrFromPath ["haskell-ng" "packages" ghcVer] pkgs;
17 nativeCabal = pkgs.stdenv.lib.versionOlder "7.8" haskellPackages.ghc.version;
17 nativeCabal = pkgs.stdenv.lib.versionOlder "7.8" haskellPackages.ghc.version;
18− Cabal = if nativeCabal then null else haskellPackages.Cabal_1_18_1_3;
18+ Cabal = if nativeCabal then null else haskellPackages.Cabal_1_20_0_3;
19 hackageDb = haskellPackages.hackageDb.override { Cabal = Cabal; };
19 hackageDb = haskellPackages.hackageDb.override { Cabal = Cabal; };
21− haskellPackages.cabal.mkDerivation (self: {
21+ haskellPackages.mkDerivation {
22 pname = "cabal2nix";
22 pname = "cabal2nix";
24 version = cabal2nixSrc.gitTag;
23 version = cabal2nixSrc.gitTag;
25 isLibrary = false;
25 isLibrary = false;
26 isExecutable = true;
26 isExecutable = true;
27 buildDepends = with haskellPackages; [
27 buildDepends = with haskellPackages; [
28− Cabal deepseq filepath hackageDb monadPar monadParExtras mtl
28+ aeson base bytestring Cabal containers deepseq directory filepath
29− regexPosix transformers SHA aeson split utf8String
29+ hackage-db monad-par monad-par-extras mtl pretty process
30+ regex-posix SHA split transformers utf8-string
31− testDepends = with haskellPackages; [ doctest ];
32+ testDepends = with haskellPackages; [ base doctest ];
32− doCheck = nativeCabal;
34− homepage = "http://github.com/NixOS/cabal2nix";
33+ homepage = "http://github.com/NixOS/cabal2nix";
35− description = "Convert Cabal files into Nix build instructions";
34+ description = "Convert Cabal files into Nix build instructions";
36− license = self.stdenv.lib.licenses.bsd3;
35+ license = pkgs.stdenv.lib.licenses.bsd3;
37− maintainers = [ self.stdenv.lib.maintainers.simons ];
36+ maintainers = [ pkgs.stdenv.lib.maintainers.simons ];