Unverified Commit 8f354147 authored by 7c6f434c's avatar 7c6f434c Committed by GitHub
Browse files

Merge pull request #228729 from helsinki-systems/serf-ossl3 

serf: patch for openssl_3
parents b87aa622 4f1ba7a9

pkgs/development/libraries/serf/default.nix

+14 −2
Original line number Diff line number Diff line 
{ lib, stdenv, fetchurl, apr, scons, openssl, aprutil, zlib, libkrb5

, pkg-config, libiconv }:

, pkg-config, libiconv

, fetchpatch }:



stdenv.mkDerivation rec {

  pname = "serf";
@@ -14,7 +15,18 @@ stdenv.mkDerivation rec { 
  buildInputs = [ apr openssl aprutil zlib libiconv ]

    ++ lib.optional (!stdenv.isCygwin) libkrb5;



  patches = [ ./scons.patch ];

  patches = [

    ./scons.patch

    # https://issues.apache.org/jira/projects/SERF/issues/SERF-198

    (fetchpatch {

      url = "https://issues.apache.org/jira/secure/attachment/13019945/serf.patch";

      hash = "sha256-3djDGG30R/gq74KJL8OJ/upMh1zDpqtwGylRzN0lXpY=";

    })

    (fetchpatch {

      url = "https://src.fedoraproject.org/rpms/libserf/raw/rawhide/f/libserf-1.3.9-errgetfunc.patch";

      hash = "sha256-FQJvXOIZ0iItvbbcu4kR88j74M7fOi7C/0NN3o1/ub4=";

    })

  ];



  prefixKey = "PREFIX=";

pkgs/top-level/all-packages.nix

+1 −5
Original line number Diff line number Diff line
@@ -23676,10 +23676,7 @@ with pkgs; 














  serd = callPackage ../development/libraries/serd { };



























  serf = callPackage ../development/libraries/serf {













    openssl = openssl_1_1;













    aprutil = aprutil.override { openssl = openssl_1_1; };













  };













  serf = callPackage ../development/libraries/serf { };





























  sfsexp = callPackage ../development/libraries/sfsexp { };
























@@ -34007,7 +34004,6 @@ with pkgs;













    sublime-merge-dev;





























  inherit (callPackages ../applications/version-management/subversion {













    openssl = openssl_1_1;















    sasl = cyrus_sasl;















    inherit (darwin.apple_sdk.frameworks) CoreServices Security;















  }) subversion;