From 975068992f2ebe2a264641bdc7aaa70b448a960e Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Sun, 13 Jul 2025 19:00:30 +0200 Subject: [PATCH 1/3] chore(deps): update https://git.salame.cl/jalil/nix-flake-outputs-size digest to e5d1a07 --- .forgejo/workflows/check.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.forgejo/workflows/check.yml b/.forgejo/workflows/check.yml index 48f59e3..6fe6b6c 100644 --- a/.forgejo/workflows/check.yml +++ b/.forgejo/workflows/check.yml @@ -25,7 +25,7 @@ jobs: - uses: https://git.salame.cl/actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4 - run: nix --version - name: Generate size report - uses: "https://git.salame.cl/jalil/nix-flake-outputs-size@6b0b78e4962d7aae6243b4601ba8257be99e3a70" # main + uses: "https://git.salame.cl/jalil/nix-flake-outputs-size@e5d1a0751adb4963c0a4982503806ae5f19f52da" # main with: comment-on-pr: ${{ github.ref_name != 'main' }} generate-artifact: ${{ github.ref_name == 'main' }} From 5cef18f07e3f89019274c546fe955d8105a90e6e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jalil=20David=20Salam=C3=A9=20Messina?= Date: Sun, 13 Jul 2025 18:49:59 +0200 Subject: [PATCH 2/3] refactor(package): share more stuff This should hopefully speed up the nix evals --- default.nix | 22 ++++++++++++---------- flake-modules/package.nix | 3 +-- 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/default.nix b/default.nix index 28e3808..2b595e0 100644 --- a/default.nix +++ b/default.nix @@ -1,15 +1,16 @@ +let + inherit (builtins.getFlake (builtins.toString ./.)) inputs; +in { - pkgs ? - (builtins.getFlake (builtins.toString ./.)).inputs.nixpkgs.legacyPackages.${builtins.currentSystem}, + pkgs ? inputs.nixpkgs.legacyPackages.${builtins.currentSystem}, lib ? pkgs.lib, - crane ? (builtins.getFlake (builtins.toString ./.)).inputs.crane, - pkgSrc ? ./., + crane ? inputs.crane, + craneLib ? crane.mkLib pkgs, + cargoArtifacts ? null, + src ? craneLib.cleanCargoSource ./., mold ? pkgs.mold, }: let - craneLib = crane.mkLib pkgs; - src = craneLib.cleanCargoSource pkgSrc; - commonArgs = { inherit src; strictDeps = true; @@ -26,12 +27,13 @@ let mainProgram = "webnsupdate"; }; }; - - cargoArtifacts = craneLib.buildDepsOnly commonArgs; in craneLib.buildPackage ( lib.mergeAttrsList [ commonArgs - { inherit cargoArtifacts; } + { + cargoArtifacts = + if cargoArtifacts == nul then craneLib.buildDepsOnly commonArgs else cargoArtifacts; + } ] ) diff --git a/flake-modules/package.nix b/flake-modules/package.nix index 1d488d0..3a7411b 100644 --- a/flake-modules/package.nix +++ b/flake-modules/package.nix @@ -44,8 +44,7 @@ in { inherit cargoArtifacts; } ]; webnsupdate = pkgs.callPackage ../default.nix { - inherit crane; - pkgSrc = src; + inherit craneLib cargoArtifacts src; }; in { From 28573ba11fd45a228faba391047ef7a3364d8c72 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jalil=20David=20Salam=C3=A9=20Messina?= Date: Sun, 13 Jul 2025 18:49:59 +0200 Subject: [PATCH 3/3] refactor(package): share more stuff This should hopefully speed up the nix evals --- default.nix | 22 ++++++++++++---------- flake-modules/package.nix | 3 +-- 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/default.nix b/default.nix index 28e3808..16b5c9b 100644 --- a/default.nix +++ b/default.nix @@ -1,15 +1,16 @@ +let + inherit (builtins.getFlake (builtins.toString ./.)) inputs; +in { - pkgs ? - (builtins.getFlake (builtins.toString ./.)).inputs.nixpkgs.legacyPackages.${builtins.currentSystem}, + pkgs ? inputs.nixpkgs.legacyPackages.${builtins.currentSystem}, lib ? pkgs.lib, - crane ? (builtins.getFlake (builtins.toString ./.)).inputs.crane, - pkgSrc ? ./., + crane ? inputs.crane, + craneLib ? crane.mkLib pkgs, + cargoArtifacts ? null, + src ? craneLib.cleanCargoSource ./., mold ? pkgs.mold, }: let - craneLib = crane.mkLib pkgs; - src = craneLib.cleanCargoSource pkgSrc; - commonArgs = { inherit src; strictDeps = true; @@ -26,12 +27,13 @@ let mainProgram = "webnsupdate"; }; }; - - cargoArtifacts = craneLib.buildDepsOnly commonArgs; in craneLib.buildPackage ( lib.mergeAttrsList [ commonArgs - { inherit cargoArtifacts; } + { + cargoArtifacts = + if cargoArtifacts == null then craneLib.buildDepsOnly commonArgs else cargoArtifacts; + } ] ) diff --git a/flake-modules/package.nix b/flake-modules/package.nix index 1d488d0..3a7411b 100644 --- a/flake-modules/package.nix +++ b/flake-modules/package.nix @@ -44,8 +44,7 @@ in { inherit cargoArtifacts; } ]; webnsupdate = pkgs.callPackage ../default.nix { - inherit crane; - pkgSrc = src; + inherit craneLib cargoArtifacts src; }; in {