diff options
author | Vincent Ambo <tazjin@tvl.su> | 2023-11-22T07·41+0300 |
---|---|---|
committer | clbot <clbot@tvl.fyi> | 2023-11-27T21·16+0000 |
commit | 360c98ce38a8eb94ab3955f4ed46c3a2e709bb74 (patch) | |
tree | 7418ccb4474ed0a57098501d035c677f87a830ef | |
parent | 0415bc6fd26ba5a20f81e2327305dc0ebfceb3b9 (diff) |
chore(3p/sources): bump channels & overlays (2023-11-27) r/7076
* picked avrdude from stable channel * removed override for texlive, as the upstream fix is merged * picked awscli2 from stable channel * bump tdlib to 1.8.21 (new minimum for telega.el) * tvix/turbofetch: switch to nixpkgs-native mechanism for CARGO_MANIFEST_LINKS (whatever that is) Change-Id: Ic695721b5ca750b89d21cab7a257e1db682b23c0 Reviewed-on: https://cl.tvl.fyi/c/depot/+/10083 Reviewed-by: flokli <flokli@flokli.de> Tested-by: BuildkiteCI Autosubmit: tazjin <tazjin@tvl.su>
-rw-r--r-- | third_party/nixpkgs/default.nix | 8 | ||||
-rw-r--r-- | third_party/overlays/tvl.nix | 6 | ||||
-rw-r--r-- | third_party/sources/sources.json | 30 | ||||
-rw-r--r-- | tvix/tools/turbofetch/default.nix | 4 |
4 files changed, 25 insertions, 23 deletions
diff --git a/third_party/nixpkgs/default.nix b/third_party/nixpkgs/default.nix index c513893d3ff1..23252b60ab5e 100644 --- a/third_party/nixpkgs/default.nix +++ b/third_party/nixpkgs/default.nix @@ -50,9 +50,11 @@ let # instead (e.g. because something is broken in unstable). # Use `stableNixpkgs` from above. stableOverlay = _unstableSelf: unstableSuper: { - # build-tex-env is broken on unstable; 2023-11-12 - # https://github.com/NixOS/nixpkgs/pull/267083 - texlive = stableNixpkgs.texlive; + # avrdude is broken on unstable; 2023-11-22 + avrdude = stableNixpkgs.avrdude; + + # awscli2 is broken on unstable; 2023-11-22 + awscli2 = stableNixpkgs.awscli2; }; # Overlay to expose the nixpkgs commits we are using to other Nix code. diff --git a/third_party/overlays/tvl.nix b/third_party/overlays/tvl.nix index 2920fac103f5..d354e0278b4c 100644 --- a/third_party/overlays/tvl.nix +++ b/third_party/overlays/tvl.nix @@ -42,12 +42,12 @@ depot.nix.readTree.drvTargets { # To match telega in emacs-overlay or wherever tdlib = super.tdlib.overrideAttrs (_: { - version = "1.8.18"; + version = "1.8.21"; src = self.fetchFromGitHub { owner = "tdlib"; repo = "td"; - rev = "100ca72b9179366d91089fd929f6c210f697031a"; - sha256 = "1zk6nvlj1xmrljlwdlcm6rx22zz7hs2qffvrn13qjhi7qfhmbaxr"; + rev = "3870c29b158b75ca5e48e0eebd6b5c3a7994a000"; + sha256 = "12c59pyghyyamzln8bzhs65alv8ysw3ny6sccvwasr84yyif0b1h"; }; }); diff --git a/third_party/sources/sources.json b/third_party/sources/sources.json index 9e41a99865cb..d6848798101f 100644 --- a/third_party/sources/sources.json +++ b/third_party/sources/sources.json @@ -17,10 +17,10 @@ "homepage": "", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "574004568151819a92d44728614334e91a16c2c3", - "sha256": "1fgsw04pbgjipnsr2c537wngfgw1q6fhgasjzpk0175b81c638fh", + "rev": "ff495a3172537a9a5d05fadd0699daf5deb48dc0", + "sha256": "17rji275ya0zb7ir4y36azylgz5jzrsg4b5n4mnqvvfwvh8xhj44", "type": "tarball", - "url": "https://github.com/nix-community/emacs-overlay/archive/574004568151819a92d44728614334e91a16c2c3.tar.gz", + "url": "https://github.com/nix-community/emacs-overlay/archive/ff495a3172537a9a5d05fadd0699daf5deb48dc0.tar.gz", "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz" }, "home-manager": { @@ -29,10 +29,10 @@ "homepage": "https://nix-community.github.io/home-manager/", "owner": "nix-community", "repo": "home-manager", - "rev": "280721186ab75a76537713ec310306f0eba3e407", - "sha256": "0qf13vx8nr3c97id0gsmhxdf3kcnfyhc18lfk96qwbwb7lnz0d73", + "rev": "db1878f013b52ba5e4034db7c1b63e8d04173a86", + "sha256": "1qr1xsf4fsqmh8c7av984hvrc03y1y6s8nlxfp9zrzhlnh1v034m", "type": "tarball", - "url": "https://github.com/nix-community/home-manager/archive/280721186ab75a76537713ec310306f0eba3e407.tar.gz", + "url": "https://github.com/nix-community/home-manager/archive/db1878f013b52ba5e4034db7c1b63e8d04173a86.tar.gz", "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz" }, "impermanence": { @@ -77,10 +77,10 @@ "homepage": "", "owner": "NixOS", "repo": "nixpkgs", - "rev": "85f1ba3e51676fa8cc604a3d863d729026a6b8eb", - "sha256": "0992mbqdvvkxy1gz8bzmqdx3kz5and17xik6d836p65vkll64ksz", + "rev": "5a09cb4b393d58f9ed0d9ca1555016a8543c2ac8", + "sha256": "019y1skg6p0wc5x9yxpzmq1zi3yw6hlj2hqsm4rfv12a6ffm68j7", "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/85f1ba3e51676fa8cc604a3d863d729026a6b8eb.tar.gz", + "url": "https://github.com/NixOS/nixpkgs/archive/5a09cb4b393d58f9ed0d9ca1555016a8543c2ac8.tar.gz", "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz" }, "nixpkgs-stable": { @@ -89,10 +89,10 @@ "homepage": "", "owner": "NixOS", "repo": "nixpkgs", - "rev": "da4024d0ead5d7820f6bd15147d3fe2a0c0cec73", - "sha256": "1y12a4hgxx2lixrcbyhycwxvrrfik1lxjnwkprar0r6173rwy9ax", + "rev": "d2e4de209881b38392933fabf303cde3454b0b4c", + "sha256": "0nm6pxnji2jq7v3dx9v7cdj8rfzp64rgnxvhyphk39dhmlyyd9m0", "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/da4024d0ead5d7820f6bd15147d3fe2a0c0cec73.tar.gz", + "url": "https://github.com/NixOS/nixpkgs/archive/d2e4de209881b38392933fabf303cde3454b0b4c.tar.gz", "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz" }, "rust-overlay": { @@ -101,10 +101,10 @@ "homepage": "", "owner": "oxalica", "repo": "rust-overlay", - "rev": "d15b1b2be8daba77c80ee6716616e5c841d3ab14", - "sha256": "1nvhx6ca0dipwjz7f5690kdj0zrq184qcsq5cz4la8am3r06v40c", + "rev": "055d3d2ea161dfc6ca569f2f135a107f48cf483e", + "sha256": "05jgnk4jklcw1dbl6wg3h229n9ksfj2q8v53cj35bjnb15xy7mfx", "type": "tarball", - "url": "https://github.com/oxalica/rust-overlay/archive/d15b1b2be8daba77c80ee6716616e5c841d3ab14.tar.gz", + "url": "https://github.com/oxalica/rust-overlay/archive/055d3d2ea161dfc6ca569f2f135a107f48cf483e.tar.gz", "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz" }, "rustsec-advisory-db": { diff --git a/tvix/tools/turbofetch/default.nix b/tvix/tools/turbofetch/default.nix index b7b6a052d76a..bd70f6a5e694 100644 --- a/tvix/tools/turbofetch/default.nix +++ b/tvix/tools/turbofetch/default.nix @@ -2,9 +2,9 @@ (pkgs.callPackage ./Cargo.nix { defaultCrateOverrides = pkgs.defaultCrateOverrides // { + ring = prev: { - # TODO(edef): implement CARGO_MANIFEST_LINKS in crate2nix - CARGO_MANIFEST_LINKS = ''ring_core_${lib.replaceStrings ["."] ["_"] prev.version}''; + links = ''ring_core_${lib.replaceStrings ["."] ["_"] prev.version}''; }; }; }).rootCrate.build.override { |