cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #181010 from ShamrockLee/voms-xrootd-update

Browse source 
voms: 2021-05-04 -> 2022-06-14 and fixes & xrootd: 5.4.2 -> 5.4.3
This commit is contained in:
ajs124 2022-07-11 13:16:45 +02:00 committed by GitHub
commit bad39490e9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 21 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
pkgs/tools/networking/voms/default.nix
View file

@ -11,17 +11,25 @@
, gsoap , gsoap
, openssl , openssl
, zlib , zlib
# Configuration overridable with .override
# If not null, the builder will
# move "$out/etc" to "$out/etc.orig" and symlink "$out/etc" to externalEtc.
, externalEtc ? "/etc"
}: }:
stdenv.mkDerivation rec{ stdenv.mkDerivation rec{
pname = "voms-unstable"; pname = "voms-unstable";
version = "2021-05-04"; version = "2022-06-14";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "italiangrid"; owner = "italiangrid";
repo = "voms"; repo = "voms";
rev = "61563152fce3a4e6860dd8ab8ab6e72b7908d8b8"; rev = "8e99bb96baaf197f0f557836e2829084bb1bb00e"; # develop branch
sha256 = "LNR0G4XrgxqjQmjyaKoZJLNoxtAGiTM93FG3jIU1u+Y="; hash = "sha256-FG4fHO2lsQ3t/ZaKT9xY+xqdQHfdtzi5ULtxLhdPnss=";
};
passthru = {
inherit externalEtc;
}; };
nativeBuildInputs = [ nativeBuildInputs = [
@ -59,8 +67,15 @@ stdenv.mkDerivation rec{
"--with-gsoap-wsdl2h=${gsoap}/bin/wsdl2h" "--with-gsoap-wsdl2h=${gsoap}/bin/wsdl2h"
]; ];
postFixup = ''
${lib.optionalString (externalEtc != null) ''
mv "$out"/etc{,.orig}
ln -s ${lib.escapeShellArg externalEtc} "$out/etc"
''}
'';
meta = with lib; { meta = with lib; {
description = "The VOMS native service and APIs"; description = "The C/C++ VOMS server, client and APIs v2.x";
homepage = "https://italiangrid.github.io/voms/"; homepage = "https://italiangrid.github.io/voms/";
changelog = "https://github.com/italiangrid/voms/blob/master/ChangeLog"; changelog = "https://github.com/italiangrid/voms/blob/master/ChangeLog";
license = licenses.asl20; license = licenses.asl20;

4
pkgs/tools/networking/xrootd/default.nix
View file

@ -20,14 +20,14 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "xrootd"; pname = "xrootd";
version = "5.4.2"; version = "5.4.3";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "xrootd"; owner = "xrootd";
repo = "xrootd"; repo = "xrootd";
rev = "v${version}"; rev = "v${version}";
fetchSubmodules = true; fetchSubmodules = true;
sha256 = "sha256-k6uAJbUhpwnRrSeGn4JQiHDBrGJNQDf5vG2a+je5ByU="; hash = "sha256-BlMYm4ffSpUxqMjlDVZC59KOuLvwsk/BeBB3VBjAwjs=";
}; };
outputs = [ "bin" "out" "dev" "man" ]; outputs = [ "bin" "out" "dev" "man" ];