From 6157673df02f0a0d5809e40241fe71be9effbea7 Mon Sep 17 00:00:00 2001 From: Taeer Bar-Yam Date: Tue, 22 Feb 2022 22:50:33 -0500 Subject: [PATCH] hopefully IFD was the problem --- .../networking/misc/zammad/default.nix | 4 ++-- .../networking/misc/zammad/package.json | 14 ++++++++++++++ pkgs/applications/networking/misc/zammad/update.sh | 3 +++ 3 files changed, 19 insertions(+), 2 deletions(-) create mode 100644 pkgs/applications/networking/misc/zammad/package.json diff --git a/pkgs/applications/networking/misc/zammad/default.nix b/pkgs/applications/networking/misc/zammad/default.nix index 0b5d691c18e6..21c9b98a01fb 100644 --- a/pkgs/applications/networking/misc/zammad/default.nix +++ b/pkgs/applications/networking/misc/zammad/default.nix @@ -52,7 +52,7 @@ let # https://docs.zammad.org/en/latest/prerequisites/software.html#ruby-programming-language inherit ruby_2_7; - gemdir = "${src}"; + gemdir = src; gemset = ./gemset.nix; groups = [ "assets" @@ -89,7 +89,7 @@ let inherit version src; yarnLock = ./yarn.lock; yarnNix = ./yarn.nix; - packageJSON = "${src}/package.json"; + packageJSON = ./package.json; }; in diff --git a/pkgs/applications/networking/misc/zammad/package.json b/pkgs/applications/networking/misc/zammad/package.json new file mode 100644 index 000000000000..ed5407ada93e --- /dev/null +++ b/pkgs/applications/networking/misc/zammad/package.json @@ -0,0 +1,14 @@ +{ + "name": "Zammad", + "version": "1.0.0", + "devDependencies": { + "gulp": "^3.8.11", + "gulp-cheerio": "^0.6.2", + "gulp-rename": "^1.2.2", + "gulp-svgmin": "^1.1.2", + "gulp-svgstore": "^5.0.1", + "gulp-util": "^3.0.4", + "gulp-watch": "^4.2.4", + "through2": "^0.6.5" + } +} diff --git a/pkgs/applications/networking/misc/zammad/update.sh b/pkgs/applications/networking/misc/zammad/update.sh index 01cdb4f8e921..f1ddf27ac618 100755 --- a/pkgs/applications/networking/misc/zammad/update.sh +++ b/pkgs/applications/networking/misc/zammad/update.sh @@ -60,6 +60,9 @@ yarn install cp yarn.lock $TARGET_DIR yarn2nix > $TARGET_DIR/yarn.nix +# needed to avoid import from derivation +cp package.json $TARGET_DIR + popd popd popd