From 9e18a59e42783bea55742e244b5185df55291bcb Mon Sep 17 00:00:00 2001 From: Shamrock Lee <44064051+ShamrockLee@users.noreply.github.com> Date: Fri, 25 Feb 2022 04:38:48 +0800 Subject: [PATCH 1/2] voms: init at 2021-05-04 --- pkgs/tools/networking/voms/default.nix | 70 ++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 72 insertions(+) create mode 100644 pkgs/tools/networking/voms/default.nix diff --git a/pkgs/tools/networking/voms/default.nix b/pkgs/tools/networking/voms/default.nix new file mode 100644 index 000000000000..06639a5ef129 --- /dev/null +++ b/pkgs/tools/networking/voms/default.nix @@ -0,0 +1,70 @@ +{ lib +, stdenv +, fetchFromGitHub + # Native build inputs +, autoreconfHook +, bison +, flex +, pkg-config + # Build inputs +, expat +, gsoap +, openssl +, zlib +}: + +stdenv.mkDerivation rec{ + pname = "voms-unstable"; + version = "2021-05-04"; + + src = fetchFromGitHub { + owner = "italiangrid"; + repo = "voms"; + rev = "61563152fce3a4e6860dd8ab8ab6e72b7908d8b8"; + sha256 = "LNR0G4XrgxqjQmjyaKoZJLNoxtAGiTM93FG3jIU1u+Y="; + }; + + nativeBuildInputs = [ + autoreconfHook + bison + flex + pkg-config + ]; + + buildInputs = [ + expat + gsoap + openssl + zlib + ]; + + outputs = [ "bin" "out" "dev" "man" ]; + + preAutoreconf = '' + mkdir -p aux src/autogen + ''; + + postAutoreconf = '' + # FHS patching + substituteInPlace configure \ + --replace "/usr/bin/soapcpp2" "${gsoap}/bin/soapcpp2" + + # Tell gcc about the location of zlib + # See https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=voms + export GSOAP_SSL_PP_CFLAGS="$(pkg-config --cflags gsoapssl++ zlib)" + export GSOAP_SSL_PP_LIBS="$(pkg-config --libs gsoapssl++ zlib)" + ''; + + configureFlags = [ + "--with-gsoap-wsdl2h=${gsoap}/bin/wsdl2h" + ]; + + meta = with lib; { + description = "The VOMS native service and APIs"; + homepage = "https://italiangrid.github.io/voms/"; + changelog = "https://github.com/italiangrid/voms/blob/master/ChangeLog"; + license = licenses.asl20; + platforms = platforms.linux; # gsoap is currently Linux-only in Nixpkgs + maintainers = with maintainers; [ ShamrockLee ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3a92b35031fc..e2bc28d1bf76 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1088,6 +1088,8 @@ with pkgs; ventoy-bin = callPackage ../tools/cd-dvd/ventoy-bin { }; + voms = callPackage ../tools/networking/voms { }; + vopono = callPackage ../tools/networking/vopono { }; winbox = callPackage ../tools/admin/winbox { From d4e1e79ede9de45145eb77358aeb607d6cf7c5c3 Mon Sep 17 00:00:00 2001 From: Shamrock Lee <44064051+ShamrockLee@users.noreply.github.com> Date: Fri, 25 Feb 2022 05:40:53 +0800 Subject: [PATCH 2/2] xrootd: add voms support --- pkgs/tools/networking/xrootd/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/networking/xrootd/default.nix b/pkgs/tools/networking/xrootd/default.nix index 6347a18c6fbf..9962e4026f28 100644 --- a/pkgs/tools/networking/xrootd/default.nix +++ b/pkgs/tools/networking/xrootd/default.nix @@ -4,15 +4,16 @@ , fetchFromGitHub , cmake , cppunit +, pkg-config , curl , fuse , libkrb5 , libuuid , libxml2 , openssl -, pkg-config , readline , systemd +, voms , zlib , enableTests ? true }: @@ -52,6 +53,7 @@ stdenv.mkDerivation rec { ++ lib.optionals stdenv.isLinux [ fuse systemd + voms ] ++ lib.optionals enableTests [ cppunit