Skip to content

Commit a7fa8cb

Browse files
committed
Pin nixpkgs to latest nixos-19.03
1 parent fedbc8e commit a7fa8cb

File tree

6 files changed

+21
-9
lines changed

6 files changed

+21
-9
lines changed

.buildkite/pipeline.yml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,5 @@
1-
env:
2-
NIX_PATH: "nixpkgs=channel:nixos-18.09"
3-
NIX_BUILD_ARGS: "--cores 0 --max-jobs 2"
4-
51
steps:
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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
steps:
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
agents:
88
system: x86_64-linux
99

1010
- label: 'Update stackage.nix'
1111
command:
12-
- nix-build -I nixpkgs=channel:nixos-18.09 -A maintainer-scripts.update-stackage -o update-stackage.sh
12+
- nix-build -A maintainer-scripts.update-stackage -o update-stackage.sh
1313
- echo "+++ Updating stackage.nix"
1414
- ./update-stackage.sh
1515
agents:

default.nix

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -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.nix

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -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.json

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"owner": "NixOS",
3+
"repo": "nixpkgs",
4+
"rev": "91cb80e4397d55b19b0beba3fa3846f1a02d0342",
5+
"sha256": "1pm6n9xwqd5c4khcyfsygni77wwfjh4ggy502k0g4am0xm4gjjs6"
6+
}

test/default.nix

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
{ pkgs ? import <nixpkgs> { }
1+
{ pkgs ? import nixpkgs {}
2+
, nixpkgs ? ./nixpkgs
23
, haskell ? pkgs.callPackage ../. { }
34
}:
45

0 commit comments

Comments
 (0)