From b77d450779b6555817f6f9808553564ace70eafd Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 4 Jul 2021 17:52:29 +0200 Subject: [PATCH 1/2] tcpdump: 4.99.0 -> 4.99.1 (cherry picked from commit 228adbbf7151ba2aad2cc8a4f103001d2bd20107) --- pkgs/tools/networking/tcpdump/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/tcpdump/default.nix b/pkgs/tools/networking/tcpdump/default.nix index f1fe0527639..6726e5b751a 100644 --- a/pkgs/tools/networking/tcpdump/default.nix +++ b/pkgs/tools/networking/tcpdump/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "tcpdump"; - version = "4.99.0"; + version = "4.99.1"; src = fetchurl { url = "http://www.tcpdump.org/release/${pname}-${version}.tar.gz"; - sha256 = "0hmqh2fx8rgs9v1mk3vpywj61xvkifz260q685xllxr8jmxg3wlc"; + sha256 = "sha256-ebNphfsnAxRmGNh8Ss3j4Gi5HFU/uT8CGjN/F1/RDr4="; }; postPatch = '' From 3cd12115c5c02ce3409afd233a71ccf34f79e0dc Mon Sep 17 00:00:00 2001 From: fortuneteller2k Date: Thu, 24 Jun 2021 11:45:02 +0800 Subject: [PATCH 2/2] linux_xanmod: 5.12.12 -> 5.12.13 (cherry picked from commit 419e4299a6a393fb514048dfe57a391f939a721b) --- pkgs/os-specific/linux/kernel/linux-xanmod.nix | 4 ++-- pkgs/top-level/all-packages.nix | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-xanmod.nix b/pkgs/os-specific/linux/kernel/linux-xanmod.nix index 4d6ff1ce76b..5940d9e33b6 100644 --- a/pkgs/os-specific/linux/kernel/linux-xanmod.nix +++ b/pkgs/os-specific/linux/kernel/linux-xanmod.nix @@ -1,7 +1,7 @@ { lib, stdenv, buildLinux, fetchFromGitHub, ... } @ args: let - version = "5.12.12"; + version = "5.12.13"; suffix = "xanmod1-cacule"; in buildLinux (args // rec { @@ -12,7 +12,7 @@ buildLinux (args // rec { owner = "xanmod"; repo = "linux"; rev = modDirVersion; - sha256 = "sha256-99gVqdYhnBx3MDTCCHbxsljmvi+DixHp19vtNwCRM/M="; + sha256 = "sha256-eFIWlguU1hnkAgTbRxSMTStq0X7XW4IT1/9XlQSgdMQ="; }; extraMeta = { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9343baee093..6e5cd93bc2e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20477,7 +20477,6 @@ in kernelPatches = [ kernelPatches.bridge_stp_helper kernelPatches.request_key_helper - kernelPatches.rtnetlink_fix_regression_in_bridge_vlan_configuration ]; };