From 8e1e8cfc515cb9bb5d66e262db58d7b4a3899f92 Mon Sep 17 00:00:00 2001 From: Mitchell Hashimoto Date: Tue, 23 Aug 2022 10:23:02 -0700 Subject: [PATCH] pin new zig-overlay repo --- flake.lock | 22 +++++++++++----------- flake.nix | 2 +- nix/overlay.nix | 4 +++- 3 files changed, 15 insertions(+), 13 deletions(-) diff --git a/flake.lock b/flake.lock index f8e1b4cb4..3da7af8a6 100644 --- a/flake.lock +++ b/flake.lock @@ -33,11 +33,11 @@ }, "flake-utils_2": { "locked": { - "lastModified": 1629481132, - "narHash": "sha256-JHgasjPR0/J1J3DRm4KxM4zTyAj4IOJY8vIl75v/kPI=", + "lastModified": 1659877975, + "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", "owner": "numtide", "repo": "flake-utils", - "rev": "997f7efcb746a9c140ce1f13c72263189225f482", + "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0", "type": "github" }, "original": { @@ -80,11 +80,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1631288242, - "narHash": "sha256-sXm4KiKs7qSIf5oTAmrlsEvBW193sFj+tKYVirBaXz0=", + "lastModified": 1661151577, + "narHash": "sha256-++S0TuJtuz9IpqP8rKktWyHZKpgdyrzDFUXVY07MTRI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "0e24c87754430cb6ad2f8c8c8021b29834a8845e", + "rev": "54060e816971276da05970a983487a25810c38a7", "type": "github" }, "original": { @@ -109,15 +109,15 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1660870378, - "narHash": "sha256-iXCyt4soxWxcEUvEQHJh1XBbvEiskVaR5UFLfbWbGrw=", - "owner": "roarkanize", + "lastModified": 1661275194, + "narHash": "sha256-1PenHIm/ScA5lIUfaPzwQKcmbxnlZNgQTK38Gv8UXzg=", + "owner": "mitchellh", "repo": "zig-overlay", - "rev": "ad6afbdece7c817fbf43903766b9e2a7a6e01c68", + "rev": "de3aa2eee56c6d1d38740801c9d1902aba5047fd", "type": "github" }, "original": { - "owner": "roarkanize", + "owner": "mitchellh", "repo": "zig-overlay", "type": "github" } diff --git a/flake.nix b/flake.nix index d9c7fb160..8226b89df 100644 --- a/flake.nix +++ b/flake.nix @@ -5,7 +5,7 @@ nixpkgs.url = "github:nixos/nixpkgs/release-22.05"; nixpkgs-unstable.url = "github:nixos/nixpkgs/nixpkgs-unstable"; flake-utils.url = "github:numtide/flake-utils"; - zig.url = "github:roarkanize/zig-overlay"; + zig.url = "github:mitchellh/zig-overlay"; # Used for shell.nix flake-compat = { url = github:edolstra/flake-compat; flake = false; }; diff --git a/nix/overlay.nix b/nix/overlay.nix index 0f3fbc3af..876c5d3dd 100644 --- a/nix/overlay.nix +++ b/nix/overlay.nix @@ -13,5 +13,7 @@ final: prev: rec { wraptest = prev.callPackage ./wraptest.nix { }; # zig we want to be the latest nightly since 0.9.0 is not released yet. - zig = final.zigpkgs.master.latest; + # NOTE: we are pinned to this master version because it broke at a certain + # point due to the self-hosted compiler. We'll fix this ASAP. + zig = final.zigpkgs.master-2022-08-19; }