chore(3p): Bump nixpkgs channels

Bumps both nixos-unstable and nixos-20.03 to today's versions, as per
status.nixos.org

Contains minor fixes to things that broke because of the update:

* tazjin/frog: hardware.u2f is a deprecated setting
* glittershark/system: modSha256 in Go modules is now vendorSha256
* glittershark/owothia: removed version constraint on relude

Change-Id: Ib3e9612b1b06ed547b90e4f8b0ffe5ed7fe0a5c4
Reviewed-on: https://cl.tvl.fyi/c/depot/+/1642
Tested-by: BuildkiteCI
Reviewed-by: glittershark <grfn@gws.fyi>
This commit is contained in:
Vincent Ambo 2020-08-04 18:43:41 +01:00 committed by tazjin
parent 68b5306c56
commit d42c3dd72f
10 changed files with 91 additions and 21 deletions

View file

@ -5,7 +5,7 @@ version: 0.0.1.0
executable owothia
main-is: Main.hs
build-depends: base
, relude ^>= 0.6.0.0
, relude
, irc-client
, lens
, chatter

View file

@ -20,7 +20,8 @@ let
sha256 = "1an4h8jjbj3r618ykjwk9brii4h9cxjqy47c4c8rivnvhimgf4wm";
};
modSha256 = "07ci2726nrn8qjvwcypk6nf8zqmfnmvch8l28bmgj7hpfrbyb424";
vendorSha256 = "1a5fx6mrv30cl46kswicd8lf5i5shn1fykchvbnbhdpgxhbz6qi4";
deleteVendor = true;
};
in

View file

@ -16,6 +16,7 @@ in
{
boot.kernelPackages = pkgs.linuxPackages.extend (self: super: {
kernel = super.kernel.override {
ignoreConfigErrors = true;
kernelPatches = super.kernel.kernelPatches ++ [{
name = "linux-ck";
patch = linux-ck;

View file

@ -304,16 +304,9 @@ instance forall t name. (NFData t, Monoid t, NFData name)
=> NFData (Editor t name) where
rnf ed = getName @_ @name ed `deepseq` getEditContents ed `deepseq` ()
instance NFData StdGen where
-- StdGen's fields are bang-patterned so this is actually correct!
rnf sg = sg `seq` ()
deriving via (ReadShowJSON StdGen) instance ToJSON StdGen
deriving via (ReadShowJSON StdGen) instance FromJSON StdGen
instance Function StdGen where
function = functionShow
--------------------------------------------------------------------------------
instance CoArbitrary a => CoArbitrary (NonNull a) where

View file

@ -51,7 +51,6 @@ in depot.lib.fix(self: {
hardware = {
cpu.amd.updateMicrocode = true;
enableRedistributableFirmware = true;
u2f.enable = true;
opengl = {
enable = true;
driSupport = true;