yarn-berry: fix fetcher with latest zlib-ng (#490634)
This commit is contained in:
@@ -8,6 +8,7 @@
|
||||
zlib-ng,
|
||||
makeScopeWithSplicing',
|
||||
generateSplicesForMkScope,
|
||||
fetchpatch,
|
||||
}:
|
||||
|
||||
let
|
||||
@@ -46,9 +47,22 @@ let
|
||||
libzip =
|
||||
(libzip.override {
|
||||
# Known good version: 2.2.4
|
||||
zlib = zlib-ng.override {
|
||||
withZlibCompat = true;
|
||||
};
|
||||
zlib =
|
||||
(zlib-ng.overrideAttrs (old: {
|
||||
patches = old.patches or [ ] ++ [
|
||||
# Yarn hashes the output of libzip(untar(tarball)), so the output of libzip
|
||||
# needs to be an exact match across versions, and this commit changes the
|
||||
# exact output. This is ridiculous, but such is life.
|
||||
(fetchpatch {
|
||||
url = "https://github.com/zlib-ng/zlib-ng/commit/be819413be8a284b1827437006c0859644d0c367.patch";
|
||||
revert = true;
|
||||
hash = "sha256-rwRcNKpA2dMWkC6WRATDOCYCDDqqPvFJkQ6DLDohQd8=";
|
||||
})
|
||||
];
|
||||
})).override
|
||||
{
|
||||
withZlibCompat = true;
|
||||
};
|
||||
}).overrideAttrs
|
||||
(old: {
|
||||
patches = (old.patches or [ ]) ++ [
|
||||
|
||||
Reference in New Issue
Block a user