movefasta/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-07-12 05:16:25 +03:00
Code Activity

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

Browse source 
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
Download patch file Download diff file Expand all files Collapse all files

35
pkgs/tools/networking/voms/default.nix → pkgs/by-name/vo/voms/package.nix
View file

@ -1,21 +1,22 @@
{ lib {
, stdenv lib,
, fetchFromGitHub stdenv,
fetchFromGitHub,
# Native build inputs # Native build inputs
, autoreconfHook autoreconfHook,
, bison bison,
, flex flex,
, pkg-config pkg-config,
# Build inputs # Build inputs
, expat expat,
, gsoap gsoap,
, openssl openssl,
, zlib zlib,
# Configuration overridable with .override # Configuration overridable with .override
# If not null, the builder will # If not null, the builder will
# create a new output "etc", move "$out/etc" to "$etc/etc" # create a new output "etc", move "$out/etc" to "$etc/etc"
# and symlink "$out/etc" to externalEtc. # and symlink "$out/etc" to externalEtc.
, externalEtc ? "/etc" externalEtc ? "/etc",
}: }:
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
@ -47,7 +48,15 @@ stdenv.mkDerivation (finalAttrs: {
zlib 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"; ++ lib.optional (externalEtc != null) "etc";
preAutoreconf = '' preAutoreconf = ''

2
pkgs/top-level/all-packages.nix
View file

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