--- a/flake.lock +++ b/flake.lock @@ -20,11 +20,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1690394427, - "narHash": "sha256-ZT1ABAZVdJycCJMUHu533dvcMuxqUGDnp6N2zLcFrv4=", + "lastModified": 1691354699, + "narHash": "sha256-BPbkT/XKv/DMPXPbSJU7RymROQDwhyBWzr//YzDWxHE=", "owner": "nixos", "repo": "nixpkgs", - "rev": "78df3591ec67310b8cc4b753e1496999da2678cf", + "rev": "7a49ac268403ce92086ed7ab8d81209032aa0a5f", "type": "github" }, "original": { @@ -50,11 +50,11 @@ ] }, "locked": { - "lastModified": 1690338181, - "narHash": "sha256-Sz2oQ9aNS3MVncnCMndr0302G26UrFUfPynoH2iLjsg=", + "lastModified": 1691287991, + "narHash": "sha256-jAfKjfK1X73Zg/utl2pDdD5nBY53zLSLeTFWQLZM7jo=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "b7f0b7b58b3c6f14a1377ec31a3d78b23ab843ec", + "rev": "5cf31bca06641e115b9217e682d85d4d23486e61", "type": "github" }, "original": { --- a/flake.nix +++ b/flake.nix @@ -16,7 +16,7 @@ inherit system; overlays = [ rust-overlay.overlays.default ]; }; - rust = ((pkgs.rustChannelOf { date = "2023-07-23"; channel = "nightly"; }).default.override { + rust = ((pkgs.rustChannelOf { date = "2023-08-02"; channel = "nightly"; }).default.override { extensions = [ "rust-src" "miri" "rust-analyzer" "clippy" ]; }); in @@ -65,7 +65,7 @@ jrsonnetVariants = [ { drv = jrsonnet; name = "current"; } { drv = jrsonnet-nightly; name = "current-nightly"; } - { drv = jrsonnet-release; name = "before-str-extend"; } + { drv = jrsonnet-release; name = "release"; } ]; }; benchmarks-quick-against-release = pkgs.callPackage ./nix/benchmarks.nix { @@ -74,12 +74,13 @@ jrsonnetVariants = [ { drv = jrsonnet; name = "current"; } { drv = jrsonnet-nightly; name = "current-nightly"; } - { drv = jrsonnet-release; name = "before-str-extend"; } + { drv = jrsonnet-release; name = "release"; } ]; }; }; devShell = pkgs.mkShell { nativeBuildInputs = with pkgs;[ + alejandra rust cargo-edit cargo-asm --- a/nix/go-jsonnet.nix +++ b/nix/go-jsonnet.nix @@ -2,14 +2,13 @@ buildGo119Module rec { pname = "go-jsonnet"; - # Latest release is broken: https://github.com/google/go-jsonnet/issues/653 - version = "b4633b66f85e069b105b1ff076d178e4354941bc"; + version = "0.20.0"; src = fetchFromGitHub { owner = "google"; - repo = "go-jsonnet"; - rev = "${version}"; - hash = "sha256-J+bGdbYo2Ch3ORYD57yJA4jiPiS8IYASZ6kJHhyaqeU="; + repo = pname; + rev = "v${version}"; + hash = "sha256-P69tguBrFF/CSCOfHjCfBT5710oJdhZDh3kMCbc32eE="; }; vendorHash = "sha256-j1fTOUpLx34TgzW94A/BctLrg9XoTtb3cBizhVJoEEI="; --- a/nix/jrsonnet-release.nix +++ b/nix/jrsonnet-release.nix @@ -3,15 +3,16 @@ rustPlatform.buildRustPackage rec { pname = "jrsonnet"; - version = "before-str-extend"; + version = "pre9"; src = fetchFromGitHub { owner = "CertainLach"; repo = pname; - rev = "ccafbf79faf649e0990e277c061be9a2b62ad84c"; - hash = "sha256-LTDIJY9wfv4h5e3/5bONHHBS0qMLKdY6bk6ajKEjG7A="; + rev = "5dc3b98bcc3b9848031f17165bcc2e86e8a65ba3"; + hash = "sha256-KM1yqsFzt7Vj4xiEzJJiuFaG49/utF80r9A2dSwCAjo="; }; - cargoHash = "sha256-LBlJWE3LcbOe/uu19TbLhbUhBKy8DzuDCP4XyuAEmUk="; + cargoHash = "sha256-y2YiktT1h263vpFaC+kRL8yaAWQThhEkS+NSQ6B6Ylk="; + cargoTestFlags = [ "--package=jrsonnet --features=mimalloc,legacy-this-file" ]; cargoBuildFlags = [ "--package=jrsonnet --features=mimalloc,legacy-this-file" ]; --- a/nix/jsonnet.nix +++ b/nix/jsonnet.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "jsonnet"; - version = "0.19.1"; + version = "0.20.0"; src = fetchFromGitHub { rev = "v${version}"; owner = "google"; - repo = "jsonnet"; - hash = "sha256-q1MNdbyrx4vvN5woe0o90pPqaNtsZjI5RQ7KJt7rOpU="; + repo = pname; + hash = "sha256-FtVJE9alEl56Uik+nCpJMV5DMVVmRCnE1xMAiWdK39Y="; }; makeFlags = [ --- a/nix/sjsonnet.nix +++ b/nix/sjsonnet.nix @@ -5,26 +5,26 @@ # TODO: Somehow build client-server version of sjsonnet, and use it in benchmarks -{ stdenv, lib, fetchurl, jdk17, makeWrapper }: +{ stdenv, lib, fetchurl, jdk20, makeWrapper }: -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "sjsonnet"; - version = "0.4.3"; + version = "0.4.5"; src = fetchurl { url = - "https://github.com/databricks/sjsonnet/releases/download/0.4.3/sjsonnet.jar"; - hash = "sha256-XDJAAAlFu1DfQ2YlGEO8OpWpwxzG83tHlCQIDiqfRGY="; + "https://github.com/databricks/${pname}/releases/download/${version}/${pname}-${version}.jar"; + hash = "sha256-bM5sK4PUwg7IvOHNq8e0zYIu0/OIA9uXjIaZMXNXxXg="; }; unpackPhase = "true"; buildInputs = - [ jdk17 makeWrapper ]; + [ jdk20 makeWrapper ]; installPhase = '' mkdir -p $out/bin $out/lib cp $src $out/lib/sjsonnet.jar - makeWrapper ${jdk17}/bin/java $out/bin/sjsonnet --add-flags "-Xss100m -XX:+UseStringDeduplication -jar $out/lib/sjsonnet.jar" + makeWrapper ${jdk20}/bin/java $out/bin/sjsonnet --add-flags "-Xss100m -XX:+UseStringDeduplication -jar $out/lib/sjsonnet.jar" ''; separateDebugInfo = false; }