Compare commits

...

3 commits

Author SHA1 Message Date
Seth Flynn
b6b858946c
Merge 7dd1f3eda2 into a737387d54 2025-02-02 16:24:34 +00:00
zig-overlay
a737387d54 update sources.json
Some checks are pending
Test / test (push) Waiting to run
2025-02-02 12:10:02 +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" "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.3012+3348478fc.tar.xz", "url": "https://ziglang.org/builds/zig-linux-x86_64-0.14.0-dev.3020+c104e8644.tar.xz",
"version": "0.14.0-dev.3012+3348478fc", "version": "0.14.0-dev.3020+c104e8644",
"sha256": "330dfb96a7f4400ccd798bb4c4b0e286f885c816c2675b1e1776cd8d95a16fd5" "sha256": "d30bde407e91d791c545c74f39b601c6cfb49e4dbb12c0e0eac91ce74175e5b8"
}, },
"aarch64-linux": { "aarch64-linux": {
"url": "https://ziglang.org/builds/zig-linux-aarch64-0.14.0-dev.3012+3348478fc.tar.xz", "url": "https://ziglang.org/builds/zig-linux-aarch64-0.14.0-dev.3020+c104e8644.tar.xz",
"version": "0.14.0-dev.3012+3348478fc", "version": "0.14.0-dev.3020+c104e8644",
"sha256": "97a46f9a236ce2c095171989815e1c5e10a1f2481abf42d404b57fb42d5028b2" "sha256": "6044bad3db6eeeface37bf41c97ba5561278b67f3a23321d1bb15e08399a9ab7"
}, },
"x86_64-darwin": { "x86_64-darwin": {
"url": "https://ziglang.org/builds/zig-macos-x86_64-0.14.0-dev.3012+3348478fc.tar.xz", "url": "https://ziglang.org/builds/zig-macos-x86_64-0.14.0-dev.3020+c104e8644.tar.xz",
"version": "0.14.0-dev.3012+3348478fc", "version": "0.14.0-dev.3020+c104e8644",
"sha256": "7cda95b8e0dd55cd014bf3aaef134d094b3bdc819cb1547a73db2163fe1314d3" "sha256": "04112d702dc4e6adfb1ccee575e320954e8f993bd633864212e44531bfba6015"
}, },
"aarch64-darwin": { "aarch64-darwin": {
"url": "https://ziglang.org/builds/zig-macos-aarch64-0.14.0-dev.3012+3348478fc.tar.xz", "url": "https://ziglang.org/builds/zig-macos-aarch64-0.14.0-dev.3020+c104e8644.tar.xz",
"version": "0.14.0-dev.3012+3348478fc", "version": "0.14.0-dev.3020+c104e8644",
"sha256": "504af03ed31bc85f13e2643cf2167e547ce746c56dcefcaf0943eda6ff2fe375" "sha256": "60081cde5edbd557b949d0a56b81f79f2ded96af7b2dfffb526929be88099945"
}, },
"x86_64-windows": { "x86_64-windows": {
"url": "https://ziglang.org/builds/zig-windows-x86_64-0.14.0-dev.3012+3348478fc.zip", "url": "https://ziglang.org/builds/zig-windows-x86_64-0.14.0-dev.3020+c104e8644.zip",
"sha256": "1983ef94f1b2fcda5ea24341d8e344c2e5bed68a0f51cd406a8216827a9e1cac", "sha256": "8b62d62f53a07889147413619db7cbf819a795bf6cb2f3cf525bd6f7c7857c6e",
"version": "0.14.0-dev.3012+3348478fc" "version": "0.14.0-dev.3020+c104e8644"
}, },
"aarch64-windows": { "aarch64-windows": {
"url": "https://ziglang.org/builds/zig-windows-aarch64-0.14.0-dev.3012+3348478fc.zip", "url": "https://ziglang.org/builds/zig-windows-aarch64-0.14.0-dev.3020+c104e8644.zip",
"sha256": "9d9beb91888e9c3bc9496adaf51f0b491981e94a7057179473ff66f23e2b5ac5", "sha256": "a95dbb8c6e3a3af6da72ccbf91e6d9f9ea434f6a019281fab80cfe55538e16a2",
"version": "0.14.0-dev.3012+3348478fc" "version": "0.14.0-dev.3020+c104e8644"
} }
}, },
"2021-02-20": { "2021-02-20": {
@ -29848,6 +29848,38 @@
"sha256": "9d9beb91888e9c3bc9496adaf51f0b491981e94a7057179473ff66f23e2b5ac5", "sha256": "9d9beb91888e9c3bc9496adaf51f0b491981e94a7057179473ff66f23e2b5ac5",
"version": "0.14.0-dev.3012+3348478fc" "version": "0.14.0-dev.3012+3348478fc"
} }
},
"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"
},
"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"
},
"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"
},
"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"
},
"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"
},
"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"
}
} }
}, },
"0.7.1": { "0.7.1": {