make custom-config a flake. merge workbench with custom-config

.gitignore

@@ -42,11 +42,6 @@ tags
 # For now require that users generate their own hie.yaml
 hie.yaml
 
-# Ignore local modification of nix config files
-/custom-config.nix
-/workbench-config.nix
-/supported-systems.nix
-
 # Ignore Visual Studio code configuration
 .vscode/tasks.json
 

custom-config/default.nix

@@ -0,0 +1,6 @@
+{
+  profileName = "default-mary";
+  autoStartCluster = false;
+  useCabalRun      = false;
+  workbenchDevMode = false;
+}

custom-config/flake.nix

@@ -0,0 +1,5 @@
+{
+  outputs = {...}: {
+    nixosModule = {};
+  };
+}

default.nix

@@ -3,7 +3,7 @@
 # allows to cutomize haskellNix (ghc and profiling, see ./nix/haskell.nix)
 , config ? {}
 # override scripts with custom configuration
-, customConfig ? import ./custom-config.nix
+, customConfig ? {}
 # allows to override dependencies of the project without modifications,
 # eg. to test build against local checkout of nixpkgs and iohk-nix:
 # nix build -f default.nix cardano-node --arg sourcesOverride '{

flake.nix

@@ -9,17 +9,12 @@
       url = "github:input-output-hk/iohk-nix/flakes-improvements";
       inputs.nixpkgs.follows = "nixpkgs";
     };
-    custom-config = {
-      url = "path:./custom-config.nix";
-      flake = false;
-    };
-    workbench-config = {
-      url = "path:./workbench-config.nix";
-      flake = false;
+    customConfig = {
+      url = "path:./custom-config";
     };
   };
 
-  outputs = { self, nixpkgs, utils, haskellNix, iohkNix, custom-config, workbench-config, ... }:
+  outputs = { self, nixpkgs, utils, haskellNix, iohkNix, customConfig }:
     let
       inherit (haskellNix.internal) config;
       inherit (nixpkgs) lib;
