Unverified Commit 39bbee99 authored by Janne Heß's avatar Janne Heß Committed by GitHub
Browse files

Merge pull request #274262 from NetaliDev/zammad-update 

zammad: 6.1.0 -> 6.2.0
parents db1680d1 6fe98c3c

nixos/tests/zammad.nix

+4 −0
Original line number Diff line number Diff line
@@ -7,6 +7,10 @@ import ./make-test-python.nix ( 
    meta.maintainers = with lib.maintainers; [ taeer n0emis netali ];



    nodes.machine = { config, ... }: {

      virtualisation = {

        memorySize = 2048;

      };



      services.zammad.enable = true;

      services.zammad.secretKeyBaseFile = pkgs.writeText "secret" ''

        52882ef142066e09ab99ce816ba72522e789505caba224a52d750ec7dc872c2c371b2fd19f16b25dfbdd435a4dd46cb3df9f82eb63fafad715056bdfe25740d6

pkgs/applications/networking/misc/zammad/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ 


let

  pname = "zammad";

  version = "6.1.0";

  version = "6.2.0";



  src = applyPatches {
@@ -101,7 +101,7 @@ let 


    offlineCache = fetchYarnDeps {

      yarnLock = "${src}/yarn.lock";

      hash = "sha256-PVQ2L+Io6Ct9UHvfoQmxV01ECG8fj0+xKwpMfAvD7q0=";

      hash = "sha256-u72ZTpcUvFa1gaWi4lzTQa+JsI85jU4n8r1JhqFnCj4=";

    };



    yarnPreBuild = ''

pkgs/applications/networking/misc/zammad/gemset.nix

+300 −158

File changed.

Preview size limit exceeded, changes collapsed.

pkgs/applications/networking/misc/zammad/package.json

+87 −86
Original line number Diff line number Diff line
@@ -15,132 +15,133 @@ 
    "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"

    "node": ">=18"

  },

  "packageManager": "yarn@1.22.19",

  "packageManager": "yarn@1.22.21",

  "devDependencies": {

    "@faker-js/faker": "^8.0.2",

    "@faker-js/faker": "^8.3.1",

    "@graphql-codegen/cli": "^5.0.0",

    "@graphql-codegen/introspection": "^4.0.0",

    "@graphql-codegen/near-operation-file-preset": "^2.5.0",

    "@graphql-codegen/near-operation-file-preset": "^3.0.0",

    "@graphql-codegen/typescript": "^4.0.1",

    "@graphql-codegen/typescript-operations": "^4.0.1",

    "@graphql-codegen/typescript-vue-apollo": "^3.3.7",

    "@histoire/plugin-vue": "^0.17.1",

    "@graphql-codegen/typescript-vue-apollo": "^4.1.0",

    "@histoire/plugin-vue": "^0.17.5",

    "@pinia/testing": "^0.1.3",

    "@testing-library/jest-dom": "^5.17.0",

    "@testing-library/user-event": "^14.4.3",

    "@testing-library/jest-dom": "^6.1.4",

    "@testing-library/user-event": "^14.5.1",

    "@testing-library/vue": "^7.0.0",

    "@types/lodash-es": "^4.17.8",

    "@types/rails__actioncable": "^6.1.6",

    "@types/ua-parser-js": "^0.7.36",

    "@types/uuid": "^9.0.2",

    "@typescript-eslint/eslint-plugin": "^5.62.0",

    "@typescript-eslint/parser": "^5.62.0",

    "@vitejs/plugin-vue": "^4.2.3",

    "@types/lodash-es": "^4.17.11",

    "@types/rails__actioncable": "^6.1.9",

    "@types/sinonjs__fake-timers": "^8.1.5",

    "@types/ua-parser-js": "^0.7.39",

    "@types/uuid": "^9.0.7",

    "@typescript-eslint/eslint-plugin": "^6.10.0",

    "@typescript-eslint/parser": "^6.10.0",

    "@vitejs/plugin-vue": "^4.5.0",

    "@vue/eslint-config-prettier": "^8.0.0",

    "@vue/eslint-config-typescript": "^11.0.3",

    "@vue/test-utils": "^2.4.1",

    "autoprefixer": "^10.4.15",

    "eslint": "^8.45.0",

    "@vue/eslint-config-typescript": "^12.0.0",

    "@vue/test-utils": "^2.4.2",

    "autoprefixer": "^10.4.16",

    "eslint": "^8.54.0",

    "eslint-config-airbnb-base": "^15.0.0",

    "eslint-config-prettier": "^8.8.0",

    "eslint-config-prettier": "^9.0.0",

    "eslint-import-resolver-alias": "^1.1.2",

    "eslint-import-resolver-typescript": "^3.5.5",

    "eslint-plugin-import": "^2.27.5",

    "eslint-plugin-prettier": "^5.0.0",

    "eslint-plugin-prettier-vue": "^4.2.0",

    "eslint-import-resolver-typescript": "^3.6.1",

    "eslint-plugin-import": "^2.29.0",

    "eslint-plugin-prettier": "^5.0.1",

    "eslint-plugin-prettier-vue": "^5.0.0",

    "eslint-plugin-security": "^1.7.1",

    "eslint-plugin-sonarjs": "^0.19.0",

    "eslint-plugin-vue": "^9.15.1",

    "eslint-plugin-sonarjs": "^0.23.0",

    "eslint-plugin-vue": "^9.18.1",

    "eslint-plugin-zammad": "file:.eslint-plugin-zammad",

    "histoire": "^0.17.0",

    "histoire": "^0.17.5",

    "jsdom": "^22.1.0",

    "mock-apollo-client": "^1.2.1",

    "postcss": "^8.4.28",

    "postcss": "^8.4.31",

    "postcss-html": "^1.5.0",

    "prettier": "3.0.2",

    "prettier-plugin-tailwindcss": "^0.5.3",

    "prettier": "3.1.0",

    "prettier-plugin-tailwindcss": "^0.5.7",

    "regenerator-runtime": "^0.14.0",

    "sass": "^1.65.1",

    "stylelint": "^15.10.3",

    "sass": "^1.69.5",

    "stylelint": "^15.11.0",

    "stylelint-config-prettier": "^9.0.5",

    "stylelint-config-recommended-vue": "^1.5.0",

    "stylelint-config-standard": "^34.0.0",

    "stylelint-config-standard-scss": "^10.0.0",

    "stylelint-config-standard-scss": "^11.1.0",

    "stylelint-prettier": "^4.0.2",

    "stylelint-scss": "^5.1.0",

    "stylelint-scss": "^5.3.1",

    "svg-baker": "^1.7.0",

    "svgo": "^3.0.2",

    "tailwindcss": "^3.3.3",

    "svgo": "^3.0.4",

    "tailwindcss": "^3.3.5",

    "timezone-mock": "^1.3.6",

    "type-fest": "^3.13.1",

    "typescript": "^5.1.6",

    "vite": "^4.4.9",

    "vite-plugin-pwa": "^0.16.4",

    "type-fest": "^4.8.1",

    "typescript": "^5.2.2",

    "vite": "^4.5.0",

    "vite-plugin-pwa": "^0.17.0",

    "vite-plugin-ruby": "^3.2.2",

    "vitest": "^0.34.3",

    "vitest": "^0.34.6",

    "vitest-axe": "^0.1.0",

    "vue-tsc": "^1.8.8"

    "vue-tsc": "^1.8.22"

  },

  "dependencies": {

    "@apollo/client": "^3.7.17",

    "@formkit/core": "^0.17.4",

    "@formkit/dev": "^0.17.4",

    "@formkit/i18n": "^0.17.4",

    "@formkit/inputs": "^0.17.4",

    "@formkit/rules": "^0.17.4",

    "@formkit/tailwindcss": "^0.17.4",

    "@formkit/themes": "^0.17.4",

    "@formkit/utils": "^0.17.4",

    "@formkit/validation": "^0.17.4",

    "@formkit/vue": "^0.17.4",

    "@apollo/client": "^3.8.7",

    "@formkit/core": "^1.2.2",

    "@formkit/dev": "^1.2.2",

    "@formkit/i18n": "^1.2.2",

    "@formkit/inputs": "^1.2.2",

    "@formkit/rules": "^1.2.2",

    "@formkit/tailwindcss": "^1.2.2",

    "@formkit/themes": "^1.2.2",

    "@formkit/utils": "^1.2.2",

    "@formkit/validation": "^1.2.2",

    "@formkit/vue": "^1.2.2",

    "@github/webauthn-json": "^2.1.1",

    "@rails/actioncable": "6.1.7",

    "@tiptap/core": "^2.0.4",

    "@tiptap/extension-blockquote": "^2.0.4",

    "@tiptap/extension-character-count": "^2.0.4",

    "@tiptap/extension-hard-break": "^2.0.4",

    "@tiptap/extension-image": "^2.0.4",

    "@tiptap/extension-link": "^2.0.4",

    "@tiptap/extension-list-item": "^2.0.4",

    "@tiptap/extension-mention": "^2.0.4",

    "@tiptap/extension-ordered-list": "^2.0.4",

    "@tiptap/extension-paragraph": "^2.0.4",

    "@tiptap/extension-strike": "^2.0.4",

    "@tiptap/extension-underline": "^2.0.4",

    "@tiptap/pm": "^2.0.4",

    "@tiptap/starter-kit": "^2.0.4",

    "@tiptap/suggestion": "^2.0.4",

    "@tiptap/vue-3": "^2.0.4",

    "@vue/apollo-composable": "4.0.0-beta.5",

    "@vueuse/core": "^10.4.0",

    "@vueuse/router": "^10.4.0",

    "@vueuse/shared": "^10.4.0",

    "@rails/actioncable": "^7.0.8",

    "@sinonjs/fake-timers": "^11.2.2",

    "@tiptap/core": "^2.1.12",

    "@tiptap/extension-blockquote": "^2.1.12",

    "@tiptap/extension-character-count": "^2.1.12",

    "@tiptap/extension-hard-break": "^2.1.12",

    "@tiptap/extension-image": "^2.1.12",

    "@tiptap/extension-link": "^2.1.12",

    "@tiptap/extension-list-item": "^2.1.12",

    "@tiptap/extension-mention": "^2.1.12",

    "@tiptap/extension-ordered-list": "^2.1.12",

    "@tiptap/extension-paragraph": "^2.1.12",

    "@tiptap/extension-strike": "^2.1.12",

    "@tiptap/extension-underline": "^2.1.12",

    "@tiptap/pm": "^2.1.12",

    "@tiptap/starter-kit": "^2.1.12",

    "@tiptap/suggestion": "^2.1.12",

    "@tiptap/vue-3": "^2.1.12",

    "@vue/apollo-composable": "^4.0.0-beta.11",

    "@vueuse/core": "^10.6.1",

    "@vueuse/router": "^10.6.1",

    "@vueuse/shared": "^10.6.1",

    "async-mutex": "^0.4.0",

    "flatpickr": "^4.6.13",

    "graphql": "^16.7.1",

    "graphql-ruby-client": "^1.11.8",

    "graphql": "^16.8.1",

    "graphql-ruby-client": "^1.11.10",

    "graphql-tag": "^2.12.6",

    "linkify-string": "^4.1.1",

    "linkifyjs": "^4.1.1",

    "linkify-string": "^4.1.2",

    "linkifyjs": "^4.1.2",

    "lodash-es": "^4.17.21",

    "loglevel": "^1.8.1",

    "mitt": "^3.0.1",

    "pinia": "^2.1.6",

    "pinia": "^2.1.7",

    "tippy.js": "^6.3.7",

    "tiptap-text-direction": "^0.3.0",

    "ua-parser-js": "^1.0.35",

    "uuid": "^9.0.0",

    "vue": "^3.3.4",

    "ua-parser-js": "^1.0.37",

    "uuid": "^9.0.1",

    "vue": "^3.3.8",

    "vue-advanced-cropper": "^2.8.8",

    "vue-easy-lightbox": "1.16.0",

    "vue-router": "^4.2.4",

    "vue-router": "^4.2.5",

    "vue3-draggable-resizable": "^1.6.5",

    "vuedraggable": "^4.1.0",

    "workbox-core": "^7.0.0",
@@ -149,9 +150,9 @@ 
  },

  "resolutions": {

    "loader-utils": "^3.2.1",

    "postcss": "^8.4.28",

    "postcss": "^8.4.31",

    "stylelint-config-recommended": "^13.0.0"

  },

  "name": "Zammad",

  "version": "6.1.0"

  "version": "6.2.0"

}

pkgs/applications/networking/misc/zammad/source.json

+2 −2
Original line number Diff line number Diff line 
{

  "owner": "zammad",

  "repo": "zammad",

  "rev": "ec4ddb8ae6a55d1c8e64ab5ddda9ff3e9d4f45c8",

  "hash": "sha256-+AphZ0pKlXFdcncnDxeLdDL3OH2dyF0nb69+/W2dLgc=",

  "rev": "6c358ca90cf7f7581aede5c45d10ac3f2e25bc52",

  "hash": "sha256-kZss5A5tgKnsANt34kk5J+824ghJoVIWXFNlb+ZkZ2Y=",

  "fetchSubmodules": true

}