Skip to content

Try to fix tests #138

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
May 20, 2019
Merged

Try to fix tests #138

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
aa8420c
tests: Regenerate nix
rvl May 20, 2019
9cc120d
tests: Use mkCabalProjectPkgSet
rvl May 20, 2019
a214f21
tests: Disable callCabalProjectToNix test
rvl May 20, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 18 additions & 0 deletions test/builder-haddock/.plan.nix/test-haddock.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
{ system, compiler, flags, pkgs, hsPkgs, pkgconfPkgs, ... }:
{
flags = {};
package = {
specVersion = "2.2";
identifier = { name = "test-haddock"; version = "0.1.0.0"; };
license = "NONE";
copyright = "";
maintainer = "[email protected]";
author = "Rodney Lorrimar";
homepage = "";
url = "";
synopsis = "";
description = "";
buildType = "Simple";
};
components = { "library" = { depends = [ (hsPkgs.base) (hsPkgs.stm) ]; }; };
} // rec { src = (pkgs.lib).mkDefault ../.; }
3 changes: 0 additions & 3 deletions test/builder-haddock/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,6 @@ with stdenv.lib;
let
pkgSet = mkCabalProjectPkgSet {
plan-pkgs = import ./pkgs.nix;
pkg-def-extras = [
{ test-haddock = ./test-haddock.nix; }
];
modules = [
# overrides to fix the build
{
Expand Down
2 changes: 1 addition & 1 deletion test/builder-haddock/pkgs.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,5 +23,5 @@
};
};
extras = hackage:
{ packages = {}; };
{ packages = { test-haddock = ./.plan.nix/test-haddock.nix; }; };
}
21 changes: 21 additions & 0 deletions test/cabal-22/.plan.nix/project.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
{ system, compiler, flags, pkgs, hsPkgs, pkgconfPkgs, ... }:
{
flags = {};
package = {
specVersion = "2.2";
identifier = { name = "project"; version = "0.1.0.0"; };
license = "NONE";
copyright = "";
maintainer = "[email protected]";
author = "Rodney Lorrimar";
homepage = "";
url = "";
synopsis = "";
description = "";
buildType = "Simple";
};
components = {
"library" = { depends = [ (hsPkgs.base) ]; };
exes = { "project" = { depends = [ (hsPkgs.base) (hsPkgs.project) ]; }; };
};
} // rec { src = (pkgs.lib).mkDefault ../.; }
4 changes: 0 additions & 4 deletions test/cabal-22/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,6 @@ with stdenv.lib;
let
pkgSet = mkCabalProjectPkgSet {
plan-pkgs = import ./pkgs.nix;
pkg-def-extras = [
{ project = ./project.nix; }
];
modules = [ ];
};

packages = pkgSet.config.hsPkgs;
Expand Down
2 changes: 1 addition & 1 deletion test/cabal-22/pkgs.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,5 +19,5 @@
};
};
extras = hackage:
{ packages = {}; };
{ packages = { project = ./.plan.nix/project.nix; }; };
}
2 changes: 1 addition & 1 deletion test/cabal-simple/.plan.nix/cabal-simple.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,4 +29,4 @@
};
};
};
} // rec { src = (pkgs.lib).mkDefault ../.; }
} // rec { src = (pkgs.lib).mkDefault ../.; }
11 changes: 3 additions & 8 deletions test/cabal-simple/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,11 @@
# Test a package set
{ stdenv, util, mkPkgSet }:
{ stdenv, util, mkCabalProjectPkgSet }:

with stdenv.lib;

