a60b8ca · typeable/cabal2nix

release-cabal2nix.nix+11−4

compare with master

unifiedsplit

@@ -1,12 +1,19 @@

1{ mkDerivation, ansi-wl-pprint, base, Cabal, containers

2, distribution-nixpkgs, language-nix, lens

3, lens-construction-helper, optparse-applicative, pretty

4−, pretty-show, stdenv

4+, pretty-show, stdenv, fetchFromGitHub

5}:

6+

6−mkDerivation {

7+mkDerivation rec {

7 pname = "cabal2nix";

8 pname = "cabal2nix";

8− version = "20150830";

9+ version = "20150824-66-gd281a60";

9− src = /home/simons/src/cabal2nix/cabal2nix;

10+ src = fetchFromGitHub {

11+ owner = "nixos";

12+ repo = "cabal2nix";

13+ rev = "v${version}";

14+ sha256 = "1ffizg60ihkipcgqr5km4vxgnqv2pdw4716amqlxgf31wj59nyas";

15+ };

16+ postUnpack = "sourceRoot+=/${pname}";

10 isLibrary = false;

17 isLibrary = false;

11 isExecutable = true;

18 isExecutable = true;

12 executableHaskellDepends = [

19 executableHaskellDepends = [

release-distribution-nixpkgs.nix+11−4

@@ -1,12 +1,19 @@

1{ mkDerivation, aeson, base, bytestring, Cabal, containers, deepseq

2, deepseq-generics, directory, doctest, filepath, hackage-db, hspec

3, language-nix, lens, lens-construction-helper, pretty, process

4−, SHA, split, stdenv, transformers, utf8-string

4+, SHA, split, stdenv, transformers, utf8-string, fetchFromGitHub

5}:

6+

6−mkDerivation {

7+mkDerivation rec {

7 pname = "distribution-nixpkgs";

8 pname = "distribution-nixpkgs";

8− version = "20150830";

9+ version = "20150824-66-gd281a60";

9− src = /home/simons/src/cabal2nix/distribution-nixpkgs;

10+ src = fetchFromGitHub {

11+ owner = "nixos";

12+ repo = "cabal2nix";

13+ rev = "v${version}";

14+ sha256 = "1ffizg60ihkipcgqr5km4vxgnqv2pdw4716amqlxgf31wj59nyas";

15+ };

16+ postUnpack = "sourceRoot+=/${pname}";

10 libraryHaskellDepends = [

17 libraryHaskellDepends = [

11 aeson base bytestring Cabal containers deepseq deepseq-generics

18 aeson base bytestring Cabal containers deepseq deepseq-generics

12 directory doctest filepath hackage-db hspec language-nix lens

19 directory doctest filepath hackage-db hspec language-nix lens

release-hackage2nix.nix+11−4

@@ -1,11 +1,18 @@

1{ mkDerivation, base, Cabal, containers, distribution-nixpkgs

2, filepath, language-nix, lens, monad-par, monad-par-extras, mtl

3−, optparse-applicative, pretty, stdenv

3+, optparse-applicative, pretty, stdenv, fetchFromGitHub

4}:

5+

5−mkDerivation {

6+mkDerivation rec {

6 pname = "hackage2nix";

7 pname = "hackage2nix";

7− version = "20150830";

8+ version = "20150824-66-gd281a60";

8− src = /home/simons/src/cabal2nix/hackage2nix;

9+ src = fetchFromGitHub {

10+ owner = "nixos";

11+ repo = "cabal2nix";

12+ rev = "v${version}";

13+ sha256 = "1ffizg60ihkipcgqr5km4vxgnqv2pdw4716amqlxgf31wj59nyas";

14+ };

15+ postUnpack = "sourceRoot+=/${pname}";

9 isLibrary = false;

16 isLibrary = false;

10 isExecutable = true;

17 isExecutable = true;

11 executableHaskellDepends = [

18 executableHaskellDepends = [

release-language-nix.nix+11−4

@@ -1,10 +1,17 @@

1{ mkDerivation, base, data-default-class, deepseq-generics, lens

2−, lens-construction-helper, pretty, regex-posix, stdenv

2+, lens-construction-helper, pretty, regex-posix, stdenv, fetchFromGitHub

3}:

4+

4−mkDerivation {

5+mkDerivation rec {

5 pname = "language-nix";

6 pname = "language-nix";

6− version = "20150830";

7+ version = "20150824-66-gd281a60";

7− src = /home/simons/src/cabal2nix/language-nix;

8+ src = fetchFromGitHub {

9+ owner = "nixos";

10+ repo = "cabal2nix";

11+ rev = "v${version}";

12+ sha256 = "1ffizg60ihkipcgqr5km4vxgnqv2pdw4716amqlxgf31wj59nyas";

13+ };

14+ postUnpack = "sourceRoot+=/${pname}";

8 libraryHaskellDepends = [

15 libraryHaskellDepends = [

9 base data-default-class deepseq-generics lens

16 base data-default-class deepseq-generics lens

10 lens-construction-helper pretty regex-posix

17 lens-construction-helper pretty regex-posix

release-lens-construction-helper.nix+11−4

@@ -1,8 +1,15 @@

1−{ mkDerivation, base, data-default-class, lens, stdenv }:

1+{ mkDerivation, base, data-default-class, fetchFromGitHub, lens, stdenv }:

2+

2−mkDerivation {

3+mkDerivation rec {

3 pname = "lens-construction-helper";

4 pname = "lens-construction-helper";

4− version = "20150830";

5+ version = "20150824-66-gd281a60";

5− src = /home/simons/src/cabal2nix/lens-construction-helper;

6+ src = fetchFromGitHub {

7+ owner = "nixos";

8+ repo = "cabal2nix";

9+ rev = "v${version}";

10+ sha256 = "1ffizg60ihkipcgqr5km4vxgnqv2pdw4716amqlxgf31wj59nyas";

11+ };

12+ postUnpack = "sourceRoot+=/${pname}";

6 libraryHaskellDepends = [ base data-default-class lens ];

13 libraryHaskellDepends = [ base data-default-class lens ];

7 homepage = "https://github.com/nixos/cabal2nix#readme";

14 homepage = "https://github.com/nixos/cabal2nix#readme";

8 description = "Use data-default to create default instances of various types";

15 description = "Use data-default to create default instances of various types";

release.nix+1−4

@@ -11,10 +11,7 @@ let

11

12 overrides = self: super: {

13

14− mkDerivationFor = subdir: args: self.mkDerivation (args // {

14+ mkDerivationFor = subdir: args: self.mkDerivation (args // { src = cabal2nixSrc; version = cabal2nixSrc.gitTag; });

15− src = cabal2nixSrc; version = cabal2nixSrc.gitTag;

16− postUnpack = "sourceRoot+=/${subdir}";

17− });

18

15

19 mkJob = path: subdir: pkgs.haskell.lib.buildStrictly (self.callPackage path { mkDerivation = self.mkDerivationFor subdir; });

16 mkJob = path: subdir: pkgs.haskell.lib.buildStrictly (self.callPackage path { mkDerivation = self.mkDerivationFor subdir; });

20

17