colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

grocy: 2.6.0 -> 2.6.1

Browse Source
This commit is contained in:
Maximilian Bosch 2020-03-06 23:46:07 +01:00
parent 5a0bbfa7f2
commit d0e0acadbb
No known key found for this signature in database
GPG Key ID: 091DBF4D1FC46B8E
2 changed files with 51 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
pkgs/servers/grocy/config-locations.patch → pkgs/servers/grocy/0001-Define-configs-with-env-vars.patch
View File

@ -1,8 +1,20 @@
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
---
app.php | 4 ++--
services/DatabaseService.php | 2 +-
services/FilesService.php | 2 +-
services/StockService.php | 2 +-
4 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/app.php b/app.php diff --git a/app.php b/app.php
index 5f91e4d..09c6010 100644 index af65ad1..4963c28 100644
--- a/app.php --- a/app.php
+++ b/app.php +++ b/app.php
@@ -23,7 +23,7 @@ else @@ -25,7 +25,7 @@ else
require_once __DIR__ . '/vendor/autoload.php'; require_once __DIR__ . '/vendor/autoload.php';
// Load config files // Load config files
@ -11,20 +23,20 @@ index 5f91e4d..09c6010 100644
require_once __DIR__ . '/config-dist.php'; // For not in own config defined values we use the default ones require_once __DIR__ . '/config-dist.php'; // For not in own config defined values we use the default ones
// Definitions for dev/demo/prerelease mode // Definitions for dev/demo/prerelease mode
@@ -49,7 +49,7 @@ $appContainer = new \Slim\Container([ @@ -50,7 +50,7 @@ $app = AppFactory::create();
], $container = $app->getContainer();
'view' => function($container) $container->set('view', function(Container $container)
{ {
- return new \Slim\Views\Blade(__DIR__ . '/views', GROCY_DATAPATH . '/viewcache'); - return new Slim\Views\Blade(__DIR__ . '/views', GROCY_DATAPATH . '/viewcache');
+ return new \Slim\Views\Blade(__DIR__ . '/views', getenv('GROCY_CACHE_DIR')); + return new \Slim\Views\Blade(__DIR__ . '/views', getenv('GROCY_CACHE_DIR'));
}, });
'LoginControllerInstance' => function($container) $container->set('LoginControllerInstance', function(Container $container)
{ {
diff --git a/services/DatabaseService.php b/services/DatabaseService.php diff --git a/services/DatabaseService.php b/services/DatabaseService.php
index 0bcf9b8..ec45e93 100644 index 23fc7b9..daa1993 100644
--- a/services/DatabaseService.php --- a/services/DatabaseService.php
+++ b/services/DatabaseService.php +++ b/services/DatabaseService.php
@@ -13,7 +13,7 @@ class DatabaseService @@ -25,7 +25,7 @@ class DatabaseService
return GROCY_DATAPATH . '/grocy_' . GROCY_CULTURE . '.db'; return GROCY_DATAPATH . '/grocy_' . GROCY_CULTURE . '.db';
} }
@ -32,9 +44,9 @@ index 0bcf9b8..ec45e93 100644
+ return getenv('GROCY_DB_FILE'); + return getenv('GROCY_DB_FILE');
} }
private $DbConnectionRaw; private static $DbConnectionRaw = null;
diff --git a/services/FilesService.php b/services/FilesService.php diff --git a/services/FilesService.php b/services/FilesService.php
index 7933b73..f52657e 100644 index cecdae3..357298d 100644
--- a/services/FilesService.php --- a/services/FilesService.php
+++ b/services/FilesService.php +++ b/services/FilesService.php
@@ -12,7 +12,7 @@ class FilesService extends BaseService @@ -12,7 +12,7 @@ class FilesService extends BaseService
@ -47,10 +59,10 @@ index 7933b73..f52657e 100644
if (!file_exists($this->StoragePath)) if (!file_exists($this->StoragePath))
{ {
diff --git a/services/StockService.php b/services/StockService.php diff --git a/services/StockService.php b/services/StockService.php
index d7482ef..d1399a7 100644 index bfde3fc..53b2245 100644
--- a/services/StockService.php --- a/services/StockService.php
+++ b/services/StockService.php +++ b/services/StockService.php
@@ -933,7 +933,7 @@ class StockService extends BaseService @@ -934,7 +934,7 @@ class StockService extends BaseService
throw new \Exception('No barcode lookup plugin defined'); throw new \Exception('No barcode lookup plugin defined');
} }
@ -59,3 +71,6 @@ index d7482ef..d1399a7 100644
if (file_exists($path)) if (file_exists($path))
{ {
require_once $path; require_once $path;
--
2.25.0

7
pkgs/servers/grocy/default.nix
View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "grocy"; pname = "grocy";
version = "2.6.0"; version = "2.6.1";
src = fetchurl { src = fetchurl {
url = "https://github.com/grocy/grocy/releases/download/v${version}/grocy_${version}.zip"; url = "https://github.com/grocy/grocy/releases/download/v${version}/grocy_${version}.zip";
sha256 = "1d4hy495in7p0i4fnhai1yqhjhmblv1g30siggmqpjrzdiiw3bak"; sha256 = "1fq1zlxxhpcxj67xxlgf20dia95xcimgnm13cr56sy9f2vjx58m6";
}; };
nativeBuildInputs = [ unzip ]; nativeBuildInputs = [ unzip ];
@ -14,7 +14,8 @@ stdenv.mkDerivation rec {
unzip ${src} -d . unzip ${src} -d .
''; '';
patches = [ ./config-locations.patch ]; patches = [ ./0001-Define-configs-with-env-vars.patch ];
patchFlags = [ "--binary" "-p1" ];
dontBuild = true; dontBuild = true;