commit e027c1bfaf0238b57e46a81d3ff9cf34b88834d1 parent 7f2da6ab178e41b5039435722c071a1c404e78d2 Author: Vincent Demeester <vincent@sbr.pm> Date: Wed, 28 Sep 2022 17:01:42 +0200 flake: update overlays Signed-off-by: Vincent Demeester <vincent@sbr.pm> Diffstat:
| M | flake.nix | | | 6 | ++++-- |
| M | nix/overlays/default.nix | | | 52 | +++++++++++++++++++++++++++------------------------- |
2 files changed, 31 insertions(+), 27 deletions(-)
diff --git a/flake.nix b/flake.nix @@ -102,7 +102,8 @@ channelsConfig.allowUnfree = true; sharedOverlays = [ - (import ./nix/overlays) + (import ./nix/overlays).openshift + (import ./nix/overlays).tekton (import ./nix/overlays/sbr.nix) emacs-overlay.overlay nur.overlay @@ -225,12 +226,13 @@ # checks = builtins.mapAttrs (system: deployLib: deployLib.deployChecks self.deploy) deploy-rs.lib; + overlays = import ./nix/overlays; outputsBuilder = channels: let pkgs = channels.nixpkgs; in { - overlays.default = import ./nix/overlays; + # overlays = import ./nix/overlays; packages = with channels.nixpkgs; { inherit diff --git a/nix/overlays/default.nix b/nix/overlays/default.nix @@ -1,27 +1,29 @@ -final: prev: { - - inherit (prev.callPackage ../packages/tkn { }) - tkn_0_17 - tkn_0_18 - tkn_0_19 - tkn_0_20 - tkn_0_21 - tkn_0_22 - tkn_0_23 - tkn - ; - inherit (prev.callPackage ../packages/tkn/tkn-pac.nix { }) - tkn-pac_0_5 - tkn-pac_0_6 - tkn-pac_0_7 - tkn-pac_0_8 - tkn-pac - ; - inherit (prev.callPackage ../packages/tkn/tkn-local.nix { }) - tkn-local_0_4 - tkn-local_0_3 - tkn-local_0_2 - tkn-local - ; +{ + openshift = final: prev: { }; + tekton = final: prev: { + inherit (prev.callPackage ../packages/tkn { }) + tkn_0_17 + tkn_0_18 + tkn_0_19 + tkn_0_20 + tkn_0_21 + tkn_0_22 + tkn_0_23 + tkn + ; + inherit (prev.callPackage ../packages/tkn/tkn-pac.nix { }) + tkn-pac_0_5 + tkn-pac_0_6 + tkn-pac_0_7 + tkn-pac_0_8 + tkn-pac + ; + inherit (prev.callPackage ../packages/tkn/tkn-local.nix { }) + tkn-local_0_4 + tkn-local_0_3 + tkn-local_0_2 + tkn-local + ; + }; }