Merge master into staging-next

maintainers/maintainer-list.nix

@@ -6113,6 +6113,12 @@
     githubId = 313929;
     name = "Gabriel Ebner";
   };
+  geluk = {
+    email = "johan+nix@geluk.io";
+    github = "geluk";
+    githubId = 1516985;
+    name = "Johan Geluk";
+  };
   genericnerdyusername = {
     name = "GenericNerdyUsername";
     email = "genericnerdyusername@proton.me";

nixos/modules/programs/zsh/zsh.nix

@@ -159,6 +159,14 @@ in
         type = types.bool;
       };
 
+      enableLsColors = mkOption {
+        default = true;
+        description = lib.mdDoc ''
+          Enable extra colors in directory listings (used by `ls` and `tree`).
+        '';
+        type = types.bool;
+      };
+
     };
 
   };
@@ -263,6 +271,11 @@ in
 
         ${cfg.interactiveShellInit}
 
+        ${optionalString cfg.enableLsColors ''
+          # Extra colors for directory listings.
+          eval "$(${pkgs.coreutils}/bin/dircolors -b)"
+        ''}
+
         # Setup aliases.
         ${zshAliases}
 

nixos/modules/services/x11/window-managers/dwm.nix

@@ -45,6 +45,7 @@ in
       { name = "dwm";
         start =
           ''
+            export _JAVA_AWT_WM_NONREPARENTING=1
             dwm &
             waitPID=$!
           '';

pkgs/applications/misc/safecloset/default.nix

@@ -0,0 +1,41 @@
+{ lib
+, rustPlatform
+, fetchFromGitHub
+, stdenv
+, darwin
+, xorg
+}:
+
+rustPlatform.buildRustPackage rec {
+  pname = "safecloset";
+  version = "1.3.0";
+
+  src = fetchFromGitHub {
+    owner = "Canop";
+    repo = "safecloset";
+    rev = "v${version}";
+    hash = "sha256-HY8HaWGsqKUsqNLFpxrGJvAcVD68fqKX2v7xCiEKuDM=";
+  };
+
+  cargoHash = "sha256-geZoqfPgYUd4X903EM7+gq/VPvIClAmlC0nkqWriB0M=";
+
+  buildInputs = lib.optionals stdenv.isDarwin [
+    darwin.apple_sdk.frameworks.AppKit
+  ] ++ lib.optionals stdenv.isLinux [
+    xorg.libxcb
+  ];
+
+  checkFlags = [
+    # skip flaky test
+    "--skip=timer::timer_tests::test_timer_reset"
+  ];
+
+  meta = with lib; {
+    description = "Cross-platform secure TUI secret locker";
+    homepage = "https://github.com/Canop/safecloset";
+    changelog = "https://github.com/Canop/safecloset/blob/${src.rev}/CHANGELOG.md";
+    license = licenses.agpl3Only;
+    maintainers = with maintainers; [ figsoda ];
+    mainProgram = "safecloset";
+  };
+}

pkgs/applications/science/logic/cryptominisat/default.nix

@@ -8,13 +8,13 @@
 
 stdenv.mkDerivation rec {
   pname = "cryptominisat";
-  version = "5.11.11";
+  version = "5.11.12";
 
   src = fetchFromGitHub {
     owner = "msoos";
     repo = "cryptominisat";
     rev = version;
-    hash = "sha256-TYuOgOOs1EsdNz7ctZMsArTlw3QzHjiPZVozuniiPcI=";
+    hash = "sha256-1AJx8gPf+qDpAp0p4cfCObKZDWKDAKdGopllr2ajpHw=";
   };
 
   buildInputs = [ python3 boost ];

pkgs/applications/virtualization/qemu/default.nix

@@ -35,8 +35,6 @@
                           ++ ["${stdenv.hostPlatform.qemuArch}-softmmu"])
                     else null)
 , nixosTestRunner ? false
-, doCheck ? false
-, qemu  # for passthru.tests
 , gitUpdater
 }:
 
@@ -44,7 +42,7 @@ let
   hexagonSupport = hostCpuTargets == null || lib.elem "hexagon" hostCpuTargets;
 in
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "qemu"
     + lib.optionalString xenSupport "-xen"
     + lib.optionalString hostCpuOnly "-host-cpu-only"
