Merge pull request #98 from input-output-hk/rvl/nixpkgs-pin

Pin nixpkgs to latest nixos-19.03

Author: rvl

.buildkite/pipeline.yml

@@ -1,9 +1,5 @@
-env:
-  NIX_PATH: "nixpkgs=channel:nixos-18.09"
-  NIX_BUILD_ARGS: "--cores 0 --max-jobs 2"
-
 steps:
   - label: 'Run tests'
-    command: "NIX_PATH=nixpkgs=channel:nixos-18.09 ./test/tests.sh"
+    command: "./test/tests.sh"
     agents:
       system: x86_64-linux

.buildkite/updates.yml

@@ -1,7 +1,7 @@
 steps:
   - label: 'Update hackage.nix'
     command:
-      - nix-build -I nixpkgs=channel:nixos-18.09 -A maintainer-scripts.update-hackage -o update-hackage.sh
+      - nix-build -A maintainer-scripts.update-hackage -o update-hackage.sh
       - echo "+++ Updating hackage.nix"
       - ./update-hackage.sh
     artifact_paths:
@@ -11,7 +11,7 @@ steps:
 
   - label: 'Update stackage.nix'
     command:
-      - nix-build -I nixpkgs=channel:nixos-18.09 -A maintainer-scripts.update-stackage -o update-stackage.sh
+      - nix-build -A maintainer-scripts.update-stackage -o update-stackage.sh
       - echo "+++ Updating stackage.nix"
       - ./update-stackage.sh
     artifact_paths:

.gitattributes

@@ -0,0 +1,6 @@
+# GitHub Linguist annotations.
+# Hide stuff that is generated by nix-tools plan-to-nix
+
+nix-tools/.plan.nix/*.nix linguist-generated=true
+nix-tools/.plan-pkgs.nix linguist-generated=true
+.stack-to-nix.cache linguist-generated=true

default.nix

@@ -1,4 +1,6 @@
-{ pkgs ? import <nixpkgs> {}
+{ pkgs ? import nixpkgs {}
+# Use a pinned nixpkgs rather than the one on NIX_PATH
+, nixpkgs ? ./nixpkgs
 
 # You can provide different pins for hackage.nix and stackage.nix if required.
 # It's also possible to override these sources with NIX_PATH.
@@ -104,9 +106,7 @@ let
 
     # Programs for generating Nix expressions from Cabal and Stack
     # files.
-    nix-tools = self.callPackage ./nix-tools {
-      inherit fetchExternal;
-    };
+    nix-tools = self.callPackage ./nix-tools { inherit fetchExternal; };
 
     # Snapshots of Hackage and Stackage, converted to Nix expressions,
     # regularly updated.