about summary refs log tree commit diff
path: root/third_party/overlays
diff options
context:
space:
mode:
authorFlorian Klink <flokli@flokli.de>2024-02-16T10·41+0700
committerclbot <clbot@tvl.fyi>2024-02-16T11·11+0000
commit8b06566d43275201e6f82284e2d334202ec2ae45 (patch)
treef5776f76e4fee9477a4758669f2fb2afc7faf70c /third_party/overlays
parentd20a97ccb8e19d5076c23008dcfc80f5aedd8af0 (diff)
fix(third_party/nixpkgs/crate2nix): reintroduce tests in debug patch r/7529
This is was dropped accidentially, but we actually want to run tests in
debug mode, to check for overflows.

Change-Id: Ic0cf2d4a263bfd71f3453ed335d8be9dacd945e8
Reviewed-on: https://cl.tvl.fyi/c/depot/+/10932
Autosubmit: flokli <flokli@flokli.de>
Tested-by: BuildkiteCI
Reviewed-by: tazjin <tazjin@tvl.su>
Diffstat (limited to 'third_party/overlays')
-rw-r--r--third_party/overlays/patches/crate2nix-tests-debug.patch12
-rw-r--r--third_party/overlays/tvl.nix5
2 files changed, 16 insertions, 1 deletions
diff --git a/third_party/overlays/patches/crate2nix-tests-debug.patch b/third_party/overlays/patches/crate2nix-tests-debug.patch
new file mode 100644
index 000000000000..384178c805f7
--- /dev/null
+++ b/third_party/overlays/patches/crate2nix-tests-debug.patch
@@ -0,0 +1,12 @@
+diff --git a/templates/nix/crate2nix/default.nix b/templates/nix/crate2nix/default.nix
+index 4eefda8..d064118 100644
+--- a/templates/nix/crate2nix/default.nix
++++ b/templates/nix/crate2nix/default.nix
+@@ -111,6 +111,7 @@ rec {
+             (
+               _: {
+                 buildTests = true;
++                release = false;
+               }
+             );
+           # If the user hasn't set any pre/post commands, we don't want to
diff --git a/third_party/overlays/tvl.nix b/third_party/overlays/tvl.nix
index fd6b35163ebc..3a4664631797 100644
--- a/third_party/overlays/tvl.nix
+++ b/third_party/overlays/tvl.nix
@@ -94,7 +94,10 @@ depot.nix.readTree.drvTargets {
       hash = "sha256-JTMe8GViCQt51WUiaaoIPmWtwEeeYrl6pBxo2DNuKig=";
     };
 
-    patches = [ ./patches/crate2nix-run-tests-in-build-source.patch ];
+    patches = [
+      ./patches/crate2nix-tests-debug.patch
+      ./patches/crate2nix-run-tests-in-build-source.patch
+    ];
 
     sourceRoot = "${src.name}/crate2nix";