git.iko.soy/typeable/cabal2nix
on master help sign in
Update Nix build expressions so that they can be used from inside of Nixpkgs.
commita60b8cac47c9b4b4634ef74991b0f975b2655192 authorPeter Simons <simons@cryp.to> dateWed 2 Sep 2015, 17:17 (11 years ago) parentd281a60
6 files changed+56−24
compare with master
unifiedsplit
release-cabal2nix.nix+11−4 release-distribution-nixpkgs.nix+11−4 release-hackage2nix.nix+11−4 release-language-nix.nix+11−4 release-lens-construction-helper.nix+11−4 release.nix+1−4
release-cabal2nix.nix+11−4
@@ -1,12 +1,19 @@
11{ mkDerivation, ansi-wl-pprint, base, Cabal, containers
22, distribution-nixpkgs, language-nix, lens
33, lens-construction-helper, optparse-applicative, pretty
4−, pretty-show, stdenv
4+, pretty-show, stdenv, fetchFromGitHub
55}:
6−mkDerivation {
6+
7+mkDerivation rec {
78 pname = "cabal2nix";
8− version = "20150830";
9− src = /home/simons/src/cabal2nix/cabal2nix;
9+ version = "20150824-66-gd281a60";
10+ src = fetchFromGitHub {
11+ owner = "nixos";
12+ repo = "cabal2nix";
13+ rev = "v${version}";
14+ sha256 = "1ffizg60ihkipcgqr5km4vxgnqv2pdw4716amqlxgf31wj59nyas";
15+ };
16+ postUnpack = "sourceRoot+=/${pname}";
1017 isLibrary = false;
1118 isExecutable = true;
1219 executableHaskellDepends = [
release-distribution-nixpkgs.nix+11−4
@@ -1,12 +1,19 @@
11{ mkDerivation, aeson, base, bytestring, Cabal, containers, deepseq
22, deepseq-generics, directory, doctest, filepath, hackage-db, hspec
33, language-nix, lens, lens-construction-helper, pretty, process
4−, SHA, split, stdenv, transformers, utf8-string
4+, SHA, split, stdenv, transformers, utf8-string, fetchFromGitHub
55}:
6−mkDerivation {
6+
7+mkDerivation rec {
78 pname = "distribution-nixpkgs";
8− version = "20150830";
9− src = /home/simons/src/cabal2nix/distribution-nixpkgs;
9+ version = "20150824-66-gd281a60";
10+ src = fetchFromGitHub {
11+ owner = "nixos";
12+ repo = "cabal2nix";
13+ rev = "v${version}";
14+ sha256 = "1ffizg60ihkipcgqr5km4vxgnqv2pdw4716amqlxgf31wj59nyas";
15+ };
16+ postUnpack = "sourceRoot+=/${pname}";
1017 libraryHaskellDepends = [
1118 aeson base bytestring Cabal containers deepseq deepseq-generics
1219 directory doctest filepath hackage-db hspec language-nix lens
release-hackage2nix.nix+11−4
@@ -1,11 +1,18 @@
11{ mkDerivation, base, Cabal, containers, distribution-nixpkgs
22, filepath, language-nix, lens, monad-par, monad-par-extras, mtl
3−, optparse-applicative, pretty, stdenv
3+, optparse-applicative, pretty, stdenv, fetchFromGitHub
44}:
5−mkDerivation {
5+
6+mkDerivation rec {
67 pname = "hackage2nix";
7− version = "20150830";
8− src = /home/simons/src/cabal2nix/hackage2nix;
8+ version = "20150824-66-gd281a60";
9+ src = fetchFromGitHub {
10+ owner = "nixos";
11+ repo = "cabal2nix";
12+ rev = "v${version}";
13+ sha256 = "1ffizg60ihkipcgqr5km4vxgnqv2pdw4716amqlxgf31wj59nyas";
14+ };
15+ postUnpack = "sourceRoot+=/${pname}";
916 isLibrary = false;
1017 isExecutable = true;
1118 executableHaskellDepends = [
release-language-nix.nix+11−4
@@ -1,10 +1,17 @@
11{ 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
33}:
4−mkDerivation {
4+
5+mkDerivation rec {
56 pname = "language-nix";
6− version = "20150830";
7− src = /home/simons/src/cabal2nix/language-nix;
7+ version = "20150824-66-gd281a60";
8+ src = fetchFromGitHub {
9+ owner = "nixos";
10+ repo = "cabal2nix";
11+ rev = "v${version}";
12+ sha256 = "1ffizg60ihkipcgqr5km4vxgnqv2pdw4716amqlxgf31wj59nyas";
13+ };
14+ postUnpack = "sourceRoot+=/${pname}";
815 libraryHaskellDepends = [
916 base data-default-class deepseq-generics lens
1017 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 }:
2−mkDerivation {
1+{ mkDerivation, base, data-default-class, fetchFromGitHub, lens, stdenv }:
2+
3+mkDerivation rec {
34 pname = "lens-construction-helper";
4− version = "20150830";
5− src = /home/simons/src/cabal2nix/lens-construction-helper;
5+ version = "20150824-66-gd281a60";
6+ src = fetchFromGitHub {
7+ owner = "nixos";
8+ repo = "cabal2nix";
9+ rev = "v${version}";
10+ sha256 = "1ffizg60ihkipcgqr5km4vxgnqv2pdw4716amqlxgf31wj59nyas";
11+ };
12+ postUnpack = "sourceRoot+=/${pname}";
613 libraryHaskellDepends = [ base data-default-class lens ];
714 homepage = "https://github.com/nixos/cabal2nix#readme";
815 description = "Use data-default to create default instances of various types";
release.nix+1−4
@@ -11,10 +11,7 @@ let
1111
1212 overrides = self: super: {
1313
14− mkDerivationFor = subdir: args: self.mkDerivation (args // {
15− src = cabal2nixSrc; version = cabal2nixSrc.gitTag;
16− postUnpack = "sourceRoot+=/${subdir}";
17− });
14+ mkDerivationFor = subdir: args: self.mkDerivation (args // { src = cabal2nixSrc; version = cabal2nixSrc.gitTag; });
1815
1916 mkJob = path: subdir: pkgs.haskell.lib.buildStrictly (self.callPackage path { mkDerivation = self.mkDerivationFor subdir; });
2017