`b5082ff183e9`

3 files changed

modifiedflake.lockdiff before after both

--- a/flake.lock
+++ b/flake.lock
@@ -110,15 +110,15 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1778022901,
+        "lastModified": 1778255217,
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "5d0f6be1c3cebacc3e817a18a44a3ac89ff66109",
+        "rev": "aa279bba121eac3e966b6dcea9891b5e96330944",
         "type": "github"
       },
       "original": {
         "owner": "nixos",
-        "ref": "release-25.11",
+        "ref": "master",
         "repo": "nixpkgs",
         "type": "github"
       }

modifiedflake.nixdiff before after both

--- a/flake.nix
+++ b/flake.nix
@@ -1,7 +1,7 @@
 {
   description = "Jrsonnet";
   inputs = {
-    nixpkgs.url = "github:nixos/nixpkgs/release-25.11";
+    nixpkgs.url = "github:nixos/nixpkgs/master";
     fenix = {
       url = "github:CertainLach/fenix/fix/libatomic";
       inputs.nixpkgs.follows = "nixpkgs";
@@ -240,6 +240,8 @@
                 jrsonnet-darwin = pkgs.callPackage ./nix/jrsonnet-cross-darwin.nix {
                   craneLib = craneLibCross;
                   targetTriple = "${targetArch}-apple-darwin";
+                  # https://github.com/rust-cross/cargo-zigbuild/issues/433
+                  zig = pkgs.zig_0_15;
                 };
                 jrsonnet-experimental-darwin = jrsonnet-darwin.override {
                   withExperimentalFeatures = true;

modifiednix/jrsonnet-cross-darwin.nixdiff before after both

1{2  lib,3  craneLib,4  cargo-zigbuild,5  zig,6  darwin,7  targetTriple,8  withExperimentalFeatures ? false,9}:10let11  inherit (lib) optionalString;12in13craneLib.buildPackage {14  src = lib.cleanSourceWith {15    src = ../.;16    filter = path: type: (lib.hasSuffix ".jsonnet" path) || (craneLib.filterCargoSources path type);17  };18  pname = "jrsonnet";19  version = "current${optionalString withExperimentalFeatures "-experimental"}";20  strictDeps = true;2122  depsBuildBuild = [23    zig24    cargo-zigbuild25  ];2627  nativeBuildInputs = [28    darwin.xcode_12_229  ];3031  cargoExtraArgs = "-p jrsonnet";3233  buildPhaseCargoCommand = ''34    export SDKROOT=${darwin.xcode_12_2}/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk35    export XDG_CACHE_HOME=$TMPDIR/xdg_cache36    mkdir -p $XDG_CACHE_HOME37    export CARGO_ZIGBUILD_CACHE_DIR=$TMPDIR/cargo-zigbuild-cache38    mkdir -p $CARGO_ZIGBUILD_CACHE_DIR3940    HOME=$(mktemp -d)41    cargo zigbuild --release --locked ${optionalString withExperimentalFeatures "--features=experimental"} --target=${targetTriple}42  '';4344  doNotPostBuildInstallCargoBinaries = true;45  installPhaseCommand = ''46    mkdir -p $out/bin47    cp target/${targetTriple}/release/jrsonnet $out/bin/jrsonnet48  '';49}