[DDW-1151] Fix remaining impurities

Author: michalrus

README.md

@@ -159,15 +159,14 @@ Most of the commands need `nix` and will run only on Linux or macOS.
 - `yarn install`
 - `yarn dev:windows`
 
-#### Updating upstream dependencies (cardano-wallet, cardano-node, and iohk-nix)
+#### Updating upstream dependencies (cardano-wallet, cardano-node)
 
 `Niv` is used to manage the version of upstream dependencies. The versions of these dependencies can be seen in `nix/sources.json`.
 
 Dependencies are updated with the follow nix commands:
 - Update cardano-wallet to the latest master: `nix-shell -A devops --arg nivOnly true --run "niv update cardano-wallet"`
 - Update cardano-wallet to a specific revision: `nix-shell -A devops --arg nivOnly true --run "niv update cardano-wallet -a rev=91db88f9195de49d4fb4299c68fc3f6de09856ab"`
 - Update cardano-node to a specific tag: `nix-shell -A devops --arg nivOnly true --run "niv update cardano-node -b tags/1.20.0"`
-- Update iohk-nix to the latest master: `nix-shell -A devops --arg nivOnly true --run  "niv update iohk-nix -b master"`
 
 #### Notes
 

default.nix

@@ -43,20 +43,20 @@ let
         patch -p1 -i ${./nix/cardano-wallet--enable-aarch64-darwin.patch}
       '';
   };
-  haskell-nix = walletFlake.defaultNix.inputs.haskellNix.legacyPackages.${system}.haskell-nix;
+  haskell-nix = walletFlake.inputs.haskellNix.legacyPackages.${system}.haskell-nix;
   flake-compat = import sources.flake-compat;
