From 0fd18ca4b852e708acc77ac9e9f806b4c2391f31 Mon Sep 17 00:00:00 2001 From: Xiaoyue Chen Date: Fri, 17 Nov 2023 13:14:16 +0100 Subject: [PATCH 1/2] Update simpleFlake Remove deprecated attributes defaultPackage and devShell.default --- simpleFlake.nix | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/simpleFlake.nix b/simpleFlake.nix index 3736356..b78e74b 100644 --- a/simpleFlake.nix +++ b/simpleFlake.nix @@ -59,8 +59,8 @@ let } // ( - if packages ? defaultPackage then { - defaultPackage = packages.defaultPackage; + if packages ? default then { + packages.default = packages.default; } else { } ) // @@ -71,10 +71,9 @@ let ) // ( - if shell != null then { - devShell = shell_ { inherit pkgs; }; - } else if packages ? devShell then { - devShell = packages.devShell; + if shell != null then rec { + devShells.${name} = shell_ { inherit pkgs; }; + devShells.default = devShells.${name}; } else { } ) ); From 91aab318cad85e207e0876d086dba30afcd1f02f Mon Sep 17 00:00:00 2001 From: Xiaoyue Chen Date: Fri, 17 Nov 2023 16:57:24 +0100 Subject: [PATCH 2/2] Add defaultPackage to simpleFlake --- simpleFlake.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/simpleFlake.nix b/simpleFlake.nix index b78e74b..0f99638 100644 --- a/simpleFlake.nix +++ b/simpleFlake.nix @@ -58,6 +58,12 @@ let legacyPackages = packages; } // + ( + if packages ? defaultPackage then { + defaultPackage = packages.defaultPackage; + } else { } + ) + // ( if packages ? default then { packages.default = packages.default;