diff options
author | Vincent Ambo <mail@tazj.in> | 2023-12-27T09·29+0300 |
---|---|---|
committer | tazjin <tazjin@tvl.su> | 2023-12-29T21·52+0000 |
commit | eba5c1757afcecc64def04e0058bccb9d248fd9f (patch) | |
tree | cd455f498642b1bb1d349a74cec64f4fae2021df /third_party/overlays/patches/crate2nix-take-lndir-from-buildPackages.patch | |
parent | 4b3f27ebc91c34c4a6a33d164e4d9f5fc975a48e (diff) |
chore(3p/sources): bump channels & overlays (2023-12-29) r/7278
* 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 <root@gws.fyi> Tested-by: BuildkiteCI
Diffstat (limited to 'third_party/overlays/patches/crate2nix-take-lndir-from-buildPackages.patch')
-rw-r--r-- | third_party/overlays/patches/crate2nix-take-lndir-from-buildPackages.patch | 26 |
1 files changed, 0 insertions, 26 deletions
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 c6436d32442f..000000000000 --- 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 <flokli@flokli.de> -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 - |