Merge staging-next into staging

2021-10-09 18:01:47 +00:00 · 2021-10-09 18:01:47 +00:00 · 81e9eafb15
commit 81e9eafb15
parent 976ba480d4 8397fd6ed9
21 changed files with 167 additions and 59 deletions
--- a/nixos/modules/services/misc/matrix-synapse.nix
+++ b/nixos/modules/services/misc/matrix-synapse.nix
@ -122,6 +122,14 @@ in {
  options = {
    services.matrix-synapse = {
      enable = mkEnableOption "matrix.org synapse";
+      configFile = mkOption {
+        type = types.str;
+        readOnly = true;
+        description = ''
+          Path to the configuration file on the target system. Useful to configure e.g. workers
+          that also need this.
+        '';
+      };
      package = mkOption {
        type = types.package;
        default = pkgs.matrix-synapse;
@ -706,6 +714,8 @@ in {
      }
    ];

+    services.matrix-synapse.configFile = "${configFile}";
+
    users.users.matrix-synapse = {
      group = "matrix-synapse";
      home = cfg.dataDir;
--- a/pkgs/applications/misc/fetchmail/default.nix
+++ b/pkgs/applications/misc/fetchmail/default.nix
@ -2,11 +2,11 @@

 stdenv.mkDerivation rec {
  pname = "fetchmail";
-  version = "6.4.21";
+  version = "6.4.22";

  src = fetchurl {
    url = "mirror://sourceforge/fetchmail/fetchmail-${version}.tar.xz";
-    sha256 = "sha256-akWcHK/XodqlzRNxQNpgwYyEtWmc2OckmnnDM0LJnR0=";
+    sha256 = "sha256-zGgYvVlDVgIWn6KS1tFj1Wshx/UxEoKUcKOs6r5hLIQ=";
  };

  buildInputs = [ openssl ];
--- a/pkgs/applications/networking/cluster/k0sctl/default.nix
+++ b/pkgs/applications/networking/cluster/k0sctl/default.nix
@ -5,16 +5,16 @@

 buildGoModule rec {
  pname = "k0sctl";
-  version = "0.10.3";
+  version = "0.10.4";

  src = fetchFromGitHub {
    owner = "k0sproject";
    repo = pname;
    rev = "v${version}";
-    sha256 = "sha256-hlJfgNFHEjIrvHhaAje1XQbNO6e3D/qcCmdVFhklwqs=";
+    sha256 = "sha256-22jZWRnymIYN1LlGOo8abVx8DTUe9VK1xAHddLknt6A=";
  };

-  vendorSha256 = "sha256-3OTkigryWsyCytyNMyumJJtc/BwtdryvDQRan2dzqfg=";
+  vendorSha256 = "sha256-N4cU9wzBRZn71mZHkNDXKgSXvlN2QFS6K4MtlR25DJc=";

  ldflags = [
    "-s"
--- a/pkgs/applications/networking/cozy-drive/default.nix
+++ b/pkgs/applications/networking/cozy-drive/default.nix
@ -29,7 +29,7 @@ appimageTools.wrapType2 {
    description = "Cozy Drive is a synchronization tool for your files and folders with Cozy Cloud.";
    homepage = "https://cozy.io";
    license = licenses.gpl3Only;
-    maintainers = with maintainers; [ "Simarra" ];
+    maintainers = with maintainers; [ simarra ];
    platforms = [ "x86_64-linux" ];
  };
 }
--- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
+++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
@ -61,7 +61,7 @@ let
 in
 mkDerivation rec {
  pname = "telegram-desktop";
-  version = "3.1.8";
+  version = "3.1.9";
  # Note: Update via pkgs/applications/networking/instant-messengers/telegram/tdesktop/update.py

  # Telegram-Desktop with submodules
@ -70,7 +70,7 @@ mkDerivation rec {
    repo = "tdesktop";
    rev = "v${version}";
    fetchSubmodules = true;
-    sha256 = "129x733a5h6d5xdf3zdz5j5lz8mv6gas5jcnyhwzyk79df138whq";
+    sha256 = "1nmakl9jxmw3k8gka56cyywbjwv06a5983dy6h9jhkkq950fn33s";
  };

  postPatch = ''
--- a/pkgs/common-updater/scripts/list-archive-two-level-versions
+++ b/pkgs/common-updater/scripts/list-archive-two-level-versions
@ -1,4 +1,4 @@
-#! /bin/sh
+#!/usr/bin/env bash

 # lists all available versions listed for a package in a site (http)

--- a/pkgs/common-updater/scripts/list-git-tags
+++ b/pkgs/common-updater/scripts/list-git-tags
@ -1,4 +1,4 @@
-#! /bin/sh -x
+#!/usr/bin/env bash

 # lists all available tags from a git repository

--- a/pkgs/common-updater/scripts/update-source-version
+++ b/pkgs/common-updater/scripts/update-source-version
@ -188,7 +188,9 @@ tempHash=$(printf '%0*d' "$hashLength" 0)
 if [[ -n "$sri" ]]; then
    # SRI hashes only support base64
    # SRI hashes need to declare the hash type as part of the hash
-    tempHash="$(nix to-sri --type "$oldHashAlgo" "$tempHash")"
+    tempHash="$(nix hash to-sri --type "$oldHashAlgo" "$tempHash" 2>/dev/null \
+        || nix to-sri --type "$oldHashAlgo" "$tempHash" 2>/dev/null)" \
+        || die "Failed to convert hash to SRI representation!"
 fi

 # Escape regex metacharacter that are allowed in hashes (+)
@ -232,7 +234,9 @@ if [[ -z "$newHash" ]]; then

    if [[ -n "$sri" ]]; then
        # nix-build preserves the hashing scheme so we can just convert the result to SRI using the old type
-        newHash="$(nix to-sri --type "$oldHashAlgo" "$newHash")"
+        newHash="$(nix hash to-sri --type "$oldHashAlgo" "$newHash" 2>/dev/null \
+            || nix to-sri --type "$oldHashAlgo" "$newHash" 2>/dev/null)" \
+            || die "Failed to convert hash to SRI representation!"
    fi
 fi

--- a/pkgs/development/libraries/dxflib/default.nix
+++ b/pkgs/development/libraries/dxflib/default.nix
@ -4,11 +4,11 @@
 }:

 stdenv.mkDerivation rec {
-  version = "3.17.0";
+  version = "3.26.4";
  pname = "dxflib";
  src = fetchurl {
-    url = "http://www.qcad.org/archives/dxflib/${pname}-${version}-src.tar.gz";
-    sha256 = "09yjgzh8677pzkkr7a59pql5d11451c22pxksk2my30mapxsri96";
+    url = "https://qcad.org/archives/dxflib/${pname}-${version}-src.tar.gz";
+    sha256 = "0pwic33mj6bp4axai5jiyn4xqf31y0xmb1i0pcf55b2h9fav8zah";
  };
  nativeBuildInputs = [
    qmake
@ -38,6 +38,7 @@ stdenv.mkDerivation rec {
  doCheck = true;

  meta = {
+    homepage = "https://qcad.org/en/90-dxflib";
    maintainers = with lib.maintainers; [raskin];
    platforms = lib.platforms.linux;
    description = "DXF file format library";
--- a/pkgs/development/python-modules/djangorestframework-simplejwt/default.nix
+++ b/pkgs/development/python-modules/djangorestframework-simplejwt/default.nix
@ -1,23 +1,45 @@
-{ lib, buildPythonPackage, fetchPypi, django, djangorestframework, pyjwt }:
+{ lib
+, buildPythonPackage
+, django
+, djangorestframework
+, fetchPypi
+, pyjwt
+, python-jose
+, setuptools-scm
+}:

 buildPythonPackage rec {
-  pname = "djangorestframework_simplejwt";
+  pname = "djangorestframework-simplejwt";
  version = "4.8.0";

  src = fetchPypi {
-    inherit pname version;
+    pname = "djangorestframework_simplejwt";
+    inherit version;
    sha256 = "153c973c5c154baf566be431de8527c2bd62557fde7373ebcb0f02b73b28e07a";
  };

-  propagatedBuildInputs = [ django djangorestframework pyjwt ];
+  nativeBuildInputs = [
+    setuptools-scm
+  ];
+
+  propagatedBuildInputs = [
+    django
+    djangorestframework
+    pyjwt
+    python-jose
+  ];

  # Test raises django.core.exceptions.ImproperlyConfigured
  doCheck = false;

+  pythonImportsCheck = [
+    "rest_framework_simplejwt"
+  ];
+
  meta = with lib; {
-    description = "A minimal JSON Web Token authentication plugin for Django REST Framework";
+    description = "JSON Web Token authentication plugin for Django REST Framework";
    homepage = "https://github.com/davesque/django-rest-framework-simplejwt";
    license = licenses.mit;
-    maintainers = [ maintainers.arnoldfarkas ];
+    maintainers = with maintainers; [ arnoldfarkas ];
  };
 }
--- a/pkgs/development/python-modules/scrapy/default.nix
+++ b/pkgs/development/python-modules/scrapy/default.nix
@ -4,7 +4,7 @@
 , buildPythonPackage
 , cryptography
 , cssselect
-, fetchFromGitHub
+, fetchPypi
 , fetchpatch
 , glibcLocales
 , installShellFiles
@ -31,14 +31,13 @@

 buildPythonPackage rec {
  pname = "scrapy";
-  version = "2.5.0";
+  version = "2.5.1";
  disabled = pythonOlder "3.6";

-  src = fetchFromGitHub {
-    owner = pname;
-    repo = pname;
-    rev = version;
-    sha256 = "09lxnjz1cw37i9bgk8sci2xxknj20gi2lq8l7i0b3xw7q8bxzp7h";
+  src = fetchPypi {
+    inherit version;
+    pname = "Scrapy";
+    sha256 = "13af6032476ab4256158220e530411290b3b934dd602bb6dacacbf6d16141f49";
  };

  nativeBuildInputs = [
@ -82,7 +81,8 @@ buildPythonPackage rec {
    (fetchpatch {
      name = "remove-h2.patch";
      url = "https://github.com/scrapy/scrapy/commit/c5b1ee810167266fcd259f263dbfc0fe0204761a.patch";
-      sha256 = "1gw28wg8qcb0al59rz214hm17smspi6j5kg62nr1r850pykyrsqk";
+      sha256 = "0sa39yx9my4nqww8a12bk9zagx7b56vwy7xpxm4xgjapjl6mcc0k";
+      excludes = [ "tox.ini" ];
    })
  ];

@ -140,6 +140,7 @@ buildPythonPackage rec {
      range of purposes, from data mining to monitoring and automated testing.
    '';
    homepage = "https://scrapy.org/";
+    changelog = "https://github.com/scrapy/scrapy/raw/${version}/docs/news.rst";
    license = licenses.bsd3;
    maintainers = with maintainers; [ drewkett marsam ];
    platforms = platforms.unix;
--- a/pkgs/development/tools/electron/default.nix
+++ b/pkgs/development/tools/electron/default.nix
@ -125,23 +125,23 @@ rec {
    headers = "0pjj0ra5ksn6cdqiy84ydy45hivksknzbq3szs9r9dlajcczgw9l";
  };

-  electron_14 = mkElectron "14.1.0" {
-    armv7l-linux = "25a68645cdd1356d95a8bab9488f5aeeb9a206f9b5ee2df23c2e13f87d775847";
-    aarch64-linux = "94047dcf53c54f6a5520a6eb62e400174addf04fc0e3ebe04b548ca962de349a";
-    x86_64-linux = "27b60841c85369a0ea8b65a8b71cdd1fb08eba80d70e855e9311f46c595874f3";
-    i686-linux = "808795405d6b27221b219c2a0f7a058e3acb2e56195c87dc08828dc882ffb8e9";
-    x86_64-darwin = "36d8e900bdcf5b410655e7fcb47800fa1f5a473c46acc1c4ce326822e5e95ee1";
-    aarch64-darwin = "5c81f418f3f83dc6fc5893247dd386e1d23e609c83f798dd5aad451febed13c8";
-    headers = "0p8lkhy97yq43sl6s4rskhdnzl520968cyh5l4fdhl2fhm5mayd4";
+  electron_14 = mkElectron "14.1.1" {
+    armv7l-linux = "56cbba7f15c8caeef06af50e249e26974f1a01ca7133f7b9baa35338454b4f73";
+    aarch64-linux = "b9c1187d6116bd83c402b01215a2af3a6206f11de5609fa5eb5d0e75da6f8d26";
+    x86_64-linux = "5bf136691dfdff9ef97f459db489dd5c4c9981e48780fb7a92ebb2e575c8dffb";
+    i686-linux = "0a00bbea8a23a3d517fbdf9a8e82bc51a2276af57a1ee10793cffb8a2178a45f";
+    x86_64-darwin = "388c88d3b7c7b69d524b143c26d1e13f08e5192aad1197bfa955f56ff38ce9b3";
+    aarch64-darwin = "a3b17406a28553a04576199adb68b2c78a1c457e78985f5648231bbf9b367832";
+    headers = "1pw67w9l63xgkwp78wmnxfjgyzlrmij27bapd2yjrvj6ag7j9xgy";
  };

-  electron_15 = mkElectron "15.1.1" {
-    armv7l-linux = "902711052fdb0e7bfcded9396aa24fd5bcf6fcc5f70548f51396d75a45cd6645";
-    aarch64-linux = "05b24c409a6dbf83b5f64f2d8904fa37cf71259c46beaaabd4b9a5ba75d03cd3";
-    x86_64-linux = "70de2da51c6a8591b88f08366c82166a51b1719243f67ef1a14eddbb806a115f";
-    i686-linux = "30f4be4dcf06c6dda953af94dd14a232767592f69e7f408def1a5b58dab054ea";
-    x86_64-darwin = "ddfab707063a79f25a95983abeba6ef4e581d53b6f26e7667fde4fd11c5547b0";
-    aarch64-darwin = "8db2ff70446e081311bb1d5cc8a13fd66e7143046747f87cdb07b139d973bb89";
-    headers = "1hfgxk1iyzg6jr36s78l3m3g8433gna6l1n2jz33mz9iw66wgy27";
+  electron_15 = mkElectron "15.1.2" {
+    armv7l-linux = "fd176f658478c56355adb0ee81949f1b1bd073a86afba54ebb703923b99ff5f0";
+    aarch64-linux = "9493f410e983cb6a11f24375ea7959cc3e8ccab3b805b6095f4dafc9fa548e67";
+    x86_64-linux = "7acb839f6bf9bc95ae7ce26722fb6c5e9fd09bb9d58b674415bf92bded3b808e";
+    i686-linux = "018a5546baff524a649fe34957eddb88c30811dae6bd2c3bd110d15b41bc8554";
+    x86_64-darwin = "f95f70790fa689684ec2d4822451e45968a2307ccd674a4378a89667f1e2c50d";
+    aarch64-darwin = "edcfb7e83c5edad21b05d9babb4a2840157e68dbe4278c3ab3b609ece22e1372";
+    headers = "093ndqsqxk0k13rpdnpsjajf9a9599crzhhb412xlvzf8kzdzhxy";
  };
 }
--- a/pkgs/servers/home-assistant/default.nix
+++ b/pkgs/servers/home-assistant/default.nix
@ -771,6 +771,7 @@ in with py.pkgs; buildPythonApplication rec {
    "--deselect tests/components/wemo/test_sensor.py::TestInsightCurrentPower::test_state_unavailable"
    # tado/test_climate.py: Tries to connect to my.tado.com
    "--deselect tests/components/tado/test_climate.py::test_air_con"
+    "--deselect tests/components/tado/test_climate.py::test_heater"
    # helpers/test_system_info.py: AssertionError: assert 'Unknown' == 'Home Assistant Container'
    "--deselect tests/helpers/test_system_info.py::test_container_installationtype"
    # tests are located in tests/
--- a/pkgs/servers/http/nginx/modules.nix
+++ b/pkgs/servers/http/nginx/modules.nix
@ -452,6 +452,16 @@ in
    };
  };

+  upload = {
+    src = fetchFromGitHub {
+      name = "upload";
+      owner = "fdintino";
+      repo = "nginx-upload-module";
+      rev = "2.3.0";
+      sha256 = "8veZP516oC7TESO368ZsZreetbDt+1eTcamk7P1kWjU=";
+    };
+  };
+
  upstream-check = {
    src = fetchFromGitHub {
      name = "upstream-check";
--- a/pkgs/servers/matrix-synapse/0001-setup-add-homeserver-as-console-script.patch
+++ b/pkgs/servers/matrix-synapse/0001-setup-add-homeserver-as-console-script.patch
@ -1,7 +1,7 @@
 From 36ffbb7ad2c535180cae473b470a43f9db4fbdcd Mon Sep 17 00:00:00 2001
 From: Maximilian Bosch <maximilian@mbosch.me>
 Date: Mon, 16 Aug 2021 13:27:28 +0200
-Subject: [PATCH] setup: add homeserver as console script
+Subject: [PATCH 1/2] setup: add homeserver as console script

 With this change, it will be added to `$out/bin` in `nixpkgs` directly.
 This became necessary since our old workaround, calling it as script,
--- a/pkgs/servers/matrix-synapse/0002-Expose-generic-worker-as-binary-under-NixOS.patch
+++ b/pkgs/servers/matrix-synapse/0002-Expose-generic-worker-as-binary-under-NixOS.patch
@ -0,0 +1,43 @@
+From 3089758015c64cc1e6788793c4fe40a0e1783457 Mon Sep 17 00:00:00 2001
+From: Maximilian Bosch <maximilian@mbosch.me>
+Date: Tue, 5 Oct 2021 22:33:12 +0200
+Subject: [PATCH 2/2] Expose generic worker as binary under NixOS
+
+---
+ setup.py                      | 3 ++-
+ synapse/app/generic_worker.py | 6 +++++-
+ 2 files changed, 7 insertions(+), 2 deletions(-)
+
+diff --git a/setup.py b/setup.py
+index 27f1d842c..6383aed6f 100755
+--- a/setup.py
+++ b/setup.py
+@@ -135,7 +135,8 @@ setup(
+     python_requires="~=3.6",
+     entry_points={
+         'console_scripts': [
+-            'homeserver = synapse.app.homeserver:main'
+            'homeserver = synapse.app.homeserver:main',
+            'worker = synapse.app.generic_worker:main'
+         ]
+     },
+     classifiers=[
+diff --git a/synapse/app/generic_worker.py b/synapse/app/generic_worker.py
+index 3b7131af8..c77a6a95c 100644
+--- a/synapse/app/generic_worker.py
+++ b/synapse/app/generic_worker.py
+@@ -491,6 +491,10 @@ def start(config_options):
+     _base.start_worker_reactor("synapse-generic-worker", config)
+ 
+ 
+-if __name__ == "__main__":
+def main():
+     with LoggingContext("main"):
+         start(sys.argv[1:])
+
+
+if __name__ == "__main__":
+    main()
+-- 
+2.31.1
+
--- a/pkgs/servers/matrix-synapse/default.nix
+++ b/pkgs/servers/matrix-synapse/default.nix
@ -36,6 +36,7 @@ buildPythonApplication rec {

  patches = [
    ./0001-setup-add-homeserver-as-console-script.patch
+    ./0002-Expose-generic-worker-as-binary-under-NixOS.patch
  ];

  buildInputs = [ openssl ];
--- a/pkgs/tools/archivers/p7zip/default.nix
+++ b/pkgs/tools/archivers/p7zip/default.nix
@ -14,6 +14,9 @@ stdenv.mkDerivation rec {
  # Default makefile is full of impurities on Darwin. The patch doesn't hurt Linux so I'm leaving it unconditional
  postPatch = ''
    sed -i '/CC=\/usr/d' makefile.macosx_llvm_64bits
+    # Avoid writing timestamps into compressed manpages
+    # to maintain determinism.
+    substituteInPlace install.sh --replace 'gzip' 'gzip -n'
    chmod +x install.sh

    # I think this is a typo and should be CXX? Either way let's kill it
--- a/pkgs/tools/misc/mtm/default.nix
+++ b/pkgs/tools/misc/mtm/default.nix
@ -2,28 +2,29 @@

 stdenv.mkDerivation rec {
  pname = "mtm";
-  version = "1.2.0";
+  version = "1.2.1";
+
+  outputs = [ "out" "terminfo" ];

  src = fetchFromGitHub {
    owner = "deadpixi";
    repo = pname;
    rev = version;
-    sha256 = "0b2arkmbmabxmrqxlpvvvhll2qx0xgj7r4r6p0ymnm9p70idris4";
+    sha256 = "0gibrvah059z37jvn1qs4b6kvd4ivk2mfihmcpgx1vz6yg70zghv";
  };

  buildInputs = [ ncurses ];

-  preBuild = ''
-    substituteInPlace Makefile --replace "strip -s mtm" ""
+  makeFlags = [ "DESTDIR=${placeholder "out"}" "MANDIR=${placeholder "out"}/share/man/man1" ];
+
+  preInstall = ''
+    mkdir -p $out/bin/ $out/share/man/man1
  '';

-  installPhase = ''
-    runHook preInstall
-
-    install -Dm755 -t $out/bin mtm
-    install -Dm644 -t $out/share/man/man1 mtm.1
-
-    runHook postInstall
+  postInstall = ''
+    mkdir -p $terminfo/share/terminfo $out/nix-support
+    tic -x -o $terminfo/share/terminfo mtm.ti
+    echo "$terminfo" >> $out/nix-support/propagated-user-env-packages
  '';

  meta = with lib; {
--- a/pkgs/tools/networking/hurl/default.nix
+++ b/pkgs/tools/networking/hurl/default.nix
@ -3,6 +3,8 @@
 , rustPlatform
 , fetchFromGitHub
 , pkg-config
+, python3
+, installShellFiles
 , libxml2
 , openssl
 , curl
@ -21,6 +23,8 @@ rustPlatform.buildRustPackage rec {

  nativeBuildInputs = [
    pkg-config
+    python3
+    installShellFiles
  ];

  buildInputs = [
@ -35,9 +39,16 @@ rustPlatform.buildRustPackage rec {

  cargoSha256 = "sha256-tAg3xwmh7SjJsm9r5TnhXHIDLpUQpz3YDS6gWxFgps4=";

+  postInstall = ''
+    python ci/gen_manpage.py docs/hurl.md > hurl.1
+    python ci/gen_manpage.py docs/hurlfmt.md > hurlfmt.1
+    installManPage hurl.1 hurlfmt.1
+  '';
+
  meta = with lib; {
    description = "Command line tool that performs HTTP requests defined in a simple plain text format.";
    homepage = "https://hurl.dev/";
+    changelog = "https://github.com/Orange-OpenSource/hurl/raw/${version}/CHANGELOG.md";
    maintainers = with maintainers; [ eonpatapon ];
    license = licenses.asl20;
  };
--- a/pkgs/tools/security/exploitdb/default.nix
+++ b/pkgs/tools/security/exploitdb/default.nix
@ -2,13 +2,13 @@

 stdenv.mkDerivation rec {
  pname = "exploitdb";
-  version = "2021-10-06";
+  version = "2021-10-09";

  src = fetchFromGitHub {
    owner = "offensive-security";
    repo = pname;
    rev = version;
-    sha256 = "sha256-MTV6rDgy6FxmdQHoBnDNBwiKEiGj9THqoHJCwUoAoB8=";
+    sha256 = "sha256-VdiZFUl2vZRocwR+398fJa602wWIiB1URU+54X2XiDc=";
  };

  nativeBuildInputs = [ makeWrapper ];