Compare commits

...

3 commits

Author SHA1 Message Date
Seth Flynn
31fadf0b02
Merge 7dd1f3eda2 into e39f9061e0 2025-02-03 20:41:12 +01:00
zig-overlay
e39f9061e0 update sources.json
Some checks failed
Test / test (push) Has been cancelled
2025-02-03 00:30:36 +00:00
seth
7dd1f3eda2
drop flake-utils
Using these few lines of polyfill should help avoid end user's
flake.lock being polluted with sometimes hard to deduplicate
dependencies (i.e., ghostty)
2024-11-16 05:31:03 -05:00
3 changed files with 53 additions and 74 deletions

34
flake.lock generated
View file

@ -16,24 +16,6 @@
"type": "github"
}
},
"flake-utils": {
"inputs": {
"systems": "systems"
},
"locked": {
"lastModified": 1705309234,
"narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"nixpkgs": {
"locked": {
"lastModified": 1708161998,
@ -53,24 +35,8 @@
"root": {
"inputs": {
"flake-compat": "flake-compat",
"flake-utils": "flake-utils",
"nixpkgs": "nixpkgs"
}
},
"systems": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
}
},
"root": "root",

View file

@ -3,7 +3,6 @@
inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.11";
flake-utils.url = "github:numtide/flake-utils";
# Used for shell.nix
flake-compat = {
@ -15,11 +14,22 @@
outputs = {
self,
nixpkgs,
flake-utils,
...
}: let
inherit (nixpkgs) lib;
# flake-utils polyfill
eachSystem = systems: fn:
lib.foldl' (
acc: system:
lib.recursiveUpdate
acc
(lib.mapAttrs (_: value: {${system} = value;}) (fn system))
) {}
systems;
systems = ["x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin"];
outputs = flake-utils.lib.eachSystem systems (system: let
outputs = eachSystem systems (system: let
pkgs = nixpkgs.legacyPackages.${system};
in rec {
# The packages exported by the Flake:
@ -33,7 +43,10 @@
# this will use the latest default.
apps = rec {
default = apps.zig;
zig = flake-utils.lib.mkApp {drv = packages.default;};
zig = {
type = "app";
program = toString packages.default;
};
};
# nix fmt

View file

@ -36,34 +36,34 @@
},
"latest": {
"x86_64-linux": {
"url": "https://ziglang.org/builds/zig-linux-x86_64-0.14.0-dev.3020+c104e8644.tar.xz",
"version": "0.14.0-dev.3020+c104e8644",
"sha256": "d30bde407e91d791c545c74f39b601c6cfb49e4dbb12c0e0eac91ce74175e5b8"
"url": "https://ziglang.org/builds/zig-linux-x86_64-0.14.0-dev.3028+cdc9d65b0.tar.xz",
"version": "0.14.0-dev.3028+cdc9d65b0",
"sha256": "be42d581bf49c51319183440d252f6a76c070b9d798cc80bcca930e269d49c5a"
},
"aarch64-linux": {
"url": "https://ziglang.org/builds/zig-linux-aarch64-0.14.0-dev.3020+c104e8644.tar.xz",
"version": "0.14.0-dev.3020+c104e8644",
"sha256": "6044bad3db6eeeface37bf41c97ba5561278b67f3a23321d1bb15e08399a9ab7"
"url": "https://ziglang.org/builds/zig-linux-aarch64-0.14.0-dev.3028+cdc9d65b0.tar.xz",
"version": "0.14.0-dev.3028+cdc9d65b0",
"sha256": "2049eda7a11a4ca251d9d8d2546c6778828edd0940d621805f2b9c56a06c5043"
},
"x86_64-darwin": {
"url": "https://ziglang.org/builds/zig-macos-x86_64-0.14.0-dev.3020+c104e8644.tar.xz",
"version": "0.14.0-dev.3020+c104e8644",
"sha256": "04112d702dc4e6adfb1ccee575e320954e8f993bd633864212e44531bfba6015"
"url": "https://ziglang.org/builds/zig-macos-x86_64-0.14.0-dev.3028+cdc9d65b0.tar.xz",
"version": "0.14.0-dev.3028+cdc9d65b0",
"sha256": "5d82aba58eff4221f736bdcfb009df4be186d221532e25cc2380ed41f9aca77f"
},
"aarch64-darwin": {
"url": "https://ziglang.org/builds/zig-macos-aarch64-0.14.0-dev.3020+c104e8644.tar.xz",
"version": "0.14.0-dev.3020+c104e8644",
"sha256": "60081cde5edbd557b949d0a56b81f79f2ded96af7b2dfffb526929be88099945"
"url": "https://ziglang.org/builds/zig-macos-aarch64-0.14.0-dev.3028+cdc9d65b0.tar.xz",
"version": "0.14.0-dev.3028+cdc9d65b0",
"sha256": "ea5b85f82fe22d81dc0d2f2f78f59999418e13ac0fb4d2a5fcfc7be1a979cb80"
},
"x86_64-windows": {
"url": "https://ziglang.org/builds/zig-windows-x86_64-0.14.0-dev.3020+c104e8644.zip",
"sha256": "8b62d62f53a07889147413619db7cbf819a795bf6cb2f3cf525bd6f7c7857c6e",
"version": "0.14.0-dev.3020+c104e8644"
"url": "https://ziglang.org/builds/zig-windows-x86_64-0.14.0-dev.3028+cdc9d65b0.zip",
"sha256": "1fa65e7110416ea338868f042c457ed4d724c281cb94329436f6c32f3e658854",
"version": "0.14.0-dev.3028+cdc9d65b0"
},
"aarch64-windows": {
"url": "https://ziglang.org/builds/zig-windows-aarch64-0.14.0-dev.3020+c104e8644.zip",
"sha256": "a95dbb8c6e3a3af6da72ccbf91e6d9f9ea434f6a019281fab80cfe55538e16a2",
"version": "0.14.0-dev.3020+c104e8644"
"url": "https://ziglang.org/builds/zig-windows-aarch64-0.14.0-dev.3028+cdc9d65b0.zip",
"sha256": "e9e1b9b7a4a7fcfac38c23a3f4112e335879594ca711471a75c4f4a6300e6199",
"version": "0.14.0-dev.3028+cdc9d65b0"
}
},
"2021-02-20": {
@ -29851,34 +29851,34 @@
},
"2025-02-02": {
"x86_64-darwin": {
"url": "https://ziglang.org/builds/zig-macos-x86_64-0.14.0-dev.3020+c104e8644.tar.xz",
"sha256": "04112d702dc4e6adfb1ccee575e320954e8f993bd633864212e44531bfba6015",
"version": "0.14.0-dev.3020+c104e8644"
"url": "https://ziglang.org/builds/zig-macos-x86_64-0.14.0-dev.3028+cdc9d65b0.tar.xz",
"sha256": "5d82aba58eff4221f736bdcfb009df4be186d221532e25cc2380ed41f9aca77f",
"version": "0.14.0-dev.3028+cdc9d65b0"
},
"aarch64-darwin": {
"url": "https://ziglang.org/builds/zig-macos-aarch64-0.14.0-dev.3020+c104e8644.tar.xz",
"sha256": "60081cde5edbd557b949d0a56b81f79f2ded96af7b2dfffb526929be88099945",
"version": "0.14.0-dev.3020+c104e8644"
"url": "https://ziglang.org/builds/zig-macos-aarch64-0.14.0-dev.3028+cdc9d65b0.tar.xz",
"sha256": "ea5b85f82fe22d81dc0d2f2f78f59999418e13ac0fb4d2a5fcfc7be1a979cb80",
"version": "0.14.0-dev.3028+cdc9d65b0"
},
"x86_64-linux": {
"url": "https://ziglang.org/builds/zig-linux-x86_64-0.14.0-dev.3020+c104e8644.tar.xz",
"sha256": "d30bde407e91d791c545c74f39b601c6cfb49e4dbb12c0e0eac91ce74175e5b8",
"version": "0.14.0-dev.3020+c104e8644"
"url": "https://ziglang.org/builds/zig-linux-x86_64-0.14.0-dev.3028+cdc9d65b0.tar.xz",
"sha256": "be42d581bf49c51319183440d252f6a76c070b9d798cc80bcca930e269d49c5a",
"version": "0.14.0-dev.3028+cdc9d65b0"
},
"aarch64-linux": {
"url": "https://ziglang.org/builds/zig-linux-aarch64-0.14.0-dev.3020+c104e8644.tar.xz",
"sha256": "6044bad3db6eeeface37bf41c97ba5561278b67f3a23321d1bb15e08399a9ab7",
"version": "0.14.0-dev.3020+c104e8644"
"url": "https://ziglang.org/builds/zig-linux-aarch64-0.14.0-dev.3028+cdc9d65b0.tar.xz",
"sha256": "2049eda7a11a4ca251d9d8d2546c6778828edd0940d621805f2b9c56a06c5043",
"version": "0.14.0-dev.3028+cdc9d65b0"
},
"x86_64-windows": {
"url": "https://ziglang.org/builds/zig-windows-x86_64-0.14.0-dev.3020+c104e8644.zip",
"sha256": "8b62d62f53a07889147413619db7cbf819a795bf6cb2f3cf525bd6f7c7857c6e",
"version": "0.14.0-dev.3020+c104e8644"
"url": "https://ziglang.org/builds/zig-windows-x86_64-0.14.0-dev.3028+cdc9d65b0.zip",
"sha256": "1fa65e7110416ea338868f042c457ed4d724c281cb94329436f6c32f3e658854",
"version": "0.14.0-dev.3028+cdc9d65b0"
},
"aarch64-windows": {
"url": "https://ziglang.org/builds/zig-windows-aarch64-0.14.0-dev.3020+c104e8644.zip",
"sha256": "a95dbb8c6e3a3af6da72ccbf91e6d9f9ea434f6a019281fab80cfe55538e16a2",
"version": "0.14.0-dev.3020+c104e8644"
"url": "https://ziglang.org/builds/zig-windows-aarch64-0.14.0-dev.3028+cdc9d65b0.zip",
"sha256": "e9e1b9b7a4a7fcfac38c23a3f4112e335879594ca711471a75c4f4a6300e6199",
"version": "0.14.0-dev.3028+cdc9d65b0"
}
}
},