From 052b7c298f28f0276aeab024a0d76ac0bd3fc492 Mon Sep 17 00:00:00 2001 From: bandithedoge Date: Thu, 14 Dec 2023 17:04:21 +0100 Subject: [PATCH 1/3] add .direnv/ to .gitignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index b4c68af..8a18add 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ index.json index.json.minisig sources.old.json sources.new.json +.direnv/ From 23b7376ffa3f1ffdd402c17a4cf86bd216546316 Mon Sep 17 00:00:00 2001 From: bandithedoge Date: Thu, 14 Dec 2023 17:04:35 +0100 Subject: [PATCH 2/3] update nixpkgs to 23.11 --- flake.lock | 8 ++++---- flake.nix | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/flake.lock b/flake.lock index 1873bfa..e0aa24b 100644 --- a/flake.lock +++ b/flake.lock @@ -33,16 +33,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1689088367, - "narHash": "sha256-Y2tl2TlKCWEHrOeM9ivjCLlRAKH3qoPUE/emhZECU14=", + "lastModified": 1702565688, + "narHash": "sha256-Rlbeq5iV1y1r69tYmEMz9aiIjFcbqLulkwr5OvG4pT8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5c9ddb86679c400d6b7360797b8a22167c2053f8", + "rev": "1190e17452013669665b163a017cd7f62a290daa", "type": "github" }, "original": { "owner": "NixOS", - "ref": "release-23.05", + "ref": "release-23.11", "repo": "nixpkgs", "type": "github" } diff --git a/flake.nix b/flake.nix index 551f725..f769c32 100644 --- a/flake.nix +++ b/flake.nix @@ -2,7 +2,7 @@ description = "Zig compiler binaries."; inputs = { - nixpkgs.url = "github:NixOS/nixpkgs/release-23.05"; + nixpkgs.url = "github:NixOS/nixpkgs/release-23.11"; flake-utils.url = "github:numtide/flake-utils"; # Used for shell.nix From 39236a8b284387e9f85b37b418144f2fb7110f87 Mon Sep 17 00:00:00 2001 From: bandithedoge Date: Thu, 14 Dec 2023 17:05:27 +0100 Subject: [PATCH 3/3] add meta section and setup hook to zig derivation --- default.nix | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/default.nix b/default.nix index d12d4b0..be6dce4 100644 --- a/default.nix +++ b/default.nix @@ -11,7 +11,7 @@ version, sha256, }: - pkgs.stdenv.mkDerivation { + pkgs.stdenv.mkDerivation (finalAttrs: { inherit version; pname = "zig"; @@ -26,7 +26,17 @@ cp -r lib/* $out/lib cp zig $out/bin/zig ''; - }; + + passthru.hook = pkgs.zig.hook.override {zig = finalAttrs.finalPackage;}; + + meta = with pkgs.lib; { + description = "General-purpose programming language and toolchain for maintaining robust, optimal, and reusable software"; + homepage = "https://ziglang.org/"; + license = lib.licenses.mit; + maintainers = []; + platforms = lib.platforms.unix; + }; + }); # The packages that are tagged releases taggedPackages =