git.delta.rocks / jrsonnet / refs/commits / d8bac4e1b3aa

difftreelog

feat always build with crane

Yaroslav Bolyukin2024-06-01parent: #966e7f1.patch.diff
in: trunk

3 files changed

modifiedflake.nixdiffbeforeafterboth
29 {29 {
30 lib = import ./lib {inherit flake-utils;};30 lib = import ./lib {
31 inherit flake-utils;
32 fleetPkgsForPkgs = pkgs: import ./pkgs {
33 inherit (pkgs) callPackage;
34 craneLib = crane.mkLib pkgs;
35 };
36 };
31 }37 }
32 // flake-utils.lib.eachDefaultSystem (system: let38 // flake-utils.lib.eachDefaultSystem (system: let
70 // (prefixAttrs "nixpkgs-stable-" (removeAttrs packages-with-nixpkgs-stable ["fleet"]));76 // (prefixAttrs "nixpkgs-stable-" (removeAttrs packages-with-nixpkgs-stable ["fleet"]));
7177
72 devShells.default = craneLib.devShell {78 devShells.default = craneLib.devShell {
73 nativeBuildInputs = with pkgs; [79 packages = with pkgs; [
74 alejandra80 alejandra
75 lld81 lld
76 cargo-edit82 cargo-edit
modifiedlib/default.nixdiffbeforeafterboth
1{flake-utils}: {1{
2 flake-utils,
3 fleetPkgsForPkgs,
4}: {
2 fleetConfiguration = {5 fleetConfiguration = {
3 # TODO: Provide by fleet, instead of requesting user to provide it.6 # TODO: Provide by fleet, instead of requesting user to provide it.
25 ++ [28 ++ [
26 data29 data
27 ({...}: {30 ({...}: {
28 inherit nixosModules hosts overlays;31 inherit nixosModules hosts;
32 overlays = [(final: prev: (fleetPkgsForPkgs final))] ++ overlays;
29 })33 })
30 ]34 ]
31 ++ fleetModules;35 ++ fleetModules;
modifiednixos/modules/module-list.nixdiffbeforeafterboth
1[1[
2 ../fleetPkgs.nix
3 ../meta.nix2 ../meta.nix
4 ../secrets.nix3 ../secrets.nix
5 ../rollback.nix4 ../rollback.nix