movefasta/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-07-14 06:00:33 +03:00
Code Activity

minor changes

Browse source
This commit is contained in:
Taeer Bar-Yam 2022-02-16 16:58:20 -05:00
parent 4d38b6460f
commit 00e74ad907
2 changed files with 9 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

6
nixos/modules/services/development/zammad.nix
View file

@ -248,15 +248,15 @@ in
wantedBy = [ "multi-user.target" ]; wantedBy = [ "multi-user.target" ];
preStart = '' preStart = ''
# Blindly copy the whole project here. # Blindly copy the whole project here.
chmod -R u+w . chmod -R +w .
rm -rf ./public/assets/* rm -rf ./public/assets/*
rm -rf ./tmp/* rm -rf ./tmp/*
rm -rf ./log/* rm -rf ./log/*
cp -r --no-preserve=owner ${cfg.package}/* . cp -r --no-preserve=owner ${cfg.package}/* .
chmod -R u+w . chmod -R +w .
# config file # config file
cp ${databaseConfig} ./config/database.yml cp ${databaseConfig} ./config/database.yml
chmod -R u+w . chmod -R +w .
${optionalString (cfg.database.passwordFile != null) '' ${optionalString (cfg.database.passwordFile != null) ''
{ {
echo -n " password: " echo -n " password: "

16
pkgs/applications/networking/misc/zammad/default.nix
View file

@ -21,7 +21,7 @@ let
pname = "zammad"; pname = "zammad";
version = "5.0.2"; version = "5.0.2";
sourceDir = applyPatches { src = applyPatches {
src = fetchFromGitHub (builtins.fromJSON (builtins.readFile ./source.json)); src = fetchFromGitHub (builtins.fromJSON (builtins.readFile ./source.json));
@ -52,7 +52,7 @@ let
# https://docs.zammad.org/en/latest/prerequisites/software.html#ruby-programming-language # https://docs.zammad.org/en/latest/prerequisites/software.html#ruby-programming-language
inherit ruby_2_7; inherit ruby_2_7;
gemdir = sourceDir; gemdir = src;
gemset = ./gemset.nix; gemset = ./gemset.nix;
groups = [ groups = [
"assets" "assets"
@ -86,19 +86,15 @@ let
yarnEnv = yarn2nix-moretea.mkYarnPackage { yarnEnv = yarn2nix-moretea.mkYarnPackage {
pname = "${pname}-node-modules"; pname = "${pname}-node-modules";
inherit version; inherit version src;
src = sourceDir;
yarnLock = ./yarn.lock; yarnLock = ./yarn.lock;
yarnNix = ./yarn.nix; yarnNix = ./yarn.nix;
packageJSON = sourceDir + "/package.json"; packageJSON = src + "/package.json";
}; };
in in
stdenv.mkDerivation { stdenv.mkDerivation {
name = "${pname}-${version}"; inherit pname version src;
inherit pname version;
src = sourceDir;
buildInputs = [ buildInputs = [
rubyEnv rubyEnv
@ -138,6 +134,6 @@ stdenv.mkDerivation {
homepage = "https://zammad.org"; homepage = "https://zammad.org";
license = licenses.agpl3Plus; license = licenses.agpl3Plus;
platforms = [ "x86_64-linux" ]; platforms = [ "x86_64-linux" ];
maintainers = with maintainers; [ n0emis ]; maintainers = with maintainers; [ n0emis garbas taeer ];
}; };
} }