Skip to content

Commit

Permalink
fix: use new namaka in local flake only
Browse files Browse the repository at this point in the history
  • Loading branch information
blaggacao committed Jun 15, 2023
1 parent a740c56 commit 60a2624
Show file tree
Hide file tree
Showing 4 changed files with 42 additions and 74 deletions.
32 changes: 4 additions & 28 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

18 changes: 3 additions & 15 deletions flake.nix
Expand Up @@ -7,12 +7,7 @@
};

inputs.haumea = {
url = "github:nix-community/haumea";
inputs.nixpkgs.follows = "nixlib";
};
inputs.namaka = {
url = "github:nix-community/namaka/v0.1.1";
inputs.haumea.follows = "haumea";
url = "github:nix-community/haumea/v0.2.2";
inputs.nixpkgs.follows = "nixlib";
};
# Incrementality of the Data Spine
Expand All @@ -36,23 +31,16 @@
self,
nixlib,
yants,
namaka,
haumea,
}: let
inherit (haumea.lib.transformers) liftDefault;

res = haumea.lib.load {
in
haumea.lib.load {
src = ./src;
transformer = liftDefault;
inputs = {
inherit (nixlib) lib;
inherit yants;
};
};
checks = namaka.lib.load {
src = ./tests;
inputs = res;
};
in
res // {inherit checks;};
}
54 changes: 27 additions & 27 deletions local/flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 8 additions & 4 deletions local/flake.nix
@@ -1,16 +1,16 @@
{
description = "Data Merge development shell";
inputs.nosys.url = "github:divnix/nosys";
inputs.namaka.url = "github:nix-community/namaka";
inputs.namaka.url = "github:nix-community/namaka/v0.2.0";
inputs.nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable";
inputs.devshell.url = "github:numtide/devshell";
inputs.flake-compat.url = "github:edolstra/flake-compat?ref=refs/pull/55/head";
inputs.call-flake.url = "github:divnix/call-flake";
outputs = inputs @ {
nosys,
flake-compat,
call-flake,
...
}:
nosys ((flake-compat ../.).inputs // inputs) (
nosys ((call-flake ../.).inputs // inputs) (
{
self,
namaka,
Expand Down Expand Up @@ -47,6 +47,10 @@
];
};
};
checks = namaka.lib.load {
src = ../tests;
inputs = call-flake ../.;
};
}
);
}

0 comments on commit 60a2624

Please sign in to comment.