diff --git a/tools/nix/pkgs.nix b/tools/nix/pkgs.nix index 4f43d9c61b5ecd..731a3c58c0a828 100644 --- a/tools/nix/pkgs.nix +++ b/tools/nix/pkgs.nix @@ -1,10 +1,10 @@ arg: let repo = "https://github.com/NixOS/nixpkgs"; - rev = "6308c3b21396534d8aaeac46179c14c439a89b8a"; + rev = "ae67888ff7ef9dff69b3cf0cc0fbfbcd3a722abe"; nixpkgs = import (builtins.fetchTarball { url = "${repo}/archive/${rev}.tar.gz"; - sha256 = "14qnx22pkl9v4r0lxnnz18f4ybxj8cv18hyf1klzap98hckg58y4"; + sha256 = "0hbf69ki28s8ss18x4qj9kpcw5afy8qfmd3gw1k6wn2lfhq5ddrz"; }) arg; in nixpkgs diff --git a/tools/nix/sharedLibDeps.nix b/tools/nix/sharedLibDeps.nix index 526ed38b4fa527..f38d1ebbeb1ec8 100644 --- a/tools/nix/sharedLibDeps.nix +++ b/tools/nix/sharedLibDeps.nix @@ -12,6 +12,7 @@ brotli gtest libuv + merve nbytes simdjson simdutf @@ -22,10 +23,6 @@ cares = pkgs.c-ares; hdr-histogram = pkgs.hdrhistogram_c; http-parser = pkgs.llhttp; - merve = pkgs.callPackage (builtins.fetchurl { - url = "https://github.com/NixOS/nixpkgs/raw/469b8e35e54d2880d73337c5ef2f1416b9b1dd43/pkgs/by-name/me/merve/package.nix"; - sha256 = "0r2fmip48hcy4za6xfaml627x9m4218g6vlk5fiajmypfvxybzfy"; - }) { }; nghttp2 = pkgs.nghttp2.overrideAttrs { patches = [ (pkgs.fetchpatch2 {