diff options
Diffstat (limited to 'pkgs/os-specific')
-rw-r--r-- | pkgs/os-specific/linux/rdma-core/default.nix | 11 | ||||
-rw-r--r-- | pkgs/os-specific/linux/uclibc/default.nix | 4 |
2 files changed, 8 insertions, 7 deletions
diff --git a/pkgs/os-specific/linux/rdma-core/default.nix b/pkgs/os-specific/linux/rdma-core/default.nix index ecfd8581ca9d..8f2c834672f5 100644 --- a/pkgs/os-specific/linux/rdma-core/default.nix +++ b/pkgs/os-specific/linux/rdma-core/default.nix @@ -1,9 +1,9 @@ { stdenv, fetchFromGitHub, cmake, pkgconfig, pandoc -, ethtool, nettools, libnl, udev, python, perl +, ethtool, iproute, libnl, udev, python, perl } : let - version = "20.1"; + version = "21"; in stdenv.mkDerivation { name = "rdma-core-${version}"; @@ -12,11 +12,11 @@ in stdenv.mkDerivation { owner = "linux-rdma"; repo = "rdma-core"; rev = "v${version}"; - sha256 = "1j6d3n4wzl04m0k4nxbmahfwc094185d5jyijgvg3z5hwwb8lkwv"; + sha256 = "0q4hdm14f1xz2h0m5d821fdyp7i917rvmkas5axmfr1myv5422fl"; }; nativeBuildInputs = [ cmake pkgconfig pandoc ]; - buildInputs = [ libnl ethtool nettools udev python perl ]; + buildInputs = [ libnl ethtool iproute udev python perl ]; cmakeFlags = [ "-DCMAKE_INSTALL_RUNDIR=/run" @@ -26,7 +26,8 @@ in stdenv.mkDerivation { postPatch = '' substituteInPlace providers/rxe/rxe_cfg.in \ --replace ethtool "${ethtool}/bin/ethtool" \ - --replace ifconfig "${nettools}/bin/ifconfig" + --replace 'ip addr' "${iproute}/bin/ip addr" \ + --replace 'ip link' "${iproute}/bin/ip link" ''; meta = with stdenv.lib; { diff --git a/pkgs/os-specific/linux/uclibc/default.nix b/pkgs/os-specific/linux/uclibc/default.nix index de1e47faf666..c07e063caa71 100644 --- a/pkgs/os-specific/linux/uclibc/default.nix +++ b/pkgs/os-specific/linux/uclibc/default.nix @@ -48,7 +48,7 @@ let UCLIBC_HAS_FPU n ''; - version = "1.0.30"; + version = "1.0.31"; in stdenv.mkDerivation { @@ -58,7 +58,7 @@ stdenv.mkDerivation { src = fetchurl { url = "https://downloads.uclibc-ng.org/releases/${version}/uClibc-ng-${version}.tar.bz2"; # from "${url}.sha256"; - sha256 = "3e0f057f24882823d697126015aa4d7d48fa2542be3939985cb3c26dcbcab5a8"; + sha256 = "0ba9yh7ir1jamrgc9x9v7zw0sw144f78q4vidiz6ynpr4dwbd5qm"; }; # 'ftw' needed to build acl, a coreutils dependency |