Merge master into staging-next

pkgs/applications/editors/emacs/elisp-packages/ement/default.nix

···
+{ trivialBuild
+, lib
+, fetchFromGitHub
+, curl
+, plz
+, cl-lib
+, ts
+}:
+
+trivialBuild {
+  pname = "ement";
+  version = "unstable-2021-09-08";
+
+  packageRequires = [
+    plz
+    cl-lib
+    ts
+  ];
+
+  src = fetchFromGitHub {
+    owner = "alphapapa";
+    repo = "ement.el";
+    rev = "468aa9b0526aaa054f059c63797aa3d9ea13611d";
+    sha256 = "sha256-0FCAu253iTSf9qcsmoJxKlzfd5eYc8eJXUxG6+0eg/I=";
+  };
+
+  meta = {
+    description = "Ement.el is a Matrix client for Emacs";
+    license = lib.licenses.gpl3Only;
+    platforms = lib.platforms.all;
+  };
+}

pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix

···
 
   emacspeak = callPackage ./emacspeak { };
 
+  ement = callPackage ./ement { };
+
   ess-R-object-popup = callPackage ./ess-R-object-popup { };
 
   font-lock-plus = callPackage ./font-lock-plus { };
···
   org-mac-link = callPackage ./org-mac-link { };
 
   perl-completion = callPackage ./perl-completion { };
+
+  plz = callPackage ./plz { };
 
   pod-mode = callPackage ./pod-mode { };
 

pkgs/applications/editors/emacs/elisp-packages/plz/default.nix

···
+{ trivialBuild, lib, fetchFromGitHub, curl }:
+
+trivialBuild {
+  pname = "plz";
+  version = "unstable-2021-08-22";
+
+  src = fetchFromGitHub {
+    owner = "alphapapa";
+    repo = "plz.el";
+    rev = "7e456638a651bab3a814e3ea81742dd917509cbb";
+    sha256 = "sha256-8kn9ax1AVF6f9iCTqvVeJZihs03pYAhLjUDooG/ubxY=";
+  };
+
+  postPatch = ''
+    substituteInPlace ./plz.el --replace 'plz-curl-program "curl"' 'plz-curl-program "${curl}/bin/curl"'
+  '';
+
+  meta = {
+    description = "plz is an HTTP library for Emacs";
+    license = lib.licenses.gpl3Only;
+    platforms = lib.platforms.all;
+  };
+}

pkgs/applications/misc/numberstation/default.nix

···
 
 python3.pkgs.buildPythonApplication rec {
   pname = "numberstation";
-  version = "0.4.0";
+  version = "0.5.0";
 
   format = "other";
 
···
     owner = "~martijnbraam";
     repo = "numberstation";
     rev = version;
-    sha256 = "038yyffqknr274f7jh5z12y68pjxr37f8y2cn2pwhf605jmbmpwv";
+    sha256 = "1hh66i0rfm85a97iajxlh965wk68hn0kkfgi9cljjkqf98xiy0bb";
   };
 
   postPatch = ''
···
     description = "TOTP Authentication application for mobile";
     homepage = "https://sr.ht/~martijnbraam/numberstation/";
     license = licenses.gpl3Only;
-    maintainers = with maintainers; [ dotlambda ];
+    maintainers = with maintainers; [ dotlambda tomfitzhenry ];
   };
 }

pkgs/applications/misc/obinskit/default.nix

···
 , libxkbcommon
 , systemd
 , xorg
-, electron_3
+, electron_11
 , makeWrapper
 , makeDesktopItem
 }:
···
     genericName = "Obinskit keyboard configurator";
     categories = "Utility";
   };
