From b877eaa1b75d0a9bce934d189c27519118149a55 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kier=C3=A1n=20Meinhardt?= <kmein@posteo.de>
Date: Thu, 30 Dec 2021 14:08:05 +0100
Subject: [PATCH] feat: upgrade nix

---
 configs/nix.nix | 5 ++---
 deploy.nix      | 8 ++++++--
 shell.nix       | 5 ++---
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/configs/nix.nix b/configs/nix.nix
index 07ab0a9..228c2f2 100644
--- a/configs/nix.nix
+++ b/configs/nix.nix
@@ -7,9 +7,8 @@
       (import <stockholm/krebs/5pkgs>)
     ];
   };
-  # enable `nix flake`
   nix = {
-    package = pkgs.nix;
-    # extraOptions = "experimental-features = nix-command flakes";
+    package = pkgs.nixUnstable;
+    extraOptions = "experimental-features = nix-command flakes";
   };
 }
diff --git a/deploy.nix b/deploy.nix
index 90f8092..2207556 100644
--- a/deploy.nix
+++ b/deploy.nix
@@ -1,9 +1,13 @@
 let
-  krops = builtins.fetchGit (gitFromJson .versions/krops.json);
+  importJson = (import <nixpkgs/lib>).importJSON;
+
+  krops = let kropsVersion = importJson .versions/krops.json; in builtins.fetchGit {
+    rev = kropsVersion.rev;
+    url = kropsVersion.url;
+  };
   lib = import "${krops}/lib";
   pkgs = import "${krops}/pkgs" {};
 
-  importJson = (import <nixpkgs> {}).lib.importJSON;
   gitFromJson = path:
     let
       object = importJson path;
diff --git a/shell.nix b/shell.nix
index e69801f..732efc7 100644
--- a/shell.nix
+++ b/shell.nix
@@ -1,9 +1,8 @@
 { pkgs ? import <nixpkgs> { }
+, lib ? import <nixpkgs/lib>
 , release ? "21.11"
 }:
 let
-  inherit (pkgs) lib;
-
   dependencies = {
     nixpkgs = {
       ref = "refs/heads/nixos-${release}";
@@ -73,7 +72,7 @@ in pkgs.mkShell {
     (let
       deployCommand = pkgs.writers.writeDash "niveum-deploy-one" ''
         ${pkgs.git}/bin/git diff $(${pkgs.openssh}/bin/ssh "$1" cat /etc/niveum/version)
-        eval "$(${pkgs.nix}/bin/nix-build --no-out-link "${toString ./.}/deploy.nix" -A "$1")"
+        eval "$(${pkgs.nixUnstable}/bin/nix-build --no-out-link "${toString ./.}/deploy.nix" -A "$1")"
       '';
     in pkgs.writers.writeDashBin "niveum-deploy" ''
       deploy() {