From 3585c75eaca06a5ebc1d56413364db2677ed520e Mon Sep 17 00:00:00 2001 From: David Arnold Date: Sun, 5 Sep 2021 16:00:30 -0500 Subject: [PATCH] bump fup + fup fixes --- deprecated.nix | 6 +++--- flake.lock | 6 +++--- src/mkFlake/fup-adapter.nix | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/deprecated.nix b/deprecated.nix index a3a1c2c..b45f7e4 100644 --- a/deprecated.nix +++ b/deprecated.nix @@ -69,9 +69,9 @@ rec { lib.exporters.internalOverlays -> lib.exportOverlays '' { - modulesFromList = flake-utils-plus.exportModules; - fromOverlays = flake-utils-plus.exportPackages; - internalOverlays = flake-utils-plus.exportOverlays; + modulesFromList = flake-utils-plus.lib.exportModules; + fromOverlays = flake-utils-plus.lib.exportPackages; + internalOverlays = flake-utils-plus.lib.exportOverlays; } ; diff --git a/flake.lock b/flake.lock index 2ceeae0..3b8487c 100644 --- a/flake.lock +++ b/flake.lock @@ -93,11 +93,11 @@ ] }, "locked": { - "lastModified": 1630831608, - "narHash": "sha256-UyIQMX8abgByw8Q+gL69uKmAcOlMUwDZgVRG+UEFseo=", + "lastModified": 1630859903, + "narHash": "sha256-gQ2SQZb9GKM7t+D7GIODsfg6lxhEDy0dM+GPqz5t4o0=", "owner": "divnix", "repo": "flake-utils-plus", - "rev": "48e2161596296273c4ba221a07962f5451822f39", + "rev": "ed14e98f77d9c1eb75f2aa86c4f29a284513b7be", "type": "github" }, "original": { diff --git a/src/mkFlake/fup-adapter.nix b/src/mkFlake/fup-adapter.nix index 25bb262..ea499b8 100644 --- a/src/mkFlake/fup-adapter.nix +++ b/src/mkFlake/fup-adapter.nix @@ -88,7 +88,7 @@ let devshellModules = flake-utils-plus.lib.exportModules config.devshell.modules; - overlays = flake-utils-plus.lib.exporters.internalOverlays { + overlays = flake-utils-plus.lib.exportOverlays { # since we can't detect overlays owned by self # we have to filter out ones exported by the inputs # optimally we would want a solution for NixOS/nix#4740