diff options
| author | Vincent Ambo <mail@tazj.in> | 2021-04-07T12·34+0200 |
|---|---|---|
| committer | tazjin <mail@tazj.in> | 2021-04-11T22·13+0000 |
| commit | 7deabb8c8d6f4c7e58e2b16548b8a1895795963b (patch) | |
| tree | c7b55b5ec32d9c1e45ca3b4f33ef14d2cf82265f /third_party/nixpkgs/default.nix | |
| parent | 9073ac18c48f2bcefc736839d6faf76a462bf433 (diff) | |
chore(3p): Bump channels to 2021-04-09 r/2481
Fixes included: * exposed gtest in the package set, required for protobuf * pinned SBCL to version 2.0.8: The channel moved it to >2.1, and a bunch of warnings seemed to be killing our builds - we should investigate this later. * removed kernel patches from //users/tazjin/frog: this machine is currently out of service anyways, not worth fixing while it's offline * removed steam & lutris from frog (they're currently broken) * removed Haskell overrides for hedgehog-classes & hgeometry-combinatorial * use gRPC sources from upstream and inject Abseil via Nix instead * fix for renamed grpc import in //third_party/nix * use libfprint-tod from upstream nixpkgs in glittershark/yeren and delete glittershark/pkgs/fprintd entirely, since all of the patches used there are available and working from upstream now (and stopped working here after the bump) Change-Id: Ia90e6f774f7b88bc9e60d28351b900ca43ee2695 Reviewed-on: https://cl.tvl.fyi/c/depot/+/2901 Reviewed-by: glittershark <grfn@gws.fyi> Reviewed-by: tazjin <mail@tazj.in> Reviewed-by: sterni <sternenseemann@systemli.org> Reviewed-by: lukegb <lukegb@tvl.fyi> Tested-by: BuildkiteCI
Diffstat (limited to 'third_party/nixpkgs/default.nix')
| -rw-r--r-- | third_party/nixpkgs/default.nix | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/third_party/nixpkgs/default.nix b/third_party/nixpkgs/default.nix index 602d16b2cab7..86e1f3b31f46 100644 --- a/third_party/nixpkgs/default.nix +++ b/third_party/nixpkgs/default.nix @@ -13,16 +13,16 @@ let # nixos-unstable, and the current stable channel of the latest NixOS # release. - # Tracking nixos-unstable as of 2021-03-25. + # Tracking nixos-unstable as of 2021-04-09. unstableHashes = { - commit = "60dd94fb7e01a8288f6638eee71d7cb354c49327"; - sha256 = "0skdwk9bdld295kzrymirs8xrzycqmhsclaz8s18jhcz75hb8sk3"; + commit = "9e377a6ce42dccd9b624ae4ce8f978dc892ba0e2"; + sha256 = "1r3ll77hyqn28d9i4cf3vqd9v48fmaa1j8ps8c4fm4f8gqf4kpl1"; }; - # Tracking nixos-20.09 as of 2021-03-25. + # Tracking nixos-20.09 as of 2021-04-09. stableHashes = { - commit = "223d0d733a66b46504ea6b4c15f88b7cc4db58fb"; - sha256 = "073327ris0frqa3kpid3nsjr9w8yx2z83xpsc24w898mrs9r7d5v"; + commit = "d6f63659a7021051a46035373ed50fbea7e4e924"; + sha256 = "0vblhzg57sfzqpdm24lgs08vjv2204lzcp6hv4cbjd20rz0mxs4y"; }; # import the nixos-unstable package set, or optionally use the |