zammad: 5.0.1 -> 5.1.0
This commit is contained in:
parent
3eb07eeafb
commit
3b7e8f9f7f
|
@ -10,6 +10,8 @@
|
||||||
, ruby_2_7
|
, ruby_2_7
|
||||||
, postgresql
|
, postgresql
|
||||||
, imlib2
|
, imlib2
|
||||||
|
, jq
|
||||||
|
, moreutils
|
||||||
, nodejs
|
, nodejs
|
||||||
, yarn
|
, yarn
|
||||||
, yarn2nix-moretea
|
, yarn2nix-moretea
|
||||||
|
@ -19,7 +21,7 @@
|
||||||
|
|
||||||
let
|
let
|
||||||
pname = "zammad";
|
pname = "zammad";
|
||||||
version = "5.0.2";
|
version = "5.1.0";
|
||||||
|
|
||||||
src = applyPatches {
|
src = applyPatches {
|
||||||
|
|
||||||
|
@ -31,6 +33,7 @@ let
|
||||||
sed -i -e "s|ruby '2.7.4'|ruby '${ruby_2_7.version}'|" Gemfile
|
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|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|2.7.4|${ruby_2_7.version}|" .ruby-version
|
||||||
|
${jq}/bin/jq '. += {name: "Zammad", version: "${version}"}' package.json | ${moreutils}/bin/sponge package.json
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -70,6 +73,7 @@ let
|
||||||
};
|
};
|
||||||
rszr = attrs: {
|
rszr = attrs: {
|
||||||
buildInputs = [ imlib2 imlib2.dev ];
|
buildInputs = [ imlib2 imlib2.dev ];
|
||||||
|
buildFlags = [ "--without-imlib2-config" ];
|
||||||
};
|
};
|
||||||
mini_racer = attrs: {
|
mini_racer = attrs: {
|
||||||
buildFlags = [
|
buildFlags = [
|
||||||
|
|
File diff suppressed because it is too large
Load diff
|
@ -1,14 +1,18 @@
|
||||||
{
|
{
|
||||||
"name": "Zammad",
|
"scripts": {
|
||||||
"version": "1.0.0",
|
"lint:css": "stylelint \"**/*.{css,scss}\"",
|
||||||
|
"lint:css:fix": "stylelint \"**/*.{css,scss}\" --fix"
|
||||||
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"gulp": "^3.8.11",
|
"postcss": "^8.4.4",
|
||||||
"gulp-cheerio": "^0.6.2",
|
"postcss-html": "^1.3.0",
|
||||||
"gulp-rename": "^1.2.2",
|
"prettier": "2.5.0",
|
||||||
"gulp-svgmin": "^1.1.2",
|
"stylelint": "^14.1.0",
|
||||||
"gulp-svgstore": "^5.0.1",
|
"stylelint-config-prettier": "^9.0.3",
|
||||||
"gulp-util": "^3.0.4",
|
"stylelint-config-standard": "^24.0.0",
|
||||||
"gulp-watch": "^4.2.4",
|
"stylelint-config-standard-scss": "^3.0.0",
|
||||||
"through2": "^0.6.5"
|
"stylelint-prettier": "^2.0.0"
|
||||||
}
|
},
|
||||||
|
"name": "Zammad",
|
||||||
|
"version": "5.1.0"
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
{
|
{
|
||||||
"owner": "zammad",
|
"owner": "zammad",
|
||||||
"repo": "zammad",
|
"repo": "zammad",
|
||||||
"rev": "ad12ad4e01f5e6d1d58da019107b66e562ae463c",
|
"rev": "eefae45c2ad6e6a96b8df631d2f50f290ecbd27d",
|
||||||
"sha256": "i50A0/dBsdvv7L/fZiA1LvJEcO3OghjjgwS/7oFjk2o=",
|
"sha256": "EjowvM//+UsAfEH9/0jgLkiD7EWH34M1NQ9U2DotBqc=",
|
||||||
"fetchSubmodules": true
|
"fetchSubmodules": true
|
||||||
}
|
}
|
||||||
|
|
|
@ -3,6 +3,7 @@
|
||||||
, makeWrapper
|
, makeWrapper
|
||||||
, bundix
|
, bundix
|
||||||
, common-updater-scripts
|
, common-updater-scripts
|
||||||
|
, jq
|
||||||
, nix-prefetch-github
|
, nix-prefetch-github
|
||||||
, yarn
|
, yarn
|
||||||
, yarn2nix
|
, yarn2nix
|
||||||
|
@ -22,6 +23,7 @@ stdenv.mkDerivation rec {
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
bundix
|
bundix
|
||||||
common-updater-scripts
|
common-updater-scripts
|
||||||
|
jq
|
||||||
nix-prefetch-github
|
nix-prefetch-github
|
||||||
yarn
|
yarn
|
||||||
yarn2nix
|
yarn2nix
|
||||||
|
|
|
@ -38,7 +38,7 @@ trap cleanup EXIT
|
||||||
pushd $WORK_DIR
|
pushd $WORK_DIR
|
||||||
|
|
||||||
echo ":: Creating source.json"
|
echo ":: Creating source.json"
|
||||||
nix-prefetch-github zammad zammad --rev $VERSION --json > $TARGET_DIR/source.json
|
nix-prefetch-github zammad zammad --rev $VERSION --json --fetch-submodules | jq 'del(.leaveDotGit) | del(.deepClone)' > $TARGET_DIR/source.json
|
||||||
echo >> $TARGET_DIR/source.json
|
echo >> $TARGET_DIR/source.json
|
||||||
|
|
||||||
echo ":: Fetching source"
|
echo ":: Fetching source"
|
||||||
|
@ -61,7 +61,7 @@ cp yarn.lock $TARGET_DIR
|
||||||
yarn2nix > $TARGET_DIR/yarn.nix
|
yarn2nix > $TARGET_DIR/yarn.nix
|
||||||
|
|
||||||
# needed to avoid import from derivation
|
# needed to avoid import from derivation
|
||||||
cp package.json $TARGET_DIR
|
jq --arg VERSION "$VERSION" '. += {name: "Zammad", version: $VERSION}' package.json > $TARGET_DIR/package.json
|
||||||
|
|
||||||
popd
|
popd
|
||||||
popd
|
popd
|
||||||
|
|
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