git.delta.rocks / jrsonnet / refs/commits / 32dd70e3f006

difftreelog

ci remove extra args for jrsonnet binary in flake

Yaroslav Bolyukin2024-03-17parent: #673b628.patch.diff
in: master

2 files changed

modifiedflake.nixdiffbeforeafterboth
63 inherit go-jsonnet sjsonnet jsonnet;63 inherit go-jsonnet sjsonnet jsonnet;
64 jrsonnetVariants = [64 jrsonnetVariants = [
65 {65 {
66 drv = jrsonnet;66 drv = jrsonnet.overrideAttrs {forBenchmarks = true;};
67 name = "";67 name = "";
68 }68 }
69 ];69 ];
73 quick = true;73 quick = true;
74 jrsonnetVariants = [74 jrsonnetVariants = [
75 {75 {
76 drv = jrsonnet;76 drv = jrsonnet.overrideAttrs {forBenchmarks = true;};
77 name = "";77 name = "";
78 }78 }
79 ];79 ];
82 inherit go-jsonnet sjsonnet jsonnet;82 inherit go-jsonnet sjsonnet jsonnet;
83 jrsonnetVariants = [83 jrsonnetVariants = [
84 {84 {
85 drv = jrsonnet;85 drv = jrsonnet.overrideAttrs {forBenchmarks = true;};
86 name = "current";86 name = "current";
87 }87 }
88 {88 {
89 drv = jrsonnet-nightly;89 drv = jrsonnet-nightly.overrideAttrs {forBenchmarks = true;};
90 name = "current-nightly";90 name = "current-nightly";
91 }91 }
92 {92 {
93 drv = jrsonnet-release;93 drv = jrsonnet-release.overrideAttrs {forBenchmarks = true;};
94 name = "release";94 name = "release";
95 }95 }
96 ];96 ];
modifiednix/jrsonnet.nixdiffbeforeafterboth
--- 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;
+    };
+  }