From c14456e41eb4395989095bd5060e4bcda57e9c1c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 2 Apr 2022 02:32:01 +0000 Subject: [PATCH 01/35] libsolv: 0.7.21 -> 0.7.22 --- pkgs/development/libraries/libsolv/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libsolv/default.nix b/pkgs/development/libraries/libsolv/default.nix index 2d50851e583..3dde7038535 100644 --- a/pkgs/development/libraries/libsolv/default.nix +++ b/pkgs/development/libraries/libsolv/default.nix @@ -1,14 +1,14 @@ { lib, stdenv, fetchFromGitHub, cmake, ninja, zlib, expat, rpm, db }: stdenv.mkDerivation rec { - version = "0.7.21"; + version = "0.7.22"; pname = "libsolv"; src = fetchFromGitHub { owner = "openSUSE"; repo = "libsolv"; rev = version; - sha256 = "sha256-ka1HXVo0CFr0eqGTkatYq1jXE+9UgM0YTZNW1WtMLF0="; + sha256 = "sha256-rqWQJz3gZuhcNblyFWiYCC17miNY8F5xguAJwDk3xFE="; }; cmakeFlags = [ From b9ef500f11387852a9d4ed438c666151e8a56986 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 3 Apr 2022 16:55:01 +0000 Subject: [PATCH 02/35] scli: 0.7.0 -> 0.7.1 --- pkgs/applications/misc/scli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/scli/default.nix b/pkgs/applications/misc/scli/default.nix index 05223aeb5c1..6a32b395be9 100644 --- a/pkgs/applications/misc/scli/default.nix +++ b/pkgs/applications/misc/scli/default.nix @@ -8,13 +8,13 @@ python3.pkgs.buildPythonApplication rec { pname = "scli"; - version = "0.7.0"; + version = "0.7.1"; src = fetchFromGitHub { owner = "isamert"; repo = pname; rev = "v${version}"; - sha256 = "sha256-DUDf5FlcNZzZASa8vTc72Z1/Dk+iAhtcgVJtjDUwyEo="; + sha256 = "sha256-YEgeeoUqDeBx3jPddTeykl+68lS8gVKD+zdo+gRTaT4="; }; propagatedBuildInputs = with python3.pkgs; [ From 9d1895cd2418f87c8841170a118f005059d7339c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 4 Apr 2022 18:36:19 +0000 Subject: [PATCH 03/35] html-xml-utils: 8.3 -> 8.4 --- pkgs/tools/text/xml/html-xml-utils/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/text/xml/html-xml-utils/default.nix b/pkgs/tools/text/xml/html-xml-utils/default.nix index f1ab390e481..741dcaad344 100644 --- a/pkgs/tools/text/xml/html-xml-utils/default.nix +++ b/pkgs/tools/text/xml/html-xml-utils/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "html-xml-utils"; - version = "8.3"; + version = "8.4"; src = fetchurl { url = "https://www.w3.org/Tools/HTML-XML-utils/${pname}-${version}.tar.gz"; - sha256 = "sha256-pQxNFtrWYK1nku9TvHfvqdVyl5diN3Gj/OUtjiPT0Iw="; + sha256 = "sha256-QbubFOH0zWEC4/jft55xRqJMCWk4aYcxZcQhdppX0Tc="; }; buildInputs = [curl libiconv]; From f6b177664893b057c443a2008dd30b0001c4f982 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 6 Apr 2022 20:53:39 +0000 Subject: [PATCH 04/35] tgt: 1.0.81 -> 1.0.82 --- pkgs/tools/networking/tgt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/tgt/default.nix b/pkgs/tools/networking/tgt/default.nix index fdaf0dc177f..34f09368760 100644 --- a/pkgs/tools/networking/tgt/default.nix +++ b/pkgs/tools/networking/tgt/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "tgt"; - version = "1.0.81"; + version = "1.0.82"; src = fetchFromGitHub { owner = "fujita"; repo = pname; rev = "v${version}"; - sha256 = "sha256-SgMpoaVAuTbgpmnXRfQFWlK5gl01fsE9vJxu3C2ctPU="; + sha256 = "sha256-uVd1qPNBIqs9+pRnRP/Q8Z5sXpRdcwBejKjt0BJbXWA="; }; nativeBuildInputs = [ libxslt docbook_xsl makeWrapper ]; From aa977f5b7724e24fed379a9a46c4414e08a87ee1 Mon Sep 17 00:00:00 2001 From: Aaron Jheng Date: Sat, 16 Apr 2022 02:01:46 +0000 Subject: [PATCH 05/35] mmake: 1.2.0 -> 1.4.0 --- pkgs/tools/misc/mmake/default.nix | 18 ++++++++++-------- pkgs/tools/misc/mmake/deps.nix | 30 ------------------------------ 2 files changed, 10 insertions(+), 38 deletions(-) delete mode 100644 pkgs/tools/misc/mmake/deps.nix diff --git a/pkgs/tools/misc/mmake/default.nix b/pkgs/tools/misc/mmake/default.nix index 564e1989aee..2172b8b958c 100644 --- a/pkgs/tools/misc/mmake/default.nix +++ b/pkgs/tools/misc/mmake/default.nix @@ -1,19 +1,21 @@ -{ lib, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: -buildGoPackage rec { +buildGoModule rec { pname = "mmake"; - version = "1.2.0"; - - goPackagePath = "github.com/tj/mmake"; + version = "1.4.0"; src = fetchFromGitHub { owner = "tj"; repo = "mmake"; rev = "v${version}"; - sha256 = "1pyqgk04v0f7a28cwq9c40bd2cgrkrv4wqcijdzpgn4bqhrqab4f"; + sha256 = "sha256-JPsVfLIl06PJ8Nsfu7ogwrttB1G93HTKbZFqUTSV9O8="; }; - goDeps = ./deps.nix; + vendorSha256 = "sha256-0z+sujzzBl/rtzXbhL4Os+jYfLUuO9PlXshUDxAH9DU="; + + ldflags = [ "-s" "-w" ]; + + checkFlags = [ "-short" ]; meta = with lib; { homepage = "https://github.com/tj/mmake"; @@ -23,7 +25,7 @@ buildGoPackage rec { functionality, such as user-friendly help output, remote includes, and eventually more. It otherwise acts as a pass-through to standard make. - ''; + ''; license = licenses.mit; maintainers = [ maintainers.gabesoft ]; }; diff --git a/pkgs/tools/misc/mmake/deps.nix b/pkgs/tools/misc/mmake/deps.nix deleted file mode 100644 index 0721ad0af60..00000000000 --- a/pkgs/tools/misc/mmake/deps.nix +++ /dev/null @@ -1,30 +0,0 @@ -# This file was generated by https://github.com/kamilchm/go2nix v1.2.1 -[ - { - goPackagePath = "github.com/apex/log"; - fetch = { - type = "git"; - url = "https://github.com/apex/log"; - rev = "0296d6eb16bb28f8a0c55668affcf4876dc269be"; - sha256 = "067px84y73h60bai1yy6xqf2l05gq6zsp64fn58d4fwzk04aa16v"; - }; - } - { - goPackagePath = "github.com/pkg/errors"; - fetch = { - type = "git"; - url = "https://github.com/pkg/errors"; - rev = "c605e284fe17294bda444b34710735b29d1a9d90"; - sha256 = "1izjk4msnc6wn1mclg0ypa6i31zfwb1r3032k8q4jfbd57hp0bz6"; - }; - } - { - goPackagePath = "github.com/segmentio/go-env"; - fetch = { - type = "git"; - url = "https://github.com/segmentio/go-env"; - rev = "ea0600a7760cd15ccca9057be4a87d68e95ee876"; - sha256 = "0rgclbi0na5042cirr52lriwyb5a2rdpqx211zfwyrrvc3zq4lwq"; - }; - } -] From 509a6f1ebae10bf3c056ef49961768e5ca5a3406 Mon Sep 17 00:00:00 2001 From: Ashish SHUKLA Date: Tue, 3 May 2022 06:23:35 +0530 Subject: [PATCH 06/35] fnc: unbreak build Import a patch from upstream to be present in the next release --- pkgs/applications/version-management/fnc/default.nix | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/version-management/fnc/default.nix b/pkgs/applications/version-management/fnc/default.nix index 1e234dea5e3..3d0c7a9cd30 100644 --- a/pkgs/applications/version-management/fnc/default.nix +++ b/pkgs/applications/version-management/fnc/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchurl, stdenv, zlib, ncurses, libiconv }: +{ lib, fetchurl, fetchpatch, stdenv, zlib, ncurses, libiconv }: stdenv.mkDerivation rec { pname = "fnc"; @@ -9,6 +9,15 @@ stdenv.mkDerivation rec { sha256 = "1phqxh0afky7q2qmhgjlsq1awbv4254yd8wpzxlww4p7a57cp0lk"; }; + patches = [ + (fetchpatch { + name = "sqlite3-upgrade.patch"; + url = "https://fnc.bsdbox.org/vpatch?from=12e8919d436f52ca&to=091ce838edf67f1d"; + sha256 = "sha256-uKSO+lCY6h7Wkv5T7zeagMbpDxj6oirA/bty6i6Py8s="; + }) + ]; + patchFlags = [ "-p0" ]; + buildInputs = [ libiconv ncurses zlib ]; makeFlags = [ "PREFIX=$(out)" ]; From 8e56de6925a2c36dcef5c912da34d959049051f1 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Thu, 5 May 2022 22:29:30 +0100 Subject: [PATCH 07/35] btrfs-progs: 5.16.2 -> 5.17 Added trivial updater. Updated build-time doc dependencies from asciidoc to sphinx. Changes: https://github.com/kdave/btrfs-progs/blob/master/CHANGES --- pkgs/tools/filesystems/btrfs-progs/default.nix | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/filesystems/btrfs-progs/default.nix b/pkgs/tools/filesystems/btrfs-progs/default.nix index fad1944c4a0..f9e5340802e 100644 --- a/pkgs/tools/filesystems/btrfs-progs/default.nix +++ b/pkgs/tools/filesystems/btrfs-progs/default.nix @@ -1,22 +1,24 @@ { lib, stdenv, fetchurl -, asciidoc, docbook_xml_dtd_45, docbook_xsl, libxslt, pkg-config, python3, xmlto +, pkg-config, python3, sphinx , zstd , acl, attr, e2fsprogs, libuuid, lzo, udev, zlib , runCommand, btrfs-progs +, gitUpdater }: stdenv.mkDerivation rec { pname = "btrfs-progs"; - version = "5.16.2"; + version = "5.17"; src = fetchurl { url = "mirror://kernel/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v${version}.tar.xz"; - sha256 = "sha256-npswOh0P2c6q8gTudMHI+h/VV5TiI9n+K8Yodey9U9I="; + sha256 = "sha256-Y7d4/kwrrRjjcdzljtNUiOCPWDkhNnRU/diFB6PQ2J4="; }; nativeBuildInputs = [ - pkg-config asciidoc xmlto docbook_xml_dtd_45 docbook_xsl libxslt + pkg-config python3 python3.pkgs.setuptools + sphinx ]; buildInputs = [ acl attr e2fsprogs libuuid lzo python3 zlib zstd ] ++ lib.optionals stdenv.hostPlatform.isGnu [ udev ]; @@ -47,6 +49,14 @@ stdenv.mkDerivation rec { [ -e $out/success ] ''; }; + + passthru.updateScript = gitUpdater { + inherit pname version; + # No nicer place to find latest release. + url = "https://github.com/kdave/btrfs-progs.git"; + rev-prefix = "v"; + }; + meta = with lib; { description = "Utilities for the btrfs filesystem"; homepage = "https://btrfs.wiki.kernel.org/"; From 607be2704a556513c156d35d0e749599750e21c1 Mon Sep 17 00:00:00 2001 From: Nicolas Benes Date: Fri, 6 May 2022 11:13:04 +0200 Subject: [PATCH 08/35] tor-browser-bundle-bin: 11.0.10 -> 11.0.11 --- .../networking/browsers/tor-browser-bundle-bin/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix index 56c7083fee6..f7f0f0c230b 100644 --- a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix +++ b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix @@ -87,7 +87,7 @@ let fteLibPath = makeLibraryPath [ stdenv.cc.cc gmp ]; # Upstream source - version = "11.0.10"; + version = "11.0.11"; lang = "en-US"; @@ -98,7 +98,7 @@ let "https://tor.eff.org/dist/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz" "https://tor.calyxinstitute.org/dist/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz" ]; - sha256 = "1j39v01bb97hkhkfvz7xyfmv6y0sjjcymvn3sa9ahz2av1xlrplp"; + sha256 = "1dx92jdnvs7w52mps4zhnnjym6jsl9vwfiav1jw8qq0g8hslgybd"; }; i686-linux = fetchurl { @@ -107,7 +107,7 @@ let "https://tor.eff.org/dist/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz" "https://tor.calyxinstitute.org/dist/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz" ]; - sha256 = "0vh913z828ncb8pwz461xx61ylxqp44rf9iah7n6lzda7hcw79r3"; + sha256 = "165mg9gwmlqwskbk3i8lhjjqp4lmpq5vzdvd9zalx69xqh9v85i5"; }; }; in From af3565ce64fa629f520d6d6c8c2435e28713ca05 Mon Sep 17 00:00:00 2001 From: Artturin Date: Fri, 6 May 2022 16:21:37 +0300 Subject: [PATCH 09/35] tor-browser-bundle-bin: fix unbound variables --- .../browsers/tor-browser-bundle-bin/default.nix | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix index 56c7083fee6..fa31d79c962 100644 --- a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix +++ b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix @@ -357,7 +357,7 @@ stdenv.mkDerivation rec { TMPDIR="\''${TMPDIR:-/tmp}" \ HOME="\$HOME" \ XAUTHORITY="\''${XAUTHORITY:-\$HOME/.Xauthority}" \ - DISPLAY="\$DISPLAY" \ + DISPLAY="\''${DISPLAY:-}" \ DBUS_SESSION_BUS_ADDRESS="\''${DBUS_SESSION_BUS_ADDRESS:-unix:path=\$XDG_RUNTIME_DIR/bus}" \\ \ XDG_DATA_HOME="\$HOME/.local/share" \ @@ -366,10 +366,10 @@ stdenv.mkDerivation rec { PULSE_SERVER="\''${PULSE_SERVER:-}" \ PULSE_COOKIE="\''${PULSE_COOKIE:-}" \ \ - MOZ_ENABLE_WAYLAND=\$MOZ_ENABLE_WAYLAND \ - WAYLAND_DISPLAY="\$WAYLAND_DISPLAY" \ - XDG_RUNTIME_DIR="\$XDG_RUNTIME_DIR" \ - XCURSOR_PATH="\$XCURSOR_PATH" \ + MOZ_ENABLE_WAYLAND="\''${MOZ_ENABLE_WAYLAND:-}" \ + WAYLAND_DISPLAY="\''${WAYLAND_DISPLAY:-}" \ + XDG_RUNTIME_DIR="\''${XDG_RUNTIME_DIR:-}" \ + XCURSOR_PATH="\''${XCURSOR_PATH:-}" \ \ APULSE_PLAYBACK_DEVICE="\''${APULSE_PLAYBACK_DEVICE:-plug:dmix}" \ \ @@ -409,9 +409,7 @@ stdenv.mkDerivation rec { LD_LIBRARY_PATH=$libPath $TBB_IN_STORE/TorBrowser/Tor/tor --version >/dev/null echo "Checking tor-browser wrapper ..." - DISPLAY="" MOZ_ENABLE_WAYLAND="" WAYLAND_DISPLAY="" XAUTHORITY="" \ - XCURSOR_PATH="" XDG_RUNTIME_DIR="" XDG_SESSION_TYPE="" \ - DBUS_SESSION_BUS_ADDRESS="" TBB_HOME=$(mktemp -d) \ + TBB_HOME=$(mktemp -d) \ $out/bin/tor-browser --version >/dev/null ''; From 8fa20691d82463928e2ee14ec23851d7a24fcad9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 6 May 2022 23:57:57 +0200 Subject: [PATCH 10/35] rustscan: remove myself from maintainers --- pkgs/tools/security/rustscan/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/security/rustscan/default.nix b/pkgs/tools/security/rustscan/default.nix index adf514006b1..8f7498083cc 100644 --- a/pkgs/tools/security/rustscan/default.nix +++ b/pkgs/tools/security/rustscan/default.nix @@ -33,6 +33,6 @@ rustPlatform.buildRustPackage rec { description = "Faster Nmap Scanning with Rust"; homepage = "https://github.com/RustScan/RustScan"; license = licenses.gpl3Only; - maintainers = [ maintainers.SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } From be9c4140e74d9fe094ed00f9bd4d92e154f38f79 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sat, 7 May 2022 03:31:48 +0200 Subject: [PATCH 11/35] python310Packages.urwid: add SuperSandro2000 as maintainer, enable on python2 again just works fine, so why not? --- pkgs/development/python-modules/urwid/default.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/urwid/default.nix b/pkgs/development/python-modules/urwid/default.nix index 3df7f6703a7..57e64ba97a8 100644 --- a/pkgs/development/python-modules/urwid/default.nix +++ b/pkgs/development/python-modules/urwid/default.nix @@ -2,7 +2,6 @@ , buildPythonPackage , fetchPypi , isPy3k -, isPy27 , glibcLocales }: @@ -11,8 +10,6 @@ buildPythonPackage rec { version = "2.1.2"; format = "setuptools"; - disabled = isPy27; - src = fetchPypi { inherit pname version; sha256 = "588bee9c1cb208d0906a9f73c613d2bd32c3ed3702012f51efe318a3f2127eae"; @@ -33,6 +30,6 @@ buildPythonPackage rec { description = "A full-featured console (xterm et al.) user interface library"; homepage = "https://urwid.org/"; license = licenses.lgpl21Plus; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ SuperSandro2000 ]; }; } From 5d2dfa253eaf9092bfc10695e40b2c80371dd55c Mon Sep 17 00:00:00 2001 From: Jonas Heinrich Date: Fri, 6 May 2022 14:05:35 +0200 Subject: [PATCH 12/35] firejail: Fix resolve binary paths in user environment --- pkgs/os-specific/linux/firejail/default.nix | 7 +++++++ .../linux/firejail/whitelist-nix-profile.patch | 9 +++++++++ 2 files changed, 16 insertions(+) create mode 100644 pkgs/os-specific/linux/firejail/whitelist-nix-profile.patch diff --git a/pkgs/os-specific/linux/firejail/default.nix b/pkgs/os-specific/linux/firejail/default.nix index c3dc819b5bc..3caf41cfca5 100644 --- a/pkgs/os-specific/linux/firejail/default.nix +++ b/pkgs/os-specific/linux/firejail/default.nix @@ -37,9 +37,16 @@ stdenv.mkDerivation rec { # Adds the /nix directory when using an overlay. # Required to run any programs under this mode. ./mount-nix-dir-on-overlay.patch + # By default fbuilder hardcodes the firejail binary to the install path. # On NixOS the firejail binary is a setuid wrapper available in $PATH. ./fbuilder-call-firejail-on-path.patch + + # NixOS specific whitelist to resolve binary paths in user environment + # Fixes https://github.com/NixOS/nixpkgs/issues/170784 + # Upstream fix https://github.com/netblue30/firejail/pull/5131 + # Upstream hopefully fixed in later versions > 0.9.68 + ./whitelist-nix-profile.patch ]; prePatch = '' diff --git a/pkgs/os-specific/linux/firejail/whitelist-nix-profile.patch b/pkgs/os-specific/linux/firejail/whitelist-nix-profile.patch new file mode 100644 index 00000000000..227d28846ea --- /dev/null +++ b/pkgs/os-specific/linux/firejail/whitelist-nix-profile.patch @@ -0,0 +1,9 @@ +--- a/etc/inc/whitelist-common.inc.org 2022-05-06 13:57:17.294206339 +0200 ++++ b/etc/inc/whitelist-common.inc 2022-05-06 13:58:00.108655548 +0200 +@@ -83,3 +83,6 @@ + whitelist ${HOME}/.kde4/share/config/oxygenrc + whitelist ${HOME}/.kde4/share/icons + whitelist ${HOME}/.local/share/qt5ct ++ ++# NixOS specific to resolve binary paths ++whitelist ${HOME}/.nix-profile From f398d4f0fdc1dcd28a79beec885008d91c1cd529 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 7 May 2022 17:41:54 +0200 Subject: [PATCH 13/35] python310Packages.types-pytz: 2021.3.7 -> 2021.3.8 --- pkgs/development/python-modules/types-pytz/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/types-pytz/default.nix b/pkgs/development/python-modules/types-pytz/default.nix index d3ac7e4932b..bbbd7913018 100644 --- a/pkgs/development/python-modules/types-pytz/default.nix +++ b/pkgs/development/python-modules/types-pytz/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "types-pytz"; - version = "2021.3.7"; + version = "2021.3.8"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "sha256-EdW6BiaBZ5U8zEo+7hksJLQtANKu9FbBYKh5iJPLIIE="; + sha256 = "sha256-QSU6OivwKLaj8XtYdJppLZVa8PdOl13pT29NLTzQHb0="; }; # Modules doesn't have tests From 319dfb2709de79379e16204c43591f1c0cd053c5 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 7 May 2022 18:53:06 +0200 Subject: [PATCH 14/35] python310Packages.pyzerproc: 0.4.10 -> 0.4.11 --- pkgs/development/python-modules/pyzerproc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyzerproc/default.nix b/pkgs/development/python-modules/pyzerproc/default.nix index 7f726d8ae7f..bc90068e66e 100644 --- a/pkgs/development/python-modules/pyzerproc/default.nix +++ b/pkgs/development/python-modules/pyzerproc/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "pyzerproc"; - version = "0.4.10"; + version = "0.4.11"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "emlove"; repo = pname; rev = version; - sha256 = "sha256-sfxyHpJzYYwxLsvfJpqI6cC/CKS7Jx0vXSLL3QD9qV4="; + sha256 = "sha256-FNiq/dbh5PMTxnKCKDSHEvllehAEUYvWZS+OyP3lSW8="; }; postPatch = '' From b0d08ba09030cc491f8435b9f0a1c53d10d0fcf4 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 7 May 2022 18:57:08 +0200 Subject: [PATCH 15/35] python310Packages.yalexs: 1.1.23 -> 1.1.24 --- pkgs/development/python-modules/yalexs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/yalexs/default.nix b/pkgs/development/python-modules/yalexs/default.nix index 2eb38dd0784..948ca6c6b88 100644 --- a/pkgs/development/python-modules/yalexs/default.nix +++ b/pkgs/development/python-modules/yalexs/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "yalexs"; - version = "1.1.23"; + version = "1.1.24"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "bdraco"; repo = pname; rev = "v${version}"; - sha256 = "sha256-CnAVkwCOADBNY0cUvq9Dt6JR+fIr4LiZVMzJIIFqzG0="; + sha256 = "sha256-6wuTY1nH7btGEktH5UmTV2rMbsap5M55tJx3fljsnlY="; }; propagatedBuildInputs = [ From 2f653769f8d759b9a2e64f0ff44913843dac867e Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sat, 7 May 2022 12:10:19 +0100 Subject: [PATCH 16/35] freetalk: pull pending fix for -fno-common toolchains Without the change build on -fno-common toolchains like clamng-13 fails as: $ nix build --impure --expr 'with import ./. {}; freetalk.override { stdenv = clang13Stdenv; }' -L ... ld: more.o:src/./more.h:15: multiple definition of `cin'; primitives.o:src/./more.h:15: first defined here ld: more.o:src/./more.h:14: multiple definition of `initial_settings'; primitives.o:src/./more.h:14: first defined here --- .../instant-messengers/freetalk/default.nix | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/instant-messengers/freetalk/default.nix b/pkgs/applications/networking/instant-messengers/freetalk/default.nix index 4c28e346a12..ffe82e6708a 100644 --- a/pkgs/applications/networking/instant-messengers/freetalk/default.nix +++ b/pkgs/applications/networking/instant-messengers/freetalk/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub +{ lib, stdenv, fetchFromGitHub, fetchpatch , guile, pkg-config, glib, loudmouth, gmp, libidn, readline, libtool , libunwind, ncurses, curl, jansson, texinfo , automake, autoconf }: @@ -13,6 +13,16 @@ stdenv.mkDerivation rec { sha256 = "09jwk2i8qd8c7wrn9xbqcwm32720dwxis22kf3jpbg8mn6w6i757"; }; + patches = [ + # Pull pending patch for -fno-common tuulchain support: + # https://github.com/GNUFreetalk/freetalk/pull/39 + (fetchpatch { + name = "fno-common.patch"; + url = "https://github.com/GNUFreetalk/freetalk/commit/f04d6bc8422be44cdf51b29c9a4310f20a18775a.patch"; + sha256 = "1zjm56cdibnqabgcwl2bx79dj6dmqjf40zghqwwb0lfi60v1njqf"; + }) + ]; + preConfigure = '' ./autogen.sh ''; From 3414ffe11fd6f4783e335ad67a5ea4ad1aca6a9f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 7 May 2022 20:11:04 +0200 Subject: [PATCH 17/35] python310Packages.devolo-plc-api: 0.7.1 -> 0.8.0 --- pkgs/development/python-modules/devolo-plc-api/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/devolo-plc-api/default.nix b/pkgs/development/python-modules/devolo-plc-api/default.nix index 4fbc0f06fc4..5d44866da0e 100644 --- a/pkgs/development/python-modules/devolo-plc-api/default.nix +++ b/pkgs/development/python-modules/devolo-plc-api/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "devolo-plc-api"; - version = "0.7.1"; + version = "0.8.0"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "2Fake"; repo = "devolo_plc_api"; rev = "v${version}"; - sha256 = "sha256-XR/daDrnfbLBrUTTMFYtndr6+RxPwnF4qbXAdXsXKHk="; + sha256 = "sha256-LMwvIwbP/nRFby295ur6QTgyXLLJ8ip30V9bti27qKQ="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; From c793d21b64cf18fbca5cb2da903c7e68f0a67b6f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 7 May 2022 20:15:18 +0200 Subject: [PATCH 18/35] python310Packages.devolo-home-control-api: 0.18.1 -> 0.18.2 --- .../python-modules/devolo-home-control-api/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/devolo-home-control-api/default.nix b/pkgs/development/python-modules/devolo-home-control-api/default.nix index 31e9da795d3..5485372a1e1 100644 --- a/pkgs/development/python-modules/devolo-home-control-api/default.nix +++ b/pkgs/development/python-modules/devolo-home-control-api/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "devolo-home-control-api"; - version = "0.18.1"; + version = "0.18.2"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "2Fake"; repo = "devolo_home_control_api"; rev = "v${version}"; - sha256 = "sha256-Xj5k09uEVxZgG0oLbiPOBx/dALsRjqkZbLKit4X4q9Q="; + sha256 = "sha256-H4kLomHM0qq6LqsRMEp34oKy/4Me7AQi6dij2vraBS8="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; From 5bfd8093b72b0321354259cec9dc1050114a223c Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sat, 7 May 2022 22:00:28 +0100 Subject: [PATCH 19/35] xwinmosaic: pull upstream fix for -fno-common toolchains Without the change build fails as: $ nix build --impure --expr 'with import ./. {}; xwinmosaic.overrideAttrs (oa: { NIX_CFLAGS_COMPILE = (oa.NIX_CFLAGS_COMPILE or "") + "-fno-common"; })' ld: CMakeFiles/xwinmosaic.dir/main.c.o:(.bss+0xc0): multiple definition of `a_NET_CURRENT_DESKTOP'; CMakeFiles/xwinmosaic.dir/x_interaction.c.o:(.bss+0xc0): first defined here ld: CMakeFiles/xwinmosaic.dir/main.c.o:(.bss+0xc8): multiple definition of `a_NET_DESKTOP_VIEWPORT'; CMakeFiles/xwinmosaic.dir/x_interaction.c.o:(.bss+0xc8): first defined here --- pkgs/tools/X11/xwinmosaic/default.nix | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/X11/xwinmosaic/default.nix b/pkgs/tools/X11/xwinmosaic/default.nix index af17f3ade7d..51ba815f1de 100644 --- a/pkgs/tools/X11/xwinmosaic/default.nix +++ b/pkgs/tools/X11/xwinmosaic/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, gtk2, cmake, pkg-config, libXdamage }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, gtk2, cmake, pkg-config, libXdamage }: stdenv.mkDerivation rec { version = "0.4.2"; @@ -11,6 +11,16 @@ stdenv.mkDerivation rec { sha256 = "16qhrpgn84fz0q3nfvaz5sisc82zk6y7c0sbvbr69zfx5fwbs1rr"; }; + patches = [ + # Pull upstream fix for -fno-common toolchains like upstream gcc-10: + # https://github.com/soulthreads/xwinmosaic/pull/33 + (fetchpatch { + name = "fno-common.patch"; + url = "https://github.com/soulthreads/xwinmosaic/commit/a193a3f30850327066e5a93b29316cba2735e10d.patch"; + sha256 = "0qpk802j5x6bsfvj6jqw1nz482jynwyk7yrrh4bsziwc53khm95q"; + }) + ]; + nativeBuildInputs = [ pkg-config cmake ]; buildInputs = [ gtk2 libXdamage ]; From d9f391d75c562df1f411d19a364fdc4321340e83 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 8 May 2022 01:12:02 +0200 Subject: [PATCH 20/35] python310Packages.oscrypto: 1.2.1 -> 1.3.0 --- .../python-modules/oscrypto/default.nix | 44 +++++++++++-------- 1 file changed, 25 insertions(+), 19 deletions(-) diff --git a/pkgs/development/python-modules/oscrypto/default.nix b/pkgs/development/python-modules/oscrypto/default.nix index b4d1c8fb88a..96d4416ec96 100644 --- a/pkgs/development/python-modules/oscrypto/default.nix +++ b/pkgs/development/python-modules/oscrypto/default.nix @@ -1,24 +1,25 @@ { lib , stdenv -, buildPythonPackage , asn1crypto -, fetchPypi +, buildPythonPackage +, fetchFromGitHub , openssl +, pytestCheckHook +, pythonOlder }: buildPythonPackage rec { pname = "oscrypto"; - version = "1.2.1"; + version = "1.3.0"; + format = "setuptools"; - src = fetchPypi { - inherit pname version; - sha256 = "1546si2bdgkqnbvv4mw1hr4mhh6bq39d9z4wxgv1m7fq6miclb3x"; - }; + disabled = pythonOlder "3.7"; - testSources = fetchPypi { - inherit version; - pname = "oscrypto_tests"; - sha256 = "1ha68dsrbx6mlra44x0n81vscn17pajbl4yg7cqkk7mq1zfmjwks"; + src = fetchFromGitHub { + owner = "wbond"; + repo = pname; + rev = version; + hash = "sha256-CmDypmlc/kb6ONCUggjT1Iqd29xNSLRaGh5Hz36dvOw="; }; propagatedBuildInputs = [ @@ -26,21 +27,26 @@ buildPythonPackage rec { openssl ]; - preCheck = '' - tar -xf ${testSources} - mv oscrypto_tests-${version} tests - - # remove tests that require network - sed -e '/TLSTests/d' -e '/TrustListTests/d' -i tests/__init__.py - ''; + checkInputs = [ + pytestCheckHook + ]; - pythonImportsCheck = [ "oscrypto" ]; + pythonImportsCheck = [ + "oscrypto" + ]; doCheck = !stdenv.isDarwin; + disabledTests = [ + # Tests require network access + "TLSTests" + "TrustListTests" + ]; + meta = with lib; { description = "Encryption library for Python"; homepage = "https://github.com/wbond/oscrypto"; license = licenses.mit; + maintainers = with maintainers; [ ]; }; } From 0cd600f9298cfe8e3a3c06c44540dcb51e87afc7 Mon Sep 17 00:00:00 2001 From: Zhaofeng Li Date: Sat, 7 May 2022 20:03:55 -0700 Subject: [PATCH 21/35] dropwatch: 1.5.3 -> 1.5.4 --- pkgs/os-specific/linux/dropwatch/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/dropwatch/default.nix b/pkgs/os-specific/linux/dropwatch/default.nix index c2701c05719..470b5901870 100644 --- a/pkgs/os-specific/linux/dropwatch/default.nix +++ b/pkgs/os-specific/linux/dropwatch/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "dropwatch"; - version = "1.5.3"; + version = "1.5.4"; src = fetchFromGitHub { owner = "nhorman"; repo = pname; rev = "v${version}"; - sha256 = "0axx0zzrs7apqnl0r70jyvmgk7cs5wk185id479mapgngibwkyxy"; + sha256 = "sha256-TbhgcX5WzuigP5/Mj5JuK7O/UKcu70D7dcOcvo4fxeQ="; }; nativeBuildInputs = [ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7521d132290..fb14a864f69 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22918,7 +22918,9 @@ with pkgs; drbd = callPackage ../os-specific/linux/drbd { }; - dropwatch = callPackage ../os-specific/linux/dropwatch { }; + dropwatch = callPackage ../os-specific/linux/dropwatch { + readline = readline81; + }; dsd = callPackage ../applications/radio/dsd { }; From 905f72e4ee14b426a98ab763f595a6cc3be675e3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 8 May 2022 03:15:27 +0000 Subject: [PATCH 22/35] python310Packages.py-canary: 0.5.1 -> 0.5.2 --- pkgs/development/python-modules/py-canary/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/py-canary/default.nix b/pkgs/development/python-modules/py-canary/default.nix index 531624781b4..695b00a1a11 100644 --- a/pkgs/development/python-modules/py-canary/default.nix +++ b/pkgs/development/python-modules/py-canary/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "py-canary"; - version = "0.5.1"; + version = "0.5.2"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "snjoetw"; repo = pname; - rev = version; - sha256 = "0j743cc0wv7im3anx1vvdm79zyvw67swhc3zwwc1r8626dgnmxjr"; + rev = "refs/tags/${version}"; + sha256 = "sha256-PE31J82Uc6mErnh7nQ1pkIjnMbuCnlYEX2R0azknMHQ="; }; propagatedBuildInputs = [ From 17acaf170887f9c7aa76d01e74b92de5123a01fd Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 8 May 2022 05:24:16 +0000 Subject: [PATCH 23/35] kube-hunter: 0.6.5 -> 0.6.7 --- pkgs/tools/security/kube-hunter/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/kube-hunter/default.nix b/pkgs/tools/security/kube-hunter/default.nix index cbd4e4e3150..0f82cc0cbab 100644 --- a/pkgs/tools/security/kube-hunter/default.nix +++ b/pkgs/tools/security/kube-hunter/default.nix @@ -5,13 +5,13 @@ python3.pkgs.buildPythonApplication rec { pname = "kube-hunter"; - version = "0.6.5"; + version = "0.6.7"; src = fetchFromGitHub { owner = "aquasecurity"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-2pmViizQLwyTdP6J92ynvdIdqkfgc6SIhsll85g9pHA="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-W7jW0V91o164EIAzZ7ODWeqTmUaUFDIqlE37x/AycqY="; }; nativeBuildInputs = with python3.pkgs; [ From 11a0360f81537e72d7feeb23be213b9cf6c1f154 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 8 May 2022 07:13:17 +0000 Subject: [PATCH 24/35] python310Packages.types-dateutil: 2.8.14 -> 2.8.15 --- pkgs/development/python-modules/types-dateutil/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/types-dateutil/default.nix b/pkgs/development/python-modules/types-dateutil/default.nix index 8e52c5b6e01..e8cf1edbde5 100644 --- a/pkgs/development/python-modules/types-dateutil/default.nix +++ b/pkgs/development/python-modules/types-dateutil/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "types-python-dateutil"; - version = "2.8.14"; + version = "2.8.15"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "sha256-Nnwf+hpSpLKlNMmzC0CwHyt/LqR6l/2CH2x20ceuMSk="; + sha256 = "sha256-fbHk7UkWvRKMvuPuze4OBsxWhNoqHN/Vf5hUHN++CGE="; }; pythonImportsCheck = [ "dateutil-stubs" ]; From 0a623980428250b5a51bc2c0b606de733281ccba Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 8 May 2022 09:22:01 +0200 Subject: [PATCH 25/35] python310Packages.py-canary: add format --- pkgs/development/python-modules/py-canary/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/py-canary/default.nix b/pkgs/development/python-modules/py-canary/default.nix index 695b00a1a11..6685d245833 100644 --- a/pkgs/development/python-modules/py-canary/default.nix +++ b/pkgs/development/python-modules/py-canary/default.nix @@ -11,13 +11,15 @@ buildPythonPackage rec { pname = "py-canary"; version = "0.5.2"; + format = "setuptools"; + disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "snjoetw"; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-PE31J82Uc6mErnh7nQ1pkIjnMbuCnlYEX2R0azknMHQ="; + hash = "sha256-PE31J82Uc6mErnh7nQ1pkIjnMbuCnlYEX2R0azknMHQ="; }; propagatedBuildInputs = [ @@ -30,7 +32,9 @@ buildPythonPackage rec { requests-mock ]; - pythonImportsCheck = [ "canary" ]; + pythonImportsCheck = [ + "canary" + ]; meta = with lib; { description = "Python package for Canary Security Camera"; From 0f5f6f617a0bd880279b2178a5b85c2e07ebc4df Mon Sep 17 00:00:00 2001 From: Alex Eyre Date: Sun, 8 May 2022 08:51:56 +0100 Subject: [PATCH 26/35] maintainers: rename @alex-eyre to @alexeyre --- maintainers/maintainer-list.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index ea6c701ca8c..35616b4d212 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -530,9 +530,9 @@ githubId = 782180; name = "Alex Vorobiev"; }; - alex-eyre = { + alexeyre = { email = "A.Eyre@sms.ed.ac.uk"; - github = "alex-eyre"; + github = "alexeyre"; githubId = 38869148; name = "Alex Eyre"; }; From f18b66dd983f88e552fcd2b069284fe4cd0217b2 Mon Sep 17 00:00:00 2001 From: Alex Eyre Date: Sun, 8 May 2022 08:55:27 +0100 Subject: [PATCH 27/35] nimbo: change maintainer @alex-eyre to @alexeyre --- pkgs/applications/misc/nimbo/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/misc/nimbo/default.nix b/pkgs/applications/misc/nimbo/default.nix index 8af9d1471a0..5ad86eeccd4 100644 --- a/pkgs/applications/misc/nimbo/default.nix +++ b/pkgs/applications/misc/nimbo/default.nix @@ -52,6 +52,6 @@ python3.pkgs.buildPythonApplication rec { description = "Run machine learning jobs on AWS with a single command"; homepage = "https://github.com/nimbo-sh/nimbo"; license = licenses.bsl11; - maintainers = with maintainers; [ alex-eyre noreferences ]; + maintainers = with maintainers; [ alexeyre noreferences ]; }; } From 08085640ee1094bb5fa18b0e962ae64c8f6cc1d8 Mon Sep 17 00:00:00 2001 From: Alex Eyre Date: Sun, 8 May 2022 08:56:30 +0100 Subject: [PATCH 28/35] scli: change maintainer @alex-eyre to @alexeyre --- pkgs/applications/misc/scli/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/misc/scli/default.nix b/pkgs/applications/misc/scli/default.nix index 6a32b395be9..9729301f6e7 100644 --- a/pkgs/applications/misc/scli/default.nix +++ b/pkgs/applications/misc/scli/default.nix @@ -47,6 +47,6 @@ python3.pkgs.buildPythonApplication rec { description = "Simple terminal user interface for Signal"; homepage = "https://github.com/isamert/scli"; license = licenses.gpl3Only; - maintainers = with maintainers; [ alex-eyre ]; + maintainers = with maintainers; [ alexeyre ]; }; } From e994576b0d2824b3f8dc4442b031bccd8faadc1f Mon Sep 17 00:00:00 2001 From: K900 Date: Sun, 8 May 2022 11:07:36 +0300 Subject: [PATCH 29/35] installation-cd-base: fix eval --- nixos/modules/installer/cd-dvd/installation-cd-base.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/installer/cd-dvd/installation-cd-base.nix b/nixos/modules/installer/cd-dvd/installation-cd-base.nix index 618057618d0..3f92b779d60 100644 --- a/nixos/modules/installer/cd-dvd/installation-cd-base.nix +++ b/nixos/modules/installer/cd-dvd/installation-cd-base.nix @@ -46,5 +46,5 @@ with lib; done ''; - system.stateVersion = mkDefault "18.03"; + system.stateVersion = lib.mkDefault lib.trivial.release; } From 2ddfd7e81bf47cc31257b58dbc0525e0cc50e2a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 3 May 2022 00:31:14 +0000 Subject: [PATCH 30/35] nixos/borgmatic: use pkgs.formats.yaml --- nixos/modules/services/backup/borgmatic.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/backup/borgmatic.nix b/nixos/modules/services/backup/borgmatic.nix index 5e5c0bbeccc..9414d78aa75 100644 --- a/nixos/modules/services/backup/borgmatic.nix +++ b/nixos/modules/services/backup/borgmatic.nix @@ -4,7 +4,8 @@ with lib; let cfg = config.services.borgmatic; - cfgfile = pkgs.writeText "config.yaml" (builtins.toJSON cfg.settings); + settingsFormat = pkgs.formats.yaml { }; + cfgfile = settingsFormat.generate "config.yaml" cfg.settings; in { options.services.borgmatic = { enable = mkEnableOption "borgmatic"; @@ -14,7 +15,7 @@ in { See https://torsion.org/borgmatic/docs/reference/configuration/ ''; type = types.submodule { - freeformType = with lib.types; attrsOf anything; + freeformType = settingsFormat.type; options.location = { source_directories = mkOption { type = types.listOf types.str; From a6d36a550dd6d117ad7c18e45e46c6865c9f5aa1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 8 May 2022 08:08:57 +0000 Subject: [PATCH 31/35] python310Packages.fakeredis: 1.7.1 -> 1.7.4 --- pkgs/development/python-modules/fakeredis/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/fakeredis/default.nix b/pkgs/development/python-modules/fakeredis/default.nix index 5d45c4dc5ce..f5a28fa3839 100644 --- a/pkgs/development/python-modules/fakeredis/default.nix +++ b/pkgs/development/python-modules/fakeredis/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "fakeredis"; - version = "1.7.1"; + version = "1.7.4"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-fCxLobQuCnUzfFS3d78GcQVrRWllDj/5J+S5s4WvyOw="; + hash = "sha256-aWl//usJk5BzYF7qyX9SS8yrrgQmV1eldcf8kjCHqmU="; }; postPatch = '' From 6220a45fdb50dd733212a1a79a62eab1580b1324 Mon Sep 17 00:00:00 2001 From: Joel Date: Sun, 8 May 2022 15:11:56 +1000 Subject: [PATCH 32/35] python3Packages.mcstatus: 9.0.4 -> 9.1.0 https://github.com/py-mine/mcstatus/releases/tag/v9.1.0 --- pkgs/development/python-modules/mcstatus/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mcstatus/default.nix b/pkgs/development/python-modules/mcstatus/default.nix index f2745bf3f6f..9adbbf5e5d3 100644 --- a/pkgs/development/python-modules/mcstatus/default.nix +++ b/pkgs/development/python-modules/mcstatus/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "mcstatus"; - version = "9.0.4"; + version = "9.1.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "py-mine"; repo = pname; rev = "v${version}"; - hash = "sha256-h5pPtzs04TDqOkDFBpcn6faFN4sz/nEMsjjiH7mTEH0="; + hash = "sha256-qKQs0uGPMUtueOryVzFk37Th+N9vmApr/IzJ6jZI2Ic="; }; nativeBuildInputs = [ From 8c8607d7a39b1ce79f01b9b9d87d99e9d03989ff Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 8 May 2022 10:19:30 +0200 Subject: [PATCH 33/35] python3Packages.total-connect-client: 2022.3 -> 2022.5 --- .../python-modules/total-connect-client/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/total-connect-client/default.nix b/pkgs/development/python-modules/total-connect-client/default.nix index 24d2093a59d..2f093200bf3 100644 --- a/pkgs/development/python-modules/total-connect-client/default.nix +++ b/pkgs/development/python-modules/total-connect-client/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "total-connect-client"; - version = "2022.3"; + version = "2022.5"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "craigjmidwinter"; repo = "total-connect-client"; rev = version; - hash = "sha256-KfJFU85yQmBZn4f0ljnaiy/DjHMOuNi+Q7nb8yCpKVk="; + hash = "sha256-S+xki1Bj+wvKhbl2vRRa8gULyxTsH4fyypkrHj3JwH0="; }; propagatedBuildInputs = [ From 83cfaa762b1881ba4b190f799af9d3f2c4e81641 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sun, 8 May 2022 09:39:51 +0100 Subject: [PATCH 34/35] ncrack: pull upstream fix for fno-common toolchains Without the change build on -fno-common toolchains like upstream gcc-10 fails as: $ nix build -L --impure --expr 'with import ./. {}; ncrack.overrideAttrs (oa: { NIX_CFLAGS_COMPILE = (oa.NIX_CFLAGS_COMPILE or "") + "-fno-common"; })' ... ld: opensshlib/libopenssh.a(umac128.o):/build/source/opensshlib/umac.c:1184: multiple definition of `umac_ctx'; opensshlib/libopenssh.a(umac.o):/build/source/opensshlib/umac.c:1184: first defined here --- pkgs/tools/security/ncrack/default.nix | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/security/ncrack/default.nix b/pkgs/tools/security/ncrack/default.nix index e1504eb12b4..9e9aeaa409d 100644 --- a/pkgs/tools/security/ncrack/default.nix +++ b/pkgs/tools/security/ncrack/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, openssl, zlib }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, openssl, zlib }: stdenv.mkDerivation rec { pname = "ncrack"; @@ -11,6 +11,16 @@ stdenv.mkDerivation rec { sha256 = "1gnv5xdd7n04glcpy7q1mkb6f8gdhdrhlrh8z6k4g2pjdhxlz26g"; }; + patches = [ + # Pull upstream fix for -fno-common toolchains like upstream gcc-10: + # https://github.com/nmap/ncrack/pull/83 + (fetchpatch { + name = "fno-common.patch"; + url = "https://github.com/nmap/ncrack/commit/cc4103267bab6017a4da9d41156d0c1075012eba.patch"; + sha256 = "06nlfvc7p108f8ppbcgwmj4iwmjy95xhc1sawa8c78lrx22r7gy3"; + }) + ]; + buildInputs = [ openssl zlib ]; meta = with lib; { From 387d083590c959d02f5a606937d5ffc9088e24d8 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sun, 8 May 2022 09:29:54 +0100 Subject: [PATCH 35/35] rox-filer: pull upstream fix for -fno-common toolchains Without the change build agaist -fno-common toolchains like upstream gcc-10 fails as: $ nix build -L --impure --expr 'with import ./. {}; rox-filer.overrideAttrs (oa: { NIX_CFLAGS_COMPILE = (oa.NIX_CFLAGS_COMPILE or "") + "-fno-common"; })' ... ld: session.o:/build/rox-filer-2.11/ROX-Filer/build/../src/session.h:13: multiple definition of `session_auto_respawn'; main.o:/build/rox-filer-2.11/ROX-Filer/build/../src/session.h:13: first defined here While at it normalized local patch against top-level source tree to ease application of upstream patches as is. --- pkgs/desktops/rox/rox-filer/default.nix | 12 ++++++++++-- .../rox-filer/rox-filer-2.11-in-source-build.patch | 4 ++-- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/pkgs/desktops/rox/rox-filer/default.nix b/pkgs/desktops/rox/rox-filer/default.nix index 032209c2f18..e26c9059225 100644 --- a/pkgs/desktops/rox/rox-filer/default.nix +++ b/pkgs/desktops/rox/rox-filer/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchurl +, fetchpatch , pkg-config , wrapGAppsHook , libxml2 @@ -27,13 +28,20 @@ stdenv.mkDerivation rec { patches = [ ./rox-filer-2.11-in-source-build.patch + # Pull upstream fix for -fno-common toolchains like upstream gcc-10: + # https://github.com/rox-desktop/rox-filer/pull/15 + (fetchpatch { + name = "fno-common.patch"; + url = "https://github.com/rox-desktop/rox-filer/commit/86b0bb9144186d51ea9b898905111bd8b143b552.patch"; + sha256 = "1csyx229i09p00lbdlkdqdhn3x2lb5zby1h9rkjgzlr2qz74gc69"; + }) ]; # go to the source directory after unpacking the sources setSourceRoot = "export sourceRoot=rox-filer-${version}/ROX-Filer/"; - # patch source with defined patches - patchFlags = [ "-p0" ]; + # account for 'setSourceRoot' offset + patchFlags = [ "-p2" ]; # patch the main.c to disable the lookup of the APP_DIR environment variable, # which is used to lookup the location for certain images when rox-filer diff --git a/pkgs/desktops/rox/rox-filer/rox-filer-2.11-in-source-build.patch b/pkgs/desktops/rox/rox-filer/rox-filer-2.11-in-source-build.patch index 11bd8004459..c68bba7ec6c 100644 --- a/pkgs/desktops/rox/rox-filer/rox-filer-2.11-in-source-build.patch +++ b/pkgs/desktops/rox/rox-filer/rox-filer-2.11-in-source-build.patch @@ -1,5 +1,5 @@ ---- src/configure 2011-10-09 16:32:14.000000000 +0200 -+++ src/configure2 2016-03-20 09:26:31.640891863 +0100 +--- a/Rox-Filer/src/configure 2011-10-09 16:32:14.000000000 +0200 ++++ b/Rox-Filer/src/configure 2016-03-20 09:26:31.640891863 +0100 @@ -2132,13 +2132,6 @@