ebb979f · haskell.nix · git.iko.soy

.buildkite/pipeline.yml+1−5

compare with iko/ghcjs-patch-master

unifiedsplit

@@ -1,9 +1,5 @@

1−env:

2− NIX_PATH: "nixpkgs=channel:nixos-18.09"

3− NIX_BUILD_ARGS: "--cores 0 --max-jobs 2"

4−

5steps:

1steps:

6 - label: 'Run tests'

2 - label: 'Run tests'

7− command: "NIX_PATH=nixpkgs=channel:nixos-18.09 ./test/tests.sh"

3+ command: "./test/tests.sh"

8 agents:

4 agents:

9 system: x86_64-linux

5 system: x86_64-linux

.buildkite/updates.yml+2−2

@@ -1,7 +1,7 @@

1steps:

2 - label: 'Update hackage.nix'

3 command:

4− - nix-build -I nixpkgs=channel:nixos-18.09 -A maintainer-scripts.update-hackage -o update-hackage.sh

4+ - nix-build -A maintainer-scripts.update-hackage -o update-hackage.sh

5 - echo "+++ Updating hackage.nix"

6 - ./update-hackage.sh

7 artifact_paths:

@@ -11,7 +11,7 @@ steps:

11

12 - label: 'Update stackage.nix'

13 command:

14− - nix-build -I nixpkgs=channel:nixos-18.09 -A maintainer-scripts.update-stackage -o update-stackage.sh

14+ - nix-build -A maintainer-scripts.update-stackage -o update-stackage.sh

15 - echo "+++ Updating stackage.nix"

16 - ./update-stackage.sh

17 artifact_paths:

default.nix+3−1

@@ -1,4 +1,6 @@

1−{ pkgs ? import <nixpkgs> {}

1+{ pkgs ? import nixpkgs {}

2+# Use a pinned nixpkgs rather than the one on NIX_PATH

3+, nixpkgs ? ./nixpkgs

2

4

3# You can provide different pins for hackage.nix and stackage.nix if required.

5# You can provide different pins for hackage.nix and stackage.nix if required.

4# It's also possible to override these sources with NIX_PATH.

6# It's also possible to override these sources with NIX_PATH.

nixpkgs/default.nixnew file+7

@@ -0,0 +1,7 @@

1+let

2+ fetchFromGitHub = { owner, repo, rev, sha256, ... }:

3+ builtins.fetchTarball {

4+ inherit sha256;

5+ url = "https://github.com/${owner}/${repo}/archive/${rev}.tar.gz";

6+ };

7+in import (fetchFromGitHub (builtins.fromJSON (builtins.readFile ./github.json)))

nixpkgs/github.jsonnew file+6

@@ -0,0 +1,6 @@

1+{

2+ "owner": "NixOS",

3+ "repo": "nixpkgs",

4+ "rev": "43ba99fa0354421dace7072ea4639d14bbb94f50",

5+ "sha256": "124w60i6rwj91l0vlz6vklmk82mbw7v30rqqs17rj6wqn57948wx"

6+}

test/default.nix+2−1

@@ -1,4 +1,5 @@

1−{ pkgs ? import <nixpkgs> { }

1+{ pkgs ? import nixpkgs {}

2+, nixpkgs ? ../nixpkgs

2, haskell ? pkgs.callPackage ../. { }

3, haskell ? pkgs.callPackage ../. { }

3}:

4}:

4

5