From 8658515be25097ed5ac48bc8afe81d7dc564e5ee Mon Sep 17 00:00:00 2001 From: cy Date: Wed, 8 Jan 2025 23:43:42 -0500 Subject: [PATCH] workflow: use overlays --- .github/workflows/build-and-cache.yml | 10 +++++++--- flake.nix | 2 ++ overlay/attic/default.nix | 6 +++--- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build-and-cache.yml b/.github/workflows/build-and-cache.yml index 8fcb1f5..50c4b0c 100644 --- a/.github/workflows/build-and-cache.yml +++ b/.github/workflows/build-and-cache.yml @@ -9,13 +9,17 @@ jobs: strategy: matrix: package: - - github:cything/attic/e91261dc9a22d267700ab9095155f5581ac3b06c#attic - - github:cything/attic/e91261dc9a22d267700ab9095155f5581ac3b06c#attic-server - - github:cything/attic/e91261dc9a22d267700ab9095155f5581ac3b06c#attic-client + - .#attic-client + - .#attic-server runs-on: ubuntu-latest steps: + - uses: actions/checkout@v4 + - uses: DeterminateSystems/nix-installer-action@main + with: + logger: pretty + - uses: DeterminateSystems/magic-nix-cache-action@main - uses: cachix/cachix-action@v15 diff --git a/flake.nix b/flake.nix index 5dab1b9..779e8a7 100644 --- a/flake.nix +++ b/flake.nix @@ -117,6 +117,8 @@ checks = forEachSystem (pkgs: { formatting = treefmtEval.${pkgs.system}.config.build.check self; }); + # lets us build overlayed packages with `nix build .#` + packages = pkgsFor; nixosConfigurations = let diff --git a/overlay/attic/default.nix b/overlay/attic/default.nix index 424cea1..7e7c030 100644 --- a/overlay/attic/default.nix +++ b/overlay/attic/default.nix @@ -10,11 +10,11 @@ final: prev: { src = final.fetchFromGitHub { owner = "cything"; repo = "attic"; - rev = "3e0c381aa1b4f41234284b5491aa818c24af5983"; - hash = "sha256-kw7zeQH+mg0bCTzfr6MqlqAHzYfPSlNj2Fk+lRqVO7A="; + rev = "e91261dc9a22d267700ab9095155f5581ac3b06c"; + hash = "sha256-dIrCD0rLXlW1XsNiF50vTeHi1l4xHYh0m+aCdHNcMfU="; }; cargoLock = null; - cargoHash = "sha256-0z7cFMMltJQt3zBQ0L+t8MLKPE+HtduWJnNXED7rEHc="; + cargoHash = "sha256-AbpWnYfBMrR6oOfy2LkQvIPYsClCWE89bJav+iHTtLM="; useFetchCargoVendor = true; } );