diff --git a/flake.nix b/flake.nix index 1168c76..ee872eb 100644 --- a/flake.nix +++ b/flake.nix @@ -97,18 +97,7 @@ } // (nixpkgs.legacyPackages."${system}".callPackage ./_sources/generated.nix {}); - # TODO: track nixos/nixpkgs#263599 - pkgList = system: callPackage: let - nixpkgs-freecad = - import (nixpkgs.legacyPackages.${system}.fetchFromGitHub { - owner = "andir"; - repo = "nixpkgs"; - rev = "084890f7f50d23eb48a9a4b75b8a7893d5a01026"; - hash = "sha256-q7Y/KNKsny6Ey5kMIdXS1xhV2R9u94qTek2Uy7HzN+U="; - }) { - inherit system; - }; - in + pkgList = system: callPackage: (import ./pkgs/default.nix { inherit callPackage; sources = sources system; @@ -118,7 +107,6 @@ raclette = inputs.raclette.defaultPackage."${system}"; neovimTraxys = inputs.nvim-traxys.packages."${system}".nvim; roaming_proxy = inputs.roaming_proxy.defaultPackage."${system}"; - inherit (nixpkgs-freecad) freecad; inherit (nixpkgs-traxys.legacyPackages."${system}") groovy-language-server; inherit (inputs.mujmap.packages."${system}") mujmap; };