@@ -37,8 +32,7 @@
         iohkNix.overlays.cardano-lib
         iohkNix.overlays.utils
         (final: prev: {
-          customConfig = import custom-config;
-          workbenchConfig =  import workbench-config;
+          customConfig = import ./custom-config // customConfig.outputs;
           gitrev = self.rev or "dirty";
           commonLib = lib
             // iohkNix.lib

nix/default.nix

@@ -1,15 +1,11 @@
 { system ? builtins.currentSystem
 , crossSystem ? null
 , config ? {}
-, customConfig ? import ./custom-config.nix
+, customConfig ? {}
 , sourcesOverride ? {}
 , gitrev ? null
-, workbenchConfig ? import ../workbench-config.nix
 }:
 let
-  gitrev' = if gitrev == null
-    then iohkNix.commitIdFromGitRepoOrZero ../.git
-    else gitrev;
   flakeSources = let
     flakeLock = (builtins.fromJSON (builtins.readFile ../flake.lock)).nodes;
     compat = s: builtins.fetchGit {
@@ -37,13 +33,14 @@ let
     ++ iohkNix.overlays.utils
     # our own overlays:
     ++ [
-      (pkgs: _: with pkgs; {
-        gitrev = gitrev';
-        inherit customConfig workbenchConfig;
-
-        inherit (iohkNix) cardanoLib;
+      (pkgs: _: {
+        gitrev = if gitrev == null
+          then iohkNix.commitIdFromGitRepoOrZero ../.git
+          else gitrev;
+        customConfig = import ./custom-config // customConfig;
+        inherit (pkgs.iohkNix) cardanoLib;
         # commonLib: mix pkgs.lib with iohk-nix utils and our own:
-        commonLib = lib // cardanoLib // iohk-nix.lib
+        commonLib = with pkgs; lib // cardanoLib // iohk-nix.lib
           // import ./util.nix { inherit haskell-nix; }
           # also expose our sources, nixpkgs and overlays
           // { inherit overlays sources nixpkgs; };
@@ -57,4 +54,4 @@ let
     config = haskellNix.nixpkgsArgs.config // config;
   };
 
-in pkgs
+in __trace "/NIX/PKGS" pkgs

nix/pkgs.nix

@@ -89,21 +89,20 @@ final: prev: with final;
 
   cardanolib-py = callPackage ./cardanolib-py {};
 
-  scripts = lib.recursiveUpdate (import ./scripts.nix { inherit pkgs customConfig; })
-    (import ./scripts-submit-api.nix { inherit pkgs customConfig; });
+  scripts = lib.recursiveUpdate (import ./scripts.nix { inherit pkgs; })
+    (import ./scripts-submit-api.nix { inherit pkgs; });
 
   dockerImage = let
     defaultConfig = {
       stateDir = "/data";
       dbPrefix = "db";
       socketPath = "/ipc/node.socket";
     };
-    customConfig' = defaultConfig // customConfig;
   in callPackage ./docker.nix {
     exe = "cardano-node";
     scripts = import ./scripts.nix {
       inherit pkgs;
-      customConfig = customConfig';
+      customConfigs = [ defaultConfig customConfig ];
     };
     script = "node";
   };
@@ -112,12 +111,11 @@ final: prev: with final;
     defaultConfig = {
       socketPath = "/ipc/node.socket";
     };
-    customConfig' = defaultConfig // customConfig;
   in callPackage ./docker.nix {
     exe = "cardano-submit-api";
     scripts = import ./scripts-submit-api.nix {
       inherit pkgs;
-      customConfig = customConfig';
+      customConfigs = [ defaultConfig customConfig ];
     };
     script = "submit-api";
   };
@@ -129,6 +127,6 @@ final: prev: with final;
 
   clusterTests = import ./supervisord-cluster/tests { inherit pkgs; };
 
-  workbench = callPackage ./workbench workbenchConfig;
+  workbench = callPackage ./workbench {};
   inherit (workbench) runWorkbench runJq;
 }

nix/scripts-submit-api.nix

@@ -1,11 +1,11 @@
 { pkgs
-, customConfig
+, customConfigs ? [ pkgs.customConfig ]
 }:
 with pkgs.commonLib;
 let
   mkScript = envConfig: let
     service = evalService {
-      inherit pkgs customConfig;
+      inherit pkgs customConfigs;
       serviceName = "cardano-submit-api";
       modules = [
         ./nixos/cardano-submit-api-service.nix

nix/scripts.nix

@@ -1,11 +1,11 @@
 { pkgs
-, customConfig
+, customConfigs ? [ pkgs.customConfig ]
 }:
 with pkgs.commonLib;
 let
   mkScript = envConfig: let
     service = evalService {
-      inherit pkgs customConfig;
+      inherit pkgs customConfigs;
       serviceName = "cardano-node";
       modules = [
         ./nixos/cardano-node-service.nix

nix/workbench/default.nix

@@ -7,16 +7,12 @@
 , moreutils
 , makeWrapper
 , runCommand
-
-## Default to pure Nix-iness:
-, useCabalRun ? false
-, workbenchDevMode ? false
-
+, customConfig
 , cardano-cli
 , cardano-topology
 }:
 
-with lib;
+with lib; with customConfig;
 
 let
   nixWbMode =

shell.nix

@@ -3,19 +3,12 @@
 { config ? {}
 , sourcesOverride ? {}
 , withHoogle ? true
-, clusterProfile ? "default-mary"
-, customConfig ? import ./custom-config.nix // { profileName = clusterProfile; }
-
-, autoStartCluster ? false
-, useCabalRun      ? false
-, workbenchDevMode ? false
-, workbenchConfig ? import ./workbench-config.nix //
-  { inherit useCabalRun workbenchDevMode; }
+, customConfig ? {}
 , pkgs ? import ./nix {
-    inherit config sourcesOverride customConfig workbenchConfig;
+    inherit config sourcesOverride customConfig;
   }
 }:
-with pkgs;
+with pkgs; with pkgs.customConfig;
 let
   commandHelp =
     ''
@@ -35,8 +28,8 @@ let
   # NOTE: due to some cabal limitation,
   #  you have to remove all `source-repository-package` entries from cabal.project
   #  after entering nix-shell for cabal to use nix provided dependencies for them.
-  clusterCabal = mkCluster (lib.recursiveUpdate customConfig (workbenchConfig // { useCabalRun = true; }));
-  clusterNix   = mkCluster (lib.recursiveUpdate customConfig (workbenchConfig // { useCabalRun = false; }));
+  clusterCabal = mkCluster (customConfig // { useCabalRun = true; });
+  clusterNix   = mkCluster (customConfig // { useCabalRun = false; });
   nixWapped = writeShellScriptBin "nix" ''
     if [[ "$@" == "flake show"* ]] || [[ "$@" == "flake check"* ]]; then
       echo 'Temporary override `supported-systems.nix` original content to be able to use `nix flake show|check` on dev machines (workaround for https://github.com/NixOS/nix/issues/4265)'