diff options
| author | Maximilian Bosch <maximilian@mbosch.me> | 2020-04-16 19:24:51 +0200 |
|---|---|---|
| committer | Maximilian Bosch <maximilian@mbosch.me> | 2020-04-16 21:52:08 +0200 |
| commit | d4659dece27b9aa5096091b46a11b3280689c897 (patch) | |
| tree | 8131efdd78099fc1200c89dd19033ac2720522c2 /pkgs/servers | |
| parent | 88be9a1b2f6e68d635adde5c2d2015012fbe2ea8 (diff) | |
| download | nixlib-d4659dece27b9aa5096091b46a11b3280689c897.tar nixlib-d4659dece27b9aa5096091b46a11b3280689c897.tar.gz nixlib-d4659dece27b9aa5096091b46a11b3280689c897.tar.bz2 nixlib-d4659dece27b9aa5096091b46a11b3280689c897.tar.lz nixlib-d4659dece27b9aa5096091b46a11b3280689c897.tar.xz nixlib-d4659dece27b9aa5096091b46a11b3280689c897.tar.zst nixlib-d4659dece27b9aa5096091b46a11b3280689c897.zip | |
grocy: 2.6.2 -> 2.7.0
Diffstat (limited to 'pkgs/servers')
3 files changed, 31 insertions, 4 deletions
diff --git a/pkgs/servers/grocy/0001-Define-configs-with-env-vars.patch b/pkgs/servers/grocy/0001-Define-configs-with-env-vars.patch index 654d96ae4e1a..ed315c854c82 100644 --- a/pkgs/servers/grocy/0001-Define-configs-with-env-vars.patch +++ b/pkgs/servers/grocy/0001-Define-configs-with-env-vars.patch @@ -1,7 +1,7 @@ From 931958d8f11cb55f2e88a178a3b828f3c537eba8 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch <maximilian@mbosch.me> Date: Fri, 6 Mar 2020 23:43:58 +0100 -Subject: [PATCH] Define configs with env vars +Subject: [PATCH 1/2] Define configs with env vars --- app.php | 4 ++-- diff --git a/pkgs/servers/grocy/0002-Remove-check-for-config-file-as-it-s-stored-in-etc-g.patch b/pkgs/servers/grocy/0002-Remove-check-for-config-file-as-it-s-stored-in-etc-g.patch new file mode 100644 index 000000000000..e7f84a146fbf --- /dev/null +++ b/pkgs/servers/grocy/0002-Remove-check-for-config-file-as-it-s-stored-in-etc-g.patch @@ -0,0 +1,24 @@ +From 1556489f0b475ae56e5ed3afba19cc2abb696a76 Mon Sep 17 00:00:00 2001 +From: Maximilian Bosch <maximilian@mbosch.me> +Date: Thu, 16 Apr 2020 19:37:32 +0200 +Subject: [PATCH 2/2] Remove check for config-file as it's stored in /etc/grocy + +--- + helpers/PrerequisiteChecker.php | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/helpers/PrerequisiteChecker.php b/helpers/PrerequisiteChecker.php +index d4bf74c6..ca7686c9 100644 +--- a/helpers/PrerequisiteChecker.php ++++ b/helpers/PrerequisiteChecker.php +@@ -8,7 +8,6 @@ class PrerequisiteChecker + { + public function checkRequirements() + { +- self::checkForConfigFile(); + self::checkForConfigDistFile(); + self::checkForComposer(); + self::checkForYarn(); +-- +2.25.0 + diff --git a/pkgs/servers/grocy/default.nix b/pkgs/servers/grocy/default.nix index a4c1722d38bd..95b51f34c0db 100644 --- a/pkgs/servers/grocy/default.nix +++ b/pkgs/servers/grocy/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "grocy"; - version = "2.6.2"; + version = "2.7.0"; src = fetchurl { url = "https://github.com/grocy/grocy/releases/download/v${version}/grocy_${version}.zip"; - sha256 = "1cjkyv50vwx24xb1mxgy51mr4qqsqgixjww06rql77d9czmmd94k"; + sha256 = "10da7s8yc3adqzd8446ksgq61zyzxb4qbnwkzj11qh64y5hyj50q"; }; nativeBuildInputs = [ unzip ]; @@ -14,7 +14,10 @@ stdenv.mkDerivation rec { unzip ${src} -d . ''; - patches = [ ./0001-Define-configs-with-env-vars.patch ]; + patches = [ + ./0001-Define-configs-with-env-vars.patch + ./0002-Remove-check-for-config-file-as-it-s-stored-in-etc-g.patch + ]; patchFlags = [ "--binary" "-p1" ]; dontBuild = true; |