diff options
author | Andreas Rammhold <andreas@rammhold.de> | 2020-02-24 23:08:00 +0100 |
---|---|---|
committer | Andreas Rammhold <andreas@rammhold.de> | 2020-02-25 00:09:30 +0100 |
commit | ad19bb5ff849dfa9af2ad52afda361198391db43 (patch) | |
tree | 3f8bca041cb9e95454f20aa64c39e46bee00d749 /pkgs | |
parent | 9532ca329e6dd563b36105509d7ef99443139416 (diff) | |
download | nixlib-ad19bb5ff849dfa9af2ad52afda361198391db43.tar nixlib-ad19bb5ff849dfa9af2ad52afda361198391db43.tar.gz nixlib-ad19bb5ff849dfa9af2ad52afda361198391db43.tar.bz2 nixlib-ad19bb5ff849dfa9af2ad52afda361198391db43.tar.lz nixlib-ad19bb5ff849dfa9af2ad52afda361198391db43.tar.xz nixlib-ad19bb5ff849dfa9af2ad52afda361198391db43.tar.zst nixlib-ad19bb5ff849dfa9af2ad52afda361198391db43.zip |
ipmitool: migrate to openssl 1.1
This adds a patch from debian to switch ipmitool to openssl 1.1. Upstream seems to already carry a version of this but that is yet to be part of a release.
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/tools/system/ipmitool/default.nix | 11 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
2 files changed, 10 insertions, 5 deletions
diff --git a/pkgs/tools/system/ipmitool/default.nix b/pkgs/tools/system/ipmitool/default.nix index 3105cba5a344..e86dc14b0201 100644 --- a/pkgs/tools/system/ipmitool/default.nix +++ b/pkgs/tools/system/ipmitool/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, openssl, static ? false }: +{ stdenv, lib, fetchurl, openssl, fetchpatch, static ? false }: let pkgname = "ipmitool"; @@ -12,7 +12,14 @@ stdenv.mkDerivation { sha256 = "0kfh8ny35rvwxwah4yv91a05qwpx74b5slq2lhrh71wz572va93m"; }; - patchPhase = stdenv.lib.optionalString stdenv.isDarwin '' + patches = [ + (fetchpatch { + url = "https://sources.debian.org/data/main/i/ipmitool/1.8.18-6/debian/patches/0120-openssl1.1.patch"; + sha256 = "1xvsjxb782lzy72bnqqnsk3r5h4zl3na95s4pqn2qg7cic2mnbfk"; + }) + ]; + + postPatch = stdenv.lib.optionalString stdenv.isDarwin '' substituteInPlace src/plugins/ipmi_intf.c --replace "s6_addr16" "s6_addr" ''; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 17b0779bc904..e71fd37682df 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4261,9 +4261,7 @@ in ipget = callPackage ../applications/networking/ipget { }; - ipmitool = callPackage ../tools/system/ipmitool { - openssl = openssl_1_0_2; - }; + ipmitool = callPackage ../tools/system/ipmitool {}; ipmiutil = callPackage ../tools/system/ipmiutil {}; |