dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #180404 from helsinki-systems/libressl_3_5_default

Browse Source 
libressl: default to 3.5
This commit is contained in:
Janne Heß 2022-07-10 13:30:16 +02:00 committed by GitHub
commit 05a276adf0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/development/libraries/libressl/default.nix
View File

@ -12,13 +12,13 @@ let
then "DYLD_LIBRARY_PATH" then "DYLD_LIBRARY_PATH"
else "LD_LIBRARY_PATH"; else "LD_LIBRARY_PATH";
generic = { version, sha256, patches ? [] }: stdenv.mkDerivation rec { generic = { version, hash, patches ? [] }: stdenv.mkDerivation rec {
pname = "libressl"; pname = "libressl";
inherit version; inherit version;
src = fetchurl { src = fetchurl {
url = "mirror://openbsd/LibreSSL/${pname}-${version}.tar.gz"; url = "mirror://openbsd/LibreSSL/${pname}-${version}.tar.gz";
inherit sha256; inherit hash;
}; };
nativeBuildInputs = [ cmake ]; nativeBuildInputs = [ cmake ];
@ -86,11 +86,11 @@ let
in { in {
libressl_3_4 = generic { libressl_3_4 = generic {
version = "3.4.3"; version = "3.4.3";
sha256 = "sha256-/4i//jVIGLPM9UXjyv5FTFAxx6dyFwdPUzJx1jw38I0="; hash = "sha256-/4i//jVIGLPM9UXjyv5FTFAxx6dyFwdPUzJx1jw38I0=";
}; };
libressl_3_5 = generic { libressl_3_5 = generic {
version = "3.5.2"; version = "3.5.3";
sha256 = "sha256-Vv6rjiHD+mVJ+LfXURZYuOmFGBYoOKeVMUcyZUrfPl8="; hash = "sha256-OrXl6u9pziDGsXDuZNeFtCI19I8uYrCV/KXXtmcriyg=";
}; };
} }

4
pkgs/os-specific/darwin/apple-source-releases/network_cmds/default.nix
View File

@ -1,9 +1,9 @@
{ lib, appleDerivation, xcbuildHook { lib, appleDerivation, xcbuildHook
, libressl, Librpcsvc, xnu, libpcap, developer_cmds }: , libressl_3_4, Librpcsvc, xnu, libpcap, developer_cmds }:
appleDerivation { appleDerivation {
nativeBuildInputs = [ xcbuildHook ]; nativeBuildInputs = [ xcbuildHook ];
buildInputs = [ libressl xnu Librpcsvc libpcap developer_cmds ]; buildInputs = [ libressl_3_4 xnu Librpcsvc libpcap developer_cmds ];
NIX_CFLAGS_COMPILE = " -I./unbound -I${xnu}/Library/Frameworks/System.framework/Headers/"; NIX_CFLAGS_COMPILE = " -I./unbound -I${xnu}/Library/Frameworks/System.framework/Headers/";

13
pkgs/top-level/all-packages.nix
View File

@ -1075,7 +1075,10 @@ with pkgs;
aether-lv2 = callPackage ../applications/audio/aether-lv2 { }; aether-lv2 = callPackage ../applications/audio/aether-lv2 { };
acme-client = callPackage ../tools/networking/acme-client { stdenv = gccStdenv; }; acme-client = callPackage ../tools/networking/acme-client {
stdenv = gccStdenv;
libressl = libressl_3_4;
};
adrgen = callPackage ../tools/misc/adrgen { }; adrgen = callPackage ../tools/misc/adrgen { };
@ -6301,6 +6304,7 @@ with pkgs;
fdbPackages = dontRecurseIntoAttrs (callPackage ../servers/foundationdb { fdbPackages = dontRecurseIntoAttrs (callPackage ../servers/foundationdb {
openjdk = openjdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 openjdk = openjdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731
libressl = libressl_3_4;
}); });
inherit (fdbPackages) inherit (fdbPackages)
@ -9351,7 +9355,9 @@ with pkgs;
otpw = callPackage ../os-specific/linux/otpw { }; otpw = callPackage ../os-specific/linux/otpw { };
ovftool = callPackage ../tools/virtualization/ovftool { }; ovftool = callPackage ../tools/virtualization/ovftool {
libressl = libressl_3_4;
};
overcommit = callPackage ../development/tools/overcommit { }; overcommit = callPackage ../development/tools/overcommit { };
@ -20339,7 +20345,7 @@ with pkgs;
libressl_3_4 libressl_3_4
libressl_3_5; libressl_3_5;
libressl = libressl_3_4; libressl = libressl_3_5;
boringssl = callPackage ../development/libraries/boringssl { }; boringssl = callPackage ../development/libraries/boringssl { };
@ -35381,6 +35387,7 @@ with pkgs;
wasm-pack = callPackage ../development/tools/wasm-pack { wasm-pack = callPackage ../development/tools/wasm-pack {
inherit (darwin.apple_sdk.frameworks) Security; inherit (darwin.apple_sdk.frameworks) Security;
libressl = libressl_3_4;
}; };
wasynth = callPackage ../development/tools/wasynth { }; wasynth = callPackage ../development/tools/wasynth { };