From a0a6a3df88e6d1d3542dee0e8d7c8f71fb8293b9 Mon Sep 17 00:00:00 2001 From: Alexander Ried Date: Fri, 29 Apr 2016 04:42:30 +0200 Subject: [PATCH] libcap: Move old libcap_* aliases to aliases.nix --- pkgs/top-level/aliases.nix | 3 +++ pkgs/top-level/all-packages.nix | 6 ------ 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 266313c81e1..964e7841344 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -54,6 +54,9 @@ doNotDisplayTwice rec { joseki = apache-jena-fuseki; # added 2016-02-28 jquery_ui = jquery-ui; # added 2014-09-07 libdbusmenu_qt5 = qt5.libdbusmenu; # added 2015-12-19 + libcap_manpages = libcap.doc; # added 2016-04-29 + libcap_pam = if stdenv.isLinux then libcap.pam else null; # added 2016-04-29 + libcap_progs = libcap.out; # added 2016-04-29 libtidy = html-tidy; # added 2014-12-21 links = links2; # added 2016-01-31 lttngTools = lttng-tools; # added 2014-07-31 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 911326d023e..66a60a9cfa4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10913,12 +10913,6 @@ in libcap = callPackage ../os-specific/linux/libcap { }; - libcap_progs = libcap.out; - - libcap_pam = if stdenv.isLinux then libcap.pam else null; - - libcap_manpages = libcap.doc; - libcap_ng = callPackage ../os-specific/linux/libcap-ng { swig = null; # Currently not using the python2/3 bindings python2 = null; # Currently not using the python2 bindings