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

Merge remote-tracking branch 'origin/master' into staging-next

Browse Source 
Conflicts:
 pkgs/tools/networking/xh/default.nix
This commit is contained in:
Jonathan Ringer
2021-05-22 18:19:10 -07:00
parent 563389a7fd 6543c61311
commit 11a9ac00fc
157 changed files with 1479 additions and 591 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,7 +1,7 @@
{ lib, stdenv, buildLinux, fetchFromGitHub, ... } @ args:
let
version = "5.11.16";
version = "5.12.5";
suffix = "xanmod1-cacule";
in
buildLinux (args // rec {
@@ -12,14 +12,14 @@ in
owner = "xanmod";
repo = "linux";
rev = modDirVersion;
sha256 = "sha256-sK2DGJsmKP/gvPyT8HWjPa21OOXydMhGjJzrOkPo71Q=";
sha256 = "sha256-u9ebl2M8zrCNdangcUdk/78KwPCYV41PIB6YKTqCgIY=";
extraPostFetch = ''
rm $out/.config
'';
};
extraMeta = {
branch = "5.11";
branch = "5.12-cacule";
maintainers = with lib.maintainers; [ fortuneteller2k ];
description = "Built with custom settings and new features built to provide a stable, responsive and smooth desktop experience";
broken = stdenv.hostPlatform.isAarch64;