Compare commits

...

3 commits

Author SHA1 Message Date
Seth Flynn
0b80dbaebc
Merge 7dd1f3eda2 into 90d58065b5 2025-02-04 14:28:18 +01:00
zig-overlay
90d58065b5 update sources.json
Some checks are pending
Test / test (push) Waiting to run
2025-02-04 12:12:06 +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.3028+cdc9d65b0.tar.xz", "url": "https://ziglang.org/builds/zig-linux-x86_64-0.14.0-dev.3036+7ac110ac2.tar.xz",
"version": "0.14.0-dev.3028+cdc9d65b0", "version": "0.14.0-dev.3036+7ac110ac2",
"sha256": "be42d581bf49c51319183440d252f6a76c070b9d798cc80bcca930e269d49c5a" "sha256": "fbe67b34e93d2d3c4e0feb08a54ded7d78fa122878fe07982dac57646d086f89"
}, },
"aarch64-linux": { "aarch64-linux": {
"url": "https://ziglang.org/builds/zig-linux-aarch64-0.14.0-dev.3028+cdc9d65b0.tar.xz", "url": "https://ziglang.org/builds/zig-linux-aarch64-0.14.0-dev.3036+7ac110ac2.tar.xz",
"version": "0.14.0-dev.3028+cdc9d65b0", "version": "0.14.0-dev.3036+7ac110ac2",
"sha256": "2049eda7a11a4ca251d9d8d2546c6778828edd0940d621805f2b9c56a06c5043" "sha256": "d84467f277f0ec3596831fa1acfb48f17098027f147cdfc4151b79ba0403ef9b"
}, },
"x86_64-darwin": { "x86_64-darwin": {
"url": "https://ziglang.org/builds/zig-macos-x86_64-0.14.0-dev.3028+cdc9d65b0.tar.xz", "url": "https://ziglang.org/builds/zig-macos-x86_64-0.14.0-dev.3036+7ac110ac2.tar.xz",
"version": "0.14.0-dev.3028+cdc9d65b0", "version": "0.14.0-dev.3036+7ac110ac2",
"sha256": "5d82aba58eff4221f736bdcfb009df4be186d221532e25cc2380ed41f9aca77f" "sha256": "bde442e8a45c2dd4abb1babda2b10b54a89baf22e5978f1563f63a38cf577deb"
}, },
"aarch64-darwin": { "aarch64-darwin": {
"url": "https://ziglang.org/builds/zig-macos-aarch64-0.14.0-dev.3028+cdc9d65b0.tar.xz", "url": "https://ziglang.org/builds/zig-macos-aarch64-0.14.0-dev.3036+7ac110ac2.tar.xz",
"version": "0.14.0-dev.3028+cdc9d65b0", "version": "0.14.0-dev.3036+7ac110ac2",
"sha256": "ea5b85f82fe22d81dc0d2f2f78f59999418e13ac0fb4d2a5fcfc7be1a979cb80" "sha256": "243682072dfe8353754630d814e6076073b9a8866b1378f65b59dd310545314a"
}, },
"x86_64-windows": { "x86_64-windows": {
"url": "https://ziglang.org/builds/zig-windows-x86_64-0.14.0-dev.3028+cdc9d65b0.zip", "url": "https://ziglang.org/builds/zig-windows-x86_64-0.14.0-dev.3036+7ac110ac2.zip",
"sha256": "1fa65e7110416ea338868f042c457ed4d724c281cb94329436f6c32f3e658854", "sha256": "fb8a846c3634c036d10c1364fcf3ff48bc9651b93ae86e7d31d1229ffd818276",
"version": "0.14.0-dev.3028+cdc9d65b0" "version": "0.14.0-dev.3036+7ac110ac2"
}, },
"aarch64-windows": { "aarch64-windows": {
"url": "https://ziglang.org/builds/zig-windows-aarch64-0.14.0-dev.3028+cdc9d65b0.zip", "url": "https://ziglang.org/builds/zig-windows-aarch64-0.14.0-dev.3036+7ac110ac2.zip",
"sha256": "e9e1b9b7a4a7fcfac38c23a3f4112e335879594ca711471a75c4f4a6300e6199", "sha256": "dad49e38d8174ca1000fcad7e00d7c3e64eb0b02fc459b5f780498fca3385792",
"version": "0.14.0-dev.3028+cdc9d65b0" "version": "0.14.0-dev.3036+7ac110ac2"
} }
}, },
"2021-02-20": { "2021-02-20": {
@ -29880,6 +29880,38 @@
"sha256": "e9e1b9b7a4a7fcfac38c23a3f4112e335879594ca711471a75c4f4a6300e6199", "sha256": "e9e1b9b7a4a7fcfac38c23a3f4112e335879594ca711471a75c4f4a6300e6199",
"version": "0.14.0-dev.3028+cdc9d65b0" "version": "0.14.0-dev.3028+cdc9d65b0"
} }
},
"2025-02-04": {
"x86_64-darwin": {
"url": "https://ziglang.org/builds/zig-macos-x86_64-0.14.0-dev.3036+7ac110ac2.tar.xz",
"sha256": "bde442e8a45c2dd4abb1babda2b10b54a89baf22e5978f1563f63a38cf577deb",
"version": "0.14.0-dev.3036+7ac110ac2"
},
"aarch64-darwin": {
"url": "https://ziglang.org/builds/zig-macos-aarch64-0.14.0-dev.3036+7ac110ac2.tar.xz",
"sha256": "243682072dfe8353754630d814e6076073b9a8866b1378f65b59dd310545314a",
"version": "0.14.0-dev.3036+7ac110ac2"
},
"x86_64-linux": {
"url": "https://ziglang.org/builds/zig-linux-x86_64-0.14.0-dev.3036+7ac110ac2.tar.xz",
"sha256": "fbe67b34e93d2d3c4e0feb08a54ded7d78fa122878fe07982dac57646d086f89",
"version": "0.14.0-dev.3036+7ac110ac2"
},
"aarch64-linux": {
"url": "https://ziglang.org/builds/zig-linux-aarch64-0.14.0-dev.3036+7ac110ac2.tar.xz",
"sha256": "d84467f277f0ec3596831fa1acfb48f17098027f147cdfc4151b79ba0403ef9b",
"version": "0.14.0-dev.3036+7ac110ac2"
},
"x86_64-windows": {
"url": "https://ziglang.org/builds/zig-windows-x86_64-0.14.0-dev.3036+7ac110ac2.zip",
"sha256": "fb8a846c3634c036d10c1364fcf3ff48bc9651b93ae86e7d31d1229ffd818276",
"version": "0.14.0-dev.3036+7ac110ac2"
},
"aarch64-windows": {
"url": "https://ziglang.org/builds/zig-windows-aarch64-0.14.0-dev.3036+7ac110ac2.zip",
"sha256": "dad49e38d8174ca1000fcad7e00d7c3e64eb0b02fc459b5f780498fca3385792",
"version": "0.14.0-dev.3036+7ac110ac2"
}
} }
}, },
"0.7.1": { "0.7.1": {