diff options
| author | Vincent Ambo <mail@tazj.in> | 2020-08-04T17·43+0100 |
|---|---|---|
| committer | tazjin <mail@tazj.in> | 2020-08-06T00·15+0000 |
| commit | d42c3dd72f3294f2a5af9bd66858d36aedce32a8 (patch) | |
| tree | 8e2ca7ae5c8f4fc0e1f00a6864c7ce2a1d1869e3 /users/glittershark | |
| parent | 68b5306c562c30df5ede227b451eadbf92c5c311 (diff) | |
chore(3p): Bump nixpkgs channels r/1604
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>
Diffstat (limited to 'users/glittershark')
4 files changed, 4 insertions, 9 deletions
diff --git a/users/glittershark/owothia/owothia.cabal b/users/glittershark/owothia/owothia.cabal index 63c438fb8a..ef5477ea1b 100644 --- a/users/glittershark/owothia/owothia.cabal +++ b/users/glittershark/owothia/owothia.cabal @@ -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 diff --git a/users/glittershark/system/home/modules/development.nix b/users/glittershark/system/home/modules/development.nix index aef0c3e6fd..4e34bcfb0f 100644 --- a/users/glittershark/system/home/modules/development.nix +++ b/users/glittershark/system/home/modules/development.nix @@ -20,7 +20,8 @@ let sha256 = "1an4h8jjbj3r618ykjwk9brii4h9cxjqy47c4c8rivnvhimgf4wm"; }; - modSha256 = "07ci2726nrn8qjvwcypk6nf8zqmfnmvch8l28bmgj7hpfrbyb424"; + vendorSha256 = "1a5fx6mrv30cl46kswicd8lf5i5shn1fykchvbnbhdpgxhbz6qi4"; + deleteVendor = true; }; in diff --git a/users/glittershark/system/system/modules/kernel.nix b/users/glittershark/system/system/modules/kernel.nix index 92aa6955a7..bad6845ff7 100644 --- a/users/glittershark/system/system/modules/kernel.nix +++ b/users/glittershark/system/system/modules/kernel.nix @@ -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; diff --git a/users/glittershark/xanthous/src/Xanthous/Orphans.hs b/users/glittershark/xanthous/src/Xanthous/Orphans.hs index 8e82c372b2..39821150ef 100644 --- a/users/glittershark/xanthous/src/Xanthous/Orphans.hs +++ b/users/glittershark/xanthous/src/Xanthous/Orphans.hs @@ -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 |