From a061657b0e1a6291dff9333e7438e1197075a633 Mon Sep 17 00:00:00 2001 From: Marc Scholten Date: Sun, 30 Jul 2023 12:23:30 +0200 Subject: [PATCH 01/25] ihp-new: 1.0.1 -> 1.1.0 --- pkgs/development/web/ihp-new/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/web/ihp-new/default.nix b/pkgs/development/web/ihp-new/default.nix index 10dd7950f96b..9b92260fa652 100644 --- a/pkgs/development/web/ihp-new/default.nix +++ b/pkgs/development/web/ihp-new/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "ihp-new"; - version = "1.0.1"; + version = "1.1.0"; src = fetchFromGitHub { owner = "digitallyinduced"; repo = "ihp"; rev = "v${version}"; - sha256 = "sha256-LUIC7Olu2qTxZwgkgVpmTgCEQYDlwvLQFQt3Ox/Vm48="; + sha256 = "sha256-o0ZSDaDFgwbXqozHfcXKxW4FeF7JqaGprAh6r7NhvhE"; }; dontConfigure = true; From aea90b672a1a4c523dfc05ad0eab1ef77490c280 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Wed, 29 Mar 2023 16:13:38 -0700 Subject: [PATCH 02/25] python310Packages.jupyter-ydoc: 0.3.4 -> 1.0.2 Changelog: https://github.com/jupyter-server/jupyter_ydoc/blob/v1.0.2/CHANGELOG.md --- pkgs/development/python-modules/jupyter-ydoc/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/jupyter-ydoc/default.nix b/pkgs/development/python-modules/jupyter-ydoc/default.nix index d2643155bff8..e3294150bf62 100644 --- a/pkgs/development/python-modules/jupyter-ydoc/default.nix +++ b/pkgs/development/python-modules/jupyter-ydoc/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "jupyter-ydoc"; - version = "0.3.4"; + version = "1.0.2"; format = "pyproject"; src = fetchPypi { pname = "jupyter_ydoc"; inherit version; - hash = "sha256-WiJi5wvwBLgsxs5xZ16TMKoFj+MNsuh82BJa1N0a5OE="; + hash = "sha256-D5W+3j8eCB4H1cV8A8ZY46Ukfg7xiIkHT776IN0+ylM="; }; nativeBuildInputs = [ @@ -46,6 +46,6 @@ buildPythonPackage rec { description = "Document structures for collaborative editing using Ypy"; homepage = "https://github.com/jupyter-server/jupyter_ydoc"; license = lib.licenses.bsd3; - maintainers = with lib.maintainers; [ dotlambda ]; + maintainers = lib.teams.jupyter.members; }; } From 223f4934999ea36f0bb87885c89867ab0775e179 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 18 Jul 2023 11:16:53 -0700 Subject: [PATCH 03/25] python310Packages.jupyter-collaboration: init at 1.0.1 --- .../default.nix | 35 ++++++++++++------- pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 4 +-- 3 files changed, 25 insertions(+), 15 deletions(-) rename pkgs/development/python-modules/{jupyter-server-ydoc => jupyter-collaboration}/default.nix (55%) diff --git a/pkgs/development/python-modules/jupyter-server-ydoc/default.nix b/pkgs/development/python-modules/jupyter-collaboration/default.nix similarity index 55% rename from pkgs/development/python-modules/jupyter-server-ydoc/default.nix rename to pkgs/development/python-modules/jupyter-collaboration/default.nix index a60f74aefbdd..9f17874dfc32 100644 --- a/pkgs/development/python-modules/jupyter-server-ydoc/default.nix +++ b/pkgs/development/python-modules/jupyter-collaboration/default.nix @@ -1,29 +1,33 @@ { lib , buildPythonPackage , pythonOlder -, fetchFromGitHub +, fetchPypi +, hatch-jupyter-builder +, hatch-nodejs-version , hatchling , pythonRelaxDepsHook +, jupyter-events +, jupyter-server , jupyter-server-fileid , jupyter-ydoc , ypy-websocket +, pytest-asyncio , pytest-jupyter , pytestCheckHook }: buildPythonPackage rec { - pname = "jupyter-server-ydoc"; - version = "0.8.0"; + pname = "jupyter-collaboration"; + version = "1.0.1"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; format = "pyproject"; - src = fetchFromGitHub { - owner = "jupyterlab"; - repo = "jupyter_collaboration"; - rev = "refs/tags/v${version}"; - hash = "sha256-KLb7kU5jsj6ihGO6HU3Y7uF+0PcwKoQlqQAhtO0oaJw="; + src = fetchPypi { + pname = "jupyter_collaboration"; + inherit version; + hash = "sha256-cf7BpF6WSoHQJQW0IXdpCAGTdkX9RNWZ4JovTHvcPho="; }; postPatch = '' @@ -31,6 +35,8 @@ buildPythonPackage rec { ''; nativeBuildInputs = [ + hatch-jupyter-builder + hatch-nodejs-version hatchling pythonRelaxDepsHook ]; @@ -40,14 +46,17 @@ buildPythonPackage rec { ]; propagatedBuildInputs = [ + jupyter-events + jupyter-server jupyter-server-fileid jupyter-ydoc ypy-websocket ]; - pythonImportsCheck = [ "jupyter_server_ydoc" ]; + pythonImportsCheck = [ "jupyter_collaboration" ]; nativeCheckInputs = [ + pytest-asyncio pytest-jupyter pytestCheckHook ]; @@ -57,10 +66,10 @@ buildPythonPackage rec { ''; meta = { - changelog = "https://github.com/jupyterlab/jupyter_collaboration/blob/${src.rev}/CHANGELOG.md"; - description = "A Jupyter Server Extension Providing Y Documents"; + changelog = "https://github.com/jupyterlab/jupyter_collaboration/blob/v${version}/CHANGELOG.md"; + description = "JupyterLab Extension enabling Real-Time Collaboration"; homepage = "https://github.com/jupyterlab/jupyter_collaboration"; license = lib.licenses.bsd3; - maintainers = with lib.maintainers; [ dotlambda ]; + maintainers = lib.teams.jupyter.members; }; } diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index a6ef2838bcb6..6ec506a14449 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -182,6 +182,7 @@ mapAliases ({ jupyter_client = jupyter-client; # added 2021-10-15 jupyter_core = jupyter-core; # added 2023-01-05 jupyter_server = jupyter-server; # added 2023-01-05 + jupyter-server-ydoc = jupyter-collaboration; # added 2023-07-18 Kajiki = kajiki; # added 2023-02-19 Keras = keras; # added 2021-11-25 larynx-train = piper-train; # added 2023-06-09 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 83b45cde21b3..998aa36cb6c4 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5485,6 +5485,8 @@ self: super: with self; { jupyter-client = callPackage ../development/python-modules/jupyter-client { }; + jupyter-collaboration = callPackage ../development/python-modules/jupyter-collaboration { }; + jupyter-contrib-core = callPackage ../development/python-modules/jupyter-contrib-core { }; jupyter-contrib-nbextensions = callPackage ../development/python-modules/jupyter-contrib-nbextensions { }; @@ -5507,8 +5509,6 @@ self: super: with self; { jupyter-server-terminals = callPackage ../development/python-modules/jupyter-server-terminals { }; - jupyter-server-ydoc = callPackage ../development/python-modules/jupyter-server-ydoc { }; - jupyter-ui-poll = callPackage ../development/python-modules/jupyter-ui-poll { }; jupyter-ydoc = callPackage ../development/python-modules/jupyter-ydoc { }; From 1f820d2c571ecc6443dd0e43a475caf97e4e54e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 18 Jul 2023 11:55:54 -0700 Subject: [PATCH 04/25] python310Packages.jupyter-server: 2.0.6 -> 2.7.0 Changelog: https://github.com/jupyter-server/jupyter_server/blob/v2.7.0/CHANGELOG.md --- .../python-modules/jupyter-server/default.nix | 22 ++++++++++++++----- 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/jupyter-server/default.nix b/pkgs/development/python-modules/jupyter-server/default.nix index 317b42d8a17c..9532e5ca68a9 100644 --- a/pkgs/development/python-modules/jupyter-server/default.nix +++ b/pkgs/development/python-modules/jupyter-server/default.nix @@ -23,24 +23,27 @@ , jupyter-server-terminals , nbformat , nbconvert +, packaging , send2trash , terminado , prometheus-client , anyio , websocket-client +, overrides , requests +, flaky }: buildPythonPackage rec { pname = "jupyter-server"; - version = "2.0.6"; + version = "2.7.0"; format = "pyproject"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchPypi { pname = "jupyter_server"; inherit version; - hash= "sha256-jddZkukLfKVWeUoe1cylEmPGl6vG0N9WGvV0qhwKAz8="; + hash = "sha256-NtoKJm0xpBrDNaNmyIkzwX36W7gXpI9cAsFtMDvJR38="; }; nativeBuildInputs = [ @@ -60,22 +63,23 @@ buildPythonPackage rec { jupyter-server-terminals nbformat nbconvert + packaging send2trash terminado prometheus-client anyio websocket-client + overrides ]; nativeCheckInputs = [ ipykernel - pandoc pytestCheckHook pytest-console-scripts pytest-jupyter pytest-timeout - pytest-tornasync requests + flaky ]; preCheck = '' @@ -85,11 +89,16 @@ buildPythonPackage rec { disabledTests = [ "test_cull_idle" + "test_server_extension_list" ] ++ lib.optionals stdenv.isDarwin [ # attempts to use trashcan, build env doesn't allow this "test_delete" # test is presumable broken in sandbox "test_authorized_requests" + # Insufficient access privileges for operation + "test_regression_is_hidden" + ] ++ lib.optionals (stdenv.isLinux && stdenv.isAarch64) [ + "test_copy_big_dir" ]; disabledTestPaths = [ @@ -103,9 +112,10 @@ buildPythonPackage rec { __darwinAllowLocalNetworking = true; meta = with lib; { + changelog = "https://github.com/jupyter-server/jupyter_server/blob/v${version}/CHANGELOG.md"; description = "The backend—i.e. core services, APIs, and REST endpoints—to Jupyter web applications"; homepage = "https://github.com/jupyter-server/jupyter_server"; license = licenses.bsdOriginal; - maintainers = [ maintainers.elohmeier ]; + maintainers = lib.teams.jupyter.members; }; } From e206cf41b49cb2fd832c65301999a1017c23aa9f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 18 Jul 2023 11:45:20 -0700 Subject: [PATCH 05/25] python310Packages.jupyterlab: 3.6.3 -> 4.0.3 Changelog: https://github.com/jupyterlab/jupyterlab/blob/v4.0.3/CHANGELOG.md --- .../python-modules/jupyterlab/default.nix | 42 +++++++++---------- 1 file changed, 19 insertions(+), 23 deletions(-) diff --git a/pkgs/development/python-modules/jupyterlab/default.nix b/pkgs/development/python-modules/jupyterlab/default.nix index 433031d73065..81c7f862f6ad 100644 --- a/pkgs/development/python-modules/jupyterlab/default.nix +++ b/pkgs/development/python-modules/jupyterlab/default.nix @@ -1,54 +1,50 @@ { lib , buildPythonPackage , fetchPypi -, ipython +, hatch-jupyter-builder +, hatchling +, async-lru , packaging , tornado +, ipykernel , jupyter-core +, jupyter-lsp , jupyterlab_server , jupyter-server -, jupyter-server-ydoc -, notebook +, notebook-shim , jinja2 , tomli , pythonOlder , jupyter-packaging -, pythonRelaxDepsHook -, nbclassic }: buildPythonPackage rec { pname = "jupyterlab"; - version = "3.6.3"; - format = "setuptools"; + version = "4.0.3"; + format = "pyproject"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-Nz6c+4py7dKUvhTxZmJWOiIM7PD7Jt56qxr5optom4I="; + hash = "sha256-4U0c5GphMCgRHQ1Hah19awlAA7dGK6xmn1tHgxeryzk="; }; nativeBuildInputs = [ - jupyter-packaging - pythonRelaxDepsHook - ]; - - pythonRelaxDeps = [ - "jupyter-ydoc" - "jupyter-server-ydoc" + hatch-jupyter-builder + hatchling ]; propagatedBuildInputs = [ - ipython + async-lru packaging tornado + ipykernel jupyter-core + jupyter-lsp jupyterlab_server jupyter-server - jupyter-server-ydoc - nbclassic - notebook + notebook-shim jinja2 ] ++ lib.optionals (pythonOlder "3.11") [ tomli @@ -68,10 +64,10 @@ buildPythonPackage rec { ]; meta = with lib; { - changelog = "https://github.com/jupyterlab/jupyterlab/releases/tag/v${version}"; + changelog = "https://github.com/jupyterlab/jupyterlab/blob/v${version}/CHANGELOG.md"; description = "Jupyter lab environment notebook server extension"; - license = with licenses; [ bsd3 ]; + license = licenses.bsd3; homepage = "https://jupyter.org/"; - maintainers = with maintainers; [ zimbatm ]; + maintainers = lib.teams.jupyter.members; }; } From 8f09dfbdfdd3cb94e842207e99bbfcecee709f4a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Wed, 2 Aug 2023 09:35:36 -0700 Subject: [PATCH 06/25] python310Packages.jupyterlab_server: 2.19.0 -> 2.24.0 Changelog: https://github.com/jupyterlab/jupyterlab_server/blob/v2.24.0/CHANGELOG.md --- .../python-modules/jupyterlab_server/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/jupyterlab_server/default.nix b/pkgs/development/python-modules/jupyterlab_server/default.nix index b766f6d42e0f..dfb6c23867fd 100644 --- a/pkgs/development/python-modules/jupyterlab_server/default.nix +++ b/pkgs/development/python-modules/jupyterlab_server/default.nix @@ -19,14 +19,14 @@ buildPythonPackage rec { pname = "jupyterlab_server"; - version = "2.19.0"; + version = "2.24.0"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-muwhohg7vt2fkahmKDVUSVdfGGLYiyitX5BQGdMebCE="; + hash = "sha256-Tm+Z4KVXm7vDLkScTbsDlWHU8aeCfVczJz7VZzjyHwc="; }; nativeBuildInputs = [ @@ -77,6 +77,6 @@ buildPythonPackage rec { homepage = "https://jupyterlab-server.readthedocs.io/"; changelog = "https://github.com/jupyterlab/jupyterlab_server/blob/v${version}/CHANGELOG.md"; license = licenses.bsdOriginal; - maintainers = with maintainers; [ ]; + maintainers = lib.teams.jupyter.members; }; } From 690e58e11de69953a1e76d0b9cc5f8caee63badd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Wed, 2 Aug 2023 09:29:26 -0700 Subject: [PATCH 07/25] python310Packages.notebook: 6.5.2 -> 7.0.1 Changelog: https://github.com/jupyter/notebook/blob/v7.0.1/CHANGELOG.md --- .../python-modules/notebook/default.nix | 103 ++++++------------ 1 file changed, 36 insertions(+), 67 deletions(-) diff --git a/pkgs/development/python-modules/notebook/default.nix b/pkgs/development/python-modules/notebook/default.nix index 9cd1e9c37a1e..628742c72f30 100644 --- a/pkgs/development/python-modules/notebook/default.nix +++ b/pkgs/development/python-modules/notebook/default.nix @@ -3,97 +3,66 @@ , buildPythonPackage , pythonOlder , fetchPypi -, argon2-cffi -, glibcLocales -, mock -, jinja2 +, hatch-jupyter-builder +, hatchling +, jupyter-server +, jupyterlab +, jupyterlab_server +, notebook-shim , tornado -, ipython_genutils -, traitlets -, jupyter-core -, jupyter-client -, nbformat -, nbclassic -, nbconvert -, ipykernel -, terminado -, requests -, send2trash -, pexpect -, prometheus-client +, pytest-jupyter , pytestCheckHook }: buildPythonPackage rec { pname = "notebook"; - version = "6.5.2"; - disabled = pythonOlder "3.7"; + version = "7.0.1"; + disabled = pythonOlder "3.8"; + + format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-wYl+UxfiJfx4tFVJpqtLZo5MmW/QOgTpOP5eevK//9A="; + hash = "sha256-LhatTmPqiffvviEu58FpP8+lq1X/73UEdTD3SvS9kmw="; }; - LC_ALL = "en_US.utf8"; - - nativeCheckInputs = [ pytestCheckHook glibcLocales ]; - - propagatedBuildInputs = [ - jinja2 - tornado - ipython_genutils - traitlets - jupyter-core - send2trash - jupyter-client - nbformat - nbclassic - nbconvert - ipykernel - terminado - requests - pexpect - prometheus-client - argon2-cffi - ]; - postPatch = '' - # Remove selenium tests - rm -rf notebook/tests/selenium - export HOME=$TMPDIR + substituteInPlace pyproject.toml \ + --replace "timeout = 300" "" ''; - disabledTests = [ - # a "system_config" is generated, and fails many tests - "config" - "load_ordered" - # requires jupyter, but will cause circular imports - "test_run" - "TestInstallServerExtension" - "launch_socket" - "sock_server" - "test_list_formats" # tries to find python MIME type - "KernelCullingTest" # has a race condition failing on slower hardware - "test_connections" # tornado.simple_httpclient.HTTPTimeoutError: Timeout during request" - ] ++ lib.optionals stdenv.isDarwin [ - "test_delete" - "test_checkpoints_follow_file" + nativeBuildInputs = [ + hatch-jupyter-builder + hatchling + jupyterlab ]; - disabledTestPaths = lib.optionals stdenv.isDarwin [ - # requires local networking - "notebook/auth/tests/test_login.py" - "notebook/bundler/tests/test_bundler_api.py" + propagatedBuildInputs = [ + jupyter-server + jupyterlab + jupyterlab_server + notebook-shim + tornado ]; + nativeCheckInputs = [ + pytest-jupyter + pytestCheckHook + ]; + + env = { + JUPYTER_PLATFORM_DIRS = 1; + }; + # Some of the tests use localhost networking. __darwinAllowLocalNetworking = true; meta = { - description = "The Jupyter HTML notebook is a web-based notebook environment for interactive computing"; + changelog = "https://github.com/jupyter/notebook/blob/v${version}/CHANGELOG.md"; + description = "Web-based notebook environment for interactive computing"; homepage = "https://github.com/jupyter/notebook"; license = lib.licenses.bsd3; - maintainers = with lib.maintainers; [ fridh ]; + maintainers = lib.teams.jupyter.members; mainProgram = "jupyter-notebook"; }; } From 2cfcf60156b7bc15682174dd5ff3cde82410018f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 3 Aug 2023 00:23:31 -0700 Subject: [PATCH 08/25] python310Packages.ipynbname: init at 2023.2.0.0 --- .../python-modules/ipynbname/default.nix | 32 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 34 insertions(+) create mode 100644 pkgs/development/python-modules/ipynbname/default.nix diff --git a/pkgs/development/python-modules/ipynbname/default.nix b/pkgs/development/python-modules/ipynbname/default.nix new file mode 100644 index 000000000000..03a27ec19d8c --- /dev/null +++ b/pkgs/development/python-modules/ipynbname/default.nix @@ -0,0 +1,32 @@ +{ lib +, buildPythonPackage +, fetchPypi +, ipykernel +}: + +buildPythonPackage rec { + pname = "ipynbname"; + version = "2023.2.0.0"; + format = "setuptools"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-Riu915VmJIdtxOqB+nkoRas4cOREyh9res2uo32Mnr8="; + }; + + propagatedBuildInputs = [ + ipykernel + ]; + + pythonImportsCheck = [ "ipynbname" ]; + + # upstream has no tests + doCheck = false; + + meta = { + description = "Simply returns either notebook filename or the full path to the notebook"; + homepage = "https://github.com/msm1089/ipynbname"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 998aa36cb6c4..226542b31044 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5179,6 +5179,8 @@ self: super: with self; { ipydatawidgets = callPackage ../development/python-modules/ipydatawidgets { }; + ipynbname = callPackage ../development/python-modules/ipynbname { }; + ipyniivue = callPackage ../development/python-modules/ipyniivue { }; ipykernel = callPackage ../development/python-modules/ipykernel { }; From 35aa2915806b604dc25e2c3842746c12614c2e07 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 3 Aug 2023 00:27:52 -0700 Subject: [PATCH 09/25] python310Packages.experiment-utilities: unvendor ipynbname --- .../experiment-utilities/default.nix | 6 + .../unvendor-ipynbname.patch | 117 ++++++++++++++++++ 2 files changed, 123 insertions(+) create mode 100644 pkgs/development/python-modules/experiment-utilities/unvendor-ipynbname.patch diff --git a/pkgs/development/python-modules/experiment-utilities/default.nix b/pkgs/development/python-modules/experiment-utilities/default.nix index 46c50e1e2ec0..5fd21994558e 100644 --- a/pkgs/development/python-modules/experiment-utilities/default.nix +++ b/pkgs/development/python-modules/experiment-utilities/default.nix @@ -5,6 +5,7 @@ , fasteners , fetchFromGitLab , qgrid +, ipynbname , ipywidgets , odfpy , scipy @@ -28,6 +29,10 @@ buildPythonPackage rec { hash = "sha256-zjmmLUpGjUhpw2+stLJE6cImesnBSvrcid5bHMftX/Q="; }; + patches = [ + ./unvendor-ipynbname.patch + ]; + # This dependency constraint (<=7.6.5) was due to a bug in qgrid that has been patched in its # owned derivation postPatch = '' @@ -39,6 +44,7 @@ buildPythonPackage rec { cloudpickle dill fasteners + ipynbname ipywidgets odfpy plotly diff --git a/pkgs/development/python-modules/experiment-utilities/unvendor-ipynbname.patch b/pkgs/development/python-modules/experiment-utilities/unvendor-ipynbname.patch new file mode 100644 index 000000000000..84f4467a8347 --- /dev/null +++ b/pkgs/development/python-modules/experiment-utilities/unvendor-ipynbname.patch @@ -0,0 +1,117 @@ +diff --git a/exputils/gui/jupyter/__init__.py b/exputils/gui/jupyter/__init__.py +index 6e9aefb..fdfdd28 100644 +--- a/exputils/gui/jupyter/__init__.py ++++ b/exputils/gui/jupyter/__init__.py +@@ -30,8 +30,8 @@ from exputils.gui.jupyter.misc import remove_children_from_widget + from exputils.gui.jupyter.misc import set_children_of_widget + from exputils.gui.jupyter.misc import generate_random_state_backup_name + +-from exputils.gui.jupyter.ipynbname import get_notebook_name +-from exputils.gui.jupyter.ipynbname import get_notebook_path ++from ipynbname import name as get_notebook_name ++from ipynbname import path as get_notebook_path + + DEFAULT_CONFIG_DIRECTORY = '.ipython_config' + +diff --git a/exputils/gui/jupyter/ipynbname.py b/exputils/gui/jupyter/ipynbname.py +deleted file mode 100644 +index 51e21b7..0000000 +--- a/exputils/gui/jupyter/ipynbname.py ++++ /dev/null +@@ -1,86 +0,0 @@ +-## +-## This file is part of the exputils package. +-## +-## Copyright: INRIA +-## Year: 2022, 2023 +-## Contact: chris.reinke@inria.fr +-## +-## exputils is provided under GPL-3.0-or-later +-## +-# Taken from https://pypi.org/project/ipynbname/ +-# TODO: add them to licence +- +-from notebook import notebookapp +-import urllib, json, os, ipykernel, ntpath +- +-FILE_ERROR = "Can't identify the notebook {}." +-CONN_ERROR = "Unable to access server;\n \ +- + ipynbname requires either no security or token based security." +- +-def _get_kernel_id(): +- """ Returns the kernel ID of the ipykernel. +- """ +- connection_file = os.path.basename(ipykernel.get_connection_file()) +- kernel_id = connection_file.split('-', 1)[1].split('.')[0] +- return kernel_id +- +- +-def _get_sessions(srv): +- """ Given a server, returns sessions, or HTTPError if access is denied. +- NOTE: Works only when either there is no security or there is token +- based security. An HTTPError is raised if unable to connect to a +- server. +- """ +- try: +- qry_str = "" +- token = srv['token'] +- if token: +- qry_str = f"?token={token}" +- url = f"{srv['url']}api/sessions{qry_str}" +- req = urllib.request.urlopen(url) +- return json.load(req) +- except: +- raise urllib.error.HTTPError(CONN_ERROR) +- +- +-def _get_nb_path(sess, kernel_id): +- """ Given a session and kernel ID, returns the notebook path for the +- session, or None if there is no notebook for the session. +- """ +- if sess['kernel']['id'] == kernel_id: +- return sess['notebook']['path'] +- return None +- +- +-def get_notebook_name(): +- """ Returns the short name of the notebook w/o the .ipynb extension, +- or raises a FileNotFoundError exception if it cannot be determined. +- """ +- kernel_id = _get_kernel_id() +- for srv in notebookapp.list_running_servers(): +- try: +- sessions = _get_sessions(srv) +- for sess in sessions: +- nb_path = _get_nb_path(sess, kernel_id) +- if nb_path: +- return ntpath.basename(nb_path).replace('.ipynb', '') +- except: +- pass # There may be stale entries in the runtime directory +- raise FileNotFoundError(FILE_ERROR.format('name')) +- +- +-def get_notebook_path(): +- """ Returns the absolute path of the notebook, +- or raises a FileNotFoundError exception if it cannot be determined. +- """ +- kernel_id = _get_kernel_id() +- for srv in notebookapp.list_running_servers(): +- try: +- sessions = _get_sessions(srv) +- for sess in sessions: +- nb_path = _get_nb_path(sess, kernel_id) +- if nb_path: +- return os.path.join(srv['notebook_dir'], nb_path) +- except: +- pass # There may be stale entries in the runtime directory +- raise FileNotFoundError(FILE_ERROR.format('path')) +\ No newline at end of file +diff --git a/setup.cfg b/setup.cfg +index 9d9cbb0..6080ed6 100644 +--- a/setup.cfg ++++ b/setup.cfg +@@ -25,3 +25,4 @@ install_requires = + tensorboard >= 1.15.0 + fasteners >= 0.18 + pyyaml >= 6.0 ++ ipynbname From 14bfde910dd7994e5df511d8990d84b40ce825c8 Mon Sep 17 00:00:00 2001 From: Donovan Glover Date: Thu, 3 Aug 2023 09:02:54 -0400 Subject: [PATCH 10/25] python311Packages.icoextract: add exe-thumbnailer --- pkgs/development/python-modules/icoextract/default.nix | 7 ++++++- .../python-modules/icoextract/exe-thumbnailer.thumbnailer | 3 +++ 2 files changed, 9 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/python-modules/icoextract/exe-thumbnailer.thumbnailer diff --git a/pkgs/development/python-modules/icoextract/default.nix b/pkgs/development/python-modules/icoextract/default.nix index 0f2636997d12..e050dd9b9406 100644 --- a/pkgs/development/python-modules/icoextract/default.nix +++ b/pkgs/development/python-modules/icoextract/default.nix @@ -22,10 +22,15 @@ buildPythonPackage rec { "icoextract" ]; + postInstall = '' + mkdir -p $out/share/thumbnailers + substituteAll ${./exe-thumbnailer.thumbnailer} $out/share/thumbnailers/exe-thumbnailer.thumbnailer + ''; + meta = with lib; { description = "Extract icons from Windows PE files"; homepage = "https://github.com/jlu5/icoextract"; license = licenses.mit; - maintainers = with maintainers; [ bryanasdev000 ]; + maintainers = with maintainers; [ bryanasdev000 donovanglover ]; }; } diff --git a/pkgs/development/python-modules/icoextract/exe-thumbnailer.thumbnailer b/pkgs/development/python-modules/icoextract/exe-thumbnailer.thumbnailer new file mode 100644 index 000000000000..c275ac919b6b --- /dev/null +++ b/pkgs/development/python-modules/icoextract/exe-thumbnailer.thumbnailer @@ -0,0 +1,3 @@ +[Thumbnailer Entry] +Exec=@out@/bin/exe-thumbnailer -v -s %s %i %o +MimeType=application/x-ms-dos-executable;application/x-dosexec;application/x-msdownload From 00d3c8b3e3cb25790602ec583ec6211ea7d52b08 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Wed, 2 Aug 2023 13:40:46 -0700 Subject: [PATCH 11/25] python310Packages.captcha: 0.4 -> 0.5.0 Diff: https://github.com/lepture/captcha/compare/v0.4...v0.5.0 --- .../python-modules/captcha/default.nix | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/captcha/default.nix b/pkgs/development/python-modules/captcha/default.nix index d040c2e7bf76..807272da5b1c 100644 --- a/pkgs/development/python-modules/captcha/default.nix +++ b/pkgs/development/python-modules/captcha/default.nix @@ -1,32 +1,31 @@ { lib , fetchFromGitHub +, pythonOlder , buildPythonPackage -, nose , pillow -, wheezy-captcha +, pytestCheckHook }: buildPythonPackage rec { pname = "captcha"; - version = "0.4"; + version = "0.5.0"; + + disabled = pythonOlder "3.8"; + format = "setuptools"; src = fetchFromGitHub { owner = "lepture"; repo = pname; rev = "v${version}"; - hash = "sha256-uxUjoACN65Cx5LMKpT+bZhKpf2JRSaEyysnYUgZntp8="; + hash = "sha256-TPPuf0BRZPSHPSF0HuGxhjhoSyZQ7r86kSjkrztgZ5w="; }; propagatedBuildInputs = [ pillow ]; pythonImportsCheck = [ "captcha" ]; - nativeCheckInputs = [ nose wheezy-captcha ]; - - checkPhase = '' - nosetests -s - ''; + nativeCheckInputs = [ pytestCheckHook ]; meta = with lib; { description = "A captcha library that generates audio and image CAPTCHAs"; From 84935de73ed64fdd258f0791e993e8e71af1e25f Mon Sep 17 00:00:00 2001 From: Jack Leightcap Date: Fri, 4 Aug 2023 22:55:58 -0400 Subject: [PATCH 12/25] python3Packages.cocotb: 1.7.2 -> 1.8.0 Signed-off-by: Jack Leightcap --- .../python-modules/cocotb/default.nix | 22 ++++++------------- 1 file changed, 7 insertions(+), 15 deletions(-) diff --git a/pkgs/development/python-modules/cocotb/default.nix b/pkgs/development/python-modules/cocotb/default.nix index cc2493bb4e63..10034b052d55 100644 --- a/pkgs/development/python-modules/cocotb/default.nix +++ b/pkgs/development/python-modules/cocotb/default.nix @@ -1,19 +1,9 @@ -{ lib -, stdenv -, buildPythonPackage -, fetchFromGitHub -, setuptools -, setuptools-scm -, cocotb-bus -, find-libpython -, pytestCheckHook -, swig -, verilog -}: +{ lib, stdenv, buildPythonPackage, fetchFromGitHub, setuptools, setuptools-scm +, cocotb-bus, find-libpython, pytestCheckHook, swig, verilog }: buildPythonPackage rec { pname = "cocotb"; - version = "1.7.2"; + version = "1.8.0"; # pypi source doesn't include tests src = fetchFromGitHub { @@ -25,7 +15,8 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools-scm ]; - buildInputs = [ setuptools find-libpython ]; + buildInputs = [ setuptools ]; + propagatedBuildInputs = [ find-libpython ]; postPatch = '' patchShebangs bin/*.py @@ -60,7 +51,8 @@ buildPythonPackage rec { pythonImportsCheck = [ "cocotb" ]; meta = with lib; { - description = "Coroutine based cosimulation library for writing VHDL and Verilog testbenches in Python"; + description = + "Coroutine based cosimulation library for writing VHDL and Verilog testbenches in Python"; homepage = "https://github.com/cocotb/cocotb"; license = licenses.bsd3; maintainers = with maintainers; [ matthuszagh ]; From eb2222a132e3d533825d855594ee7f0d8f84bc31 Mon Sep 17 00:00:00 2001 From: Jack Leightcap Date: Fri, 4 Aug 2023 23:06:35 -0400 Subject: [PATCH 13/25] fixup! python3Packages.cocotb: 1.7.2 -> 1.8.0 Signed-off-by: Jack Leightcap --- .../python-modules/cocotb/default.nix | 25 +++++++++++++------ 1 file changed, 18 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/cocotb/default.nix b/pkgs/development/python-modules/cocotb/default.nix index 10034b052d55..cd9c3b035819 100644 --- a/pkgs/development/python-modules/cocotb/default.nix +++ b/pkgs/development/python-modules/cocotb/default.nix @@ -1,5 +1,16 @@ -{ lib, stdenv, buildPythonPackage, fetchFromGitHub, setuptools, setuptools-scm -, cocotb-bus, find-libpython, pytestCheckHook, swig, verilog }: +{ lib +, stdenv +, buildPythonPackage +, fetchFromGitHub +, setuptools +, setuptools-scm +, cocotb-bus +, find-libpython +, pytestCheckHook +, swig +, verilog +, ghdl +}: buildPythonPackage rec { pname = "cocotb"; @@ -10,7 +21,7 @@ buildPythonPackage rec { owner = "cocotb"; repo = "cocotb"; rev = "refs/tags/v${version}"; - hash = "sha256-gLOYwljqnYkGsdbny7+f93QgroLBaLLnDBRpoCe8uEg="; + hash = "sha256-k3VizQ9iyDawfDCeE3Zup/KkyD54tFBLdQvRKsbKDLY="; }; nativeBuildInputs = [ setuptools-scm ]; @@ -42,7 +53,7 @@ buildPythonPackage rec { ./0001-Patch-LDCXXSHARED-for-macOS-along-with-LDSHARED.patch ]; - nativeCheckInputs = [ cocotb-bus pytestCheckHook swig verilog ]; + nativeCheckInputs = [ cocotb-bus pytestCheckHook swig verilog ghdl ]; preCheck = '' export PATH=$out/bin:$PATH mv cocotb cocotb.hidden @@ -51,10 +62,10 @@ buildPythonPackage rec { pythonImportsCheck = [ "cocotb" ]; meta = with lib; { - description = - "Coroutine based cosimulation library for writing VHDL and Verilog testbenches in Python"; + changelog = "https://github.com/cocotb/cocotb/releases/tag/v${version}"; + description = "Coroutine based cosimulation library for writing VHDL and Verilog testbenches in Python"; homepage = "https://github.com/cocotb/cocotb"; license = licenses.bsd3; - maintainers = with maintainers; [ matthuszagh ]; + maintainers = with maintainers; [ matthuszagh jleightcap ]; }; } From aedfec7eef5a3f026ccbce61034f7691647e0e68 Mon Sep 17 00:00:00 2001 From: Atemu Date: Sun, 6 Aug 2023 12:59:48 +0200 Subject: [PATCH 14/25] linux_xanmod: 6.1.42 -> 6.1.43 --- pkgs/os-specific/linux/kernel/xanmod-kernels.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix index 4412bd56fadd..15cc6ce9fa70 100644 --- a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix +++ b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix @@ -3,8 +3,8 @@ let # These names are how they are designated in https://xanmod.org. ltsVariant = { - version = "6.1.42"; - hash = "sha256-mOydloX5bff9wrFh40wf12GW+sION9SoGK2mAC1yNOw="; + version = "6.1.43"; + hash = "sha256-IdNW0gzYl6L3OjN2meWnGbMZsTcLfSMbKFDx12Z9Ll4="; variant = "lts"; }; From 5a6f112645de2ecd9104c4567f195880bef5dff6 Mon Sep 17 00:00:00 2001 From: Atemu Date: Sun, 6 Aug 2023 13:00:02 +0200 Subject: [PATCH 15/25] linux_xanmod_latest: 6.4.7 -> 6.4.8 --- pkgs/os-specific/linux/kernel/xanmod-kernels.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix index 15cc6ce9fa70..aef33cea64ae 100644 --- a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix +++ b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix @@ -9,8 +9,8 @@ let }; mainVariant = { - version = "6.4.7"; - hash = "sha256-0yOVCMqhoiWz8IlYRR0wXytAzjv81Cf5NoFa9qxGMm4="; + version = "6.4.8"; + hash = "sha256-GkNWXngIx/aoSzu2pfpuv8kGwV9evbHl3hauux0lSwk="; variant = "main"; }; From ba873b2be6252a5144c9f37fae1341973ac155ae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 6 Aug 2023 16:36:56 -0700 Subject: [PATCH 16/25] python310Packages.jupyter-nbextensions-configurator: make compatible with notebook v7 --- .../default.nix | 24 ++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/jupyter-nbextensions-configurator/default.nix b/pkgs/development/python-modules/jupyter-nbextensions-configurator/default.nix index ef0ff175268f..c675542be108 100644 --- a/pkgs/development/python-modules/jupyter-nbextensions-configurator/default.nix +++ b/pkgs/development/python-modules/jupyter-nbextensions-configurator/default.nix @@ -1,7 +1,13 @@ { lib , buildPythonPackage , fetchFromGitHub +, fetchpatch , jupyter-contrib-core +, jupyter-core +, jupyter-server +, notebook +, pyyaml +, tornado }: buildPythonPackage rec { @@ -15,7 +21,23 @@ buildPythonPackage rec { hash = "sha256-ovKYHATRAC5a5qTMv32ohU2gJd15/fRKXa5HI0zGp/0="; }; - propagatedBuildInputs = [ jupyter-contrib-core ]; + patches = [ + # https://github.com/Jupyter-contrib/jupyter_nbextensions_configurator/pull/166 + (fetchpatch { + name = "notebook-v7-compat.patch"; + url = "https://github.com/Jupyter-contrib/jupyter_nbextensions_configurator/commit/a600cef9222ca0c61a6912eb29d8fa0323409705.patch"; + hash = "sha256-Rt9r5ZOgnhBcs18+ET5+k0/t980I2DiVN8oHkGLp0iw="; + }) + ]; + + propagatedBuildInputs = [ + jupyter-contrib-core + jupyter-core + jupyter-server + notebook + pyyaml + tornado + ]; pythonImportsCheck = [ "jupyter_nbextensions_configurator" ]; From b5c809b161d118bf4fec6ed20e1e1da963618c8a Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Mon, 7 Aug 2023 02:30:43 +0000 Subject: [PATCH 17/25] =?UTF-8?q?gnome-console:=2044.0=20=E2=86=92=2044.4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/console/-/compare/44.0...44.4 --- .../applications/terminal-emulators/gnome-console/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/terminal-emulators/gnome-console/default.nix b/pkgs/applications/terminal-emulators/gnome-console/default.nix index 460b6426cdfc..bfcc4cc5bc50 100644 --- a/pkgs/applications/terminal-emulators/gnome-console/default.nix +++ b/pkgs/applications/terminal-emulators/gnome-console/default.nix @@ -18,11 +18,11 @@ stdenv.mkDerivation rec { pname = "gnome-console"; - version = "44.0"; + version = "44.4"; src = fetchurl { url = "mirror://gnome/sources/gnome-console/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "0cGv1eyNK9+Eo9sCmwSiQy7Me80kLCp0X+mYakKJiEQ="; + sha256 = "uR9E6abAQz6W2ZfzlVhSBtq6xiRzmTo8B1Uv5YiOWo0="; }; nativeBuildInputs = [ From 9a7825e19978979c52384ba4fea0484149b740de Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Mon, 7 Aug 2023 02:33:08 +0000 Subject: [PATCH 18/25] =?UTF-8?q?gnome.gnome-terminal:=203.48.1=20?= =?UTF-8?q?=E2=86=92=203.48.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-terminal/-/compare/3.48.1...3.48.2 --- pkgs/desktops/gnome/core/gnome-terminal/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/core/gnome-terminal/default.nix b/pkgs/desktops/gnome/core/gnome-terminal/default.nix index 11b9606908fc..0fa7a713ce0c 100644 --- a/pkgs/desktops/gnome/core/gnome-terminal/default.nix +++ b/pkgs/desktops/gnome/core/gnome-terminal/default.nix @@ -29,14 +29,14 @@ stdenv.mkDerivation rec { pname = "gnome-terminal"; - version = "3.48.1"; + version = "3.48.2"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "GNOME"; repo = "gnome-terminal"; rev = version; - sha256 = "sha256-1t48JRESjAQubOmyK+QOhlp57iE5Ml0cqgy/2wjrLjE="; + sha256 = "sha256-WvFKFh5BK6AS+Lqyh27xIfH1rxs1+YTkywX4w9UashQ="; }; nativeBuildInputs = [ From f7dc23b500e64736145621460b306594220b4c39 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Mon, 7 Aug 2023 02:37:15 +0000 Subject: [PATCH 19/25] =?UTF-8?q?gvfs:=201.50.5=20=E2=86=92=201.50.6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gvfs/-/compare/1.50.5...1.50.6 --- pkgs/development/libraries/gvfs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gvfs/default.nix b/pkgs/development/libraries/gvfs/default.nix index 51526ebf32e1..7fd4572e0b7c 100644 --- a/pkgs/development/libraries/gvfs/default.nix +++ b/pkgs/development/libraries/gvfs/default.nix @@ -45,11 +45,11 @@ stdenv.mkDerivation rec { pname = "gvfs"; - version = "1.50.5"; + version = "1.50.6"; src = fetchurl { url = "mirror://gnome/sources/gvfs/${lib.versions.majorMinor version}/gvfs-${version}.tar.xz"; - hash = "sha256-uG8JtzMchkLs6/RqPNoGkvXrJghvEyMmpUg8Lr+GpMs="; + hash = "sha256-xPbhH8TqqZM/TbjHo0R14GaM6tK//tloZ9Bhvj053aU="; }; patches = [ From df140c2feba4550d0b3d1865dd2321c2e4030b7f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 7 Aug 2023 05:55:29 +0000 Subject: [PATCH 20/25] evcc: 0.118.10 -> 0.118.11 --- pkgs/servers/home-automation/evcc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/home-automation/evcc/default.nix b/pkgs/servers/home-automation/evcc/default.nix index c28aafad3877..4e35e0a76a1c 100644 --- a/pkgs/servers/home-automation/evcc/default.nix +++ b/pkgs/servers/home-automation/evcc/default.nix @@ -16,13 +16,13 @@ buildGoModule rec { pname = "evcc"; - version = "0.118.10"; + version = "0.118.11"; src = fetchFromGitHub { owner = "evcc-io"; repo = pname; rev = version; - hash = "sha256-A79l8tA73EeRp+BlJnIz/qtiBk33D4KvbJegqrgNvbg="; + hash = "sha256-gwFArZJX3DBUNaSpWD5n76VImWeDImR8b1s2czBrBaA="; }; vendorHash = "sha256-0NTOit1nhX/zxQjHwU7ZOY1GsoIu959/KICCEWyfIQ4="; From 2e93b24ced0e4be0de47362c3d32d2537f8cab56 Mon Sep 17 00:00:00 2001 From: pokon548 <65808665+pokon548@users.noreply.github.com> Date: Mon, 7 Aug 2023 14:31:29 +0800 Subject: [PATCH 21/25] maintainers: add pokon548 --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 8a468301ea5d..7d214c085fae 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -13476,6 +13476,12 @@ githubId = 38314551; name = "Peter Okelmann"; }; + pokon548 = { + email = "nix@bukn.uk"; + github = "pokon548"; + githubId = 65808665; + name = "Bu Kun"; + }; polarmutex = { email = "brian@brianryall.xyz"; github = "polarmutex"; From dcf5ae3d0b21d7b70c049c37f3a8ec7fe1cf1352 Mon Sep 17 00:00:00 2001 From: pokon548 <65808665+pokon548@users.noreply.github.com> Date: Mon, 7 Aug 2023 14:32:32 +0800 Subject: [PATCH 22/25] nixos/dae: init --- nixos/modules/module-list.nix | 1 + nixos/modules/services/networking/dae.nix | 41 +++++++++++++++++++++++ 2 files changed, 42 insertions(+) create mode 100644 nixos/modules/services/networking/dae.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 29fcabaefad5..29249b75d29f 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -863,6 +863,7 @@ ./services/networking/coturn.nix ./services/networking/create_ap.nix ./services/networking/croc.nix + ./services/networking/dae.nix ./services/networking/dante.nix ./services/networking/dhcpcd.nix ./services/networking/dnscache.nix diff --git a/nixos/modules/services/networking/dae.nix b/nixos/modules/services/networking/dae.nix new file mode 100644 index 000000000000..b0ad2c0d4bb0 --- /dev/null +++ b/nixos/modules/services/networking/dae.nix @@ -0,0 +1,41 @@ +{ config, pkgs, lib, ... }: +let + cfg = config.services.dae; +in +{ + meta.maintainers = with lib.maintainers; [ pokon548 ]; + + options = { + services.dae = { + enable = lib.options.mkEnableOption (lib.mdDoc "the dae service"); + package = lib.mkPackageOptionMD pkgs "dae" { }; + }; + }; + + config = lib.mkIf config.services.dae.enable { + networking.firewall.allowedTCPPorts = [ 12345 ]; + networking.firewall.allowedUDPPorts = [ 12345 ]; + + systemd.services.dae = { + unitConfig = { + Description = "dae Service"; + Documentation = "https://github.com/daeuniverse/dae"; + After = [ "network.target" "systemd-sysctl.service" ]; + Wants = [ "network.target" ]; + }; + + serviceConfig = { + User = "root"; + ExecStartPre = "${lib.getExe cfg.package} validate -c /etc/dae/config.dae"; + ExecStart = "${lib.getExe cfg.package} run --disable-timestamp -c /etc/dae/config.dae"; + ExecReload = "${lib.getExe cfg.package} reload $MAINPID"; + LimitNPROC = 512; + LimitNOFILE = 1048576; + Restart = "on-abnormal"; + Type = "notify"; + }; + + wantedBy = [ "multi-user.target" ]; + }; + }; +} From 872d49d1881b66fcdbf1455acc3b34d6653b6741 Mon Sep 17 00:00:00 2001 From: pokon548 <65808665+pokon548@users.noreply.github.com> Date: Mon, 7 Aug 2023 14:33:33 +0800 Subject: [PATCH 23/25] dae: add meta.mainProgram --- pkgs/tools/networking/dae/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/networking/dae/default.nix b/pkgs/tools/networking/dae/default.nix index 7abd3975eaff..9c874f860d27 100644 --- a/pkgs/tools/networking/dae/default.nix +++ b/pkgs/tools/networking/dae/default.nix @@ -58,7 +58,8 @@ buildGoModule rec { description = "A Linux high-performance transparent proxy solution based on eBPF"; homepage = "https://github.com/daeuniverse/dae"; license = licenses.agpl3Only; - maintainers = with maintainers; [ oluceps ]; + maintainers = with maintainers; [ oluceps pokon548 ]; platforms = platforms.linux; + mainProgram = "dae"; }; } From e5b26e4bcea49be080d5bb72984cf2a497424428 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 7 Aug 2023 11:48:35 +0200 Subject: [PATCH 24/25] python311Packages.greeneye-monitor: 4.0 -> 4.0.1 Diff: https://github.com/jkeljo/greeneye-monitor/compare/refs/tags/v4.0...v4.0.1 Changelog: https://github.com/jkeljo/greeneye-monitor/blob/v4.0.1/CHANGELOG.rst --- pkgs/development/python-modules/greeneye-monitor/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/greeneye-monitor/default.nix b/pkgs/development/python-modules/greeneye-monitor/default.nix index d29a754aa86e..3efc25274d93 100644 --- a/pkgs/development/python-modules/greeneye-monitor/default.nix +++ b/pkgs/development/python-modules/greeneye-monitor/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "greeneye-monitor"; - version = "4.0"; + version = "4.0.1"; disabled = pythonOlder "3.10"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "jkeljo"; repo = "greeneye-monitor"; rev = "refs/tags/v${version}"; - hash = "sha256-kMyFerb6T5316cr4T5hSo4HcpO5Hl5l+bMor5jon9yY="; + hash = "sha256-S/1MT9ZQ9G0F1WXqzNKhVo8vtfPLzr8WRlfYc7TU9iQ="; }; postPatch = '' From c35ae8c34f689a3cdd1c8507410f79714493f69c Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Mon, 7 Aug 2023 20:09:02 +0200 Subject: [PATCH 25/25] merkaartor: add patch for exiv2 0.28 --- pkgs/applications/misc/merkaartor/default.nix | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/misc/merkaartor/default.nix b/pkgs/applications/misc/merkaartor/default.nix index eda540427bbd..c8ac515571c7 100644 --- a/pkgs/applications/misc/merkaartor/default.nix +++ b/pkgs/applications/misc/merkaartor/default.nix @@ -1,9 +1,10 @@ -{ mkDerivation -, lib +{ lib , stdenv , fetchFromGitHub +, fetchpatch , qmake , qttools +, wrapQtAppsHook , qttranslations , gdal , proj @@ -15,7 +16,7 @@ , withZbar ? false, zbar }: -mkDerivation rec { +stdenv.mkDerivation rec { pname = "merkaartor"; version = "0.19.0"; @@ -23,10 +24,18 @@ mkDerivation rec { owner = "openstreetmap"; repo = "merkaartor"; rev = version; - sha256 = "sha256-I3QNCXzwhEFa8aOdwl3UJV8MLZ9caN9wuaaVrGFRvbQ="; + hash = "sha256-I3QNCXzwhEFa8aOdwl3UJV8MLZ9caN9wuaaVrGFRvbQ="; }; - nativeBuildInputs = [ qmake qttools ]; + patches = [ + (fetchpatch { + name = "exiv2-0.28.patch"; + url = "https://github.com/openstreetmap/merkaartor/commit/1e20d2ccd743ea5f8c2358e4ae36fead8b9390fd.patch"; + hash = "sha256-aHjJLKYvqz7V0QwUIg0SbentBe+DaCJusVqy4xRBVWo="; + }) + ]; + + nativeBuildInputs = [ qmake qttools wrapQtAppsHook ]; buildInputs = [ gdal proj qtsvg qtwebengine ] ++ lib.optional withGeoimage exiv2