Skip to content

Commit 88b01c4

Browse files
committed
drop! update nixpkgs
1 parent 940d7d8 commit 88b01c4

File tree

3 files changed

+12
-13
lines changed

3 files changed

+12
-13
lines changed

.github/workflows/test-shared.yml

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -69,16 +69,6 @@ jobs:
6969
with:
7070
persist-credentials: false
7171

72-
- name: Patch npm gyp (to be able to build addons for the tests)
73-
if: ${{ github.event_name != 'workflow_dispatch' }}
74-
run: |
75-
curl -L https://github.com/nodejs/gyp-next/commit/8224deef984add7e7afe846cfb82c9d3fa6da1fb.diff \
76-
| git apply --directory=deps/npm/node_modules/node-gyp/gyp
77-
git add deps/npm/node_modules/node-gyp/gyp
78-
git config --local user.email "[email protected]"
79-
git config --local user.name "Node.js GitHub Bot"
80-
git commit --fixup HEAD
81-
8272
- name: Make tarball
8373
if: ${{ github.event_name != 'workflow_dispatch' }}
8474
run: |

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

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";
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,

0 commit comments

Comments
 (0)