dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

all-packages.nix: cleanup a bit

Browse Source
This commit is contained in:
Jan Malakhovski 2018-08-18 18:15:14 +00:00
parent 1ee3c294bf
commit 033ed93da2
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/top-level/all-packages.nix
View File

@ -8496,7 +8496,7 @@ with pkgs;
gn = callPackage ../development/tools/build-managers/gn { }; gn = callPackage ../development/tools/build-managers/gn { };
nixbang = callPackage ../development/tools/misc/nixbang { nixbang = callPackage ../development/tools/misc/nixbang {
pythonPackages = python3Packages; pythonPackages = python3Packages;
}; };
nexus = callPackage ../development/tools/repository-managers/nexus { }; nexus = callPackage ../development/tools/repository-managers/nexus { };
@ -12827,8 +12827,8 @@ with pkgs;
rdf4store = callPackage ../servers/http/4store { }; rdf4store = callPackage ../servers/http/4store { };
apacheHttpd = pkgs.apacheHttpd_2_4;
apacheHttpd_2_4 = callPackage ../servers/http/apache-httpd/2.4.nix { }; apacheHttpd_2_4 = callPackage ../servers/http/apache-httpd/2.4.nix { };
apacheHttpd = pkgs.apacheHttpd_2_4;
apacheHttpdPackagesFor = apacheHttpd: self: let callPackage = newScope self; in { apacheHttpdPackagesFor = apacheHttpd: self: let callPackage = newScope self; in {
inherit apacheHttpd; inherit apacheHttpd;
@ -12852,8 +12852,8 @@ with pkgs;
subversion = pkgs.subversion.override { httpServer = true; inherit apacheHttpd; }; subversion = pkgs.subversion.override { httpServer = true; inherit apacheHttpd; };
}; };
apacheHttpdPackages = apacheHttpdPackagesFor pkgs.apacheHttpd pkgs.apacheHttpdPackages;
apacheHttpdPackages_2_4 = apacheHttpdPackagesFor pkgs.apacheHttpd_2_4 pkgs.apacheHttpdPackages_2_4; apacheHttpdPackages_2_4 = apacheHttpdPackagesFor pkgs.apacheHttpd_2_4 pkgs.apacheHttpdPackages_2_4;
apacheHttpdPackages = apacheHttpdPackages_2_4;
appdaemon = callPackage ../servers/home-assistant/appdaemon.nix { }; appdaemon = callPackage ../servers/home-assistant/appdaemon.nix { };