Skip to content

Commit

Permalink
[ADP-3368] Use flakes in E2E, remove default.nix, shell.nix (#4644)
Browse files Browse the repository at this point in the history
This PR remove `shell.nix` in favor of flakes

- [x] remove `default.nix` 
- [x] remove `shell.nix`
- [x] remove `test/e2e/shell.nix`
- [x] move e2e needs in the main flake
  • Loading branch information
paolino authored Jun 26, 2024
2 parents 6063d18 + fe17de4 commit cb0573a
Show file tree
Hide file tree
Showing 6 changed files with 18 additions and 44 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -78,3 +78,4 @@ lib/wallet-benchmarks/data/membench-snapshot

## Local cluster swagger golden actual
lib/local-cluster/data/swagger.json.actual
test/e2e/.direnv/flake-profile*
12 changes: 0 additions & 12 deletions default.nix

This file was deleted.

17 changes: 16 additions & 1 deletion nix/haskell.nix
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,17 @@ CHaP: haskell-nix: nixpkgs-recent: nodePkgs: haskell-nix.cabalProject' [
filter = haskell-nix.haskellSourceFilter;
};

shell = {
shell =
let
# To update gemset.nix, run:
# nix-shell --arg bins false --run bundix
gems = pkgs.bundlerEnv {
name = "gems-cardano-wallet-e2e";
gemdir = ../test/e2e;
ruby = pkgs.ruby_3_1;
};
in
{
name = "cardano-wallet-shell${lib.optionalString config.profiling "-profiled"}";
packages = ps: builtins.attrValues (haskellLib.selectProjectPackages ps);
tools = {
Expand All @@ -130,6 +140,11 @@ CHaP: haskell-nix: nixpkgs-recent: nodePkgs: haskell-nix.cabalProject' [
nodePkgs.cardano-node
cardano-addresses-cli.components.exes.cardano-address
bech32.components.exes.bech32
# for e2e tests
gems
gems.wrappedRuby
pkgs.bundix
pkgs.screen
]) ++ (with pkgs.buildPackages.buildPackages; [
just
pkg-config
Expand Down
1 change: 0 additions & 1 deletion shell.nix

This file was deleted.

2 changes: 1 addition & 1 deletion test/e2e/.envrc
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ else
# to prevent bootstrapping problems.
# It's definitely better to use lorri, because direnv won't
# be fast like this.
use nix
use flake
fi

# Source a user-specific config in .envrc-local at the project
Expand Down
29 changes: 0 additions & 29 deletions test/e2e/shell.nix

This file was deleted.

0 comments on commit cb0573a

Please sign in to comment.