diff options
| author | Vincent Ambo <mail@tazj.in> | 2023-05-18T10·58+0300 |
|---|---|---|
| committer | clbot <clbot@tvl.fyi> | 2023-05-30T13·27+0000 |
| commit | e3c5eb331315c9c252bf27e259ea98c6fb51003b (patch) | |
| tree | 20de4090344bb2070727421fc19dde230b4e2fa0 /third_party/overlays | |
| parent | 48b66a89820f170d89bb94a7a000bc8f73879aa4 (diff) | |
chore(3p/sources): bump nixpkgs channels & overlays r/6222
* 3p/buzz: delete package This is unused, old, and uses an insecure version of OpenSSL which broke eval. * 3p/overlays: remove nvd patch Newer versions of nvd are compatible with Nix 2.3 by default. * users/grfn/system/home: remove explicit rust-analyser package This conflicts with `rustup`, causing eval failures, as the wrapper seems to now be included in `rustup` by default. * users/grfn/system: temporarily disable ISO builds They were broken upstream in nixpkgs by a change to stdenv/setup.sh, being fixed in https://github.com/NixOS/nixpkgs/pull/234883 Change-Id: I0eea99ec98f4e73e615c012ffae1d0e37122e73b Reviewed-on: https://cl.tvl.fyi/c/depot/+/8585 Tested-by: BuildkiteCI Reviewed-by: grfn <grfn@gws.fyi> Reviewed-by: sterni <sternenseemann@systemli.org> Autosubmit: tazjin <tazjin@tvl.su>
Diffstat (limited to 'third_party/overlays')
| -rw-r--r-- | third_party/overlays/patches/nvd-nix-2.3.patch | 12 | ||||
| -rw-r--r-- | third_party/overlays/tvl.nix | 6 |
2 files changed, 0 insertions, 18 deletions
diff --git a/third_party/overlays/patches/nvd-nix-2.3.patch b/third_party/overlays/patches/nvd-nix-2.3.patch deleted file mode 100644 index e39a747942e6..000000000000 --- a/third_party/overlays/patches/nvd-nix-2.3.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/src/nvd b/src/nvd -index 4caf646..793fc60 100755 ---- a/src/nvd -+++ b/src/nvd -@@ -440,7 +440,6 @@ def query_closure_disk_usage_bytes(target: Path) -> Optional[int]: - stdout = subprocess.run( - [ - make_nix_bin_path("nix"), "path-info", -- "--extra-experimental-features", "nix-command", - "--closure-size", target_str, - ], - stdout=PIPE, diff --git a/third_party/overlays/tvl.nix b/third_party/overlays/tvl.nix index 79c4518877a5..3163a95db301 100644 --- a/third_party/overlays/tvl.nix +++ b/third_party/overlays/tvl.nix @@ -39,12 +39,6 @@ depot.nix.readTree.drvTargets { nix = self.nix_2_3; nix_latest = super.nix; - nvd = super.nvd.overrideAttrs (old: { - patches = old.patches or [ ] ++ [ - ./patches/nvd-nix-2.3.patch - ]; - }); - # Too match telega in emacs-overlay or wherever tdlib = super.tdlib.overrideAttrs (_: { version = "1.8.12"; |