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: cb7c51a27541
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 0f9a4a2e556b
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Jan 11, 2020

  1. ipset: 7.4 -> 7.5, pname

    @dtzWill
    dtzWill committed Jan 11, 2020

    Unverified

    This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
    Learn about vigilant mode
    Copy the full SHA
    49638e3 View commit details

  2. Merge pull request #77488 from dtzWill/update/ipset-7.5 

    ipset: 7.4 -> 7.5, pname
    @markuskowa
    markuskowa authored Jan 11, 2020

    Unverified

    This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
    Learn about vigilant mode
    Copy the full SHA
    0f9a4a2 View commit details
Showing with 4 additions and 3 deletions.
  1. +4 −3 pkgs/os-specific/linux/ipset/default.nix
7 changes: 4 additions & 3 deletions pkgs/os-specific/linux/ipset/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
{ stdenv, fetchurl, pkgconfig, libmnl }:

stdenv.mkDerivation rec {
name = "ipset-7.4";
pname = "ipset";
version = "7.5";

src = fetchurl {
url = "http://ipset.netfilter.org/${name}.tar.bz2";
sha256 = "110q996yrf74ckpkc5f4pn8j5bqq98f27fsak3ibgr3zwmv435sa";
url = "http://ipset.netfilter.org/${pname}-${version}.tar.bz2";
sha256 = "02vangpxdyyk9z84vc0ba1vbjvfnd6zlniisc029xzkgmdafwym5";
};

nativeBuildInputs = [ pkgconfig ];