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

--- a/flake.lock
+++ b/flake.lock
@@ -1,5 +1,25 @@
 {
   "nodes": {
+    "crane": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1711299236,
+        "narHash": "sha256-6/JsyozOMKN8LUGqWMopKTSiK8N79T8Q+hcxu2KkTXg=",
+        "owner": "ipetkov",
+        "repo": "crane",
+        "rev": "880573f80d09e18a11713f402b9e6172a085449f",
+        "type": "github"
+      },
+      "original": {
+        "owner": "ipetkov",
+        "repo": "crane",
+        "type": "github"
+      }
+    },
     "flake-utils": {
       "inputs": {
         "systems": "systems"
@@ -35,6 +55,7 @@
     },
     "root": {
       "inputs": {
+        "crane": "crane",
         "flake-utils": "flake-utils",
         "nixpkgs": "nixpkgs",
         "rust-overlay": "rust-overlay"

5    flake-utils.url = "github:numtide/flake-utils";5    flake-utils.url = "github:numtide/flake-utils";
6    rust-overlay = {6    rust-overlay = {
7      url = "github:oxalica/rust-overlay";7      url = "github:oxalica/rust-overlay";
8      inputs.nixpkgs.follows = "nixpkgs";8      inputs = {
9        nixpkgs.follows = "nixpkgs";
9      inputs.flake-utils.follows = "flake-utils";10        flake-utils.follows = "flake-utils";
11      };
10    };12    };
13    crane = {
14      url = "github:ipetkov/crane";
15      inputs.nixpkgs.follows = "nixpkgs";
16    };
11  };17  };
12  outputs = {18  outputs = {
13    nixpkgs,19    nixpkgs,
14    flake-utils,20    flake-utils,
15    rust-overlay,21    rust-overlay,
22    crane,
16    ...23    ...
17  }:24  }:
18    flake-utils.lib.eachDefaultSystem (25    flake-utils.lib.eachDefaultSystem (
22          overlays = [rust-overlay.overlays.default];29          overlays = [rust-overlay.overlays.default];
23          config.allowUnsupportedSystem = true;30          config.allowUnsupportedSystem = true;
24        };31        };
25        lib = pkgs.lib;32        rust = pkgs.rust-bin.fromRustupToolchainFile ./rust-toolchain.toml;
26        rust =33        craneLib = (crane.mkLib pkgs).overrideToolchain rust;
27          (pkgs.rustChannelOf {
28            date = "2024-01-10";
29            channel = "nightly";
30          })
31          .default
32          .override {
33            extensions = ["rust-src" "miri" "rust-analyzer" "clippy"];
34          };
35      in {34      in {
36        packages = rec {35        packages = rec {
37          default = jrsonnet;36          default = jrsonnet;
42          # haskell-jsonnet = pkgs.callPackage ./nix/haskell-jsonnet.nix { };41          # haskell-jsonnet = pkgs.callPackage ./nix/haskell-jsonnet.nix { };
42
43          jrsonnet = pkgs.callPackage ./nix/jrsonnet.nix {43          jrsonnet = pkgs.callPackage ./nix/jrsonnet.nix {
44            rustPlatform = pkgs.makeRustPlatform {
45              rustc = rust;
46              cargo = rust;
47            };44            inherit craneLib;
48          };45          };
49          jrsonnet-nightly = pkgs.callPackage ./nix/jrsonnet.nix {46          jrsonnet-nightly = pkgs.callPackage ./nix/jrsonnet.nix {
50            rustPlatform = pkgs.makeRustPlatform {
51              rustc = rust;
52              cargo = rust;
53            };47            inherit craneLib;
54            withNightlyFeatures = true;48            withNightlyFeatures = true;
55          };49          };
50          jrsonnet-experimental = pkgs.callPackage ./nix/jrsonnet.nix {
51            inherit craneLib;
52            withExperimentalFeatures = true;
53          };
54
56          jrsonnet-release = pkgs.callPackage ./nix/jrsonnet-release.nix {55          jrsonnet-release = pkgs.callPackage ./nix/jrsonnet-release.nix {
57            rustPlatform = pkgs.makeRustPlatform {56            rustPlatform = pkgs.makeRustPlatform {
115            ];114            ];
116          };115          };
117        };116        };
118        packagesCross = lib.genAttrs ["mingwW64"] (crossSystem: let
119          callPackage = pkgs.pkgsCross.${crossSystem}.callPackage;
120        in {
121          jrsonnet = callPackage ./nix/jrsonnet.nix {
122            # rustPlatform = pkgs.makeRustPlatform {
123            #   rustc = rust;
124            #   cargo = rust;
125            # };
126          };
127        });
128        devShells.default = pkgs.mkShell {117        devShells.default = craneLib.devShell {
129          nativeBuildInputs = with pkgs; [118          nativeBuildInputs = with pkgs; [
130            alejandra119            alejandra
131            rust
132            cargo-edit120            cargo-edit
133            cargo-asm121            cargo-asm
134            cargo-outdated122            cargo-outdated

--- a/nix/jrsonnet-release.nix
+++ b/nix/jrsonnet-release.nix
@@ -1,6 +1,8 @@
-{ lib, fetchFromGitHub, rustPlatform, runCommand, makeWrapper }:
-
-
+{
+  fetchFromGitHub,
+  rustPlatform,
+  makeWrapper,
+}:
 rustPlatform.buildRustPackage rec {
   pname = "jrsonnet";
   version = "pre9";
@@ -13,11 +15,10 @@
   };
   cargoHash = "sha256-y2YiktT1h263vpFaC+kRL8yaAWQThhEkS+NSQ6B6Ylk=";
 
-
-  cargoTestFlags = [ "--package=jrsonnet --features=mimalloc,legacy-this-file" ];
-  cargoBuildFlags = [ "--package=jrsonnet --features=mimalloc,legacy-this-file" ];
+  cargoTestFlags = ["--package=jrsonnet --features=mimalloc,legacy-this-file"];
+  cargoBuildFlags = ["--package=jrsonnet --features=mimalloc,legacy-this-file"];
 
-  buildInputs = [ makeWrapper ];
+  buildInputs = [makeWrapper];
 
   postInstall = ''
     wrapProgram $out/bin/jrsonnet --add-flags "--max-stack=200000 --os-stack=200000"

--- a/nix/jrsonnet.nix
+++ b/nix/jrsonnet.nix
@@ -1,33 +1,24 @@
 {
   lib,
-  rustPlatform,
-  runCommand,
+  craneLib,
   makeWrapper,
   withNightlyFeatures ? false,
+  withExperimentalFeatures ? false,
   forBenchmarks ? false,
 }:
-with lib; let
-  filteredSrc = builtins.path {
-    name = "jrsonnet-src-filtered";
-    filter = path: type: !(builtins.baseNameOf path == "flake.nix" || builtins.baseNameOf path == "nix");
-    path = ../.;
-  };
-
-  # for some reason, filteredSrc hash still depends on nix directory contents
-  # Moving it into a CA store drops leftover references
-  src =
-    runCommand "jrsonnet-src"
-    {
-      __contentAddressed = true;
-    } "cp -r '${filteredSrc}' $out";
-in
-  rustPlatform.buildRustPackage rec {
-    inherit src;
+with lib;
+  craneLib.buildPackage rec {
+    src = lib.cleanSourceWith {
+      src = ../.;
+      filter = path: type:
+        (lib.hasSuffix "\.jsonnet" path)
+        || (craneLib.filterCargoSources path type);
+    };
     pname = "jrsonnet";
-    version = "current${optionalString withNightlyFeatures "-nightly"}";
+    version = "current${optionalString withNightlyFeatures "-nightly"}${optionalString withExperimentalFeatures "-experimental"}";
 
     cargoTestFlags = [
-      "--features=mimalloc,legacy-this-file${optionalString withNightlyFeatures ",nightly"}"
+      "--features=mimalloc,legacy-this-file${optionalString withNightlyFeatures ",nightly"}${optionalString withExperimentalFeatures ",experimental"}"
     ];
     cargoBuildFlags = cargoTestFlags;
 
@@ -37,8 +28,4 @@
     postInstall = optionalString forBenchmarks ''
       wrapProgram $out/bin/jrsonnet --add-flags "--max-stack=200000 --os-stack=200000"
     '';
-
-    cargoLock = {
-      lockFile = ../Cargo.lock;
-    };
   }

--- a/rust-toolchain.toml
+++ b/rust-toolchain.toml
@@ -1,3 +1,3 @@
 [toolchain]
-channel = "nightly-2023-10-28"
-components = ["rustfmt", "clippy"]
+channel = "nightly-2024-01-10"
+components = ["rustfmt", "clippy", "rust-analyzer", "rust-src"]