-  walletFlake = flake-compat  { src = sources.cardano-wallet; };
-  walletPackages = with walletFlake.defaultNix.hydraJobs; {
+  walletFlake = (flake-compat  { src = sources.cardano-wallet; }).defaultNix;
+  walletPackages = with walletFlake.hydraJobs; {
     x86_64-windows = linux.windows;
     x86_64-linux = linux.native;
     x86_64-darwin = macos.intel;
     aarch64-darwin = macos.silicon;
   }.${target};
-  walletPkgs = import "${sources.cardano-wallet}/nix" {};
+  walletPkgs = walletFlake.legacyPackages.${system}.pkgs;
   cardanoWorldFlake = (flake-compat { src = sources.cardano-world; }).defaultNix.outputs;
   # only used for CLI, to be removed when upgraded to next node version
   nodePkgs = import "${sources.cardano-node}/nix" {};
-  shellPkgs = (import "${sources.cardano-shell}/nix") {};
+  shellPkgs = (import "${sources.cardano-shell}/nix") { inherit system; };
   inherit (pkgs.lib) optionalString optional concatStringsSep;
   inherit (pkgs) writeTextFile;
   crossSystem = lib: (crossSystemTable lib).${target} or null;
@@ -73,7 +73,7 @@ let
 
   packages = self: {
     inherit walletFlake cardanoWorldFlake cluster pkgs version target nodeImplementation;
-    cardanoLib = localLib.iohkNix.cardanoLib;
+    cardanoLib = walletPkgs.cardanoLib;
     daedalus-bridge = self.bridgeTable.${nodeImplementation};
 
     nodejs = let

flake.nix

@@ -51,11 +51,16 @@
   // (let
     x86_64-linux  = inputs.tullia.fromSimple "x86_64-linux"  (import ./nix/tullia.nix inputs.self "x86_64-linux");
     x86_64-darwin = inputs.tullia.fromSimple "x86_64-darwin" (import ./nix/tullia.nix inputs.self "x86_64-darwin");
+    fakeEvent = { inputs={"GitHub event".value = {github_body.head_commit.id="0000000";};}; id=""; ociRegistry=""; };
   in {
     tullia.x86_64-linux = x86_64-linux.tullia;
     cicero.x86_64-linux = x86_64-linux.cicero;
     tullia.x86_64-darwin = x86_64-darwin.tullia;
     cicero.x86_64-darwin = x86_64-darwin.cicero;
+
+    ciceroLocalTest.x86_64-linux  = (x86_64-linux.cicero."daedalus/ci"  fakeEvent).job;
+    ciceroLocalTest.x86_64-darwin = (x86_64-darwin.cicero."daedalus/ci" fakeEvent).job;
+
   });
   # --- Flake Local Nix Configuration ----------------------------
   nixConfig = {

iohk-nix.json

@@ -4,9 +4,8 @@
 
 let
   sources = import ./nix/sources.nix;
-  iohkNix = import sources.iohk-nix { sourcesOverride = sources; };
   nixpkgs = import sources.nixpkgs { sourcesOverride = sources; inherit system; };
-  # TODO: can we use the filter in iohk-nix instead?
+  # TODO: can we use the filter in cardano-wallet instead?
   cleanSourceFilter = with pkgs.stdenv;
     name: type: let baseName = baseNameOf (toString name); in ! (
       # Filter out .git repo
@@ -32,5 +31,5 @@ let
   lib = pkgs.lib;
 in
 lib // {
-  inherit sources iohkNix pkgs isDaedalus cleanSourceFilter;
+  inherit sources pkgs isDaedalus cleanSourceFilter;
 }

lib.nix

@@ -71,18 +71,6 @@
         "url": "https://github.com/hercules-ci/gitignore/archive/f9e996052b5af4032fe6150bba4a6fe4f7b9d698.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     },
-    "iohk-nix": {
-        "branch": "master",
-        "description": "nix scripts shared across projects",
-        "homepage": null,
-        "owner": "input-output-hk",
-        "repo": "iohk-nix",
-        "rev": "266ca46a8d1cb4286b9699b4fd435066e88440ac",
-        "sha256": "132fbnnpp7bbfqv3dgvn9xi9dc1gsn9mivbqnxmglgmlv4lmrad8",
-        "type": "tarball",
-        "url": "https://github.com/input-output-hk/iohk-nix/archive/266ca46a8d1cb4286b9699b4fd435066e88440ac.tar.gz",
-        "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
-    },
     "js-chain-libs": {
         "branch": "master",
         "description": "chain-libs javascript SDK",

nix/sources.json

@@ -1,7 +1,7 @@
 { system ? builtins.currentSystem
 , config ? {}
 , nodeImplementation ? "cardano"
-, localLib ? import ./lib.nix { inherit nodeImplementation; }
+, localLib ? import ./lib.nix { inherit nodeImplementation system; }
 , pkgs ? import (import ./nix/sources.nix).nixpkgs { inherit system config; }
 , cluster ? "selfnode"
 , systemStart ? null
@@ -20,9 +20,9 @@ let
   daedalusPkgs = import ./. {
     inherit nodeImplementation cluster topologyOverride configOverride genesisOverride useLocalNode;
     target = system;
+    localLibSystem = system;
     devShell = true;
   };
-  hostPkgs = import pkgs.path { config = {}; overlays = []; };
   fullExtraArgs = walletExtraArgs ++ pkgs.lib.optional allowFaultInjection "--allow-fault-injection";
   launcherConfig' = "${daedalusPkgs.daedalus.cfg}/etc/launcher-config.yaml";
   fixYarnLock = pkgs.stdenv.mkDerivation {
@@ -77,7 +77,7 @@ let
 
   gcRoot = pkgs.runCommandLocal "gc-root" {
     properBuildShell = buildShell.overrideAttrs (old: { buildCommand = "export >$out"; });
-    cardanoWalletsHaskellNix = daedalusPkgs.walletFlake.defaultNix.outputs.legacyPackages.${system}.roots;
+    cardanoWalletsHaskellNix = daedalusPkgs.walletFlake.outputs.legacyPackages.${system}.roots;
     ourHaskellNix = if pkgs.stdenv.isLinux then daedalusPkgs.yaml2json.project.roots else "";
     daedalusInstallerInputs = with daedalusPkgs.daedalus-installer; buildInputs ++ nativeBuildInputs;
     # cardano-bridge inputs are GC’d, and rebuilt too often on Apple M1 CI:
@@ -194,7 +194,7 @@ let
   devops = pkgs.stdenv.mkDerivation {
     name = "devops-shell";
     buildInputs = let
-      inherit (localLib.iohkNix) niv;
+      inherit (daedalusPkgs.walletFlake.outputs.legacyPackages.${system}.pkgs) niv;
     in if nivOnly then [ niv ] else [ niv daedalusPkgs.cardano-node-cluster.start daedalusPkgs.cardano-node-cluster.stop ];
     shellHook = ''
       export CARDANO_NODE_SOCKET_PATH=$(pwd)/state-cluster/bft1.socket