ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-09-21 04:28:40 +03:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into staging-next

Browse Source
This commit is contained in:
Robert Schütz 2023-08-07 12:40:10 -07:00
commit 242d458f25
28 changed files with 386 additions and 159 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
maintainers/maintainer-list.nix
View File

@ -13482,6 +13482,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";

1
nixos/modules/module-list.nix
View File

@ -864,6 +864,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

41
nixos/modules/services/networking/dae.nix Normal file
View File

@ -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" ];
};
};
}

19
pkgs/applications/misc/merkaartor/default.nix
View File

@ -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

4
pkgs/applications/terminal-emulators/gnome-console/default.nix
View File

@ -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 = [

4
pkgs/desktops/gnome/core/gnome-terminal/default.nix
View File

@ -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 = [

4
pkgs/development/libraries/gvfs/default.nix
View File

@ -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 = [

17
pkgs/development/python-modules/captcha/default.nix
View File

@ -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";

13
pkgs/development/python-modules/cocotb/default.nix
View File

@ -9,23 +9,25 @@
, pytestCheckHook
, swig
, verilog
, ghdl
}:
buildPythonPackage rec {
pname = "cocotb";
version = "1.7.2";
version = "1.8.0";
# pypi source doesn't include tests
src = fetchFromGitHub {
owner = "cocotb";
repo = "cocotb";
rev = "refs/tags/v${version}";
hash = "sha256-gLOYwljqnYkGsdbny7+f93QgroLBaLLnDBRpoCe8uEg=";
hash = "sha256-k3VizQ9iyDawfDCeE3Zup/KkyD54tFBLdQvRKsbKDLY=";
};
nativeBuildInputs = [ setuptools-scm ];
buildInputs = [ setuptools find-libpython ];
buildInputs = [ setuptools ];
propagatedBuildInputs = [ find-libpython ];
postPatch = ''
patchShebangs bin/*.py
@ -51,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
@ -60,9 +62,10 @@ buildPythonPackage rec {
pythonImportsCheck = [ "cocotb" ];
meta = with lib; {
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 ];
};
}

6
pkgs/development/python-modules/experiment-utilities/default.nix
View File

@ -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

117
pkgs/development/python-modules/experiment-utilities/unvendor-ipynbname.patch Normal file
View File

@ -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

4
pkgs/development/python-modules/greeneye-monitor/default.nix
View File

@ -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 = ''

7
pkgs/development/python-modules/icoextract/default.nix
View File

@ -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 ];
};
}

3
pkgs/development/python-modules/icoextract/exe-thumbnailer.thumbnailer Normal file
View File

@ -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

32
pkgs/development/python-modules/ipynbname/default.nix Normal file
View File

@ -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 ];
};
}

35
pkgs/development/python-modules/jupyter-server-ydoc/default.nix → pkgs/development/python-modules/jupyter-collaboration/default.nix
View File

@ -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;
};
}

24
pkgs/development/python-modules/jupyter-nbextensions-configurator/default.nix
View File

@ -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" ];

25
pkgs/development/python-modules/jupyter-server/default.nix
View File

@ -15,7 +15,6 @@
, jinja2
, tornado
, pyzmq
, flaky
, ipykernel
, traitlets
, jupyter-core
@ -24,25 +23,27 @@
, jupyter-server-terminals
, nbformat
, nbconvert
, overrides
, packaging
, send2trash
, terminado
, prometheus-client
, anyio
, websocket-client
, overrides
, requests
, flaky
}:
buildPythonPackage rec {
pname = "jupyter-server";
version = "2.7.0";
format = "pyproject";
disabled = pythonOlder "3.7";
disabled = pythonOlder "3.8";
src = fetchPypi {
pname = "jupyter_server";
inherit version;
hash= "sha256-NtoKJm0xpBrDNaNmyIkzwX36W7gXpI9cAsFtMDvJR38=";
hash = "sha256-NtoKJm0xpBrDNaNmyIkzwX36W7gXpI9cAsFtMDvJR38=";
};
nativeBuildInputs = [
@ -62,24 +63,23 @@ buildPythonPackage rec {
jupyter-server-terminals
nbformat
nbconvert
overrides
packaging
send2trash
terminado
prometheus-client
anyio
websocket-client
overrides
];
nativeCheckInputs = [
flaky
ipykernel
pandoc
pytestCheckHook
pytest-console-scripts
pytest-jupyter
pytest-timeout
pytest-tornasync
requests
flaky
];
pytestFlagsArray = [
@ -94,11 +94,16 @@ buildPythonPackage rec {
disabledTests = [
"test_server_extension_list"
"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 = [
@ -112,10 +117,10 @@ buildPythonPackage rec {
__darwinAllowLocalNetworking = true;
meta = with lib; {
changelog = "https://github.com/jupyter-server/jupyter_server/releases/tag/v${version}";
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;
};
}

6
pkgs/development/python-modules/jupyter-ydoc/default.nix
View File

@ -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;
};
}

42
pkgs/development/python-modules/jupyterlab/default.nix
View File

@ -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;
};
}

6
pkgs/development/python-modules/jupyterlab_server/default.nix
View File

@ -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;
};
}

103
pkgs/development/python-modules/notebook/default.nix
View File

@ -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";
};
}

4
pkgs/development/web/ihp-new/default.nix
View File

@ -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;

8
pkgs/os-specific/linux/kernel/xanmod-kernels.nix
View File

@ -3,14 +3,14 @@
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";
};
mainVariant = {
version = "6.4.7";
hash = "sha256-0yOVCMqhoiWz8IlYRR0wXytAzjv81Cf5NoFa9qxGMm4=";
version = "6.4.8";
hash = "sha256-GkNWXngIx/aoSzu2pfpuv8kGwV9evbHl3hauux0lSwk=";
variant = "main";
};

4
pkgs/servers/home-automation/evcc/default.nix
View File

@ -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=";

3
pkgs/tools/networking/dae/default.nix
View File

@ -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";
};
}

1
pkgs/top-level/python-aliases.nix
View File

@ -183,6 +183,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
ldap = python-ldap; # added 2022-09-16

6
pkgs/top-level/python-packages.nix
View File

@ -5187,6 +5187,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 { };
@ -5495,6 +5497,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 { };
@ -5517,8 +5521,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 { };