From 7b9edb617a2c04f88c149bbde9c9515d4728e09c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 5 Sep 2023 02:15:18 +0000 Subject: [PATCH 01/13] freerdp: 2.10.0 -> 2.11.0 (cherry picked from commit 168ac2a0ab631c0639d6cdf618522e3c689604bb) --- 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 f586f4f3e9e9..642530e00fde 100644 --- a/pkgs/applications/networking/remote/freerdp/default.nix +++ b/pkgs/applications/networking/remote/freerdp/default.nix @@ -76,13 +76,13 @@ let in stdenv.mkDerivation rec { pname = "freerdp"; - version = "2.10.0"; + version = "2.11.0"; src = fetchFromGitHub { owner = "FreeRDP"; repo = "FreeRDP"; rev = version; - sha256 = "sha256-4sq3LblFRWCBREudtzg+o9wjstm58gPzBq7QAwlWvEg="; + sha256 = "sha256-yyJs6J2R2L2YtNKzHFW6X6I1aJTHipBA1+yuT7bR9Zg="; }; postPatch = '' From b35e5efd80870303c0f7bad7ec6b27986ca70b4d Mon Sep 17 00:00:00 2001 From: Thomas Watson Date: Sun, 19 Nov 2023 14:46:14 -0600 Subject: [PATCH 02/13] quartus-prime-lite: fix loading of libudev.so.0 Loading without a path was broken by nixpkgs commit e2d06c56951459ab3aebfb40c366ab635a021366. Fortunately we don't want libudev.so.0 in modelsim now anyway which was the reason for loading by name only, so we move it back to being 64-bit only and load it by absolute path. (cherry picked from commit 5887fb9a74806e54397201ad8f9e7d6b186a839d) --- pkgs/applications/editors/quartus-prime/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/editors/quartus-prime/default.nix b/pkgs/applications/editors/quartus-prime/default.nix index d48877129cb6..dc9ddd315f6c 100644 --- a/pkgs/applications/editors/quartus-prime/default.nix +++ b/pkgs/applications/editors/quartus-prime/default.nix @@ -38,6 +38,7 @@ in buildFHSEnv rec { xorg.libICE xorg.libSM zlib + libudev0-shim # qsys requirements xorg.libXtst xorg.libXi @@ -63,7 +64,6 @@ in buildFHSEnv rec { xorg.libX11 xorg.libXext xorg.libXrender - libudev0-shim libxcrypt-legacy ]; @@ -105,7 +105,6 @@ in buildFHSEnv rec { # LD_PRELOAD fixes issues in the licensing system that cause memory corruption and crashes when # starting most operations in many containerized environments, including WSL2, Docker, and LXC # (a similiar fix involving LD_PRELOADing tcmalloc did not solve the issue in my situation) - # we use the name so that quartus can load the 64 bit verson and modelsim can load the 32 bit version # https://community.intel.com/t5/Intel-FPGA-Software-Installation/Running-Quartus-Prime-Standard-on-WSL-crashes-in-libudev-so/m-p/1189032 # # But, as can be seen in the above resource, LD_PRELOADing libudev breaks @@ -113,7 +112,7 @@ in buildFHSEnv rec { # `(vlog-2163) Macro ` is undefined.`), so only use LD_PRELOAD # for non-ModelSim wrappers. if [ "$NIXPKGS_IS_MODELSIM_WRAPPER" != 1 ]; then - export LD_PRELOAD=''${LD_PRELOAD:+$LD_PRELOAD:}libudev.so.0 + export LD_PRELOAD=''${LD_PRELOAD:+$LD_PRELOAD:}/usr/lib/libudev.so.0 fi ''; From 9faf91e6d0b7743d41cce3b63a8e5c733dc696a3 Mon Sep 17 00:00:00 2001 From: teutat3s <10206665+teutat3s@users.noreply.github.com> Date: Sun, 12 Nov 2023 14:07:51 +0100 Subject: [PATCH 03/13] signal-desktop: fix screensharing on wayland Without this change, starting a screenshare in signal-desktop on wayland (sway) only produces a blank, black screen after selecting which screen to share, with the following error in the logs: ERROR:shared_screencast_stream.cc(412)] Unable to open PipeWire library ERROR:base_capturer_pipewire.cc(81)] ScreenCastPortal failed: 1 Upstream has fixed screensharing in general according to https://github.com/signalapp/Signal-Desktop/issues/5350#issuecomment-1664092786. (cherry picked from commit 60f0edfb950f981ab616b897cb8e1ea4e6200b21) --- .../networking/instant-messengers/signal-desktop/generic.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/generic.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/generic.nix index 38719920d8a2..aec46a8c0f6b 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/generic.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/generic.nix @@ -15,6 +15,7 @@ , at-spi2-atk , cairo , pango +, pipewire , gdk-pixbuf , glib , freetype @@ -150,7 +151,7 @@ stdenv.mkDerivation rec { preFixup = '' gappsWrapperArgs+=( - --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ stdenv.cc.cc ] }" + --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ stdenv.cc.cc pipewire ] }" # Currently crashes see https://github.com/NixOS/nixpkgs/issues/222043 #--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" --suffix PATH : ${lib.makeBinPath [ xdg-utils ]} From 0d4cad0a9f0f4f50b8e944ebbedaff97c09f808b Mon Sep 17 00:00:00 2001 From: Eduardo Quiros Date: Wed, 15 Nov 2023 23:12:32 -0600 Subject: [PATCH 04/13] signal-desktop: 6.38.0 -> 6.39.0, 6.39.0-beta.2 -> 6.40.0-beta.1 (cherry picked from commit 30e6ba32cd98ad91c1b8f6d8b5516ce6c6c96574) --- .../instant-messengers/signal-desktop/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix index a18afedaecdc..0e66707349db 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix @@ -1,12 +1,12 @@ { callPackage }: builtins.mapAttrs (pname: attrs: callPackage ./generic.nix (attrs // { inherit pname; })) { signal-desktop = { dir = "Signal"; - version = "6.38.0"; - hash = "sha256-y2mwO7Qc01vuIeJUcAxYDD97DXOwXCd8wNZmkG4maF0="; + version = "6.39.0"; + hash = "sha256-cG8ZFWpx92haTgMkpMMcFDV0OB7lmU540g9fNj4ofy8="; }; signal-desktop-beta = { dir = "Signal Beta"; - version = "6.39.0-beta.2"; - hash = "sha256-1+1wvkMtEovBBs2bS9zUV5kpSxkPy0EqBAU01el8uko="; + version = "6.40.0-beta.1"; + hash = "sha256-daXh1Uh2lHw0NA/j7qhQK7nrVljbr/fP2iLjcqnuvns="; }; } From e6f041a691d5c4e34076f3510c4b67f5008d76a0 Mon Sep 17 00:00:00 2001 From: K900 Date: Mon, 20 Nov 2023 14:32:23 +0300 Subject: [PATCH 05/13] linux_testing: 6.7-rc1 -> 6.7-rc2 (cherry picked from commit 318024f8a707f3c0ed68c7debff8f8b557240d1c) --- pkgs/os-specific/linux/kernel/kernels-org.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json index 5201a4248f85..838e6204c9a4 100644 --- a/pkgs/os-specific/linux/kernel/kernels-org.json +++ b/pkgs/os-specific/linux/kernel/kernels-org.json @@ -1,7 +1,7 @@ { "testing": { - "version": "6.7-rc1", - "hash": "sha256:1a071vvmm08sp48d0arqzcmqnz5xdb1vflfhxcqwmpzaabjrgadk" + "version": "6.7-rc2", + "hash": "sha256:026aqfblls4zl2j8rpnl7rjh9ma82jlwb6x00jryvv44kvwm0fgs" }, "6.5": { "version": "6.5.11", From a3e0514ccc5eef54072ffe563854412c0143310b Mon Sep 17 00:00:00 2001 From: K900 Date: Mon, 20 Nov 2023 14:32:28 +0300 Subject: [PATCH 06/13] linux_6_6: 6.6.1 -> 6.6.2 (cherry picked from commit 81decae248f1304d72dbe16fefb358ef12c317bf) --- pkgs/os-specific/linux/kernel/kernels-org.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json index 838e6204c9a4..eff280708af5 100644 --- a/pkgs/os-specific/linux/kernel/kernels-org.json +++ b/pkgs/os-specific/linux/kernel/kernels-org.json @@ -36,7 +36,7 @@ "hash": "sha256:1dvb4xf0b7snabznl7bg7gga7ffdmywy8vr8q65pzl9yf6fnhdny" }, "6.6": { - "version": "6.6.1", - "hash": "sha256:0d42b1hbvv9w3y3q4wydr6il0g5a823n54a06p4p5vcpgkadf7ns" + "version": "6.6.2", + "hash": "sha256:0zmpk5ls6282j88xpnymkr8z5hxpk2495hjjxm0jmb6ninnzdm3k" } } From 38d98de7f6aa679f3840862c70ef0b9f0787f86b Mon Sep 17 00:00:00 2001 From: K900 Date: Mon, 20 Nov 2023 14:32:32 +0300 Subject: [PATCH 07/13] linux_6_5: 6.5.11 -> 6.5.12 (cherry picked from commit a6c4f52daca6612bfbfc925c6bd7d6fd5e19678d) --- pkgs/os-specific/linux/kernel/kernels-org.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json index eff280708af5..a521f422e0c1 100644 --- a/pkgs/os-specific/linux/kernel/kernels-org.json +++ b/pkgs/os-specific/linux/kernel/kernels-org.json @@ -4,8 +4,8 @@ "hash": "sha256:026aqfblls4zl2j8rpnl7rjh9ma82jlwb6x00jryvv44kvwm0fgs" }, "6.5": { - "version": "6.5.11", - "hash": "sha256:06dmb4hbwrms0lp4axphwgj8wbnzsym70sx55lxr501b53wlmqif" + "version": "6.5.12", + "hash": "sha256:17rmkzxszp2jg1zx2mmdcy30ffrsd0qms513sxd14klp5k9w2saa" }, "6.4": { "version": "6.4.16", From e1c648b02208226eaeaa6476b30cc1d6d132fbff Mon Sep 17 00:00:00 2001 From: K900 Date: Mon, 20 Nov 2023 14:32:36 +0300 Subject: [PATCH 08/13] linux_6_1: 6.1.62 -> 6.1.63 (cherry picked from commit fa23814880d6b452484df516df1c1b616dbe24e8) --- pkgs/os-specific/linux/kernel/kernels-org.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json index a521f422e0c1..09b45a0d25b0 100644 --- a/pkgs/os-specific/linux/kernel/kernels-org.json +++ b/pkgs/os-specific/linux/kernel/kernels-org.json @@ -12,8 +12,8 @@ "hash": "sha256:0zgj1z97jyx7wf12zrnlcp0mj4cl43ais9qsy6dh1jwylf2fq9ln" }, "6.1": { - "version": "6.1.62", - "hash": "sha256:1v453q4sf0j8708ivs1zmdf645hgimqvxfc8xz7czgnnmipn3zdr" + "version": "6.1.63", + "hash": "sha256:13bmy22mi4ybl21kr3hdy6qiaawiqz2jgl2gl9hwqkyx04xh97f2" }, "5.15": { "version": "5.15.138", From 9bcaef3b061f55bd6463cc8a6dac7915a9d5c46e Mon Sep 17 00:00:00 2001 From: K900 Date: Mon, 20 Nov 2023 14:32:41 +0300 Subject: [PATCH 09/13] linux_5_15: 5.15.138 -> 5.15.139 (cherry picked from commit 4fe8149d24f411c73c7e421997cb5847867ff99e) --- pkgs/os-specific/linux/kernel/kernels-org.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json index 09b45a0d25b0..c9f402848039 100644 --- a/pkgs/os-specific/linux/kernel/kernels-org.json +++ b/pkgs/os-specific/linux/kernel/kernels-org.json @@ -16,8 +16,8 @@ "hash": "sha256:13bmy22mi4ybl21kr3hdy6qiaawiqz2jgl2gl9hwqkyx04xh97f2" }, "5.15": { - "version": "5.15.138", - "hash": "sha256:1ajaxy97gx0c9cdxiyxa49ykfsykir22i9abfrcizh71ci0yb15g" + "version": "5.15.139", + "hash": "sha256:0kh4v1224a7p7ib64pnmc1qid3d1lvg3c14l5s4rpr8qzq6w2s4w" }, "5.10": { "version": "5.10.200", From 79d84877e79f8cfa130fa43f68f8af5053d1d7ee Mon Sep 17 00:00:00 2001 From: K900 Date: Mon, 20 Nov 2023 14:32:45 +0300 Subject: [PATCH 10/13] linux_5_10: 5.10.200 -> 5.10.201 (cherry picked from commit 4d7fab2db4a74a4f23470d75b4185663dfa1e01e) --- pkgs/os-specific/linux/kernel/kernels-org.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json index c9f402848039..c25fcbf75cff 100644 --- a/pkgs/os-specific/linux/kernel/kernels-org.json +++ b/pkgs/os-specific/linux/kernel/kernels-org.json @@ -20,8 +20,8 @@ "hash": "sha256:0kh4v1224a7p7ib64pnmc1qid3d1lvg3c14l5s4rpr8qzq6w2s4w" }, "5.10": { - "version": "5.10.200", - "hash": "sha256:012i41bj8rcqn0vhfxrwq3gg82nb6pp2cwq8n146wj47pwgrcbcx" + "version": "5.10.201", + "hash": "sha256:0642y6qj2d4aww6jcki81ba53pvjyfazjxgzgj8brqx8ixchdz3a" }, "5.4": { "version": "5.4.260", From b7c279dbeb6546a1fb84bca5a88b0deede1a2d65 Mon Sep 17 00:00:00 2001 From: K900 Date: Mon, 20 Nov 2023 14:32:49 +0300 Subject: [PATCH 11/13] linux_5_4: 5.4.260 -> 5.4.261 (cherry picked from commit ba81973a18557fcabe7e3438970c17758e3e6e95) --- pkgs/os-specific/linux/kernel/kernels-org.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json index c25fcbf75cff..b10066cc9e8a 100644 --- a/pkgs/os-specific/linux/kernel/kernels-org.json +++ b/pkgs/os-specific/linux/kernel/kernels-org.json @@ -24,8 +24,8 @@ "hash": "sha256:0642y6qj2d4aww6jcki81ba53pvjyfazjxgzgj8brqx8ixchdz3a" }, "5.4": { - "version": "5.4.260", - "hash": "sha256:1zpbaipd2j3idj8h9iznlj0ywcq5nkhwj707a1f9ixf82h3q4c4q" + "version": "5.4.261", + "hash": "sha256:1hsgnv2vcziflhzrrxiny2yp88ybdqda48fm60xhpaphhs0cgfii" }, "4.19": { "version": "4.19.298", From cb1a0a7b53b4976c6835098ada65fe13071bba72 Mon Sep 17 00:00:00 2001 From: K900 Date: Mon, 20 Nov 2023 14:32:52 +0300 Subject: [PATCH 12/13] linux_4_19: 4.19.298 -> 4.19.299 (cherry picked from commit 5fba68ecb0ea50ff185503bf7675bcb6b5362c74) --- pkgs/os-specific/linux/kernel/kernels-org.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json index b10066cc9e8a..eeaeb26b3a6f 100644 --- a/pkgs/os-specific/linux/kernel/kernels-org.json +++ b/pkgs/os-specific/linux/kernel/kernels-org.json @@ -28,8 +28,8 @@ "hash": "sha256:1hsgnv2vcziflhzrrxiny2yp88ybdqda48fm60xhpaphhs0cgfii" }, "4.19": { - "version": "4.19.298", - "hash": "sha256:0mhgq6hdcls1af7nj999x1mds5b37s7vwin8nsb4q0lnx2y1da4x" + "version": "4.19.299", + "hash": "sha256:12p431p2jqjfsf0all3fgn47z9fr2cdqyxipfrf4s4mlw4hpbyy6" }, "4.14": { "version": "4.14.329", From f741f8a839912e272d7e87ccf4b9dbc6012cdaf9 Mon Sep 17 00:00:00 2001 From: K900 Date: Mon, 20 Nov 2023 14:32:56 +0300 Subject: [PATCH 13/13] linux_4_14: 4.14.329 -> 4.14.330 (cherry picked from commit 9cd26085fda6f16afc58bf9e8b991ea91fceae82) --- pkgs/os-specific/linux/kernel/kernels-org.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json index eeaeb26b3a6f..a521360392d7 100644 --- a/pkgs/os-specific/linux/kernel/kernels-org.json +++ b/pkgs/os-specific/linux/kernel/kernels-org.json @@ -32,8 +32,8 @@ "hash": "sha256:12p431p2jqjfsf0all3fgn47z9fr2cdqyxipfrf4s4mlw4hpbyy6" }, "4.14": { - "version": "4.14.329", - "hash": "sha256:1dvb4xf0b7snabznl7bg7gga7ffdmywy8vr8q65pzl9yf6fnhdny" + "version": "4.14.330", + "hash": "sha256:0rwgzyfmrns6zir0dpxkwz2hm3z8c0af3wy11lmxamaa5i2wq3k7" }, "6.6": { "version": "6.6.2",