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:
parent
68b5306c56
commit
d42c3dd72f
10 changed files with 91 additions and 21 deletions
|
@ -102,7 +102,9 @@ in lib.fix (self: {
|
|||
hgeometry-combinatorial
|
||||
vinyl
|
||||
comonad-extras
|
||||
depot.third_party.haskell-language-server.ghc883
|
||||
|
||||
# TODO(grfn): Disabled because of build errors with recent nixpkgs
|
||||
# depot.third_party.haskell-language-server.ghc883
|
||||
];
|
||||
|
||||
# User-specific build targets
|
||||
|
@ -116,7 +118,7 @@ in lib.fix (self: {
|
|||
];
|
||||
|
||||
glittershark = with depot.users.glittershark; [
|
||||
xanthous
|
||||
# xanthous
|
||||
keyboard.layout
|
||||
owothia
|
||||
|
||||
|
|
12
third_party/default.nix
vendored
12
third_party/default.nix
vendored
|
@ -5,11 +5,11 @@
|
|||
{ ... }:
|
||||
|
||||
let
|
||||
# Tracking nixos-unstable as of 2020-06-10.
|
||||
nixpkgsCommit = "467ce5a9f45aaf96110b41eb863a56866e1c2c3c";
|
||||
# Tracking nixos-unstable as of 2020-08-04.
|
||||
nixpkgsCommit = "840c782d507d60aaa49aa9e3f6d0b0e780912742";
|
||||
nixpkgsSrc = fetchTarball {
|
||||
url = "https://github.com/NixOS/nixpkgs-channels/archive/${nixpkgsCommit}.tar.gz";
|
||||
sha256 = "0qz7wgi61pdb335n18xm8rfwddckwv0vg8n7fii5abrrx47vnqcj";
|
||||
sha256 = "14q3kvnmgz19pgwyq52gxx0cs90ddf24pnplmq33pdddbb6c51zn";
|
||||
};
|
||||
nixpkgs = import nixpkgsSrc {
|
||||
config.allowUnfree = true;
|
||||
|
@ -21,11 +21,11 @@ let
|
|||
];
|
||||
};
|
||||
|
||||
# Tracking nixos-20.03 as of 2020-05-22
|
||||
stableCommit = "48723f48ab92381f0afd50143f38e45cf3080405";
|
||||
# Tracking nixos-20.03 as of 2020-08-04.
|
||||
stableCommit = "977000f149bd4ddb65bf1af09552898a0f305c72";
|
||||
stableNixpkgsSrc = fetchTarball {
|
||||
url = "https://github.com/NixOS/nixpkgs-channels/archive/${stableCommit}.tar.gz";
|
||||
sha256 = "0h3b3l867j3ybdgimfn76lw7w6yjhszd5x02pq5827l659ihcf53";
|
||||
sha256 = "1ad3bviywxd64g4vwk4ppjkkajd3rfqjhnp6xcz3w0ih0sbn0rh5";
|
||||
};
|
||||
stableNixpkgs = import stableNixpkgsSrc {};
|
||||
|
||||
|
|
4
third_party/haskell-language-server/hls.nix
vendored
4
third_party/haskell-language-server/hls.nix
vendored
|
@ -192,8 +192,8 @@ let
|
|||
|
||||
semialign = self.callHackageDirect {
|
||||
pkg = "semialign";
|
||||
ver = "1.1";
|
||||
sha256 = "01wj9sv44y95zvidclvl3qkxrg777n46f1qxwnzq0mw2a9mi6frz";
|
||||
ver = "1.1.0.1";
|
||||
sha256 = "1xs5dvz87gx6xnannw6bc70nzr8ffhk0j6n7n0p5dqair9sz77x4";
|
||||
} {};
|
||||
|
||||
semigroups = self.callHackageDirect {
|
||||
|
|
74
third_party/haskell_overlay/default.nix
vendored
74
third_party/haskell_overlay/default.nix
vendored
|
@ -1,6 +1,28 @@
|
|||
{ pkgs ? import ./nixpkgs.nix {} }:
|
||||
|
||||
self: super: with pkgs.haskell.lib; rec {
|
||||
aeson = doJailbreak super.aeson;
|
||||
|
||||
attoparsec = doJailbreak super.attoparsec;
|
||||
|
||||
cassava = doJailbreak super.cassava;
|
||||
|
||||
fgl = overrideSrc (doJailbreak super.fgl) rec {
|
||||
src = pkgs.fetchzip {
|
||||
url = "mirror://hackage/fgl-${version}/fgl-${version}.tar.gz";
|
||||
sha256 = "0spyd56b2rmwp8n6h167rfjwy8lpcvar1p2rqhw9q580h2l9v61l";
|
||||
};
|
||||
version = "5.7.0.3";
|
||||
};
|
||||
|
||||
fgl-arbitrary = overrideSrc super.fgl-arbitrary rec {
|
||||
src = pkgs.fetchzip {
|
||||
url = "mirror://hackage/fgl-arbitrary-${version}/fgl-arbitrary-${version}.tar.gz";
|
||||
sha256 = "0bacdv51am13x5k64xvmxcs5gkdkh0gpmnh05wgd2vqg1n8r7fwb";
|
||||
};
|
||||
version = "0.2.0.6";
|
||||
};
|
||||
|
||||
generic-arbitrary = appendPatch
|
||||
super.generic-arbitrary
|
||||
[ ./patches/generic-arbitrary-export-garbitrary.patch ];
|
||||
|
@ -20,6 +42,58 @@ self: super: with pkgs.haskell.lib; rec {
|
|||
sha256 = "12k41wd9fd1y3jd5djwcpwg2s1cva87wh14i0m1yn49zax9wl740";
|
||||
} {};
|
||||
|
||||
psqueues = doJailbreak super.psqueues;
|
||||
|
||||
random = dontCheck (self.callHackageDirect {
|
||||
pkg = "random";
|
||||
ver = "1.2.0";
|
||||
sha256 = "06s3mmqbsfwv09j2s45qnd66nrxfp9280gnl9ng8yh128pfr7bjh";
|
||||
} {});
|
||||
|
||||
random-source = overrideSrc super.random-source rec {
|
||||
src = pkgs.fetchzip {
|
||||
url = "mirror://hackage/random-source-${version}/random-source-${version}.tar.gz";
|
||||
sha256 = "0yx0i4fv1xg535zd2isczfngsq5740wzl6w44168lxdmpw9fmsyz";
|
||||
};
|
||||
# downgraded as the latest version was causing a ghc crash:
|
||||
# https://gitlab.haskell.org/ghc/ghc/-/issues/18537
|
||||
version = "0.3.0.8";
|
||||
};
|
||||
|
||||
semialign = self.callHackageDirect {
|
||||
pkg = "semialign";
|
||||
ver = "1.1.0.1";
|
||||
sha256 = "1xs5dvz87gx6xnannw6bc70nzr8ffhk0j6n7n0p5dqair9sz77x4";
|
||||
} {};
|
||||
|
||||
splitmix = dontCheck (self.callHackageDirect {
|
||||
pkg = "splitmix";
|
||||
ver = "0.1";
|
||||
sha256 = "1k7l07h2w4fhjdqiqvw48if0irx0ngv6niach265j7lbfxsm8qql";
|
||||
} {});
|
||||
|
||||
hedgehog = doJailbreak super.hedgehog;
|
||||
|
||||
hspec-core = dontCheck super.hspec-core;
|
||||
|
||||
QuickCheck = overrideSrc super.QuickCheck rec {
|
||||
src = pkgs.fetchzip {
|
||||
url = "mirror://hackage/QuickCheck-${version}/QuickCheck-${version}.tar.gz";
|
||||
sha256 = "0x9pnr9m81jlywj38w3530zw1g0xmfszmj9303m2fp58zpad96h0";
|
||||
};
|
||||
version = "2.14.1";
|
||||
};
|
||||
|
||||
test-framework-quickcheck2 = doJailbreak super.test-framework-quickcheck2;
|
||||
|
||||
vector = overrideSrc (doJailbreak super.vector) rec {
|
||||
src = pkgs.fetchzip {
|
||||
url = "mirror://hackage/vector-${version}/vector-${version}.tar.gz";
|
||||
sha256 = "1312lpb1f4jzbmcjp7mdf9l9ykp1hscxdr66cl8zlcs8kbr13bm7";
|
||||
};
|
||||
version = "0.12.1.2";
|
||||
};
|
||||
|
||||
vinyl = overrideSrc (markUnbroken super.vinyl)
|
||||
rec {
|
||||
src = pkgs.fetchzip {
|
||||
|
|
2
third_party/nix/src/libexpr/symbol-table.hh
vendored
2
third_party/nix/src/libexpr/symbol-table.hh
vendored
|
@ -19,7 +19,7 @@ class Symbol {
|
|||
|
||||
bool operator<(const Symbol& s2) const { return *s < *s2.s; }
|
||||
|
||||
operator const std::string &() const { return *s; }
|
||||
operator const std::string&() const { return *s; }
|
||||
|
||||
bool set() const { return s; }
|
||||
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -20,7 +20,8 @@ let
|
|||
sha256 = "1an4h8jjbj3r618ykjwk9brii4h9cxjqy47c4c8rivnvhimgf4wm";
|
||||
};
|
||||
|
||||
modSha256 = "07ci2726nrn8qjvwcypk6nf8zqmfnmvch8l28bmgj7hpfrbyb424";
|
||||
vendorSha256 = "1a5fx6mrv30cl46kswicd8lf5i5shn1fykchvbnbhdpgxhbz6qi4";
|
||||
deleteVendor = true;
|
||||
};
|
||||
|
||||
in
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -51,7 +51,6 @@ in depot.lib.fix(self: {
|
|||
hardware = {
|
||||
cpu.amd.updateMicrocode = true;
|
||||
enableRedistributableFirmware = true;
|
||||
u2f.enable = true;
|
||||
opengl = {
|
||||
enable = true;
|
||||
driSupport = true;
|
||||
|
|
Loading…
Reference in a new issue