Personal Nix flake
nixos home-manager nix
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

refactor: Remove lib.loaders.callPackage*

Those never worked quite right, so I'll just use
pkgs-by-name-for-flake-parts for now

+35 -41
+16
flake.lock
··· 1654 1654 "type": "github" 1655 1655 } 1656 1656 }, 1657 + "pkgs-by-name-for-flake-parts": { 1658 + "locked": { 1659 + "lastModified": 1769286518, 1660 + "narHash": "sha256-F7VlUICvYp2wJKyQqM6d46BNEZCzMQ6dMH9zbmjuybc=", 1661 + "owner": "drupol", 1662 + "repo": "pkgs-by-name-for-flake-parts", 1663 + "rev": "7ba1cd4a9a72c9c6c272018a63f090f2c912a171", 1664 + "type": "github" 1665 + }, 1666 + "original": { 1667 + "owner": "drupol", 1668 + "repo": "pkgs-by-name-for-flake-parts", 1669 + "type": "github" 1670 + } 1671 + }, 1657 1672 "poetry2nix": { 1658 1673 "inputs": { 1659 1674 "flake-utils": [ ··· 1821 1836 "nixpkgs-schemas": "nixpkgs-schemas", 1822 1837 "nixvim": "nixvim", 1823 1838 "nur": "nur", 1839 + "pkgs-by-name-for-flake-parts": "pkgs-by-name-for-flake-parts", 1824 1840 "spicetify-nix": "spicetify-nix", 1825 1841 "stable": "stable", 1826 1842 "stylix": "stylix",
+1
flake.nix
··· 110 110 }; 111 111 nix-std.url = "github:chessai/nix-std"; 112 112 nur.url = "github:nix-community/NUR"; 113 + pkgs-by-name-for-flake-parts.url = "github:drupol/pkgs-by-name-for-flake-parts"; 113 114 spicetify-nix = { 114 115 url = "github:Gerg-L/spicetify-nix"; 115 116 inputs.nixpkgs.follows = "nixpkgs";
-22
nix/lib/loaders.nix
··· 125 125 inherit path args; 126 126 filterFn = path: ! (lib.hasSuffix "default.nix" path); 127 127 }; 128 - 129 - # Runs callPackage on files ending in default.nix, always recursive 130 - callPackageDefault = path: pkgs: 131 - path 132 - |> (path: 133 - read { 134 - inherit path; 135 - filterFn = lib.hasSuffix "default.nix"; 136 - }) 137 - |> builtins.mapAttrs (_: path: 138 - lib.callPackageWith (removeAttrs pkgs ["root"]) path {}); 139 - 140 - # Runs callPackage on files not ending in default.nix, always recursive 141 - callPackageNonDefault = path: pkgs: 142 - path 143 - |> (path: 144 - read { 145 - inherit path; 146 - filterFn = path: ! (lib.hasSuffix "default.nix" path); 147 - }) 148 - |> builtins.mapAttrs (_: path: 149 - lib.callPackageWith (removeAttrs pkgs ["root"]) path {}); 150 128 }
+4 -5
nix/overlays/packages.nix
··· 1 - {inputs, ...}: final: prev: let 2 - inherit (inputs) self; 3 - inherit (prev.stdenv.hostPlatform) system; 4 - in 5 - self.packages.${system} or {} 1 + {inputs, ...} @ args: ( 2 + final: prev: 3 + import "${inputs.self}/nix/packages" args 4 + )
+14 -14
nix/packages/default.nix
··· 1 - args: let 2 - inherit ((import ../lib args).loaders) callPackageDefault callPackageNonDefault; 3 - in { 1 + {inputs, ...}: { 2 + imports = [ 3 + inputs.pkgs-by-name-for-flake-parts.flakeModule 4 + ]; 5 + 4 6 perSystem = { 5 7 inputs', 6 - self', 7 8 lib, 9 + pkgs, 8 10 ... 9 11 }: let 10 - inherit (self'.legacyPackages) pkgs; 11 12 callPackage = lib.callPackageWith pkgs; 12 13 in { 13 - packages = 14 - (callPackageDefault ./. pkgs) 15 - // (callPackageNonDefault ./. pkgs) 16 - // { 17 - lichen = 18 - callPackage 19 - ./lichen/package.nix 20 - {inherit (inputs'.nixpkgs-hare.legacyPackages) hare hareHook;}; 21 - }; 14 + pkgsDirectory = ./.; 15 + pkgsNameSeparator = "-"; 16 + packages = lib.mkForce { 17 + lichen = 18 + callPackage 19 + ./lichen/package.nix 20 + {inherit (inputs'.nixpkgs-hare.legacyPackages) hare hareHook;}; 21 + }; 22 22 }; 23 23 }