From 0d7919e7258b091cc04cf13eb6a2118ee4823018 Mon Sep 17 00:00:00 2001 From: Babeuh <60193302+babeuh@users.noreply.github.com> Date: Thu, 13 Jul 2023 17:07:24 +0200 Subject: [PATCH 01/11] maintainers: add babeuh (cherry picked from commit a28f9684e225b3a5b1a78b8ffe530f07ae4bdc11) --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 62fdbfed2d9d..eac371141fa2 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -1666,6 +1666,12 @@ fingerprint = "6FBC A462 4EAF C69C A7C4 98C1 F044 3098 48A0 7CAC"; }]; }; + babeuh = { + name = "Raphael Le Goaller"; + email = "babeuh@rlglr.fr"; + github = "babeuh"; + githubId = 60193302; + }; bachp = { email = "pascal.bach@nextrem.ch"; matrix = "@bachp:matrix.org"; From a4deae9a9cee0d9321655617e69c8bbabe05e046 Mon Sep 17 00:00:00 2001 From: Babeuh <60193302+babeuh@users.noreply.github.com> Date: Thu, 13 Jul 2023 17:06:43 +0200 Subject: [PATCH 02/11] multiviewer-for-f1: init at 1.24.1 (cherry picked from commit 5e496c9a72beb9619cca6bd45ca6bd52aed40dde) --- .../video/multiviewer-for-f1/default.nix | 103 ++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 105 insertions(+) create mode 100644 pkgs/applications/video/multiviewer-for-f1/default.nix diff --git a/pkgs/applications/video/multiviewer-for-f1/default.nix b/pkgs/applications/video/multiviewer-for-f1/default.nix new file mode 100644 index 000000000000..d373a850e65a --- /dev/null +++ b/pkgs/applications/video/multiviewer-for-f1/default.nix @@ -0,0 +1,103 @@ +{ stdenvNoCC +, fetchurl +, lib +, makeWrapper +, autoPatchelfHook +, dpkg +, alsa-lib +, at-spi2-atk +, cairo +, cups +, dbus +, expat +, ffmpeg +, glib +, gtk3 +, libdrm +, libudev0-shim +, libxkbcommon +, mesa +, nspr +, nss +, pango +, xorg +}: + +let + id = "117980724"; +in +stdenvNoCC.mkDerivation rec { + pname = "multiviewer-for-f1"; + version = "1.24.1"; + + src = fetchurl { + url = "https://releases.multiviewer.dev/download/${id}/multiviewer-for-f1_${version}_amd64.deb"; + sha256 = "sha256-uEcxDIWolouIUJ8Xuva3rtW51gfCddAwTGqOBnucmmY="; + }; + + nativeBuildInputs = [ + dpkg + makeWrapper + autoPatchelfHook + ]; + + buildInputs = [ + alsa-lib + at-spi2-atk + cairo + cups + dbus + expat + ffmpeg + glib + gtk3 + libdrm + libxkbcommon + mesa + nspr + nss + pango + xorg.libX11 + xorg.libXcomposite + xorg.libxcb + xorg.libXdamage + xorg.libXext + xorg.libXfixes + xorg.libXrandr + ]; + + dontBuild = true; + dontConfigure = true; + + unpackPhase = '' + runHook preUnpack + + # The deb file contains a setuid binary, so 'dpkg -x' doesn't work here + dpkg --fsys-tarfile $src | tar --extract + + runHook postUnpack + ''; + + installPhase = '' + runHook preInstall + + mkdir -p $out/bin $out/share + mv -t $out/share usr/share/* usr/lib/multiviewer-for-f1 + + makeWrapper "$out/share/multiviewer-for-f1/MultiViewer for F1" $out/bin/multiviewer-for-f1 \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform=wayland --enable-features=WaylandWindowDecorations}}" \ + --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ libudev0-shim ]}:\"$out/share/Multiviewer for F1\"" + + runHook postInstall + ''; + + meta = with lib; { + description = "Unofficial desktop client for F1 TV®"; + homepage = "https://multiviewer.app"; + downloadPage = "https://multiviewer.app/download"; + license = licenses.unfree; + maintainers = with maintainers; [ babeuh ]; + platforms = [ "x86_64-linux" ]; + }; +} + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 089c41d33def..df87a3d1892d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -30954,6 +30954,8 @@ with pkgs; molsketch = libsForQt5.callPackage ../applications/editors/molsketch { }; + multiviewer-for-f1 = callPackage ../applications/video/multiviewer-for-f1 { }; + pattypan = callPackage ../applications/misc/pattypan { jdk = jdk.override { enableJavaFX = true; }; }; From 9a2a79a6ba58a11f3978aa0f507d7f03de1e33bb Mon Sep 17 00:00:00 2001 From: networkException Date: Thu, 27 Jul 2023 12:39:20 +0200 Subject: [PATCH 03/11] ungoogled-chromium: 115.0.5790.102 -> 115.0.5790.110 (cherry picked from commit e987531533df5e774cd8d17d7865e86a698c59ee) --- .../networking/browsers/chromium/upstream-info.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index 79abe4f1dd70..f92fed32a9da 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -45,9 +45,9 @@ } }, "ungoogled-chromium": { - "version": "115.0.5790.102", - "sha256": "0sxhhsrn4cg9akpnb2qpn7kkgp286rh8y2mmypm2409s5grf1xh6", - "sha256bin64": "18n7xqbvcdd68856wmbrxx1f5lqj61g9cyiir9dzlfmf0a9wxvml", + "version": "115.0.5790.110", + "sha256": "0wgp44qnvmdqf2kk870ndm51rcvar36li2qq632ay4n8gfpbrm79", + "sha256bin64": "1w2jl92x78s4vxv4p1imkz7qaq51yvs0wiz2bclbjz0hjlw9akr3", "deps": { "gn": { "version": "2023-05-19", @@ -56,8 +56,8 @@ "sha256": "0y07c18xskq4mclqiz3a63fz8jicz2kqridnvdhqdf75lhp61f8a" }, "ungoogled-patches": { - "rev": "115.0.5790.102-1", - "sha256": "0g3igkca75d4h1ydzhh2xsp4lw6i6420pvhv71f92msppmsz83n8" + "rev": "115.0.5790.110-1", + "sha256": "1jahy4jl5bnnzl6433hln0dj3b39v5zqd90n8zf7ss45wqrff91b" } } } From 8c2f87287e69bbeac2d753ff94cd7e8d3353606b Mon Sep 17 00:00:00 2001 From: Olli Helenius Date: Thu, 27 Jul 2023 13:46:24 +0300 Subject: [PATCH 04/11] gradle: 8.0.1 -> 8.2.1 (cherry picked from commit 5aa3fc52e2b4b37bdeb2b1e90e4516de2dc1dd21) --- pkgs/development/tools/build-managers/gradle/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/build-managers/gradle/default.nix b/pkgs/development/tools/build-managers/gradle/default.nix index ff794be099c4..648158a9b78a 100644 --- a/pkgs/development/tools/build-managers/gradle/default.nix +++ b/pkgs/development/tools/build-managers/gradle/default.nix @@ -127,9 +127,9 @@ rec { # https://docs.gradle.org/current/userguide/compatibility.html gradle_8 = gen { - version = "8.0.1"; + version = "8.2.1"; nativeVersion = "0.22-milestone-24"; - sha256 = "02g9i1mrpdydj8d6395cv6a4ny9fw3z7sjzr7n6l6a9zx65masqv"; + sha256 = "1lasx96qgh1pjmjjk8a5a772ppgqmp33mp6axyfsjalg71nigv03"; defaultJava = jdk17; }; From 5ba1fcbad9338f85b9e35dba0b8af806f076e04b Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Fri, 14 Jul 2023 11:50:31 +0200 Subject: [PATCH 05/11] pjsip: 2.13 -> 2.13.1 Fixes CVE-2023-27585. Changes: https://github.com/pjsip/pjproject/releases/tag/2.13.1 (cherry picked from commit 3601ccf5aeece88bf85f4373aa9aaf3c939b0e73) --- pkgs/applications/networking/pjsip/default.nix | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) diff --git a/pkgs/applications/networking/pjsip/default.nix b/pkgs/applications/networking/pjsip/default.nix index 11462dab9a1b..9c1b8e4f2617 100644 --- a/pkgs/applications/networking/pjsip/default.nix +++ b/pkgs/applications/networking/pjsip/default.nix @@ -2,7 +2,6 @@ , testers , stdenv , fetchFromGitHub -, fetchpatch , openssl , libsamplerate , swig @@ -16,27 +15,17 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "pjsip"; - version = "2.13"; + version = "2.13.1"; src = fetchFromGitHub { owner = finalAttrs.pname; repo = "pjproject"; - rev = finalAttrs.version; - sha256 = "sha256-yzszmm3uIyXtYFgZtUP3iswLx4u/8UbFt80Ln25ToFE="; + rev = "refs/tags/${finalAttrs.version}"; + hash = "sha256-R1iKIkWyNCRV2PjQgTqKmJYUgHAZrREanD60Jz6MY1Y="; }; patches = [ ./fix-aarch64.patch - (fetchpatch { - name = "CVE-2022-23537.patch"; - url = "https://github.com/pjsip/pjproject/commit/d8440f4d711a654b511f50f79c0445b26f9dd1e1.patch"; - sha256 = "sha256-7ueQCHIiJ7MLaWtR4+GmBc/oKaP+jmEajVnEYqiwLRA="; - }) - (fetchpatch { - name = "CVE-2022-23547.patch"; - url = "https://github.com/pjsip/pjproject/commit/bc4812d31a67d5e2f973fbfaf950d6118226cf36.patch"; - sha256 = "sha256-bpc8e8VAQpfyl5PX96G++6fzkFpw3Or1PJKNPKl7N5k="; - }) ]; nativeBuildInputs = From a4b255cc907aca64d257460a12554bc071c12613 Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Thu, 13 Jul 2023 23:13:09 +0200 Subject: [PATCH 06/11] ntp: 4.2.8p15 -> 4.2.8p17 Fixes CVE-2023-26555, CVE-2023-26551, CVE-2023-26552, CVE-2023-26553 and CVE-2023-26554. Release announcement: https://www.ntp.org/support/securitynotice/4_2_8p17-release-announcement/ https://www.ntp.org/support/securitynotice/4_2_8p16-release-announcement/ (cherry picked from commit 5f23eb96cddf606c78e803ecc207b34d25d69440) --- pkgs/tools/networking/ntp/default.nix | 13 +++------ .../tools/networking/ntp/glibc-2.34-fix.patch | 28 ------------------- 2 files changed, 4 insertions(+), 37 deletions(-) delete mode 100644 pkgs/tools/networking/ntp/glibc-2.34-fix.patch diff --git a/pkgs/tools/networking/ntp/default.nix b/pkgs/tools/networking/ntp/default.nix index f272470a98f4..1a081993bbd6 100644 --- a/pkgs/tools/networking/ntp/default.nix +++ b/pkgs/tools/networking/ntp/default.nix @@ -2,18 +2,13 @@ stdenv.mkDerivation rec { pname = "ntp"; - version = "4.2.8p15"; + version = "4.2.8p17"; src = fetchurl { - url = "https://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-${lib.versions.majorMinor version}/ntp-${version}.tar.gz"; - sha256 = "06cwhimm71safmwvp6nhxp6hvxsg62whnbgbgiflsqb8mgg40n7n"; + url = "https://archive.ntp.org/ntp4/ntp-${lib.versions.majorMinor version}/ntp-${version}.tar.gz"; + hash = "sha256-ED3ScuambFuN8H3OXpoCVV/NbxOXvft4IjcyjonTqGY="; }; - patches = [ - # From https://patchwork.openembedded.org/patch/180019/ - ./glibc-2.34-fix.patch - ]; - configureFlags = [ "--sysconfdir=/etc" "--localstatedir=/var" @@ -33,7 +28,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - homepage = "http://www.ntp.org/"; + homepage = "https://www.ntp.org/"; description = "An implementation of the Network Time Protocol"; license = { # very close to isc and bsd2 diff --git a/pkgs/tools/networking/ntp/glibc-2.34-fix.patch b/pkgs/tools/networking/ntp/glibc-2.34-fix.patch deleted file mode 100644 index 256f125a77b2..000000000000 --- a/pkgs/tools/networking/ntp/glibc-2.34-fix.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 082a504cfcc046c3d8adaae1164268bc94e5108a Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Sat, 31 Jul 2021 10:51:41 -0700 -Subject: [PATCH] libntp: Do not use PTHREAD_STACK_MIN on glibc -In glibc 2.34+ PTHREAD_STACK_MIN is not a compile-time constant which -could mean different stack sizes at runtime on different architectures -and it also causes compile failure. Default glibc thread stack size -or 64Kb set by ntp should be good in glibc these days. -Upstream-Status: Pending -Signed-off-by: Khem Raj ---- - libntp/work_thread.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/libntp/work_thread.c b/libntp/work_thread.c -index 03a5647..3ddd751 100644 ---- a/libntp/work_thread.c -+++ b/libntp/work_thread.c -@@ -41,7 +41,7 @@ - #ifndef THREAD_MINSTACKSIZE - # define THREAD_MINSTACKSIZE (64U * 1024) - #endif --#ifndef __sun -+#if !defined(__sun) && !defined(__GLIBC__) - #if defined(PTHREAD_STACK_MIN) && THREAD_MINSTACKSIZE < PTHREAD_STACK_MIN - # undef THREAD_MINSTACKSIZE - # define THREAD_MINSTACKSIZE PTHREAD_STACK_MIN --- -2.32.0 From 52ab673cba118a2d5e7317cb69ee5b0cf0be77c5 Mon Sep 17 00:00:00 2001 From: Cathal Mullan Date: Fri, 28 Jul 2023 13:39:53 +0100 Subject: [PATCH 07/11] pgcat: init at 1.1.0 (cherry picked from commit 3fe70ce0024a9e567e3404f3129c48968656991a) --- pkgs/servers/sql/pgcat/default.nix | 50 ++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 52 insertions(+) create mode 100644 pkgs/servers/sql/pgcat/default.nix diff --git a/pkgs/servers/sql/pgcat/default.nix b/pkgs/servers/sql/pgcat/default.nix new file mode 100644 index 000000000000..72c3155861bb --- /dev/null +++ b/pkgs/servers/sql/pgcat/default.nix @@ -0,0 +1,50 @@ +{ lib +, stdenv +, fetchFromGitHub +, rustPlatform +, darwin +}: + +rustPlatform.buildRustPackage rec { + pname = "pgcat"; + version = "1.1.0"; + + src = fetchFromGitHub { + owner = "postgresml"; + repo = "pgcat"; + rev = "v${version}"; + hash = "sha256-ESHBOh9JSzu6Zxh0z/+nebumi/zyFVdTK0DIwR/46Xo="; + }; + + cargoHash = "sha256-2wZADXEi8bfNgSQuL7yAmDYd/a0LOssdPFa/kvSSLFU="; + + buildInputs = lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.Security + ]; + + checkFlags = [ + # requires network access + "--skip=dns_cache::CachedResolver::lookup_ip" + "--skip=dns_cache::CachedResolver::new" + "--skip=dns_cache::CachedResolver" + "--skip=dns_cache::tests::has_changed" + "--skip=dns_cache::tests::incorrect_address" + "--skip=dns_cache::tests::lookup_ip" + "--skip=dns_cache::tests::new" + "--skip=dns_cache::tests::thread" + "--skip=dns_cache::tests::unknown_host" + ]; + + doInstallCheck = true; + installCheckPhase = '' + $out/bin/pgcat --version | grep "pgcat ${version}" + ''; + + meta = with lib; { + homepage = "https://github.com/postgresml/pgcat"; + description = "PostgreSQL pooler with sharding, load balancing and failover support."; + license = with licenses; [mit]; + platforms = platforms.unix; + maintainers = with maintainers; [cathalmullan]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ec918367161c..32be6632148d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -26000,6 +26000,8 @@ with pkgs; pgbouncer = callPackage ../servers/sql/pgbouncer { }; + pgcat = callPackage ../servers/sql/pgcat {}; + pgpool = callPackage ../servers/sql/pgpool { }; tang = callPackage ../servers/tang { From c79b1dc83d9aa51c153369c90ef0512d45cf9096 Mon Sep 17 00:00:00 2001 From: Atemu Date: Fri, 28 Jul 2023 15:59:57 +0200 Subject: [PATCH 08/11] linux_xanmod: 6.1.39 -> 6.1.42 (cherry picked from commit cbf2d325b4812fb3e18349867a50a192ef34b3d1) --- pkgs/os-specific/linux/kernel/xanmod-kernels.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix index 4781f5f14e55..a4d194783b03 100644 --- a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix +++ b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix @@ -3,8 +3,8 @@ let # These names are how they are designated in https://xanmod.org. ltsVariant = { - version = "6.1.39"; - hash = "sha256-H7KoNTl00OCQhUZXNM6PfiknI+lOVNxe2+levmJM5gA="; + version = "6.1.42"; + hash = "sha256-mOydloX5bff9wrFh40wf12GW+sION9SoGK2mAC1yNOw="; variant = "lts"; }; From fc4c9c41270a5d48b6f81598078ff68345b7dee5 Mon Sep 17 00:00:00 2001 From: Atemu Date: Fri, 28 Jul 2023 16:00:23 +0200 Subject: [PATCH 09/11] linux_xanmod_latest: 6.4.4 -> 6.4.7 (cherry picked from commit c7ac8bcc04a61ea638daf95ebc27ef15ab6be112) --- pkgs/os-specific/linux/kernel/xanmod-kernels.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix index a4d194783b03..4412bd56fadd 100644 --- a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix +++ b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix @@ -9,8 +9,8 @@ let }; mainVariant = { - version = "6.4.4"; - hash = "sha256-EdyGAdWIPr91SNz68tVhya9YO4/dL/wEmEklo45i2p0="; + version = "6.4.7"; + hash = "sha256-0yOVCMqhoiWz8IlYRR0wXytAzjv81Cf5NoFa9qxGMm4="; variant = "main"; }; From 35e6797e38dd98dcf4bef3b95ae78e866f032650 Mon Sep 17 00:00:00 2001 From: Kiskae Date: Tue, 27 Jun 2023 10:24:50 +0200 Subject: [PATCH 10/11] linuxPackages.nvidiaPackages.mkDriver: init (cherry picked from commit 8ef3c5b70e8aac987594dde103da016915e0d6a8) --- pkgs/os-specific/linux/nvidia-x11/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix index 8825c5f39b3e..254a02f1f0c1 100644 --- a/pkgs/os-specific/linux/nvidia-x11/default.nix +++ b/pkgs/os-specific/linux/nvidia-x11/default.nix @@ -18,6 +18,8 @@ let else a; in rec { + mkDriver = generic; + # Official Unix Drivers - https://www.nvidia.com/en-us/drivers/unix/ # Branch/Maturity data - http://people.freedesktop.org/~aplattner/nvidia-versions.txt From 77a36daa6961a20f27621fd61a08d3a14bfaad2c Mon Sep 17 00:00:00 2001 From: linsui Date: Sat, 29 Jul 2023 22:34:47 +0800 Subject: [PATCH 11/11] jami: apply CVE patch (cherry picked from commit 1b78e939aa8ffe1aa7a15f8940fb5df2b74e6c20) --- .../networking/instant-messengers/jami/default.nix | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/instant-messengers/jami/default.nix b/pkgs/applications/networking/instant-messengers/jami/default.nix index d7b0a675bb52..4718353c3c15 100644 --- a/pkgs/applications/networking/instant-messengers/jami/default.nix +++ b/pkgs/applications/networking/instant-messengers/jami/default.nix @@ -2,6 +2,7 @@ , lib , pkg-config , fetchFromGitLab +, fetchpatch , gitUpdater , ffmpeg_5 @@ -90,7 +91,15 @@ stdenv.mkDerivation rec { hash = "sha256-hrm5tDM2jknU/gWMeO6/FhqOvay8bajFid39OiEtAAQ="; }; - patches = (map (x: patch-src + x) (readLinesToList ./config/pjsip_patches)); + patches = (map (x: patch-src + x) (readLinesToList ./config/pjsip_patches)) ++ [ + (fetchpatch { + name = "CVE-2023-27585.patch"; + url = "https://github.com/pjsip/pjproject/commit/d1c5e4da5bae7f220bc30719888bb389c905c0c5.patch"; + hash = "sha256-+yyKKTKG2FnfyLWnc4S80vYtDzmiu9yRmuqb5eIulPg="; + }) + ]; + + patchFlags = [ "-p1" "-l" ]; configureFlags = (readLinesToList ./config/pjsip_args_common) ++ lib.optionals stdenv.isLinux (readLinesToList ./config/pjsip_args_linux);