From 298e5fddd308a84571066e773299e2dd1abd87d9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 29 Jan 2024 11:48:05 +0000 Subject: [PATCH 01/44] build(deps): bump korthout/backport-action from 2.1.1 to 2.4.1 Bumps [korthout/backport-action](https://github.com/korthout/backport-action) from 2.1.1 to 2.4.1. - [Release notes](https://github.com/korthout/backport-action/releases) - [Commits](https://github.com/korthout/backport-action/compare/08bafb375e6e9a9a2b53a744b987e5d81a133191...e8161d6a0dbfa2651b7daa76cbb75bc7c925bbf3) --- updated-dependencies: - dependency-name: korthout/backport-action dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- .github/workflows/backport.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/backport.yml b/.github/workflows/backport.yml index c49eeac5a20b..cfe189d7fd80 100644 --- a/.github/workflows/backport.yml +++ b/.github/workflows/backport.yml @@ -24,7 +24,7 @@ jobs: with: ref: ${{ github.event.pull_request.head.sha }} - name: Create backport PRs - uses: korthout/backport-action@08bafb375e6e9a9a2b53a744b987e5d81a133191 # v2.1.1 + uses: korthout/backport-action@e8161d6a0dbfa2651b7daa76cbb75bc7c925bbf3 # v2.4.1 with: # Config README: https://github.com/korthout/backport-action#backport-action copy_labels_pattern: 'severity:\ssecurity' From bc19782e3f918bd05a3afe10a6e3a1357350711b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 4 Mar 2024 11:00:23 +0000 Subject: [PATCH 02/44] lact: 0.5.0 -> 0.5.3 --- pkgs/tools/system/lact/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/system/lact/default.nix b/pkgs/tools/system/lact/default.nix index 16ce41007ea7..c694b96d85f5 100644 --- a/pkgs/tools/system/lact/default.nix +++ b/pkgs/tools/system/lact/default.nix @@ -14,16 +14,16 @@ rustPlatform.buildRustPackage rec { pname = "lact"; - version = "0.5.0"; + version = "0.5.3"; src = fetchFromGitHub { owner = "ilya-zlobintsev"; repo = "LACT"; rev = "v${version}"; - hash = "sha256-B3YAlEKELbHGIQ8AIvortYZsHY6wsuaFxm9lC9Uh+Zg="; + hash = "sha256-Ts2byWYn1MwQCJPQfwTxezsa/fnwlgVOZyNDUXWgZ0s="; }; - cargoHash = "sha256-MbE6OrYJGPoQPQggxa9dssx8Nc6/5w53V58E1yLLeq0="; + cargoHash = "sha256-7zGZu3q2CF/xzWjbicEb/JOt6pXEC2Skg7eR2syvUmY="; nativeBuildInputs = [ blueprint-compiler From 2aaaa26710e0b8009ac9782666e736888f5c1f87 Mon Sep 17 00:00:00 2001 From: Florian Brandes Date: Thu, 14 Mar 2024 13:06:47 +0100 Subject: [PATCH 03/44] python3Packages.jsonformatter: init at 0.3.2 Signed-off-by: Florian Brandes --- .../python-modules/jsonformatter/default.nix | 31 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 33 insertions(+) create mode 100644 pkgs/development/python-modules/jsonformatter/default.nix diff --git a/pkgs/development/python-modules/jsonformatter/default.nix b/pkgs/development/python-modules/jsonformatter/default.nix new file mode 100644 index 000000000000..f800493b2c93 --- /dev/null +++ b/pkgs/development/python-modules/jsonformatter/default.nix @@ -0,0 +1,31 @@ +{ lib +, fetchFromGitHub +, buildPythonPackage +, setuptools +}: + +buildPythonPackage rec { + pname = "jsonformatter"; + version = "0.3.2"; + format = "setuptools"; + + src = fetchFromGitHub { + owner = "MyColorfulDays"; + repo = pname; + rev = "refs/tags/v${version}"; + hash = "sha256-oK419J/MIxRT+1j/5Yklj1F+4d3wuMXR8IVqJAMKPNw="; + }; + + nativeBuildInputs = [ setuptools ]; + + pythonImportsCheck = [ + "jsonformatter" + ]; + + meta = with lib; { + description = "jsonformatter is a formatter for python output json log, e.g. output LogStash needed log"; + homepage = "https://github.com/MyColorfulDays/jsonformatter"; + license = licenses.bsd2; + maintainers = with maintainers; [ gador ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 545fe4a7dae3..96fc557382e7 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6015,6 +6015,8 @@ self: super: with self; { jsonable = callPackage ../development/python-modules/jsonable { }; + jsonformatter = callPackage ../development/python-modules/jsonformatter { }; + jsonnet = buildPythonPackage { inherit (pkgs.jsonnet) name src; }; jsonpatch = callPackage ../development/python-modules/jsonpatch { }; From f353e79a828d06558d204ce13fced6f0c587878e Mon Sep 17 00:00:00 2001 From: Florian Brandes Date: Thu, 14 Mar 2024 13:07:38 +0100 Subject: [PATCH 04/44] pgadmin4: 8.3 -> 8.4 Signed-off-by: Florian Brandes --- pkgs/tools/admin/pgadmin/default.nix | 22 +++-- pkgs/tools/admin/pgadmin/yarn.lock | 136 +++++++++++++++++++++++++-- 2 files changed, 140 insertions(+), 18 deletions(-) diff --git a/pkgs/tools/admin/pgadmin/default.nix b/pkgs/tools/admin/pgadmin/default.nix index dcd250b9e837..31093f0497b4 100644 --- a/pkgs/tools/admin/pgadmin/default.nix +++ b/pkgs/tools/admin/pgadmin/default.nix @@ -14,14 +14,14 @@ let pname = "pgadmin"; - version = "8.3"; - yarnHash = "sha256-nhHss4YOFu2cGkIhA909lIdnf3H3pD9BQx4PvP9+9c0="; + version = "8.4"; + yarnHash = "sha256-Wizgb3WgNPYOLytEj7hBVMV/U3RqW9vhNnhQU4k+j+8="; src = fetchFromGitHub { owner = "pgadmin-org"; repo = "pgadmin4"; rev = "REL-${lib.versions.major version}_${lib.versions.minor version}"; - hash = "sha256-2L/JLkuyjx1oD9akQULmzW0FlSq8/MQlZ1HmlO81jj0="; + hash = "sha256-kj/a1JjSDFnLY/UQNBqYdhs3J5wi0mlDyJ1jD/L12FM="; }; # keep the scope, as it is used throughout the derivation and tests @@ -54,20 +54,23 @@ pythonPackages.buildPythonApplication rec { # patching Makefile, so it doesn't try to build sphinx documentation here # (will do so later) substituteInPlace Makefile \ - --replace 'LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 $(MAKE) -C docs/en_US -f Makefile.sphinx html' "true" + --replace-fail 'LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 $(MAKE) -C docs/en_US -f Makefile.sphinx html' "true" # fix document which refers a non-existing document and fails substituteInPlace docs/en_US/contributions.rst \ - --replace "code_snippets" "" + --replace-fail "code_snippets" "" # relax dependencies sed 's|==|>=|g' -i requirements.txt # fix extra_require error with "*" in match sed 's|*|0|g' -i requirements.txt + # remove packageManager from package.json so we can work without corepack + substituteInPlace web/package.json \ + --replace-fail "\"packageManager\": \"yarn@3.6.4\"" "\"\": \"\"" substituteInPlace pkg/pip/setup_pip.py \ - --replace "req = req.replace('psycopg[c]', 'psycopg[binary]')" "req = req" + --replace-fail "req = req.replace('psycopg[c]', 'psycopg[binary]')" "req = req" ${lib.optionalString (!server-mode) '' substituteInPlace web/config.py \ - --replace "SERVER_MODE = True" "SERVER_MODE = False" + --replace-fail "SERVER_MODE = True" "SERVER_MODE = False" ''} ''; @@ -182,6 +185,7 @@ pythonPackages.buildPythonApplication rec { keyring typer rich + jsonformatter ]; passthru.tests = { @@ -209,8 +213,8 @@ pythonPackages.buildPythonApplication rec { # in /var/lib/pgadmin and /var/log/pgadmin # see https://github.com/pgadmin-org/pgadmin4/blob/fd1c26408bbf154fa455a49ee5c12895933833a3/web/regression/runtests.py#L217-L226 cp -v regression/test_config.json.in regression/test_config.json - substituteInPlace regression/test_config.json --replace "localhost" "$PGHOST" - substituteInPlace regression/runtests.py --replace "builtins.SERVER_MODE = None" "builtins.SERVER_MODE = False" + substituteInPlace regression/test_config.json --replace-fail "localhost" "$PGHOST" + substituteInPlace regression/runtests.py --replace-fail "builtins.SERVER_MODE = None" "builtins.SERVER_MODE = False" ## Browser test ## diff --git a/pkgs/tools/admin/pgadmin/yarn.lock b/pkgs/tools/admin/pgadmin/yarn.lock index c6573efabf78..1acf9a14a07c 100644 --- a/pkgs/tools/admin/pgadmin/yarn.lock +++ b/pkgs/tools/admin/pgadmin/yarn.lock @@ -1715,6 +1715,82 @@ resolved "https://registry.npmjs.org/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== +"@codemirror/autocomplete@^6.0.0": + version "6.12.0" + resolved "https://registry.npmjs.org/@codemirror/autocomplete/-/autocomplete-6.12.0.tgz#3fa620a8a3f42ded7751749916e8375f6bbbb333" + integrity sha512-r4IjdYFthwbCQyvqnSlx0WBHRHi8nBvU+WjJxFUij81qsBfhNudf/XKKmmC2j3m0LaOYUQTf3qiEK1J8lO1sdg== + dependencies: + "@codemirror/language" "^6.0.0" + "@codemirror/state" "^6.0.0" + "@codemirror/view" "^6.17.0" + "@lezer/common" "^1.0.0" + +"@codemirror/commands@^6.0.0": + version "6.3.3" + resolved "https://registry.npmjs.org/@codemirror/commands/-/commands-6.3.3.tgz#03face5bf5f3de0fc4e09b177b3c91eda2ceb7e9" + integrity sha512-dO4hcF0fGT9tu1Pj1D2PvGvxjeGkbC6RGcZw6Qs74TH+Ed1gw98jmUgd2axWvIZEqTeTuFrg1lEB1KV6cK9h1A== + dependencies: + "@codemirror/language" "^6.0.0" + "@codemirror/state" "^6.4.0" + "@codemirror/view" "^6.0.0" + "@lezer/common" "^1.1.0" + +"@codemirror/lang-sql@^6.5.5": + version "6.5.5" + resolved "https://registry.npmjs.org/@codemirror/lang-sql/-/lang-sql-6.5.5.tgz#85619f4ea6738c07c0241b19c62d8ef86678e672" + integrity sha512-DvOaP2RXLb2xlxJxxydTFfwyYw5YDqEFea6aAfgh9UH0kUD6J1KFZ0xPgPpw1eo/5s2w3L6uh5PVR7GM23GxkQ== + dependencies: + "@codemirror/autocomplete" "^6.0.0" + "@codemirror/language" "^6.0.0" + "@codemirror/state" "^6.0.0" + "@lezer/common" "^1.2.0" + "@lezer/highlight" "^1.0.0" + "@lezer/lr" "^1.0.0" + +"@codemirror/language@^6.0.0": + version "6.10.0" + resolved "https://registry.npmjs.org/@codemirror/language/-/language-6.10.0.tgz#2d0e818716825ee2ed0dacd04595eaa61bae8f23" + integrity sha512-2vaNn9aPGCRFKWcHPFksctzJ8yS5p7YoaT+jHpc0UGKzNuAIx4qy6R5wiqbP+heEEdyaABA582mNqSHzSoYdmg== + dependencies: + "@codemirror/state" "^6.0.0" + "@codemirror/view" "^6.23.0" + "@lezer/common" "^1.1.0" + "@lezer/highlight" "^1.0.0" + "@lezer/lr" "^1.0.0" + style-mod "^4.0.0" + +"@codemirror/lint@^6.0.0": + version "6.4.2" + resolved "https://registry.npmjs.org/@codemirror/lint/-/lint-6.4.2.tgz#c13be5320bde9707efdc94e8bcd3c698abae0b92" + integrity sha512-wzRkluWb1ptPKdzlsrbwwjYCPLgzU6N88YBAmlZi8WFyuiEduSd05MnJYNogzyc8rPK7pj6m95ptUApc8sHKVA== + dependencies: + "@codemirror/state" "^6.0.0" + "@codemirror/view" "^6.0.0" + crelt "^1.0.5" + +"@codemirror/search@^6.0.0": + version "6.5.5" + resolved "https://registry.npmjs.org/@codemirror/search/-/search-6.5.5.tgz#cf97e201da364da2285c2a250167af25bbd2a4a2" + integrity sha512-PIEN3Ke1buPod2EHbJsoQwlbpkz30qGZKcnmH1eihq9+bPQx8gelauUwLYaY4vBOuBAuEhmpDLii4rj/uO0yMA== + dependencies: + "@codemirror/state" "^6.0.0" + "@codemirror/view" "^6.0.0" + crelt "^1.0.5" + +"@codemirror/state@^6.0.0", "@codemirror/state@^6.4.0": + version "6.4.0" + resolved "https://registry.npmjs.org/@codemirror/state/-/state-6.4.0.tgz#8bc3e096c84360b34525a84696a84f86b305363a" + integrity sha512-hm8XshYj5Fo30Bb922QX9hXB/bxOAVH+qaqHBzw5TKa72vOeslyGwd4X8M0c1dJ9JqxlaMceOQ8RsL9tC7gU0A== + +"@codemirror/view@^6.0.0", "@codemirror/view@^6.17.0", "@codemirror/view@^6.23.0": + version "6.23.1" + resolved "https://registry.npmjs.org/@codemirror/view/-/view-6.23.1.tgz#1ce3039a588d6b93f153b7c4c035c2075ede34a6" + integrity sha512-J2Xnn5lFYT1ZN/5ewEoMBCmLlL71lZ3mBdb7cUEuHhX2ESoSrNEucpsDXpX22EuTGm9LOgC9v4Z0wx+Ez8QmGA== + dependencies: + "@codemirror/state" "^6.4.0" + style-mod "^4.1.0" + w3c-keyname "^2.2.4" + "@date-io/core@1.x", "@date-io/core@^1.3.13", "@date-io/core@^1.3.6": version "1.3.13" resolved "https://registry.npmjs.org/@date-io/core/-/core-1.3.13.tgz#90c71da493f20204b7a972929cc5c482d078b3fa" @@ -2286,6 +2362,25 @@ "@jridgewell/resolve-uri" "3.1.0" "@jridgewell/sourcemap-codec" "1.4.14" +"@lezer/common@^1.0.0", "@lezer/common@^1.1.0", "@lezer/common@^1.2.0": + version "1.2.1" + resolved "https://registry.npmjs.org/@lezer/common/-/common-1.2.1.tgz#198b278b7869668e1bebbe687586e12a42731049" + integrity sha512-yemX0ZD2xS/73llMZIK6KplkjIjf2EvAHcinDi/TfJ9hS25G0388+ClHt6/3but0oOxinTcQHJLDXh6w1crzFQ== + +"@lezer/highlight@^1.0.0": + version "1.2.0" + resolved "https://registry.npmjs.org/@lezer/highlight/-/highlight-1.2.0.tgz#e5898c3644208b4b589084089dceeea2966f7780" + integrity sha512-WrS5Mw51sGrpqjlh3d4/fOwpEV2Hd3YOkp9DBt4k8XZQcoTHZFB7sx030A6OcahF4J1nDQAa3jXlTVVYH50IFA== + dependencies: + "@lezer/common" "^1.0.0" + +"@lezer/lr@^1.0.0": + version "1.4.0" + resolved "https://registry.npmjs.org/@lezer/lr/-/lr-1.4.0.tgz#ed52a75dbbfbb0d1eb63710ea84c35ee647cb67e" + integrity sha512-Wst46p51km8gH0ZUmeNrtpRYmdlRHUpN1DQd3GFAyKANi8WVz8c2jHYTf1CVScFaCjQw1iO3ZZdqGDxQPRErTg== + dependencies: + "@lezer/common" "^1.0.0" + "@material-ui/core@4.12.4": version "4.12.4" resolved "https://registry.npmjs.org/@material-ui/core/-/core-4.12.4.tgz#4ac17488e8fcaf55eb6a7f5efb2a131e10138a73" @@ -4527,10 +4622,18 @@ co@^4.6.0: resolved "https://registry.npmjs.org/co/-/co-4.6.0.tgz#6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184" integrity sha512-QVb0dM5HvG+uaxitm8wONl7jltx8dqhfU33DcqtOZcLSVIKSDDLDi7+0LbAKiyI8hD9u42m2YxXSkMGWThaecQ== -codemirror@^5.59.2: - version "5.65.13" - resolved "https://registry.npmjs.org/codemirror/-/codemirror-5.65.13.tgz#c098a6f409db8b5a7c5722788bd9fa3bb2367f2e" - integrity sha512-SVWEzKXmbHmTQQWaz03Shrh4nybG0wXx2MEu3FO4ezbPW8IbnZEd5iGHGEffSUaitKYa3i+pHpBsSvw8sPHtzg== +codemirror@^6.0.1: + version "6.0.1" + resolved "https://registry.npmjs.org/codemirror/-/codemirror-6.0.1.tgz#62b91142d45904547ee3e0e0e4c1a79158035a29" + integrity sha512-J8j+nZ+CdWmIeFIGXEFbFPtpiYacFMDR8GlHK3IyHQJMCaVRfGx9NT+Hxivv1ckLWPvNdZqndbr/7lVhrf/Svg== + dependencies: + "@codemirror/autocomplete" "^6.0.0" + "@codemirror/commands" "^6.0.0" + "@codemirror/language" "^6.0.0" + "@codemirror/lint" "^6.0.0" + "@codemirror/search" "^6.0.0" + "@codemirror/state" "^6.0.0" + "@codemirror/view" "^6.0.0" collect-v8-coverage@^1.0.0: version "1.0.2" @@ -4797,6 +4900,11 @@ create-ecdh@^4.0.0: safe-buffer "^5.0.1" sha.js "^2.4.8" +crelt@^1.0.5: + version "1.0.6" + resolved "https://registry.npmjs.org/crelt/-/crelt-1.0.6.tgz#7cc898ea74e190fb6ef9dae57f8f81cf7302df72" + integrity sha512-VQ2MBenTq1fWZUH9DJNGti7kKv6EeAuYr3cLwxUWhIu1baTaXh4Ib5W2CqHVqib4/MqbYGJqiL3Zb8GJZr3l4g== + cross-env@^7.0.3: version "7.0.3" resolved "https://registry.npmjs.org/cross-env/-/cross-env-7.0.3.tgz#865264b29677dc015ba8418918965dd232fc54cf" @@ -6837,6 +6945,11 @@ hosted-git-info@^4.0.1: dependencies: lru-cache "^6.0.0" +hotkeys-js@^3.13.3: + version "3.13.3" + resolved "https://registry.npmjs.org/hotkeys-js/-/hotkeys-js-3.13.3.tgz#b0a9f243bb1e9cacb93d3772a9e1f6013c0698a3" + integrity sha512-IEiMBNRJZMhWyNDsvww8LYC8vZYyj2/w2GgXPg0ljq/K3SYvOJH6NRMqzF7z2Fwaq2AzKSvmvECREzFleKSeow== + html-dom-parser@5.0.4: version "5.0.4" resolved "https://registry.npmjs.org/html-dom-parser/-/html-dom-parser-5.0.4.tgz#2941a762317d088e747db31c8cf290987ec30a55" @@ -8918,11 +9031,6 @@ moo@^0.5.0: resolved "https://registry.npmjs.org/moo/-/moo-0.5.2.tgz#f9fe82473bc7c184b0d32e2215d3f6e67278733c" integrity sha512-iSAJLHYKnX41mKcJKjqvnAN9sf0LMDTXDEvFv+ffuRR9a1MIuXLjMNL6EsnDHSkKLTWNqQQ5uo61P4EbU4NU+Q== -mousetrap@^1.6.3: - version "1.6.5" - resolved "https://registry.npmjs.org/mousetrap/-/mousetrap-1.6.5.tgz#8a766d8c272b08393d5f56074e0b5ec183485bf9" - integrity sha512-QNo4kEepaIBwiT8CDhP98umTetp+JNfQYBWvC1pc6/OAibuXtRcxZ58Qz8skvEHYvURne/7R8T5VoOI7rDsEUA== - mozjpeg@^8.0.0: version "8.0.0" resolved "https://registry.npmjs.org/mozjpeg/-/mozjpeg-8.0.0.tgz#cd990d96581626ca64b877146ce22ba00b3b308c" @@ -11619,6 +11727,11 @@ style-loader@^3.3.2: resolved "https://registry.npmjs.org/style-loader/-/style-loader-3.3.3.tgz#bba8daac19930169c0c9c96706749a597ae3acff" integrity sha512-53BiGLXAcll9maCYtZi2RCQZKa8NQQai5C4horqKyRmHj9H7QmcUyucrH+4KW/gBQbXM2AsB0axoEcFZPlfPcw== +"style-mod@^4.0.0", "style-mod@^4.1.0": + version "4.1.0" + resolved "https://registry.npmjs.org/style-mod/-/style-mod-4.1.0.tgz#a313a14f4ae8bb4d52878c0053c4327fb787ec09" + integrity sha512-Ca5ib8HrFn+f+0n4N4ScTIA9iTOQ7MaGS1ylHcoVqW9J7w2w8PzN6g9gKmTYgGEBH8e120+RCmhpje6jC5uGWA== + style-to-js@1.1.9: version "1.1.9" resolved "https://registry.npmjs.org/style-to-js/-/style-to-js-1.1.9.tgz#5bdc23ba7624016094a19d6ea90fa3f98bee34c4" @@ -12354,6 +12467,11 @@ vm-browserify@^1.0.0: resolved "https://registry.npmjs.org/vm-browserify/-/vm-browserify-1.1.2.tgz#78641c488b8e6ca91a75f511e7a3b32a86e5dda0" integrity sha512-2ham8XPWTONajOR0ohOKOHXkm3+gaBmGut3SRuu75xLd/RRaY6vqgh8NBYYk7+RW3u5AtzPQZG8F10LHkl0lAQ== +w3c-keyname@^2.2.4: + version "2.2.8" + resolved "https://registry.npmjs.org/w3c-keyname/-/w3c-keyname-2.2.8.tgz#7b17c8c6883d4e8b86ac8aba79d39e880f8869c5" + integrity sha512-dpojBhNsCNN7T82Tm7k26A6G9ML3NkhDsnw9n/eoxSRlVBB4CEtIQ/KTCLI2Fwf3ataSXRhYFkQi3SlnFwPvPQ== + w3c-xmlserializer@^4.0.0: version "4.0.0" resolved "https://registry.npmjs.org/w3c-xmlserializer/-/w3c-xmlserializer-4.0.0.tgz#aebdc84920d806222936e3cdce408e32488a3073" From 8bf5cc266685eda1269846bd31e92abf23a8bab8 Mon Sep 17 00:00:00 2001 From: Stzx Date: Thu, 14 Mar 2024 21:53:33 +0800 Subject: [PATCH 05/44] pinentry: fix DM option and user conflict --- nixos/modules/services/desktop-managers/plasma6.nix | 2 +- nixos/modules/services/x11/desktop-managers/deepin.nix | 2 +- nixos/modules/services/x11/desktop-managers/lxqt.nix | 2 +- nixos/modules/services/x11/desktop-managers/plasma5.nix | 2 +- nixos/modules/services/x11/desktop-managers/xfce.nix | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/nixos/modules/services/desktop-managers/plasma6.nix b/nixos/modules/services/desktop-managers/plasma6.nix index 1710d28954d6..1cb7a7ea778b 100644 --- a/nixos/modules/services/desktop-managers/plasma6.nix +++ b/nixos/modules/services/desktop-managers/plasma6.nix @@ -215,7 +215,7 @@ in { serif = ["Noto Serif"]; }; - programs.gnupg.agent.pinentryPackage = pkgs.pinentry-qt; + programs.gnupg.agent.pinentryPackage = mkDefault pkgs.pinentry-qt; programs.ssh.askPassword = mkDefault "${kdePackages.ksshaskpass.out}/bin/ksshaskpass"; # Enable helpful DBus services. diff --git a/nixos/modules/services/x11/desktop-managers/deepin.nix b/nixos/modules/services/x11/desktop-managers/deepin.nix index e6f221201013..902e3a9317dd 100644 --- a/nixos/modules/services/x11/desktop-managers/deepin.nix +++ b/nixos/modules/services/x11/desktop-managers/deepin.nix @@ -66,7 +66,7 @@ in services.upower.enable = mkDefault config.powerManagement.enable; networking.networkmanager.enable = mkDefault true; programs.dconf.enable = mkDefault true; - programs.gnupg.agent.pinentryPackage = pkgs.pinentry-qt; + programs.gnupg.agent.pinentryPackage = mkDefault pkgs.pinentry-qt; fonts.packages = with pkgs; [ noto-fonts ]; xdg.mime.enable = true; diff --git a/nixos/modules/services/x11/desktop-managers/lxqt.nix b/nixos/modules/services/x11/desktop-managers/lxqt.nix index d3bdc4326a90..3d02deba6fc7 100644 --- a/nixos/modules/services/x11/desktop-managers/lxqt.nix +++ b/nixos/modules/services/x11/desktop-managers/lxqt.nix @@ -62,7 +62,7 @@ in # Link some extra directories in /run/current-system/software/share environment.pathsToLink = [ "/share" ]; - programs.gnupg.agent.pinentryPackage = pkgs.pinentry-qt; + programs.gnupg.agent.pinentryPackage = mkDefault pkgs.pinentry-qt; # virtual file systems support for PCManFM-QT services.gvfs.enable = true; diff --git a/nixos/modules/services/x11/desktop-managers/plasma5.nix b/nixos/modules/services/x11/desktop-managers/plasma5.nix index c884b4487e24..f516a29fb5db 100644 --- a/nixos/modules/services/x11/desktop-managers/plasma5.nix +++ b/nixos/modules/services/x11/desktop-managers/plasma5.nix @@ -336,7 +336,7 @@ in serif = [ "Noto Serif" ]; }; - programs.gnupg.agent.pinentryPackage = pkgs.pinentry-qt; + programs.gnupg.agent.pinentryPackage = mkDefault pkgs.pinentry-qt; programs.ssh.askPassword = mkDefault "${pkgs.plasma5Packages.ksshaskpass.out}/bin/ksshaskpass"; # Enable helpful DBus services. diff --git a/nixos/modules/services/x11/desktop-managers/xfce.nix b/nixos/modules/services/x11/desktop-managers/xfce.nix index 6bc964f4c6ed..3ba27b201507 100644 --- a/nixos/modules/services/x11/desktop-managers/xfce.nix +++ b/nixos/modules/services/x11/desktop-managers/xfce.nix @@ -131,7 +131,7 @@ in xfdesktop ] ++ optional cfg.enableScreensaver xfce4-screensaver) excludePackages; - programs.gnupg.agent.pinentryPackage = pkgs.pinentry-gtk2; + programs.gnupg.agent.pinentryPackage = mkDefault pkgs.pinentry-gtk2; programs.xfconf.enable = true; programs.thunar.enable = true; From 2cf82a9ad2a07d664ff78a2f767cf7632c667222 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 15 Mar 2024 00:29:52 +0000 Subject: [PATCH 06/44] gnomeExtensions.unite: 77 -> 78 --- pkgs/desktops/gnome/extensions/unite/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/extensions/unite/default.nix b/pkgs/desktops/gnome/extensions/unite/default.nix index ef975ffddf45..36913e3d4e57 100644 --- a/pkgs/desktops/gnome/extensions/unite/default.nix +++ b/pkgs/desktops/gnome/extensions/unite/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "gnome-shell-extension-unite"; - version = "77"; + version = "78"; src = fetchFromGitHub { owner = "hardpixel"; repo = "unite-shell"; rev = "v${version}"; - hash = "sha256-5PClGWOxqwTVaqBySu5I+qavaV1vcKHUvoYJ3Qgcq2o="; + hash = "sha256-4fOCgStMPzUg2QxYeX6tU/WUaGOn1YUyheZp6YNeODA="; }; passthru = { From 01463448be78f01a89247071aa8062388e5fde3f Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Thu, 29 Feb 2024 17:42:58 +0100 Subject: [PATCH 07/44] postgresql: refactor to move locale-binary-path.patch into patches/ Seems to have been put in the wrong place. --- pkgs/servers/sql/postgresql/default.nix | 2 +- .../sql/postgresql/{ => patches}/locale-binary-path.patch | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename pkgs/servers/sql/postgresql/{ => patches}/locale-binary-path.patch (100%) diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix index 700f0ad99bd1..cfb9553a6d03 100644 --- a/pkgs/servers/sql/postgresql/default.nix +++ b/pkgs/servers/sql/postgresql/default.nix @@ -116,7 +116,7 @@ let ./patches/findstring.patch (substituteAll { - src = ./locale-binary-path.patch; + src = ./patches/locale-binary-path.patch; locale = "${if stdenv.isDarwin then darwin.adv_cmds else lib.getBin stdenv.cc.libc}/bin/locale"; }) diff --git a/pkgs/servers/sql/postgresql/locale-binary-path.patch b/pkgs/servers/sql/postgresql/patches/locale-binary-path.patch similarity index 100% rename from pkgs/servers/sql/postgresql/locale-binary-path.patch rename to pkgs/servers/sql/postgresql/patches/locale-binary-path.patch From 9ef7195e08f0a546f4d130c752dfaa21c0ddbfea Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Sun, 10 Mar 2024 16:28:01 +0100 Subject: [PATCH 08/44] postgresql: refactor to move packages.nix to ext/default.nix (1/2) This commit is split up into two commits to allow git to detect renames, make rebasing easier and allow a working entry in .git-blame-ignore-revs. To allow bisecting we allow evaluation on every commit by moving the extensions into ext/ext/ first and back to ext/ with the next commit. --- pkgs/servers/sql/postgresql/default.nix | 2 +- pkgs/servers/sql/postgresql/{packages.nix => ext/default.nix} | 0 pkgs/servers/sql/postgresql/ext/{ => ext}/age.nix | 0 .../sql/postgresql/ext/{ => ext}/apache_datasketches.nix | 0 pkgs/servers/sql/postgresql/ext/{ => ext}/citus.nix | 0 pkgs/servers/sql/postgresql/ext/{ => ext}/cstore_fdw.nix | 0 pkgs/servers/sql/postgresql/ext/{ => ext}/h3-pg.nix | 0 pkgs/servers/sql/postgresql/ext/{ => ext}/hypopg.nix | 0 pkgs/servers/sql/postgresql/ext/{ => ext}/jsonb_deep_sum.nix | 0 pkgs/servers/sql/postgresql/ext/{ => ext}/lantern.nix | 0 pkgs/servers/sql/postgresql/ext/{ => ext}/periods.nix | 0 pkgs/servers/sql/postgresql/ext/{ => ext}/pg_auto_failover.nix | 0 pkgs/servers/sql/postgresql/ext/{ => ext}/pg_bigm.nix | 0 pkgs/servers/sql/postgresql/ext/{ => ext}/pg_cron.nix | 0 pkgs/servers/sql/postgresql/ext/{ => ext}/pg_ed25519.nix | 0 pkgs/servers/sql/postgresql/ext/{ => ext}/pg_embedding.nix | 0 pkgs/servers/sql/postgresql/ext/{ => ext}/pg_hint_plan.nix | 0 pkgs/servers/sql/postgresql/ext/{ => ext}/pg_hll.nix | 0 pkgs/servers/sql/postgresql/ext/{ => ext}/pg_ivm.nix | 0 pkgs/servers/sql/postgresql/ext/{ => ext}/pg_net.nix | 0 pkgs/servers/sql/postgresql/ext/{ => ext}/pg_partman.nix | 0 pkgs/servers/sql/postgresql/ext/{ => ext}/pg_rational.nix | 0 pkgs/servers/sql/postgresql/ext/{ => ext}/pg_relusage.nix | 0 pkgs/servers/sql/postgresql/ext/{ => ext}/pg_repack.nix | 0 pkgs/servers/sql/postgresql/ext/{ => ext}/pg_safeupdate.nix | 0 pkgs/servers/sql/postgresql/ext/{ => ext}/pg_similarity.nix | 0 pkgs/servers/sql/postgresql/ext/{ => ext}/pg_squeeze.nix | 0 pkgs/servers/sql/postgresql/ext/{ => ext}/pg_topn.nix | 0 pkgs/servers/sql/postgresql/ext/{ => ext}/pg_uuidv7.nix | 0 pkgs/servers/sql/postgresql/ext/{ => ext}/pgaudit.nix | 0 pkgs/servers/sql/postgresql/ext/{ => ext}/pgjwt.nix | 0 pkgs/servers/sql/postgresql/ext/{ => ext}/pgroonga.nix | 0 pkgs/servers/sql/postgresql/ext/{ => ext}/pgrouting.nix | 0 pkgs/servers/sql/postgresql/ext/{ => ext}/pgsodium.nix | 0 pkgs/servers/sql/postgresql/ext/{ => ext}/pgsql-http.nix | 0 pkgs/servers/sql/postgresql/ext/{ => ext}/pgtap.nix | 0 pkgs/servers/sql/postgresql/ext/{ => ext}/pgvector.nix | 0 pkgs/servers/sql/postgresql/ext/{ => ext}/plpgsql_check.nix | 0 pkgs/servers/sql/postgresql/ext/{ => ext}/plr.nix | 0 .../{ => ext}/plv8/0001-build-Allow-using-V8-from-system.patch | 0 pkgs/servers/sql/postgresql/ext/{ => ext}/plv8/default.nix | 0 pkgs/servers/sql/postgresql/ext/{ => ext}/postgis.nix | 0 .../sql/postgresql/ext/{ => ext}/promscale_extension.nix | 0 pkgs/servers/sql/postgresql/ext/{ => ext}/repmgr.nix | 0 pkgs/servers/sql/postgresql/ext/{ => ext}/rum.nix | 0 pkgs/servers/sql/postgresql/ext/{ => ext}/smlar.nix | 0 pkgs/servers/sql/postgresql/ext/{ => ext}/tds_fdw.nix | 0 pkgs/servers/sql/postgresql/ext/{ => ext}/temporal_tables.nix | 0 pkgs/servers/sql/postgresql/ext/{ => ext}/timescaledb.nix | 0 .../sql/postgresql/ext/{ => ext}/timescaledb_toolkit.nix | 0 pkgs/servers/sql/postgresql/ext/{ => ext}/tsearch_extras.nix | 0 pkgs/servers/sql/postgresql/ext/{ => ext}/tsja.nix | 0 pkgs/servers/sql/postgresql/ext/{ => ext}/wal2json.nix | 0 53 files changed, 1 insertion(+), 1 deletion(-) rename pkgs/servers/sql/postgresql/{packages.nix => ext/default.nix} (100%) rename pkgs/servers/sql/postgresql/ext/{ => ext}/age.nix (100%) rename pkgs/servers/sql/postgresql/ext/{ => ext}/apache_datasketches.nix (100%) rename pkgs/servers/sql/postgresql/ext/{ => ext}/citus.nix (100%) rename pkgs/servers/sql/postgresql/ext/{ => ext}/cstore_fdw.nix (100%) rename pkgs/servers/sql/postgresql/ext/{ => ext}/h3-pg.nix (100%) rename pkgs/servers/sql/postgresql/ext/{ => ext}/hypopg.nix (100%) rename pkgs/servers/sql/postgresql/ext/{ => ext}/jsonb_deep_sum.nix (100%) rename pkgs/servers/sql/postgresql/ext/{ => ext}/lantern.nix (100%) rename pkgs/servers/sql/postgresql/ext/{ => ext}/periods.nix (100%) rename pkgs/servers/sql/postgresql/ext/{ => ext}/pg_auto_failover.nix (100%) rename pkgs/servers/sql/postgresql/ext/{ => ext}/pg_bigm.nix (100%) rename pkgs/servers/sql/postgresql/ext/{ => ext}/pg_cron.nix (100%) rename pkgs/servers/sql/postgresql/ext/{ => ext}/pg_ed25519.nix (100%) rename pkgs/servers/sql/postgresql/ext/{ => ext}/pg_embedding.nix (100%) rename pkgs/servers/sql/postgresql/ext/{ => ext}/pg_hint_plan.nix (100%) rename pkgs/servers/sql/postgresql/ext/{ => ext}/pg_hll.nix (100%) rename pkgs/servers/sql/postgresql/ext/{ => ext}/pg_ivm.nix (100%) rename pkgs/servers/sql/postgresql/ext/{ => ext}/pg_net.nix (100%) rename pkgs/servers/sql/postgresql/ext/{ => ext}/pg_partman.nix (100%) rename pkgs/servers/sql/postgresql/ext/{ => ext}/pg_rational.nix (100%) rename pkgs/servers/sql/postgresql/ext/{ => ext}/pg_relusage.nix (100%) rename pkgs/servers/sql/postgresql/ext/{ => ext}/pg_repack.nix (100%) rename pkgs/servers/sql/postgresql/ext/{ => ext}/pg_safeupdate.nix (100%) rename pkgs/servers/sql/postgresql/ext/{ => ext}/pg_similarity.nix (100%) rename pkgs/servers/sql/postgresql/ext/{ => ext}/pg_squeeze.nix (100%) rename pkgs/servers/sql/postgresql/ext/{ => ext}/pg_topn.nix (100%) rename pkgs/servers/sql/postgresql/ext/{ => ext}/pg_uuidv7.nix (100%) rename pkgs/servers/sql/postgresql/ext/{ => ext}/pgaudit.nix (100%) rename pkgs/servers/sql/postgresql/ext/{ => ext}/pgjwt.nix (100%) rename pkgs/servers/sql/postgresql/ext/{ => ext}/pgroonga.nix (100%) rename pkgs/servers/sql/postgresql/ext/{ => ext}/pgrouting.nix (100%) rename pkgs/servers/sql/postgresql/ext/{ => ext}/pgsodium.nix (100%) rename pkgs/servers/sql/postgresql/ext/{ => ext}/pgsql-http.nix (100%) rename pkgs/servers/sql/postgresql/ext/{ => ext}/pgtap.nix (100%) rename pkgs/servers/sql/postgresql/ext/{ => ext}/pgvector.nix (100%) rename pkgs/servers/sql/postgresql/ext/{ => ext}/plpgsql_check.nix (100%) rename pkgs/servers/sql/postgresql/ext/{ => ext}/plr.nix (100%) rename pkgs/servers/sql/postgresql/ext/{ => ext}/plv8/0001-build-Allow-using-V8-from-system.patch (100%) rename pkgs/servers/sql/postgresql/ext/{ => ext}/plv8/default.nix (100%) rename pkgs/servers/sql/postgresql/ext/{ => ext}/postgis.nix (100%) rename pkgs/servers/sql/postgresql/ext/{ => ext}/promscale_extension.nix (100%) rename pkgs/servers/sql/postgresql/ext/{ => ext}/repmgr.nix (100%) rename pkgs/servers/sql/postgresql/ext/{ => ext}/rum.nix (100%) rename pkgs/servers/sql/postgresql/ext/{ => ext}/smlar.nix (100%) rename pkgs/servers/sql/postgresql/ext/{ => ext}/tds_fdw.nix (100%) rename pkgs/servers/sql/postgresql/ext/{ => ext}/temporal_tables.nix (100%) rename pkgs/servers/sql/postgresql/ext/{ => ext}/timescaledb.nix (100%) rename pkgs/servers/sql/postgresql/ext/{ => ext}/timescaledb_toolkit.nix (100%) rename pkgs/servers/sql/postgresql/ext/{ => ext}/tsearch_extras.nix (100%) rename pkgs/servers/sql/postgresql/ext/{ => ext}/tsja.nix (100%) rename pkgs/servers/sql/postgresql/ext/{ => ext}/wal2json.nix (100%) diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix index cfb9553a6d03..015150bfd7a4 100644 --- a/pkgs/servers/sql/postgresql/default.nix +++ b/pkgs/servers/sql/postgresql/default.nix @@ -283,7 +283,7 @@ let }; newSelf = self // scope; newSuper = { callPackage = newScope (scope // this.pkgs); }; - in import ./packages.nix newSelf newSuper; + in import ./ext newSelf newSuper; withPackages = postgresqlWithPackages { inherit makeWrapper buildEnv; diff --git a/pkgs/servers/sql/postgresql/packages.nix b/pkgs/servers/sql/postgresql/ext/default.nix similarity index 100% rename from pkgs/servers/sql/postgresql/packages.nix rename to pkgs/servers/sql/postgresql/ext/default.nix diff --git a/pkgs/servers/sql/postgresql/ext/age.nix b/pkgs/servers/sql/postgresql/ext/ext/age.nix similarity index 100% rename from pkgs/servers/sql/postgresql/ext/age.nix rename to pkgs/servers/sql/postgresql/ext/ext/age.nix diff --git a/pkgs/servers/sql/postgresql/ext/apache_datasketches.nix b/pkgs/servers/sql/postgresql/ext/ext/apache_datasketches.nix similarity index 100% rename from pkgs/servers/sql/postgresql/ext/apache_datasketches.nix rename to pkgs/servers/sql/postgresql/ext/ext/apache_datasketches.nix diff --git a/pkgs/servers/sql/postgresql/ext/citus.nix b/pkgs/servers/sql/postgresql/ext/ext/citus.nix similarity index 100% rename from pkgs/servers/sql/postgresql/ext/citus.nix rename to pkgs/servers/sql/postgresql/ext/ext/citus.nix diff --git a/pkgs/servers/sql/postgresql/ext/cstore_fdw.nix b/pkgs/servers/sql/postgresql/ext/ext/cstore_fdw.nix similarity index 100% rename from pkgs/servers/sql/postgresql/ext/cstore_fdw.nix rename to pkgs/servers/sql/postgresql/ext/ext/cstore_fdw.nix diff --git a/pkgs/servers/sql/postgresql/ext/h3-pg.nix b/pkgs/servers/sql/postgresql/ext/ext/h3-pg.nix similarity index 100% rename from pkgs/servers/sql/postgresql/ext/h3-pg.nix rename to pkgs/servers/sql/postgresql/ext/ext/h3-pg.nix diff --git a/pkgs/servers/sql/postgresql/ext/hypopg.nix b/pkgs/servers/sql/postgresql/ext/ext/hypopg.nix similarity index 100% rename from pkgs/servers/sql/postgresql/ext/hypopg.nix rename to pkgs/servers/sql/postgresql/ext/ext/hypopg.nix diff --git a/pkgs/servers/sql/postgresql/ext/jsonb_deep_sum.nix b/pkgs/servers/sql/postgresql/ext/ext/jsonb_deep_sum.nix similarity index 100% rename from pkgs/servers/sql/postgresql/ext/jsonb_deep_sum.nix rename to pkgs/servers/sql/postgresql/ext/ext/jsonb_deep_sum.nix diff --git a/pkgs/servers/sql/postgresql/ext/lantern.nix b/pkgs/servers/sql/postgresql/ext/ext/lantern.nix similarity index 100% rename from pkgs/servers/sql/postgresql/ext/lantern.nix rename to pkgs/servers/sql/postgresql/ext/ext/lantern.nix diff --git a/pkgs/servers/sql/postgresql/ext/periods.nix b/pkgs/servers/sql/postgresql/ext/ext/periods.nix similarity index 100% rename from pkgs/servers/sql/postgresql/ext/periods.nix rename to pkgs/servers/sql/postgresql/ext/ext/periods.nix diff --git a/pkgs/servers/sql/postgresql/ext/pg_auto_failover.nix b/pkgs/servers/sql/postgresql/ext/ext/pg_auto_failover.nix similarity index 100% rename from pkgs/servers/sql/postgresql/ext/pg_auto_failover.nix rename to pkgs/servers/sql/postgresql/ext/ext/pg_auto_failover.nix diff --git a/pkgs/servers/sql/postgresql/ext/pg_bigm.nix b/pkgs/servers/sql/postgresql/ext/ext/pg_bigm.nix similarity index 100% rename from pkgs/servers/sql/postgresql/ext/pg_bigm.nix rename to pkgs/servers/sql/postgresql/ext/ext/pg_bigm.nix diff --git a/pkgs/servers/sql/postgresql/ext/pg_cron.nix b/pkgs/servers/sql/postgresql/ext/ext/pg_cron.nix similarity index 100% rename from pkgs/servers/sql/postgresql/ext/pg_cron.nix rename to pkgs/servers/sql/postgresql/ext/ext/pg_cron.nix diff --git a/pkgs/servers/sql/postgresql/ext/pg_ed25519.nix b/pkgs/servers/sql/postgresql/ext/ext/pg_ed25519.nix similarity index 100% rename from pkgs/servers/sql/postgresql/ext/pg_ed25519.nix rename to pkgs/servers/sql/postgresql/ext/ext/pg_ed25519.nix diff --git a/pkgs/servers/sql/postgresql/ext/pg_embedding.nix b/pkgs/servers/sql/postgresql/ext/ext/pg_embedding.nix similarity index 100% rename from pkgs/servers/sql/postgresql/ext/pg_embedding.nix rename to pkgs/servers/sql/postgresql/ext/ext/pg_embedding.nix diff --git a/pkgs/servers/sql/postgresql/ext/pg_hint_plan.nix b/pkgs/servers/sql/postgresql/ext/ext/pg_hint_plan.nix similarity index 100% rename from pkgs/servers/sql/postgresql/ext/pg_hint_plan.nix rename to pkgs/servers/sql/postgresql/ext/ext/pg_hint_plan.nix diff --git a/pkgs/servers/sql/postgresql/ext/pg_hll.nix b/pkgs/servers/sql/postgresql/ext/ext/pg_hll.nix similarity index 100% rename from pkgs/servers/sql/postgresql/ext/pg_hll.nix rename to pkgs/servers/sql/postgresql/ext/ext/pg_hll.nix diff --git a/pkgs/servers/sql/postgresql/ext/pg_ivm.nix b/pkgs/servers/sql/postgresql/ext/ext/pg_ivm.nix similarity index 100% rename from pkgs/servers/sql/postgresql/ext/pg_ivm.nix rename to pkgs/servers/sql/postgresql/ext/ext/pg_ivm.nix diff --git a/pkgs/servers/sql/postgresql/ext/pg_net.nix b/pkgs/servers/sql/postgresql/ext/ext/pg_net.nix similarity index 100% rename from pkgs/servers/sql/postgresql/ext/pg_net.nix rename to pkgs/servers/sql/postgresql/ext/ext/pg_net.nix diff --git a/pkgs/servers/sql/postgresql/ext/pg_partman.nix b/pkgs/servers/sql/postgresql/ext/ext/pg_partman.nix similarity index 100% rename from pkgs/servers/sql/postgresql/ext/pg_partman.nix rename to pkgs/servers/sql/postgresql/ext/ext/pg_partman.nix diff --git a/pkgs/servers/sql/postgresql/ext/pg_rational.nix b/pkgs/servers/sql/postgresql/ext/ext/pg_rational.nix similarity index 100% rename from pkgs/servers/sql/postgresql/ext/pg_rational.nix rename to pkgs/servers/sql/postgresql/ext/ext/pg_rational.nix diff --git a/pkgs/servers/sql/postgresql/ext/pg_relusage.nix b/pkgs/servers/sql/postgresql/ext/ext/pg_relusage.nix similarity index 100% rename from pkgs/servers/sql/postgresql/ext/pg_relusage.nix rename to pkgs/servers/sql/postgresql/ext/ext/pg_relusage.nix diff --git a/pkgs/servers/sql/postgresql/ext/pg_repack.nix b/pkgs/servers/sql/postgresql/ext/ext/pg_repack.nix similarity index 100% rename from pkgs/servers/sql/postgresql/ext/pg_repack.nix rename to pkgs/servers/sql/postgresql/ext/ext/pg_repack.nix diff --git a/pkgs/servers/sql/postgresql/ext/pg_safeupdate.nix b/pkgs/servers/sql/postgresql/ext/ext/pg_safeupdate.nix similarity index 100% rename from pkgs/servers/sql/postgresql/ext/pg_safeupdate.nix rename to pkgs/servers/sql/postgresql/ext/ext/pg_safeupdate.nix diff --git a/pkgs/servers/sql/postgresql/ext/pg_similarity.nix b/pkgs/servers/sql/postgresql/ext/ext/pg_similarity.nix similarity index 100% rename from pkgs/servers/sql/postgresql/ext/pg_similarity.nix rename to pkgs/servers/sql/postgresql/ext/ext/pg_similarity.nix diff --git a/pkgs/servers/sql/postgresql/ext/pg_squeeze.nix b/pkgs/servers/sql/postgresql/ext/ext/pg_squeeze.nix similarity index 100% rename from pkgs/servers/sql/postgresql/ext/pg_squeeze.nix rename to pkgs/servers/sql/postgresql/ext/ext/pg_squeeze.nix diff --git a/pkgs/servers/sql/postgresql/ext/pg_topn.nix b/pkgs/servers/sql/postgresql/ext/ext/pg_topn.nix similarity index 100% rename from pkgs/servers/sql/postgresql/ext/pg_topn.nix rename to pkgs/servers/sql/postgresql/ext/ext/pg_topn.nix diff --git a/pkgs/servers/sql/postgresql/ext/pg_uuidv7.nix b/pkgs/servers/sql/postgresql/ext/ext/pg_uuidv7.nix similarity index 100% rename from pkgs/servers/sql/postgresql/ext/pg_uuidv7.nix rename to pkgs/servers/sql/postgresql/ext/ext/pg_uuidv7.nix diff --git a/pkgs/servers/sql/postgresql/ext/pgaudit.nix b/pkgs/servers/sql/postgresql/ext/ext/pgaudit.nix similarity index 100% rename from pkgs/servers/sql/postgresql/ext/pgaudit.nix rename to pkgs/servers/sql/postgresql/ext/ext/pgaudit.nix diff --git a/pkgs/servers/sql/postgresql/ext/pgjwt.nix b/pkgs/servers/sql/postgresql/ext/ext/pgjwt.nix similarity index 100% rename from pkgs/servers/sql/postgresql/ext/pgjwt.nix rename to pkgs/servers/sql/postgresql/ext/ext/pgjwt.nix diff --git a/pkgs/servers/sql/postgresql/ext/pgroonga.nix b/pkgs/servers/sql/postgresql/ext/ext/pgroonga.nix similarity index 100% rename from pkgs/servers/sql/postgresql/ext/pgroonga.nix rename to pkgs/servers/sql/postgresql/ext/ext/pgroonga.nix diff --git a/pkgs/servers/sql/postgresql/ext/pgrouting.nix b/pkgs/servers/sql/postgresql/ext/ext/pgrouting.nix similarity index 100% rename from pkgs/servers/sql/postgresql/ext/pgrouting.nix rename to pkgs/servers/sql/postgresql/ext/ext/pgrouting.nix diff --git a/pkgs/servers/sql/postgresql/ext/pgsodium.nix b/pkgs/servers/sql/postgresql/ext/ext/pgsodium.nix similarity index 100% rename from pkgs/servers/sql/postgresql/ext/pgsodium.nix rename to pkgs/servers/sql/postgresql/ext/ext/pgsodium.nix diff --git a/pkgs/servers/sql/postgresql/ext/pgsql-http.nix b/pkgs/servers/sql/postgresql/ext/ext/pgsql-http.nix similarity index 100% rename from pkgs/servers/sql/postgresql/ext/pgsql-http.nix rename to pkgs/servers/sql/postgresql/ext/ext/pgsql-http.nix diff --git a/pkgs/servers/sql/postgresql/ext/pgtap.nix b/pkgs/servers/sql/postgresql/ext/ext/pgtap.nix similarity index 100% rename from pkgs/servers/sql/postgresql/ext/pgtap.nix rename to pkgs/servers/sql/postgresql/ext/ext/pgtap.nix diff --git a/pkgs/servers/sql/postgresql/ext/pgvector.nix b/pkgs/servers/sql/postgresql/ext/ext/pgvector.nix similarity index 100% rename from pkgs/servers/sql/postgresql/ext/pgvector.nix rename to pkgs/servers/sql/postgresql/ext/ext/pgvector.nix diff --git a/pkgs/servers/sql/postgresql/ext/plpgsql_check.nix b/pkgs/servers/sql/postgresql/ext/ext/plpgsql_check.nix similarity index 100% rename from pkgs/servers/sql/postgresql/ext/plpgsql_check.nix rename to pkgs/servers/sql/postgresql/ext/ext/plpgsql_check.nix diff --git a/pkgs/servers/sql/postgresql/ext/plr.nix b/pkgs/servers/sql/postgresql/ext/ext/plr.nix similarity index 100% rename from pkgs/servers/sql/postgresql/ext/plr.nix rename to pkgs/servers/sql/postgresql/ext/ext/plr.nix diff --git a/pkgs/servers/sql/postgresql/ext/plv8/0001-build-Allow-using-V8-from-system.patch b/pkgs/servers/sql/postgresql/ext/ext/plv8/0001-build-Allow-using-V8-from-system.patch similarity index 100% rename from pkgs/servers/sql/postgresql/ext/plv8/0001-build-Allow-using-V8-from-system.patch rename to pkgs/servers/sql/postgresql/ext/ext/plv8/0001-build-Allow-using-V8-from-system.patch diff --git a/pkgs/servers/sql/postgresql/ext/plv8/default.nix b/pkgs/servers/sql/postgresql/ext/ext/plv8/default.nix similarity index 100% rename from pkgs/servers/sql/postgresql/ext/plv8/default.nix rename to pkgs/servers/sql/postgresql/ext/ext/plv8/default.nix diff --git a/pkgs/servers/sql/postgresql/ext/postgis.nix b/pkgs/servers/sql/postgresql/ext/ext/postgis.nix similarity index 100% rename from pkgs/servers/sql/postgresql/ext/postgis.nix rename to pkgs/servers/sql/postgresql/ext/ext/postgis.nix diff --git a/pkgs/servers/sql/postgresql/ext/promscale_extension.nix b/pkgs/servers/sql/postgresql/ext/ext/promscale_extension.nix similarity index 100% rename from pkgs/servers/sql/postgresql/ext/promscale_extension.nix rename to pkgs/servers/sql/postgresql/ext/ext/promscale_extension.nix diff --git a/pkgs/servers/sql/postgresql/ext/repmgr.nix b/pkgs/servers/sql/postgresql/ext/ext/repmgr.nix similarity index 100% rename from pkgs/servers/sql/postgresql/ext/repmgr.nix rename to pkgs/servers/sql/postgresql/ext/ext/repmgr.nix diff --git a/pkgs/servers/sql/postgresql/ext/rum.nix b/pkgs/servers/sql/postgresql/ext/ext/rum.nix similarity index 100% rename from pkgs/servers/sql/postgresql/ext/rum.nix rename to pkgs/servers/sql/postgresql/ext/ext/rum.nix diff --git a/pkgs/servers/sql/postgresql/ext/smlar.nix b/pkgs/servers/sql/postgresql/ext/ext/smlar.nix similarity index 100% rename from pkgs/servers/sql/postgresql/ext/smlar.nix rename to pkgs/servers/sql/postgresql/ext/ext/smlar.nix diff --git a/pkgs/servers/sql/postgresql/ext/tds_fdw.nix b/pkgs/servers/sql/postgresql/ext/ext/tds_fdw.nix similarity index 100% rename from pkgs/servers/sql/postgresql/ext/tds_fdw.nix rename to pkgs/servers/sql/postgresql/ext/ext/tds_fdw.nix diff --git a/pkgs/servers/sql/postgresql/ext/temporal_tables.nix b/pkgs/servers/sql/postgresql/ext/ext/temporal_tables.nix similarity index 100% rename from pkgs/servers/sql/postgresql/ext/temporal_tables.nix rename to pkgs/servers/sql/postgresql/ext/ext/temporal_tables.nix diff --git a/pkgs/servers/sql/postgresql/ext/timescaledb.nix b/pkgs/servers/sql/postgresql/ext/ext/timescaledb.nix similarity index 100% rename from pkgs/servers/sql/postgresql/ext/timescaledb.nix rename to pkgs/servers/sql/postgresql/ext/ext/timescaledb.nix diff --git a/pkgs/servers/sql/postgresql/ext/timescaledb_toolkit.nix b/pkgs/servers/sql/postgresql/ext/ext/timescaledb_toolkit.nix similarity index 100% rename from pkgs/servers/sql/postgresql/ext/timescaledb_toolkit.nix rename to pkgs/servers/sql/postgresql/ext/ext/timescaledb_toolkit.nix diff --git a/pkgs/servers/sql/postgresql/ext/tsearch_extras.nix b/pkgs/servers/sql/postgresql/ext/ext/tsearch_extras.nix similarity index 100% rename from pkgs/servers/sql/postgresql/ext/tsearch_extras.nix rename to pkgs/servers/sql/postgresql/ext/ext/tsearch_extras.nix diff --git a/pkgs/servers/sql/postgresql/ext/tsja.nix b/pkgs/servers/sql/postgresql/ext/ext/tsja.nix similarity index 100% rename from pkgs/servers/sql/postgresql/ext/tsja.nix rename to pkgs/servers/sql/postgresql/ext/ext/tsja.nix diff --git a/pkgs/servers/sql/postgresql/ext/wal2json.nix b/pkgs/servers/sql/postgresql/ext/ext/wal2json.nix similarity index 100% rename from pkgs/servers/sql/postgresql/ext/wal2json.nix rename to pkgs/servers/sql/postgresql/ext/ext/wal2json.nix From 719034f6f6749d624faa28dff259309fc0e3e730 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Thu, 29 Feb 2024 21:15:34 +0100 Subject: [PATCH 09/44] postgresql: refactor to move packages.nix to ext/default.nix (2/2) This aligns more with the commonly used style in nixpkgs. --- .../sql/postgresql/ext/{ext => }/age.nix | 0 .../ext/{ext => }/apache_datasketches.nix | 0 .../sql/postgresql/ext/{ext => }/citus.nix | 0 .../postgresql/ext/{ext => }/cstore_fdw.nix | 0 pkgs/servers/sql/postgresql/ext/default.nix | 106 +++++++++--------- .../sql/postgresql/ext/{ext => }/h3-pg.nix | 0 .../sql/postgresql/ext/{ext => }/hypopg.nix | 0 .../ext/{ext => }/jsonb_deep_sum.nix | 0 .../sql/postgresql/ext/{ext => }/lantern.nix | 0 .../sql/postgresql/ext/{ext => }/periods.nix | 0 .../ext/{ext => }/pg_auto_failover.nix | 0 .../sql/postgresql/ext/{ext => }/pg_bigm.nix | 0 .../sql/postgresql/ext/{ext => }/pg_cron.nix | 0 .../postgresql/ext/{ext => }/pg_ed25519.nix | 0 .../postgresql/ext/{ext => }/pg_embedding.nix | 0 .../postgresql/ext/{ext => }/pg_hint_plan.nix | 0 .../sql/postgresql/ext/{ext => }/pg_hll.nix | 0 .../sql/postgresql/ext/{ext => }/pg_ivm.nix | 0 .../sql/postgresql/ext/{ext => }/pg_net.nix | 0 .../postgresql/ext/{ext => }/pg_partman.nix | 0 .../postgresql/ext/{ext => }/pg_rational.nix | 0 .../postgresql/ext/{ext => }/pg_relusage.nix | 0 .../postgresql/ext/{ext => }/pg_repack.nix | 0 .../ext/{ext => }/pg_safeupdate.nix | 0 .../ext/{ext => }/pg_similarity.nix | 0 .../postgresql/ext/{ext => }/pg_squeeze.nix | 0 .../sql/postgresql/ext/{ext => }/pg_topn.nix | 0 .../postgresql/ext/{ext => }/pg_uuidv7.nix | 0 .../sql/postgresql/ext/{ext => }/pgaudit.nix | 0 .../sql/postgresql/ext/{ext => }/pgjwt.nix | 0 .../sql/postgresql/ext/{ext => }/pgroonga.nix | 0 .../postgresql/ext/{ext => }/pgrouting.nix | 0 .../sql/postgresql/ext/{ext => }/pgsodium.nix | 0 .../postgresql/ext/{ext => }/pgsql-http.nix | 0 .../sql/postgresql/ext/{ext => }/pgtap.nix | 0 .../sql/postgresql/ext/{ext => }/pgvector.nix | 0 .../ext/{ext => }/plpgsql_check.nix | 0 .../sql/postgresql/ext/{ext => }/plr.nix | 0 ...001-build-Allow-using-V8-from-system.patch | 0 .../postgresql/ext/{ext => }/plv8/default.nix | 0 .../sql/postgresql/ext/{ext => }/postgis.nix | 0 .../ext/{ext => }/promscale_extension.nix | 0 .../sql/postgresql/ext/{ext => }/repmgr.nix | 0 .../sql/postgresql/ext/{ext => }/rum.nix | 0 .../sql/postgresql/ext/{ext => }/smlar.nix | 0 .../sql/postgresql/ext/{ext => }/tds_fdw.nix | 0 .../ext/{ext => }/temporal_tables.nix | 0 .../postgresql/ext/{ext => }/timescaledb.nix | 0 .../ext/{ext => }/timescaledb_toolkit.nix | 0 .../ext/{ext => }/tsearch_extras.nix | 0 .../sql/postgresql/ext/{ext => }/tsja.nix | 0 .../sql/postgresql/ext/{ext => }/wal2json.nix | 0 52 files changed, 53 insertions(+), 53 deletions(-) rename pkgs/servers/sql/postgresql/ext/{ext => }/age.nix (100%) rename pkgs/servers/sql/postgresql/ext/{ext => }/apache_datasketches.nix (100%) rename pkgs/servers/sql/postgresql/ext/{ext => }/citus.nix (100%) rename pkgs/servers/sql/postgresql/ext/{ext => }/cstore_fdw.nix (100%) rename pkgs/servers/sql/postgresql/ext/{ext => }/h3-pg.nix (100%) rename pkgs/servers/sql/postgresql/ext/{ext => }/hypopg.nix (100%) rename pkgs/servers/sql/postgresql/ext/{ext => }/jsonb_deep_sum.nix (100%) rename pkgs/servers/sql/postgresql/ext/{ext => }/lantern.nix (100%) rename pkgs/servers/sql/postgresql/ext/{ext => }/periods.nix (100%) rename pkgs/servers/sql/postgresql/ext/{ext => }/pg_auto_failover.nix (100%) rename pkgs/servers/sql/postgresql/ext/{ext => }/pg_bigm.nix (100%) rename pkgs/servers/sql/postgresql/ext/{ext => }/pg_cron.nix (100%) rename pkgs/servers/sql/postgresql/ext/{ext => }/pg_ed25519.nix (100%) rename pkgs/servers/sql/postgresql/ext/{ext => }/pg_embedding.nix (100%) rename pkgs/servers/sql/postgresql/ext/{ext => }/pg_hint_plan.nix (100%) rename pkgs/servers/sql/postgresql/ext/{ext => }/pg_hll.nix (100%) rename pkgs/servers/sql/postgresql/ext/{ext => }/pg_ivm.nix (100%) rename pkgs/servers/sql/postgresql/ext/{ext => }/pg_net.nix (100%) rename pkgs/servers/sql/postgresql/ext/{ext => }/pg_partman.nix (100%) rename pkgs/servers/sql/postgresql/ext/{ext => }/pg_rational.nix (100%) rename pkgs/servers/sql/postgresql/ext/{ext => }/pg_relusage.nix (100%) rename pkgs/servers/sql/postgresql/ext/{ext => }/pg_repack.nix (100%) rename pkgs/servers/sql/postgresql/ext/{ext => }/pg_safeupdate.nix (100%) rename pkgs/servers/sql/postgresql/ext/{ext => }/pg_similarity.nix (100%) rename pkgs/servers/sql/postgresql/ext/{ext => }/pg_squeeze.nix (100%) rename pkgs/servers/sql/postgresql/ext/{ext => }/pg_topn.nix (100%) rename pkgs/servers/sql/postgresql/ext/{ext => }/pg_uuidv7.nix (100%) rename pkgs/servers/sql/postgresql/ext/{ext => }/pgaudit.nix (100%) rename pkgs/servers/sql/postgresql/ext/{ext => }/pgjwt.nix (100%) rename pkgs/servers/sql/postgresql/ext/{ext => }/pgroonga.nix (100%) rename pkgs/servers/sql/postgresql/ext/{ext => }/pgrouting.nix (100%) rename pkgs/servers/sql/postgresql/ext/{ext => }/pgsodium.nix (100%) rename pkgs/servers/sql/postgresql/ext/{ext => }/pgsql-http.nix (100%) rename pkgs/servers/sql/postgresql/ext/{ext => }/pgtap.nix (100%) rename pkgs/servers/sql/postgresql/ext/{ext => }/pgvector.nix (100%) rename pkgs/servers/sql/postgresql/ext/{ext => }/plpgsql_check.nix (100%) rename pkgs/servers/sql/postgresql/ext/{ext => }/plr.nix (100%) rename pkgs/servers/sql/postgresql/ext/{ext => }/plv8/0001-build-Allow-using-V8-from-system.patch (100%) rename pkgs/servers/sql/postgresql/ext/{ext => }/plv8/default.nix (100%) rename pkgs/servers/sql/postgresql/ext/{ext => }/postgis.nix (100%) rename pkgs/servers/sql/postgresql/ext/{ext => }/promscale_extension.nix (100%) rename pkgs/servers/sql/postgresql/ext/{ext => }/repmgr.nix (100%) rename pkgs/servers/sql/postgresql/ext/{ext => }/rum.nix (100%) rename pkgs/servers/sql/postgresql/ext/{ext => }/smlar.nix (100%) rename pkgs/servers/sql/postgresql/ext/{ext => }/tds_fdw.nix (100%) rename pkgs/servers/sql/postgresql/ext/{ext => }/temporal_tables.nix (100%) rename pkgs/servers/sql/postgresql/ext/{ext => }/timescaledb.nix (100%) rename pkgs/servers/sql/postgresql/ext/{ext => }/timescaledb_toolkit.nix (100%) rename pkgs/servers/sql/postgresql/ext/{ext => }/tsearch_extras.nix (100%) rename pkgs/servers/sql/postgresql/ext/{ext => }/tsja.nix (100%) rename pkgs/servers/sql/postgresql/ext/{ext => }/wal2json.nix (100%) diff --git a/pkgs/servers/sql/postgresql/ext/ext/age.nix b/pkgs/servers/sql/postgresql/ext/age.nix similarity index 100% rename from pkgs/servers/sql/postgresql/ext/ext/age.nix rename to pkgs/servers/sql/postgresql/ext/age.nix diff --git a/pkgs/servers/sql/postgresql/ext/ext/apache_datasketches.nix b/pkgs/servers/sql/postgresql/ext/apache_datasketches.nix similarity index 100% rename from pkgs/servers/sql/postgresql/ext/ext/apache_datasketches.nix rename to pkgs/servers/sql/postgresql/ext/apache_datasketches.nix diff --git a/pkgs/servers/sql/postgresql/ext/ext/citus.nix b/pkgs/servers/sql/postgresql/ext/citus.nix similarity index 100% rename from pkgs/servers/sql/postgresql/ext/ext/citus.nix rename to pkgs/servers/sql/postgresql/ext/citus.nix diff --git a/pkgs/servers/sql/postgresql/ext/ext/cstore_fdw.nix b/pkgs/servers/sql/postgresql/ext/cstore_fdw.nix similarity index 100% rename from pkgs/servers/sql/postgresql/ext/ext/cstore_fdw.nix rename to pkgs/servers/sql/postgresql/ext/cstore_fdw.nix diff --git a/pkgs/servers/sql/postgresql/ext/default.nix b/pkgs/servers/sql/postgresql/ext/default.nix index eabcb0613c0d..b6181da6cf02 100644 --- a/pkgs/servers/sql/postgresql/ext/default.nix +++ b/pkgs/servers/sql/postgresql/ext/default.nix @@ -1,107 +1,107 @@ self: super: { - age = super.callPackage ./ext/age.nix { }; + age = super.callPackage ./age.nix { }; - anonymizer = super.callPackage ./ext/anonymizer.nix { }; + anonymizer = super.callPackage ./anonymizer.nix { }; - apache_datasketches = super.callPackage ./ext/apache_datasketches.nix { }; + apache_datasketches = super.callPackage ./apache_datasketches.nix { }; - citus = super.callPackage ./ext/citus.nix { }; + citus = super.callPackage ./citus.nix { }; - h3-pg = super.callPackage ./ext/h3-pg.nix { }; + h3-pg = super.callPackage ./h3-pg.nix { }; - hypopg = super.callPackage ./ext/hypopg.nix { }; + hypopg = super.callPackage ./hypopg.nix { }; - jsonb_deep_sum = super.callPackage ./ext/jsonb_deep_sum.nix { }; + jsonb_deep_sum = super.callPackage ./jsonb_deep_sum.nix { }; - lantern = super.callPackage ./ext/lantern.nix { }; + lantern = super.callPackage ./lantern.nix { }; - periods = super.callPackage ./ext/periods.nix { }; + periods = super.callPackage ./periods.nix { }; - postgis = super.callPackage ./ext/postgis.nix { }; + postgis = super.callPackage ./postgis.nix { }; - pg_auto_failover = super.callPackage ./ext/pg_auto_failover.nix { }; + pg_auto_failover = super.callPackage ./pg_auto_failover.nix { }; - pg_bigm = super.callPackage ./ext/pg_bigm.nix { }; + pg_bigm = super.callPackage ./pg_bigm.nix { }; - pg_ed25519 = super.callPackage ./ext/pg_ed25519.nix { }; + pg_ed25519 = super.callPackage ./pg_ed25519.nix { }; - pg_embedding = super.callPackage ./ext/pg_embedding.nix { }; + pg_embedding = super.callPackage ./pg_embedding.nix { }; - pg_hint_plan = super.callPackage ./ext/pg_hint_plan.nix { }; + pg_hint_plan = super.callPackage ./pg_hint_plan.nix { }; - pg_ivm = super.callPackage ./ext/pg_ivm.nix { }; + pg_ivm = super.callPackage ./pg_ivm.nix { }; - pg_rational = super.callPackage ./ext/pg_rational.nix { }; + pg_rational = super.callPackage ./pg_rational.nix { }; - pg_repack = super.callPackage ./ext/pg_repack.nix { }; + pg_repack = super.callPackage ./pg_repack.nix { }; - pg_similarity = super.callPackage ./ext/pg_similarity.nix { }; + pg_similarity = super.callPackage ./pg_similarity.nix { }; - pgaudit = super.callPackage ./ext/pgaudit.nix { }; + pgaudit = super.callPackage ./pgaudit.nix { }; - pgroonga = super.callPackage ./ext/pgroonga.nix { }; + pgroonga = super.callPackage ./pgroonga.nix { }; - pgsodium = super.callPackage ./ext/pgsodium.nix { }; + pgsodium = super.callPackage ./pgsodium.nix { }; - pgsql-http = super.callPackage ./ext/pgsql-http.nix { }; + pgsql-http = super.callPackage ./pgsql-http.nix { }; - pgvecto-rs = super.callPackage ./ext/pgvecto-rs { }; + pgvecto-rs = super.callPackage ./pgvecto-rs { }; - pgvector = super.callPackage ./ext/pgvector.nix { }; + pgvector = super.callPackage ./pgvector.nix { }; - plpgsql_check = super.callPackage ./ext/plpgsql_check.nix { }; + plpgsql_check = super.callPackage ./plpgsql_check.nix { }; - plr = super.callPackage ./ext/plr.nix { }; + plr = super.callPackage ./plr.nix { }; - plv8 = super.callPackage ./ext/plv8 { }; + plv8 = super.callPackage ./plv8 { }; - pgjwt = super.callPackage ./ext/pgjwt.nix { }; + pgjwt = super.callPackage ./pgjwt.nix { }; - cstore_fdw = super.callPackage ./ext/cstore_fdw.nix { }; + cstore_fdw = super.callPackage ./cstore_fdw.nix { }; - pg_hll = super.callPackage ./ext/pg_hll.nix { }; + pg_hll = super.callPackage ./pg_hll.nix { }; - pg_cron = super.callPackage ./ext/pg_cron.nix { }; + pg_cron = super.callPackage ./pg_cron.nix { }; - pg_topn = super.callPackage ./ext/pg_topn.nix { }; + pg_topn = super.callPackage ./pg_topn.nix { }; - pg_net = super.callPackage ./ext/pg_net.nix { }; + pg_net = super.callPackage ./pg_net.nix { }; - pgtap = super.callPackage ./ext/pgtap.nix { }; + pgtap = super.callPackage ./pgtap.nix { }; - smlar = super.callPackage ./ext/smlar.nix { }; + smlar = super.callPackage ./smlar.nix { }; - temporal_tables = super.callPackage ./ext/temporal_tables.nix { }; + temporal_tables = super.callPackage ./temporal_tables.nix { }; - timescaledb = super.callPackage ./ext/timescaledb.nix { }; - timescaledb-apache = super.callPackage ./ext/timescaledb.nix { enableUnfree = false; }; + timescaledb = super.callPackage ./timescaledb.nix { }; + timescaledb-apache = super.callPackage ./timescaledb.nix { enableUnfree = false; }; - timescaledb_toolkit = super.callPackage ./ext/timescaledb_toolkit.nix { }; + timescaledb_toolkit = super.callPackage ./timescaledb_toolkit.nix { }; - tsearch_extras = super.callPackage ./ext/tsearch_extras.nix { }; + tsearch_extras = super.callPackage ./tsearch_extras.nix { }; - tds_fdw = super.callPackage ./ext/tds_fdw.nix { }; + tds_fdw = super.callPackage ./tds_fdw.nix { }; - pgrouting = super.callPackage ./ext/pgrouting.nix { }; + pgrouting = super.callPackage ./pgrouting.nix { }; - pg_partman = super.callPackage ./ext/pg_partman.nix { }; + pg_partman = super.callPackage ./pg_partman.nix { }; - pg_relusage = super.callPackage ./ext/pg_relusage.nix { }; + pg_relusage = super.callPackage ./pg_relusage.nix { }; - pg_safeupdate = super.callPackage ./ext/pg_safeupdate.nix { }; + pg_safeupdate = super.callPackage ./pg_safeupdate.nix { }; - pg_squeeze = super.callPackage ./ext/pg_squeeze.nix { }; + pg_squeeze = super.callPackage ./pg_squeeze.nix { }; - pg_uuidv7 = super.callPackage ./ext/pg_uuidv7.nix { }; + pg_uuidv7 = super.callPackage ./pg_uuidv7.nix { }; - promscale_extension = super.callPackage ./ext/promscale_extension.nix { }; + promscale_extension = super.callPackage ./promscale_extension.nix { }; - repmgr = super.callPackage ./ext/repmgr.nix { }; + repmgr = super.callPackage ./repmgr.nix { }; - rum = super.callPackage ./ext/rum.nix { }; + rum = super.callPackage ./rum.nix { }; - tsja = super.callPackage ./ext/tsja.nix { }; + tsja = super.callPackage ./tsja.nix { }; - wal2json = super.callPackage ./ext/wal2json.nix { }; + wal2json = super.callPackage ./wal2json.nix { }; } diff --git a/pkgs/servers/sql/postgresql/ext/ext/h3-pg.nix b/pkgs/servers/sql/postgresql/ext/h3-pg.nix similarity index 100% rename from pkgs/servers/sql/postgresql/ext/ext/h3-pg.nix rename to pkgs/servers/sql/postgresql/ext/h3-pg.nix diff --git a/pkgs/servers/sql/postgresql/ext/ext/hypopg.nix b/pkgs/servers/sql/postgresql/ext/hypopg.nix similarity index 100% rename from pkgs/servers/sql/postgresql/ext/ext/hypopg.nix rename to pkgs/servers/sql/postgresql/ext/hypopg.nix diff --git a/pkgs/servers/sql/postgresql/ext/ext/jsonb_deep_sum.nix b/pkgs/servers/sql/postgresql/ext/jsonb_deep_sum.nix similarity index 100% rename from pkgs/servers/sql/postgresql/ext/ext/jsonb_deep_sum.nix rename to pkgs/servers/sql/postgresql/ext/jsonb_deep_sum.nix diff --git a/pkgs/servers/sql/postgresql/ext/ext/lantern.nix b/pkgs/servers/sql/postgresql/ext/lantern.nix similarity index 100% rename from pkgs/servers/sql/postgresql/ext/ext/lantern.nix rename to pkgs/servers/sql/postgresql/ext/lantern.nix diff --git a/pkgs/servers/sql/postgresql/ext/ext/periods.nix b/pkgs/servers/sql/postgresql/ext/periods.nix similarity index 100% rename from pkgs/servers/sql/postgresql/ext/ext/periods.nix rename to pkgs/servers/sql/postgresql/ext/periods.nix diff --git a/pkgs/servers/sql/postgresql/ext/ext/pg_auto_failover.nix b/pkgs/servers/sql/postgresql/ext/pg_auto_failover.nix similarity index 100% rename from pkgs/servers/sql/postgresql/ext/ext/pg_auto_failover.nix rename to pkgs/servers/sql/postgresql/ext/pg_auto_failover.nix diff --git a/pkgs/servers/sql/postgresql/ext/ext/pg_bigm.nix b/pkgs/servers/sql/postgresql/ext/pg_bigm.nix similarity index 100% rename from pkgs/servers/sql/postgresql/ext/ext/pg_bigm.nix rename to pkgs/servers/sql/postgresql/ext/pg_bigm.nix diff --git a/pkgs/servers/sql/postgresql/ext/ext/pg_cron.nix b/pkgs/servers/sql/postgresql/ext/pg_cron.nix similarity index 100% rename from pkgs/servers/sql/postgresql/ext/ext/pg_cron.nix rename to pkgs/servers/sql/postgresql/ext/pg_cron.nix diff --git a/pkgs/servers/sql/postgresql/ext/ext/pg_ed25519.nix b/pkgs/servers/sql/postgresql/ext/pg_ed25519.nix similarity index 100% rename from pkgs/servers/sql/postgresql/ext/ext/pg_ed25519.nix rename to pkgs/servers/sql/postgresql/ext/pg_ed25519.nix diff --git a/pkgs/servers/sql/postgresql/ext/ext/pg_embedding.nix b/pkgs/servers/sql/postgresql/ext/pg_embedding.nix similarity index 100% rename from pkgs/servers/sql/postgresql/ext/ext/pg_embedding.nix rename to pkgs/servers/sql/postgresql/ext/pg_embedding.nix diff --git a/pkgs/servers/sql/postgresql/ext/ext/pg_hint_plan.nix b/pkgs/servers/sql/postgresql/ext/pg_hint_plan.nix similarity index 100% rename from pkgs/servers/sql/postgresql/ext/ext/pg_hint_plan.nix rename to pkgs/servers/sql/postgresql/ext/pg_hint_plan.nix diff --git a/pkgs/servers/sql/postgresql/ext/ext/pg_hll.nix b/pkgs/servers/sql/postgresql/ext/pg_hll.nix similarity index 100% rename from pkgs/servers/sql/postgresql/ext/ext/pg_hll.nix rename to pkgs/servers/sql/postgresql/ext/pg_hll.nix diff --git a/pkgs/servers/sql/postgresql/ext/ext/pg_ivm.nix b/pkgs/servers/sql/postgresql/ext/pg_ivm.nix similarity index 100% rename from pkgs/servers/sql/postgresql/ext/ext/pg_ivm.nix rename to pkgs/servers/sql/postgresql/ext/pg_ivm.nix diff --git a/pkgs/servers/sql/postgresql/ext/ext/pg_net.nix b/pkgs/servers/sql/postgresql/ext/pg_net.nix similarity index 100% rename from pkgs/servers/sql/postgresql/ext/ext/pg_net.nix rename to pkgs/servers/sql/postgresql/ext/pg_net.nix diff --git a/pkgs/servers/sql/postgresql/ext/ext/pg_partman.nix b/pkgs/servers/sql/postgresql/ext/pg_partman.nix similarity index 100% rename from pkgs/servers/sql/postgresql/ext/ext/pg_partman.nix rename to pkgs/servers/sql/postgresql/ext/pg_partman.nix diff --git a/pkgs/servers/sql/postgresql/ext/ext/pg_rational.nix b/pkgs/servers/sql/postgresql/ext/pg_rational.nix similarity index 100% rename from pkgs/servers/sql/postgresql/ext/ext/pg_rational.nix rename to pkgs/servers/sql/postgresql/ext/pg_rational.nix diff --git a/pkgs/servers/sql/postgresql/ext/ext/pg_relusage.nix b/pkgs/servers/sql/postgresql/ext/pg_relusage.nix similarity index 100% rename from pkgs/servers/sql/postgresql/ext/ext/pg_relusage.nix rename to pkgs/servers/sql/postgresql/ext/pg_relusage.nix diff --git a/pkgs/servers/sql/postgresql/ext/ext/pg_repack.nix b/pkgs/servers/sql/postgresql/ext/pg_repack.nix similarity index 100% rename from pkgs/servers/sql/postgresql/ext/ext/pg_repack.nix rename to pkgs/servers/sql/postgresql/ext/pg_repack.nix diff --git a/pkgs/servers/sql/postgresql/ext/ext/pg_safeupdate.nix b/pkgs/servers/sql/postgresql/ext/pg_safeupdate.nix similarity index 100% rename from pkgs/servers/sql/postgresql/ext/ext/pg_safeupdate.nix rename to pkgs/servers/sql/postgresql/ext/pg_safeupdate.nix diff --git a/pkgs/servers/sql/postgresql/ext/ext/pg_similarity.nix b/pkgs/servers/sql/postgresql/ext/pg_similarity.nix similarity index 100% rename from pkgs/servers/sql/postgresql/ext/ext/pg_similarity.nix rename to pkgs/servers/sql/postgresql/ext/pg_similarity.nix diff --git a/pkgs/servers/sql/postgresql/ext/ext/pg_squeeze.nix b/pkgs/servers/sql/postgresql/ext/pg_squeeze.nix similarity index 100% rename from pkgs/servers/sql/postgresql/ext/ext/pg_squeeze.nix rename to pkgs/servers/sql/postgresql/ext/pg_squeeze.nix diff --git a/pkgs/servers/sql/postgresql/ext/ext/pg_topn.nix b/pkgs/servers/sql/postgresql/ext/pg_topn.nix similarity index 100% rename from pkgs/servers/sql/postgresql/ext/ext/pg_topn.nix rename to pkgs/servers/sql/postgresql/ext/pg_topn.nix diff --git a/pkgs/servers/sql/postgresql/ext/ext/pg_uuidv7.nix b/pkgs/servers/sql/postgresql/ext/pg_uuidv7.nix similarity index 100% rename from pkgs/servers/sql/postgresql/ext/ext/pg_uuidv7.nix rename to pkgs/servers/sql/postgresql/ext/pg_uuidv7.nix diff --git a/pkgs/servers/sql/postgresql/ext/ext/pgaudit.nix b/pkgs/servers/sql/postgresql/ext/pgaudit.nix similarity index 100% rename from pkgs/servers/sql/postgresql/ext/ext/pgaudit.nix rename to pkgs/servers/sql/postgresql/ext/pgaudit.nix diff --git a/pkgs/servers/sql/postgresql/ext/ext/pgjwt.nix b/pkgs/servers/sql/postgresql/ext/pgjwt.nix similarity index 100% rename from pkgs/servers/sql/postgresql/ext/ext/pgjwt.nix rename to pkgs/servers/sql/postgresql/ext/pgjwt.nix diff --git a/pkgs/servers/sql/postgresql/ext/ext/pgroonga.nix b/pkgs/servers/sql/postgresql/ext/pgroonga.nix similarity index 100% rename from pkgs/servers/sql/postgresql/ext/ext/pgroonga.nix rename to pkgs/servers/sql/postgresql/ext/pgroonga.nix diff --git a/pkgs/servers/sql/postgresql/ext/ext/pgrouting.nix b/pkgs/servers/sql/postgresql/ext/pgrouting.nix similarity index 100% rename from pkgs/servers/sql/postgresql/ext/ext/pgrouting.nix rename to pkgs/servers/sql/postgresql/ext/pgrouting.nix diff --git a/pkgs/servers/sql/postgresql/ext/ext/pgsodium.nix b/pkgs/servers/sql/postgresql/ext/pgsodium.nix similarity index 100% rename from pkgs/servers/sql/postgresql/ext/ext/pgsodium.nix rename to pkgs/servers/sql/postgresql/ext/pgsodium.nix diff --git a/pkgs/servers/sql/postgresql/ext/ext/pgsql-http.nix b/pkgs/servers/sql/postgresql/ext/pgsql-http.nix similarity index 100% rename from pkgs/servers/sql/postgresql/ext/ext/pgsql-http.nix rename to pkgs/servers/sql/postgresql/ext/pgsql-http.nix diff --git a/pkgs/servers/sql/postgresql/ext/ext/pgtap.nix b/pkgs/servers/sql/postgresql/ext/pgtap.nix similarity index 100% rename from pkgs/servers/sql/postgresql/ext/ext/pgtap.nix rename to pkgs/servers/sql/postgresql/ext/pgtap.nix diff --git a/pkgs/servers/sql/postgresql/ext/ext/pgvector.nix b/pkgs/servers/sql/postgresql/ext/pgvector.nix similarity index 100% rename from pkgs/servers/sql/postgresql/ext/ext/pgvector.nix rename to pkgs/servers/sql/postgresql/ext/pgvector.nix diff --git a/pkgs/servers/sql/postgresql/ext/ext/plpgsql_check.nix b/pkgs/servers/sql/postgresql/ext/plpgsql_check.nix similarity index 100% rename from pkgs/servers/sql/postgresql/ext/ext/plpgsql_check.nix rename to pkgs/servers/sql/postgresql/ext/plpgsql_check.nix diff --git a/pkgs/servers/sql/postgresql/ext/ext/plr.nix b/pkgs/servers/sql/postgresql/ext/plr.nix similarity index 100% rename from pkgs/servers/sql/postgresql/ext/ext/plr.nix rename to pkgs/servers/sql/postgresql/ext/plr.nix diff --git a/pkgs/servers/sql/postgresql/ext/ext/plv8/0001-build-Allow-using-V8-from-system.patch b/pkgs/servers/sql/postgresql/ext/plv8/0001-build-Allow-using-V8-from-system.patch similarity index 100% rename from pkgs/servers/sql/postgresql/ext/ext/plv8/0001-build-Allow-using-V8-from-system.patch rename to pkgs/servers/sql/postgresql/ext/plv8/0001-build-Allow-using-V8-from-system.patch diff --git a/pkgs/servers/sql/postgresql/ext/ext/plv8/default.nix b/pkgs/servers/sql/postgresql/ext/plv8/default.nix similarity index 100% rename from pkgs/servers/sql/postgresql/ext/ext/plv8/default.nix rename to pkgs/servers/sql/postgresql/ext/plv8/default.nix diff --git a/pkgs/servers/sql/postgresql/ext/ext/postgis.nix b/pkgs/servers/sql/postgresql/ext/postgis.nix similarity index 100% rename from pkgs/servers/sql/postgresql/ext/ext/postgis.nix rename to pkgs/servers/sql/postgresql/ext/postgis.nix diff --git a/pkgs/servers/sql/postgresql/ext/ext/promscale_extension.nix b/pkgs/servers/sql/postgresql/ext/promscale_extension.nix similarity index 100% rename from pkgs/servers/sql/postgresql/ext/ext/promscale_extension.nix rename to pkgs/servers/sql/postgresql/ext/promscale_extension.nix diff --git a/pkgs/servers/sql/postgresql/ext/ext/repmgr.nix b/pkgs/servers/sql/postgresql/ext/repmgr.nix similarity index 100% rename from pkgs/servers/sql/postgresql/ext/ext/repmgr.nix rename to pkgs/servers/sql/postgresql/ext/repmgr.nix diff --git a/pkgs/servers/sql/postgresql/ext/ext/rum.nix b/pkgs/servers/sql/postgresql/ext/rum.nix similarity index 100% rename from pkgs/servers/sql/postgresql/ext/ext/rum.nix rename to pkgs/servers/sql/postgresql/ext/rum.nix diff --git a/pkgs/servers/sql/postgresql/ext/ext/smlar.nix b/pkgs/servers/sql/postgresql/ext/smlar.nix similarity index 100% rename from pkgs/servers/sql/postgresql/ext/ext/smlar.nix rename to pkgs/servers/sql/postgresql/ext/smlar.nix diff --git a/pkgs/servers/sql/postgresql/ext/ext/tds_fdw.nix b/pkgs/servers/sql/postgresql/ext/tds_fdw.nix similarity index 100% rename from pkgs/servers/sql/postgresql/ext/ext/tds_fdw.nix rename to pkgs/servers/sql/postgresql/ext/tds_fdw.nix diff --git a/pkgs/servers/sql/postgresql/ext/ext/temporal_tables.nix b/pkgs/servers/sql/postgresql/ext/temporal_tables.nix similarity index 100% rename from pkgs/servers/sql/postgresql/ext/ext/temporal_tables.nix rename to pkgs/servers/sql/postgresql/ext/temporal_tables.nix diff --git a/pkgs/servers/sql/postgresql/ext/ext/timescaledb.nix b/pkgs/servers/sql/postgresql/ext/timescaledb.nix similarity index 100% rename from pkgs/servers/sql/postgresql/ext/ext/timescaledb.nix rename to pkgs/servers/sql/postgresql/ext/timescaledb.nix diff --git a/pkgs/servers/sql/postgresql/ext/ext/timescaledb_toolkit.nix b/pkgs/servers/sql/postgresql/ext/timescaledb_toolkit.nix similarity index 100% rename from pkgs/servers/sql/postgresql/ext/ext/timescaledb_toolkit.nix rename to pkgs/servers/sql/postgresql/ext/timescaledb_toolkit.nix diff --git a/pkgs/servers/sql/postgresql/ext/ext/tsearch_extras.nix b/pkgs/servers/sql/postgresql/ext/tsearch_extras.nix similarity index 100% rename from pkgs/servers/sql/postgresql/ext/ext/tsearch_extras.nix rename to pkgs/servers/sql/postgresql/ext/tsearch_extras.nix diff --git a/pkgs/servers/sql/postgresql/ext/ext/tsja.nix b/pkgs/servers/sql/postgresql/ext/tsja.nix similarity index 100% rename from pkgs/servers/sql/postgresql/ext/ext/tsja.nix rename to pkgs/servers/sql/postgresql/ext/tsja.nix diff --git a/pkgs/servers/sql/postgresql/ext/ext/wal2json.nix b/pkgs/servers/sql/postgresql/ext/wal2json.nix similarity index 100% rename from pkgs/servers/sql/postgresql/ext/ext/wal2json.nix rename to pkgs/servers/sql/postgresql/ext/wal2json.nix From 4c8e7af9416730d45667ca55c3e3367adceb89be Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Sat, 2 Mar 2024 12:43:09 +0100 Subject: [PATCH 10/44] postgresql: refactor to remove useless references to "self" No need to reference self here, because llvmPackages / stdenv' are available in that scope anyway. Pure refactor, derivations don't change. --- pkgs/servers/sql/postgresql/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix index 015150bfd7a4..c769fff259c7 100644 --- a/pkgs/servers/sql/postgresql/default.nix +++ b/pkgs/servers/sql/postgresql/default.nix @@ -208,18 +208,18 @@ let moveToOutput "lib/llvmjit*" "$out" # In the case of JIT support, prevent a retained dependency on clang-wrapper - substituteInPlace "$out/lib/pgxs/src/Makefile.global" --replace ${self.llvmPackages.stdenv.cc}/bin/clang clang + substituteInPlace "$out/lib/pgxs/src/Makefile.global" --replace ${stdenv'.cc}/bin/clang clang nuke-refs $out/lib/llvmjit_types.bc $(find $out/lib/bitcode -type f) # Stop out depending on the default output of llvm substituteInPlace $out/lib/pgxs/src/Makefile.global \ - --replace ${self.llvmPackages.llvm.out}/bin "" \ + --replace ${llvmPackages.llvm.out}/bin "" \ --replace '$(LLVM_BINPATH)/' "" # Stop out depending on the -dev output of llvm substituteInPlace $out/lib/pgxs/src/Makefile.global \ - --replace ${self.llvmPackages.llvm.dev}/bin/llvm-config llvm-config \ - --replace -I${self.llvmPackages.llvm.dev}/include "" + --replace ${llvmPackages.llvm.dev}/bin/llvm-config llvm-config \ + --replace -I${llvmPackages.llvm.dev}/include "" ${lib.optionalString (!stdenv'.isDarwin) '' # Stop lib depending on the -dev output of llvm From 9af8c0a3b7ef345ff0c32e65f110ac71f8a139a7 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Sat, 2 Mar 2024 12:19:25 +0100 Subject: [PATCH 11/44] postgresql: refactor to split up default.nix (1/2) This just renames default.nix to generic.nix, because the biggest chunk of code should move that way in the next commit. This gives us a much better diff for the next commit and makes rebasing **much** easier in case of changes. This commit does not stand on its own and needs to go in with the next commit (2/2). --- pkgs/servers/sql/postgresql/{default.nix => generic.nix} | 0 pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename pkgs/servers/sql/postgresql/{default.nix => generic.nix} (100%) diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/generic.nix similarity index 100% rename from pkgs/servers/sql/postgresql/default.nix rename to pkgs/servers/sql/postgresql/generic.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 02964f0d1fd3..00739c166258 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -26735,7 +26735,7 @@ with pkgs; timescaledb-tune = callPackage ../development/tools/database/timescaledb-tune { }; - inherit (import ../servers/sql/postgresql pkgs) + inherit (import ../servers/sql/postgresql/generic.nix pkgs) postgresql_12 postgresql_13 postgresql_14 From 1d9f2bd7266d46b2f3abaefb5fadba26f0eb8e1a Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Thu, 29 Feb 2024 13:47:03 +0100 Subject: [PATCH 12/44] postgresql: refactor to split up default.nix (2/2) The recommended [1] structure for a package regarding versioning is to have each version in a separate file. This commit just mechanically copies code around without any changes. Pure refactor, not changing any derivations. [1]: pkgs/README.md --- pkgs/servers/sql/postgresql/12.nix | 5 ++ pkgs/servers/sql/postgresql/13.nix | 5 ++ pkgs/servers/sql/postgresql/14.nix | 5 ++ pkgs/servers/sql/postgresql/15.nix | 5 ++ pkgs/servers/sql/postgresql/16.nix | 5 ++ pkgs/servers/sql/postgresql/default.nix | 43 +++++++++++++++++ pkgs/servers/sql/postgresql/generic.nix | 63 +++---------------------- pkgs/top-level/all-packages.nix | 2 +- 8 files changed, 75 insertions(+), 58 deletions(-) create mode 100644 pkgs/servers/sql/postgresql/12.nix create mode 100644 pkgs/servers/sql/postgresql/13.nix create mode 100644 pkgs/servers/sql/postgresql/14.nix create mode 100644 pkgs/servers/sql/postgresql/15.nix create mode 100644 pkgs/servers/sql/postgresql/16.nix create mode 100644 pkgs/servers/sql/postgresql/default.nix diff --git a/pkgs/servers/sql/postgresql/12.nix b/pkgs/servers/sql/postgresql/12.nix new file mode 100644 index 000000000000..4979df61136e --- /dev/null +++ b/pkgs/servers/sql/postgresql/12.nix @@ -0,0 +1,5 @@ +import ./generic.nix { + version = "12.18"; + psqlSchema = "12"; + hash = "sha256-T5kZcl2UHOmGjgf+HtHTqGdIWZtIM4ZUdYOSi3TDkYo="; +} diff --git a/pkgs/servers/sql/postgresql/13.nix b/pkgs/servers/sql/postgresql/13.nix new file mode 100644 index 000000000000..61985518ce61 --- /dev/null +++ b/pkgs/servers/sql/postgresql/13.nix @@ -0,0 +1,5 @@ +import ./generic.nix { + version = "13.14"; + psqlSchema = "13"; + hash = "sha256-uN8HhVGJiWC9UA3F04oXfpkFN234H+fytmChQH+mpe0="; +} diff --git a/pkgs/servers/sql/postgresql/14.nix b/pkgs/servers/sql/postgresql/14.nix new file mode 100644 index 000000000000..efd7da0778ab --- /dev/null +++ b/pkgs/servers/sql/postgresql/14.nix @@ -0,0 +1,5 @@ +import ./generic.nix { + version = "14.11"; + psqlSchema = "14"; + hash = "sha256-pnC9fc4i3K1Cl7JhE2s7HUoJpvVBcZViqhTKY78paKg="; +} diff --git a/pkgs/servers/sql/postgresql/15.nix b/pkgs/servers/sql/postgresql/15.nix new file mode 100644 index 000000000000..4efb790542be --- /dev/null +++ b/pkgs/servers/sql/postgresql/15.nix @@ -0,0 +1,5 @@ +import ./generic.nix { + version = "15.6"; + psqlSchema = "15"; + hash = "sha256-hFUUbtnGnJOlfelUrq0DAsr60DXCskIXXWqh4X68svs="; +} diff --git a/pkgs/servers/sql/postgresql/16.nix b/pkgs/servers/sql/postgresql/16.nix new file mode 100644 index 000000000000..2dfc54277df1 --- /dev/null +++ b/pkgs/servers/sql/postgresql/16.nix @@ -0,0 +1,5 @@ +import ./generic.nix { + version = "16.2"; + psqlSchema = "16"; + hash = "sha256-RG6IKU28LJCFq0twYaZG+mBLS+wDUh1epnHC5a2bKVI="; +} diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix new file mode 100644 index 000000000000..fc242d08ec0b --- /dev/null +++ b/pkgs/servers/sql/postgresql/default.nix @@ -0,0 +1,43 @@ +let + mkPackages = self: { + postgresql_12 = import ./12.nix { + this = self.postgresql_12; + thisAttr = "postgresql_12"; + inherit self; + }; + + postgresql_13 = import ./13.nix { + this = self.postgresql_13; + thisAttr = "postgresql_13"; + inherit self; + }; + + postgresql_14 = import ./14.nix { + this = self.postgresql_14; + thisAttr = "postgresql_14"; + inherit self; + }; + + postgresql_15 = import ./15.nix { + this = self.postgresql_15; + thisAttr = "postgresql_15"; + inherit self; + }; + + postgresql_16 = import ./16.nix { + this = self.postgresql_16; + thisAttr = "postgresql_16"; + inherit self; + }; + }; + +in self: + let packages = mkPackages self; in + packages + // self.lib.mapAttrs' + (attrName: postgres: self.lib.nameValuePair "${attrName}_jit" (postgres.override rec { + jitSupport = true; + thisAttr = "${attrName}_jit"; + this = self.${thisAttr}; + })) + packages diff --git a/pkgs/servers/sql/postgresql/generic.nix b/pkgs/servers/sql/postgresql/generic.nix index c769fff259c7..2e8054060a3a 100644 --- a/pkgs/servers/sql/postgresql/generic.nix +++ b/pkgs/servers/sql/postgresql/generic.nix @@ -353,60 +353,9 @@ let passthru.psqlSchema = postgresql.psqlSchema; }; - mkPackages = self: { - postgresql_12 = self.callPackage generic { - version = "12.18"; - psqlSchema = "12"; - hash = "sha256-T5kZcl2UHOmGjgf+HtHTqGdIWZtIM4ZUdYOSi3TDkYo="; - this = self.postgresql_12; - thisAttr = "postgresql_12"; - inherit self; - }; - - postgresql_13 = self.callPackage generic { - version = "13.14"; - psqlSchema = "13"; - hash = "sha256-uN8HhVGJiWC9UA3F04oXfpkFN234H+fytmChQH+mpe0="; - this = self.postgresql_13; - thisAttr = "postgresql_13"; - inherit self; - }; - - postgresql_14 = self.callPackage generic { - version = "14.11"; - psqlSchema = "14"; - hash = "sha256-pnC9fc4i3K1Cl7JhE2s7HUoJpvVBcZViqhTKY78paKg="; - this = self.postgresql_14; - thisAttr = "postgresql_14"; - inherit self; - }; - - postgresql_15 = self.callPackage generic { - version = "15.6"; - psqlSchema = "15"; - hash = "sha256-hFUUbtnGnJOlfelUrq0DAsr60DXCskIXXWqh4X68svs="; - this = self.postgresql_15; - thisAttr = "postgresql_15"; - inherit self; - }; - - postgresql_16 = self.callPackage generic { - version = "16.2"; - psqlSchema = "16"; - hash = "sha256-RG6IKU28LJCFq0twYaZG+mBLS+wDUh1epnHC5a2bKVI="; - this = self.postgresql_16; - thisAttr = "postgresql_16"; - inherit self; - }; - }; - -in self: - let packages = mkPackages self; in - packages - // self.lib.mapAttrs' - (attrName: postgres: self.lib.nameValuePair "${attrName}_jit" (postgres.override rec { - jitSupport = true; - thisAttr = "${attrName}_jit"; - this = self.${thisAttr}; - })) - packages +in +# passed by .nix +versionArgs: +# passed by default.nix +{ self, ... } @defaultArgs: +self.callPackage generic (defaultArgs // versionArgs) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 00739c166258..02964f0d1fd3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -26735,7 +26735,7 @@ with pkgs; timescaledb-tune = callPackage ../development/tools/database/timescaledb-tune { }; - inherit (import ../servers/sql/postgresql/generic.nix pkgs) + inherit (import ../servers/sql/postgresql pkgs) postgresql_12 postgresql_13 postgresql_14 From 62635c9643b6b44d621508324fdc200d46222382 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Thu, 29 Feb 2024 14:05:47 +0100 Subject: [PATCH 13/44] postgresql: refactor mkPackages in default.nix Refactors some low hanging fruit in default.nix to make it easier to add new versions later on. Pure refactor, not changing any derivations. This change makes it easier to add new versions in default.nix without messing up - and also prevents us from adding version-specific arguments in default.nix by accident in the future. Those should be put in the versioned .nix files instead. --- pkgs/servers/sql/postgresql/default.nix | 62 +++++++++---------------- pkgs/servers/sql/postgresql/generic.nix | 2 +- 2 files changed, 23 insertions(+), 41 deletions(-) diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix index fc242d08ec0b..d8acae8787a6 100644 --- a/pkgs/servers/sql/postgresql/default.nix +++ b/pkgs/servers/sql/postgresql/default.nix @@ -1,43 +1,25 @@ +self: let - mkPackages = self: { - postgresql_12 = import ./12.nix { - this = self.postgresql_12; - thisAttr = "postgresql_12"; - inherit self; - }; - - postgresql_13 = import ./13.nix { - this = self.postgresql_13; - thisAttr = "postgresql_13"; - inherit self; - }; - - postgresql_14 = import ./14.nix { - this = self.postgresql_14; - thisAttr = "postgresql_14"; - inherit self; - }; - - postgresql_15 = import ./15.nix { - this = self.postgresql_15; - thisAttr = "postgresql_15"; - inherit self; - }; - - postgresql_16 = import ./16.nix { - this = self.postgresql_16; - thisAttr = "postgresql_16"; - inherit self; - }; + versions = { + postgresql_12 = ./12.nix; + postgresql_13 = ./13.nix; + postgresql_14 = ./14.nix; + postgresql_15 = ./15.nix; + postgresql_16 = ./16.nix; }; -in self: - let packages = mkPackages self; in - packages - // self.lib.mapAttrs' - (attrName: postgres: self.lib.nameValuePair "${attrName}_jit" (postgres.override rec { - jitSupport = true; - thisAttr = "${attrName}_jit"; - this = self.${thisAttr}; - })) - packages + mkAttributes = jitSupport: + self.lib.mapAttrs' (version: path: + let + attrName = if jitSupport then "${version}_jit" else version; + in + self.lib.nameValuePair attrName (import path { + inherit jitSupport self; + thisAttr = attrName; + this = self.${attrName}; + }) + ) versions; + +in +# variations without and with JIT +(mkAttributes false) // (mkAttributes true) diff --git a/pkgs/servers/sql/postgresql/generic.nix b/pkgs/servers/sql/postgresql/generic.nix index 2e8054060a3a..f2f13a5fadba 100644 --- a/pkgs/servers/sql/postgresql/generic.nix +++ b/pkgs/servers/sql/postgresql/generic.nix @@ -21,7 +21,7 @@ let , testers, nixosTests, thisAttr # JIT - , jitSupport ? false + , jitSupport , nukeReferences, patchelf, llvmPackages , makeRustPlatform, buildPgxExtension, cargo, rustc From a92a323a1d0c80aae979112030852ba8b776db4d Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Sat, 2 Mar 2024 12:31:12 +0100 Subject: [PATCH 14/44] postgresql: refactor to remove passthru's readline attribute This seems to have been introduced 20 years ago in 5863d4f - but seems to have been a copy&paste mistake from the beginning. AFAICT, it's not used anywhere. --- pkgs/servers/sql/postgresql/generic.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/sql/postgresql/generic.nix b/pkgs/servers/sql/postgresql/generic.nix index f2f13a5fadba..9b000274d4fa 100644 --- a/pkgs/servers/sql/postgresql/generic.nix +++ b/pkgs/servers/sql/postgresql/generic.nix @@ -262,7 +262,7 @@ let }; in { - inherit readline psqlSchema jitSupport; + inherit psqlSchema jitSupport; withJIT = if jitSupport then this else jitToggle; withoutJIT = if jitSupport then jitToggle else this; From 82e6c4a6094579fa1e3aace27015f5c505e6f6e0 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Sat, 2 Mar 2024 12:37:04 +0100 Subject: [PATCH 15/44] postgresql: refactor to remove psqlSchema argument The passthru attribute is still set, but automatically created from the major version number. Fewer moving parts decrease the chance for mistakes. --- pkgs/servers/sql/postgresql/12.nix | 1 - pkgs/servers/sql/postgresql/13.nix | 1 - pkgs/servers/sql/postgresql/14.nix | 1 - pkgs/servers/sql/postgresql/15.nix | 1 - pkgs/servers/sql/postgresql/16.nix | 1 - pkgs/servers/sql/postgresql/generic.nix | 5 +++-- 6 files changed, 3 insertions(+), 7 deletions(-) diff --git a/pkgs/servers/sql/postgresql/12.nix b/pkgs/servers/sql/postgresql/12.nix index 4979df61136e..d29fc7683048 100644 --- a/pkgs/servers/sql/postgresql/12.nix +++ b/pkgs/servers/sql/postgresql/12.nix @@ -1,5 +1,4 @@ import ./generic.nix { version = "12.18"; - psqlSchema = "12"; hash = "sha256-T5kZcl2UHOmGjgf+HtHTqGdIWZtIM4ZUdYOSi3TDkYo="; } diff --git a/pkgs/servers/sql/postgresql/13.nix b/pkgs/servers/sql/postgresql/13.nix index 61985518ce61..ba458dfd1909 100644 --- a/pkgs/servers/sql/postgresql/13.nix +++ b/pkgs/servers/sql/postgresql/13.nix @@ -1,5 +1,4 @@ import ./generic.nix { version = "13.14"; - psqlSchema = "13"; hash = "sha256-uN8HhVGJiWC9UA3F04oXfpkFN234H+fytmChQH+mpe0="; } diff --git a/pkgs/servers/sql/postgresql/14.nix b/pkgs/servers/sql/postgresql/14.nix index efd7da0778ab..b0de8af650ae 100644 --- a/pkgs/servers/sql/postgresql/14.nix +++ b/pkgs/servers/sql/postgresql/14.nix @@ -1,5 +1,4 @@ import ./generic.nix { version = "14.11"; - psqlSchema = "14"; hash = "sha256-pnC9fc4i3K1Cl7JhE2s7HUoJpvVBcZViqhTKY78paKg="; } diff --git a/pkgs/servers/sql/postgresql/15.nix b/pkgs/servers/sql/postgresql/15.nix index 4efb790542be..00dfc0cbbc19 100644 --- a/pkgs/servers/sql/postgresql/15.nix +++ b/pkgs/servers/sql/postgresql/15.nix @@ -1,5 +1,4 @@ import ./generic.nix { version = "15.6"; - psqlSchema = "15"; hash = "sha256-hFUUbtnGnJOlfelUrq0DAsr60DXCskIXXWqh4X68svs="; } diff --git a/pkgs/servers/sql/postgresql/16.nix b/pkgs/servers/sql/postgresql/16.nix index 2dfc54277df1..cdc37b7c62f5 100644 --- a/pkgs/servers/sql/postgresql/16.nix +++ b/pkgs/servers/sql/postgresql/16.nix @@ -1,5 +1,4 @@ import ./generic.nix { version = "16.2"; - psqlSchema = "16"; hash = "sha256-RG6IKU28LJCFq0twYaZG+mBLS+wDUh1epnHC5a2bKVI="; } diff --git a/pkgs/servers/sql/postgresql/generic.nix b/pkgs/servers/sql/postgresql/generic.nix index 9b000274d4fa..3b0a3ea643b2 100644 --- a/pkgs/servers/sql/postgresql/generic.nix +++ b/pkgs/servers/sql/postgresql/generic.nix @@ -15,7 +15,7 @@ let , this, self, newScope, buildEnv # source specification - , version, hash, psqlSchema + , version, hash # for tests , testers, nixosTests, thisAttr @@ -262,7 +262,8 @@ let }; in { - inherit psqlSchema jitSupport; + inherit jitSupport; + psqlSchema = lib.versions.major version; withJIT = if jitSupport then this else jitToggle; withoutJIT = if jitSupport then jitToggle else this; From b301c01e3121068b29c04d26fdcd2a71db92fc4d Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Thu, 29 Feb 2024 14:53:46 +0100 Subject: [PATCH 16/44] postgresql: refactor to move musl patches into versioned .nix files This makes it obvious that the required argument muslPatches must be passed when creating a new version file. Pure refactor, not changing any derivations. --- pkgs/servers/sql/postgresql/12.nix | 6 ++++ pkgs/servers/sql/postgresql/13.nix | 10 ++++++ pkgs/servers/sql/postgresql/14.nix | 10 ++++++ pkgs/servers/sql/postgresql/15.nix | 6 ++++ pkgs/servers/sql/postgresql/16.nix | 6 ++++ pkgs/servers/sql/postgresql/generic.nix | 45 ++----------------------- 6 files changed, 40 insertions(+), 43 deletions(-) diff --git a/pkgs/servers/sql/postgresql/12.nix b/pkgs/servers/sql/postgresql/12.nix index d29fc7683048..9e0388be0451 100644 --- a/pkgs/servers/sql/postgresql/12.nix +++ b/pkgs/servers/sql/postgresql/12.nix @@ -1,4 +1,10 @@ import ./generic.nix { version = "12.18"; hash = "sha256-T5kZcl2UHOmGjgf+HtHTqGdIWZtIM4ZUdYOSi3TDkYo="; + muslPatches = { + icu-collations-hack = { + url = "https://git.alpinelinux.org/aports/plain/testing/postgresql12/icu-collations-hack.patch?id=d5227c91adda59d4e7f55f13468f0314e8869174"; + hash = "sha256-wuwjvGHArkRNwFo40g3p43W32OrJohretlt6iSRlJKg="; + }; + }; } diff --git a/pkgs/servers/sql/postgresql/13.nix b/pkgs/servers/sql/postgresql/13.nix index ba458dfd1909..a4870812acdb 100644 --- a/pkgs/servers/sql/postgresql/13.nix +++ b/pkgs/servers/sql/postgresql/13.nix @@ -1,4 +1,14 @@ import ./generic.nix { version = "13.14"; hash = "sha256-uN8HhVGJiWC9UA3F04oXfpkFN234H+fytmChQH+mpe0="; + muslPatches = { + icu-collations-hack = { + url = "https://git.alpinelinux.org/aports/plain/main/postgresql14/icu-collations-hack.patch?id=56999e6d0265ceff5c5239f85fdd33e146f06cb7"; + hash = "sha256-wuwjvGHArkRNwFo40g3p43W32OrJohretlt6iSRlJKg="; + }; + disable-test-collate-icu-utf8 = { + url = "https://git.alpinelinux.org/aports/plain/main/postgresql13/disable-test-collate.icu.utf8.patch?id=69faa146ec9fff3b981511068f17f9e629d4688b"; + hash = "sha256-jS/qxezaiaKhkWeMCXwpz1SDJwUWn9tzN0uKaZ3Ph2Y="; + }; + }; } diff --git a/pkgs/servers/sql/postgresql/14.nix b/pkgs/servers/sql/postgresql/14.nix index b0de8af650ae..2de876cf4ad6 100644 --- a/pkgs/servers/sql/postgresql/14.nix +++ b/pkgs/servers/sql/postgresql/14.nix @@ -1,4 +1,14 @@ import ./generic.nix { version = "14.11"; hash = "sha256-pnC9fc4i3K1Cl7JhE2s7HUoJpvVBcZViqhTKY78paKg="; + muslPatches = { + icu-collations-hack = { + url = "https://git.alpinelinux.org/aports/plain/main/postgresql14/icu-collations-hack.patch?id=56999e6d0265ceff5c5239f85fdd33e146f06cb7"; + hash = "sha256-wuwjvGHArkRNwFo40g3p43W32OrJohretlt6iSRlJKg="; + }; + disable-test-collate-icu-utf8 = { + url = "https://git.alpinelinux.org/aports/plain/main/postgresql14/disable-test-collate.icu.utf8.patch?id=56999e6d0265ceff5c5239f85fdd33e146f06cb7"; + hash = "sha256-jXe23AxnFjEl+TZQm4R7rStk2Leo08ctxMNmu1xr5zM="; + }; + }; } diff --git a/pkgs/servers/sql/postgresql/15.nix b/pkgs/servers/sql/postgresql/15.nix index 00dfc0cbbc19..f633dc975085 100644 --- a/pkgs/servers/sql/postgresql/15.nix +++ b/pkgs/servers/sql/postgresql/15.nix @@ -1,4 +1,10 @@ import ./generic.nix { version = "15.6"; hash = "sha256-hFUUbtnGnJOlfelUrq0DAsr60DXCskIXXWqh4X68svs="; + muslPatches = { + icu-collations-hack = { + url = "https://git.alpinelinux.org/aports/plain/main/postgresql15/icu-collations-hack.patch?id=f424e934e6d076c4ae065ce45e734aa283eecb9c"; + hash = "sha256-HgtmhF4OJYU9macGJbTB9PjQi/yW7c3Akm3U0niWs8I="; + }; + }; } diff --git a/pkgs/servers/sql/postgresql/16.nix b/pkgs/servers/sql/postgresql/16.nix index cdc37b7c62f5..6a6420643b31 100644 --- a/pkgs/servers/sql/postgresql/16.nix +++ b/pkgs/servers/sql/postgresql/16.nix @@ -1,4 +1,10 @@ import ./generic.nix { version = "16.2"; hash = "sha256-RG6IKU28LJCFq0twYaZG+mBLS+wDUh1epnHC5a2bKVI="; + muslPatches = { + icu-collations-hack = { + url = "https://git.alpinelinux.org/aports/plain/main/postgresql16/icu-collations-hack.patch?id=08a24be262339fd093e641860680944c3590238e"; + hash = "sha256-+urQdVIlADLdDPeT68XYv5rljhbK8M/7mPZn/cF+FT0="; + }; + }; } diff --git a/pkgs/servers/sql/postgresql/generic.nix b/pkgs/servers/sql/postgresql/generic.nix index 3b0a3ea643b2..cdcffc5f135c 100644 --- a/pkgs/servers/sql/postgresql/generic.nix +++ b/pkgs/servers/sql/postgresql/generic.nix @@ -15,7 +15,7 @@ let , this, self, newScope, buildEnv # source specification - , version, hash + , version, hash, muslPatches # for tests , testers, nixosTests, thisAttr @@ -121,48 +121,7 @@ let }) ] ++ lib.optionals stdenv'.hostPlatform.isMusl ( - let - self = { - "12" = { - icu-collations-hack = fetchurl { - url = "https://git.alpinelinux.org/aports/plain/testing/postgresql12/icu-collations-hack.patch?id=d5227c91adda59d4e7f55f13468f0314e8869174"; - hash = "sha256-wuwjvGHArkRNwFo40g3p43W32OrJohretlt6iSRlJKg="; - }; - }; - "13" = { - inherit (self."14") icu-collations-hack; - disable-test-collate-icu-utf8 = fetchurl { - url = "https://git.alpinelinux.org/aports/plain/main/postgresql13/disable-test-collate.icu.utf8.patch?id=69faa146ec9fff3b981511068f17f9e629d4688b"; - hash = "sha256-jS/qxezaiaKhkWeMCXwpz1SDJwUWn9tzN0uKaZ3Ph2Y="; - }; - }; - "14" = { - icu-collations-hack = fetchurl { - url = "https://git.alpinelinux.org/aports/plain/main/postgresql14/icu-collations-hack.patch?id=56999e6d0265ceff5c5239f85fdd33e146f06cb7"; - hash = "sha256-wuwjvGHArkRNwFo40g3p43W32OrJohretlt6iSRlJKg="; - }; - disable-test-collate-icu-utf8 = fetchurl { - url = "https://git.alpinelinux.org/aports/plain/main/postgresql14/disable-test-collate.icu.utf8.patch?id=56999e6d0265ceff5c5239f85fdd33e146f06cb7"; - hash = "sha256-jXe23AxnFjEl+TZQm4R7rStk2Leo08ctxMNmu1xr5zM="; - }; - }; - "15" = { - icu-collations-hack = fetchurl { - url = "https://git.alpinelinux.org/aports/plain/main/postgresql15/icu-collations-hack.patch?id=f424e934e6d076c4ae065ce45e734aa283eecb9c"; - hash = "sha256-HgtmhF4OJYU9macGJbTB9PjQi/yW7c3Akm3U0niWs8I="; - }; - }; - "16" = { - icu-collations-hack = fetchurl { - url = "https://git.alpinelinux.org/aports/plain/main/postgresql16/icu-collations-hack.patch?id=08a24be262339fd093e641860680944c3590238e"; - hash = "sha256-+urQdVIlADLdDPeT68XYv5rljhbK8M/7mPZn/cF+FT0="; - }; - }; - }; - - patchesForVersion = self.${lib.versions.major version} or (throw "no musl patches for postgresql ${version}"); - in - lib.attrValues patchesForVersion + map fetchurl (lib.attrValues muslPatches) ) ++ lib.optionals stdenv'.isLinux [ (if atLeast "13" then ./patches/socketdir-in-run-13.patch else ./patches/socketdir-in-run.patch) ]; From a4a43c399c4bac2bd20997bf71e08eb32d4ccccd Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Fri, 15 Mar 2024 19:16:29 +0200 Subject: [PATCH 17/44] libtins: 4.4 -> 4.5 Diff: https://github.com/mfontanini/libtins/compare/v4.4...v4.5 Changelog: https://raw.githubusercontent.com/mfontanini/libtins/v4.5/CHANGES.md Close #255639 --- pkgs/development/libraries/libtins/default.nix | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/pkgs/development/libraries/libtins/default.nix b/pkgs/development/libraries/libtins/default.nix index 1533794bcd1e..dbb4f4d471d0 100644 --- a/pkgs/development/libraries/libtins/default.nix +++ b/pkgs/development/libraries/libtins/default.nix @@ -1,25 +1,17 @@ -{ boost, cmake, fetchFromGitHub, fetchpatch, gtest, libpcap, openssl, lib, stdenv }: +{ boost, cmake, fetchFromGitHub, gtest, libpcap, openssl, lib, stdenv }: stdenv.mkDerivation rec { pname = "libtins"; - version = "4.4"; + version = "4.5"; src = fetchFromGitHub { owner = "mfontanini"; repo = pname; rev = "v${version}"; - sha256 = "sha256-mXbinXh/CO0SZZ71+K+FozbHCCoi12+AIa2o+P0QmUw="; + sha256 = "sha256-zL4C2Cgs9Y3NebL8MPQBO5j8Bm6xhl8ZggQBPJLRn0o="; }; patches = [ - # Pull gcc-13 fixes: - # https://github.com/mfontanini/libtins/pull/496 - # TODO: remove when upgrade to the next version. - (fetchpatch { - name = "gcc-13.patch"; - url = "https://github.com/mfontanini/libtins/commit/812be7966d445ec56e88eab512f8fd2d57152427.patch"; - hash = "sha256-5RCFPe95r1CBrAocjTPR2SvUlgaGa1aBc8RazyxUj3M="; - }) # Required for gtest 1.13+. ./0001-force-cpp-14.patch ]; From 12128314a4445af577222836c9d5e4a78eb004f5 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Fri, 15 Mar 2024 19:39:52 +0200 Subject: [PATCH 18/44] libtins: mention upstream issue with gtest --- pkgs/development/libraries/libtins/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libtins/default.nix b/pkgs/development/libraries/libtins/default.nix index dbb4f4d471d0..6f195615551f 100644 --- a/pkgs/development/libraries/libtins/default.nix +++ b/pkgs/development/libraries/libtins/default.nix @@ -12,7 +12,8 @@ stdenv.mkDerivation rec { }; patches = [ - # Required for gtest 1.13+. + # Required for gtest 1.13+, see also upstream report at: + # https://github.com/mfontanini/libtins/issues/529 ./0001-force-cpp-14.patch ]; From 113f140a152297ca55e364228f5b63ca6bddd360 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Fri, 15 Mar 2024 19:30:43 +0200 Subject: [PATCH 19/44] compactor: don't overuse pname --- pkgs/applications/networking/compactor/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/compactor/default.nix b/pkgs/applications/networking/compactor/default.nix index 84c0f6ae8ba5..12e6f432c5bd 100644 --- a/pkgs/applications/networking/compactor/default.nix +++ b/pkgs/applications/networking/compactor/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "dns-stats"; - repo = pname; + repo = "compactor"; rev = version; fetchSubmodules = true; hash = "sha256-5Z14suhO5ghhmZsSj4DsSoKm+ct2gQFO6qxhjmx4Xm4="; @@ -68,7 +68,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Tools to capture DNS traffic and record it in C-DNS files"; homepage = "https://dns-stats.org/"; - changelog = "https://github.com/dns-stats/${pname}/raw/${version}/ChangeLog.txt"; + changelog = "https://github.com/dns-stats/compactor/raw/${version}/ChangeLog.txt"; license = licenses.mpl20; maintainers = with maintainers; [ fdns ]; platforms = platforms.unix; From 14b3ea2789ef6b8bfb39553919708b6b5672ff67 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Sat, 2 Mar 2024 14:04:06 +0100 Subject: [PATCH 20/44] postgresql: refactor to pass jitSupport/llvm via scope instead of passthru This makes it less error-prone to use the llvm package in extensions, because it will always match the package used by the postgresql derivation itself. Previously, you could've accidentally used llvm instead of postgresql.llvm with a different result. --- nixos/modules/services/databases/postgresql.nix | 2 +- pkgs/servers/sql/postgresql/ext/anonymizer.nix | 4 ++-- pkgs/servers/sql/postgresql/ext/plv8/default.nix | 3 ++- pkgs/servers/sql/postgresql/ext/postgis.nix | 4 +++- pkgs/servers/sql/postgresql/generic.nix | 5 ++--- 5 files changed, 10 insertions(+), 8 deletions(-) diff --git a/nixos/modules/services/databases/postgresql.nix b/nixos/modules/services/databases/postgresql.nix index c4e76c82ba5c..c3f3b98ae5e7 100644 --- a/nixos/modules/services/databases/postgresql.nix +++ b/nixos/modules/services/databases/postgresql.nix @@ -14,7 +14,7 @@ let # package = pkgs.postgresql_; # }; # works. - base = if cfg.enableJIT && !cfg.package.jitSupport then cfg.package.withJIT else cfg.package; + base = if cfg.enableJIT then cfg.package.withJIT else cfg.package; in if cfg.extraPlugins == [] then base diff --git a/pkgs/servers/sql/postgresql/ext/anonymizer.nix b/pkgs/servers/sql/postgresql/ext/anonymizer.nix index 430911d40108..b6ec0256ae09 100644 --- a/pkgs/servers/sql/postgresql/ext/anonymizer.nix +++ b/pkgs/servers/sql/postgresql/ext/anonymizer.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, pg-dump-anon, postgresql, runtimeShell }: +{ lib, stdenv, pg-dump-anon, postgresql, runtimeShell, jitSupport, llvm }: stdenv.mkDerivation (finalAttrs: { pname = "postgresql_anonymizer"; @@ -6,7 +6,7 @@ stdenv.mkDerivation (finalAttrs: { inherit (pg-dump-anon) version src passthru; buildInputs = [ postgresql ]; - nativeBuildInputs = [ postgresql ] ++ lib.optional postgresql.jitSupport postgresql.llvm; + nativeBuildInputs = [ postgresql ] ++ lib.optional jitSupport llvm; strictDeps = true; diff --git a/pkgs/servers/sql/postgresql/ext/plv8/default.nix b/pkgs/servers/sql/postgresql/ext/plv8/default.nix index 241aa610c8f9..fa2f1b7ad2d8 100644 --- a/pkgs/servers/sql/postgresql/ext/plv8/default.nix +++ b/pkgs/servers/sql/postgresql/ext/plv8/default.nix @@ -4,6 +4,7 @@ , v8 , perl , postgresql +, jitSupport # For test , runCommand , coreutils @@ -138,6 +139,6 @@ stdenv.mkDerivation (finalAttrs: { maintainers = with maintainers; [ marsam ]; platforms = [ "x86_64-linux" "aarch64-linux" ]; license = licenses.postgresql; - broken = postgresql.jitSupport; + broken = jitSupport; }; }) diff --git a/pkgs/servers/sql/postgresql/ext/postgis.nix b/pkgs/servers/sql/postgresql/ext/postgis.nix index 87333fe97504..f069a1b7e90d 100644 --- a/pkgs/servers/sql/postgresql/ext/postgis.nix +++ b/pkgs/servers/sql/postgresql/ext/postgis.nix @@ -13,6 +13,8 @@ , libiconv , pcre2 , nixosTests +, jitSupport +, llvm }: let @@ -31,7 +33,7 @@ stdenv.mkDerivation rec { buildInputs = [ libxml2 postgresql geos proj gdal json_c protobufc pcre2.dev ] ++ lib.optional stdenv.isDarwin libiconv; - nativeBuildInputs = [ perl pkg-config ] ++ lib.optional postgresql.jitSupport postgresql.llvm; + nativeBuildInputs = [ perl pkg-config ] ++ lib.optional jitSupport llvm; dontDisableStatic = true; # postgis config directory assumes /include /lib from the same root for json-c library diff --git a/pkgs/servers/sql/postgresql/generic.nix b/pkgs/servers/sql/postgresql/generic.nix index cdcffc5f135c..052460da27b2 100644 --- a/pkgs/servers/sql/postgresql/generic.nix +++ b/pkgs/servers/sql/postgresql/generic.nix @@ -221,7 +221,6 @@ let }; in { - inherit jitSupport; psqlSchema = lib.versions.major version; withJIT = if jitSupport then this else jitToggle; @@ -231,6 +230,8 @@ let pkgs = let scope = { + inherit jitSupport; + inherit (llvmPackages) llvm; postgresql = this; stdenv = stdenv'; buildPgxExtension = buildPgxExtension.override { @@ -257,8 +258,6 @@ let } // lib.optionalAttrs jitSupport { postgresql-jit = nixosTests.postgresql-jit.${thisAttr}; }; - } // lib.optionalAttrs jitSupport { - inherit (llvmPackages) llvm; }; meta = with lib; { From 4b6bce5c313f82d57f711be4ca22dccf30d32c35 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Thu, 29 Feb 2024 19:31:41 +0100 Subject: [PATCH 21/44] postgresql: refactor to remove "this" argument This was proposed by abbradar in #150801, but left out of the follow up PR #221851 by Ma27 to reduce the size of the diff. Compared to the initial proposal this includes the callPackage call in the recursion, which avoids breaking the withJIT/withoutJIT helpers. In terms of nixpkgs, this is a pure refactor, no derivations change. However, this makes downstream expressions like the following possible: (postgresql.override { jitSupport = true; }).pkgs.postgis This would have not worked before without passing another "this" argument, which is error prone as can be seen in this example: https://github.com/PostgREST/postgrest/pull/3222/files --- nixos/modules/services/databases/postgresql.md | 2 +- pkgs/servers/sql/postgresql/default.nix | 1 - pkgs/servers/sql/postgresql/generic.nix | 6 +++--- pkgs/top-level/all-packages.nix | 4 ++-- 4 files changed, 6 insertions(+), 7 deletions(-) diff --git a/nixos/modules/services/databases/postgresql.md b/nixos/modules/services/databases/postgresql.md index 7d141f12b5de..3ff1f00fa9cf 100644 --- a/nixos/modules/services/databases/postgresql.md +++ b/nixos/modules/services/databases/postgresql.md @@ -277,7 +277,7 @@ self: super: { Here's a recipe on how to override a particular plugin through an overlay: ``` self: super: { - postgresql_15 = super.postgresql_15.override { this = self.postgresql_15; } // { + postgresql_15 = super.postgresql_15// { pkgs = super.postgresql_15.pkgs // { pg_repack = super.postgresql_15.pkgs.pg_repack.overrideAttrs (_: { name = "pg_repack-v20181024"; diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix index d8acae8787a6..d11a2d06b2d2 100644 --- a/pkgs/servers/sql/postgresql/default.nix +++ b/pkgs/servers/sql/postgresql/default.nix @@ -16,7 +16,6 @@ let self.lib.nameValuePair attrName (import path { inherit jitSupport self; thisAttr = attrName; - this = self.${attrName}; }) ) versions; diff --git a/pkgs/servers/sql/postgresql/generic.nix b/pkgs/servers/sql/postgresql/generic.nix index 052460da27b2..a669cbb020fb 100644 --- a/pkgs/servers/sql/postgresql/generic.nix +++ b/pkgs/servers/sql/postgresql/generic.nix @@ -12,7 +12,7 @@ let , gssSupport ? with stdenv.hostPlatform; !isWindows && !isStatic # for postgresql.pkgs - , this, self, newScope, buildEnv + , self, newScope, buildEnv # source specification , version, hash, muslPatches @@ -32,7 +32,7 @@ let # detection of crypt fails when using llvm stdenv, so we add it manually # for <13 (where it got removed: https://github.com/postgres/postgres/commit/c45643d618e35ec2fe91438df15abd4f3c0d85ca) , libxcrypt - }: + } @args: let atLeast = lib.versionAtLeast version; olderThan = lib.versionOlder version; @@ -215,9 +215,9 @@ let disallowedReferences = [ stdenv'.cc ]; passthru = let + this = self.callPackage generic args; jitToggle = this.override { jitSupport = !jitSupport; - this = jitToggle; }; in { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 02964f0d1fd3..9a09007b4e42 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -26748,8 +26748,8 @@ with pkgs; postgresql_15_jit postgresql_16_jit ; - postgresql = postgresql_15.override { this = postgresql; }; - postgresql_jit = postgresql_15_jit.override { this = postgresql_jit; }; + postgresql = postgresql_15; + postgresql_jit = postgresql_15_jit; postgresqlPackages = recurseIntoAttrs postgresql.pkgs; postgresqlJitPackages = recurseIntoAttrs postgresql_jit.pkgs; postgresql12Packages = recurseIntoAttrs postgresql_12.pkgs; From d7ae1c5143c75e7823a09166f1d62fdcde30c903 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Sun, 10 Mar 2024 19:49:39 +0100 Subject: [PATCH 22/44] postgresql: refactor to remove doInstallCheck = false This is the default anyway. --- pkgs/servers/sql/postgresql/generic.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/servers/sql/postgresql/generic.nix b/pkgs/servers/sql/postgresql/generic.nix index a669cbb020fb..e2547e5d3f0a 100644 --- a/pkgs/servers/sql/postgresql/generic.nix +++ b/pkgs/servers/sql/postgresql/generic.nix @@ -210,8 +210,6 @@ let --replace "object_address" "" '' else null; - doInstallCheck = false; # needs a running daemon? - disallowedReferences = [ stdenv'.cc ]; passthru = let From e6bfabf366b7dfdf67e24877dc5a24c5c1f8e62e Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Tue, 12 Mar 2024 21:16:33 +0100 Subject: [PATCH 23/44] postgresql: rename enableSystemd to systemdSupport for consistency We have gssSupport, jitSupport and pythonSupport - but enableSystemd? Across nixpkgs there are currently three styles commonly used, about equally often: withX, xSupport and enableX. Let's at least use one consistent style in this package. --- pkgs/servers/sql/postgresql/generic.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/sql/postgresql/generic.nix b/pkgs/servers/sql/postgresql/generic.nix index e2547e5d3f0a..d6f7f3a72fdd 100644 --- a/pkgs/servers/sql/postgresql/generic.nix +++ b/pkgs/servers/sql/postgresql/generic.nix @@ -8,7 +8,8 @@ let , linux-pam # This is important to obtain a version of `libpq` that does not depend on systemd. - , enableSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd && !stdenv.hostPlatform.isStatic + , systemdSupport ? lib.meta.availableOn stdenv.hostPlatform systemd && !stdenv.hostPlatform.isStatic + , enableSystemd ? null , gssSupport ? with stdenv.hostPlatform; !isWindows && !isStatic # for postgresql.pkgs @@ -39,6 +40,8 @@ let lz4Enabled = atLeast "14"; zstdEnabled = atLeast "15"; + systemdSupport' = if enableSystemd == null then systemdSupport else (lib.warn "postgresql: argument enableSystemd is deprecated, please use systemdSupport instead." enableSystemd); + pname = "postgresql"; stdenv' = if jitSupport then llvmPackages.stdenv else stdenv; @@ -66,7 +69,7 @@ let ++ lib.optionals jitSupport [ llvmPackages.llvm ] ++ lib.optionals lz4Enabled [ lz4 ] ++ lib.optionals zstdEnabled [ zstd ] - ++ lib.optionals enableSystemd [ systemd ] + ++ lib.optionals systemdSupport' [ systemd ] ++ lib.optionals pythonSupport [ python3 ] ++ lib.optionals gssSupport [ libkrb5 ] ++ lib.optionals stdenv'.isLinux [ linux-pam ] @@ -97,7 +100,7 @@ let "--libdir=$(lib)/lib" "--with-system-tzdata=${tzdata}/share/zoneinfo" "--enable-debug" - (lib.optionalString enableSystemd "--with-systemd") + (lib.optionalString systemdSupport' "--with-systemd") (if stdenv'.isDarwin then "--with-uuid=e2fs" else "--with-ossp-uuid") ] ++ lib.optionals lz4Enabled [ "--with-lz4" ] ++ lib.optionals zstdEnabled [ "--with-zstd" ] From 58acdb18ded4df20ab2267e804d625e9bc994fff Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Fri, 15 Mar 2024 22:01:36 +0000 Subject: [PATCH 24/44] libdicom: add patch for CVE-2024-24793 & CVE-2024-24794 --- pkgs/development/libraries/libdicom/default.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/development/libraries/libdicom/default.nix b/pkgs/development/libraries/libdicom/default.nix index cb4d68121ef5..94dfaf81298d 100644 --- a/pkgs/development/libraries/libdicom/default.nix +++ b/pkgs/development/libraries/libdicom/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , uthash , meson , ninja @@ -19,6 +20,15 @@ stdenv.mkDerivation (finalAttrs: { sha256 = "sha256-9n0Gp9+fmTM/shgWC8zpwt1pic9BrvDubOt7f+ZDMeE="; }; + patches = [ + (fetchpatch { + name = "CVE-2024-24793.CVE-2024-24794.patch"; + url = "https://github.com/ImagingDataCommons/libdicom/commit/3661aa4cdbe9c39f67d38ae87520f9e3ed50ab16.patch"; + excludes = [ "CHANGELOG.md" ]; + hash = "sha256-/KTp0nKYk6jX4phNHY+nzjEptUBHKM2JkOftS5vHsEw="; + }) + ]; + buildInputs = [ uthash ]; nativeBuildInputs = [ meson ninja pkg-config ] From a6d212c099b2667044ecea1e99eb00ede49b0544 Mon Sep 17 00:00:00 2001 From: Evils Date: Sat, 16 Mar 2024 03:34:44 +0100 Subject: [PATCH 25/44] python312Packages.diffimg: fix test python 3.12 seems to yield a very slightly different result change is the least significant digit of a ratio, seems safe and upgrade to --replace-warn while i'm here --- pkgs/development/python-modules/diffimg/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/diffimg/default.nix b/pkgs/development/python-modules/diffimg/default.nix index e5afcdf8cdf1..c1769d118f90 100644 --- a/pkgs/development/python-modules/diffimg/default.nix +++ b/pkgs/development/python-modules/diffimg/default.nix @@ -3,6 +3,7 @@ , fetchFromGitHub , pillow , unittestCheckHook +, pythonAtLeast }: buildPythonPackage rec { @@ -21,7 +22,10 @@ buildPythonPackage rec { # fix offered to upstream https://github.com/nicolashahn/diffimg/pull/6 postPatch = '' substituteInPlace diffimg/test.py \ - --replace "from diff import diff" "from diffimg.diff import diff" + --replace-warn "from diff import diff" "from diffimg.diff import diff" + '' + lib.optionalString (pythonAtLeast "3.12") '' + substituteInPlace diffimg/test.py \ + --replace-warn "3503192421617232" "3503192421617233" ''; propagatedBuildInputs = [ From 122f35b01970e8c4a24cede8dacce0d488173c1d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 16 Mar 2024 09:07:04 +0000 Subject: [PATCH 26/44] plexRaw: 1.40.0.7998-c29d4c0c8 -> 1.40.1.8227-c0dd5a73e --- pkgs/servers/plex/raw.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/plex/raw.nix b/pkgs/servers/plex/raw.nix index c6751136dd62..5b5af73e1805 100644 --- a/pkgs/servers/plex/raw.nix +++ b/pkgs/servers/plex/raw.nix @@ -12,16 +12,16 @@ # server, and the FHS userenv and corresponding NixOS module should # automatically pick up the changes. stdenv.mkDerivation rec { - version = "1.40.0.7998-c29d4c0c8"; + version = "1.40.1.8227-c0dd5a73e"; pname = "plexmediaserver"; # Fetch the source src = if stdenv.hostPlatform.system == "aarch64-linux" then fetchurl { url = "https://downloads.plex.tv/plex-media-server-new/${version}/debian/plexmediaserver_${version}_arm64.deb"; - sha256 = "sha256-uVsOI6sItfq7wLP+xPOYSC9ueOv/lcDeL+vnrx1WdRA="; + sha256 = "16gc8fwb29x3l9s263xs9c7nb0i1rzgaps2wlx0cil8bs2a9izz8"; } else fetchurl { url = "https://downloads.plex.tv/plex-media-server-new/${version}/debian/plexmediaserver_${version}_amd64.deb"; - sha256 = "sha256-ucxDtnGpfTpQURaGvLwohHeIZPE3aulXtoITRZCYA9c="; + sha256 = "03sx5fvwy2njpfh7k4xvkqscrxnafdvzh42g4hsn2hqxp0bqkl51"; }; outputs = [ "out" "basedb" ]; From 01444957bad77f93aca788fdbd2eca8e4c4da97e Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Sat, 16 Mar 2024 11:52:12 +0100 Subject: [PATCH 27/44] postgresql: explain use of fetchurl for alpine patches --- pkgs/servers/sql/postgresql/generic.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/servers/sql/postgresql/generic.nix b/pkgs/servers/sql/postgresql/generic.nix index d6f7f3a72fdd..5d93cf9aa31b 100644 --- a/pkgs/servers/sql/postgresql/generic.nix +++ b/pkgs/servers/sql/postgresql/generic.nix @@ -124,6 +124,7 @@ let }) ] ++ lib.optionals stdenv'.hostPlatform.isMusl ( + # Using fetchurl instead of fetchpatch on purpose: https://github.com/NixOS/nixpkgs/issues/240141 map fetchurl (lib.attrValues muslPatches) ) ++ lib.optionals stdenv'.isLinux [ (if atLeast "13" then ./patches/socketdir-in-run-13.patch else ./patches/socketdir-in-run.patch) From 7d8ce1444361d4aa4321996c7fdbc98cfdb2c8bf Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 16 Mar 2024 13:18:53 +0000 Subject: [PATCH 28/44] mautrix-whatsapp: 0.10.5 -> 0.10.6 --- pkgs/servers/mautrix-whatsapp/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/mautrix-whatsapp/default.nix b/pkgs/servers/mautrix-whatsapp/default.nix index 3423985f6584..76ac8bfd5712 100644 --- a/pkgs/servers/mautrix-whatsapp/default.nix +++ b/pkgs/servers/mautrix-whatsapp/default.nix @@ -2,18 +2,18 @@ buildGoModule rec { pname = "mautrix-whatsapp"; - version = "0.10.5"; + version = "0.10.6"; src = fetchFromGitHub { owner = "mautrix"; repo = "whatsapp"; rev = "v${version}"; - hash = "sha256-bn9nUTtpaEkzF2SEdCcKG27WQDL7xsgfgA/72wElQqA="; + hash = "sha256-foYmHJk25SOCv+o6eiJTeD2VP8vi6PpeeDm845Lq43Y="; }; buildInputs = [ olm ]; - vendorHash = "sha256-PDUSjza+0SDanQwKYQRuLzsiA/sHjRnG0xpzlzhkm+U="; + vendorHash = "sha256-2xHgGBVFzEnOFiZrg1ClgjUrzKVD3CLxPsvRO2iQBC4="; doCheck = false; From 1366d907964d5d5748d008980b9249aa48fc0a84 Mon Sep 17 00:00:00 2001 From: Kira Bruneau Date: Sat, 16 Mar 2024 15:07:30 -0400 Subject: [PATCH 29/44] texlab: 5.13.0 -> 5.13.1 https://github.com/latex-lsp/texlab/blob/v5.13.1/CHANGELOG.md --- pkgs/development/tools/misc/texlab/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/misc/texlab/default.nix b/pkgs/development/tools/misc/texlab/default.nix index c1ba1b482232..1c504f6fbf68 100644 --- a/pkgs/development/tools/misc/texlab/default.nix +++ b/pkgs/development/tools/misc/texlab/default.nix @@ -15,16 +15,16 @@ let in rustPlatform.buildRustPackage rec { pname = "texlab"; - version = "5.13.0"; + version = "5.13.1"; src = fetchFromGitHub { owner = "latex-lsp"; repo = "texlab"; rev = "refs/tags/v${version}"; - hash = "sha256-k/Hfl9SZxjdNLzvGrMMu/DPQpXsW21FC/WvJbz1IhSY="; + hash = "sha256-fmtNalpOOPEiMO5zDD6m01cDfFuaLQsYPk6cc7yvjog="; }; - cargoHash = "sha256-tM/y1A/aCkcpU/1nZfUrNYDI0jiGn8qzvmP244tEJac="; + cargoHash = "sha256-5ojXplzkBwchnSZLkwR5jz8WgyEA14Y1iVQ+Q19U8Tg="; outputs = [ "out" ] ++ lib.optional (!isCross) "man"; @@ -41,7 +41,7 @@ rustPlatform.buildRustPackage rec { # generate the man page postInstall = lib.optionalString (!isCross) '' # TexLab builds man page separately in CI: - # https://github.com/latex-lsp/texlab/blob/v5.13.0/.github/workflows/publish.yml#L117-L121 + # https://github.com/latex-lsp/texlab/blob/v5.13.1/.github/workflows/publish.yml#L117-L121 help2man --no-info "$out/bin/texlab" > texlab.1 installManPage texlab.1 ''; From fd1a21f0ae169cb090970b0f0f17c39f694cc845 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 16 Mar 2024 19:21:23 +0000 Subject: [PATCH 30/44] python311Packages.paste: 3.7.1 -> 3.8.0 --- pkgs/development/python-modules/paste/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/paste/default.nix b/pkgs/development/python-modules/paste/default.nix index 3a8ec63f3e9a..9248eca81255 100644 --- a/pkgs/development/python-modules/paste/default.nix +++ b/pkgs/development/python-modules/paste/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "paste"; - version = "3.7.1"; + version = "3.8.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "cdent"; repo = "paste"; rev = "refs/tags/${version}"; - hash = "sha256-xp8FU4MR79/leBSJvSk8J2GdWW32AW2I5i3Y6DsRPLw="; + hash = "sha256-T9VG91Y8hap1nt3FkuCGsv8nglWNlRajvsvljXexH3Y="; }; postPatch = '' From 143bb150359ea4ab79e1ecabce2acbdb53f01619 Mon Sep 17 00:00:00 2001 From: nwright Date: Sat, 16 Mar 2024 13:44:03 -0400 Subject: [PATCH 31/44] xone: 0.3 -> 0.3-unstable-2024-03-16 --- pkgs/os-specific/linux/xone/default.nix | 25 ++++++++----------------- 1 file changed, 8 insertions(+), 17 deletions(-) diff --git a/pkgs/os-specific/linux/xone/default.nix b/pkgs/os-specific/linux/xone/default.nix index 104b7952f2be..b1e2ce570a2d 100644 --- a/pkgs/os-specific/linux/xone/default.nix +++ b/pkgs/os-specific/linux/xone/default.nix @@ -1,27 +1,18 @@ { stdenv, lib, fetchFromGitHub, kernel, fetchurl, fetchpatch }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "xone"; - version = "0.3"; + version = "0.3-unstable-2024-03-16"; src = fetchFromGitHub { owner = "medusalix"; - repo = pname; - rev = "refs/tags/v${version}"; - sha256 = "sha256-h+j4xCV9R6hp9trsv1NByh9m0UBafOz42ZuYUjclILE="; + repo = "xone"; + rev = "948d2302acdd6333295eaba4da06d96677290ad3"; + hash = "sha256-srAEw1ai5KT0rmVUL3Dut9R2mNb00AAZVCcINikh2sM="; }; - patches = [ - # Fix build on kernel 6.3 - (fetchpatch { - name = "kernel-6.3.patch"; - url = "https://github.com/medusalix/xone/commit/bbf0dcc484c3f5611f4e375da43e0e0ef08f3d18.patch"; - hash = "sha256-A2OzRRk4XT++rS6k6EIyiPy/LJptvVRUxoP7CIGrPWU="; - }) - ]; - setSourceRoot = '' - export sourceRoot=$(pwd)/${src.name} + export sourceRoot=$(pwd)/${finalAttrs.src.name} ''; nativeBuildInputs = kernel.moduleBuildDependencies; @@ -30,7 +21,7 @@ stdenv.mkDerivation rec { "-C" "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" "M=$(sourceRoot)" - "VERSION=${version}" + "VERSION=${finalAttrs.version}" ]; buildFlags = [ "modules" ]; @@ -45,4 +36,4 @@ stdenv.mkDerivation rec { platforms = platforms.linux; }; } - +) From b1d7482b702fd5935e5aeade802429cacea87390 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 17 Mar 2024 01:16:25 +0000 Subject: [PATCH 32/44] nix-zsh-completions: 0.5.0 -> 0.5.1 --- pkgs/shells/zsh/nix-zsh-completions/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/shells/zsh/nix-zsh-completions/default.nix b/pkgs/shells/zsh/nix-zsh-completions/default.nix index 32565af35be9..1b5c61218c01 100644 --- a/pkgs/shells/zsh/nix-zsh-completions/default.nix +++ b/pkgs/shells/zsh/nix-zsh-completions/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "nix-zsh-completions"; - version = "0.5.0"; + version = "0.5.1"; src = fetchFromGitHub { owner = "nix-community"; repo = "nix-zsh-completions"; rev = "refs/tags/${version}"; - hash = "sha256-DKvCpjAeCiUwD5l6PUW7WlEvM0cNZEOk41IiVXoh9D8="; + hash = "sha256-bgbMc4HqigqgdkvUe/CWbUclwxpl17ESLzCIP8Sz+F8="; }; strictDeps = true; From 09ea163a7ddc3efedefdf422a8e9c440a313d919 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 17 Mar 2024 02:31:16 +0000 Subject: [PATCH 33/44] srm-cuarzo: 0.5.4-1 -> 0.5.5-1 --- pkgs/by-name/sr/srm-cuarzo/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/sr/srm-cuarzo/package.nix b/pkgs/by-name/sr/srm-cuarzo/package.nix index 8255ade26658..1f636e8aaeeb 100644 --- a/pkgs/by-name/sr/srm-cuarzo/package.nix +++ b/pkgs/by-name/sr/srm-cuarzo/package.nix @@ -14,9 +14,9 @@ }: stdenv.mkDerivation (self: { pname = "srm-cuarzo"; - version = "0.5.4-1"; + version = "0.5.5-1"; rev = "v${self.version}"; - hash = "sha256-nmYMhX3XtyIyv6Kxi7s+ahkOHfnuLcjpwSU58HcPNeU="; + hash = "sha256-4aeKzvhfVmimz4Df7wnyZESAZa7RMjYUqbhFhqPJ59o="; src = fetchFromGitHub { inherit (self) rev hash; From f83e5b297eec4ee1978849722688974fd1d360e1 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 17 Mar 2024 07:32:12 +0100 Subject: [PATCH 34/44] python312Packages.pysnmp-lextudio: 6.0.10 -> 6.0.11 Diff: https://github.com/lextudio/pysnmp/compare/refs/tags/v6.0.10...v6.0.11 Changelog: https://github.com/lextudio/pysnmp/blob/refs/tags/v6.0.11/CHANGES.txt --- .../python-modules/pysnmp-lextudio/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/pysnmp-lextudio/default.nix b/pkgs/development/python-modules/pysnmp-lextudio/default.nix index 6bcbbc717100..ef50f244a430 100644 --- a/pkgs/development/python-modules/pysnmp-lextudio/default.nix +++ b/pkgs/development/python-modules/pysnmp-lextudio/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "pysnmp-lextudio"; - version = "6.0.10"; + version = "6.0.11"; pyproject = true; src = fetchFromGitHub { owner = "lextudio"; repo = "pysnmp"; - rev = "v${version}"; - hash = "sha256-zxv/+IhIAnnn6gTyulPCuKainUcGMwRqw6ktYXR+d4Q="; + rev = "refs/tags/v${version}"; + hash = "sha256-h/FxiGjBZqO82omkVqz+fws398Iz1EkHbZPMYIzG+t0="; }; nativeBuildInputs = [ @@ -57,6 +57,8 @@ buildPythonPackage rec { # pysnmp.smi.error.MibNotFoundError "test_send_v3_trap_notification" "test_addAsn1MibSource" + "test_v1_walk" + "test_v2_walk" ]; pythonImportsCheck = [ From 164531fa14dc94c6d1f725a5ff0d7aefe1457691 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 17 Mar 2024 07:32:45 +0100 Subject: [PATCH 35/44] python312Packages.atenpdu: 0.6.1 -> 0.6.2 Changelog: https://github.com/mtdcr/pductl/releases/tag/0.6.2 --- .../python-modules/atenpdu/default.nix | 20 ++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/atenpdu/default.nix b/pkgs/development/python-modules/atenpdu/default.nix index f29936d3174a..9397060d4a9c 100644 --- a/pkgs/development/python-modules/atenpdu/default.nix +++ b/pkgs/development/python-modules/atenpdu/default.nix @@ -2,28 +2,33 @@ , buildPythonPackage , fetchPypi , async-timeout -, pysnmplib +, pysnmp-lextudio , pythonOlder +, poetry-core }: buildPythonPackage rec { pname = "atenpdu"; - version = "0.6.1"; - format = "setuptools"; + version = "0.6.2"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3."; src = fetchPypi { inherit pname version; - hash = "sha256-Of7tQJNqaLDgO8nie6rSd1saMbauXJBp8vWfXYAziEE="; + hash = "sha256-KzRoE4tE/tQkKYroq5PbWKREmEl8AwbIOg3IHRZZtsQ="; }; + nativeBuildInputs = [ + poetry-core + ]; + propagatedBuildInputs = [ async-timeout - pysnmplib + pysnmp-lextudio ]; - # Project has no test + # Module has no test doCheck = false; pythonImportsCheck = [ @@ -33,6 +38,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python interface to control ATEN PE PDUs"; homepage = "https://github.com/mtdcr/pductl"; + changelog = "https://github.com/mtdcr/pductl/releases/tag/${version}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; From a48ddbea868a7b51c10a0c7bcecb097113312c0e Mon Sep 17 00:00:00 2001 From: FidgetingBits Date: Sun, 17 Mar 2024 15:45:48 +0800 Subject: [PATCH 36/44] tree-sitter-grammars: add talon --- .../tools/parsing/tree-sitter/grammars/default.nix | 1 + .../tree-sitter/grammars/tree-sitter-talon.json | 12 ++++++++++++ .../development/tools/parsing/tree-sitter/update.nix | 4 ++++ 3 files changed, 17 insertions(+) create mode 100644 pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-talon.json diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix b/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix index 1544e737c0b9..c2c5c2a6e371 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix @@ -91,6 +91,7 @@ tree-sitter-supercollider = lib.importJSON ./tree-sitter-supercollider.json; tree-sitter-surface = lib.importJSON ./tree-sitter-surface.json; tree-sitter-svelte = lib.importJSON ./tree-sitter-svelte.json; + tree-sitter-talon = lib.importJSON ./tree-sitter-talon.json; tree-sitter-templ = lib.importJSON ./tree-sitter-templ.json; tree-sitter-tiger = lib.importJSON ./tree-sitter-tiger.json; tree-sitter-tlaplus = lib.importJSON ./tree-sitter-tlaplus.json; diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-talon.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-talon.json new file mode 100644 index 000000000000..baa13c0a37dc --- /dev/null +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-talon.json @@ -0,0 +1,12 @@ +{ + "url": "https://github.com/wenkokke/tree-sitter-talon", + "rev": "dafc9fabf7acc1a46d51cce379cec00c07661aa7", + "date": "2023-11-05T13:07:41+00:00", + "path": "/nix/store/df67djinw8sjwf6lbfv6gdckxckv0y65-tree-sitter-talon", + "sha256": "1clmmb3pgvc54fsp83f2jmz6n21pmmjkb15yk9bfqlkzdm12sirw", + "hash": "sha256-PEctQm1/UuxWmr6ENWWtNwhrfpXCDXS1I4Xtd8eqlbI=", + "fetchLFS": false, + "fetchSubmodules": false, + "deepClone": false, + "leaveDotGit": false +} diff --git a/pkgs/development/tools/parsing/tree-sitter/update.nix b/pkgs/development/tools/parsing/tree-sitter/update.nix index aad4a6c9a029..68f5a1dfa66b 100644 --- a/pkgs/development/tools/parsing/tree-sitter/update.nix +++ b/pkgs/development/tools/parsing/tree-sitter/update.nix @@ -157,6 +157,10 @@ let repo = "tree-sitter-sql"; branch = "gh-pages"; }; + "tree-sitter-talon" = { + orga = "wenkokke"; + repo = "tree-sitter-talon"; + }; "tree-sitter-typst" = { orga = "uben0"; repo = "tree-sitter-typst"; From 986bd442b96e3b84eb05c2d6a60cab5144517ea4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 17 Mar 2024 01:03:13 +0000 Subject: [PATCH 37/44] mu: 1.12.1 -> 1.12.2 --- pkgs/tools/networking/mu/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/mu/default.nix b/pkgs/tools/networking/mu/default.nix index f94e83552130..c4c112e9415b 100644 --- a/pkgs/tools/networking/mu/default.nix +++ b/pkgs/tools/networking/mu/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { pname = "mu"; - version = "1.12.1"; + version = "1.12.2"; outputs = [ "out" "mu4e" ]; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { owner = "djcb"; repo = "mu"; rev = "v${version}"; - hash = "sha256-JnKvMbgkaZ1MO7cZMb2PGZsNMjV1M+dnaDpsBDsT0L4="; + hash = "sha256-ab5nTB7mp9zB53JsPS2aPhbnW4O+56+cWunqTVENMPA="; }; postPatch = '' From d0f89e785eda20709acdc468d42dc4d95d25ae36 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 17 Mar 2024 02:48:14 -0700 Subject: [PATCH 38/44] klipper: unstable-2024-02-17 -> unstable-2024-03-15 (#296574) --- pkgs/servers/klipper/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/klipper/default.nix b/pkgs/servers/klipper/default.nix index e1d15d55722c..15b4c9351f30 100644 --- a/pkgs/servers/klipper/default.nix +++ b/pkgs/servers/klipper/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "klipper"; - version = "unstable-2024-02-17"; + version = "unstable-2024-03-15"; src = fetchFromGitHub { owner = "KevinOConnor"; repo = "klipper"; - rev = "28f06a104bc0cfe3a7d36db343ade5a805b3e132"; - sha256 = "sha256-v2nv4g3dQTMbUKIrEJo8s66WRWXnSkWO8K+12fK/cZw="; + rev = "bfb71bc2dc63f2911a11ebf580f82b1e8b2706c4"; + sha256 = "sha256-djF1IOcMCBcsmVV0hgn6QMwDVClxSSithgiRvss9KQc="; }; sourceRoot = "${src.name}/klippy"; From 162f9b041655e9917b177ff55ffc0f67980c05db Mon Sep 17 00:00:00 2001 From: Friedrich Altheide <11352905+FriedrichAltheide@users.noreply.github.com> Date: Sun, 17 Mar 2024 07:19:03 +0100 Subject: [PATCH 39/44] maintainers: add friedrichaltheide --- maintainers/maintainer-list.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 53ae8880787d..07f5874226e4 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -6653,6 +6653,11 @@ githubId = 46672819; name = "Frido Friedemann"; }; + friedrichaltheide = { + github = "friedrichaltheide"; + githubId = 11352905; + name = "Friedrich Altheide"; + }; frlan = { email = "frank@frank.uvena.de"; github = "frlan"; From 37766ba31091c0331d13592bf6ed8e48fe030e77 Mon Sep 17 00:00:00 2001 From: Friedrich Altheide <11352905+FriedrichAltheide@users.noreply.github.com> Date: Sun, 17 Mar 2024 07:19:38 +0100 Subject: [PATCH 40/44] virtualbox: add friedrichaltheide to maintainers --- pkgs/applications/virtualization/virtualbox/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix index f226a32596d3..df2094c3b1fc 100644 --- a/pkgs/applications/virtualization/virtualbox/default.nix +++ b/pkgs/applications/virtualization/virtualbox/default.nix @@ -281,7 +281,7 @@ in stdenv.mkDerivation { ]; license = licenses.gpl2; homepage = "https://www.virtualbox.org/"; - maintainers = with maintainers; [ sander ]; + maintainers = with maintainers; [ sander friedrichaltheide ]; platforms = [ "x86_64-linux" ]; mainProgram = "VirtualBox"; }; From c19f63e984c63e8ed97d3fa6d6495905dc50968a Mon Sep 17 00:00:00 2001 From: Friedrich Altheide <11352905+FriedrichAltheide@users.noreply.github.com> Date: Sun, 17 Mar 2024 07:20:41 +0100 Subject: [PATCH 41/44] virtualboxExtpack: add friedrichaltheide to maintainers --- pkgs/applications/virtualization/virtualbox/extpack.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/virtualization/virtualbox/extpack.nix b/pkgs/applications/virtualization/virtualbox/extpack.nix index 1831d42a129e..fad5aa6e10fb 100644 --- a/pkgs/applications/virtualization/virtualbox/extpack.nix +++ b/pkgs/applications/virtualization/virtualbox/extpack.nix @@ -19,7 +19,7 @@ fetchurl rec { description = "Oracle Extension pack for VirtualBox"; license = licenses.virtualbox-puel; homepage = "https://www.virtualbox.org/"; - maintainers = with maintainers; [ sander ]; + maintainers = with maintainers; [ sander friedrichaltheide ]; platforms = [ "x86_64-linux" ]; }; } From b7386abb63c8f31326153570364a34b8e708c882 Mon Sep 17 00:00:00 2001 From: Friedrich Altheide <11352905+FriedrichAltheide@users.noreply.github.com> Date: Sun, 17 Mar 2024 07:21:00 +0100 Subject: [PATCH 42/44] virtualboxGuestAdditions: add friedrichaltheide to maintainers --- .../virtualization/virtualbox/guest-additions/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix index 4f0868730c19..a1c2c8d09e24 100644 --- a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix +++ b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix @@ -146,7 +146,7 @@ in stdenv.mkDerivation rec { ''; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; license = "GPL"; - maintainers = [ lib.maintainers.sander ]; + maintainers = [ lib.maintainers.sander lib.maintainers.friedrichaltheide ]; platforms = [ "i686-linux" "x86_64-linux" ]; broken = stdenv.hostPlatform.is32bit && (kernel.kernelAtLeast "5.10"); }; From 1f45a867b7fb59f19758272a89b0f4536af60a62 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 17 Mar 2024 10:05:14 +0000 Subject: [PATCH 43/44] python311Packages.litellm: 1.31.14 -> 1.32.1 --- pkgs/development/python-modules/litellm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/litellm/default.nix b/pkgs/development/python-modules/litellm/default.nix index f0358d979103..4c24fd9b1e05 100644 --- a/pkgs/development/python-modules/litellm/default.nix +++ b/pkgs/development/python-modules/litellm/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { pname = "litellm"; - version = "1.31.14"; + version = "1.32.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -42,7 +42,7 @@ buildPythonPackage rec { owner = "BerriAI"; repo = "litellm"; rev = "refs/tags/v${version}"; - hash = "sha256-/K8LhKr7TpOPk1CMqNoFJCF+C0N6A8pDkBmS6JZ0sb0="; + hash = "sha256-qIEAtgfzTiUK+HzsocIH3L7z0Wfah3C4GByaA89wvso="; }; postPatch = '' From 1453c5df1862ec27a27400bdb85b6e6045998fe3 Mon Sep 17 00:00:00 2001 From: Sebastian Sellmeier Date: Sun, 17 Mar 2024 11:11:15 +0100 Subject: [PATCH 44/44] nix-zsh-completions: Add sebtm (repo-maintainer) as maintainer (cherry picked from commit a3f990a0e617b40090d0e58a88e1d41b00730af4) --- pkgs/shells/zsh/nix-zsh-completions/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/shells/zsh/nix-zsh-completions/default.nix b/pkgs/shells/zsh/nix-zsh-completions/default.nix index 32565af35be9..70d9f2970bc6 100644 --- a/pkgs/shells/zsh/nix-zsh-completions/default.nix +++ b/pkgs/shells/zsh/nix-zsh-completions/default.nix @@ -23,6 +23,6 @@ stdenv.mkDerivation rec { description = "ZSH completions for Nix, NixOS, and NixOps"; license = licenses.bsd3; platforms = platforms.all; - maintainers = with maintainers; [ olejorgenb hedning ma27 ]; + maintainers = with maintainers; [ olejorgenb hedning ma27 sebtm ]; }; }