chaos/nixfiles
1
0
Fork 0
Code Issues 2 Releases Activity

update grocy to 4.1.0

Browse source
This commit is contained in:
chaos 2024-02-18 20:21:24 +00:00
parent 7b0b321e89
commit 095a3e6590
No known key found for this signature in database
3 changed files with 27 additions and 97 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
overlay/default.nix
View file

@ -23,16 +23,19 @@ final: prev: rec {
# this includes a bunch of unneeded files # this includes a bunch of unneeded files
# but we cba to go through the bat file # but we cba to go through the bat file
# the author uses to figure out what all the 7z commands do) # the author uses to figure out what all the 7z commands do)
grocy = prev.grocy.overrideAttrs (_old: let grocy = prev.grocy.overrideAttrs (old: let
rev = "9f94ba55a4a5ad91a442800d6734ee6968847d3b"; version = "4.1.0";
hash = "";
in rec { in rec {
src = ./grocy-${rev}.zip; inherit version;
src = final.fetchurl {
url = "https://github.com/grocy/grocy/releases/download/v${version}/grocy_${version}.zip";
hash = "sha256-Y4rHFgPmFHcNrETlvMLXSr0v07p2GzfjJ1JjH2YGXoU=";
};
unpackPhase = '' unpackPhase = ''
unzip ${src} -d . unzip ${src} -d .
''; '';
patches = [ patches = [./grocy-env-variables.diff];
./grocy-env-variables.diff
];
}); });
# Remove when fixed in upstream # Remove when fixed in upstream

BIN
overlay/grocy-9f94ba55a4a5ad91a442800d6734ee6968847d3b.zip
View file

Binary file not shown.

109
overlay/grocy-env-variables.diff
View file

@ -1,99 +1,26 @@
diff --git a/app.php b/app.php
index bc5b1b39..26f7687e 100644
--- a/app.php
+++ b/app.php
@@ -12,7 +12,7 @@ use Slim\Views\Blade;
require_once __DIR__ . '/packages/autoload.php';
// Load config files
-require_once GROCY_DATAPATH . '/config.php';
+require_once getenv('GROCY_CONFIG_FILE');
require_once __DIR__ . '/config-dist.php'; // For not in own config defined values we use the default ones
require_once __DIR__ . '/helpers/ConfigurationValidator.php';
@@ -64,7 +64,7 @@ $app = AppFactory::create();
$container = $app->getContainer();
$container->set('view', function (Container $container)
{
- return new Blade(__DIR__ . '/views', GROCY_DATAPATH . '/viewcache');
+ return new Blade(__DIR__ . '/views', getenv('GROCY_CACHE_DIR'));
});
$container->set('UrlManager', function (Container $container)
@@ -106,7 +106,7 @@ $errorMiddleware->setDefaultErrorHandler(
$app->add(new CorsMiddleware($app->getResponseFactory()));
-$app->getRouteCollector()->setCacheFile(GROCY_DATAPATH . '/viewcache/route_cache.php');
+$app->getRouteCollector()->setCacheFile(getenv('GROCY_CACHE_DIR') . '/route_cache.php');
ob_clean(); // No response output before here
$app->run();
diff --git a/helpers/PrerequisiteChecker.php b/helpers/PrerequisiteChecker.php
index 8e12a5c5..37b433db 100644
--- a/helpers/PrerequisiteChecker.php
+++ b/helpers/PrerequisiteChecker.php
@@ -18,7 +18,6 @@ class PrerequisiteChecker
public function checkRequirements()
{
self::checkForPhpVersion();
- self::checkForConfigFile();
self::checkForConfigDistFile();
self::checkForComposer();
self::checkForPhpExtensions();
diff --git a/services/DatabaseService.php b/services/DatabaseService.php diff --git a/services/DatabaseService.php b/services/DatabaseService.php
index e22d0c76..66938bed 100644 index ba79a73..e6cf14f 100644
--- a/services/DatabaseService.php --- a/services/DatabaseService.php
+++ b/services/DatabaseService.php +++ b/services/DatabaseService.php
@@ -29,7 +29,7 @@ class DatabaseService @@ -29,7 +29,7 @@ class DatabaseService
if (GROCY_MODE === 'dev') if (GROCY_MODE === 'dev')
{ {
- $logFilePath = GROCY_DATAPATH . '/sql.log'; - $logFilePath = GROCY_DATAPATH . '/sql.log';
+ $logFilePath = getenv('GROCY_SQL_LOG_FILE'); + $logFilePath = getenv('GROCY_SQL_LOG_FILE');;
if (file_exists($logFilePath)) if (file_exists($logFilePath))
{ {
file_put_contents($logFilePath, $sql . PHP_EOL, FILE_APPEND); file_put_contents($logFilePath, $sql . PHP_EOL, FILE_APPEND);
@@ -70,7 +70,7 @@ class DatabaseService
if (GROCY_MODE === 'dev')
{
- $logFilePath = GROCY_DATAPATH . '/sql.log';
+ $logFilePath = getenv('GROCY_SQL_LOG_FILE');
if (file_exists($logFilePath))
{
self::$DbConnection->setQueryCallback(function ($query, $params) use ($logFilePath)
@@ -137,6 +137,6 @@ class DatabaseService
return GROCY_DATAPATH . '/grocy_' . $dbSuffix . '.db';
}
- return GROCY_DATAPATH . '/grocy.db';
+ return getenv('GROCY_DB_FILE');
}
}
diff --git a/services/FilesService.php b/services/FilesService.php
index 7d070350..a6dd4b08 100644
--- a/services/FilesService.php
+++ b/services/FilesService.php
@@ -10,7 +10,7 @@ class FilesService extends BaseService
public function __construct()
{
- $this->StoragePath = GROCY_DATAPATH . '/storage';
+ $this->StoragePath = getenv('GROCY_STORAGE_DIR');
if (!file_exists($this->StoragePath))
{
mkdir($this->StoragePath);
diff --git a/services/StockService.php b/services/StockService.php diff --git a/services/StockService.php b/services/StockService.php
index 86c0b4f5..ba752a14 100644 index 9f034a5..fd3c0b7 100644
--- a/services/StockService.php --- a/services/StockService.php
+++ b/services/StockService.php +++ b/services/StockService.php
@@ -1707,7 +1707,7 @@ class StockService extends BaseService @@ -1707,7 +1707,7 @@ class StockService extends BaseService
throw new \Exception('No barcode lookup plugin defined'); throw new \Exception('No barcode lookup plugin defined');
} }
- $path = GROCY_DATAPATH . "/plugins/$pluginName.php"; - $path = GROCY_DATAPATH . "/plugins/$pluginName.php";
+ $path = getenv('GROCY_PLUGIN_DIR') . "/$pluginName.php"; + $path = getenv('GROCY_PLUGIN_DIR') . "/$pluginName.php";
if (file_exists($path)) if (file_exists($path))
{ {
require_once $path; require_once $path;