Merge #214010: staging-next 2023-02-01

NixOS · Feb 13, 2023 · f1f9ae6 · f1f9ae6
2 parents 38f213c + a6767ed
commit f1f9ae6
Show file tree

Hide file tree

Showing 297 changed files with 2,882 additions and 2,077 deletions.
diff --git a/nixos/tests/systemd-cryptenroll.nix b/nixos/tests/systemd-cryptenroll.nix
@@ -2,7 +2,6 @@ import ./make-test-python.nix ({ pkgs, ... }: {
  name = "systemd-cryptenroll";
  meta = with pkgs.lib.maintainers; {
  maintainers = [ ymatsiuk ];
- broken = true; # times out after two hours, details -> https://github.com/NixOS/nixpkgs/issues/167994
  };
 
  nodes.machine = { pkgs, lib, ... }: {

diff --git a/pkgs/applications/audio/aether-lv2/default.nix b/pkgs/applications/audio/aether-lv2/default.nix
@@ -18,6 +18,12 @@ stdenv.mkDerivation rec {
  lv2 libX11 libGL libGLU mesa
  ];
 
+ NIX_CFLAGS_COMPILE = [
+ # Needed with GCC 12
+ "-Wno-error=array-bounds"
+ "-Wno-error=stringop-overflow"
+ ];
+
  installPhase = ''
  mkdir -p $out/lib/lv2
  cp -r aether.lv2 $out/lib/lv2

diff --git a/pkgs/applications/audio/bespokesynth/default.nix b/pkgs/applications/audio/bespokesynth/default.nix
@@ -66,6 +66,10 @@ stdenv.mkDerivation rec {
  fetchSubmodules = true;
  };
 
+ postPatch = ''
+ sed '1i#include <memory>' -i Source/TitleBar.h # gcc12
+ '';
+
  cmakeBuildType = "Release";
 
  cmakeFlags = lib.optionals enableVST2 [ "-DBESPOKE_VST2_SDK_LOCATION=${vst-sdk}/VST2_SDK" ];

diff --git a/pkgs/applications/audio/calf/default.nix b/pkgs/applications/audio/calf/default.nix
@@ -10,6 +10,8 @@ stdenv.mkDerivation rec {
  sha256 = "17x4hylgq4dn9qycsdacfxy64f5cv57n2qgkvsdp524gnqzw4az3";
  };
 
+ outputs = [ "out" "doc" ];
+
  enableParallelBuilding = true;
 
  nativeBuildInputs = [ pkg-config ];

diff --git a/pkgs/applications/audio/furnace/default.nix b/pkgs/applications/audio/furnace/default.nix
@@ -63,6 +63,12 @@ stdenv.mkDerivation rec {
  "-DWARNINGS_ARE_ERRORS=ON"
  ];
 
+ NIX_CFLAGS_COMPILE = lib.optionals (stdenv.cc.isGNU && lib.versionAtLeast stdenv.cc.version "12") [
+ # Needed with GCC 12 but breaks on darwin (with clang) or aarch64 (old gcc)
+ "-Wno-error=mismatched-new-delete"
+ "-Wno-error=use-after-free"
+ ];
+
  postInstall = lib.optionalString stdenv.hostPlatform.isDarwin ''
  # Normal CMake install phase on Darwin only installs the binary, the user is expected to use CPack to build a
  # bundle. That adds alot of overhead for not much benefit (CPack is currently abit broken, and needs impure access

diff --git a/pkgs/applications/audio/jack-rack/default.nix b/pkgs/applications/audio/jack-rack/default.nix
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
  };
  nativeBuildInputs = [ pkg-config ];
  buildInputs = [ libjack2 ladspaH gtk2 alsa-lib libxml2 lrdf ];
- NIX_LDFLAGS = "-ldl -lm -lpthread";
+ NIX_LDFLAGS = "-lm -lpthread";
 
  meta = {
  description = ''An effects "rack" for the JACK low latency audio API'';

diff --git a/pkgs/applications/audio/jamin/default.nix b/pkgs/applications/audio/jamin/default.nix
@@ -21,8 +21,6 @@ stdenv.mkDerivation rec {
  # `l_notebook1'; jamin-callbacks.o:/build/jamin-0.95.0/src/hdeq.h:64: first defined here
  NIX_CFLAGS_COMPILE = "-fcommon";
 
- NIX_LDFLAGS = "-ldl";
-
  postInstall = ''
  wrapProgram $out/bin/jamin --set LADSPA_PATH ${ladspaPlugins}/lib/ladspa
  '';

diff --git a/pkgs/applications/audio/lsp-plugins/default.nix b/pkgs/applications/audio/lsp-plugins/default.nix
@@ -4,19 +4,21 @@
 , ladspaH, php, libXrandr }:
 
 stdenv.mkDerivation rec {
-  pname = "lsp-plugins";
-  version = "1.2.5";
+ pname = "lsp-plugins";
+ version = "1.2.5";
 
-  src = fetchurl {
-  url = "https://github.com/sadko4u/${pname}/releases/download/${version}/${pname}-src-${version}.tar.gz";
-  sha256 = "sha256-YYrt+FbpY7iEui0aw4Ce94BW1SHDk0OH8gFSzkW2fkw=";
-  };
+ src = fetchurl {
+ url = "https://github.com/sadko4u/${pname}/releases/download/${version}/${pname}-src-${version}.tar.gz";
+ sha256 = "sha256-YYrt+FbpY7iEui0aw4Ce94BW1SHDk0OH8gFSzkW2fkw=";
+ };
 
- nativeBuildInputs = [ pkg-config php makeWrapper ];
- buildInputs = [ jack2 libsndfile libGLU libGL lv2 cairo ladspaH libXrandr ];
+ outputs = [ "out" "dev" "doc" ];
 
- makeFlags = [
- "PREFIX=${placeholder "out"}"
+ nativeBuildInputs = [ pkg-config php makeWrapper ];
+ buildInputs = [ jack2 libsndfile libGLU libGL lv2 cairo ladspaH libXrandr ];
+
+ makeFlags = [
+ "PREFIX=${placeholder "out"}"
  ];
 
  NIX_CFLAGS_COMPILE = "-DLSP_NO_EXPERIMENTAL";

diff --git a/pkgs/applications/audio/mimic/default.nix b/pkgs/applications/audio/mimic/default.nix
@@ -38,6 +38,11 @@ stdenv.mkDerivation rec {
  pcre2
  ] ++ lib.optional pulseaudioSupport libpulseaudio;
 
+ NIX_CFLAGS_COMPILE = [
+ # Needed with GCC 12
+ "-Wno-error=free-nonheap-object"
+ ];
+
  postInstall = ''
  wrapProgram $out/bin/mimic \
  --run "export ALSA_PLUGIN_DIR=${alsa-plugins}/lib/alsa-lib"

diff --git a/pkgs/applications/audio/mpg123/default.nix b/pkgs/applications/audio/mpg123/default.nix
@@ -18,11 +18,11 @@
 
 stdenv.mkDerivation rec {
  pname = "mpg123";
- version = "1.29.3";
+ version = "1.31.2";
 
  src = fetchurl {
  url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.bz2";
- sha256 = "sha256-ljiF2Mx3Ji8ot3GHx9GJ4yGV5kJE3iUwt5jd8yGD6Ec=";
+ sha256 = "sha256-sX8ikF4x9DtrQB399qce0Ru30Fb2jbRJ1wufmug5x94=";
  };
 
  outputs = [ "out" ] ++ lib.optionals withConplay [ "conplay" ];

diff --git a/pkgs/applications/audio/odin2/default.nix b/pkgs/applications/audio/odin2/default.nix
@@ -28,6 +28,11 @@ stdenv.mkDerivation rec {
  sha256 = "sha256-N96Nb7G6hqfh8DyMtHbttl/fRZUkS8f2KfPSqeMAhHY=";
  };
 
+ postPatch = ''
+ sed '1i#include <utility>' -i \
+ libs/JUCELV2/modules/juce_gui_basics/windows/juce_ComponentPeer.h # gcc12
+ '';
+
  nativeBuildInputs = [
  cmake
  pkg-config

diff --git a/pkgs/applications/audio/opusfile/default.nix b/pkgs/applications/audio/opusfile/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, pkg-config, openssl, libogg, libopus }:
+{ lib, stdenv, fetchurl, pkg-config, openssl, libogg, libopus, fetchpatch }:
 
 stdenv.mkDerivation rec {
  pname = "opusfile";
@@ -12,7 +12,14 @@ stdenv.mkDerivation rec {
  buildInputs = [ openssl libogg ];
  propagatedBuildInputs = [ libopus ];
  outputs = [ "out" "dev" ];
- patches = [ ./include-multistream.patch ]
+ patches = [
+ ./include-multistream.patch
+ (fetchpatch {
+ name = "CVE-2022-47021.patch";
+ url = "https://github.com/xiph/opusfile/commit/0a4cd796df5b030cb866f3f4a5e41a4b92caddf5.patch";
+ sha256 = "sha256-XThI/ys5caB+OncFVfxm5IsvQPy1MbLQKwIlYjPvTJQ=";
+ })
+ ]
  # fixes problem with openssl 1.1 dependency
  # see https://github.com/xiph/opusfile/issues/13
  ++ lib.optionals stdenv.hostPlatform.isWindows [ ./disable-cert-store.patch ];

diff --git a/pkgs/applications/audio/stochas/default.nix b/pkgs/applications/audio/stochas/default.nix
@@ -12,6 +12,11 @@ stdenv.mkDerivation rec {
  fetchSubmodules = true;
  };
 
+ postPatch = ''
+ sed '1i#include <utility>' -i \
+ lib/JUCE/modules/juce_gui_basics/windows/juce_ComponentPeer.h # gcc12
+ '';
+
  nativeBuildInputs = [ cmake pkg-config ];
 
  buildInputs = [

diff --git a/pkgs/applications/editors/ed/default.nix b/pkgs/applications/editors/ed/default.nix
@@ -8,11 +8,11 @@
 
 stdenv.mkDerivation (rec {
  pname = "ed";
- version = "1.18";
+ version = "1.19";
 
  src = fetchurl {
  url = "mirror://gnu/ed/${pname}-${version}.tar.lz";
- sha256 = "sha256-rKjvrZgAxYdySiC5eqj8R+a1pH34Fgb+q6gxsHRGK08=";
+ hash = "sha256-zi8uXEJHkKqW0J2suT2bv9wLfrYknJy3U4RS6Ox3zUg=";
  };
 
  nativeBuildInputs = [ lzip ];

diff --git a/pkgs/applications/editors/poke/default.nix b/pkgs/applications/editors/poke/default.nix
@@ -80,13 +80,13 @@ in stdenv.mkDerivation rec {
  moveToOutput share/vim "$out"
  '';
 
+ # Prevent tclPackageHook from auto-wrapping all binaries, we only
+ # need to wrap poke-gui
+ dontWrapTclBinaries = true;
+
  postFixup = lib.optionalString guiSupport ''
  wrapProgram "$out/bin/poke-gui" \
  --prefix TCLLIBPATH ' ' "$TCLLIBPATH"
-
- # Prevent tclPackageHook from auto-wrapping all binaries, we only
- # need to wrap poke-gui
- unset TCLLIBPATH
  '';
 
  passthru = {

diff --git a/pkgs/applications/emulators/mame/default.nix b/pkgs/applications/emulators/mame/default.nix
@@ -117,6 +117,10 @@ stdenv.mkDerivation rec {
  --subst-var-by mamePath "$out/opt/mame"
  '';
 
+ NIX_CFLAGS_COMPILE = [
+ "-Wno-error=use-after-free"
+ ];
+
  desktopItems = [
  (makeDesktopItem {
  name = "MAME";

diff --git a/pkgs/applications/emulators/rpcs3/default.nix b/pkgs/applications/emulators/rpcs3/default.nix
@@ -1,4 +1,4 @@
-{ gcc11Stdenv, lib, fetchFromGitHub, wrapQtAppsHook, cmake, pkg-config, git
+{ gcc12Stdenv, lib, fetchFromGitHub, wrapQtAppsHook, cmake, pkg-config, git
 , qtbase, qtquickcontrols, qtmultimedia, openal, glew, vulkan-headers, vulkan-loader, libpng
 , ffmpeg, libevdev, libusb1, zlib, curl, wolfssl, python3, pugixml, faudio, flatbuffers
 , sdl2Support ? true, SDL2
@@ -21,7 +21,7 @@ let
  sha256 = "0c3g30rj1y8fbd2q4kwlpg1jdy02z4w5ryhj3yr9051pdnf4kndz";
  };
 in
-gcc11Stdenv.mkDerivation {
+gcc12Stdenv.mkDerivation {
  pname = "rpcs3";
  version = rpcs3Version;
 

diff --git a/pkgs/applications/graphics/foxotron/default.nix b/pkgs/applications/graphics/foxotron/default.nix
@@ -46,6 +46,11 @@ stdenv.mkDerivation rec {
  ++ lib.optionals stdenv.hostPlatform.isLinux [ libX11 libXrandr libXinerama libXcursor libXi libXext alsa-lib fontconfig libGLU ]
  ++ lib.optionals stdenv.hostPlatform.isDarwin [ AVFoundation Carbon Cocoa CoreAudio Kernel OpenGL ];
 
+ NIX_CFLAGS_COMPILE = [
+ # Needed with GCC 12
+ "-Wno-error=array-bounds"
+ ];
+
  installPhase = ''
  runHook preInstall
 

diff --git a/pkgs/applications/graphics/goxel/default.nix b/pkgs/applications/graphics/goxel/default.nix
@@ -16,6 +16,12 @@ stdenv.mkDerivation rec {
 
  nativeBuildInputs = [ scons pkg-config wrapGAppsHook ];
  buildInputs = [ glfw3 gtk3 libpng12 ];
+
+ NIX_CFLAGS_COMPILE = [
+ # Needed with GCC 12
+ "-Wno-error=format-truncation"
+ ];
+
  NIX_LDFLAGS = "-lpthread";
 
  buildPhase = ''

diff --git a/pkgs/applications/graphics/hdrmerge/default.nix b/pkgs/applications/graphics/hdrmerge/default.nix
@@ -46,6 +46,11 @@ mkDerivation rec {
  url = "https://github.com/mkroehnert/hdrmerge/commit/472b2dfe7d54856158aea3d5412a02d0bab1da4c.patch";
  sha256 = "0jc713ajr4w08pfbi6bva442prj878nxp1fpl9112i3xj34x9sdi";
  })
+ (fetchpatch {
+ name = "support-libraw-0.21.patch";
+ url = "https://github.com/jcelaya/hdrmerge/commit/779e566b3e2807280b78c79affda2cdfa64bde87.diff";
+ sha256 = "48sivCfJWEtGiBXTrO+SWTVlT9xyx92w2kkB8Wt/clk=";
+ })
  ];
 
  desktopItems = [

diff --git a/pkgs/applications/graphics/krita/default.nix b/pkgs/applications/graphics/krita/default.nix
@@ -1,7 +1,7 @@
 { callPackage, ... } @ args:
 
 callPackage ./generic.nix (args // {
- version = "5.1.4";
+ version = "5.1.5";
  kde-channel = "stable";
- sha256 = "sha256-wisCCGJZbrL92RHhsXnbvOewgb4RFFei6sr2rhzKLcs=";
+ sha256 = "1lx4x4affkbh47b7w5qvahkkr4db0vcw6h24nykak6gpy2z5wxqw";
 })
diff --git a/pkgs/applications/misc/lyx/default.nix b/pkgs/applications/misc/lyx/default.nix
@@ -11,6 +11,12 @@ mkDerivation rec {
  sha256 = "sha256-xr7SYzQZiY4Bp8w1AxDX2TS/WRyrcln8JYGqTADq+ng=";
  };
 
+ # Needed with GCC 12
+ postPatch = ''
+ sed '1i#include <iterator>' -i src/lyxfind.cpp
+ sed '1i#include <cstring>' -i src/insets/InsetListings.cpp
+ '';
+
  # LaTeX is used from $PATH, as people often want to have it with extra pkgs
  nativeBuildInputs = [ pkg-config makeWrapper ];
  buildInputs = [

diff --git a/pkgs/applications/misc/mysql-workbench/default.nix b/pkgs/applications/misc/mysql-workbench/default.nix
@@ -140,13 +140,16 @@ in stdenv.mkDerivation rec {
  patchShebangs tools/get_wb_version.sh
  '';
 
- NIX_CFLAGS_COMPILE = toString ([
+ NIX_CFLAGS_COMPILE = [
  # error: 'OGRErr OGRSpatialReference::importFromWkt(char**)' is deprecated
  "-Wno-error=deprecated-declarations"
  ] ++ lib.optionals stdenv.isAarch64 [
  # error: narrowing conversion of '-1' from 'int' to 'char'
  "-Wno-error=narrowing"
- ]);
+ ] ++ lib.optionals (stdenv.cc.isGNU && lib.versionAtLeast stdenv.cc.version "12") [
+ # Needed with GCC 12 but problematic with some old GCCs
+ "-Wno-error=maybe-uninitalized"
+ ];
 
  cmakeFlags = [
  "-DMySQL_CONFIG_PATH=${mysql}/bin/mysql_config"

diff --git a/pkgs/applications/networking/instant-messengers/jami/client.nix b/pkgs/applications/networking/instant-messengers/jami/client.nix
@@ -9,7 +9,7 @@
 , python3
 , qttools # for translations
 , wrapQtAppsHook
-, ffmpeg-jami
+, ffmpeg_5
 , jami-daemon
 , libnotify
 , qt5compat
@@ -43,7 +43,7 @@ stdenv.mkDerivation {
  ];
 
  buildInputs = [
- ffmpeg-jami
+ ffmpeg_5
  jami-daemon
  libnotify
  networkmanager