From d0e95ba2c00f6a87087823338543b4c9cba3f10b Mon Sep 17 00:00:00 2001 From: seth Date: Sat, 19 Aug 2023 21:18:10 -0400 Subject: start using flake-parts & hercules-ci --- pkgs/all-packages.nix | 21 +++++++++++++++++++++ pkgs/default.nix | 46 +++++++++++++++++++++++++++------------------- 2 files changed, 48 insertions(+), 19 deletions(-) create mode 100644 pkgs/all-packages.nix (limited to 'pkgs') diff --git a/pkgs/all-packages.nix b/pkgs/all-packages.nix new file mode 100644 index 0000000..6a8f12e --- /dev/null +++ b/pkgs/all-packages.nix @@ -0,0 +1,21 @@ +pkgs: let + inherit (pkgs) callPackage; +in { + # original packages + cfspeedtest = callPackage ./cfspeedtest.nix {}; + check-pr = callPackage ./check-pr.nix {}; + fastfetch = callPackage ./fastfetch.nix {}; + huion = callPackage ./huion.nix {}; + klassy = pkgs.libsForQt5.callPackage ./klassy.nix {}; + mommy = callPackage ./mommy.nix {}; + nixgc = callPackage ./nixgc.nix {}; + modrinth-app-unwrapped = callPackage ./modrinth-app { + inherit (pkgs.nodePackages) pnpm; + inherit (pkgs.darwin.apple_sdk.frameworks) CoreServices Security WebKit; + }; + modrinth-app = callPackage ./modrinth-app/wrapper.nix {}; + treefetch = callPackage ./treefetch.nix {}; + swhkd = callPackage ./swhkd {}; + vim-just = callPackage ./vim-just.nix {}; + xwaylandvideobridge = callPackage ./xwaylandvideobridge.nix {}; +} diff --git a/pkgs/default.nix b/pkgs/default.nix index 6a8f12e..8471def 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -1,21 +1,29 @@ -pkgs: let - inherit (pkgs) callPackage; -in { - # original packages - cfspeedtest = callPackage ./cfspeedtest.nix {}; - check-pr = callPackage ./check-pr.nix {}; - fastfetch = callPackage ./fastfetch.nix {}; - huion = callPackage ./huion.nix {}; - klassy = pkgs.libsForQt5.callPackage ./klassy.nix {}; - mommy = callPackage ./mommy.nix {}; - nixgc = callPackage ./nixgc.nix {}; - modrinth-app-unwrapped = callPackage ./modrinth-app { - inherit (pkgs.nodePackages) pnpm; - inherit (pkgs.darwin.apple_sdk.frameworks) CoreServices Security WebKit; +{ + self, + inputs, + ... +}: { + perSystem = { + lib, + pkgs, + system, + ... + }: { + _module.args.pkgs = import inputs.nixpkgs { + inherit system; + overlays = [self.overlays.default]; + }; + + packages = let + p = let + packages = import ./all-packages.nix pkgs; + in + lib.filterAttrs (_: v: + builtins.elem system (v.meta.platforms or []) && !(v.meta.broken or false)) + packages; + in + p // {default = p.treefetch;}; }; - modrinth-app = callPackage ./modrinth-app/wrapper.nix {}; - treefetch = callPackage ./treefetch.nix {}; - swhkd = callPackage ./swhkd {}; - vim-just = callPackage ./vim-just.nix {}; - xwaylandvideobridge = callPackage ./xwaylandvideobridge.nix {}; + + flake.overlays.default = final: _: import ./all-packages.nix final; } -- cgit v1.2.3