Skip to content

Commit

Permalink
nix: selectively pin openssl to 1.1 for Haskell packages.
Browse files Browse the repository at this point in the history
* nix: Pin openssl to 1.1

* Revert "nix: Pin openssl to 1.1"

This causes a world rebuild of nixpkgs (which takes a lot of time), and the
build in CI doesn't complete successfully anyhow.

This reverts commit dc1f54e.

* nix: selectively pin openssl to 1.1 for Haskell packages.

This injects openssl 1.1 into the build of specifically the HsOpenSSL package,
which other Haskell derivations depend on for TLS functionality.

Co-authored-by: Molly Miller <[email protected]>
  • Loading branch information
akshaymankar and sysvinit authored Oct 31, 2022
1 parent d733327 commit f9acd79
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 1 deletion.
4 changes: 3 additions & 1 deletion nix/manual-overrides.nix
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ libsodium, protobuf, hlib, mls-test-cli }:
{ libsodium, protobuf, hlib, mls-test-cli, openssl }:
# FUTUREWORK: Figure out a way to detect if some of these packages are not
# actually marked broken, so we can cleanup this file on every nixpkgs bump.
hself: hsuper: {
Expand Down Expand Up @@ -58,4 +58,6 @@ hself: hsuper: {

# Make hoogle static to reduce size of the hoogle image
hoogle = hlib.justStaticExecutables hsuper.hoogle;

HsOpenSSL = hsuper.HsOpenSSL.override { inherit openssl; };
}
1 change: 1 addition & 0 deletions nix/wire-server.nix
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,7 @@ let lib = pkgs.lib;
];
manualOverrides = import ./manual-overrides.nix (with pkgs; {
inherit hlib libsodium protobuf mls-test-cli;
openssl = openssl_1_1;
});

executables = hself: hsuper:
Expand Down

0 comments on commit f9acd79

Please sign in to comment.