Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: ef129a51a2f9
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 8f8b7e1b8658
Choose a head ref
  • 2 commits
  • 3 files changed
  • 1 contributor

Commits on Aug 8, 2018

  1. libressl: add 2.8.0 

    This does not remove any prior versions: LibreSSL versions are
maintained for a year after their corresponding OpenBSD branch is tagged
for release:

   - v2.6.x, part of OpenBSD 6.2-release, Nov 2017 (EOL: Nov 2018)
   - v2.7.x, part of OpenBSD 6.3-release, Apr 2018 (EOL: Apr 2019)
   - v2.8.x, expected OpenBSD 6.4-release, ETA Sep 2018 (EOL: Sep 2019)

This also does not change the default version: the stable branch remains
2.7.x, and 2.8.0 is the newest released development version. 2.8 can
become the default after OpenBSD-6.4

Closes #44760 (as it's redundant).

Signed-off-by: Austin Seipp <aseipp@pobox.com>
    @thoughtpolice
    thoughtpolice committed Aug 8, 2018
    Copy the full SHA
    078da08 View commit details

  2. h2o: fix compatibility with libressl 2.7+ 

    Signed-off-by: Austin Seipp <aseipp@pobox.com>
    @thoughtpolice
    thoughtpolice committed Aug 8, 2018
    Copy the full SHA
    8f8b7e1 View commit details
Showing with 18 additions and 3 deletions.
  1. +5 −0 pkgs/development/libraries/libressl/default.nix
  2. +11 −2 pkgs/servers/http/h2o/default.nix
  3. +2 −1 pkgs/top-level/all-packages.nix
5 changes: 5 additions & 0 deletions pkgs/development/libraries/libressl/default.nix
View file
Original file line number Diff line number Diff line change
@@ -43,4 +43,9 @@ in {
version = "2.7.4";
sha256 = "19kxa5i97q7p6rrps9qm0nd8zqhdjvzx02j72400c73cl2nryfhy";
};

libressl_2_8 = generic {
version = "2.8.0";
sha256 = "1hwxg14d6a9wgk360dvi0wfzw7b327a95wf6xqc3a1h6bfbblaxg";
};
}
13 changes: 11 additions & 2 deletions pkgs/servers/http/h2o/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub
, pkgconfig, cmake
, libressl_2_6, libuv, zlib
, libressl, libuv, zlib
}:

with builtins;
@@ -16,8 +16,17 @@ stdenv.mkDerivation rec {
sha256 = "0jyvbp6cjiirj44nxqa2fi5y473gnc8awfn8zv82hb1y9rlxqfyv";
};

# We have to fix up some function prototypes, because despite upstream h2o
# issue #1705 (https://github.com/h2o/h2o/issues/1706), libressl 2.7+ doesn't
# seem to work
patchPhase = ''
substituteInPlace ./deps/neverbleed/neverbleed.c \
--replace 'static void RSA_' 'void RSA_' \
--replace 'static int RSA_' 'int RSA_'
'';

nativeBuildInputs = [ pkgconfig cmake ];
buildInputs = [ libressl_2_6 libuv zlib ];
buildInputs = [ libressl libuv zlib ];
enableParallelBuilding = true;

meta = {
3 changes: 2 additions & 1 deletion pkgs/top-level/all-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -11275,7 +11275,8 @@ with pkgs;

inherit (callPackages ../development/libraries/libressl { })
libressl_2_6
libressl_2_7;
libressl_2_7
libressl_2_8;

libressl = libressl_2_7;