public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge release-21.05 into staging-next-21.05

Browse Source
This commit is contained in:
github-actions[bot] 2021-07-06 00:02:35 +00:00 committed by GitHub
commit 2cba83ecca
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/os-specific/linux/kernel/linux-xanmod.nix
View File

@ -1,7 +1,7 @@
{ lib, stdenv, buildLinux, fetchFromGitHub, ... } @ args: { lib, stdenv, buildLinux, fetchFromGitHub, ... } @ args:
let let
version = "5.12.12"; version = "5.12.13";
suffix = "xanmod1-cacule"; suffix = "xanmod1-cacule";
in in
buildLinux (args // rec { buildLinux (args // rec {
@ -12,7 +12,7 @@ buildLinux (args // rec {
owner = "xanmod"; owner = "xanmod";
repo = "linux"; repo = "linux";
rev = modDirVersion; rev = modDirVersion;
sha256 = "sha256-99gVqdYhnBx3MDTCCHbxsljmvi+DixHp19vtNwCRM/M="; sha256 = "sha256-eFIWlguU1hnkAgTbRxSMTStq0X7XW4IT1/9XlQSgdMQ=";
}; };
extraMeta = { extraMeta = {

4
pkgs/tools/networking/tcpdump/default.nix
View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "tcpdump"; pname = "tcpdump";
version = "4.99.0"; version = "4.99.1";
src = fetchurl { src = fetchurl {
url = "http://www.tcpdump.org/release/${pname}-${version}.tar.gz"; url = "http://www.tcpdump.org/release/${pname}-${version}.tar.gz";
sha256 = "0hmqh2fx8rgs9v1mk3vpywj61xvkifz260q685xllxr8jmxg3wlc"; sha256 = "sha256-ebNphfsnAxRmGNh8Ss3j4Gi5HFU/uT8CGjN/F1/RDr4=";
}; };
postPatch = '' postPatch = ''

1
pkgs/top-level/all-packages.nix
View File

@ -20477,7 +20477,6 @@ in
kernelPatches = [ kernelPatches = [
kernelPatches.bridge_stp_helper kernelPatches.bridge_stp_helper
kernelPatches.request_key_helper kernelPatches.request_key_helper
kernelPatches.rtnetlink_fix_regression_in_bridge_vlan_configuration
]; ];
}; };