nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-25 00:12:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge #285030: openldap: update, drop openssl_legacy

Browse Source 
...into staging
This commit is contained in:
Vladimír Čunát 2024-02-03 07:44:40 +01:00
commit 474d728adf
No known key found for this signature in database
GPG Key ID: E747DF1F9575A3AA
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkgs/development/libraries/openldap/default.nix
View File

@ -17,11 +17,11 @@
stdenv.mkDerivation rec {
pname = "openldap";
version = "2.6.6";
version = "2.6.7";
src = fetchurl {
url = "https://www.openldap.org/software/download/OpenLDAP/openldap-release/${pname}-${version}.tgz";
hash = "sha256-CC6ZjPVCmE1DY0RC2+EdqGB1nlEJBxUupXm9xC/jnqA=";
hash = "sha256-zXdfYlyUTteKPaGKA7A7CO6nPIqryXtBuzNumhCVSTA=";
};
# TODO: separate "out" and "bin"
@ -99,6 +99,11 @@ stdenv.mkDerivation rec {
# skip flaky tests
rm -f tests/scripts/test063-delta-multiprovider
# https://bugs.openldap.org/show_bug.cgi?id=10009
# can probably be re-added once https://github.com/cyrusimap/cyrus-sasl/pull/772
# has made it to a release
rm -f tests/scripts/test076-authid-rewrite
'';
doCheck = true;

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

@ -24251,9 +24251,7 @@ with pkgs;
openexrid-unstable = callPackage ../development/libraries/openexrid-unstable { };
openldap = callPackage ../development/libraries/openldap {
openssl = openssl_legacy;
};
openldap = callPackage ../development/libraries/openldap { };
opencolorio = darwin.apple_sdk_11_0.callPackage ../development/libraries/opencolorio {
inherit (darwin.apple_sdk_11_0.frameworks) Carbon GLUT Cocoa;