mdebray/tvl-depot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

chore(3p/nixpkgs): Bump unstable channel to 2021-06-14

Browse source 
Included fixes:

* 3p/apereo-cas: Don't use stdenv.lib
* grfn/system: Bump Linux to 5.12 (5.11 is gone)

Change-Id: Ie32d476e659ba482418d4035333c2797a7dbd106
Reviewed-on: https://cl.tvl.fyi/c/depot/+/3211
Reviewed-by: sterni <sternenseemann@systemli.org>
Reviewed-by: grfn <grfn@gws.fyi>
Tested-by: BuildkiteCI
This commit is contained in:
Vincent Ambo 2021-06-14 23:17:51 +02:00 committed by tazjin
parent 417d1c8a49
commit 1a4465d7d3
3 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
third_party/apereo-cas/default.nix vendored
View file

@ -1,4 +1,4 @@
{ pkgs, ... }:
{ pkgs, lib, ... }:
let
name = "apereo-cas-${version}";
@ -8,7 +8,7 @@ let
jdk = pkgs.jdk11;
gradle = pkgs.gradle_6;
meta = with pkgs.stdenvNoCC.lib; {
meta = with lib; {
homepage = "https://www.apereo.org/projects/cas";
description = "CAS provides enterprise single sign-on for the Web";
platforms = platforms.linux;

6
third_party/nixpkgs/default.nix vendored
View file

@ -13,10 +13,10 @@ let
# nixos-unstable, and the current stable channel of the latest NixOS
# release.
# Tracking nixpkgs-unstable as of 2021-06-05.
# Tracking nixpkgs-unstable as of 2021-06-14.
unstableHashes = {
commit = "2a1c29ef4bacac06f9b677931027bf053952618c";
sha256 = "1gxkvp4bf222v23kpb7di8iay5gl2qyv5qwgmb10nzdr87avbcax";
commit = "432fc2d9a67f92e05438dff5fdc2b39d33f77997";
sha256 = "0npj480pxjzl5vjsbijsn275z48jpqpjp0q5xbwpr3fx6m8lcvr6";
};
# Tracking nixos-21.05 as of 2021-06-02.

4
users/grfn/system/system/modules/kernel.nix
View file

@ -11,7 +11,7 @@ let
name = "linux-ck-patch-${mm}-ck1.xz";
# example: http://ck.kolivas.org/patches/5.0/5.4/5.4-ck1/patch-5.4-ck1.xz
url = "http://ck.kolivas.org/patches/${mj}.0/${mm}/${mm}-ck1/patch-${mm}-ck1.xz";
sha256 = "14lfpq9hvq1amxrl0ayfid1d04kd35vwsvk1ppnqa87nqfkjq47c";
sha256 = "0z6x9vqks0b5sr47ip6zc4gva1j4g3swwdj7gjvgfwcqrakg44yw";
};
unpackPhase = ''
@ -24,7 +24,7 @@ let
};
in
{
boot.kernelPackages = pkgs.linuxPackages_5_11.extend (self: super: {
boot.kernelPackages = pkgs.linuxPackages_5_12.extend (self: super: {
kernel = super.kernel.override {
ignoreConfigErrors = true;
kernelPatches = super.kernel.kernelPatches ++ [{