jussi/zig-overlay
1
0
Fork 0
mirror of https://github.com/mitchellh/zig-overlay.git synced 2025-02-05 08:52:48 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

nix fmt and support aarch64-darwin

Browse source
This commit is contained in:
Mitchell Hashimoto 2022-08-22 19:55:54 -07:00
parent 941ed4d57e
commit c4a460a991
No known key found for this signature in database
GPG key ID: 523D5DC389D273BC
2 changed files with 77 additions and 55 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
default.nix
View file

@ -1,16 +1,21 @@
{ pkgs ? import <nixpkgs> {},
system ? builtins.currentSystem }:
let
{
pkgs ? import <nixpkgs> {},
system ? builtins.currentSystem,
}: let
inherit (pkgs) lib;
sources = builtins.fromJSON (lib.strings.fileContents ./sources.json);
# mkBinaryInstall makes a derivation that installs Zig from a binary.
mkBinaryInstall = { url, version, sha256 }: pkgs.stdenv.mkDerivation {
mkBinaryInstall = {
url,
version,
sha256,
}:
pkgs.stdenv.mkDerivation {
inherit version;
pname = "zig";
src = pkgs.fetchurl { inherit url sha256; };
src = pkgs.fetchurl {inherit url sha256;};
dontConfigure = true;
dontBuild = true;
dontFixup = true;
@ -24,19 +29,28 @@ let
};
# The packages that are tagged releases
taggedPackages = lib.attrsets.mapAttrs
(k: v: mkBinaryInstall { inherit (v.${system}) version url sha256; })
taggedPackages =
lib.attrsets.mapAttrs
(k: v: mkBinaryInstall {inherit (v.${system}) version url sha256;})
(lib.attrsets.filterAttrs
(k: v: (builtins.hasAttr system v) && (v.${system}.url != null))
(builtins.removeAttrs sources ["master"]));
# The master packages
masterPackages = lib.attrsets.mapAttrs'
(k: v: lib.attrsets.nameValuePair
(if k == "latest" then "master" else ("master-" + k))
(mkBinaryInstall { inherit (v.${system}) version url sha256; })
masterPackages =
lib.attrsets.mapAttrs' (
k: v:
lib.attrsets.nameValuePair
(
if k == "latest"
then "master"
else ("master-" + k)
)
sources.master;
(mkBinaryInstall {inherit (v.${system}) version url sha256;})
)
(lib.attrsets.filterAttrs
(k: v: (builtins.hasAttr system v) && (v.${system}.url != null))
sources.master);
# This determines the latest /released/ version.
latest = lib.lists.last (
@ -47,4 +61,4 @@ let
in
# We want the packages but also add a "default" that just points to the
# latest released version.
taggedPackages // masterPackages // { "default" = taggedPackages.${latest}; }
taggedPackages // masterPackages // {"default" = taggedPackages.${latest};}

26
flake.nix
View file

@ -6,28 +6,36 @@
flake-utils.url = "github:numtide/flake-utils";
};
outputs = { self, nixpkgs, flake-utils, ... }:
# List of systems where binaries are provided.
let
systems = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" ];
outputs = flake-utils.lib.eachSystem systems (system:
let pkgs = nixpkgs.legacyPackages.${system};
outputs = {
self,
nixpkgs,
flake-utils,
...
}: let
systems = ["x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin"];
outputs = flake-utils.lib.eachSystem systems (system: let
pkgs = nixpkgs.legacyPackages.${system};
in rec {
# The packages exported by the Flake:
# - default - latest /released/ version
# - <version> - tagged version
# - master - latest nightly (updated daily)
# - master-<date> - nightly by date
packages = import ./default.nix { inherit system pkgs; };
packages = import ./default.nix {inherit system pkgs;};
# "Apps" so that `nix run` works. If you run `nix run .` then
# this will use the latest default.
apps = rec {
default = apps.zig;
zig = flake-utils.lib.mkApp { drv = packages.default; };
zig = flake-utils.lib.mkApp {drv = packages.default;};
};
# nix fmt
formatter = pkgs.alejandra;
});
in outputs // {
in
outputs
// {
# Overlay that can be imported so you can access the packages
# using zigpkgs.master.latest or whatever you'd like.
overlays.default = final: prev: {