From 1a4465d7d3726e61cf95c6455330f779d760f5db Mon Sep 17 00:00:00 2001 From: Vincent Ambo Date: Mon, 14 Jun 2021 23:17:51 +0200 Subject: chore(3p/nixpkgs): Bump unstable channel to 2021-06-14 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 Reviewed-by: grfn Tested-by: BuildkiteCI --- third_party/apereo-cas/default.nix | 4 ++-- third_party/nixpkgs/default.nix | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'third_party') diff --git a/third_party/apereo-cas/default.nix b/third_party/apereo-cas/default.nix index e9930774ec..bda607c072 100644 --- a/third_party/apereo-cas/default.nix +++ b/third_party/apereo-cas/default.nix @@ -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; diff --git a/third_party/nixpkgs/default.nix b/third_party/nixpkgs/default.nix index fdbd619cfa..681c8b1b9d 100644 --- a/third_party/nixpkgs/default.nix +++ b/third_party/nixpkgs/default.nix @@ -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. -- cgit 1.4.1