Merge staging-next into staging

2024-11-27 09:23:01 +00:00 · 2021-03-02 06:17:20 +00:00 · 2021-03-02 06:17:20 +00:00 · b9b22451f0
commit b9b22451f0
parent 5863e72037 ecbacbd259
24 changed files with 150 additions and 280 deletions
--- a/pkgs/applications/editors/poke/default.nix
+++ b/pkgs/applications/editors/poke/default.nix
@ -0,0 +1,74 @@
+{ lib
+, stdenv
+, fetchurl
+, gettext
+, help2man
+, pkg-config
+, texinfo
+, makeWrapper
+, boehmgc
+, readline
+, guiSupport ? false, tcl, tcllib, tk
+, miSupport ? true, json_c
+, nbdSupport ? true, libnbd
+, textStylingSupport ? true
+, dejagnu
+}:
+
+let
+  isCross = stdenv.hostPlatform != stdenv.buildPlatform;
+in stdenv.mkDerivation rec {
+  pname = "poke";
+  version = "1.0";
+
+  src = fetchurl {
+    url = "mirror://gnu/${pname}/${pname}-${version}.tar.gz";
+    hash = "sha256-3pMLhwDAdys8LNDQyjX1D9PXe9+CxiUetRa0noyiWwo=";
+  };
+
+  postPatch = ''
+    patchShebangs .
+  '';
+
+  strictDeps = true;
+
+  nativeBuildInputs = [
+    gettext
+    help2man
+    pkg-config
+    texinfo
+  ] ++ lib.optional guiSupport makeWrapper;
+
+  buildInputs = [ boehmgc readline ]
+  ++ lib.optional guiSupport tk
+  ++ lib.optional miSupport json_c
+  ++ lib.optional nbdSupport libnbd
+  ++ lib.optional textStylingSupport gettext
+  ++ lib.optional (!isCross) dejagnu;
+
+  configureFlags = lib.optionals guiSupport [
+    "--with-tcl=${tcl}/lib"
+    "--with-tk=${tk}/lib"
+    "--with-tkinclude=${tk.dev}/include"
+  ];
+
+  enableParallelBuilding = true;
+
+  doCheck = !isCross;
+  checkInputs = lib.optionals (!isCross) [ dejagnu ];
+
+  postFixup = lib.optionalString guiSupport ''
+    wrapProgram "$out/bin/poke-gui" \
+      --prefix TCLLIBPATH ' ' ${tcllib}/lib/tcllib${tcllib.version}
+  '';
+
+  meta = with lib; {
+    description = "Interactive, extensible editor for binary data";
+    homepage = "http://www.jemarch.net/poke";
+    license = licenses.gpl3Plus;
+    maintainers = with maintainers; [ AndersonTorres metadark ];
+    platforms = platforms.unix;
+  };
+}
+
+# TODO: Enable guiSupport by default once it's more than just a stub
--- a/pkgs/applications/misc/gnome-passwordsafe/default.nix
+++ b/pkgs/applications/misc/gnome-passwordsafe/default.nix
@ -4,8 +4,8 @@
 , pkg-config
 , gettext
 , fetchFromGitLab
-, python3
-, libhandy_0
+, python3Packages
+, libhandy
 , libpwquality
 , wrapGAppsHook
 , gtk3
@ -15,9 +15,9 @@
 , desktop-file-utils
 , appstream-glib }:

-python3.pkgs.buildPythonApplication rec {
+python3Packages.buildPythonApplication rec {
  pname = "gnome-passwordsafe";
-  version = "3.99.2";
+  version = "5.0";
  format = "other";
  strictDeps = false; # https://github.com/NixOS/nixpkgs/issues/56943

@ -26,7 +26,7 @@ python3.pkgs.buildPythonApplication rec {
    owner = "World";
    repo = "PasswordSafe";
    rev = version;
-    sha256 = "0pi2l4gwf8paxm858mxrcsk5nr0c0zw5ycax40mghndb6b1qmmhf";
+    sha256 = "8EFKLNK7rZlYL2g/7FmaC5r5hcdblsnod/aB8NYiBvY=";
  };

  nativeBuildInputs = [
@ -44,26 +44,13 @@ python3.pkgs.buildPythonApplication rec {
    gtk3
    glib
    gdk-pixbuf
-    libhandy_0
+    libhandy
  ];

-  propagatedBuildInputs = with python3.pkgs; [
+  propagatedBuildInputs = with python3Packages; [
    pygobject3
    construct
-
-    # pykeepass 3.2.1 changed some exception types, and is not backwards compatible.
-    # Remove override once the MR is merged upstream.
-    # https://gitlab.gnome.org/World/PasswordSafe/-/merge_requests/79
-    (pykeepass.overridePythonAttrs (old: rec {
-      version = "3.2.0";
-      src = fetchPypi {
-        pname = "pykeepass";
-        inherit version;
-        sha256 = "1ysjn92bixq8wkwhlbhrjj9z0h80qnlnj7ks5478ndkzdw5gxvm1";
-      };
-      propagatedBuildInputs = old.propagatedBuildInputs ++ [ pycryptodome ];
-    }))
-
+    pykeepass
  ] ++ [
    libpwquality # using the python bindings
  ];
--- a/pkgs/applications/misc/mob/default.nix
+++ b/pkgs/applications/misc/mob/default.nix
@ -2,14 +2,14 @@

 buildGoPackage rec {
  pname = "mob";
-  version = "1.2.0";
+  version = "1.3.0";
  goPackagePath = "github.com/remotemobprogramming/mob";

  src = fetchFromGitHub {
    rev = "v${version}";
    owner = "remotemobprogramming";
    repo = pname;
-    sha256 = "sha256-hBzSf3UUW2FUp1jG1sPt7vN1iDybdMox/h6xHVrM7DY=";
+    sha256 = "sha256-uzWr6wWO6niocJ8yLc1Uu9Wt/FXlCuQrC0RJkgVlphM=";
  };

  meta = with lib; {
--- a/pkgs/applications/networking/ids/zeek/default.nix
+++ b/pkgs/applications/networking/ids/zeek/default.nix
@ -1,4 +1,5 @@
-{ lib, stdenv
+{ lib
+, stdenv
 , fetchurl
 , cmake
 , flex
@ -16,9 +17,7 @@
 , fetchpatch
 , coreutils
 }:
-let
-  preConfigure = (import ./script.nix {inherit coreutils;});
-in
+
 stdenv.mkDerivation rec {
  pname = "zeek";
  version = "3.2.4";
@ -32,9 +31,6 @@ stdenv.mkDerivation rec {
  buildInputs = [ openssl libpcap zlib curl libmaxminddb gperftools python swig ]
    ++ lib.optionals stdenv.isDarwin [ gettext ];

-  #see issue https://github.com/zeek/zeek/issues/804 to modify hardlinking duplicate files.
-  inherit preConfigure;
-
  patches = lib.optionals stdenv.cc.isClang [
    # Fix pybind c++17 build with Clang. See: https://github.com/pybind/pybind11/issues/1604
    (fetchpatch {
@ -51,6 +47,18 @@ stdenv.mkDerivation rec {
    "-DINSTALL_AUX_TOOLS=true"
  ];

+  postInstall = ''
+    for file in $out/share/zeek/base/frameworks/notice/actions/pp-alarms.zeek $out/share/zeek/base/frameworks/notice/main.zeek; do
+      substituteInPlace $file \
+         --replace "/bin/rm" "${coreutils}/bin/rm" \
+         --replace "/bin/cat" "${coreutils}/bin/cat"
+    done
+
+    for file in $out/share/zeek/policy/misc/trim-trace-file.zeek $out/share/zeek/base/frameworks/logging/postprocessors/scp.zeek $out/share/zeek/base/frameworks/logging/postprocessors/sftp.zeek; do
+      substituteInPlace $file --replace "/bin/rm" "${coreutils}/bin/rm"
+    done
+  '';
+
  meta = with lib; {
    description = "Powerful network analysis framework much different from a typical IDS";
    homepage = "https://www.zeek.org";
--- a/pkgs/applications/networking/ids/zeek/script.nix
+++ b/pkgs/applications/networking/ids/zeek/script.nix
@ -1,69 +0,0 @@
-{coreutils}:
-''
-   sed -i 's|/bin/mv|${coreutils}/bin/mv|' scripts/base/frameworks/logging/writers/ascii.zeek
-   sed -i 's|/bin/mv|${coreutils}/bin/mv|' scripts/policy/misc/trim-trace-file.zeek
-   sed -i 's|/bin/cat|${coreutils}/bin/cat|' scripts/base/frameworks/notice/actions/pp-alarms.zeek
-   sed -i 's|/bin/cat|${coreutils}/bin/cat|' scripts/base/frameworks/notice/main.zeek
-
-   sed -i "1i##! test dpd" $PWD/scripts/base/frameworks/dpd/__load__.zeek
-   sed -i "1i##! test x509" $PWD/scripts/base/files/x509/__load__.zeek
-   sed -i "1i##! test files-extract" $PWD/scripts/base/files/extract/__load__.zeek
-   sed -i "1i##! test files-hash" $PWD/scripts/base/files/hash/__load__.zeek
-   sed -i "1i##! test files-pe" $PWD/scripts/base/files/pe/__load__.zeek
-   sed -i "1i##! test analyzer" $PWD/scripts/base/frameworks/analyzer/__load__.zeek
-   sed -i "1i##! test cluster" $PWD/scripts/base/frameworks/cluster/__load__.zeek
-   sed -i "1i##! test config" $PWD/scripts/base/frameworks/config/__load__.zeek
-   sed -i "1i##! test contro" $PWD/scripts/base/frameworks/control/__load__.zeek
-   sed -i "1i##! test files" $PWD/scripts/base/frameworks/files/__load__.zeek
-   sed -i "1i##! test files-magic" $PWD/scripts/base/frameworks/files/magic/__load__.zeek
-   sed -i "1i##! test input" $PWD/scripts/base/frameworks/input/__load__.zeek
-   sed -i "1i##! test intel" $PWD/scripts/base/frameworks/intel/__load__.zeek
-   sed -i "1i##! test logging" $PWD/scripts/base/frameworks/logging/__load__.zeek
-   sed -i "1i##! test logging-postprocessors" $PWD/scripts/base/frameworks/logging/postprocessors/__load__.zeek
-   sed -i "1i##! test netcontrol" $PWD/scripts/base/frameworks/netcontrol/__load__.zeek
-   sed -i "1i##! test netcontrol-plugins" $PWD/scripts/base/frameworks/netcontrol/plugins/__load__.zeek
-   sed -i "1i##! test notice" $PWD/scripts/base/frameworks/notice/__load__.zeek
-   sed -i "1i##! test openflow" $PWD/scripts/base/frameworks/openflow/__load__.zeek
-   sed -i "1i##! test openflow-plugins" $PWD/scripts/base/frameworks/openflow/plugins/__load__.zeek
-   sed -i "1i##! test packet-filter" $PWD/scripts/base/frameworks/packet-filter/__load__.zeek
-   sed -i "1i##! test reporter" $PWD/scripts/base/frameworks/reporter/__load__.zeek
-   sed -i "1i##! test signatures" $PWD/scripts/base/frameworks/signatures/__load__.zeek
-   sed -i "1i##! test software" $PWD/scripts/base/frameworks/software/__load__.zeek
-   sed -i "1i##! test sumstats" $PWD/scripts/base/frameworks/sumstats/__load__.zeek
-   sed -i "1i##! test sumstats-plugins" $PWD/scripts/base/frameworks/sumstats/plugins/__load__.zeek
-   sed -i "1i##! test conn" $PWD/scripts/base/protocols/conn/__load__.zeek
-   sed -i "1i##! test dce-rpc" $PWD/scripts/base/protocols/dce-rpc/__load__.zeek
-   sed -i "1i##! test dhcp" $PWD/scripts/base/protocols/dhcp/__load__.zeek
-   sed -i "1i##! test dnp3" $PWD/scripts/base/protocols/dnp3/__load__.zeek
-   sed -i "1i##! test dns" $PWD/scripts/base/protocols/dns/__load__.zeek
-   sed -i "1i##! test ftp" $PWD/scripts/base/protocols/ftp/__load__.zeek
-   sed -i "1i##! test http" $PWD/scripts/base/protocols/http/__load__.zeek
-   sed -i "1i##! test tunnels" $PWD/scripts/base/protocols/tunnels/__load__.zeek
-   sed -i "1i##! test imap" $PWD/scripts/base/protocols/imap/__load__.zeek
-   sed -i "1i##! test irc" $PWD/scripts/base/protocols/irc/__load__.zeek
-   sed -i "1i##! test krb" $PWD/scripts/base/protocols/krb/__load__.zeek
-   sed -i "1i##! test modbus" $PWD/scripts/base/protocols/modbus/__load__.zeek
-   sed -i "1i##! test mqtt" $PWD/scripts/base/protocols/mqtt/__load__.zeek
-   sed -i "1i##! test mysql" $PWD/scripts/base/protocols/mysql/__load__.zeek
-   sed -i "1i##! test ntlm" $PWD/scripts/base/protocols/ntlm/__load__.zeek
-   sed -i "1i##! test ntp" $PWD/scripts/base/protocols/ntp/__load__.zeek
-   sed -i "1i##! test pop3" $PWD/scripts/base/protocols/pop3/__load__.zeek
-   sed -i "1i##! test radius" $PWD/scripts/base/protocols/radius/__load__.zeek
-   sed -i "1i##! test rdp" $PWD/scripts/base/protocols/rdp/__load__.zeek
-   sed -i "1i##! test rfb" $PWD/scripts/base/protocols/rfb/__load__.zeek
-   sed -i "1i##! test sip" $PWD/scripts/base/protocols/sip/__load__.zeek
-   sed -i "1i##! test smb" $PWD/scripts/base/protocols/smb/__load__.zeek
-   sed -i "1i##! test smtp" $PWD/scripts/base/protocols/smtp/__load__.zeek
-   sed -i "1i##! test snmp" $PWD/scripts/base/protocols/snmp/__load__.zeek
-   sed -i "1i##! test socks" $PWD/scripts/base/protocols/socks/__load__.zeek
-   sed -i "1i##! test ssh" $PWD/scripts/base/protocols/ssh/__load__.zeek
-   sed -i "1i##! test ssl" $PWD/scripts/base/protocols/ssl/__load__.zeek
-   sed -i "1i##! test syslog" $PWD/scripts/base/protocols/syslog/__load__.zeek
-   sed -i "1i##! test xmpp" $PWD/scripts/base/protocols/xmpp/__load__.zeek
-   sed -i "1i##! test unified2" $PWD/scripts/policy/files/unified2/__load__.zeek
-   sed -i "1i##! test intel-seen" $PWD/scripts/policy/frameworks/intel/seen/__load__.zeek
-   sed -i "1i##! test notice" $PWD/scripts/policy/frameworks/notice/__load__.zeek
-   sed -i "1i##! test barnyard2" $PWD/scripts/policy/integration/barnyard2/__load__.zeek
-   sed -i "1i##! test collective-intel" $PWD/scripts/policy/integration/collective-intel/__load__.zeek
-   sed -i "1i##! test detect-traceroute" $PWD/scripts/policy/misc/detect-traceroute/__load__.zeek
-''
--- a/pkgs/applications/virtualization/x11docker/default.nix
+++ b/pkgs/applications/virtualization/x11docker/default.nix
@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
    description = "Run graphical applications with Docker";
    homepage = "https://github.com/mviereck/x11docker";
    license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ jD91mZM2 ];
+    maintainers = with lib.maintainers; [ ];
    platforms = lib.platforms.linux;
  };
 }
--- a/pkgs/desktops/xfce/default.nix
+++ b/pkgs/desktops/xfce/default.nix
@ -102,8 +102,6 @@ lib.makeScope pkgs.newScope (self: with self; {

  #### PANEL PLUGINS

-  xfce4-vala-panel-appmenu-plugin = callPackage ./panel-plugins/xfce4-vala-panel-appmenu-plugin { };
-
  xfce4-battery-plugin = callPackage ./panel-plugins/xfce4-battery-plugin { };

  xfce4-clipman-plugin = callPackage ./panel-plugins/xfce4-clipman-plugin { };
--- a/pkgs/desktops/xfce/panel-plugins/xfce4-vala-panel-appmenu-plugin/appmenu-gtk-module.nix
+++ b/pkgs/desktops/xfce/panel-plugins/xfce4-vala-panel-appmenu-plugin/appmenu-gtk-module.nix
@ -1,31 +0,0 @@
-{ lib, stdenv, fetchFromGitHub, cmake, vala, glib, gtk2, gtk3 }:
-stdenv.mkDerivation rec {
-  pname = "vala-panel-appmenu-xfce";
-  version = "0.6.94";
-
-  src = "${fetchFromGitHub {
-    owner = "rilian-la-te";
-    repo = "vala-panel-appmenu";
-    rev = version;
-    fetchSubmodules = true;
-
-    sha256 = "0xxn3zs60a9nfix8wrdp056wviq281cm1031hznzf1l38lp3wr5p";
-  }}/subprojects/appmenu-gtk-module";
-
-  nativeBuildInputs = [ cmake vala ];
-  buildInputs = [ glib gtk2 gtk3 ];
-
-  configurePhase = ''
-    cmake . -DGTK3_INCLUDE_GDK=
-  '';
-  installPhase = ''
-    make DESTDIR=output install
-    cp -r output/var/empty/* "$out"
-  '';
-
-  meta = with lib; {
-    description = "Port of the Unity GTK Module";
-    license = licenses.lgpl3;
-    maintainers = with maintainers; [ jD91mZM2 ];
-  };
-}
--- a/pkgs/desktops/xfce/panel-plugins/xfce4-vala-panel-appmenu-plugin/default.nix
+++ b/pkgs/desktops/xfce/panel-plugins/xfce4-vala-panel-appmenu-plugin/default.nix
@ -1,56 +0,0 @@
-{ lib, stdenv, fetchFromGitHub, substituteAll, callPackage, pkg-config, cmake, vala, libxml2,
-  glib, pcre, gtk2, gtk3, xorg, libxkbcommon, epoxy, at-spi2-core, dbus-glib, bamf,
-  xfce, libwnck3, libdbusmenu, gobject-introspection }:
-
-stdenv.mkDerivation rec {
-  pname = "xfce4-vala-panel-appmenu-plugin";
-  version = "0.7.3";
-
-  src = fetchFromGitHub {
-    owner = "rilian-la-te";
-    repo = "vala-panel-appmenu";
-    rev = version;
-    fetchSubmodules = true;
-
-    sha256 = "06rykdr2c9rnzxwinwdynd73v9wf0gjkx6qfva7sx2n94ajsdnaw";
-  };
-
-  nativeBuildInputs = [ pkg-config cmake vala libxml2.bin ];
-  buildInputs = [ (callPackage ./appmenu-gtk-module.nix {})
-                  glib pcre gtk2 gtk3 xorg.libpthreadstubs xorg.libXdmcp libxkbcommon epoxy
-                  at-spi2-core dbus-glib bamf xfce.xfce4panel_gtk3 xfce.libxfce4util xfce.xfconf
-                  libwnck3 libdbusmenu gobject-introspection ];
-
-  patches = [
-    (substituteAll {
-      src = ./fix-bamf-dependency.patch;
-      bamf = bamf;
-    })
-  ];
-
-  cmakeFlags = [
-      "-DENABLE_XFCE=ON"
-      "-DENABLE_BUDGIE=OFF"
-      "-DENABLE_VALAPANEL=OFF"
-      "-DENABLE_MATE=OFF"
-      "-DENABLE_JAYATANA=OFF"
-      "-DENABLE_APPMENU_GTK_MODULE=OFF"
-  ];
-
-  preConfigure = ''
-    mv cmake/FallbackVersion.cmake.in cmake/FallbackVersion.cmake
-  '';
-
-  passthru.updateScript = xfce.updateScript {
-    inherit pname version;
-    attrPath = "xfce.${pname}";
-    versionLister = xfce.gitLister src.meta.homepage;
-  };
-
-  meta = with lib; {
-    description = "Global Menu applet for XFCE4";
-    license = licenses.lgpl3;
-    maintainers = with maintainers; [ jD91mZM2 ];
-    broken = true;
-  };
-}
--- a/pkgs/desktops/xfce/panel-plugins/xfce4-vala-panel-appmenu-plugin/fix-bamf-dependency.patch
+++ b/pkgs/desktops/xfce/panel-plugins/xfce4-vala-panel-appmenu-plugin/fix-bamf-dependency.patch
@ -1,12 +0,0 @@
-+++ source/cmake/FindBAMF.cmake	2018-05-11 17:03:44.385917811 +0200
-@@ -80,9 +80,7 @@
- 
- find_program(BAMF_DAEMON_EXECUTABLE
- 	bamfdaemon
-	HINTS ${CMAKE_INSTALL_FULL_LIBDIR}
-		  ${CMAKE_INSTALL_FULL_LIBEXECDIR}
-		  ${BAMF_LIBDIR}
-+	HINTS "@bamf@/libexec/bamf/"
- 	PATH_SUFFIXES bamf
- )
- 
--- a/pkgs/development/libraries/libfyaml/default.nix
+++ b/pkgs/development/libraries/libfyaml/default.nix
@ -1,15 +1,21 @@
-{ lib, stdenv, fetchurl, gnum4 }:
+{ lib, stdenv, fetchFromGitHub, pkg-config, autoreconfHook }:

 stdenv.mkDerivation rec {
  pname = "libfyaml";
-  version = "0.5.7";
+  version = "0.6";

-  src = fetchurl {
-    url = "https://github.com/pantoniou/libfyaml/releases/download/v${version}/libfyaml-${version}.tar.gz";
-    sha256 = "143m30f006jsvhikk9nc050hxzqi8xg0sbd88kjrgfpyncdz689j";
+  src = fetchFromGitHub {
+    owner = "pantoniou";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "0b1wnalh49rbjykw4bj5k3y1d9yr8k6f0im221bl1gyrwlgw7hp5";
  };

-  nativeBuildInputs = [ gnum4 ];
+  nativeBuildInputs = [ autoreconfHook pkg-config ];
+
+  postPatch = ''
+    echo ${version} > .tarball-version
+  '';

  meta = with lib; {
    homepage = "https://github.com/pantoniou/libfyaml";
--- a/pkgs/development/libraries/libical/default.nix
+++ b/pkgs/development/libraries/libical/default.nix
@ -67,7 +67,7 @@ stdenv.mkDerivation rec {
    "-DGOBJECT_INTROSPECTION=True"
    "-DICAL_GLIB_VAPI=True"
  ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
-    "-DIMPORT_GLIB_SRC_GENERATOR=${lib.getDev buildPackages.libical}/lib/cmake/LibIcal/GlibSrcGenerator.cmake"
+    "-DIMPORT_ICAL_GLIB_SRC_GENERATOR=${lib.getDev buildPackages.libical}/lib/cmake/LibIcal/IcalGlibSrcGenerator.cmake"
  ];

  patches = [
--- a/pkgs/development/ocaml-modules/parmap/default.nix
+++ b/pkgs/development/ocaml-modules/parmap/default.nix
@ -2,11 +2,11 @@

 buildDunePackage rec {
  pname = "parmap";
-  version = "1.1.1";
+  version = "1.2";

  src = fetchurl {
    url = "https://github.com/rdicosmo/${pname}/releases/download/${version}/${pname}-${version}.tbz";
-    sha256 = "1pci7b1jqxkgmrbhr0p5j98i4van5nfmmb3sak8cyvxhwgna93j4";
+    sha256 = "sha256-XUXptzD0eytaypaBQ+EBp4iVFRE6/Y0inS93t/YZrM8=";
  };

  doCheck = true;
--- a/pkgs/development/tools/scaff/default.nix
+++ b/pkgs/development/tools/scaff/default.nix
@ -1,26 +0,0 @@
-{ lib, rustPlatform, fetchFromGitLab, pkg-config, openssl }:
-
-rustPlatform.buildRustPackage rec {
-  pname = "scaff";
-  version = "0.1.2";
-
-  src = fetchFromGitLab {
-    owner = "jD91mZM2";
-    repo = pname;
-    rev = version;
-
-    sha256 = "01yf2clf156qv2a6w866a2p8rc2dl8innxnsqrj244x54s1pk27r";
-  };
-
-  cargoSha256 = "1v6580mj70d7cqbjw32slz65lg6c8ficq5mdkfbivs63hqkv4hgx";
-
-  nativeBuildInputs = [ pkg-config ];
-  buildInputs = [ openssl ];
-
-  meta = with lib; {
-    description = "Painless and powerful scaffolding of projects";
-    license = licenses.mit;
-    maintainers = with maintainers; [ jD91mZM2 ];
-    platforms = platforms.unix;
-  };
-}
--- a/pkgs/games/osu-lazer/default.nix
+++ b/pkgs/games/osu-lazer/default.nix
@ -16,13 +16,13 @@ let

 in stdenv.mkDerivation rec {
  pname = "osu-lazer";
-  version = "2021.220.0";
+  version = "2021.226.0";

  src = fetchFromGitHub {
    owner = "ppy";
    repo = "osu";
    rev = version;
-    sha256 = "XGwG/1cWSUNniCrUY1/18KHRtumxIWjfW5x+aYQ6RKU=";
+    sha256 = "sK7FFyOb3JdsqIqvDNexhg3ZPNRpCE4hH0BADYeFHoU=";
  };

  patches = [ ./bypass-tamper-detection.patch ];
--- a/pkgs/games/osu-lazer/deps.nix
+++ b/pkgs/games/osu-lazer/deps.nix
@ -395,14 +395,9 @@
    sha256 = "1jfbqfngwwjx3x1cyqaamf26s7j6wag86ig1n7bh99ny85gd78wb";
  })
  (fetchNuGet {
-    name = "Microsoft.CodeAnalysis.FxCopAnalyzers";
-    version = "3.3.2";
-    sha256 = "02apz67f1gbp4p0wy7r593m10mhjm0rwp9q1n96p9avhdc3dwmv5";
-  })
-  (fetchNuGet {
-    name = "Microsoft.CodeAnalysis.VersionCheckAnalyzer";
-    version = "3.3.2";
-    sha256 = "1wxfkn16bqay7z64yxx50y9qkyznbfrv269h19fd60dy0vflwlfv";
+    name = "Microsoft.CodeAnalysis.NetAnalyzers";
+    version = "5.0.3";
+    sha256 = "1l0zg9wl8yapjq9g2d979zhsmdkr8kfybmxnl7kvgkgldf114fbg";
  })
  (fetchNuGet {
    name = "Microsoft.CodeAnalysis.Workspaces.Common";
@ -414,11 +409,6 @@
    version = "3.8.0";
    sha256 = "1ag78ls51s88znv4v004sbklrx3qnbphpdngjq196188a3vljww7";
  })
-  (fetchNuGet {
-    name = "Microsoft.CodeQuality.Analyzers";
-    version = "3.3.2";
-    sha256 = "0hfsjqg4kz5ylx461ssvbx64wgaiy8gcalb760jc53lvbd8qrq5r";
-  })
  (fetchNuGet {
    name = "Microsoft.CSharp";
    version = "4.0.1";
@ -579,11 +569,6 @@
    version = "5.0.0";
    sha256 = "0swqcknyh87ns82w539z1mvy804pfwhgzs97cr3nwqk6g5s42gd6";
  })
-  (fetchNuGet {
-    name = "Microsoft.NetCore.Analyzers";
-    version = "3.3.2";
-    sha256 = "1h1bjiiw64qncs61p2idwxswv4kzq06bbl2rlghiagv6sbjk4pnq";
-  })
  (fetchNuGet {
    name = "Microsoft.NETCore.App.Runtime.linux-x64";
    version = "5.0.0";
@ -619,11 +604,6 @@
    version = "5.0.0";
    sha256 = "0z3qyv7qal5irvabc8lmkh58zsl42mrzd1i0sssvzhv4q4kl3cg6";
  })
-  (fetchNuGet {
-    name = "Microsoft.NetFramework.Analyzers";
-    version = "3.3.2";
-    sha256 = "0samfc6c3mm7c4g6b0m01c8c37ip5ywy1i2my02xsbf9vygkal89";
-  })
  (fetchNuGet {
    name = "Microsoft.Win32.Primitives";
    version = "4.0.1";
@ -726,8 +706,8 @@
  })
  (fetchNuGet {
    name = "ppy.osu.Framework";
-    version = "2021.220.0";
-    sha256 = "0lsv1xl4wav9wv50d1aba56sf6dgqa5qsx4lfn81azy3lzpcbzpp";
+    version = "2021.226.0";
+    sha256 = "0875lcd28vmx4f40k8m957lcpg0ilkzm3da12j94xaqk88mx4j7c";
  })
  (fetchNuGet {
    name = "ppy.osu.Framework.NativeLibs";
--- a/pkgs/games/r2mod_cli/default.nix
+++ b/pkgs/games/r2mod_cli/default.nix
@ -7,13 +7,13 @@

 stdenv.mkDerivation rec {
  pname = "r2mod_cli";
-  version = "1.0.5";
+  version = "1.0.6";

  src = fetchFromGitHub {
    owner = "Foldex";
    repo = "r2mod_cli";
    rev = "v${version}";
-    sha256 = "1g64f8ms7yz4rzm6xb93agc08kh9sbwkhvq35dpfhvi6v59j3n5m";
+    sha256 = "0as3nl9qiyf9daf2n78lyish319qclf2gbhr20mdd5wnqmxpk276";
  };

  nativeBuildInputs = [ makeWrapper ];
--- a/pkgs/servers/matrix-synapse/default.nix
+++ b/pkgs/servers/matrix-synapse/default.nix
@ -12,11 +12,11 @@ let
 in
 buildPythonApplication rec {
  pname = "matrix-synapse";
-  version = "1.27.0";
+  version = "1.28.0";

  src = fetchPypi {
    inherit pname version;
-    sha256 = "1kpkxgyzz35ga4ld7cbjr0pfbhrcbrfmp9msnwjqllmsmy0g5bas";
+    sha256 = "sha256-KWEpgizOdil7dXIxug7xT3dEYEHi/IEPX/6aT7qW6C8=";
  };

  patches = [
--- a/pkgs/tools/X11/nx-libs/default.nix
+++ b/pkgs/tools/X11/nx-libs/default.nix
@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
    description = "NX X server based on Xnest";
    homepage = "https://github.com/ArcticaProject/nx-libs";
    license = lib.licenses.gpl2;
-    maintainers = with lib.maintainers; [ jD91mZM2 ];
+    maintainers = with lib.maintainers; [ ];
    platforms = lib.platforms.linux;
  };
 }
--- a/pkgs/tools/misc/pspg/default.nix
+++ b/pkgs/tools/misc/pspg/default.nix
@ -2,13 +2,13 @@

 stdenv.mkDerivation rec {
  pname = "pspg";
-  version = "4.2.1";
+  version = "4.3.0";

  src = fetchFromGitHub {
    owner = "okbob";
    repo = pname;
    rev = version;
-    sha256 = "sha256-r6qD7KyuBj67c+nhaRLHP5B46JV8VP9MKCloqYLua+Q=";
+    sha256 = "sha256-564ZHrok5RVFR9OYPpd6WjSZKieNFhnvUbBklayGOb0=";
  };

  nativeBuildInputs = [ pkg-config ];
--- a/pkgs/tools/networking/privoxy/default.nix
+++ b/pkgs/tools/networking/privoxy/default.nix
@ -3,11 +3,11 @@
 stdenv.mkDerivation rec {

  pname = "privoxy";
-  version = "3.0.31";
+  version = "3.0.32";

  src = fetchurl {
    url = "mirror://sourceforge/ijbswa/Sources/${version}%20%28stable%29/${pname}-${version}-stable-src.tar.gz";
-    sha256 = "sha256-B3cpo6rHkiKk6NiKZQ2QKNFv1LDWA42o9fXkcSDQBOs=";
+    sha256 = "sha256-xh3kAIxiRF7Bjx8nBAfL8jcuq6k76szcnjI4uy3v7tc=";
  };

  hardeningEnable = [ "pie" ];
@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
  meta = with lib; {
    homepage = "https://www.privoxy.org/";
    description = "Non-caching web proxy with advanced filtering capabilities";
-    license = licenses.gpl2;
+    license = licenses.gpl2Plus;
    platforms = platforms.all;
    maintainers = [ maintainers.phreedom ];
  };
--- a/pkgs/tools/security/brutespray/default.nix
+++ b/pkgs/tools/security/brutespray/default.nix
@ -1,14 +1,20 @@
-{ lib, stdenv, python3, fetchFromGitHub, makeWrapper, medusa }:
+{ lib
+, stdenv
+, python3
+, fetchFromGitHub
+, makeWrapper
+, medusa
+}:

 stdenv.mkDerivation rec {
  pname = "brutespray";
-  version = "1.6.8";
+  version = "1.7.0";

  src = fetchFromGitHub {
    owner = "x90skysn3k";
    repo = pname;
-    rev = "brutespray-${version}";
-    sha256 = "1pi4d5vcvvjsby39dq995dlhpxdicmfhqsiw23hr25m38ccfm3rh";
+    rev = "${pname}-${version}";
+    sha256 = "0lkm3fvx35ml5jh4ykjr2srq8qfajkmxwp4qfcn9xi58khk3asq3";
  };

  postPatch = ''
@ -33,7 +39,11 @@ stdenv.mkDerivation rec {

  meta = with lib; {
    homepage = "https://github.com/x90skysn3k/brutespray";
-    description = "Brute-Forcing from Nmap output - Automatically attempts default creds on found services";
+    description = "Tool to do brute-forcing from Nmap output";
+    longDescription = ''
+      This tool automatically attempts default credentials on found services
+      directly from Nmap output.
+    '';
    license = licenses.mit;
    maintainers = with maintainers; [ ma27 ];
  };
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@ -618,6 +618,7 @@ mapAliases ({
  saneBackendsGit = sane-backends-git; # added 2016-01-02
  saneFrontends = sane-frontends; # added 2016-01-02
  sapic = throw "sapic was deprecated on 2019-1-19: sapic is bundled with 'tamarin-prover' now";
+  scaff = throw "scaff is deprecated - replaced by https://gitlab.com/jD91mZM2/inc (not in nixpkgs yet)"; # added 2020-03-01
  scim = sc-im; # added 2016-01-22
  scollector = bosun; # added 2018-04-25
  sdlmame = mame; # added 2019-10-30
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@ -12862,8 +12862,6 @@ in

  sauce-connect = callPackage ../development/tools/sauce-connect { };

-  scaff = callPackage ../development/tools/scaff { };
-
  sd-local = callPackage ../development/tools/sd-local { };

  selenium-server-standalone = callPackage ../development/tools/selenium/server { };
@ -24577,6 +24575,8 @@ in

  plugin-torture = callPackage ../applications/audio/plugin-torture { };

+  poke = callPackage ../applications/editors/poke { };
+
  polar-bookshelf = callPackage ../applications/misc/polar-bookshelf { };

  poezio = python3Packages.poezio;