Merge staging-next into staging

nixos/modules/security/acme/default.nix

@@ -62,9 +62,9 @@ let
     SystemCallArchitectures = "native";
     SystemCallFilter = [
       # 1. allow a reasonable set of syscalls
-      "@system-service"
+      "@system-service @resources"
       # 2. and deny unreasonable ones
-      "~@privileged @resources"
+      "~@privileged"
       # 3. then allow the required subset within denied groups
       "@chown"
     ];

nixos/modules/services/web-apps/changedetection-io.nix

@@ -127,7 +127,7 @@ in
       defaultStateDir = cfg.datastorePath == "/var/lib/changedetection-io";
     in {
       services.changedetection-io = {
-        wantedBy = [ "mutli-user.target" ];
+        wantedBy = [ "multi-user.target" ];
         after = [ "network.target" ];
         preStart = ''
           mkdir -p ${cfg.datastorePath}

nixos/release-combined.nix

@@ -55,6 +55,7 @@ in rec {
         (onFullSupported "nixos.manual")
         (onSystems ["x86_64-linux"] "nixos.ova")
         (onSystems ["aarch64-linux"] "nixos.sd_image")
+        (onFullSupported "nixos.tests.acme")
         (onSystems ["x86_64-linux"] "nixos.tests.boot.biosCdrom")
         (onSystems ["x86_64-linux"] "nixos.tests.boot.biosUsb")
         (onFullSupported "nixos.tests.boot-stage1")

nixos/release-small.nix

@@ -31,6 +31,7 @@ in rec {
     inherit (nixos') channel manual options iso_minimal amazonImage dummy;
     tests = {
       inherit (nixos'.tests)
+        acme
         containers-imperative
         containers-ip
         firewall
@@ -110,6 +111,7 @@ in rec {
         "nixos.iso_minimal"
         "nixos.amazonImage"
         "nixos.manual"
+        "nixos.tests.acme"
         "nixos.tests.boot.uefiCdrom"
         "nixos.tests.containers-imperative"
         "nixos.tests.containers-ip"

nixos/tests/chromium.nix

@@ -39,7 +39,9 @@ mapAttrs (channel: chromiumPkg: makeTest {
   name = "chromium-${channel}";
   meta = {
     maintainers = with maintainers; [ aszlig primeos ];
+  } // optionalAttrs (chromiumPkg.meta ? timeout) {
     # https://github.com/NixOS/hydra/issues/591#issuecomment-435125621
+    # Note: optionalAttrs is used since meta.timeout is not set for Google Chrome
     inherit (chromiumPkg.meta) timeout;
   };
 
@@ -65,6 +67,9 @@ mapAttrs (channel: chromiumPkg: makeTest {
     from contextlib import contextmanager
 
 
+    major_version = "${versions.major (getVersion chromiumPkg.name)}"
+
+
     # Run as user alice
     def ru(cmd):
         return "su - ${user} -c " + shlex.quote(cmd)
@@ -84,7 +89,6 @@ mapAttrs (channel: chromiumPkg: makeTest {
             binary = pname
         # Add optional CLI options:
         options = []
-        major_version = "${versions.major (getVersion chromiumPkg.name)}"
         if major_version > "95" and not pname.startswith("google-chrome"):
             # Workaround to avoid a GPU crash:
             options.append("--use-gl=swiftshader")
@@ -242,9 +246,11 @@ mapAttrs (channel: chromiumPkg: makeTest {
         machine.screenshot("after_copy_from_chromium")
 
 
-    with test_new_win("gpu_info", "chrome://gpu", "chrome://gpu"):
+    if major_version < "107":
-        # To check the text rendering (catches regressions like #131074):
+        # TODO: Fix the chrome://gpu test for M107+
-        machine.wait_for_text("Graphics Feature Status")
+        with test_new_win("gpu_info", "chrome://gpu", "chrome://gpu"):
+            # To check the text rendering (catches regressions like #131074):
+            machine.wait_for_text("Graphics Feature Status")
 
 
     with test_new_win("version_info", "chrome://version", "About Version") as clipboard:

pkgs/applications/editors/vim/plugins/generated.nix

@@ -4893,6 +4893,18 @@ final: prev:
     meta.homepage = "https://github.com/Shougo/neco-vim/";
   };
 
+  neo-tree-nvim = buildVimPluginFrom2Nix {
+    pname = "neo-tree.nvim";
+    version = "2022-10-22";
+    src = fetchFromGitHub {
+      owner = "nvim-neo-tree";
+      repo = "neo-tree.nvim";
+      rev = "ab8ca9fac52949d7a741b538c5d9c3898cd0f45a";
+      sha256 = "0ccrxj04md7lssfwy9lvw4sn99iwkpci9lddc577m6zs1nz00lw0";
+    };
+    meta.homepage = "https://github.com/nvim-neo-tree/neo-tree.nvim/";
+  };
+
   neocomplete-vim = buildVimPluginFrom2Nix {
     pname = "neocomplete.vim";
     version = "2021-02-18";

pkgs/applications/editors/vim/plugins/overrides.nix

@@ -624,6 +624,10 @@ self: super: {
     dependencies = with self; [ plenary-nvim ];
   });
 
+  neo-tree-nvim = super.neo-tree-nvim.overrideAttrs (old: {
+    dependencies = with self; [ plenary-nvim nui-nvim ];
+  });
+
   noice-nvim = super.noice-nvim.overrideAttrs(old: {
     dependencies = with self; [ nui-nvim nvim-notify ];
   });

pkgs/applications/editors/vim/plugins/vim-plugin-names

@@ -410,6 +410,7 @@ https://github.com/eagletmt/neco-ghc/,,
 https://github.com/ujihisa/neco-look/,,
 https://github.com/Shougo/neco-syntax/,,
 https://github.com/Shougo/neco-vim/,,
+https://github.com/nvim-neo-tree/neo-tree.nvim/,HEAD,
 https://github.com/Shougo/neocomplete.vim/,,
 https://github.com/KeitaNakamura/neodark.vim/,,
 https://github.com/folke/neodev.nvim/,HEAD,

pkgs/applications/misc/dmenu/default.nix

@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "dmenu";
-  version = "5.1";
+  version = "5.2";
 
   src = fetchurl {
     url = "https://dl.suckless.org/tools/dmenu-${version}.tar.gz";
-    sha256 = "sha256-H01wnrujfrcybroOZl4PE75Pok7jXJWw15ww8Uo0j9U=";
+    sha256 = "sha256-1NTKd7WRQPJyJy21N+BbuRpZFPVoAmUtxX5hp3PUN5I=";
   };
 
   buildInputs = [ libX11 libXinerama zlib libXft ];

pkgs/applications/misc/nwg-wrapper/default.nix

@@ -2,13 +2,13 @@
 
 python3Packages.buildPythonPackage rec {
   pname = "nwg-wrapper";
-  version = "0.1.2";
+  version = "0.1.3";
 
   src = fetchFromGitHub {
     owner = "nwg-piotr";
     repo = pname;
-    rev = "v${version}";
+    rev = "refs/tags/v${version}";
-    sha256 = "114y55mv2rgnp75a3c7rk46v5v84d1zqb6wkha7x16ab6xa9phzl";
+    sha256 = "sha256-GKDAdjO67aedCEFHKDukQ+oPMomTPwFE/CvJu112fus=";
   };
 
   nativeBuildInputs = [ gobject-introspection wrapGAppsHook ];
@@ -17,9 +17,6 @@ python3Packages.buildPythonPackage rec {
 
   propagatedBuildInputs = with python3Packages; [ i3ipc pygobject3 ];
 
-  # ValueError: Namespace GtkLayerShell not available
-  strictDeps = false;
-
   # No tests
   doCheck = false;
 

pkgs/applications/misc/watchmate/default.nix

@@ -0,0 +1,54 @@
+{ lib
+, rustPlatform
+, fetchFromGitLab
+, pkg-config
+, gtk4
+, libadwaita
+, bluez
+, dbus
+, openssl
+, wrapGAppsHook4
+, glib
+}:
+
+rustPlatform.buildRustPackage rec {
+  pname = "watchmate";
+  version = "0.3.0";
+
+  src = fetchFromGitLab {
+    owner = "azymohliad";
+    repo = "watchmate";
+    rev = "v${version}";
+    sha256 = "sha256-HyH+9KMbdiJSmjo2NsAvz8rN3JhYKz1nNqfuZufKjQA=";
+  };
+
+  cargoSha256 = "sha256-HvuxKPIVwVrcsTKgPwNosF/ar8QL9Jlldq7SBe2nh6o=";
+
+  nativeBuildInputs = [
+    pkg-config
+    wrapGAppsHook4
+    glib
+  ];
+  buildInputs = [
+    gtk4
+    libadwaita
+    bluez
+    dbus
+    openssl
+  ];
+
+  postInstall = ''
+    install -Dm444 assets/io.gitlab.azymohliad.WatchMate.desktop -t $out/share/applications/
+    install -Dm444 assets/io.gitlab.azymohliad.WatchMate.metainfo.xml -t $out/share/metainfo/
+    install -Dm444 assets/icons/io.gitlab.azymohliad.WatchMate.svg -t $out/share/icons/hicolor/scalable/apps/
+    install -Dm444 assets/icons/io.gitlab.azymohliad.WatchMate-symbolic.svg -t $out/share/icons/hicolor/scalable/apps/
+  '';
+
+  meta = with lib; {
+    description = "PineTime smart watch companion app for Linux phone and desktop";
+    homepage = "https://gitlab.com/azymohliad/watchmate";
+    license = licenses.gpl3Plus;
+    maintainers = with maintainers; [ chuangzhu ];
+    platforms = platforms.linux;
+  };
+}

pkgs/applications/networking/instant-messengers/discord/darwin.nix

@@ -1,4 +1,4 @@
-{ pname, version, src, openasar, meta, stdenv, binaryName, desktopName, lib, undmg, makeWrapper, withOpenASAR ? false }:
+{ pname, version, src, openasar, meta, stdenv, binaryName, desktopName, lib, undmg, makeWrapper, branch, withOpenASAR ? false }:
 
 stdenv.mkDerivation {
   inherit pname version src meta;

pkgs/applications/networking/instant-messengers/discord/default.nix

@@ -2,7 +2,7 @@
 let
   versions = if stdenv.isLinux then {
     stable = "0.0.21";
-    ptb = "0.0.29";
+    ptb = "0.0.34";
     canary = "0.0.140";
   } else {
     stable = "0.0.264";
@@ -18,7 +18,7 @@ let
       };
       ptb = fetchurl {
         url = "https://dl-ptb.discordapp.net/apps/linux/${version}/discord-ptb-${version}.tar.gz";
-        sha256 = "d78NnQZ3MkLje8mHrI6noH2iD2oEvSJ3cDnsmzQsUYc=";
+        sha256 = "CD6dLoBnlvhpwEFfLI9OqjhviZPj3xNDyPK9qBJUqck=";
       };
       canary = fetchurl {
         url = "https://dl-canary.discordapp.net/apps/linux/${version}/discord-canary-${version}.tar.gz";
@@ -69,7 +69,7 @@ let
       (_: value:
         callPackage package (value
           // {
-          inherit src version openasar;
+          inherit src version openasar branch;
           meta = meta // { mainProgram = value.binaryName; };
         }))
       {

pkgs/applications/networking/instant-messengers/discord/linux.nix

@@ -5,6 +5,7 @@
 , libXScrnSaver, libXcomposite, libXcursor, libXdamage, libXext, libXfixes
 , libXi, libXrandr, libXrender, libXtst, libxcb, libxshmfence, mesa, nspr, nss
 , pango, systemd, libappindicator-gtk3, libdbusmenu, writeScript, python3, runCommand
+, branch
 , common-updater-scripts, withOpenASAR ? false }:
 
 let
@@ -141,7 +142,7 @@ stdenv.mkDerivation rec {
       }?platform=linux&format=tar.gz" | grep -oP 'location: \K\S+')
       version=''${url##https://dl*.discordapp.net/apps/linux/}
       version=''${version%%/*.tar.gz}
-      update-source-version ${pname} "$version" --file=./pkgs/applications/networking/instant-messengers/discord/default.nix
+      update-source-version ${pname} "$version" --file=./pkgs/applications/networking/instant-messengers/discord/default.nix --version-key=${branch}
     '';
   };
 }

pkgs/applications/science/physics/dawn/default.nix

@@ -1,6 +1,8 @@
 { lib
 , stdenv
 , fetchurl
+, tk
+, makeWrapper
 }:
 
 stdenv.mkDerivation rec {
@@ -18,12 +20,19 @@ stdenv.mkDerivation rec {
       --replace 'INSTALL_DIR =' "INSTALL_DIR = $out/bin#"
   '';
 
+  nativeBuildInputs = [ makeWrapper ];
+
   dontConfigure = true;
 
   preInstall = ''
     mkdir -p "$out/bin"
   '';
 
+  postInstall = ''
+    wrapProgram "$out/bin/DAWN_GUI" \
+      --prefix PATH : ${lib.makeBinPath [ tk ]}
+  '';
+
   meta = with lib; {
     description = "A vectorized 3D PostScript processor with analytical hidden line/surface removal";
     license = licenses.unfree;

pkgs/applications/science/physics/dawncut/default.nix

@@ -0,0 +1,40 @@
+{ lib
+, stdenv
+, fetchurl
+}:
+
+stdenv.mkDerivation rec {
+  pname = "dawncut";
+  version = "1.54a";
+
+  src = fetchurl {
+    name = "${pname}-${version}.tar.gz";
+    url = "https://geant4.kek.jp/~tanaka/src/dawncut_${builtins.replaceStrings ["."] ["_"] version}.taz";
+    hash = "sha256-Ux4fDi7TXePisYAxCMDvtzLYOgxnbxQIO9QacTRrT6k=";
+  };
+
+  postPatch = ''
+    substituteInPlace Makefile.architecture \
+      --replace 'CXX      := g++' ""
+  '';
+
+  dontConfigure = true;
+
+  NIX_CFLAGS_COMPILE="-std=c++98";
+
+  installPhase = ''
+    runHook preInstall
+
+    install -Dm 500 dawncut "$out/bin/dawncut"
+
+    runHook postInstall
+  '';
+
+  meta = with lib; {
+    description = "A tool to generate a 3D scene data clipped with an arbitrary plane";
+    license = licenses.unfree;
+    homepage = "https://geant4.kek.jp/~tanaka/DAWN/About_DAWNCUT.html";
+    platforms = platforms.unix;
+    maintainers = with maintainers; [ veprbl ];
+  };
+}

pkgs/desktops/plasma-5/3rdparty/addons/bismuth/default.nix

@@ -12,13 +12,13 @@
 
 mkDerivation rec {
   pname = "bismuth";
-  version = "3.1.3";
+  version = "3.1.4";
 
   src = fetchFromGitHub {
     owner = "Bismuth-Forge";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-IWwFsYqoqW3924+pf8L+acIt31aU/mhqakXbT9Q4Bqw=";
+    sha256 = "sha256-c13OFEw6E/I8j/mqeLnuc9Chi6pc3+AgwAMPpCzh974=";
   };
 
   cmakeFlags = [

pkgs/development/libraries/boost/1.80.nix

@@ -0,0 +1,14 @@
+{ callPackage, fetchurl, fetchpatch, ... } @ args:
+
+callPackage ./generic.nix (args // rec {
+  version = "1.80.0";
+
+  src = fetchurl {
+    urls = [
+      "mirror://sourceforge/boost/boost_${builtins.replaceStrings ["."] ["_"] version}.tar.bz2"
+      "https://boostorg.jfrog.io/artifactory/main/release/${version}/source/boost_${builtins.replaceStrings ["."] ["_"] version}.tar.bz2"
+    ];
+    # SHA256 from http://www.boost.org/users/history/version_1_80_0.html
+    sha256 = "1e19565d82e43bc59209a168f5ac899d3ba471d55c7610c677d4ccf2c9c500c0";
+  };
+})

pkgs/development/libraries/boost/default.nix

@@ -32,4 +32,5 @@ in {
   boost177 = makeBoost ./1.77.nix;
   boost178 = makeBoost ./1.78.nix;
   boost179 = makeBoost ./1.79.nix;
+  boost180 = makeBoost ./1.80.nix;
 }

pkgs/development/libraries/libvarlink/default.nix

@@ -4,17 +4,19 @@
 , meson
 , ninja
 , python3
+, nix-update-script
+, testers
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "libvarlink";
-  version = "22";
+  version = "23";
 
   src = fetchFromGitHub {
     owner = "varlink";
-    repo = pname;
+    repo = finalAttrs.pname;
-    rev = version;
+    rev = finalAttrs.version;
-    sha256 = "1i15227vlc9k4276r833ndhxrcys9305pf6dga1j0alx2vj85yz2";
+    sha256 = "sha256-oUy9HhybNMjRBWoqqal1Mw8cC5RddgN4izxAl0cgnKE=";
   };
 
   nativeBuildInputs = [ meson ninja ];
@@ -33,6 +35,18 @@ stdenv.mkDerivation rec {
 
   doCheck = true;
 
+  passthru = {
+    updateScript = nix-update-script {
+      attrPath = finalAttrs.pname;
+    };
+    tests = {
+      version = testers.testVersion {
+        package = finalAttrs.finalPackage;
+        command = "varlink --version";
+      };
+    };
+  };
+
   meta = with lib; {
     description = "C implementation of the Varlink protocol and command line tool";
     homepage = "https://github.com/varlink/libvarlink";
@@ -40,4 +54,4 @@ stdenv.mkDerivation rec {
     maintainers = with maintainers; [ artturin ];
     platforms = platforms.linux;
   };
-}
+})

pkgs/development/libraries/ncnn/cmakelists.patch

@@ -1,13 +1,26 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 98611276..989350bb 100644
+index c453d23e..66b4aa24 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -260,6 +260,8 @@ if(NCNN_VULKAN)
+@@ -478,6 +478,8 @@ if(NCNN_VULKAN)
-                 include("${GLSLANG_TARGET_DIR}/HLSLTargets.cmake")
+ 
-             endif()
+             find_package(Threads)
-             include("${GLSLANG_TARGET_DIR}/glslangTargets.cmake")
+ 
 +            include("${GLSLANG_TARGET_DIR}/SPIRV-Tools/SPIRV-ToolsTarget.cmake")
 +            include("${GLSLANG_TARGET_DIR}/SPIRV-Tools-opt/SPIRV-Tools-optTargets.cmake")
-             include("${GLSLANG_TARGET_DIR}/SPIRVTargets.cmake")
+             include("${GLSLANG_TARGET_DIR}/OSDependentTargets.cmake")
- 
+             include("${GLSLANG_TARGET_DIR}/OGLCompilerTargets.cmake")
-             if (NOT TARGET glslang OR NOT TARGET SPIRV)
+             if(EXISTS "${GLSLANG_TARGET_DIR}/HLSLTargets.cmake")
+diff --git a/src/ncnn.pc.in b/src/ncnn.pc.in
+index b580fcee..be2becd0 100644
+--- a/src/ncnn.pc.in
++++ b/src/ncnn.pc.in
+@@ -1,6 +1,6 @@
+ prefix=${pcfiledir}/../..
+-librarydir=${prefix}/@CMAKE_INSTALL_LIBDIR@
+-includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@
++librarydir=@CMAKE_INSTALL_FULL_LIBDIR@
++includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@
+ 
+ Name: @CMAKE_PROJECT_NAME@
+ Description: high-performance neural network inference framework optimized for the mobile platform

pkgs/development/libraries/ncnn/default.nix

@@ -45,6 +45,5 @@ stdenv.mkDerivation rec {
     homepage = "https://github.com/Tencent/ncnn";
     license = licenses.bsd3;
     maintainers = with maintainers; [ tilcreator ];
-    broken = true; # at 2022-11-23
   };
 }

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

@@ -13,7 +13,7 @@
 
 buildPythonPackage rec {
   pname = "aiobiketrax";
-  version = "0.3.0";
+  version = "0.4.0";
   format = "pyproject";
 
   disabled = pythonOlder "3.9";
@@ -22,7 +22,7 @@ buildPythonPackage rec {
     owner = "basilfx";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-goS+BLIeFJ2fXQ2srbhKRfEjsMFX3+eA7iWzpBWMqZQ=";
+    hash = "sha256-P8BExzL22rRj1IFPpojKR8ITdVq0RF8e3qLgb+H1PzE=";
   };
 
   nativeBuildInputs = [

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

@@ -15,7 +15,7 @@
 
 buildPythonPackage rec {
   pname = "denonavr";
-  version = "0.10.11";
+  version = "0.10.12";
   format = "setuptools";
 
   disabled = pythonOlder "3.6";
@@ -23,8 +23,8 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "scarface-4711";
     repo = pname;
-    rev = version;
+    rev = "refs/tags/${version}";
-    hash = "sha256-RY1XRGuwSFL429foEjEN93fBucUyyYc6cmpzYmYRorc=";
+    hash = "sha256-QNiDoPjOuwwAgUqDzXHzn0BE9bwXQrQKAIFlHCywl88=";
   };
 
   propagatedBuildInputs = [

pkgs/development/python-modules/localstack-client/default.nix

@@ -3,18 +3,21 @@
 , fetchFromGitHub
 , boto3
 , pytestCheckHook
+
+# downstream dependencies
+, localstack
 }:
 
 buildPythonPackage rec {
   pname = "localstack-client";
-  version = "1.36";
+  version = "1.39";
 
   src = fetchFromGitHub {
     owner = "localstack";
     repo = "localstack-python-client";
     # Request for proper tags: https://github.com/localstack/localstack-python-client/issues/38
-    rev = "92229c02c5b3cd0cef006e99c3d47db15aefcb4f";
+    rev = "f1e538ad23700e5b1afe98720404f4801475e470";
-    sha256 = "sha256-pbDpe/5o4YU/2UIi8YbhzhIlXigOb/M2vjW9DKcIxoI=";
+    sha256 = "sha256-MBXTiTzCwkduJPPRN7OKaWy2q9J8xCX/GGu09tyac3A=";
   };
 
   propagatedBuildInputs = [
@@ -25,6 +28,8 @@ buildPythonPackage rec {
     "localstack_client"
   ];
 
+  # All commands test `localstack` which is a downstream dependency
+  doCheck = false;
   checkInputs = [
     pytestCheckHook
   ];
@@ -37,6 +42,10 @@ buildPythonPackage rec {
   # For tests
   __darwinAllowLocalNetworking = true;
 
+  passthru.tests = {
+    inherit localstack;
+  };
+
   meta = with lib; {
     description = "A lightweight Python client for LocalStack";
     homepage = "https://github.com/localstack/localstack-python-client";

pkgs/development/python-modules/localstack-ext/default.nix

@@ -9,15 +9,18 @@
 , python-jose
 , requests
 , tabulate
+
+# Sensitive downstream dependencies
+, localstack
 }:
 
 buildPythonPackage rec {
   pname = "localstack-ext";
-  version = "1.1.0";
+  version = "1.2.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-EpFkam2xqRSiIhLkcBFSFKr9j0P5oRP4CIUVcjKT5gM=";
+    sha256 = "sha256-F+FQJwvB1WH7qcfOG6IGY+ZlfKwz39UE5rwoQKnxaac=";
   };
 
   postPatch = ''
@@ -50,6 +53,10 @@ buildPythonPackage rec {
   # No tests in repo
   doCheck = false;
 
+  passthru.tests = {
+    inherit localstack;
+  };
+
   meta = with lib; {
     description = "Extensions for LocalStack";
     homepage = "https://github.com/localstack/localstack";

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

@@ -19,13 +19,13 @@
 
 buildPythonPackage rec {
   pname = "localstack";
-  version = "1.0.4";
+  version = "1.2.0";
 
   src = fetchFromGitHub {
     owner = "localstack";
     repo = "localstack";
     rev = "v${version}";
-    sha256 = "sha256-JDF3wM5AVhfkAFlxmy1f3aMxs4J5LWd0JOY8MzRAzT4=";
+    sha256 = "sha256-en/9kxhiW4aesc2SOpg/jRXiRa222iBQuq1O3cHeBJs=";
   };
 
   postPatch = ''

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

@@ -7,7 +7,7 @@
 
 buildPythonPackage rec {
   pname = "lxmf";
-  version = "0.2.1";
+  version = "0.2.2";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
@@ -16,7 +16,7 @@ buildPythonPackage rec {
     owner = "markqvist";
     repo = "lxmf";
     rev = "refs/tags/${version}";
-    hash = "sha256-ULYo2eFzBoEc5OeuRW/o35P/9oeYob8lG4T++nDrnNg=";
+    hash = "sha256-DmJcxbAVaNUTe1ulVmYeI0Kdtm0Lz83akjH4ttZsgZg=";
   };
 
   propagatedBuildInputs = [

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

@@ -1,7 +1,6 @@
 { lib
 , buildPythonPackage
 , fetchFromGitHub
-, fetchpatch
 , poetry-core
 , pytestCheckHook
 , pythonOlder
@@ -9,7 +8,7 @@
 
 buildPythonPackage rec {
   pname = "pyhumps";
-  version = "3.7.3";
+  version = "3.8.0";
   format = "pyproject";
 
   disabled = pythonOlder "3.7";
@@ -18,17 +17,9 @@ buildPythonPackage rec {
     owner = "nficano";
     repo = "humps";
     rev = "v${version}";
-    hash = "sha256-7jkwf4qGQ+AD4/hOrEe/oAPY+gnSySUVBWFf70rU7xc=";
+    hash = "sha256-ElL/LY2V2Z3efdV5FnDy9dSoBltULrzxsjaOx+7W9Oo=";
   };
 
-  patches = [
-    (fetchpatch {
-      # https://github.com/nficano/humps/pull/281
-      url = "https://github.com/nficano/humps/commit/e248c26195804fa04c43e88c5682528f367e27b3.patch";
-      hash = "sha256-+TCVfuMgfkDaS1tPu4q6PIOC3Kn1MBWyuoyAO6W0/h4=";
-    })
-  ];
-
   nativeBuildInputs = [
     poetry-core
   ];

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

@@ -6,7 +6,7 @@
 
 buildPythonPackage rec {
   pname = "pynobo";
-  version = "1.5.0";
+  version = "1.6.0";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
@@ -15,7 +15,7 @@ buildPythonPackage rec {
     owner = "echoromeo";
     repo = pname;
     rev = "refs/tags/v${version}";
-    hash = "sha256-msJClYHljib8sATooI8q4irz6cC8hEgvcxLmmgatvwU=";
+    hash = "sha256-YbQfdOLO1gs7+oiwe4rDmmD1o7MG+vma5xPlrtNZ00M=";
   };
 
   # Project has no tests

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

@@ -9,7 +9,7 @@
 
 buildPythonPackage rec {
   pname = "rns";
-  version = "0.3.16";
+  version = "0.3.17";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
     owner = "markqvist";
     repo = "Reticulum";
     rev = "refs/tags/${version}";
-    hash = "sha256-+TXIxyLLIWK0lLUyh4irTYHXZLAv8zFYUGKAbA7D9qA=";
+    hash = "sha256-2e1mUDIDxgjGY4PGfgtbGwkktQfH1LsAczXKVW4jCLA=";
   };
 
   propagatedBuildInputs = [

pkgs/development/python-modules/types-python-dateutil/default.nix

@@ -5,12 +5,12 @@
 
 buildPythonPackage rec {
   pname = "types-python-dateutil";
-  version = "2.8.19.1";
+  version = "2.8.19.2";
   format = "setuptools";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-1kL3ryu5n+ePWndv0MpOMpMnIAR/QA4lrWK8KlsY3JQ=";
+    hash = "sha256-5uMs4Y83dlsIxGYiKHvI2BNtwMVi2a1bj9FYxZlj16c=";
   };
 
   # Modules doesn't have tests

pkgs/development/tools/operator-sdk/default.nix

@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "operator-sdk";
-  version = "1.24.1";
+  version = "1.25.0";
 
   src = fetchFromGitHub {
     owner = "operator-framework";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-6Al9EkAnaa7/wJzV4xy6FifPXa4MdA9INwJWpkWzCb8=";
+    sha256 = "sha256-Ej+Ai5bxqT3x/snFD0WaakcXlHCWJQh3vanyUJyJ/ks=";
   };
 
-  vendorSha256 = "sha256-eczTVlArpO+uLC6IsTkj4LBIi+fXq7CMBf1zJShDN58=";
+  vendorSha256 = "sha256-7I/Hcrp50Nyp2yjALoEX/+sr3B/XJ8JKmkAB1SgAuGg=";
 
   doCheck = false;
 

pkgs/misc/flashfocus/default.nix

@@ -1,12 +1,12 @@
-{ lib, python3, netcat-openbsd }:
+{ lib, python3, netcat-openbsd, nix-update-script }:
 
 python3.pkgs.buildPythonApplication rec {
   pname = "flashfocus";
-  version = "2.2.3";
+  version = "2.3.1";
 
   src = python3.pkgs.fetchPypi {
     inherit pname version;
-    sha256 = "0cn44hryvz2wl7xklaslxsb3l2i3f8jkgmml0n9v2ks22j5l4r4h";
+    sha256 = "sha256-XT3CKJWn1uKnPPsJC+MWlEAd8sWdVTEXz5b3n0UUedY=";
   };
 
   postPatch = ''
@@ -36,6 +36,10 @@ python3.pkgs.buildPythonApplication rec {
 
   pythonImportsCheck = [ "flashfocus" ];
 
+  passthru.updateScript = nix-update-script {
+    attrPath = pname;
+  };
+
   meta = with lib; {
     homepage = "https://github.com/fennerm/flashfocus";
     description = "Simple focus animations for tiling window managers";

pkgs/servers/web-apps/changedetection-io/default.nix

@@ -19,17 +19,6 @@ let
           "test_redirect"
         ];
       });
-      lxml = prev.lxml.override {
-        libxml2 = prev.libxml2.overrideAttrs (old: rec {
-          # etree.fromstring always returns None with 2.10.0
-          version = "2.9.14";
-
-          src = fetchurl {
-            url = "mirror://gnome/sources/libxml2/${lib.versions.majorMinor version}/libxml2-${version}.tar.xz";
-            sha256 = "sha256-YNdKJX0czsBHXnScui8hVZ5IE577pv8oIkNXx8eY3+4=";
-          };
-        });
-      };
       werkzeug = prev.werkzeug.overridePythonAttrs (old: rec {
         version = "2.0.3";
         src = old.src.override {

pkgs/shells/fish/plugins/forgit.nix

@@ -2,7 +2,7 @@
 
 buildFishPlugin rec {
   pname = "forgit";
-  version = "unstable-2022-08-16";
+  version = "unstable-2022-10-14";
 
   preFixup = ''
     substituteInPlace $out/share/fish/vendor_conf.d/forgit.plugin.fish \
@@ -13,8 +13,8 @@ buildFishPlugin rec {
   src = fetchFromGitHub {
     owner = "wfxr";
     repo = "forgit";
-    rev = "3f50933f047510020428114551da0ee5cdfb32a3";
+    rev = "2872548075e63bc83a0b960e2813b16571998563";
-    sha256 = "sha256-TSF4Vr5uf/+MVU4yCdIHNnwB7kkp4mF+hkhKtLqQvmk=";
+    sha256 = "sha256-NKL4c4k9Nath8NQ3sWUTGUzp517jRX4v0qVaKMJSMrw=";
   };
 
   meta = with lib; {

pkgs/shells/zsh/oh-my-zsh/default.nix

@@ -5,15 +5,15 @@
 , git, nix, nixfmt, jq, coreutils, gnused, curl, cacert, bash }:
 
 stdenv.mkDerivation rec {
-  version = "2022-10-22";
+  version = "2022-10-24";
   pname = "oh-my-zsh";
-  rev = "0066280c3e971e1e45a9037f6d0b993dabcc3576";
+  rev = "bb8a0aa2c1c54c3aeb3e703397ab050fd62e36e6";
 
   src = fetchFromGitHub {
     inherit rev;
     owner = "ohmyzsh";
     repo = "ohmyzsh";
-    sha256 = "SiP58GhkhgaxdTG1A6jvWFkBs7D3mRCXZtNziCvPKKU=";
+    sha256 = "bLuUkT81eJ37WtLasNzDNiGY21SveCZO7Ma5fbb61mc=";
   };
 
   strictDeps = true;

pkgs/tools/graphics/realesrgan-ncnn-vulkan/cmakelists.patch

@@ -1,13 +1,13 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index a234caa..cd9d2c5 100644
+index a234caa..d94388a 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -114,6 +114,8 @@ if(USE_SYSTEM_NCNN)
+@@ -107,6 +107,8 @@ if(USE_SYSTEM_NCNN)
-             include("${GLSLANG_TARGET_DIR}/HLSLTargets.cmake")
+ 
-         endif()
+         find_package(Threads)
-         include("${GLSLANG_TARGET_DIR}/glslangTargets.cmake")
+ 
 +        include("${GLSLANG_TARGET_DIR}/SPIRV-Tools/SPIRV-ToolsTarget.cmake")
 +        include("${GLSLANG_TARGET_DIR}/SPIRV-Tools-opt/SPIRV-Tools-optTargets.cmake")
-         include("${GLSLANG_TARGET_DIR}/SPIRVTargets.cmake")
+         include("${GLSLANG_TARGET_DIR}/OSDependentTargets.cmake")
- 
+         include("${GLSLANG_TARGET_DIR}/OGLCompilerTargets.cmake")
-         if (NOT TARGET glslang OR NOT TARGET SPIRV)
+         if(EXISTS "${GLSLANG_TARGET_DIR}/HLSLTargets.cmake")

pkgs/tools/system/btop/default.nix

@@ -8,8 +8,8 @@
 
 stdenv.mkDerivation rec {
   pname = "btop";
-  version = "1.2.9";
+  version = "1.2.12";
-  hash = "sha256-YCVRWmBZmzAAFxMIWMBb8NPCRp8NeBtMqEbkgXYS9M4=";
+  hash = "sha256-ieNwFCDJF0U1wTfAeWM22CS3RE1SEp12ODHsRVYFoKU=";
 
   src = fetchFromGitHub {
     owner = "aristocratos";

pkgs/tools/text/textpieces/default.nix

@@ -0,0 +1,76 @@
+{ lib
+, stdenv
+, fetchFromGitHub
+, python3
+, meson
+, ninja
+, pkg-config
+, vala
+, glib
+, gtk4
+, libgee
+, libadwaita
+, json-glib
+, blueprint-compiler
+, gtksourceview5
+, gobject-introspection
+, wrapGAppsHook4
+, appstream-glib
+, desktop-file-utils
+}:
+
+let
+  pythonEnv = python3.withPackages ( ps: with ps; [ pyyaml ] );
+in
+stdenv.mkDerivation rec {
+  pname = "textpieces";
+  version = "3.3.0";
+
+  src = fetchFromGitHub {
+    owner = "liferooter";
+    repo = pname;
+    rev = "v${version}";
+    hash = "sha256-QLPvK2kiOGf8XN2aors6cZtl9d9uqsxcho2A1kISO5Y=";
+  };
+
+  nativeBuildInputs = [
+    meson
+    ninja
+    pkg-config
+    pythonEnv
+    vala
+    blueprint-compiler
+    wrapGAppsHook4
+    appstream-glib
+    desktop-file-utils
+  ];
+
+  buildInputs = [
+    glib
+    gtk4
+    libadwaita
+    libgee
+    json-glib
+    gtksourceview5
+    gobject-introspection
+  ];
+
+  runtimeDependencies = [
+    pythonEnv
+  ];
+
+  postPatch = ''
+    chmod +x build-aux/meson/postinstall.py
+    patchShebangs build-aux/meson/postinstall.py
+    patchShebangs scripts/
+  '';
+
+  meta = with lib; {
+    description = "Quick text processing";
+    longDescription = "A small tool for quick text transformations such as checksums, encoding, decoding and so on.";
+    homepage = "https://github.com/liferooter/textpieces";
+    license = licenses.gpl3Plus;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ zendo ];
+  };
+}

pkgs/top-level/all-packages.nix

@@ -18097,11 +18097,13 @@ with pkgs;
     boost177
     boost178
     boost179
+    boost180
   ;
 
   boost15x = boost159;
   boost16x = boost169;
   boost17x = boost179;
+  boost18x = boost180;
   boost = boost17x;
 
   boost_process = callPackage ../development/libraries/boost-process { };
@@ -32061,6 +32063,8 @@ with pkgs;
 
   terminal-notifier = callPackage ../applications/misc/terminal-notifier {};
 
+  textpieces = callPackage ../tools/text/textpieces { };
+
   textplots = callPackage ../tools/graphics/textplots { };
 
   texture-synthesis = callPackage ../tools/graphics/texture-synthesis { };
@@ -32654,6 +32658,8 @@ with pkgs;
     imlib2 = imlib2-nox;
   };
 
+  watchmate = callPackage ../applications/misc/watchmate { };
+
   watson = callPackage ../applications/office/watson { };
 
   wapiti = callPackage ../tools/security/wapiti { };
@@ -35450,6 +35456,8 @@ with pkgs;
 
   dawn = callPackage ../applications/science/physics/dawn {};
 
+  dawncut = callPackage ../applications/science/physics/dawncut {};
+
   elmerfem = callPackage ../applications/science/physics/elmerfem {};
 
   mcfm = callPackage ../applications/science/physics/MCFM {