Merge staging-next into staging

7 files changed, 68 insertions, 45 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 4429a804e80..cc7c45e5e27 100644
--- a/pkgs/servers/grocy/0001-Define-configs-with-env-vars.patch
+++ b/pkgs/servers/grocy/0001-Define-configs-with-env-vars.patch
@@ -1,21 +1,21 @@
-From 05b762c6ca58ecb5fd631a019fbda69b0647785f Mon Sep 17 00:00:00 2001

-From: Maximilian Bosch <maximilian@mbosch.me>

-Date: Tue, 22 Dec 2020 15:38:56 +0100

-Subject: [PATCH] Define configs with env vars

+From 3ec6fce101083d4f23641fd015cbe4ade317ad59 Mon Sep 17 00:00:00 2001

+From: Ember Keske <git@n0emis.eu>

+Date: Wed, 2 Aug 2023 06:36:02 +0200

+Subject: [PATCH 1/2] Define configs with env vars

 

 ---

- app.php                      | 4 ++--

+ app.php                      | 6 +++---

  services/DatabaseService.php | 2 +-

  services/FilesService.php    | 2 +-

- services/StockService.php    | 3 +--

- 4 files changed, 5 insertions(+), 6 deletions(-)

+ services/StockService.php    | 2 +-

+ 4 files changed, 6 insertions(+), 6 deletions(-)

 

 diff --git a/app.php b/app.php

-index 17ba6a99..89f48089 100644

+index 31905be6..30b3eb82 100644

 --- a/app.php

 +++ b/app.php

-@@ -11,7 +11,7 @@ use Slim\Views\Blade;

- require_once __DIR__ . '/vendor/autoload.php';

+@@ -12,7 +12,7 @@ use Slim\Views\Blade;

+ require_once __DIR__ . '/packages/autoload.php';

  

  // Load config files

 -require_once GROCY_DATAPATH . '/config.php';

@@ -23,7 +23,7 @@ index 17ba6a99..89f48089 100644
  require_once __DIR__ . '/config-dist.php'; // For not in own config defined values we use the default ones

  require_once __DIR__ . '/helpers/ConfigurationValidator.php';

  

-@@ -62,7 +62,7 @@ $app = AppFactory::create();