let
## steps to generate local files
# 1. cabal new-build
# 2. plan-to-nix -o .
pkgs = import ./pkgs.nix;
pkgSet = mkPkgSet {
pkg-def = pkgs.pkgs;
pkg-def-extras = [ pkgs.extras ];
pkgSet = mkCabalProjectPkgSet {
plan-pkgs = import ./pkgs.nix;
modules = [
{
# Package has no exposed modules which causes
Expand Down
66 changes: 36 additions & 30 deletions test/cabal-simple/pkgs.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,22 +2,23 @@
pkgs = hackage:
{
packages = {
"binary".revision = (((hackage."binary")."0.8.6.0").revisions).default;
"ghc-prim".revision = (((hackage."ghc-prim")."0.5.3").revisions).default;
"binary".revision = (((hackage."binary")."0.8.5.1").revisions).default;
"ghc-prim".revision = (((hackage."ghc-prim")."0.5.2.0").revisions).default;
"extra".revision = (((hackage."extra")."1.6.15").revisions).default;
"stm".revision = (((hackage."stm")."2.4.5.1").revisions).default;
"unix".revision = (((hackage."unix")."2.7.2.2").revisions).default;
"rts".revision = (((hackage."rts")."1.0").revisions).default;
"clock".revision = (((hackage."clock")."0.8").revisions).default;
"clock".flags.llvm = false;
"scientific".revision = (((hackage."scientific")."0.3.6.2").revisions).default;
"scientific".flags.integer-simple = false;
"scientific".flags.bytestring-builder = false;
"deepseq".revision = (((hackage."deepseq")."1.4.4.0").revisions).default;
"deepseq".revision = (((hackage."deepseq")."1.4.3.0").revisions).default;
"random".revision = (((hackage."random")."1.1").revisions).default;
"uuid-types".revision = (((hackage."uuid-types")."1.0.3").revisions).default;
"optparse-applicative".revision = (((hackage."optparse-applicative")."0.14.3.0").revisions).default;
"dlist".revision = (((hackage."dlist")."0.8.0.6").revisions).default;
"semigroups".revision = (((hackage."semigroups")."0.18.5").revisions).default;
"semigroups".revision = (((hackage."semigroups")."0.19").revisions).default;
"semigroups".flags.bytestring = true;
"semigroups".flags.unordered-containers = true;
"semigroups".flags.text = true;
Expand All @@ -28,16 +29,17 @@
"semigroups".flags.transformers = true;
"semigroups".flags.deepseq = true;
"semigroups".flags.bytestring-builder = false;
"directory".revision = (((hackage."directory")."1.3.3.0").revisions).default;
"transformers-compat".revision = (((hackage."transformers-compat")."0.6.4").revisions).default;
"semigroups".flags.template-haskell = true;
"directory".revision = (((hackage."directory")."1.3.1.5").revisions).default;
"transformers-compat".revision = (((hackage."transformers-compat")."0.6.5").revisions).default;
"transformers-compat".flags.five = false;
"transformers-compat".flags.generic-deriving = true;
"transformers-compat".flags.two = false;
"transformers-compat".flags.five-three = true;
"transformers-compat".flags.mtl = true;
"transformers-compat".flags.four = false;
"transformers-compat".flags.three = false;
"template-haskell".revision = (((hackage."template-haskell")."2.14.0.0").revisions).default;
"template-haskell".revision = (((hackage."template-haskell")."2.13.0.0").revisions).default;
"vector".revision = (((hackage."vector")."0.12.0.3").revisions).default;
"vector".flags.unsafechecks = false;
"vector".flags.internalchecks = false;
Expand All @@ -48,22 +50,27 @@
"time-locale-compat".flags.old-locale = false;
"safe".revision = (((hackage."safe")."0.3.17").revisions).default;
"base-compat".revision = (((hackage."base-compat")."0.10.5").revisions).default;
"ansi-terminal".revision = (((hackage."ansi-terminal")."0.9").revisions).default;
"ansi-terminal".revision = (((hackage."ansi-terminal")."0.9.1").revisions).default;
"ansi-terminal".flags.example = false;
"tagged".revision = (((hackage."tagged")."0.8.6").revisions).default;
"tagged".flags.transformers = true;
"tagged".flags.deepseq = true;
"containers".revision = (((hackage."containers")."0.6.0.1").revisions).default;
"containers".revision = (((hackage."containers")."0.5.11.0").revisions).default;
"integer-logarithms".revision = (((hackage."integer-logarithms")."1.0.3").revisions).default;
"integer-logarithms".flags.check-bounds = false;
"integer-logarithms".flags.integer-gmp = true;
"bytestring".revision = (((hackage."bytestring")."0.10.8.2").revisions).default;
"ansi-wl-pprint".revision = (((hackage."ansi-wl-pprint")."0.6.8.2").revisions).default;
"ansi-wl-pprint".revision = (((hackage."ansi-wl-pprint")."0.6.9").revisions).default;
"ansi-wl-pprint".flags.example = false;
"StateVar".revision = (((hackage."StateVar")."1.1.1.1").revisions).default;
"contravariant".revision = (((hackage."contravariant")."1.5.1").revisions).default;
"contravariant".flags.semigroups = true;
"contravariant".flags.tagged = true;
"contravariant".flags.statevar = true;
"text".revision = (((hackage."text")."1.2.3.1").revisions).default;
"unordered-containers".revision = (((hackage."unordered-containers")."0.2.10.0").revisions).default;
"unordered-containers".flags.debug = false;
"base".revision = (((hackage."base")."4.12.0.0").revisions).default;
"base".revision = (((hackage."base")."4.11.1.0").revisions).default;
"time".revision = (((hackage."time")."1.8.0.2").revisions).default;
"transformers".revision = (((hackage."transformers")."0.5.6.2").revisions).default;
"hashable".revision = (((hackage."hashable")."1.2.7.0").revisions).default;
Expand All @@ -73,46 +80,45 @@
"hashable".flags.examples = false;
"attoparsec".revision = (((hackage."attoparsec")."0.13.2.2").revisions).default;
"attoparsec".flags.developer = false;
"colour".revision = (((hackage."colour")."2.3.4").revisions).default;
"filepath".revision = (((hackage."filepath")."1.4.2.1").revisions).default;
"colour".revision = (((hackage."colour")."2.3.5").revisions).default;
"filepath".revision = (((hackage."filepath")."1.4.2").revisions).default;
"process".revision = (((hackage."process")."1.6.5.0").revisions).default;
"pretty".revision = (((hackage."pretty")."1.1.3.6").revisions).default;
"aeson".revision = (((hackage."aeson")."1.4.3.0").revisions).default;
"aeson".flags.cffi = false;
"aeson".flags.fast = false;
"aeson".flags.bytestring-builder = false;
"aeson".flags.developer = false;
"ghc-boot-th".revision = (((hackage."ghc-boot-th")."8.6.4").revisions).default;
"ghc-boot-th".revision = (((hackage."ghc-boot-th")."8.4.4").revisions).default;
"th-abstraction".revision = (((hackage."th-abstraction")."0.3.1.0").revisions).default;
"array".revision = (((hackage."array")."0.5.3.0").revisions).default;
"array".revision = (((hackage."array")."0.5.2.0").revisions).default;
"integer-gmp".revision = (((hackage."integer-gmp")."1.0.2.0").revisions).default;
};
compiler = {
version = "8.6.4";
nix-name = "ghc864";
version = "8.4.4";
nix-name = "ghc844";
packages = {
"binary" = "0.8.6.0";
"ghc-prim" = "0.5.3";
"binary" = "0.8.5.1";
"ghc-prim" = "0.5.2.0";
"stm" = "2.4.5.1";
"unix" = "2.7.2.2";
"rts" = "1.0";
"deepseq" = "1.4.4.0";
"directory" = "1.3.3.0";
"template-haskell" = "2.14.0.0";
"containers" = "0.6.0.1";
"deepseq" = "1.4.3.0";
"directory" = "1.3.1.5";
"template-haskell" = "2.13.0.0";
"containers" = "0.5.11.0";
"bytestring" = "0.10.8.2";
"text" = "1.2.3.1";
"base" = "4.12.0.0";
"base" = "4.11.1.0";
"time" = "1.8.0.2";
"transformers" = "0.5.6.2";
"filepath" = "1.4.2.1";
"process" = "1.6.5.0";
"filepath" = "1.4.2";
"pretty" = "1.1.3.6";
"ghc-boot-th" = "8.6.4";
"array" = "0.5.3.0";
"ghc-boot-th" = "8.4.4";
"array" = "0.5.2.0";
"integer-gmp" = "1.0.2.0";
};
};
};
extras = hackage:
{ packages = { cabal-simple = ./.plan.nix/cabal-simple.nix; }; };
}
}
11 changes: 3 additions & 8 deletions test/cabal-sublib/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,11 @@
# Test a package set
{ stdenv, util, mkPkgSet }:
{ stdenv, util, mkCabalProjectPkgSet }:

with stdenv.lib;

let
## steps to generate local files
# 1. cabal new-build
# 2. plan-to-nix -o .
pkgs = import ./pkgs.nix;
pkgSet = mkPkgSet {
pkg-def = pkgs.pkgs;
pkg-def-extras = [ pkgs.extras ];
pkgSet = mkCabalProjectPkgSet {
plan-pkgs = import ./pkgs.nix;
modules = [
{
# Package has no exposed modules which causes
Expand Down
Loading