From eba5c1757afcecc64def04e0058bccb9d248fd9f Mon Sep 17 00:00:00 2001 From: Vincent Ambo Date: Wed, 27 Dec 2023 12:29:50 +0300 Subject: chore(3p/sources): bump channels & overlays (2023-12-29) * all: update wasm-bindgen to 0.2.89 in WASM projects * users/grfn: explicitly set pinentry for gpg-agent * 3p/crate2nix: drop patches that were merged upstream * 3p/rust-crates: fix one more package name that was broken by crates.io * 3p/overlays: bump telega backend to new required version The update for agenix has been dropped. It caused strange build errors with messages like these: patching script interpreter paths in /nix/store/0g0wpa3vxfb4w461s6ny3s1wr08faj73-agenix-0.15.0 /nix/store/0g0wpa3vxfb4w461s6ny3s1wr08faj73-agenix-0.15.0/bin/agenix: interpreter directive changed from "#!/usr/bin/env bash" to "/nix/store/q8qq40xg2grfh9ry1d9x4g7lq4ra7n81-bash-5.2-p21/bin/bash" stripping (with command strip and flags -S -p) in /nix/store/0g0wpa3vxfb4w461s6ny3s1wr08faj73-agenix-0.15.0/bin Running phase: installCheckPhase no Makefile or custom installCheckPhase, doing nothing agenix version: 0.15.0 error: creating directory '/nix/var': Permission denied There is no rule for secret1.age in ./secrets.nix. /nix/store/d4jf1cbbk494zwgbqz31pxgigpsbh6w2-stdenv-linux/setup: line 138: test: =: unary operator expected /nix/store/d4jf1cbbk494zwgbqz31pxgigpsbh6w2-stdenv-linux/setup: line 131: pop_var_context: head of shell_variables not a function context builder for '/nix/store/0ivvf44hxy0zv4gg8nvchdkp895xw5ri-agenix-0.15.0.drv' failed with exit code 2 I can't be bothered to deal with that right now. Change-Id: Ia052af0d97dbe9ef0c0d4f3e2214ac00ca8645a2 Reviewed-on: https://cl.tvl.fyi/c/depot/+/10458 Reviewed-by: aspen Tested-by: BuildkiteCI --- ...x-resolve-missing-target-features-to-null.patch | 53 ---------------------- ...x-skip-running-tests-when-cross-compiling.patch | 33 -------------- .../crate2nix-take-lndir-from-buildPackages.patch | 26 ----------- third_party/overlays/tvl.nix | 9 +--- third_party/rust-crates/default.nix | 2 +- third_party/sources/sources.json | 48 ++++++++++---------- 6 files changed, 26 insertions(+), 145 deletions(-) delete mode 100644 third_party/overlays/patches/crate2nix-fix-resolve-missing-target-features-to-null.patch delete mode 100644 third_party/overlays/patches/crate2nix-skip-running-tests-when-cross-compiling.patch delete mode 100644 third_party/overlays/patches/crate2nix-take-lndir-from-buildPackages.patch (limited to 'third_party') diff --git a/third_party/overlays/patches/crate2nix-fix-resolve-missing-target-features-to-null.patch b/third_party/overlays/patches/crate2nix-fix-resolve-missing-target-features-to-null.patch deleted file mode 100644 index 96e0fdd263..0000000000 --- a/third_party/overlays/patches/crate2nix-fix-resolve-missing-target-features-to-null.patch +++ /dev/null @@ -1,53 +0,0 @@ -From 5ed4d5f99e8c2ee0e552ceb3842fdf0afaed7534 Mon Sep 17 00:00:00 2001 -From: tilpner -Date: Tue, 24 Oct 2023 20:26:29 +0200 -Subject: [PATCH] fix: resolve missing target features to 'null' - ---- - crate2nix/Cargo.nix | 16 ++++++++-------- - crate2nix/src/render.rs | 10 +++++----- - sample_projects/bin/Cargo.toml | 3 +++ - .../bin_with_git_submodule_dep/Cargo.nix | 6 +++--- - sample_projects/codegen/Cargo.nix | 2 +- - 5 files changed, 20 insertions(+), 17 deletions(-) - -diff --git a/crate2nix/src/render.rs b/crate2nix/src/render.rs -index 8ca2f1c..a269fc7 100644 ---- a/src/render.rs -+++ b/src/render.rs -@@ -224,7 +224,7 @@ fn cfg_to_nix_expr(cfg: &CfgExpr) -> String { - } else if key == "target_family" { - format!("(builtins.elem {} target.{})", escaped_value, target(key)) - } else { -- format!("({} == target.{})", escaped_value, target(key)) -+ format!("({} == target.{} or null)", escaped_value, target(key)) - }); - } - CfgExpr::Not(expr) => { -@@ -292,19 +292,19 @@ fn test_render_cfg_to_nix_expr() { - &cfg_to_nix_expr(&kv("target_family", "unix")) - ); - assert_eq!( -- "(\"linux\" == target.\"os\")", -+ "(\"linux\" == target.\"os\" or null)", - &cfg_to_nix_expr(&kv("target_os", "linux")) - ); - assert_eq!( -- "(!(\"linux\" == target.\"os\"))", -+ "(!(\"linux\" == target.\"os\" or null))", - &cfg_to_nix_expr(&CfgExpr::Not(Box::new(kv("target_os", "linux")))) - ); - assert_eq!( -- "((target.\"unix\" or false) || (\"linux\" == target.\"os\"))", -+ "((target.\"unix\" or false) || (\"linux\" == target.\"os\" or null))", - &cfg_to_nix_expr(&CfgExpr::Any(vec![name("unix"), kv("target_os", "linux")])) - ); - assert_eq!( -- "((target.\"unix\" or false) && (\"linux\" == target.\"os\"))", -+ "((target.\"unix\" or false) && (\"linux\" == target.\"os\" or null))", - &cfg_to_nix_expr(&CfgExpr::All(vec![name("unix"), kv("target_os", "linux")])) - ); - assert_eq!("true", &cfg_to_nix_expr(&CfgExpr::All(vec![]))); --- -2.42.0 - diff --git a/third_party/overlays/patches/crate2nix-skip-running-tests-when-cross-compiling.patch b/third_party/overlays/patches/crate2nix-skip-running-tests-when-cross-compiling.patch deleted file mode 100644 index 6c47986705..0000000000 --- a/third_party/overlays/patches/crate2nix-skip-running-tests-when-cross-compiling.patch +++ /dev/null @@ -1,33 +0,0 @@ -From b37dff98b7df177313f2823a77c19828398f1505 Mon Sep 17 00:00:00 2001 -From: Florian Klink -Date: Tue, 31 Oct 2023 14:18:06 +0200 -Subject: [PATCH] skip running tests when cross-compiling - ---- - crate2nix/templates/nix/crate2nix/default.nix | 10 ++++++---- - 1 file changed, 6 insertions(+), 4 deletions(-) - -diff --git a/crate2nix/templates/nix/crate2nix/default.nix b/crate2nix/templates/nix/crate2nix/default.nix -index 2b8050c..e4fc2e9 100644 ---- a/templates/nix/crate2nix/default.nix -+++ b/templates/nix/crate2nix/default.nix -@@ -165,10 +165,12 @@ rec { - passthru = (crate.passthru or { }) // { - inherit test; - }; -- } '' -- echo tested by ${test} -- ${lib.concatMapStringsSep "\n" (output: "ln -s ${crate.${output}} ${"$"}${output}") crate.outputs} -- ''; -+ } -+ (lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' -+ echo tested by ${test} -+ '' + '' -+ ${lib.concatMapStringsSep "\n" (output: "ln -s ${crate.${output}} ${"$"}${output}") crate.outputs} -+ ''); - - /* A restricted overridable version of builtRustCratesWithFeatures. */ - buildRustCrateWithFeatures = --- -2.42.0 - diff --git a/third_party/overlays/patches/crate2nix-take-lndir-from-buildPackages.patch b/third_party/overlays/patches/crate2nix-take-lndir-from-buildPackages.patch deleted file mode 100644 index c6436d3244..0000000000 --- a/third_party/overlays/patches/crate2nix-take-lndir-from-buildPackages.patch +++ /dev/null @@ -1,26 +0,0 @@ -From ea4ec75c6cae0c0aba21c3cf4616dfceb64bff7a Mon Sep 17 00:00:00 2001 -From: Florian Klink -Date: Tue, 31 Oct 2023 14:16:22 +0200 -Subject: [PATCH 1/2] take lndir from buildPackages - -This needs to be executed on the building host. ---- - crate2nix/templates/nix/crate2nix/default.nix | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/crate2nix/templates/nix/crate2nix/default.nix b/crate2nix/templates/nix/crate2nix/default.nix -index 1b859fb..2b8050c 100644 ---- a/templates/nix/crate2nix/default.nix -+++ b/templates/nix/crate2nix/default.nix -@@ -135,7 +135,7 @@ rec { - # recreate a file hierarchy as when running tests with cargo - - # the source for test data -- ${pkgs.xorg.lndir}/bin/lndir ${crate.src} -+ ${pkgs.buildPackages.xorg.lndir}/bin/lndir ${crate.src} - - # build outputs - testRoot=target/debug --- -2.42.0 - diff --git a/third_party/overlays/tvl.nix b/third_party/overlays/tvl.nix index 009af09cea..0a136babc2 100644 --- a/third_party/overlays/tvl.nix +++ b/third_party/overlays/tvl.nix @@ -16,7 +16,7 @@ depot.nix.readTree.drvTargets { # To match telega in emacs-overlay or wherever tdlib = super.tdlib.overrideAttrs (_: { - version = "1.8.21"; + version = "1.8.22"; src = self.fetchFromGitHub { owner = "tdlib"; repo = "td"; @@ -79,13 +79,6 @@ depot.nix.readTree.drvTargets { # run tests in debug mode, not release mode # https://github.com/nix-community/crate2nix/pull/301 ./patches/crate2nix-tests-debug.patch - - # https://github.com/nix-community/crate2nix/pull/309 - ./patches/crate2nix-take-lndir-from-buildPackages.patch - ./patches/crate2nix-skip-running-tests-when-cross-compiling.patch - - # https://github.com/nix-community/crate2nix/pull/307 - ./patches/crate2nix-fix-resolve-missing-target-features-to-null.patch ]; }); diff --git a/third_party/rust-crates/default.nix b/third_party/rust-crates/default.nix index d29a99fa79..2b7fe405bc 100644 --- a/third_party/rust-crates/default.nix +++ b/third_party/rust-crates/default.nix @@ -319,7 +319,7 @@ depot.nix.readTree.drvTargets rec{ }; percent-encoding = buildRustCrate { - pname = "percent_encoding"; + pname = "percent-encoding"; version = "2.1.0"; sha256 = "0i838f2nr81585ckmfymf8l1x1vdmx6n8xqvli0lgcy60yl2axy3"; libPath = "lib.rs"; diff --git a/third_party/sources/sources.json b/third_party/sources/sources.json index c4a68f6fe4..3fc00d6703 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": "ff6270444ab7e1ab6fac3464d173b03aa8cb7a75", - "sha256": "1llr0a9ssx3r614sppbmz4g6l9swwa5nwc0q9967z1mmpvfckz9j", + "rev": "e9e995a2f582217b7c4efe38415fafbbc06274d2", + "sha256": "06851d4ddnljfpyl545kcxrqb66rjz5yfspwxjahddddl3jddw86", "type": "tarball", - "url": "https://github.com/nix-community/emacs-overlay/archive/ff6270444ab7e1ab6fac3464d173b03aa8cb7a75.tar.gz", + "url": "https://github.com/nix-community/emacs-overlay/archive/e9e995a2f582217b7c4efe38415fafbbc06274d2.tar.gz", "url_template": "https://github.com///archive/.tar.gz" }, "home-manager": { @@ -29,10 +29,10 @@ "homepage": "https://nix-community.github.io/home-manager/", "owner": "nix-community", "repo": "home-manager", - "rev": "ac7216918cd65f3824ba7817dea8f22e61221eaf", - "sha256": "110m66gdxhidamz0y5i5ijpv4lx2p8iwfhiwajpwf2vginn74jn7", + "rev": "2aff324cf65f5f98f89d878c056b779466b17db8", + "sha256": "1sipxx381b7ri9sh1nyhk740szbsgc54r30x87n7lghxfyfkj629", "type": "tarball", - "url": "https://github.com/nix-community/home-manager/archive/ac7216918cd65f3824ba7817dea8f22e61221eaf.tar.gz", + "url": "https://github.com/nix-community/home-manager/archive/2aff324cf65f5f98f89d878c056b779466b17db8.tar.gz", "url_template": "https://github.com///archive/.tar.gz" }, "impermanence": { @@ -41,10 +41,10 @@ "homepage": "", "owner": "nix-community", "repo": "impermanence", - "rev": "0f317c2e9e56550ce12323eb39302d251618f5b5", - "sha256": "120775fbfar2x1s5ijkxnvb8p0mmk3dlbq0lzfhsi0csfynp98ki", + "rev": "033643a45a4a920660ef91caa391fbffb14da466", + "sha256": "16x067nv146igqfxq8b3a0rf6715z5vpl0hz27dp2a29s6lr8944", "type": "tarball", - "url": "https://github.com/nix-community/impermanence/archive/0f317c2e9e56550ce12323eb39302d251618f5b5.tar.gz", + "url": "https://github.com/nix-community/impermanence/archive/033643a45a4a920660ef91caa391fbffb14da466.tar.gz", "url_template": "https://github.com///archive/.tar.gz" }, "naersk": { @@ -65,10 +65,10 @@ "homepage": "", "owner": "nix-community", "repo": "napalm", - "rev": "a8215ccf1c80070f51a92771f3bc637dd9b9f7ee", - "sha256": "04vf4mk2q55gpnvxw3qb735lkdyml77qq3lfzfwis619g9izs7c3", + "rev": "edcb26c266ca37c9521f6a97f33234633cbec186", + "sha256": "0ai1ax380nnpz0mbgbc5vdzafyjilcmdj7kgv087x2vagpprb4yy", "type": "tarball", - "url": "https://github.com/nix-community/napalm/archive/a8215ccf1c80070f51a92771f3bc637dd9b9f7ee.tar.gz", + "url": "https://github.com/nix-community/napalm/archive/edcb26c266ca37c9521f6a97f33234633cbec186.tar.gz", "url_template": "https://github.com///archive/.tar.gz" }, "nixpkgs": { @@ -77,10 +77,10 @@ "homepage": "", "owner": "NixOS", "repo": "nixpkgs", - "rev": "91050ea1e57e50388fa87a3302ba12d188ef723a", - "sha256": "1hf6cgaci1n186kkkjq106ryf8mmlq9vnwgfwh625wa8hfgdn4dm", + "rev": "5f64a12a728902226210bf01d25ec6cbb9d9265b", + "sha256": "0lq73nhcg11485ppazbnpz767qjifbydgqxn5xhj3xxlbfml39ba", "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/91050ea1e57e50388fa87a3302ba12d188ef723a.tar.gz", + "url": "https://github.com/NixOS/nixpkgs/archive/5f64a12a728902226210bf01d25ec6cbb9d9265b.tar.gz", "url_template": "https://github.com///archive/.tar.gz" }, "nixpkgs-stable": { @@ -89,10 +89,10 @@ "homepage": "", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e9f06adb793d1cca5384907b3b8a4071d5d7cb19", - "sha256": "0370pkzfcpm05q5m0llr52y8vb87smr6hdpcfs9m1gl1s7h3qlpd", + "rev": "7790e078f8979a9fcd543f9a47427eeaba38f268", + "sha256": "1iyaik6rkiwjr9dzhk5x2w94z4k8klcanrwyd1a4z47d6ybiwlgl", "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/e9f06adb793d1cca5384907b3b8a4071d5d7cb19.tar.gz", + "url": "https://github.com/NixOS/nixpkgs/archive/7790e078f8979a9fcd543f9a47427eeaba38f268.tar.gz", "url_template": "https://github.com///archive/.tar.gz" }, "rust-overlay": { @@ -101,10 +101,10 @@ "homepage": "", "owner": "oxalica", "repo": "rust-overlay", - "rev": "1fdfc1689218998460983986501bd65ba5bbee0f", - "sha256": "0ilmn9v1lmm1051m7vcp3bj6a7az0jzbq4ndvak48i53vd416i6d", + "rev": "2b24e1f369f00f5ae9876e15e12f77e12c9c2374", + "sha256": "14chq4i99lx0iqh5gn8wz97n1f18ngkzs7mcgilr66pmyl6hclh8", "type": "tarball", - "url": "https://github.com/oxalica/rust-overlay/archive/1fdfc1689218998460983986501bd65ba5bbee0f.tar.gz", + "url": "https://github.com/oxalica/rust-overlay/archive/2b24e1f369f00f5ae9876e15e12f77e12c9c2374.tar.gz", "url_template": "https://github.com///archive/.tar.gz" }, "rustsec-advisory-db": { @@ -113,10 +113,10 @@ "homepage": "https://rustsec.org", "owner": "RustSec", "repo": "advisory-db", - "rev": "43af5fef0591531a72ebb86c5f1c623ee95c62fe", - "sha256": "0w57jgwyvspak01bg492yis28rwqszfrj2k6j20hm3y61mydxghy", + "rev": "a5fb72de318a74eb69a2c241c0e46705684a35d0", + "sha256": "1cypbsjjv6c1azi3lhh8gf368c0zilrddpnf2mi0qym9hj1by7dz", "type": "tarball", - "url": "https://github.com/RustSec/advisory-db/archive/43af5fef0591531a72ebb86c5f1c623ee95c62fe.tar.gz", + "url": "https://github.com/RustSec/advisory-db/archive/a5fb72de318a74eb69a2c241c0e46705684a35d0.tar.gz", "url_template": "https://github.com///archive/.tar.gz" } } -- cgit 1.4.1