From 6bf6d29a4e8617b6065a952edeca1f04b65762f2 Mon Sep 17 00:00:00 2001 From: Jeremy Kolb Date: Fri, 8 Jul 2022 16:25:29 -0400 Subject: [PATCH] Migrate to new flake names --- flake.nix | 6 +++--- overlay.nix | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/flake.nix b/flake.nix index 8ad073900d..991a0cfff0 100644 --- a/flake.nix +++ b/flake.nix @@ -11,12 +11,12 @@ eachSystem allSystems (system: let pkgs = import nixpkgs { inherit system; - overlays = [ self.overlay ]; + overlays = [ self.overlays.default ]; }; in { legacyPackages = pkgs.rosPackages; }) // { - overlay = import ./overlay.nix; - nixosModule = import ./modules; + overlays.default = import ./overlay.nix; + nixosModules.default = import ./modules; }; } diff --git a/overlay.nix b/overlay.nix index 081f4423a1..9ef470e1e2 100644 --- a/overlay.nix +++ b/overlay.nix @@ -1,5 +1,5 @@ -self: super: with super.lib; +final: prev: with prev.lib; foldr composeExtensions (_: _: {}) [ (import ./pkgs) (import ./distros) -] self super +] final prev