removed juno, added beaker for wasm

ComposableFi · Jun 6, 2023 · 83dc152 · 83dc152
1 parent 7f4f6b0
commit 83dc152
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 11 deletions.
diff --git a/flake.nix b/flake.nix
@@ -91,10 +91,11 @@
         ./inputs/centauri/flake-module.nix
         ./inputs/chevdor/subwasm.nix
         ./inputs/cosmos/cosmwasm.nix
-        ./inputs/notional-labs/composable-centauri/flake-module.nix
         ./inputs/cosmos/gex.nix
         ./inputs/CosmosContracts/juno.nix
         ./inputs/CosmWasm/wasmvm.nix
+        ./inputs/notional-labs/composable-centauri/flake-module.nix
+        ./inputs/osmosis-labs/beaker/flake-module.nix
         ./inputs/paritytech/cumulus.nix
         ./inputs/paritytech/polkadot.nix
         ./inputs/paritytech/substrate.nix

diff --git a/flake/dev-shells.nix b/flake/dev-shells.nix
@@ -41,13 +41,9 @@
       };
       cosmosattrs = defaultattrs // {
         modules = [{
-          packages = tools ++ (with self'.packages; [ junod gex ]);
+          packages = tools ++ (with self'.packages; [ gex ]);
           devcontainer.enable = true;
           inherit env;
-          enterShell = ''
-            echo "junod alice key:"
-            echo "clip hire initial neck maid actor venue client foam budget lock catalog sweet steak waste crater broccoli pipe steak sister coyote moment obvious choose" | junod keys add alice --recover --keyring-backend test || true
-          '';
         }];
       };
       allattrs = defaultattrs // {

diff --git a/inputs/cosmos/cosmwasm.nix b/inputs/cosmos/cosmwasm.nix
@@ -22,12 +22,7 @@
           subwasm
           pkgs.binaryen
           cosmwasm-check
-          junod
         ];
-        shellHook = ''
-          echo "junod alice key:"
-          echo "clip hire initial neck maid actor venue client foam budget lock catalog sweet steak waste crater broccoli pipe steak sister coyote moment obvious choose" | junod keys add alice --recover --keyring-backend test || true
-        '';
       };
     };
   };

diff --git a/inputs/osmosis-labs/beaker/flake-module.nix b/inputs/osmosis-labs/beaker/flake-module.nix
@@ -0,0 +1,27 @@
+{ self, ... }: {
+  perSystem = { config, self', inputs', pkgs, system, crane, systemCommonRust
+    , subnix, ... }: {
+      packages = rec {
+        beaker = let
+          name = "beaker";
+          src = pkgs.fetchFromGitHub {
+            owner = "dzmitry-lahoda-forks";
+            repo = name;
+            rev = "d6700f03da8e93de3e5e327c2e87d93fde3967b8";
+            hash = "sha256-42j/ZP8Gyn1gyPTLNMpWJH5pLqz2Ufd8hSb6g8SnkCU=";
+          };
+        in crane.stable.buildPackage (subnix.subenv // {
+          name = name;
+          cargoArtifacts = crane.stable.buildDepsOnly (subnix.subenv // {
+            inherit src;
+            doCheck = false;
+            cargoTestCommand = "";
+            nativeBuildInputs = systemCommonRust.darwin-deps;
+          });
+          inherit src;
+          cargoTestCommand = "";
+          meta = { mainProgram = name; };
+        });
+      };
+    };
+}