From 34cbe6a44c3c905173abf3e1b5dc017fddbb7439 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Mon, 20 Mar 2023 20:05:06 +0000 Subject: [PATCH 01/16] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'agenix': 'github:ryantm/agenix/b7ffcfe77f817d9ee992640ba1f270718d197f28' (2023-01-31) → 'github:ryantm/agenix/03b51fe8e459a946c4b88dcfb6446e45efb2c24e' (2023-03-04) • Updated input 'devshell': 'github:numtide/devshell/2e19b92980a79118351ec12496a81c49bd674d8a' (2023-02-02) → 'github:numtide/devshell/3e0e60ab37cd0bf7ab59888f5c32499d851edb47' (2023-03-16) • Updated input 'drv-parts': 'github:DavHau/drv-parts/26eceebedcffa68f93a761dde45cf0789f59be22' (2023-01-20) → 'github:DavHau/drv-parts/38f59f9eb2dbcf9ad6b939ec47c005033445f13e' (2023-03-19) • Added input 'drv-parts/flake-compat': 'github:edolstra/flake-compat/35bb57c0c8d8b62bbfd284272c928ceb64ddbde9' (2023-01-17) • Updated input 'flake-parts': 'github:hercules-ci/flake-parts/bf53492df08f3178ce85e0c9df8ed8d03c030c9f' (2023-02-01) → 'github:hercules-ci/flake-parts/c13d60b89adea3dc20704c045ec4d50dd964d447' (2023-03-09) • Updated input 'hercules-ci-agent': 'github:hercules-ci/hercules-ci-agent/72bf956c45ef97b801b6f4e5b4dbb8097f843ed8' (2023-02-02) → 'github:hercules-ci/hercules-ci-agent/3a118a985ce57c2a0d8ce567b1f007d57933c540' (2023-03-17) • Updated input 'hercules-ci-agent/haskell-flake': 'github:srid/haskell-flake/c6ff897db9abdd4e5ff7911b5f9234a1380c6611' (2023-01-18) → 'github:srid/haskell-flake/26852ade574c712bc3912ad28de52b0c4cf7d4cb' (2023-03-13) • Updated input 'hercules-ci-agent/pre-commit-hooks-nix': 'github:cachix/pre-commit-hooks.nix/06f48d63d473516ce5b8abe70d15be96a0147fcd' (2022-11-06) → 'github:cachix/pre-commit-hooks.nix/1a20b9708962096ec2481eeb2ddca29ed747770a' (2023-03-09) • Added input 'hercules-ci-agent/pre-commit-hooks-nix/flake-compat': 'github:edolstra/flake-compat/35bb57c0c8d8b62bbfd284272c928ceb64ddbde9' (2023-01-17) • Updated input 'hercules-ci-agent/pre-commit-hooks-nix/flake-utils': 'github:numtide/flake-utils/6ee9ebb6b1ee695d2cacc4faa053a7b9baa76817' (2022-10-29) → 'github:numtide/flake-utils/5aed5285a952e0b949eb3ba02c12fa4fcfef535f' (2022-11-02) • Added input 'hercules-ci-agent/pre-commit-hooks-nix/gitignore': 'github:hercules-ci/gitignore.nix/a20de23b925fd8264fd7fad6454652e142fd7f73' (2022-08-14) • Added input 'hercules-ci-agent/pre-commit-hooks-nix/gitignore/nixpkgs': follows 'hercules-ci-agent/pre-commit-hooks-nix/nixpkgs' • Added input 'hercules-ci-agent/pre-commit-hooks-nix/nixpkgs-stable': 'github:NixOS/nixpkgs/2f9fd351ec37f5d479556cd48be4ca340da59b8f' (2023-01-15) • Updated input 'hercules-ci-effects': 'github:hercules-ci/hercules-ci-effects/0cc800cb3af7465538e619466ea35f75fde499fc' (2023-02-02) → 'github:hercules-ci/hercules-ci-effects/0eec846f63e69f935ae1c06280b3b444f98d95e5' (2023-03-15) • Updated input 'nix-filter': 'github:numtide/nix-filter/e1b2f96c2a31415f362268bc48c3fccf47dff6eb' (2023-02-02) → 'github:numtide/nix-filter/aa9ff6ce4a7f19af6415fb3721eaa513ea6c763c' (2023-03-06) • Updated input 'nix-super': 'gitlab:max/nix-super/792d83f2623ed0a54fa994c92305dcadf2e18369' (2023-01-28) → 'gitlab:max/nix-super/8eb40776e51819038fbb8a087d9885842451a333' (2023-02-27) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/8e8240194eda25b61449f29bb5131e02b28a5486' (2023-02-04) → 'github:NixOS/nixpkgs/e2c97799da5f5cd87adfa5017fba971771e123ef' (2023-03-20) • Updated input 'repin-flake-utils': 'github:numtide/flake-utils/5aed5285a952e0b949eb3ba02c12fa4fcfef535f' (2022-11-02) → 'github:numtide/flake-utils/93a2b84fc4b70d9e089d029deacc3583435c2ed6' (2023-03-15) --- flake.lock | 155 +++++++++++++++++++++++++++++++++++++++-------------- 1 file changed, 115 insertions(+), 40 deletions(-) diff --git a/flake.lock b/flake.lock index b90d0c0..33f2c07 100644 --- a/flake.lock +++ b/flake.lock @@ -8,11 +8,11 @@ ] }, "locked": { - "lastModified": 1675176355, - "narHash": "sha256-Qjxh5cmN56siY97mzmBLI1+cdjXSPqmfPVsKxBvHmwI=", + "lastModified": 1677969766, + "narHash": "sha256-AIp/ZYZMNLDZR/H7iiAlaGpu4lcXsVt9JQpBlf43HRY=", "owner": "ryantm", "repo": "agenix", - "rev": "b7ffcfe77f817d9ee992640ba1f270718d197f28", + "rev": "03b51fe8e459a946c4b88dcfb6446e45efb2c24e", "type": "github" }, "original": { @@ -96,11 +96,11 @@ ] }, "locked": { - "lastModified": 1675340818, - "narHash": "sha256-GAzTgOvonq4K3CVyyKZGbCnqdLi6nRe78t8ko/mLxL0=", + "lastModified": 1678957337, + "narHash": "sha256-Gw4nVbuKRdTwPngeOZQOzH/IFowmz4LryMPDiJN/ah4=", "owner": "numtide", "repo": "devshell", - "rev": "2e19b92980a79118351ec12496a81c49bd674d8a", + "rev": "3e0e60ab37cd0bf7ab59888f5c32499d851edb47", "type": "github" }, "original": { @@ -166,6 +166,7 @@ }, "drv-parts": { "inputs": { + "flake-compat": "flake-compat", "flake-parts": [ "flake-parts" ], @@ -174,11 +175,11 @@ ] }, "locked": { - "lastModified": 1674180232, - "narHash": "sha256-Eqrcd6ayrwLthrOkQp8VshxUphC1is/lTk++8yC0/GA=", + "lastModified": 1679210066, + "narHash": "sha256-0t6UZrLmIEsH3R8Jk8mo2XFGIPJmSWLsCR6HlSp3va8=", "owner": "DavHau", "repo": "drv-parts", - "rev": "26eceebedcffa68f93a761dde45cf0789f59be22", + "rev": "38f59f9eb2dbcf9ad6b939ec47c005033445f13e", "type": "github" }, "original": { @@ -187,6 +188,38 @@ "type": "github" } }, + "flake-compat": { + "flake": false, + "locked": { + "lastModified": 1673956053, + "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, + "flake-compat_2": { + "flake": false, + "locked": { + "lastModified": 1673956053, + "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, "flake-parts": { "inputs": { "nixpkgs-lib": [ @@ -194,11 +227,11 @@ ] }, "locked": { - "lastModified": 1675295133, - "narHash": "sha256-dU8fuLL98WFXG0VnRgM00bqKX6CEPBLybhiIDIgO45o=", + "lastModified": 1678379998, + "narHash": "sha256-TZdfNqftHhDuIFwBcN9MUThx5sQXCTeZk9je5byPKRw=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "bf53492df08f3178ce85e0c9df8ed8d03c030c9f", + "rev": "c13d60b89adea3dc20704c045ec4d50dd964d447", "type": "github" }, "original": { @@ -209,11 +242,11 @@ }, "flake-utils": { "locked": { - "lastModified": 1667077288, - "narHash": "sha256-bdC8sFNDpT0HK74u9fUkpbf1MEzVYJ+ka7NXCdgBoaA=", + "lastModified": 1667395993, + "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", "owner": "numtide", "repo": "flake-utils", - "rev": "6ee9ebb6b1ee695d2cacc4faa053a7b9baa76817", + "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", "type": "github" }, "original": { @@ -222,17 +255,40 @@ "type": "github" } }, + "gitignore": { + "inputs": { + "nixpkgs": [ + "hercules-ci-agent", + "pre-commit-hooks-nix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1660459072, + "narHash": "sha256-8DFJjXG8zqoONA1vXtgeKXy68KdJL5UaXR8NtVMUbx8=", + "owner": "hercules-ci", + "repo": "gitignore.nix", + "rev": "a20de23b925fd8264fd7fad6454652e142fd7f73", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "gitignore.nix", + "type": "github" + } + }, "haskell-flake": { "locked": { - "lastModified": 1674066917, - "narHash": "sha256-nRSAb7N64zmAbXUoVVqY/s2LbSIdDTdfN0sSKG5/CCY=", + "lastModified": 1678745009, + "narHash": "sha256-ujfwSrkxThmHJozibkCnJmlXLVyxm+Cbo2Q4wXPbCS4=", "owner": "srid", "repo": "haskell-flake", - "rev": "c6ff897db9abdd4e5ff7911b5f9234a1380c6611", + "rev": "26852ade574c712bc3912ad28de52b0c4cf7d4cb", "type": "github" }, "original": { "owner": "srid", + "ref": "0.2.0", "repo": "haskell-flake", "type": "github" } @@ -252,11 +308,11 @@ "pre-commit-hooks-nix": "pre-commit-hooks-nix" }, "locked": { - "lastModified": 1675328703, - "narHash": "sha256-23W8Msfs/8+MbWzsI+gqtc6dyj83v+6GX8hLWEtlx/Q=", + "lastModified": 1679065768, + "narHash": "sha256-VYzLS/51fPx8wId7QeLJWHC9oL4QRbOJwu96G4wd/qA=", "owner": "hercules-ci", "repo": "hercules-ci-agent", - "rev": "72bf956c45ef97b801b6f4e5b4dbb8097f843ed8", + "rev": "3a118a985ce57c2a0d8ce567b1f007d57933c540", "type": "github" }, "original": { @@ -278,11 +334,11 @@ ] }, "locked": { - "lastModified": 1675345398, - "narHash": "sha256-rxyl5bqLQ99CoFkXArrtY2MtXMBtiOcoEH6onWwjY50=", + "lastModified": 1678923240, + "narHash": "sha256-qoa7OvbboojbwZnCaL5+r2pFNhLkxRUsD9+RaoM9zjw=", "owner": "hercules-ci", "repo": "hercules-ci-effects", - "rev": "0cc800cb3af7465538e619466ea35f75fde499fc", + "rev": "0eec846f63e69f935ae1c06280b3b444f98d95e5", "type": "github" }, "original": { @@ -362,11 +418,11 @@ }, "nix-filter": { "locked": { - "lastModified": 1675361037, - "narHash": "sha256-CTbDuDxFD3U3g/dWUB+r+B/snIe+qqP1R+1myuFGe2I=", + "lastModified": 1678109515, + "narHash": "sha256-C2X+qC80K2C1TOYZT8nabgo05Dw2HST/pSn6s+n6BO8=", "owner": "numtide", "repo": "nix-filter", - "rev": "e1b2f96c2a31415f362268bc48c3fccf47dff6eb", + "rev": "aa9ff6ce4a7f19af6415fb3721eaa513ea6c763c", "type": "github" }, "original": { @@ -387,11 +443,11 @@ }, "locked": { "host": "git.privatevoid.net", - "lastModified": 1674866006, - "narHash": "sha256-6xWH1moJwBwD/AbVbM6DRgCqF95N27RSGZCV2JJogI8=", + "lastModified": 1677536397, + "narHash": "sha256-pKp+dmOJc3/9R3dBP30u2zXOyCuF5dVzgFlS1upSwZk=", "owner": "max", "repo": "nix-super", - "rev": "792d83f2623ed0a54fa994c92305dcadf2e18369", + "rev": "8eb40776e51819038fbb8a087d9885842451a333", "type": "gitlab" }, "original": { @@ -403,11 +459,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1675512093, - "narHash": "sha256-u1CY4feK14B57E6T+0Bhkuoj8dpBxCPrWO+SP87UVP8=", + "lastModified": 1679318992, + "narHash": "sha256-uoj5Oy6hruIHuxzfQZtcalObe5kPrX9v+ClUMFEOzmE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "8e8240194eda25b61449f29bb5131e02b28a5486", + "rev": "e2c97799da5f5cd87adfa5017fba971771e123ef", "type": "github" }, "original": { @@ -417,6 +473,22 @@ "type": "github" } }, + "nixpkgs-stable": { + "locked": { + "lastModified": 1673800717, + "narHash": "sha256-SFHraUqLSu5cC6IxTprex/nTsI81ZQAtDvlBvGDWfnA=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "2f9fd351ec37f5d479556cd48be4ca340da59b8f", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-22.11", + "repo": "nixpkgs", + "type": "github" + } + }, "poetry2nix": { "flake": false, "locked": { @@ -436,18 +508,21 @@ }, "pre-commit-hooks-nix": { "inputs": { + "flake-compat": "flake-compat_2", "flake-utils": "flake-utils", + "gitignore": "gitignore", "nixpkgs": [ "hercules-ci-agent", "nixpkgs" - ] + ], + "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1667760143, - "narHash": "sha256-+X5CyeNEKp41bY/I1AJgW/fn69q5cLJ1bgiaMMCKB3M=", + "lastModified": 1678376203, + "narHash": "sha256-3tyYGyC8h7fBwncLZy5nCUjTJPrHbmNwp47LlNLOHSM=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "06f48d63d473516ce5b8abe70d15be96a0147fcd", + "rev": "1a20b9708962096ec2481eeb2ddca29ed747770a", "type": "github" }, "original": { @@ -458,11 +533,11 @@ }, "repin-flake-utils": { "locked": { - "lastModified": 1667395993, - "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", + "lastModified": 1678901627, + "narHash": "sha256-U02riOqrKKzwjsxc/400XnElV+UtPUQWpANPlyazjH0=", "owner": "numtide", "repo": "flake-utils", - "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", + "rev": "93a2b84fc4b70d9e089d029deacc3583435c2ed6", "type": "github" }, "original": { From 4a14ad784543285447f1a3c81c74c9187663b2d3 Mon Sep 17 00:00:00 2001 From: Max Date: Fri, 24 Feb 2023 15:53:20 +0100 Subject: [PATCH 02/16] meta: use new module structure in drv-parts flake --- flake.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flake.nix b/flake.nix index bfd67cb..6e3fb46 100644 --- a/flake.nix +++ b/flake.nix @@ -13,7 +13,7 @@ imports = [ inputs.hercules-ci-effects.flakeModule - inputs.drv-parts.flakeModule + inputs.drv-parts.modules.flake-parts.drv-parts inputs.dream2nix.flakeModuleBeta ./hosts/part.nix ./modules/part.nix From de58e712b8e495f22b03441537cccf988700259c Mon Sep 17 00:00:00 2001 From: Max Date: Sat, 25 Feb 2023 13:09:47 +0100 Subject: [PATCH 03/16] packages/build-support/drv-parts: attribute shuffle --- packages/build-support/drv-parts/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/build-support/drv-parts/default.nix b/packages/build-support/drv-parts/default.nix index a69ef64..b6f829d 100644 --- a/packages/build-support/drv-parts/default.nix +++ b/packages/build-support/drv-parts/default.nix @@ -6,7 +6,7 @@ ./dependency-sets ]; _module.args = { - drv-backends = inputs.drv-parts.drv-backends // config.drv-backends; + drv-backends = inputs.drv-parts.modules.drv-parts // config.drv-backends; }; }; } \ No newline at end of file From ed094531dc749ad91ccde5b0eea7ee3c2eb2b2e5 Mon Sep 17 00:00:00 2001 From: Max Date: Sat, 25 Feb 2023 13:13:34 +0100 Subject: [PATCH 04/16] packages/build-support/buildPythonPackage: set stdenv directly --- .../drv-parts/backends/buildPythonPackage/implementation.nix | 1 + packages/servers/reflex-cache/project.nix | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/build-support/drv-parts/backends/buildPythonPackage/implementation.nix b/packages/build-support/drv-parts/backends/buildPythonPackage/implementation.nix index db7f655..09259b7 100644 --- a/packages/build-support/drv-parts/backends/buildPythonPackage/implementation.nix +++ b/packages/build-support/drv-parts/backends/buildPythonPackage/implementation.nix @@ -42,6 +42,7 @@ in ; inherit (pkgs) ensureNewerSourcesForZipFilesHook + stdenv ; }; diff --git a/packages/servers/reflex-cache/project.nix b/packages/servers/reflex-cache/project.nix index 3d83271..801f22b 100644 --- a/packages/servers/reflex-cache/project.nix +++ b/packages/servers/reflex-cache/project.nix @@ -24,7 +24,6 @@ drv-backends.buildPythonPackage ]; pyprojectToml = ./pyproject.toml; - inherit (pkgs) stdenv; propagatedBuildInputs = deps; From 97ded90c9e30f291034d337f2d375c5494b2d2b9 Mon Sep 17 00:00:00 2001 From: Max Date: Tue, 21 Mar 2023 16:51:59 +0100 Subject: [PATCH 05/16] packages/build-support/buildPythonPackage: fix for new drv-parts version --- .../buildPythonPackage/implementation.nix | 103 ++++++++++-------- packages/servers/reflex-cache/project.nix | 16 +-- 2 files changed, 64 insertions(+), 55 deletions(-) diff --git a/packages/build-support/drv-parts/backends/buildPythonPackage/implementation.nix b/packages/build-support/drv-parts/backends/buildPythonPackage/implementation.nix index 09259b7..cc7cc6d 100644 --- a/packages/build-support/drv-parts/backends/buildPythonPackage/implementation.nix +++ b/packages/build-support/drv-parts/backends/buildPythonPackage/implementation.nix @@ -1,4 +1,4 @@ -{ config, dependencySets, lib, ... }: +{ config, dependencySets, drv-parts, lib, ... }: let inherit (config) deps; @@ -19,7 +19,11 @@ let in { - pname = lib.mkIf hasPyproject (lib.mkDefault pyproject.tool.poetry.name); + imports = [ + drv-parts.modules.drv-parts.mkDerivation + ]; + + name = lib.mkIf hasPyproject (lib.mkDefault pyproject.tool.poetry.name); version = lib.mkIf hasPyproject (lib.mkDefault pyproject.tool.poetry.version); deps = { pkgs, python3Packages, ... }: { @@ -46,56 +50,59 @@ in ; }; - nativeBuildInputs = with deps; [ - python - wrapPython - ensureNewerSourcesForZipFilesHook - pythonRemoveTestsDirHook - ] ++ lib.optionals config.catchConflicts [ - pythonCatchConflictsHook - ] ++ lib.optionals config.removeBinByteCode [ - pythonRemoveBinBytecodeHook - ] ++ lib.optionals (lib.hasSuffix "zip" (config.src.name or "")) [ - unzip - ] ++ lib.optionals (config.format == "setuptools") [ - setuptoolsBuildHook - ] ++ lib.optionals (config.format == "flit") [ - flitBuildHook - ] ++ lib.optionals (config.format == "pyproject") [ - pipBuildHook - ] ++ lib.optionals (config.format == "wheel") [ - wheelUnpackHook - ] ++ lib.optionals (config.format == "egg") [ - eggUnpackHook eggBuildHook eggInstallHook - ] ++ lib.optionals (!(config.format == "other") || config.dontUsePipInstall) [ - pipInstallHook - ] ++ lib.optionals (python.stdenv.buildPlatform == python.stdenv.hostPlatform) [ - # This is a test, however, it should be ran independent of the checkPhase and checkInputs - pythonImportsCheckHook - ] ++ lib.optionals (python.pythonAtLeast "3.3") [ - # Optionally enforce PEP420 for python3 - pythonNamespacesHook - ] ++ lib.optionals withDistOutput [ - pythonOutputDistHook - ]; - - propagatedBuildInputs = with deps; [ - python - ]; - env = { LANG = "${if deps.python.stdenv.isDarwin then "en_US" else "C"}.UTF-8"; }; - doCheck = false; - doInstallCheck = lib.mkDefault true; - installCheckInputs = lib.optionals (config.format == "setuptools") [ - deps.setuptoolsCheckHook - ]; + mkDerivation = { - postFixup = lib.mkBefore (lib.optionalString (!config.dontWrapPythonPrograms) '' - wrapPythonPrograms - ''); + nativeBuildInputs = with deps; [ + python + wrapPython + ensureNewerSourcesForZipFilesHook + pythonRemoveTestsDirHook + ] ++ lib.optionals config.catchConflicts [ + pythonCatchConflictsHook + ] ++ lib.optionals config.removeBinByteCode [ + pythonRemoveBinBytecodeHook + ] ++ lib.optionals (lib.hasSuffix "zip" (config.src.name or "")) [ + unzip + ] ++ lib.optionals (config.format == "setuptools") [ + setuptoolsBuildHook + ] ++ lib.optionals (config.format == "flit") [ + flitBuildHook + ] ++ lib.optionals (config.format == "pyproject") [ + pipBuildHook + ] ++ lib.optionals (config.format == "wheel") [ + wheelUnpackHook + ] ++ lib.optionals (config.format == "egg") [ + eggUnpackHook eggBuildHook eggInstallHook + ] ++ lib.optionals (!(config.format == "other") || config.dontUsePipInstall) [ + pipInstallHook + ] ++ lib.optionals (python.stdenv.buildPlatform == python.stdenv.hostPlatform) [ + # This is a test, however, it should be ran independent of the checkPhase and checkInputs + pythonImportsCheckHook + ] ++ lib.optionals (python.pythonAtLeast "3.3") [ + # Optionally enforce PEP420 for python3 + pythonNamespacesHook + ] ++ lib.optionals withDistOutput [ + pythonOutputDistHook + ]; - outputs = [ "out" ] ++ lib.optional withDistOutput "dist"; + propagatedBuildInputs = with deps; [ + python + ]; + + doCheck = false; + doInstallCheck = lib.mkDefault true; + installCheckInputs = lib.optionals (config.format == "setuptools") [ + deps.setuptoolsCheckHook + ]; + + postFixup = lib.mkBefore (lib.optionalString (!config.dontWrapPythonPrograms) '' + wrapPythonPrograms + ''); + + outputs = [ "out" ] ++ lib.optional withDistOutput "dist"; + }; } diff --git a/packages/servers/reflex-cache/project.nix b/packages/servers/reflex-cache/project.nix index 801f22b..05f9e14 100644 --- a/packages/servers/reflex-cache/project.nix +++ b/packages/servers/reflex-cache/project.nix @@ -25,14 +25,16 @@ ]; pyprojectToml = ./pyproject.toml; - propagatedBuildInputs = deps; + mkDerivation = { + propagatedBuildInputs = deps; - src = with inputs.nix-filter.lib; filter { - root = ./.; - include = [ - "pyproject.toml" - (inDirectory "reflex_cache") - ]; + src = with inputs.nix-filter.lib; filter { + root = ./.; + include = [ + "pyproject.toml" + (inDirectory "reflex_cache") + ]; + }; }; }; }; From b2dc3f0b0e2d6578fd387f5ca843ad72af5e1058 Mon Sep 17 00:00:00 2001 From: Max Date: Tue, 21 Mar 2023 23:28:22 +0100 Subject: [PATCH 06/16] packages/cinny: 2.2.3 -> 2.2.4 --- packages/sources/sources.json | 8 ++++---- packages/web-apps/cinny/default.nix | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/sources/sources.json b/packages/sources/sources.json index 8794e78..467348d 100644 --- a/packages/sources/sources.json +++ b/packages/sources/sources.json @@ -9,10 +9,10 @@ }, "pre_releases": false, "version_upper_bound": null, - "version": "v2.2.3", - "revision": "4ea14c853ee7b9c1a211a08e386fb323870e2ec2", - "url": "https://api.github.com/repos/cinnyapp/cinny/tarball/v2.2.3", - "hash": "1h470vbdlayncg5525991bmf2iyzzs9nncz1w6hlfhkmyl2d0wwy" + "version": "v2.2.4", + "revision": "a6fb44e1abe9ad48136dee8e7d053e639f37bedc", + "url": "https://api.github.com/repos/cinnyapp/cinny/tarball/v2.2.4", + "hash": "0m7y1hzsdmlhp39hdv2fazhm07kskgb5qf2khhyxrs8nlas4fbha" }, "excalidraw": { "type": "Git", diff --git a/packages/web-apps/cinny/default.nix b/packages/web-apps/cinny/default.nix index d5e1705..a995d60 100644 --- a/packages/web-apps/cinny/default.nix +++ b/packages/web-apps/cinny/default.nix @@ -11,7 +11,7 @@ let src = fetchzip { name = "cinny-tarball-${version}"; url = "https://github.com/${repo.owner}/${repo.repo}/releases/download/${cinny.version}/cinny-${cinny.version}.tar.gz"; - sha256 = "sha256-CmjWlHkVUxFQXZ8kF3fW6XSbgb5b6mnsm0t+WGb3ZTM="; + sha256 = "sha256-zMvCpjt74U8Fsuw8husaXtcccD5eF4wknOw0YWT9b/M="; }; buildCommand = '' From 02f62560264838fe2e437b708937339ddaa198ee Mon Sep 17 00:00:00 2001 From: Max Date: Tue, 21 Mar 2023 23:28:36 +0100 Subject: [PATCH 07/16] packages/excalidraw: unknown -> unknown --- packages/sources/sources.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/sources/sources.json b/packages/sources/sources.json index 467348d..6b8d15b 100644 --- a/packages/sources/sources.json +++ b/packages/sources/sources.json @@ -22,9 +22,9 @@ "repo": "excalidraw" }, "branch": "master", - "revision": "5ae39c9292bb69853b69a67ff1889380a651d6ca", - "url": "https://github.com/excalidraw/excalidraw/archive/5ae39c9292bb69853b69a67ff1889380a651d6ca.tar.gz", - "hash": "1h0frqzkvsk5p4x1g4yxfb460wj8bb699l7x4lhpb2rmd9qgxp90" + "revision": "ac4c8b3ca798c486a3c86ad71eb4d16352a486be", + "url": "https://github.com/excalidraw/excalidraw/archive/ac4c8b3ca798c486a3c86ad71eb4d16352a486be.tar.gz", + "hash": "03gyrg9ykm6cw2bhw1a8f30yhazr4bsfahmi03fpbcb80v3q2vvz" }, "searxng": { "type": "Git", From ca994eec180b1c75832e7e77247e476b0c134bb4 Mon Sep 17 00:00:00 2001 From: Max Date: Tue, 21 Mar 2023 23:28:44 +0100 Subject: [PATCH 08/16] packages/searxng: 1.0.0pre_9d102fb -> 1.0.0pre_9dc3696 --- packages/sources/sources.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/sources/sources.json b/packages/sources/sources.json index 6b8d15b..3435377 100644 --- a/packages/sources/sources.json +++ b/packages/sources/sources.json @@ -34,9 +34,9 @@ "repo": "searxng" }, "branch": "master", - "revision": "9d102fb08ff4a7dc04d093561adde60436e3f69e", - "url": "https://github.com/searxng/searxng/archive/9d102fb08ff4a7dc04d093561adde60436e3f69e.tar.gz", - "hash": "17ay25ipybs46khycsjgy1qf6q5127gn8v9vw7fv9p2drswmhzj0" + "revision": "9dc36965bbb118db64c0bf2d3f54389d4d484670", + "url": "https://github.com/searxng/searxng/archive/9dc36965bbb118db64c0bf2d3f54389d4d484670.tar.gz", + "hash": "0h5dvnrp3v88mgv9snccsrqsvy20mi3sga7s408fmid2n248ws8k" }, "stevenblack-hosts": { "type": "GitRelease", From 466b43d37914c1ed6b4675c835f1348ad5e551a2 Mon Sep 17 00:00:00 2001 From: Max Date: Tue, 21 Mar 2023 23:29:11 +0100 Subject: [PATCH 09/16] packages/stevenblack-hosts: 3.12.1 -> 3.12.15 --- packages/sources/sources.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/sources/sources.json b/packages/sources/sources.json index 3435377..3cc0466 100644 --- a/packages/sources/sources.json +++ b/packages/sources/sources.json @@ -47,10 +47,10 @@ }, "pre_releases": false, "version_upper_bound": null, - "version": "3.12.1", - "revision": "a5b36aac7afc39d46af5324769fab5cbfc1c5bab", - "url": "https://api.github.com/repos/StevenBlack/hosts/tarball/3.12.1", - "hash": "09wrz3ydlw0yx2pw18vn1dl8v7914h4nnjg0fna0lacc0wyhdmj3" + "version": "3.12.15", + "revision": "0cfed81116bf22d3719fffe5b08b72eab115b3e1", + "url": "https://api.github.com/repos/StevenBlack/hosts/tarball/3.12.15", + "hash": "10b0y5wpbylpl4snczfg0dw9cr6dkb5iryqzx3vqm822p7kmg0qy" }, "tempo": { "type": "GitRelease", From 14401fff52520ceeda927329d0f5ce9b11874f1c Mon Sep 17 00:00:00 2001 From: Max Date: Tue, 21 Mar 2023 23:29:51 +0100 Subject: [PATCH 10/16] packages/tempo: 1.5.0 -> 2.0.1 --- packages/sources/sources.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/sources/sources.json b/packages/sources/sources.json index 3cc0466..24e4440 100644 --- a/packages/sources/sources.json +++ b/packages/sources/sources.json @@ -61,10 +61,10 @@ }, "pre_releases": false, "version_upper_bound": null, - "version": "v1.5.0", - "revision": "1a97bea16259be7863dda77e1a6df09eb048b202", - "url": "https://api.github.com/repos/grafana/tempo/tarball/v1.5.0", - "hash": "0hvpp4kd59p22p25ngp2lrm6f2va36q0j8xx4k223n3hnhawkmf3" + "version": "v2.0.1", + "revision": "989486f82a1d69160e9096fcdab57b8e63294d4b", + "url": "https://api.github.com/repos/grafana/tempo/tarball/v2.0.1", + "hash": "02am43gv7yx6fa0asc5msyjppqvhksfwpr8ha013cfr518p0qs82" }, "uptime-kuma": { "type": "GitRelease", From 68fc09866af667b77a120b156442e6615c2cf32c Mon Sep 17 00:00:00 2001 From: Max Date: Tue, 21 Mar 2023 23:30:02 +0100 Subject: [PATCH 11/16] packages/uptime-kuma: 1.19.6 -> 1.21.0 --- packages/sources/sources.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/sources/sources.json b/packages/sources/sources.json index 24e4440..6dd8328 100644 --- a/packages/sources/sources.json +++ b/packages/sources/sources.json @@ -75,10 +75,10 @@ }, "pre_releases": false, "version_upper_bound": null, - "version": "1.19.6", - "revision": "2b57b3e863954c9d9cf7911b76f600bb8de4c41b", - "url": "https://api.github.com/repos/louislam/uptime-kuma/tarball/1.19.6", - "hash": "0kwljvnjd0wqxk6pjj66c82kc4wflc1cs8c2lz5cngsghmxjck8y" + "version": "1.21.0", + "revision": "72317633d982a111f74c23c6b675bdba93e8f6aa", + "url": "https://api.github.com/repos/louislam/uptime-kuma/tarball/1.21.0", + "hash": "0hghh8h4zcxaxlb42cbj84d3m0nwg40k5v3sba05px1iz4y7637k" } }, "version": 2 From 3e3682a9e3d4ed091e5ab81672f58522b8499883 Mon Sep 17 00:00:00 2001 From: Max Date: Sat, 25 Feb 2023 09:04:22 +0100 Subject: [PATCH 12/16] packages/searxng: rebase revert-flask-babel-3.0.0.patch --- packages/web-apps/searxng/default.nix | 2 +- ...flask-babel-3.0.0.patch => revert-flask-babel-3.0.1.patch} | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) rename packages/web-apps/searxng/{revert-flask-babel-3.0.0.patch => revert-flask-babel-3.0.1.patch} (97%) diff --git a/packages/web-apps/searxng/default.nix b/packages/web-apps/searxng/default.nix index cc3b913..3e43016 100644 --- a/packages/web-apps/searxng/default.nix +++ b/packages/web-apps/searxng/default.nix @@ -13,7 +13,7 @@ toPythonModule (buildPythonApplication rec { patches = [ # wait for https://github.com/NixOS/nixpkgs/pull/211654 - ./revert-flask-babel-3.0.0.patch + ./revert-flask-babel-3.0.1.patch ]; postPatch = '' diff --git a/packages/web-apps/searxng/revert-flask-babel-3.0.0.patch b/packages/web-apps/searxng/revert-flask-babel-3.0.1.patch similarity index 97% rename from packages/web-apps/searxng/revert-flask-babel-3.0.0.patch rename to packages/web-apps/searxng/revert-flask-babel-3.0.1.patch index 01fbb20..fe03b6a 100644 --- a/packages/web-apps/searxng/revert-flask-babel-3.0.0.patch +++ b/packages/web-apps/searxng/revert-flask-babel-3.0.1.patch @@ -4,8 +4,8 @@ certifi==2022.12.7 babel==2.11.0 +flask-babel==2.0.0 --flask-babel==3.0.0 - flask==2.2.2 +-flask-babel==3.0.1 + flask==2.2.3 jinja2==3.1.2 lxml==4.9.2 --- b/searx/locales.py From ecdb49f1362262d208c473c54357a22c5c80566b Mon Sep 17 00:00:00 2001 From: Max Date: Sat, 25 Feb 2023 08:59:51 +0100 Subject: [PATCH 13/16] packages/uptime-kuma: rebase data dir patch --- .../uptime-kuma/data-dir-concat-with-slash.patch | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/packages/dream2nix-overrides/nodejs/uptime-kuma/data-dir-concat-with-slash.patch b/packages/dream2nix-overrides/nodejs/uptime-kuma/data-dir-concat-with-slash.patch index 15f7459..75a70be 100644 --- a/packages/dream2nix-overrides/nodejs/uptime-kuma/data-dir-concat-with-slash.patch +++ b/packages/dream2nix-overrides/nodejs/uptime-kuma/data-dir-concat-with-slash.patch @@ -1,14 +1,22 @@ diff --git a/server/database.js b/server/database.js -index b17e7f4..7b77f84 100644 +index 575827f3..8e288095 100644 --- a/server/database.js +++ b/server/database.js -@@ -74,13 +74,13 @@ class Database { +@@ -87,20 +87,20 @@ class Database { */ static init(args) { // Data Directory (must be end with "/") - Database.dataDir = process.env.DATA_DIR || args["data-dir"] || "./data/"; -- Database.path = Database.dataDir + "kuma.db"; + Database.dataDir = process.env.DATA_DIR || args["data-dir"] || "./data"; + + // Plugin feature is working only if the dataDir = "./data"; +- if (Database.dataDir !== "./data/") { ++ if (Database.dataDir !== "./data") { + log.warn("PLUGIN", "Warning: In order to enable plugin feature, you need to use the default data directory: ./data/"); + PluginsManager.disable = true; + } + +- Database.path = Database.dataDir + "kuma.db"; + Database.path = Database.dataDir + "/kuma.db"; if (! fs.existsSync(Database.dataDir)) { fs.mkdirSync(Database.dataDir, { recursive: true }); @@ -19,7 +27,7 @@ index b17e7f4..7b77f84 100644 if (! fs.existsSync(Database.uploadDir)) { fs.mkdirSync(Database.uploadDir, { recursive: true }); -@@ -429,7 +429,7 @@ class Database { +@@ -455,7 +455,7 @@ class Database { static backup(version) { if (! this.backupPath) { log.info("db", "Backing up the database"); From fd4619b9236a19e135ca5ab5e963731de67f973a Mon Sep 17 00:00:00 2001 From: Max Date: Sat, 25 Feb 2023 11:48:22 +0100 Subject: [PATCH 14/16] checks/tempo: update for new tempo version --- packages/checks/tempo.nix | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/packages/checks/tempo.nix b/packages/checks/tempo.nix index db7785a..12aa3c5 100644 --- a/packages/checks/tempo.nix +++ b/packages/checks/tempo.nix @@ -5,8 +5,6 @@ nixosTest { nodes.machine = let dataDir = "/var/lib/tempo"; tempoConfig = { - search_enabled = true; - metrics_generator_enabled = true; server = { http_listen_address = "127.0.0.1"; http_listen_port = 8888; @@ -25,13 +23,8 @@ nixosTest { }; storage.trace = { backend = "local"; - block = { - bloom_filter_false_positive = 0.05; - index_downsample_bytes = 1000; - encoding = "zstd"; - }; + block.bloom_filter_false_positive = 0.05; wal.path = "${dataDir}/wal"; - wal.encoding = "snappy"; local.path = "${dataDir}/blocks"; pool = { max_workers = 16; @@ -73,6 +66,6 @@ nixosTest { testScript = '' machine.wait_for_unit("tempo.service") machine.wait_for_open_port(8888) - machine.succeed("curl --fail http://127.0.0.1:8888/status/version") + machine.succeed("curl -s --fail http://127.0.0.1:8888/status/version") ''; } From 4627b7e49b14d9b8892440ecf556279d3d616a38 Mon Sep 17 00:00:00 2001 From: Max Date: Sat, 25 Feb 2023 11:49:12 +0100 Subject: [PATCH 15/16] VEGAS/monitoring: update tempo config for new tempo version --- hosts/VEGAS/services/monitoring/tracing.nix | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/hosts/VEGAS/services/monitoring/tracing.nix b/hosts/VEGAS/services/monitoring/tracing.nix index e86e913..3325494 100644 --- a/hosts/VEGAS/services/monitoring/tracing.nix +++ b/hosts/VEGAS/services/monitoring/tracing.nix @@ -4,8 +4,6 @@ let inherit (config) links; dataDir = "/srv/storage/private/tempo"; tempoConfig = { - search_enabled = true; - metrics_generator_enabled = true; server = { http_listen_address = links.tempo.ipv4; http_listen_port = links.tempo.port; @@ -32,13 +30,8 @@ let }; storage.trace = { backend = "local"; - block = { - bloom_filter_false_positive = 0.05; - index_downsample_bytes = 1000; - encoding = "zstd"; - }; + block.bloom_filter_false_positive = 0.05; wal.path = "${dataDir}/wal"; - wal.encoding = "snappy"; local.path = "${dataDir}/blocks"; pool = { max_workers = 16; From 422b016e624a8db9d7e227a0d1165f330b56af8c Mon Sep 17 00:00:00 2001 From: Max Date: Sat, 25 Feb 2023 09:10:37 +0100 Subject: [PATCH 16/16] packages/tempo: use Go 1.19 --- packages/patched-derivations.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/patched-derivations.nix b/packages/patched-derivations.nix index 1f5ed58..03efc65 100644 --- a/packages/patched-derivations.nix +++ b/packages/patched-derivations.nix @@ -63,7 +63,7 @@ super: rec { prometheus-jitsi-exporter = patch super.prometheus-jitsi-exporter "patches/base/prometheus-jitsi-exporter"; - tempo = (super.tempo.override { buildGoModule = super.buildGo118Module; }).overrideAttrs (_: { + tempo = (super.tempo.override { buildGoModule = super.buildGo119Module; }).overrideAttrs (_: { version = builtins.substring 1 (-1) pins.tempo.version; src = super.npins.mkSource pins.tempo; subPackages = [ "cmd/tempo" ];