From 2af2b4eb6f22d418101b1df79e8cae94555b01fd Mon Sep 17 00:00:00 2001
From: Ben Sima <ben@bsima.me>
Date: Tue, 19 Feb 2019 11:39:30 -0800
Subject: Fetch pinned nixpkgs as tarball

This should speed up initial building (e.g. on a builds.sr.ht).
---
 ibb/default.nix | 6 +++---
 nixos.nix       | 2 +-
 pkgs.nix        | 6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/ibb/default.nix b/ibb/default.nix
index 1d6a065..310e790 100644
--- a/ibb/default.nix
+++ b/ibb/default.nix
@@ -3,10 +3,10 @@
 , doBenchmark ? false
 , doCheck ? true
 , withHoogle ? false
-, pkgs ? import (fetchGit (import ../pkgs.nix)) {}
+, nixpkgs ? builtins.fetchTarball (import ../pkgs.nix)
 }:
 
-with pkgs;
+with import "${nixpkgs}" {};
 
 haskell.packages.${compiler}.developPackage {
   root = ./.;
@@ -20,4 +20,4 @@ haskell.packages.${compiler}.developPackage {
       then self.ghc.withPackages
       else super.ghcWithPackages;
   };
-}
\ No newline at end of file
+}
diff --git a/nixos.nix b/nixos.nix
index 4a1257e..a1a1205 100644
--- a/nixos.nix
+++ b/nixos.nix
@@ -1,7 +1,7 @@
 # Nix config for the main biz machine.
 
 let
-  nixpkgs = fetchGit (import ./pkgs.nix);
+  nixpkgs = builtins.fetchTarball (import ./pkgs.nix);
 in
 import "${nixpkgs}/nixos" {
   system = "x86_64-linux";
diff --git a/pkgs.nix b/pkgs.nix
index b87407a..154daca 100644
--- a/pkgs.nix
+++ b/pkgs.nix
@@ -1,5 +1,5 @@
+# Get the sha256 with: nix-prefetch-url --unpack ${url}
 {
-  url = "https://github.com/nixos/nixpkgs.git";
-  ref = "release-18.09";
-  rev = "da81531c1d76b4c24b944f6cf69b7025770662c1";
+  url = "https://github.com/NixOS/nixpkgs/archive/da81531c1d76b4c24b944f6cf69b7025770662c1.tar.gz";
+  sha256 = "00qqchbvvbcmmkfpjkp1ki4kwcm33ch1ljbi2n3zxy36r430way1";
 }
-- 
cgit v1.2.3