maurice/snix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

chore(3p/sources): bump channels & overlays (2023-12-29)

Browse source 
* 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
This commit is contained in:
Vincent Ambo 2023-12-27 12:29:50 +03:00 • committed by tazjin
parent 4b3f27ebc9
commit eba5c1757a
15 changed files with 72 additions and 189 deletions
Download patch file Download diff file Expand all files Collapse all files

53
third_party/overlays/patches/crate2nix-fix-resolve-missing-target-features-to-null.patch vendored
View file

@ -1,53 +0,0 @@
From 5ed4d5f99e8c2ee0e552ceb3842fdf0afaed7534 Mon Sep 17 00:00:00 2001
From: tilpner <git@tilpner.com>
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

33
third_party/overlays/patches/crate2nix-skip-running-tests-when-cross-compiling.patch vendored
View file

@ -1,33 +0,0 @@
From b37dff98b7df177313f2823a77c19828398f1505 Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
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

26
third_party/overlays/patches/crate2nix-take-lndir-from-buildPackages.patch vendored
View file

@ -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