From 0d09c4cc6fe9b86abb2e859a6283e572dd531ce8 Mon Sep 17 00:00:00 2001 From: Matthias Thym Date: Sat, 26 Feb 2022 14:12:28 +0100 Subject: [PATCH 1/6] qownnotes: 22.2.7 -> 22.2.9 --- pkgs/applications/office/qownnotes/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/office/qownnotes/default.nix b/pkgs/applications/office/qownnotes/default.nix index 20449b1911ff..121c1ccf36e7 100644 --- a/pkgs/applications/office/qownnotes/default.nix +++ b/pkgs/applications/office/qownnotes/default.nix @@ -5,13 +5,13 @@ mkDerivation rec { pname = "qownnotes"; - version = "22.2.7"; + version = "22.2.9"; src = fetchurl { url = "https://download.tuxfamily.org/${pname}/src/${pname}-${version}.tar.xz"; # Fetch the checksum of current version with curl: # curl https://download.tuxfamily.org/qownnotes/src/qownnotes-.tar.xz.sha256 - sha256 = "f7c97f3dc3435ecdc740131548aacd390332c8b97c4e6fee98a3e80985786533"; + sha256 = "ced99f4b2106148c683267c2c5ccc5902dc6b98249eb7c132dde2bd6ea37bc34"; }; nativeBuildInputs = [ qmake qttools ]; From f29438562f9693f724e022e1fe0196ad983bdf6f Mon Sep 17 00:00:00 2001 From: Ilan Joselevich Date: Sat, 26 Feb 2022 20:10:06 +0200 Subject: [PATCH 2/6] nextcloud-client: add xdg-utils --- pkgs/applications/networking/nextcloud-client/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/networking/nextcloud-client/default.nix b/pkgs/applications/networking/nextcloud-client/default.nix index 874c0f8a177f..04e6e3fb438d 100644 --- a/pkgs/applications/networking/nextcloud-client/default.nix +++ b/pkgs/applications/networking/nextcloud-client/default.nix @@ -17,6 +17,7 @@ , qtgraphicaleffects , sqlite , inkscape +, xdg-utils }: mkDerivation rec { @@ -62,6 +63,7 @@ mkDerivation rec { "--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libsecret ]}" # See also: https://bugreports.qt.io/browse/QTBUG-85967 "--set QML_DISABLE_DISK_CACHE 1" + "--prefix PATH : ${lib.makeBinPath [ xdg-utils ]}" ]; cmakeFlags = [ From 0dadec45d805c31a0cff3d1ea4e0a3e9a357edfe Mon Sep 17 00:00:00 2001 From: Dominique Martinet Date: Sun, 27 Feb 2022 07:04:18 +0900 Subject: [PATCH 3/6] logrotate/systemd: add 'minsize = 1M' to wtmp/btmp rotation align with upstream logrotate which added the minsize rule at some point. This avoids needlessly rotating the files too often as brought up in https://github.com/NixOS/nixpkgs/pull/159187#issuecomment-1052426774 --- nixos/modules/system/boot/systemd.nix | 2 ++ nixos/tests/logrotate.nix | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix index 441faa03af00..4019af63ad35 100644 --- a/nixos/modules/system/boot/systemd.nix +++ b/nixos/modules/system/boot/systemd.nix @@ -1224,6 +1224,7 @@ in keep = 1; extraConfig = '' create 0660 root ${config.users.groups.utmp.name} + minsize 1M ''; }; "/var/log/wtmp" = mapAttrs (_: mkDefault) { @@ -1231,6 +1232,7 @@ in keep = 1; extraConfig = '' create 0664 root ${config.users.groups.utmp.name} + minsize 1M ''; }; }; diff --git a/nixos/tests/logrotate.nix b/nixos/tests/logrotate.nix index 0f6b59f071d4..5a724d9d6e94 100644 --- a/nixos/tests/logrotate.nix +++ b/nixos/tests/logrotate.nix @@ -19,7 +19,8 @@ import ./make-test-python.nix ({ pkgs, ...} : rec { # wtmp is present in default config. "rm -f /var/log/wtmp*", - "echo test > /var/log/wtmp", + # we need to give it at least 1MB + "dd if=/dev/zero of=/var/log/wtmp bs=2M count=1", # move into the future and rotate "date -s 'now + 1 month + 1 day'", From fe73c8276aaeea3f05c6d8090bbc34a592ad77a6 Mon Sep 17 00:00:00 2001 From: Michal Sojka Date: Sun, 27 Feb 2022 00:32:47 +0100 Subject: [PATCH 4/6] libtracefs: 1.2.5 -> 1.3.0 --- pkgs/os-specific/linux/libtracefs/default.nix | 27 ++++++++++++++----- 1 file changed, 20 insertions(+), 7 deletions(-) diff --git a/pkgs/os-specific/linux/libtracefs/default.nix b/pkgs/os-specific/linux/libtracefs/default.nix index f3f1a393973d..972a71d50390 100644 --- a/pkgs/os-specific/linux/libtracefs/default.nix +++ b/pkgs/os-specific/linux/libtracefs/default.nix @@ -1,23 +1,36 @@ -{ lib, stdenv, fetchgit, pkg-config, libtraceevent, asciidoc, xmlto, docbook_xml_dtd_45, docbook_xsl }: +{ lib +, stdenv +, fetchgit +, pkg-config +, libtraceevent +, asciidoc +, xmlto +, docbook_xml_dtd_45 +, docbook_xsl +, coreutils +, which +, valgrind +, sourceHighlight +}: stdenv.mkDerivation rec { pname = "libtracefs"; - version = "1.2.5"; + version = "1.3.0"; src = fetchgit { url = "git://git.kernel.org/pub/scm/libs/libtrace/libtracefs.git"; rev = "libtracefs-${version}"; - sha256 = "1rva9ysspf1wqd0zf52qwgpaasrn7jcbns4dwldc59ksk0n93qdb"; + sha256 = "sha256-Kg1mPjTZ2UCeco18Fa8GqmLo2R35XvUE/q2J1HAmtEc="; }; - # Don't build and install html documentation postPatch = '' - sed -i -e '/^all:/ s/html//' -e '/^install:/ s/install-html//' Documentation/Makefile + substituteInPlace scripts/utils.mk --replace /bin/pwd ${coreutils}/bin/pwd + patchShebangs check-manpages.sh ''; - outputs = [ "out" "dev" "devman" ]; + outputs = [ "out" "dev" "devman" "doc" ]; enableParallelBuilding = true; - nativeBuildInputs = [ pkg-config asciidoc xmlto docbook_xml_dtd_45 docbook_xsl ]; + nativeBuildInputs = [ pkg-config asciidoc xmlto docbook_xml_dtd_45 docbook_xsl which valgrind sourceHighlight ]; buildInputs = [ libtraceevent ]; makeFlags = [ "prefix=${placeholder "out"}" From 23380df7de6a417630aa181e7e5bb60fa475d45d Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Sat, 26 Feb 2022 20:37:04 -0500 Subject: [PATCH 5/6] randtype: mark as broken on darwin --- pkgs/games/randtype/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/games/randtype/default.nix b/pkgs/games/randtype/default.nix index 0eaf2c092160..97993a5ffdac 100644 --- a/pkgs/games/randtype/default.nix +++ b/pkgs/games/randtype/default.nix @@ -27,5 +27,6 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ dandellion ]; license = licenses.gpl2Only; platforms = platforms.unix; + broken = stdenv.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/trunk/randtype.x86_64-darwin }; } From dc23e69491c746083210618e7b55dd1afb010621 Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Sun, 27 Feb 2022 02:18:14 +0000 Subject: [PATCH 6/6] python3Packages.tensorflow: 2.7.0 -> 2.7.1 (#161589) --- pkgs/development/python-modules/tensorflow/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/tensorflow/default.nix b/pkgs/development/python-modules/tensorflow/default.nix index 47acd1f53c75..517faef3f8fc 100644 --- a/pkgs/development/python-modules/tensorflow/default.nix +++ b/pkgs/development/python-modules/tensorflow/default.nix @@ -72,7 +72,7 @@ let tfFeature = x: if x then "1" else "0"; - version = "2.7.0"; + version = "2.7.1"; variant = if cudaSupport then "-gpu" else ""; pname = "tensorflow${variant}"; @@ -185,7 +185,7 @@ let owner = "tensorflow"; repo = "tensorflow"; rev = "v${version}"; - sha256 = "sha256-n7jRDPeXsyq4pEWSWmOCas4c8VsArIKlCuwvSU/Ro/c="; + sha256 = "1qwzbqq899swrwrwmm6z7mq9sc55gyh0r4ca0mcnchbvn7w0qbkh"; }; patches = [