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: 5935d5a45e53
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 54ad1d8d4136
Choose a head ref
  • 3 commits
  • 1 file changed
  • 1 contributor

Commits on Sep 4, 2019

  1. libnl: 3.4.0 -> 3.5.0 

    https://lists.infradead.org/pipermail/libnl/2019-September/002415.html

FWIW:
> The previous 3.4.0 release was in October 2017
    @dtzWill
    dtzWill committed Sep 4, 2019

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    dtzWill Will Dietz
    GPG key ID: EBB0EA4124809D02
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    725bf6f View commit details

  2. libnl: drop musl patch, optimistically. 

    Builds, at least, without it :).
    @dtzWill
    dtzWill committed Sep 4, 2019

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    dtzWill Will Dietz
    GPG key ID: EBB0EA4124809D02
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    0468918 View commit details

Commits on Oct 7, 2019

  1. Merge pull request #68051 from dtzWill/update/libnl-3.5 

    libnl: 3.4.0 -> 3.5.0, drop musl patch
    @dtzWill
    dtzWill authored Oct 7, 2019

    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
    54ad1d8 View commit details
Showing with 3 additions and 9 deletions.
  1. +3 −9 pkgs/os-specific/linux/libnl/default.nix
12 changes: 3 additions & 9 deletions pkgs/os-specific/linux/libnl/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,25 +1,19 @@
{ stdenv, file, lib, fetchFromGitHub, fetchpatch, autoreconfHook, bison, flex, pkgconfig
{ stdenv, file, lib, fetchFromGitHub, autoreconfHook, bison, flex, pkgconfig
, pythonSupport ? stdenv.buildPlatform == stdenv.hostPlatform, swig ? null, python}:

stdenv.mkDerivation rec {
pname = "libnl";
version = "3.4.0";
version = "3.5.0";

src = fetchFromGitHub {
repo = "libnl";
owner = "thom311";
rev = "libnl${lib.replaceStrings ["."] ["_"] version}";
sha256 = "1bqf1f5glwf285sa98k5pkj9gg79lliixk1jk85j63v5510fbagp";
sha256 = "1ak30jcx52gl5yz1691qq0b76ldbcp2z6vsvdr2mrrwqiplqbcs2";
};

outputs = [ "bin" "dev" "out" "man" ] ++ lib.optional pythonSupport "py";

patches = stdenv.lib.optional stdenv.hostPlatform.isMusl
(fetchpatch {
url = "https://raw.githubusercontent.com/gentoo/musl/48d2a28710ae40877fd3e178ead1fb1bb0baa62c/dev-libs/libnl/files/libnl-3.3.0_rc1-musl.patch";
sha256 = "0dd7xxikib201i99k2if066hh7gwf2i4ffckrjplq6lr206jn00r";
});

enableParallelBuilding = true;

nativeBuildInputs = [ autoreconfHook bison flex pkgconfig file ]