From 112e51dc254679a9586adec25cb5de45d3588e7c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Motiejus=20Jak=C5=A1tys?= Date: Tue, 19 Nov 2024 22:31:08 +0200 Subject: [PATCH] use Mitchell's Zig overlay --- flake.lock | 29 ++++++++++++++++++++++++++++- flake.nix | 11 +++++++++++ shared/home/default.nix | 3 ++- 3 files changed, 41 insertions(+), 2 deletions(-) diff --git a/flake.lock b/flake.lock index b74716b..398340c 100644 --- a/flake.lock +++ b/flake.lock @@ -274,7 +274,8 @@ "nixpkgs": "nixpkgs", "nixpkgs-unstable": "nixpkgs-unstable", "nur": "nur", - "pre-commit-hooks": "pre-commit-hooks" + "pre-commit-hooks": "pre-commit-hooks", + "zig": "zig" } }, "systems": { @@ -306,6 +307,32 @@ "repo": "default", "type": "github" } + }, + "zig": { + "inputs": { + "flake-compat": [ + "flake-compat" + ], + "flake-utils": [ + "flake-utils" + ], + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1732018331, + "narHash": "sha256-K9Ckfj8B/BYseN/FjdP0Q+fpuXEgl8cVov5t6+4D8bU=", + "owner": "mitchellh", + "repo": "zig-overlay", + "rev": "d667054598d541df2266b961b207bb63fe8fe423", + "type": "github" + }, + "original": { + "owner": "mitchellh", + "repo": "zig-overlay", + "type": "github" + } } }, "root": "root", diff --git a/flake.nix b/flake.nix index 91f27fd..6f8d4b1 100644 --- a/flake.nix +++ b/flake.nix @@ -38,6 +38,15 @@ }; }; + zig = { + url = "github:mitchellh/zig-overlay"; + inputs = { + nixpkgs.follows = "nixpkgs"; + flake-compat.follows = "flake-compat"; + flake-utils.follows = "flake-utils"; + }; + }; + nix-index-database.url = "github:Mic92/nix-index-database"; nix-index-database.inputs.nixpkgs.follows = "nixpkgs"; @@ -74,6 +83,7 @@ nix-index-database, pre-commit-hooks, nur, + zig, nixgl, ... }@inputs: @@ -82,6 +92,7 @@ overlays = [ nur.overlay + zig.overlays.default nixgl.overlay (_self: super: { deploy-rs-pkg = super.deploy-rs; }) diff --git a/shared/home/default.nix b/shared/home/default.nix index bff3bfe..f83659d 100644 --- a/shared/home/default.nix +++ b/shared/home/default.nix @@ -68,7 +68,8 @@ in pkgs-unstable.delve pkgs-unstable.go_1_23 pkgs-unstable.go-tools - pkgs-unstable.zig_0_13 + + pkgs.zigpkgs."0.13.0" ]) (lib.mkIf hmOnly [