on iko/ghcjs-patch-master help sign in
Pin nixpkgs to latest nixos-19.03
commitebb979fa07e086ff396f2642bb062c08da401f91 authorRodney Lorrimar <rodney.lorrimar@iohk.io> dateFri 22 Mar 2019, 09:43 (8 years ago) parent0a68cd4
6 files changed+21−9
.buildkite/pipeline.yml+1−5 .buildkite/updates.yml+2−2 default.nix+3−1 nixpkgs/default.nix+7 nixpkgs/github.json+6 test/default.nix+2−1
.buildkite/pipeline.yml+1−5
@@ -1,9 +1,5 @@
1−env:
2− NIX_PATH: "nixpkgs=channel:nixos-18.09"
3− NIX_BUILD_ARGS: "--cores 0 --max-jobs 2"
4−
51steps:
62 - label: 'Run tests'
7− command: "NIX_PATH=nixpkgs=channel:nixos-18.09 ./test/tests.sh"
3+ command: "./test/tests.sh"
84 agents:
95 system: x86_64-linux
.buildkite/updates.yml+2−2
@@ -1,7 +1,7 @@
11steps:
22 - label: 'Update hackage.nix'
33 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
55 - echo "+++ Updating hackage.nix"
66 - ./update-hackage.sh
77 artifact_paths:
@@ -11,7 +11,7 @@ steps:
1111
1212 - label: 'Update stackage.nix'
1313 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
1515 - echo "+++ Updating stackage.nix"
1616 - ./update-stackage.sh
1717 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
24
35# You can provide different pins for hackage.nix and stackage.nix if required.
46# 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
23, haskell ? pkgs.callPackage ../. { }
34}:
45