diff options
| author | Florian Klink <flokli@flokli.de> | 2023-11-03T08·20+0200 |
|---|---|---|
| committer | clbot <clbot@tvl.fyi> | 2023-11-03T09·04+0000 |
| commit | c017e6d51a1757666e3fcfa7754723d8dbe16511 (patch) | |
| tree | 01c18f04a814a347c51bfbb1213fcf77d5849b0c | |
| parent | fd725bc7fdd609a3fcd295966922fb4f5f37f7b9 (diff) | |
chore(third_party/nixpkgs/nix_2_3): switch to 2.3-maintenance r/6928
The comment about what fixes have been applied was outdated (more was cherry-picked), and all our backports have been upstreamed to the 2.3- maintenance branch. Switch to there, which will also give us support for zstd, which was merged separately. Fixes https://b.tvl.fyi/issues/328 Change-Id: Ice25ebaaf8250a97f032a40a4dd0c7fad2ebda28 Reviewed-on: https://cl.tvl.fyi/c/depot/+/9906 Reviewed-by: tazjin <tazjin@tvl.su> Autosubmit: flokli <flokli@flokli.de> Tested-by: BuildkiteCI
| -rw-r--r-- | third_party/overlays/tvl.nix | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/third_party/overlays/tvl.nix b/third_party/overlays/tvl.nix index 94c2fbb5093d..de4788a29b16 100644 --- a/third_party/overlays/tvl.nix +++ b/third_party/overlays/tvl.nix @@ -4,19 +4,20 @@ self: super: let - # Rollback Nix to a stable version (2.3) with backports for - # build-user problems applied. + # Rollback Nix to a stable version (2.3) with some backports applied. + # We currently track a commit on the 2.3-maintenance that didn't make it into + # a release yet - tracked in https://github.com/NixOS/nix/issues/9244. nixSrc = let - # branch 2.3-backport-await-users - rev = "46a91f2abaee85135cbb447c13957d3c5e9091a9"; + # branch 2.3-maintenance + rev = "f76990444c17716506080e5445e430a9c5c880f9"; in self.fetchFromGitHub { - owner = "tvlfyi"; + owner = "NixOS"; repo = "nix"; inherit rev; - hash = "sha256:0rwyrh471c5y64axyd8vzzzmzlscg97fsrjbgbm1a93wnzxcvnvk"; + hash = "sha256-EK0pgHDekJFqr0oMj+8ANIjq96WPjICe2s0m4xkUdH4="; } // { revCount = 0; shortRev = builtins.substring 0 7 rev; }; nixTarball = (scopedImport |