zammad: move to pkgs/by-name/, use stdenvNoCC and format with rfc-style (#359530)

This commit is contained in:
Franz Pletz 2024-11-28 12:54:11 +01:00 committed by GitHub
commit 5ca1ce25e1
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
7 changed files with 54 additions and 38 deletions

View File

@ -1,22 +1,23 @@
{ stdenv
, lib
, nixosTests
, fetchFromGitHub
, applyPatches
, bundlerEnv
, defaultGemConfig
, callPackage
, procps
, ruby
, postgresql
, imlib2
, jq
, moreutils
, nodejs
, pnpm
, cacert
, redis
, dataDir ? "/var/lib/zammad"
{
stdenvNoCC,
lib,
nixosTests,
fetchFromGitHub,
applyPatches,
bundlerEnv,
defaultGemConfig,
callPackage,
procps,
ruby,
postgresql,
imlib2,
jq,
moreutils,
nodejs,
pnpm,
cacert,
redis,
dataDir ? "/var/lib/zammad",
}:
let
@ -61,7 +62,10 @@ let
buildFlags = [ "--with-pg-config=${lib.getDev postgresql}/bin/pg_config" ];
};
rszr = attrs: {
buildInputs = [ imlib2 imlib2.dev ];
buildInputs = [
imlib2
imlib2.dev
];
buildFlags = [ "--without-imlib2-config" ];
};
mini_racer = attrs: {
@ -78,7 +82,7 @@ let
};
in
stdenv.mkDerivation {
stdenvNoCC.mkDerivation {
inherit pname version src;
buildInputs = [
@ -136,15 +140,28 @@ stdenv.mkDerivation {
passthru = {
inherit rubyEnv;
updateScript = [ "${callPackage ./update.nix {}}/bin/update.sh" pname (toString ./.) ];
tests = { inherit (nixosTests) zammad; };
updateScript = [
"${callPackage ./update.nix { }}/bin/update.sh"
pname
(toString ./.)
];
tests = {
inherit (nixosTests) zammad;
};
};
meta = with lib; {
description = "Zammad, a web-based, open source user support/ticketing solution";
homepage = "https://zammad.org";
license = licenses.agpl3Plus;
platforms = [ "x86_64-linux" "aarch64-linux" ];
maintainers = with maintainers; [ n0emis taeer netali ];
platforms = [
"x86_64-linux"
"aarch64-linux"
];
maintainers = with maintainers; [
n0emis
taeer
netali
];
};
}

View File

@ -1,16 +1,17 @@
{ stdenv
, lib
, makeWrapper
, bundix
, common-updater-scripts
, xidel
, jq
, nix-prefetch-github
, yarn
, yarn2nix
{
stdenvNoCC,
lib,
makeWrapper,
bundix,
common-updater-scripts,
xidel,
jq,
nix-prefetch-github,
yarn,
yarn2nix,
}:
stdenv.mkDerivation rec {
stdenvNoCC.mkDerivation rec {
name = "zammad-update-script";
installPhase = ''
mkdir -p $out/bin

View File

@ -16427,8 +16427,6 @@ with pkgs;
yuview = libsForQt5.yuview;
zammad = callPackage ../applications/networking/misc/zammad { };
zathuraPkgs = callPackage ../applications/misc/zathura { };
zathura = zathuraPkgs.zathuraWrapper;