Skip to content

Commit 515c88e

Browse files
rvlangerman
rvl
authored and
angerman
committed
Add script for regenerating nix in tests
And update it for new versions of plan-to-nix.
1 parent 76a31e3 commit 515c88e

File tree

19 files changed

+520
-512
lines changed

19 files changed

+520
-512
lines changed

‎test/builder-haddock/default.nix

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,10 @@
1-
{ mkPkgSet, stdenv }:
1+
{ mkCabalProjectPkgSet, stdenv }:
22

33
with stdenv.lib;
44

55
let
6-
pkgSet = mkPkgSet {
7-
# generated with:
8-
# cabal new-build
9-
# plan-to-nix dist-newstyle/cache/plan.json > plan.nix
10-
# cabal-to-nix test-haddock.cabal > test-haddock.nix
11-
pkg-def = import ./plan.nix;
6+
pkgSet = mkCabalProjectPkgSet {
7+
plan-pkgs = import ./pkgs.nix;
128
pkg-def-extras = [
139
{ test-haddock = ./test-haddock.nix; }
1410
];

‎test/builder-haddock/pkgs.nix

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
{
2+
pkgs = hackage:
3+
{
4+
packages = {
5+
"ghc-prim".revision = (((hackage."ghc-prim")."0.5.2.0").revisions).default;
6+
"stm".revision = (((hackage."stm")."2.4.5.1").revisions).default;
7+
"rts".revision = (((hackage."rts")."1.0").revisions).default;
8+
"base".revision = (((hackage."base")."4.11.1.0").revisions).default;
9+
"array".revision = (((hackage."array")."0.5.2.0").revisions).default;
10+
"integer-gmp".revision = (((hackage."integer-gmp")."1.0.2.0").revisions).default;
11+
};
12+
compiler = {
13+
version = "8.4.4";
14+
nix-name = "ghc844";
15+
packages = {
16+
"ghc-prim" = "0.5.2.0";
17+
"stm" = "2.4.5.1";
18+
"rts" = "1.0";
19+
"base" = "4.11.1.0";
20+
"array" = "0.5.2.0";
21+
"integer-gmp" = "1.0.2.0";
22+
};
23+
};
24+
};
25+
extras = hackage:
26+
{ packages = {}; };
27+
}

‎test/builder-haddock/plan.nix

Lines changed: 0 additions & 23 deletions
This file was deleted.

‎test/builder-haddock/test-haddock.nix

Lines changed: 4 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,9 @@
1-
{ system
2-
, compiler
3-
, flags
4-
, pkgs
5-
, hsPkgs
6-
, pkgconfPkgs
7-
, ... }:
1+
{ system, compiler, flags, pkgs, hsPkgs, pkgconfPkgs, ... }:
82
{
93
flags = {};
104
package = {
115
specVersion = "2.2";
12-
identifier = {
13-
name = "test-haddock";
14-
version = "0.1.0.0";
15-
};
6+
identifier = { name = "test-haddock"; version = "0.1.0.0"; };
167
license = "NONE";
178
copyright = "";
189
maintainer = "[email protected]";
@@ -22,15 +13,6 @@
2213
synopsis = "";
2314
description = "";
2415
buildType = "Simple";
25-
};
26-
components = {
27-
"library" = {
28-
depends = [
29-
(hsPkgs.base)
30-
(hsPkgs.stm)
31-
];
3216
};
33-
};
34-
} // rec {
35-
src = pkgs.lib.mkDefault ./.;
36-
}
17+
components = { "library" = { depends = [ (hsPkgs.base) (hsPkgs.stm) ]; }; };
18+
} // rec { src = (pkgs.lib).mkDefault ./.; }

‎test/cabal-22/default.nix

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
{ stdenv, mkPkgSet }:
1+
{ stdenv, mkCabalProjectPkgSet }:
22

33
with stdenv.lib;
44