+@@ -63,7 +63,7 @@ $app = AppFactory::create();

  

  $container = $app->getContainer();

  $container->set('view', function (Container $container) {

@@ -32,11 +32,20 @@ index 17ba6a99..89f48089 100644
  });

  

  $container->set('UrlManager', function (Container $container) {

+@@ -103,7 +103,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/services/DatabaseService.php b/services/DatabaseService.php

-index c093f361..0894791f 100644

+index be5486b6..b6091ee7 100644

 --- a/services/DatabaseService.php

 +++ b/services/DatabaseService.php

-@@ -114,6 +114,6 @@ class DatabaseService

+@@ -104,6 +104,6 @@ class DatabaseService

  			return GROCY_DATAPATH . '/grocy_' . $dbSuffix . '.db';

  		}

  

@@ -58,19 +67,18 @@ index 7d070350..a6dd4b08 100644
  		{

  			mkdir($this->StoragePath);

 diff --git a/services/StockService.php b/services/StockService.php

-index 85f57803..15556112 100644

+index 16cb468c..23228803 100644

 --- a/services/StockService.php

 +++ b/services/StockService.php

-@@ -1704,8 +1704,7 @@ class StockService extends BaseService

+@@ -1769,7 +1769,7 @@ class StockService extends BaseService

  			throw new \Exception('No barcode lookup plugin defined');

  		}

  

 -		$path = GROCY_DATAPATH . "/plugins/$pluginName.php";

--

 +		$path = getenv('GROCY_PLUGIN_DIR') . "/$pluginName.php";

+ 

  		if (file_exists($path))

  		{

- 			require_once $path;

 -- 

-2.38.1

+2.41.0

 

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
index b065ca801d5..5b6ae862dcb 100644
--- 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
@@ -1,6 +1,6 @@
-From c46323dfc4a3d5bf17f7508f5b5f223858a598c3 Mon Sep 17 00:00:00 2001

-From: Maximilian Bosch <maximilian@mbosch.me>

-Date: Tue, 22 Dec 2020 15:39:15 +0100

+From 0e834aa0ef712ce97acf24c05c43a04387fda18c Mon Sep 17 00:00:00 2001

+From: Ember Keske <git@n0emis.eu>

+Date: Wed, 2 Aug 2023 06:36:46 +0200

 Subject: [PATCH 2/2] Remove check for config-file as it's stored in /etc/grocy

 

 ---

@@ -8,17 +8,17 @@ Subject: [PATCH 2/2] Remove check for config-file as it's stored in /etc/grocy
  1 file changed, 1 deletion(-)

 

 diff --git a/helpers/PrerequisiteChecker.php b/helpers/PrerequisiteChecker.php

-index cbe0a3a..a484db2 100644

+index da431b4b..6b878627 100644

 --- a/helpers/PrerequisiteChecker.php

 +++ b/helpers/PrerequisiteChecker.php

-@@ -11,7 +11,6 @@ class PrerequisiteChecker

- {

+@@ -17,7 +17,6 @@ class PrerequisiteChecker

  	public function checkRequirements()

  	{

+ 		self::checkForPhpVersion();

 -		self::checkForConfigFile();

  		self::checkForConfigDistFile();

  		self::checkForComposer();

  		self::checkForPhpExtensions();

 -- 

-2.29.2

+2.41.0

 

diff --git a/pkgs/servers/grocy/default.nix b/pkgs/servers/grocy/default.nix
index bbae0f8f248..5777245d678 100644
--- a/pkgs/servers/grocy/default.nix
+++ b/pkgs/servers/grocy/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "grocy";
-  version = "3.3.2";
+  version = "4.0.0";
 
   src = fetchurl {
     url = "https://github.com/grocy/grocy/releases/download/v${version}/grocy_${version}.zip";
-    sha256 = "sha256-KF4zxrC8rlRUaBKc4iLIt6TSAHMJ+tOWptMsVcixVWs=";
+    sha256 = "sha256-Sei+UYM5azzSWgnmgufxDl5ySbYJ52DBGPc0nTjnqqc=";
   };
 
   nativeBuildInputs = [ unzip ];
@@ -33,9 +33,8 @@ stdenv.mkDerivation rec {
 
   meta = with lib; {
     license = licenses.mit;
-    maintainers = with maintainers; [ ma27 ];
+    maintainers = with maintainers; [ n0emis ];
     description = "ERP beyond your fridge - grocy is a web-based self-hosted groceries & household management solution for your home";
     homepage = "https://grocy.info/";
-    broken = true; # Not compatible with PHP 8.1
   };
 }
diff --git a/pkgs/servers/honk/default.nix b/pkgs/servers/honk/default.nix
index cdcc0ddb63a..8b968dc49ee 100644
--- a/pkgs/servers/honk/default.nix
+++ b/pkgs/servers/honk/default.nix
@@ -1,21 +1,35 @@
-{ lib, buildGoModule, fetchurl, installShellFiles, sqlite }:
+{ lib
+, buildGoModule
+, fetchurl
+, sqlite
+, installShellFiles
+}:
 
 buildGoModule rec {
   pname = "honk";
-  version = "0.9.91";
+  version = "1.0.0";
 
   src = fetchurl {
     url = "https://humungus.tedunangst.com/r/honk/d/honk-${version}.tgz";
-    hash = "sha256-+NFWTTMVdngWsC8/EIN2xJC/5C4naaAekk/YoA17wFk=";
+    hash = "sha256-+0W9HncN+51dRE9bWJU4cAfYOc5bxNAqPe4xY+4UFg0=";
   };
   vendorHash = null;
 
-  buildInputs = [ sqlite ];
-  nativeBuildInputs = [ installShellFiles ];
+  buildInputs = [
+    sqlite
+  ];
+
+  nativeBuildInputs = [
+    installShellFiles
+  ];
+
   subPackages = [ "." ];
 
+  # This susbtitution is not mandatory. It is only existing to have something
+  # working out of the box. This value can be overriden by the user, by
+  # providing the `-viewdir` parameter in the command line.
   postPatch = ''
-    substituteInPlace honk.go --replace \
+    substituteInPlace main.go --replace \
       "var viewDir = \".\"" \
       "var viewDir = \"$out/share/honk\""
   '';
@@ -35,10 +49,12 @@ buildGoModule rec {
     mv views $out/share/${pname}
   '';
 
-  meta = with lib; {
+  meta = {
+    changelog = "https://humungus.tedunangst.com/r/honk/v/v${version}/f/docs/changelog.txt";
     description = "An ActivityPub server with minimal setup and support costs.";
     homepage = "https://humungus.tedunangst.com/r/honk";
-    license = licenses.isc;
-    maintainers = with maintainers; [ huyngo ];
+    license = lib.licenses.isc;
+    mainProgram = "honk";
+    maintainers = with lib.maintainers; [ huyngo ];
   };
 }
diff --git a/pkgs/servers/monitoring/prometheus/bind-exporter.nix b/pkgs/servers/monitoring/prometheus/bind-exporter.nix
index 8610a888c48..1ee84e5e703 100644
--- a/pkgs/servers/monitoring/prometheus/bind-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/bind-exporter.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "bind_exporter";
-  version = "0.6.1";
+  version = "0.7.0";
 
   src = fetchFromGitHub {
     rev = "v${version}";
     owner = "prometheus-community";
     repo = "bind_exporter";
-    sha256 = "sha256-qyTfo4Pkp07v575p7SePwe/OfCZRVuHKGyaEQQOkYjk=";
+    sha256 = "sha256-x/XGatlXCKo9cI92JzFItApsjuZAfZX+8IZRpy7PVUo=";
   };
 
-  vendorHash = "sha256-ZQKQY7budLH6eAusLMwSF5cLJ6QdiXLJc29xJk+XBxI=";
+  vendorHash = "sha256-f0ei/zotOj5ebURAOWUox/7J3jS2abQ5UgjninI9nRk=";
 
   passthru.tests = { inherit (nixosTests.prometheus-exporters) bind; };
 
diff --git a/pkgs/servers/sql/postgresql/ext/timescaledb.nix b/pkgs/servers/sql/postgresql/ext/timescaledb.nix
index c2c28812a40..a7c136ba691 100644
--- a/pkgs/servers/sql/postgresql/ext/timescaledb.nix
+++ b/pkgs/servers/sql/postgresql/ext/timescaledb.nix
@@ -13,7 +13,7 @@
 
 stdenv.mkDerivation rec {
   pname = "timescaledb${lib.optionalString (!enableUnfree) "-apache"}";
-  version = "2.11.1";
+  version = "2.11.2";
 
   nativeBuildInputs = [ cmake ];
   buildInputs = [ postgresql openssl libkrb5 ];
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
     owner = "timescale";
     repo = "timescaledb";
     rev = version;
-    sha256 = "sha256-nThflLfHvcEqJo1dz8PVca0ux7KJOW66nZ3dV1yTOCM=";
+    sha256 = "sha256-c2fztGtl2cLThT0JhHCM0UaYkiWTp5T6TUZ3Au7CG7c=";
   };
 
   cmakeFlags = [ "-DSEND_TELEMETRY_DEFAULT=OFF" "-DREGRESS_CHECKS=OFF" "-DTAP_CHECKS=OFF" ]
diff --git a/pkgs/servers/web-apps/dolibarr/default.nix b/pkgs/servers/web-apps/dolibarr/default.nix
index c2e0bfd238e..9c94ad3bd54 100644
--- a/pkgs/servers/web-apps/dolibarr/default.nix
+++ b/pkgs/servers/web-apps/dolibarr/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "dolibarr";
-  version = "16.0.4";
+  version = "16.0.5";
 
   src = fetchFromGitHub {
     owner = "Dolibarr";
     repo = "dolibarr";
     rev = version;
-    sha256 = "sha256-H0f12pEsRxq6cYrcCjjQF1b5PFQEPBfYhZ5YnBfIbHk=";
+    sha256 = "sha256-+OAkUMwLXZGFPQocJARIG//+0V1Dv5MdZvythbp4KPw=";
   };
 
   dontBuild = true;