Skip to content

Commit 55c3cbd

Browse files
committed
Bump tullia and add its cli to nix develop shells
1 parent 2766947 commit 55c3cbd

File tree

5 files changed

+14
-11
lines changed

5 files changed

+14
-11
lines changed

flake.lock

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

flake.nix

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,7 @@
118118
iohkNix.overlays.utils
119119
(final: prev: {
120120
inherit customConfig nix2container;
121+
inherit (tullia.packages.${final.system}) tullia;
121122
gitrev = final.customConfig.gitrev or self.rev or "0000000000000000000000000000000000000000";
122123
commonLib = lib
123124
// iohkNix.lib
@@ -235,6 +236,7 @@
235236

236237
shell = import ./shell.nix { inherit pkgs customConfig cardano-mainnet-mirror; };
237238
devShells = {
239+
default = shell.dev;
238240
inherit (shell) devops workbench-shell;
239241
cluster = shell;
240242
profiled = project.profiled.shell;

nix/haskell.nix

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@ haskell-nix.cabalProject' ({ pkgs
5353
ghcid
5454
haskell-language-server
5555
cabal
56+
tullia
5657
];
5758

5859
withHoogle = true;

nix/tullia.nix

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ self: system:
1818

1919
let
2020
ciInputName = "GitHub event";
21-
repo = "input-output-hk/cardano-node";
21+
repository = "input-output-hk/cardano-node";
2222
in rec {
2323
tasks = let
2424
common = {
@@ -29,11 +29,10 @@ in rec {
2929
# needed on top-level task to set runtime options
3030
nix.enable = true;
3131

32-
github-ci = {
32+
github.ci = {
3333
enable = config.actionRun.facts != {};
34-
inherit repo;
35-
sha = config.preset.github-ci.lib.getRevision ciInputName null;
36-
clone.enable = false;
34+
inherit repository;
35+
revision = config.preset.github.lib.getRevision ciInputName null;
3736
};
3837
};
3938

@@ -53,7 +52,7 @@ in rec {
5352
}.${system};
5453

5554
flakeUrl = {config, lib, ...}:
56-
lib.escapeShellArg "github:${repo}/${config.preset.github-ci.lib.getRevision ciInputName null}";
55+
lib.escapeShellArg "github:${repository}/${config.preset.github.lib.getRevision ciInputName null}";
5756
in
5857
{
5958
"ci/push" = {lib, ...} @ args: {
@@ -83,7 +82,7 @@ in rec {
8382
io = ''
8483
#lib.io.github_push
8584
#input: "${ciInputName}"
86-
#repo: "${repo}"
85+
#repo: "${repository}"
8786
'';
8887
};
8988

@@ -92,7 +91,7 @@ in rec {
9291
io = ''
9392
#lib.io.github_pr
9493
#input: "${ciInputName}"
95-
#repo: "${repo}"
94+
#repo: "${repository}"
9695
#target_default: false
9796
'';
9897
};

shell.nix

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -117,6 +117,7 @@ let
117117
workbenchRunner.workbench.workbench
118118
pstree
119119
pkgs.time
120+
tullia
120121
];
121122

122123
shellHook = ''

0 commit comments

Comments
 (0)