@@ -52,7 +50,7 @@ stdenv.mkDerivation rec {
   version = "8.0.4";
 
   src = fetchurl {
-    url = "https://download.qemu.org/qemu-${version}.tar.xz";
+    url = "https://download.qemu.org/qemu-${finalAttrs.version}.tar.xz";
     hash = "sha256-gcgX3aOK+Vi+W+8abPVbZYuy0/uHwealcd5reyxEUWw=";
   };
 
@@ -207,7 +205,7 @@ stdenv.mkDerivation rec {
   preBuild = "cd build";
 
   # tests can still timeout on slower systems
-  inherit doCheck;
+  doCheck = false;
   nativeCheckInputs = [ socat ];
   preCheck = ''
     # time limits are a little meagre for a build machine that's
@@ -248,7 +246,7 @@ stdenv.mkDerivation rec {
   passthru = {
     qemu-system-i386 = "bin/qemu-system-i386";
     tests = {
-      qemu-tests = qemu.override { doCheck = true; };
+      qemu-tests = finalAttrs.finalPackage.overrideAttrs (_: { doCheck = true; });
     };
     updateScript = gitUpdater {
       # No nicer place to find latest release.
@@ -269,4 +267,4 @@ stdenv.mkDerivation rec {
     maintainers = with maintainers; [ eelco qyliss ];
     platforms = platforms.unix;
   };
-}
+})

pkgs/development/python-modules/aiobafi6/default.nix

@@ -11,7 +11,7 @@
 
 buildPythonPackage rec {
   pname = "aiobafi6";
-  version = "0.8.2";
+  version = "0.9.0";
   format = "pyproject";
 
   disabled = pythonOlder "3.10";
@@ -20,7 +20,7 @@ buildPythonPackage rec {
     owner = "jfroy";
     repo = "aiobafi6";
     rev = "refs/tags/${version}";
-    hash = "sha256-ng+WpLhAfsouFA9biomc0V+L9XQHDthJeJLv8ttnYBc=";
+    hash = "sha256-QxjrspvNrcMcGChjj1B4QF/SnWCsGmPxnI2bWAL6BiI=";
   };
 
   nativeBuildInputs = [

pkgs/development/python-modules/ansible-pylibssh/default.nix

@@ -0,0 +1,49 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, pythonOlder
+, libssh
+, cython
+, wheel
+, setuptools
+, setuptools-scm
+, toml
+, expandvars
+}:
+
+buildPythonPackage rec {
+  pname = "ansible-pylibssh";
+  version = "1.1.0";
+  format = "pyproject";
+
+  disabled = pythonOlder "3.6";
+
+  src = fetchPypi {
+    inherit pname version;
+    hash = "sha256-spaGux6dYvtUtpOdU6oN7SEn8IgBof2NpQSPvr+Zplg=";
+  };
+
+  nativeBuildInputs = [
+    cython
+    wheel
+    setuptools
+    setuptools-scm
+    toml
+    expandvars
+  ];
+
+  propagatedBuildInputs = [
+    libssh
+  ];
+
+  pythonImportsCheck = [
+    "pylibsshext"
+  ];
+
+  meta = with lib; {
+    description = "Python bindings to client functionality of libssh specific to Ansible use case";
+    homepage = "https://github.com/ansible/pylibssh";
+    license = licenses.lgpl21Plus;
+    maintainers = with maintainers; [ geluk ];
+  };
+}

pkgs/development/python-modules/ansible/core.nix

@@ -13,6 +13,7 @@
 , ncclient
 , packaging
 , paramiko
+, ansible-pylibssh
 , passlib
 , pexpect
 , psutil
@@ -63,6 +64,7 @@ buildPythonPackage rec {
     lxml
     ncclient
     paramiko
+    ansible-pylibssh
     pexpect
     psutil
     pycrypto

pkgs/development/python-modules/ansible/default.nix

@@ -7,6 +7,7 @@
 , ncclient
 , netaddr
 , paramiko
+, ansible-pylibssh
 , pynetbox
 , scp
 , textfsm
@@ -45,6 +46,7 @@ buildPythonPackage {
     ncclient
     netaddr
     paramiko
+    ansible-pylibssh
     xmltodict
     # ansible.posix
     # ansible.utils
@@ -62,6 +64,7 @@ buildPythonPackage {
     jxmlease
     ncclient
     paramiko
+    ansible-pylibssh
     scp
     xmltodict
   ] ++ lib.optionals (withNetbox) [

pkgs/development/python-modules/anyqt/default.nix

@@ -0,0 +1,44 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, pyqt5
+, pytestCheckHook
+, nix-update-script
+}:
+
+buildPythonPackage rec {
+  pname = "anyqt";
+  version = "0.2.0";
+
+  src = fetchFromGitHub {
+    owner = "ales-erjavec";
+    repo = "anyqt";
+    rev = version;
+    hash = "sha256-dL2EUAMzWKq/oN3rXiEC6emDJddmg4KclT5ONKA0jfk=";
+  };
+
+  nativeCheckInputs = [ pyqt5 pytestCheckHook ];
+
+  # All of these fail because Qt modules cannot be imported
+  disabledTestPaths = [
+    "tests/test_qabstractitemview.py"
+    "tests/test_qaction_set_menu.py"
+    "tests/test_qactionevent_action.py"
+    "tests/test_qfontdatabase_static.py"
+    "tests/test_qpainter_draw_pixmap_fragments.py"
+    "tests/test_qsettings.py"
+    "tests/test_qstandarditem_insertrow.py"
+    "tests/test_qtest.py"
+  ];
+
+  pythonImportsCheck = [ "AnyQt" ];
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "PyQt/PySide compatibility layer";
+    homepage = "https://github.com/ales-erjavec/anyqt";
+    license = [ lib.licenses.gpl3Only ];
+    maintainers = [ lib.maintainers.lucasew ];
+  };
+}

pkgs/development/python-modules/baycomp/default.nix

@@ -0,0 +1,35 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, numpy
+, scipy
+, scikit-learn
+, matplotlib
+, unittestCheckHook
+}:
+
+buildPythonPackage rec {
+  pname = "baycomp";
+  version = "1.0.2";
+
+  src = fetchPypi {
+    inherit pname version;
+    hash = "sha256-xDRywWvXzfSITdTHPdMH5KPacJf+Scg81eiNdRQpI7A=";
+  };
+
+  propagatedBuildInputs = [
+    numpy
+    scipy
+    matplotlib
+  ];
+
+  nativeCheckInputs = [ unittestCheckHook ];
+  pythonImportsCheck = [ "baycomp" ];
+
+  meta = {
+    description = "A library for Bayesian comparison of classifiers";
+    homepage = "https://github.com/janezd/baycomp";
+    license = [ lib.licenses.mit ];
+    maintainers = [ lib.maintainers.lucasew ];
+  };
+}

pkgs/development/python-modules/cloup/default.nix

@@ -5,18 +5,19 @@
 , click
 , setuptools-scm
 , pythonOlder
+, typing-extensions
 }:
 
 buildPythonPackage rec {
   pname = "cloup";
-  version = "3.0.0";
+  version = "3.0.1";
   format = "setuptools";
 
-  disabled = pythonOlder "3.6";
+  disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-ur1L3P0nT4Z3nW0845ueoPbMWrPU7+NbpoQebW0DeJM=";
+    hash = "sha256-4ItMwje7mlvY/4G6btSUmOIgDaw5InsWSOlXiCAo6ZM=";
   };
 
   nativeBuildInputs = [
@@ -25,6 +26,8 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [
     click
+  ] ++ lib.optionals (pythonOlder "3.8") [
+    typing-extensions
   ];
 
   nativeCheckInputs = [

pkgs/development/python-modules/expandvars/default.nix

@@ -0,0 +1,39 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, pythonOlder
+, setuptools
+, wheel
+}:
+
+buildPythonPackage rec {
+  pname = "expandvars";
+  version = "0.11.0";
+  format = "pyproject";
+
+  disabled = pythonOlder "3.6";
+
+  src = fetchPypi {
+    inherit pname version;
+    hash = "sha256-Q7Qn9dMnqzYAY98mFR+Y0qbwj+GPKJWjKn9fDxF7W1I=";
+  };
+
+  nativeBuildInputs = [
+    setuptools
+    wheel
+  ];
+
+  # The PyPi package does not supply any tests
+  doCheck = false;
+
+  pythonImportsCheck = [
+    "expandvars"
+  ];
+
+  meta = with lib; {
+    description = "Expand system variables Unix style";
+    homepage = "https://github.com/sayanarijit/expandvars";
+    license = licenses.mit;
+    maintainers = with maintainers; [ geluk ];
+  };
+}

pkgs/development/python-modules/faraday-plugins/default.nix

@@ -18,7 +18,7 @@
 
 buildPythonPackage rec {
   pname = "faraday-plugins";
-  version = "1.12.1";
+  version = "1.13.0";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
@@ -27,7 +27,7 @@ buildPythonPackage rec {
     owner = "infobyte";
     repo = "faraday_plugins";
     rev = "refs/tags/${version}";
-    hash = "sha256-sDHqBGRJQuAj2zB7hcIy3u5iNCxBHO1ub0eHxfgd7kI=";
+    hash = "sha256-t1C9fS0LU46J7y+rp2pTCVma09aFqzuBtslrlU+MS1E=";
   };
 
   postPatch = ''

pkgs/development/python-modules/gensim/default.nix

@@ -14,14 +14,14 @@
 
 buildPythonPackage rec {
   pname = "gensim";
-  version = "4.3.1";
+  version = "4.3.2";
   format = "setuptools";
 
   disabled = pythonOlder "3.8";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-i18RwOalMICGtI6PaEEiOk+ho31RNoRhK37oVLUzAV8=";
+    hash = "sha256-maxq9v/UBoLnAVXtn5Lsv0OE1Z+1CvEg00PqXuGzCKs=";
   };
 
   nativeBuildInputs = [

pkgs/development/python-modules/griffe/default.nix

@@ -12,7 +12,7 @@
 
 buildPythonPackage rec {
   pname = "griffe";
-  version = "0.34.0";
+  version = "0.35.0";
   format = "pyproject";
 
   disabled = pythonOlder "3.8";
@@ -21,7 +21,7 @@ buildPythonPackage rec {
     owner = "mkdocstrings";
     repo = pname;
     rev = "refs/tags/${version}";
-    hash = "sha256-kc+RL5ulV2VfB4ojgv/ZSupPy36kyOqbLBWHPiSpqkk=";
+    hash = "sha256-PogpRQWeFhBpPlesHBUq9F6QA384/u+wIYsqkjCH3Sk=";
   };
 
   SETUPTOOLS_SCM_PRETEND_VERSION = version;

pkgs/development/python-modules/model-bakery/default.nix

@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "model-bakery";
-  version = "1.14.0";
+  version = "1.15.0";
   format = "pyproject";
 
   disabled = pythonOlder "3.8";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
     owner = "model-bakers";
     repo = "model_bakery";
     rev = "refs/tags/${version}";
-    hash = "sha256-eiCbx15lY8H+xS2HhDCpsqwsuZGxou8aHgaktd/+65U=";
+    hash = "sha256-gB6lcLymkajRoeOQ70kmZVlBI7oeZgQo1VySfPGeQLQ=";
   };
 
   nativeBuildInputs = [

pkgs/development/python-modules/opentsne/default.nix

@@ -0,0 +1,56 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, cython
+, numpy
+, scipy
+, scikit-learn
+, pytestCheckHook
+, nix-update-script
+, setuptools
+}:
+
+let
+  self = buildPythonPackage rec {
+    pname = "opentsne";
+    version = "1.0.0";
+    format = "pyproject";
+
+    src = fetchFromGitHub {
+      owner = "pavlin-policar";
+      repo = "openTSNE";
+      rev = "v${version}";
+      hash = "sha256-L5Qx6dMJlXF3EaWwlFTQ3dkhGXc5PvQBXYJo+QO+Hxc=";
+    };
+
+    propagatedBuildInputs = [ numpy scipy scikit-learn ];
+    nativeBuildInputs = [ cython setuptools ];
+
+    pythonImportsCheck = [ "openTSNE" ];
+    doCheck = false;
+
+    passthru = {
+      updateScript = nix-update-script {};
+      tests.pytest = self.overridePythonAttrs (old: {
+        pname = "${old.pname}-tests";
+        format = "other";
+
+        postPatch = "rm openTSNE -rf";
+
+        doBuild = false;
+        doInstall = false;
+
+        doCheck = true;
+        nativeCheckInputs = [ pytestCheckHook self ];
+      });
+    };
+
+    meta = {
+      description = "Modular Python implementation of t-Distributed Stochasitc Neighbor Embedding";
+      homepage = "https://github.com/pavlin-policar/openTSNE";
+      changelog = "https://github.com/pavlin-policar/openTSNE/releases/tag/${version}";
+      license = [ lib.licenses.bsd3 ];
+      maintainers = [ lib.maintainers.lucasew ];
+    };
+  };
+in self

pkgs/development/python-modules/orange-canvas-core/default.nix

@@ -0,0 +1,64 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, anyqt
+, cachecontrol
+, commonmark
+, dictdiffer
+, docutils
+, filelock
+, lockfile
+, pytest-qt
+, pytestCheckHook
+, python
+, qasync
+, qt5
+, writeShellScript
+, xvfb-run
+}:
+
+buildPythonPackage rec {
+  pname = "orange-canvas-core";
+  version = "0.1.31";
+
+  src = fetchPypi {
+    inherit pname version;
+    hash = "sha256-kqh/c0pEWFLqf1BMD79li1MqLpH/4xrdTH9+/7YO/tg=";
+  };
+
+  propagatedBuildInputs = [
+    anyqt
+    cachecontrol
+    commonmark
+    dictdiffer
+    docutils
+    filelock
+    lockfile
+    qasync
+  ];
+
+  pythonImportsCheck = [ "orangecanvas" ];
+
+  preCheck = ''
+    export HOME=$(mktemp -d)
+    export QT_PLUGIN_PATH="${qt5.qtbase.bin}/${qt5.qtbase.qtPluginPrefix}"
+    export QT_QPA_PLATFORM_PLUGIN_PATH="${qt5.qtbase.bin}/lib/qt-${qt5.qtbase.version}/plugins";
+    export QT_QPA_PLATFORM=offscreen
+  '';
+
+  nativeCheckInputs = [
+    pytest-qt
+    pytestCheckHook
+  ];
+
+  disabledTestPaths = [
+    "orangecanvas/canvas/items/tests/test_graphicstextitem.py"
+  ];
+
+  meta = {
+    description = "Orange framework for building graphical user interfaces for editing workflows";
+    homepage = "https://github.com/biolab/orange-canvas-core";
+    license = [ lib.licenses.gpl3 ];
+    maintainers = [ lib.maintainers.lucasew ];
+  };
+}

pkgs/development/python-modules/orange-widget-base/default.nix

@@ -0,0 +1,62 @@
+{ lib
+, stdenv
+, buildPythonPackage
+, fetchPypi
+, pyqt5
+, pyqtwebengine
+, matplotlib
+, orange-canvas-core
+, pyqtgraph
+, typing-extensions
+, qt5
+, pytestCheckHook
+, pytest-qt
+, appnope
+}:
+
+buildPythonPackage rec {
+  pname = "orange-widget-base";
+  version = "4.21.0";
+
+  src = fetchPypi {
+    inherit pname version;
+    hash = "sha256-43JeEdgEb6WS7PySW1x08fn02yl9Q/HwwKo6ojaqiH0=";
+  };
+
+  propagatedBuildInputs = [
+    matplotlib
+    orange-canvas-core
+    pyqt5
+    pyqtgraph
+    pyqtwebengine
+    typing-extensions
+  ] ++ lib.optionals stdenv.isDarwin [
+    appnope
+  ];
+
+  pythonImportsCheck = [ "orangewidget" ];
+
+  preCheck = ''
+    export HOME=$(mktemp -d)
+    export QT_PLUGIN_PATH="${qt5.qtbase.bin}/${qt5.qtbase.qtPluginPrefix}"
+    export QT_QPA_PLATFORM_PLUGIN_PATH="${qt5.qtbase.bin}/lib/qt-${qt5.qtbase.version}/plugins";
+    export QT_QPA_PLATFORM=offscreen
+  '';
+
+  nativeCheckInputs = [
+    pytest-qt
+    pytestCheckHook
+  ];
+
+  disabledTestPaths = [
+    "orangewidget/report/tests/test_report.py"
+    "orangewidget/tests/test_widget.py"
+  ];
+
+  meta = {
+    description = "Implementation of the base OWBaseWidget class and utilities for use in Orange Canvas workflows";
+    homepage = "https://github.com/biolab/orange-widget-base";
+    license = [ lib.licenses.gpl3Plus ];
+    maintainers = [ lib.maintainers.lucasew ];
+  };
+}

pkgs/development/python-modules/orange3/default.nix

@@ -0,0 +1,164 @@
+{ lib
+, buildPythonPackage
+, copyDesktopItems
+, fetchurl
+, makeDesktopItem
+, fetchFromGitHub
+, nix-update-script
+, python
+, baycomp
+, bottleneck
+, chardet
+, cython
+, httpx
+, joblib
+, keyring
+, keyrings-alt
+, matplotlib
+, numpy
+, openpyxl
+, opentsne
+, orange-canvas-core
+, orange-widget-base
+, pandas
+, pyqtgraph
+, pyqtwebengine
+, python-louvain
+, pyyaml
+, qt5
+, qtconsole
+, requests
+, scikit-learn
+, scipy
+, sphinx
+, serverfiles
+, xlrd
+, xlsxwriter
+}:
+
+let
+self = buildPythonPackage rec {
+    pname = "orange3";
+    version = "3.35.0";
+    format = "pyproject";
+
+    src = fetchFromGitHub {
+      owner = "biolab";
+      repo = "orange3";
+      rev = "refs/tags/${version}";
+      hash = "sha256-dj/Z4uOjA4nidd45dnHZDyHZP6Fy/MGC8asqOPV7U7A=";
+    };
+
+    postPatch = ''
+      sed -i 's;\(scikit-learn\)[^$]*;\1;g' requirements-core.txt
+      sed -i 's;pyqtgraph[^$]*;;g' requirements-gui.txt # TODO: remove after bump with a version greater than 0.13.1
+    '';
+
+    nativeBuildInputs = [
+      copyDesktopItems
+      cython
+      qt5.wrapQtAppsHook
+      sphinx
+    ];
+
+    enableParallelBuilding = true;
+
+    propagatedBuildInputs = [
+      numpy
+      scipy
+      chardet
+      openpyxl
+      opentsne
+      qtconsole
+      bottleneck
+      matplotlib
+      joblib
+      requests
+      keyring
+      scikit-learn
+      pandas
+      pyqtwebengine
+      serverfiles
+      orange-canvas-core
+      python-louvain
+      xlrd
+      xlsxwriter
+      httpx
+      pyqtgraph
+      orange-widget-base
+      keyrings-alt
+      pyyaml
+      baycomp
+    ];
+
+    # FIXME: ImportError: cannot import name '_variable' from partially initialized module 'Orange.data' (most likely due to a circular import) (/build/source/Orange/data/__init__.py)
+    doCheck = false;
+
+    pythonImportsCheck = [ "Orange" "Orange.data._variable" ];
+
+    desktopItems = [
+      (makeDesktopItem {
+        name = "orange";
+        exec = "orange-canvas";
+        desktopName = "Orange Data Mining";
+        genericName = "Data Mining Suite";
+        comment = "Explore, analyze, and visualize your data";
+        icon = "orange-canvas";
+        mimeTypes = [ "application/x-extension-ows" ];
+        categories = [ "Science" "Education" "ArtificialIntelligence" "DataVisualization" "NumericalAnalysis" "Qt" ];
+        keywords = [ "Machine Learning" "Scientific Visualization" "Statistical Analysis" ];
+      })
+    ];
+
+    postInstall = ''
+      wrapProgram $out/bin/orange-canvas \
+        "${"$"}{qtWrapperArgs[@]}"
+      mkdir -p $out/share/icons/hicolor/{256x256,48x48}/apps
+      cp distribute/icon-256.png $out/share/icons/hicolor/256x256/apps/orange-canvas.png
+      cp distribute/icon-48.png $out/share/icons/hicolor/48x48/apps/orange-canvas.png
+    '';
+
+    passthru = {
+      updateScript = nix-update-script { };
+      tests.unittests = self.overridePythonAttrs (old: {
+        pname = "${old.pname}-tests";
+        format = "other";
+
+        preCheck = ''
+          export HOME=$(mktemp -d)
+          export QT_PLUGIN_PATH="${qt5.qtbase.bin}/${qt5.qtbase.qtPluginPrefix}"
+          export QT_QPA_PLATFORM_PLUGIN_PATH="${qt5.qtbase.bin}/lib/qt-${qt5.qtbase.version}/plugins";
+          export QT_QPA_PLATFORM=offscreen
+
+          rm Orange -rf
+          cp -r ${self}/${python.sitePackages}/Orange .
+          chmod +w -R .
+
+          rm Orange/tests/test_url_reader.py # uses network
+          rm Orange/tests/test_ada_boost.py # broken: The 'base_estimator' parameter of AdaBoostRegressor must be an object implementing 'fit' and 'predict' or a str among {'deprecated'}. Got None instead.
+        '';
+
+        checkPhase = ''
+          runHook preCheck
+          ${python.interpreter} -m unittest -b -v ./Orange/**/test*.py
+          runHook postCheck
+        '';
+
+        postInstall = "";
+
+        doBuild = false;
+        doInstall = false;
+
+        nativeBuildInputs = [ self ] ++ old.nativeBuildInputs;
+      });
+    };
+
+    meta = {
+      mainProgram = "orange-canvas";
+      description = "Data mining and visualization toolbox for novice and expert alike";
+      homepage = "https://orangedatamining.com/";
+      license = [ lib.licenses.gpl3Plus ];
+      maintainers = [ lib.maintainers.lucasew ];
+    };
+  };
+in self

pkgs/development/python-modules/pylitterbot/default.nix

@@ -15,7 +15,7 @@
 
 buildPythonPackage rec {
   pname = "pylitterbot";
-  version = "2023.4.5";
+  version = "2023.4.6";
   format = "pyproject";
 
   disabled = pythonOlder "3.9";
@@ -24,7 +24,7 @@ buildPythonPackage rec {
     owner = "natekspencer";
     repo = pname;
     rev = "refs/tags/v${version}";
-    hash = "sha256-e3k4L/lY8yszqYmJCaZghtv1nrmTi+WyWuzYuHSXM08=";
+    hash = "sha256-vrdKpdA+GX1DQaNx/hYs+YSy3UQIov0aPCs7eXppi7c=";
   };
 
   nativeBuildInputs = [

pkgs/development/python-modules/qasync/default.nix

@@ -0,0 +1,39 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, pyqt5
+, pytestCheckHook
+}:
+
+buildPythonPackage rec {
+  pname = "qasync";
+  version = "0.24.1";
+
+  src = fetchFromGitHub {
+    owner = "CabbageDevelopment";
+    repo = pname;
+    rev = "refs/tags/v${version}";
+    hash = "sha256-DAzmobw+c29Pt/URGO3bWXHBxgu9bDHhdTUBE9QJDe4=";
+  };
+
+  postPatch = ''
+    rm qasync/_windows.py # Ignoring it is not taking effect and it will not be used on Linux
+  '';
+
+  propagatedBuildInputs = [ pyqt5 ];
+
+  checkInputs = [ pytestCheckHook ];
+
+  pythonImportsCheck = [ "qasync" ];
+
+  disabledTestPaths = [
+    "tests/test_qeventloop.py"
+  ];
+
+  meta = {
+    description = "Allows coroutines to be used in PyQt/PySide applications by providing an implementation of the PEP 3156 event-loop";
+    homepage = "https://github.com/CabbageDevelopment/qasync";
+    license = [ lib.licenses.bsd2 ];
+    maintainers = [ lib.maintainers.lucasew ];
+  };
+}

pkgs/development/python-modules/serverfiles/default.nix

@@ -0,0 +1,28 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, requests
+, unittestCheckHook
+}:
+
+buildPythonPackage rec {
+  pname = "serverfiles";
+  version = "0.3.1";
+
+  src = fetchPypi {
+    inherit pname version;
+    hash = "sha256-XhD8MudYeR43NbwIvOLtRwKoOx5Fq5bF1ZzIruz76+E=";
+  };
+
+  propagatedBuildInputs = [ requests ];
+
+  pythonImportsCheck = [ "serverfiles" ];
+  nativeCheckInputs = [ unittestCheckHook ];
+
+  meta = {
+    description = "An utility that accesses files on a HTTP server and stores them locally for reuse";
+    homepage = "https://github.com/biolab/serverfiles";
+    license = [ lib.licenses.gpl3Plus ];
+    maintainers = [ lib.maintainers.lucasew ];
+  };
+}

pkgs/development/python-modules/whitenoise/default.nix

@@ -11,7 +11,7 @@
 
 buildPythonPackage rec {
   pname = "whitenoise";
-  version = "6.4.0";
+  version = "6.5.0";
   format = "pyproject";
 
   disabled = pythonOlder "3.7";
@@ -22,7 +22,7 @@ buildPythonPackage rec {
     owner = "evansd";
     repo = pname;
     rev = "refs/tags/${version}";
-    hash = "sha256-ouEoqMcNh3Vwahwaq6bGQuVUFViVN14CDJosDXC5ozI=";
+    hash = "sha256-g1D0tjGsAP3y1fWvODWwNvxnTSZJuTpyZ0Otk83Oq9E=";
   };
 
   nativeBuildInputs = [
@@ -57,7 +57,7 @@ buildPythonPackage rec {
 
   meta = with lib; {
     description = "Library to serve static file for WSGI applications";
-    homepage = "https://whitenoise.evans.io/";
+    homepage = "https://whitenoise.readthedocs.io/";
     changelog = "https://github.com/evansd/whitenoise/blob/${version}/docs/changelog.rst";
     license = licenses.mit;
     maintainers = with maintainers; [ ];

pkgs/development/tools/language-servers/pylyzer/default.nix

@@ -12,16 +12,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "pylyzer";
-  version = "0.0.40";
+  version = "0.0.41";
 
   src = fetchFromGitHub {
     owner = "mtshiba";
     repo = "pylyzer";
     rev = "v${version}";
-    hash = "sha256-HMu5DrzlHbNynjKdDxmN7Uzb+grsPQLv2ycOjT7vid0=";
+    hash = "sha256-8pDHCu0cmBDkMc5epVTT1JSKd9dbLsRk3ZyqBM5QJwc=";
   };
 
-  cargoHash = "sha256-3q7vNjcrKGE4y+w/9iezJWWHdewWKjRgeP2/Pza8CqM=";
+  cargoHash = "sha256-1eAxl9eO6SOTVT4e+kinsDPd2LFmF9+SflUJaFEJE6g=";
 
   nativeBuildInputs = [
     git

pkgs/development/tools/language-servers/rune-languageserver/default.nix

@@ -0,0 +1,35 @@
+{ lib
+, rustPlatform
+, fetchCrate
+, stdenv
+, darwin
+}:
+
+rustPlatform.buildRustPackage rec {
+  pname = "rune-languageserver";
+  version = "0.12.4";
+
+  src = fetchCrate {
+    inherit pname version;
+    hash = "sha256-KVNof5s3hiCabsoypwS22FMyJIPF9aU8HNqVKPNo7Fk=";
+  };
+
+  cargoHash = "sha256-HiydWqOHz4LJJwJTclRlQfOphE1W03HTMjCtqr1XnJs=";
+
+  buildInputs = lib.optionals stdenv.isDarwin [
+    darwin.apple_sdk.frameworks.Security
+  ];
+
+  env = {
+    RUNE_VERSION = version;
+  };
+
+  meta = with lib; {
+    description = "A language server for the Rune Language, an embeddable dynamic programming language for Rust";
+    homepage = "https://crates.io/crates/rune-languageserver";
+    changelog = "https://github.com/rune-rs/rune/releases/tag/${version}";
+    license = with licenses; [ asl20 mit ];
+    maintainers = with maintainers; [ figsoda ];
+    mainProgram = "rune-languageserver";
+  };
+}

pkgs/os-specific/linux/kernel/linux-testing.nix

@@ -3,7 +3,7 @@
 with lib;
 
 buildLinux (args // rec {
-  version = "6.5-rc5";
+  version = "6.5-rc7";
   extraMeta.branch = lib.versions.majorMinor version;
 
   # modDirVersion needs to be x.y.z, will always add .0
@@ -11,7 +11,7 @@ buildLinux (args // rec {
 
   src = fetchzip {
     url = "https://git.kernel.org/torvalds/t/linux-${version}.tar.gz";
-    hash = "sha256-7QNXBuk1jMCdUFWeu5P0j1nwL5PQgBFhlFYbKzj/k6E=";
+    hash = "sha256-5rIcyXN54o9P+RxHZkI/BTO2Ox6uJ0Fi9NVcrN1HczQ=";
   };
 
   # Should the testing kernels ever be built on Hydra?

pkgs/tools/admin/lego/default.nix

@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "lego";
-  version = "4.13.2";
+  version = "4.14.0";
 
   src = fetchFromGitHub {
     owner = "go-acme";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-nFRDA0EHV1i9mcl1i5WpfhTNseU9E9jmlPd1xFbkCaM=";
+    sha256 = "sha256-dIHyorypyaKIv0Jo+iAK25j7NabgmPtNC6eJVwCl0LQ=";
   };
 
-  vendorHash = "sha256-mjCxe4hCCIcjVDWVizqqqo6/kn8iS8s32urMtDD5yq4=";
+  vendorHash = "sha256-nAEPkikm98xbGQJzsB6YNXgpZVgR4AK/uCPwiQ25OYU=";
 
   doCheck = false;
 

pkgs/tools/package-management/nix-index/default.nix

@@ -4,32 +4,32 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "nix-index";
-  version = "0.1.6";
+  version = "0.1.7";
 
   src = fetchFromGitHub {
-    owner = "bennofs";
+    owner = "nix-community";
     repo = "nix-index";
     rev = "v${version}";
-    sha256 = "sha256-mdK63qRVvISRbRwfMel4SYucmBxR6RLbM4IFz3K3Pks=";
+    hash = "sha256-WPWd2aMuP4L17UDFz7SI6lqyrCzrPV8c88vGyO6r6jk=";
   };
 
-  cargoHash = "sha256-uIGxCaFj4x1Ck/D2xxOlosJaGSVbOKxbXAEAkkBxyaQ=";
+  cargoHash = "sha256-zZhQ3pOid7BCGzcyCrl6sDm0q6IEVKF7K+d6nVs9flk=";
 
   nativeBuildInputs = [ pkg-config ];
   buildInputs = [ openssl curl sqlite ]
     ++ lib.optional stdenv.isDarwin Security;
 
   postInstall = ''
-    mkdir -p $out/etc/profile.d
+    substituteInPlace command-not-found.sh \
-    cp ./command-not-found.sh $out/etc/profile.d/command-not-found.sh
+      --subst-var out
-    substituteInPlace $out/etc/profile.d/command-not-found.sh \
+    install -Dm555 command-not-found.sh -t $out/etc/profile.d
-      --replace "@out@" "$out"
   '';
 
   meta = with lib; {
     description = "A files database for nixpkgs";
-    homepage = "https://github.com/bennofs/nix-index";
+    homepage = "https://github.com/nix-community/nix-index";
+    changelog = "https://github.com/nix-community/nix-index/blob/${src.rev}/CHANGELOG.md";
     license = with licenses; [ bsd3 ];
-    maintainers = with maintainers; [ bennofs ncfavier ];
+    maintainers = with maintainers; [ bennofs figsoda ncfavier ];
   };
 }

pkgs/tools/security/exploitdb/default.nix

@@ -6,13 +6,13 @@
 
 stdenv.mkDerivation rec {
   pname = "exploitdb";
-  version = "2023-08-22";
+  version = "2023-08-24";
 
   src = fetchFromGitLab {
     owner = "exploit-database";
     repo = pname;
     rev = "refs/tags/${version}";
-    hash = "sha256-FgisC2eOQ0sqy+dkUs9RZ6nJQROidEv15Hf1wUwcUPE=";
+    hash = "sha256-iL0RfcTOKQ3c3UErfAE0efi4HXJYHUP6RFcgDzeGJqU=";
   };
 
   nativeBuildInputs = [

pkgs/tools/security/tor/default.nix

@@ -30,11 +30,11 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "tor";
-  version = "0.4.7.14";
+  version = "0.4.8.4";
 
   src = fetchurl {
     url = "https://dist.torproject.org/${pname}-${version}.tar.gz";
-    sha256 = "sha256-paxn9kZjgPwF6AQ9AcWB5Oiisi/glDABNHPnEGXmXfg=";
+    sha256 = "sha256-CcHOdKJfw7SMgf8UbL0N1TjLu4/k4pZPwvsrGS9qHSs=";
   };
 
   outputs = [ "out" "geoip" ];

pkgs/tools/system/acpica-tools/default.nix

@@ -7,11 +7,11 @@
 
 stdenv.mkDerivation rec {
   pname = "acpica-tools";
-  version = "20230331";
+  version = "20230628";
 
   src = fetchurl {
-    url = "https://acpica.org/sites/acpica/files/acpica-unix-${version}.tar.gz";
+    url = "https://downloadmirror.intel.com/783534/acpica-unix-${version}.tar.gz";
-    hash = "sha256-DF1pXWBaqmFwnzxj9XoambiQIpFyOZhEawgTtXrDEOI=";
+    hash = "sha256-hodqdF49Ik3P0iLtPeRltHVZ6FgR3y25gg7wmp3/XM4=";
   };
 
   nativeBuildInputs = [ bison flex ];
@@ -51,7 +51,7 @@ stdenv.mkDerivation rec {
     homepage = "https://www.acpica.org/";
     description = "ACPICA Tools";
     license = with licenses; [ iasl gpl2Only bsd3 ];
-    maintainers = with maintainers; [ tadfisher ];
+    maintainers = with maintainers; [ delroth tadfisher ];
     platforms = platforms.linux ++ platforms.darwin;
   };
 }

pkgs/top-level/all-packages.nix

@@ -12829,6 +12829,8 @@ with pkgs;
 
   safe-rm = callPackage ../tools/system/safe-rm { };
 
+  safecloset = callPackage ../applications/misc/safecloset { };
+
   safeeyes = callPackage ../applications/misc/safeeyes { };
 
   sagoin = callPackage ../tools/misc/sagoin { };
@@ -18480,6 +18482,8 @@ with pkgs;
 
   ruff-lsp = python3Packages.callPackage ../development/tools/language-servers/ruff-lsp { };
 
+  rune-languageserver = callPackage ../development/tools/language-servers/rune-languageserver { };
+
   svls = callPackage ../development/tools/language-servers/svls { };
 
   typst-lsp = callPackage ../development/tools/language-servers/typst-lsp { };

pkgs/top-level/python-packages.nix

@@ -532,6 +532,8 @@ self: super: with self; {
 
   ansible-kernel = callPackage ../development/python-modules/ansible-kernel { };
 
+  ansible-pylibssh = callPackage ../development/python-modules/ansible-pylibssh { };
+
   ansible-runner = callPackage ../development/python-modules/ansible-runner { };
 
   ansible-vault-rw = callPackage ../development/python-modules/ansible-vault-rw { };
@@ -562,6 +564,8 @@ self: super: with self; {
 
   anyio = callPackage ../development/python-modules/anyio { };
 
+  anyqt = callPackage ../development/python-modules/anyqt { };
+
   anytree = callPackage ../development/python-modules/anytree {
     inherit (pkgs) graphviz;
   };
@@ -1283,6 +1287,8 @@ self: super: with self; {
 
   batinfo = callPackage ../development/python-modules/batinfo { };
 
+  baycomp = callPackage ../development/python-modules/baycomp { };
+
   bayesian-optimization = callPackage ../development/python-modules/bayesian-optimization { };
 
   bayespy = callPackage ../development/python-modules/bayespy { };
@@ -3542,6 +3548,8 @@ self: super: with self; {
 
   exifread = callPackage ../development/python-modules/exifread { };
 
+  expandvars = callPackage ../development/python-modules/expandvars { };
+
   expects = callPackage ../development/python-modules/expects { };
 
   expecttest = callPackage ../development/python-modules/expecttest { };
@@ -7558,6 +7566,8 @@ self: super: with self; {
 
   opentracing = callPackage ../development/python-modules/opentracing { };
 
+  opentsne = callPackage ../development/python-modules/opentsne { };
+
   openvino = callPackage ../development/python-modules/openvino {
     openvino-native = pkgs.openvino.override {
       inherit python;
@@ -7590,6 +7600,12 @@ self: super: with self; {
 
   oralb-ble = callPackage ../development/python-modules/oralb-ble { };
 
+  orange3 = callPackage ../development/python-modules/orange3 { };
+
+  orange-canvas-core = callPackage ../development/python-modules/orange-canvas-core { };
+
+  orange-widget-base = callPackage ../development/python-modules/orange-widget-base { };
+
   orderedmultidict = callPackage ../development/python-modules/orderedmultidict { };
 
   ordered-set = callPackage ../development/python-modules/ordered-set { };
@@ -10778,6 +10794,8 @@ self: super: with self; {
 
   qbittorrent-api = callPackage ../development/python-modules/qbittorrent-api { };
 
+  qasync = callPackage ../development/python-modules/qasync { };
+
   qcelemental = callPackage ../development/python-modules/qcelemental { };
 
   qcengine = callPackage ../development/python-modules/qcengine { };
@@ -11602,6 +11620,8 @@ self: super: with self; {
 
   servefile = callPackage ../development/python-modules/servefile { };
 
+  serverfiles = callPackage ../development/python-modules/serverfiles { };
+
   serverlessrepo = callPackage ../development/python-modules/serverlessrepo { };
 
   service-identity = callPackage ../development/python-modules/service-identity { };