From 7cb4b1be695f19c0be26efc6e9f6407105d7d47c Mon Sep 17 00:00:00 2001 From: Lucy Hochkamp Date: Fri, 10 Oct 2025 17:44:49 +0200 Subject: [PATCH] meow --- .woodpecker/build-cache.yaml | 29 +++++++-------- flake.lock | 63 +++++++++++++++++++++++++++------ flake.nix | 5 ++- modules/presets/development.nix | 2 +- 4 files changed, 73 insertions(+), 26 deletions(-) diff --git a/.woodpecker/build-cache.yaml b/.woodpecker/build-cache.yaml index 258098fb..19171f78 100644 --- a/.woodpecker/build-cache.yaml +++ b/.woodpecker/build-cache.yaml @@ -30,23 +30,24 @@ steps: - nix build ".#nix" --print-build-logs --out-link nix --no-update-lock-file - nix profile remove lix - ./nix/bin/nix profile install ".#nix" --no-update-lock-file - - nix profile install ".#nix-fast-build" ".#attic-client" ".#jq" --no-update-lock-file + - nix profile install ".#nix-ci" ".#attic-client" ".#jq" --no-update-lock-file - nix --version - attic login default $${ATTIC_ENDPOINT} $${ATTIC_PUSH_TOKEN} - attic use $${ATTIC_CACHE} + - attic push $${ATTIC_CACHE} $(nix build --print-build-logs --no-update-lock-file --no-link --print-out-paths .#nix-ci) # - attic watch-store $${ATTIC_CACHE} & # - nix build .#nixosConfigurations.ds9.config.system.build.toplevel .#nixosConfigurations.picard.config.system.build.toplevel .#nixosConfigurations.theseus.config.system.build.toplevel # - nix flake archive --json . - - attic push xyno $(nix flake archive --json . | jq -r '[.. | .path? | select(. != null)] | unique | .[]') - - mkdir /tmp/reports - - nix-fast-build --debug --no-nom --skip-cached --result-file /tmp/reports/junit.xml --result-format junit --attic-cache $${ATTIC_CACHE} --flake .#hydraJobs.systems - - name: junit-reports - image: ghcr.io/wgroeneveld/woodpecker-ascii-junit:main - settings: - log-level: debug - path: /tmp/reports/**/*.xml - when: - status: [ - 'success', - 'failure', - ] + # - attic push xyno $(nix flake archive --json . | jq -r '[.. | .path? | select(. != null)] | unique | .[]') + # - mkdir /tmp/reports + - nix-ci --check-cached --copy-to-attic $${ATTIC_CACHE} --flake-path .#hydraJobs.systems + # - name: junit-reports + # image: ghcr.io/wgroeneveld/woodpecker-ascii-junit:main + # settings: + # log-level: debug + # path: /tmp/reports/**/*.xml + # when: + # status: [ + # 'success', + # 'failure', + # ] diff --git a/flake.lock b/flake.lock index 9a2c9fd5..8f3d5f43 100644 --- a/flake.lock +++ b/flake.lock @@ -242,11 +242,11 @@ ] }, "locked": { - "lastModified": 1760015796, - "narHash": "sha256-c/WkaynHrRE1EHWATe5+vb9M9YabfTaR1GHivdybaSU=", + "lastModified": 1760103600, + "narHash": "sha256-R4cltQFceN3POiPhBu7aTKsrwqTiwo6zjzmitrHD80E=", "owner": "nix-community", "repo": "home-manager", - "rev": "6564ee29d0521af3feba937a91024e6a3e77a8b6", + "rev": "bcccb01d0a353c028cc8cb3254cac7ebae32929e", "type": "github" }, "original": { @@ -435,13 +435,34 @@ "type": "github" } }, + "nix-ci": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ], + "rust-overlay": "rust-overlay_4" + }, + "locked": { + "lastModified": 1760113386, + "narHash": "sha256-6gjmlJuvNJiRx/Ss2DKvtJvzJgXWhV30FCTkibKXC6U=", + "ref": "refs/heads/main", + "rev": "ac4fdac3b7e0722299003836928df115dada6cae", + "revCount": 8, + "type": "git", + "url": "https://git.xyno.systems/xyno/nix-ci" + }, + "original": { + "type": "git", + "url": "https://git.xyno.systems/xyno/nix-ci" + } + }, "nixos-hardware": { "locked": { - "lastModified": 1759582739, - "narHash": "sha256-spZegilADH0q5OngM86u6NmXxduCNv5eX9vCiUPhOYc=", + "lastModified": 1760106635, + "narHash": "sha256-2GoxVaKWTHBxRoeUYSjv0AfSOx4qw5CWSFz2b+VolKU=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "3441b5242af7577230a78ffb03542add264179ab", + "rev": "9ed85f8afebf2b7478f25db0a98d0e782c0ed903", "type": "github" }, "original": { @@ -484,11 +505,11 @@ }, "nixpkgs-master": { "locked": { - "lastModified": 1760020272, - "narHash": "sha256-/w2H6t+NxdtbZ/oBkb0i/bW766aOuq7X69Jz1CzC3Vw=", + "lastModified": 1760112597, + "narHash": "sha256-OVrj3jM33mKdgnHlwsISC4h0MayjESadorU49FapVFQ=", "owner": "nixos", "repo": "nixpkgs", - "rev": "531f6038cfe85c60b3f349b85e71939b539bc334", + "rev": "d4e0dea40464c69ad9c9f100f03195d6dd96203c", "type": "github" }, "original": { @@ -603,6 +624,7 @@ "mtxclient": "mtxclient", "nheko": "nheko", "niri": "niri", + "nix-ci": "nix-ci", "nixos-hardware": "nixos-hardware", "nixpkgs": "nixpkgs", "nixpkgs-master": "nixpkgs-master", @@ -676,6 +698,27 @@ } }, "rust-overlay_4": { + "inputs": { + "nixpkgs": [ + "nix-ci", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1760063676, + "narHash": "sha256-s5Fjh43skH2L+avOGioLmEHoYZffDbg3abV5h0gjeew=", + "owner": "oxalica", + "repo": "rust-overlay", + "rev": "897deed0923cc5a1d560c5176abe0d172ec9716d", + "type": "github" + }, + "original": { + "owner": "oxalica", + "repo": "rust-overlay", + "type": "github" + } + }, + "rust-overlay_5": { "inputs": { "nixpkgs": [ "xwayland-satellite", @@ -814,7 +857,7 @@ "nixpkgs": [ "nixpkgs-master" ], - "rust-overlay": "rust-overlay_4" + "rust-overlay": "rust-overlay_5" }, "locked": { "lastModified": 1759707084, diff --git a/flake.nix b/flake.nix index c018b397..df8f2e4c 100644 --- a/flake.nix +++ b/flake.nix @@ -35,6 +35,8 @@ nheko.flake = false; mtxclient.url = "github:Nheko-Reborn/mtxclient"; mtxclient.flake = false; + nix-ci.url = "git+https://git.xyno.systems/xyno/nix-ci"; + nix-ci.inputs.nixpkgs.follows = "nixpkgs"; # helix helix.url = "github:helix-editor/helix"; @@ -70,6 +72,7 @@ ); overlays = [ self.overlays.default + inputs.nix-ci.overlays.default (final: prev: { inherit (final.unstable.lixPackageSets.latest) nixpkgs-review @@ -148,7 +151,7 @@ in { nix = pkgs.unstable.lixPackageSets.latest.lix; - inherit (pkgs) nix-fast-build attic-client jq; + inherit (pkgs) nix-fast-build attic-client jq nix-ci; }; checks."x86_64-linux"."nixos" = let diff --git a/modules/presets/development.nix b/modules/presets/development.nix index c06f739d..fcd46abe 100644 --- a/modules/presets/development.nix +++ b/modules/presets/development.nix @@ -25,7 +25,7 @@ in virtualisation.podman.enable = true; environment.systemPackages = with pkgs; [ - unstable.jetbrains.rider + jetbrains.rider # android-studio nixpkgs-manual nixpkgs-manual.lib-docs