55
let
6-
pkgSet = mkPkgSet {
7-
pkg-def = import ./plan.nix;
6+
pkgSet = mkCabalProjectPkgSet {
7+
plan-pkgs = import ./pkgs.nix;
88
pkg-def-extras = [
99
{ project = ./project.nix; }
1010
];

‎test/cabal-22/pkgs.nix

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
{
2+
pkgs = hackage:
3+
{
4+
packages = {
5+
"ghc-prim".revision = (((hackage."ghc-prim")."0.5.2.0").revisions).default;
6+
"rts".revision = (((hackage."rts")."1.0").revisions).default;
7+
"base".revision = (((hackage."base")."4.11.1.0").revisions).default;
8+
"integer-gmp".revision = (((hackage."integer-gmp")."1.0.2.0").revisions).default;
9+
};
10+
compiler = {
11+
version = "8.4.4";
12+
nix-name = "ghc844";
13+
packages = {
14+
"ghc-prim" = "0.5.2.0";
15+
"rts" = "1.0";
16+
"base" = "4.11.1.0";
17+
"integer-gmp" = "1.0.2.0";
18+
};
19+
};
20+
};
21+
extras = hackage:
22+
{ packages = {}; };
23+
}

‎test/cabal-22/plan.nix

Lines changed: 0 additions & 19 deletions
This file was deleted.

‎test/cabal-22/project.nix

Lines changed: 6 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,9 @@
1-
{ system
2-
, compiler
3-
, flags
4-
, pkgs
5-
, hsPkgs
6-
, pkgconfPkgs
7-
, ... }:
1+
{ system, compiler, flags, pkgs, hsPkgs, pkgconfPkgs, ... }:
82
{
93
flags = {};
104
package = {
115
specVersion = "2.2";
12-
identifier = {
13-
name = "project";
14-
version = "0.1.0.0";
15-
};
6+
identifier = { name = "project"; version = "0.1.0.0"; };
167
license = "NONE";
178
copyright = "";
189
maintainer = "[email protected]";
@@ -22,20 +13,9 @@
2213
synopsis = "";
2314
description = "";
2415
buildType = "Simple";
25-
};
26-
components = {
27-
"library" = {
28-
depends = [ (hsPkgs.base) ];
2916
};
30-
exes = {
31-
"project" = {
32-
depends = [
33-
(hsPkgs.base)
34-
(hsPkgs.project)
35-
];
36-
};
17+
components = {
18+
"library" = { depends = [ (hsPkgs.base) ]; };
19+
exes = { "project" = { depends = [ (hsPkgs.base) (hsPkgs.project) ]; }; };
3720
};
38-
};
39-
} // rec {
40-
src = pkgs.lib.mkDefault ./.;
41-
}
21+
} // rec { src = (pkgs.lib).mkDefault ./.; }

‎test/cabal-simple/cabal-simple.nix

Lines changed: 8 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,9 @@
1-
{ system
2-
, compiler
3-
, flags
4-
, pkgs
5-
, hsPkgs
6-
, pkgconfPkgs
7-
, ... }:
1+
{ system, compiler, flags, pkgs, hsPkgs, pkgconfPkgs, ... }:
82
{
93
flags = {};
104
package = {
115
specVersion = "1.10";
12-
identifier = {
13-
name = "cabal-simple";
14-
version = "0.1.0.0";
15-
};
6+
identifier = { name = "cabal-simple"; version = "0.1.0.0"; };
167
license = "LicenseRef-PublicDomain";
178
copyright = "";
189
maintainer = "[email protected]";
@@ -22,27 +13,20 @@
2213
synopsis = "";
2314
description = "";
2415
buildType = "Simple";
25-
};
16+
};
2617
components = {
2718
"library" = {
28-
depends = [
29-
(hsPkgs.base)
30-
(hsPkgs.extra)
31-
(hsPkgs.safe)
32-
(hsPkgs.aeson)
33-
];
34-
};
19+
depends = [ (hsPkgs.base) (hsPkgs.extra) (hsPkgs.safe) (hsPkgs.aeson) ];
20+
};
3521
exes = {
3622
"cabal-simple" = {
3723
depends = [
3824
(hsPkgs.base)
3925
(hsPkgs.cabal-simple)
4026
(hsPkgs.extra)
4127
(hsPkgs.optparse-applicative)
42-
];
28+
];
29+
};
4330
};
4431
};
45-
};
46-
} // rec {
47-
src = pkgs.lib.mkDefault ./.;
48-
}
32+
} // rec { src = (pkgs.lib).mkDefault ./.; }

‎test/cabal-simple/default.nix

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,11 @@
11
# Test a package set
2-
{ stdenv, util, mkPkgSet }:
2+
{ stdenv, util, mkCabalProjectPkgSet }:
33

44
with stdenv.lib;
55

66
let
7-
## steps to generate local files
8-
# 1. cabal-to-nix cabal-simple.cabal > cabal-simple.nix
9-
# 2. cabal new-build
10-
# 3. plan-to-nix ./dist-newstyle/cache/plan.json > plan.nix
11-
pkgSet = mkPkgSet {
12-
pkg-def = import ./plan.nix;
7+
pkgSet = mkCabalProjectPkgSet {
8+
plan-pkgs = import ./pkgs.nix;
139
pkg-def-extras = [
1410
{ cabal-simple = ./cabal-simple.nix;
1511
}

0 commit comments

Comments
 (0)