diff options
| -rw-r--r-- | third_party/nixpkgs/default.nix | 12 | ||||
| -rw-r--r-- | third_party/overlays/tvl.nix | 17 |
2 files changed, 6 insertions, 23 deletions
diff --git a/third_party/nixpkgs/default.nix b/third_party/nixpkgs/default.nix index c457ad801c..35687bc987 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-12-15. + # Tracking nixos-unstable as of 2021-12-20. unstableHashes = { - commit = "a2e281f5770247855b85d70c43454ba5bff34613"; - sha256 = "03m6b3yvx7v8gwib848aclwqpg02rhqdh9h511w9byyfvha9g0fg"; + commit = "d87b72206aadebe6722944f541f55d33fd7046fb"; + sha256 = "18p03pdy2halapvlfv37f2p6m67g0y6lvhj485iyl4xa5hb4cr8n"; }; - # Tracking nixos-21.11 as of 2021-12-12. + # Tracking nixos-21.11 as of 2021-12-20. stableHashes = { - commit = "573095944e7c1d58d30fc679c81af63668b54056"; - sha256 = "07s5cwhskqvy82b4rld9b14ljc0013pig23i3jx3l3f957rk95pg"; + commit = "86453059bf8312f0f5bf1fe8a2f52da2be664489"; + sha256 = "0inzy97dp5988cwjwpn41219rir4c7qp7wwg7v4abcs9lypg8is4"; }; # import the nixos-unstable package set, or optionally use the diff --git a/third_party/overlays/tvl.nix b/third_party/overlays/tvl.nix index c6b6e86dc8..da504320dc 100644 --- a/third_party/overlays/tvl.nix +++ b/third_party/overlays/tvl.nix @@ -60,23 +60,6 @@ self: super: { meta.ci = false; }); - # bump treefmt to a newer version that includes our config file patch - treefmt = super.treefmt.overrideAttrs(drv: rec { - version = "0.3.0"; - - src = super.fetchFromGitHub { - owner = "numtide"; - repo = "treefmt"; - rev = "v${version}"; - sha256 = "0jnfak6wmqpqwymja9bsw54al50yqzdy7lxfx66rqamqsvngqd1x"; - }; - - cargoDeps = drv.cargoDeps.overrideAttrs(_: { - inherit src; - outputHash = "19p15gavcjldn1di7yyn80ys6rj4ajaprqk8x34vxslr4y2qychf"; - }); - }); - # TODO(tazjin): determine whether this is the cause of my suspend # bugs, and if so, upstream it to nixpkgs. xsecurelock = super.xsecurelock.overrideAttrs(drv: rec { |