difftreelog
ci package everything for darwin cross
in: master
3 files changed
flake.lockdiffbeforeafterboth--- 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"
}
flake.nixdiffbeforeafterboth--- 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;
nix/jrsonnet-cross-darwin.nixdiffbeforeafterboth42 '';42 '';434344 doNotPostBuildInstallCargoBinaries = true;44 doNotPostBuildInstallCargoBinaries = true;45 installPhaseCommand = ''45 installPhaseCommand = ''46 mkdir -p $out/bin46 mkdir -p $out/bin $out/lib47 cp target/${targetTriple}/release/jrsonnet $out/bin/jrsonnet47 cp target/${targetTriple}/release/jrsonnet $out/bin/jrsonnet48 cp target/${targetTriple}/release/jrsonnet-fmt $out/bin/jrsonnet-fmt49 cp target/${targetTriple}/release/jrb $out/bin/jrb50 cp target/${targetTriple}/release/libjsonnet.dylib $out/lib/libjsonnet.dylib51 cp target/${targetTriple}/release/libjsonnet.a $out/lib/libjsonnet.a48 '';52 '';49}53}5054