superrob1500
/
mirror-ghostty
mirror of https://github.com/ghostty-org/ghostty
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

update to the latest zon2nix (#8808)

pull/8812/head
Mitchell Hashimoto 2025-09-20 15:11:34 -07:00 committed by GitHub
parent c277ef8d82 d4bc73a9d6
commit a96b2abf7c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
flake.lock
View File

@ -49,15 +49,15 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1755972213, "lastModified": 1758360447,
"narHash": "sha256-VYK7aDAv8H1enXn1ECRHmGbeY6RqLnNwUJkOwloIsko=", "narHash": "sha256-XDY3A83bclygHDtesRoaRTafUd80Q30D/Daf9KSG6bs=",
"rev": "73e96df7cff5783f45e21342a75a1540c4eddce4", "rev": "8eaee110344796db060382e15d3af0a9fc396e0e",
"type": "tarball", "type": "tarball",
"url": "https://releases.nixos.org/nixos/unstable-small/nixos-25.11pre850642.73e96df7cff5/nixexprs.tar.xz" "url": "https://releases.nixos.org/nixos/unstable/nixos-25.11pre864002.8eaee1103447/nixexprs.tar.xz"
}, },
"original": { "original": {
"type": "tarball", "type": "tarball",
"url": "https://channels.nixos.org/nixos-unstable-small/nixexprs.tar.xz" "url": "https://channels.nixos.org/nixos-unstable/nixexprs.tar.xz"
} }
}, },
"root": { "root": {
@ -115,17 +115,17 @@
"nixpkgs": "nixpkgs_2" "nixpkgs": "nixpkgs_2"
}, },
"locked": { "locked": {
"lastModified": 1757167408, "lastModified": 1758405547,
"narHash": "sha256-4XyJ6fmKd9wgJ7vHUQuULYy5ps2gUgkkDk/PrJb2OPY=", "narHash": "sha256-WgaDgvIZMPvlZcZrpPMjkaalTBnGF2lTG+62znXctWM=",
"owner": "jcollie", "owner": "jcollie",
"repo": "zon2nix", "repo": "zon2nix",
"rev": "dc78177e2ad28d5a407c9e783ee781bd559d7dd5", "rev": "bf983aa90ff169372b9fa8c02e57ea75e0b42245",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "jcollie", "owner": "jcollie",
"repo": "zon2nix", "repo": "zon2nix",
"rev": "dc78177e2ad28d5a407c9e783ee781bd559d7dd5", "rev": "bf983aa90ff169372b9fa8c02e57ea75e0b42245",
"type": "github" "type": "github"
} }
} }

2
flake.nix
View File

@ -24,7 +24,7 @@
}; };
zon2nix = { zon2nix = {
url = "github:jcollie/zon2nix?rev=dc78177e2ad28d5a407c9e783ee781bd559d7dd5"; url = "github:jcollie/zon2nix?rev=bf983aa90ff169372b9fa8c02e57ea75e0b42245";
inputs = { inputs = {
# Don't override nixpkgs until Zig 0.15 is available in the Nix branch # Don't override nixpkgs until Zig 0.15 is available in the Nix branch
# we are using for "normal" builds. # we are using for "normal" builds.

3
nix/build-support/check-zig-cache.sh
View File

@ -79,7 +79,7 @@ elif [ "$1" != "--update" ]; then
exit 1 exit 1
fi fi
zon2nix "$BUILD_ZIG_ZON" --nix "$WORK_DIR/build.zig.zon.nix" --txt "$WORK_DIR/build.zig.zon.txt" --json "$WORK_DIR/build.zig.zon.json" --flatpak "$WORK_DIR/zig-packages.json" zon2nix "$BUILD_ZIG_ZON" --14 --nix "$WORK_DIR/build.zig.zon.nix" --txt "$WORK_DIR/build.zig.zon.txt" --json "$WORK_DIR/build.zig.zon.json" --flatpak "$WORK_DIR/zig-packages.json"
alejandra --quiet "$WORK_DIR/build.zig.zon.nix" alejandra --quiet "$WORK_DIR/build.zig.zon.nix"
prettier --log-level warn --write "$WORK_DIR/build.zig.zon.json" prettier --log-level warn --write "$WORK_DIR/build.zig.zon.json"
prettier --log-level warn --write "$WORK_DIR/zig-packages.json" prettier --log-level warn --write "$WORK_DIR/zig-packages.json"
@ -118,4 +118,3 @@ else
echo -e "OK: flatpak/zig-packages.json updated." echo -e "OK: flatpak/zig-packages.json updated."
exit 0 exit 0
fi fi