diff --git a/flake.lock b/flake.lock index 1523ed025..8e1427318 100644 --- a/flake.lock +++ b/flake.lock @@ -1,21 +1,5 @@ { "nodes": { - "flake-compat": { - "flake": false, - "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, "flake-utils": { "inputs": { "systems": "systems" @@ -34,75 +18,6 @@ "type": "github" } }, - "flake-utils_2": { - "inputs": { - "systems": "systems_2" - }, - "locked": { - "lastModified": 1710146030, - "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_3": { - "inputs": { - "systems": "systems_3" - }, - "locked": { - "lastModified": 1705309234, - "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "gitignore": { - "inputs": { - "nixpkgs": [ - "zls", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1709087332, - "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=", - "owner": "hercules-ci", - "repo": "gitignore.nix", - "rev": "637db329424fd7e46cf4185293b9cc8c88c95394", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "gitignore.nix", - "type": "github" - } - }, - "langref": { - "flake": false, - "locked": { - "narHash": "sha256-O6p2tiKD8ZMhSX+DeA/o5hhAvcPkU2J9lFys/r11peY=", - "type": "file", - "url": "https://raw.githubusercontent.com/ziglang/zig/0fb2015fd3422fc1df364995f9782dfe7255eccd/doc/langref.html.in" - }, - "original": { - "type": "file", - "url": "https://raw.githubusercontent.com/ziglang/zig/0fb2015fd3422fc1df364995f9782dfe7255eccd/doc/langref.html.in" - } - }, "nixpkgs-stable": { "locked": { "lastModified": 1705957679, @@ -139,8 +54,7 @@ "inputs": { "nixpkgs-stable": "nixpkgs-stable", "nixpkgs-unstable": "nixpkgs-unstable", - "zig": "zig", - "zls": "zls" + "zig": "zig" } }, "systems": { @@ -158,36 +72,6 @@ "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" - } - }, "zig": { "inputs": { "flake-compat": [], @@ -209,54 +93,6 @@ "repo": "zig-overlay", "type": "github" } - }, - "zig-overlay": { - "inputs": { - "flake-compat": "flake-compat", - "flake-utils": "flake-utils_3", - "nixpkgs": [ - "zls", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1718539737, - "narHash": "sha256-hvQ900gSqzGnJWMRQwv65TixciIbC44iX0Nh5ENRwCU=", - "owner": "mitchellh", - "repo": "zig-overlay", - "rev": "6eb42ce6f85d247b1aecf854c45d80902821d0ad", - "type": "github" - }, - "original": { - "owner": "mitchellh", - "repo": "zig-overlay", - "type": "github" - } - }, - "zls": { - "inputs": { - "flake-utils": "flake-utils_2", - "gitignore": "gitignore", - "langref": "langref", - "nixpkgs": [ - "nixpkgs-stable" - ], - "zig-overlay": "zig-overlay" - }, - "locked": { - "lastModified": 1718930611, - "narHash": "sha256-FtfVhs6XHNfSQRQorrrz03nD0LCNp2FCnGllRntHBts=", - "owner": "zigtools", - "repo": "zls", - "rev": "0b9746b60c2020ab948f6556f1c729858b82a0f0", - "type": "github" - }, - "original": { - "owner": "zigtools", - "ref": "master", - "repo": "zls", - "type": "github" - } } }, "root": "root", diff --git a/flake.nix b/flake.nix index 9bde321cf..520dbbf49 100644 --- a/flake.nix +++ b/flake.nix @@ -16,11 +16,6 @@ flake-compat.follows = ""; }; }; - - zls = { - url = "github:zigtools/zls/master"; - inputs.nixpkgs.follows = "nixpkgs-stable"; - }; }; outputs = { @@ -28,7 +23,6 @@ nixpkgs-unstable, nixpkgs-stable, zig, - zls, ... }: builtins.foldl' nixpkgs-stable.lib.recursiveUpdate {} (builtins.map (system: let @@ -37,7 +31,6 @@ in { devShell.${system} = pkgs-stable.callPackage ./nix/devShell.nix { inherit (pkgs-unstable) tracy; - inherit (zls.packages.${system}) zls; zig = zig.packages.${system}."0.13.0"; wraptest = pkgs-stable.callPackage ./nix/wraptest.nix {}; diff --git a/nix/devShell.nix b/nix/devShell.nix index 3c4842096..b4e109513 100644 --- a/nix/devShell.nix +++ b/nix/devShell.nix @@ -23,7 +23,6 @@ wraptest, zig, zip, - zls, llvmPackages_latest, bzip2, expat, @@ -109,11 +108,6 @@ in wabt wasmtime ] - ++ lib.optionals (!(stdenv.isLinux && stdenv.isAarch64)) [ - # This is currently broken on aarch64 linux. Once this is - # fixed we can remove this conditional. - zls - ] ++ lib.optionals stdenv.isLinux [ # My nix shell environment installs the non-interactive version # by default so we have to include this.