From 05f9389e4f9e17be04e1bdef5b1cf695d3a8687b Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Thu, 3 Jan 2019 21:32:23 +0100
Subject: krops: use nixpkgs derivation for ci

---
 krebs/krops.nix | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'krebs/krops.nix')

diff --git a/krebs/krops.nix b/krebs/krops.nix
index ab752494..76bca026 100644
--- a/krebs/krops.nix
+++ b/krebs/krops.nix
@@ -9,15 +9,15 @@
 
   krebs-source = { test ? false }: rec {
     nixpkgs = if test then {
-      file = {
-        path = toString (pkgs.fetchFromGitHub {
+      derivation = ''
+        with import <nixpkgs> {};
+        pkgs.fetchFromGitHub {
           owner = "nixos";
           repo = "nixpkgs";
-          rev = (lib.importJSON ./nixpkgs.json).rev;
-          sha256 = (lib.importJSON ./nixpkgs.json).sha256;
-        });
-        useChecksum = true;
-      };
+          rev = "${(lib.importJSON ./nixpkgs.json).rev}";
+          sha256 = "${(lib.importJSON ./nixpkgs.json).sha256}";
+        }
+      '';
     } else {
       git = {
         ref = (lib.importJSON ./nixpkgs.json).rev;
-- 
cgit v1.2.3


From fd5615a298ff4b7cfa7e8cccbcac0afb680cc9a9 Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Mon, 28 Jan 2019 23:05:38 +0100
Subject: krops: bootstrap nixpkgs

---
 krebs/krops.nix | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

(limited to 'krebs/krops.nix')

diff --git a/krebs/krops.nix b/krebs/krops.nix
index 76bca026..94418fdc 100644
--- a/krebs/krops.nix
+++ b/krebs/krops.nix
@@ -9,13 +9,19 @@
 
   krebs-source = { test ? false }: rec {
     nixpkgs = if test then {
-      derivation = ''
-        with import <nixpkgs> {};
+      derivation = let
+        rev = (lib.importJSON ./nixpkgs.json).rev;
+        sha256 = (lib.importJSON ./nixpkgs.json).sha256;
+      in ''
+        with import (builtins.fetchTarball {
+          url = "https://github.com/nixos/nixpkgs/archive/${rev}.tar.gz";
+          sha256 = "${sha256}";
+        }) {};
         pkgs.fetchFromGitHub {
           owner = "nixos";
           repo = "nixpkgs";
-          rev = "${(lib.importJSON ./nixpkgs.json).rev}";
-          sha256 = "${(lib.importJSON ./nixpkgs.json).sha256}";
+          rev = "${rev}";
+          sha256 = "${sha256}";
         }
       '';
     } else {
-- 
cgit v1.2.3