Merge master into staging-next

2021-02-22 06:17:05 +00:00
parent d8f2a7bf5c 9552143266
commit 227aa2c9b0
31 changed files with 282 additions and 107 deletions
@@ -2,11 +2,11 @@

 stdenv.mkDerivation rec {
  pname = "ipset";
-  version = "7.10";
+  version = "7.11";

  src = fetchurl {
    url = "http://ipset.netfilter.org/${pname}-${version}.tar.bz2";
-    sha256 = "sha256-skkGukPi/jIr1BhjR2dh10mkvd9c5MImW6BLA7x+nPY=";
+    sha256 = "sha256-MVG6rTDx2eMXsqtPL1qnqfe03BH8+P5zrNDcC126v30=";
  };

  nativeBuildInputs = [ pkg-config ];