Skip to content

Commit 46fc67c

Browse files
nodejs-github-botaduh95
authored andcommitted
tools: update nixpkgs-unstable to 02f2cb8e0feb4596d20cc52fda73ccee960
1 parent 3c8c1ef commit 46fc67c

File tree

3 files changed

+17
-3
lines changed

3 files changed

+17
-3
lines changed

.github/workflows/test-shared.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,11 @@ jobs:
9595
with:
9696
extra_nix_config: sandbox = true
9797

98+
- uses: cachix/cachix-action@0fc020193b5a1fa3ac4575aa3a7d3aa6a35435ad # v16
99+
with:
100+
name: nodejs
101+
authToken: ${{ secrets.CACHIX_AUTH_TOKEN }}
102+
98103
- name: Configure sccache
99104
uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
100105
with:

shell.nix

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
brotli
1010
c-ares
1111
libuv
12-
nghttp2
1312
nghttp3
1413
ngtcp2
1514
openssl
@@ -21,6 +20,16 @@
2120
zstd
2221
;
2322
http-parser = pkgs.llhttp;
23+
nghttp2 = pkgs.nghttp2.overrideAttrs {
24+
patches = [
25+
(pkgs.fetchpatch2 {
26+
url = "https://github.com/nghttp2/nghttp2/commit/7784fa979d0bcf801a35f1afbb25fb048d815cd7.patch?full_index=1";
27+
revert = true;
28+
excludes = [ "lib/includes/nghttp2/nghttp2.h" ];
29+
hash = "sha256-RG87Qifjpl7HTP9ac2JwHj2XAbDlFgOpAnpZX3ET6gU=";
30+
})
31+
];
32+
};
2433
},
2534
ccache ? pkgs.ccache,
2635
ninja ? pkgs.ninja,

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 = "ca77296380960cd497a765102eeb1356eb80fed0";
4+
rev = "02f2cb8e0feb4596d20cc52fda73ccee960e3538";
55
nixpkgs = import (builtins.fetchTarball {
66
url = "${repo}/archive/${rev}.tar.gz";
7-
sha256 = "1airrw6l87iyny1a3mb29l28na4s4llifprlgpll2na461jd40iy";
7+
sha256 = "0k4za9vmdxpz5jixspyz2ypc25ymcxijpssgwaacz6l9fcgg0zdl";
88
}) arg;
99
in
1010
nixpkgs

0 commit comments

Comments
 (0)