difftreelog
ci update versions for benchmarking
in: master
6 files changed
flake.lockdiffbeforeafterboth20 },20 },21 "nixpkgs": {21 "nixpkgs": {22 "locked": {22 "locked": {23 "lastModified": 1690394427,23 "lastModified": 1691354699,24 "narHash": "sha256-ZT1ABAZVdJycCJMUHu533dvcMuxqUGDnp6N2zLcFrv4=",24 "narHash": "sha256-BPbkT/XKv/DMPXPbSJU7RymROQDwhyBWzr//YzDWxHE=",25 "owner": "nixos",25 "owner": "nixos",26 "repo": "nixpkgs",26 "repo": "nixpkgs",27 "rev": "78df3591ec67310b8cc4b753e1496999da2678cf",27 "rev": "7a49ac268403ce92086ed7ab8d81209032aa0a5f",28 "type": "github"28 "type": "github"29 },29 },30 "original": {30 "original": {50 ]50 ]51 },51 },52 "locked": {52 "locked": {53 "lastModified": 1690338181,53 "lastModified": 1691287991,54 "narHash": "sha256-Sz2oQ9aNS3MVncnCMndr0302G26UrFUfPynoH2iLjsg=",54 "narHash": "sha256-jAfKjfK1X73Zg/utl2pDdD5nBY53zLSLeTFWQLZM7jo=",55 "owner": "oxalica",55 "owner": "oxalica",56 "repo": "rust-overlay",56 "repo": "rust-overlay",57 "rev": "b7f0b7b58b3c6f14a1377ec31a3d78b23ab843ec",57 "rev": "5cf31bca06641e115b9217e682d85d4d23486e61",58 "type": "github"58 "type": "github"59 },59 },60 "original": {60 "original": {flake.nixdiffbeforeafterboth16 inherit system;16 inherit system;17 overlays = [ rust-overlay.overlays.default ];17 overlays = [ rust-overlay.overlays.default ];18 };18 };19 rust = ((pkgs.rustChannelOf { date = "2023-07-23"; channel = "nightly"; }).default.override {19 rust = ((pkgs.rustChannelOf { date = "2023-08-02"; channel = "nightly"; }).default.override {20 extensions = [ "rust-src" "miri" "rust-analyzer" "clippy" ];20 extensions = [ "rust-src" "miri" "rust-analyzer" "clippy" ];21 });21 });22 in22 in65 jrsonnetVariants = [65 jrsonnetVariants = [66 { drv = jrsonnet; name = "current"; }66 { drv = jrsonnet; name = "current"; }67 { drv = jrsonnet-nightly; name = "current-nightly"; }67 { drv = jrsonnet-nightly; name = "current-nightly"; }68 { drv = jrsonnet-release; name = "before-str-extend"; }68 { drv = jrsonnet-release; name = "release"; }69 ];69 ];70 };70 };71 benchmarks-quick-against-release = pkgs.callPackage ./nix/benchmarks.nix {71 benchmarks-quick-against-release = pkgs.callPackage ./nix/benchmarks.nix {74 jrsonnetVariants = [74 jrsonnetVariants = [75 { drv = jrsonnet; name = "current"; }75 { drv = jrsonnet; name = "current"; }76 { drv = jrsonnet-nightly; name = "current-nightly"; }76 { drv = jrsonnet-nightly; name = "current-nightly"; }77 { drv = jrsonnet-release; name = "before-str-extend"; }77 { drv = jrsonnet-release; name = "release"; }78 ];78 ];79 };79 };80 };80 };81 devShell = pkgs.mkShell {81 devShell = pkgs.mkShell {82 nativeBuildInputs = with pkgs;[82 nativeBuildInputs = with pkgs;[83 alejandra83 rust84 rust84 cargo-edit85 cargo-edit85 cargo-asm86 cargo-asmnix/go-jsonnet.nixdiffbeforeafterboth223buildGo119Module rec {3buildGo119Module rec {4 pname = "go-jsonnet";4 pname = "go-jsonnet";5 # Latest release is broken: https://github.com/google/go-jsonnet/issues/6536 version = "b4633b66f85e069b105b1ff076d178e4354941bc";5 version = "0.20.0";768 src = fetchFromGitHub {7 src = fetchFromGitHub {9 owner = "google";8 owner = "google";10 repo = "go-jsonnet";9 repo = pname;11 rev = "${version}";10 rev = "v${version}";12 hash = "sha256-J+bGdbYo2Ch3ORYD57yJA4jiPiS8IYASZ6kJHhyaqeU=";11 hash = "sha256-P69tguBrFF/CSCOfHjCfBT5710oJdhZDh3kMCbc32eE=";13 };12 };14 vendorHash = "sha256-j1fTOUpLx34TgzW94A/BctLrg9XoTtb3cBizhVJoEEI=";13 vendorHash = "sha256-j1fTOUpLx34TgzW94A/BctLrg9XoTtb3cBizhVJoEEI=";1514nix/jrsonnet-release.nixdiffbeforeafterboth334rustPlatform.buildRustPackage rec {4rustPlatform.buildRustPackage rec {5 pname = "jrsonnet";5 pname = "jrsonnet";6 version = "before-str-extend";6 version = "pre9";778 src = fetchFromGitHub {8 src = fetchFromGitHub {9 owner = "CertainLach";9 owner = "CertainLach";10 repo = pname;10 repo = pname;11 rev = "ccafbf79faf649e0990e277c061be9a2b62ad84c";11 rev = "5dc3b98bcc3b9848031f17165bcc2e86e8a65ba3";12 hash = "sha256-LTDIJY9wfv4h5e3/5bONHHBS0qMLKdY6bk6ajKEjG7A=";12 hash = "sha256-KM1yqsFzt7Vj4xiEzJJiuFaG49/utF80r9A2dSwCAjo=";13 };13 };14 cargoHash = "sha256-LBlJWE3LcbOe/uu19TbLhbUhBKy8DzuDCP4XyuAEmUk=";14 cargoHash = "sha256-y2YiktT1h263vpFaC+kRL8yaAWQThhEkS+NSQ6B6Ylk=";15151616 cargoTestFlags = [ "--package=jrsonnet --features=mimalloc,legacy-this-file" ];17 cargoTestFlags = [ "--package=jrsonnet --features=mimalloc,legacy-this-file" ];nix/jsonnet.nixdiffbeforeafterboth223stdenv.mkDerivation rec {3stdenv.mkDerivation rec {4 pname = "jsonnet";4 pname = "jsonnet";5 version = "0.19.1";5 version = "0.20.0";667 src = fetchFromGitHub {7 src = fetchFromGitHub {8 rev = "v${version}";8 rev = "v${version}";9 owner = "google";9 owner = "google";10 repo = "jsonnet";10 repo = pname;11 hash = "sha256-q1MNdbyrx4vvN5woe0o90pPqaNtsZjI5RQ7KJt7rOpU=";11 hash = "sha256-FtVJE9alEl56Uik+nCpJMV5DMVVmRCnE1xMAiWdK39Y=";12 };12 };131314 makeFlags = [14 makeFlags = [nix/sjsonnet.nixdiffbeforeafterboth556# TODO: Somehow build client-server version of sjsonnet, and use it in benchmarks6# TODO: Somehow build client-server version of sjsonnet, and use it in benchmarks778{ stdenv, lib, fetchurl, jdk17, makeWrapper }:8{ stdenv, lib, fetchurl, jdk20, makeWrapper }:9910stdenv.mkDerivation {10stdenv.mkDerivation rec {11 pname = "sjsonnet";11 pname = "sjsonnet";12 version = "0.4.3";12 version = "0.4.5";131314 src = fetchurl {14 src = fetchurl {15 url =15 url =16 "https://github.com/databricks/sjsonnet/releases/download/0.4.3/sjsonnet.jar";16 "https://github.com/databricks/${pname}/releases/download/${version}/${pname}-${version}.jar";17 hash = "sha256-XDJAAAlFu1DfQ2YlGEO8OpWpwxzG83tHlCQIDiqfRGY=";17 hash = "sha256-bM5sK4PUwg7IvOHNq8e0zYIu0/OIA9uXjIaZMXNXxXg=";18 };18 };191920 unpackPhase = "true";20 unpackPhase = "true";21 buildInputs =21 buildInputs =22 [ jdk17 makeWrapper ];22 [ jdk20 makeWrapper ];232324 installPhase = ''24 installPhase = ''25 mkdir -p $out/bin $out/lib25 mkdir -p $out/bin $out/lib26 cp $src $out/lib/sjsonnet.jar26 cp $src $out/lib/sjsonnet.jar27 makeWrapper ${jdk17}/bin/java $out/bin/sjsonnet --add-flags "-Xss100m -XX:+UseStringDeduplication -jar $out/lib/sjsonnet.jar"27 makeWrapper ${jdk20}/bin/java $out/bin/sjsonnet --add-flags "-Xss100m -XX:+UseStringDeduplication -jar $out/lib/sjsonnet.jar"28 '';28 '';29 separateDebugInfo = false;29 separateDebugInfo = false;30}30}3131