From b05d6bb1acfa12ee837029a21daba28006807a7b Mon Sep 17 00:00:00 2001 From: Isabella Bastaja Date: Fri, 27 Mar 2026 15:45:07 +0100 Subject: desperation --- default.nix | 68 ------------------------------------------------------------ flake.nix | 2 +- packages.nix | 66 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 67 insertions(+), 69 deletions(-) delete mode 100644 default.nix create mode 100644 packages.nix diff --git a/default.nix b/default.nix deleted file mode 100644 index c557da7..0000000 --- a/default.nix +++ /dev/null @@ -1,68 +0,0 @@ -{ - # self, - pkgs ? import { }, - wrapper-manager, - # system, -}: -let - recursiveMerge = - with pkgs.lib; - attrList: - let - f = - attrPath: - zipAttrsWith ( - n: values: - if tail values == [ ] then - head values - else if all isList values then - unique (concatLists values) - else if all isAttrs values then - f (attrPath ++ [ n ]) values - else - last values - ); - in - f [ ] attrList; - callPackage = pkgs.lib.callPackageWith (recursiveMerge [ - pkgs - packages - ]); - packages = { - python3Packages = { - ascii = callPackage ./pkgs/python3Packages/ascii.nix { }; - pyease-grpc = callPackage ./pkgs/python3Packages/pyease-grpc.nix { }; - pyexecjs = callPackage ./pkgs/python3Packages/pyexecjs.nix { }; - }; - - sorremacs = callPackage ./pkgs/sorremacs { }; - lightnovel-crawler = callPackage ./pkgs/lightnovel-crawler.nix { }; - } - // wrappers; - - wm-eval = wrapper-manager.lib { - inherit pkgs; - modules = [ - ./wrappers/gallery-dl - ./wrappers/jujutsu - ]; - }; - wrappers = wm-eval.config.build.packages; - - # archpkgs = import ./archpkgs.nix { - # inherit - # self - # pkgs - # wrappers - # system - # ; - # }; -in -{ - # inherit wrappers archpkgs; - inherit wrappers; - lib = import ./lib { inherit pkgs; }; - modules = import ./modules; - overlays = import ./overlays; -} -// packages diff --git a/flake.nix b/flake.nix index cdd1001..fe12f57 100644 --- a/flake.nix +++ b/flake.nix @@ -33,7 +33,7 @@ ]; }; - legacyPackages = import ./default.nix { + legacyPackages = import ./packages.nix { inherit pkgs wrapper-manager; }; diff --git a/packages.nix b/packages.nix new file mode 100644 index 0000000..2a89954 --- /dev/null +++ b/packages.nix @@ -0,0 +1,66 @@ +{ + # self, + pkgs ? import { }, + wrapper-manager, + # system, +}: +let + recursiveMerge = + with pkgs.lib; + attrList: + let + f = + attrPath: + zipAttrsWith ( + n: values: + if tail values == [ ] then + head values + else if all isList values then + unique (concatLists values) + else if all isAttrs values then + f (attrPath ++ [ n ]) values + else + last values + ); + in + f [ ] attrList; + callPackage = pkgs.lib.callPackageWith (recursiveMerge [ + pkgs + packages + ]); + packages = { + python3Packages = { + ascii = callPackage ./pkgs/python3Packages/ascii.nix { }; + pyease-grpc = callPackage ./pkgs/python3Packages/pyease-grpc.nix { }; + pyexecjs = callPackage ./pkgs/python3Packages/pyexecjs.nix { }; + }; + + sorremacs = callPackage ./pkgs/sorremacs { }; + lightnovel-crawler = callPackage ./pkgs/lightnovel-crawler.nix { }; + } + // wrappers; + + wm-eval = wrapper-manager.lib { + inherit pkgs; + modules = [ + ./wrappers/gallery-dl + ./wrappers/jujutsu + ]; + }; + wrappers = wm-eval.config.build.packages; + + # archpkgs = import ./archpkgs.nix { + # inherit + # self + # pkgs + # wrappers + # system + # ; + # }; +in +{ + lib = import ./lib { inherit pkgs; }; + modules = import ./modules; + overlays = import ./overlays; +} +// packages -- cgit v1.3.1