Skip to content

Commit ecd979c

Browse files
tools: update nixpkgs-unstable to ae67888ff7ef9dff69b3cf0cc0fbfbcd3a7
PR-URL: #61733 Reviewed-By: Antoine du Hamel <duhamelantoine1995@gmail.com> Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
1 parent f3b3bb8 commit ecd979c

2 files changed

Lines changed: 3 additions & 6 deletions

File tree

‎tools/nix/pkgs.nix‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
arg:
22
let
33
repo="https://github.com/NixOS/nixpkgs";
4-
rev="6308c3b21396534d8aaeac46179c14c439a89b8a";
4+
rev="ae67888ff7ef9dff69b3cf0cc0fbfbcd3a722abe";
55
nixpkgs=import(builtins.fetchTarball{
66
url="${repo}/archive/${rev}.tar.gz";
7-
sha256="14qnx22pkl9v4r0lxnnz18f4ybxj8cv18hyf1klzap98hckg58y4";
7+
sha256="0hbf69ki28s8ss18x4qj9kpcw5afy8qfmd3gw1k6wn2lfhq5ddrz";
88
})arg;
99
in
1010
nixpkgs

‎tools/nix/sharedLibDeps.nix‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
brotli
1313
gtest
1414
libuv
15+
merve
1516
nbytes
1617
simdjson
1718
simdutf
@@ -22,10 +23,6 @@
2223
cares=pkgs.c-ares;
2324
hdr-histogram=pkgs.hdrhistogram_c;
2425
http-parser=pkgs.llhttp;
25-
merve=pkgs.callPackage(builtins.fetchurl{
26-
url="https://github.com/NixOS/nixpkgs/raw/469b8e35e54d2880d73337c5ef2f1416b9b1dd43/pkgs/by-name/me/merve/package.nix";
27-
sha256="0r2fmip48hcy4za6xfaml627x9m4218g6vlk5fiajmypfvxybzfy";
28-
}){};
2926
nghttp2=pkgs.nghttp2.overrideAttrs{
3027
patches=[
3128
(pkgs.fetchpatch2{

0 commit comments

Comments
 (0)