Compare commits

...

3 commits

Author SHA1 Message Date
Seth Flynn
f07815271b
Merge 7dd1f3eda2 into 6847a19012 2025-01-31 20:31:49 +04:00
zig-overlay
6847a19012 update sources.json
Some checks are pending
Test / test (push) Waiting to run
2025-01-31 12:11:28 +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 67 additions and 56 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.2989+bf6ee7cb3.tar.xz",
"version": "0.14.0-dev.2989+bf6ee7cb3",
"sha256": "3513e4d878d73d07b9c2dc11cc7e2470ca4155100c0a9c73ecc3dc40f6062c06"
"url": "https://ziglang.org/builds/zig-linux-x86_64-0.14.0-dev.2992+78b7a446f.tar.xz",
"version": "0.14.0-dev.2992+78b7a446f",
"sha256": "873a8a00039a39ddded2866edc55ec718a881d6ea84d7766cf75949394f1123f"
},
"aarch64-linux": {
"url": "https://ziglang.org/builds/zig-linux-aarch64-0.14.0-dev.2989+bf6ee7cb3.tar.xz",
"version": "0.14.0-dev.2989+bf6ee7cb3",
"sha256": "1d9a7f8be681839ff711713c28f7b073b830b12989586b60d5fd3d9a90fd8880"
"url": "https://ziglang.org/builds/zig-linux-aarch64-0.14.0-dev.2992+78b7a446f.tar.xz",
"version": "0.14.0-dev.2992+78b7a446f",
"sha256": "d8fbccc8cdb34dd8ebce954a21dbb99b30e75ffd9727edc90a9928ef0888d673"
},
"x86_64-darwin": {
"url": "https://ziglang.org/builds/zig-macos-x86_64-0.14.0-dev.2989+bf6ee7cb3.tar.xz",
"version": "0.14.0-dev.2989+bf6ee7cb3",
"sha256": "24d8f2a509d04db81f229017aedb0f882d6452a5e500f04ec96b3c15b967af24"
"url": "https://ziglang.org/builds/zig-macos-x86_64-0.14.0-dev.2992+78b7a446f.tar.xz",
"version": "0.14.0-dev.2992+78b7a446f",
"sha256": "91f16bc2fc85b823c002822037fd8e165c4c74f32412c92eb63448f1060bc29b"
},
"aarch64-darwin": {
"url": "https://ziglang.org/builds/zig-macos-aarch64-0.14.0-dev.2989+bf6ee7cb3.tar.xz",
"version": "0.14.0-dev.2989+bf6ee7cb3",
"sha256": "1ba106c98cf040f2d958fcf41b24229693bcfc2cace6c48c9b4726fc5c5d8f3c"
"url": "https://ziglang.org/builds/zig-macos-aarch64-0.14.0-dev.2992+78b7a446f.tar.xz",
"version": "0.14.0-dev.2992+78b7a446f",
"sha256": "aa431bdb99c744e8ab5404902b36ed7abccc004d5f39ff30e5591acf74877663"
},
"x86_64-windows": {
"url": "https://ziglang.org/builds/zig-windows-x86_64-0.14.0-dev.2989+bf6ee7cb3.zip",
"sha256": "7903b01c98e3a03eee9d825839d3ecf1aa0554958d554821697f400d78dd07f5",
"version": "0.14.0-dev.2989+bf6ee7cb3"
"url": "https://ziglang.org/builds/zig-windows-x86_64-0.14.0-dev.2992+78b7a446f.zip",
"sha256": "7b8243c25829e6464d5bfc86c19533a3e2676c396785832563fb3df8ac403539",
"version": "0.14.0-dev.2992+78b7a446f"
},
"aarch64-windows": {
"url": "https://ziglang.org/builds/zig-windows-aarch64-0.14.0-dev.2989+bf6ee7cb3.zip",
"sha256": "645206f52c7ea16ca6b8f4fd25803698630979598e5e53692f854ff8ce987280",
"version": "0.14.0-dev.2989+bf6ee7cb3"
"url": "https://ziglang.org/builds/zig-windows-aarch64-0.14.0-dev.2992+78b7a446f.zip",
"sha256": "09b803a40cfff420e88a0f97f9b7c20e0b3810c031fee55fd2324e3d0b33183d",
"version": "0.14.0-dev.2992+78b7a446f"
}
},
"2021-02-20": {
@ -29784,6 +29784,38 @@
"sha256": "645206f52c7ea16ca6b8f4fd25803698630979598e5e53692f854ff8ce987280",
"version": "0.14.0-dev.2989+bf6ee7cb3"
}
},
"2025-01-31": {
"x86_64-darwin": {
"url": "https://ziglang.org/builds/zig-macos-x86_64-0.14.0-dev.2992+78b7a446f.tar.xz",
"sha256": "91f16bc2fc85b823c002822037fd8e165c4c74f32412c92eb63448f1060bc29b",
"version": "0.14.0-dev.2992+78b7a446f"
},
"aarch64-darwin": {
"url": "https://ziglang.org/builds/zig-macos-aarch64-0.14.0-dev.2992+78b7a446f.tar.xz",
"sha256": "aa431bdb99c744e8ab5404902b36ed7abccc004d5f39ff30e5591acf74877663",
"version": "0.14.0-dev.2992+78b7a446f"
},
"x86_64-linux": {
"url": "https://ziglang.org/builds/zig-linux-x86_64-0.14.0-dev.2992+78b7a446f.tar.xz",
"sha256": "873a8a00039a39ddded2866edc55ec718a881d6ea84d7766cf75949394f1123f",
"version": "0.14.0-dev.2992+78b7a446f"
},
"aarch64-linux": {
"url": "https://ziglang.org/builds/zig-linux-aarch64-0.14.0-dev.2992+78b7a446f.tar.xz",
"sha256": "d8fbccc8cdb34dd8ebce954a21dbb99b30e75ffd9727edc90a9928ef0888d673",
"version": "0.14.0-dev.2992+78b7a446f"
},
"x86_64-windows": {
"url": "https://ziglang.org/builds/zig-windows-x86_64-0.14.0-dev.2992+78b7a446f.zip",
"sha256": "7b8243c25829e6464d5bfc86c19533a3e2676c396785832563fb3df8ac403539",
"version": "0.14.0-dev.2992+78b7a446f"
},
"aarch64-windows": {
"url": "https://ziglang.org/builds/zig-windows-aarch64-0.14.0-dev.2992+78b7a446f.zip",
"sha256": "09b803a40cfff420e88a0f97f9b7c20e0b3810c031fee55fd2324e3d0b33183d",
"version": "0.14.0-dev.2992+78b7a446f"
}
}
},
"0.7.1": {