From 64eb016b66982c717d9d77cd6d1f9a2b977cabd7 Mon Sep 17 00:00:00 2001 From: Atemu Date: Mon, 2 Nov 2020 17:31:44 +0100 Subject: release/package-config: port nixos-search's additions https://github.com/NixOS/nixos-search/commit/c420d058156320d7bd80194cac1a0770fd10f10d#diff-c1e4b734102f2931f4cddbcf9b4624bd74ee25eb5e6fcab151c4fa7e931cad4e --- pkgs/top-level/packages-config.nix | 38 ++++++++++++++++++++++++++++++++++---- 1 file changed, 34 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/packages-config.nix b/pkgs/top-level/packages-config.nix index 8ce855780cf9..4746f6299429 100644 --- a/pkgs/top-level/packages-config.nix +++ b/pkgs/top-level/packages-config.nix @@ -6,8 +6,38 @@ # Enable recursion into attribute sets that nix-env normally doesn't look into # so that we can get a more complete picture of the available packages for the # purposes of the index. - packageOverrides = super: { - haskellPackages = super.recurseIntoAttrs super.haskellPackages; - rPackages = super.recurseIntoAttrs super.rPackages; - }; + packageOverrides = super: + let + recurseIntoAttrs = sets: + super.lib.genAttrs + (builtins.filter (set: builtins.hasAttr set super) sets) + (set: super.recurseIntoAttrs (builtins.getAttr set super)); + in recurseIntoAttrs [ + "roundcubePlugins" + "emscriptenfastcompPackages" + "fdbPackages" + "nodePackages_latest" + "nodePackages" + "platformioPackages" + "haskellPackages" + "idrisPackages" + "sconsPackages" + "gns3Packages" + "quicklispPackagesClisp" + "quicklispPackagesSBCL" + "rPackages" + "apacheHttpdPackages_2_4" + "zabbix44" + "zabbix40" + "zabbix30" + "fusePackages" + "nvidiaPackages" + "sourceHanPackages" + "atomPackages" + "emacs25Packages" + "emacs26Packages" + "steamPackages" + "ut2004Packages" + "zeroadPackages" + ]; } -- cgit v1.2.3 From 534223201d8c00b0bc38d3c806d838fef469a127 Mon Sep 17 00:00:00 2001 From: Atemu Date: Fri, 4 Dec 2020 08:06:11 +0100 Subject: release/package-config: update package set versions NixOS-search uses a list with outdated packages sets because it needs to stay compatible with stable branches --- pkgs/top-level/packages-config.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/packages-config.nix b/pkgs/top-level/packages-config.nix index 4746f6299429..52ad7aecd284 100644 --- a/pkgs/top-level/packages-config.nix +++ b/pkgs/top-level/packages-config.nix @@ -27,15 +27,15 @@ "quicklispPackagesSBCL" "rPackages" "apacheHttpdPackages_2_4" - "zabbix44" + "zabbix50" "zabbix40" "zabbix30" "fusePackages" "nvidiaPackages" "sourceHanPackages" "atomPackages" - "emacs25Packages" "emacs26Packages" + "emacs27Packages" "steamPackages" "ut2004Packages" "zeroadPackages" -- cgit v1.2.3