Skip to content

Update stack.yaml #112

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 5 commits into from
May 7, 2019
Merged

Update stack.yaml #112

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
0704284
Update stack.yaml
angerman Apr 27, 2019
9a44557
Regenerate nix for test/stack-simple
rvl May 7, 2019
2a63d29
Regenerate nix for test/with-packages to avoid transformers-0.5.0.0 p…
rvl May 7, 2019
647571c
Regenerate nix for test/cabal-sublib
rvl May 7, 2019
38b302d
Add script for regenerating nix in tests
rvl May 7, 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
10 changes: 3 additions & 7 deletions test/builder-haddock/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,10 @@
{ mkPkgSet, stdenv }:
{ mkCabalProjectPkgSet, stdenv }:

with stdenv.lib;

let
pkgSet = mkPkgSet {
# generated with:
# cabal new-build
# plan-to-nix dist-newstyle/cache/plan.json > plan.nix
# cabal-to-nix test-haddock.cabal > test-haddock.nix
pkg-def = import ./plan.nix;
pkgSet = mkCabalProjectPkgSet {
plan-pkgs = import ./pkgs.nix;
pkg-def-extras = [
{ test-haddock = ./test-haddock.nix; }
];
Expand Down
27 changes: 27 additions & 0 deletions test/builder-haddock/pkgs.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
{
pkgs = hackage:
{
packages = {
"ghc-prim".revision = (((hackage."ghc-prim")."0.5.2.0").revisions).default;
"stm".revision = (((hackage."stm")."2.4.5.1").revisions).default;
"rts".revision = (((hackage."rts")."1.0").revisions).default;
"base".revision = (((hackage."base")."4.11.1.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.4.4";
nix-name = "ghc844";
packages = {
"ghc-prim" = "0.5.2.0";
"stm" = "2.4.5.1";
"rts" = "1.0";
"base" = "4.11.1.0";
"array" = "0.5.2.0";
"integer-gmp" = "1.0.2.0";
};
};
};
extras = hackage:
{ packages = {}; };
}
23 changes: 0 additions & 23 deletions test/builder-haddock/plan.nix
View file
Open in desktop

This file was deleted.

26 changes: 4 additions & 22 deletions test/builder-haddock/test-haddock.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,9 @@
{ system
, compiler
, flags
, pkgs
, hsPkgs
, pkgconfPkgs
, ... }:
{ system, compiler, flags, pkgs, hsPkgs, pkgconfPkgs, ... }:
{
flags = {};
package = {
specVersion = "2.2";
identifier = {
name = "test-haddock";
version = "0.1.0.0";
};
identifier = { name = "test-haddock"; version = "0.1.0.0"; };
license = "NONE";
copyright = "";
maintainer = "[email protected]";
Expand All @@ -22,15 +13,6 @@
synopsis = "";
description = "";
buildType = "Simple";
};
components = {
"library" = {
depends = [
(hsPkgs.base)
(hsPkgs.stm)
];
};
};
} // rec {
src = pkgs.lib.mkDefault ./.;
}
components = { "library" = { depends = [ (hsPkgs.base) (hsPkgs.stm) ]; }; };
} // rec { src = (pkgs.lib).mkDefault ./.; }
6 changes: 3 additions & 3 deletions test/cabal-22/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{ stdenv, mkPkgSet }:
{ stdenv, mkCabalProjectPkgSet }:

with stdenv.lib;

let
pkgSet = mkPkgSet {
pkg-def = import ./plan.nix;
pkgSet = mkCabalProjectPkgSet {
plan-pkgs = import ./pkgs.nix;
pkg-def-extras = [
{ project = ./project.nix; }
];
Expand Down
23 changes: 23 additions & 0 deletions test/cabal-22/pkgs.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{
pkgs = hackage:
{
packages = {
"ghc-prim".revision = (((hackage."ghc-prim")."0.5.2.0").revisions).default;
"rts".revision = (((hackage."rts")."1.0").revisions).default;
"base".revision = (((hackage."base")."4.11.1.0").revisions).default;
"integer-gmp".revision = (((hackage."integer-gmp")."1.0.2.0").revisions).default;
};
compiler = {
version = "8.4.4";
nix-name = "ghc844";
packages = {
"ghc-prim" = "0.5.2.0";
"rts" = "1.0";
"base" = "4.11.1.0";
"integer-gmp" = "1.0.2.0";
};
};
};
extras = hackage:
{ packages = {}; };
}
19 changes: 0 additions & 19 deletions test/cabal-22/plan.nix
View file
Open in desktop

This file was deleted.

32 changes: 6 additions & 26 deletions test/cabal-22/project.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,9 @@
{ system
, compiler
, flags
, pkgs
, hsPkgs
, pkgconfPkgs
, ... }:
{ system, compiler, flags, pkgs, hsPkgs, pkgconfPkgs, ... }:
{
flags = {};
package = {
specVersion = "2.2";
identifier = {
name = "project";
version = "0.1.0.0";
};
identifier = { name = "project"; version = "0.1.0.0"; };
license = "NONE";
copyright = "";
maintainer = "[email protected]";
Expand All @@ -22,20 +13,9 @@
synopsis = "";
description = "";
buildType = "Simple";
};
components = {
"library" = {
depends = [ (hsPkgs.base) ];
};
exes = {
"project" = {
depends = [
(hsPkgs.base)
(hsPkgs.project)
];
};
components = {
"library" = { depends = [ (hsPkgs.base) ]; };
exes = { "project" = { depends = [ (hsPkgs.base) (hsPkgs.project) ]; }; };
};
};
} // rec {
src = pkgs.lib.mkDefault ./.;
}
} // rec { src = (pkgs.lib).mkDefault ./.; }
32 changes: 8 additions & 24 deletions test/cabal-simple/cabal-simple.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,9 @@
{ system
, compiler
, flags
, pkgs
, hsPkgs
, pkgconfPkgs
, ... }:
{ system, compiler, flags, pkgs, hsPkgs, pkgconfPkgs, ... }:
{
flags = {};
package = {
specVersion = "1.10";
identifier = {
name = "cabal-simple";
version = "0.1.0.0";
};
identifier = { name = "cabal-simple"; version = "0.1.0.0"; };
license = "LicenseRef-PublicDomain";
copyright = "";
maintainer = "[email protected]";
Expand All @@ -22,27 +13,20 @@
synopsis = "";
description = "";
buildType = "Simple";
};
};
components = {
"library" = {
depends = [
(hsPkgs.base)
(hsPkgs.extra)
(hsPkgs.safe)
(hsPkgs.aeson)
];
};
depends = [ (hsPkgs.base) (hsPkgs.extra) (hsPkgs.safe) (hsPkgs.aeson) ];
};
exes = {
"cabal-simple" = {
depends = [
(hsPkgs.base)
(hsPkgs.cabal-simple)
(hsPkgs.extra)
(hsPkgs.optparse-applicative)
];
];
};
};
};
};
} // rec {
src = pkgs.lib.mkDefault ./.;
}
} // rec { src = (pkgs.lib).mkDefault ./.; }
10 changes: 3 additions & 7 deletions test/cabal-simple/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,11 @@
# Test a package set
{ stdenv, util, mkPkgSet }:
{ stdenv, util, mkCabalProjectPkgSet }:

with stdenv.lib;

let
## steps to generate local files
# 1. cabal-to-nix cabal-simple.cabal > cabal-simple.nix
# 2. cabal new-build
# 3. plan-to-nix ./dist-newstyle/cache/plan.json > plan.nix
pkgSet = mkPkgSet {
pkg-def = import ./plan.nix;
pkgSet = mkCabalProjectPkgSet {
plan-pkgs = import ./pkgs.nix;
pkg-def-extras = [
{ cabal-simple = ./cabal-simple.nix;
}
Expand Down
Loading