Merge pull request #325116 from ShamrockLee/voms-fomat-move-byname

voms: format with `nixfmt-rfc-style` and move to the name-based package directories
This commit is contained in:
Aleksana 2024-07-07 15:30:08 +08:00 committed by GitHub
commit 8da8e6bb57
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 22 additions and 15 deletions

View File

@ -1,21 +1,22 @@
{ 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 (finalAttrs: {
@ -47,7 +48,15 @@ stdenv.mkDerivation (finalAttrs: {
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 = ''

View File

@ -2078,8 +2078,6 @@ with pkgs;
vitess = callPackage ../development/tools/database/vitess { };
voms = callPackage ../tools/networking/voms { };
vopono = callPackage ../tools/networking/vopono { };
vprof = with python3Packages; toPythonApplication vprof;