From a2463667bf5ac5b87ca52fc20fdfe7bc499f5b3e Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 29 Jul 2021 05:04:48 +0000 Subject: [PATCH 1/7] freerdp: 2.3.2 -> 2.4.0 (cherry picked from commit 9730596ace05443a9f271b8188e978c5c8ac8d68) --- pkgs/applications/networking/remote/freerdp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/remote/freerdp/default.nix b/pkgs/applications/networking/remote/freerdp/default.nix index 8e0f4dde8168..4a4cdf3c2c1c 100644 --- a/pkgs/applications/networking/remote/freerdp/default.nix +++ b/pkgs/applications/networking/remote/freerdp/default.nix @@ -18,13 +18,13 @@ let in stdenv.mkDerivation rec { pname = "freerdp"; - version = "2.3.2"; + version = "2.4.0"; src = fetchFromGitHub { owner = "FreeRDP"; repo = "FreeRDP"; rev = version; - sha256 = "sha256-qqpdMBDcVfXm/KB54zv23O8raGqBhAKqXo6Kj2VaI8w="; + sha256 = "sha256-o+9twuyH9keWJriCSNkR63+xZuuOmPjoWg+Jp616CsQ="; }; postPatch = '' From 67ab43974aeb00713568d26c3d95ac16ad31408f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 29 Oct 2021 16:00:14 +0000 Subject: [PATCH 2/7] freerdp: 2.4.0 -> 2.4.1 (cherry picked from commit 700c0c5be3ecfc58503a7efaf2e9bfa94c1150ea) --- pkgs/applications/networking/remote/freerdp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/remote/freerdp/default.nix b/pkgs/applications/networking/remote/freerdp/default.nix index 4a4cdf3c2c1c..4da593c932c3 100644 --- a/pkgs/applications/networking/remote/freerdp/default.nix +++ b/pkgs/applications/networking/remote/freerdp/default.nix @@ -18,13 +18,13 @@ let in stdenv.mkDerivation rec { pname = "freerdp"; - version = "2.4.0"; + version = "2.4.1"; src = fetchFromGitHub { owner = "FreeRDP"; repo = "FreeRDP"; rev = version; - sha256 = "sha256-o+9twuyH9keWJriCSNkR63+xZuuOmPjoWg+Jp616CsQ="; + sha256 = "sha256-0wwIuE6Gv8khhLAbWSHOBfHGrTUjR4f/C5bzYJpvWIQ="; }; postPatch = '' From b40eb036e3198a9eceac0cfae686239d6d83296a Mon Sep 17 00:00:00 2001 From: Tom Date: Fri, 26 Nov 2021 09:03:06 -0800 Subject: [PATCH 3/7] wl-mirror: init at 0.5.0 (cherry picked from commit b71ed45cfc402ee498b973dc919e8bcf433deeea) --- pkgs/tools/wayland/wl-mirror/default.nix | 45 ++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 47 insertions(+) create mode 100644 pkgs/tools/wayland/wl-mirror/default.nix diff --git a/pkgs/tools/wayland/wl-mirror/default.nix b/pkgs/tools/wayland/wl-mirror/default.nix new file mode 100644 index 000000000000..0836723760e7 --- /dev/null +++ b/pkgs/tools/wayland/wl-mirror/default.nix @@ -0,0 +1,45 @@ +{ lib +, stdenv +, fetchFromGitHub +, cmake +, pkg-config +, wayland +, wayland-protocols +, wayland-scanner +, wlr-protocols +, libGL +}: + +stdenv.mkDerivation rec { + pname = "wl-mirror"; + version = "0.5.0"; + + src = fetchFromGitHub { + owner = "Ferdi265"; + repo = "wl-mirror"; + rev = "v${version}"; + sha256 = "1wjdjzj6h1q51yg70gdrq2yrgg6ihamcwhizxfrjq8955yy2y6ly"; + }; + + patchPhase = '' + substituteInPlace CMakeLists.txt \ + --replace 'WL_PROTOCOL_DIR "/usr' 'WL_PROTOCOL_DIR "${wayland-protocols}' \ + --replace 'WLR_PROTOCOL_DIR "/usr' 'WLR_PROTOCOL_DIR "${wlr-protocols}' + ''; + + nativeBuildInputs = [ cmake pkg-config wayland-scanner ]; + buildInputs = [ + libGL + wayland + wayland-protocols + wlr-protocols + ]; + + meta = with lib; { + homepage = "https://github.com/Ferdi265/wl-mirror"; + description = "Mirrors an output onto a Wayland surface."; + license = licenses.gpl3; + maintainers = with maintainers; [ twitchyliquid64 ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 965caa1dd4f8..d9889e287c82 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2231,6 +2231,8 @@ in wl-clipboard = callPackage ../tools/wayland/wl-clipboard { }; + wl-mirror = callPackage ../tools/wayland/wl-mirror { }; + wlogout = callPackage ../tools/wayland/wlogout { }; wlr-randr = callPackage ../tools/wayland/wlr-randr { }; From 3aa7278f27e9f4fa8b0e18c780de38e902360f07 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sun, 28 Nov 2021 15:01:35 +0100 Subject: [PATCH 4/7] nixosTests.keymap.qwertz: reduce platforms in `tested` In particular, aarch64-linux variant doesn't work on Hydra, so at least avoid this blocking the 21.11 channel. (cherry picked from commit 3c2e73c2eaf81a7e32df8fc61d13e17c7780a1e5) --- nixos/release-combined.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/release-combined.nix b/nixos/release-combined.nix index 34183c0ba9ff..57e1234855f9 100644 --- a/nixos/release-combined.nix +++ b/nixos/release-combined.nix @@ -92,7 +92,7 @@ in rec { (onFullSupported "nixos.tests.keymap.dvorak") (onFullSupported "nixos.tests.keymap.dvorak-programmer") (onFullSupported "nixos.tests.keymap.neo") - (onFullSupported "nixos.tests.keymap.qwertz") + (onSystems ["x86_64-linux"] "nixos.tests.keymap.qwertz") (onFullSupported "nixos.tests.latestKernel.login") (onFullSupported "nixos.tests.lightdm") (onFullSupported "nixos.tests.login") From c4cbbed186cc00066fd1998b5d915fe37f197135 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Thu, 29 Jul 2021 21:15:47 +0200 Subject: [PATCH 5/7] isync: 1.4.2 -> 1.4.3 (cherry picked from commit 09bbf2d3ec81a12767f3146c868f7735b12f8ea7) --- pkgs/tools/networking/isync/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/isync/default.nix b/pkgs/tools/networking/isync/default.nix index 666e19ca81ae..a6181e6f2ded 100644 --- a/pkgs/tools/networking/isync/default.nix +++ b/pkgs/tools/networking/isync/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "isync"; - version = "1.4.2"; + version = "1.4.3"; src = fetchurl { url = "mirror://sourceforge/isync/${pname}-${version}.tar.gz"; - sha256 = "0hskfpj4r4q3959k3npyqli353daj3r5d9mfia9bbmig87nyfd8r"; + sha256 = "024p3glj4p7fhrssw5sr55arls9zna1igxxrspxlfd6sbds21ixl"; }; nativeBuildInputs = [ pkg-config perl ]; From 56cb40bc60a61603bc5e007826bc3ad8bcd51274 Mon Sep 17 00:00:00 2001 From: Alvar Penning Date: Fri, 3 Dec 2021 13:58:59 +0100 Subject: [PATCH 6/7] isync: 1.4.3 -> 1.4.4 Fixes CVE-2021-3657 and CVE-2021-44143 and closes #147884 (cherry picked from commit 8500a748bb7d941e40768a07988082ae94fd6c16) --- pkgs/tools/networking/isync/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/isync/default.nix b/pkgs/tools/networking/isync/default.nix index a6181e6f2ded..e26526dc68d5 100644 --- a/pkgs/tools/networking/isync/default.nix +++ b/pkgs/tools/networking/isync/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "isync"; - version = "1.4.3"; + version = "1.4.4"; src = fetchurl { url = "mirror://sourceforge/isync/${pname}-${version}.tar.gz"; - sha256 = "024p3glj4p7fhrssw5sr55arls9zna1igxxrspxlfd6sbds21ixl"; + sha256 = "1zq0wwvmqsl9y71546dr0aygzn9gjjfiw19hlcq87s929y4p6ckw"; }; nativeBuildInputs = [ pkg-config perl ]; From b86b6bc5e753919ab4d7c902210234f324d0efa4 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Fri, 3 Dec 2021 11:09:11 -0800 Subject: [PATCH 7/7] agate: fix meta old link is dead (cherry picked from commit 161d757a3a4bf40a722816c814481353f4be18be) --- pkgs/servers/gemini/agate/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/gemini/agate/default.nix b/pkgs/servers/gemini/agate/default.nix index 953087721652..0ddce389b508 100644 --- a/pkgs/servers/gemini/agate/default.nix +++ b/pkgs/servers/gemini/agate/default.nix @@ -31,8 +31,8 @@ rustPlatform.buildRustPackage rec { ''; meta = with lib; { - homepage = "https://proxy.vulpes.one/gemini/qwertqwefsday.eu/agate.gmi"; - changelog = "https://proxy.vulpes.one/gemini/qwertqwefsday.eu/agate.gmi"; + homepage = "https://github.com/mbrubeck/agate"; + changelog = "https://github.com/mbrubeck/agate/blob/master/CHANGELOG.md"; description = "Very simple server for the Gemini hypertext protocol"; longDescription = '' Agate is a server for the Gemini network protocol, built with the Rust