From 7d148117306e1e0ec91f57894e22ccecd00cd759 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Motiejus=20Jak=C5=A1tys?= Date: Mon, 9 Oct 2023 12:15:07 +0300 Subject: [PATCH] hm: install zig 0.11 --- flake.lock | 29 ++++++++++++++++++++++++++++- flake.nix | 18 +++++++++++++++++- shared/home/default.nix | 2 ++ 3 files changed, 47 insertions(+), 2 deletions(-) diff --git a/flake.lock b/flake.lock index 7187ca6..1269cb7 100644 --- a/flake.lock +++ b/flake.lock @@ -235,7 +235,8 @@ "nixos-hardware": "nixos-hardware", "nixpkgs": "nixpkgs", "nur": "nur", - "pre-commit-hooks": "pre-commit-hooks" + "pre-commit-hooks": "pre-commit-hooks", + "zigpkgs": "zigpkgs" } }, "systems": { @@ -252,6 +253,32 @@ "repo": "default", "type": "github" } + }, + "zigpkgs": { + "inputs": { + "flake-compat": [ + "flake-compat" + ], + "flake-utils": [ + "flake-utils" + ], + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1696810944, + "narHash": "sha256-yvt223HLZlAJa/u4uzT5aw3ph2bifto/KfU2k+eX+jg=", + "owner": "mitchellh", + "repo": "zig-overlay", + "rev": "6dc03885321cc8aad6356c847148eb40e167f9fb", + "type": "github" + }, + "original": { + "owner": "mitchellh", + "repo": "zig-overlay", + "type": "github" + } } }, "root": "root", diff --git a/flake.nix b/flake.nix index f87ce48..eaa9c3f 100644 --- a/flake.nix +++ b/flake.nix @@ -8,6 +8,11 @@ nixos-hardware.url = "github:NixOS/nixos-hardware/master"; nur.url = "github:nix-community/NUR"; + zigpkgs.url = "github:mitchellh/zig-overlay"; + zigpkgs.inputs.nixpkgs.follows = "nixpkgs"; + zigpkgs.inputs.flake-utils.follows = "flake-utils"; + zigpkgs.inputs.flake-compat.follows = "flake-compat"; + home-manager.url = "github:nix-community/home-manager/release-23.05"; home-manager.inputs.nixpkgs.follows = "nixpkgs"; @@ -50,6 +55,7 @@ nixos-hardware, nix-index-database, pre-commit-hooks, + zigpkgs, nur, ... } @ inputs: let @@ -246,7 +252,17 @@ deploy-rs.lib; } // flake-utils.lib.eachDefaultSystem (system: let - pkgs = import nixpkgs {inherit system;}; + pkgs = import nixpkgs { + inherit system; + overlays = [ + (_final: prev: { + zigpkgs = import zigpkgs { + inherit (prev) pkgs; + inherit system; + }; + }) + ]; + }; in { homeConfigurations.motiejusja = home-manager.lib.homeManagerConfiguration { inherit pkgs; diff --git a/shared/home/default.nix b/shared/home/default.nix index 380343f..d4c94a5 100644 --- a/shared/home/default.nix +++ b/shared/home/default.nix @@ -18,6 +18,8 @@ (with pkgs; [ go + zigpkgs."0.11.0" + scala_2_12 coursier ])