From 9a1bf524f52cc662abf85b2737f7d0f5037bb85f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Samuel=20Gr=C3=A4fenstein?= Date: Wed, 29 Sep 2021 16:00:00 +0200 Subject: [PATCH 01/20] common-updater-scripts/list-git-tags: don't print commands --- pkgs/common-updater/scripts/list-git-tags | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/common-updater/scripts/list-git-tags b/pkgs/common-updater/scripts/list-git-tags index ff09671c7cb0..61658342c3a5 100755 --- a/pkgs/common-updater/scripts/list-git-tags +++ b/pkgs/common-updater/scripts/list-git-tags @@ -1,4 +1,4 @@ -#! /bin/sh -x +#! /bin/sh # lists all available tags from a git repository From 8ae7cd8a93ce916e13bf6bdd76bf5ff68f6e333c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Samuel=20Gr=C3=A4fenstein?= Date: Wed, 29 Sep 2021 16:41:19 +0200 Subject: [PATCH 02/20] common-updater-scripts/*: /bin/sh -> /usr/bin/env bash --- pkgs/common-updater/scripts/list-archive-two-level-versions | 2 +- pkgs/common-updater/scripts/list-git-tags | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/common-updater/scripts/list-archive-two-level-versions b/pkgs/common-updater/scripts/list-archive-two-level-versions index e46652820ad2..36a051e97c91 100755 --- 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) diff --git a/pkgs/common-updater/scripts/list-git-tags b/pkgs/common-updater/scripts/list-git-tags index 61658342c3a5..d137552cdd66 100755 --- a/pkgs/common-updater/scripts/list-git-tags +++ b/pkgs/common-updater/scripts/list-git-tags @@ -1,4 +1,4 @@ -#! /bin/sh +#!/usr/bin/env bash # lists all available tags from a git repository From 17d18904e2bed21deea8f65cef27f741adb4ab08 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Samuel=20Gr=C3=A4fenstein?= Date: Fri, 1 Oct 2021 18:37:21 +0200 Subject: [PATCH 03/20] common-updater-scripts/update-source-version: Fix on Nix 2.4 --- pkgs/common-updater/scripts/update-source-version | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/common-updater/scripts/update-source-version b/pkgs/common-updater/scripts/update-source-version index d5c23466ee03..0ac6b3cf8c28 100755 --- 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 From b0ab15b0a12a2d9cacba0e0185589d905527df26 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Fri, 8 Oct 2021 14:45:46 +0200 Subject: [PATCH 04/20] nixos/matrix-synapse: expose rendered config file as readOnly option --- nixos/modules/services/misc/matrix-synapse.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/nixos/modules/services/misc/matrix-synapse.nix b/nixos/modules/services/misc/matrix-synapse.nix index 437bd05fdc2e..950c72c6e589 100644 --- 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; From b44e0ef9ce7cfdb05cf22bf02da8438edc2d7595 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Fri, 8 Oct 2021 14:46:09 +0200 Subject: [PATCH 05/20] matrix-synapse: also expose `synapse.app.generic_worker` via `setup.py` --- ...tup-add-homeserver-as-console-script.patch | 2 +- ...generic-worker-as-binary-under-NixOS.patch | 43 +++++++++++++++++++ pkgs/servers/matrix-synapse/default.nix | 1 + 3 files changed, 45 insertions(+), 1 deletion(-) create mode 100644 pkgs/servers/matrix-synapse/0002-Expose-generic-worker-as-binary-under-NixOS.patch diff --git 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 index eb70d21ed5cb..2a83c5fcf6d9 100644 --- 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 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, diff --git 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 new file mode 100644 index 000000000000..11dd53c9ad3e --- /dev/null +++ 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 +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 + diff --git a/pkgs/servers/matrix-synapse/default.nix b/pkgs/servers/matrix-synapse/default.nix index 1c5e92a94bb4..d0077a8c5cdc 100644 --- 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 ]; From c8fff86cd6dc7ddb3e8e804a9f3aff149191b72c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 8 Oct 2021 23:36:20 +0200 Subject: [PATCH 06/20] python3Packages.djangorestframework-simplejwt: add setuptools-scm --- .../djangorestframework-simplejwt/default.nix | 34 +++++++++++++++---- 1 file changed, 28 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/djangorestframework-simplejwt/default.nix b/pkgs/development/python-modules/djangorestframework-simplejwt/default.nix index ad9afabadf2c..6c54f3ded292 100644 --- 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 ]; }; } From 508d862dc72a4c2a1cb06700ab28ac319961e925 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 9 Oct 2021 00:04:20 +0000 Subject: [PATCH 07/20] python39Packages.scrapy: 2.5.0 -> 2.5.1 https://github.com/scrapy/scrapy/releases/tag/2.5.1 --- .../python-modules/scrapy/default.nix | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/scrapy/default.nix b/pkgs/development/python-modules/scrapy/default.nix index e19e502af269..dd06a04e080a 100644 --- 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; From 2a42dff30ef818486fe317e66ba748a1424ef552 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Fri, 8 Oct 2021 20:48:08 -0500 Subject: [PATCH 08/20] mtm: 1.2.0 -> 1.2.1 https://github.com/deadpixi/mtm/releases/tag/1.2.1 --- pkgs/tools/misc/mtm/default.nix | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/pkgs/tools/misc/mtm/default.nix b/pkgs/tools/misc/mtm/default.nix index bc8ac50d1aeb..c142c1f29036 100644 --- 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; { From 42f543b2173b3772c1f156feb6075acc805a5c0d Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Fri, 8 Oct 2021 20:53:02 -0500 Subject: [PATCH 09/20] hurl: install manpages --- pkgs/tools/networking/hurl/default.nix | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/pkgs/tools/networking/hurl/default.nix b/pkgs/tools/networking/hurl/default.nix index 1bd64250ae25..0843ba3a756a 100644 --- 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; }; From e8a12492fcc0c776a08ceafca93eb4a58564aca6 Mon Sep 17 00:00:00 2001 From: Vanilla Date: Sat, 9 Oct 2021 10:42:50 +0800 Subject: [PATCH 10/20] tdesktop: 3.1.8 -> 3.1.9 --- .../instant-messengers/telegram/tdesktop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix index 6fa76685a80d..d39ac978d8d3 100644 --- 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 = '' From edf8f5d054d878adba911c8fdb26ecba19ae4db4 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sat, 9 Oct 2021 09:14:41 +0100 Subject: [PATCH 11/20] p7zip: fix determinism of compressed manpages MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit diffoscope shown non-determinism in embedded gzip timestamp: --- p7zip-17.04/share/man/man1/7z.1.gz +++ p7zip-17.04.check/share/man/man1/7z.1.gz ─ filetype from file(1) @@ -1 +1 @@ -gzip compressed data, was "7z.1", last modified: Fri Oct 1 14:14:55 2021, from Unix +gzip compressed data, was "7z.1", last modified: Sat Oct 9 08:15:33 2021, from Unix Fix it by using `gzip -n`. --- pkgs/tools/archivers/p7zip/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/tools/archivers/p7zip/default.nix b/pkgs/tools/archivers/p7zip/default.nix index 96f9262427b0..7f892a44da5d 100644 --- 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 From 99805ce16739d1eb4d46bd9ccd1218a626b7c9f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Na=C3=AFm=20Favier?= Date: Thu, 23 Sep 2021 16:39:49 +0200 Subject: [PATCH 12/20] nginxModules.upload: init at 2.3.0 --- pkgs/servers/http/nginx/modules.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/servers/http/nginx/modules.nix b/pkgs/servers/http/nginx/modules.nix index 568f6d8b9e50..c5d9d8c7817d 100644 --- 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"; From e0f5245ab30f87ba4d357f8b3d32d6ed027a8f0f Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Sat, 9 Oct 2021 10:53:16 +0000 Subject: [PATCH 13/20] electron_15: 15.1.1 -> 15.1.2 https://github.com/electron/electron/releases/tag/v15.1.2 --- pkgs/development/tools/electron/default.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/development/tools/electron/default.nix b/pkgs/development/tools/electron/default.nix index c8c388847ad2..09ce522f3d25 100644 --- a/pkgs/development/tools/electron/default.nix +++ b/pkgs/development/tools/electron/default.nix @@ -135,13 +135,13 @@ rec { headers = "0p8lkhy97yq43sl6s4rskhdnzl520968cyh5l4fdhl2fhm5mayd4"; }; - 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"; }; } From 9b46db90ffb313e3d738be406d77c9ad0717ec84 Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Sat, 9 Oct 2021 10:53:44 +0000 Subject: [PATCH 14/20] electron_14: 14.1.0 -> 14.1.1 https://github.com/electron/electron/releases/tag/v14.1.1 --- pkgs/development/tools/electron/default.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/development/tools/electron/default.nix b/pkgs/development/tools/electron/default.nix index 09ce522f3d25..4aca895c6af3 100644 --- a/pkgs/development/tools/electron/default.nix +++ b/pkgs/development/tools/electron/default.nix @@ -125,14 +125,14 @@ 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.2" { From 139ecccc84091cb1ee605cc77e221fd643517caa Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 9 Oct 2021 13:39:47 +0200 Subject: [PATCH 15/20] home-assistant: disable tado test that needs network access --- pkgs/servers/home-assistant/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index add1be9d0be3..c5f1bb5d6021 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -769,6 +769,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/ From ed666b443daaaa4ea5a226606b4272c4b5286ff0 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Sat, 9 Oct 2021 20:03:24 +0800 Subject: [PATCH 16/20] k0sctl: 0.10.3 -> 0.10.4 --- pkgs/applications/networking/cluster/k0sctl/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/k0sctl/default.nix b/pkgs/applications/networking/cluster/k0sctl/default.nix index 8ce36e8c312e..b552af837bd0 100644 --- 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" From 383145270fe9640fe07f9806845acf1b7849be3e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 9 Oct 2021 14:21:21 +0200 Subject: [PATCH 17/20] exploitdb: 2021-10-06 -> 2021-10-09 --- pkgs/tools/security/exploitdb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/exploitdb/default.nix b/pkgs/tools/security/exploitdb/default.nix index 832051ebc562..30dbbd9a3b8e 100644 --- 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 ]; From 463c567becb387c462a7de387c20fcc567487e5c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Na=C3=AFm=20Favier?= Date: Sat, 9 Oct 2021 15:50:27 +0200 Subject: [PATCH 18/20] cozydrive: fix maintainers Having a string instead of a maintainer entry is causing the nixos-search import to [fail](https://github.com/NixOS/nixos-search/runs/3846627702?check_suite_focus=true#step:8:13) --- pkgs/applications/networking/cozy-drive/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/cozy-drive/default.nix b/pkgs/applications/networking/cozy-drive/default.nix index 75a11b0ea12c..57a791d9db4d 100644 --- 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" ]; }; } From 34c98d248ea162a5d7aa8e78a623e20cc3b700cf Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Sat, 9 Oct 2021 17:32:23 +0200 Subject: [PATCH 19/20] fetchmail: 6.4.21 -> 6.4.22 Fixes CVE-2021-39272. --- pkgs/applications/misc/fetchmail/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/fetchmail/default.nix b/pkgs/applications/misc/fetchmail/default.nix index 4baa3a094261..db807ffe1cf3 100644 --- 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 ]; From 314a49503af315c25a5fefb0eb3d088bd610ff32 Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Sat, 9 Oct 2021 18:05:45 +0200 Subject: [PATCH 20/20] libsForQt5.dxflib: 3.17.0 -> 3.26.4 Fixes CVE-2021-21897. --- pkgs/development/libraries/dxflib/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/dxflib/default.nix b/pkgs/development/libraries/dxflib/default.nix index 09f2ad3ccad6..b1af825cccd8 100644 --- 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";