Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

chore(snowflake): patch oscrypto in the nix environment #6955

Merged
merged 2 commits into from
Aug 29, 2023
Merged

chore(snowflake): patch oscrypto in the nix environment #6955

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
817ee74
chore(snowflake): patch `oscrypto` in the nix environment
cpcloud Aug 29, 2023
f9f8a7c
chore(deps): remove fixed poetry overrides
cpcloud Aug 29, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 19 additions & 5 deletions poetry-overrides.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,25 @@ in
# `wheel` cannot be used as a wheel to unpack itself, since that would
# require itself (infinite recursion)
wheel = super.wheel.override { preferWheel = false; };
paginate = super.paginate.overridePythonAttrs (attrs: {
nativeBuildInputs = attrs.nativeBuildInputs or [ ] ++ [ self.setuptools ];
});
readtime = super.readtime.overridePythonAttrs (attrs: {
nativeBuildInputs = attrs.nativeBuildInputs or [ ] ++ [ self.setuptools ];

# patch oscrypto for openssl 3 support: the fix is to relax some regexes that
# inspect the libcrypto version
#
# without these patches applied, snowflake doesn't work in the nix environment
#
# these overrides can be removed when oscrypto is released again (1.3.0 was
# released on 2022-03-17)
oscrypto = (super.oscrypto.override { preferWheel = false; }).overridePythonAttrs (attrs: {
patches = attrs.patches or [ ] ++ [
(self.pkgs.fetchpatch {
url = "https://github.com/wbond/oscrypto/commit/ebbc944485b278192b60080ea1f495e287efb4f8.patch";
sha256 = "sha256-c1faM8szkn/7AjDthzmDisytzO8UdrzDtPkuuITjkRQ=";
})
(self.pkgs.fetchpatch {
url = "https://github.com/wbond/oscrypto/commit/d5f3437ed24257895ae1edd9e503cfb352e635a8.patch";
sha256 = "sha256-sRwxD99EV8mmiOAjM8emews9gvDeFtpBV3sSLiNEziM=";
})
];
});
} // super.lib.listToAttrs (
map
Expand Down