From f49710f361b886f665b353264559fb1eaeba95db Mon Sep 17 00:00:00 2001 From: Muki Kiboigo Date: Wed, 28 May 2025 13:02:25 -0700 Subject: [PATCH] update flake.nix for Zig 0.14.1 --- flake.lock | 153 +++-------------------------------------------------- flake.nix | 16 +----- 2 files changed, 8 insertions(+), 161 deletions(-) diff --git a/flake.lock b/flake.lock index 85f56560..50fb0209 100644 --- a/flake.lock +++ b/flake.lock @@ -1,21 +1,5 @@ { "nodes": { - "flake-compat": { - "flake": false, - "locked": { - "lastModified": 1733328505, - "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, "flake-utils": { "inputs": { "systems": "systems" @@ -34,101 +18,26 @@ "type": "github" } }, - "flake-utils_2": { - "inputs": { - "systems": "systems_2" - }, - "locked": { - "lastModified": 1731533236, - "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_3": { - "inputs": { - "systems": "systems_3" - }, - "locked": { - "lastModified": 1731533236, - "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "iguana": { - "inputs": { - "flake-utils": "flake-utils_2", - "nixpkgs": [ - "nixpkgs" - ], - "zigPkgs": "zigPkgs" - }, - "locked": { - "lastModified": 1746539192, - "narHash": "sha256-32nN8JlRqNuCFfrDooyre+gDSnxZuCtK/qaHhRmGMhg=", - "owner": "mookums", - "repo": "iguana", - "rev": "5569f95694edf59803429400ff6cb1c7522da801", - "type": "github" - }, - "original": { - "owner": "mookums", - "repo": "iguana", - "type": "github" - } - }, "nixpkgs": { "locked": { - "lastModified": 1746397377, - "narHash": "sha256-5oLdRa3vWSRbuqPIFFmQBGGUqaYZBxX+GGtN9f/n4lU=", - "owner": "NixOS", + "lastModified": 1748344075, + "narHash": "sha256-PsZAY3H0e/PBoDVn4fLwGEmeSwESj7SZPZ6CMfgbWFU=", + "owner": "nixos", "repo": "nixpkgs", - "rev": "ed30f8aba41605e3ab46421e3dcb4510ec560ff8", + "rev": "e0042dedfbc9134ef973f64e5c7f56a38cc5cc97", "type": "github" }, "original": { - "owner": "NixOS", + "owner": "nixos", "ref": "nixpkgs-unstable", "repo": "nixpkgs", "type": "github" } }, - "nixpkgs_2": { - "locked": { - "lastModified": 1746481231, - "narHash": "sha256-U3VKPi5D2oLBFzaMI0jJLJp8J64ZLjz+EwodUS//QWc=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "c6aca34d2ca2ce9e20b722f54e684cda64b275c2", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "release-24.11", - "repo": "nixpkgs", - "type": "github" - } - }, "root": { "inputs": { "flake-utils": "flake-utils", - "iguana": "iguana", - "nixpkgs": "nixpkgs_2" + "nixpkgs": "nixpkgs" } }, "systems": { @@ -145,56 +54,6 @@ "repo": "default", "type": "github" } - }, - "systems_2": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, - "systems_3": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, - "zigPkgs": { - "inputs": { - "flake-compat": "flake-compat", - "flake-utils": "flake-utils_3", - "nixpkgs": "nixpkgs" - }, - "locked": { - "lastModified": 1746475050, - "narHash": "sha256-KJC7BNY+NPCc1I+quGkWtoHXOMvFVEyer8Y0haOtTCA=", - "owner": "mookums", - "repo": "zig-overlay", - "rev": "dfa488aa462932e46f44fddf6677ff22f1244c22", - "type": "github" - }, - "original": { - "owner": "mookums", - "repo": "zig-overlay", - "type": "github" - } } }, "root": "root", diff --git a/flake.nix b/flake.nix index 69a12f0f..cfa4c842 100644 --- a/flake.nix +++ b/flake.nix @@ -2,37 +2,25 @@ description = "headless browser designed for AI and automation"; inputs = { - nixpkgs.url = "github:nixos/nixpkgs/release-24.11"; - - iguana.url = "github:mookums/iguana"; - iguana.inputs.nixpkgs.follows = "nixpkgs"; - + nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable"; flake-utils.url = "github:numtide/flake-utils"; }; outputs = { nixpkgs, - iguana, flake-utils, ... }: flake-utils.lib.eachDefaultSystem ( system: let - zigVersion = "0_14_0"; - iguanaLib = iguana.lib.${system}; - pkgs = import nixpkgs { inherit system; - overlays = [ - (iguanaLib.mkZigOverlay zigVersion) - (iguanaLib.mkZlsOverlay zigVersion) - ]; }; # This build pipeline is very unhappy without an FHS-compliant env. - fhs = pkgs.buildFHSUserEnv { + fhs = pkgs.buildFHSEnv { name = "fhs-shell"; targetPkgs = pkgs: with pkgs; [