all repos — nix-packages @ 0b1a7aba70b085972c1c9b8372660ff2a49db02d

My personal collection of packages for nix

refactor package definition loading

Alin
commit

0b1a7aba70b085972c1c9b8372660ff2a49db02d

parent

195fbbcaebbb97c3e2456d2ca9cbdb932f62157b

3 files changed, 18 insertions(+), 13 deletions(-)

changed files
M default.nix → default.nix
@@ -15,16 +15,5 @@ # The `lib`, `modules`, and `overlays` names are special
   lib = import ./lib { inherit pkgs; }; # functions
   modules = import ./modules/nixos; # NixOS modules
   overlays = import ./overlays; # nixpkgs overlays
-
-  fishPlugins = pkgs.lib.makeScope pkgs.fishPlugins.newScope (
-    self:
-    pkgs.lib.packagesFromDirectoryRecursive {
-      inherit (pkgs.fishPlugins) callPackage;
-      directory = ./pkgs/scoped/fishPlugins;
-    }
-  );
 }
-// pkgs.lib.packagesFromDirectoryRecursive {
-  inherit (pkgs) callPackage;
-  directory = ./pkgs/by-directory;
-}
+// (import ./pkgs { inherit pkgs; })
M flake.nix → flake.nix
@@ -45,7 +45,7 @@ paths = (import ./ci.nix { inherit pkgs; }).cachePkgs;
             };
           in
           {
-            legacyPackages = (import ./default.nix { inherit pkgs; });
+            legacyPackages = (import ./pkgs { inherit pkgs; });
 
             packages = (
               lpkgs
A pkgs/default.nix
@@ -0,0 +1,16 @@
+{
+  pkgs ? import <nixpkgs> { },
+}:
+{
+  fishPlugins = pkgs.lib.makeScope pkgs.fishPlugins.newScope (
+    self:
+    pkgs.lib.packagesFromDirectoryRecursive {
+      inherit (pkgs.fishPlugins) callPackage;
+      directory = ./scoped/fishPlugins;
+    }
+  );
+}
+// pkgs.lib.packagesFromDirectoryRecursive {
+  inherit (pkgs) callPackage;
+  directory = ./by-directory;
+}