Page MenuHomePhabricator

D4646.id14999.diff
No OneTemporary

D4646.id14999.diff

diff --git a/flake.lock b/flake.lock
--- a/flake.lock
+++ b/flake.lock
@@ -2,11 +2,11 @@
"nodes": {
"nixpkgs": {
"locked": {
- "lastModified": 1655481042,
- "narHash": "sha256-XHbcywq2vIQ5CeH1OK3TN793jkiNAAZsSctS1PFgseo=",
+ "lastModified": 1658644204,
+ "narHash": "sha256-MWyfCH9K3eVTXJUxBi67OQSAh9jJAnvWklM6qm4j8w8=",
"owner": "nixos",
"repo": "nixpkgs",
- "rev": "103a4c0ae46afa9cf008c30744175315ca38e9f9",
+ "rev": "2f0c3be57c348f4cfd8820f2d189e29a685d9c41",
"type": "github"
},
"original": {
diff --git a/nix/overlay.nix b/nix/overlay.nix
--- a/nix/overlay.nix
+++ b/nix/overlay.nix
@@ -21,12 +21,6 @@
mysql-up = prev.callPackage ./mysql-up-linux.nix { };
- arcanist = prev.arcanist.override(_: {
- # php8.1 will cause warnings to throw as exceptions
- # around calling strlen() with null
- php = prev.php80;
- });
-
olm = prev.olm.overrideAttrs(oldAttrs: {
# *.hh files aren't meant to be used externally
# so we patch installation to add it
@@ -47,6 +41,10 @@
url = "https://nodejs.org/dist/v${version}/node-v${version}.tar.xz";
sha256 = "sha256-MhFLPcOUXtD5X4vDO0LGjg7xjECMtWEiVyoWPZB+y8w=";
};
+
+ # 16.13 doesn't need fixes from https://github.com/npm/cli/pull/5197
+ # which the regression wasn't introduced until a later release
+ patches = prev.lib.head oldAttrs.patches;
});
# Ensure that yarn is using the pinned version

File Metadata

Mime Type
text/plain
Expires
Sat, Sep 21, 4:03 PM (21 h, 50 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
2163429
Default Alt Text
D4646.id14999.diff (1 KB)

Event Timeline