git.delta.rocks / jrsonnet / refs/commits / b6c7886761f7

difftreelog

chore update other impls for benchmarking

lystomvoYaroslav Bolyukin2026-02-08parent: #7c5655f.patch.diff
in: master

9 files changed

modifiedflake.nixdiffbeforeafterboth
45 jsonnetImpls = {45 jsonnetImpls = {
46 go-jsonnet = pkgs.callPackage ./nix/go-jsonnet.nix { };46 go-jsonnet = pkgs.callPackage ./nix/go-jsonnet.nix { };
47 sjsonnet = pkgs.callPackage ./nix/sjsonnet.nix { };47 sjsonnet = pkgs.callPackage ./nix/sjsonnet.nix { };
48 jsonnet = pkgs.callPackage ./nix/jsonnet.nix { };48 cpp-jsonnet = pkgs.callPackage ./nix/cpp-jsonnet.nix { };
49 # I didn't managed to build it, and nixpkgs version is marked as broken49 # I didn't managed to build it, and nixpkgs version is marked as broken
50 # haskell-jsonnet = pkgs.callPackage ./nix/haskell-jsonnet.nix { };50 # haskell-jsonnet = pkgs.callPackage ./nix/haskell-jsonnet.nix { };
51 rsjsonnet = pkgs.callPackage ./nix/rsjsonnet.nix { };51 rsjsonnet = pkgs.callPackage ./nix/rsjsonnet.nix { };
57 jrsonnet = pkgs.callPackage ./nix/jrsonnet.nix {57 jrsonnet = pkgs.callPackage ./nix/jrsonnet.nix {
58 inherit craneLib;58 inherit craneLib;
59 };59 };
60 jrsonnet-nightly = pkgs.callPackage ./nix/jrsonnet.nix {
61 inherit craneLib;
62 withNightlyFeatures = true;
63 };
64 jrsonnet-experimental = pkgs.callPackage ./nix/jrsonnet.nix {60 jrsonnet-experimental = pkgs.callPackage ./nix/jrsonnet.nix {
65 inherit craneLib;61 inherit craneLib;
66 withExperimentalFeatures = true;62 withExperimentalFeatures = true;
77 inherit (config.legacyPackages.jsonnetImpls)73 inherit (config.legacyPackages.jsonnetImpls)
78 go-jsonnet74 go-jsonnet
79 sjsonnet75 sjsonnet
80 jsonnet76 cpp-jsonnet
81 rsjsonnet77 rsjsonnet
82 ;78 ;
83 jrsonnetVariants = [79 jrsonnetVariants = [
91 inherit (config.legacyPackages.jsonnetImpls)87 inherit (config.legacyPackages.jsonnetImpls)
92 go-jsonnet88 go-jsonnet
93 sjsonnet89 sjsonnet
94 jsonnet90 cpp-jsonnet
95 rsjsonnet91 rsjsonnet
96 ;92 ;
97 quick = true;93 quick = true;
106 inherit (config.legacyPackages.jsonnetImpls)102 inherit (config.legacyPackages.jsonnetImpls)
107 go-jsonnet103 go-jsonnet
108 sjsonnet104 sjsonnet
109 jsonnet105 cpp-jsonnet
110 rsjsonnet106 rsjsonnet
111 ;107 ;
112 jrsonnetVariants = [108 jrsonnetVariants = [
115 name = "current";111 name = "current";
116 }112 }
117 {113 {
118 drv = jrsonnet-nightly.override { forBenchmarks = true; };114 drv = jrsonnet-experimental.override { forBenchmarks = true; };
119 name = "current-nightly";115 name = "current-experimental";
120 }116 }
121 {117 {
122 drv = jrsonnet-release.override { forBenchmarks = true; };118 drv = jrsonnet-release.override { forBenchmarks = true; };
128 inherit (config.legacyPackages.jsonnetImpls)124 inherit (config.legacyPackages.jsonnetImpls)
129 go-jsonnet125 go-jsonnet
130 sjsonnet126 sjsonnet
131 jsonnet127 cpp-jsonnet
132 rsjsonnet128 rsjsonnet
133 ;129 ;
134 quick = true;130 quick = true;
138 name = "current";134 name = "current";
139 }135 }
140 {136 {
141 drv = jrsonnet-nightly.override { forBenchmarks = true; };137 drv = jrsonnet-experimental.override { forBenchmarks = true; };
142 name = "current-nightly";138 name = "current-experimental";
143 }139 }
144 {140 {
145 drv = jrsonnet-release.override { forBenchmarks = true; };141 drv = jrsonnet-release.override { forBenchmarks = true; };
modifiednix/benchmarks.nixdiffbeforeafterboth
7 fetchFromGitHub,7 fetchFromGitHub,
8 go-jsonnet,8 go-jsonnet,
9 sjsonnet,9 sjsonnet,
10 jsonnet,10 cpp-jsonnet,
11 rsjsonnet,11 rsjsonnet,
12 hyperfine,12 hyperfine,
13 quick ? false,13 quick ? false,
7171
72 buildInputs = [72 buildInputs = [
73 sjsonnet73 sjsonnet
74 jsonnet74 cpp-jsonnet
75 rsjsonnet75 rsjsonnet
76 go-jsonnet76 go-jsonnet
7777
addednix/cpp-jsonnet.nixdiffbeforeafterboth

no changes

modifiednix/go-jsonnet.nixdiffbeforeafterboth
3 fetchFromGitHub,3 fetchFromGitHub,
4 makeWrapper,4 makeWrapper,
5}:5}:
6buildGoModule rec {6let
7 pname = "go-jsonnet";7 pname = "go-jsonnet";
8 version = "0.20.0";8 version = "0.21.0";
9
10 src = fetchFromGitHub {9 src = fetchFromGitHub {
11 owner = "google";10 owner = "google";
12 repo = pname;11 repo = pname;
13 rev = "v${version}";12 rev = "v${version}";
14 hash = "sha256-P69tguBrFF/CSCOfHjCfBT5710oJdhZDh3kMCbc32eE=";13 hash = "sha256-J92xNDpCidbiSsN6NveS6BX6Tx+qDQqkgm6pjk1wBTQ=";
15 };14 };
16 vendorHash = "sha256-j1fTOUpLx34TgzW94A/BctLrg9XoTtb3cBizhVJoEEI=";15in
1716buildGoModule {
18 buildInputs = [makeWrapper];17 inherit pname version src;
1918
20 postInstall = ''19 vendorHash = "sha256-Uh2rAXdye9QmmZuEqx1qeokE9Z9domyHsSFlU7YZsZw=";
21 mv $out/bin/jsonnet $out/bin/go-jsonnet20
22 wrapProgram $out/bin/go-jsonnet --add-flags "--max-stack 200000"21 buildInputs = [ makeWrapper ];
23 '';22
2423 postInstall = ''
25 doCheck = false;24 mv $out/bin/jsonnet $out/bin/go-jsonnet
2625 wrapProgram $out/bin/go-jsonnet --add-flags "--max-stack 200000"
27 subPackages = ["cmd/jsonnet"];26 '';
28}27
28 passthru = { inherit src; };
29
30 doCheck = false;
31
32 subPackages = [ "cmd/jsonnet" ];
33}
2934
modifiednix/jrsonnet-release.nixdiffbeforeafterboth
16 rev = "ad68a2495da324ce7a893992a6b32851849c64eb";16 rev = "ad68a2495da324ce7a893992a6b32851849c64eb";
17 hash = "sha256-N2z0JcJG6iQ+eAE1GGF+c1+T7Pti8oCgx+QWdhT+33M=";17 hash = "sha256-N2z0JcJG6iQ+eAE1GGF+c1+T7Pti8oCgx+QWdhT+33M=";
18 };18 };
19 cargoHash = "sha256-A/sdqI51kD7Tfo9R95ep2CecaSEzSz3suhZXdND6/nQ=";19 cargoHash = "sha256-ZHmdlqakucapzXJz6L7ZJpmvqTutelN8qkWAD4uDJr8=";
2020
21 cargoTestFlags = ["--package=jrsonnet --features=mimalloc,legacy-this-file"];21 cargoTestFlags = ["--package=jrsonnet --features=mimalloc,legacy-this-file"];
22 cargoBuildFlags = ["--package=jrsonnet --features=mimalloc,legacy-this-file"];22 cargoBuildFlags = ["--package=jrsonnet --features=mimalloc,legacy-this-file"];
modifiednix/jrsonnet.nixdiffbeforeafterboth
2 lib,2 lib,
3 craneLib,3 craneLib,
4 makeWrapper,4 makeWrapper,
5 withNightlyFeatures ? false,
6 withExperimentalFeatures ? false,5 withExperimentalFeatures ? false,
7 forBenchmarks ? false,6 forBenchmarks ? false,
8}:7}:
15 || (craneLib.filterCargoSources path type);14 || (craneLib.filterCargoSources path type);
16 };15 };
17 pname = "jrsonnet";16 pname = "jrsonnet";
18 version = "current${optionalString withNightlyFeatures "-nightly"}${optionalString withExperimentalFeatures "-experimental"}";17 version = "current${optionalString withExperimentalFeatures "-experimental"}";
1918
20 cargoExtraArgs = "--locked --features=mimalloc${optionalString withNightlyFeatures ",nightly"}${optionalString withExperimentalFeatures ",experimental"}";19 cargoExtraArgs = "--locked --features=mimalloc${optionalString withExperimentalFeatures ",experimental"}";
2120
22 nativeBuildInputs = [makeWrapper];21 nativeBuildInputs = [makeWrapper];
2322
deletednix/jsonnet.nixdiffbeforeafterboth

no changes

modifiednix/rsjsonnet.nixdiffbeforeafterboth
5}:5}:
6rustPlatform.buildRustPackage rec {6rustPlatform.buildRustPackage rec {
7 pname = "rsjsonnet";7 pname = "rsjsonnet";
8 version = "0.1.1";8 version = "0.4.0";
99
10 src = fetchFromGitHub {10 src = fetchFromGitHub {
11 owner = "eduardosm";11 owner = "eduardosm";
12 repo = pname;12 repo = pname;
13 rev = "v${version}";13 rev = "v${version}";
14 hash = "sha256-C6hZYGllKrKKMwMwss6PK2UD5Zb7bk2v8DrGpWnwP/A=";14 hash = "sha256-Oas/fll5YerHAMI91fTEQqe6praYh4Ro8idsdvzldpA=";
15 };15 };
1616
17 cargoHash = "sha256-TsUN9oUu6S1l9oTaR6nET1ZdRvMrR29bkP3VEDre8aE=";17 cargoHash = "sha256-jH2BOvD0Iss34hODhLFHKx5pGMVtkZir7E1bYwjSa8E=";
1818
19 nativeBuildInputs = [makeWrapper];19 nativeBuildInputs = [makeWrapper];
2020
modifiednix/sjsonnet.nixdiffbeforeafterboth
5{5{
6 stdenv,6 stdenv,
7 fetchurl,7 fetchurl,
8 jdk21_headless,8 jdk25_headless,
9 makeWrapper,9 makeWrapper,
10 java ? jdk21_headless,10 java ? jdk25_headless,
11}:11}:
12stdenv.mkDerivation rec {12stdenv.mkDerivation rec {
13 pname = "sjsonnet";13 pname = "sjsonnet";
14 version = "0.4.10";14 version = "0.6.0";
1515
16 src = fetchurl {16 src = fetchurl {
17 url = "https://github.com/databricks/${pname}/releases/download/${version}/${pname}-${version}.jar";17 url = "https://github.com/databricks/${pname}/releases/download/${version}/${pname}-${version}.jar";
18 hash = "sha256-zKlmh+jXm23x78CKwna8fGHNqziWuPipSbWTPUCADrY=";18 hash = "sha256-HQovfF/hX664apg9Pl9SdrK03b8rmZ9IjHpf7uNY8FM=";
19 };19 };
2020
21 unpackPhase = "true";21 unpackPhase = "true";