From 32dd70e3f0069444a77aa4ade7da3d790227ecfe Mon Sep 17 00:00:00 2001
From: Yaroslav Bolyukin <iam@lach.pw>
Date: Sun, 17 Mar 2024 22:02:00 +0000
Subject: [PATCH] ci: remove extra args for jrsonnet binary in flake


---
--- a/flake.nix
+++ b/flake.nix
@@ -63,7 +63,7 @@
             inherit go-jsonnet sjsonnet jsonnet;
             jrsonnetVariants = [
               {
-                drv = jrsonnet;
+                drv = jrsonnet.overrideAttrs {forBenchmarks = true;};
                 name = "";
               }
             ];
@@ -73,7 +73,7 @@
             quick = true;
             jrsonnetVariants = [
               {
-                drv = jrsonnet;
+                drv = jrsonnet.overrideAttrs {forBenchmarks = true;};
                 name = "";
               }
             ];
@@ -82,15 +82,15 @@
             inherit go-jsonnet sjsonnet jsonnet;
             jrsonnetVariants = [
               {
-                drv = jrsonnet;
+                drv = jrsonnet.overrideAttrs {forBenchmarks = true;};
                 name = "current";
               }
               {
-                drv = jrsonnet-nightly;
+                drv = jrsonnet-nightly.overrideAttrs {forBenchmarks = true;};
                 name = "current-nightly";
               }
               {
-                drv = jrsonnet-release;
+                drv = jrsonnet-release.overrideAttrs {forBenchmarks = true;};
                 name = "release";
               }
             ];
--- a/nix/jrsonnet.nix
+++ b/nix/jrsonnet.nix
@@ -1,14 +1,12 @@
-{ lib
-, fetchFromGitHub
-, rustPlatform
-, runCommand
-, makeWrapper
-, withNightlyFeatures ? false
+{
+  lib,
+  rustPlatform,
+  runCommand,
+  makeWrapper,
+  withNightlyFeatures ? false,
+  forBenchmarks ? false,
 }:
-
-with lib;
-
-let
+with lib; let
   filteredSrc = builtins.path {
     name = "jrsonnet-src-filtered";
     filter = path: type: !(builtins.baseNameOf path == "flake.nix" || builtins.baseNameOf path == "nix");
@@ -17,29 +15,30 @@
 
   # for some reason, filteredSrc hash still depends on nix directory contents
   # Moving it into a CA store drops leftover references
-  src = runCommand "jrsonnet-src"
+  src =
+    runCommand "jrsonnet-src"
     {
       __contentAddressed = true;
     } "cp -r '${filteredSrc}' $out";
 in
-
-rustPlatform.buildRustPackage rec {
-  inherit src;
-  pname = "jrsonnet";
-  version = "current${optionalString withNightlyFeatures "-nightly"}";
+  rustPlatform.buildRustPackage rec {
+    inherit src;
+    pname = "jrsonnet";
+    version = "current${optionalString withNightlyFeatures "-nightly"}";
 
-  cargoTestFlags = [
-    "--features=mimalloc,legacy-this-file${optionalString withNightlyFeatures ",nightly"}"
-  ];
-  cargoBuildFlags = cargoTestFlags;
+    cargoTestFlags = [
+      "--features=mimalloc,legacy-this-file${optionalString withNightlyFeatures ",nightly"}"
+    ];
+    cargoBuildFlags = cargoTestFlags;
 
-  nativeBuildInputs = [ makeWrapper ];
+    nativeBuildInputs = [makeWrapper];
 
-  postInstall = ''
-    wrapProgram $out/bin/jrsonnet --add-flags "--max-stack=200000 --os-stack=200000"
-  '';
+    # To clean-up hyperfine output
+    postInstall = mkIf forBenchmarks ''
+      wrapProgram $out/bin/jrsonnet --add-flags "--max-stack=200000 --os-stack=200000"
+    '';
 
-  cargoLock = {
-    lockFile = ../Cargo.lock;
-  };
-}
+    cargoLock = {
+      lockFile = ../Cargo.lock;
+    };
+  }

-- 
gitstuff