Compare commits

...

4 commits

Author SHA1 Message Date
Seth Flynn
49ce81f8af
Merge 7dd1f3eda2 into 1a8fb6f3a0 2025-01-30 20:49:12 +01:00
zig-overlay
1a8fb6f3a0 update sources.json
Some checks are pending
Test / test (push) Waiting to run
2025-01-30 12:11:50 +00:00
zig-overlay
7dc582328b update sources.json
Some checks are pending
Test / test (push) Waiting to run
2025-01-30 00:28:45 +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 99 additions and 56 deletions

34
flake.lock generated
View file

@ -16,24 +16,6 @@
"type": "github" "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": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1708161998, "lastModified": 1708161998,
@ -53,24 +35,8 @@
"root": { "root": {
"inputs": { "inputs": {
"flake-compat": "flake-compat", "flake-compat": "flake-compat",
"flake-utils": "flake-utils",
"nixpkgs": "nixpkgs" "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", "root": "root",

View file

@ -3,7 +3,6 @@
inputs = { inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.11"; nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.11";
flake-utils.url = "github:numtide/flake-utils";
# Used for shell.nix # Used for shell.nix
flake-compat = { flake-compat = {
@ -15,11 +14,22 @@
outputs = { outputs = {
self, self,
nixpkgs, nixpkgs,
flake-utils,
... ...
}: let }: 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"]; 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}; pkgs = nixpkgs.legacyPackages.${system};
in rec { in rec {
# The packages exported by the Flake: # The packages exported by the Flake:
@ -33,7 +43,10 @@
# this will use the latest default. # this will use the latest default.
apps = rec { apps = rec {
default = apps.zig; default = apps.zig;
zig = flake-utils.lib.mkApp {drv = packages.default;}; zig = {
type = "app";
program = toString packages.default;
};
}; };
# nix fmt # nix fmt

View file

@ -36,34 +36,34 @@
}, },
"latest": { "latest": {
"x86_64-linux": { "x86_64-linux": {
"url": "https://ziglang.org/builds/zig-linux-x86_64-0.14.0-dev.2851+b074fb7dd.tar.xz", "url": "https://ziglang.org/builds/zig-linux-x86_64-0.14.0-dev.2989+bf6ee7cb3.tar.xz",
"version": "0.14.0-dev.2851+b074fb7dd", "version": "0.14.0-dev.2989+bf6ee7cb3",
"sha256": "60a673a0a9eef7a62a61dd5b12beca02b7790f001456bb844404b72a066f063b" "sha256": "3513e4d878d73d07b9c2dc11cc7e2470ca4155100c0a9c73ecc3dc40f6062c06"
}, },
"aarch64-linux": { "aarch64-linux": {
"url": "https://ziglang.org/builds/zig-linux-aarch64-0.14.0-dev.2851+b074fb7dd.tar.xz", "url": "https://ziglang.org/builds/zig-linux-aarch64-0.14.0-dev.2989+bf6ee7cb3.tar.xz",
"version": "0.14.0-dev.2851+b074fb7dd", "version": "0.14.0-dev.2989+bf6ee7cb3",
"sha256": "d4e533966c188f5db43317914339ae3347ddef90eaeca98c349c523958919880" "sha256": "1d9a7f8be681839ff711713c28f7b073b830b12989586b60d5fd3d9a90fd8880"
}, },
"x86_64-darwin": { "x86_64-darwin": {
"url": "https://ziglang.org/builds/zig-macos-x86_64-0.14.0-dev.2851+b074fb7dd.tar.xz", "url": "https://ziglang.org/builds/zig-macos-x86_64-0.14.0-dev.2989+bf6ee7cb3.tar.xz",
"version": "0.14.0-dev.2851+b074fb7dd", "version": "0.14.0-dev.2989+bf6ee7cb3",
"sha256": "414191621981e2771b05f48a87db07158e666c78a84f2699eeb29776aa8b454e" "sha256": "24d8f2a509d04db81f229017aedb0f882d6452a5e500f04ec96b3c15b967af24"
}, },
"aarch64-darwin": { "aarch64-darwin": {
"url": "https://ziglang.org/builds/zig-macos-aarch64-0.14.0-dev.2851+b074fb7dd.tar.xz", "url": "https://ziglang.org/builds/zig-macos-aarch64-0.14.0-dev.2989+bf6ee7cb3.tar.xz",
"version": "0.14.0-dev.2851+b074fb7dd", "version": "0.14.0-dev.2989+bf6ee7cb3",
"sha256": "03ca1ad191ea4025df77e1dcc2b17c5297537d783f53c5ddd6bc50e00dcd6784" "sha256": "1ba106c98cf040f2d958fcf41b24229693bcfc2cace6c48c9b4726fc5c5d8f3c"
}, },
"x86_64-windows": { "x86_64-windows": {
"url": "https://ziglang.org/builds/zig-windows-x86_64-0.14.0-dev.2851+b074fb7dd.zip", "url": "https://ziglang.org/builds/zig-windows-x86_64-0.14.0-dev.2989+bf6ee7cb3.zip",
"sha256": "e0498ae38fac67d8cebbcf4d3e8b452b4808e63d6b95bfa29a0d99cc4cee532b", "sha256": "7903b01c98e3a03eee9d825839d3ecf1aa0554958d554821697f400d78dd07f5",
"version": "0.14.0-dev.2851+b074fb7dd" "version": "0.14.0-dev.2989+bf6ee7cb3"
}, },
"aarch64-windows": { "aarch64-windows": {
"url": "https://ziglang.org/builds/zig-windows-aarch64-0.14.0-dev.2851+b074fb7dd.zip", "url": "https://ziglang.org/builds/zig-windows-aarch64-0.14.0-dev.2989+bf6ee7cb3.zip",
"sha256": "1f17d82e5210a97ce6b834c23007fb79a1c89ce4cb098cb37ae71f41106c8dd9", "sha256": "645206f52c7ea16ca6b8f4fd25803698630979598e5e53692f854ff8ce987280",
"version": "0.14.0-dev.2851+b074fb7dd" "version": "0.14.0-dev.2989+bf6ee7cb3"
} }
}, },
"2021-02-20": { "2021-02-20": {
@ -29720,6 +29720,70 @@
"sha256": "1f17d82e5210a97ce6b834c23007fb79a1c89ce4cb098cb37ae71f41106c8dd9", "sha256": "1f17d82e5210a97ce6b834c23007fb79a1c89ce4cb098cb37ae71f41106c8dd9",
"version": "0.14.0-dev.2851+b074fb7dd" "version": "0.14.0-dev.2851+b074fb7dd"
} }
},
"2025-01-29": {
"x86_64-darwin": {
"url": "https://ziglang.org/builds/zig-macos-x86_64-0.14.0-dev.2987+183bb8b08.tar.xz",
"sha256": "a6ead86fe2019a1f177c910cf6949782b180f16c9705093b2a1898e0e4b04043",
"version": "0.14.0-dev.2987+183bb8b08"
},
"aarch64-darwin": {
"url": "https://ziglang.org/builds/zig-macos-aarch64-0.14.0-dev.2987+183bb8b08.tar.xz",
"sha256": "f44b03064424035f579e066c743d56097198e1837a8bbb1625fda94e23cd80f3",
"version": "0.14.0-dev.2987+183bb8b08"
},
"x86_64-linux": {
"url": "https://ziglang.org/builds/zig-linux-x86_64-0.14.0-dev.2987+183bb8b08.tar.xz",
"sha256": "c6a385ee786693dda85d29d6469e2fa4f10c53768b10a18a3644e0b8891d36e4",
"version": "0.14.0-dev.2987+183bb8b08"
},
"aarch64-linux": {
"url": "https://ziglang.org/builds/zig-linux-aarch64-0.14.0-dev.2987+183bb8b08.tar.xz",
"sha256": "cdf0fa991aae83d30ee6decf83bc22d5e46aeeeea623d98c1ce53aeea1eed1e1",
"version": "0.14.0-dev.2987+183bb8b08"
},
"x86_64-windows": {
"url": "https://ziglang.org/builds/zig-windows-x86_64-0.14.0-dev.2987+183bb8b08.zip",
"sha256": "c30bbe136930ced91686166a9dc57a532cc4362cae914e29fd8921db91dad213",
"version": "0.14.0-dev.2987+183bb8b08"
},
"aarch64-windows": {
"url": "https://ziglang.org/builds/zig-windows-aarch64-0.14.0-dev.2987+183bb8b08.zip",
"sha256": "3a91cc831badd3e1fd8dc331e0a5d0611eb0e66b5ade02125f3bb6a1b4086b4d",
"version": "0.14.0-dev.2987+183bb8b08"
}
},
"2025-01-30": {
"x86_64-darwin": {
"url": "https://ziglang.org/builds/zig-macos-x86_64-0.14.0-dev.2989+bf6ee7cb3.tar.xz",
"sha256": "24d8f2a509d04db81f229017aedb0f882d6452a5e500f04ec96b3c15b967af24",
"version": "0.14.0-dev.2989+bf6ee7cb3"
},
"aarch64-darwin": {
"url": "https://ziglang.org/builds/zig-macos-aarch64-0.14.0-dev.2989+bf6ee7cb3.tar.xz",
"sha256": "1ba106c98cf040f2d958fcf41b24229693bcfc2cace6c48c9b4726fc5c5d8f3c",
"version": "0.14.0-dev.2989+bf6ee7cb3"
},
"x86_64-linux": {
"url": "https://ziglang.org/builds/zig-linux-x86_64-0.14.0-dev.2989+bf6ee7cb3.tar.xz",
"sha256": "3513e4d878d73d07b9c2dc11cc7e2470ca4155100c0a9c73ecc3dc40f6062c06",
"version": "0.14.0-dev.2989+bf6ee7cb3"
},
"aarch64-linux": {
"url": "https://ziglang.org/builds/zig-linux-aarch64-0.14.0-dev.2989+bf6ee7cb3.tar.xz",
"sha256": "1d9a7f8be681839ff711713c28f7b073b830b12989586b60d5fd3d9a90fd8880",
"version": "0.14.0-dev.2989+bf6ee7cb3"
},
"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"
},
"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"
}
} }
}, },
"0.7.1": { "0.7.1": {