From 7c8c46b86c9bb31b7772ec78eb005b72a59e49e3 Mon Sep 17 00:00:00 2001
From: Kjetil Orbekk <kj@orbekk.com>
Date: Sun, 21 Feb 2021 11:27:00 -0500
Subject: Use custom nix package

---
 flake.lock | 22 ++++++++++++++++++++++
 flake.nix  |  8 ++++++--
 2 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/flake.lock b/flake.lock
index 4f9e088..96d8c8e 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1,5 +1,26 @@
 {
   "nodes": {
+    "nix": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1613924055,
+        "narHash": "sha256-NmrkOYl9I2pURNiQg+KKR2SP5EzH2Ne6JXPlyU1CLHk=",
+        "owner": "orbekk",
+        "repo": "nix",
+        "rev": "fa6a0f82d0f0dceb096086bcd199be307c7e682c",
+        "type": "github"
+      },
+      "original": {
+        "owner": "orbekk",
+        "ref": "master",
+        "repo": "nix",
+        "type": "github"
+      }
+    },
     "nixpkgs": {
       "locked": {
         "lastModified": 1613772719,
@@ -34,6 +55,7 @@
     },
     "root": {
       "inputs": {
+        "nix": "nix",
         "nixpkgs": "nixpkgs",
         "nixpkgs_unstable": "nixpkgs_unstable"
       }
diff --git a/flake.nix b/flake.nix
index 6dcce7c..f8b88cd 100644
--- a/flake.nix
+++ b/flake.nix
@@ -1,8 +1,10 @@
 {
   inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixos-20.09";
   inputs.nixpkgs_unstable.url = "github:NixOS/nixpkgs/nixos-unstable";
+  inputs.nix.url = "github:orbekk/nix/master";
+  inputs.nix.inputs.nixpkgs.follows = "nixpkgs";
 
-  outputs = { self, nixpkgs, nixpkgs_unstable }:
+  outputs = { self, nixpkgs, nixpkgs_unstable, nix }:
     {
       nixosConfigurations = let
         mkConfig = { hostName
@@ -20,9 +22,11 @@
                   system.configurationRevision =
                     if self ? rev then self.rev else "DIRTY";
 
-                  # Add unstable packages.
                   nixpkgs.overlays = [
+                    # Add unstable packages.
                     (final: prev: { unstable = nixpkgs_unstable.legacyPackages."x86_64-linux"; })
+                    # For git+file support with bare repo.
+                    nix.overlay
                   ];
                 })
               ];
-- 
cgit v1.2.3