From b93ac6d197d1dab361ffb314bde2406ae12c2329 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 30 Jun 2021 04:34:29 +0000 Subject: [PATCH 1/9] hugo: 0.84.2 -> 0.84.3 (cherry picked from commit f9b78ee700ac91b09680aa522da66967d9e8d1b2) --- pkgs/applications/misc/hugo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/hugo/default.nix b/pkgs/applications/misc/hugo/default.nix index bb925ceb2fb..c2e55be1134 100644 --- a/pkgs/applications/misc/hugo/default.nix +++ b/pkgs/applications/misc/hugo/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "hugo"; - version = "0.84.2"; + version = "0.84.3"; src = fetchFromGitHub { owner = "gohugoio"; repo = pname; rev = "v${version}"; - sha256 = "sha256-NE4vXtczzcL5f0/aDYeGnleBwsDBTzojSaek/LzowFo="; + sha256 = "sha256-3SbF4JsanNup0JmtEoZlyu3SvMn01r+nhnPgIi/W8pA="; }; vendorSha256 = "sha256-ImXTOtN6kQL7Q8IBlmK7+i47cWtyZT0xcnQdCw3NvWM="; From f1e98f91f761950f3ea8ca1675d48c7cc9371232 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 3 Jul 2021 14:58:48 +0000 Subject: [PATCH 2/9] hugo: 0.84.3 -> 0.84.4 (cherry picked from commit 93a665e66d37d324bd2c761c96a977ea2d1410b6) --- pkgs/applications/misc/hugo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/hugo/default.nix b/pkgs/applications/misc/hugo/default.nix index c2e55be1134..42683318840 100644 --- a/pkgs/applications/misc/hugo/default.nix +++ b/pkgs/applications/misc/hugo/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "hugo"; - version = "0.84.3"; + version = "0.84.4"; src = fetchFromGitHub { owner = "gohugoio"; repo = pname; rev = "v${version}"; - sha256 = "sha256-3SbF4JsanNup0JmtEoZlyu3SvMn01r+nhnPgIi/W8pA="; + sha256 = "sha256-nD2UBDSDG6OFfUvDBXCfhOCiJyFMP2pDXSlIESaEfqE="; }; vendorSha256 = "sha256-ImXTOtN6kQL7Q8IBlmK7+i47cWtyZT0xcnQdCw3NvWM="; From 576fd29e848dbae5ad2db686810dfc90b4db13e0 Mon Sep 17 00:00:00 2001 From: Luflosi Date: Thu, 22 Jul 2021 12:54:18 +0200 Subject: [PATCH 3/9] ipfs: install ipfs-hardened.service as well This will be useful for hardening the IPFS NixOS module in the future. (cherry picked from commit ad34c7697a2e696d31222b4ae7810700175933f0) --- pkgs/applications/networking/ipfs/0.9.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/applications/networking/ipfs/0.9.nix b/pkgs/applications/networking/ipfs/0.9.nix index e96602a54c5..a20d467b171 100644 --- a/pkgs/applications/networking/ipfs/0.9.nix +++ b/pkgs/applications/networking/ipfs/0.9.nix @@ -29,10 +29,13 @@ buildGoModule rec { postInstall = '' install --mode=444 -D misc/systemd/ipfs.service $out/etc/systemd/system/ipfs.service + install --mode=444 -D misc/systemd/ipfs-hardened.service $out/etc/systemd/system/ipfs-hardened.service install --mode=444 -D misc/systemd/ipfs-api.socket $out/etc/systemd/system/ipfs-api.socket install --mode=444 -D misc/systemd/ipfs-gateway.socket $out/etc/systemd/system/ipfs-gateway.socket substituteInPlace $out/etc/systemd/system/ipfs.service \ --replace /usr/bin/ipfs $out/bin/ipfs + substituteInPlace $out/etc/systemd/system/ipfs-hardened.service \ + --replace /usr/bin/ipfs $out/bin/ipfs ''; meta = with lib; { From e2aab2ed33894e7fd432d9b0ee8a0b2319f90d7a Mon Sep 17 00:00:00 2001 From: Luflosi Date: Thu, 22 Jul 2021 12:59:11 +0200 Subject: [PATCH 4/9] ipfs: 0.9.0 -> 0.9.1 https://github.com/ipfs/go-ipfs/releases/tag/v0.9.1 (cherry picked from commit 7a4b26853aa44152027cf9a62b0be96d75158953) --- pkgs/applications/networking/ipfs/0.9.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/ipfs/0.9.nix b/pkgs/applications/networking/ipfs/0.9.nix index a20d467b171..2823b84d473 100644 --- a/pkgs/applications/networking/ipfs/0.9.nix +++ b/pkgs/applications/networking/ipfs/0.9.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "ipfs"; - version = "0.9.0"; + version = "0.9.1"; rev = "v${version}"; # go-ipfs makes changes to it's source tarball that don't match the git source. src = fetchurl { url = "https://github.com/ipfs/go-ipfs/releases/download/${rev}/go-ipfs-source.tar.gz"; - sha256 = "sha256:1fyffnw1d860w7gwm6ijbgrh68297z5bmvww8yqfshm3xgvcs6bf"; + sha256 = "sha256-RliyIEtNgwzbLVwl6T38VIbhc12CZMBc3LZ6T/llaHc="; }; # tarball contains multiple files/directories From e94b0c2a22b7dbd43379f8325f97a74b047f706c Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Fri, 23 Jul 2021 11:45:31 +0200 Subject: [PATCH 5/9] grocy: 3.0.1 -> 3.1.0 ChangeLog: https://github.com/grocy/grocy/releases/tag/v3.1.0 (cherry picked from commit 07b51f58df6042e0baaff5e10b0ca389f2cac1fe) --- nixos/tests/grocy.nix | 2 +- .../0001-Define-configs-with-env-vars.patch | 40 +++++++++---------- pkgs/servers/grocy/default.nix | 4 +- 3 files changed, 23 insertions(+), 23 deletions(-) diff --git a/nixos/tests/grocy.nix b/nixos/tests/grocy.nix index 220c55b1f63..2be5c24ecb5 100644 --- a/nixos/tests/grocy.nix +++ b/nixos/tests/grocy.nix @@ -40,7 +40,7 @@ import ./make-test-python.nix ({ pkgs, ... }: { assert task_name == "Test Task" - machine.succeed("curl -sSfI http://localhost/api/tasks 2>&1 | grep '401 Unauthorized'") + machine.succeed("curl -sSI http://localhost/api/tasks 2>&1 | grep '401 Unauthorized'") machine.shutdown() ''; 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 0d6ae781b75..4e3d36c33c9 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 7ed6c641cc501246931721700b73f40dce7e8f4b Mon Sep 17 00:00:00 2001 +From 035709eeac697945a26276cc17b996c1a0678ddc Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Tue, 22 Dec 2020 15:38:56 +0100 -Subject: [PATCH 1/2] Define configs with env vars +Subject: [PATCH] Define configs with env vars --- app.php | 4 ++-- @@ -11,32 +11,32 @@ Subject: [PATCH 1/2] Define configs with env vars 4 files changed, 5 insertions(+), 6 deletions(-) diff --git a/app.php b/app.php -index 8176ebe..04432ba 100644 +index 17ba6a99..89f48089 100644 --- a/app.php +++ b/app.php -@@ -10,7 +10,7 @@ use Slim\Factory\AppFactory; +@@ -11,7 +11,7 @@ use Slim\Views\Blade; require_once __DIR__ . '/vendor/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'; - // Definitions for dev/demo/prerelease mode -@@ -37,7 +37,7 @@ $app = AppFactory::create(); +@@ -62,7 +62,7 @@ $app = AppFactory::create(); $container = $app->getContainer(); $container->set('view', function (Container $container) { -- return new Slim\Views\Blade(__DIR__ . '/views', GROCY_DATAPATH . '/viewcache'); -+ return new Slim\Views\Blade(__DIR__ . '/views', getenv('GROCY_CACHE_DIR')); +- return new Blade(__DIR__ . '/views', GROCY_DATAPATH . '/viewcache'); ++ return new Blade(__DIR__ . '/views', getenv('GROCY_CACHE_DIR')); }); + $container->set('UrlManager', function (Container $container) { - return new UrlManager(GROCY_BASE_URL); diff --git a/services/DatabaseService.php b/services/DatabaseService.php -index d1080b0..8bc4ee1 100644 +index dfcd5d4b..bc8d1a1d 100644 --- a/services/DatabaseService.php +++ b/services/DatabaseService.php -@@ -105,6 +105,6 @@ class DatabaseService +@@ -107,6 +107,6 @@ class DatabaseService return GROCY_DATAPATH . '/grocy_' . $dbSuffix . '.db'; } @@ -45,23 +45,23 @@ index d1080b0..8bc4ee1 100644 } } diff --git a/services/FilesService.php b/services/FilesService.php -index 8c1483e..8f74b4b 100644 +index 7d070350..fba2e923 100644 --- a/services/FilesService.php +++ b/services/FilesService.php -@@ -70,7 +70,7 @@ class FilesService extends BaseService - { - parent::__construct(); +@@ -103,7 +103,7 @@ class FilesService extends BaseService -- $this->StoragePath = GROCY_DATAPATH . '/storage'; + public function GetFilePath($group, $fileName) + { +- $groupFolderPath = $this->StoragePath . '/' . $group; + $this->StoragePath = getenv('GROCY_STORAGE_DIR'); - if (!file_exists($this->StoragePath)) + if (!file_exists($groupFolderPath)) { diff --git a/services/StockService.php b/services/StockService.php -index 4741b4b..6d4e748 100644 +index f73ac5bd..6b6e693a 100644 --- a/services/StockService.php +++ b/services/StockService.php -@@ -1374,8 +1374,7 @@ class StockService extends BaseService +@@ -1589,8 +1589,7 @@ class StockService extends BaseService throw new \Exception('No barcode lookup plugin defined'); } @@ -72,5 +72,5 @@ index 4741b4b..6d4e748 100644 { require_once $path; -- -2.29.2 +2.31.1 diff --git a/pkgs/servers/grocy/default.nix b/pkgs/servers/grocy/default.nix index bd9a02f7b91..96c7cbbdf71 100644 --- a/pkgs/servers/grocy/default.nix +++ b/pkgs/servers/grocy/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "grocy"; - version = "3.0.1"; + version = "3.1.0"; src = fetchurl { url = "https://github.com/grocy/grocy/releases/download/v${version}/grocy_${version}.zip"; - sha256 = "sha256-Yjxv0LcLNtpYs4ntBano9NUxwdWgF5etA/M6hUVzOa8="; + sha256 = "sha256-ohviTI2np6z+SjV2CDScouI8Lh2Ru4+CE00KlgT40i8="; }; nativeBuildInputs = [ unzip ]; From ddb061d9a42549b1af0cf8006908356cb077a22b Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Sun, 30 May 2021 02:42:06 +0000 Subject: [PATCH 6/9] zfsUnstable: 2.1.0-rc5 -> 2.1.0-rc6 https://github.com/openzfs/zfs/releases/tag/zfs-2.1.0-rc6 (cherry picked from commit 917884725dbab2f3855da31b46f9342951cafb57) --- pkgs/os-specific/linux/zfs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix index 6977583adeb..22d274c7d1c 100644 --- a/pkgs/os-specific/linux/zfs/default.nix +++ b/pkgs/os-specific/linux/zfs/default.nix @@ -206,9 +206,9 @@ in { kernelCompatible = kernel.kernelAtLeast "3.10" && kernel.kernelOlder "5.13"; # this package should point to a version / git revision compatible with the latest kernel release - version = "2.1.0-rc5"; + version = "2.1.0-rc6"; - sha256 = "sha256-cj0P2bw6sTO+Y74pYn/WEpBuVGMMYCreJQjUdC3DMTE="; + sha256 = "0q3vl9rid6a84pb85v38hnf17vws65jjb4slw8bhm8dq8fna2a86"; isUnstable = true; }; From 5841063b6c6e6c0250c0e8aa5f7ba188c3cf08e1 Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Fri, 11 Jun 2021 07:55:50 +0000 Subject: [PATCH 7/9] zfsUnstable: 2.1.0-rc6 -> 2.1.0-rc7 https://github.com/openzfs/zfs/releases/tag/zfs-2.1.0-rc7 (cherry picked from commit eeb255207df56b2b28745eb53b33e50bb87c3021) --- pkgs/os-specific/linux/zfs/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix index 22d274c7d1c..6619b24477d 100644 --- a/pkgs/os-specific/linux/zfs/default.nix +++ b/pkgs/os-specific/linux/zfs/default.nix @@ -179,6 +179,7 @@ let snapshotting, cloning, block devices, deduplication, and more. ''; homepage = "https://github.com/openzfs/zfs"; + changelog = "https://github.com/openzfs/zfs/releases/tag/zfs-${version}"; license = licenses.cddl; platforms = platforms.linux; maintainers = with maintainers; [ hmenke jcumming jonringer wizeman fpletz globin mic92 ]; @@ -206,9 +207,9 @@ in { kernelCompatible = kernel.kernelAtLeast "3.10" && kernel.kernelOlder "5.13"; # this package should point to a version / git revision compatible with the latest kernel release - version = "2.1.0-rc6"; + version = "2.1.0-rc7"; - sha256 = "0q3vl9rid6a84pb85v38hnf17vws65jjb4slw8bhm8dq8fna2a86"; + sha256 = "11dvz8r5l7cbhbx2j02y6335i2vibh29dqrqk4kmw4lf87g1isni"; isUnstable = true; }; From 02552c70743e742f711ad882d52446b2f22c2d82 Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Wed, 30 Jun 2021 16:20:22 +0000 Subject: [PATCH 8/9] zfsUnstable: 2.1.0-rc7 -> 2.1.0-rc8 https://github.com/openzfs/zfs/releases/tag/zfs-2.1.0-rc8 (cherry picked from commit 5ef8322daa6007ef0256460c0de339f70d718e50) --- pkgs/os-specific/linux/zfs/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix index 6619b24477d..bc5378b4589 100644 --- a/pkgs/os-specific/linux/zfs/default.nix +++ b/pkgs/os-specific/linux/zfs/default.nix @@ -204,12 +204,12 @@ in { zfsUnstable = common { # check the release notes for compatible kernels - kernelCompatible = kernel.kernelAtLeast "3.10" && kernel.kernelOlder "5.13"; + kernelCompatible = kernel.kernelAtLeast "3.10" && kernel.kernelOlder "5.14"; # this package should point to a version / git revision compatible with the latest kernel release - version = "2.1.0-rc7"; + version = "2.1.0-rc8"; - sha256 = "11dvz8r5l7cbhbx2j02y6335i2vibh29dqrqk4kmw4lf87g1isni"; + sha256 = "0c53ca6xd59c30h3b2hmvyy63yqyk745x1kdfypnfqj3lnsj1pac"; isUnstable = true; }; From cab2d34df61d8fcda835875ab733bed56b1baed8 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Fri, 2 Jul 2021 12:59:20 -0700 Subject: [PATCH 9/9] zfsUnstable: 2.1.0-rc8 -> 2.1.0 (cherry picked from commit 6f1b155d37337dc0cf7dc075b9291f3b2dedca69) --- pkgs/os-specific/linux/zfs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix index bc5378b4589..acb06f7cda0 100644 --- a/pkgs/os-specific/linux/zfs/default.nix +++ b/pkgs/os-specific/linux/zfs/default.nix @@ -207,9 +207,9 @@ in { kernelCompatible = kernel.kernelAtLeast "3.10" && kernel.kernelOlder "5.14"; # this package should point to a version / git revision compatible with the latest kernel release - version = "2.1.0-rc8"; + version = "2.1.0"; - sha256 = "0c53ca6xd59c30h3b2hmvyy63yqyk745x1kdfypnfqj3lnsj1pac"; + sha256 = "sha256-YdY4SStXZGBBdAHdM3R/unco7ztxI3s0/buPSNSeh5o="; isUnstable = true; };