Switched to niv sources

default.nix

@@ -1,10 +1,17 @@
-{ sourcePaths ? import ./nix/sources.nix
+{ sources ? import ./nix/sources.nix
 , system ? builtins.currentSystem
 , crossSystem ? null
 , config ? {}
+, cardanoNodeProject ? import sources.cardano-node {}
 }@args: with import ./nix args; {
   shell = mkShell {
-    buildInputs = [ niv nixops nix ];
+    inherit (import sources.niv {}) niv;
+    buildInputs = [
+      cardanoNodeProject.cardano-cli
+      niv
+      nix
+      nixops
+    ];
     NIX_PATH = "nixpkgs=${path}";
     NIXOPS_DEPLOYMENT = "${globals.deploymentName}";
   };

nix/default.nix

@@ -1,4 +1,4 @@
-{ sourcePaths ? import ./sources.nix
+{ sources ? import ./sources.nix
 , system ? builtins.currentSystem
 , crossSystem ? null
 , config ? {} }:
@@ -17,7 +17,7 @@ let
   upstream-overlays = [
       ( _: super: {
 
-      sourcePaths = (super.sourcePaths or {}) // sourcePaths;
+      sources = (super.sources or {}) // sources;
     })
   ];
 
@@ -26,6 +26,6 @@ let
     globals ++
     upstream-overlays;
 in
-  import sourcePaths.nixpkgs {
+  import sources.nixpkgs {
     inherit overlays system crossSystem config;
   }

overlays/default.nix

@@ -1,2 +0,0 @@
-sourcePaths: map import (import ./overlay-list.nix) ++
-  [(self: super: { inherit sourcePaths; })]

overlays/niv.nix

@@ -1,3 +0,0 @@
-self: super: {
-  inherit (import self.sourcePaths.niv {}) niv;
-}

overlays/overlay-list.nix

@@ -1,3 +0,0 @@
-[
-  ./niv.nix
-]