Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Backport release-24.05] voms: 2.1.0-rc2-unstable-2022-06-14 -> 2.1.0 #325097

Merged
merged 4 commits into from
Jul 7, 2024
Merged

[Backport release-24.05] voms: 2.1.0-rc2-unstable-2022-06-14 -> 2.1.0 #325097

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6c9a18b
voms: normalize pname and version
wegank Jul 3, 2024
bdf776d
voms: 2.1.0-rc2-unstable-2022-06-14 -> 2.1.0 (#270400)
ShamrockLee Jul 6, 2024
8f090d7
voms: format according to Nix RFC 166
ShamrockLee Jul 6, 2024
e01566a
voms: move to pkgs/by-name
ShamrockLee Jul 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
47 changes: 28 additions & 19 deletions pkgs/tools/networking/voms/default.nix → pkgs/by-name/vo/voms/package.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,32 +1,33 @@
{ lib
, stdenv
, fetchFromGitHub
{
lib,
stdenv,
fetchFromGitHub,
# Native build inputs
, autoreconfHook
, bison
, flex
, pkg-config
autoreconfHook,
bison,
flex,
pkg-config,
# Build inputs
, expat
, gsoap
, openssl
, zlib
expat,
gsoap,
openssl,
zlib,
# Configuration overridable with .override
# If not null, the builder will
# create a new output "etc", move "$out/etc" to "$etc/etc"
# and symlink "$out/etc" to externalEtc.
, externalEtc ? "/etc"
externalEtc ? "/etc",
}:

stdenv.mkDerivation rec{
pname = "voms-unstable";
version = "2022-06-14";
stdenv.mkDerivation (finalAttrs: {
superherointj marked this conversation as resolved.
Show resolved Hide resolved
pname = "voms";
version = "2.1.0";

src = fetchFromGitHub {
owner = "italiangrid";
repo = "voms";
rev = "8e99bb96baaf197f0f557836e2829084bb1bb00e"; # develop branch
hash = "sha256-FG4fHO2lsQ3t/ZaKT9xY+xqdQHfdtzi5ULtxLhdPnss=";
rev = "v${finalAttrs.version}";
hash = "sha256-Xz9+NYaSZsVuoIbyuejVWmwEmsPmMVtBAD94/SXP8ag=";
};

passthru = {
Expand All @@ -47,7 +48,15 @@ stdenv.mkDerivation rec{
zlib
];

outputs = [ "bin" "out" "dev" "man" ]
outputs =
[
"bin"
"out"
"dev"
"man"
]
# `etc` output for default configurations that can optionally be
# installed to /etc (system-wide) or profile-path>/etc.
++ lib.optional (externalEtc != null) "etc";

preAutoreconf = ''
Expand Down Expand Up @@ -83,4 +92,4 @@ stdenv.mkDerivation rec{
platforms = platforms.linux; # gsoap is currently Linux-only in Nixpkgs
maintainers = with maintainers; [ ShamrockLee ];
};
}
})
2 changes: 0 additions & 2 deletions pkgs/top-level/all-packages.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2099,8 +2099,6 @@ with pkgs;

vitess = callPackage ../development/tools/database/vitess { };

voms = callPackage ../tools/networking/voms { };

vopono = callPackage ../tools/networking/vopono { };

vprof = with python3Packages; toPythonApplication vprof;
Expand Down