Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 16dbe8e534ea
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: f6169667efaa
Choose a head ref
  • 3 commits
  • 1 file changed
  • 2 contributors

Commits on Nov 18, 2018

  1. rdma-core: 20.1 -> 21 

    Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/rdma-core/versions
    @r-ryantm
    r-ryantm committed Nov 18, 2018

    Verified

    This commit was signed with the committer’s verified signature.
    DuCanhGH Ngô Đức Anh
    GPG key ID: B5269D3A0E6B6D11
    Verified
    Learn about vigilant mode
    Copy the full SHA
    a3ffea5 View commit details

  2. rdma-core: add iproute to rxe_cfg tool 

    The rxe_cfg script switched from ifconfig
to iproute utility (ip).
    @markuskowa
    markuskowa committed Nov 18, 2018

    Verified

    This commit was signed with the committer’s verified signature.
    DuCanhGH Ngô Đức Anh
    GPG key ID: B5269D3A0E6B6D11
    Verified
    Learn about vigilant mode
    Copy the full SHA
    8dc5cea View commit details

  3. Merge pull request #50576 from r-ryantm/auto-update/rdma-core 

    rdma-core: 20.1 -> 21
    @markuskowa
    markuskowa authored Nov 18, 2018

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    f616966 View commit details
Showing with 6 additions and 5 deletions.
  1. +6 −5 pkgs/os-specific/linux/rdma-core/default.nix
11 changes: 6 additions & 5 deletions pkgs/os-specific/linux/rdma-core/default.nix
View file
Original file line number Diff line number Diff line change
@@ -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; {