From 433fe023817d45abcda828c48f27512c212d398f Mon Sep 17 00:00:00 2001 From: Antoine Pietri Date: Mon, 30 Oct 2023 01:17:45 +0100 Subject: [PATCH 1/5] escrotum: add ffmpeg-full to PATH of wrapper Screen recording requires ffmpeg with --enable-libxcb. --- pkgs/tools/graphics/escrotum/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/tools/graphics/escrotum/default.nix b/pkgs/tools/graphics/escrotum/default.nix index 08136f57ef88..04c245dbd9a6 100644 --- a/pkgs/tools/graphics/escrotum/default.nix +++ b/pkgs/tools/graphics/escrotum/default.nix @@ -1,4 +1,5 @@ { lib, python3Packages, fetchFromGitHub +, ffmpeg-full , gtk3 , pango , gobject-introspection @@ -33,6 +34,8 @@ with python3Packages; buildPythonApplication { outputs = [ "out" "man" ]; + makeWrapperArgs = ["--prefix PATH : ${lib.makeBinPath [ ffmpeg-full ]}"]; + postInstall = '' mkdir -p $man/share/man/man1 cp man/escrotum.1 $man/share/man/man1/ From 390a2965da31baf366685728dd60eca4b6944ee5 Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Mon, 30 Oct 2023 22:10:38 +0100 Subject: [PATCH 2/5] mysql80: 8.0.34 -> 8.0.35 Fixes CVE-2023-22059, CVE-2023-22079, CVE-2023-22097, CVE-2023-22066, CVE-2023-22068, CVE-2023-22114, CVE-2023-22084, CVE-2023-22032, CVE-2023-22064, CVE-2023-22070, CVE-2023-22112, CVE-2023-22078 and CVE-2023-22092. https://www.oracle.com/security-alerts/cpuoct2023.html#AppendixMSQL Changes: https://dev.mysql.com/doc/relnotes/mysql/8.0/en/news-8-0-35.html --- pkgs/servers/sql/mysql/8.0.x.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sql/mysql/8.0.x.nix b/pkgs/servers/sql/mysql/8.0.x.nix index 4eec452d0f11..e136f02757d9 100644 --- a/pkgs/servers/sql/mysql/8.0.x.nix +++ b/pkgs/servers/sql/mysql/8.0.x.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "mysql"; - version = "8.0.34"; + version = "8.0.35"; src = fetchurl { url = "https://dev.mysql.com/get/Downloads/MySQL-${lib.versions.majorMinor finalAttrs.version}/mysql-${finalAttrs.version}.tar.gz"; - hash = "sha256-5l0Do8QmGLX7+ZBCrtMyCUAumyeqYsfIdD/9R4jY2x0="; + hash = "sha256-kXxe04cE6ZIRGFzkviTjOowZyRJB7XOvQYGm840VdMI="; }; nativeBuildInputs = [ bison cmake pkg-config ] From 91b90bc8c79a3ddc147a7b86e700d8e4a0909096 Mon Sep 17 00:00:00 2001 From: Zane van Iperen Date: Sat, 4 Nov 2023 21:15:34 +1000 Subject: [PATCH 3/5] fiji: remove myself as maintainer --- pkgs/applications/graphics/fiji/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/graphics/fiji/default.nix b/pkgs/applications/graphics/fiji/default.nix index 039eb45a2967..e3847b98d519 100644 --- a/pkgs/applications/graphics/fiji/default.nix +++ b/pkgs/applications/graphics/fiji/default.nix @@ -71,6 +71,6 @@ stdenv.mkDerivation rec { binaryNativeCode ]; license = with lib.licenses; [ gpl2Plus gpl3Plus bsd2 publicDomain ]; - maintainers = with maintainers; [ zane ]; + maintainers = with maintainers; [ ]; }; } From b8db6fee56ff9a83bdf7fbf2e796e11d7be75894 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 4 Nov 2023 13:22:28 +0000 Subject: [PATCH 4/5] greenfoot: 3.8.0 -> 3.8.1 --- pkgs/applications/editors/greenfoot/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/greenfoot/default.nix b/pkgs/applications/editors/greenfoot/default.nix index 52d52a0785ee..6ca6f35246d3 100644 --- a/pkgs/applications/editors/greenfoot/default.nix +++ b/pkgs/applications/editors/greenfoot/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { pname = "greenfoot"; - version = "3.8.0"; + version = "3.8.1"; src = fetchurl { # We use the deb here. First instinct might be to go for the "generic" JAR # download, but that is actually a graphical installer that is much harder # to unpack than the deb. url = "https://www.greenfoot.org/download/files/Greenfoot-linux-${builtins.replaceStrings ["."] [""] version}.deb"; - sha256 = "sha256-HDXmgLHS18VZVV+hCA0RgIrKRftOlV7t+fvE0pAHGjk="; + sha256 = "sha256-utGSAbP74O1t1iEoN0CwiZVc8HxdCxhozPPMwQCtkEE="; }; nativeBuildInputs = [ dpkg wrapGAppsHook ]; From 089d3839a6c5d4b84f05d555f99340d8fd02fee7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 4 Nov 2023 15:20:52 +0000 Subject: [PATCH 5/5] osmo-iuh: 1.4.0 -> 1.5.0 --- pkgs/servers/osmocom/osmo-iuh/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/osmocom/osmo-iuh/default.nix b/pkgs/servers/osmocom/osmo-iuh/default.nix index 201a7ee9abf7..9047c7439724 100644 --- a/pkgs/servers/osmocom/osmo-iuh/default.nix +++ b/pkgs/servers/osmocom/osmo-iuh/default.nix @@ -17,13 +17,13 @@ in stdenv.mkDerivation rec { pname = "osmo-iuh"; - version = "1.4.0"; + version = "1.5.0"; src = fetchFromGitHub { owner = "osmocom"; repo = "osmo-iuh"; rev = version; - hash = "sha256-AwLLfG+5JgvFSBddzyUQdPDFZOX1uQyDSyr4O/wTlgs="; + hash = "sha256-rAU2+NxD+j2jntZ7dHvakv2aTsfzAg0+SFDHtSJNpn8="; }; prePatch = ''