-  electron = electron_3;
+  electron = electron_11;
 in
 stdenv.mkDerivation rec {
   pname = "obinskit";
-  version = "1.1.4";
+  version = "1.1.8";
 
   src = fetchurl {
     url = "http://releases.obins.net/occ/linux/tar/ObinsKit_${version}_x64.tar.gz";
-    sha256 = "0q422rmfn4k4ww1qlgrwdmxz4l10dxkd6piynbcw5cr4i5icnh2l";
+    sha256 = "MgasbgexOdscQrUte/6OzCSrc74RvaBq44oHplQA/Gc=";
   };
 
   unpackPhase = "tar -xzf $src";
···
   postFixup = ''
     makeWrapper ${electron}/bin/electron $out/bin/${pname} \
       --add-flags $out/opt/obinskit/resources/app.asar \
-      --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ stdenv.cc.cc.lib libxkbcommon (lib.getLib systemd) xorg.libXt ]}"
+      --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ stdenv.cc.cc.lib libxkbcommon (lib.getLib systemd) xorg.libXt xorg.libXtst ]}"
   '';
 
   meta = with lib; {
     description = "Graphical configurator for Anne Pro and Anne Pro II keyboards";
-    homepage = "http://en.obins.net/obinskit/"; # https is broken
+    homepage = "https://www.hexcore.xyz/obinskit";
     license = licenses.unfree;
     maintainers = with maintainers; [ shou ];
     platforms = [ "x86_64-linux" ];

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

···
 , wrapGAppsHook
 , evolution-data-server
 , feedbackd
+, glibmm
+, gspell
 , gtk3
 , json-glib
 , libgcrypt
 , libhandy
 , libphonenumber
+, modemmanager
 , olm
 , pidgin
 , protobuf
···
 
 stdenv.mkDerivation rec {
   pname = "chatty";
-  version = "0.3.4";
+  version = "0.4.0";
 
   src = fetchFromGitLab {
     domain = "source.puri.sm";
     owner = "Librem5";
     repo = "chatty";
     rev = "v${version}";
-    sha256 = "0910f5bw75ph576gxbsd6ysdwnlk4ysdp0pml2i3mjqpcbkqfs3w";
+    sha256 = "12k1a5xrwd6zk4x0m53hbzggk695z3bpbzy1wcikzy0jvch7h13d";
   };
 
   postPatch = ''
···
   buildInputs = [
     evolution-data-server
     feedbackd
+    glibmm
+    gspell
     gtk3
     json-glib
     libgcrypt
     libhandy
     libphonenumber
+    modemmanager
     olm
     pidgin
     protobuf

pkgs/applications/networking/nextdns/default.nix

···
 
 buildGoModule rec {
   pname = "nextdns";
-  version = "1.36.0";
+  version = "1.37.2";
 
   src = fetchFromGitHub {
     owner = "nextdns";
     repo = "nextdns";
     rev = "v${version}";
-    sha256 = "sha256-aYWnopMRN0CDFpiWymhFT+f7vbKaP2HpjekVIr2rsME=";
+    sha256 = "sha256-R0n/wRCaQ8WvQer3bBLUmOdIojtfjXU0bs0pTn7L0lc=";
   };
 
   vendorSha256 = "sha256-YZm+DUrH+1xdJrGjmlajbcsnqVODVbZKivVjmqZ2e48=";

pkgs/applications/radio/pyradio/default.nix

···
 
 python3Packages.buildPythonApplication rec {
   pname = "pyradio";
-  version = "0.8.7.2";
+  version = "0.8.9.9";
 
   src = fetchFromGitHub {
     owner = "coderholic";
     repo = pname;
     rev = version;
-    sha256 = "0h2sxaqpmc1d1kpvpbcs9wymgzhx25x0x9p7dbyfw9r90i6123q1";
+    sha256 = "04asw5alkkf2q5iixswarj6ddb0y4a6ixm7cckl6204jiyxpv6kc";
   };
 
   checkPhase = ''

pkgs/applications/science/biology/picard-tools/default.nix

···
 
 stdenv.mkDerivation rec {
   pname = "picard-tools";
-  version = "2.26.0";
+  version = "2.26.2";
 
   src = fetchurl {
     url = "https://github.com/broadinstitute/picard/releases/download/${version}/picard.jar";
-    sha256 = "sha256-sz/7MtcCJlUlrNy16W1YB/zXMhYeLLbQOIOdzNsGW7w=";
+    sha256 = "sha256-mfqxaZpzX9BIoFl1okN3TxzJnoepsoMR1KqHLQY5BHQ=";
   };
 
   nativeBuildInputs = [ makeWrapper ];

pkgs/applications/version-management/git-and-tools/gitui/default.nix

···
-{ lib, stdenv, rustPlatform, fetchFromGitHub, libiconv, perl, python3, Security, AppKit, openssl, xclip }:
+{ lib, stdenv, rustPlatform, fetchFromGitHub, libiconv, perl, python3, Security, AppKit, openssl, xclip, pkg-config }:
 rustPlatform.buildRustPackage rec {
   pname = "gitui";
   version = "0.17.1";
···
 
   cargoSha256 = "sha256-9uRvxax0SrvRkD89mbZPxsfRItde11joA/ZgnXK9XBE=";
 
-  nativeBuildInputs = [ python3 perl ];
+  nativeBuildInputs = [ python3 perl pkg-config ];
   buildInputs = [ openssl ]
     ++ lib.optional stdenv.isLinux xclip
     ++ lib.optionals stdenv.isDarwin [ libiconv Security AppKit ];
+
+  # Needed to get openssl-sys to use pkg-config.
+  OPENSSL_NO_VENDOR = 1;
 
   meta = with lib; {
     description = "Blazing fast terminal-ui for git written in rust";

pkgs/applications/video/streamlink/default.nix

···
 { lib
-, python3
-, fetchFromGitHub
+, python3Packages
 , rtmpdump
 , ffmpeg
 }:
 
-python3.pkgs.buildPythonApplication rec {
+python3Packages.buildPythonApplication rec {
   pname = "streamlink";
-  version = "2.3.0";
+  version = "2.4.0";
 
-  src = fetchFromGitHub {
-    owner = "streamlink";
-    repo = "streamlink";
-    rev = version;
-    sha256 = "sha256-lsurDFvVHn1rxR3bgG7BY512ISavpja36/UaKXauf+g=";
+  src = python3Packages.fetchPypi {
+    inherit pname version;
+    sha256 = "e95588e222d1a7bd51e3171cd4bce84fd6f646418537aff37993d40f597810af";
   };
 
-  checkInputs = with python3.pkgs; [
+  checkInputs = with python3Packages; [
     pytestCheckHook
     mock
     requests-mock
     freezegun
   ];
 
-  propagatedBuildInputs = (with python3.pkgs; [
+  propagatedBuildInputs = (with python3Packages; [
     pycryptodome
     requests
     iso-639
     iso3166
     websocket-client
     isodate
+    lxml
   ]) ++ [
     rtmpdump
     ffmpeg
···
   # note that upstream currently uses requests 2.25.1 in Windows builds
   postPatch = ''
     substituteInPlace setup.py \
-      --replace 'requests>=2.26.0,<3.0' 'requests>=2.25.1,<3.0'
+      --replace 'requests>=2.26.0,<3.0' 'requests'
   '';
 
   meta = with lib; {
-    homepage = "https://github.com/streamlink/streamlink";
+    homepage = "https://streamlink.github.io/";
     description = "CLI for extracting streams from various websites to video player of your choosing";
     longDescription = ''
       Streamlink is a CLI utility that pipes videos from online
···
 
       Streamlink is a fork of the livestreamer project.
     '';
+    changelog = "https://github.com/streamlink/streamlink/raw/${version}/CHANGELOG.md";
     license = licenses.bsd2;
     platforms = platforms.linux ++ platforms.darwin;
     maintainers = with maintainers; [ dezgeg zraexy DeeUnderscore ];

pkgs/development/tools/metals/default.nix

···
 
 stdenv.mkDerivation rec {
   pname = "metals";
-  version = "0.10.5";
+  version = "0.10.6";
 
   deps = stdenv.mkDerivation {
     name = "${pname}-deps-${version}";
···
     '';
     outputHashMode = "recursive";
     outputHashAlgo = "sha256";
-    outputHash     = "0n0y522izqlyls3sn2x6mdjy0pmhrl1kr7z5fqac6wrpgcsczf01";
+    outputHash     = "1f31z5isr34acv3nbsdigk3h426vind2zk5qvy44zmb5qmlb15x9";
   };
 
   nativeBuildInputs = [ makeWrapper ];

pkgs/development/tools/misc/terraformer/default.nix

···
 
 buildGoModule rec {
   pname = "terraformer";
-  version = "0.8.15";
+  version = "0.8.16";
 
   src = fetchFromGitHub {
     owner = "GoogleCloudPlatform";
     repo = pname;
     rev = version;
-    sha256 = "sha256-d8DOUvUj5hdc1kcd0vgMufVIOJqV0eG4sXQIX597L/w=";
+    sha256 = "sha256-W2Lt24wYYVLaQBtljWrReTZyHj6b9SPHKBdxaMJYUcU=";
   };
 
-  vendorSha256 = "sha256-VQ3yZQqpq9KbAkBDnQAfOE+axlT0GhvUpMIjb59PYT0=";
+  vendorSha256 = "sha256-bJbPshTB5VOyyhY2iMVe1GLedRFbWBL4Q5eKLBsVrTA=";
 
   subPackages = [ "." ];
 

pkgs/servers/nats-server/default.nix

···
 
 buildGoPackage rec {
   pname   = "nats-server";
-  version = "2.4.0";
+  version = "2.5.0";
 
   goPackagePath = "github.com/nats-io/${pname}";
 
···
     rev    = "v${version}";
     owner  = "nats-io";
     repo   = pname;
-    sha256 = "sha256-v758qj1dy8zh3zfZxKkKALxZqNAxc1XdtTW4dxU4l5A=";
+    sha256 = "sha256-q6TgRbIorOL9ZSLdjAbqbwY60XJ2cZhxUHMrzGGZG8I=";
   };
 
   meta = {

pkgs/servers/teleport/default.nix

···
 in
 buildGoModule rec {
   pname = "teleport";
-  version = "7.0.3";
+  version = "7.1.0";
 
   # This repo has a private submodule "e" which fetchgit cannot handle without failing.
   src = fetchFromGitHub {
     owner = "gravitational";
     repo = "teleport";
     rev = "v${version}";
-    sha256 = "sha256-pWe4n/HilieUYfoO0OElC9ccMaTOaMcVadUfWUJJGhk=";
+    sha256 = "sha256-4kXI/eOrgJQYt4D/S709bUt+x5cGiFGAOP0VEoSgIsM=";
   };
 
   vendorSha256 = null;

pkgs/tools/games/ajour/default.nix

···
 
 in rustPlatform.buildRustPackage rec {
   pname = "Ajour";
-  version = "1.3.0";
+  version = "1.3.1";
 
   src = fetchFromGitHub {
     owner = "casperstorm";
     repo = "ajour";
     rev = version;
-    sha256 = "sha256-nz54KPvPmrFGXB52Jn6LKl1aSYgLngARcfC7YIAaC70=";
+    sha256 = "sha256-tUm5d2JTvYyNFnKgId8mivWTB+v4TURZX293fMd11pk=";
   };
 
-  cargoSha256 = "sha256-nsuo8PdQpdVJcDY8VDCLISnOz5+Z+MqG/OJC3FYCfEo=";
+  cargoSha256 = "sha256-SPmfXJLIA4OGEm/S2mi5xmIE9ng7hY3aHm/PCT7pg0E=";
 
   nativeBuildInputs = [
     autoPatchelfHook

pkgs/tools/inputmethods/kime/default.nix

···
 in
 stdenv.mkDerivation rec {
   pname = "kime";
-  version = "2.5.3";
+  version = "2.5.5";
 
   src = fetchFromGitHub {
     owner = "Riey";
     repo = pname;
     rev = "v${version}";
-    sha256 = "1kjw22hy2x90dc7xfm252v1pdr9x13mpm92rcgfy8zbkiqq242bl";
+    sha256 = "sha256-u2CmehJipXSH1dey5oIyQf8CsRveeae5cSjpY8vWYRs=";
   };
 
   cargoDeps = rustPlatform.fetchCargoTarball {
     inherit src;
-    sha256 = "05kb9vnifaw01qw5cmdh4wzcf50szb0y00085wx41m8h4f28hfbk";
+    sha256 = "sha256-ROzEEfIPeWoWDi5McNwub5E/UCAeJpOx5nZS9r/q4K4=";
   };
 
   # Replace autostart path

pkgs/tools/misc/nomino/default.nix

···
+{ fetchFromGitHub, lib, rustPlatform }:
+
+rustPlatform.buildRustPackage rec {
+  pname = "nomino";
+  version = "1.1.0";
+
+  src = fetchFromGitHub {
+    owner = "yaa110";
+    repo = pname;
+    rev = version;
+    sha256 = "1nnyz4gkwrc2zccw0ir5kvmiyyv3r0vxys9r7j4cf0ymngal5kwp";
+  };
+
+  cargoSha256 = "0501w3124vkipb1rnksjaizkghw3jf3nmmmmf3zprmcaim1b4szg";
+
+  meta = with lib; {
+    description = "Batch rename utility for developers";
+    homepage = "https://github.com/yaa110/nomino";
+    license = with licenses; [ mit /* or */ asl20 ];
+    maintainers = with maintainers; [ figsoda ];
+  };
+}

pkgs/tools/misc/slop/default.nix

···
 
 stdenv.mkDerivation rec {
   pname = "slop";
-  version = "7.5";
+  version = "7.6";
 
   src = fetchFromGitHub {
     owner = "naelstrof";
     repo = "slop";
     rev = "v${version}";
-    sha256 = "1k8xxb4rj2fylr4vj16yvsf73cyywliz9cy78pl4ibmi03jhg837";
+    sha256 = "sha256-LdBQxw8K8WWSfm4E2QpK4GYTuYvI+FX5gLOouVFSU/U=";
   };
 
   nativeBuildInputs = [ cmake pkg-config ];

pkgs/tools/security/swtpm/default.nix

···
 { lib
 , stdenv
-, fetchFromGitHub
+, fetchFromGitHub, fetchpatch
 , autoreconfHook
 , pkg-config
-, libtasn1, openssl, fuse, glib, libseccomp
+, libtasn1, openssl, fuse, glib, libseccomp, json-glib
 , libtpms
 , unixtools, expect, socat
 , gnutls
 , perl
-, python3, python3Packages
 }:
 
 stdenv.mkDerivation rec {
   pname = "swtpm";
-  version = "0.5.2";
+  version = "0.6.0";
 
   src = fetchFromGitHub {
     owner = "stefanberger";
     repo = "swtpm";
     rev = "v${version}";
-    sha256 = "sha256-KY5V4z/8I15ePjorgZueNahlD/xvFa3tDarA0tuRxFk=";
+    sha256 = "sha256-7YzdwGAGECj7PhaCOf/dLSILPXqtbylCkN79vuFBw5Y=";
   };
 
-  pythonPath = with python3Packages; requiredPythonModules [
-    setuptools
-    cryptography
-  ];
-
   patches = [
-    # upstream looks for /usr directory in $prefix to check
-    # whether or not to proceed with installation of python
-    # tools (swtpm_setup utility).
-    ./python-installation.patch
+    (fetchpatch {
+      url = "https://patch-diff.githubusercontent.com/raw/stefanberger/swtpm/pull/527.patch";
+      sha256 = "sha256-cpKHP15a27ifmmswSgHoNzGPO6TY/ZuJIfM5xLOlqlU=";
+    })
   ];
 
-  prePatch = ''
-    patchShebangs src/swtpm_setup/setup.py
-    patchShebangs samples/setup.py
-  '';
-
   nativeBuildInputs = [
     pkg-config unixtools.netstat expect socat
     perl # for pod2man
     autoreconfHook
-    python3
   ];
   buildInputs = [
     libtpms
     openssl libtasn1 libseccomp
-    fuse glib
+    fuse glib json-glib
     gnutls
-    python3.pkgs.wrapPython
   ];
-  propagatedBuildInputs = pythonPath;
 
   configureFlags = [
     "--with-cuse"
   ];
-
-  postInstall = ''
-    wrapPythonProgramsIn $out/bin "$out $pythonPath"
-    wrapPythonProgramsIn $out/share/swtpm "$out $pythonPath"
-  '';
 
   enableParallelBuilding = true;
 

pkgs/tools/security/swtpm/python-installation.patch

···
-commit 353794feb596d95e3f8893e39b174c5a89d1013e
-Author: Arthur Gautier <[e-mail]>
-Date:   Wed Feb 17 02:27:40 2021 +0000
-
-    python-install
-    
-    Signed-off-by: Arthur Gautier <[e-mail]>
-
-diff --git a/samples/Makefile.am b/samples/Makefile.am
-index 7d69bf8..1803bb9 100644
---- a/samples/Makefile.am
-+++ b/samples/Makefile.am
-@@ -39,19 +39,9 @@ python-uninstall:
- 	$(PIP3) uninstall -y $(PY_PACKAGE_NAME)
- 
- if PYTHON_INSTALLATION
--install-exec-local: $(PY_PACKAGE)
--	@if ! test $(findstring /usr, "$(DESTDIR)$(bindir)"); then \
--		echo "Warning: Not installing python package to $(DESTDIR)$(bindir)"; \
--	else \
--		$(MAKE) python-install; \
--	fi
-+install-exec-local: python-install
- 
--uninstall-local:
--	@if ! test $(findstring /usr, "$(DESTDIR)$(bindir)"); then \
--		echo "Cleanup for distcheck build not implemented" ; \
--	else \
--		$(MAKE) python-uninstall; \
--	fi
-+uninstall-local: python-uninstall
- endif
- 
- 
-diff --git a/src/swtpm_setup/Makefile.am b/src/swtpm_setup/Makefile.am
-index 529eefe..533b1b3 100644
---- a/src/swtpm_setup/Makefile.am
-+++ b/src/swtpm_setup/Makefile.am
-@@ -29,19 +29,9 @@ python-uninstall:
- 	$(PIP3) uninstall -y $(PY_PACKAGE_NAME)
- 
- if PYTHON_INSTALLATION
--install-exec-local: $(PY_PACKAGE)
--	@if ! test $(findstring /usr, "$(DESTDIR)$(bindir)"); then \
--		echo "Warning: Not installing python package to $(DESTDIR)$(bindir)"; \
--	else \
--		$(MAKE) python-install; \
--	fi
-+install-exec-local: python-install
- 
--uninstall-local:
--	@if ! test $(findstring /usr, "$(DESTDIR)$(bindir)"); then \
--		echo "Cleanup for distcheck build not implemented" ; \
--	else \
--		$(MAKE) python-uninstall; \
--	fi
-+uninstall-local: python-uninstall
- endif
- 
- # for out-of-tree builds we need to clean up

pkgs/tools/text/vale/default.nix

···
 
 buildGoModule rec {
   pname = "vale";
-  version = "2.10.5";
+  version = "2.10.6";
 
   subPackages = [ "cmd/vale" ];
   outputs = [ "out" "data" ];
···
     owner  = "errata-ai";
     repo   = "vale";
     rev    = "v${version}";
-    sha256 = "sha256-SxNM63MCtsBmjzFbO/leCQwWWew5nN8wTUdmzHkx7dQ=";
+    sha256 = "sha256-exBrs/MQhfqCxAJrnxECdKnxvsK9LvXIqpnYkR5h7uA=";
   };
 
   vendorSha256 = "sha256-3rCrRA9OKG2/wUlVvkG9lynJZOYFVqMkUZpGpW89KZc=";

pkgs/top-level/all-packages.nix

···
 
   nomad-driver-podman = callPackage ../applications/networking/cluster/nomad-driver-podman { };
 
+  nomino = callPackage ../tools/misc/nomino { };
+
   notable = callPackage ../applications/misc/notable { };
 
   ntlmrecon = callPackage ../tools/security/ntlmrecon { };