forked from mirrors/nixpkgs
Merge pull request #231512 from n0emis/zammad-5.4.1
zammad: 5.1.1 -> 5.4.1
This commit is contained in:
Martin Weinelt
GitHub
commit
a919e81dbf
|
|
@ -254,7 +254,7 @@ in
|
|||
preStart = ''
|
||||
# Blindly copy the whole project here.
|
||||
chmod -R +w .
|
||||
rm -rf ./public/assets/*
|
||||
rm -rf ./public/assets/
|
||||
rm -rf ./tmp/*
|
||||
rm -rf ./log/*
|
||||
cp -r --no-preserve=owner ${cfg.package}/* .
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@ import ./make-test-python.nix (
|
|||
{
|
||||
name = "zammad";
|
||||
|
||||
meta.maintainers = with lib.maintainers; [ garbas taeer ];
|
||||
meta.maintainers = with lib.maintainers; [ garbas taeer n0emis ];
|
||||
|
||||
nodes.machine = { config, ... }: {
|
||||
services.zammad.enable = true;
|
||||
|
|
|
|||
|
|
@ -1,5 +1,6 @@
|
|||
{ stdenv
|
||||
, lib
|
||||
, nixosTests
|
||||
, fetchFromGitHub
|
||||
, applyPatches
|
||||
, bundlerEnv
|
||||
|
|
@ -7,7 +8,7 @@
|
|||
, callPackage
|
||||
, writeText
|
||||
, procps
|
||||
, ruby_2_7
|
||||
, ruby
|
||||
, postgresql
|
||||
, imlib2
|
||||
, jq
|
||||
|
|
@ -21,7 +22,7 @@
|
|||
|
||||
let
|
||||
pname = "zammad";
|
||||
version = "5.1.1";
|
||||
version = "5.4.1";
|
||||
|
||||
src = applyPatches {
|
||||
|
||||
|
|
@ -30,9 +31,9 @@ let
|
|||
patches = [ ./0001-nulldb.patch ];
|
||||
|
||||
postPatch = ''
|
||||
sed -i -e "s|ruby '2.7.4'|ruby '${ruby_2_7.version}'|" Gemfile
|
||||
sed -i -e "s|ruby 2.7.4p191|ruby ${ruby_2_7.version}|" Gemfile.lock
|
||||
sed -i -e "s|2.7.4|${ruby_2_7.version}|" .ruby-version
|
||||
sed -i -e "s|ruby '3.1.[0-9]\+'|ruby '${ruby.version}'|" Gemfile
|
||||
sed -i -e "s|ruby 3.1.[0-9]\+p[0-9]\+|ruby ${ruby.version}|" Gemfile.lock
|
||||
sed -i -e "s|3.1.[0-9]\+|${ruby.version}|" .ruby-version
|
||||
${jq}/bin/jq '. += {name: "Zammad", version: "${version}"}' package.json | ${moreutils}/bin/sponge package.json
|
||||
'';
|
||||
};
|
||||
|
|
@ -53,7 +54,7 @@ let
|
|||
|
||||
# Which ruby version to select:
|
||||
# https://docs.zammad.org/en/latest/prerequisites/software.html#ruby-programming-language
|
||||
inherit ruby_2_7;
|
||||
inherit ruby;
|
||||
|
||||
gemdir = src;
|
||||
gemset = ./gemset.nix;
|
||||
|
|
@ -94,6 +95,12 @@ let
|
|||
yarnLock = ./yarn.lock;
|
||||
yarnNix = ./yarn.nix;
|
||||
packageJSON = ./package.json;
|
||||
|
||||
yarnPreBuild = ''
|
||||
mkdir -p deps/Zammad
|
||||
cp -r ${src}/.eslint-plugin-zammad deps/Zammad/.eslint-plugin-zammad
|
||||
chmod -R +w deps/Zammad/.eslint-plugin-zammad
|
||||
'';
|
||||
};
|
||||
|
||||
in
|
||||
|
|
@ -129,13 +136,14 @@ stdenv.mkDerivation {
|
|||
passthru = {
|
||||
inherit rubyEnv yarnEnv;
|
||||
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" ];
|
||||
platforms = [ "x86_64-linux" "aarch64-linux" ];
|
||||
maintainers = with maintainers; [ n0emis garbas taeer ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
|
|
@ -1,18 +1,152 @@
|
|||
{
|
||||
"private": true,
|
||||
"scripts": {
|
||||
"lint:css": "stylelint \"**/*.{css,scss}\"",
|
||||
"lint:css:fix": "stylelint \"**/*.{css,scss}\" --fix"
|
||||
"generate-graphql-api": "RAILS_ENV=development bundle exec rails generate zammad:graphql_introspection > tmp/graphql_introspection.json && npx graphql-codegen -c .graphql_code_generator.yml && rm tmp/graphql_introspection.json",
|
||||
"dev": "RAILS_ENV=development forego start -f Procfile.dev",
|
||||
"dev:https": "VITE_RUBY_HTTPS=true RAILS_ENV=development forego start -f Procfile.dev-https",
|
||||
"https:generate": "sh contrib/ssl/generate-ssl.sh",
|
||||
"i18n": "rails generate zammad:translation_catalog",
|
||||
"lint": "vue-tsc --noEmit && eslint --cache --cache-location ./tmp/eslintcache.js -c .eslintrc.js --ext .js,.ts,.vue app/frontend/ .eslint-plugin-zammad/",
|
||||
"lint:fix": "yarn lint -- --fix",
|
||||
"lint:css": "stylelint **/*.{css,vue,scss}",
|
||||
"lint:css:fix": "stylelint **/*.{css,vue,scss} --fix",
|
||||
"test": "VTL_SKIP_AUTO_CLEANUP=true TZ=utc vitest",
|
||||
"test:ct": "CY_OPEN=true yarn --cwd ./.cypress cypress open --component --project ../ --config-file .cypress/cypress.config.mjs",
|
||||
"test:ci:ct": "CI=true yarn --cwd ./.cypress cypress run --component --project ../ --config-file .cypress/cypress.config.mjs --browser electron",
|
||||
"cypress:snapshots": "sh .cypress/visual-regression/snapshots.sh",
|
||||
"cypress:install": "yarn --cwd ./.cypress install",
|
||||
"postinstall": "node script/fix-node-modules.mjs",
|
||||
"story": "histoire dev",
|
||||
"story:build": "HISTOIRE_BUILD=1 histoire build"
|
||||
},
|
||||
"engines": {
|
||||
"node": ">=16"
|
||||
},
|
||||
"packageManager": "yarn@1.22.19",
|
||||
"devDependencies": {
|
||||
"postcss": "^8.4.4",
|
||||
"postcss-html": "^1.3.0",
|
||||
"prettier": "2.5.0",
|
||||
"stylelint": "^14.1.0",
|
||||
"stylelint-config-prettier": "^9.0.3",
|
||||
"stylelint-config-standard": "^24.0.0",
|
||||
"stylelint-config-standard-scss": "^3.0.0",
|
||||
"stylelint-prettier": "^2.0.0"
|
||||
"@graphql-codegen/cli": "^3.0.0",
|
||||
"@graphql-codegen/introspection": "^3.0.0",
|
||||
"@graphql-codegen/near-operation-file-preset": "^2.5.0",
|
||||
"@graphql-codegen/typescript": "^3.0.0",
|
||||
"@graphql-codegen/typescript-operations": "^3.0.0",
|
||||
"@graphql-codegen/typescript-vue-apollo": "^3.3.7",
|
||||
"@histoire/plugin-vue": "^0.14.2",
|
||||
"@pinia/testing": "^0.0.14",
|
||||
"@tailwindcss/line-clamp": "^0.4.2",
|
||||
"@testing-library/jest-dom": "^5.16.5",
|
||||
"@testing-library/user-event": "^14.4.3",
|
||||
"@testing-library/vue": "^6.6.1",
|
||||
"@types/lodash-es": "^4.17.6",
|
||||
"@types/rails__actioncable": "^6.1.6",
|
||||
"@types/ua-parser-js": "^0.7.36",
|
||||
"@types/uuid": "^9.0.0",
|
||||
"@typescript-eslint/eslint-plugin": "^5.51.0",
|
||||
"@typescript-eslint/parser": "^5.51.0",
|
||||
"@vitejs/plugin-vue": "^4.0.0",
|
||||
"@vue/eslint-config-prettier": "^7.0.0",
|
||||
"@vue/eslint-config-typescript": "^11.0.2",
|
||||
"@vue/test-utils": "^2.2.10",
|
||||
"autoprefixer": "^10.4.13",
|
||||
"eslint": "^8.33.0",
|
||||
"eslint-config-airbnb-base": "^15.0.0",
|
||||
"eslint-config-prettier": "^8.6.0",
|
||||
"eslint-import-resolver-alias": "^1.1.2",
|
||||
"eslint-plugin-import": "^2.27.5",
|
||||
"eslint-plugin-prettier": "^4.2.1",
|
||||
"eslint-plugin-prettier-vue": "^4.2.0",
|
||||
"eslint-plugin-security": "^1.7.1",
|
||||
"eslint-plugin-sonarjs": "^0.18.0",
|
||||
"eslint-plugin-vue": "^9.9.0",
|
||||
"eslint-plugin-zammad": "file:.eslint-plugin-zammad",
|
||||
"histoire": "^0.14.2",
|
||||
"jsdom": "^21.1.0",
|
||||
"mock-apollo-client": "^1.2.1",
|
||||
"postcss": "^8.4.21",
|
||||
"postcss-html": "^1.5.0",
|
||||
"prettier": "2.8.4",
|
||||
"prettier-plugin-tailwindcss": "^0.2.2",
|
||||
"regenerator-runtime": "^0.13.11",
|
||||
"sass": "^1.58.0",
|
||||
"stylelint": "^14.16.1",
|
||||
"stylelint-config-prettier": "^9.0.5",
|
||||
"stylelint-config-recommended-vue": "^1.4.0",
|
||||
"stylelint-config-standard": "^29.0.0",
|
||||
"stylelint-config-standard-scss": "^6.1.0",
|
||||
"stylelint-prettier": "^2.0.0",
|
||||
"stylelint-scss": "^4.4.0",
|
||||
"tailwindcss": "^3.2.6",
|
||||
"timezone-mock": "^1.3.6",
|
||||
"ts-node": "^10.9.1",
|
||||
"type-fest": "^3.5.7",
|
||||
"typescript": "^4.9.5",
|
||||
"vite": "^4.0.4",
|
||||
"vite-plugin-pwa": "^0.14.1",
|
||||
"vite-plugin-ruby": "^3.1.3",
|
||||
"vite-plugin-svg-icons": "^2.0.1",
|
||||
"vitest": "^0.28.4",
|
||||
"vitest-axe": "^0.1.0",
|
||||
"vue-tsc": "^1.0.24"
|
||||
},
|
||||
"dependencies": {
|
||||
"@apollo/client": "^3.7.7",
|
||||
"@formkit/core": "^1.0.0-beta.13-c578106",
|
||||
"@formkit/dev": "^1.0.0-beta.13-c578106",
|
||||
"@formkit/i18n": "^1.0.0-beta.13-c578106",
|
||||
"@formkit/inputs": "^1.0.0-beta.13-c578106",
|
||||
"@formkit/rules": "^1.0.0-beta.13-c578106",
|
||||
"@formkit/tailwindcss": "^1.0.0-beta.13-c578106",
|
||||
"@formkit/themes": "^1.0.0-beta.13-c578106",
|
||||
"@formkit/utils": "^1.0.0-beta.13-c578106",
|
||||
"@formkit/validation": "^1.0.0-beta.13-c578106",
|
||||
"@formkit/vue": "^1.0.0-beta.13-c578106",
|
||||
"@rails/actioncable": "6.1.7",
|
||||
"@tiptap/core": "^2.0.0-beta.217",
|
||||
"@tiptap/extension-blockquote": "^2.0.0-beta.217",
|
||||
"@tiptap/extension-character-count": "^2.0.0-beta.217",
|
||||
"@tiptap/extension-image": "^2.0.0-beta.217",
|
||||
"@tiptap/extension-link": "^2.0.0-beta.217",
|
||||
"@tiptap/extension-list-item": "^2.0.0-beta.217",
|
||||
"@tiptap/extension-mention": "^2.0.0-beta.217",
|
||||
"@tiptap/extension-ordered-list": "^2.0.0-beta.217",
|
||||
"@tiptap/extension-paragraph": "^2.0.0-beta.217",
|
||||
"@tiptap/extension-strike": "^2.0.0-beta.217",
|
||||
"@tiptap/extension-underline": "^2.0.0-beta.217",
|
||||
"@tiptap/pm": "^2.0.0-beta.217",
|
||||
"@tiptap/starter-kit": "^2.0.0-beta.217",
|
||||
"@tiptap/suggestion": "^2.0.0-beta.217",
|
||||
"@tiptap/vue-3": "^2.0.0-beta.217",
|
||||
"@vue/apollo-composable": "^4.0.0-beta.2",
|
||||
"@vueuse/core": "^9.12.0",
|
||||
"@vueuse/router": "^9.12.0",
|
||||
"@vueuse/shared": "^9.12.0",
|
||||
"async-mutex": "^0.4.0",
|
||||
"flatpickr": "^4.6.13",
|
||||
"graphql": "^16.6.0",
|
||||
"graphql-ruby-client": "^1.11.5",
|
||||
"graphql-tag": "^2.12.6",
|
||||
"linkify-string": "^4.1.0",
|
||||
"linkifyjs": "^4.1.0",
|
||||
"lodash-es": "^4.17.21",
|
||||
"loglevel": "^1.8.1",
|
||||
"mitt": "^3.0.0",
|
||||
"pinia": "^2.0.30",
|
||||
"tippy.js": "^6.3.7",
|
||||
"ua-parser-js": "^1.0.33",
|
||||
"uuid": "^9.0.0",
|
||||
"vue": "^3.2.47",
|
||||
"vue-advanced-cropper": "^2.8.8",
|
||||
"vue-easy-lightbox": "1.12.0",
|
||||
"vue-router": "^4.1.6",
|
||||
"vue3-draggable-resizable": "^1.6.5",
|
||||
"vuedraggable": "^4.1.0",
|
||||
"workbox-core": "^6.5.4",
|
||||
"workbox-precaching": "^6.5.4",
|
||||
"workbox-window": "^6.5.4"
|
||||
},
|
||||
"resolutions": {
|
||||
"loader-utils": "^3.2.1",
|
||||
"postcss": "^8.4.21"
|
||||
},
|
||||
"name": "Zammad",
|
||||
"version": "5.1.1"
|
||||
"version": "5.4.1"
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
{
|
||||
"owner": "zammad",
|
||||
"repo": "zammad",
|
||||
"rev": "d71bd90ef964426230664cdfbaa2572325bfed4f",
|
||||
"sha256": "yzDTkjnRBl71REtSKRblkanJWhj7gp/+exhWjxGCFWw=",
|
||||
"rev": "643aba6ba4ba66c6127038c8cc2cc7a20b912678",
|
||||
"sha256": "vLLn989M5ZN+jTh60BopEKbuaxOBfDsk6PiM+gHFClo=",
|
||||
"fetchSubmodules": true
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -3,6 +3,7 @@
|
|||
, makeWrapper
|
||||
, bundix
|
||||
, common-updater-scripts
|
||||
, xidel
|
||||
, jq
|
||||
, nix-prefetch-github
|
||||
, yarn
|
||||
|
|
@ -23,6 +24,7 @@ stdenv.mkDerivation rec {
|
|||
buildInputs = [
|
||||
bundix
|
||||
common-updater-scripts
|
||||
xidel
|
||||
jq
|
||||
nix-prefetch-github
|
||||
yarn
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@ if [ "$#" -gt 2 ] || [[ "$1" == -* ]]; then
|
|||
exit 1
|
||||
fi
|
||||
|
||||
VERSION=$(curl -s https://ftp.zammad.com/ | grep -v latest | grep tar.gz | sed "s/<a href=\".*\">zammad-//" | sort -h | tail -n 1 | awk '{print $1}' | sed 's/.tar.gz<\/a>//')
|
||||
VERSION=$(xidel -s https://ftp.zammad.com/ --extract "//a" | grep -E "zammad-[0-9.]*.tar.gz" | sort --version-sort | tail -n 1 | sed -e 's/zammad-//' -e 's/.tar.gz//')
|
||||
TARGET_DIR="$2"
|
||||
WORK_DIR=$(mktemp -d)
|
||||
SOURCE_DIR=$WORK_DIR/zammad-$VERSION
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
File diff suppressed because it is too large
Load diff
Loading…
Reference in a new issue