Skip to content

Commit 26da6ea

Browse files
committed
[DDW-1083] Update Cicero/Tullia definitions
1 parent f4df7c2 commit 26da6ea

File tree

4 files changed

+281
-211
lines changed

4 files changed

+281
-211
lines changed

flake.lock

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

flake.nix

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -36,15 +36,7 @@
3636
devShell = __mapAttrs (_: a: a.default) inputs.self.outputs.devShells;
3737

3838
}
39-
// (let
40-
tullia = inputs.tullia.fromSimple "x86_64-linux" (import ./nix/tullia.nix);
41-
fakeEvent = { inputs."GitHub event" = {id = ""; created_at = ""; value = {github_body.head_commit.id="0000000";};}; id=""; ociRegistry=""; };
42-
in {
43-
tullia.x86_64-linux = tullia.tullia;
44-
cicero.x86_64-linux = tullia.cicero;
45-
ciceroLocalTest.x86_64-linux = (tullia.cicero."daedalus/ci" fakeEvent).job; # XXX: only nix-eval this
46-
tulliaLocalTest.x86_64-linux = tullia.tullia.task.ci.computedCommand; # XXX: fine to nix-build
47-
});
39+
// (import ./nix/cicero.nix {inherit inputs;});
4840

4941
# --- Flake Local Nix Configuration ----------------------------
5042
nixConfig = {

nix/cicero.nix

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
{inputs}: let
2+
# For now, Cicero is building for Darwin on Linux with configured remote builders:
3+
x86_64-linux = inputs.tullia.fromSimple "x86_64-linux" (import ./tullia.nix);
4+
in {
5+
tullia.x86_64-linux = x86_64-linux.tullia;
6+
cicero.x86_64-linux = x86_64-linux.cicero;
7+
tulliaLocalTest.x86_64-linux = let
8+
pkgs = inputs.nixpkgs.legacyPackages.x86_64-linux;
9+
in
10+
pkgs.linkFarm "tulliaLocalTest" (pkgs.lib.mapAttrsToList (k: v: {
11+
name = k;
12+
path = v.computedCommand;
13+
})
14+
x86_64-linux.tullia.task);
15+
}

0 commit comments

Comments
 (0)