Merge pull request #4963 from input-output-hk/andreabedini/patch-1

Fix flake setup
IntersectMBO · Mar 10, 2023 · 2684e93 · 2684e93
2 parents 6f6d7d6 + ec02ae4
commit 2684e93
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 4 deletions.
diff --git a/cabal.project b/cabal.project
@@ -37,6 +37,9 @@ packages:
     trace-resources
     trace-forward
 
+extra-packages:
+  ouroboros-consensus-cardano-tools
+
 package cardano-api
   ghc-options: -Werror
 

diff --git a/flake.nix b/flake.nix
@@ -139,7 +139,6 @@
           inherit (ouroboros-consensus-cardano-tools.components.exes) db-analyser db-synthesizer;
           inherit (bech32.components.exes) bech32;
         } // lib.optionalAttrs hostPlatform.isUnix {
-          inherit (network-mux.components.exes) cardano-ping;
           inherit plutus-example;
         });
 

diff --git a/nix/workbench/backend/nixops/cluster.nix b/nix/workbench/backend/nixops/cluster.nix
@@ -88,7 +88,6 @@ in {
 
   environment.systemPackages = with pkgs;
     [ cardano-cli
-      cardano-ping
     ];
 }
 // listToAttrs (concatLists [

diff --git a/nix/workbench/shell.nix b/nix/workbench/shell.nix
@@ -96,7 +96,6 @@ in project.shellFor {
 
   # These programs will be available inside the nix-shell.
   nativeBuildInputs = with pkgs; with haskellPackages; with cardanoNodePackages; [
-    cardano-ping
     db-analyser
     pkgs.graphviz
     graphmod

diff --git a/shell.nix b/shell.nix
@@ -99,7 +99,6 @@ let
       nix
       cardano-cli
       bech32
-      cardano-ping
       cardano-node
       cardano-topology
       cardano-tracer