grocy: 2.6.2 -> 2.7.0

(cherry picked from commit d4659de)
NixOS · Apr 16, 2020 · 34104aa · 34104aa
1 parent 077bbd6
commit 34104aa
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 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
@@ -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
@@ -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
@@ -2,19 +2,22 @@
 
 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 ];
   unpackPhase = ''
     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;