update cli to latest master

input-output-hk · Nov 30, 2021 · 1f3251c · 1f3251c
1 parent d47a9c8
commit 1f3251c
Show file tree

Hide file tree

Showing 3 changed files with 218 additions and 6 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -4,14 +4,15 @@
   inputs = {
     utils.url = "github:kreisys/flake-utils";
     bitte.url = "github:input-output-hk/bitte";
+    cli.url = "github:input-output-hk/bitte-cli";
     nixpkgs-unstable.url = "nixpkgs/nixpkgs-unstable";
-    nixpkgs.follows = "bitte/nixpkgs";
+    nixpkgs.follows = "cli/nixpkgs";
     bitte-ci.url = "github:input-output-hk/bitte-ci";
     bitte-ci-frontend.follows = "bitte-ci/bitte-ci-frontend";
     ops-lib.url = "github:input-output-hk/ops-lib/zfs-image?dir=zfs";
   };
 
-  outputs = { self, nixpkgs, utils, bitte, ... }@inputs:
+  outputs = { self, nixpkgs, utils, bitte, cli, ... }@inputs:
     utils.lib.simpleFlake {
       nixpkgs = nixpkgs // {
         lib = nixpkgs.lib // {
@@ -22,7 +23,7 @@
       };
       systems = [ "x86_64-linux" ];
 
-      preOverlays = [ bitte ];
+      preOverlays = [ bitte cli.overlay ];
       overlay = import ./overlay.nix inputs;
 
       extraOutputs = let

diff --git a/overlay.nix b/overlay.nix
@@ -19,7 +19,7 @@ in {
     nix = final.nixFlakes;
   };
 
-  devShell = final.bitteShellCompat {
+  devShell = final.bitteShell {
     inherit (inputs) self;
     extraPackages = [ final.cue ];
     cluster = "plutus-playground";