From 7d32fe6dbee7c88c47bd707a769c05686643e255 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 9 Apr 2023 14:47:05 +0000 Subject: [PATCH 01/30] ethash: 0.8.0 -> 1.0.1 --- pkgs/development/libraries/ethash/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/ethash/default.nix b/pkgs/development/libraries/ethash/default.nix index c0119cbfac32..9100ccad3b31 100644 --- a/pkgs/development/libraries/ethash/default.nix +++ b/pkgs/development/libraries/ethash/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { pname = "ethash"; - version = "0.8.0"; + version = "1.0.1"; src = fetchFromGitHub { owner = "chfast"; repo = "ethash"; rev = "v${version}"; - sha256 = "sha256-4SJk4niSpLPjymwTCD0kHOrqpMf+vE3J/O7DiffUSJ4="; + sha256 = "sha256-BjgfWDn72P4NJhzq0ySW8bvZI3AQB9jOaRqFIeCfJ8k="; }; nativeBuildInputs = [ From 737c53238490d4221aac56e81a64813ce3246a9d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 17 Dec 2023 13:38:15 +0000 Subject: [PATCH 02/30] packer: 1.9.5 -> 1.10.0 --- pkgs/development/tools/packer/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/packer/default.nix b/pkgs/development/tools/packer/default.nix index 726aa304a544..d02a32827c2c 100644 --- a/pkgs/development/tools/packer/default.nix +++ b/pkgs/development/tools/packer/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "packer"; - version = "1.9.5"; + version = "1.10.0"; src = fetchFromGitHub { owner = "hashicorp"; repo = "packer"; rev = "v${version}"; - hash = "sha256-7HoT9B6YpgwJ8Q1TUMS3W919204LiOqyemtT7Ybeeyg="; + hash = "sha256-pHqYO3a9JruOCbMbLLQ2BqS4bcCeaBf82cBxGVHgLoY="; }; - vendorHash = "sha256-aalecIoKUUj0siDIBXXeyCjkpsyjlPPX6XohDC6WDoY="; + vendorHash = "sha256-ydG1nINW9uGYv5uNlJ6p8GHSkIW83qGpUAfRU+yQXmc="; subPackages = [ "." ]; @@ -30,7 +30,7 @@ buildGoModule rec { meta = with lib; { description = "A tool for creating identical machine images for multiple platforms from a single source configuration"; homepage = "https://www.packer.io"; - license = licenses.mpl20; + license = licenses.bsl11; maintainers = with maintainers; [ zimbatm ma27 techknowlogick qjoly ]; changelog = "https://github.com/hashicorp/packer/blob/v${version}/CHANGELOG.md"; }; From f038ea19d19e69cb6acf8e2b25ff4dcffb16c027 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 28 Dec 2023 06:16:46 +0000 Subject: [PATCH 03/30] libngspice: 41 -> 42 --- pkgs/development/libraries/libngspice/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libngspice/default.nix b/pkgs/development/libraries/libngspice/default.nix index 4807c1c55142..840ff2177d85 100644 --- a/pkgs/development/libraries/libngspice/default.nix +++ b/pkgs/development/libraries/libngspice/default.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation rec { pname = "${lib.optionalString withNgshared "lib"}ngspice"; - version = "41"; + version = "42"; src = fetchurl { url = "mirror://sourceforge/ngspice/ngspice-${version}.tar.gz"; - hash = "sha256-HOIZOV0vUMM+siOhQD+DGLFo8ebRAVp9udv0OUCN6MQ="; + hash = "sha256-c3/jhGqyMzolDfrfHtbr4YYK8dil/154A8dyzEJW5Qo="; }; nativeBuildInputs = [ From af026a99cdbe98790041e07fecfd1559121b0f49 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 28 Dec 2023 08:22:01 +0000 Subject: [PATCH 04/30] premid: 2.3.2 -> 2.3.4 --- pkgs/applications/misc/premid/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/premid/default.nix b/pkgs/applications/misc/premid/default.nix index 3fe8c64f20be..df2f0d6b28a1 100644 --- a/pkgs/applications/misc/premid/default.nix +++ b/pkgs/applications/misc/premid/default.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { pname = "premid"; - version = "2.3.2"; + version = "2.3.4"; src = fetchurl { url = "https://github.com/premid/Linux/releases/download/v${version}/${pname}.tar.gz"; - sha256 = "sha256-TuID63cVZkQ2kBl2iZeuVvjRUJYBt62ppPvgffBlOXY="; + sha256 = "sha256-ime6SCxm+fhMR2wagv1RItqwLjPxvJnVziW3DZafP50="; }; nativeBuildInputs = [ From b15d3c21be4f8d1314436074b7a8acc3d58a954f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 29 Dec 2023 06:39:13 +0000 Subject: [PATCH 05/30] augustus: 3.2.0 -> 4.0.0 --- pkgs/games/augustus/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/augustus/default.nix b/pkgs/games/augustus/default.nix index df10516ab35c..5aec0186cfc4 100644 --- a/pkgs/games/augustus/default.nix +++ b/pkgs/games/augustus/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "augustus"; - version = "3.2.0"; + version = "4.0.0"; src = fetchFromGitHub { owner = "Keriew"; repo = "augustus"; rev = "v${version}"; - sha256 = "sha256-NS6ijgI/wLsGF5KabjaR7ElKWFXIdjpmPYHVmI4oMzQ="; + sha256 = "sha256-UWJmxirRJJqvL4ZSjBvFepeKVvL77+WMp4YdZuFNEkg="; }; nativeBuildInputs = [ cmake ]; From 7f93dbdcb15f16d9ae91f32bcb299c93fd8c5958 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 29 Dec 2023 09:23:43 +0000 Subject: [PATCH 06/30] kestrel: 0.11.0 -> 1.0.0 --- pkgs/tools/security/kestrel/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/kestrel/default.nix b/pkgs/tools/security/kestrel/default.nix index 8384fa920498..f3d40b5ade0c 100644 --- a/pkgs/tools/security/kestrel/default.nix +++ b/pkgs/tools/security/kestrel/default.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "kestrel"; - version = "0.11.0"; + version = "1.0.0"; src = fetchFromGitHub { owner = "finfet"; repo = pname; rev = "v${version}"; - hash = "sha256-l9YYzwyi7POXbCxRmmhULO2YJauNJBfRGuXYU3uZQN4="; + hash = "sha256-n0XIFBCwpc6QTj3PjGp+fYtU4U+RAfA4PRcettFlxVA="; }; - cargoHash = "sha256-XqyFGxTNQyY1ryTbL9/9s1WVP4bVk/zbG9xNdddLX10="; + cargoHash = "sha256-GZK4IaAolU1up2bYd/2tBahcCP70hO5/shDODUD+aRE="; nativeBuildInputs = [ installShellFiles From 2a844964b4711b0f9bc6a158f4b6b03c371e61b9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 29 Dec 2023 11:59:24 +0000 Subject: [PATCH 07/30] python310Packages.troposphere: 4.5.2 -> 4.5.3 --- pkgs/development/python-modules/troposphere/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/troposphere/default.nix b/pkgs/development/python-modules/troposphere/default.nix index 016ed7de737b..1f2cfdd7febc 100644 --- a/pkgs/development/python-modules/troposphere/default.nix +++ b/pkgs/development/python-modules/troposphere/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "troposphere"; - version = "4.5.2"; + version = "4.5.3"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "cloudtools"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-LLky4lSSMUmLEf+qHwgPvDu0DZhG4WWZ1aFSXqFm1BA="; + hash = "sha256-Kk4PvkUC1JB2MNyarq/cHhOOc+2Id7HlR/hSt/5JjlI="; }; propagatedBuildInputs = [ From 1ec5fcaf3bdddfa901cf9cd36b6ef20c305a1cd8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 29 Dec 2023 12:21:26 +0000 Subject: [PATCH 08/30] poedit: 3.4.1 -> 3.4.2 --- pkgs/tools/text/poedit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/text/poedit/default.nix b/pkgs/tools/text/poedit/default.nix index 022bf39f87ca..7e8b78fda19f 100644 --- a/pkgs/tools/text/poedit/default.nix +++ b/pkgs/tools/text/poedit/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "poedit"; - version = "3.4.1"; + version = "3.4.2"; src = fetchFromGitHub { owner = "vslavik"; repo = "poedit"; rev = "v${version}-oss"; - hash = "sha256-VV8af2PVGPL0wzJbUigqPq4FDFUkwbafligNbfB6a9w="; + hash = "sha256-CfCWfKRzeGGk8/B0BLauO4Xb88/Si1ezvcGKeURgC9o="; }; nativeBuildInputs = [ autoconf automake asciidoc wrapGAppsHook From 4b302dbc95363e81c03d0c242602744b879f78bc Mon Sep 17 00:00:00 2001 From: natsukium Date: Thu, 4 Jan 2024 10:15:05 +0900 Subject: [PATCH 09/30] python311Packages.jupyter-core: 5.5.1 -> 5.7.0 Diff: https://github.com/jupyter/jupyter_core/compare/refs/tags/v5.5.1...v5.7.0 Changelog: https://github.com/jupyter/jupyter_core/blob/refs/tags/v5.7.0/CHANGELOG.md --- pkgs/development/python-modules/jupyter-core/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jupyter-core/default.nix b/pkgs/development/python-modules/jupyter-core/default.nix index 1ab9f5770909..68f66994d180 100644 --- a/pkgs/development/python-modules/jupyter-core/default.nix +++ b/pkgs/development/python-modules/jupyter-core/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "jupyter-core"; - version = "5.5.1"; + version = "5.7.0"; disabled = pythonOlder "3.7"; pyproject = true; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "jupyter"; repo = "jupyter_core"; rev = "refs/tags/v${version}"; - hash = "sha256-X8yBh63JYIuIatLtJU0pOD8Oz/QpJShU0R2VGAgPAa4="; + hash = "sha256-y3a2pSk+6QNSVg0skosbf6uHSXpvMubyflP6jQleI44="; }; patches = [ From 5227353617e8626f3295a8b31949226382c4b08c Mon Sep 17 00:00:00 2001 From: natsukium Date: Thu, 4 Jan 2024 10:15:45 +0900 Subject: [PATCH 10/30] python311Packages.jupyter-server: 2.12.1 -> 2.12.2 Changelog: https://github.com/jupyter-server/jupyter_server/blob/v2.12.2/CHANGELOG.md --- pkgs/development/python-modules/jupyter-server/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/jupyter-server/default.nix b/pkgs/development/python-modules/jupyter-server/default.nix index 47d5b0c33220..f938497d3412 100644 --- a/pkgs/development/python-modules/jupyter-server/default.nix +++ b/pkgs/development/python-modules/jupyter-server/default.nix @@ -34,14 +34,14 @@ buildPythonPackage rec { pname = "jupyter-server"; - version = "2.12.1"; - format = "pyproject"; + version = "2.12.2"; + pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { pname = "jupyter_server"; inherit version; - hash = "sha256-3He33MX8BUesuisoRPAXmACGZyAe6ifGMZ/5JX1wCm0="; + hash = "sha256-Xq6GvhUiS1N1zewMNULOcv8g96JSl6KoFmolC7RVpRk="; }; nativeBuildInputs = [ From 9cd747bff44309b8f8ad88656dc8bf7c15b5b595 Mon Sep 17 00:00:00 2001 From: natsukium Date: Thu, 4 Jan 2024 10:16:05 +0900 Subject: [PATCH 11/30] python311Packages.jupyter-sphinx: 0.4.0 -> 0.5.3 Changelog: https://github.com/jupyter/jupyter-sphinx/releases/tag/v0.5.3 --- .../python-modules/jupyter-sphinx/default.nix | 32 +++++++++++++------ 1 file changed, 23 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/jupyter-sphinx/default.nix b/pkgs/development/python-modules/jupyter-sphinx/default.nix index 3c41db14e7a7..87f6bf3d4bbf 100644 --- a/pkgs/development/python-modules/jupyter-sphinx/default.nix +++ b/pkgs/development/python-modules/jupyter-sphinx/default.nix @@ -1,30 +1,44 @@ { lib , buildPythonPackage , fetchPypi -, nbformat -, sphinx +, hatchling +, ipykernel +, ipython , ipywidgets -, pythonOlder , nbconvert +, nbformat +, pythonOlder +, sphinx }: buildPythonPackage rec { pname = "jupyter-sphinx"; - version = "0.4.0"; - format = "setuptools"; + version = "0.5.3"; + pyproject = true; + + disabled = pythonOlder "3.8"; src = fetchPypi { inherit version; pname = "jupyter_sphinx"; - hash = "sha256-DBGjjxNDE48sUFHA00xMVF9EgBdMG9QcAlb+gm4LqlU="; + hash = "sha256-LiNpmjoc9dsxsQmB2lqjJgbucw9rc6hE0edtgAdWr1Y="; }; - propagatedBuildInputs = [ nbconvert nbformat sphinx ipywidgets ]; + nativeBuildInputs = [ + hatchling + ]; + + propagatedBuildInputs = [ + ipykernel + ipython + ipywidgets + nbconvert + nbformat + sphinx + ]; doCheck = false; - disabled = pythonOlder "3.5"; - meta = with lib; { description = "Jupyter Sphinx Extensions"; homepage = "https://github.com/jupyter/jupyter-sphinx/"; From 123996d4409bc0fa250bacae310f35155f10a1f4 Mon Sep 17 00:00:00 2001 From: natsukium Date: Thu, 4 Jan 2024 11:01:24 +0900 Subject: [PATCH 12/30] python311Packages.jupyter-sphinx: enable tests --- .../python-modules/jupyter-sphinx/default.nix | 30 ++++++++++++++----- 1 file changed, 23 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/jupyter-sphinx/default.nix b/pkgs/development/python-modules/jupyter-sphinx/default.nix index 87f6bf3d4bbf..9fb30b5e143e 100644 --- a/pkgs/development/python-modules/jupyter-sphinx/default.nix +++ b/pkgs/development/python-modules/jupyter-sphinx/default.nix @@ -1,6 +1,6 @@ { lib , buildPythonPackage -, fetchPypi +, fetchFromGitHub , hatchling , ipykernel , ipython @@ -9,6 +9,7 @@ , nbformat , pythonOlder , sphinx +, pytestCheckHook }: buildPythonPackage rec { @@ -18,10 +19,11 @@ buildPythonPackage rec { disabled = pythonOlder "3.8"; - src = fetchPypi { - inherit version; - pname = "jupyter_sphinx"; - hash = "sha256-LiNpmjoc9dsxsQmB2lqjJgbucw9rc6hE0edtgAdWr1Y="; + src = fetchFromGitHub { + owner = "jupyter"; + repo = "jupyter-sphinx"; + rev = "refs/tags/v${version}"; + hash = "sha256-o/i3WravKZPf7uw2H4SVYfAyaZGf19ZJlkmeHCWcGtE="; }; nativeBuildInputs = [ @@ -37,12 +39,26 @@ buildPythonPackage rec { sphinx ]; - doCheck = false; + pythonImportsCheck = [ + "jupyter_sphinx" + ]; + + env.JUPYTER_PLATFORM_DIRS = 1; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + preCheck = '' + export HOME=$TMPDIR + ''; + + __darwinAllowLocalNetworking = true; meta = with lib; { description = "Jupyter Sphinx Extensions"; homepage = "https://github.com/jupyter/jupyter-sphinx/"; + changelog = "https://github.com/jupyter/jupyter-sphinx/releases/tag/${src.rev}"; license = licenses.bsd3; }; - } From d0a3bd40f7ea820832c1727f2a6c79199031e76c Mon Sep 17 00:00:00 2001 From: natsukium Date: Thu, 4 Jan 2024 10:16:42 +0900 Subject: [PATCH 13/30] python311Packages.jupyterlab: 4.0.9 -> 4.0.10 Changelog: https://github.com/jupyterlab/jupyterlab/blob/v4.0.10/CHANGELOG.md --- pkgs/development/python-modules/jupyterlab/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jupyterlab/default.nix b/pkgs/development/python-modules/jupyterlab/default.nix index ae4437216fdc..c00e171772e1 100644 --- a/pkgs/development/python-modules/jupyterlab/default.nix +++ b/pkgs/development/python-modules/jupyterlab/default.nix @@ -19,14 +19,14 @@ buildPythonPackage rec { pname = "jupyterlab"; - version = "4.0.9"; + version = "4.0.10"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-nrraQdUmUfYjwMnwad24oh1oSOTIh9jl3cBhMWbtXAs="; + hash = "sha256-Rhd+uO3nDcc76SKsmfjvlDvcLfvGoxs1PEvehIo13uE="; }; nativeBuildInputs = [ From 93fe029ac5c9a11e0946feaadb66a45e1c129ae4 Mon Sep 17 00:00:00 2001 From: natsukium Date: Thu, 4 Jan 2024 10:17:44 +0900 Subject: [PATCH 14/30] python311Packages.nbconvert: 7.13.1 -> 7.14.0 Changelog: https://github.com/jupyter/nbconvert/blob/v7.14.0/CHANGELOG.md --- pkgs/development/python-modules/nbconvert/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/nbconvert/default.nix b/pkgs/development/python-modules/nbconvert/default.nix index 795ffa0b8d73..922b7259bf05 100644 --- a/pkgs/development/python-modules/nbconvert/default.nix +++ b/pkgs/development/python-modules/nbconvert/default.nix @@ -32,14 +32,14 @@ let }; in buildPythonPackage rec { pname = "nbconvert"; - version = "7.13.1"; + version = "7.14.0"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-Lcgmfb3+7c4tzTTJ4/G1GvGPQ8sQVUnRxaGBiewjuoU="; + hash = "sha256-krmkS2Plp/tPb6DvQSYeNcFpJQRszRwEpcgJm/EAR24="; }; # Add $out/share/jupyter to the list of paths that are used to search for From 6a98c747dec55d9bb61cddfd55e394b6075db723 Mon Sep 17 00:00:00 2001 From: K900 Date: Thu, 4 Jan 2024 13:44:57 +0300 Subject: [PATCH 15/30] libaccounts-glib: 1.24 -> 1.26 --- .../libraries/libaccounts-glib/default.nix | 7 +--- .../libaccounts-glib/py-override.patch | 38 ------------------- 2 files changed, 2 insertions(+), 43 deletions(-) delete mode 100644 pkgs/development/libraries/libaccounts-glib/py-override.patch diff --git a/pkgs/development/libraries/libaccounts-glib/default.nix b/pkgs/development/libraries/libaccounts-glib/default.nix index e20ad1c954d1..c540f4bc26ec 100644 --- a/pkgs/development/libraries/libaccounts-glib/default.nix +++ b/pkgs/development/libraries/libaccounts-glib/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { pname = "libaccounts-glib"; - version = "1.24"; + version = "1.26"; outputs = [ "out" "dev" "devdoc" "py" ]; @@ -11,12 +11,9 @@ stdenv.mkDerivation rec { owner = "accounts-sso"; repo = "libaccounts-glib"; rev = version; - sha256 = "0y8smg1rd279lrr9ad8b499i8pbkajmwd4xn41rdh9h93hs9apn7"; + sha256 = "sha256-KVKylt+XjLfidsS2KzT7oFXP6rTR528lYAUP8dffu7k="; }; - # See: https://gitlab.com/accounts-sso/libaccounts-glib/merge_requests/22 - patches = [ ./py-override.patch ]; - nativeBuildInputs = [ check docbook_xml_dtd_43 diff --git a/pkgs/development/libraries/libaccounts-glib/py-override.patch b/pkgs/development/libraries/libaccounts-glib/py-override.patch deleted file mode 100644 index 4179f4fa0af0..000000000000 --- a/pkgs/development/libraries/libaccounts-glib/py-override.patch +++ /dev/null @@ -1,38 +0,0 @@ -diff --git a/libaccounts-glib/pygobject/meson.build b/libaccounts-glib/pygobject/meson.build -index fa1f4a0..588c4ce 100644 ---- a/libaccounts-glib/pygobject/meson.build -+++ b/libaccounts-glib/pygobject/meson.build -@@ -1,11 +1,19 @@ --python3 = import('python3') --python_exec = python3.find_python() --python_exec_result = run_command(python_exec, ['-c', 'import gi; from os.path import abspath; print(abspath(gi._overridesdir))']) -+py_override = get_option('py-overrides-dir') - --if python_exec_result.returncode() != 0 -- error('Failed to retreive the python GObject override directory') -+if py_override == '' -+ python3 = import('python3') -+ python_exec = python3.find_python() -+ -+ python_exec_result = run_command(python_exec, ['-c', 'import gi; from os.path import abspath; print(abspath(gi._overridesdir))']) -+ -+ if python_exec_result.returncode() != 0 -+ error('Failed to retreive the python GObject override directory') -+ endif -+ -+ py_override = python_exec_result.stdout().strip() - endif - --install_data('Accounts.py', -- install_dir: join_paths(python_exec_result.stdout().strip()) -+install_data( -+ 'Accounts.py', -+ install_dir: py_override - ) -diff --git a/meson_options.txt b/meson_options.txt -new file mode 100644 -index 0000000..2c33804 ---- /dev/null -+++ b/meson_options.txt -@@ -0,0 +1 @@ -+option('py-overrides-dir', type : 'string', value : '', description: 'Path to pygobject overrides directory') From b7afb78da373075131736aefc5b8221570acf5f7 Mon Sep 17 00:00:00 2001 From: K900 Date: Thu, 4 Jan 2024 13:49:37 +0300 Subject: [PATCH 16/30] accounts-qt: clean up, make buildable with Qt6 --- pkgs/development/libraries/accounts-qt/default.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/accounts-qt/default.nix b/pkgs/development/libraries/accounts-qt/default.nix index 93f33531b5e8..7549f02fc56c 100644 --- a/pkgs/development/libraries/accounts-qt/default.nix +++ b/pkgs/development/libraries/accounts-qt/default.nix @@ -1,6 +1,6 @@ -{ mkDerivation, lib, fetchFromGitLab, doxygen, glib, libaccounts-glib, pkg-config, qmake }: +{ stdenv, lib, fetchFromGitLab, doxygen, glib, libaccounts-glib, pkg-config, qmake, qtbase, wrapQtAppsHook }: -mkDerivation rec { +stdenv.mkDerivation rec { pname = "accounts-qt"; version = "1.16"; @@ -12,9 +12,10 @@ mkDerivation rec { }; propagatedBuildInputs = [ glib libaccounts-glib ]; - nativeBuildInputs = [ doxygen pkg-config qmake ]; + buildInputs = [ qtbase ]; + nativeBuildInputs = [ doxygen pkg-config qmake wrapQtAppsHook ]; - # remove forbidden references to $TMPDIR + # remove forbidden references to /build preFixup = '' patchelf --shrink-rpath --allowed-rpath-prefixes "$NIX_STORE" "$out"/bin/* ''; @@ -23,6 +24,6 @@ mkDerivation rec { description = "Qt library for accessing the online accounts database"; homepage = "https://gitlab.com/accounts-sso"; license = licenses.lgpl21; - platforms = with platforms; linux; + platforms = platforms.linux; }; } From 6d0fa8c7f88093d1be9f5b288381b9df2d0efb72 Mon Sep 17 00:00:00 2001 From: K900 Date: Thu, 4 Jan 2024 13:51:59 +0300 Subject: [PATCH 17/30] signond: clean up, make buildable with Qt6 --- pkgs/development/libraries/signond/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/signond/default.nix b/pkgs/development/libraries/signond/default.nix index ff5aeca626eb..ea57e872ab29 100644 --- a/pkgs/development/libraries/signond/default.nix +++ b/pkgs/development/libraries/signond/default.nix @@ -1,6 +1,6 @@ -{ mkDerivation, lib, fetchFromGitLab, qmake, doxygen }: +{ stdenv, lib, fetchFromGitLab, qmake, qtbase, wrapQtAppsHook, doxygen }: -mkDerivation rec { +stdenv.mkDerivation rec { pname = "signond"; version = "8.61"; @@ -14,8 +14,11 @@ mkDerivation rec { nativeBuildInputs = [ qmake doxygen + wrapQtAppsHook ]; + buildInputs = [ qtbase ]; + preConfigure = '' substituteInPlace src/signond/signond.pro \ --replace "/etc" "@out@/etc" @@ -24,7 +27,7 @@ mkDerivation rec { meta = with lib; { homepage = "https://gitlab.com/accounts-sso/signond"; description = "Signon Daemon for Qt"; - maintainers = with maintainers; [ freezeboy ]; + maintainers = with maintainers; [ freezeboy ]; platforms = platforms.linux; }; } From 016680fcf62c2fcd679bbb64a20b46e2156d121c Mon Sep 17 00:00:00 2001 From: DS Date: Thu, 4 Jan 2024 12:00:03 -0800 Subject: [PATCH 18/30] doc: add documentation conventions to keep a consistent style --- doc/README.md | 64 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 64 insertions(+) diff --git a/doc/README.md b/doc/README.md index 616409beaaf5..43eb39c02ab1 100644 --- a/doc/README.md +++ b/doc/README.md @@ -106,6 +106,19 @@ The following are supported: - [`note`](https://tdg.docbook.org/tdg/5.0/note.html) - [`tip`](https://tdg.docbook.org/tdg/5.0/tip.html) - [`warning`](https://tdg.docbook.org/tdg/5.0/warning.html) +- [`example`](https://tdg.docbook.org/tdg/5.0/example.html) + +Example admonitions require a title to work. +If you don't provide one, the manual won't be built. + +```markdown +::: {.example #ex-showing-an-example} + +# Title for this example + +Text for the example. +::: +``` #### [Definition lists](https://github.com/jgm/commonmark-hs/blob/master/commonmark-extensions/test/definition_lists.md) @@ -139,3 +152,54 @@ watermelon Closes #216321. - If the commit contains more than just documentation changes, follow the commit message format relevant for the rest of the changes. + +## Documentation conventions + +In an effort to keep the Nixpkgs manual in a consistent style, please follow the conventions below, unless they prevent you from properly documenting something. +In that case, please open an issue about the particular documentation convention and tag it with a "needs: documentation" label. + +- Put each sentence in its own line. + This makes reviewing documentation much easier, since GitHub's review system is based on lines. + +- Use the admonitions syntax for any callouts and examples (see [section above](#admonitions)). + +- If you provide an example involving Nix code, make your example into a fully-working package (something that can be passed to `pkgs.callPackage`). + This will help others quickly test that the example works, and will also make it easier if we start automatically testing all example code to make sure it works. + For example, instead of providing something like: + + ``` + pkgs.dockerTools.buildLayeredImage { + name = "hello"; + contents = [ pkgs.hello ]; + } + ``` + + Provide something like: + + ``` + { dockerTools, hello }: + dockerTools.buildLayeredImage { + name = "hello"; + contents = [ hello ]; + } + ``` + +- Use [definition lists](#definition-lists) to document function arguments, and the attributes of such arguments. For example: + + ```markdown + # pkgs.coolFunction + + Description of what `coolFunction` does. + `coolFunction` expects a single argument which should be an attribute set, with the following possible attributes: + + `name` + + : The name of the resulting image. + + `tag` _optional_ + + : Tag of the generated image. + + _Default value:_ the output path's hash. + + ``` From 3d0b034e8794ad419a1d2615c77ff20ccd0acfd9 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Thu, 28 Dec 2023 11:48:40 +1000 Subject: [PATCH 19/30] maintainers/teams: add buildbot --- maintainers/team-list.nix | 10 ++++++++++ .../continuous-integration/buildbot/master.nix | 2 +- .../continuous-integration/buildbot/worker.nix | 2 +- nixos/tests/buildbot.nix | 2 +- .../continuous-integration/buildbot/master.nix | 2 +- .../tools/continuous-integration/buildbot/pkg.nix | 2 +- .../continuous-integration/buildbot/plugins.nix | 14 +++++++------- .../continuous-integration/buildbot/worker.nix | 2 +- 8 files changed, 23 insertions(+), 13 deletions(-) diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix index 35aba906cffe..c5b37437ddb2 100644 --- a/maintainers/team-list.nix +++ b/maintainers/team-list.nix @@ -96,6 +96,16 @@ with lib.maintainers; { shortName = "Blockchains"; }; + buildbot = { + members = [ + lopsided98 + mic92 + zowoq + ]; + scope = "Maintain Buildbot CI framework"; + shortName = "Buildbot"; + }; + c = { members = [ matthewbauer diff --git a/nixos/modules/services/continuous-integration/buildbot/master.nix b/nixos/modules/services/continuous-integration/buildbot/master.nix index 56abeda3a5cd..446d19b8fd5a 100644 --- a/nixos/modules/services/continuous-integration/buildbot/master.nix +++ b/nixos/modules/services/continuous-integration/buildbot/master.nix @@ -305,5 +305,5 @@ in { '') ]; - meta.maintainers = with lib.maintainers; [ mic92 lopsided98 ]; + meta.maintainers = lib.teams.buildbot.members; } diff --git a/nixos/modules/services/continuous-integration/buildbot/worker.nix b/nixos/modules/services/continuous-integration/buildbot/worker.nix index 2a836c24dda3..9c7b2bdd06e0 100644 --- a/nixos/modules/services/continuous-integration/buildbot/worker.nix +++ b/nixos/modules/services/continuous-integration/buildbot/worker.nix @@ -188,6 +188,6 @@ in { }; }; - meta.maintainers = with lib.maintainers; [ ]; + meta.maintainers = lib.teams.buildbot.members; } diff --git a/nixos/tests/buildbot.nix b/nixos/tests/buildbot.nix index dbf68aba9467..2f6926313b7c 100644 --- a/nixos/tests/buildbot.nix +++ b/nixos/tests/buildbot.nix @@ -104,5 +104,5 @@ import ./make-test-python.nix ({ pkgs, ... }: { bbworker.fail("nc -z bbmaster 8011") ''; - meta.maintainers = with pkgs.lib.maintainers; [ ]; + meta.maintainers = pkgs.lib.teams.buildbot.members; }) diff --git a/pkgs/development/tools/continuous-integration/buildbot/master.nix b/pkgs/development/tools/continuous-integration/buildbot/master.nix index 5436d00b0bb0..5b26a284a0bc 100644 --- a/pkgs/development/tools/continuous-integration/buildbot/master.nix +++ b/pkgs/development/tools/continuous-integration/buildbot/master.nix @@ -156,7 +156,7 @@ let description = "An open-source continuous integration framework for automating software build, test, and release processes"; homepage = "https://buildbot.net/"; changelog = "https://github.com/buildbot/buildbot/releases/tag/v${version}"; - maintainers = with maintainers; [ ryansydnor lopsided98 ]; + maintainers = teams.buildbot.members; license = licenses.gpl2Only; broken = stdenv.isDarwin; }; diff --git a/pkgs/development/tools/continuous-integration/buildbot/pkg.nix b/pkgs/development/tools/continuous-integration/buildbot/pkg.nix index 758a640aa876..88b03f46a362 100644 --- a/pkgs/development/tools/continuous-integration/buildbot/pkg.nix +++ b/pkgs/development/tools/continuous-integration/buildbot/pkg.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { meta = with lib; { homepage = "https://buildbot.net/"; description = "Buildbot Packaging Helper"; - maintainers = with maintainers; [ ryansydnor lopsided98 ]; + maintainers = teams.buildbot.members; license = licenses.gpl2; }; } diff --git a/pkgs/development/tools/continuous-integration/buildbot/plugins.nix b/pkgs/development/tools/continuous-integration/buildbot/plugins.nix index 3c6fa1bbdae9..45442bf2a6e3 100644 --- a/pkgs/development/tools/continuous-integration/buildbot/plugins.nix +++ b/pkgs/development/tools/continuous-integration/buildbot/plugins.nix @@ -24,7 +24,7 @@ meta = with lib; { homepage = "https://buildbot.net/"; description = "Buildbot UI"; - maintainers = with maintainers; [ ryansydnor lopsided98 ]; + maintainers = teams.buildbot.members; license = licenses.gpl2; }; }; @@ -51,7 +51,7 @@ meta = with lib; { homepage = "https://buildbot.net/"; description = "Buildbot UI (React)"; - maintainers = with maintainers; [ mic92 ]; + maintainers = teams.buildbot.members; license = licenses.gpl2Only; }; }; @@ -73,7 +73,7 @@ meta = with lib; { homepage = "https://buildbot.net/"; description = "Buildbot Console View Plugin"; - maintainers = with maintainers; [ ryansydnor lopsided98 ]; + maintainers = teams.buildbot.members; license = licenses.gpl2; }; }; @@ -95,7 +95,7 @@ meta = with lib; { homepage = "https://buildbot.net/"; description = "Buildbot Waterfall View Plugin"; - maintainers = with maintainers; [ ryansydnor lopsided98 ]; + maintainers = teams.buildbot.members; license = licenses.gpl2; }; }; @@ -117,7 +117,7 @@ meta = with lib; { homepage = "https://buildbot.net/"; description = "Buildbot Grid View Plugin"; - maintainers = with maintainers; [ lopsided98 ]; + maintainers = teams.buildbot.members; license = licenses.gpl2; }; }; @@ -139,7 +139,7 @@ meta = with lib; { homepage = "https://buildbot.net/"; description = "Buildbot WSGI dashboards Plugin"; - maintainers = with maintainers; [ lopsided98 ]; + maintainers = teams.buildbot.members; license = licenses.gpl2; }; }; @@ -162,7 +162,7 @@ meta = with lib; { homepage = "https://buildbot.net/"; description = "Buildbot Badges Plugin"; - maintainers = with maintainers; [ julienmalka ]; + maintainers = teams.buildbot.members ++ [ maintainers.julienmalka ]; license = licenses.gpl2; }; }; diff --git a/pkgs/development/tools/continuous-integration/buildbot/worker.nix b/pkgs/development/tools/continuous-integration/buildbot/worker.nix index e1e31459ce17..c87b8db563c9 100644 --- a/pkgs/development/tools/continuous-integration/buildbot/worker.nix +++ b/pkgs/development/tools/continuous-integration/buildbot/worker.nix @@ -59,7 +59,7 @@ buildPythonPackage (rec { meta = with lib; { homepage = "https://buildbot.net/"; description = "Buildbot Worker Daemon"; - maintainers = with maintainers; [ ryansydnor lopsided98 ]; + maintainers = teams.buildbot.members; license = licenses.gpl2; broken = stdenv.isDarwin; # https://hydra.nixos.org/build/243534318/nixlog/6 }; From 43a88eef2ed0cbcfe3640a62a36176a833f3b2b2 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Thu, 28 Dec 2023 11:48:40 +1000 Subject: [PATCH 20/30] .github/CODEOWNERS: add buildbot --- .github/CODEOWNERS | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 8c25c757fca3..ed54c4ee3bfe 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -336,3 +336,8 @@ nixos/tests/zfs.nix @raitobezarius # Linux Kernel pkgs/os-specific/linux/kernel/manual-config.nix @amjoseph-nixpkgs + +# Buildbot +nixos/modules/services/continuous-integration/buildbot @Mic92 @zowoq +nixos/tests/buildbot.nix @Mic92 @zowoq +pkgs/development/tools/continuous-integration/buildbot @Mic92 @zowoq From a64cc4682ee541fc76726e0d90a7e527b7b80fb0 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Fri, 29 Dec 2023 14:48:23 +1000 Subject: [PATCH 21/30] buildbot-plugins.react-console-view: init at 3.10.1 --- .../buildbot/plugins.nix | 22 +++++++++++++++++++ .../continuous-integration/buildbot/update.sh | 1 + 2 files changed, 23 insertions(+) diff --git a/pkgs/development/tools/continuous-integration/buildbot/plugins.nix b/pkgs/development/tools/continuous-integration/buildbot/plugins.nix index 45442bf2a6e3..b7da42feb207 100644 --- a/pkgs/development/tools/continuous-integration/buildbot/plugins.nix +++ b/pkgs/development/tools/continuous-integration/buildbot/plugins.nix @@ -78,6 +78,28 @@ }; }; + react-console-view = buildPythonPackage rec { + pname = "buildbot-react-console-view"; + inherit (buildbot-pkg) version; + + src = fetchPypi { + inherit pname version; + hash = "sha256-U0j/ovoP3A83BzQWF4dtwisJxs00mZz0yyT12mlxfGo="; + }; + + buildInputs = [ buildbot-pkg ]; + + # tests fail + doCheck = false; + + meta = with lib; { + homepage = "https://buildbot.net/"; + description = "Buildbot Console View Plugin (React)"; + maintainers = teams.buildbot.members; + license = licenses.gpl2; + }; + }; + waterfall-view = buildPythonPackage rec { pname = "buildbot-waterfall-view"; inherit (buildbot-pkg) version; diff --git a/pkgs/development/tools/continuous-integration/buildbot/update.sh b/pkgs/development/tools/continuous-integration/buildbot/update.sh index 3bbbfc840e44..128b2c1cb347 100755 --- a/pkgs/development/tools/continuous-integration/buildbot/update.sh +++ b/pkgs/development/tools/continuous-integration/buildbot/update.sh @@ -8,6 +8,7 @@ nix-update --version=skip buildbot-plugins.buildbot-pkg nix-update --version=skip buildbot-plugins.www nix-update --version=skip buildbot-plugins.www-react nix-update --version=skip buildbot-plugins.console-view +nix-update --version=skip buildbot-plugins.react-console-view nix-update --version=skip buildbot-plugins.waterfall-view nix-update --version=skip buildbot-plugins.grid-view nix-update --version=skip buildbot-plugins.wsgi-dashboards From 6b6eb04575ec6123a234e29f038509558cf4a6cf Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Fri, 29 Dec 2023 14:48:49 +1000 Subject: [PATCH 22/30] buildbot-plugins.react-waterfall-view: init at 3.10.1 --- .../buildbot/plugins.nix | 22 +++++++++++++++++++ .../continuous-integration/buildbot/update.sh | 1 + 2 files changed, 23 insertions(+) diff --git a/pkgs/development/tools/continuous-integration/buildbot/plugins.nix b/pkgs/development/tools/continuous-integration/buildbot/plugins.nix index b7da42feb207..17c7cc7a4856 100644 --- a/pkgs/development/tools/continuous-integration/buildbot/plugins.nix +++ b/pkgs/development/tools/continuous-integration/buildbot/plugins.nix @@ -122,6 +122,28 @@ }; }; + react-waterfall-view = buildPythonPackage rec { + pname = "buildbot-react-waterfall-view"; + inherit (buildbot-pkg) version; + + src = fetchPypi { + inherit pname version; + hash = "sha256-vt7ea0IWIKn4i8sBUUMsoOMi1gPzzFssQ6wORDClJqs="; + }; + + buildInputs = [ buildbot-pkg ]; + + # tests fail + doCheck = false; + + meta = with lib; { + homepage = "https://buildbot.net/"; + description = "Buildbot Waterfall View Plugin (React)"; + maintainers = teams.buildbot.members; + license = licenses.gpl2; + }; + }; + grid-view = buildPythonPackage rec { pname = "buildbot-grid-view"; inherit (buildbot-pkg) version; diff --git a/pkgs/development/tools/continuous-integration/buildbot/update.sh b/pkgs/development/tools/continuous-integration/buildbot/update.sh index 128b2c1cb347..c5f7a3b7f0de 100755 --- a/pkgs/development/tools/continuous-integration/buildbot/update.sh +++ b/pkgs/development/tools/continuous-integration/buildbot/update.sh @@ -10,6 +10,7 @@ nix-update --version=skip buildbot-plugins.www-react nix-update --version=skip buildbot-plugins.console-view nix-update --version=skip buildbot-plugins.react-console-view nix-update --version=skip buildbot-plugins.waterfall-view +nix-update --version=skip buildbot-plugins.react-waterfall-view nix-update --version=skip buildbot-plugins.grid-view nix-update --version=skip buildbot-plugins.wsgi-dashboards nix-update --version=skip buildbot-plugins.badges From 9051cab202f52bedd15eb5e73b464884133ba391 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Fri, 29 Dec 2023 14:49:01 +1000 Subject: [PATCH 23/30] buildbot-plugins.react-grid-view: init at 3.10.1 --- .../buildbot/plugins.nix | 22 +++++++++++++++++++ .../continuous-integration/buildbot/update.sh | 1 + 2 files changed, 23 insertions(+) diff --git a/pkgs/development/tools/continuous-integration/buildbot/plugins.nix b/pkgs/development/tools/continuous-integration/buildbot/plugins.nix index 17c7cc7a4856..5e9f056f3708 100644 --- a/pkgs/development/tools/continuous-integration/buildbot/plugins.nix +++ b/pkgs/development/tools/continuous-integration/buildbot/plugins.nix @@ -166,6 +166,28 @@ }; }; + react-grid-view = buildPythonPackage rec { + pname = "buildbot-react-grid-view"; + inherit (buildbot-pkg) version; + + src = fetchPypi { + inherit pname version; + hash = "sha256-Q8gwqUfMy+D9dPBSw60BhNV12iu9mjhc7KXKYjtO23s="; + }; + + buildInputs = [ buildbot-pkg ]; + + # tests fail + doCheck = false; + + meta = with lib; { + homepage = "https://buildbot.net/"; + description = "Buildbot Grid View Plugin (React)"; + maintainers = teams.buildbot.members; + license = licenses.gpl2; + }; + }; + wsgi-dashboards = buildPythonPackage rec { pname = "buildbot-wsgi-dashboards"; inherit (buildbot-pkg) version; diff --git a/pkgs/development/tools/continuous-integration/buildbot/update.sh b/pkgs/development/tools/continuous-integration/buildbot/update.sh index c5f7a3b7f0de..dbefba28b55f 100755 --- a/pkgs/development/tools/continuous-integration/buildbot/update.sh +++ b/pkgs/development/tools/continuous-integration/buildbot/update.sh @@ -12,5 +12,6 @@ nix-update --version=skip buildbot-plugins.react-console-view nix-update --version=skip buildbot-plugins.waterfall-view nix-update --version=skip buildbot-plugins.react-waterfall-view nix-update --version=skip buildbot-plugins.grid-view +nix-update --version=skip buildbot-plugins.react-grid-view nix-update --version=skip buildbot-plugins.wsgi-dashboards nix-update --version=skip buildbot-plugins.badges From 07072e248d98ea9763d85ca450814e637ea63728 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Wed, 3 Jan 2024 17:39:09 -0800 Subject: [PATCH 24/30] python3Packages.datadog: unbreak, run subset of tests --- pkgs/development/python-modules/datadog/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/datadog/default.nix b/pkgs/development/python-modules/datadog/default.nix index 311e4a0090b0..9c314e6ea09a 100644 --- a/pkgs/development/python-modules/datadog/default.nix +++ b/pkgs/development/python-modules/datadog/default.nix @@ -48,11 +48,12 @@ buildPythonPackage rec { disabledTestPaths = [ "tests/performance" + # https://github.com/DataDog/datadogpy/issues/800 + "tests/integration/api/test_*.py" ]; disabledTests = [ "test_default_settings_set" - ] ++ lib.optionals (pythonAtLeast "3.11") [ # https://github.com/DataDog/datadogpy/issues/746 "TestDogshell" ]; @@ -62,7 +63,6 @@ buildPythonPackage rec { ]; meta = with lib; { - broken = true; # https://github.com/DataDog/datadogpy/issues/800 description = "The Datadog Python library"; homepage = "https://github.com/DataDog/datadogpy"; changelog = "https://github.com/DataDog/datadogpy/blob/v${version}/CHANGELOG.md"; From 4664f806a93ea05560c7b1e21f8d53d0bd3e7165 Mon Sep 17 00:00:00 2001 From: Sean Buckley Date: Thu, 4 Jan 2024 17:08:19 -0500 Subject: [PATCH 25/30] brave: 1.61.109 -> 1.61.114 https://community.brave.com/t/release-channel-1-61-114/524569 --- pkgs/applications/networking/browsers/brave/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/brave/default.nix b/pkgs/applications/networking/browsers/brave/default.nix index d2f96600d787..153e208d6958 100644 --- a/pkgs/applications/networking/browsers/brave/default.nix +++ b/pkgs/applications/networking/browsers/brave/default.nix @@ -92,11 +92,11 @@ in stdenv.mkDerivation rec { pname = "brave"; - version = "1.61.109"; + version = "1.61.114"; src = fetchurl { url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb"; - hash = "sha256-vIi205FqgoQEZCV4iWCFxjH2hJNWH9HjRU94jt7Ee8A="; + hash = "sha256-AVL08Npg1nuvFJrd3rC2rCZeoLnPuQsgpvf2R623c6Y="; }; dontConfigure = true; From 7e11b29e589c42ec0dfe1ee99d2072ab7322f63b Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 5 Jan 2024 03:12:08 +0100 Subject: [PATCH 26/30] python311Packages.django-bootstrap3: 23.4 -> 23.6 https://github.com/zostera/django-bootstrap3/blob/v23.6/CHANGELOG.md --- .../python-modules/django-bootstrap3/default.nix | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/django-bootstrap3/default.nix b/pkgs/development/python-modules/django-bootstrap3/default.nix index ccb1ffd3c1a7..6a29fc7630aa 100644 --- a/pkgs/development/python-modules/django-bootstrap3/default.nix +++ b/pkgs/development/python-modules/django-bootstrap3/default.nix @@ -3,7 +3,8 @@ , fetchFromGitHub # build-system -, hatchling +, setuptools +, setuptools-scm # non-propagates , django @@ -15,22 +16,19 @@ buildPythonPackage rec { pname = "django-bootstrap3"; - version = "23.4"; + version = "23.6"; format = "pyproject"; src = fetchFromGitHub { owner = "zostera"; repo = "django-bootstrap3"; rev = "refs/tags/v${version}"; - hash = "sha256-1/JQ17GjBHH0JbY4EnHOS2B3KhEJdG2yL6O2nc1HNNc="; + hash = "sha256-qqG9w0bQYoQgWXCks/WwwQVoh2DhIMLaFXDQ4z6D84g="; }; - postPatch = '' - sed -i '/beautifulsoup4/d' pyproject.toml - ''; - nativeBuildInputs = [ - hatchling + setuptools + setuptools-scm ]; buildInputs = [ From da102b9c3fdb463953ede82251ebe2ffa90f23ee Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 5 Jan 2024 03:12:40 +0100 Subject: [PATCH 27/30] python311Packages.django-bootstrap4: 23.2 -> 23.4 https://github.com/zostera/django-bootstrap4/blob/refs/tags/v23.4/CHANGELOG.md --- .../python-modules/django-bootstrap4/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/django-bootstrap4/default.nix b/pkgs/development/python-modules/django-bootstrap4/default.nix index 568ce0df3048..66cff8029757 100644 --- a/pkgs/development/python-modules/django-bootstrap4/default.nix +++ b/pkgs/development/python-modules/django-bootstrap4/default.nix @@ -3,7 +3,8 @@ , fetchFromGitHub # build-system -, hatchling +, setuptools +, setuptools-scm # non-propagates , django @@ -17,18 +18,19 @@ buildPythonPackage rec { pname = "django-bootstrap4"; - version = "23.2"; + version = "23.4"; format = "pyproject"; src = fetchFromGitHub { owner = "zostera"; repo = "django-bootstrap4"; rev = "refs/tags/v${version}"; - hash = "sha256-RYGwi+hRfTqPAikrv33w27v1/WLwRvXexSusJKdr2o8="; + hash = "sha256-ccZ/73u4c6E6pfRv+f3Pu8SorF/d7zQBexGAlFcIwTo="; }; nativeBuildInputs = [ - hatchling + setuptools + setuptools-scm ]; propagatedBuildInputs = [ From a6ea8a52ae25299df54a6001c9d243c13ee1890f Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 5 Jan 2024 03:14:44 +0100 Subject: [PATCH 28/30] python311Packages.deepmerge: 1.1.0 -> 1.1.1 https://github.com/toumorokoshi/deepmerge/releases/tag/v1.1.1 --- .../python-modules/deepmerge/default.nix | 21 ++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/deepmerge/default.nix b/pkgs/development/python-modules/deepmerge/default.nix index 2ef1e6aa5182..0a22573e2dfa 100644 --- a/pkgs/development/python-modules/deepmerge/default.nix +++ b/pkgs/development/python-modules/deepmerge/default.nix @@ -1,24 +1,27 @@ { lib , buildPythonPackage , fetchPypi -, isPy27 + +# build-system +, setuptools , setuptools-scm -, vcver + +# tests , pytestCheckHook }: buildPythonPackage rec { pname = "deepmerge"; - version = "1.1.0"; - disabled = isPy27; - format = "pyproject"; + version = "1.1.1"; + pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-TCeg213iheGnzqx9vBUx3qpVa2J96kkAyCRFgezf6i0="; + hash = "sha256-U6SJ3JRJY25ICnhDWa4qqzGRdIySBklVHI43hiLw7KQ="; }; nativeBuildInputs = [ + setuptools setuptools-scm ]; @@ -26,10 +29,14 @@ buildPythonPackage rec { pytestCheckHook ]; - pythonImportsCheck = [ "deepmerge" ]; + pythonImportsCheck = [ + "deepmerge" + ]; meta = with lib; { + changelog = "https://github.com/toumorokoshi/deepmerge/releases/tag/v${version}"; description = "A toolset to deeply merge python dictionaries."; + downloadPage = "https://github.com/toumorokoshi/deepmerge"; homepage = "http://deepmerge.readthedocs.io/en/latest/"; license = licenses.mit; maintainers = with maintainers; [ hexa ]; From 6f5d75c11909a01b3537902ea794eb4b0819a7e8 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 5 Jan 2024 03:17:52 +0100 Subject: [PATCH 29/30] python311Packages.mocket: 3.12.0 -> 3.12.2 https://github.com/mindflayer/python-mocket/releases/tag/3.12.2 --- pkgs/development/python-modules/mocket/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mocket/default.nix b/pkgs/development/python-modules/mocket/default.nix index 41789a796dd1..9e156b7f1291 100644 --- a/pkgs/development/python-modules/mocket/default.nix +++ b/pkgs/development/python-modules/mocket/default.nix @@ -34,12 +34,12 @@ buildPythonPackage rec { pname = "mocket"; - version = "3.12.0"; + version = "3.12.2"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-brvBWwTWT2F/usVBRr7wz9L0kct4X1Fddl4mu5LUENA="; + hash = "sha256-BN9S5/mku+HT1vglyobgHZPWsY0yvbfQfpMRUKrnJQQ="; }; nativeBuildInputs = [ From a4d0aa0797f148a77b50f7539553840051c4f525 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 5 Jan 2024 02:53:24 +0000 Subject: [PATCH 30/30] taproot-assets: 0.2.3 -> 0.3.2 --- pkgs/applications/blockchains/taproot-assets/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/blockchains/taproot-assets/default.nix b/pkgs/applications/blockchains/taproot-assets/default.nix index 602025e60a88..a49b25c7be11 100644 --- a/pkgs/applications/blockchains/taproot-assets/default.nix +++ b/pkgs/applications/blockchains/taproot-assets/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "taproot-assets"; - version = "0.2.3"; + version = "0.3.2"; src = fetchFromGitHub { owner = "lightninglabs"; repo = "taproot-assets"; rev = "v${version}"; - hash = "sha256-nTgIoYajpnlEvyXPcwXbm/jOfG+C83TTZiPmoB2kK24="; + hash = "sha256-zYS/qLWYzfmLksYLCUWosT287K8La2fuu9TcT4Wytto="; }; - vendorHash = "sha256-fc++0M7Mnn1nJOkV2gzAVRQCp3vOqsO2OQNlOKaMmB4="; + vendorHash = "sha256-jz6q3l2FtkJM3qyaTTqqu3ZG2FeKW9s7WdlW1pHij5k="; subPackages = [ "cmd/tapcli" "cmd/tapd" ];