public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #116335 from SuperSandro2000/move-aliases.nix

Browse Source
This commit is contained in:
Sandro
2021-04-05 04:07:15 +02:00
committed by GitHub
parent 7ffdeb358b f9bcee4ed5
commit 7c932296e0
237 changed files with 1074 additions and 515 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/os-specific/linux/autofs/default.nix
+2 -2
View File
@@ -1,5 +1,5 @@
{ lib, stdenv, fetchurl, flex, bison, linuxHeaders, libtirpc, mount, umount, nfs-utils, e2fsprogs
, libxml2, kerberos, kmod, openldap, sssd, cyrus_sasl, openssl, rpcsvc-proto }:
, libxml2, libkrb5, kmod, openldap, sssd, cyrus_sasl, openssl, rpcsvc-proto }:
let
version = "5.1.6";
@@ -36,7 +36,7 @@ in stdenv.mkDerivation {
#make install SUBDIRS="samples" # impure!
'';
buildInputs = [ linuxHeaders libtirpc libxml2 kerberos kmod openldap sssd
buildInputs = [ linuxHeaders libtirpc libxml2 libkrb5 kmod openldap sssd
openssl cyrus_sasl rpcsvc-proto ];
nativeBuildInputs = [ flex bison ];
pkgs/os-specific/linux/cifs-utils/default.nix
+2 -2
View File
@@ -1,5 +1,5 @@
{ stdenv, lib, fetchurl, autoreconfHook, docutils, pkg-config
, kerberos, keyutils, pam, talloc, python3 }:
, libkrb5, keyutils, pam, talloc, python3 }:
stdenv.mkDerivation rec {
pname = "cifs-utils";
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ autoreconfHook docutils pkg-config ];
buildInputs = [ kerberos keyutils pam talloc python3 ];
buildInputs = [ libkrb5 keyutils pam talloc python3 ];
configureFlags = [ "ROOTSBINDIR=$(out)/sbin" ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
# AC_FUNC_MALLOC is broken on cross builds.
pkgs/os-specific/linux/firmware/firmware-manager/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ rustPlatform, lib, fetchFromGitHub, lzma, pkg-config, openssl, dbus, glib, udev, cairo, pango, atk, gdk-pixbuf, gtk3, wrapGAppsHook }:
{ rustPlatform, lib, fetchFromGitHub, xz, pkg-config, openssl, dbus, glib, udev, cairo, pango, atk, gdk-pixbuf, gtk3, wrapGAppsHook }:
rustPlatform.buildRustPackage rec {
pname = "firmware-manager";
version = "0.1.2";
@@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec {
nativeBuildInputs = [ pkg-config wrapGAppsHook ];
buildInputs = [ lzma openssl dbus glib udev cairo pango atk gdk-pixbuf gtk3 ];
buildInputs = [ xz openssl dbus glib udev cairo pango atk gdk-pixbuf gtk3 ];
depsExtraArgs.postPatch = "make prefix='$(out)' toml-gen";
pkgs/os-specific/linux/firmware/system76-firmware/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ rustPlatform, lib, fetchFromGitHub, lzma, pkg-config, openssl, dbus, efibootmgr, makeWrapper }:
{ rustPlatform, lib, fetchFromGitHub, xz, pkg-config, openssl, dbus, efibootmgr, makeWrapper }:
rustPlatform.buildRustPackage rec {
pname = "system76-firmware";
# Check Makefile when updating, make sure postInstall matches make install
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
nativeBuildInputs = [ pkg-config makeWrapper ];
buildInputs = [ lzma openssl dbus ];
buildInputs = [ xz openssl dbus ];
cargoBuildFlags = [ "--workspace" ];
pkgs/os-specific/linux/gogoclient/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{lib, stdenv, fetchurl, openssl, nettools, iproute, sysctl}:
{lib, stdenv, fetchurl, openssl, nettools, iproute2, sysctl}:
let baseName = "gogoclient";
version = "1.2";
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
substituteInPlace "$out/template/linux.sh" \
--replace "/sbin/ifconfig" "${nettools}/bin/ifconfig" \
--replace "/sbin/route" "${nettools}/bin/route" \
--replace "/sbin/ip" "${iproute}/sbin/ip" \
--replace "/sbin/ip" "${iproute2}/sbin/ip" \
--replace "/sbin/sysctl" "${sysctl}/bin/sysctl"
sed -i -e 's/^.*Exec \$route -A.*$/& metric 128/' $out/template/linux.sh
'';
pkgs/os-specific/linux/hyperv-daemons/default.nix
+2 -2
View File
@@ -1,5 +1,5 @@
{ stdenv, lib, python, kernel, makeWrapper, writeText
, gawk, iproute }:
, gawk, iproute2 }:
let
libexec = "libexec/hypervkvpd";
@@ -42,7 +42,7 @@ let
postFixup = ''
wrapProgram $out/bin/hv_kvp_daemon \
--prefix PATH : $out/bin:${lib.makeBinPath [ gawk iproute ]}
--prefix PATH : $out/bin:${lib.makeBinPath [ gawk iproute2 ]}
'';
};
pkgs/os-specific/linux/iproute/mptcp.nix
+2 -2
View File
@@ -1,6 +1,6 @@
{ lib, iproute, fetchFromGitHub }:
{ lib, iproute2, fetchFromGitHub }:
iproute.overrideAttrs (oa: rec {
iproute2.overrideAttrs (oa: rec {
pname = "iproute_mptcp";
version = "0.95";
pkgs/os-specific/linux/ipsec-tools/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, fetchpatch, linuxHeaders, readline, openssl, flex, kerberos, pam }:
{ lib, stdenv, fetchurl, fetchpatch, linuxHeaders, readline, openssl, flex, libkrb5, pam }:
# TODO: These tools are supposed to work under NetBSD and FreeBSD as
# well, so I guess it's not appropriate to place this expression in
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
sha256 = "0b9gfbz78k2nj0k7jdlm5kajig628ja9qm0z5yksiwz22s3v7dlf";
};
buildInputs = [ readline openssl flex kerberos pam ];
buildInputs = [ readline openssl flex libkrb5 pam ];
patches = [
./dont-create-localstatedir-during-install.patch
pkgs/os-specific/linux/libcgroup/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, fetchpatch, pam, yacc, flex }:
{ lib, stdenv, fetchurl, fetchpatch, pam, bison, flex }:
stdenv.mkDerivation rec {
pname = "libcgroup";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
sha256 = "0lgvyq37gq84sk30sg18admxaj0j0p5dq3bl6g74a1ppgvf8pqz4";
};
buildInputs = [ pam yacc flex ];
buildInputs = [ pam bison flex ];
patches = [
(fetchpatch {
pkgs/os-specific/linux/nfs-utils/default.nix
+6 -6
View File
@@ -1,5 +1,5 @@
{ stdenv, fetchurl, fetchpatch, lib, pkg-config, util-linux, libcap, libtirpc, libevent
, sqlite, kerberos, kmod, libuuid, keyutils, lvm2, systemd, coreutils, tcp_wrappers
, sqlite, libkrb5, kmod, libuuid, keyutils, lvm2, systemd, coreutils, tcp_wrappers
, python3, buildPackages, nixosTests, rpcsvc-proto
, enablePython ? true
}:
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
buildInputs = [
libtirpc libcap libevent sqlite lvm2
libuuid keyutils kerberos tcp_wrappers
libuuid keyutils libkrb5 tcp_wrappers
] ++ lib.optional enablePython python3;
enableParallelBuilding = true;
@@ -33,15 +33,15 @@ stdenv.mkDerivation rec {
preConfigure =
''
substituteInPlace configure \
--replace '$dir/include/gssapi' ${lib.getDev kerberos}/include/gssapi \
--replace '$dir/bin/krb5-config' ${lib.getDev kerberos}/bin/krb5-config
--replace '$dir/include/gssapi' ${lib.getDev libkrb5}/include/gssapi \
--replace '$dir/bin/krb5-config' ${lib.getDev libkrb5}/bin/krb5-config
'';
configureFlags =
[ "--enable-gss"
"--enable-svcgss"
"--with-statedir=/var/lib/nfs"
"--with-krb5=${lib.getLib kerberos}"
"--with-krb5=${lib.getLib libkrb5}"
"--with-systemd=${placeholder "out"}/etc/systemd/system"
"--enable-libmount-mount"
"--with-pluginpath=${placeholder "lib"}/lib/libnfsidmap" # this installs libnfsidmap
@@ -106,7 +106,7 @@ stdenv.mkDerivation rec {
# https://bugzilla.kernel.org/show_bug.cgi?id=203793
doCheck = false;
disallowedReferences = [ (lib.getDev kerberos) ];
disallowedReferences = [ (lib.getDev libkrb5) ];
passthru.tests = {
nfs3-simple = nixosTests.nfs3.simple;
pkgs/os-specific/linux/openvswitch/lts.nix
+1 -1
View File
@@ -1,5 +1,5 @@
{ lib, stdenv, fetchurl, makeWrapper, pkg-config, util-linux, which
, procps, libcap_ng, openssl, python2, iproute , perl
, procps, libcap_ng, openssl, python2, perl
, automake, autoconf, libtool, kernel ? null }:
with lib;
pkgs/os-specific/linux/pam_krb5/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, pam, kerberos }:
{ lib, stdenv, fetchurl, pam, libkrb5 }:
stdenv.mkDerivation rec {
name = "pam-krb5-4.10";
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
sha256 = "09wzxd5zrj5bzqpb01qf148npj5k8hmd2bx2ij1qsy40hdxqyq79";
};
buildInputs = [ pam kerberos ];
buildInputs = [ pam libkrb5 ];
meta = with lib; {
homepage = "https://www.eyrie.org/~eagle/software/pam-krb5/";
pkgs/os-specific/linux/pcmciautils/default.nix
+2 -2
View File
@@ -1,5 +1,5 @@
{ config, lib, stdenv, fetchurl
, yacc, flex
, bison, flex
, sysfsutils, kmod, udev
, firmware ? config.pcmciaUtils.firmware or [] # Special pcmcia cards.
, configOpts ? config.pcmciaUtils.config or null # Special hardware (map memory & port & irq)
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
sha256 = "0sfm3w2n73kl5w7gb1m6q8gy5k4rgwvzz79n6yhs9w3sag3ix8sk";
};
buildInputs = [udev yacc sysfsutils kmod flex];
buildInputs = [udev bison sysfsutils kmod flex];
patchPhase = ''
sed -i "
pkgs/os-specific/linux/pipework/default.nix
+2 -2
View File
@@ -1,5 +1,5 @@
{ stdenv, lib, fetchFromGitHub, makeWrapper
, bridge-utils, iproute, lxc, openvswitch, docker, busybox, dhcpcd, dhcp
, bridge-utils, iproute2, lxc, openvswitch, docker, busybox, dhcpcd, dhcp
}:
stdenv.mkDerivation {
@@ -15,7 +15,7 @@ stdenv.mkDerivation {
installPhase = ''
install -D pipework $out/bin/pipework
wrapProgram $out/bin/pipework --prefix PATH : \
${lib.makeBinPath [ bridge-utils iproute lxc openvswitch docker busybox dhcpcd dhcp ]};
${lib.makeBinPath [ bridge-utils iproute2 lxc openvswitch docker busybox dhcpcd dhcp ]};
'';
meta = with lib; {
description = "Software-Defined Networking tools for LXC";
pkgs/os-specific/linux/ply/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ lib, stdenv, kernel, fetchFromGitHub, autoreconfHook, yacc, flex, p7zip, rsync }:
{ lib, stdenv, kernel, fetchFromGitHub, autoreconfHook, bison, flex, p7zip, rsync }:
assert kernel != null -> lib.versionAtLeast kernel.version "4.0";
@@ -7,7 +7,7 @@ let
in stdenv.mkDerivation {
pname = "ply";
inherit version;
nativeBuildInputs = [ autoreconfHook flex yacc p7zip rsync ];
nativeBuildInputs = [ autoreconfHook flex bison p7zip rsync ];
src = fetchFromGitHub {
owner = "iovisor";
pkgs/os-specific/linux/rdma-core/default.nix
+2 -2
View File
@@ -1,5 +1,5 @@
{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, docutils
, pandoc, ethtool, iproute, libnl, udev, python3, perl
, pandoc, ethtool, iproute2, libnl, udev, python3, perl
, makeWrapper
} :
@@ -18,7 +18,7 @@ in stdenv.mkDerivation {
};
nativeBuildInputs = [ cmake pkg-config pandoc docutils makeWrapper ];
buildInputs = [ libnl ethtool iproute udev python3 perl ];
buildInputs = [ libnl ethtool iproute2 udev python3 perl ];
cmakeFlags = [
"-DCMAKE_INSTALL_RUNDIR=/run"
pkgs/os-specific/linux/sssd/default.nix
+2 -2
View File
@@ -1,7 +1,7 @@
{ lib, stdenv, fetchurl, fetchpatch, glibc, augeas, dnsutils, c-ares, curl,
cyrus_sasl, ding-libs, libnl, libunistring, nss, samba, nfs-utils, doxygen,
python, python3, pam, popt, talloc, tdb, tevent, pkg-config, ldb, openldap,
pcre, kerberos, cifs-utils, glib, keyutils, dbus, fakeroot, libxslt, libxml2,
pcre, libkrb5, cifs-utils, glib, keyutils, dbus, fakeroot, libxslt, libxml2,
libuuid, ldap, systemd, nspr, check, cmocka, uid_wrapper,
nss_wrapper, ncurses, Po4a, http-parser, jansson,
docbook_xsl, docbook_xml_dtd_44,
@@ -62,7 +62,7 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
buildInputs = [ augeas dnsutils c-ares curl cyrus_sasl ding-libs libnl libunistring nss
samba nfs-utils doxygen python python3 popt
talloc tdb tevent pkg-config ldb pam openldap pcre kerberos
talloc tdb tevent pkg-config ldb pam openldap pcre libkrb5
cifs-utils glib keyutils dbus fakeroot libxslt libxml2
libuuid ldap systemd nspr check cmocka uid_wrapper
nss_wrapper ncurses Po4a http-parser jansson ];