From 9f084d492947bb4772139bfd834c8b94ec3be8ab Mon Sep 17 00:00:00 2001 From: Daniel Olsen Date: Wed, 19 Jan 2022 22:59:38 +0100 Subject: [PATCH 1/5] hydrus: 469 -> 470b (cherry picked from commit c7193ca132e0a7e204fbb36eb2f78286a1333349) --- pkgs/applications/graphics/hydrus/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/hydrus/default.nix b/pkgs/applications/graphics/hydrus/default.nix index d4664f7e997d..08293f748de7 100644 --- a/pkgs/applications/graphics/hydrus/default.nix +++ b/pkgs/applications/graphics/hydrus/default.nix @@ -10,14 +10,14 @@ python3Packages.buildPythonPackage rec { pname = "hydrus"; - version = "469"; + version = "470b"; format = "other"; src = fetchFromGitHub { owner = "hydrusnetwork"; repo = "hydrus"; rev = "v${version}"; - sha256 = "sha256-1E85SIsLXeG+AUqQYCJxOlSwiT26OG+n/d9GbyryGCE="; + sha256 = "0v52krjcqykrm3zqj6idzvbpjv4fhbgvq2jr8k0g63f7db7p08h9"; }; nativeBuildInputs = [ From 0ddf22097fd054aaadd4dcb00f8a9a16520a40d3 Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Sat, 22 Jan 2022 19:33:40 +0000 Subject: [PATCH 2/5] brave: 1.34.80 -> 1.34.81 https://github.com/brave/brave-browser/blob/master/CHANGELOG_DESKTOP.md#13481 (cherry picked from commit fafa1363f91d685135c8138f27e479ba72a837f2) --- pkgs/applications/networking/browsers/brave/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/brave/default.nix b/pkgs/applications/networking/browsers/brave/default.nix index a769d30e500a..3c0690861134 100644 --- a/pkgs/applications/networking/browsers/brave/default.nix +++ b/pkgs/applications/networking/browsers/brave/default.nix @@ -93,11 +93,11 @@ in stdenv.mkDerivation rec { pname = "brave"; - version = "1.34.80"; + version = "1.34.81"; src = fetchurl { url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb"; - sha256 = "2N+dXQGVfm3GsaKKo3EBxLu+cu08OjlrqkgXX9knFys="; + sha256 = "bMNk1l3MguQho0vck78U1e3A+/571DyoWSKKerQVE7s="; }; dontConfigure = true; From 918dbfa0c646cd1d8d504919110ce374e0d109ef Mon Sep 17 00:00:00 2001 From: Alvar Penning Date: Sat, 22 Jan 2022 21:53:39 +0100 Subject: [PATCH 3/5] imagemagick: 7.1.0-19 -> 7.1.0-20 https://github.com/ImageMagick/ImageMagick/releases/tag/7.1.0-20 (cherry picked from commit 74783209bf1905108fc5de24fbe273bcd2287168) --- pkgs/applications/graphics/ImageMagick/7.0.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/graphics/ImageMagick/7.0.nix b/pkgs/applications/graphics/ImageMagick/7.0.nix index 54f838499956..3b215ea24fc7 100644 --- a/pkgs/applications/graphics/ImageMagick/7.0.nix +++ b/pkgs/applications/graphics/ImageMagick/7.0.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, libtool +{ lib, stdenv, fetchFromGitHub, pkg-config, libtool , bzip2, zlib, libX11, libXext, libXt, fontconfig, freetype, ghostscript, libjpeg, djvulibre , lcms2, openexr, libjxl, libpng, liblqr1, libraw, librsvg, libtiff, libxml2, openjpeg, libwebp, libheif , ApplicationServices @@ -18,11 +18,13 @@ in stdenv.mkDerivation rec { pname = "imagemagick"; - version = "7.1.0-19"; + version = "7.1.0-20"; - src = fetchurl { - url = "https://download.imagemagick.org/ImageMagick/download/releases/ImageMagick-${version}.tar.xz"; - hash = "sha256-P9eRdKsPMLwWQ68+ZU8dL/zDqVVCY5gRVWiLT0n3/Xc="; + src = fetchFromGitHub { + owner = "ImageMagick"; + repo = "ImageMagick"; + rev = version; + sha256 = "0r8zmk2cfmf09l94hqzfz4aspnzn178ggdbgm7w4hr0p864cbvc3"; }; outputs = [ "out" "dev" "doc" ]; # bin/ isn't really big From 40972bc4507f27d8e67286a5efd6dc284008cb84 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 23 Jan 2022 02:08:33 +0000 Subject: [PATCH 4/5] python310Packages.mattermostdriver: 7.3.1 -> 7.3.2 (cherry picked from commit 607c7e95dc7928165af8ae3ce74e7056f6d428f1) --- pkgs/development/python-modules/mattermostdriver/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mattermostdriver/default.nix b/pkgs/development/python-modules/mattermostdriver/default.nix index 6a0be0696063..2564670c8b99 100644 --- a/pkgs/development/python-modules/mattermostdriver/default.nix +++ b/pkgs/development/python-modules/mattermostdriver/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "mattermostdriver"; - version = "7.3.1"; + version = "7.3.2"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "bf629c4b8f825bd7196208aa93995ac5077bd60939ba67cca314a7f13c1dbcea"; + sha256 = "2e4d7b4a17d3013e279c6f993746ea18cd60b45d8fa3be24f47bc2de22b9b3b4"; }; propagatedBuildInputs = [ websockets requests ]; From 604c44137d97b5111be1ca5c0d97f6e24fbc5c2c Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Fri, 14 Jan 2022 14:52:52 -0800 Subject: [PATCH 5/5] nixos/systemd-boot: fix error output (cherry picked from commit 87502df43b246c020ff47e99e1d06c4fbb36022f) --- .../system/boot/loader/systemd-boot/systemd-boot-builder.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py b/nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py index e9697b5f0e64..4e1f980e4aee 100644 --- a/nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py +++ b/nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py @@ -281,7 +281,7 @@ def main() -> None: if os.readlink(system_dir(*gen)) == args.default_config: write_loader_conf(*gen) except OSError as e: - print("ignoring profile '{}' in the list of boot entries because of the following error:\n{}".format(profile, e), file=sys.stderr) + print("ignoring generation '{}' in the list of boot entries because of the following error:\n{}".format(*gen, e), file=sys.stderr) memtest_entry_file = "@efiSysMountPoint@/loader/entries/memtest86.conf" if os.path.exists(memtest_entry_file):