Merge master into staging-next

doc/languages-frameworks/lua.section.md

@@ -179,7 +179,7 @@ Each interpreter has the following attributes:
 
 #### `buildLuarocksPackage` function {#buildluarockspackage-function}
 
-The `buildLuarocksPackage` function is implemented in `pkgs/development/interpreters/lua-5/build-lua-package.nix`
+The `buildLuarocksPackage` function is implemented in `pkgs/development/interpreters/lua-5/build-luarocks-package.nix`
 The following is an example:
 ```nix
 luaposix = buildLuarocksPackage {

pkgs/applications/networking/browsers/vivaldi/default.nix

@@ -23,7 +23,7 @@ let
   vivaldiName = if isSnapshot then "vivaldi-snapshot" else "vivaldi";
 in stdenv.mkDerivation rec {
   pname = "vivaldi";
-  version = "6.0.2979.22";
+  version = "6.1.3035.111";
 
   suffix = {
     aarch64-linux = "arm64";
@@ -33,8 +33,8 @@ in stdenv.mkDerivation rec {
   src = fetchurl {
     url = "https://downloads.vivaldi.com/${branch}/vivaldi-${branch}_${version}-1_${suffix}.deb";
     hash = {
-      aarch64-linux = "sha256-x7wBbd7BdurnWGFeHD5kYb5t0/zGEXQaUwbHnNA4iME=";
-      x86_64-linux = "sha256-uN2nBWlullxpOZP2PzVCwKcNmO9XmDS3WiFOcp0dOqg=";
+      aarch64-linux = "sha256-0bUe1Rn3pi08SaUxg+PXRXFD8V/TGVh40hkWSKvalhc=";
+      x86_64-linux = "sha256-be+dKBxfDLitqstg3mZbwL4bYo4De7rIWp8+k99+a2o=";
     }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
   };
 

pkgs/applications/networking/instant-messengers/psi-plus/default.nix

@@ -43,13 +43,13 @@ assert enablePsiMedia -> enablePlugins;
 
 mkDerivation rec {
   pname = "psi-plus";
-  version = "1.5.1646";
+  version = "1.5.1650";
 
   src = fetchFromGitHub {
     owner = "psi-plus";
     repo = "psi-plus-snapshots";
     rev = version;
-    sha256 = "sha256-FeZlJAJHmNGd7hbpjmthe2/yGxh0zIl3zXnA+vRjNCM=";
+    sha256 = "sha256-qoqusg2CbivoPFbYnBSzE5P5+p1vCKmMbSBrPdC6SqI=";
   };
 
   cmakeFlags = [

pkgs/applications/networking/remote/citrix-workspace/generic.nix

@@ -3,7 +3,7 @@
 , heimdal, krb5, libsoup, libvorbis, speex, openssl, zlib, xorg, pango, gtk2
 , gnome2, mesa, nss, nspr, gtk_engines, freetype, dconf, libpng12, libxml2
 , libjpeg, libredirect, tzdata, cacert, systemd, libcxxabi, libcxx, e2fsprogs, symlinkJoin
-, libpulseaudio, pcsclite, glib-networking, llvmPackages_12
+, libpulseaudio, pcsclite, glib-networking, llvmPackages_12, opencv4
 
 , homepage, version, prefix, hash
 
@@ -82,12 +82,15 @@ stdenv.mkDerivation rec {
     libcxxabi
     libjpeg
     libpng12
+    libpulseaudio
     libsoup
     libvorbis
     libxml2
+    llvmPackages_12.libunwind
     mesa
     nspr
     nss
+    opencv4
     openssl'
     pango
     speex
@@ -98,9 +101,7 @@ stdenv.mkDerivation rec {
     xorg.libXScrnSaver
     xorg.libXtst
     zlib
-  ] ++ lib.optional (lib.versionOlder version "20.04") e2fsprogs
-    ++ lib.optional (lib.versionAtLeast version "20.10") libpulseaudio
-    ++ lib.optional (lib.versionAtLeast version "21.12") llvmPackages_12.libunwind;
+  ];
 
   runtimeDependencies = [
     glib
@@ -121,7 +122,7 @@ stdenv.mkDerivation rec {
   installPhase = let
     icaFlag = program:
       if (builtins.match "selfservice(.*)" program) != null then "--icaroot"
-      else if (lib.versionAtLeast version "21.12" && builtins.match "wfica(.*)" program != null) then null
+      else if (builtins.match "wfica(.*)" program != null) then null
       else "-icaroot";
     wrap = program: ''
       wrapProgram $out/opt/citrix-icaclient/${program} \
@@ -142,8 +143,7 @@ stdenv.mkDerivation rec {
 
     mkWrappers = lib.concatMapStringsSep "\n";
 
-    toWrap = [ "wfica" "selfservice" "util/configmgr" "util/conncenter" "util/ctx_rehash" ]
-      ++ lib.optional (lib.versionOlder version "20.06") "selfservice_old";
+    toWrap = [ "wfica" "selfservice" "util/configmgr" "util/conncenter" "util/ctx_rehash" ];
   in ''
     runHook preInstall
 
@@ -198,6 +198,14 @@ stdenv.mkDerivation rec {
   # Make sure that `autoPatchelfHook` is executed before
   # running `ctx_rehash`.
   dontAutoPatchelf = true;
+  preFixup = ''
+    find $out/opt/citrix-icaclient/lib -name "libopencv_imgcodecs.so.*" | while read -r fname; do
+      # lib needs libtiff.so.5, but nixpkgs provides libtiff.so.6
+      patchelf --replace-needed libtiff.so.5 libtiff.so $fname
+      # lib needs libjpeg.so.8, but nixpkgs provides libjpeg.so.9
+      patchelf --replace-needed libjpeg.so.8 libjpeg.so $fname
+    done
+  '';
   postFixup = ''
     autoPatchelf -- "$out"
     $out/opt/citrix-icaclient/util/ctx_rehash

pkgs/applications/networking/remote/citrix-workspace/sources.nix

@@ -22,8 +22,20 @@ let
       x86hash   = "39228fc8dd69adca4e56991c1ebc0832fec183c3ab5abd2d65c66b39b634391b";
       x64suffix = "10";
       x86suffix = "10";
+      homepage  = "https://www.citrix.com/downloads/workspace-app/legacy-workspace-app-for-linux/workspace-app-for-linux-latest6.html";
+    };
+
+    "23.07.0" = {
+      major     = "23";
+      minor     = "7";
+      patch     = "0";
+      x64hash   = "d4001226e79b5353fc74da4c8ed4f6295c1859fe18142cb5de345a3c7ae48168";
+      x86hash   = "4a7da238286ae28d7baf0fefa1e7e09d077c8bc56c2bf7bec00da42c331bee59";
+      x64suffix = "17";
+      x86suffix = "17";
       homepage  = "https://www.citrix.com/downloads/workspace-app/linux/workspace-app-for-linux-latest.html";
     };
+
   };
 
   # Retain attribute-names for abandoned versions of Citrix workspace to

pkgs/applications/science/logic/tlaplus/tlaplus18.nix

@@ -0,0 +1,39 @@
+{ lib, stdenv, fetchurl, makeWrapper, jre }:
+
+stdenv.mkDerivation rec {
+  pname = "tlaplus";
+  version = "1.8.0";
+
+  src = fetchurl {
+    url = "https://github.com/tlaplus/tlaplus/releases/download/v${version}/tla2tools.jar";
+    sha256 = "sha256-OXgpd1xuyvhveunlybBi/N6jnxtp/J8Kmp8PYX3eSZ4=";
+  };
+
+  nativeBuildInputs = [ makeWrapper ];
+
+  dontUnpack = true;
+  installPhase = ''
+    mkdir -p $out/share/java $out/bin
+    cp $src $out/share/java/tla2tools.jar
+
+    makeWrapper ${jre}/bin/java $out/bin/tlc \
+      --add-flags "-XX:+UseParallelGC -cp $out/share/java/tla2tools.jar tlc2.TLC"
+    makeWrapper ${jre}/bin/java $out/bin/tlasany \
+      --add-flags "-XX:+UseParallelGC -cp $out/share/java/tla2tools.jar tla2sany.SANY"
+    makeWrapper ${jre}/bin/java $out/bin/pcal \
+      --add-flags "-XX:+UseParallelGC -cp $out/share/java/tla2tools.jar pcal.trans"
+    makeWrapper ${jre}/bin/java $out/bin/tlatex \
+      --add-flags "-XX:+UseParallelGC -cp $out/share/java/tla2tools.jar tla2tex.TLA"
+    makeWrapper ${jre}/bin/java $out/bin/tlarepl \
+      --add-flags "-XX:+UseParallelGC -cp $out/share/java/tla2tools.jar tlc2.REPL"
+  '';
+
+  meta = {
+    description = "An algorithm specification language with model checking tools";
+    homepage    = "http://lamport.azurewebsites.net/tla/tla.html";
+    sourceProvenance = with lib.sourceTypes; [ binaryBytecode ];
+    license     = lib.licenses.mit;
+    platforms   = lib.platforms.unix;
+    maintainers = with lib.maintainers; [ florentc thoughtpolice mgregson ];
+  };
+}

pkgs/applications/video/iina/default.nix

@@ -2,6 +2,7 @@
 , fetchurl
 , stdenv
 , undmg
+, nix-update-script
 }:
 
 stdenv.mkDerivation rec {
@@ -10,7 +11,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "https://github.com/iina/iina/releases/download/v${version}/IINA.v${version}.dmg";
-    hash = "sha256-yieAcMc3rqoURsAcc8iAbe1pohlAU3r76FsgUeiNTP8=";
+    hash = "sha256-rF5yv2QHWVUUsyf/u78jWRn4C629GBJgB/i8YnaKHBk=";
   };
 
   nativeBuildInputs = [ undmg ];
@@ -22,11 +23,13 @@ stdenv.mkDerivation rec {
     cp -R . "$out/Applications/IINA.app"
   '';
 
+  passthru.updateScript = nix-update-script { };
+
   meta = with lib; {
     homepage = "https://iina.io/";
     description = "The modern media player for macOS";
     platforms = platforms.darwin;
     license = licenses.gpl3;
-    maintainers = with maintainers; [ arkivm ];
+    maintainers = with maintainers; [ arkivm stepbrobd ];
   };
 }

pkgs/applications/virtualization/virter/default.nix

@@ -0,0 +1,36 @@
+{ lib
+, buildGoModule
+, fetchFromGitHub
+}:
+
+buildGoModule rec {
+  pname = "virter";
+  version = "0.25.0";
+
+  src = fetchFromGitHub {
+    owner = "LINBIT";
+    repo = "virter";
+    rev = "v${version}";
+    hash = "sha256-NIZBaPYFFH3MG2M7rF39TW8sLVR44SA37ZU3gOPwAFU=";
+  };
+
+  vendorHash = "sha256-cVOxRrsDdtlDSJ3WRDNk8nqt7ztz4GSRIf6FDDBxvPc=";
+
+  ldflags = [
+    "-s"
+    "-w"
+    "-X github.com/LINBIT/virter/cmd.version=${version}"
+    "-X github.com/LINBIT/virter/cmd.builddate=builtByNix"
+    "-X github.com/LINBIT/virter/cmd.githash=builtByNix"
+  ];
+
+  # requires network access
+  doCheck = false;
+
+  meta = {
+    description = "A command line tool for simple creation and cloning of virtual machines based on libvirt";
+    homepage = "https://github.com/LINBIT/virter";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ dit7ya ];
+  };
+}

pkgs/development/libraries/hwloc/default.nix

@@ -8,11 +8,11 @@
 
 stdenv.mkDerivation rec {
   pname = "hwloc";
-  version = "2.9.1";
+  version = "2.9.2";
 
   src = fetchurl {
     url = "https://www.open-mpi.org/software/hwloc/v${lib.versions.majorMinor version}/downloads/hwloc-${version}.tar.bz2";
-    sha256 = "sha256-fMSTGiD+9Ffgkzrz83W+bq+ncD/eIeE3v7loWxQJWZ4=";
+    sha256 = "sha256-Cof99nf4sAtWfSKbYyC/ayXGk+2qQ+C4UmjZmdawYM8=";
   };
 
   configureFlags = [

pkgs/development/php-packages/psalm/default.nix

@@ -2,14 +2,14 @@
 
 let
   pname = "psalm";
-  version = "5.9.0";
+  version = "5.13.1";
 in
 mkDerivation {
   inherit pname version;
 
   src = fetchurl {
     url = "https://github.com/vimeo/psalm/releases/download/${version}/psalm.phar";
-    sha256 = "sha256-56vLT/t+3f5ZyH1pFmgy4vtSMQcDYLQZIF/iIkwd2vM=";
+    sha256 = "sha256-kMNL44Ma0A3RBYxLUGl6kXvOppZ8FKt2ETb2ZaqsOsY=";
   };
 
   dontUnpack = true;

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

@@ -0,0 +1,40 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, pythonOlder
+}:
+
+let
+  pname = "boilerpy3";
+  version = "1.0.6";
+in
+buildPythonPackage {
+  inherit pname version;
+  format = "setuptools";
+
+  disabled = pythonOlder "3.6";
+
+  src = fetchFromGitHub {
+    owner = "jmriebold";
+    repo = "BoilerPy3";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-hl2+XpSvVaHpq9RGMnSzWHCA8TtBQnYwDtEOia1Rl/A=";
+  };
+
+  postPatch = ''
+    # the version mangling in mautrix_signal/get_version.py interacts badly with pythonRelaxDepsHook
+    substituteInPlace setup.py \
+      --replace '>=3.6.*' '>=3.6'
+  '';
+
+
+  pythonImportsCheck = [ "boilerpy3" ];
+
+  meta = with lib; {
+    homepage = "https://github.com/jmriebold/BoilerPy3";
+    description = "Python port of Boilerpipe library";
+    changelog = "https://github.com/jmriebold/BoilerPy3/releases/tag/v${version}";
+    license = licenses.asl20;
+    maintainers = with maintainers; [ happysalada ];
+  };
+}

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

@@ -0,0 +1,68 @@
+{ lib
+, stdenv
+, buildPythonPackage
+, fetchFromGitHub
+, pythonOlder
+# build inputs
+, tqdm
+, portalocker
+, boto3
+# check inputs
+, pytestCheckHook
+, torch
+}:
+let
+  pname = "iopath";
+  version = "0.1.9";
+in
+buildPythonPackage {
+  inherit pname version;
+  format = "setuptools";
+
+  disabled = pythonOlder "3.10";
+
+  src = fetchFromGitHub {
+    owner = "facebookresearch";
+    repo = "iopath";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-Qubf/mWKMgYz9IVoptMZrwy4lQKsNGgdqpJB1j/u5s8=";
+  };
+
+  propagatedBuildInputs = [
+    tqdm
+    portalocker
+  ];
+
+  nativeCheckInputs = [
+    pytestCheckHook
+    torch
+  ];
+
+  disabledTests = [
+    # requires network access
+    "test_download"
+    "test_bad_args"
+  ];
+
+  disabledTestPaths = [
+    # flakey
+    "tests/async_torch_test.py"
+    "tests/async_writes_test.py"
+  ];
+
+  pythonImportsCheck = [
+    "iopath"
+  ];
+
+  passthru.optional-dependencies = {
+    aws = [ boto3 ];
+  };
+
+  meta = with lib; {
+    description = "A python library that provides common I/O interface across different storage backends.";
+    homepage = "https://github.com/facebookresearch/iopath";
+    changelog = "https://github.com/facebookresearch/iopath/releases/tag/v${version}";
+    license = licenses.mit;
+    maintainers = with maintainers; [ happysalada ];
+  };
+}

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

@@ -0,0 +1,39 @@
+{ lib
+, stdenv
+, buildPythonPackage
+, fetchFromGitHub
+, pytestCheckHook
+, packaging
+}:
+let
+  pname = "lazy_imports";
+  version = "0.3.1";
+in
+buildPythonPackage {
+  inherit pname version;
+  format = "setuptools";
+
+  src = fetchFromGitHub {
+    owner = "telekom";
+    repo = "lazy-imports";
+    rev = "refs/tags/${version}";
+    hash = "sha256-i+VPlBoxNqk56U4oiEgS1Ayhi1t2O8PtLZ/bzEurUY8=";
+  };
+
+  pythonImportsCheck = [
+    "lazy_imports"
+  ];
+
+  nativeCheckInputs = [
+    pytestCheckHook
+    packaging
+  ];
+
+  meta = with lib; {
+    description = "Python tool to support lazy imports.";
+    homepage = "https://github.com/telekom/lazy-imports";
+    changelog = "https://github.com/telekom/lazy-imports/releases/tag/${version}";
+    license = licenses.asl20;
+    maintainers = with maintainers; [ happysalada ];
+  };
+}

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

@@ -0,0 +1,61 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, pythonOlder
+# build inputs
+, jupyter-client
+, nbformat
+, nbconvert
+# check inputs
+, unittestCheckHook
+, ipykernel
+}:
+let
+  pname = "nbexec";
+  version = "0.2.0";
+in
+buildPythonPackage {
+  inherit pname version;
+  format = "setuptools";
+
+  disabled = pythonOlder "3.9";
+
+  src = fetchFromGitHub {
+    owner = "jsvine";
+    repo = "nbexec";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-Vv6EHX6WlnSmzQAYlO1mHnz5t078z3RQfVfte1+X2pw=";
+  };
+
+  propagatedBuildInputs = [
+    jupyter-client
+    nbformat
+    nbconvert
+  ];
+
+  # TODO there is a warning about debugpy_stream missing
+  nativeCheckInputs = [
+    unittestCheckHook
+    ipykernel
+  ];
+
+  preCheck = ''
+    export HOME=$(mktemp -d)
+  '';
+
+  unittestFlagsArray = [
+    "-s" "test" "-v"
+  ];
+
+  pythonImportsCheck = [
+    "nbexec"
+  ];
+
+  meta = with lib; {
+    description = "A dead-simple tool for executing Jupyter notebooks from the command line.";
+    homepage = "https://github.com/jsvine/nbexec";
+    changelog = "https://github.com/jsvine/nbexec/releases/tag/v${version}";
+    license = licenses.mit;
+    maintainers = with maintainers; [ happysalada ];
+  };
+}

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

@@ -0,0 +1,82 @@
+{ lib
+, stdenv
+, buildPythonPackage
+, fetchFromGitHub
+, pythonOlder
+# build inputs
+, pdfminer-six
+, pillow
+, wand
+# check inputs
+, pytestCheckHook
+, pytest-cov
+, pytest-parallel
+, flake8
+, black
+, isort
+, pandas
+, mypy
+, pandas-stubs
+, types-pillow
+, jupyterlab
+, nbexec
+}:
+let
+  pname = "pdfplumber";
+  version = "0.9.0";
+in
+buildPythonPackage {
+  inherit pname version;
+  format = "setuptools";
+
+  disabled = pythonOlder "3.7";
+
+  src = fetchFromGitHub {
+    owner = "jsvine";
+    repo = "pdfplumber";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-cGTn1JTSp1YvksemjlvvToZcVauZ7GKINiNmG5f4zKg=";
+  };
+
+  propagatedBuildInputs = [
+    pdfminer-six
+    pillow
+    wand
+  ];
+
+  preCheck = ''
+    export HOME=$(mktemp -d)
+  '';
+
+  nativeCheckInputs = [
+    pytestCheckHook
+    pytest-cov
+    pytest-parallel
+    flake8
+    black
+    isort
+    pandas
+    mypy
+    pandas-stubs
+    types-pillow
+    jupyterlab
+    nbexec
+  ];
+
+  pythonImportsCheck = [
+    "pdfplumber"
+  ];
+
+  disabledTests = [
+    # flaky
+    "test__repr_png_"
+  ];
+
+  meta = with lib; {
+    description = "Plumb a PDF for detailed information about each char, rectangle, line, et cetera — and easily extract text and tables.";
+    homepage = "https://github.com/jsvine/pdfplumber";
+    changelog = "https://github.com/jsvine/pdfplumber/releases/tag/v${version}";
+    license = licenses.mit;
+    maintainers = with maintainers; [ happysalada ];
+  };
+}

pkgs/development/python-modules/prompthub-py/default.nix

@@ -0,0 +1,43 @@
+{ lib
+, buildPythonPackage
+, pythonOlder
+, fetchFromGitHub
+, poetry-core
+, pyyaml
+, requests
+}:
+let
+  pname = "prompthub-py";
+  version = "4.0.0";
+in
+buildPythonPackage {
+  inherit version pname;
+  format = "pyproject";
+
+  # Pypi source package doesn't contain tests
+  src = fetchFromGitHub {
+    owner = "deepset-ai";
+    repo = pname;
+    rev = "v${version}";
+    hash = "sha256-FA4IfhHViSL1u4pgd7jh40rEcS0BldSFDwCPG5irk1g=";
+  };
+
+  disabled = pythonOlder "3.8";
+
+  nativeBuildInputs = [
+    poetry-core
+  ];
+
+  propagatedBuildInputs = [
+    pyyaml
+    requests
+  ];
+
+  meta = with lib; {
+    description = "A simple client to fetch prompts from Prompt Hub using its REST API.";
+    homepage = "https://github.com/deepset-ai/prompthub-py";
+    changelog = "https://github.com/deepset-ai/prompthub-py/releases/tag/v${version}";
+    license = licenses.asl20;
+    maintainers = with maintainers; [ happysalada ];
+  };
+}

pkgs/development/python-modules/pytest-parallel/default.nix

@@ -0,0 +1,41 @@
+{ lib
+, stdenv
+, buildPythonPackage
+, fetchFromGitHub
+, pythonOlder
+# build inputs
+, tblib
+, pytest
+, py
+}:
+let
+  pname = "pytest-parallel";
+  version = "0.1.1";
+in
+buildPythonPackage {
+  inherit pname version;
+  format = "setuptools";
+
+  disabled = pythonOlder "3.10";
+
+  src = fetchFromGitHub {
+    owner = "kevlened";
+    repo = pname;
+    rev = "refs/tags/${version}";
+    hash = "sha256-ddpoWBTf7Zor569p6uOMjHSTx3Qa551f4mSwyTLDdBU=";
+  };
+
+  propagatedBuildInputs = [
+    tblib
+    pytest
+    py
+  ];
+
+  meta = with lib; {
+    description = "A pytest plugin for parallel and concurrent testing";
+    homepage = "https://github.com/kevlened/pytest-parallelt";
+    changelog = "https://github.com/kevlened/pytest-parallel/releases/tag/${version}";
+    license = licenses.mit;
+    maintainers = with maintainers; [ happysalada ];
+  };
+}

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

@@ -12,14 +12,14 @@
 
 buildPythonPackage rec {
   pname = "pyvista";
-  version = "0.39.1";
+  version = "0.40.0";
   format = "setuptools";
 
   src = fetchFromGitHub {
     owner = pname;
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-N+1FfTKDITBmLaOjKZsahMd6s26W19ObcWXk8gGQ0QI=";
+    hash = "sha256-vZmZh/wD6Np/0ZxTm81Ai3zWZHrQ4qykDw/+xKBUUZg=";
   };
 
   propagatedBuildInputs = [

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

@@ -0,0 +1,53 @@
+{ lib
+, buildPythonPackage
+, pythonOlder
+, pythonAtLeast
+, fetchFromGitHub
+  # build inputs
+, inflect
+, num2words
+, numpy
+, scipy
+, scikit-learn
+, joblib
+, wikipedia
+, stemming
+}:
+let
+  pname = "quantulum3";
+  version = "0.9.0";
+in
+buildPythonPackage {
+  inherit version pname;
+  format = "pyproject";
+
+  # Pypi source package doesn't contain tests
+  src = fetchFromGitHub {
+    owner = "nielstron";
+    repo = pname;
+    rev = "9dafd76d3586aa5ea1b96164d86c73037e827294";
+    hash = "sha256-fHztPeTbMp1aYsj+STYWzHgwdY0Q9078qXpXxtA8pPs=";
+  };
+
+  disabled = pythonOlder "3.7";
+
+  propagatedBuildInputs = [
+    inflect
+    num2words
+    numpy
+    scipy
+    scikit-learn
+    joblib
+    wikipedia
+    stemming
+  ];
+
+  pythonImportsCheck = [ "quantulum3" ];
+
+  meta = with lib; {
+    description = "Library for unit extraction - fork of quantulum for python3";
+    homepage = "https://github.com/nielstron/quantulum3";
+    license = licenses.mit;
+    maintainers = with maintainers; [ happysalada ];
+  };
+}

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

@@ -0,0 +1,43 @@
+{ lib
+, buildPythonPackage
+, pythonOlder
+, fetchFromGitHub
+, numpy
+}:
+let
+  pname = "rank_bm25";
+  version = "0.2.2";
+in
+buildPythonPackage {
+  inherit version pname;
+  format = "setuptools";
+
+  # Pypi source package doesn't contain tests
+  src = fetchFromGitHub {
+    owner = "dorianbrown";
+    repo = pname;
+    rev = version;
+    hash = "sha256-+BxQBflMm2AvCLAFFj52Jpkqn+KErwYXU1wztintgOg=";
+  };
+
+  disabled = pythonOlder "3.7";
+
+  postPatch = ''
+    # Upstream doesn't provide a PKG-INFO file
+    substituteInPlace setup.py --replace "get_version()" "'${version}'"
+  '';
+
+  propagatedBuildInputs = [
+    numpy
+  ];
+
+  pythonImportsCheck = [ "rank_bm25" ];
+
+  meta = with lib; {
+    description = "A Collection of BM25 Algorithms in Python";
+    homepage = "https://github.com/dorianbrown/rank_bm25";
+    changelog = "https://github.com/dorianbrown/rank_bm25/releases/tag/${version}";
+    license = licenses.asl20;
+    maintainers = with maintainers; [ happysalada ];
+  };
+}

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

@@ -0,0 +1,32 @@
+{ lib
+, buildPythonPackage
+, pythonOlder
+, fetchFromGitHub
+}:
+let
+  pname = "stemming";
+  version = "1.0.1";
+in
+buildPythonPackage {
+  inherit version pname;
+  format = "setuptools";
+
+  # Pypi source package doesn't contain tests
+  src = fetchFromGitHub {
+    owner = "nmstoker";
+    repo = pname;
+    rev = "477d0e354e79843f5ec241ba3603bcb5b843c3c4";
+    hash = "sha256-wnmBCbxnCZ9mN1J7sLcN7OynMcvqgAnhEgpAwW2/xz4=";
+  };
+
+  disabled = pythonOlder "3.7";
+
+  pythonImportsCheck = [ "stemming" ];
+
+  meta = with lib; {
+    description = "Python implementations of various stemming algorithms.";
+    homepage = "https://github.com/nmstoker/stemming";
+    license = licenses.unlicense;
+    maintainers = with maintainers; [ happysalada ];
+  };
+}

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

@@ -19,7 +19,7 @@
 
 buildPythonPackage rec {
   pname = "timetagger";
-  version = "23.6.1";
+  version = "23.7.1";
   format = "setuptools";
 
   disabled = pythonOlder "3.6";
@@ -28,7 +28,7 @@ buildPythonPackage rec {
     owner = "almarklein";
     repo = pname;
     rev = "refs/tags/v${version}";
-    hash = "sha256-WE/vsmIuRRqjZ1Hg/jiBfpCSlC8L+9t3psEhD7IFwgU=";
+    hash = "sha256-OLIjb5mFNNi0elPeXaPoK9V0fVw2Cnd7CHjPc1oGfyM=";
   };
 
   propagatedBuildInputs = [
@@ -59,6 +59,5 @@ buildPythonPackage rec {
     changelog = "https://github.com/almarklein/timetagger/releases/tag/v${version}";
     license = licenses.gpl3Only;
     maintainers = with maintainers; [ matthiasbeyer ];
-    broken = stdenv.isDarwin;
   };
 }

pkgs/development/python-modules/vallox-websocket-api/default.nix

@@ -11,7 +11,7 @@
 
 buildPythonPackage rec {
   pname = "vallox-websocket-api";
-  version = "3.2.1";
+  version = "3.3.0";
   format = "pyproject";
 
   disabled = pythonOlder "3.8";
@@ -20,7 +20,7 @@ buildPythonPackage rec {
     owner = "yozik04";
     repo = "vallox_websocket_api";
     rev = "refs/tags/${version}";
-    hash = "sha256-KtjyTSD7osIdThq/Ota4oCyeseBHxqaYaL47wiVicsI=";
+    hash = "sha256-wlkb6aa2UtqjrbNA26TUH+ZKvOM64An+lol+MCdQh3U=";
   };
 
   nativeBuildInputs = [

pkgs/development/python-modules/zigpy-znp/default.nix

@@ -16,7 +16,7 @@
 
 buildPythonPackage rec {
   pname = "zigpy-znp";
-  version = "0.11.2";
+  version = "0.11.3";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
@@ -25,7 +25,7 @@ buildPythonPackage rec {
     owner = "zigpy";
     repo = pname;
     rev = "refs/tags/v${version}";
-    hash = "sha256-qCc02iv7SlIPY+e3WNg3BBGijCSuaWAxNrZKSjJhxrs=";
+    hash = "sha256-3pK6H926awUuQGmwyqirFKPnnz+XCGg2/ChuwvaHoDY=";
   };
 
   postPatch = ''

pkgs/development/tools/continuous-integration/github-runner/default.nix

@@ -17,13 +17,13 @@
 }:
 buildDotnetModule rec {
   pname = "github-runner";
-  version = "2.305.0";
+  version = "2.306.0";
 
   src = fetchFromGitHub {
     owner = "actions";
     repo = "runner";
     rev = "v${version}";
-    hash = "sha256-sI29B4VlSc4DQW7mrBZmtWPKgO3q8B5Dt5JSVCY1nCQ=";
+    hash = "sha256-wffHekmyMIGTpUHBPgcxAOPRoTDuuWJZh9pJly3I2eQ=";
     leaveDotGit = true;
     postFetch = ''
       git -C $out rev-parse --short HEAD > $out/.git-revision

pkgs/development/tools/gptcommit/default.nix

@@ -10,7 +10,7 @@
 
 let
   pname = "gptcommit";
-  version = "0.5.8";
+  version = "0.5.10";
 in
 rustPlatform.buildRustPackage {
   inherit pname version;
@@ -19,10 +19,10 @@ rustPlatform.buildRustPackage {
     owner = "zurawiki";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-K4A0np8+gpFpSU4jBv6PAw4RyUWmIB7dTgWvpy36CYY=";
+    sha256 = "sha256-W4AUP4OQCHWJ3BbuD7N9CowF4tPi9f1fmYZnAbG9Rq8=";
   };
 
-  cargoSha256 = "sha256-awztElsrJCUGUn2HcGpCkxUO/nEy8iZO22/fQtwAKdg=";
+  cargoSha256 = "sha256-KUM3ZV9pfR/kUktO2mk9uYpTscBwzAi2APHXBb0GH+U=";
 
   nativeBuildInputs = [ pkg-config ];
 

pkgs/servers/timetagger/default.nix

@@ -1,6 +1,4 @@
-{ lib
-, python3
-, fetchFromGitHub
+{ python3
 
 , addr ? "127.0.0.1"
 , port ? 8082
@@ -24,9 +22,10 @@ python3.pkgs.buildPythonApplication {
   installPhase = ''
     mkdir -p $out/bin
     echo "#!${python3.interpreter}" >> $out/bin/timetagger
-    cat run.py >> $out/bin/timetagger
-    sed -Ei 's,0\.0\.0\.0:80,${addr}:${toString port},' $out/bin/timetagger
+    cat timetagger/__main__.py >> $out/bin/timetagger
     chmod +x $out/bin/timetagger
+    wrapProgram $out/bin/timetagger \
+      --set TIMETAGGER_BIND "${addr}:${toString port}"
   '';
 }
 

pkgs/tools/audio/mpd-discord-rpc/default.nix

@@ -1,37 +1,39 @@
-{ stdenv
-, lib
+{ lib
 , rustPlatform
 , fetchFromGitHub
 , pkg-config
 , openssl
-, Security
+, stdenv
+, darwin
 }:
 
 rustPlatform.buildRustPackage rec {
   pname = "mpd-discord-rpc";
-  version = "1.7.0";
+  version = "1.7.1";
 
   src = fetchFromGitHub {
     owner = "JakeStanger";
-    repo = pname;
+    repo = "mpd-discord-rpc";
     rev = "v${version}";
-    sha256 = "sha256-/B9ar9Q+d1MbBh6zIzf0QmlfgugxECLWHuiYSGUjdmg=";
+    hash = "sha256-fJHBQGc0+HjEALWuAWSts1l6NMookkut3Cm4e541iGw=";
   };
 
-  cargoLock = {
-    lockFile = ./Cargo.lock;
-    outputHashes = {
-      "discord-rpc-client-0.3.0" = "sha256-NzrsJYRe4jCZBkIEXbTG9xbHHJHQyIVnDWGx73of8Tw=";
-    };
-  };
+  cargoHash = "sha256-v5JN0Nqp/fGjjJaKrMWt2HWzxAnA1URf0P2Xq9lHNVQ=";
 
-  nativeBuildInputs = [ pkg-config ];
+  nativeBuildInputs = [
+    pkg-config
+  ];
 
-  buildInputs = [ openssl ] ++ lib.optional stdenv.isDarwin Security;
+  buildInputs = [
+    openssl
+  ] ++ lib.optionals stdenv.isDarwin [
+    darwin.apple_sdk.frameworks.Security
+  ];
 
   meta = with lib; {
     description = "Rust application which displays your currently playing song / album / artist from MPD in Discord using Rich Presence";
-    homepage = "https://github.com/JakeStanger/mpd-discord-rpc";
+    homepage = "https://github.com/JakeStanger/mpd-discord-rpc/";
+    changelog = "https://github.com/JakeStanger/mpd-discord-rpc/blob/${src.rev}/CHANGELOG.md";
     license = licenses.mit;
     maintainers = with maintainers; [ kranzes ];
   };

pkgs/tools/graphics/timg/default.nix

@@ -1,18 +1,37 @@
-{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, graphicsmagick, libjpeg
-, ffmpeg, zlib, libexif, openslide }:
+{ lib
+, stdenv
+, fetchFromGitHub
+, cmake
+, pkg-config
+, ffmpeg
+, graphicsmagick
+, libdeflate
+, libexif
+, libjpeg
+, libsixel
+, openslide
+}:
 
 stdenv.mkDerivation rec {
   pname = "timg";
-  version = "1.4.5";
+  version = "1.5.0";
 
   src = fetchFromGitHub {
     owner = "hzeller";
     repo = "timg";
     rev = "v${version}";
-    sha256 = "sha256-YqcPTgStevUkl4grgaOLK8v1vbgFNgc7MfkMB07KDqo=";
+    hash = "sha256-1zv5+62roS0iSVXa1QXGKuO0Qd6D3e3tZD2HZ5czRRk=";
   };
 
-  buildInputs = [ graphicsmagick ffmpeg libexif libjpeg openslide zlib ];
+  buildInputs = [
+    ffmpeg
+    graphicsmagick
+    libdeflate
+    libexif
+    libjpeg
+    libsixel
+    openslide
+  ];
 
   nativeBuildInputs = [ cmake pkg-config ];
 
@@ -21,6 +40,7 @@ stdenv.mkDerivation rec {
     "-DWITH_VIDEO_DECODING=On"
     "-DWITH_VIDEO_DEVICE=On"
     "-DWITH_OPENSLIDE_SUPPORT=On"
+    "-DWITH_LIBSIXEL=On"
   ];
 
   meta = with lib; {

pkgs/tools/misc/latex2html/default.nix

@@ -4,13 +4,13 @@
 
 stdenv.mkDerivation rec {
   pname = "latex2html";
-  version = "2023";
+  version = "2023.2";
 
   src = fetchFromGitHub {
     owner = pname;
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-VQ416ieqZ+UqI2sgsh+YPkcdn2SmtXFhPqJd1tp49EQ=";
+    sha256 = "sha256-fn9Td4IVqlON93p3xPpQuurFQR8Rjp/sHoQG33O5GkI=";
   };
 
   buildInputs = [ ghostscript netpbm perl ];

pkgs/top-level/all-packages.nix

@@ -5709,9 +5709,7 @@ with pkgs;
 
   mpdris2 = callPackage ../tools/audio/mpdris2 { };
 
-  mpd-discord-rpc = callPackage ../tools/audio/mpd-discord-rpc {
-    inherit (darwin.apple_sdk.frameworks) Security;
-  };
+  mpd-discord-rpc = callPackage ../tools/audio/mpd-discord-rpc { };
 
   mpd-mpris = callPackage ../tools/audio/mpd-mpris { };
 
@@ -6489,8 +6487,9 @@ with pkgs;
 
   inherit (callPackage ../applications/networking/remote/citrix-workspace { })
     citrix_workspace_23_02_0
+    citrix_workspace_23_07_0
   ;
-  citrix_workspace = citrix_workspace_23_02_0;
+  citrix_workspace = citrix_workspace_23_07_0;
 
   cmigemo = callPackage ../tools/text/cmigemo { };
 
@@ -35530,6 +35529,8 @@ with pkgs;
 
   viw = callPackage ../applications/editors/viw { };
 
+  virter = callPackage ../applications/virtualization/virter { };
+
   virt-viewer = callPackage ../applications/virtualization/virt-viewer { };
 
   virt-top = callPackage ../applications/virtualization/virt-top { };
@@ -38968,6 +38969,7 @@ with pkgs;
   tlaplus = callPackage ../applications/science/logic/tlaplus {
     jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731
   };
+  tlaplus18 = callPackage ../applications/science/logic/tlaplus/tlaplus18.nix {};
   tlaps = callPackage ../applications/science/logic/tlaplus/tlaps.nix {
     inherit (ocaml-ng.ocamlPackages_4_14_unsafe_string) ocaml;
   };

pkgs/top-level/lua-packages.nix

@@ -19,7 +19,7 @@ let
 
   buildLuaApplication = args: buildLuarocksPackage ({ namePrefix = ""; } // args);
 
-  buildLuarocksPackage = lib.makeOverridable (callPackage ../development/interpreters/lua-5/build-lua-package.nix { });
+  buildLuarocksPackage = lib.makeOverridable (callPackage ../development/interpreters/lua-5/build-luarocks-package.nix { });
 
   luaLib = callPackage ../development/lua-modules/lib.nix { };
 

pkgs/top-level/python-packages.nix

@@ -1444,6 +1444,8 @@ self: super: with self; {
 
   boiboite-opener-framework = callPackage ../development/python-modules/boiboite-opener-framework { };
 
+  boilerpy3 = callPackage ../development/python-modules/boilerpy3 { };
+
   bokeh = callPackage ../development/python-modules/bokeh { };
 
   boltons = callPackage ../development/python-modules/boltons { };
@@ -5063,6 +5065,8 @@ self: super: with self; {
 
   ionhash = callPackage ../development/python-modules/ionhash { };
 
+  iopath = callPackage ../development/python-modules/iopath { };
+
   iotawattpy = callPackage ../development/python-modules/iotawattpy { };
 
   iowait = callPackage ../development/python-modules/iowait { };
@@ -5650,6 +5654,8 @@ self: super: with self; {
 
   lazy_import = callPackage ../development/python-modules/lazy_import { };
 
+  lazy_imports = callPackage ../development/python-modules/lazy_imports { };
+
   lazy-loader = callPackage ../development/python-modules/lazy-loader { };
 
   lazy-object-proxy = callPackage ../development/python-modules/lazy-object-proxy { };
@@ -6770,6 +6776,8 @@ self: super: with self; {
 
   nbdime = callPackage ../development/python-modules/nbdime { };
 
+  nbexec = callPackage ../development/python-modules/nbexec { };
+
   nbformat = callPackage ../development/python-modules/nbformat { };
 
   nbmerge = callPackage ../development/python-modules/nbmerge { };
@@ -7584,6 +7592,8 @@ self: super: with self; {
 
   pdfminer-six = callPackage ../development/python-modules/pdfminer-six { };
 
+  pdfplumber = callPackage ../development/python-modules/pdfplumber { };
+
   pdfrw = callPackage ../development/python-modules/pdfrw { };
 
   pdftotext = callPackage ../development/python-modules/pdftotext { };
@@ -8236,6 +8246,8 @@ self: super: with self; {
 
   prompt-toolkit = callPackage ../development/python-modules/prompt-toolkit { };
 
+  prompthub-py = callPackage ../development/python-modules/prompthub-py { };
+
   property-manager = callPackage ../development/python-modules/property-manager { };
 
   protego = callPackage ../development/python-modules/protego { };
@@ -9847,6 +9859,8 @@ self: super: with self; {
 
   pytest-param-files = callPackage ../development/python-modules/pytest-param-files { };
 
+  pytest-parallel = callPackage ../development/python-modules/pytest-parallel { };
+
   pytest-playwright = callPackage ../development/python-modules/pytest-playwright {};
 
   pytest-plt = callPackage ../development/python-modules/pytest-plt { };
@@ -10554,6 +10568,8 @@ self: super: with self; {
 
   quantum-gateway = callPackage ../development/python-modules/quantum-gateway { };
 
+  quantulum3 = callPackage ../development/python-modules/quantulum3 { };
+
   quart = callPackage ../development/python-modules/quart { };
 
   quart-cors = callPackage ../development/python-modules/quart-cors { };
@@ -10600,6 +10616,8 @@ self: super: with self; {
 
   rangehttpserver = callPackage ../development/python-modules/rangehttpserver { };
 
+  rank_bm25 = callPackage ../development/python-modules/rank_bm25 { };
+
   rapidfuzz = callPackage ../development/python-modules/rapidfuzz { };
 
   rapidfuzz-capi = callPackage ../development/python-modules/rapidfuzz-capi { };
@@ -11929,6 +11947,8 @@ self: super: with self; {
 
   stem = callPackage ../development/python-modules/stem { };
 
+  stemming = callPackage ../development/python-modules/stemming { };
+
   stestr = callPackage ../development/python-modules/stestr { };
 
   stevedore = callPackage ../development/python-modules/stevedore { };