Compare commits

...

4 commits

Author SHA1 Message Date
Seth Flynn
ef25d048d9
Merge 7dd1f3eda2 into 2ac29c1ec4 2025-02-01 23:26:49 -08:00
zig-overlay
2ac29c1ec4 update sources.json
Some checks are pending
Test / test (push) Waiting to run
2025-02-01 12:10:01 +00:00
zig-overlay
82cb790f2b update sources.json
Some checks are pending
Test / test (push) Waiting to run
2025-02-01 00:31:58 +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 85 additions and 74 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.2992+78b7a446f.tar.xz", "url": "https://ziglang.org/builds/zig-linux-x86_64-0.14.0-dev.3012+3348478fc.tar.xz",
"version": "0.14.0-dev.2992+78b7a446f", "version": "0.14.0-dev.3012+3348478fc",
"sha256": "873a8a00039a39ddded2866edc55ec718a881d6ea84d7766cf75949394f1123f" "sha256": "330dfb96a7f4400ccd798bb4c4b0e286f885c816c2675b1e1776cd8d95a16fd5"
}, },
"aarch64-linux": { "aarch64-linux": {
"url": "https://ziglang.org/builds/zig-linux-aarch64-0.14.0-dev.2992+78b7a446f.tar.xz", "url": "https://ziglang.org/builds/zig-linux-aarch64-0.14.0-dev.3012+3348478fc.tar.xz",
"version": "0.14.0-dev.2992+78b7a446f", "version": "0.14.0-dev.3012+3348478fc",
"sha256": "d8fbccc8cdb34dd8ebce954a21dbb99b30e75ffd9727edc90a9928ef0888d673" "sha256": "97a46f9a236ce2c095171989815e1c5e10a1f2481abf42d404b57fb42d5028b2"
}, },
"x86_64-darwin": { "x86_64-darwin": {
"url": "https://ziglang.org/builds/zig-macos-x86_64-0.14.0-dev.2992+78b7a446f.tar.xz", "url": "https://ziglang.org/builds/zig-macos-x86_64-0.14.0-dev.3012+3348478fc.tar.xz",
"version": "0.14.0-dev.2992+78b7a446f", "version": "0.14.0-dev.3012+3348478fc",
"sha256": "91f16bc2fc85b823c002822037fd8e165c4c74f32412c92eb63448f1060bc29b" "sha256": "7cda95b8e0dd55cd014bf3aaef134d094b3bdc819cb1547a73db2163fe1314d3"
}, },
"aarch64-darwin": { "aarch64-darwin": {
"url": "https://ziglang.org/builds/zig-macos-aarch64-0.14.0-dev.2992+78b7a446f.tar.xz", "url": "https://ziglang.org/builds/zig-macos-aarch64-0.14.0-dev.3012+3348478fc.tar.xz",
"version": "0.14.0-dev.2992+78b7a446f", "version": "0.14.0-dev.3012+3348478fc",
"sha256": "aa431bdb99c744e8ab5404902b36ed7abccc004d5f39ff30e5591acf74877663" "sha256": "504af03ed31bc85f13e2643cf2167e547ce746c56dcefcaf0943eda6ff2fe375"
}, },
"x86_64-windows": { "x86_64-windows": {
"url": "https://ziglang.org/builds/zig-windows-x86_64-0.14.0-dev.2992+78b7a446f.zip", "url": "https://ziglang.org/builds/zig-windows-x86_64-0.14.0-dev.3012+3348478fc.zip",
"sha256": "7b8243c25829e6464d5bfc86c19533a3e2676c396785832563fb3df8ac403539", "sha256": "1983ef94f1b2fcda5ea24341d8e344c2e5bed68a0f51cd406a8216827a9e1cac",
"version": "0.14.0-dev.2992+78b7a446f" "version": "0.14.0-dev.3012+3348478fc"
}, },
"aarch64-windows": { "aarch64-windows": {
"url": "https://ziglang.org/builds/zig-windows-aarch64-0.14.0-dev.2992+78b7a446f.zip", "url": "https://ziglang.org/builds/zig-windows-aarch64-0.14.0-dev.3012+3348478fc.zip",
"sha256": "09b803a40cfff420e88a0f97f9b7c20e0b3810c031fee55fd2324e3d0b33183d", "sha256": "9d9beb91888e9c3bc9496adaf51f0b491981e94a7057179473ff66f23e2b5ac5",
"version": "0.14.0-dev.2992+78b7a446f" "version": "0.14.0-dev.3012+3348478fc"
} }
}, },
"2021-02-20": { "2021-02-20": {
@ -29787,34 +29787,66 @@
}, },
"2025-01-31": { "2025-01-31": {
"x86_64-darwin": { "x86_64-darwin": {
"url": "https://ziglang.org/builds/zig-macos-x86_64-0.14.0-dev.2992+78b7a446f.tar.xz", "url": "https://ziglang.org/builds/zig-macos-x86_64-0.14.0-dev.3011+e4c049e41.tar.xz",
"sha256": "91f16bc2fc85b823c002822037fd8e165c4c74f32412c92eb63448f1060bc29b", "sha256": "a9cb03eb533b596ee12c2a239b19e5b3f1fb0eb4ba19b101bcf1494c7c7c738e",
"version": "0.14.0-dev.2992+78b7a446f" "version": "0.14.0-dev.3011+e4c049e41"
}, },
"aarch64-darwin": { "aarch64-darwin": {
"url": "https://ziglang.org/builds/zig-macos-aarch64-0.14.0-dev.2992+78b7a446f.tar.xz", "url": "https://ziglang.org/builds/zig-macos-aarch64-0.14.0-dev.3011+e4c049e41.tar.xz",
"sha256": "aa431bdb99c744e8ab5404902b36ed7abccc004d5f39ff30e5591acf74877663", "sha256": "52c4ac284332e00bbacec7bdc601a186af4449d6cd915fd6a4cbf4898a7db6b2",
"version": "0.14.0-dev.2992+78b7a446f" "version": "0.14.0-dev.3011+e4c049e41"
}, },
"x86_64-linux": { "x86_64-linux": {
"url": "https://ziglang.org/builds/zig-linux-x86_64-0.14.0-dev.2992+78b7a446f.tar.xz", "url": "https://ziglang.org/builds/zig-linux-x86_64-0.14.0-dev.3011+e4c049e41.tar.xz",
"sha256": "873a8a00039a39ddded2866edc55ec718a881d6ea84d7766cf75949394f1123f", "sha256": "e2544ee01d2a43a0c66b0ab6588c48ac7d7ce819108a3d6af1ba16897567c87b",
"version": "0.14.0-dev.2992+78b7a446f" "version": "0.14.0-dev.3011+e4c049e41"
}, },
"aarch64-linux": { "aarch64-linux": {
"url": "https://ziglang.org/builds/zig-linux-aarch64-0.14.0-dev.2992+78b7a446f.tar.xz", "url": "https://ziglang.org/builds/zig-linux-aarch64-0.14.0-dev.3011+e4c049e41.tar.xz",
"sha256": "d8fbccc8cdb34dd8ebce954a21dbb99b30e75ffd9727edc90a9928ef0888d673", "sha256": "4e0294ac8ab1d9f4095d48dd08e402f719d4b51d5371b4fb468b086e9a3fc840",
"version": "0.14.0-dev.2992+78b7a446f" "version": "0.14.0-dev.3011+e4c049e41"
}, },
"x86_64-windows": { "x86_64-windows": {
"url": "https://ziglang.org/builds/zig-windows-x86_64-0.14.0-dev.2992+78b7a446f.zip", "url": "https://ziglang.org/builds/zig-windows-x86_64-0.14.0-dev.3011+e4c049e41.zip",
"sha256": "7b8243c25829e6464d5bfc86c19533a3e2676c396785832563fb3df8ac403539", "sha256": "f4e1def5b102b628f926579f81780a7c025567d6edd29517c1033eff7e044f43",
"version": "0.14.0-dev.2992+78b7a446f" "version": "0.14.0-dev.3011+e4c049e41"
}, },
"aarch64-windows": { "aarch64-windows": {
"url": "https://ziglang.org/builds/zig-windows-aarch64-0.14.0-dev.2992+78b7a446f.zip", "url": "https://ziglang.org/builds/zig-windows-aarch64-0.14.0-dev.3011+e4c049e41.zip",
"sha256": "09b803a40cfff420e88a0f97f9b7c20e0b3810c031fee55fd2324e3d0b33183d", "sha256": "9614f30002fa5155024bab836e0d331092d7c10bf6c2c83d5486963798b73984",
"version": "0.14.0-dev.2992+78b7a446f" "version": "0.14.0-dev.3011+e4c049e41"
}
},
"2025-02-01": {
"x86_64-darwin": {
"url": "https://ziglang.org/builds/zig-macos-x86_64-0.14.0-dev.3012+3348478fc.tar.xz",
"sha256": "7cda95b8e0dd55cd014bf3aaef134d094b3bdc819cb1547a73db2163fe1314d3",
"version": "0.14.0-dev.3012+3348478fc"
},
"aarch64-darwin": {
"url": "https://ziglang.org/builds/zig-macos-aarch64-0.14.0-dev.3012+3348478fc.tar.xz",
"sha256": "504af03ed31bc85f13e2643cf2167e547ce746c56dcefcaf0943eda6ff2fe375",
"version": "0.14.0-dev.3012+3348478fc"
},
"x86_64-linux": {
"url": "https://ziglang.org/builds/zig-linux-x86_64-0.14.0-dev.3012+3348478fc.tar.xz",
"sha256": "330dfb96a7f4400ccd798bb4c4b0e286f885c816c2675b1e1776cd8d95a16fd5",
"version": "0.14.0-dev.3012+3348478fc"
},
"aarch64-linux": {
"url": "https://ziglang.org/builds/zig-linux-aarch64-0.14.0-dev.3012+3348478fc.tar.xz",
"sha256": "97a46f9a236ce2c095171989815e1c5e10a1f2481abf42d404b57fb42d5028b2",
"version": "0.14.0-dev.3012+3348478fc"
},
"x86_64-windows": {
"url": "https://ziglang.org/builds/zig-windows-x86_64-0.14.0-dev.3012+3348478fc.zip",
"sha256": "1983ef94f1b2fcda5ea24341d8e344c2e5bed68a0f51cd406a8216827a9e1cac",
"version": "0.14.0-dev.3012+3348478fc"
},
"aarch64-windows": {
"url": "https://ziglang.org/builds/zig-windows-aarch64-0.14.0-dev.3012+3348478fc.zip",
"sha256": "9d9beb91888e9c3bc9496adaf51f0b491981e94a7057179473ff66f23e2b5ac5",
"version": "0.14.0-dev.3012+3348478fc"
} }
} }
}, },