diff options
31 files changed, 338 insertions, 75 deletions
diff --git a/nixos/modules/services/editors/emacs.nix b/nixos/modules/services/editors/emacs.nix index fe3a101597947..fad4f39ff2104 100644 --- a/nixos/modules/services/editors/emacs.nix +++ b/nixos/modules/services/editors/emacs.nix @@ -80,6 +80,15 @@ in using the EDITOR environment variable. ''; }; + + startWithGraphical = mkOption { + type = types.bool; + default = config.services.xserver.enable; + defaultText = literalExpression "config.services.xserver.enable"; + description = lib.mdDoc '' + Start emacs with the graphical session instead of any session. Without this, emacs clients will not be able to create frames in the graphical session. + ''; + }; }; config = mkIf (cfg.enable || cfg.install) { @@ -92,7 +101,13 @@ in ExecStop = "${cfg.package}/bin/emacsclient --eval (kill-emacs)"; Restart = "always"; }; - } // optionalAttrs cfg.enable { wantedBy = [ "default.target" ]; }; + + unitConfig = optionalAttrs cfg.startWithGraphical { + After = "graphical-session.target"; + }; + } // optionalAttrs cfg.enable { + wantedBy = if cfg.startWithGraphical then [ "graphical-session.target" ] else [ "default.target" ]; + }; environment.systemPackages = [ cfg.package editorScript desktopApplicationFile ]; diff --git a/pkgs/applications/misc/free42/default.nix b/pkgs/applications/misc/free42/default.nix index ce86dfdea9796..dd8405772caff 100644 --- a/pkgs/applications/misc/free42/default.nix +++ b/pkgs/applications/misc/free42/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "free42"; - version = "3.0.20"; + version = "3.0.21"; src = fetchFromGitHub { owner = "thomasokken"; repo = pname; rev = "v${version}"; - hash = "sha256-Dqrys7bAkSnpbOF0D17RDYi7q47ExlM75d5OOAnHCVU="; + hash = "sha256-zRO0buYfKtybUisWZJRkvLJVLJYZwLcDnT04rnQWy+s="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/avalanchego/default.nix b/pkgs/applications/networking/avalanchego/default.nix index 8a13341b119c2..9a6b5a44d05d8 100644 --- a/pkgs/applications/networking/avalanchego/default.nix +++ b/pkgs/applications/networking/avalanchego/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "avalanchego"; - version = "1.10.5"; + version = "1.10.8"; src = fetchFromGitHub { owner = "ava-labs"; repo = pname; rev = "v${version}"; - hash = "sha256-mGie45sIvl8BjBB4JJF/U/OJ7naT6iWjo3l50qZvyaY="; + hash = "sha256-1SD+0WkqFGInrFtVmXHz3FuOso7rooeCPMAq9eFOSDg="; }; - vendorHash = "sha256-/pNXCRHtoaJvgYsSMyYB05IKH4wG7hTlEHjuoOuifQ0="; + vendorHash = "sha256-7O1ENOZUkt0NPXk0KK+ydbeLB9ht17jBSH+/cmpOg8U="; # go mod vendor has a bug, see: https://github.com/golang/go/issues/57529 proxyVendor = true; @@ -40,6 +40,6 @@ buildGoModule rec { homepage = "https://github.com/ava-labs/avalanchego"; changelog = "https://github.com/ava-labs/avalanchego/releases/tag/v${version}"; license = licenses.bsd3; - maintainers = with maintainers; [ urandom ]; + maintainers = with maintainers; [ urandom qjoly ]; }; } diff --git a/pkgs/applications/science/logic/cbmc/default.nix b/pkgs/applications/science/logic/cbmc/default.nix index 228027d187bdf..9cc88ca7081d3 100644 --- a/pkgs/applications/science/logic/cbmc/default.nix +++ b/pkgs/applications/science/logic/cbmc/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "cbmc"; - version = "5.89.0"; + version = "5.90.0"; src = fetchFromGitHub { owner = "diffblue"; repo = pname; rev = "${pname}-${version}"; - sha256 = "sha256-pgZdR1X0aOCfCKAGo2h9bAIO2XTTiWL8ERgandOQj/M="; + sha256 = "sha256-c6Ms/IStmKug5nz37TzjeexkY3YfWaUqEKIC2viMK9g="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/deepin/apps/deepin-camera/default.nix b/pkgs/desktops/deepin/apps/deepin-camera/default.nix index e55640cbd094c..f1b4485354baf 100644 --- a/pkgs/desktops/deepin/apps/deepin-camera/default.nix +++ b/pkgs/desktops/deepin/apps/deepin-camera/default.nix @@ -22,13 +22,13 @@ stdenv.mkDerivation rec { pname = "deepin-camera"; - version = "1.4.13"; + version = "6.0.2"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - sha256 = "sha256-h4oCxtj9GwaZqioZ4vFx2Cq8a1w7lYQvOhDAd7x9gMU="; + hash = "sha256-GQQFwlJNfdsi0GvDRMIorUnlbXrgbYl9H9aBedOm+ZQ="; }; # QLibrary and dlopen work with LD_LIBRARY_PATH @@ -66,7 +66,6 @@ stdenv.mkDerivation rec { gstreamer gst-plugins-base gst-plugins-good - gst-plugins-bad ]); cmakeFlags = [ "-DVERSION=${version}" ]; diff --git a/pkgs/desktops/deepin/apps/deepin-camera/dont_use_libPath.diff b/pkgs/desktops/deepin/apps/deepin-camera/dont_use_libPath.diff index b4ef86f79b38a..f8e005f577a31 100644 --- a/pkgs/desktops/deepin/apps/deepin-camera/dont_use_libPath.diff +++ b/pkgs/desktops/deepin/apps/deepin-camera/dont_use_libPath.diff @@ -1,25 +1,24 @@ +diff --git a/src/src/gstvideowriter.cpp b/src/src/gstvideowriter.cpp +index c96c8b0..fcc11da 100644 +--- a/src/src/gstvideowriter.cpp ++++ b/src/src/gstvideowriter.cpp +@@ -282,6 +282,7 @@ void GstVideoWriter::loadAppSrcCaps() + + QString GstVideoWriter::libPath(const QString &strlib) + { ++ return strlib; + QDir dir; + QString path = QLibraryInfo::location(QLibraryInfo::LibrariesPath); + dir.setPath(path); diff --git a/src/src/mainwindow.cpp b/src/src/mainwindow.cpp -index d3c6f5c..4817446 100644 +index d3c6c24..6d313a6 100644 --- a/src/src/mainwindow.cpp +++ b/src/src/mainwindow.cpp -@@ -781,19 +781,7 @@ void CMainWindow::slotPopupSettingsDialog() +@@ -784,6 +784,7 @@ void CMainWindow::slotPopupSettingsDialog() QString CMainWindow::libPath(const QString &strlib) { -- QDir dir; -- QString path = QLibraryInfo::location(QLibraryInfo::LibrariesPath); -- dir.setPath(path); -- QStringList list = dir.entryList(QStringList() << (strlib + "*"), QDir::NoDotAndDotDot | QDir::Files); //filter name with strlib -- -- if (list.contains(strlib)) -- return strlib; -- -- list.sort(); -- if (list.size() > 0) -- return list.last(); -- -- return ""; + return strlib; - } - - void CMainWindow::reflushSnapshotLabel() + QDir dir; + QString path = QLibraryInfo::location(QLibraryInfo::LibrariesPath); + dir.setPath(path); diff --git a/pkgs/development/python-modules/aioguardian/default.nix b/pkgs/development/python-modules/aioguardian/default.nix index 83f6231629620..e4dcbda3a02eb 100644 --- a/pkgs/development/python-modules/aioguardian/default.nix +++ b/pkgs/development/python-modules/aioguardian/default.nix @@ -5,6 +5,7 @@ , buildPythonPackage , docutils , fetchFromGitHub +, fetchpatch , poetry-core , pytest-aiohttp , pytest-asyncio @@ -27,6 +28,20 @@ buildPythonPackage rec { hash = "sha256-plgO+pyKmG0mYnFZxDcrENcuEg5AG2Og2xWipzuzyHo="; }; + patches = [ + # This patch removes references to setuptools and wheel that are no longer + # necessary and changes poetry to poetry-core, so that we don't need to add + # unnecessary nativeBuildInputs. + # + # https://github.com/bachya/aioguardian/pull/288 + # + (fetchpatch { + name = "clean-up-build-dependencies.patch"; + url = "https://github.com/bachya/aioguardian/commit/ffaad4b396645f599815010995fb71ca976e761e.patch"; + hash = "sha256-RLRbHmaR2A8MNc96WHx0L8ccyygoBUaOulAuRJkFuUM="; + }) + ]; + nativeBuildInputs = [ poetry-core ]; diff --git a/pkgs/development/python-modules/aionotion/default.nix b/pkgs/development/python-modules/aionotion/default.nix index 08235b793e006..c99a317d2ca1b 100644 --- a/pkgs/development/python-modules/aionotion/default.nix +++ b/pkgs/development/python-modules/aionotion/default.nix @@ -3,6 +3,7 @@ , aresponses , buildPythonPackage , fetchFromGitHub +, fetchpatch , poetry-core , pydantic , pytest-aiohttp @@ -26,6 +27,20 @@ buildPythonPackage rec { hash = "sha256-/2sF8m5R8YXkP89bi5zR3h13r5LrFOl1OsixAcX0D4o="; }; + patches = [ + # This patch removes references to setuptools and wheel that are no longer + # necessary and changes poetry to poetry-core, so that we don't need to add + # unnecessary nativeBuildInputs. + # + # https://github.com/bachya/aionotion/pull/269 + # + (fetchpatch { + name = "clean-up-build-dependencies.patch"; + url = "https://github.com/bachya/aionotion/commit/53c7285110d12810f9b43284295f71d052a81b83.patch"; + hash = "sha256-RLRbHmaR2A8MNc96WHx0L8ccyygoBUaOulAuRJkFuUM="; + }) + ]; + nativeBuildInputs = [ poetry-core ]; @@ -35,6 +50,8 @@ buildPythonPackage rec { pydantic ]; + __darwinAllowLocalNetworking = true; + nativeCheckInputs = [ aresponses pytest-aiohttp diff --git a/pkgs/development/python-modules/aiopurpleair/default.nix b/pkgs/development/python-modules/aiopurpleair/default.nix index 5f74bc55cbd14..bdbc83fd2ab3e 100644 --- a/pkgs/development/python-modules/aiopurpleair/default.nix +++ b/pkgs/development/python-modules/aiopurpleair/default.nix @@ -3,6 +3,7 @@ , aresponses , buildPythonPackage , fetchFromGitHub +, fetchpatch , poetry-core , pydantic , pytest-aiohttp @@ -25,6 +26,20 @@ buildPythonPackage rec { hash = "sha256-YmJH4brWkTpgzyHwu9UnIWrY5qlDCmMtvF+KxQFXwfk="; }; + patches = [ + # This patch removes references to setuptools and wheel that are no longer + # necessary and changes poetry to poetry-core, so that we don't need to add + # unnecessary nativeBuildInputs. + # + # https://github.com/bachya/aiopurpleair/pull/207 + # + (fetchpatch { + name = "clean-up-build-dependencies.patch"; + url = "https://github.com/bachya/aiopurpleair/commit/8c704c51ea50da266f52a7f53198d29d643b30c5.patch"; + hash = "sha256-RLRbHmaR2A8MNc96WHx0L8ccyygoBUaOulAuRJkFuUM="; + }) + ]; + postPatch = '' substituteInPlace pyproject.toml \ --replace 'pydantic = "^1.10.2"' 'pydantic = "*"' @@ -39,6 +54,8 @@ buildPythonPackage rec { pydantic ]; + __darwinAllowLocalNetworking = true; + nativeCheckInputs = [ aresponses pytest-aiohttp diff --git a/pkgs/development/python-modules/aiorecollect/default.nix b/pkgs/development/python-modules/aiorecollect/default.nix index 259e7f6d530b7..c5fdc3f8f36ff 100644 --- a/pkgs/development/python-modules/aiorecollect/default.nix +++ b/pkgs/development/python-modules/aiorecollect/default.nix @@ -3,6 +3,7 @@ , aresponses , buildPythonPackage , fetchFromGitHub +, fetchpatch , freezegun , poetry-core , pytest-asyncio @@ -12,7 +13,7 @@ buildPythonPackage rec { pname = "aiorecollect"; - version = "2022.10.0"; + version = "2023.08.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -21,9 +22,29 @@ buildPythonPackage rec { owner = "bachya"; repo = pname; rev = version; - hash = "sha256-JIh6jr4pFXGZTUi6K7VsymaCxCrTNBevk9xo9TsrFnM="; + hash = "sha256-oTkWirq3w0DgQWWe0ziK+ry4pg6j6SQbBESLG4xgDE4="; }; + patches = [ + # This patch removes references to setuptools and wheel that are no longer + # necessary and changes poetry to poetry-core, so that we don't need to add + # unnecessary nativeBuildInputs. + # + # https://github.com/bachya/aiorecollect/pull/207 + # + (fetchpatch { + name = "clean-up-dependencies.patch"; + url = "https://github.com/bachya/aiorecollect/commit/0bfddead1c1b176be4d599b8e12ed608eac97b8b.patch"; + hash = "sha256-w/LAtyuyYsAAukDeIy8XLlp9QrydC1Wmi2zxEj1Zdm8="; + includes = [ "pyproject.toml" ]; + }) + ]; + + postPatch = '' + # this is not used directly by the project + sed -i '/certifi =/d' pyproject.toml + ''; + nativeBuildInputs = [ poetry-core ]; @@ -32,6 +53,8 @@ buildPythonPackage rec { aiohttp ]; + __darwinAllowLocalNetworking = true; + nativeCheckInputs = [ aresponses freezegun diff --git a/pkgs/development/python-modules/aioridwell/default.nix b/pkgs/development/python-modules/aioridwell/default.nix index 8098af3e87a6d..1ef9300eaf357 100644 --- a/pkgs/development/python-modules/aioridwell/default.nix +++ b/pkgs/development/python-modules/aioridwell/default.nix @@ -3,6 +3,7 @@ , aresponses , buildPythonPackage , fetchFromGitHub +, fetchpatch , freezegun , poetry-core , pyjwt @@ -29,6 +30,20 @@ buildPythonPackage rec { hash = "sha256-8EPELXxSq+B9o9eMFeM5ZPVYTa1+kT/S6cO7hKtD18s="; }; + patches = [ + # This patch removes references to setuptools and wheel that are no longer + # necessary and changes poetry to poetry-core, so that we don't need to add + # unnecessary nativeBuildInputs. + # + # https://github.com/bachya/aioridwell/pull/234 + # + (fetchpatch { + name = "clean-up-build-dependencies.patch"; + url = "https://github.com/bachya/aioridwell/commit/79a9dd7462dcfeb0833abca73a1f184827120a6f.patch"; + hash = "sha256-RLRbHmaR2A8MNc96WHx0L8ccyygoBUaOulAuRJkFuUM="; + }) + ]; + nativeBuildInputs = [ poetry-core ]; @@ -40,6 +55,8 @@ buildPythonPackage rec { titlecase ]; + __darwinAllowLocalNetworking = true; + nativeCheckInputs = [ aresponses freezegun diff --git a/pkgs/development/python-modules/aiowatttime/default.nix b/pkgs/development/python-modules/aiowatttime/default.nix index 85d6076ad275a..dde165c5bf874 100644 --- a/pkgs/development/python-modules/aiowatttime/default.nix +++ b/pkgs/development/python-modules/aiowatttime/default.nix @@ -3,6 +3,7 @@ , aresponses , buildPythonPackage , fetchFromGitHub +, fetchpatch , poetry-core , pytest-aiohttp , pytest-asyncio @@ -24,6 +25,20 @@ buildPythonPackage rec { hash = "sha256-rqmsUvVwXC/XkR/v2d9d3t7u6Poms4ORiOci41ajXIo="; }; + patches = [ + # This patch removes references to setuptools and wheel that are no longer + # necessary and changes poetry to poetry-core, so that we don't need to add + # unnecessary nativeBuildInputs. + # + # https://github.com/bachya/aiowatttime/pull/206 + # + (fetchpatch { + name = "clean-up-build-dependencies.patch"; + url = "https://github.com/bachya/aiowatttime/commit/c3cd53f794964c5435148caacd04f4e0ab8f550a.patch"; + hash = "sha256-RLRbHmaR2A8MNc96WHx0L8ccyygoBUaOulAuRJkFuUM="; + }) + ]; + nativeBuildInputs = [ poetry-core ]; @@ -32,6 +47,8 @@ buildPythonPackage rec { aiohttp ]; + __darwinAllowLocalNetworking = true; + nativeCheckInputs = [ aresponses pytest-aiohttp diff --git a/pkgs/development/python-modules/atlassian-python-api/default.nix b/pkgs/development/python-modules/atlassian-python-api/default.nix index f121cc21466df..2ce8a31193a1e 100755 --- a/pkgs/development/python-modules/atlassian-python-api/default.nix +++ b/pkgs/development/python-modules/atlassian-python-api/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "atlassian-python-api"; - version = "3.40.0"; + version = "3.41.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "atlassian-api"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-2yY1shsdlX40FJV3K7nT6HfKKI14/3zH8dOEnJeTahw="; + hash = "sha256-f1i4kX9lZ8ozv/jLzvu1XbCn+BheMn8SQE1mtivaEG8="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-api-python-client/default.nix b/pkgs/development/python-modules/google-api-python-client/default.nix index aea6bd04d8448..24bf908942fcc 100644 --- a/pkgs/development/python-modules/google-api-python-client/default.nix +++ b/pkgs/development/python-modules/google-api-python-client/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "google-api-python-client"; - version = "2.96.0"; + version = "2.97.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-9xI3PQPTOK9XufX+mMkfS1uqqHZUabAVvGI8RoHFvVE="; + hash = "sha256-SCdykYlIdqHKftQSfgVegfgeY0PO0bVEpyAK4sEZ3Nc="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/ibis-framework/default.nix b/pkgs/development/python-modules/ibis-framework/default.nix index 065fe77317aa6..1c5b134ce1ae8 100644 --- a/pkgs/development/python-modules/ibis-framework/default.nix +++ b/pkgs/development/python-modules/ibis-framework/default.nix @@ -70,7 +70,7 @@ in buildPythonPackage rec { pname = "ibis-framework"; - version = "6.0.0"; + version = "6.1.0"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -80,7 +80,7 @@ buildPythonPackage rec { repo = "ibis"; owner = "ibis-project"; rev = "refs/tags/${version}"; - hash = "sha256-qIxacrRSN/Il9cY6ZsOiYLPyxI20aI+DyDM0/9jr654="; + hash = "sha256-+AtXgRNxPryP/fd/GQlLNxWbP6ozikqG2yBCp3dE0tY="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/numba/cuda_path.patch b/pkgs/development/python-modules/numba/cuda_path.patch index 1ad472ec424f7..73f38e283d8cf 100644 --- a/pkgs/development/python-modules/numba/cuda_path.patch +++ b/pkgs/development/python-modules/numba/cuda_path.patch @@ -1,12 +1,13 @@ diff --git a/numba/cuda/cuda_paths.py b/numba/cuda/cuda_paths.py -index 0da435d33..7b1fde087 100644 +index d195bbc29..0699b365b 100644 --- a/numba/cuda/cuda_paths.py +++ b/numba/cuda/cuda_paths.py -@@ -24,10 +24,7 @@ def _find_valid_path(options): +@@ -24,11 +24,7 @@ def _find_valid_path(options): def _get_libdevice_path_decision(): options = [ - ('Conda environment', get_conda_ctk()), +- ('Conda environment (NVIDIA package)', get_nvidia_libdevice_ctk()), - ('CUDA_HOME', get_cuda_home('nvvm', 'libdevice')), - ('System', get_system_ctk('nvvm', 'libdevice')), - ('Debian package', get_debian_pkg_libdevice()), @@ -14,7 +15,7 @@ index 0da435d33..7b1fde087 100644 ] by, libdir = _find_valid_path(options) return by, libdir -@@ -35,16 +32,14 @@ def _get_libdevice_path_decision(): +@@ -36,17 +32,14 @@ def _get_libdevice_path_decision(): def _nvvm_lib_dir(): if IS_WIN32: @@ -28,13 +29,14 @@ index 0da435d33..7b1fde087 100644 def _get_nvvm_path_decision(): options = [ - ('Conda environment', get_conda_ctk()), +- ('Conda environment (NVIDIA package)', get_nvidia_nvvm_ctk()), - ('CUDA_HOME', get_cuda_home(*_nvvm_lib_dir())), - ('System', get_system_ctk(*_nvvm_lib_dir())), + ('Nix store', get_nix_ctk(*_nvvm_lib_dir())), ] by, path = _find_valid_path(options) return by, path -@@ -64,14 +59,12 @@ def _cudalib_path(): +@@ -66,7 +59,7 @@ def _cudalib_path(): if IS_WIN32: return 'bin' else: @@ -42,19 +44,25 @@ index 0da435d33..7b1fde087 100644 + return 'lib' + def _cuda_home_static_cudalib_path(): +@@ -78,10 +71,7 @@ def _cuda_home_static_cudalib_path(): + def _get_cudalib_dir_path_decision(): options = [ - ('Conda environment', get_conda_ctk()), +- ('Conda environment (NVIDIA package)', get_nvidia_cudalib_ctk()), - ('CUDA_HOME', get_cuda_home(_cudalib_path())), - ('System', get_system_ctk(_cudalib_path())), + ('Nix store', get_nix_lib_ctk(_cudalib_path())), ] by, libdir = _find_valid_path(options) return by, libdir -@@ -82,6 +75,22 @@ def _get_cudalib_dir(): - return _env_path_tuple(by, libdir) - - +@@ -239,3 +229,19 @@ def get_debian_pkg_libdevice(): + if not os.path.exists(pkg_libdevice_location): + return None + return pkg_libdevice_location ++ ++ +def get_nix_ctk(*subdirs): + """Return path to nix store cudatoolkit; or, None if it doesn't exist. + """ @@ -69,8 +77,3 @@ index 0da435d33..7b1fde087 100644 + base = '@cuda_toolkit_lib_path@' + if os.path.exists(base): + return os.path.join(base, *subdirs) -+ -+ - def get_system_ctk(*subdirs): - """Return path to system-wide cudatoolkit; or, None if it doesn't exist. - """ diff --git a/pkgs/development/python-modules/py17track/default.nix b/pkgs/development/python-modules/py17track/default.nix index 6541a1abaf1a6..6294b6b1c0665 100644 --- a/pkgs/development/python-modules/py17track/default.nix +++ b/pkgs/development/python-modules/py17track/default.nix @@ -1,10 +1,10 @@ { lib , aiohttp , aresponses -, async-timeout , attrs , buildPythonPackage , fetchFromGitHub +, fetchpatch , poetry-core , pytest-asyncio , pytestCheckHook @@ -26,29 +26,38 @@ buildPythonPackage rec { hash = "sha256-T0Jjdu6QC8rTqZwe4cdsBbs0hQXUY6CkrImCgYwWL9o="; }; + patches = [ + # This patch removes references to setuptools and wheel that are no longer + # necessary and changes poetry to poetry-core, so that we don't need to add + # unnecessary nativeBuildInputs. + # + # https://github.com/bachya/py17track/pull/80 + # + (fetchpatch { + name = "clean-up-build-dependencies.patch"; + url = "https://github.com/bachya/py17track/commit/3b52394759aa50c62e2a56581e30cdb94003e2f1.patch"; + hash = "sha256-iLgklhEZ61rrdzQoO6rp1HGZcqLsqGNitwIiPNLNHQ4="; + }) + ]; + nativeBuildInputs = [ poetry-core ]; propagatedBuildInputs = [ aiohttp - async-timeout attrs pytz ]; + __darwinAllowLocalNetworking = true; + nativeCheckInputs = [ aresponses pytest-asyncio pytestCheckHook ]; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace 'attrs = ">=19.3,<21.0"' 'attrs = ">=19.3,<22.0"' \ - --replace 'async-timeout = "^3.0.1"' 'async-timeout = ">=3.0.1,<5.0.0"' - ''; - disabledTestPaths = [ # Ignore the examples directory as the files are prefixed with test_ "examples/" diff --git a/pkgs/development/python-modules/pyiqvia/default.nix b/pkgs/development/python-modules/pyiqvia/default.nix index 81127de8c6623..48cd93608e98e 100644 --- a/pkgs/development/python-modules/pyiqvia/default.nix +++ b/pkgs/development/python-modules/pyiqvia/default.nix @@ -4,6 +4,7 @@ , aresponses , backoff , fetchFromGitHub +, fetchpatch , poetry-core , pytest-aiohttp , pytest-asyncio @@ -25,6 +26,20 @@ buildPythonPackage rec { hash = "sha256-4xoK/SwpcsjIpGUertWoSlRsKIpgpV1XmuIzDJcZMZg="; }; + patches = [ + # This patch removes references to setuptools and wheel that are no longer + # necessary and changes poetry to poetry-core, so that we don't need to add + # unnecessary nativeBuildInputs. + # + # https://github.com/bachya/pyiqvia/pull/245 + # + (fetchpatch { + name = "clean-up-build-dependencies.patch"; + url = "https://github.com/bachya/pyiqvia/commit/760d5bd1f4d60f3a97f6ea9a9a57860f4be3abdd.patch"; + hash = "sha256-RLRbHmaR2A8MNc96WHx0L8ccyygoBUaOulAuRJkFuUM="; + }) + ]; + nativeBuildInputs = [ poetry-core ]; @@ -34,6 +49,8 @@ buildPythonPackage rec { backoff ]; + __darwinAllowLocalNetworking = true; + nativeCheckInputs = [ aresponses pytest-aiohttp diff --git a/pkgs/development/python-modules/pyopenuv/default.nix b/pkgs/development/python-modules/pyopenuv/default.nix index 05b8793c73fb3..3c70109657852 100644 --- a/pkgs/development/python-modules/pyopenuv/default.nix +++ b/pkgs/development/python-modules/pyopenuv/default.nix @@ -33,6 +33,17 @@ buildPythonPackage rec { url = "https://github.com/bachya/pyopenuv/commit/af15736b0d82ef811c3f380f5da32007752644fe.patch"; hash = "sha256-5uQS3DoM91mhfyxLTNii3JBxwXIDK4/GwtadkVagjuw="; }) + # This patch removes references to setuptools and wheel that are no longer + # necessary and changes poetry to poetry-core, so that we don't need to add + # unnecessary nativeBuildInputs. + # + # https://github.com/bachya/pyopenuv/pull/244 + # + (fetchpatch { + name = "clean-up-build-dependencies.patch"; + url = "https://github.com/bachya/pyopenuv/commit/1663f697dd5528fb03af1400e5ffd3fba076c64c.patch"; + hash = "sha256-RLRbHmaR2A8MNc96WHx0L8ccyygoBUaOulAuRJkFuUM="; + }) ]; nativeBuildInputs = [ @@ -44,6 +55,8 @@ buildPythonPackage rec { backoff ]; + __darwinAllowLocalNetworking = true; + nativeCheckInputs = [ aresponses pytest-asyncio diff --git a/pkgs/development/python-modules/pyoutbreaksnearme/default.nix b/pkgs/development/python-modules/pyoutbreaksnearme/default.nix index 4a653d0fe670f..c0e4ea20dd267 100644 --- a/pkgs/development/python-modules/pyoutbreaksnearme/default.nix +++ b/pkgs/development/python-modules/pyoutbreaksnearme/default.nix @@ -3,6 +3,7 @@ , aresponses , buildPythonPackage , fetchFromGitHub +, fetchpatch , poetry-core , pytest-asyncio , pytest-aiohttp @@ -25,6 +26,20 @@ buildPythonPackage rec { hash = "sha256-D7oXkKDSg+yF+j1WyG/VVY12hLU6oyhEtxLrF6IkMSA="; }; + patches = [ + # This patch removes references to setuptools and wheel that are no longer + # necessary and changes poetry to poetry-core, so that we don't need to add + # unnecessary nativeBuildInputs. + # + # https://github.com/bachya/pyoutbreaksnearme/pull/174 + # + (fetchpatch { + name = "clean-up-build-dependencies.patch"; + url = "https://github.com/bachya/pyoutbreaksnearme/commit/45fba9f689253a0f79ebde93086ee731a4151553.patch"; + hash = "sha256-RLRbHmaR2A8MNc96WHx0L8ccyygoBUaOulAuRJkFuUM="; + }) + ]; + nativeBuildInputs = [ poetry-core ]; @@ -34,6 +49,8 @@ buildPythonPackage rec { ujson ]; + __darwinAllowLocalNetworking = true; + nativeCheckInputs = [ aresponses pytest-asyncio diff --git a/pkgs/development/python-modules/pytile/default.nix b/pkgs/development/python-modules/pytile/default.nix index 598dac359ca84..977cf15d074ba 100644 --- a/pkgs/development/python-modules/pytile/default.nix +++ b/pkgs/development/python-modules/pytile/default.nix @@ -3,6 +3,7 @@ , aresponses , buildPythonPackage , fetchFromGitHub +, fetchpatch , poetry-core , pytest-aiohttp , pytest-asyncio @@ -24,6 +25,20 @@ buildPythonPackage rec { hash = "sha256-SFHWhXKC7PIqanJIQyGcpM8klwxOAJPVtzk9w0i2YYA="; }; + patches = [ + # This patch removes references to setuptools and wheel that are no longer + # necessary and changes poetry to poetry-core, so that we don't need to add + # unnecessary nativeBuildInputs. + # + # https://github.com/bachya/pytile/pull/286 + # + (fetchpatch { + name = "clean-up-build-dependencies.patch"; + url = "https://github.com/bachya/pytile/commit/bdb5d96ba9d640bf85a1ae9c3787704dbc2ced23.patch"; + hash = "sha256-RLRbHmaR2A8MNc96WHx0L8ccyygoBUaOulAuRJkFuUM="; + }) + ]; + nativeBuildInputs = [ poetry-core ]; diff --git a/pkgs/development/python-modules/regenmaschine/default.nix b/pkgs/development/python-modules/regenmaschine/default.nix index 2cee50ac5039c..f506b13a7795a 100644 --- a/pkgs/development/python-modules/regenmaschine/default.nix +++ b/pkgs/development/python-modules/regenmaschine/default.nix @@ -3,6 +3,7 @@ , aresponses , buildPythonPackage , fetchFromGitHub +, fetchpatch , poetry-core , pytest-aiohttp , pytest-asyncio @@ -26,6 +27,20 @@ buildPythonPackage rec { hash = "sha256-W5W/2gBraraZs8ai8tyg3aRWvHt6WOQCVICuiAigae0="; }; + patches = [ + # This patch removes references to setuptools and wheel that are no longer + # necessary and changes poetry to poetry-core, so that we don't need to add + # unnecessary nativeBuildInputs. + # + # https://github.com/bachya/regenmaschine/pull/334 + # + (fetchpatch { + name = "clean-up-build-dependencies.patch"; + url = "https://github.com/bachya/regenmaschine/commit/ecc2f771e2ae2e0a8d46f5beab072df4e4727ba3.patch"; + hash = "sha256-RLRbHmaR2A8MNc96WHx0L8ccyygoBUaOulAuRJkFuUM="; + }) + ]; + nativeBuildInputs = [ poetry-core ]; diff --git a/pkgs/development/python-modules/seventeentrack/default.nix b/pkgs/development/python-modules/seventeentrack/default.nix index 56bec419987ad..351392aec46a2 100644 --- a/pkgs/development/python-modules/seventeentrack/default.nix +++ b/pkgs/development/python-modules/seventeentrack/default.nix @@ -1,10 +1,10 @@ { lib , aiohttp , aresponses -, async-timeout , attrs , buildPythonPackage , fetchFromGitHub +, fetchpatch , poetry-core , pytest-asyncio , pytestCheckHook @@ -26,17 +26,32 @@ buildPythonPackage rec { hash = "sha256-vMdRXcd0es/LjgsVyWItSLFzlSTEa3oaA6lr/NL4i8U="; }; + patches = [ + # This patch removes references to setuptools and wheel that are no longer + # necessary and changes poetry to poetry-core, so that we don't need to add + # unnecessary nativeBuildInputs. + # + # https://github.com/McSwindler/seventeentrack/pull/4 + # + (fetchpatch { + name = "clean-up-build-dependencies.patch"; + url = "https://github.com/McSwindler/seventeentrack/commit/9a21e22f796a17628a9628f54e19d19d002b4d0a.patch"; + hash = "sha256-UvxUpiSkDbP8Jum5XbrWHBnH1HLBYEKUKw6GTV+Kvys="; + }) + ]; + nativeBuildInputs = [ poetry-core ]; propagatedBuildInputs = [ aiohttp - async-timeout attrs pytz ]; + __darwinAllowLocalNetworking = true; + nativeCheckInputs = [ aresponses pytest-asyncio diff --git a/pkgs/development/python-modules/simplisafe-python/default.nix b/pkgs/development/python-modules/simplisafe-python/default.nix index 5b00e279a7e19..d4fbc5c861b87 100644 --- a/pkgs/development/python-modules/simplisafe-python/default.nix +++ b/pkgs/development/python-modules/simplisafe-python/default.nix @@ -6,6 +6,7 @@ , buildPythonPackage , docutils , fetchFromGitHub +, fetchpatch , poetry-core , pytest-aiohttp , pytest-asyncio @@ -31,6 +32,20 @@ buildPythonPackage rec { hash = "sha256-dcWDB9tpKrFbnWf35HLDmgy2zNTzKNeJQrdtRXbSMvs="; }; + patches = [ + # This patch removes references to setuptools and wheel that are no longer + # necessary and changes poetry to poetry-core, so that we don't need to add + # unnecessary nativeBuildInputs. + # + # https://github.com/bachya/simplisafe-python/pull/596 + # + (fetchpatch { + name = "clean-up-build-dependencies.patch"; + url = "https://github.com/bachya/simplisafe-python/commit/60f41c690fac7acb614490b542cbbf2fa0052266.patch"; + hash = "sha256-RLRbHmaR2A8MNc96WHx0L8ccyygoBUaOulAuRJkFuUM="; + }) + ]; + nativeBuildInputs = [ poetry-core ]; diff --git a/pkgs/development/tools/build-managers/xmake/default.nix b/pkgs/development/tools/build-managers/xmake/default.nix index 55dc84d9f1643..fc092b52f589a 100644 --- a/pkgs/development/tools/build-managers/xmake/default.nix +++ b/pkgs/development/tools/build-managers/xmake/default.nix @@ -12,11 +12,11 @@ stdenv.mkDerivation rec { pname = "xmake"; - version = "2.8.1"; + version = "2.8.2"; src = fetchurl { url = "https://github.com/xmake-io/xmake/releases/download/v${version}/xmake-v${version}.tar.gz"; - hash = "sha256-nM0LV3CVaLNbB1EKjc+Ywir2aQ/xWgET2Cu+kh908l8="; + hash = "sha256-rA0wiL2kZs+rOSCLXAaX50epK9aL+We4FYgr2/TxRKo="; }; nativeBuildInputs = [ diff --git a/pkgs/development/tools/rust/cargo-llvm-cov/default.nix b/pkgs/development/tools/rust/cargo-llvm-cov/default.nix index 51f8e2340cfb7..ee8bc53760264 100644 --- a/pkgs/development/tools/rust/cargo-llvm-cov/default.nix +++ b/pkgs/development/tools/rust/cargo-llvm-cov/default.nix @@ -6,13 +6,13 @@ rustPlatform.buildRustPackage rec { pname = "cargo-llvm-cov"; - version = "0.5.27"; + version = "0.5.28"; src = fetchCrate { inherit pname version; - sha256 = "sha256-c48JHEziyrNGfnPk9MB++9jlOtDp/80XYelqQXi7Rfs="; + sha256 = "sha256-B+tyDVb/tSuxQAK8x5cEw+Y7Y5IXD+jkr0FeqiDY+g8="; }; - cargoSha256 = "sha256-ztF+txw6WAtpfiN1/zBzKw8jVjyf4YMHx3EfkGXSi4c="; + cargoSha256 = "sha256-lGaMws7Z7qIWkQlfnSnN9cqRojBuxWp81nMAlBXAWEM="; # skip tests which require llvm-tools-preview checkFlags = [ diff --git a/pkgs/tools/misc/cloc/default.nix b/pkgs/tools/misc/cloc/default.nix index f6de1942ba6a7..a8fc4a4f01b88 100644 --- a/pkgs/tools/misc/cloc/default.nix +++ b/pkgs/tools/misc/cloc/default.nix @@ -1,8 +1,9 @@ { lib, stdenv, fetchFromGitHub, makeWrapper, perlPackages }: -stdenv.mkDerivation rec { +let version = "1.98"; +in stdenv.mkDerivation { pname = "cloc"; - version = "1.98"; + inherit version; src = fetchFromGitHub { owner = "AlDanial"; @@ -27,6 +28,28 @@ stdenv.mkDerivation rec { postFixup = "wrapProgram $out/bin/cloc --prefix PERL5LIB : $PERL5LIB"; + doInstallCheck = true; + installCheckPhase = '' + runHook preInstallCheck + + echo -n 'checking --version...' + $out/bin/cloc --version | grep '${version}' > /dev/null + echo ' ok' + + cat > test.nix <<EOF + {a, b}: { + test = a + + b; + } + EOF + + echo -n 'checking lines in test.nix...' + $out/bin/cloc --quiet --csv test.nix | grep '1,Nix,0,0,4' > /dev/null + echo ' ok' + + runHook postInstallCheck + ''; + meta = { description = "A program that counts lines of source code"; homepage = "https://github.com/AlDanial/cloc"; diff --git a/pkgs/tools/misc/findutils/default.nix b/pkgs/tools/misc/findutils/default.nix index 62f39492437ed..b37eaeaea1be1 100644 --- a/pkgs/tools/misc/findutils/default.nix +++ b/pkgs/tools/misc/findutils/default.nix @@ -90,5 +90,7 @@ stdenv.mkDerivation rec { platforms = lib.platforms.all; license = lib.licenses.gpl3Plus; + + mainProgram = "find"; }; } diff --git a/pkgs/tools/networking/dnsproxy/default.nix b/pkgs/tools/networking/dnsproxy/default.nix index aaa2ed1459a37..fd1d9606fcf23 100644 --- a/pkgs/tools/networking/dnsproxy/default.nix +++ b/pkgs/tools/networking/dnsproxy/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "dnsproxy"; - version = "0.52.0"; + version = "0.54.0"; src = fetchFromGitHub { owner = "AdguardTeam"; repo = pname; rev = "v${version}"; - sha256 = "sha256-vHiC7RWPba4LlS0YX088HqS3hLGEt0jHKzL7DcysEkw="; + sha256 = "sha256-wA88v8zF5sq3NQwKh8g4k/COviuaegGn6bBTzBMcdGM="; }; vendorHash = null; diff --git a/pkgs/tools/system/automatic-timezoned/default.nix b/pkgs/tools/system/automatic-timezoned/default.nix index e9ef13e649a8c..fd124d8cf8f5c 100644 --- a/pkgs/tools/system/automatic-timezoned/default.nix +++ b/pkgs/tools/system/automatic-timezoned/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "automatic-timezoned"; - version = "1.0.118"; + version = "1.0.121"; src = fetchFromGitHub { owner = "maxbrunet"; repo = pname; rev = "v${version}"; - sha256 = "sha256-kV66aN/eGrGIX61zcdyow1f/VzrYW0m/TVOx13Jq88E="; + sha256 = "sha256-B3Ndu6Zyq7tsVOvQqtnBB7Fs8CbxrogeV5LF20u17IQ="; }; - cargoHash = "sha256-705pVGdVixq/Xog8RBktERP8GBLkt8Ch2DozuSngTas="; + cargoHash = "sha256-2rVqwmWn59ytLRrMFS1m97CXlJ/FneV7QSMdvqjzmw8="; meta = with lib; { description = "Automatically update system timezone based on location"; diff --git a/pkgs/tools/text/ugrep/default.nix b/pkgs/tools/text/ugrep/default.nix index 354cdc350833d..afc986e9c5979 100644 --- a/pkgs/tools/text/ugrep/default.nix +++ b/pkgs/tools/text/ugrep/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "ugrep"; - version = "4.0.0"; + version = "4.0.2"; src = fetchFromGitHub { owner = "Genivia"; repo = "ugrep"; rev = "v${finalAttrs.version}"; - hash = "sha256-kRpHJl/ouYgvwFMk6uO4XobyT2kTCH9kLfeF70IqMuc="; + hash = "sha256-g+COkAdXc1Z3yrObbeBU1wtu9Tr3mEhxrf6Qmy3JywY="; }; buildInputs = [ |