diff options
Diffstat (limited to 'pkgs/applications')
159 files changed, 1896 insertions, 1279 deletions
diff --git a/pkgs/applications/audio/bespokesynth/default.nix b/pkgs/applications/audio/bespokesynth/default.nix index 752088fcd8222..83c5af0a53fce 100644 --- a/pkgs/applications/audio/bespokesynth/default.nix +++ b/pkgs/applications/audio/bespokesynth/default.nix @@ -29,7 +29,7 @@ , curl , pcre , mount -, gnome +, zenity , Accelerate , Cocoa , WebKit @@ -91,7 +91,7 @@ stdenv.mkDerivation rec { libusb1 alsa-lib libjack2 - gnome.zenity + zenity alsa-tools libxcb xcbutil @@ -129,7 +129,7 @@ stdenv.mkDerivation rec { # These X11 libs get dlopen'd, they cause visual bugs when unavailable. wrapProgram $out/bin/BespokeSynth \ --prefix PATH : '${lib.makeBinPath [ - gnome.zenity + zenity (python3.withPackages (ps: with ps; [ jedi ])) ]}' ''; diff --git a/pkgs/applications/audio/easytag/default.nix b/pkgs/applications/audio/easytag/default.nix index 35ba2666f0b6b..d90735294d446 100644 --- a/pkgs/applications/audio/easytag/default.nix +++ b/pkgs/applications/audio/easytag/default.nix @@ -17,6 +17,7 @@ libxml2, gsettings-desktop-schemas, gnome, + adwaita-icon-theme, wrapGAppsHook3, fetchpatch, }: @@ -59,7 +60,7 @@ stdenv.mkDerivation rec { opusfile flac gsettings-desktop-schemas - gnome.adwaita-icon-theme + adwaita-icon-theme ]; doCheck = false; # fails 1 out of 9 tests diff --git a/pkgs/applications/audio/exaile/default.nix b/pkgs/applications/audio/exaile/default.nix index 4f49564898a9a..9d5c69858aef9 100644 --- a/pkgs/applications/audio/exaile/default.nix +++ b/pkgs/applications/audio/exaile/default.nix @@ -1,8 +1,8 @@ { stdenv, lib, fetchFromGitHub , gobject-introspection, makeWrapper, wrapGAppsHook3 , gtk3, gst_all_1, python3 -, gettext, gnome, help2man, keybinder3, libnotify, librsvg, streamripper, udisks, webkitgtk -, iconTheme ? gnome.adwaita-icon-theme +, gettext, adwaita-icon-theme, help2man, keybinder3, libnotify, librsvg, streamripper, udisks, webkitgtk +, iconTheme ? adwaita-icon-theme , deviceDetectionSupport ? true , documentationSupport ? true , notificationSupport ? true diff --git a/pkgs/applications/audio/gpodder/default.nix b/pkgs/applications/audio/gpodder/default.nix index 0e6178006ccfc..eff5bd76c9f22 100644 --- a/pkgs/applications/audio/gpodder/default.nix +++ b/pkgs/applications/audio/gpodder/default.nix @@ -2,7 +2,7 @@ , fetchFromGitHub , gitUpdater , glibcLocales -, gnome +, adwaita-icon-theme , gobject-introspection , gtk3 , intltool @@ -42,7 +42,7 @@ python3Packages.buildPythonApplication rec { buildInputs = [ python3 gtk3 - gnome.adwaita-icon-theme + adwaita-icon-theme ]; nativeCheckInputs = with python3Packages; [ diff --git a/pkgs/applications/audio/guitarix/default.nix b/pkgs/applications/audio/guitarix/default.nix index 71ac598000daf..247a3bb23ecb1 100644 --- a/pkgs/applications/audio/guitarix/default.nix +++ b/pkgs/applications/audio/guitarix/default.nix @@ -12,7 +12,7 @@ , glib , glib-networking , glibmm -, gnome +, adwaita-icon-theme , gsettings-desktop-schemas , gtk3 , gtkmm3 @@ -76,7 +76,7 @@ stdenv.mkDerivation (finalAttrs: { glib glib-networking.out glibmm - gnome.adwaita-icon-theme + adwaita-icon-theme gsettings-desktop-schemas gtk3 gtkmm3 diff --git a/pkgs/applications/audio/helio-workstation/default.nix b/pkgs/applications/audio/helio-workstation/default.nix index dc4bf6333d384..79f0c61af78e7 100644 --- a/pkgs/applications/audio/helio-workstation/default.nix +++ b/pkgs/applications/audio/helio-workstation/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub -, alsa-lib, freetype, xorg, curl, libGL, libjack2, gnome +, alsa-lib, freetype, xorg, curl, libGL, libjack2, zenity , pkg-config, makeWrapper }: @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { buildInputs = [ alsa-lib freetype xorg.libX11 xorg.libXext xorg.libXinerama xorg.libXrandr - xorg.libXcursor xorg.libXcomposite curl libGL libjack2 gnome.zenity + xorg.libXcursor xorg.libXcomposite curl libGL libjack2 zenity ]; nativeBuildInputs = [ pkg-config makeWrapper ]; @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p $out/bin install -Dm755 build/helio $out/bin - wrapProgram $out/bin/helio --prefix PATH ":" ${gnome.zenity}/bin + wrapProgram $out/bin/helio --prefix PATH ":" ${zenity}/bin mkdir -p $out/share cp -r ../Deployment/Linux/Debian/x64/usr/share/* $out/share diff --git a/pkgs/applications/audio/in-formant/default.nix b/pkgs/applications/audio/in-formant/default.nix index a6bcc68bf5a7a..3dd4a3006b2b9 100644 --- a/pkgs/applications/audio/in-formant/default.nix +++ b/pkgs/applications/audio/in-formant/default.nix @@ -67,6 +67,6 @@ stdenv.mkDerivation rec { license = licenses.asl20; # currently broken on i686-linux and aarch64-linux due to other nixpkgs dependencies platforms = [ "x86_64-linux" ]; - maintainers = with maintainers; [ ckie ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/applications/audio/mopidy/notify.nix b/pkgs/applications/audio/mopidy/notify.nix index 8b90089ef23d2..ca6ab3d2bee61 100644 --- a/pkgs/applications/audio/mopidy/notify.nix +++ b/pkgs/applications/audio/mopidy/notify.nix @@ -24,6 +24,6 @@ pythonPackages.buildPythonApplication rec { homepage = "https://github.com/phijor/mopidy-notify"; description = "Mopidy extension for showing desktop notifications on track change"; license = licenses.asl20; - maintainers = with maintainers; [ lilyinstarlight ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/applications/audio/mopidy/spotify.nix b/pkgs/applications/audio/mopidy/spotify.nix index 4b6fe17e8225f..aac6ec43c305e 100644 --- a/pkgs/applications/audio/mopidy/spotify.nix +++ b/pkgs/applications/audio/mopidy/spotify.nix @@ -30,6 +30,6 @@ pythonPackages.buildPythonApplication rec { homepage = "https://github.com/mopidy/mopidy-spotify"; description = "Mopidy extension for playing music from Spotify"; license = licenses.asl20; - maintainers = with maintainers; [ lilyinstarlight ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/applications/audio/open-stage-control/default.nix b/pkgs/applications/audio/open-stage-control/default.nix index 60b9bc23bc362..c188465f52e99 100644 --- a/pkgs/applications/audio/open-stage-control/default.nix +++ b/pkgs/applications/audio/open-stage-control/default.nix @@ -88,7 +88,7 @@ buildNpmPackage rec { description = "Libre and modular OSC / MIDI controller"; homepage = "https://openstagecontrol.ammd.net/"; license = licenses.gpl3Only; - maintainers = with maintainers; [ lilyinstarlight ]; + maintainers = with maintainers; [ ]; platforms = platforms.linux; mainProgram = "open-stage-control"; }; diff --git a/pkgs/applications/audio/openutau/default.nix b/pkgs/applications/audio/openutau/default.nix index 17105558f2d2b..289991a944316 100644 --- a/pkgs/applications/audio/openutau/default.nix +++ b/pkgs/applications/audio/openutau/default.nix @@ -83,7 +83,7 @@ buildDotnetModule rec { # worldline resampler binary - no source is available (hence "unfree") but usage of the binary is MIT unfreeRedistributable ]; - maintainers = with maintainers; [ lilyinstarlight ]; + maintainers = with maintainers; [ ]; platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ]; mainProgram = "OpenUtau"; }; diff --git a/pkgs/applications/audio/pavucontrol/default.nix b/pkgs/applications/audio/pavucontrol/default.nix index 019c777cd046c..f6b8d20f91d2c 100644 --- a/pkgs/applications/audio/pavucontrol/default.nix +++ b/pkgs/applications/audio/pavucontrol/default.nix @@ -8,7 +8,7 @@ , libsigcxx , libcanberra-gtk3 , json-glib -, gnome +, adwaita-icon-theme , wrapGAppsHook3 }: @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { libsigcxx libcanberra-gtk3 json-glib - gnome.adwaita-icon-theme + adwaita-icon-theme ]; nativeBuildInputs = [ pkg-config intltool wrapGAppsHook3 ]; diff --git a/pkgs/applications/audio/pithos/default.nix b/pkgs/applications/audio/pithos/default.nix index dbb3a63fce6b7..933d173614593 100644 --- a/pkgs/applications/audio/pithos/default.nix +++ b/pkgs/applications/audio/pithos/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchFromGitHub, meson, ninja, pkg-config, appstream-glib -, wrapGAppsHook3, pythonPackages, gtk3, gnome, gobject-introspection +, wrapGAppsHook3, pythonPackages, gtk3, adwaita-icon-theme, gobject-introspection , libnotify, libsecret, gst_all_1 }: pythonPackages.buildPythonApplication rec { @@ -27,7 +27,7 @@ pythonPackages.buildPythonApplication rec { ]; propagatedBuildInputs = - [ gtk3 gobject-introspection libnotify libsecret gnome.adwaita-icon-theme ] ++ + [ gtk3 gobject-introspection libnotify libsecret adwaita-icon-theme ] ++ (with gst_all_1; [ gstreamer gst-plugins-base gst-plugins-good gst-plugins-ugly gst-plugins-bad ]) ++ (with pythonPackages; [ pygobject3 pylast ]); diff --git a/pkgs/applications/audio/plugdata/default.nix b/pkgs/applications/audio/plugdata/default.nix index 9af5c4a9fa85f..e58e5aabcd81a 100644 --- a/pkgs/applications/audio/plugdata/default.nix +++ b/pkgs/applications/audio/plugdata/default.nix @@ -9,7 +9,7 @@ , alsa-lib , freetype , webkitgtk -, gnome +, zenity , curl , xorg , python3 @@ -102,7 +102,7 @@ stdenv.mkDerivation (finalAttrs: { # These X11 libs get dlopen'd, they cause visual bugs when unavailable. wrapProgram $out/bin/plugdata \ --prefix PATH : '${lib.makeBinPath [ - gnome.zenity + zenity ]}' \ --prefix LD_LIBRARY_PATH : '${lib.makeLibraryPath [ xorg.libXrandr diff --git a/pkgs/applications/audio/sfizz/default.nix b/pkgs/applications/audio/sfizz/default.nix index c6a0ac824566f..3aa2b6cf6deb8 100644 --- a/pkgs/applications/audio/sfizz/default.nix +++ b/pkgs/applications/audio/sfizz/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, libjack2, libsndfile, xorg, freetype -, libxkbcommon, cairo, glib, gnome, flac, libogg, libvorbis, libopus, cmake +, libxkbcommon, cairo, glib, zenity, flac, libogg, libvorbis, libopus, cmake , pango, pkg-config, catch2 }: @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { libxkbcommon cairo glib - gnome.zenity + zenity freetype pango ]; @@ -47,9 +47,9 @@ stdenv.mkDerivation rec { cp ${catch2}/include/catch2/catch.hpp tests/catch2/catch.hpp substituteInPlace plugins/editor/external/vstgui4/vstgui/lib/platform/linux/x11fileselector.cpp \ - --replace 'zenitypath = "zenity"' 'zenitypath = "${gnome.zenity}/bin/zenity"' + --replace 'zenitypath = "zenity"' 'zenitypath = "${zenity}/bin/zenity"' substituteInPlace plugins/editor/src/editor/NativeHelpers.cpp \ - --replace '/usr/bin/zenity' '${gnome.zenity}/bin/zenity' + --replace '/usr/bin/zenity' '${zenity}/bin/zenity' ''; cmakeFlags = [ "-DSFIZZ_TESTS=ON" ]; diff --git a/pkgs/applications/audio/sonata/default.nix b/pkgs/applications/audio/sonata/default.nix index 8b6b9631a85d0..36c0f9239973b 100644 --- a/pkgs/applications/audio/sonata/default.nix +++ b/pkgs/applications/audio/sonata/default.nix @@ -1,5 +1,5 @@ { lib, fetchFromGitHub, wrapGAppsHook3, gettext -, python3Packages, gnome, gtk3, glib, gdk-pixbuf, gsettings-desktop-schemas, gobject-introspection }: +, python3Packages, adwaita-icon-theme, gtk3, glib, gdk-pixbuf, gsettings-desktop-schemas, gobject-introspection }: let inherit (python3Packages) buildPythonApplication isPy3k dbus-python pygobject3 mpd2 setuptools; @@ -24,7 +24,7 @@ in buildPythonApplication rec { buildInputs = [ glib - gnome.adwaita-icon-theme + adwaita-icon-theme gsettings-desktop-schemas gtk3 gdk-pixbuf diff --git a/pkgs/applications/audio/sonic-pi/default.nix b/pkgs/applications/audio/sonic-pi/default.nix index bc1c72cf746e6..286e26bdaad38 100644 --- a/pkgs/applications/audio/sonic-pi/default.nix +++ b/pkgs/applications/audio/sonic-pi/default.nix @@ -224,7 +224,7 @@ stdenv.mkDerivation rec { homepage = "https://sonic-pi.net/"; description = "Free live coding synth for everyone originally designed to support computing and music lessons within schools"; license = licenses.mit; - maintainers = with maintainers; [ Phlogistique kamilchm c0deaddict sohalt lilyinstarlight ]; + maintainers = with maintainers; [ Phlogistique kamilchm c0deaddict sohalt ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/audio/sound-juicer/default.nix b/pkgs/applications/audio/sound-juicer/default.nix index ef299ac7074cf..a2e2c4bc09ef7 100644 --- a/pkgs/applications/audio/sound-juicer/default.nix +++ b/pkgs/applications/audio/sound-juicer/default.nix @@ -11,6 +11,7 @@ , brasero , libcanberra-gtk3 , gnome +, adwaita-icon-theme , gst_all_1 , libmusicbrainz5 , libdiscid @@ -42,7 +43,7 @@ stdenv.mkDerivation rec { gtk3 brasero libcanberra-gtk3 - gnome.adwaita-icon-theme + adwaita-icon-theme gsettings-desktop-schemas libmusicbrainz5 libdiscid diff --git a/pkgs/applications/audio/spotify/linux.nix b/pkgs/applications/audio/spotify/linux.nix index 8886e851c3c95..43b4ae243540e 100644 --- a/pkgs/applications/audio/spotify/linux.nix +++ b/pkgs/applications/audio/spotify/linux.nix @@ -1,6 +1,6 @@ { fetchurl, lib, stdenv, squashfsTools, xorg, alsa-lib, makeShellWrapper, wrapGAppsHook3, openssl, freetype , glib, pango, cairo, atk, gdk-pixbuf, gtk3, cups, nspr, nss_latest, libpng, libnotify -, libgcrypt, systemd, fontconfig, dbus, expat, ffmpeg_4, curlWithGnuTls, zlib, gnome +, libgcrypt, systemd, fontconfig, dbus, expat, ffmpeg_4, curlWithGnuTls, zlib, zenity , at-spi2-atk, at-spi2-core, libpulseaudio, libdrm, mesa, libxkbcommon , pname, meta, harfbuzz, libayatana-appindicator, libdbusmenu, libGL # High-DPI support: Spotify's --force-device-scale-factor argument @@ -179,7 +179,7 @@ stdenv.mkDerivation { --add-flags "--force-device-scale-factor=${toString deviceScaleFactor}" \ ''} \ --prefix LD_LIBRARY_PATH : "$librarypath" \ - --prefix PATH : "${gnome.zenity}/bin" \ + --prefix PATH : "${zenity}/bin" \ --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--enable-features=UseOzonePlatform --ozone-platform=wayland}}" runHook postFixup diff --git a/pkgs/applications/audio/touchosc/default.nix b/pkgs/applications/audio/touchosc/default.nix index bc53b296357b6..b3cc4dbd22097 100644 --- a/pkgs/applications/audio/touchosc/default.nix +++ b/pkgs/applications/audio/touchosc/default.nix @@ -18,7 +18,7 @@ , libXrender , libXxf86vm , libglvnd -, gnome +, zenity }: let @@ -39,7 +39,7 @@ let ]; runBinDeps = [ - gnome.zenity + zenity ]; in @@ -101,7 +101,7 @@ stdenv.mkDerivation rec { description = "Next generation modular control surface"; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; - maintainers = with maintainers; [ lilyinstarlight ]; + maintainers = with maintainers; [ ]; platforms = [ "aarch64-linux" "armv7l-linux" "x86_64-linux" ]; mainProgram = "TouchOSC"; }; diff --git a/pkgs/applications/audio/vcv-rack/default.nix b/pkgs/applications/audio/vcv-rack/default.nix index 7a1ded3e2f82a..0d02e5a686a12 100644 --- a/pkgs/applications/audio/vcv-rack/default.nix +++ b/pkgs/applications/audio/vcv-rack/default.nix @@ -7,7 +7,7 @@ , ghc_filesystem , glew , glfw -, gnome +, zenity , gtk3-x11 , imagemagick , jansson @@ -173,7 +173,7 @@ stdenv.mkDerivation rec { # Fix reference to zenity substituteInPlace dep/osdialog/osdialog_zenity.c \ - --replace 'zenityBin[] = "zenity"' 'zenityBin[] = "${gnome.zenity}/bin/zenity"' + --replace 'zenityBin[] = "zenity"' 'zenityBin[] = "${zenity}/bin/zenity"' ''; nativeBuildInputs = [ @@ -191,7 +191,7 @@ stdenv.mkDerivation rec { ghc_filesystem glew glfw - gnome.zenity + zenity gtk3-x11 jansson libarchive diff --git a/pkgs/applications/backup/ludusavi/default.nix b/pkgs/applications/backup/ludusavi/default.nix index e2dfc14569845..c96b99162292b 100644 --- a/pkgs/applications/backup/ludusavi/default.nix +++ b/pkgs/applications/backup/ludusavi/default.nix @@ -17,7 +17,7 @@ , libxkbcommon , vulkan-loader , wayland -, gnome +, zenity , libsForQt5 }: @@ -85,7 +85,7 @@ rustPlatform.buildRustPackage rec { in '' patchelf --set-rpath "${libPath}" "$out/bin/ludusavi" - wrapProgram $out/bin/ludusavi --prefix PATH : ${lib.makeBinPath [ gnome.zenity libsForQt5.kdialog ]} + wrapProgram $out/bin/ludusavi --prefix PATH : ${lib.makeBinPath [ zenity libsForQt5.kdialog ]} ''; diff --git a/pkgs/applications/backup/restic-integrity/default.nix b/pkgs/applications/backup/restic-integrity/default.nix index d0311e5d40d0a..c34b1a19405b4 100644 --- a/pkgs/applications/backup/restic-integrity/default.nix +++ b/pkgs/applications/backup/restic-integrity/default.nix @@ -21,7 +21,7 @@ rustPlatform.buildRustPackage rec { description = "CLI tool to check the integrity of a restic repository without unlocking it"; homepage = "https://git.nwex.de/networkException/restic-integrity"; license = with licenses; [ bsd2 ]; - maintainers = with maintainers; [ janik ]; + maintainers = with maintainers; [ ]; mainProgram = "restic-integrity"; }; } diff --git a/pkgs/applications/display-managers/lightdm/default.nix b/pkgs/applications/display-managers/lightdm/default.nix index 8361461fb7d37..f5d856ec1770c 100644 --- a/pkgs/applications/display-managers/lightdm/default.nix +++ b/pkgs/applications/display-managers/lightdm/default.nix @@ -21,13 +21,13 @@ , polkit , accountsservice , gtk-doc -, gnome , gobject-introspection , vala , fetchpatch , withQt5 ? false , qtbase , yelp-tools +, yelp-xsl }: stdenv.mkDerivation rec { @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { autoconf automake yelp-tools - gnome.yelp-xsl + yelp-xsl gobject-introspection gtk-doc intltool diff --git a/pkgs/applications/editors/android-studio-for-platform/common.nix b/pkgs/applications/editors/android-studio-for-platform/common.nix new file mode 100644 index 0000000000000..a970f4a39d56f --- /dev/null +++ b/pkgs/applications/editors/android-studio-for-platform/common.nix @@ -0,0 +1,186 @@ +{ channel, pname, version, sha256Hash }: + +{ android-tools +, bash +, buildFHSEnv +, coreutils +, dpkg +, e2fsprogs +, fetchurl +, findutils +, git +, gnugrep +, gnused +, gnutar +, gtk2, gnome_vfs, glib, GConf +, gzip +, fontsConf +, fontconfig +, freetype +, libX11 +, libXext +, libXi +, libXrandr +, libXrender +, libXtst +, makeFontsConf +, makeWrapper +, ncurses5 +, openssl +, ps +, python3 +, lib +, stdenv +, unzip +, usbutils +, which +, runCommand +, xkeyboard_config +, zip +, zlib +, makeDesktopItem +, tiling_wm ? false # if we are using a tiling wm, need to set _JAVA_AWT_WM_NONREPARENTING in wrapper +}: + +let + drvName = "${pname}-${version}"; + filename = "asfp-${version}-linux.deb"; + + androidStudioForPlatform = stdenv.mkDerivation { + name = "${drvName}-unwrapped"; + + src = fetchurl { + url = "https://dl.google.com/android/asfp/${filename}"; + sha256 = sha256Hash; + }; + + nativeBuildInputs = [ + dpkg + makeWrapper + ]; + + installPhase = '' + cp -r "./opt/${pname}/" $out + wrapProgram $out/bin/studio.sh \ + --set-default JAVA_HOME "$out/jbr" \ + --set QT_XKB_CONFIG_ROOT "${xkeyboard_config}/share/X11/xkb" \ + ${lib.optionalString tiling_wm "--set _JAVA_AWT_WM_NONREPARENTING 1"} \ + --set FONTCONFIG_FILE ${fontsConf} \ + --prefix PATH : "${lib.makeBinPath [ + + # Checked in studio.sh + coreutils + findutils + gnugrep + which + gnused + + # Used during setup wizard + gnutar + gzip + + # Runtime stuff + git + ps + usbutils + android-tools + + # For Soong sync + openssl + python3 + unzip + zip + e2fsprogs + ]}" \ + --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ + # Crash at startup without these + fontconfig + freetype + libXext + libXi + libXrender + libXtst + libX11 + + # Support multiple monitors + libXrandr + + # For GTKLookAndFeel + gtk2 + gnome_vfs + glib + GConf + + # For Soong sync + e2fsprogs + ]}" + ''; + }; + + desktopItem = makeDesktopItem { + name = pname; + exec = pname; + icon = pname; + desktopName = "Android Studio for Platform (${channel} channel)"; + comment = "The official Android IDE for Android platform development"; + categories = [ "Development" "IDE" ]; + startupNotify = true; + startupWMClass = "jetbrains-studio"; + }; + + # Android Studio for Platform downloads prebuilt binaries as part of the SDK. These tools + # (e.g. `mksdcard`) have `/lib/ld-linux.so.2` set as the interpreter. An FHS + # environment is used as a work around for that. + fhsEnv = buildFHSEnv { + name = "${drvName}-fhs-env"; + multiPkgs = pkgs: [ + zlib + ncurses5 + ncurses5.dev + ]; + profile = '' + export ALLOW_NINJA_ENV=true + export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/lib:/usr/lib32 + ''; + }; +in runCommand + drvName + { + startScript = '' + #!${bash}/bin/bash + ${fhsEnv}/bin/${drvName}-fhs-env ${androidStudioForPlatform}/bin/studio.sh "$@" + ''; + preferLocalBuild = true; + allowSubstitutes = false; + passthru = { + unwrapped = androidStudioForPlatform; + }; + meta = with lib; { + description = "The Official IDE for Android platform development"; + longDescription = '' + Android Studio for Platform (ASfP) is the version of the Android Studio IDE + for Android Open Source Project (AOSP) platform developers who build with the Soong build system. + ''; + homepage = "https://developer.android.com/studio/platform.html"; + license = with licenses; [ asl20 unfree ]; # The code is under Apache-2.0, but: + # If one selects Help -> Licenses in Android Studio, the dialog shows the following: + # "Android Studio includes proprietary code subject to separate license, + # including JetBrains CLion(R) (www.jetbrains.com/clion) and IntelliJ(R) + # IDEA Community Edition (www.jetbrains.com/idea)." + # Also: For actual development the Android SDK is required and the Google + # binaries are also distributed as proprietary software (unlike the + # source-code itself). + platforms = [ "x86_64-linux" ]; + maintainers = with maintainers; [ robbins ]; + mainProgram = pname; + }; + } + '' + mkdir -p $out/{bin,share/pixmaps} + + echo -n "$startScript" > $out/bin/${pname} + chmod +x $out/bin/${pname} + + ln -s ${androidStudioForPlatform}/bin/studio.png $out/share/pixmaps/${pname}.png + ln -s ${desktopItem}/share/applications $out/share/applications + '' diff --git a/pkgs/applications/editors/android-studio-for-platform/default.nix b/pkgs/applications/editors/android-studio-for-platform/default.nix new file mode 100644 index 0000000000000..737ae7ddd1a80 --- /dev/null +++ b/pkgs/applications/editors/android-studio-for-platform/default.nix @@ -0,0 +1,32 @@ +{ callPackage, makeFontsConf, gnome2, buildFHSEnv, tiling_wm ? false }: + +let + mkStudio = opts: callPackage (import ./common.nix opts) { + fontsConf = makeFontsConf { + fontDirectories = []; + }; + inherit (gnome2) GConf gnome_vfs; + inherit buildFHSEnv; + inherit tiling_wm; + }; + stableVersion = { + version = "2023.2.1.20"; # Android Studio Iguana | 2023.2.1 Beta 2 + sha256Hash = "sha256-cM/pkSghqLUUvJVF/OVLDOxVBJlJLH8ge1bfZtDUegY="; + }; + canaryVersion = { + version = "2023.3.2.1"; # Android Studio Jellyfish | 2023.3.2 Canary 1 + sha256Hash = "sha256-XOsbMyNentklfEp1k49H3uFeiRNMCV/Seisw9K1ganM="; + }; +in { + # Attributes are named by their corresponding release channels + + stable = mkStudio (stableVersion // { + channel = "stable"; + pname = "android-studio-for-platform"; + }); + + canary = mkStudio (canaryVersion // { + channel = "canary"; + pname = "android-studio-for-platform-canary"; + }); +} diff --git a/pkgs/applications/editors/bluefish/default.nix b/pkgs/applications/editors/bluefish/default.nix index d9140fc1ea8c3..d560254ee1e69 100644 --- a/pkgs/applications/editors/bluefish/default.nix +++ b/pkgs/applications/editors/bluefish/default.nix @@ -8,7 +8,7 @@ , enchant , gucharmap , python3 -, gnome +, adwaita-icon-theme }: stdenv.mkDerivation rec { @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config wrapGAppsHook3 ]; buildInputs = [ - gnome.adwaita-icon-theme + adwaita-icon-theme gtk libxml2 enchant diff --git a/pkgs/applications/editors/gnome-latex/default.nix b/pkgs/applications/editors/gnome-latex/default.nix index 2c9ecd828a643..efa6aaf4cbdbd 100644 --- a/pkgs/applications/editors/gnome-latex/default.nix +++ b/pkgs/applications/editors/gnome-latex/default.nix @@ -12,6 +12,7 @@ , libgedit-gtksourceview , libgedit-tepl , libgee +, adwaita-icon-theme , gnome , glib , pkg-config @@ -49,7 +50,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - gnome.adwaita-icon-theme + adwaita-icon-theme glib gsettings-desktop-schemas gspell diff --git a/pkgs/applications/editors/l3afpad/default.nix b/pkgs/applications/editors/l3afpad/default.nix index 1ad346ed01de0..d2203a714c374 100644 --- a/pkgs/applications/editors/l3afpad/default.nix +++ b/pkgs/applications/editors/l3afpad/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { description = "Simple text editor forked from Leafpad using GTK+ 3.x"; homepage = "https://github.com/stevenhoneyman/l3afpad"; platforms = platforms.linux; - maintainers = with maintainers; [ ckie ]; + maintainers = with maintainers; [ ]; license = licenses.gpl2; mainProgram = "l3afpad"; }; diff --git a/pkgs/applications/editors/vim/macvim-configurable.nix b/pkgs/applications/editors/vim/macvim-configurable.nix index 5c436307897f4..cca5d06ba90ad 100644 --- a/pkgs/applications/editors/vim/macvim-configurable.nix +++ b/pkgs/applications/editors/vim/macvim-configurable.nix @@ -1,8 +1,6 @@ { lib, stdenv, callPackage, vimUtils, buildEnv, makeWrapper }: let - macvim = callPackage ./macvim.nix { inherit stdenv; }; - makeCustomizable = macvim: macvim // { # configure expects the same args as vimUtils.vimrcFile. # This is the same as the value given to neovim.override { configure = … } @@ -62,5 +60,4 @@ let override = f: makeCustomizable (macvim.override f); overrideAttrs = f: makeCustomizable (macvim.overrideAttrs f); }; -in - makeCustomizable macvim +in { inherit makeCustomizable; } diff --git a/pkgs/applications/editors/vim/macvim.nix b/pkgs/applications/editors/vim/macvim.nix index 64aa5b639a9b4..bd526b8f6ce22 100644 --- a/pkgs/applications/editors/vim/macvim.nix +++ b/pkgs/applications/editors/vim/macvim.nix @@ -6,15 +6,23 @@ , gettext , pkg-config , cscope -, ruby +, ruby_3_2 , tcl -, perl +, perl536 , luajit , darwin , libiconv , python3 }: +# Try to match MacVim's documented script interface compatibility +let + # Perl 5.30 - closest we get is 5.36. 5.38 is currently failing + perl = perl536; + # Ruby 3.2 + ruby = ruby_3_2; +in + let # Building requires a few system tools to be in PATH. # Some of these we could patch into the relevant source files (such as xcodebuild and @@ -26,16 +34,16 @@ let ''; in -stdenv.mkDerivation { +stdenv.mkDerivation (finalAttrs: { pname = "macvim"; - version = "8.2.3455"; + version = "178"; src = fetchFromGitHub { owner = "macvim-dev"; repo = "macvim"; - rev = "snapshot-172"; - sha256 = "sha256-LLLQ/V1vyKTuSXzHW3SOlOejZD5AV16NthEdMoTnfko="; + rev = "release-${finalAttrs.version}"; + hash = "sha256-JYh5fyaYuME/Lk67vrf1hYOIcAkEbwtslcnI9KRzHa8="; }; enableParallelBuilding = true; @@ -48,26 +56,26 @@ stdenv.mkDerivation { patches = [ ./macvim.patch ]; configureFlags = [ - "--enable-cscope" - "--enable-fail-if-missing" - "--with-features=huge" - "--enable-gui=macvim" - "--enable-multibyte" - "--enable-nls" - "--enable-luainterp=dynamic" - "--enable-python3interp=dynamic" - "--enable-perlinterp=dynamic" - "--enable-rubyinterp=dynamic" - "--enable-tclinterp=yes" - "--without-local-dir" - "--with-luajit" - "--with-lua-prefix=${luajit}" - "--with-python3-command=${python3}/bin/python3" - "--with-ruby-command=${ruby}/bin/ruby" - "--with-tclsh=${tcl}/bin/tclsh" - "--with-tlib=ncurses" - "--with-compiledby=Nix" - "--disable-sparkle" + "--enable-cscope" + "--enable-fail-if-missing" + "--with-features=huge" + "--enable-gui=macvim" + "--enable-multibyte" + "--enable-nls" + "--enable-luainterp=dynamic" + "--enable-python3interp=dynamic" + "--enable-perlinterp=dynamic" + "--enable-rubyinterp=dynamic" + "--enable-tclinterp=yes" + "--without-local-dir" + "--with-luajit" + "--with-lua-prefix=${luajit}" + "--with-python3-command=${python3}/bin/python3" + "--with-ruby-command=${ruby}/bin/ruby" + "--with-tclsh=${tcl}/bin/tclsh" + "--with-tlib=ncurses" + "--with-compiledby=Nix" + "--disable-sparkle" ]; # Remove references to Sparkle.framework from the project. @@ -78,37 +86,45 @@ stdenv.mkDerivation { sed -e '/Sparkle\.framework/d' -i src/MacVim/MacVim.xcodeproj/project.pbxproj ''; - # This is unfortunate, but we need to use the same compiler as Xcode, - # but Xcode doesn't provide a way to configure the compiler. - preConfigure = '' - CC=/usr/bin/clang - - DEV_DIR=$(/usr/bin/xcode-select -print-path)/Platforms/MacOSX.platform/Developer - configureFlagsArray+=( - --with-developer-dir="$DEV_DIR" - LDFLAGS="-L${ncurses}/lib" - CPPFLAGS="-isystem ${ncurses.dev}/include" - CFLAGS="-Wno-error=implicit-function-declaration" - ) - '' - # For some reason having LD defined causes PSMTabBarControl to fail at link-time as it - # passes arguments to ld that it meant for clang. - + '' - unset LD - '' - # When building with nix-daemon, we need to pass -derivedDataPath or else it tries to use - # a folder rooted in /var/empty and fails. Unfortunately we can't just pass -derivedDataPath - # by itself as this flag requires the use of -scheme or -xctestrun (not sure why), but MacVim - # by default just runs `xcodebuild -project src/MacVim/MacVim.xcodeproj`, relying on the default - # behavior to build the first target in the project. Experimentally, there seems to be a scheme - # called MacVim, so we'll explicitly select that. We also need to specify the configuration too - # as the scheme seems to have the wrong default. - + '' - configureFlagsArray+=( - XCODEFLAGS="-scheme MacVim -derivedDataPath $NIX_BUILD_TOP/derivedData" - --with-xcodecfg="Release" - ) - '' + # This is unfortunate, but we need to use the same compiler as Xcode, but Xcode doesn't provide a + # way to configure the compiler. We also need to pull in lib/include paths for some of our build + # inputs since we don't have cc-wrapper to do that for us. + preConfigure = + let + # ideally we'd recurse, but we don't need that right now + inputs = [ ncurses ] ++ perl.propagatedBuildInputs; + ldflags = map (drv: "-L${lib.getLib drv}/lib") inputs; + cppflags = map (drv: "-isystem ${lib.getDev drv}/include") inputs; + in + '' + CC=/usr/bin/clang + + DEV_DIR=$(/usr/bin/xcode-select -print-path)/Platforms/MacOSX.platform/Developer + configureFlagsArray+=( + --with-developer-dir="$DEV_DIR" + LDFLAGS=${lib.escapeShellArg ldflags} + CPPFLAGS=${lib.escapeShellArg cppflags} + CFLAGS="-Wno-error=implicit-function-declaration" + ) + '' + # For some reason having LD defined causes PSMTabBarControl to fail at link-time as it + # passes arguments to ld that it meant for clang. + + '' + unset LD + '' + # When building with nix-daemon, we need to pass -derivedDataPath or else it tries to use + # a folder rooted in /var/empty and fails. Unfortunately we can't just pass -derivedDataPath + # by itself as this flag requires the use of -scheme or -xctestrun (not sure why), but MacVim + # by default just runs `xcodebuild -project src/MacVim/MacVim.xcodeproj`, relying on the default + # behavior to build the first target in the project. Experimentally, there seems to be a scheme + # called MacVim, so we'll explicitly select that. We also need to specify the configuration too + # as the scheme seems to have the wrong default. + + '' + configureFlagsArray+=( + XCODEFLAGS="-scheme MacVim -derivedDataPath $NIX_BUILD_TOP/derivedData" + --with-xcodecfg="Release" + ) + '' ; # Because we're building with system clang, this means we're building against Xcode's SDK and @@ -124,7 +140,7 @@ stdenv.mkDerivation { # Xcode project or pass it as a flag to xcodebuild as well. postConfigure = '' substituteInPlace src/auto/config.mk \ - --replace "PERL_CFLAGS =" "PERL_CFLAGS = -I${darwin.libutil}/include" \ + --replace "PERL_CFLAGS${"\t"}=" "PERL_CFLAGS${"\t"}= -I${darwin.libutil}/include" \ --replace " -L${stdenv.cc.libc}/lib" "" \ --replace " -L${darwin.libobjc}/lib" "" \ --replace " -L${darwin.libunwind}/lib" "" \ @@ -143,17 +159,25 @@ stdenv.mkDerivation { substituteInPlace src/MacVim/vimrc --subst-var-by CSCOPE ${cscope}/bin/cscope ''; + # Note that $out/MacVim.app has a misnamed set of binaries in the Contents/bin folder (the V is + # capitalized) and is missing a bunch of them. This is why we're grabbing the version from the + # build folder. postInstall = '' mkdir -p $out/Applications cp -r src/MacVim/build/Release/MacVim.app $out/Applications rm -rf $out/MacVim.app - rm $out/bin/* - - cp src/vimtutor $out/bin - for prog in mvim ex vi vim vimdiff view rvim rvimdiff rview; do + mkdir -p $out/bin + for prog in ex vi {,g,m,r}vi{m,mdiff,ew}; do ln -s $out/Applications/MacVim.app/Contents/bin/mvim $out/bin/$prog done + for prog in {,g}vimtutor xxd; do + ln -s $out/Applications/MacVim.app/Contents/bin/$prog $out/bin/$prog + done + ln -s $out/Applications/MacVim.app/Contents/bin/gvimtutor $out/bin/mvimtutor + + mkdir -p $out/share + ln -s $out/Applications/MacVim.app/Contents/man $out/share/man # Fix rpaths exe="$out/Applications/MacVim.app/Contents/MacOS/Vim" @@ -165,7 +189,7 @@ stdenv.mkDerivation { install_name_tool -add_rpath ${ruby}/lib $exe # Remove manpages from tools we aren't providing - find $out/share/man \( -name eVim.1 -or -name xxd.1 \) -delete + find $out/Applications/MacVim.app/Contents/man -name evim.1 -delete ''; # We rely on the user's Xcode install to build. It may be located in an arbitrary place, and @@ -179,10 +203,10 @@ stdenv.mkDerivation { meta = with lib; { description = "Vim - the text editor - for macOS"; - homepage = "https://github.com/macvim-dev/macvim"; + homepage = "https://macvim.org/"; license = licenses.vim; - maintainers = with maintainers; [ lilyball ]; - platforms = platforms.darwin; + maintainers = with maintainers; [ ]; + platforms = platforms.darwin; hydraPlatforms = []; # hydra can't build this as long as we rely on Xcode and sandboxProfile }; -} +}) diff --git a/pkgs/applications/editors/vim/macvim.patch b/pkgs/applications/editors/vim/macvim.patch index 6af3e384a63c1..223778acf60cc 100644 --- a/pkgs/applications/editors/vim/macvim.patch +++ b/pkgs/applications/editors/vim/macvim.patch @@ -1,50 +1,60 @@ diff --git a/src/MacVim/vimrc b/src/MacVim/vimrc -index 32c89b387..c2af70127 100644 +index 162af04..4322049 100644 --- a/src/MacVim/vimrc +++ b/src/MacVim/vimrc -@@ -9,35 +9,5 @@ set nocompatible +@@ -9,45 +9,7 @@ set nocompatible " more sensible value. Add "set backspace&" to your ~/.vimrc to reset it. set backspace+=indent,eol,start -" Python2 --" MacVim is configured by default to use the pre-installed System python2 --" version. However, following code tries to find a Homebrew, MacPorts or --" an installation from python.org: +-" MacVim is configured by default in the binary release to use the +-" pre-installed System python2 version. However, following code tries to +-" find a Homebrew, MacPorts or an installation from python.org: -if exists("&pythondll") && exists("&pythonhome") +- " Homebrew python 2.7 - if filereadable("/usr/local/Frameworks/Python.framework/Versions/2.7/Python") -- " Homebrew python 2.7 - set pythondll=/usr/local/Frameworks/Python.framework/Versions/2.7/Python +- +- " MacPorts python 2.7 - elseif filereadable("/opt/local/Library/Frameworks/Python.framework/Versions/2.7/Python") -- " MacPorts python 2.7 - set pythondll=/opt/local/Library/Frameworks/Python.framework/Versions/2.7/Python +- +- " https://www.python.org/downloads/mac-osx/ - elseif filereadable("/Library/Frameworks/Python.framework/Versions/2.7/Python") -- " https://www.python.org/downloads/mac-osx/ - set pythondll=/Library/Frameworks/Python.framework/Versions/2.7/Python - endif -endif - -" Python3 --" MacVim is configured by default to use Homebrew python3 version --" If this cannot be found, following code tries to find a MacPorts --" or an installation from python.org: +-" MacVim is configured by default in the binary release to set +-" pythonthreedll to Homebrew python3. If it cannot be found, the following +-" code tries to find Python3 from other popular locations. Note that we are +-" using "Current" for the version, because Vim supports the stable ABI and +-" therefore any new version of Python3 will work. -if exists("&pythonthreedll") && exists("&pythonthreehome") && - \ !filereadable(&pythonthreedll) -- if filereadable("/opt/local/Library/Frameworks/Python.framework/Versions/3.9/Python") -- " MacPorts python 3.9 -- set pythonthreedll=/opt/local/Library/Frameworks/Python.framework/Versions/3.9/Python -- elseif filereadable("/Library/Frameworks/Python.framework/Versions/3.9/Python") -- " https://www.python.org/downloads/mac-osx/ -- set pythonthreedll=/Library/Frameworks/Python.framework/Versions/3.9/Python +- " MacPorts python +- if filereadable("/opt/local/Library/Frameworks/Python.framework/Versions/Current/Python") +- set pythonthreedll=/opt/local/Library/Frameworks/Python.framework/Versions/Current/Python +- +- " macOS default Python, installed by 'xcode-select --install' +- elseif filereadable("/Library/Developer/CommandLineTools/Library/Frameworks/Python3.framework/Versions/Current/Python3") +- set pythonthreedll=/Library/Developer/CommandLineTools/Library/Frameworks/Python3.framework/Versions/Current/Python3 +- +- " https://www.python.org/downloads/mac-osx/ +- elseif filereadable("/Library/Frameworks/Python.framework/Versions/Current/Python") +- set pythonthreedll=/Library/Frameworks/Python.framework/Versions/Current/Python - endif -endif -- +" Default cscopeprg to the Nix-installed path +set cscopeprg=@CSCOPE@ + + " vim: sw=2 ts=2 et diff --git a/src/Makefile b/src/Makefile -index c4a3ada37..06ee3de44 100644 +index 5b4cdff..72fee3a 100644 --- a/src/Makefile +++ b/src/Makefile -@@ -1402,7 +1402,7 @@ MACVIMGUI_SRC = gui.c gui_beval.c MacVim/gui_macvim.m MacVim/MMBackend.m \ +@@ -1290,7 +1290,7 @@ MACVIMGUI_SRC = gui.c gui_beval.c MacVim/gui_macvim.m MacVim/MMBackend.m \ MacVim/MacVim.m MACVIMGUI_OBJ = objects/gui.o objects/gui_beval.o \ objects/gui_macvim.o objects/MMBackend.o objects/MacVim.o @@ -54,10 +64,10 @@ index c4a3ada37..06ee3de44 100644 MACVIMGUI_LIBS_DIR = MACVIMGUI_LIBS1 = diff --git a/src/auto/configure b/src/auto/configure -index 39ef81449..d8fa7ec2f 100755 +index ecf10c4..4b691d0 100755 --- a/src/auto/configure +++ b/src/auto/configure -@@ -5896,10 +5896,7 @@ $as_echo "not found" >&6; } +@@ -6247,10 +6247,7 @@ printf "%s\n" "not found" >&6; } for path in "${vi_cv_path_mzscheme_pfx}/lib" "${SCHEME_LIB}"; do if test "X$path" != "X"; then @@ -69,7 +79,7 @@ index 39ef81449..d8fa7ec2f 100755 MZSCHEME_LIBS="${path}/libmzscheme3m.a" MZSCHEME_CFLAGS="-DMZ_PRECISE_GC" elif test -f "${path}/libracket3m.a"; then -@@ -6287,23 +6284,6 @@ $as_echo ">>> too old; need Perl version 5.003_01 or later <<<" >&6; } +@@ -6646,23 +6643,6 @@ printf "%s\n" ">>> too old; need Perl version 5.003_01 or later <<<" >&6; } fi if test "x$MACOS_X" = "xyes"; then @@ -93,7 +103,7 @@ index 39ef81449..d8fa7ec2f 100755 PERL_LIBS=`echo "$PERL_LIBS" | sed -e 's/-arch\ ppc//' -e 's/-arch\ i386//' -e 's/-arch\ x86_64//'` PERL_CFLAGS=`echo "$PERL_CFLAGS" | sed -e 's/-arch\ ppc//' -e 's/-arch\ i386//' -e 's/-arch\ x86_64//'` fi -@@ -6526,13 +6506,6 @@ __: +@@ -6902,13 +6882,7 @@ __: eof eval "`cd ${PYTHON_CONFDIR} && make -f "${tmp_mkf}" __ | sed '/ directory /d'`" rm -f -- "${tmp_mkf}" @@ -104,10 +114,11 @@ index 39ef81449..d8fa7ec2f 100755 - vi_cv_path_python_plibs="-F${python_PYTHONFRAMEWORKPREFIX} -framework Python" - fi - else ++ vi_cv_path_python_plibs="-L${PYTHON_CONFDIR} -lpython${vi_cv_var_python_version}" if test -n "${python_LINKFORSHARED}" && test -n "${python_PYTHONFRAMEWORKPREFIX}"; then python_link_symbol=`echo ${python_LINKFORSHARED} | sed 's/\([^ \t][^ \t]*[ \t][ \t]*[^ \t][^ \t]*\)[ \t].*/\1/'` -@@ -6547,7 +6520,6 @@ eof +@@ -6923,7 +6897,6 @@ eof fi vi_cv_path_python_plibs="${vi_cv_path_python_plibs} ${python_BASEMODLIBS} ${python_LIBS} ${python_SYSLIBS} ${python_LINKFORSHARED}" vi_cv_path_python_plibs=`echo $vi_cv_path_python_plibs | sed s/-ltermcap//` @@ -115,8 +126,8 @@ index 39ef81449..d8fa7ec2f 100755 fi -@@ -6626,13 +6598,6 @@ rm -f core conftest.err conftest.$ac_objext \ - $as_echo "no" >&6; } +@@ -7004,13 +6977,6 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam \ + printf "%s\n" "no" >&6; } fi - if test -n "$MACSDK"; then @@ -126,13 +137,13 @@ index 39ef81449..d8fa7ec2f 100755 - PYTHON_GETPATH_CFLAGS= - fi - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if compile and link flags for Python are sane" >&5 - $as_echo_n "checking if compile and link flags for Python are sane... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if compile and link flags for Python are sane" >&5 + printf %s "checking if compile and link flags for Python are sane... " >&6; } cflags_save=$CFLAGS -@@ -7557,11 +7522,7 @@ $as_echo "$tclver - OK" >&6; }; +@@ -8060,11 +8026,7 @@ printf "%s\n" "$tclver - OK" >&6; }; - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for location of Tcl include" >&5 - $as_echo_n "checking for location of Tcl include... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for location of Tcl include" >&5 + printf %s "checking for location of Tcl include... " >&6; } - if test "x$MACOS_X" != "xyes"; then tclinc="$tclloc/include $tclloc/include/tcl $tclloc/include/tcl$tclver /usr/local/include /usr/local/include/tcl$tclver /usr/include /usr/include/tcl$tclver" - else @@ -141,10 +152,10 @@ index 39ef81449..d8fa7ec2f 100755 TCL_INC= for try in $tclinc; do if test -f "$try/tcl.h"; then -@@ -7579,13 +7540,8 @@ $as_echo "<not found>" >&6; } +@@ -8082,13 +8044,8 @@ printf "%s\n" "<not found>" >&6; } if test -z "$SKIP_TCL"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for location of tclConfig.sh script" >&5 - $as_echo_n "checking for location of tclConfig.sh script... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for location of tclConfig.sh script" >&5 + printf %s "checking for location of tclConfig.sh script... " >&6; } - if test "x$MACOS_X" != "xyes"; then tclcnf=`echo $tclinc | sed s/include/lib/g` tclcnf="$tclcnf `echo $tclinc | sed s/include/lib64/g`" @@ -154,8 +165,8 @@ index 39ef81449..d8fa7ec2f 100755 - fi for try in $tclcnf; do if test -f "$try/tclConfig.sh"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $try/tclConfig.sh" >&5 -@@ -7774,10 +7730,6 @@ $as_echo "$rubyhdrdir" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $try/tclConfig.sh" >&5 +@@ -8285,10 +8242,6 @@ printf "%s\n" "$rubyhdrdir" >&6; } rubylibdir=`$vi_cv_path_ruby -r rbconfig -e "print $ruby_rbconfig.expand($ruby_rbconfig::CONFIG['libdir'])"` if test -f "$rubylibdir/$librubya" || expr "$librubyarg" : "-lruby"; then RUBY_LIBS="$RUBY_LIBS -L$rubylibdir" @@ -167,10 +178,10 @@ index 39ef81449..d8fa7ec2f 100755 if test "X$librubyarg" != "X"; then diff --git a/src/vim.h b/src/vim.h -index 4ff59f201..f91cb9836 100644 +index 6e33142..6185f45 100644 --- a/src/vim.h +++ b/src/vim.h -@@ -244,17 +244,6 @@ +@@ -270,17 +270,6 @@ # define SUN_SYSTEM #endif @@ -189,10 +200,10 @@ index 4ff59f201..f91cb9836 100644 # include "os_amiga.h" #endif diff --git a/src/vimtutor b/src/vimtutor -index 3b154f288..e89f26060 100755 +index 3b154f2..e89f260 100755 --- a/src/vimtutor +++ b/src/vimtutor -@@ -16,6 +16,6 @@ seq="vim vim81 vim80 vim8 vim74 vim73 vim72 vim71 vim70 vim7 vim6 vi" +@@ -16,7 +16,7 @@ seq="vim vim81 vim80 vim8 vim74 vim73 vim72 vim71 vim70 vim7 vim6 vi" if test "$1" = "-g"; then # Try to use the GUI version of Vim if possible, it will fall back # on Vim if Gvim is not installed. @@ -200,3 +211,4 @@ index 3b154f288..e89f26060 100755 + seq="mvim gvim gvim81 gvim80 gvim8 gvim74 gvim73 gvim72 gvim71 gvim70 gvim7 gvim6 $seq" shift fi + diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index 727962f8340b8..450595595cf36 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -25,7 +25,6 @@ , fzf , gawk , git -, gnome , himalaya , htop , jq @@ -58,6 +57,7 @@ , xorg , xxd , zathura +, zenity , zsh , # codeium-nvim dependencies codeium @@ -1614,7 +1614,7 @@ vCoolor-vim = super.vCoolor-vim.overrideAttrs { # on linux can use either Zenity or Yad. - propagatedBuildInputs = [ gnome.zenity ]; + propagatedBuildInputs = [ zenity ]; meta = { description = "Simple color selector/picker plugin"; license = lib.licenses.publicDomain; diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index 724e9004b29df..bf506f29f79e5 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -1262,8 +1262,8 @@ let mktplcRef = { name = "vscode-eslint"; publisher = "dbaeumer"; - version = "2.4.4"; - hash = "sha256-NJGsMme/+4bvED/93SGojYTH03EZbtKe5LyvocywILA="; + version = "3.0.10"; + hash = "sha256-EVmexnTIQQDmj25/rql3eCfJd47zRui3TpHol6l0Vgs="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/dbaeumer.vscode-eslint/changelog"; diff --git a/pkgs/applications/emulators/cdemu/analyzer.nix b/pkgs/applications/emulators/cdemu/analyzer.nix index 244abc4f96c78..09e5f4959bac2 100644 --- a/pkgs/applications/emulators/cdemu/analyzer.nix +++ b/pkgs/applications/emulators/cdemu/analyzer.nix @@ -1,5 +1,5 @@ { cmake, pkg-config, callPackage, gobject-introspection, wrapGAppsHook3 -, python3Packages, libxml2, gnuplot, gnome, gdk-pixbuf, intltool, libmirage }: +, python3Packages, libxml2, gnuplot, adwaita-icon-theme, gdk-pixbuf, intltool, libmirage }: python3Packages.buildPythonApplication { inherit (callPackage ./common-drv-attrs.nix { @@ -8,7 +8,7 @@ python3Packages.buildPythonApplication { hash = "sha256-7I8RUgd+k3cEzskJGbziv1f0/eo5QQXn62wGh/Y5ozc="; }) pname version src meta; - buildInputs = [ libxml2 gnuplot libmirage gnome.adwaita-icon-theme gdk-pixbuf ]; + buildInputs = [ libxml2 gnuplot libmirage adwaita-icon-theme gdk-pixbuf ]; propagatedBuildInputs = with python3Packages; [ pygobject3 matplotlib ]; nativeBuildInputs = [ cmake pkg-config wrapGAppsHook3 intltool gobject-introspection ]; diff --git a/pkgs/applications/emulators/cdemu/gui.nix b/pkgs/applications/emulators/cdemu/gui.nix index ff2ebd68ca4d1..eb1d533c40f4a 100644 --- a/pkgs/applications/emulators/cdemu/gui.nix +++ b/pkgs/applications/emulators/cdemu/gui.nix @@ -1,5 +1,5 @@ { callPackage, cmake, pkg-config, wrapGAppsHook3, gobject-introspection -, python3Packages, libnotify, intltool, gnome, gdk-pixbuf }: +, python3Packages, libnotify, intltool, adwaita-icon-theme, gdk-pixbuf }: python3Packages.buildPythonApplication { inherit (callPackage ./common-drv-attrs.nix { @@ -9,7 +9,7 @@ python3Packages.buildPythonApplication { }) pname version src meta; nativeBuildInputs = [ cmake pkg-config wrapGAppsHook3 intltool gobject-introspection ]; - buildInputs = [ libnotify gnome.adwaita-icon-theme gdk-pixbuf ]; + buildInputs = [ libnotify adwaita-icon-theme gdk-pixbuf ]; propagatedBuildInputs = with python3Packages; [ pygobject3 ]; pyproject = false; diff --git a/pkgs/applications/emulators/dolphin-emu/default.nix b/pkgs/applications/emulators/dolphin-emu/default.nix index 589a09a6d1054..100ea1d3f9532 100644 --- a/pkgs/applications/emulators/dolphin-emu/default.nix +++ b/pkgs/applications/emulators/dolphin-emu/default.nix @@ -188,8 +188,6 @@ stdenv.mkDerivation rec { branch = "master"; license = licenses.gpl2Plus; platforms = platforms.unix; - maintainers = with maintainers; [ - ashkitten - ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/applications/emulators/dolphin-emu/primehack.nix b/pkgs/applications/emulators/dolphin-emu/primehack.nix index b4698480a962d..95b06b9608572 100644 --- a/pkgs/applications/emulators/dolphin-emu/primehack.nix +++ b/pkgs/applications/emulators/dolphin-emu/primehack.nix @@ -143,7 +143,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/shiiion/dolphin"; description = "Gamecube/Wii/Triforce emulator for x86_64 and ARMv8"; license = licenses.gpl2Plus; - maintainers = with maintainers; [ ashkitten Madouura ]; + maintainers = with maintainers; [ Madouura ]; broken = stdenv.isDarwin; platforms = platforms.unix; }; diff --git a/pkgs/applications/file-managers/pcmanfm/default.nix b/pkgs/applications/file-managers/pcmanfm/default.nix index 5c614fdede9f2..3e8d22a65b8d0 100644 --- a/pkgs/applications/file-managers/pcmanfm/default.nix +++ b/pkgs/applications/file-managers/pcmanfm/default.nix @@ -8,7 +8,7 @@ , pango , pkg-config , wrapGAppsHook3 -, gnome +, adwaita-icon-theme , withGtk3 ? true , gtk2 , gtk3 @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-FMt7JHSTxMzmX7tZAmEeOtAKeocPvB5QrcUEKMUUDPc="; }; - buildInputs = [ glib gtk libfm' libX11 pango gnome.adwaita-icon-theme ]; + buildInputs = [ glib gtk libfm' libX11 pango adwaita-icon-theme ]; nativeBuildInputs = [ pkg-config wrapGAppsHook3 intltool ]; configureFlags = optional withGtk3 "--with-gtk=3"; diff --git a/pkgs/applications/graphics/avocode/default.nix b/pkgs/applications/graphics/avocode/default.nix index 2bd13de7d5d63..e9ab276606055 100644 --- a/pkgs/applications/graphics/avocode/default.nix +++ b/pkgs/applications/graphics/avocode/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, makeDesktopItem, fetchurl, unzip -, gdk-pixbuf, glib, gtk3, atk, at-spi2-atk, pango, cairo, freetype, fontconfig, dbus, nss, nspr, alsa-lib, cups, expat, udev, gnome +, gdk-pixbuf, glib, gtk3, atk, at-spi2-atk, pango, cairo, freetype, fontconfig, dbus, nss, nspr, alsa-lib, cups, expat, udev, adwaita-icon-theme , xorg, mozjpeg, makeWrapper, wrapGAppsHook3, libuuid, at-spi2-core, libdrm, mesa, libxkbcommon }: @@ -61,7 +61,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [makeWrapper wrapGAppsHook3 unzip]; - buildInputs = [ gtk3 gnome.adwaita-icon-theme ]; + buildInputs = [ gtk3 adwaita-icon-theme ]; # src is producing multiple folder on unzip so we must # override unpackCmd to extract it into newly created folder diff --git a/pkgs/applications/graphics/darktable/default.nix b/pkgs/applications/graphics/darktable/default.nix index 362de3633ab25..561a365b56210 100644 --- a/pkgs/applications/graphics/darktable/default.nix +++ b/pkgs/applications/graphics/darktable/default.nix @@ -38,7 +38,7 @@ , colord-gtk , libwebp , libsecret -, gnome +, adwaita-icon-theme , SDL2 , ocl-icd , pcre @@ -94,7 +94,7 @@ stdenv.mkDerivation rec { libwebp libsecret SDL2 - gnome.adwaita-icon-theme + adwaita-icon-theme osm-gps-map pcre isocodes diff --git a/pkgs/applications/graphics/drawpile/default.nix b/pkgs/applications/graphics/drawpile/default.nix index 0522879d9d3e1..3bdb37900de0b 100644 --- a/pkgs/applications/graphics/drawpile/default.nix +++ b/pkgs/applications/graphics/drawpile/default.nix @@ -2,10 +2,14 @@ , lib , mkDerivation , fetchFromGitHub +, cargo , extra-cmake-modules +, rustc +, rustPlatform # common deps , karchive +, qtwebsockets # client deps , qtbase @@ -20,7 +24,6 @@ , kdnssd , libvpx , miniupnpc -, qtx11extras # kis # optional server deps , libmicrohttpd @@ -33,10 +36,10 @@ , buildServer ? true , buildServerGui ? true # if false builds a headless server , buildExtraTools ? false -, enableKisTablet ? false # enable improved graphics tablet support }: -with lib; +assert lib.assertMsg (buildClient || buildServer || buildExtraTools) + "You must specify at least one of buildClient, buildServer, or buildExtraTools."; let clientDeps = [ @@ -57,54 +60,57 @@ let # optional: libmicrohttpd # HTTP admin api libsodium # ext-auth support - ] ++ optional withSystemd systemd; - - kisDeps = [ - qtx11extras - ]; - - boolToFlag = bool: - if bool then "ON" else "OFF"; + ] ++ lib.optional withSystemd systemd; in mkDerivation rec { pname = "drawpile"; - version = "2.1.20"; + version = "2.2.1"; src = fetchFromGitHub { owner = "drawpile"; repo = "drawpile"; rev = version; - sha256 = "sha256-HjGsaa2BYRNxaQP9e8Z7BkVlIKByC/ta92boGbYHRWQ="; + sha256 = "sha256-NS1aQlWpn3f+SW0oUjlYwHtOS9ZgbjFTrE9grjK5REM="; }; - nativeBuildInputs = [ extra-cmake-modules ]; + cargoDeps = rustPlatform.fetchCargoTarball { + inherit src; + hash = "sha256-V36yiwraXK7qlJd1r8EtEA4ULxlgvMEmpn/ka3m9GjA="; + }; + + nativeBuildInputs = [ + cargo + extra-cmake-modules + rustc + rustPlatform.cargoSetupHook + ]; buildInputs = [ karchive + qtwebsockets ] - ++ optionals buildClient clientDeps - ++ optionals buildServer serverDeps - ++ optionals enableKisTablet kisDeps; + ++ lib.optionals buildClient clientDeps + ++ lib.optionals buildServer serverDeps; cmakeFlags = [ - "-Wno-dev" - "-DINITSYS=systemd" - "-DCLIENT=${boolToFlag buildClient}" - "-DSERVER=${boolToFlag buildServer}" - "-DSERVERGUI=${boolToFlag buildServerGui}" - "-DTOOLS=${boolToFlag buildExtraTools}" - "-DKIS_TABLET=${boolToFlag enableKisTablet}" + (lib.cmakeFeature "INITSYS" (lib.optionalString withSystemd "systemd")) + (lib.cmakeBool "CLIENT" buildClient) + (lib.cmakeBool "SERVER" buildServer) + (lib.cmakeBool "SERVERGUI" buildServerGui) + (lib.cmakeBool "TOOLS" buildExtraTools) ]; meta = { description = "Collaborative drawing program that allows multiple users to sketch on the same canvas simultaneously"; - mainProgram = "drawpile-srv"; homepage = "https://drawpile.net/"; downloadPage = "https://drawpile.net/download/"; - license = licenses.gpl3; - maintainers = with maintainers; [ fgaz ]; - platforms = platforms.unix; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ fgaz ]; + platforms = lib.platforms.unix; broken = stdenv.isDarwin; + } // lib.optionalAttrs buildServer { + mainProgram = "drawpile-srv"; + } // lib.optionalAttrs buildClient { + mainProgram = "drawpile"; }; } - diff --git a/pkgs/applications/graphics/geeqie/default.nix b/pkgs/applications/graphics/geeqie/default.nix index 4eeb330f6d27e..3c44ae0bddf1e 100644 --- a/pkgs/applications/graphics/geeqie/default.nix +++ b/pkgs/applications/graphics/geeqie/default.nix @@ -2,7 +2,7 @@ , gtk3, lcms2, exiv2, libchamplain, clutter-gtk, ffmpegthumbnailer, fbida , libarchive, djvulibre, libheif, openjpeg, libjxl, libraw, lua5_3, poppler , gspell, libtiff, libwebp -, gphoto2, imagemagick, yad, exiftool, gnome, libnotify +, gphoto2, imagemagick, yad, exiftool, zenity, libnotify , wrapGAppsHook3, fetchpatch, doxygen , nix-update-script }: @@ -56,18 +56,18 @@ stdenv.mkDerivation rec { # Allow to crop image. # Requires imagemagick, exiv2 and exiftool. sed -i $out/lib/geeqie/geeqie-image-crop \ - -e '1 a export PATH=${lib.makeBinPath [ imagemagick exiv2 exiftool gnome.zenity ]}:$PATH' + -e '1 a export PATH=${lib.makeBinPath [ imagemagick exiv2 exiftool zenity ]}:$PATH' # Requires gphoto2 and libnotify sed -i $out/lib/geeqie/geeqie-tethered-photography \ - -e '1 a export PATH=${lib.makeBinPath [ gphoto2 gnome.zenity libnotify ]}:$PATH' + -e '1 a export PATH=${lib.makeBinPath [ gphoto2 zenity libnotify ]}:$PATH' # Import images from camera. # Requires gphoto2. sed -i $out/lib/geeqie/geeqie-camera-import \ - -e '1 a export PATH=${lib.makeBinPath [ gphoto2 gnome.zenity ]}:$PATH' + -e '1 a export PATH=${lib.makeBinPath [ gphoto2 zenity ]}:$PATH' # Export jpeg from raw file. # Requires exiv2, exiftool and lcms2. sed -i $out/lib/geeqie/geeqie-export-jpeg \ - -e '1 a export PATH=${lib.makeBinPath [ gnome.zenity exiv2 exiftool lcms2 ]}:$PATH' + -e '1 a export PATH=${lib.makeBinPath [ zenity exiv2 exiftool lcms2 ]}:$PATH' ''; enableParallelBuilding = true; diff --git a/pkgs/applications/graphics/gimp/wrapper.nix b/pkgs/applications/graphics/gimp/wrapper.nix index 5b92093005e09..f2400aca0fd1f 100644 --- a/pkgs/applications/graphics/gimp/wrapper.nix +++ b/pkgs/applications/graphics/gimp/wrapper.nix @@ -1,4 +1,4 @@ -{ lib, symlinkJoin, makeWrapper, gimpPlugins, gnome, plugins ? null}: +{ lib, symlinkJoin, makeWrapper, gimpPlugins, gnome-themes-extra, plugins ? null}: let inherit (gimpPlugins) gimp; @@ -19,7 +19,7 @@ in symlinkJoin { wrapProgram $out/bin/$each \ --set GIMP2_PLUGINDIR "$out/lib/gimp/2.0" \ --set GIMP2_DATADIR "$out/share/gimp/2.0" \ - --prefix GTK_PATH : "${gnome.gnome-themes-extra}/lib/gtk-2.0" \ + --prefix GTK_PATH : "${gnome-themes-extra}/lib/gtk-2.0" \ ${toString extraArgs} done set +x diff --git a/pkgs/applications/graphics/glabels/default.nix b/pkgs/applications/graphics/glabels/default.nix index 461e1882d3780..f5e026c75b711 100644 --- a/pkgs/applications/graphics/glabels/default.nix +++ b/pkgs/applications/graphics/glabels/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchpatch, barcode, gnome, autoreconfHook +{ lib, stdenv, fetchurl, fetchpatch, barcode, gnome, gnome-common, autoreconfHook , gtk3, gtk-doc, libxml2, librsvg , libtool, libe-book, gsettings-desktop-schemas , intltool, itstool, makeWrapper, pkg-config, yelp-tools, qrencode }: @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkg-config makeWrapper intltool ]; buildInputs = [ barcode gtk3 gtk-doc yelp-tools - gnome.gnome-common gsettings-desktop-schemas + gnome-common gsettings-desktop-schemas itstool libxml2 librsvg libe-book libtool qrencode ]; diff --git a/pkgs/applications/graphics/gscan2pdf/default.nix b/pkgs/applications/graphics/gscan2pdf/default.nix index 6aaf257496cd9..915a9966ef2c7 100644 --- a/pkgs/applications/graphics/gscan2pdf/default.nix +++ b/pkgs/applications/graphics/gscan2pdf/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchurl, perlPackages, wrapGAppsHook3, fetchpatch, +{ lib, fetchurl, perlPackages, wrapGAppsHook3, # libs librsvg, sane-backends, sane-frontends, # runtime dependencies @@ -10,20 +10,14 @@ with lib; perlPackages.buildPerlPackage rec { pname = "gscan2pdf"; - version = "2.13.2"; + version = "2.13.3"; src = fetchurl { url = "mirror://sourceforge/gscan2pdf/gscan2pdf-${version}.tar.xz"; - hash = "sha256-NGz6DUa7TdChpgwmD9pcGdvYr3R+Ft3jPPSJpybCW4Q="; + hash = "sha256-QAs6fsQDe9+nKM/OAVZUHB034K72jHsKoA2LY2JQa8Y="; }; patches = [ - # fixes warnings during tests. See https://sourceforge.net/p/gscan2pdf/bugs/421 - (fetchpatch { - name = "0001-Remove-given-and-when-keywords-and-operator.patch"; - url = "https://sourceforge.net/p/gscan2pdf/bugs/_discuss/thread/602a7cedfd/1ea4/attachment/0001-Remove-given-and-when-keywords-and-operator.patch"; - hash = "sha256-JtrHUkfEKnDhWfEVdIdYVlr5b/xChTzsrrPmruLaJ5M="; - }) # fixes an error with utf8 file names. See https://sourceforge.net/p/gscan2pdf/bugs/400 ./image-utf8-fix.patch ]; @@ -113,18 +107,6 @@ perlPackages.buildPerlPackage rec { ]); checkPhase = '' - # Temporarily disable a test failing after a patch imagemagick update. - # It might only due to the reporting and matching used in the test. - # See https://github.com/NixOS/nixpkgs/issues/223446 - # See https://sourceforge.net/p/gscan2pdf/bugs/417/ - # - # Failed test 'valid TIFF created' - # at t/131_save_tiff.t line 44. - # 'test.tif TIFF 70x46 70x46+0+0 8-bit sRGB 10024B 0.000u 0:00.000 - # ' - # doesn't match '(?^:test.tif TIFF 70x46 70x46\+0\+0 8-bit sRGB [7|9][.\d]+K?B)' - rm t/131_save_tiff.t - # Temporarily disable a dubiously failing test: # t/169_import_scan.t ........................... 1/1 # # Failed test 'variable-height scan imported with expected size' @@ -135,12 +117,17 @@ perlPackages.buildPerlPackage rec { # t/169_import_scan.t ........................... Dubious, test returned 1 (wstat 256, 0x100) rm t/169_import_scan.t - # Disable a test which passes but reports an incorrect status - # t/0601_Dialog_Scan.t .......................... All 14 subtests passed - # t/0601_Dialog_Scan.t (Wstat: 139 Tests: 14 Failed: 0) - # Non-zero wait status: 139 - rm t/0601_Dialog_Scan.t - + # Disable a test failing because of a warning interfering with the pinned output + # t/3722_user_defined.t ......................... 1/2 + # Failed test 'user_defined caught error injected in queue' + # at t/3722_user_defined.t line 41. + # got: 'error + # WARNING: The convert command is deprecated in IMv7, use "magick" instead of "convert" or "magick convert"' + # expected: 'error' + # Looks like you failed 1 test of 2. + rm t/3722_user_defined.t + + export XDG_CACHE_HOME="$(mktemp -d)" xvfb-run -s '-screen 0 800x600x24' \ make test ''; diff --git a/pkgs/applications/graphics/gthumb/default.nix b/pkgs/applications/graphics/gthumb/default.nix index fc59139694515..7de0541955206 100644 --- a/pkgs/applications/graphics/gthumb/default.nix +++ b/pkgs/applications/graphics/gthumb/default.nix @@ -5,6 +5,7 @@ , pkg-config , meson , ninja +, adwaita-icon-theme , exiv2 , libheif , libjpeg @@ -58,7 +59,7 @@ stdenv.mkDerivation rec { clutter-gtk exiv2 glib - gnome.adwaita-icon-theme + adwaita-icon-theme gsettings-desktop-schemas gst_all_1.gst-plugins-base (gst_all_1.gst-plugins-good.override { gtkSupport = true; }) diff --git a/pkgs/applications/graphics/kodelife/default.nix b/pkgs/applications/graphics/kodelife/default.nix index 9bfc5d7aec191..35ec592d24cc5 100644 --- a/pkgs/applications/graphics/kodelife/default.nix +++ b/pkgs/applications/graphics/kodelife/default.nix @@ -19,7 +19,7 @@ , libXrender , libXxf86vm , libglvnd -, gnome +, zenity }: let @@ -39,7 +39,7 @@ let ]; runBinDeps = [ - gnome.zenity + zenity ]; in @@ -100,7 +100,7 @@ stdenv.mkDerivation rec { description = "Real-time GPU shader editor"; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; - maintainers = with maintainers; [ prusnak lilyinstarlight ]; + maintainers = with maintainers; [ prusnak ]; platforms = [ "aarch64-linux" "armv7l-linux" "x86_64-linux" ]; mainProgram = "KodeLife"; }; diff --git a/pkgs/applications/graphics/shotwell/default.nix b/pkgs/applications/graphics/shotwell/default.nix index 8185f59c7452a..803d298ddfd7e 100644 --- a/pkgs/applications/graphics/shotwell/default.nix +++ b/pkgs/applications/graphics/shotwell/default.nix @@ -3,6 +3,7 @@ , fetchurl , meson , ninja +, adwaita-icon-theme , gtk3 , libexif , libgphoto2 @@ -80,7 +81,7 @@ stdenv.mkDerivation (finalAttrs: { librsvg librest gcr - gnome.adwaita-icon-theme + adwaita-icon-theme libsecret libportal-gtk3 ]; diff --git a/pkgs/applications/graphics/shutter/default.nix b/pkgs/applications/graphics/shutter/default.nix index 9f18033fca487..fe4286aa4b5b1 100644 --- a/pkgs/applications/graphics/shutter/default.nix +++ b/pkgs/applications/graphics/shutter/default.nix @@ -15,8 +15,6 @@ let perlModules = with perlPackages; [ - # Not sure if these are needed - # Gnome2 Gnome2Canvas Gnome2VFS Gtk2AppIndicator Gtk2Unique ImageMagick Cairo FileBaseDir diff --git a/pkgs/applications/graphics/synfigstudio/default.nix b/pkgs/applications/graphics/synfigstudio/default.nix index f1edfe81fb638..c20f10ee0d1bd 100644 --- a/pkgs/applications/graphics/synfigstudio/default.nix +++ b/pkgs/applications/graphics/synfigstudio/default.nix @@ -19,7 +19,7 @@ , pango , imagemagick , intltool -, gnome +, adwaita-icon-theme , harfbuzz , freetype , fribidi @@ -131,7 +131,7 @@ stdenv.mkDerivation { libsigcxx libxmlxx mlt - gnome.adwaita-icon-theme + adwaita-icon-theme openexr fftw ]; diff --git a/pkgs/applications/graphics/tev/default.nix b/pkgs/applications/graphics/tev/default.nix index 288eb7aef6ca6..76c8b7f692af9 100644 --- a/pkgs/applications/graphics/tev/default.nix +++ b/pkgs/applications/graphics/tev/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub , cmake, wrapGAppsHook3 -, libX11, libzip, glfw, libpng, xorg, gnome +, libX11, libzip, glfw, libpng, xorg, zenity }: stdenv.mkDerivation rec { @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { postInstall = '' wrapProgram $out/bin/tev \ "''${gappsWrapperArgs[@]}" \ - --prefix PATH ":" "${gnome.zenity}/bin" + --prefix PATH ":" "${zenity}/bin" ''; env.CXXFLAGS = "-include cstdint"; diff --git a/pkgs/applications/misc/bazecor/default.nix b/pkgs/applications/misc/bazecor/default.nix index ed1900836fccc..02d15b5068722 100644 --- a/pkgs/applications/misc/bazecor/default.nix +++ b/pkgs/applications/misc/bazecor/default.nix @@ -1,12 +1,12 @@ -{ lib -, appimageTools -, fetchurl +{ + lib, + appimageTools, + fetchurl, + makeWrapper, }: - -appimageTools.wrapAppImage rec { +let pname = "bazecor"; version = "1.3.11"; - src = appimageTools.extract { inherit pname version; src = fetchurl { @@ -18,11 +18,14 @@ appimageTools.wrapAppImage rec { postExtract = '' substituteInPlace \ $out/usr/lib/bazecor/resources/app/.webpack/main/index.js \ - --replace \ + --replace-fail \ 'checkUdev=()=>{try{if(c.default.existsSync(f))return c.default.readFileSync(f,"utf-8").trim()===l.trim()}catch(e){console.error(e)}return!1}' \ 'checkUdev=()=>{return 1}' ''; }; +in +appimageTools.wrapAppImage { + inherit pname version src; # also make sure to update the udev rules in ./10-dygma.rules; most recently # taken from @@ -35,14 +38,18 @@ appimageTools.wrapAppImage rec { # to allow non-root modifications to the keyboards. extraInstallCommands = '' - install -m 444 -D ${src}/Bazecor.desktop -t $out/share/applications - substituteInPlace $out/share/applications/Bazecor.desktop \ - --replace 'Exec=Bazecor' 'Exec=bazecor' + source "${makeWrapper}/nix-support/setup-hook" + wrapProgram $out/bin/bazecor \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" + install -m 444 -D ${src}/Bazecor.desktop -t $out/share/applications install -m 444 -D ${src}/bazecor.png -t $out/share/pixmaps mkdir -p $out/lib/udev/rules.d - ln -s --target-directory=$out/lib/udev/rules.d ${./10-dygma.rules} + install -m 444 -D ${./10-dygma.rules} $out/lib/udev/rules.d/10-dygma.rules + + substituteInPlace $out/share/applications/Bazecor.desktop \ + --replace-fail 'Exec=Bazecor' 'Exec=bazecor' ''; meta = { @@ -51,7 +58,10 @@ appimageTools.wrapAppImage rec { changelog = "https://github.com/Dygmalab/Bazecor/releases/tag/v${version}"; sourceProvenance = [ lib.sourceTypes.binaryNativeCode ]; license = lib.licenses.gpl3Only; - maintainers = with lib.maintainers; [ amesgen ]; + maintainers = with lib.maintainers; [ + amesgen + gcleroux + ]; platforms = [ "x86_64-linux" ]; mainProgram = "bazecor"; }; diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix index 0e19d15973651..e1bf6cffb008d 100644 --- a/pkgs/applications/misc/calibre/default.nix +++ b/pkgs/applications/misc/calibre/default.nix @@ -21,12 +21,13 @@ , qmake , qtbase , qtwayland -, removeReferencesTo , speechd , sqlite , wrapQtAppsHook , xdg-utils , wrapGAppsHook3 +, popplerSupport ? true +, speechSupport ? true , unrarSupport ? false }: @@ -69,7 +70,6 @@ stdenv.mkDerivation (finalAttrs: { cmake pkg-config qmake - removeReferencesTo wrapGAppsHook3 wrapQtAppsHook ]; @@ -91,48 +91,48 @@ stdenv.mkDerivation (finalAttrs: { qtbase qtwayland sqlite + (python3Packages.python.withPackages + (ps: with ps; [ + (apsw.overrideAttrs (oldAttrs: { + setupPyBuildFlags = [ "--enable=load_extension" ]; + })) + beautifulsoup4 + css-parser + cssselect + python-dateutil + dnspython + faust-cchardet + feedparser + html2text + html5-parser + lxml + markdown + mechanize + msgpack + netifaces + pillow + pychm + pyqt-builder + pyqt6 + python + regex + sip + setuptools + zeroconf + jeepney + pycryptodome + xxhash + # the following are distributed with calibre, but we use upstream instead + odfpy + ] ++ lib.optionals (lib.lists.any (p: p == stdenv.hostPlatform.system) pyqt6-webengine.meta.platforms) [ + # much of calibre's functionality is usable without a web + # browser, so we enable building on platforms which qtwebengine + # does not support by simply omitting qtwebengine. + pyqt6-webengine + ] ++ lib.optional (unrarSupport) unrardll) + ) xdg-utils - ] ++ ( - with python3Packages; [ - (apsw.overrideAttrs (oldAttrs: { - setupPyBuildFlags = [ "--enable=load_extension" ]; - })) - beautifulsoup4 - css-parser - cssselect - python-dateutil - dnspython - faust-cchardet - feedparser - html2text - html5-parser - lxml - markdown - mechanize - msgpack - netifaces - pillow - pychm - pyqt-builder - pyqt6 - python - regex - sip - setuptools - speechd - zeroconf - jeepney - pycryptodome - xxhash - # the following are distributed with calibre, but we use upstream instead - odfpy - ] ++ lib.optionals (lib.lists.any (p: p == stdenv.hostPlatform.system) pyqt6-webengine.meta.platforms) [ - # much of calibre's functionality is usable without a web - # browser, so we enable building on platforms which qtwebengine - # does not support by simply omitting qtwebengine. - pyqt6-webengine - ] ++ lib.optional (unrarSupport) unrardll - ); + ] ++ lib.optional (speechSupport) speechd; installPhase = '' runHook preInstall @@ -149,7 +149,7 @@ stdenv.mkDerivation (finalAttrs: { export XDG_DATA_HOME=$out/share export XDG_UTILS_INSTALL_MODE="user" - ${python3Packages.python.pythonOnBuildForHost.interpreter} setup.py install --root=$out \ + python setup.py install --root=$out \ --prefix=$out \ --libdir=$out/lib \ --staging-root=$out \ @@ -173,23 +173,18 @@ stdenv.mkDerivation (finalAttrs: { dontWrapQtApps = true; dontWrapGApps = true; - # Remove some references to shrink the closure size. This reference (as of - # 2018-11-06) was a single string like the following: - # /nix/store/xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx-podofo-0.9.6-dev/include/podofo/base/PdfVariant.h - preFixup = '' - remove-references-to -t ${podofo.dev} \ - $out/lib/calibre/calibre/plugins/podofo.so - - for program in $out/bin/*; do - wrapProgram $program \ - ''${qtWrapperArgs[@]} \ - ''${gappsWrapperArgs[@]} \ - --prefix PYTHONPATH : $PYTHONPATH \ - --prefix PATH : ${poppler_utils.out}/bin - done - ''; - - disallowedReferences = [ podofo.dev ]; + preFixup = + let + popplerArgs = "--prefix PATH : ${poppler_utils.out}/bin"; + in + '' + for program in $out/bin/*; do + wrapProgram $program \ + ''${qtWrapperArgs[@]} \ + ''${gappsWrapperArgs[@]} \ + ${if popplerSupport then popplerArgs else ""} + done + ''; meta = { homepage = "https://calibre-ebook.com"; diff --git a/pkgs/applications/misc/camunda-modeler/default.nix b/pkgs/applications/misc/camunda-modeler/default.nix index ce23411258420..8a8bf8ad5812c 100644 --- a/pkgs/applications/misc/camunda-modeler/default.nix +++ b/pkgs/applications/misc/camunda-modeler/default.nix @@ -9,11 +9,11 @@ stdenvNoCC.mkDerivation rec { pname = "camunda-modeler"; - version = "5.23.0"; + version = "5.25.0"; src = fetchurl { url = "https://github.com/camunda/camunda-modeler/releases/download/v${version}/camunda-modeler-${version}-linux-x64.tar.gz"; - hash = "sha256-x63UMIl0Wsr4qSEn19Of135PHKlpEVAZzhA2+ZjxNwY="; + hash = "sha256-4YeeeIC37s/cXZ4TjIxn/yvDVKP92f9uSBajLCj7NZw="; }; sourceRoot = "camunda-modeler-${version}-linux-x64"; diff --git a/pkgs/applications/misc/collision/default.nix b/pkgs/applications/misc/collision/default.nix index 2f73d2d8dee41..96f19b47968aa 100644 --- a/pkgs/applications/misc/collision/default.nix +++ b/pkgs/applications/misc/collision/default.nix @@ -5,7 +5,7 @@ , wrapGAppsHook4 , desktopToDarwinBundle , gobject-introspection -, gnome +, nautilus-python , python3 , libadwaita , openssl @@ -54,7 +54,7 @@ crystal.buildCrystalPackage rec { libadwaita openssl libxml2 - gnome.nautilus-python + nautilus-python python3.pkgs.pygobject3 ]; diff --git a/pkgs/applications/misc/gpx-viewer/default.nix b/pkgs/applications/misc/gpx-viewer/default.nix index daaf92fc72de2..a04cf4ec7c773 100644 --- a/pkgs/applications/misc/gpx-viewer/default.nix +++ b/pkgs/applications/misc/gpx-viewer/default.nix @@ -7,7 +7,7 @@ , ninja , vala , pkg-config -, gnome +, adwaita-icon-theme , libchamplain , gdl , wrapGAppsHook3 @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { buildInputs = [ gdl libchamplain - gnome.adwaita-icon-theme + adwaita-icon-theme libxml2 ]; diff --git a/pkgs/applications/misc/inochi2d/generic.nix b/pkgs/applications/misc/inochi2d/generic.nix index 6666a63ca1ed9..769b44204420c 100644 --- a/pkgs/applications/misc/inochi2d/generic.nix +++ b/pkgs/applications/misc/inochi2d/generic.nix @@ -13,7 +13,7 @@ dbus, freetype, SDL2, - gnome, + zenity, builderArgs, }: @@ -126,7 +126,7 @@ buildDubPackage ( postFixup = '' # Add support for `open file` dialog makeWrapper $out/share/${pname}/${pname} $out/bin/${pname} \ - --prefix PATH : ${lib.makeBinPath [ gnome.zenity ]} + --prefix PATH : ${lib.makeBinPath [ zenity ]} ''; meta = { diff --git a/pkgs/applications/misc/keeweb/default.nix b/pkgs/applications/misc/keeweb/default.nix index a7260dc509b72..33ebb9e329f25 100644 --- a/pkgs/applications/misc/keeweb/default.nix +++ b/pkgs/applications/misc/keeweb/default.nix @@ -13,7 +13,7 @@ , nss , udev , xorg -, gnome +, gnome-keyring , mesa , gtk3 , libusb1 @@ -54,7 +54,7 @@ let xorg.libXScrnSaver xorg.libXtst xorg.libxshmfence - gnome.gnome-keyring + gnome-keyring mesa gtk3 libusb1 diff --git a/pkgs/applications/misc/keymapp/default.nix b/pkgs/applications/misc/keymapp/default.nix deleted file mode 100644 index 59dae9589fa7a..0000000000000 --- a/pkgs/applications/misc/keymapp/default.nix +++ /dev/null @@ -1,68 +0,0 @@ -{ stdenv -, lib -, fetchurl -, autoPatchelfHook -, wrapGAppsHook3 -, libusb1 -, webkitgtk -, gtk3 -, writeShellScript -, makeDesktopItem -, copyDesktopItems -}: -let - desktopItem = makeDesktopItem { - name = "keymapp"; - icon = "keymapp"; - desktopName = "Keymapp"; - categories = [ "Settings" "HardwareSettings" ]; - type = "Application"; - exec = "keymapp"; - }; -in -stdenv.mkDerivation rec { - pname = "keymapp"; - version = "1.1.1"; - - src = fetchurl { - url = "https://oryx.nyc3.cdn.digitaloceanspaces.com/keymapp/keymapp-${version}.tar.gz"; - hash = "sha256-tbRlJ65hHPBDwoXAXf++OdcW67RcqR1x1vfhbPCo1Ls="; - }; - - nativeBuildInputs = [ - copyDesktopItems - autoPatchelfHook - wrapGAppsHook3 - ]; - - buildInputs = [ - libusb1 - webkitgtk - gtk3 - ]; - - sourceRoot = "."; - - installPhase = '' - runHook preInstall - - install -m755 -D keymapp "$out/bin/${pname}" - install -Dm644 icon.png "$out/share/pixmaps/${pname}.png" - - runHook postInstall - ''; - - preFixup = '' - gappsWrapperArgs+=(--set-default '__NV_PRIME_RENDER_OFFLOAD' 1) - ''; - - desktopItems = [ desktopItem ]; - - meta = with lib; { - homepage = "https://www.zsa.io/flash/"; - description = "Application for ZSA keyboards"; - maintainers = with lib.maintainers; [ jankaifer shawn8901 ]; - platforms = platforms.linux; - license = lib.licenses.unfree; - }; -} diff --git a/pkgs/applications/misc/lutris/fhsenv.nix b/pkgs/applications/misc/lutris/fhsenv.nix index 3d241f30efa22..c1beb102cdd65 100644 --- a/pkgs/applications/misc/lutris/fhsenv.nix +++ b/pkgs/applications/misc/lutris/fhsenv.nix @@ -7,7 +7,7 @@ let qt5Deps = pkgs: with pkgs.qt5; [ qtbase qtmultimedia ]; - gnomeDeps = pkgs: with pkgs; [ gnome.zenity gtksourceview gnome-desktop libgnome-keyring webkitgtk ]; + gnomeDeps = pkgs: with pkgs; [ zenity gtksourceview gnome-desktop libgnome-keyring webkitgtk ]; xorgDeps = pkgs: with pkgs.xorg; [ libX11 libXrender libXrandr libxcb libXmu libpthreadstubs libXext libXdmcp libXxf86vm libXinerama libSM libXv libXaw libXi libXcursor libXcomposite diff --git a/pkgs/applications/misc/mob/default.nix b/pkgs/applications/misc/mob/default.nix index 786e766681372..755cb735e737e 100644 --- a/pkgs/applications/misc/mob/default.nix +++ b/pkgs/applications/misc/mob/default.nix @@ -13,9 +13,9 @@ buildGoModule rec { src = fetchFromGitHub { owner = "remotemobprogramming"; - repo = pname; + repo = "mob"; rev = "v${version}"; - sha256 = "sha256-1A8xoDiDBW1YieRDTCAiena63j4y7FJf5dMQoNrIAno="; + hash = "sha256-+pN+FGZCW5sPWpUNIYTFn26KBpHre+9PPBQwEcBNJWI="; }; vendorHash = null; diff --git a/pkgs/applications/misc/mupdf/default.nix b/pkgs/applications/misc/mupdf/default.nix index 492722d33f49a..9422b6452cec2 100644 --- a/pkgs/applications/misc/mupdf/default.nix +++ b/pkgs/applications/misc/mupdf/default.nix @@ -208,7 +208,7 @@ stdenv.mkDerivation rec { description = "Lightweight PDF, XPS, and E-book viewer and toolkit written in portable C"; changelog = "https://git.ghostscript.com/?p=mupdf.git;a=blob_plain;f=CHANGES;hb=${version}"; license = licenses.agpl3Plus; - maintainers = with maintainers; [ vrthra fpletz lilyinstarlight ]; + maintainers = with maintainers; [ vrthra fpletz ]; platforms = platforms.unix; mainProgram = "mupdf"; }; diff --git a/pkgs/applications/misc/notify-osd-customizable/default.nix b/pkgs/applications/misc/notify-osd-customizable/default.nix index 49f6cf478fbbc..20fe2ad6d82b1 100644 --- a/pkgs/applications/misc/notify-osd-customizable/default.nix +++ b/pkgs/applications/misc/notify-osd-customizable/default.nix @@ -2,7 +2,7 @@ , dbus-glib , fetchurl , glib -, gnome +, gnome-common , libnotify , libtool , libwnck @@ -27,7 +27,7 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config makeWrapper libtool ]; buildInputs = [ glib libwnck libnotify dbus-glib - gsettings-desktop-schemas gnome.gnome-common + gsettings-desktop-schemas gnome-common ]; configureFlags = [ "--libexecdir=$(out)/bin" ]; diff --git a/pkgs/applications/misc/organicmaps/default.nix b/pkgs/applications/misc/organicmaps/default.nix index 5388b7b7485eb..d21e306c8a7a6 100644 --- a/pkgs/applications/misc/organicmaps/default.nix +++ b/pkgs/applications/misc/organicmaps/default.nix @@ -11,6 +11,7 @@ , qtbase , qtpositioning , qtsvg +, qtwayland , libGLU , libGL , zlib @@ -68,6 +69,7 @@ in stdenv.mkDerivation rec { qtbase qtpositioning qtsvg + qtwayland libGLU libGL zlib diff --git a/pkgs/applications/misc/parsec/bin.nix b/pkgs/applications/misc/parsec/bin.nix index e6c250afc321b..436822aa2b889 100644 --- a/pkgs/applications/misc/parsec/bin.nix +++ b/pkgs/applications/misc/parsec/bin.nix @@ -21,8 +21,7 @@ , libjpeg8 , curl , vulkan-loader -, gnome -, zenity ? gnome.zenity +, zenity }: stdenvNoCC.mkDerivation { diff --git a/pkgs/applications/misc/plank/default.nix b/pkgs/applications/misc/plank/default.nix index 69be975be0ba2..cd03f1521abfa 100644 --- a/pkgs/applications/misc/plank/default.nix +++ b/pkgs/applications/misc/plank/default.nix @@ -5,7 +5,7 @@ , cairo , dconf , glib -, gnome +, gnome-common , gtk3 , libwnck , libX11 @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook gettext - gnome.gnome-common + gnome-common libxml2 # xmllint pkg-config vala diff --git a/pkgs/applications/misc/pytrainer/default.nix b/pkgs/applications/misc/pytrainer/default.nix index 57d5ae394381f..296a81e075da3 100644 --- a/pkgs/applications/misc/pytrainer/default.nix +++ b/pkgs/applications/misc/pytrainer/default.nix @@ -2,7 +2,7 @@ , python310 , fetchFromGitHub , gdk-pixbuf -, gnome +, adwaita-icon-theme , gpsbabel , glib-networking , glibcLocales @@ -55,7 +55,7 @@ in python.pkgs.buildPythonApplication rec { gtk3 webkitgtk glib-networking - gnome.adwaita-icon-theme + adwaita-icon-theme gdk-pixbuf ]; diff --git a/pkgs/applications/misc/snapper-gui/default.nix b/pkgs/applications/misc/snapper-gui/default.nix index 8029eee15f896..f4df09504fc26 100644 --- a/pkgs/applications/misc/snapper-gui/default.nix +++ b/pkgs/applications/misc/snapper-gui/default.nix @@ -1,5 +1,5 @@ { lib, fetchFromGitHub, python3, python3Packages -, gnome, gtk3, wrapGAppsHook3, gtksourceview3, snapper +, adwaita-icon-theme, gtk3, wrapGAppsHook3, gtksourceview3, snapper , gobject-introspection }: @@ -18,7 +18,7 @@ python3Packages.buildPythonApplication rec { buildInputs = [ python3 - gnome.adwaita-icon-theme + adwaita-icon-theme ]; doCheck = false; # it doesn't have any tests diff --git a/pkgs/applications/misc/ssocr/default.nix b/pkgs/applications/misc/ssocr/default.nix index 4231adb65b410..520ea84ebd995 100644 --- a/pkgs/applications/misc/ssocr/default.nix +++ b/pkgs/applications/misc/ssocr/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "ssocr"; - version = "2.23.1"; + version = "2.24.0"; src = fetchFromGitHub { owner = "auerswal"; repo = "ssocr"; rev = "v${version}"; - sha256 = "sha256-EfZsTrZI6vKM7tB6mKNGEkdfkNFbN5p4TmymOJGZRBk="; + sha256 = "sha256-79AnlO5r3IWSsV7zcI8li63bWTa+jw99cdOFFOGFZ2w="; }; nativeBuildInputs = [ pkg-config ]; @@ -22,5 +22,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3; maintainers = [ maintainers.kroell ]; mainProgram = "ssocr"; + platforms = platforms.unix; }; } diff --git a/pkgs/applications/misc/syncthingtray/default.nix b/pkgs/applications/misc/syncthingtray/default.nix index b5bf0696f7645..b66c4f74d724e 100644 --- a/pkgs/applications/misc/syncthingtray/default.nix +++ b/pkgs/applications/misc/syncthingtray/default.nix @@ -31,6 +31,7 @@ during runtime. Alternatively, one can edit the desktop file themselves after it is generated See: https://github.com/NixOS/nixpkgs/issues/199596#issuecomment-1310136382 */ , autostartExecPath ? "syncthingtray" +, versionCheckHook }: stdenv.mkDerivation (finalAttrs: { @@ -85,9 +86,10 @@ stdenv.mkDerivation (finalAttrs: { # Make binary available in PATH like on other platforms ln -s $out/Applications/syncthingtray.app/Contents/MacOS/syncthingtray $out/bin/syncthingtray ''; - installCheckPhase = '' - $out/bin/syncthingtray --help | grep ${finalAttrs.version} - ''; + nativeInstallCheckInputs = [ + versionCheckHook + ]; + doInstallCheck = true; cmakeFlags = [ "-DQT_PACKAGE_PREFIX=Qt${lib.versions.major qtbase.version}" diff --git a/pkgs/applications/misc/thedesk/default.nix b/pkgs/applications/misc/thedesk/default.nix index b3292b8ebb5d0..d1c4dd88583a6 100644 --- a/pkgs/applications/misc/thedesk/default.nix +++ b/pkgs/applications/misc/thedesk/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "thedesk"; - version = "24.1.3"; + version = "24.2.1"; src = fetchurl { url = "https://github.com/cutls/TheDesk/releases/download/v${version}/${pname}_${version}_amd64.deb"; - sha256 = "sha256-Fq+kDdNR7G0Fbi++OFGxYbgFFOnpdzxy0JVh5t/i8hs="; + sha256 = "sha256-AdjygNnQ3qQB03cGcQ5EB0cY3XXWLrzfCqw/U8tq1Yo="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/ulauncher/default.nix b/pkgs/applications/misc/ulauncher/default.nix index 92d93b5095d13..438277bc98cd4 100644 --- a/pkgs/applications/misc/ulauncher/default.nix +++ b/pkgs/applications/misc/ulauncher/default.nix @@ -4,7 +4,7 @@ , python3Packages , gdk-pixbuf , glib -, gnome +, adwaita-icon-theme , gobject-introspection , gtk3 , wrapGAppsHook3 @@ -38,7 +38,7 @@ python3Packages.buildPythonApplication rec { buildInputs = [ glib - gnome.adwaita-icon-theme + adwaita-icon-theme gtk3 keybinder3 libappindicator diff --git a/pkgs/applications/misc/verbiste/default.nix b/pkgs/applications/misc/verbiste/default.nix index 9f27f8e73d7f3..2793ffcd0c639 100644 --- a/pkgs/applications/misc/verbiste/default.nix +++ b/pkgs/applications/misc/verbiste/default.nix @@ -1,18 +1,18 @@ -{ lib, stdenv, fetchurl, pkg-config, libgnomeui, libxml2 }: +{ lib, stdenv, fetchurl, pkg-config, gtk2, libxml2 }: stdenv.mkDerivation rec { pname = "verbiste"; - version = "0.1.47"; + version = "0.1.48"; src = fetchurl { - url = "https://perso.b2b2c.ca/~sarrazip/dev/${pname}-${version}.tar.gz"; - sha256 = "02kzin3pky2q2jnihrch8y0hy043kqqmzxq8j741x80kl0j1qxkm"; + url = "https://perso.b2b2c.ca/~sarrazip/dev/verbiste-${version}.tar.gz"; + hash = "sha256-qp0OFpH4DInWjzraDI6+CeKh85JkbwVYHlJruIrGnBM="; }; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ libgnomeui libxml2 ]; + buildInputs = [ gtk2 libxml2 ]; enableParallelBuilding = true; diff --git a/pkgs/applications/misc/yubioath-flutter/default.nix b/pkgs/applications/misc/yubioath-flutter/default.nix index da5cb37a978b0..c88a65d55d60c 100644 --- a/pkgs/applications/misc/yubioath-flutter/default.nix +++ b/pkgs/applications/misc/yubioath-flutter/default.nix @@ -6,7 +6,7 @@ , libnotify , libappindicator , pkg-config -, gnome +, gnome-screenshot , makeWrapper , removeReferencesTo }: @@ -67,7 +67,7 @@ flutter319.buildFlutterApplication rec { # Needed for QR scanning to work extraWrapProgramArgs = '' - --prefix PATH : ${lib.makeBinPath [ gnome.gnome-screenshot ]} + --prefix PATH : ${lib.makeBinPath [ gnome-screenshot ]} ''; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/browsers/brave/make-brave.nix b/pkgs/applications/networking/browsers/brave/make-brave.nix index f0b9fb6cf0c6e..01458f7001828 100644 --- a/pkgs/applications/networking/browsers/brave/make-brave.nix +++ b/pkgs/applications/networking/browsers/brave/make-brave.nix @@ -12,7 +12,7 @@ , freetype , gdk-pixbuf , glib -, gnome +, adwaita-icon-theme , gsettings-desktop-schemas , gtk3 , gtk4 @@ -120,7 +120,7 @@ stdenv.mkDerivation { glib gsettings-desktop-schemas gtk3 gtk4 # needed for XDG_ICON_DIRS - gnome.adwaita-icon-theme + adwaita-icon-theme ]; unpackPhase = "dpkg-deb --fsys-tarfile $src | tar -x --no-same-permissions --no-same-owner"; diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index 095fe13f9197a..1998972cc2178 100644 --- a/pkgs/applications/networking/browsers/chromium/default.nix +++ b/pkgs/applications/networking/browsers/chromium/default.nix @@ -1,7 +1,7 @@ { newScope, config, stdenv, makeWrapper , buildPackages , ed, gnugrep, coreutils, xdg-utils -, glib, gtk3, gtk4, gnome, gsettings-desktop-schemas, gn, fetchgit +, glib, gtk3, gtk4, adwaita-icon-theme, gsettings-desktop-schemas, gn, fetchgit , libva, pipewire, wayland , runCommand , lib, libkrb5 @@ -101,7 +101,7 @@ in stdenv.mkDerivation { gsettings-desktop-schemas glib gtk3 gtk4 # needed for XDG_ICON_DIRS - gnome.adwaita-icon-theme + adwaita-icon-theme # Needed for kerberos at runtime libkrb5 diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix index 15c8ffc3b22d6..79df553d3ac2b 100644 --- a/pkgs/applications/networking/browsers/firefox/wrapper.nix +++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix @@ -4,7 +4,7 @@ ## various stuff that can be plugged in , ffmpeg, xorg, alsa-lib, libpulseaudio, libcanberra-gtk3, libglvnd, libnotify, opensc -, gnome/*.gnome-shell*/ +, adwaita-icon-theme , browserpass, gnome-browser-connector, uget-integrator, plasma5Packages, bukubrow, pipewire , tridactyl-native , fx-cast-bridge @@ -322,7 +322,7 @@ let --set MOZ_LEGACY_PROFILES 1 \ --set MOZ_ALLOW_DOWNGRADE 1 \ --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" \ - --suffix XDG_DATA_DIRS : '${gnome.adwaita-icon-theme}/share' \ + --suffix XDG_DATA_DIRS : '${adwaita-icon-theme}/share' \ --set-default MOZ_ENABLE_WAYLAND 1 \ "''${oldWrapperArgs[@]}" ############################# diff --git a/pkgs/applications/networking/browsers/ladybird/default.nix b/pkgs/applications/networking/browsers/ladybird/default.nix index 85d85ba2476b1..954bbf25e08d0 100644 --- a/pkgs/applications/networking/browsers/ladybird/default.nix +++ b/pkgs/applications/networking/browsers/ladybird/default.nix @@ -10,9 +10,11 @@ , darwin , cmake , ninja +, pkg-config , libxcrypt , python3 , qt6Packages +, woff2 , nixosTests , AppKit , Cocoa @@ -50,19 +52,15 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "ladybird"; - version = "0-unstable-2024-06-04"; + version = "0-unstable-2024-06-08"; src = fetchFromGitHub { owner = "LadybirdWebBrowser"; repo = "ladybird"; - rev = "c6e9f0e7b5b050ddbb5d735ca9c65458add9b4a5"; - hash = "sha256-+NDrd0kO9bqXFcCEJFmNwNu5jmf+wT+uUVlmbmCYLw4="; + rev = "2f68e361370040d8cdc75a8ed8af4239134ae481"; + hash = "sha256-EQZTsui4lGThSi+8a6KSyL5lJnO0A8fJ8HWY4jgkpUA="; }; - patches = [ - ./nixos-font-path.patch - ]; - postPatch = '' sed -i '/iconutil/d' Ladybird/CMakeLists.txt @@ -112,6 +110,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = with qt6Packages; [ cmake ninja + pkg-config python3 wrapQtAppsHook ]; @@ -120,6 +119,9 @@ stdenv.mkDerivation (finalAttrs: { libxcrypt qtbase qtmultimedia + woff2 + ] ++ lib.optional stdenv.isLinux [ + qtwayland ] ++ lib.optionals stdenv.isDarwin [ AppKit Cocoa @@ -163,5 +165,7 @@ stdenv.mkDerivation (finalAttrs: { maintainers = with maintainers; [ fgaz ]; platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ]; mainProgram = "Ladybird"; + # use of undeclared identifier 'NSBezelStyleAccessoryBarAction' + broken = stdenv.isDarwin; }; }) diff --git a/pkgs/applications/networking/browsers/ladybird/nixos-font-path.patch b/pkgs/applications/networking/browsers/ladybird/nixos-font-path.patch deleted file mode 100644 index 468eb10b2c313..0000000000000 --- a/pkgs/applications/networking/browsers/ladybird/nixos-font-path.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/Userland/Libraries/LibCore/StandardPaths.cpp b/Userland/Libraries/LibCore/StandardPaths.cpp -index 77ddbeb9..76481497 100644 ---- a/Userland/Libraries/LibCore/StandardPaths.cpp -+++ b/Userland/Libraries/LibCore/StandardPaths.cpp -@@ -205,6 +205,7 @@ ErrorOr<Vector<String>> StandardPaths::font_directories() - "/Library/Fonts"_string, - TRY(String::formatted("{}/Library/Fonts"sv, home_directory())), - # else -+ "/run/current-system/sw/share/X11/fonts"_string, - "/usr/share/fonts"_string, - "/usr/local/share/fonts"_string, - TRY(String::formatted("{}/.local/share/fonts"sv, home_directory())), diff --git a/pkgs/applications/networking/browsers/mullvad-browser/default.nix b/pkgs/applications/networking/browsers/mullvad-browser/default.nix index b9a0b49bab2ba..edb62c692abe9 100644 --- a/pkgs/applications/networking/browsers/mullvad-browser/default.nix +++ b/pkgs/applications/networking/browsers/mullvad-browser/default.nix @@ -144,6 +144,14 @@ stdenv.mkDerivation rec { genericName = "Web Browser"; comment = meta.description; categories = [ "Network" "WebBrowser" "Security" ]; + mimeTypes = [ + "text/html" + "text/xml" + "application/xhtml+xml" + "application/vnd.mozilla.xul+xml" + "x-scheme-handler/http" + "x-scheme-handler/https" + ]; })]; buildPhase = '' diff --git a/pkgs/applications/networking/browsers/opera/default.nix b/pkgs/applications/networking/browsers/opera/default.nix index d5bd6a3e34b98..c594fa7328adb 100644 --- a/pkgs/applications/networking/browsers/opera/default.nix +++ b/pkgs/applications/networking/browsers/opera/default.nix @@ -51,11 +51,11 @@ let in stdenv.mkDerivation rec { pname = "opera"; - version = "110.0.5130.49"; + version = "111.0.5168.43"; src = fetchurl { url = "${mirror}/${version}/linux/${pname}-stable_${version}_amd64.deb"; - hash = "sha256-ge2ne11BrODlvbu17G6xaLd4w2mIEsErtIaqlLY4os8="; + hash = "sha256-BKtDxKPVu0RUG+DOrfZ1TpJMK/FopfQURTfQGNWE3rc="; }; unpackPhase = "dpkg-deb -x $src ."; diff --git a/pkgs/applications/networking/browsers/tor-browser/default.nix b/pkgs/applications/networking/browsers/tor-browser/default.nix index f19da4505789b..12b0c63b6afe4 100644 --- a/pkgs/applications/networking/browsers/tor-browser/default.nix +++ b/pkgs/applications/networking/browsers/tor-browser/default.nix @@ -163,6 +163,14 @@ stdenv.mkDerivation rec { genericName = "Web Browser"; comment = meta.description; categories = [ "Network" "WebBrowser" "Security" ]; + mimeTypes = [ + "text/html" + "text/xml" + "application/xhtml+xml" + "application/vnd.mozilla.xul+xml" + "x-scheme-handler/http" + "x-scheme-handler/https" + ]; })]; buildPhase = '' diff --git a/pkgs/applications/networking/cluster/helm/plugins/helm-git.nix b/pkgs/applications/networking/cluster/helm/plugins/helm-git.nix index 2619e8bd40788..f05b0e54bf00f 100644 --- a/pkgs/applications/networking/cluster/helm/plugins/helm-git.nix +++ b/pkgs/applications/networking/cluster/helm/plugins/helm-git.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "helm-git"; - version = "0.16.0"; + version = "0.16.1"; src = fetchFromGitHub { owner = "aslafy-z"; repo = pname; rev = "v${version}"; - sha256 = "sha256-/kUKi2BI6LMMUiy6AaYhpPIXU428Or352xYoDYdym8A="; + sha256 = "sha256-XM51pbi3BZWzdGEiQAbGlZcMJYjLEeIiexqlmSR0+AI="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/networking/dnscontrol/default.nix b/pkgs/applications/networking/dnscontrol/default.nix index 832133082f778..c28199c800c2e 100644 --- a/pkgs/applications/networking/dnscontrol/default.nix +++ b/pkgs/applications/networking/dnscontrol/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "dnscontrol"; - version = "4.12.0"; + version = "4.12.1"; src = fetchFromGitHub { owner = "StackExchange"; repo = "dnscontrol"; rev = "v${version}"; - hash = "sha256-W1X/d2Xf31xQWZH7ShH8Y6axhhyTOqxE/EjxNvR6pBU="; + hash = "sha256-Vq8sGlDsFOLApzFqMN49C14X14PGsAHONE8uzcJ1F4A="; }; - vendorHash = "sha256-Dz45h33Rv4Pf5Lo0aok37MNrcbT8f/xrPPkGJMNBo8Y="; + vendorHash = "sha256-KqsMD0WbFDZwVqsIvg0LfOhcEO7oZw7v5XJwyDj9wxw="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/applications/networking/dropbox/cli.nix b/pkgs/applications/networking/dropbox/cli.nix index a922d70cd68fd..f66f0262242b6 100644 --- a/pkgs/applications/networking/dropbox/cli.nix +++ b/pkgs/applications/networking/dropbox/cli.nix @@ -6,7 +6,7 @@ , python3 , dropbox , gtk4 -, gnome +, nautilus , gdk-pixbuf , gobject-introspection }: @@ -51,7 +51,7 @@ stdenv.mkDerivation { buildInputs = [ python3 gtk4 - gnome.nautilus + nautilus ]; configureFlags = [ diff --git a/pkgs/applications/networking/dyndns/cfdyndns/Cargo.lock b/pkgs/applications/networking/dyndns/cfdyndns/Cargo.lock index c7e42c551fe72..208d5e34198bf 100644 --- a/pkgs/applications/networking/dyndns/cfdyndns/Cargo.lock +++ b/pkgs/applications/networking/dyndns/cfdyndns/Cargo.lock @@ -19,9 +19,9 @@ checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" [[package]] name = "aho-corasick" -version = "1.1.1" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea5d730647d4fadd988536d06fecce94b7b4f2a7efdae548f1cf4b63205518ab" +checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0" dependencies = [ "memchr", ] @@ -43,9 +43,9 @@ dependencies = [ [[package]] name = "anstream" -version = "0.5.0" +version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1f58811cfac344940f1a400b6e6231ce35171f614f26439e80f8c1465c5cc0c" +checksum = "2ab91ebe16eb252986481c5b62f6098f3b698a45e34b5b98200cf20dd2484a44" dependencies = [ "anstyle", "anstyle-parse", @@ -57,15 +57,15 @@ dependencies = [ [[package]] name = "anstyle" -version = "1.0.3" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b84bf0a05bbb2a83e5eb6fa36bb6e87baa08193c35ff52bbf6b38d8af2890e46" +checksum = "7079075b41f533b8c61d2a4d073c4676e1f8b249ff94a393b0595db304e0dd87" [[package]] name = "anstyle-parse" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "938874ff5980b03a87c5524b3ae5b59cf99b1d6bc836848df7bc5ada9643c333" +checksum = "317b9a89c1868f5ea6ff1d9539a69f45dffc21ce321ac1fd1160dfa48c8e2140" dependencies = [ "utf8parse", ] @@ -81,9 +81,9 @@ dependencies = [ [[package]] name = "anstyle-wincon" -version = "2.1.0" +version = "3.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58f54d10c6dfa51283a066ceab3ec1ab78d13fae00aa49243a45e4571fb79dfd" +checksum = "f0699d10d2f4d628a98ee7b57b289abbc98ff3bad977cb3152709d4bf2330628" dependencies = [ "anstyle", "windows-sys", @@ -103,7 +103,7 @@ checksum = "bc00ceb34980c03614e35a3a4e218276a0a824e911d07651cd0d858a51e8c0f0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] @@ -158,6 +158,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec" [[package]] +name = "byteorder" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" + +[[package]] name = "bytes" version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -180,6 +186,7 @@ dependencies = [ "clap", "clap-verbosity-flag", "cloudflare", + "local-ip-address", "log", "pretty_env_logger", "public-ip", @@ -209,9 +216,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.4.5" +version = "4.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "824956d0dca8334758a5b7f7e50518d66ea319330cbceedcf76905c2f6ab30e3" +checksum = "d04704f56c2cde07f43e8e2c154b43f216dc5c92fc98ada720177362f953b956" dependencies = [ "clap_builder", "clap_derive", @@ -229,9 +236,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.4.5" +version = "4.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "122ec64120a49b4563ccaedcbea7818d069ed8e9aa6d829b82d8a4128936b2ab" +checksum = "0e231faeaca65ebd1ea3c737966bf858971cd38c3849107aa3ea7de90a804e45" dependencies = [ "anstream", "anstyle", @@ -249,7 +256,7 @@ dependencies = [ "heck", "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] @@ -260,21 +267,18 @@ checksum = "cd7cc57abe963c6d3b9d8be5b06ba7c8957a930305ca90304f24ef040aa6f961" [[package]] name = "cloudflare" -version = "0.10.1" -source = "git+https://github.com/jcgruenhage/cloudflare-rs.git?branch=make-owner-fields-optional#02397fc4211886548a31a0731b240f2e17309de4" +version = "0.12.0" +source = "git+https://github.com/Wyn-Price/cloudflare-rs.git?branch=wyn/zone-details#a6179f8b3b520b17788f39fcd5f103e81a87a890" dependencies = [ - "anyhow", - "async-trait", - "base64 0.13.1", - "cfg-if", "chrono", "http", "percent-encoding", "reqwest", "serde", "serde_json", - "serde_qs", + "serde_urlencoded", "serde_with", + "thiserror", "url", "uuid", ] @@ -346,7 +350,7 @@ dependencies = [ "proc-macro2", "quote", "strsim 0.10.0", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] @@ -368,7 +372,7 @@ checksum = "836a9bbc7ad63342d6d6e7b815ccab164bc77a2d95d84bc3117a8c0d5c98e2d5" dependencies = [ "darling_core 0.20.3", "quote", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] @@ -424,6 +428,12 @@ dependencies = [ ] [[package]] +name = "either" +version = "1.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" + +[[package]] name = "encoding_rs" version = "0.8.33" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -465,26 +475,15 @@ dependencies = [ [[package]] name = "errno" -version = "0.3.3" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "136526188508e25c6fef639d7927dfb3e0e3084488bf202267829cf7fc23dbdd" +checksum = "ac3e13f66a2f95e32a39eaa81f6b95d42878ca0e1db0c7543723dfe12557e860" dependencies = [ - "errno-dragonfly", "libc", "windows-sys", ] [[package]] -name = "errno-dragonfly" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf" -dependencies = [ - "cc", - "libc", -] - -[[package]] name = "fastrand" version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -576,7 +575,7 @@ checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" dependencies = [ "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] @@ -879,9 +878,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] name = "libc" -version = "0.2.148" +version = "0.2.149" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9cdc71e17332e86d2e1d38c1f99edcb6288ee11b815fb1a4b049eaa2114d369b" +checksum = "a08173bc88b7955d1b3145aa561539096c421ac8debde8cbc3612ec635fee29b" [[package]] name = "linked-hash-map" @@ -900,9 +899,21 @@ dependencies = [ [[package]] name = "linux-raw-sys" -version = "0.4.7" +version = "0.4.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a9bad9f94746442c783ca431b22403b519cd7fbeed0533fdd6328b2f2212128" +checksum = "da2479e8c062e40bf0066ffa0bc823de0a9368974af99c9f6df941d2c231e03f" + +[[package]] +name = "local-ip-address" +version = "0.5.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "66357e687a569abca487dc399a9c9ac19beb3f13991ed49f00c144e02cbd42ab" +dependencies = [ + "libc", + "neli", + "thiserror", + "windows-sys", +] [[package]] name = "lock_api" @@ -928,9 +939,9 @@ checksum = "2532096657941c2fea9c289d370a250971c689d4f143798ff67113ec042024a5" [[package]] name = "memchr" -version = "2.6.3" +version = "2.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f232d6ef707e1956a43342693d2a31e72989554d58299d7a88738cc95b0d35c" +checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167" [[package]] name = "mime" @@ -977,6 +988,31 @@ dependencies = [ ] [[package]] +name = "neli" +version = "0.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1100229e06604150b3becd61a4965d5c70f3be1759544ea7274166f4be41ef43" +dependencies = [ + "byteorder", + "libc", + "log", + "neli-proc-macros", +] + +[[package]] +name = "neli-proc-macros" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c168194d373b1e134786274020dae7fc5513d565ea2ebb9bc9ff17ffb69106d4" +dependencies = [ + "either", + "proc-macro2", + "quote", + "serde", + "syn 1.0.109", +] + +[[package]] name = "nibble_vec" version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -987,9 +1023,9 @@ dependencies = [ [[package]] name = "num-traits" -version = "0.2.16" +version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f30b0abd723be7e2ffca1272140fac1a2f084c77ec3e123c192b66af1ee9e6c2" +checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c" dependencies = [ "autocfg", ] @@ -1042,7 +1078,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] @@ -1109,7 +1145,7 @@ checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405" dependencies = [ "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] @@ -1148,9 +1184,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.67" +version = "1.0.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d433d9f1a3e8c1263d9456598b16fec66f4acc9a74dacffd35c7bb09b3a1328" +checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da" dependencies = [ "unicode-ident", ] @@ -1238,9 +1274,9 @@ dependencies = [ [[package]] name = "regex" -version = "1.9.5" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "697061221ea1b4a94a624f67d0ae2bfe4e22b8a17b6a192afb11046542cc8c47" +checksum = "d119d7c7ca818f8a53c300863d4f87566aac09943aef5b355bb83969dae75d87" dependencies = [ "aho-corasick", "memchr", @@ -1250,9 +1286,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.3.8" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2f401f4955220693b56f8ec66ee9c78abffd8d1c4f23dc41a23839eb88f0795" +checksum = "465c6fc0621e4abc4187a2bda0937bfd4f722c2730b29562e19689ea796c9a4b" dependencies = [ "aho-corasick", "memchr", @@ -1261,15 +1297,15 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.7.5" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da" +checksum = "c3cbb081b9784b07cceb8824c8583f86db4814d172ab043f3c23f7dc600bf83d" [[package]] name = "reqwest" -version = "0.11.20" +version = "0.11.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e9ad3fe7488d7e34558a2033d45a0c90b72d97b4f80705666fea71472e2e6a1" +checksum = "046cd98826c46c2ac8ddecae268eb5c2e58628688a5fc7a2643704a73faba95b" dependencies = [ "base64 0.21.4", "bytes", @@ -1292,6 +1328,7 @@ dependencies = [ "serde", "serde_json", "serde_urlencoded", + "system-configuration", "tokio", "tokio-native-tls", "tower-service", @@ -1310,9 +1347,9 @@ checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" [[package]] name = "rustix" -version = "0.38.14" +version = "0.38.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "747c788e9ce8e92b12cd485c49ddf90723550b654b32508f979b71a7b1ecda4f" +checksum = "745ecfa778e66b2b63c88a61cb36e0eea109e803b0b86bf9879fbc77c70e86ed" dependencies = [ "bitflags 2.4.0", "errno", @@ -1382,7 +1419,7 @@ checksum = "4eca7ac642d82aa35b60049a6eccb4be6be75e599bd2e9adb5f875a737654af2" dependencies = [ "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] @@ -1397,17 +1434,6 @@ dependencies = [ ] [[package]] -name = "serde_qs" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8cac3f1e2ca2fe333923a1ae72caca910b98ed0630bb35ef6f8c8517d6e81afa" -dependencies = [ - "percent-encoding", - "serde", - "thiserror", -] - -[[package]] name = "serde_urlencoded" version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1444,7 +1470,7 @@ dependencies = [ "darling 0.20.3", "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] @@ -1507,9 +1533,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.37" +version = "2.0.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7303ef2c05cd654186cb250d29049a24840ca25d2747c25c0381c8d9e2f582e8" +checksum = "e96b79aaa137db8f61e26363a0c9b47d8b4ec75da28b7d1d614c2303e232408b" dependencies = [ "proc-macro2", "quote", @@ -1517,6 +1543,27 @@ dependencies = [ ] [[package]] +name = "system-configuration" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7" +dependencies = [ + "bitflags 1.3.2", + "core-foundation", + "system-configuration-sys", +] + +[[package]] +name = "system-configuration-sys" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a75fb188eb626b924683e3b95e3a48e63551fcfb51949de2f06a9d91dbee93c9" +dependencies = [ + "core-foundation-sys", + "libc", +] + +[[package]] name = "tempfile" version = "3.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1565,7 +1612,7 @@ checksum = "10712f02019e9288794769fba95cd6847df9874d49d871d062172f9dd41bc4cc" dependencies = [ "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] @@ -1613,9 +1660,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.32.0" +version = "1.33.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17ed6077ed6cd6c74735e21f37eb16dc3935f96878b1fe961074089cc80893f9" +checksum = "4f38200e3ef7995e5ef13baec2f432a6da0aa9ac495b2c0e8f3b7eec2c92d653" dependencies = [ "backtrace", "bytes", @@ -1636,7 +1683,7 @@ checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] @@ -1707,7 +1754,7 @@ checksum = "5f4f31f56159e98206da9efd823404b79b6ef3143b4a7ab76e67b1751b25a4ab" dependencies = [ "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] @@ -1826,7 +1873,6 @@ version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "79daa5ed5740825c40b389c5e50312b9c86df53fccd33f281df655642b43869d" dependencies = [ - "getrandom", "serde", ] @@ -1872,7 +1918,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", "wasm-bindgen-shared", ] @@ -1906,7 +1952,7 @@ checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", "wasm-bindgen-backend", "wasm-bindgen-shared", ] diff --git a/pkgs/applications/networking/dyndns/cfdyndns/default.nix b/pkgs/applications/networking/dyndns/cfdyndns/default.nix index aba0262e32588..9659e9777a2e9 100644 --- a/pkgs/applications/networking/dyndns/cfdyndns/default.nix +++ b/pkgs/applications/networking/dyndns/cfdyndns/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cfdyndns"; - version = "0.2.0"; + version = "0.2.1"; src = fetchFromGitHub { owner = "nrdxp"; repo = "cfdyndns"; rev = "v${version}"; - hash = "sha256-iwKMTWLK7pgz8AEmPVBO1bTWrXTokQJ+Z1U4CiiRdho="; + hash = "sha256-OV1YRcZDzYy1FP1Bqp9m+Jxgu6Vc0aWpbAffNcdIW/4="; }; cargoLock.lockFile = ./Cargo.lock; - cargoLock.outputHashes."cloudflare-0.10.1" = "sha256-AJW4AQ34EDhxf7zMhFY2rqq5n4IaSVWJAYi+7jXEUVo="; + cargoLock.outputHashes."cloudflare-0.12.0" = "sha256-8/C5mHN7g/k3q9BzFC9TIKMlgmBsmvC4xWVEoz1Sz9c="; cargoLock.outputHashes."public-ip-0.2.2" = "sha256-DDdh90EAo3Ppsym4AntczFuiAQo4/QQ9TEPJjMB1XzY="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/applications/networking/instant-messengers/alfaview/default.nix b/pkgs/applications/networking/instant-messengers/alfaview/default.nix index d8c4089eee728..5e1ad5cddbd05 100644 --- a/pkgs/applications/networking/instant-messengers/alfaview/default.nix +++ b/pkgs/applications/networking/instant-messengers/alfaview/default.nix @@ -75,7 +75,7 @@ stdenv.mkDerivation rec { homepage = "https://alfaview.com"; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; - maintainers = with maintainers; [ hexchen ]; + maintainers = with maintainers; [ ]; mainProgram = "alfaview"; platforms = [ "x86_64-linux" ]; }; diff --git a/pkgs/applications/networking/instant-messengers/cinny/default.nix b/pkgs/applications/networking/instant-messengers/cinny/default.nix index f3ae1665fe3d9..6b3f5904e9757 100644 --- a/pkgs/applications/networking/instant-messengers/cinny/default.nix +++ b/pkgs/applications/networking/instant-messengers/cinny/default.nix @@ -60,7 +60,7 @@ buildNpmPackage rec { meta = with lib; { description = "Yet another Matrix client for the web"; homepage = "https://cinny.in/"; - maintainers = with maintainers; [ abbe ashkitten ]; + maintainers = with maintainers; [ abbe ]; license = licenses.agpl3Only; platforms = platforms.all; }; diff --git a/pkgs/applications/networking/instant-messengers/dino/fix-compile-new-vala-c.diff b/pkgs/applications/networking/instant-messengers/dino/fix-compile-new-vala-c.diff deleted file mode 100644 index b8277f32afc9c..0000000000000 --- a/pkgs/applications/networking/instant-messengers/dino/fix-compile-new-vala-c.diff +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/plugins/gpgme-vala/vapi/gpgme_public.vapi b/plugins/gpgme-vala/vapi/gpgme_public.vapi -index bcf12569..b32efd03 100644 ---- a/plugins/gpgme-vala/vapi/gpgme_public.vapi -+++ b/plugins/gpgme-vala/vapi/gpgme_public.vapi -@@ -22,9 +22,9 @@ public class Key { - public string issuer_name; - public string chain_id; - public Validity owner_trust; -- [CCode(array_null_terminated = true)] -+ [CCode(array_length = false, array_null_terminated = true)] - public SubKey[] subkeys; -- [CCode(array_null_terminated = true)] -+ [CCode(array_length = false, array_null_terminated = true)] - public UserID[] uids; - public KeylistMode keylist_mode; - // public string fpr; // requires gpgme >= 1.7.0 diff --git a/pkgs/applications/networking/instant-messengers/fluffychat/default.nix b/pkgs/applications/networking/instant-messengers/fluffychat/default.nix index 66d7abc0822d0..5d49787837855 100644 --- a/pkgs/applications/networking/instant-messengers/fluffychat/default.nix +++ b/pkgs/applications/networking/instant-messengers/fluffychat/default.nix @@ -7,7 +7,7 @@ , flutter319 , pulseaudio , makeDesktopItem -, gnome +, zenity , targetFlutterPlatform ? "linux" }: @@ -50,7 +50,7 @@ flutter319.buildFlutterApplication (rec { runtimeDependencies = [ pulseaudio ]; - extraWrapProgramArgs = "--prefix PATH : ${gnome.zenity}/bin"; + extraWrapProgramArgs = "--prefix PATH : ${zenity}/bin"; env.NIX_LDFLAGS = "-rpath-link ${libwebrtcRpath}"; diff --git a/pkgs/applications/networking/instant-messengers/gajim/default.nix b/pkgs/applications/networking/instant-messengers/gajim/default.nix index 7f273359de4e7..ef57fe10ac815 100644 --- a/pkgs/applications/networking/instant-messengers/gajim/default.nix +++ b/pkgs/applications/networking/instant-messengers/gajim/default.nix @@ -1,7 +1,7 @@ { lib, fetchurl, gettext, wrapGAppsHook3 # Native dependencies -, python3, gtk3, gobject-introspection, gnome +, python3, gtk3, gobject-introspection, adwaita-icon-theme , gtksourceview4 , glib-networking @@ -31,7 +31,8 @@ python3.pkgs.buildPythonApplication rec { format = "pyproject"; buildInputs = [ - gtk3 gnome.adwaita-icon-theme + gtk3 + adwaita-icon-theme gtksourceview4 glib-networking ] ++ lib.optionals enableJingle [ farstream gstreamer gst-plugins-base gst-libav gst-plugins-good libnice ] diff --git a/pkgs/applications/networking/instant-messengers/neosay/default.nix b/pkgs/applications/networking/instant-messengers/neosay/default.nix index 46ea22da5db81..b6fbbd68401f1 100644 --- a/pkgs/applications/networking/instant-messengers/neosay/default.nix +++ b/pkgs/applications/networking/instant-messengers/neosay/default.nix @@ -23,6 +23,6 @@ buildGoModule rec { mainProgram = "neosay"; homepage = "https://github.com/donuts-are-good/neosay"; license = licenses.mit; - maintainers = with maintainers; [ janik ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/applications/networking/instant-messengers/qq/default.nix b/pkgs/applications/networking/instant-messengers/qq/default.nix index cbb23559ae61f..0167146e57853 100644 --- a/pkgs/applications/networking/instant-messengers/qq/default.nix +++ b/pkgs/applications/networking/instant-messengers/qq/default.nix @@ -1,4 +1,5 @@ { alsa-lib +, libuuid , cups , dpkg , fetchurl @@ -86,7 +87,7 @@ stdenv.mkDerivation { makeShellWrapper $out/opt/QQ/qq $out/bin/qq \ --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" \ --prefix LD_PRELOAD : "${lib.makeLibraryPath [ libssh2 ]}/libssh2.so.1" \ - --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ libGL ]}" \ + --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ libGL libuuid]}" \ --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" \ --add-flags ${lib.escapeShellArg commandLineArgs} \ "''${gappsWrapperArgs[@]}" @@ -115,6 +116,6 @@ stdenv.mkDerivation { platforms = [ "x86_64-linux" "aarch64-linux" ]; license = licenses.unfree; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - maintainers = with lib.maintainers; [ fee1-dead ]; + maintainers = with lib.maintainers; [ fee1-dead bot-wxt1221 ]; }; } diff --git a/pkgs/applications/networking/instant-messengers/qq/sources.nix b/pkgs/applications/networking/instant-messengers/qq/sources.nix index 4fa23026a9571..4c5fadb9ef193 100644 --- a/pkgs/applications/networking/instant-messengers/qq/sources.nix +++ b/pkgs/applications/networking/instant-messengers/qq/sources.nix @@ -1,9 +1,9 @@ # Generated by ./update.sh - do not update manually! -# Last updated: 2024-06-07 +# Last updated: 2024-06-17 { version = "3.2.9"; - amd64_url = "https://dldir1.qq.com/qqfile/qq/QQNT/Linux/QQ_3.2.9_240606_amd64_01.deb"; - arm64_url = "https://dldir1.qq.com/qqfile/qq/QQNT/Linux/QQ_3.2.9_240606_arm64_01.deb"; - arm64_hash = "sha256-wZyaIkJdGDvIw8PrRlOiKpo3rdeELlxYBPyS6llbL4w="; - amd64_hash = "sha256-DcQWwep4p4aWUAoBNQ9Ge1QBiCxk6BhcziTDSHmRpgY="; + amd64_url = "https://dldir1.qq.com/qqfile/qq/QQNT/Linux/QQ_3.2.9_240617_amd64_01.deb"; + arm64_url = "https://dldir1.qq.com/qqfile/qq/QQNT/Linux/QQ_3.2.9_240617_arm64_01.deb"; + arm64_hash = "sha256-qC3eUc3Hs1nolZJhAds0Qx+tAlD/AR3scGxmcA8dtEw="; + amd64_hash = "sha256-ofoelAzbuCgxSHsZciWSVkDFDv+zsW+AzZqjeNlaja0="; } diff --git a/pkgs/applications/networking/instant-messengers/rocketchat-desktop/default.nix b/pkgs/applications/networking/instant-messengers/rocketchat-desktop/default.nix index 4411fbc6e9bc9..6db3418789b2c 100644 --- a/pkgs/applications/networking/instant-messengers/rocketchat-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/rocketchat-desktop/default.nix @@ -4,11 +4,11 @@ let in stdenv.mkDerivation rec { pname = "rocketchat-desktop"; - version = "3.9.15"; + version = "4.0.0"; src = fetchurl { url = "https://github.com/RocketChat/Rocket.Chat.Electron/releases/download/${version}/rocketchat-${version}-linux-amd64.deb"; - hash = "sha256-fMnr7RCNoYVyV+CzKOIqaGd6T6+3fJxMuPjNdFAZdX0="; + hash = "sha256-ryfYaePwL4W6x8sKlxACadLUvXEqyqJ0enlSnmVmpUo="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix b/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix index 99ff0b412e2cd..ea3f0b672939d 100644 --- a/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix +++ b/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, dpkg -, alsa-lib, atk, cairo, cups, curl, dbus, expat, fontconfig, freetype, gdk-pixbuf, glib, glibc, gnome +, alsa-lib, atk, cairo, cups, curl, dbus, expat, fontconfig, freetype, gdk-pixbuf, glib, glibc, gnome-keyring , gtk3, libappindicator-gtk3, libnotify, libpulseaudio, libsecret, libv4l, nspr, nss, pango, systemd, wrapGAppsHook3, xorg , at-spi2-atk, libuuid, at-spi2-core, libdrm, mesa, libxkbcommon, libxshmfence }: @@ -30,7 +30,7 @@ let gtk3 libappindicator-gtk3 - gnome.gnome-keyring + gnome-keyring libnotify libpulseaudio diff --git a/pkgs/applications/networking/instant-messengers/teams-for-linux/default.nix b/pkgs/applications/networking/instant-messengers/teams-for-linux/default.nix index f59b9c3774bc6..b5ac402921d2a 100644 --- a/pkgs/applications/networking/instant-messengers/teams-for-linux/default.nix +++ b/pkgs/applications/networking/instant-messengers/teams-for-linux/default.nix @@ -100,7 +100,7 @@ stdenv.mkDerivation (finalAttrs: { mainProgram = "teams-for-linux"; homepage = "https://github.com/IsmaelMartinez/teams-for-linux"; license = lib.licenses.gpl3Only; - maintainers = with lib.maintainers; [ muscaln lilyinstarlight qjoly chvp ]; + maintainers = with lib.maintainers; [ muscaln qjoly chvp ]; platforms = lib.platforms.unix; broken = stdenv.isDarwin; }; diff --git a/pkgs/applications/networking/mailreaders/astroid/default.nix b/pkgs/applications/networking/mailreaders/astroid/default.nix index e56697be4f995..a1e6177f72783 100644 --- a/pkgs/applications/networking/mailreaders/astroid/default.nix +++ b/pkgs/applications/networking/mailreaders/astroid/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, pkg-config, gnome, gmime3, webkitgtk, ronn +{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, pkg-config, adwaita-icon-theme, gmime3, webkitgtk, ronn , libsass, notmuch, boost, wrapGAppsHook3, glib-networking, protobuf , gtkmm3, libpeas, gsettings-desktop-schemas, gobject-introspection, python3 @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { buildInputs = [ gtkmm3 gmime3 webkitgtk libsass libpeas python3 - notmuch boost gsettings-desktop-schemas gnome.adwaita-icon-theme + notmuch boost gsettings-desktop-schemas adwaita-icon-theme glib-networking protobuf vim ]; diff --git a/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix b/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix index 0fe2e4796efc4..f605aa3617b2c 100644 --- a/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix +++ b/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix @@ -23,6 +23,7 @@ , libical , db , sqlite +, adwaita-icon-theme , gnome , gnome-desktop , librsvg @@ -62,7 +63,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - gnome.adwaita-icon-theme + adwaita-icon-theme bogofilter db evolution-data-server diff --git a/pkgs/applications/networking/mailreaders/evolution/evolution/wrapper.nix b/pkgs/applications/networking/mailreaders/evolution/evolution/wrapper.nix index 6b65211d0b4b3..bae0bdb2fd454 100644 --- a/pkgs/applications/networking/mailreaders/evolution/evolution/wrapper.nix +++ b/pkgs/applications/networking/mailreaders/evolution/evolution/wrapper.nix @@ -1,8 +1,8 @@ -{ lib, makeWrapper, symlinkJoin, gnome, plugins }: +{ lib, makeWrapper, symlinkJoin, evolution-data-server, plugins }: symlinkJoin { name = "evolution-with-plugins"; - paths = [ gnome.evolution-data-server ] ++ plugins; + paths = [ evolution-data-server ] ++ plugins; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/networking/mailreaders/tutanota-desktop/default.nix b/pkgs/applications/networking/mailreaders/tutanota-desktop/default.nix index 3e09dbc9b8786..bf0b709abdcf1 100644 --- a/pkgs/applications/networking/mailreaders/tutanota-desktop/default.nix +++ b/pkgs/applications/networking/mailreaders/tutanota-desktop/default.nix @@ -5,11 +5,11 @@ appimageTools.wrapType2 rec { pname = "tutanota-desktop"; - version = "230.240603.0"; + version = "232.240626.0"; src = fetchurl { url = "https://github.com/tutao/tutanota/releases/download/tutanota-desktop-release-${version}/tutanota-desktop-linux.AppImage"; - hash = "sha256-pgRqlaUbEDEAd4frooSloeiNEX02VESPhqIzRIuQshI="; + hash = "sha256-LsLhsWrH+hRcx7hjx2GbtDMEf1oAygSwtsCxpmnZOfE="; }; extraPkgs = pkgs: [ pkgs.libsecret ]; diff --git a/pkgs/applications/networking/netmaker/default.nix b/pkgs/applications/networking/netmaker/default.nix index 58e48e69fc4f6..e1392d00f4ad5 100644 --- a/pkgs/applications/networking/netmaker/default.nix +++ b/pkgs/applications/networking/netmaker/default.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "netmaker"; - version = "0.24.1"; + version = "0.24.2"; src = fetchFromGitHub { owner = "gravitl"; repo = pname; rev = "v${version}"; - hash = "sha256-Me1hux+Y3EiT9vlP4+4019JPcDEW0d5byFO6YIfKbbw="; + hash = "sha256-UR5hUV7HTDaEbltQikgKfQypPXVee46PLP5bBEDFSsg="; }; - vendorHash = "sha256-BlZYXLvB05BTI2gMke8I2ob4jYSrixfpBUqKzNcHisI="; + vendorHash = "sha256-roEw8A7TFLoUR7BY4r53HNB1b7IbKwgg7x0e63UGpu8="; inherit subPackages; diff --git a/pkgs/applications/networking/novnc/default.nix b/pkgs/applications/networking/novnc/default.nix index c0fa9afdb2430..5a8866e26be4e 100644 --- a/pkgs/applications/networking/novnc/default.nix +++ b/pkgs/applications/networking/novnc/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "novnc"; - version = "1.4.0"; + version = "1.5.0"; src = fetchFromGitHub { owner = "novnc"; repo = "noVNC"; rev = "v${version}"; - sha256 = "sha256-G7Rtv7pQFR9UrzhYXDyBf+FRqtjo5NAXU7m/HeXhI1k="; + sha256 = "sha256-3Q87bYsC824/8A85Kxdqlm+InuuR/D/HjVrYTJZfE9Y="; }; patches = with python3.pkgs; [ diff --git a/pkgs/applications/networking/remote/remmina/default.nix b/pkgs/applications/networking/remote/remmina/default.nix index d80850edd4466..7096c6265b654 100644 --- a/pkgs/applications/networking/remote/remmina/default.nix +++ b/pkgs/applications/networking/remote/remmina/default.nix @@ -9,7 +9,7 @@ , openssl, gsettings-desktop-schemas, json-glib, libsodium, webkitgtk_4_1, harfbuzz , wayland # The themes here are soft dependencies; only icons are missing without them. -, gnome +, adwaita-icon-theme , withKf5Wallet ? stdenv.isLinux, libsForQt5 , withLibsecret ? stdenv.isLinux , withVte ? true @@ -47,7 +47,7 @@ stdenv.mkDerivation (finalAttrs: { libsoup_3 spice-protocol spice-gtk libepoxy at-spi2-core - openssl gnome.adwaita-icon-theme json-glib libsodium + openssl adwaita-icon-theme json-glib libsodium harfbuzz python3 wayland ] ++ lib.optionals stdenv.isLinux [ fuse3 libappindicator-gtk3 libdbusmenu-gtk3 webkitgtk_4_1 ] diff --git a/pkgs/applications/networking/sniffers/qtwirediff/default.nix b/pkgs/applications/networking/sniffers/qtwirediff/default.nix index 8ed53ec0771f9..655626d07e262 100644 --- a/pkgs/applications/networking/sniffers/qtwirediff/default.nix +++ b/pkgs/applications/networking/sniffers/qtwirediff/default.nix @@ -50,6 +50,6 @@ stdenv.mkDerivation { mainProgram = "qtwirediff"; homepage = "https://github.com/aaptel/qtwirediff"; license = lib.licenses.gpl3Plus; - maintainers = with lib.maintainers; [ janik ]; + maintainers = with lib.maintainers; [ ]; }; } diff --git a/pkgs/applications/networking/sync/celeste/default.nix b/pkgs/applications/networking/sync/celeste/default.nix index 7eef4f4510051..fe2d7b07acc82 100644 --- a/pkgs/applications/networking/sync/celeste/default.nix +++ b/pkgs/applications/networking/sync/celeste/default.nix @@ -2,7 +2,7 @@ , stdenv , rustPlatform , fetchFromGitHub -, substituteAll +, darwin , just , pkg-config , wrapGAppsHook4 @@ -20,16 +20,16 @@ rustPlatform.buildRustPackage rec { pname = "celeste"; - version = "0.8.1"; + version = "0.8.3"; src = fetchFromGitHub { owner = "hwittenborn"; repo = "celeste"; rev = "v${version}"; - hash = "sha256-fJK3UTa5NS+dSsjnqZtRN3HmHQ1bYU2jepkJ5tchYD4="; + hash = "sha256-Yj2PvAlAkwLaSE27KnzEmiRAD5K/YVGbF4+N3uhDVT8="; }; - cargoHash = "sha256-/0w52bh9CsBoMTJsnWuEAQNgQzf92mbzh53H4iQYswc="; + cargoHash = "sha256-nlYkFgm5r6nAbJvtrXW2VxzVYq1GrSs8bzHYWOglL1c="; postPatch = '' pushd $cargoDepsCopy/librclone-sys @@ -66,8 +66,15 @@ rustPlatform.buildRustPackage rec { libadwaita librclone pango + ] ++ lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.Foundation + darwin.apple_sdk.frameworks.Security ]; + env.NIX_CFLAGS_COMPILE = toString (lib.optionals stdenv.isDarwin [ + "-Wno-error=incompatible-function-pointer-types" + ]); + preFixup = '' gappsWrapperArgs+=( --prefix PATH : "${lib.makeBinPath [ rclone ]}" diff --git a/pkgs/applications/networking/trayscale/default.nix b/pkgs/applications/networking/trayscale/default.nix index 936ed487b25c3..7df9b7224408e 100644 --- a/pkgs/applications/networking/trayscale/default.nix +++ b/pkgs/applications/networking/trayscale/default.nix @@ -11,16 +11,16 @@ buildGoModule rec { pname = "trayscale"; - version = "0.12.4"; + version = "0.12.5"; src = fetchFromGitHub { owner = "DeedleFake"; repo = "trayscale"; rev = "v${version}"; - hash = "sha256-quy1maeC1ebVzMvN+JzKf8AmMbipju9vvdTU03SyNnc="; + hash = "sha256-EwfICUKlDnlkD1vxR1jpNybvUG4mOHfRRgk8VB9T+hs="; }; - vendorHash = "sha256-lGjJLqEGBFd2aYm82xrDfLK90Mcrhb7bMtXSNZpp/bM="; + vendorHash = "sha256-lEGFOBR0d8IfqBYdrC8awRhGcPqt0y4oOWU+xu4ClfE="; subPackages = [ "cmd/trayscale" ]; @@ -46,7 +46,7 @@ buildGoModule rec { ''; meta = with lib; { - changelog = "https://github.com/DeedleFake/trayscale/releases/tag/${version}"; + changelog = "https://github.com/DeedleFake/trayscale/releases/tag/${src.rev}"; description = "Unofficial GUI wrapper around the Tailscale CLI client"; homepage = "https://github.com/DeedleFake/trayscale"; license = licenses.mit; diff --git a/pkgs/applications/office/autokey/default.nix b/pkgs/applications/office/autokey/default.nix index d05c83cb19992..91700299400a2 100644 --- a/pkgs/applications/office/autokey/default.nix +++ b/pkgs/applications/office/autokey/default.nix @@ -6,7 +6,7 @@ , gtksourceview3 , libappindicator-gtk3 , libnotify -, gnome +, zenity , wmctrl }: @@ -41,7 +41,7 @@ python3Packages.buildPythonApplication rec { ]; runtimeDeps = [ - gnome.zenity + zenity wmctrl ]; diff --git a/pkgs/applications/office/endeavour/default.nix b/pkgs/applications/office/endeavour/default.nix index 851eab538818d..806e024985772 100644 --- a/pkgs/applications/office/endeavour/default.nix +++ b/pkgs/applications/office/endeavour/default.nix @@ -6,7 +6,7 @@ , pkg-config , wrapGAppsHook4 , gettext -, gnome +, adwaita-icon-theme , glib , gtk4 , wayland @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { libpeas gnome-online-accounts gsettings-desktop-schemas - gnome.adwaita-icon-theme + adwaita-icon-theme # Plug-ins evolution-data-server-gtk4 # eds diff --git a/pkgs/applications/office/gnumeric/default.nix b/pkgs/applications/office/gnumeric/default.nix index d9b376a1962e7..74c9e571375fc 100644 --- a/pkgs/applications/office/gnumeric/default.nix +++ b/pkgs/applications/office/gnumeric/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, pkg-config, intltool, perlPackages -, goffice, gnome, wrapGAppsHook3, gtk3, bison, python3Packages +, goffice, gnome, adwaita-icon-theme, wrapGAppsHook3, gtk3, bison, python3Packages , itstool }: @@ -20,7 +20,7 @@ in stdenv.mkDerivation rec { # ToDo: optional libgda, introspection? buildInputs = [ - goffice gtk3 gnome.adwaita-icon-theme + goffice gtk3 adwaita-icon-theme python pygobject3 ] ++ (with perlPackages; [ perl XMLParser ]); diff --git a/pkgs/applications/office/grisbi/default.nix b/pkgs/applications/office/grisbi/default.nix index 846b4180625ab..911ed9715320d 100644 --- a/pkgs/applications/office/grisbi/default.nix +++ b/pkgs/applications/office/grisbi/default.nix @@ -7,7 +7,7 @@ , intltool , wrapGAppsHook3 , libsoup -, gnome +, adwaita-icon-theme }: stdenv.mkDerivation rec { @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { libgsf libofx libsoup - gnome.adwaita-icon-theme + adwaita-icon-theme ]; meta = with lib; { diff --git a/pkgs/applications/office/homebank/default.nix b/pkgs/applications/office/homebank/default.nix index 000942ff68bdd..5c21eeb721408 100644 --- a/pkgs/applications/office/homebank/default.nix +++ b/pkgs/applications/office/homebank/default.nix @@ -1,5 +1,5 @@ { fetchurl, lib, stdenv, gtk, pkg-config, libofx, intltool, wrapGAppsHook3 -, libsoup_3, gnome }: +, libsoup_3, adwaita-icon-theme }: stdenv.mkDerivation rec { pname = "homebank"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ pkg-config wrapGAppsHook3 intltool ]; - buildInputs = [ gtk libofx libsoup_3 gnome.adwaita-icon-theme]; + buildInputs = [ gtk libofx libsoup_3 adwaita-icon-theme]; meta = with lib; { description = "Free, easy, personal accounting for everyone"; diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix index d679b168e24ff..30e5f7864cd03 100644 --- a/pkgs/applications/office/libreoffice/default.nix +++ b/pkgs/applications/office/libreoffice/default.nix @@ -86,7 +86,7 @@ , glm , gst_all_1 , gdb -, gnome +, adwaita-icon-theme , glib , ncurses , libepoxy @@ -311,7 +311,7 @@ in stdenv.mkDerivation (finalAttrs: { gettext glib glm - gnome.adwaita-icon-theme + adwaita-icon-theme gperf gpgme graphite2 diff --git a/pkgs/applications/office/paperwork/paperwork-gtk.nix b/pkgs/applications/office/paperwork/paperwork-gtk.nix index 2393ac0ece553..c9b9efeba8906 100644 --- a/pkgs/applications/office/paperwork/paperwork-gtk.nix +++ b/pkgs/applications/office/paperwork/paperwork-gtk.nix @@ -2,7 +2,7 @@ , python3Packages , gtk3 , cairo -, gnome +, adwaita-icon-theme , librsvg , xvfb-run , dbus @@ -69,7 +69,7 @@ python3Packages.buildPythonApplication rec { ln -s $i $site/icon/out; done - export XDG_DATA_DIRS=$XDG_DATA_DIRS:${gnome.adwaita-icon-theme}/share + export XDG_DATA_DIRS=$XDG_DATA_DIRS:${adwaita-icon-theme}/share # build the user manual PATH=$out/bin:$PATH PAPERWORK_TEST_DOCUMENTS=${sample_docs} make data for i in src/paperwork_gtk/model/help/out/*.pdf; do @@ -89,7 +89,7 @@ python3Packages.buildPythonApplication rec { ] ++ documentation_deps; buildInputs = [ - gnome.adwaita-icon-theme + adwaita-icon-theme libnotify librsvg gtk3 diff --git a/pkgs/applications/office/pdfmm/default.nix b/pkgs/applications/office/pdfmm/default.nix index 5be76fa51685f..9f4f17f893c9b 100644 --- a/pkgs/applications/office/pdfmm/default.nix +++ b/pkgs/applications/office/pdfmm/default.nix @@ -3,7 +3,7 @@ , fetchFromGitHub , ghostscript , locale -, gnome +, zenity , gnused , lib , resholve @@ -35,7 +35,7 @@ resholve.mkDerivation rec { coreutils ghostscript locale - gnome.zenity + zenity gnused ]; fake = { @@ -43,7 +43,7 @@ resholve.mkDerivation rec { external = [ "xmessage" ]; }; execer = [ - "cannot:${gnome.zenity}/bin/zenity" + "cannot:${zenity}/bin/zenity" ]; keep."$toutLu" = true; }; diff --git a/pkgs/applications/office/qownnotes/default.nix b/pkgs/applications/office/qownnotes/default.nix index 53563d72d6584..8003317fc2fb4 100644 --- a/pkgs/applications/office/qownnotes/default.nix +++ b/pkgs/applications/office/qownnotes/default.nix @@ -21,14 +21,14 @@ let pname = "qownnotes"; appname = "QOwnNotes"; - version = "24.6.3"; + version = "24.7.0"; in stdenv.mkDerivation { inherit pname version; src = fetchurl { url = "https://github.com/pbek/QOwnNotes/releases/download/v${version}/qownnotes-${version}.tar.xz"; - hash = "sha256-UdWyS5DalnGDoNEOx8d9MglKpJeqOXY1mTgLl3r/9gY="; + hash = "sha256-yDWm6d3kZwBEo0i7CSni4EOA4H+lAuYSzmANi/q7HxU="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/office/tryton/default.nix b/pkgs/applications/office/tryton/default.nix index 27d50caedde05..d2db214a4ef88 100644 --- a/pkgs/applications/office/tryton/default.nix +++ b/pkgs/applications/office/tryton/default.nix @@ -7,7 +7,7 @@ , atk , gtk3 , gtkspell3 -, gnome +, adwaita-icon-theme , glib , goocanvas2 , gdk-pixbuf @@ -47,7 +47,7 @@ python3Packages.buildPythonApplication rec { atk gdk-pixbuf glib - gnome.adwaita-icon-theme + adwaita-icon-theme goocanvas2 fontconfig freetype diff --git a/pkgs/applications/office/zim/default.nix b/pkgs/applications/office/zim/default.nix index 98d83f53f2d33..0f4017dbbc07c 100644 --- a/pkgs/applications/office/zim/default.nix +++ b/pkgs/applications/office/zim/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, python3Packages, gtk3, gobject-introspection, wrapGAppsHook3, gnome }: +{ lib, stdenv, fetchurl, python3Packages, gtk3, gobject-introspection, wrapGAppsHook3, adwaita-icon-theme }: # TODO: Declare configuration options for the following optional dependencies: # - File stores: hg, git, bzr @@ -14,7 +14,7 @@ python3Packages.buildPythonApplication rec { hash = "sha256-QIkNsFsWeNHEcXhGHHZyJDMMW2lNvdwMJLGxeCZaLdI="; }; - buildInputs = [ gtk3 gnome.adwaita-icon-theme ]; + buildInputs = [ gtk3 adwaita-icon-theme ]; propagatedBuildInputs = with python3Packages; [ pyxdg pygobject3 ]; nativeBuildInputs = [ gobject-introspection wrapGAppsHook3 ]; @@ -22,7 +22,7 @@ python3Packages.buildPythonApplication rec { preFixup = '' makeWrapperArgs+=(--prefix XDG_DATA_DIRS : $out/share) - makeWrapperArgs+=(--prefix XDG_DATA_DIRS : ${gnome.adwaita-icon-theme}/share) + makeWrapperArgs+=(--prefix XDG_DATA_DIRS : ${adwaita-icon-theme}/share) makeWrapperArgs+=(--argv0 $out/bin/.zim-wrapped) makeWrapperArgs+=("''${gappsWrapperArgs[@]}") ''; diff --git a/pkgs/applications/office/zotero/default.nix b/pkgs/applications/office/zotero/default.nix index b31ce7f8c2de7..78a335a1b907c 100644 --- a/pkgs/applications/office/zotero/default.nix +++ b/pkgs/applications/office/zotero/default.nix @@ -30,7 +30,7 @@ , libXrender , libXt , libnotify -, gnome +, adwaita-icon-theme , libGLU , libGL , nspr @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ wrapGAppsHook3 ]; buildInputs = - [ gsettings-desktop-schemas glib gtk3 gnome.adwaita-icon-theme dconf ]; + [ gsettings-desktop-schemas glib gtk3 adwaita-icon-theme dconf ]; dontConfigure = true; dontBuild = true; diff --git a/pkgs/applications/radio/anytone-emu/default.nix b/pkgs/applications/radio/anytone-emu/default.nix index eee3375294db3..337038fd32c2b 100644 --- a/pkgs/applications/radio/anytone-emu/default.nix +++ b/pkgs/applications/radio/anytone-emu/default.nix @@ -36,7 +36,7 @@ rustPlatform.buildRustPackage rec { description = "Tiny emulator for AnyTone radios"; homepage = "https://github.com/hmatuschek/anytone-emu"; license = licenses.gpl3Only; - maintainers = with maintainers; [ janik ]; + maintainers = with maintainers; [ ]; platforms = platforms.linux; mainProgram = "anytone-emu"; }; diff --git a/pkgs/applications/radio/qdmr/default.nix b/pkgs/applications/radio/qdmr/default.nix index ed3fa1715f75c..6217a169ef256 100644 --- a/pkgs/applications/radio/qdmr/default.nix +++ b/pkgs/applications/radio/qdmr/default.nix @@ -67,7 +67,7 @@ stdenv.mkDerivation rec { description = "GUI application and command line tool for programming DMR radios"; homepage = "https://dm3mat.darc.de/qdmr/"; license = lib.licenses.gpl3Plus; - maintainers = with lib.maintainers; [ janik _0x4A6F ]; + maintainers = with lib.maintainers; [ _0x4A6F ]; platforms = lib.platforms.linux; }; } diff --git a/pkgs/applications/science/electronics/kicad/default.nix b/pkgs/applications/science/electronics/kicad/default.nix index 1cec011fae33f..4dd8fa743121b 100644 --- a/pkgs/applications/science/electronics/kicad/default.nix +++ b/pkgs/applications/science/electronics/kicad/default.nix @@ -7,7 +7,7 @@ , callPackage , callPackages -, gnome +, adwaita-icon-theme , dconf , gtk3 , wxGTK32 @@ -197,7 +197,7 @@ stdenv.mkDerivation rec { makeWrapperArgs = with passthru.libraries; [ "--prefix XDG_DATA_DIRS : ${base}/share" "--prefix XDG_DATA_DIRS : ${hicolor-icon-theme}/share" - "--prefix XDG_DATA_DIRS : ${gnome.adwaita-icon-theme}/share" + "--prefix XDG_DATA_DIRS : ${adwaita-icon-theme}/share" "--prefix XDG_DATA_DIRS : ${gtk3}/share/gsettings-schemas/${gtk3.name}" "--prefix XDG_DATA_DIRS : ${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}" # wrapGAppsHook3 did these two as well, no idea if it matters... diff --git a/pkgs/applications/science/electronics/magic-vlsi/default.nix b/pkgs/applications/science/electronics/magic-vlsi/default.nix index 0be742f76e3c6..28b1b91ae1a24 100644 --- a/pkgs/applications/science/electronics/magic-vlsi/default.nix +++ b/pkgs/applications/science/electronics/magic-vlsi/default.nix @@ -13,11 +13,11 @@ stdenv.mkDerivation rec { pname = "magic-vlsi"; - version = "8.3.483"; + version = "8.3.486"; src = fetchurl { url = "http://opencircuitdesign.com/magic/archive/magic-${version}.tgz"; - sha256 = "sha256-JyawlH/zUTJ7fGf63zHvZ3q8AYRwFELwh+63RN9IkBA="; + sha256 = "sha256-RLAA97roY41imjxehEFzF+peLmrS+rTQkVua+8dxKDY="; }; nativeBuildInputs = [ python3 ]; diff --git a/pkgs/applications/science/logic/coq/default.nix b/pkgs/applications/science/logic/coq/default.nix index 8f0f88461e653..d07ebd90ec7d1 100644 --- a/pkgs/applications/science/logic/coq/default.nix +++ b/pkgs/applications/science/logic/coq/default.nix @@ -11,7 +11,7 @@ , ocamlPackages_4_14 , ncurses , buildIde ? null # default is true for Coq < 8.14 and false for Coq >= 8.14 -, glib, gnome, wrapGAppsHook3, makeDesktopItem, copyDesktopItems +, glib, adwaita-icon-theme, wrapGAppsHook3, makeDesktopItem, copyDesktopItems , csdp ? null , version, coq-version ? null }@args: @@ -154,7 +154,7 @@ self = stdenv.mkDerivation { buildInputs = [ ncurses ] ++ optionals buildIde (if coqAtLeast "8.10" - then [ ocamlPackages.lablgtk3-sourceview3 glib gnome.adwaita-icon-theme ] + then [ ocamlPackages.lablgtk3-sourceview3 glib adwaita-icon-theme ] else [ ocamlPackages.lablgtk ]) ; diff --git a/pkgs/applications/science/logic/lean4/default.nix b/pkgs/applications/science/logic/lean4/default.nix index 2ec05098f4078..2c63edc1e7d49 100644 --- a/pkgs/applications/science/logic/lean4/default.nix +++ b/pkgs/applications/science/logic/lean4/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "lean4"; - version = "4.8.0"; + version = "4.9.0"; src = fetchFromGitHub { owner = "leanprover"; repo = "lean4"; rev = "v${finalAttrs.version}"; - hash = "sha256-R75RrAQb/tRTtMvy/ddLl1KQaA7V71nocvjIS9geMrg="; + hash = "sha256-wi7outnKpz60to6Z7MSGAKK6COxmpJo6iu6Re86jqlo="; }; postPatch = '' diff --git a/pkgs/applications/science/math/qalculate-qt/default.nix b/pkgs/applications/science/math/qalculate-qt/default.nix index 5b56fe7581a3a..ba47acb80e03f 100644 --- a/pkgs/applications/science/math/qalculate-qt/default.nix +++ b/pkgs/applications/science/math/qalculate-qt/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "qalculate"; repo = "qalculate-qt"; rev = "v${finalAttrs.version}"; - hash = "sha256-jlzuLLEFi72ElVBJSRikrMMaHIVWKRUAWGyeqzuj7xw="; + hash = "sha256-suJUPeWLX+da0lQdvsDgSBRCBYmog+s4+n/w0PnPijs="; }; nativeBuildInputs = [ qmake intltool pkg-config qttools wrapQtAppsHook ]; diff --git a/pkgs/applications/science/math/wxmaxima/default.nix b/pkgs/applications/science/math/wxmaxima/default.nix index db2ff0c4a8444..2a6225eab7653 100644 --- a/pkgs/applications/science/math/wxmaxima/default.nix +++ b/pkgs/applications/science/math/wxmaxima/default.nix @@ -6,7 +6,7 @@ , gettext , maxima , wxGTK -, gnome +, adwaita-icon-theme , glib }: @@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs:{ wxGTK maxima # So it won't embed svg files into headers. - gnome.adwaita-icon-theme + adwaita-icon-theme # So it won't crash under Sway. glib ]; diff --git a/pkgs/applications/science/robotics/qgroundcontrol/default.nix b/pkgs/applications/science/robotics/qgroundcontrol/default.nix index 25b1f4e5d5ce6..a999a719e2e40 100644 --- a/pkgs/applications/science/robotics/qgroundcontrol/default.nix +++ b/pkgs/applications/science/robotics/qgroundcontrol/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { pname = "qgroundcontrol"; - version = "4.3.0"; + version = "4.4.0"; propagatedBuildInputs = [ qtbase qtcharts qtlocation qtserialport qtsvg qtquickcontrols2 @@ -67,7 +67,7 @@ stdenv.mkDerivation rec { owner = "mavlink"; repo = pname; rev = "v${version}"; - sha256 = "sha256-a0+cpT413qi88PvaWQPxKABHfK7vbPE7B42n84n/SAk="; + sha256 = "sha256-LKERjHoIgJ4cF1MjB5nVW3FB/DrmKP4Xj58avsDobhc="; fetchSubmodules = true; }; diff --git a/pkgs/applications/version-management/deepgit/default.nix b/pkgs/applications/version-management/deepgit/default.nix index feffc31b759b1..acaf26b2c5c88 100644 --- a/pkgs/applications/version-management/deepgit/default.nix +++ b/pkgs/applications/version-management/deepgit/default.nix @@ -1,7 +1,7 @@ { copyDesktopItems , fetchurl , glib -, gnome +, adwaita-icon-theme , gtk3 , jre , lib @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - gnome.adwaita-icon-theme + adwaita-icon-theme gtk3 jre ]; diff --git a/pkgs/applications/version-management/git-machete/default.nix b/pkgs/applications/version-management/git-machete/default.nix index e8efa81e217b2..033b1c1416a1f 100644 --- a/pkgs/applications/version-management/git-machete/default.nix +++ b/pkgs/applications/version-management/git-machete/default.nix @@ -12,13 +12,13 @@ buildPythonApplication rec { pname = "git-machete"; - version = "3.26.0"; + version = "3.26.1"; src = fetchFromGitHub { owner = "virtuslab"; repo = pname; rev = "v${version}"; - hash = "sha256-6q0XunfzURfcvce/BLtJhDeI1fPusN+07S1SegLDkwY="; + hash = "sha256-QcsBe1v2qiPR7svl5mQ/aro/X2PbpkJHNHnNAnQE9yA="; }; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/applications/version-management/gitkraken/default.nix b/pkgs/applications/version-management/gitkraken/default.nix index c1373346b6af0..70bd9ab46c4f6 100644 --- a/pkgs/applications/version-management/gitkraken/default.nix +++ b/pkgs/applications/version-management/gitkraken/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, libXcomposite, libgnome-keyring, makeWrapper, udev, curlWithGnuTls, alsa-lib -, libXfixes, atk, gtk3, libXrender, pango, gnome, cairo, freetype, fontconfig +, libXfixes, atk, gtk3, libXrender, pango, adwaita-icon-theme, cairo, freetype, fontconfig , libX11, libXi, libxcb, libXext, libXcursor, glib, libXScrnSaver, libxkbfile, libXtst , nss, nspr, cups, fetchzip, expat, gdk-pixbuf, libXdamage, libXrandr, dbus , makeDesktopItem, openssl, wrapGAppsHook3, makeShellWrapper, at-spi2-atk, at-spi2-core, libuuid @@ -107,7 +107,7 @@ let }) ]; nativeBuildInputs = [ copyDesktopItems (wrapGAppsHook3.override { makeWrapper = makeShellWrapper; }) ]; - buildInputs = [ gtk3 gnome.adwaita-icon-theme ]; + buildInputs = [ gtk3 adwaita-icon-theme ]; # avoid double-wrapping dontWrapGApps = true; diff --git a/pkgs/applications/version-management/gitlab/data.json b/pkgs/applications/version-management/gitlab/data.json index 41fe2756ff47e..e46f414f83d69 100644 --- a/pkgs/applications/version-management/gitlab/data.json +++ b/pkgs/applications/version-management/gitlab/data.json @@ -1,15 +1,15 @@ { - "version": "16.11.5", - "repo_hash": "1bhg6glb644m55m50q2kp0azf3c4if11vymjn823rhs68jw3jqcp", - "yarn_hash": "03q7h8dyssvsr91klr1jk65f5jz1ac71lx0114zq9c7awxrgp6kq", + "version": "17.1.1", + "repo_hash": "1ivaicgz4lgl6l06fnr9wfpn71b88yd22ryi3qn2r40rg3vjl1vf", + "yarn_hash": "1xyc3c3hhfp5lgrpacj4gsfbql3wn0brdp16ivnqg4n0csjlizq7", "owner": "gitlab-org", "repo": "gitlab", - "rev": "v16.11.5-ee", + "rev": "v17.1.1-ee", "passthru": { - "GITALY_SERVER_VERSION": "16.11.5", - "GITLAB_PAGES_VERSION": "16.11.5", - "GITLAB_SHELL_VERSION": "14.35.0", - "GITLAB_ELASTICSEARCH_INDEXER_VERSION": "4.8.0", - "GITLAB_WORKHORSE_VERSION": "16.11.5" + "GITALY_SERVER_VERSION": "17.1.1", + "GITLAB_PAGES_VERSION": "17.1.1", + "GITLAB_SHELL_VERSION": "14.36.0", + "GITLAB_ELASTICSEARCH_INDEXER_VERSION": "5.0.0", + "GITLAB_WORKHORSE_VERSION": "17.1.1" } } diff --git a/pkgs/applications/version-management/gitlab/default.nix b/pkgs/applications/version-management/gitlab/default.nix index 144fd40edd9c6..f43ade4af22a3 100644 --- a/pkgs/applications/version-management/gitlab/default.nix +++ b/pkgs/applications/version-management/gitlab/default.nix @@ -1,10 +1,37 @@ -{ stdenv, lib, fetchFromGitLab, bundlerEnv -, ruby_3_1, tzdata, git, nettools, nixosTests, nodejs, openssl -, defaultGemConfig, buildRubyGem -, gitlabEnterprise ? false, callPackage, yarn -, fixup-yarn-lock, replace, file, cacert, fetchYarnDeps, makeWrapper, pkg-config -, cargo, rustc, rustPlatform -, icu, zlib, which +{ bundlerEnv +, cacert +, defaultGemConfig +, fetchFromGitLab +, fetchYarnDeps +, fixup-yarn-lock +, git +, gitlabEnterprise ? false +, lib +, makeWrapper +, nettools +, nixosTests +, nodejs +, replace +, ruby_3_2 +, stdenv +, tzdata +, yarn + +# gem dependencies: +# gitlab-glfm-markdown +, buildRubyGem, cargo, rustc, rustPlatform + +# gpgme +, pkg-config + +# openssl +, openssl + +# ruby-magic +, file + +# static-holmes +, icu, which, zlib }: let @@ -20,7 +47,7 @@ let rubyEnv = bundlerEnv rec { name = "gitlab-env-${version}"; - ruby = ruby_3_1; + ruby = ruby_3_2; gemdir = ./rubyEnv; gemset = import (gemdir + "/gemset.nix") src; gemConfig = defaultGemConfig // { @@ -50,7 +77,7 @@ let cp Cargo.lock $out ''; }; - hash = "sha256-SncgYYnoSaWA4kQWonoXXbSMu1mnwTyhdLXFagqgH+o="; + hash = "sha256-VYjCYUikORuXx27OYWyumBxeHw9aj/S1wcr9vLIsXeo="; }; dontBuild = false; @@ -75,12 +102,17 @@ let find $out -type f -name .rustc_info.json -delete ''; }; + static_holmes = attrs: { - buildInputs = [ which icu zlib ]; + nativeBuildInputs = [ + icu + which + zlib.dev + ]; }; }; groups = [ - "default" "unicorn" "ed25519" "metrics" "development" "puma" "test" "kerberos" + "default" "unicorn" "ed25519" "metrics" "development" "puma" "test" "kerberos" "opentelemetry" ]; # N.B. omniauth_oauth2_generic and apollo_upload_server both provide a # `console` executable. diff --git a/pkgs/applications/version-management/gitlab/gitaly/default.nix b/pkgs/applications/version-management/gitlab/gitaly/default.nix index c978c1884577b..eb7499058674f 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/default.nix +++ b/pkgs/applications/version-management/gitlab/gitaly/default.nix @@ -5,7 +5,7 @@ }: let - version = "16.11.5"; + version = "17.1.1"; package_version = "v${lib.versions.major version}"; gitaly_package = "gitlab.com/gitlab-org/gitaly/${package_version}"; @@ -17,10 +17,10 @@ let owner = "gitlab-org"; repo = "gitaly"; rev = "v${version}"; - hash = "sha256-iBLRhkFPsopy6m3y+9Qc+v3FCbV5nOWMs+DMwW+JiSk="; + hash = "sha256-c9gLVVRNSkl4RI7LN0UZc6CAzcLIbWGIvsjoiaPdUKY="; }; - vendorHash = "sha256-WCZF7XVW6J1zyPx8e/Mcn+HmHElAUGcEICxiF5HLzBg="; + vendorHash = "sha256-yOm0cPC8v6L3gkekUMpf5U86XzpnmeoLTgZSFBb02BA="; ldflags = [ "-X ${gitaly_package}/internal/version.version=${version}" "-X ${gitaly_package}/internal/version.moduleVersion=${version}" ]; diff --git a/pkgs/applications/version-management/gitlab/gitlab-elasticsearch-indexer/default.nix b/pkgs/applications/version-management/gitlab/gitlab-elasticsearch-indexer/default.nix index 6bbd3c555f53c..b2b29cf15a35f 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-elasticsearch-indexer/default.nix +++ b/pkgs/applications/version-management/gitlab/gitlab-elasticsearch-indexer/default.nix @@ -2,17 +2,17 @@ buildGoModule rec { pname = "gitlab-elasticsearch-indexer"; - version = "4.8.0"; + version = "5.0.0"; # nixpkgs-update: no auto update src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-elasticsearch-indexer"; rev = "v${version}"; - sha256 = "sha256-JHUDZmGlZGyvsB4wgAnNyIEtosZG4ajZ4eBGumH97ZI="; + sha256 = "sha256-856lRCW4+FIiXjOzMkfoYws6SMIKXWVtvr+867QEjCk="; }; - vendorHash = "sha256-ztRKXoXncY66XJVwlPn4ShLWTD4Cr0yYHoUdquJItDM="; + vendorHash = "sha256-2XdbTqNGt97jQUJmE06D6M/VxF9+vJAwMM/fF8MP2oo="; buildInputs = [ icu ]; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/applications/version-management/gitlab/gitlab-pages/default.nix b/pkgs/applications/version-management/gitlab/gitlab-pages/default.nix index 3cb270e2cae02..655bfe02ca0e3 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-pages/default.nix +++ b/pkgs/applications/version-management/gitlab/gitlab-pages/default.nix @@ -2,17 +2,17 @@ buildGoModule rec { pname = "gitlab-pages"; - version = "16.11.5"; + version = "17.1.1"; # nixpkgs-update: no auto update src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-pages"; rev = "v${version}"; - hash = "sha256-mJKzaFICE7f4aIFGeV/4PbbQkaxwmRd9QO2pRXpM2ag="; + hash = "sha256-cwFqzKXDWuIESdDjuPYos73Ly+zd+J20aJJi0RiRdus="; }; - vendorHash = "sha256-WrR4eZRAuYkhr7ZqP7OXqJ6uwvxzn+t+3OdBNcNaq0M="; + vendorHash = "sha256-uVpkCl5rSAtg6gDnL3d11AaOlGNpS2xaPtJrthUNbfE="; subPackages = [ "." ]; meta = with lib; { diff --git a/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix b/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix index e5c669ba3e648..698be436be8f9 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix +++ b/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix @@ -2,24 +2,23 @@ buildGoModule rec { pname = "gitlab-shell"; - version = "14.35.0"; + version = "14.36.0"; # nixpkgs-update: no auto update src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-shell"; rev = "v${version}"; - sha256 = "sha256-WyIUdDKPKQE1Ddz40WaMA5lDs37OyDuZl/6/nKDYY/8="; + sha256 = "sha256-SclRIIUZm1D5fYDrTH1L8opQpxxIoi+SrG2GO7wtScU="; }; buildInputs = [ ruby libkrb5 ]; patches = [ ./remove-hardcoded-locations.patch - ./go-mod-tidy.patch ]; - vendorHash = "sha256-7TUHD14/aCs3lkpTy5CH9WYUc1Ud6rDFCx+JgsINvxU="; + vendorHash = "sha256-Ebs9HnHhK4y6+vwLRvVwQnG8I7Gk6leBBezjkc+bhJo="; postInstall = '' cp -r "$NIX_BUILD_TOP/source"/bin/* $out/bin diff --git a/pkgs/applications/version-management/gitlab/gitlab-shell/go-mod-tidy.patch b/pkgs/applications/version-management/gitlab/gitlab-shell/go-mod-tidy.patch deleted file mode 100644 index f7ce8cf0575e5..0000000000000 --- a/pkgs/applications/version-management/gitlab/gitlab-shell/go-mod-tidy.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/go.mod b/go.mod -index 513ccc40..30ba0f6e 100644 ---- a/go.mod -+++ b/go.mod -@@ -1,6 +1,6 @@ - module gitlab.com/gitlab-org/gitlab-shell/v14 - --go 1.20 -+go 1.21 - - require ( - github.com/charmbracelet/git-lfs-transfer v0.1.1-0.20240402115927-f0b226fa61cc diff --git a/pkgs/applications/version-management/gitlab/gitlab-shell/remove-hardcoded-locations.patch b/pkgs/applications/version-management/gitlab/gitlab-shell/remove-hardcoded-locations.patch index 8bbfd97e00efb..8fdc546cbf36a 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-shell/remove-hardcoded-locations.patch +++ b/pkgs/applications/version-management/gitlab/gitlab-shell/remove-hardcoded-locations.patch @@ -28,8 +28,8 @@ index c6f2422..fb0426b 100644 } func (k *KeyLine) ToString() string { -- command := fmt.Sprintf("%s %s-%s", path.Join(k.Config.RootDir, executable.BinDir, executable.GitlabShell), k.Prefix, k.Id) -+ command := fmt.Sprintf("%s %s-%s", path.Join("/run/current-system/sw/bin", executable.GitlabShell), k.Prefix, k.Id) +- command := fmt.Sprintf("%s %s-%s", path.Join(k.Config.RootDir, executable.BinDir, executable.GitlabShell), k.Prefix, k.ID) ++ command := fmt.Sprintf("%s %s-%s", path.Join("/run/current-system/sw/bin", executable.GitlabShell), k.Prefix, k.ID) return fmt.Sprintf(`command="%s",%s %s`, command, SshOptions, k.Value) } diff --git a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix index 682376e40a111..2b1677e1b8dc5 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix +++ b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix @@ -5,7 +5,7 @@ in buildGoModule rec { pname = "gitlab-workhorse"; - version = "16.11.5"; + version = "17.1.1"; # nixpkgs-update: no auto update src = fetchFromGitLab { @@ -17,7 +17,7 @@ buildGoModule rec { sourceRoot = "${src.name}/workhorse"; - vendorHash = "sha256-44EtpjYsxYqDH035/ruPfshfejiO011HybKD2inp8bU="; + vendorHash = "sha256-7iit/YJHxvrFYfnppwPox+gEAHea7/eq83vMPojWUWU="; buildInputs = [ git ]; ldflags = [ "-X main.Version=${version}" ]; doCheck = false; diff --git a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile index dacf2473597cb..d8f93f9280b18 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile +++ b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile @@ -24,7 +24,7 @@ gem 'bundler-checksum', '~> 0.1.0', path: 'vendor/gems/bundler-checksum', requir # https://gitlab.com/gitlab-org/gitlab/-/issues/375713 # # See https://docs.gitlab.com/ee/development/gemfile.html#upgrade-rails for guidelines when upgrading Rails -gem 'rails', '~> 7.0.8.1' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'rails', '~> 7.0.8.4' # rubocop:todo Gemfile/MissingFeatureCategory gem 'activerecord-gitlab', path: 'gems/activerecord-gitlab' # rubocop:todo Gemfile/MissingFeatureCategory @@ -49,12 +49,12 @@ gem 'responders', '~> 3.0' # rubocop:todo Gemfile/MissingFeatureCategory gem 'sprockets', '~> 3.7.0' # rubocop:todo Gemfile/MissingFeatureCategory -gem 'view_component', '~> 3.11.0' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'view_component', '~> 3.12.1' # rubocop:todo Gemfile/MissingFeatureCategory # Supported DBs -gem 'pg', '~> 1.5.6' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'pg', '~> 1.5.6', feature_category: :database -gem 'neighbor', '~> 0.2.3' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'neighbor', '~> 0.3.2', feature_category: :duo_chat gem 'rugged', '~> 1.6' # rubocop:todo Gemfile/MissingFeatureCategory @@ -64,6 +64,9 @@ gem 'marginalia', '~> 1.11.1' # rubocop:todo Gemfile/MissingFeatureCategory # Authorization gem 'declarative_policy', '~> 1.1.0' # rubocop:todo Gemfile/MissingFeatureCategory +# For source code paths mapping +gem 'coverband', '6.1.2', require: false, feature_category: :shared + # Authentication libraries gem 'devise', '~> 4.9.3', feature_category: :system_access gem 'devise-pbkdf2-encryptable', '~> 0.0.0', path: 'vendor/gems/devise-pbkdf2-encryptable' # rubocop:todo Gemfile/MissingFeatureCategory @@ -75,17 +78,13 @@ gem 'ruby-saml', '~> 1.15.0' # rubocop:todo Gemfile/MissingFeatureCategory gem 'omniauth', '~> 2.1.0' # rubocop:todo Gemfile/MissingFeatureCategory gem 'omniauth-auth0', '~> 3.1' # rubocop:todo Gemfile/MissingFeatureCategory gem 'omniauth-azure-activedirectory-v2', '~> 2.0' # rubocop:todo Gemfile/MissingFeatureCategory -gem 'omniauth-azure-oauth2', '~> 0.0.9', path: 'vendor/gems/omniauth-azure-oauth2' # See gem README.md # rubocop:todo Gemfile/MissingFeatureCategory -gem 'omniauth-dingtalk-oauth2', '~> 1.0' # rubocop:todo Gemfile/MissingFeatureCategory gem 'omniauth-alicloud', '~> 3.0.0' # rubocop:todo Gemfile/MissingFeatureCategory -gem 'omniauth-facebook', '~> 4.0.0' # rubocop:todo Gemfile/MissingFeatureCategory gem 'omniauth-github', '2.0.1' # rubocop:todo Gemfile/MissingFeatureCategory gem 'omniauth-gitlab', '~> 4.0.0', path: 'vendor/gems/omniauth-gitlab' # See vendor/gems/omniauth-gitlab/README.md # rubocop:todo Gemfile/MissingFeatureCategory gem 'omniauth-google-oauth2', '~> 1.1' # rubocop:todo Gemfile/MissingFeatureCategory gem 'omniauth-oauth2-generic', '~> 0.2.2' # rubocop:todo Gemfile/MissingFeatureCategory gem 'omniauth-saml', '~> 2.1.0' # rubocop:todo Gemfile/MissingFeatureCategory gem 'omniauth-shibboleth-redux', '~> 2.0', require: 'omniauth-shibboleth' # rubocop:todo Gemfile/MissingFeatureCategory -gem 'omniauth-twitter', '~> 1.4' # rubocop:todo Gemfile/MissingFeatureCategory gem 'omniauth_crowd', '~> 2.4.0', path: 'vendor/gems/omniauth_crowd' # See vendor/gems/omniauth_crowd/README.md # rubocop:todo Gemfile/MissingFeatureCategory gem 'omniauth_openid_connect', '~> 0.6.1' # rubocop:todo Gemfile/MissingFeatureCategory # Locked until Ruby 3.0 upgrade since upgrading will pull in an updated net-smtp gem. @@ -134,17 +133,17 @@ gem 'net-ldap', '~> 0.17.1' # rubocop:todo Gemfile/MissingFeatureCategory # API gem 'grape', '~> 2.0.0', feature_category: :api -gem 'grape-entity', '~> 0.10.2', feature_category: :api -gem 'grape-swagger', '~> 2.0.2', group: [:development, :test], feature_category: :api +gem 'grape-entity', '~> 1.0.1', feature_category: :api +gem 'grape-swagger', '~> 2.1.0', group: [:development, :test], feature_category: :api gem 'grape-swagger-entity', '~> 0.5.1', group: [:development, :test], feature_category: :api gem 'grape-path-helpers', '~> 2.0.1', feature_category: :api gem 'rack-cors', '~> 2.0.1', require: 'rack/cors' # rubocop:todo Gemfile/MissingFeatureCategory # GraphQL API -gem 'graphql', '~> 2.2.5', feature_category: :api +gem 'graphql', '~> 2.3.4', feature_category: :api gem 'graphql-docs', '~> 4.0.0', group: [:development, :test], feature_category: :api gem 'graphiql-rails', '~> 1.8.0', feature_category: :api -gem 'apollo_upload_server', '~> 2.1.5', feature_category: :api +gem 'apollo_upload_server', '~> 2.1.6', feature_category: :api gem 'graphlient', '~> 0.6.0', feature_category: :importers # Used by BulkImport feature (group::import) # Generate Fake data @@ -167,7 +166,7 @@ gem 'fog-aws', '~> 3.18' # rubocop:todo Gemfile/MissingFeatureCategory # Locked until fog-google resolves https://github.com/fog/fog-google/issues/421. # Also see config/initializers/fog_core_patch.rb. gem 'fog-core', '= 2.1.0' # rubocop:todo Gemfile/MissingFeatureCategory -gem 'fog-google', '~> 1.19', require: 'fog/google' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'fog-google', '~> 1.24.1', require: 'fog/google' # rubocop:todo Gemfile/MissingFeatureCategory gem 'fog-local', '~> 0.8' # rubocop:todo Gemfile/MissingFeatureCategory # NOTE: # the fog-aliyun gem since v0.4 pulls in aliyun-sdk transitively, which monkey-patches @@ -207,9 +206,9 @@ gem 'seed-fu', '~> 2.3.7' # rubocop:todo Gemfile/MissingFeatureCategory gem 'elasticsearch-model', '~> 7.2' # rubocop:todo Gemfile/MissingFeatureCategory gem 'elasticsearch-rails', '~> 7.2', require: 'elasticsearch/rails/instrumentation' # rubocop:todo Gemfile/MissingFeatureCategory gem 'elasticsearch-api', '7.13.3' # rubocop:todo Gemfile/MissingFeatureCategory -gem 'aws-sdk-core', '~> 3.191.6' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'aws-sdk-core', '~> 3.197.0' # rubocop:todo Gemfile/MissingFeatureCategory gem 'aws-sdk-cloudformation', '~> 1' # rubocop:todo Gemfile/MissingFeatureCategory -gem 'aws-sdk-s3', '~> 1.146.1' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'aws-sdk-s3', '~> 1.151.0' # rubocop:todo Gemfile/MissingFeatureCategory gem 'faraday_middleware-aws-sigv4', '~>0.3.0' # rubocop:todo Gemfile/MissingFeatureCategory gem 'typhoeus', '~> 1.4.0' # Used with Elasticsearch to support http keep-alive connections # rubocop:todo Gemfile/MissingFeatureCategory @@ -230,7 +229,7 @@ gem 'asciidoctor-kroki', '~> 0.8.0', require: false # rubocop:todo Gemfile/Missi gem 'rouge', '~> 4.2.0' # rubocop:todo Gemfile/MissingFeatureCategory gem 'truncato', '~> 0.7.12' # rubocop:todo Gemfile/MissingFeatureCategory gem 'nokogiri', '~> 1.16' # rubocop:todo Gemfile/MissingFeatureCategory -gem 'gitlab-glfm-markdown', '~> 0.0.14', feature_category: :team_planning +gem 'gitlab-glfm-markdown', '~> 0.0.17', feature_category: :team_planning # Calendar rendering gem 'icalendar' # rubocop:todo Gemfile/MissingFeatureCategory @@ -256,9 +255,12 @@ gem 'state_machines-activerecord', '~> 0.8.0' # rubocop:todo Gemfile/MissingFeat gem 'acts-as-taggable-on', '~> 10.0' # rubocop:todo Gemfile/MissingFeatureCategory # Background jobs -gem 'sidekiq', path: 'vendor/gems/sidekiq-7.1.6', require: 'sidekiq' # rubocop:todo Gemfile/MissingFeatureCategory -gem 'sidekiq-cron', '~> 1.12.0', feature_category: :shared -gem 'gitlab-sidekiq-fetcher', path: 'vendor/gems/sidekiq-reliable-fetch', require: 'sidekiq-reliable-fetch' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'sidekiq', path: 'vendor/gems/sidekiq-7.1.6', require: 'sidekiq', feature_category: :scalability +gem 'sidekiq-cron', '~> 1.12.0', feature_category: :scalability +gem 'gitlab-sidekiq-fetcher', + path: 'vendor/gems/sidekiq-reliable-fetch', + require: 'sidekiq-reliable-fetch', + feature_category: :scalability # Cron Parser gem 'fugit', '~> 1.8.1' # rubocop:todo Gemfile/MissingFeatureCategory @@ -277,7 +279,7 @@ gem 're2', '2.7.0' # rubocop:todo Gemfile/MissingFeatureCategory # Misc -gem 'semver_dialects', '~> 2.0', '>= 2.0.2', feature_category: :static_application_security_testing +gem 'semver_dialects', '~> 3.0', feature_category: :software_composition_analysis gem 'version_sorter', '~> 2.3' # rubocop:todo Gemfile/MissingFeatureCategory gem 'csv_builder', path: 'gems/csv_builder' # rubocop:todo Gemfile/MissingFeatureCategory @@ -288,13 +290,13 @@ gem 'js_regex', '~> 3.8' # rubocop:todo Gemfile/MissingFeatureCategory gem 'device_detector' # rubocop:todo Gemfile/MissingFeatureCategory # Redis -gem 'redis-namespace', '~> 1.10.0', feature_category: :redis -gem 'redis', '~> 5.0.0', feature_category: :redis -gem 'redis-clustering', '~> 5.0.0', feature_category: :redis +gem 'redis-namespace', '~> 1.11.0', feature_category: :redis +gem 'redis', '~> 5.2.0', feature_category: :redis +gem 'redis-clustering', '~> 5.2.0', feature_category: :redis gem 'connection_pool', '~> 2.4' # rubocop:todo Gemfile/MissingFeatureCategory # Redis session store -gem 'redis-actionpack', '~> 5.4.0' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'redis-actionpack', '~> 5.4.0', feature_category: :redis # Discord integration gem 'discordrb-webhooks', '~> 3.5', require: false, feature_category: :integrations @@ -353,16 +355,15 @@ gem 'gon', '~> 6.4.0' # rubocop:todo Gemfile/MissingFeatureCategory gem 'request_store', '~> 1.5.1' # rubocop:todo Gemfile/MissingFeatureCategory gem 'base32', '~> 0.3.0' # rubocop:todo Gemfile/MissingFeatureCategory -gem 'gitlab-license', '~> 2.4', feature_category: :shared +gem 'gitlab-license', '~> 2.5', feature_category: :shared # Protect against bruteforcing gem 'rack-attack', '~> 6.7.0' # rubocop:todo Gemfile/MissingFeatureCategory # Sentry integration -gem 'sentry-raven', '~> 3.1', feature_category: :error_tracking -gem 'sentry-ruby', '~> 5.10.0', feature_category: :error_tracking -gem 'sentry-rails', '~> 5.10.0', feature_category: :error_tracking -gem 'sentry-sidekiq', '~> 5.10.0', feature_category: :error_tracking +gem 'sentry-ruby', '~> 5.17.3', feature_category: :error_tracking +gem 'sentry-rails', '~> 5.17.3', feature_category: :error_tracking +gem 'sentry-sidekiq', '~> 5.17.3', feature_category: :error_tracking # PostgreSQL query parsing # @@ -372,19 +373,18 @@ gem 'gitlab-schema-validation', path: 'gems/gitlab-schema-validation' # rubocop: gem 'gitlab-http', path: 'gems/gitlab-http' # rubocop:todo Gemfile/MissingFeatureCategory gem 'premailer-rails', '~> 1.10.3' # rubocop:todo Gemfile/MissingFeatureCategory - -gem 'gitlab-labkit', '~> 0.35.1' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'gitlab-labkit', '~> 0.36.0', feature_category: :shared gem 'thrift', '>= 0.16.0' # rubocop:todo Gemfile/MissingFeatureCategory # I18n -gem 'rails-i18n', '~> 7.0', feature_category: :internationalization +gem 'rails-i18n', '~> 7.0', '>= 7.0.9', feature_category: :internationalization gem 'gettext_i18n_rails', '~> 1.12.0', feature_category: :internationalization gem 'gettext', '~> 3.4', '>= 3.4.9', require: false, group: [:development, :test], feature_category: :internationalization -gem 'batch-loader', '~> 2.0.1' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'batch-loader', '~> 2.0.5' # rubocop:todo Gemfile/MissingFeatureCategory # Perf bar gem 'peek', '~> 1.1' # rubocop:todo Gemfile/MissingFeatureCategory @@ -399,6 +399,36 @@ gem 'snowplow-tracker', '~> 0.8.0' # rubocop:todo Gemfile/MissingFeatureCategory gem 'webrick', '~> 1.8.1', require: false # rubocop:todo Gemfile/MissingFeatureCategory gem 'prometheus-client-mmap', '~> 1.1', '>= 1.1.1', require: 'prometheus/client' # rubocop:todo Gemfile/MissingFeatureCategory +# OpenTelemetry +group :opentelemetry do + # Core OpenTelemetry gems + gem 'opentelemetry-sdk', feature_category: :tooling + gem 'opentelemetry-exporter-otlp', feature_category: :tooling + + # OpenTelemetry gems selected from full set in `opentelemetry-instrumentation-all` metagem + gem 'opentelemetry-instrumentation-active_support', feature_category: :tooling + gem 'opentelemetry-instrumentation-action_pack', feature_category: :tooling + gem 'opentelemetry-instrumentation-active_job', feature_category: :tooling + gem 'opentelemetry-instrumentation-active_record', feature_category: :tooling + gem 'opentelemetry-instrumentation-action_view', feature_category: :tooling + gem 'opentelemetry-instrumentation-aws_sdk', feature_category: :tooling + gem 'opentelemetry-instrumentation-http', feature_category: :tooling + gem 'opentelemetry-instrumentation-concurrent_ruby', feature_category: :tooling + gem 'opentelemetry-instrumentation-ethon', feature_category: :tooling + gem 'opentelemetry-instrumentation-excon', feature_category: :tooling + gem 'opentelemetry-instrumentation-faraday', feature_category: :tooling + gem 'opentelemetry-instrumentation-grape', feature_category: :tooling + gem 'opentelemetry-instrumentation-graphql', feature_category: :tooling + gem 'opentelemetry-instrumentation-http_client', feature_category: :tooling + gem 'opentelemetry-instrumentation-net_http', feature_category: :tooling + gem 'opentelemetry-instrumentation-pg', feature_category: :tooling + gem 'opentelemetry-instrumentation-rack', feature_category: :tooling + gem 'opentelemetry-instrumentation-rails', feature_category: :tooling + gem 'opentelemetry-instrumentation-rake', feature_category: :tooling + gem 'opentelemetry-instrumentation-redis', feature_category: :tooling + gem 'opentelemetry-instrumentation-sidekiq', feature_category: :tooling +end + gem 'warning', '~> 1.3.0' # rubocop:todo Gemfile/MissingFeatureCategory group :development do @@ -407,7 +437,7 @@ group :development do gem 'solargraph', '~> 0.47.2', require: false # rubocop:todo Gemfile/MissingFeatureCategory gem 'letter_opener_web', '~> 2.0.0' # rubocop:todo Gemfile/MissingFeatureCategory - gem 'lookbook', '~> 2.2', '>= 2.2.2' # rubocop:todo Gemfile/MissingFeatureCategory + gem 'lookbook', '~> 2.3' # rubocop:todo Gemfile/MissingFeatureCategory # Better errors handler gem 'better_errors', '~> 2.10.1' # rubocop:todo Gemfile/MissingFeatureCategory @@ -416,19 +446,20 @@ group :development do gem 'listen', '~> 3.7' # rubocop:todo Gemfile/MissingFeatureCategory - gem 'ruby-lsp', "~> 0.14.6", require: false, feature_category: :tooling + gem 'ruby-lsp', "~> 0.16.7", require: false, feature_category: :tooling - gem 'ruby-lsp-rails', "~> 0.3.3", feature_category: :tooling + gem 'ruby-lsp-rails', "~> 0.3.6", feature_category: :tooling gem 'ruby-lsp-rspec', "~> 0.1.10", require: false, feature_category: :tooling - gem 'gdk-toogle', '~> 0.9', require: 'toogle', feature_category: :tooling + gem 'gdk-toogle', '~> 0.9', '>= 0.9.5', require: 'toogle', feature_category: :tooling end group :development, :test do gem 'deprecation_toolkit', '~> 1.5.1', require: false # rubocop:todo Gemfile/MissingFeatureCategory gem 'bullet', '~> 7.1.2' # rubocop:todo Gemfile/MissingFeatureCategory - gem 'parser', '~> 3.3', '>= 3.3.0.5' # rubocop:todo Gemfile/MissingFeatureCategory + # Locked on 3.3.0.5 until inspec-core is updated in Omnibus: https://github.com/inspec/inspec/pull/7030 + gem 'parser', '= 3.3.0.5', feature_category: :shared gem 'pry-byebug' # rubocop:todo Gemfile/MissingFeatureCategory gem 'pry-rails', '~> 0.3.9' # rubocop:todo Gemfile/MissingFeatureCategory gem 'pry-shell', '~> 0.6.4' # rubocop:todo Gemfile/MissingFeatureCategory @@ -436,8 +467,8 @@ group :development, :test do gem 'awesome_print', require: false # rubocop:todo Gemfile/MissingFeatureCategory gem 'database_cleaner-active_record', '~> 2.1.0', feature_category: :database - gem 'factory_bot_rails', '~> 6.4.3' # rubocop:todo Gemfile/MissingFeatureCategory gem 'rspec-rails', '~> 6.1.1', feature_category: :shared + gem 'factory_bot_rails', '~> 6.4.3', feature_category: :tooling # Prevent occasions where minitest is not bundled in packaged versions of ruby (see #3826) gem 'minitest', '~> 5.11.0' # rubocop:todo Gemfile/MissingFeatureCategory @@ -445,8 +476,8 @@ group :development, :test do gem 'spring', '~> 4.1.0' # rubocop:todo Gemfile/MissingFeatureCategory gem 'spring-commands-rspec', '~> 1.0.4' # rubocop:todo Gemfile/MissingFeatureCategory - gem 'gitlab-styles', '~> 11.0.0', feature_category: :tooling - gem 'haml_lint', '~> 0.53', feature_category: :tooling + gem 'gitlab-styles', '~> 12.0.1', feature_category: :tooling + gem 'haml_lint', '~> 0.58', feature_category: :tooling gem 'bundler-audit', '~> 0.9.1', require: false # rubocop:todo Gemfile/MissingFeatureCategory @@ -455,7 +486,7 @@ group :development, :test do gem 'benchmark-memory', '~> 0.1', require: false # rubocop:todo Gemfile/MissingFeatureCategory # Profiling data from CI/CD pipelines - gem 'influxdb-client', '~> 2.9', require: false # rubocop:todo Gemfile/MissingFeatureCategory + gem 'influxdb-client', '~> 3.1', require: false, feature_category: :tooling gem 'knapsack', '~> 1.22.0', feature_category: :tooling gem 'crystalball', '~> 0.7.0', require: false, feature_category: :tooling @@ -506,12 +537,12 @@ group :test do gem 'rspec-retry', '~> 0.6.2', feature_category: :tooling gem 'rspec_profiling', '~> 0.0.9', feature_category: :tooling gem 'rspec-benchmark', '~> 0.6.0', feature_category: :tooling - gem 'rspec-parameterized', '~> 1.0', require: false, feature_category: :tooling + gem 'rspec-parameterized', '~> 1.0', '>= 1.0.2', require: false, feature_category: :tooling gem 'os', '~> 1.1', '>= 1.1.4', feature_category: :tooling gem 'capybara', '~> 3.40' # rubocop:todo Gemfile/MissingFeatureCategory gem 'capybara-screenshot', '~> 1.0.26' # rubocop:todo Gemfile/MissingFeatureCategory - gem 'selenium-webdriver', '~> 4.19' # rubocop:todo Gemfile/MissingFeatureCategory + gem 'selenium-webdriver', '~> 4.21', '>= 4.21.1' # rubocop:todo Gemfile/MissingFeatureCategory gem 'graphlyte', '~> 1.0.0' # rubocop:todo Gemfile/MissingFeatureCategory @@ -520,7 +551,7 @@ group :test do gem 'webmock', '~> 3.23.0', feature_category: :shared gem 'rails-controller-testing' # rubocop:todo Gemfile/MissingFeatureCategory gem 'concurrent-ruby', '~> 1.1' # rubocop:todo Gemfile/MissingFeatureCategory - gem 'test-prof', '~> 1.3.2', feature_category: :tooling + gem 'test-prof', '~> 1.3.3', feature_category: :tooling gem 'rspec_junit_formatter' # rubocop:todo Gemfile/MissingFeatureCategory gem 'guard-rspec' # rubocop:todo Gemfile/MissingFeatureCategory gem 'axe-core-rspec', '~> 4.9.0', feature_category: :tooling @@ -528,7 +559,7 @@ group :test do # Moved in `test` because https://gitlab.com/gitlab-org/gitlab/-/issues/217527 gem 'derailed_benchmarks', require: false # rubocop:todo Gemfile/MissingFeatureCategory - gem 'gitlab_quality-test_tooling', '~> 1.21.1', require: false, feature_category: :tooling + gem 'gitlab_quality-test_tooling', '~> 1.28.0', require: false, feature_category: :tooling end gem 'octokit', '~> 8.1', feature_category: :importers @@ -563,12 +594,12 @@ gem 'ssh_data', '~> 1.3' # rubocop:todo Gemfile/MissingFeatureCategory gem 'spamcheck', '~> 1.3.0' # rubocop:todo Gemfile/MissingFeatureCategory # Gitaly GRPC protocol definitions -gem 'gitaly', '~> 16.11.0.pre.rc1', feature_category: :gitaly +gem 'gitaly', '~> 17.0.1', feature_category: :gitaly # KAS GRPC protocol definitions -gem 'kas-grpc', '~> 0.4.0', feature_category: :deployment_management +gem 'kas-grpc', '~> 0.5.0', feature_category: :deployment_management -gem 'grpc', '~> 1.60.0' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'grpc', '~> 1.63', feature_category: :shared gem 'google-protobuf', '~> 3.25', '>= 3.25.3' # rubocop:todo Gemfile/MissingFeatureCategory @@ -657,9 +688,10 @@ gem 'telesignenterprise', '~> 2.2' # rubocop:todo Gemfile/MissingFeatureCategory # BufferedIO patch # Updating this version will require updating scripts/allowed_warnings.txt gem 'net-protocol', '~> 0.1.3' # rubocop:todo Gemfile/MissingFeatureCategory -# Lock this until we make DNS rebinding work with the updated net-http: -# https://gitlab.com/gitlab-org/gitlab/-/issues/413528 -gem 'net-http', '= 0.1.1' # rubocop:todo Gemfile/MissingFeatureCategory + +# This is locked to 0.4.1 because we patch Net::HTTP#connect in +# gems/gitlab-http/lib/net_http/connect_patch.rb. +gem 'net-http', '= 0.4.1', feature_category: :shared gem 'duo_api', '~> 1.3' # rubocop:todo Gemfile/MissingFeatureCategory diff --git a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock index bb661693ff498..aa9a829983a80 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock +++ b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock @@ -48,6 +48,7 @@ PATH concurrent-ruby (~> 1.2) httparty (~> 0.21.0) ipaddress (~> 0.8.3) + net-http (= 0.4.1) railties (~> 7) PATH @@ -99,7 +100,7 @@ PATH PATH remote: gems/ipynbdiff specs: - ipynbdiff (0.4.7) + ipynbdiff (0.4.8) diffy (~> 3.4) oj (~> 3.13.16) @@ -151,14 +152,6 @@ PATH oauth2 (>= 1.4.4, < 3) PATH - remote: vendor/gems/omniauth-azure-oauth2 - specs: - omniauth-azure-oauth2 (0.0.10) - jwt (>= 1.0, < 3.0) - omniauth (~> 2.0) - omniauth-oauth2 (~> 1.4) - -PATH remote: vendor/gems/omniauth-gitlab specs: omniauth-gitlab (4.0.0) @@ -205,70 +198,70 @@ GEM acme-client (2.0.11) faraday (>= 1.0, < 3.0.0) faraday-retry (~> 1.0) - actioncable (7.0.8.1) - actionpack (= 7.0.8.1) - activesupport (= 7.0.8.1) + actioncable (7.0.8.4) + actionpack (= 7.0.8.4) + activesupport (= 7.0.8.4) nio4r (~> 2.0) websocket-driver (>= 0.6.1) - actionmailbox (7.0.8.1) - actionpack (= 7.0.8.1) - activejob (= 7.0.8.1) - activerecord (= 7.0.8.1) - activestorage (= 7.0.8.1) - activesupport (= 7.0.8.1) + actionmailbox (7.0.8.4) + actionpack (= 7.0.8.4) + activejob (= 7.0.8.4) + activerecord (= 7.0.8.4) + activestorage (= 7.0.8.4) + activesupport (= 7.0.8.4) mail (>= 2.7.1) net-imap net-pop net-smtp - actionmailer (7.0.8.1) - actionpack (= 7.0.8.1) - actionview (= 7.0.8.1) - activejob (= 7.0.8.1) - activesupport (= 7.0.8.1) + actionmailer (7.0.8.4) + actionpack (= 7.0.8.4) + actionview (= 7.0.8.4) + activejob (= 7.0.8.4) + activesupport (= 7.0.8.4) mail (~> 2.5, >= 2.5.4) net-imap net-pop net-smtp rails-dom-testing (~> 2.0) - actionpack (7.0.8.1) - actionview (= 7.0.8.1) - activesupport (= 7.0.8.1) + actionpack (7.0.8.4) + actionview (= 7.0.8.4) + activesupport (= 7.0.8.4) rack (~> 2.0, >= 2.2.4) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.2.0) - actiontext (7.0.8.1) - actionpack (= 7.0.8.1) - activerecord (= 7.0.8.1) - activestorage (= 7.0.8.1) - activesupport (= 7.0.8.1) + actiontext (7.0.8.4) + actionpack (= 7.0.8.4) + activerecord (= 7.0.8.4) + activestorage (= 7.0.8.4) + activesupport (= 7.0.8.4) globalid (>= 0.6.0) nokogiri (>= 1.8.5) - actionview (7.0.8.1) - activesupport (= 7.0.8.1) + actionview (7.0.8.4) + activesupport (= 7.0.8.4) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.1, >= 1.2.0) - activejob (7.0.8.1) - activesupport (= 7.0.8.1) + activejob (7.0.8.4) + activesupport (= 7.0.8.4) globalid (>= 0.3.6) - activemodel (7.0.8.1) - activesupport (= 7.0.8.1) - activerecord (7.0.8.1) - activemodel (= 7.0.8.1) - activesupport (= 7.0.8.1) + activemodel (7.0.8.4) + activesupport (= 7.0.8.4) + activerecord (7.0.8.4) + activemodel (= 7.0.8.4) + activesupport (= 7.0.8.4) activerecord-explain-analyze (0.1.0) activerecord (>= 4) pg - activestorage (7.0.8.1) - actionpack (= 7.0.8.1) - activejob (= 7.0.8.1) - activerecord (= 7.0.8.1) - activesupport (= 7.0.8.1) + activestorage (7.0.8.4) + actionpack (= 7.0.8.4) + activejob (= 7.0.8.4) + activerecord (= 7.0.8.4) + activesupport (= 7.0.8.4) marcel (~> 1.0) mini_mime (>= 1.1.0) - activesupport (7.0.8.1) + activesupport (7.0.8.4) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 1.6, < 2) minitest (>= 5.1) @@ -286,7 +279,7 @@ GEM mize tins (~> 1.0) android_key_attestation (0.3.0) - apollo_upload_server (2.1.5) + apollo_upload_server (2.1.6) actionpack (>= 6.1.6) graphql (>= 1.8) app_store_connect (0.29.0) @@ -311,7 +304,7 @@ GEM aws-sdk-cloudformation (1.41.0) aws-sdk-core (~> 3, >= 3.99.0) aws-sigv4 (~> 1.1) - aws-sdk-core (3.191.6) + aws-sdk-core (3.197.0) aws-eventstream (~> 1, >= 1.3.0) aws-partitions (~> 1, >= 1.651.0) aws-sigv4 (~> 1.8) @@ -319,8 +312,8 @@ GEM aws-sdk-kms (1.76.0) aws-sdk-core (~> 3, >= 3.188.0) aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.146.1) - aws-sdk-core (~> 3, >= 3.191.0) + aws-sdk-s3 (1.151.0) + aws-sdk-core (~> 3, >= 3.194.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.8) aws-sigv4 (1.8.0) @@ -348,7 +341,7 @@ GEM backport (1.2.0) base32 (0.3.2) base64 (0.2.0) - batch-loader (2.0.1) + batch-loader (2.0.5) bcrypt (3.1.18) benchmark (0.2.0) benchmark-ips (2.11.0) @@ -361,6 +354,7 @@ GEM erubi (>= 1.0.0) rack (>= 0.9.0) rouge (>= 1.0.0) + bigdecimal (3.1.7) bindata (2.4.11) binding_of_caller (1.0.0) debug_inspector (>= 0.0.1) @@ -426,6 +420,8 @@ GEM countries (4.0.1) i18n_data (~> 0.13.0) sixarm_ruby_unaccent (~> 1.1) + coverband (6.1.2) + redis (>= 3.0) crack (0.4.3) safe_yaml (~> 1.0.0) crass (1.0.6) @@ -553,7 +549,7 @@ GEM encryptor (3.0.0) erubi (1.12.0) escape_utils (1.3.0) - et-orbi (1.2.7) + et-orbi (1.2.11) tzinfo ethon (0.16.0) ffi (>= 1.15.0) @@ -633,18 +629,19 @@ GEM excon (~> 0.58) formatador (~> 0.2) mime-types - fog-google (1.19.0) - fog-core (< 2.3) + fog-google (1.24.1) + addressable (>= 2.7.0) + fog-core (< 2.5) fog-json (~> 1.2) fog-xml (~> 0.1.0) - google-apis-compute_v1 (~> 0.14) - google-apis-dns_v1 (~> 0.12) - google-apis-iamcredentials_v1 (~> 0.6) - google-apis-monitoring_v3 (~> 0.12) - google-apis-pubsub_v1 (~> 0.7) - google-apis-sqladmin_v1beta4 (~> 0.13) - google-apis-storage_v1 (~> 0.6) - google-cloud-env (~> 1.2) + google-apis-compute_v1 (~> 0.53) + google-apis-dns_v1 (~> 0.28) + google-apis-iamcredentials_v1 (~> 0.15) + google-apis-monitoring_v3 (~> 0.37) + google-apis-pubsub_v1 (~> 0.30) + google-apis-sqladmin_v1beta4 (~> 0.38) + google-apis-storage_v1 (>= 0.19, < 1) + google-cloud-env (>= 1.2, < 3.0) fog-json (1.2.0) fog-core multi_json (~> 1.10) @@ -670,7 +667,7 @@ GEM googleapis-common-protos-types (>= 1.3.1, < 2.a) googleauth (~> 1.0) grpc (~> 1.36) - gdk-toogle (0.9.3) + gdk-toogle (0.9.5) haml rails (>= 7.0.4.2) gemoji (3.0.1) @@ -687,7 +684,7 @@ GEM git (1.18.0) addressable (~> 2.8) rchardet (~> 1.8) - gitaly (16.11.0.pre.rc1) + gitaly (17.0.2) grpc (~> 1.0) gitlab (4.19.0) httparty (~> 0.20) @@ -707,22 +704,22 @@ GEM fog-core (~> 2.1) fog-json (~> 1.2) mime-types - gitlab-glfm-markdown (0.0.14) - rb_sys (~> 0.9.86) - gitlab-labkit (0.35.1) + gitlab-glfm-markdown (0.0.17) + rb_sys (= 0.9.94) + gitlab-labkit (0.36.0) actionpack (>= 5.0.0, < 8.0.0) activesupport (>= 5.0.0, < 8.0.0) - grpc (>= 1.37) + grpc (>= 1.62) jaeger-client (~> 1.1.0) opentracing (~> 0.4) pg_query (>= 4.2.3, < 6.0) redis (> 3.0.0, < 6.0.0) - gitlab-license (2.4.0) - gitlab-mail_room (0.0.24) + gitlab-license (2.5.0) + gitlab-mail_room (0.0.25) jwt (>= 2.0) net-imap (>= 0.2.1) oauth2 (>= 1.4.4, < 3) - redis (>= 4, < 6) + redis (>= 5, < 6) redis-namespace (>= 1.8.2) gitlab-markup (1.9.0) gitlab-net-dns (0.9.2) @@ -730,12 +727,13 @@ GEM activesupport (>= 5.2.0) rake (~> 13.0) snowplow-tracker (~> 0.8.0) - gitlab-styles (11.0.0) - rubocop (~> 1.57.1) - rubocop-graphql (~> 0.18) - rubocop-performance (~> 1.15) - rubocop-rails (~> 2.17) - rubocop-rspec (~> 2.22) + gitlab-styles (12.0.1) + rubocop (~> 1.62.1) + rubocop-factory_bot (~> 2.25.1) + rubocop-graphql (~> 1.5.0) + rubocop-performance (~> 1.20.2) + rubocop-rails (~> 2.24.0) + rubocop-rspec (~> 2.27.1) gitlab_chronic_duration (0.12.0) numerizer (~> 0.2) gitlab_omniauth-ldap (2.2.0) @@ -743,11 +741,12 @@ GEM omniauth (>= 1.3, < 3) pyu-ruby-sasl (>= 0.0.3.3, < 0.1) rubyntlm (~> 0.5) - gitlab_quality-test_tooling (1.21.1) - activesupport (>= 6.1, < 7.2) + gitlab_quality-test_tooling (1.28.0) + activesupport (>= 7.0, < 7.2) amatch (~> 0.4.1) gitlab (~> 4.19) http (~> 5.0) + influxdb-client (~> 3.1) nokogiri (~> 1.10) parallel (>= 1, < 2) rainbow (>= 3, < 4) @@ -782,16 +781,16 @@ GEM retriable (>= 2.0, < 4.a) rexml webrick - google-apis-dns_v1 (0.28.0) - google-apis-core (>= 0.9.0, < 2.a) + google-apis-dns_v1 (0.36.0) + google-apis-core (>= 0.11.0, < 2.a) google-apis-iam_v1 (0.36.0) google-apis-core (>= 0.9.1, < 2.a) google-apis-iamcredentials_v1 (0.15.0) google-apis-core (>= 0.9.0, < 2.a) - google-apis-monitoring_v3 (0.37.0) - google-apis-core (>= 0.9.1, < 2.a) - google-apis-pubsub_v1 (0.30.0) - google-apis-core (>= 0.9.1, < 2.a) + google-apis-monitoring_v3 (0.54.0) + google-apis-core (>= 0.11.0, < 2.a) + google-apis-pubsub_v1 (0.45.0) + google-apis-core (>= 0.11.0, < 2.a) google-apis-serviceusage_v1 (0.28.0) google-apis-core (>= 0.9.1, < 2.a) google-apis-sqladmin_v1beta4 (0.41.0) @@ -852,7 +851,7 @@ GEM mustermann-grape (~> 1.0.0) rack (>= 1.3.0) rack-accept - grape-entity (0.10.2) + grape-entity (1.0.1) activesupport (>= 3.0.0) multi_json (>= 1.3.2) grape-path-helpers (2.0.1) @@ -860,7 +859,7 @@ GEM grape (~> 2.0) rake (> 12) ruby2_keywords (~> 0.0.2) - grape-swagger (2.0.2) + grape-swagger (2.1.0) grape (>= 1.7, < 3.0) rack-test (~> 2) grape-swagger-entity (0.5.1) @@ -877,8 +876,8 @@ GEM faraday_middleware graphql-client graphlyte (1.0.0) - graphql (2.2.5) - racc (~> 1.4) + graphql (2.3.4) + base64 graphql-client (0.19.0) activesupport (>= 3.0) graphql @@ -890,7 +889,7 @@ GEM gemoji (~> 3.0) graphql (~> 2.0) html-pipeline (~> 2.14, >= 2.14.3) - grpc (1.60.0) + grpc (1.63.0) google-protobuf (~> 3.25) googleapis-common-protos-types (~> 1.0) grpc-google-iam-v1 (1.5.0) @@ -916,7 +915,7 @@ GEM haml (5.2.2) temple (>= 0.8.0) tilt - haml_lint (0.53.0) + haml_lint (0.58.0) haml (>= 5.0) parallel (~> 1.10) rainbow @@ -962,7 +961,7 @@ GEM ice_nine (0.11.2) imagen (0.1.8) parser (>= 2.5, != 2.5.1.1) - influxdb-client (2.9.0) + influxdb-client (3.1.0) invisible_captcha (2.1.0) rails (>= 5.2) ipaddr (1.2.5) @@ -1011,7 +1010,7 @@ GEM activerecord kaminari-core (= 1.2.2) kaminari-core (1.2.2) - kas-grpc (0.4.0) + kas-grpc (0.5.0) grpc (~> 1.0) knapsack (1.22.0) rake @@ -1027,7 +1026,7 @@ GEM language_server-protocol (3.17.0.3) launchy (2.5.0) addressable (~> 2.7) - lefthook (1.6.8) + lefthook (1.6.14) letter_opener (1.7.0) launchy (~> 2.2) letter_opener_web (2.0.0) @@ -1036,7 +1035,7 @@ GEM railties (>= 5.2) rexml libyajl2 (2.1.0) - license_finder (7.0.1) + license_finder (7.1.0) bundler rubyzip (>= 1, < 3) thor (~> 1.2) @@ -1065,7 +1064,7 @@ GEM loofah (2.22.0) crass (~> 1.0.2) nokogiri (>= 1.12.0) - lookbook (2.2.2) + lookbook (2.3.1) activemodel css_parser htmlbeautifier (~> 1.3) @@ -1117,11 +1116,10 @@ GEM mustermann-grape (1.0.2) mustermann (>= 1.0.0) nap (1.1.0) - neighbor (0.2.3) - activerecord (>= 5.2) + neighbor (0.3.2) + activerecord (>= 6.1) nenv (0.3.0) - net-http (0.1.1) - net-protocol + net-http (0.4.1) uri net-http-persistent (4.0.1) connection_pool (~> 2.2) @@ -1191,10 +1189,6 @@ GEM omniauth-oauth2 (~> 1) omniauth-azure-activedirectory-v2 (2.0.0) omniauth-oauth2 (~> 1.8) - omniauth-dingtalk-oauth2 (1.0.1) - omniauth-oauth2 (~> 1.7) - omniauth-facebook (4.0.0) - omniauth-oauth2 (~> 1.2) omniauth-github (2.0.1) omniauth (~> 2.0) omniauth-oauth2 (~> 1.8) @@ -1203,9 +1197,6 @@ GEM oauth2 (~> 2.0.6) omniauth (~> 2.0) omniauth-oauth2 (~> 1.8.0) - omniauth-oauth (1.2.0) - oauth - omniauth (>= 1.0, < 3) omniauth-oauth2 (1.8.0) oauth2 (>= 1.4, < 3) omniauth (~> 2.0) @@ -1217,9 +1208,6 @@ GEM ruby-saml (~> 1.12) omniauth-shibboleth-redux (2.0.0) omniauth (>= 2.0.0) - omniauth-twitter (1.4.0) - omniauth-oauth (~> 1.1) - rack omniauth_openid_connect (0.6.1) omniauth (>= 1.9, < 3) openid_connect (~> 1.1) @@ -1237,6 +1225,110 @@ GEM openssl (3.1.0) openssl-signature_algorithm (1.3.0) openssl (> 2.0) + opentelemetry-api (1.2.5) + opentelemetry-common (0.21.0) + opentelemetry-api (~> 1.0) + opentelemetry-exporter-otlp (0.27.0) + google-protobuf (~> 3.14) + googleapis-common-protos-types (~> 1.3) + opentelemetry-api (~> 1.1) + opentelemetry-common (~> 0.20) + opentelemetry-sdk (~> 1.2) + opentelemetry-semantic_conventions + opentelemetry-helpers-sql-obfuscation (0.1.0) + opentelemetry-common (~> 0.20) + opentelemetry-instrumentation-action_pack (0.9.0) + opentelemetry-api (~> 1.0) + opentelemetry-instrumentation-base (~> 0.22.1) + opentelemetry-instrumentation-rack (~> 0.21) + opentelemetry-instrumentation-action_view (0.7.0) + opentelemetry-api (~> 1.0) + opentelemetry-instrumentation-active_support (~> 0.1) + opentelemetry-instrumentation-base (~> 0.22.1) + opentelemetry-instrumentation-active_job (0.7.1) + opentelemetry-api (~> 1.0) + opentelemetry-instrumentation-base (~> 0.22.1) + opentelemetry-instrumentation-active_record (0.7.2) + opentelemetry-api (~> 1.0) + opentelemetry-instrumentation-base (~> 0.22.1) + opentelemetry-instrumentation-active_support (0.5.1) + opentelemetry-api (~> 1.0) + opentelemetry-instrumentation-base (~> 0.22.1) + opentelemetry-instrumentation-aws_sdk (0.5.2) + opentelemetry-api (~> 1.0) + opentelemetry-instrumentation-base (~> 0.22.1) + opentelemetry-instrumentation-base (0.22.3) + opentelemetry-api (~> 1.0) + opentelemetry-registry (~> 0.1) + opentelemetry-instrumentation-concurrent_ruby (0.21.3) + opentelemetry-api (~> 1.0) + opentelemetry-instrumentation-base (~> 0.22.1) + opentelemetry-instrumentation-ethon (0.21.5) + opentelemetry-api (~> 1.0) + opentelemetry-common (~> 0.21.0) + opentelemetry-instrumentation-base (~> 0.22.1) + opentelemetry-instrumentation-excon (0.22.2) + opentelemetry-api (~> 1.0) + opentelemetry-common (~> 0.21.0) + opentelemetry-instrumentation-base (~> 0.22.1) + opentelemetry-instrumentation-faraday (0.24.3) + opentelemetry-api (~> 1.0) + opentelemetry-common (~> 0.21.0) + opentelemetry-instrumentation-base (~> 0.22.1) + opentelemetry-instrumentation-grape (0.1.8) + opentelemetry-api (~> 1.0) + opentelemetry-instrumentation-base (~> 0.22.1) + opentelemetry-instrumentation-rack (~> 0.21) + opentelemetry-instrumentation-graphql (0.28.2) + opentelemetry-api (~> 1.0) + opentelemetry-instrumentation-base (~> 0.22.1) + opentelemetry-instrumentation-http (0.23.3) + opentelemetry-api (~> 1.0) + opentelemetry-instrumentation-base (~> 0.22.1) + opentelemetry-instrumentation-http_client (0.22.5) + opentelemetry-api (~> 1.0) + opentelemetry-common (~> 0.21.0) + opentelemetry-instrumentation-base (~> 0.22.1) + opentelemetry-instrumentation-net_http (0.22.5) + opentelemetry-api (~> 1.0) + opentelemetry-common (~> 0.21.0) + opentelemetry-instrumentation-base (~> 0.22.1) + opentelemetry-instrumentation-pg (0.27.3) + opentelemetry-api (~> 1.0) + opentelemetry-helpers-sql-obfuscation + opentelemetry-instrumentation-base (~> 0.22.1) + opentelemetry-instrumentation-rack (0.24.4) + opentelemetry-api (~> 1.0) + opentelemetry-common (~> 0.21.0) + opentelemetry-instrumentation-base (~> 0.22.1) + opentelemetry-instrumentation-rails (0.30.1) + opentelemetry-api (~> 1.0) + opentelemetry-instrumentation-action_pack (~> 0.9.0) + opentelemetry-instrumentation-action_view (~> 0.7.0) + opentelemetry-instrumentation-active_job (~> 0.7.0) + opentelemetry-instrumentation-active_record (~> 0.7.0) + opentelemetry-instrumentation-active_support (~> 0.5.0) + opentelemetry-instrumentation-base (~> 0.22.1) + opentelemetry-instrumentation-rake (0.2.2) + opentelemetry-api (~> 1.0) + opentelemetry-instrumentation-base (~> 0.22.1) + opentelemetry-instrumentation-redis (0.25.5) + opentelemetry-api (~> 1.0) + opentelemetry-common (~> 0.21.0) + opentelemetry-instrumentation-base (~> 0.22.1) + opentelemetry-instrumentation-sidekiq (0.25.4) + opentelemetry-api (~> 1.0) + opentelemetry-common (~> 0.21.0) + opentelemetry-instrumentation-base (~> 0.22.1) + opentelemetry-registry (0.3.0) + opentelemetry-api (~> 1.1) + opentelemetry-sdk (1.4.1) + opentelemetry-api (~> 1.1) + opentelemetry-common (~> 0.20) + opentelemetry-registry (~> 0.2) + opentelemetry-semantic_conventions + opentelemetry-semantic_conventions (1.10.0) + opentelemetry-api (~> 1.0) opentracing (0.5.0) optimist (3.0.1) org-ruby (0.9.12) @@ -1264,7 +1356,7 @@ GEM diff-lcs (~> 1.5) expgen (~> 0.1) rainbow (~> 3.1.1) - parallel (1.22.1) + parallel (1.24.0) parser (3.3.0.5) ast (~> 2.4.1) racc @@ -1288,7 +1380,7 @@ GEM prime (0.1.2) forwardable singleton - prism (0.24.0) + prism (0.29.0) proc_to_ast (0.1.0) coderay parser @@ -1337,20 +1429,20 @@ GEM rack-test (2.1.0) rack (>= 1.3) rack-timeout (0.6.3) - rails (7.0.8.1) - actioncable (= 7.0.8.1) - actionmailbox (= 7.0.8.1) - actionmailer (= 7.0.8.1) - actionpack (= 7.0.8.1) - actiontext (= 7.0.8.1) - actionview (= 7.0.8.1) - activejob (= 7.0.8.1) - activemodel (= 7.0.8.1) - activerecord (= 7.0.8.1) - activestorage (= 7.0.8.1) - activesupport (= 7.0.8.1) + rails (7.0.8.4) + actioncable (= 7.0.8.4) + actionmailbox (= 7.0.8.4) + actionmailer (= 7.0.8.4) + actionpack (= 7.0.8.4) + actiontext (= 7.0.8.4) + actionview (= 7.0.8.4) + activejob (= 7.0.8.4) + activemodel (= 7.0.8.4) + activerecord (= 7.0.8.4) + activestorage (= 7.0.8.4) + activesupport (= 7.0.8.4) bundler (>= 1.15.0) - railties (= 7.0.8.1) + railties (= 7.0.8.4) rails-controller-testing (1.0.5) actionpack (>= 5.0.1.rc1) actionview (>= 5.0.1.rc1) @@ -1361,12 +1453,12 @@ GEM rails-html-sanitizer (1.6.0) loofah (~> 2.21) nokogiri (~> 1.14) - rails-i18n (7.0.3) + rails-i18n (7.0.9) i18n (>= 0.7, < 2) railties (>= 6.0.0, < 8) - railties (7.0.8.1) - actionpack (= 7.0.8.1) - activesupport (= 7.0.8.1) + railties (7.0.8.4) + actionpack (= 7.0.8.4) + activesupport (= 7.0.8.4) method_source rake (>= 12.2) thor (~> 1.0) @@ -1376,7 +1468,7 @@ GEM rb-fsevent (0.11.2) rb-inotify (0.10.1) ffi (~> 1.0) - rb_sys (0.9.86) + rb_sys (0.9.94) rbtrace (0.5.1) ffi (>= 1.0.6) msgpack (>= 0.4.3) @@ -1388,20 +1480,20 @@ GEM json recursive-open-struct (1.1.3) redcarpet (3.6.0) - redis (5.0.8) - redis-client (>= 0.17.0) + redis (5.2.0) + redis-client (>= 0.22.0) redis-actionpack (5.4.0) actionpack (>= 5, < 8) redis-rack (>= 2.1.0, < 4) redis-store (>= 1.1.0, < 2) - redis-client (0.21.1) + redis-client (0.22.2) connection_pool - redis-cluster-client (0.7.5) - redis-client (~> 0.12) - redis-clustering (5.0.8) - redis (= 5.0.8) - redis-cluster-client (>= 0.7.0) - redis-namespace (1.10.0) + redis-cluster-client (0.8.2) + redis-client (~> 0.22) + redis-clustering (5.2.0) + redis (= 5.2.0) + redis-cluster-client (>= 0.7.11) + redis-namespace (1.11.0) redis (>= 4) redis-rack (3.0.0) rack-session (>= 0.2.0) @@ -1452,7 +1544,7 @@ GEM rspec-mocks (3.12.6) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.12.0) - rspec-parameterized (1.0.0) + rspec-parameterized (1.0.2) rspec-parameterized-core (< 2) rspec-parameterized-table_syntax (< 2) rspec-parameterized-core (1.0.0) @@ -1480,51 +1572,49 @@ GEM activerecord get_process_mem rails - rubocop (1.57.2) + rubocop (1.62.1) json (~> 2.3) language_server-protocol (>= 3.17.0) parallel (~> 1.10) - parser (>= 3.2.2.4) + parser (>= 3.3.0.2) rainbow (>= 2.2.2, < 4.0) regexp_parser (>= 1.8, < 3.0) rexml (>= 3.2.5, < 4.0) - rubocop-ast (>= 1.28.1, < 2.0) + rubocop-ast (>= 1.31.1, < 2.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 2.4.0, < 3.0) - rubocop-ast (1.29.0) - parser (>= 3.2.1.0) - rubocop-capybara (2.19.0) + rubocop-ast (1.31.2) + parser (>= 3.3.0.4) + rubocop-capybara (2.20.0) rubocop (~> 1.41) - rubocop-factory_bot (2.24.0) - rubocop (~> 1.33) - rubocop-graphql (0.19.0) - rubocop (>= 0.87, < 2) - rubocop-performance (1.19.1) - rubocop (>= 1.7.0, < 2.0) - rubocop-ast (>= 0.4.0) - rubocop-rails (2.22.1) + rubocop-factory_bot (2.25.1) + rubocop (~> 1.41) + rubocop-graphql (1.5.1) + rubocop (>= 0.90, < 2) + rubocop-performance (1.20.2) + rubocop (>= 1.48.1, < 2.0) + rubocop-ast (>= 1.30.0, < 2.0) + rubocop-rails (2.24.1) activesupport (>= 4.2.0) rack (>= 1.1) rubocop (>= 1.33.0, < 2.0) - rubocop-rspec (2.25.0) + rubocop-ast (>= 1.31.1, < 2.0) + rubocop-rspec (2.27.1) rubocop (~> 1.40) rubocop-capybara (~> 2.17) rubocop-factory_bot (~> 2.22) ruby-fogbugz (0.3.0) crack (~> 0.4) multipart-post (~> 2.0) - ruby-lsp (0.14.6) + ruby-lsp (0.16.7) language_server-protocol (~> 3.17.0) - prism (>= 0.22.0, < 0.25) + prism (>= 0.29.0, < 0.30) sorbet-runtime (>= 0.5.10782) - ruby-lsp-rails (0.3.3) - actionpack (>= 6.0) - activerecord (>= 6.0) - railties (>= 6.0) - ruby-lsp (>= 0.14.2, < 0.15.0) + ruby-lsp-rails (0.3.6) + ruby-lsp (>= 0.16.5, < 0.17.0) sorbet-runtime (>= 0.5.9897) - ruby-lsp-rspec (0.1.10) - ruby-lsp (~> 0.14.0) + ruby-lsp-rspec (0.1.11) + ruby-lsp (~> 0.16.0) ruby-magic (0.6.0) mini_portile2 (~> 2.8) ruby-openai (3.7.0) @@ -1555,25 +1645,24 @@ GEM seed-fu (2.3.7) activerecord (>= 3.1) activesupport (>= 3.1) - selenium-webdriver (4.19.0) + selenium-webdriver (4.21.1) base64 (~> 0.2) rexml (~> 3.2, >= 3.2.5) rubyzip (>= 1.2.2, < 3.0) websocket (~> 1.0) - semver_dialects (2.0.2) + semver_dialects (3.0.1) deb_version (~> 1.0.1) pastel (~> 0.8.0) thor (~> 1.3) tty-command (~> 0.10.1) - sentry-rails (5.10.0) + sentry-rails (5.17.3) railties (>= 5.0) - sentry-ruby (~> 5.10.0) - sentry-raven (3.1.2) - faraday (>= 1.0) - sentry-ruby (5.10.0) + sentry-ruby (~> 5.17.3) + sentry-ruby (5.17.3) + bigdecimal concurrent-ruby (~> 1.0, >= 1.0.2) - sentry-sidekiq (5.10.0) - sentry-ruby (~> 5.10.0) + sentry-sidekiq (5.17.3) + sentry-ruby (~> 5.17.3) sidekiq (>= 3.0) sexp_processor (4.17.1) shellany (0.0.1) @@ -1673,7 +1762,7 @@ GEM unicode-display_width (>= 1.1.1, < 3) terser (1.0.2) execjs (>= 0.3.0, < 3) - test-prof (1.3.2) + test-prof (1.3.3) test_file_finder (0.3.1) faraday (>= 1.0, < 3.0, != 2.0.0) text (1.3.1) @@ -1758,7 +1847,7 @@ GEM activesupport (>= 3.0) version_gem (1.1.0) version_sorter (2.3.0) - view_component (3.11.0) + view_component (3.12.1) activesupport (>= 5.2.0, < 8.0) concurrent-ruby (~> 1.0) method_source (~> 1.0) @@ -1789,7 +1878,7 @@ GEM webfinger (1.2.0) activesupport httpclient (>= 2.4) - webmock (3.23.0) + webmock (3.23.1) addressable (>= 2.8.0) crack (>= 0.3.2) hashdiff (>= 0.4.0, < 2.0.0) @@ -1825,7 +1914,7 @@ DEPENDENCIES acts-as-taggable-on (~> 10.0) addressable (~> 2.8) akismet (~> 3.0) - apollo_upload_server (~> 2.1.5) + apollo_upload_server (~> 2.1.6) app_store_connect arr-pm (~> 0.0.12) asciidoctor (~> 2.0.18) @@ -1836,12 +1925,12 @@ DEPENDENCIES attr_encrypted (~> 3.2.4)! awesome_print aws-sdk-cloudformation (~> 1) - aws-sdk-core (~> 3.191.6) - aws-sdk-s3 (~> 1.146.1) + aws-sdk-core (~> 3.197.0) + aws-sdk-s3 (~> 1.151.0) axe-core-rspec (~> 4.9.0) babosa (~> 2.0) base32 (~> 0.3.0) - batch-loader (~> 2.0.1) + batch-loader (~> 2.0.5) bcrypt (~> 3.1, >= 3.1.14) benchmark-ips (~> 2.11.0) benchmark-memory (~> 0.1) @@ -1861,6 +1950,7 @@ DEPENDENCIES concurrent-ruby (~> 1.1) connection_pool (~> 2.4) countries (~> 4.0.0) + coverband (= 6.1.2) creole (~> 0.5.0) crystalball (~> 0.7.0) cssbundling-rails (= 1.4.0) @@ -1900,24 +1990,24 @@ DEPENDENCIES fog-aliyun (~> 0.4) fog-aws (~> 3.18) fog-core (= 2.1.0) - fog-google (~> 1.19) + fog-google (~> 1.24.1) fog-local (~> 0.8) fugit (~> 1.8.1) fuubar (~> 2.2.0) - gdk-toogle (~> 0.9) + gdk-toogle (~> 0.9, >= 0.9.5) gettext (~> 3.4, >= 3.4.9) gettext_i18n_rails (~> 1.12.0) - gitaly (~> 16.11.0.pre.rc1) + gitaly (~> 17.0.1) gitlab-backup-cli! gitlab-chronic (~> 0.10.5) gitlab-dangerfiles (~> 4.7.0) gitlab-experiment (~> 0.9.1) gitlab-fog-azure-rm (~> 1.9.1) - gitlab-glfm-markdown (~> 0.0.14) + gitlab-glfm-markdown (~> 0.0.17) gitlab-housekeeper! gitlab-http! - gitlab-labkit (~> 0.35.1) - gitlab-license (~> 2.4) + gitlab-labkit (~> 0.36.0) + gitlab-license (~> 2.5) gitlab-mail_room (~> 0.0.24) gitlab-markup (~> 1.9.0) gitlab-net-dns (~> 0.9.2) @@ -1928,11 +2018,11 @@ DEPENDENCIES gitlab-sdk (~> 0.3.0) gitlab-secret_detection! gitlab-sidekiq-fetcher! - gitlab-styles (~> 11.0.0) + gitlab-styles (~> 12.0.1) gitlab-utils! gitlab_chronic_duration (~> 0.12) gitlab_omniauth-ldap (~> 2.2.0) - gitlab_quality-test_tooling (~> 1.21.1) + gitlab_quality-test_tooling (~> 1.28.0) gon (~> 6.4.0) google-apis-androidpublisher_v3 (~> 0.34.0) google-apis-cloudbilling_v1 (~> 0.21.0) @@ -1952,20 +2042,20 @@ DEPENDENCIES googleauth (~> 1.8.1) gpgme (~> 2.0.23) grape (~> 2.0.0) - grape-entity (~> 0.10.2) + grape-entity (~> 1.0.1) grape-path-helpers (~> 2.0.1) - grape-swagger (~> 2.0.2) + grape-swagger (~> 2.1.0) grape-swagger-entity (~> 0.5.1) grape_logging (~> 1.8, >= 1.8.4) graphiql-rails (~> 1.8.0) graphlient (~> 0.6.0) graphlyte (~> 1.0.0) - graphql (~> 2.2.5) + graphql (~> 2.3.4) graphql-docs (~> 4.0.0) - grpc (~> 1.60.0) + grpc (~> 1.63) gssapi (~> 1.3.1) guard-rspec - haml_lint (~> 0.53) + haml_lint (~> 0.58) hamlit (~> 2.15.0) hashie (~> 5.0.0) health_check (~> 3.0) @@ -1973,7 +2063,7 @@ DEPENDENCIES html2text httparty (~> 0.21.0) icalendar - influxdb-client (~> 2.9) + influxdb-client (~> 3.1) invisible_captcha (~> 2.1.0) ipaddr (~> 1.2.5) ipaddress (~> 0.8.3) @@ -1985,7 +2075,7 @@ DEPENDENCIES jsonb_accessor (~> 1.3.10) jwt (~> 2.5) kaminari (~> 1.2.2) - kas-grpc (~> 0.4.0) + kas-grpc (~> 0.5.0) knapsack (~> 1.22.0) kramdown (~> 2.3.1) kubeclient (~> 4.11.0) @@ -1997,7 +2087,7 @@ DEPENDENCIES lockbox (~> 1.3.0) lograge (~> 0.5) loofah (~> 2.22.0) - lookbook (~> 2.2, >= 2.2.2) + lookbook (~> 2.3) lru_redux mail (= 2.8.1) mail-smtp_pool (~> 0.1.0)! @@ -2007,8 +2097,8 @@ DEPENDENCIES mini_magick (~> 4.12) minitest (~> 5.11.0) multi_json (~> 1.14.1) - neighbor (~> 0.2.3) - net-http (= 0.1.1) + neighbor (~> 0.3.2) + net-http (= 0.4.1) net-ldap (~> 0.17.1) net-ntp net-protocol (~> 0.1.3) @@ -2023,9 +2113,6 @@ DEPENDENCIES omniauth-atlassian-oauth2 (~> 0.2.0) omniauth-auth0 (~> 3.1) omniauth-azure-activedirectory-v2 (~> 2.0) - omniauth-azure-oauth2 (~> 0.0.9)! - omniauth-dingtalk-oauth2 (~> 1.0) - omniauth-facebook (~> 4.0.0) omniauth-github (= 2.0.1) omniauth-gitlab (~> 4.0.0)! omniauth-google-oauth2 (~> 1.1) @@ -2033,16 +2120,38 @@ DEPENDENCIES omniauth-salesforce (~> 1.0.5)! omniauth-saml (~> 2.1.0) omniauth-shibboleth-redux (~> 2.0) - omniauth-twitter (~> 1.4) omniauth_crowd (~> 2.4.0)! omniauth_openid_connect (~> 0.6.1) openid_connect (= 1.3.0) openssl (~> 3.0) + opentelemetry-exporter-otlp + opentelemetry-instrumentation-action_pack + opentelemetry-instrumentation-action_view + opentelemetry-instrumentation-active_job + opentelemetry-instrumentation-active_record + opentelemetry-instrumentation-active_support + opentelemetry-instrumentation-aws_sdk + opentelemetry-instrumentation-concurrent_ruby + opentelemetry-instrumentation-ethon + opentelemetry-instrumentation-excon + opentelemetry-instrumentation-faraday + opentelemetry-instrumentation-grape + opentelemetry-instrumentation-graphql + opentelemetry-instrumentation-http + opentelemetry-instrumentation-http_client + opentelemetry-instrumentation-net_http + opentelemetry-instrumentation-pg + opentelemetry-instrumentation-rack + opentelemetry-instrumentation-rails + opentelemetry-instrumentation-rake + opentelemetry-instrumentation-redis + opentelemetry-instrumentation-sidekiq + opentelemetry-sdk org-ruby (~> 0.9.12) os (~> 1.1, >= 1.1.4) pact (~> 1.64) parallel (~> 1.19) - parser (~> 3.3, >= 3.3.0.5) + parser (= 3.3.0.5) parslet (~> 1.8) peek (~> 1.1) pg (~> 1.5.6) @@ -2060,17 +2169,17 @@ DEPENDENCIES rack-oauth2 (~> 1.21.3) rack-proxy (~> 0.7.7) rack-timeout (~> 0.6.3) - rails (~> 7.0.8.1) + rails (~> 7.0.8.4) rails-controller-testing - rails-i18n (~> 7.0) + rails-i18n (~> 7.0, >= 7.0.9) rainbow (~> 3.0) rbtrace (~> 0.4) re2 (= 2.7.0) recaptcha (~> 5.12) - redis (~> 5.0.0) + redis (~> 5.2.0) redis-actionpack (~> 5.4.0) - redis-clustering (~> 5.0.0) - redis-namespace (~> 1.10.0) + redis-clustering (~> 5.2.0) + redis-namespace (~> 1.11.0) request_store (~> 1.5.1) responders (~> 3.0) retriable (~> 3.1.2) @@ -2078,15 +2187,15 @@ DEPENDENCIES rouge (~> 4.2.0) rqrcode (~> 2.2) rspec-benchmark (~> 0.6.0) - rspec-parameterized (~> 1.0) + rspec-parameterized (~> 1.0, >= 1.0.2) rspec-rails (~> 6.1.1) rspec-retry (~> 0.6.2) rspec_junit_formatter rspec_profiling (~> 0.0.9) rubocop ruby-fogbugz (~> 0.3.0) - ruby-lsp (~> 0.14.6) - ruby-lsp-rails (~> 0.3.3) + ruby-lsp (~> 0.16.7) + ruby-lsp-rails (~> 0.3.6) ruby-lsp-rspec (~> 0.1.10) ruby-magic (~> 0.6) ruby-openai (~> 3.7) @@ -2097,12 +2206,11 @@ DEPENDENCIES sanitize (~> 6.0.2) sd_notify (~> 0.1.0) seed-fu (~> 2.3.7) - selenium-webdriver (~> 4.19) - semver_dialects (~> 2.0, >= 2.0.2) - sentry-rails (~> 5.10.0) - sentry-raven (~> 3.1) - sentry-ruby (~> 5.10.0) - sentry-sidekiq (~> 5.10.0) + selenium-webdriver (~> 4.21, >= 4.21.1) + semver_dialects (~> 3.0) + sentry-rails (~> 5.17.3) + sentry-ruby (~> 5.17.3) + sentry-sidekiq (~> 5.17.3) shoulda-matchers (~> 5.1.0) sidekiq! sidekiq-cron (~> 1.12.0) @@ -2127,7 +2235,7 @@ DEPENDENCIES tanuki_emoji (~> 0.9) telesignenterprise (~> 2.2) terser (= 1.0.2) - test-prof (~> 1.3.2) + test-prof (~> 1.3.3) test_file_finder (~> 0.3.1) thrift (>= 0.16.0) timfel-krb5-auth (~> 0.8) @@ -2139,7 +2247,7 @@ DEPENDENCIES valid_email (~> 0.1) validates_hostname (~> 1.0.13) version_sorter (~> 2.3) - view_component (~> 3.11.0) + view_component (~> 3.12.1) vite_rails (~> 3.0.17) vite_ruby (~> 3.5.0) vmstat (~> 2.3.0) @@ -2151,4 +2259,4 @@ DEPENDENCIES yajl-ruby (~> 1.4.3) BUNDLED WITH - 2.5.8 + 2.5.11 diff --git a/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix b/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix index dff2917092d8b..f64d8b7daba95 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix +++ b/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix @@ -13,25 +13,25 @@ src: }; actioncable = { dependencies = ["actionpack" "activesupport" "nio4r" "websocket-driver"]; - groups = ["default" "test"]; + groups = ["default" "development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0j86qjs1zw34p0p7d5napa1vvwqlvm9nmv7ckxxhcba1qv4dspmw"; + sha256 = "1c46q4ykf8cqcpzad7zhkrxjhvf92sil0185zvxwzhj95p1zp5vr"; type = "gem"; }; - version = "7.0.8.1"; + version = "7.0.8.4"; }; actionmailbox = { dependencies = ["actionpack" "activejob" "activerecord" "activestorage" "activesupport" "mail" "net-imap" "net-pop" "net-smtp"]; - groups = ["default" "test"]; + groups = ["default" "development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1f68h8cl6dqbz7mq3x43s0s82291nani3bz1hrxkk2qpgda23mw9"; + sha256 = "0x100vq4rf2c5ndz8ai00hb5gsb9ax2xqc89dsfzzhxbpa9gs9ik"; type = "gem"; }; - version = "7.0.8.1"; + version = "7.0.8.4"; }; actionmailer = { dependencies = ["actionpack" "actionview" "activejob" "activesupport" "mail" "net-imap" "net-pop" "net-smtp" "rails-dom-testing"]; @@ -39,10 +39,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "077j47jsg0wqwx5b13n4h0g3g409b6kfrlazpzgjpa3pal74f7sc"; + sha256 = "1hds7b6n7vsa64fmma7wl7x9mxscr89myfb13vxni5fcns1agwzr"; type = "gem"; }; - version = "7.0.8.1"; + version = "7.0.8.4"; }; actionpack = { dependencies = ["actionview" "activesupport" "rack" "rack-test" "rails-dom-testing" "rails-html-sanitizer"]; @@ -50,21 +50,21 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0jh83rqd6glys1b2wsihzsln8yk6zdwgiyn9xncyiav9rcwjpkax"; + sha256 = "18k05a55i0xgyv60lx0m1psnyncn935j76ivbp9hssqpij00jj1f"; type = "gem"; }; - version = "7.0.8.1"; + version = "7.0.8.4"; }; actiontext = { dependencies = ["actionpack" "activerecord" "activestorage" "activesupport" "globalid" "nokogiri"]; - groups = ["default" "test"]; + groups = ["default" "development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "044qi3zhzxlfq7slc2pb9ky9mdivp1m1sjyhjvnsi64ggq7cvr22"; + sha256 = "1g54g1kjyrwv9g592gxfz7z6ksmj916l1cgkxk54zhywxf6gpn0y"; type = "gem"; }; - version = "7.0.8.1"; + version = "7.0.8.4"; }; actionview = { dependencies = ["activesupport" "builder" "erubi" "rails-dom-testing" "rails-html-sanitizer"]; @@ -72,10 +72,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1ygpg75f3ffdcbxvf7s14xw3hcjin1nnx1nk3mg9mj2xc1nb60aa"; + sha256 = "03rfynhj40270dqhkm4cyaphzb37b4fdiaqh9grvcfq760vx7ha5"; type = "gem"; }; - version = "7.0.8.1"; + version = "7.0.8.4"; }; activejob = { dependencies = ["activesupport" "globalid"]; @@ -83,10 +83,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0yql9v4cd1xbqgnzlf3cv4a6sm26v2y4gsgcbbfgvfc0hhlfjklg"; + sha256 = "1b54didwsg5p8wn30qjwspzh97w7g07hrsdzr7wdrdly4zii7sr1"; type = "gem"; }; - version = "7.0.8.1"; + version = "7.0.8.4"; }; activemodel = { dependencies = ["activesupport"]; @@ -94,10 +94,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0grdpvglh0cj96qhlxjj9bcfqkh13c1pfpcwc9ld3aw0yzvsw5a1"; + sha256 = "1mi5cppdmkzgr2z135ibs0bq71qndbnip0vfflz1n4j4hqnhjkpg"; type = "gem"; }; - version = "7.0.8.1"; + version = "7.0.8.4"; }; activerecord = { dependencies = ["activemodel" "activesupport"]; @@ -105,10 +105,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0rlky1cr5kcdl0jad3nk5jpim6vjzbgkfhxnk7y492b3j2nznpcf"; + sha256 = "1pkv0jvvjc3grr0rvxni9b3j3hb22jaj0h70g476h9w54p0aljcb"; type = "gem"; }; - version = "7.0.8.1"; + version = "7.0.8.4"; }; activerecord-explain-analyze = { dependencies = ["activerecord" "pg"]; @@ -133,14 +133,14 @@ src: }; activestorage = { dependencies = ["actionpack" "activejob" "activerecord" "activesupport" "marcel" "mini_mime"]; - groups = ["default" "test"]; + groups = ["default" "development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0f4g3589i5ii4gdfazv6d9rjinr16aarh6g12v8378ck7jll3mhz"; + sha256 = "1qdqx20dqkg7iwzb8q5148x5sl9mr2063hxzy4i7i94af2d2vz6b"; type = "gem"; }; - version = "7.0.8.1"; + version = "7.0.8.4"; }; activesupport = { dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo"]; @@ -148,10 +148,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ff3x7q400flzhml131ix8zfwmh13h70rs6yzbzf513g781gbbxh"; + sha256 = "15z11983ws5svibg6rky9k2mgd4d4chnvddyxfpgn81b81q70139"; type = "gem"; }; - version = "7.0.8.1"; + version = "7.0.8.4"; }; acts-as-taggable-on = { dependencies = ["activerecord"]; @@ -233,10 +233,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "198k6ikkz6wdnl9i4m569s384sx2r2pyn4l74yvyhz6zdflvwrhg"; + sha256 = "1cnddcnrb0gwhi0w2hrmh53fkpdxxy2v80rfp2q1hrcf4mr41v6w"; type = "gem"; }; - version = "2.1.5"; + version = "2.1.6"; }; app_store_connect = { dependencies = ["activesupport" "jwt"]; @@ -400,10 +400,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "08h9apxdn2aflkg751j4i56ks4750znfbj56w4zlxf4jk7jxkbyk"; + sha256 = "146v6mhf8gma5vmzhz643sddwzhv3acapv7nhaisv4fcsf1lii1l"; type = "gem"; }; - version = "3.191.6"; + version = "3.197.0"; }; aws-sdk-kms = { dependencies = ["aws-sdk-core" "aws-sigv4"]; @@ -422,10 +422,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1al80phz4x9wwfnr07q1l8h5f0qxgfrrycbg8jvznhxm3zhrakrq"; + sha256 = "023h9xx65dd91z1sk9znhfwp4wr48imnnhdhvczv64m17r7ych4y"; type = "gem"; }; - version = "1.146.1"; + version = "1.151.0"; }; aws-sigv4 = { dependencies = ["aws-eventstream"]; @@ -538,10 +538,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "17d8wwj880zar5h8zxdmw878shgmljmmv957802fw5nkg3gi3xwk"; + sha256 = "04zjpzb2m1qjxk0lzdi5m812wyq5kkwcdbxs1asbm67lp0wgcjwn"; type = "gem"; }; - version = "2.0.1"; + version = "2.0.5"; }; bcrypt = { groups = ["default"]; @@ -625,6 +625,16 @@ src: }; version = "2.10.1"; }; + bigdecimal = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0cq1c29zbkcxgdihqisirhcw76xc768z2zpd5vbccpq0l1lv76g7"; + type = "gem"; + }; + version = "3.1.7"; + }; bindata = { groups = ["default"]; platforms = []; @@ -978,6 +988,17 @@ src: }; version = "4.0.1"; }; + coverband = { + dependencies = ["redis"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0cms6ppz367fqfynyzjdsy1lqrxkrh6vvfzznrw3mxhz1xmkb7wp"; + type = "gem"; + }; + version = "6.1.2"; + }; crack = { dependencies = ["safe_yaml"]; groups = ["default" "test"]; @@ -1599,10 +1620,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1d2z4ky2v15dpcz672i2p7lb2nc793dasq3yq3660h2az53kss9v"; + sha256 = "0r6zylqjfv0xhdxvldr0kgmnglm57nm506pcm6085f0xqa68cvnj"; type = "gem"; }; - version = "1.2.7"; + version = "1.2.11"; }; ethon = { dependencies = ["ffi"]; @@ -1973,15 +1994,15 @@ src: version = "2.1.0"; }; fog-google = { - dependencies = ["fog-core" "fog-json" "fog-xml" "google-apis-compute_v1" "google-apis-dns_v1" "google-apis-iamcredentials_v1" "google-apis-monitoring_v3" "google-apis-pubsub_v1" "google-apis-sqladmin_v1beta4" "google-apis-storage_v1" "google-cloud-env"]; + dependencies = ["addressable" "fog-core" "fog-json" "fog-xml" "google-apis-compute_v1" "google-apis-dns_v1" "google-apis-iamcredentials_v1" "google-apis-monitoring_v3" "google-apis-pubsub_v1" "google-apis-sqladmin_v1beta4" "google-apis-storage_v1" "google-cloud-env"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "127l22c7lhg166sylfhxys41p0i3nlkxkpzzgw8q9zip10irm41w"; + sha256 = "1q2qhdkz7axp1f853d3jxx852gj5idrqhypxk8k3zm9fs72lxmnw"; type = "gem"; }; - version = "1.19.0"; + version = "1.24.1"; }; fog-json = { dependencies = ["fog-core" "multi_json"]; @@ -2085,10 +2106,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1gzf4b6y5v0d5pbc0lq33383m3c8y8kq5yy57124lb9bblymszw9"; + sha256 = "0jfjp87f4zi5jp8ydwabvfz3dv115ickaaasbs8c096kfqjrgf1q"; type = "gem"; }; - version = "0.9.3"; + version = "0.9.5"; }; gemoji = { groups = ["default" "development" "test"]; @@ -2150,10 +2171,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1bp7lsqhcmb1fi1wsij1gbl0ip9jcwmzxagfg39c7dnm7xglycr4"; + sha256 = "10ms9zz9j1zvabgdldpsn0s8g7v8q7vn3dkyvzh551iijzqcvlgc"; type = "gem"; }; - version = "16.11.0.pre.rc1"; + version = "17.0.2"; }; gitlab = { dependencies = ["httparty" "terminal-table"]; @@ -2226,10 +2247,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0finxlax2pgxw85qnyz3p4pmi8dz6qj8bsjkrkrnkd93k41lyfcn"; + sha256 = "0sdaq9av30761h9x7kjwmwri22265x1dnpq24law6w9sqmgm8ygk"; type = "gem"; }; - version = "0.0.14"; + version = "0.0.17"; }; gitlab-housekeeper = { dependencies = ["activesupport" "awesome_print" "httparty" "rubocop"]; @@ -2242,7 +2263,7 @@ src: version = "0.1.0"; }; gitlab-http = { - dependencies = ["activesupport" "concurrent-ruby" "httparty" "ipaddress" "railties"]; + dependencies = ["activesupport" "concurrent-ruby" "httparty" "ipaddress" "net-http" "railties"]; groups = ["default"]; platforms = []; source = { @@ -2257,20 +2278,20 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1m41by1hly50yq9vsz5pbrb51yryf46n9pm7wnrinaisccrinl79"; + sha256 = "10gr7886pphgxg8ja1axba022l0b1c5mvqi1hfdhrvbh70f1vwim"; type = "gem"; }; - version = "0.35.1"; + version = "0.36.0"; }; gitlab-license = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "082ycgvq7j0kyqrbx8shipqk3lgz6i279caf1ljvk9h5wsqqy8zx"; + sha256 = "0k9zaybfzp7q8w07ghf44q3yngxyrr68l623r9v7il9aki36q5jc"; type = "gem"; }; - version = "2.4.0"; + version = "2.5.0"; }; gitlab-mail_room = { dependencies = ["jwt" "net-imap" "oauth2" "redis" "redis-namespace"]; @@ -2278,10 +2299,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1crw7k0mdzkrc94xw901dlmzzhhaa8a2bxyvk2y29h5w7pvkvgy7"; + sha256 = "06ivc4cbr5lc6lja947flzlppp3d9s44fwd3x8an0yvrq31yfg12"; type = "gem"; }; - version = "0.0.24"; + version = "0.0.25"; }; gitlab-markup = { groups = ["default"]; @@ -2375,15 +2396,15 @@ src: version = "0.11.0"; }; gitlab-styles = { - dependencies = ["rubocop" "rubocop-graphql" "rubocop-performance" "rubocop-rails" "rubocop-rspec"]; + dependencies = ["rubocop" "rubocop-factory_bot" "rubocop-graphql" "rubocop-performance" "rubocop-rails" "rubocop-rspec"]; groups = ["development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ss0p7al6vyf5qwzyfbgaaxpa3ykvszwc5in3p2mm5g9dh3frn0d"; + sha256 = "0cyi9sccg1h7ia12i9jwbq5ygic53c7pc08ms7i1h7qfmfq058yq"; type = "gem"; }; - version = "11.0.0"; + version = "12.0.1"; }; gitlab-utils = { dependencies = ["actionview" "activesupport" "addressable" "rake"]; @@ -2418,15 +2439,15 @@ src: version = "2.2.0"; }; gitlab_quality-test_tooling = { - dependencies = ["activesupport" "amatch" "gitlab" "http" "nokogiri" "parallel" "rainbow" "rspec-parameterized" "table_print" "zeitwerk"]; + dependencies = ["activesupport" "amatch" "gitlab" "http" "influxdb-client" "nokogiri" "parallel" "rainbow" "rspec-parameterized" "table_print" "zeitwerk"]; groups = ["test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1g4fsldxs63ds31sni422xk0g3yrr9jpga0bah5ip4hys8as3wl3"; + sha256 = "1wsizq4hxcwkd8si14q7hb8rxh9hygpm3s7s0f8cyz2b62ycdcnh"; type = "gem"; }; - version = "1.21.1"; + version = "1.28.0"; }; globalid = { dependencies = ["activesupport"]; @@ -2533,10 +2554,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0k7k1nanm4wqyx19m5x9xzzm3nvf89gg5vr1dq4nfyvkl8g668zm"; + sha256 = "0ivx6km85mlycb11x2rbkyg3kl4syy3730q7pk8h6zdkibbp7ljx"; type = "gem"; }; - version = "0.28.0"; + version = "0.36.0"; }; google-apis-iam_v1 = { dependencies = ["google-apis-core"]; @@ -2566,10 +2587,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0skk42y2y81jlj0qfk790wqz3sdaxrykrc4mp1ysr0zsinp654id"; + sha256 = "0a31sid7p4qn4m1gcq8z1bsqdyzzc84h4frh2dw97k5lwpff2zv7"; type = "gem"; }; - version = "0.37.0"; + version = "0.54.0"; }; google-apis-pubsub_v1 = { dependencies = ["google-apis-core"]; @@ -2577,10 +2598,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0gg1br0pj16iag3xax942g101zk4rk48isdpz5abyhc070amk45q"; + sha256 = "01dj7jx6dfyl4wz88nn7ml45qvck6khl7gli8h6hl9c1qwa4dzhx"; type = "gem"; }; - version = "0.30.0"; + version = "0.45.0"; }; google-apis-serviceusage_v1 = { dependencies = ["google-apis-core"]; @@ -2784,10 +2805,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0wdm44s7l6jxqszybf58ar7699vlq7vj2zfsi8f9sh9mh5a89dcy"; + sha256 = "0d16s18k34crhyc44ycj062y81sdahgp8pcll9xggbq7wja9w3z0"; type = "gem"; }; - version = "0.10.2"; + version = "1.0.1"; }; grape-path-helpers = { dependencies = ["activesupport" "grape" "rake" "ruby2_keywords"]; @@ -2806,10 +2827,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "018843mknkjs1ybazs7b8k7k0g67m1ldc42z8vlb5yinp9b9l4x7"; + sha256 = "07i1rl07ra81j4zhz7i8f34ja4dgaksdp5rjgmznk332040k2jxn"; type = "gem"; }; - version = "2.0.2"; + version = "2.1.0"; }; grape-swagger-entity = { dependencies = ["grape-entity" "grape-swagger"]; @@ -2866,15 +2887,15 @@ src: version = "1.0.0"; }; graphql = { - dependencies = ["racc"]; + dependencies = ["base64"]; groups = ["default" "development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0zmw8gslwqaydxvmvan0m2rpbgxplm77kwp64bg051cvnasb9vhm"; + sha256 = "0df94lkqsis1kqgjch12mkm8fh55d6s1lqp2fvjj6xr310v323q2"; type = "gem"; }; - version = "2.2.5"; + version = "2.3.4"; }; graphql-client = { dependencies = ["activesupport" "graphql"]; @@ -2904,10 +2925,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1bzkhy5yy4a8nlp89wwfw9bv4h358gsa9rvzn6i2y0z2ha5vmgqn"; + sha256 = "11ink0ayf14qgs3msn5a7dpg49vm3ck2415r64nfk1i8xv286hsz"; type = "gem"; }; - version = "1.60.0"; + version = "1.63.0"; }; grpc-google-iam-v1 = { dependencies = ["google-protobuf" "googleapis-common-protos" "grpc"]; @@ -2980,10 +3001,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "060vz5dx0ag3ggpwhwfcadfim0g8aabl0b1dvnzagizymfsw2g92"; + sha256 = "1mf24djxk6968n0ypwbib790nzijcf03m4kw0dnks8csfxj6hy9g"; type = "gem"; }; - version = "0.53.0"; + version = "0.58.0"; }; hamlit = { dependencies = ["temple" "thor" "tilt"]; @@ -3221,10 +3242,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "00lzkgzr6zmnlbqcfsb38b4d3762wslx0v32nsy6052jksvas7xm"; + sha256 = "1j01r3rhai3h0bgq7npi49xz6ahm5sj6zag8b0l3amdxp82wb7ay"; type = "gem"; }; - version = "2.9.0"; + version = "3.1.0"; }; invisible_captcha = { dependencies = ["rails"]; @@ -3265,7 +3286,7 @@ src: path = "${src}/gems/ipynbdiff"; type = "path"; }; - version = "0.4.7"; + version = "0.4.8"; }; jaeger-client = { dependencies = ["opentracing" "thrift"]; @@ -3433,10 +3454,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "13bkqrdz1rdn23nn0zni7vdvwnm34apgi3xy42djhhxl698888dv"; + sha256 = "0dffbnw10hld4vpack6xw14n590b9fgqv5cxgap3f7qzzdd6yybc"; type = "gem"; }; - version = "0.4.0"; + version = "0.5.0"; }; knapsack = { dependencies = ["rake"]; @@ -3508,10 +3529,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "08y6f6f4nhg4dc96rbawhjjalxn0chzvvza5d8qfzsac6zl83094"; + sha256 = "1rbw6vr1chabkd0p3sqxcpva77vxgk3a1pzrv7h4m73jx4bixdbq"; type = "gem"; }; - version = "1.6.8"; + version = "1.6.14"; }; letter_opener = { dependencies = ["launchy"]; @@ -3551,10 +3572,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0sig4ifxzvcz3fwjnz93dpv61v6sxpmlknj5f8n112ragrbcj8hb"; + sha256 = "0v66fb85majc816qip42kbwcn41lr6rm5w6zim4a2kgp74v0n0kd"; type = "gem"; }; - version = "7.0.1"; + version = "7.1.0"; }; licensee = { dependencies = ["dotenv" "octokit" "reverse_markdown" "rugged" "thor"]; @@ -3637,10 +3658,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0kxnshqv3xv3hprnn4rsqq0djrqpmfcr7x8qmwy6p91g7yqhkhx5"; + sha256 = "0ffwg0lnvzfaxp9z7gynll1d4hlxm4ma2c05qcwqrznj7d7jkfnn"; type = "gem"; }; - version = "2.2.2"; + version = "2.3.1"; }; lru_redux = { groups = ["default"]; @@ -3960,10 +3981,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1r9k34xz7x7fpd18bix0cd5bk2wv6mj8z67f8fr7l30d2717m23h"; + sha256 = "1a7bwycd8svpxp5plnm84iyn1cxhc4s7msgpv61axfdi4k6bp5dp"; type = "gem"; }; - version = "0.2.3"; + version = "0.3.2"; }; nenv = { groups = ["default" "test"]; @@ -3976,15 +3997,15 @@ src: version = "0.3.0"; }; net-http = { - dependencies = ["net-protocol" "uri"]; + dependencies = ["uri"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "11mymfxpsgpwr1qbv8vwj8av9kksqj0632p9s3x35bzrnq4y393m"; + sha256 = "10n2n9aq00ih8v881af88l1zyrqgs5cl3njdw8argjwbl5ggqvm9"; type = "gem"; }; - version = "0.1.1"; + version = "0.4.1"; }; net-http-persistent = { dependencies = ["connection_pool"]; @@ -4263,38 +4284,6 @@ src: }; version = "2.0.0"; }; - omniauth-azure-oauth2 = { - dependencies = ["jwt" "omniauth" "omniauth-oauth2"]; - groups = ["default"]; - platforms = []; - source = { - path = "${src}/vendor/gems/omniauth-azure-oauth2"; - type = "path"; - }; - version = "0.0.10"; - }; - omniauth-dingtalk-oauth2 = { - dependencies = ["omniauth-oauth2"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "16qkd51f1ab1hw4az27qj3vk958aal67by8djsplwd1q3h7nfib5"; - type = "gem"; - }; - version = "1.0.1"; - }; - omniauth-facebook = { - dependencies = ["omniauth-oauth2"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "03zjla9i446fk1jkw7arh67c39jfhp5bhkmhvbw8vczxr1jkbbh5"; - type = "gem"; - }; - version = "4.0.0"; - }; omniauth-github = { dependencies = ["omniauth" "omniauth-oauth2"]; groups = ["default"]; @@ -4327,17 +4316,6 @@ src: }; version = "1.1.1"; }; - omniauth-oauth = { - dependencies = ["oauth" "omniauth"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0yw2vzx633p9wpdkd4jxsih6mw604mj7f6myyfikmj4d95c8d9z7"; - type = "gem"; - }; - version = "1.2.0"; - }; omniauth-oauth2 = { dependencies = ["oauth2" "omniauth"]; groups = ["default"]; @@ -4392,17 +4370,6 @@ src: }; version = "2.0.0"; }; - omniauth-twitter = { - dependencies = ["omniauth-oauth" "rack"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0r5j65hkpgzhvvbs90id3nfsjgsad6ymzggbm7zlaxvnrmvnrk65"; - type = "gem"; - }; - version = "1.4.0"; - }; omniauth_crowd = { dependencies = ["activesupport" "nokogiri" "omniauth"]; groups = ["default"]; @@ -4466,6 +4433,324 @@ src: }; version = "1.3.0"; }; + opentelemetry-api = { + groups = ["default" "opentelemetry"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1j9c2a4wgw0jaw63qscfasw3lf3kr45q83p4mmlf0bndcq2rlgdb"; + type = "gem"; + }; + version = "1.2.5"; + }; + opentelemetry-common = { + dependencies = ["opentelemetry-api"]; + groups = ["default" "opentelemetry"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "160ws06d8mzx3hwjss2i954h8r86dp3sw95k2wrbq81sb121m2gy"; + type = "gem"; + }; + version = "0.21.0"; + }; + opentelemetry-exporter-otlp = { + dependencies = ["google-protobuf" "googleapis-common-protos-types" "opentelemetry-api" "opentelemetry-common" "opentelemetry-sdk" "opentelemetry-semantic_conventions"]; + groups = ["opentelemetry"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0k4y30x7l29kgkydn966qcwvf35phx0c9n3c2zinw64pvrmcyl00"; + type = "gem"; + }; + version = "0.27.0"; + }; + opentelemetry-helpers-sql-obfuscation = { + dependencies = ["opentelemetry-common"]; + groups = ["default" "opentelemetry"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0cnlr3gqmd2q9wcaxhvlkxkbjvvvkp4vzcwif1j7kydw7lvz2vmw"; + type = "gem"; + }; + version = "0.1.0"; + }; + opentelemetry-instrumentation-action_pack = { + dependencies = ["opentelemetry-api" "opentelemetry-instrumentation-base" "opentelemetry-instrumentation-rack"]; + groups = ["opentelemetry"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "16nbkayp8jb2zkqj2rmqd4d1mz4wdf0zg6jx8b0vzkf9mxr89py5"; + type = "gem"; + }; + version = "0.9.0"; + }; + opentelemetry-instrumentation-action_view = { + dependencies = ["opentelemetry-api" "opentelemetry-instrumentation-active_support" "opentelemetry-instrumentation-base"]; + groups = ["opentelemetry"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0xfbqgw497k2f56f68k7zsvmrrk5jk69xhl56227dfxlw15p2z5w"; + type = "gem"; + }; + version = "0.7.0"; + }; + opentelemetry-instrumentation-active_job = { + dependencies = ["opentelemetry-api" "opentelemetry-instrumentation-base"]; + groups = ["opentelemetry"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "12c0qr980zr4si2ps55aj3zj84zycg3zcf16nh6mizljkmn8096s"; + type = "gem"; + }; + version = "0.7.1"; + }; + opentelemetry-instrumentation-active_record = { + dependencies = ["opentelemetry-api" "opentelemetry-instrumentation-base"]; + groups = ["opentelemetry"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0wjfd1dmfzcnvss2jsnc2s3g6p0wfq5ay3vfnidkmisgyw7fphfk"; + type = "gem"; + }; + version = "0.7.2"; + }; + opentelemetry-instrumentation-active_support = { + dependencies = ["opentelemetry-api" "opentelemetry-instrumentation-base"]; + groups = ["opentelemetry"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0rjajgb7sj3mrw5d79xm7q3f4mns1fc3ngasjfw10i18x0kq7283"; + type = "gem"; + }; + version = "0.5.1"; + }; + opentelemetry-instrumentation-aws_sdk = { + dependencies = ["opentelemetry-api" "opentelemetry-instrumentation-base"]; + groups = ["opentelemetry"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "191p0d0yvlwakppzhfq7nkakbz4psby0h0bgx8p5apdc7vz2mmmr"; + type = "gem"; + }; + version = "0.5.2"; + }; + opentelemetry-instrumentation-base = { + dependencies = ["opentelemetry-api" "opentelemetry-registry"]; + groups = ["default" "opentelemetry"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0pv064ksiynin8hzvljkwm5vlkgr8kk6g3qqpiwcik860i7l677n"; + type = "gem"; + }; + version = "0.22.3"; + }; + opentelemetry-instrumentation-concurrent_ruby = { + dependencies = ["opentelemetry-api" "opentelemetry-instrumentation-base"]; + groups = ["opentelemetry"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1xmx1rxdvf835kvad352rcavwkk3x758q0rznx2npay3mm8bbcbg"; + type = "gem"; + }; + version = "0.21.3"; + }; + opentelemetry-instrumentation-ethon = { + dependencies = ["opentelemetry-api" "opentelemetry-common" "opentelemetry-instrumentation-base"]; + groups = ["opentelemetry"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1h5sa5in4b5yh8xgsgpk2spzhvkakinyi81mccgfy39zvz1p1i1i"; + type = "gem"; + }; + version = "0.21.5"; + }; + opentelemetry-instrumentation-excon = { + dependencies = ["opentelemetry-api" "opentelemetry-common" "opentelemetry-instrumentation-base"]; + groups = ["opentelemetry"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0im1ljdz4xd2498ss919gsqmv8r4ipk4rkwhf8ai0diw58qwa78p"; + type = "gem"; + }; + version = "0.22.2"; + }; + opentelemetry-instrumentation-faraday = { + dependencies = ["opentelemetry-api" "opentelemetry-common" "opentelemetry-instrumentation-base"]; + groups = ["opentelemetry"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1a3hx6linkdwmy5pax0khm64w68d2c7536yzc3svppivhxnfank9"; + type = "gem"; + }; + version = "0.24.3"; + }; + opentelemetry-instrumentation-grape = { + dependencies = ["opentelemetry-api" "opentelemetry-instrumentation-base" "opentelemetry-instrumentation-rack"]; + groups = ["opentelemetry"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0c33cg6a2ykpc5215v1a1pqhvad5wld6pz0m32zxhai5psxj3110"; + type = "gem"; + }; + version = "0.1.8"; + }; + opentelemetry-instrumentation-graphql = { + dependencies = ["opentelemetry-api" "opentelemetry-instrumentation-base"]; + groups = ["opentelemetry"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "13lbvcbszr20b7li8mm007rnm59np5y7zz5a36jchbz8503dhfai"; + type = "gem"; + }; + version = "0.28.2"; + }; + opentelemetry-instrumentation-http = { + dependencies = ["opentelemetry-api" "opentelemetry-instrumentation-base"]; + groups = ["opentelemetry"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1yncpv6i2cagjyq1srdqddf6mh0q9s04kfi9q1rh9qbsxqbp5cff"; + type = "gem"; + }; + version = "0.23.3"; + }; + opentelemetry-instrumentation-http_client = { + dependencies = ["opentelemetry-api" "opentelemetry-common" "opentelemetry-instrumentation-base"]; + groups = ["opentelemetry"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "038bpsg4bfix3ap7l9f8jqkb1acl3v0p7c2jd7bj1116v4ycdcvc"; + type = "gem"; + }; + version = "0.22.5"; + }; + opentelemetry-instrumentation-net_http = { + dependencies = ["opentelemetry-api" "opentelemetry-common" "opentelemetry-instrumentation-base"]; + groups = ["opentelemetry"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1gppqpy2c48xj2jlcd1lkmr3wh3qhwf14337wjk2w0qq77h11gcr"; + type = "gem"; + }; + version = "0.22.5"; + }; + opentelemetry-instrumentation-pg = { + dependencies = ["opentelemetry-api" "opentelemetry-helpers-sql-obfuscation" "opentelemetry-instrumentation-base"]; + groups = ["opentelemetry"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1k9m9v4i42y53s85b8y7vz4dj4y00v1gg8392rkrswl5f72fk2dn"; + type = "gem"; + }; + version = "0.27.3"; + }; + opentelemetry-instrumentation-rack = { + dependencies = ["opentelemetry-api" "opentelemetry-common" "opentelemetry-instrumentation-base"]; + groups = ["opentelemetry"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1dc2ds4vaqybfpzp98p79z9kgpdagljsgbjbhpi0i9jrlh2xnddy"; + type = "gem"; + }; + version = "0.24.4"; + }; + opentelemetry-instrumentation-rails = { + dependencies = ["opentelemetry-api" "opentelemetry-instrumentation-action_pack" "opentelemetry-instrumentation-action_view" "opentelemetry-instrumentation-active_job" "opentelemetry-instrumentation-active_record" "opentelemetry-instrumentation-active_support" "opentelemetry-instrumentation-base"]; + groups = ["opentelemetry"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0hiihby0lndwvny1alba1mvvag48z55vjjrwbjppb700prv0q1kk"; + type = "gem"; + }; + version = "0.30.1"; + }; + opentelemetry-instrumentation-rake = { + dependencies = ["opentelemetry-api" "opentelemetry-instrumentation-base"]; + groups = ["opentelemetry"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0840gnlr90nbl430yc72czn26bngdp94v4adz7q9ph3pmdm8mppv"; + type = "gem"; + }; + version = "0.2.2"; + }; + opentelemetry-instrumentation-redis = { + dependencies = ["opentelemetry-api" "opentelemetry-common" "opentelemetry-instrumentation-base"]; + groups = ["opentelemetry"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1mrkcd8mdvfgrqalnav4dh3hvd1f91yq718n1mdb56jkd607kknp"; + type = "gem"; + }; + version = "0.25.5"; + }; + opentelemetry-instrumentation-sidekiq = { + dependencies = ["opentelemetry-api" "opentelemetry-common" "opentelemetry-instrumentation-base"]; + groups = ["opentelemetry"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "18x3x06dfydaqqab4k6yykqhy2axppyf9q63sh2da893jphb5qac"; + type = "gem"; + }; + version = "0.25.4"; + }; + opentelemetry-registry = { + dependencies = ["opentelemetry-api"]; + groups = ["default" "opentelemetry"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "08k8zqrg47v1jxcvxz9wxyqm03kjdw98qa8q0y840qvh988vcshi"; + type = "gem"; + }; + version = "0.3.0"; + }; + opentelemetry-sdk = { + dependencies = ["opentelemetry-api" "opentelemetry-common" "opentelemetry-registry" "opentelemetry-semantic_conventions"]; + groups = ["opentelemetry"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1ajf9igx63r6r2ds0f3hxd18iragvr88k2k9kzvamp1jkdna6gsi"; + type = "gem"; + }; + version = "1.4.1"; + }; + opentelemetry-semantic_conventions = { + dependencies = ["opentelemetry-api"]; + groups = ["default" "opentelemetry"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0xhv5fwwgjj2k8ksprpg1nm5v8k3w6gyw4wiq2k08q3kf484rlhk"; + type = "gem"; + }; + version = "1.10.0"; + }; opentracing = { groups = ["default"]; platforms = []; @@ -4555,10 +4840,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "07vnk6bb54k4yc06xnwck7php50l09vvlw1ga8wdz0pia461zpzb"; + sha256 = "15wkxrg1sj3n1h2g8jcrn7gcapwcgxr659ypjf75z1ipkgxqxwsv"; type = "gem"; }; - version = "1.22.1"; + version = "1.24.0"; }; parser = { dependencies = ["ast" "racc"]; @@ -4682,10 +4967,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0pgxgng905jbhp0pr54w4w2pr4nqcq80ijj48204bj4x4nigj8ji"; + sha256 = "0ps7lydh1jsqv02vmb1lgky80hi8wcvbv6lfybxgb9q80cx88b55"; type = "gem"; }; - version = "0.24.0"; + version = "0.29.0"; }; proc_to_ast = { dependencies = ["coderay" "parser" "unparser"]; @@ -4925,14 +5210,14 @@ src: }; rails = { dependencies = ["actioncable" "actionmailbox" "actionmailer" "actionpack" "actiontext" "actionview" "activejob" "activemodel" "activerecord" "activestorage" "activesupport" "railties"]; - groups = ["default" "test"]; + groups = ["default" "development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1v9dp9sgh8kk32r23mj66zjni7w1dv2h7mbaxgmazsf59a43gsvx"; + sha256 = "1sv5jzd3varqzcqm8zxllwiqzgbgcymszw12ci3f9zbzlliq8hby"; type = "gem"; }; - version = "7.0.8.1"; + version = "7.0.8.4"; }; rails-controller-testing = { dependencies = ["actionpack" "actionview" "activesupport"]; @@ -4973,10 +5258,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1lrbrx88ic42adcj36wip3dk1svmqld1f7qksngi4b9kqnc8w5g3"; + sha256 = "0s8kvic2ia34ngssz6h15wqj0k3wwblhyh0f9v0j3gy7ly0dp161"; type = "gem"; }; - version = "7.0.3"; + version = "7.0.9"; }; railties = { dependencies = ["actionpack" "activesupport" "method_source" "rake" "thor" "zeitwerk"]; @@ -4984,10 +5269,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "08ga56kz6a37dnlmi7y45r19fcc7jzb62mrc3ifavbzggmhy7r62"; + sha256 = "02z7lqx0y60bzpkd4v67i9sbdh7djs0mm89h343kidx0gmq0kbh0"; type = "gem"; }; - version = "7.0.8.1"; + version = "7.0.8.4"; }; rainbow = { groups = ["coverage" "default" "development" "test"]; @@ -5035,10 +5320,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "131sa2jvc7b1yld3nzc0xq7lvwvql7b8c09i0xv2brzjybammlv5"; + sha256 = "1jjcxfwwr70l46wylv68mjnazi4zfwn7fn5yb2wnfs4hwzcbwdca"; type = "gem"; }; - version = "0.9.86"; + version = "0.9.94"; }; rbtrace = { dependencies = ["ffi" "msgpack" "optimist"]; @@ -5119,10 +5404,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1n7k4sgx5vzsigp8c15flz4fclqy4j2a33vim7b2c2w5jyjhwxrv"; + sha256 = "1d1ng78dwbzgfg1sljf9bnx2km5y3p3jc42a9npwcrmiard9fsrk"; type = "gem"; }; - version = "5.0.8"; + version = "5.2.0"; }; redis-actionpack = { dependencies = ["actionpack" "redis-rack" "redis-store"]; @@ -5141,10 +5426,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0irk5j73aqhyv54q3vs88y5rp9a5fkvbdif7zn5q7m5d51h2375w"; + sha256 = "1h5cgdv40zk0ph1nl64ayhn6anzwy6mbxyi7fci9n404ryvy9zii"; type = "gem"; }; - version = "0.21.1"; + version = "0.22.2"; }; redis-cluster-client = { dependencies = ["redis-client"]; @@ -5152,10 +5437,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "12p7wi39zaldk8lr484j4j6w49502fxayinfs9f7l58pvag1rz8j"; + sha256 = "107ban04brh3f6xwy4rcy83a6kgq0r71jdfyjz95ggg2hs51pv8w"; type = "gem"; }; - version = "0.7.5"; + version = "0.8.2"; }; redis-clustering = { dependencies = ["redis" "redis-cluster-client"]; @@ -5163,10 +5448,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0rp1yrqpvi29ar6mlqsyk36nxgh1drijb4f5xa76c057n7iksbwf"; + sha256 = "13h3w100848y272vykm1bwyj29z749pa9sfcjqd0k0fx1f73hpv8"; type = "gem"; }; - version = "5.0.8"; + version = "5.2.0"; }; redis-namespace = { dependencies = ["redis"]; @@ -5174,10 +5459,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "154dfnrjpbv7fhwhfrcnp6jn9qv5qaj3mvlvbgkl7qy5qsknw71c"; + sha256 = "0f92i9cwlp6xj6fyn7qn4qsaqvxfw4wqvayll7gbd26qnai1l6p9"; type = "gem"; }; - version = "1.10.0"; + version = "1.11.0"; }; redis-rack = { dependencies = ["rack-session" "redis-store"]; @@ -5408,10 +5693,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "11mk52x34j957rqccxfqlsqjzg26dz04ipd1v4yx5yraqx1v01ww"; + sha256 = "1hplygik9p5d92lhb9412lzap8msrmry2qrrq5d1f90r170dwmml"; type = "gem"; }; - version = "1.0.0"; + version = "1.0.2"; }; rspec-parameterized-core = { dependencies = ["parser" "proc_to_ast" "rspec" "unparser"]; @@ -5495,10 +5780,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "06qnp5zs233j4f59yyqrg8al6hr9n4a7vcdg3p31v0np8bz9srwg"; + sha256 = "0daamn13fbm77rdwwa4w6j6221iq6091asivgdhk6n7g398frcdf"; type = "gem"; }; - version = "1.57.2"; + version = "1.62.1"; }; rubocop-ast = { dependencies = ["parser"]; @@ -5506,10 +5791,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "188bs225kkhrb17dsf3likdahs2p1i1sqn0pr3pvlx50g6r2mnni"; + sha256 = "1v3q8n48w8h809rqbgzihkikr4g3xk72m1na7s97jdsmjjq6y83w"; type = "gem"; }; - version = "1.29.0"; + version = "1.31.2"; }; rubocop-capybara = { dependencies = ["rubocop"]; @@ -5517,10 +5802,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1jwwi5a05947q9zsk6i599zxn657hdphbmmbbpx17qsv307rwcps"; + sha256 = "0f5r9di123hc4x2h453a143986plfzz9935bwc7267wj8awl8s1a"; type = "gem"; }; - version = "2.19.0"; + version = "2.20.0"; }; rubocop-factory_bot = { dependencies = ["rubocop"]; @@ -5528,10 +5813,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1y79flwjwlaslyhfpg84di9n756ir6bm52n964620xsj658d661h"; + sha256 = "0d012phc7z5h1j1d2aisnbkmqlb95sld5jriia5qg2gpgbg1nxb2"; type = "gem"; }; - version = "2.24.0"; + version = "2.25.1"; }; rubocop-graphql = { dependencies = ["rubocop"]; @@ -5539,10 +5824,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0hryrjmcl04br06ibjzzrbb2am8ybbhnl2l7w13xl3wz3k4jyjxs"; + sha256 = "1sw242bz2al9c1arprim9pd0kks8wbla77kkjvwp7kp1m01dc0lm"; type = "gem"; }; - version = "0.19.0"; + version = "1.5.1"; }; rubocop-performance = { dependencies = ["rubocop" "rubocop-ast"]; @@ -5550,21 +5835,21 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1pzsrnjmrachdjxzl9jpw47cydicn3408vgdg3a4bss4v5r42rjj"; + sha256 = "0cf7fn4dwf45r3nhnda0dhnwn8qghswyqbfxr2ippb3z8a6gmc8v"; type = "gem"; }; - version = "1.19.1"; + version = "1.20.2"; }; rubocop-rails = { - dependencies = ["activesupport" "rack" "rubocop"]; + dependencies = ["activesupport" "rack" "rubocop" "rubocop-ast"]; groups = ["default" "development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0imxmki4qc5pji31wn491smaq531ncngnv6d4xvbpn11cgdkqryv"; + sha256 = "06dcxrr71sn0kkw8fwh0w884zbig2ilxpkl66s7lcis9jmkggv83"; type = "gem"; }; - version = "2.22.1"; + version = "2.24.1"; }; rubocop-rspec = { dependencies = ["rubocop" "rubocop-capybara" "rubocop-factory_bot"]; @@ -5572,10 +5857,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1wwrgcigdrrlgg4nwbl18qfyjks519kqbbly5adrdffvh428lgq8"; + sha256 = "17ksg89i1k5kyhi241pc0zyzmq1n7acxg0zybav5vrqbf02cw9rg"; type = "gem"; }; - version = "2.25.0"; + version = "2.27.1"; }; ruby-fogbugz = { dependencies = ["crack" "multipart-post"]; @@ -5594,21 +5879,21 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ja3ag2q0w8xsbf25sf2x98gvdia534ld2m8hn1bfwzhwb5ysfsl"; + sha256 = "0730631afd1iadx51izm2adygwqd7aii95gdmy405d847x35bmf3"; type = "gem"; }; - version = "0.14.6"; + version = "0.16.7"; }; ruby-lsp-rails = { - dependencies = ["actionpack" "activerecord" "railties" "ruby-lsp" "sorbet-runtime"]; + dependencies = ["ruby-lsp" "sorbet-runtime"]; groups = ["development"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1hrb39svnd8v6vnd3vyzsby6qr0z28cj0v9r02hcjvadm2p67g03"; + sha256 = "1pdr6ir97af633lg0dkdasjflfmrlf50ad4x4jq7a712x4p1fxag"; type = "gem"; }; - version = "0.3.3"; + version = "0.3.6"; }; ruby-lsp-rspec = { dependencies = ["ruby-lsp"]; @@ -5616,10 +5901,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0npxb9146yqfwpyx3bw375q8vx60ph2zgbvpai1dmgq8dfs3idki"; + sha256 = "11nc5ysf3rq47v7h9v17ivmca62bj7lm6x80fy5fpj45vxh7pz1l"; type = "gem"; }; - version = "0.1.10"; + version = "0.1.11"; }; ruby-magic = { dependencies = ["mini_portile2"]; @@ -5805,10 +6090,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0rjh9s5x7jqaxjfcz2m3hphhlajk9nxs6wdsnia62iba07bd32sc"; + sha256 = "0qrjr30qs01b27km6ipzc2zasdlzhdgri5q7qrb53z1j8l0n82y3"; type = "gem"; }; - version = "4.19.0"; + version = "4.21.1"; }; semver_dialects = { dependencies = ["deb_version" "pastel" "thor" "tty-command"]; @@ -5816,10 +6101,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1zhnq4wkcy8vv6qazfg0p3zrlswxhz9glqnq2991p4vg86grq1b0"; + sha256 = "0d9q502kp1az64lk0psblgdi50s5mr8x8g8k19avivkna0v5z6fs"; type = "gem"; }; - version = "2.0.2"; + version = "3.0.1"; }; sentry-rails = { dependencies = ["railties" "sentry-ruby"]; @@ -5827,32 +6112,21 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1gby2dx2h487y8ziisy57ba8mj6scpg6az49n4p989kc2fn2zalr"; - type = "gem"; - }; - version = "5.10.0"; - }; - sentry-raven = { - dependencies = ["faraday"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0jin9x4f43lplglhr9smv2wxsjgmph2ygqlci4s0v0aq5493ng8h"; + sha256 = "0ncl8br0k6fas4n6c4xw4wr59kq5s2liqn1s4790m73k5p272xq1"; type = "gem"; }; - version = "3.1.2"; + version = "5.17.3"; }; sentry-ruby = { - dependencies = ["concurrent-ruby"]; + dependencies = ["bigdecimal" "concurrent-ruby"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "069n32qqhhv91slyvzh92vqw3gp232qqz652yc894c71mv028p0i"; + sha256 = "1z5v5zzasy04hbgxbj9n8bb39ayllvps3snfgbc5rydh1d5ilyb1"; type = "gem"; }; - version = "5.10.0"; + version = "5.17.3"; }; sentry-sidekiq = { dependencies = ["sentry-ruby" "sidekiq"]; @@ -5860,10 +6134,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "06pagbphvmwp8yk3rcnhl7mbnc0hnvhcjhanzgiipyrk0y6h30fc"; + sha256 = "0n1cr9g15hp08jsqabprd6q34ap61r71f33x28w1xr4ri4hllwfh"; type = "gem"; }; - version = "5.10.0"; + version = "5.17.3"; }; sexp_processor = { groups = ["default" "test"]; @@ -6361,10 +6635,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "09zw1y52yhzw2z01za87dglpfpdrm1dma00629wpq6462nxq9574"; + sha256 = "0rwnq67qm2ngz066sncvg0dv65bsk29qz3xarbv8qan2hi7yw0qg"; type = "gem"; }; - version = "1.3.2"; + version = "1.3.3"; }; test_file_finder = { dependencies = ["faraday"]; @@ -6802,10 +7076,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1zy51z0whkm3fdpsbi8v4j8h5h3ia1zkc2j28amiznpqqvfc7539"; + sha256 = "12xi88jvx49p15nx2168wm0r00g90mb4cxzzsjxz92akjk92mkpj"; type = "gem"; }; - version = "3.11.0"; + version = "3.12.1"; }; virtus = { dependencies = ["axiom-types" "coercible" "descendants_tracker"]; @@ -6899,10 +7173,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "07zk8ljq5kyd1mm9qw3452fcnf7frg3irh9ql8ln2m8zbi1qf1qh"; + sha256 = "158d2ikjfzw43kgm095klp43ihphk0cv5xjprk44w73xfv03i9qg"; type = "gem"; }; - version = "3.23.0"; + version = "3.23.1"; }; webrick = { groups = ["default" "development" "test"]; diff --git a/pkgs/applications/version-management/meld/default.nix b/pkgs/applications/version-management/meld/default.nix index f5e66083553cb..681da8792f397 100644 --- a/pkgs/applications/version-management/meld/default.nix +++ b/pkgs/applications/version-management/meld/default.nix @@ -13,6 +13,7 @@ , gtk3 , gtksourceview4 , gnome +, adwaita-icon-theme , gsettings-desktop-schemas }: @@ -44,7 +45,7 @@ python3.pkgs.buildPythonApplication rec { gtk3 gtksourceview4 gsettings-desktop-schemas - gnome.adwaita-icon-theme + adwaita-icon-theme ]; pythonPath = with python3.pkgs; [ diff --git a/pkgs/applications/video/byzanz/default.nix b/pkgs/applications/video/byzanz/default.nix index bc88c24814678..a19f03727023b 100644 --- a/pkgs/applications/video/byzanz/default.nix +++ b/pkgs/applications/video/byzanz/default.nix @@ -3,7 +3,7 @@ , wrapGAppsHook3 , cairo , glib -, gnome +, gnome-common , gst_all_1 , gtk3 , intltool @@ -37,7 +37,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ pkg-config intltool ]; buildInputs = [ which - gnome.gnome-common + gnome-common glib libtool cairo diff --git a/pkgs/applications/video/clapper/default.nix b/pkgs/applications/video/clapper/default.nix index 78bfaa2b46373..12a66c90e8d54 100644 --- a/pkgs/applications/video/clapper/default.nix +++ b/pkgs/applications/video/clapper/default.nix @@ -22,13 +22,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "clapper"; - version = "0.6.0"; + version = "0.6.1"; src = fetchFromGitHub { owner = "Rafostar"; repo = "clapper"; rev = finalAttrs.version; - hash = "sha256-5fD1OnVcY3ZC+QfoFqe2jV43/J36r85SpLUYF2ti7dY="; + hash = "sha256-IQJTnLB6FzYYPONOqBkvi89iF0U6fx/aWYvNOOJpBvc="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/video/coriander/default.nix b/pkgs/applications/video/coriander/default.nix deleted file mode 100644 index 80892b96c94b6..0000000000000 --- a/pkgs/applications/video/coriander/default.nix +++ /dev/null @@ -1,45 +0,0 @@ -{ lib -, stdenv -, fetchurl -, pkg-config -, glib -, gtk2 -, libgnomeui -, libXv -, libraw1394 -, libdc1394 -, SDL -, automake -, GConf -}: - -stdenv.mkDerivation rec { - pname = "coriander"; - version = "2.0.1"; - - src = fetchurl { - url = "http://damien.douxchamps.net/ieee1394/coriander/archives/coriander-${version}.tar.gz"; - sha256 = "0l6hpfgy5r4yardilmdrggsnn1fbfww516sk5a90g1740cd435x5"; - }; - - # Workaround build failure on -fno-common toolchains: - # ld: subtitles.o:src/coriander.h:110: multiple definition of - # `main_window'; main.o:src/coriander.h:110: first defined here - env.NIX_CFLAGS_COMPILE = "-fcommon"; - - preConfigure = '' - cp ${automake}/share/automake-*/mkinstalldirs . - ''; - - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ glib gtk2 libgnomeui libXv libraw1394 libdc1394 SDL GConf ]; - - meta = { - homepage = "https://damien.douxchamps.net/ieee1394/coriander/"; - description = "GUI for controlling a Digital Camera through the IEEE1394 bus"; - license = lib.licenses.gpl3Plus; - maintainers = with lib.maintainers; [ viric ]; - platforms = with lib.platforms; linux; - mainProgram = "coriander"; - }; -} diff --git a/pkgs/applications/video/dvdstyler/default.nix b/pkgs/applications/video/dvdstyler/default.nix index db3f6e7f9a54e..ec15a47090fdb 100644 --- a/pkgs/applications/video/dvdstyler/default.nix +++ b/pkgs/applications/video/dvdstyler/default.nix @@ -24,7 +24,6 @@ , zip , dvdisasterSupport ? true, dvdisaster ? null -, thumbnailSupport ? true, libgnomeui ? null , udevSupport ? true, udev ? null , dbusSupport ? true, dbus ? null }: @@ -72,8 +71,7 @@ in stdenv.mkDerivation rec { ] ++ optionals dvdisasterSupport [ dvdisaster ] ++ optionals udevSupport [ udev ] - ++ optionals dbusSupport [ dbus ] - ++ optionals thumbnailSupport [ libgnomeui ]; + ++ optionals dbusSupport [ dbus ]; enableParallelBuilding = true; diff --git a/pkgs/applications/video/obs-studio/default.nix b/pkgs/applications/video/obs-studio/default.nix index 418d9adf8263b..82b557d449e17 100644 --- a/pkgs/applications/video/obs-studio/default.nix +++ b/pkgs/applications/video/obs-studio/default.nix @@ -48,8 +48,6 @@ , nlohmann_json , websocketpp , asio -, decklinkSupport ? false -, blackmagic-desktop-video , libdatachannel , libvpl , qrcodegencpp @@ -167,8 +165,6 @@ stdenv.mkDerivation (finalAttrs: { xorg.libX11 libvlc libGL - ] ++ optionals decklinkSupport [ - blackmagic-desktop-video ]; in '' # Remove libcef before patchelf, otherwise it will fail diff --git a/pkgs/applications/video/obs-studio/plugins/obs-vertical-canvas.nix b/pkgs/applications/video/obs-studio/plugins/obs-vertical-canvas.nix index c43b823dd7f81..5f47c666078c4 100644 --- a/pkgs/applications/video/obs-studio/plugins/obs-vertical-canvas.nix +++ b/pkgs/applications/video/obs-studio/plugins/obs-vertical-canvas.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "obs-vertical-canvas"; - version = "1.4.4"; + version = "1.4.5"; src = fetchFromGitHub { owner = "Aitum"; repo = "obs-vertical-canvas"; rev = version; - sha256 = "sha256-RBsdYG73SoX+dB4sUq641SL0ETUFE+PVAmr/DaqMuLI="; + sha256 = "sha256-4BmTp/PrR01H9IrKNX9ZpK4kLaiNG/G9rTMf9dsoV0s="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/applications/video/rtabmap/default.nix b/pkgs/applications/video/rtabmap/default.nix index 3b457530fbf29..a720e672c783d 100644 --- a/pkgs/applications/video/rtabmap/default.nix +++ b/pkgs/applications/video/rtabmap/default.nix @@ -68,7 +68,7 @@ stdenv.mkDerivation rec { description = "Real-Time Appearance-Based 3D Mapping"; homepage = "https://introlab.github.io/rtabmap/"; license = licenses.bsd3; - maintainers = with maintainers; [ ckie ]; + maintainers = with maintainers; [ ]; platforms = with platforms; linux; }; } diff --git a/pkgs/applications/video/timelens/default.nix b/pkgs/applications/video/timelens/default.nix index b80d1c3c447b8..2124813f417fd 100644 --- a/pkgs/applications/video/timelens/default.nix +++ b/pkgs/applications/video/timelens/default.nix @@ -40,7 +40,7 @@ rustPlatform.buildRustPackage rec { homepage = "https://timelens.blinry.org"; changelog = "https://github.com/timelens/timelens/blob/${src.rev}/CHANGELOG.md"; license = lib.licenses.gpl2Plus; - maintainers = with lib.maintainers; [ janik ]; + maintainers = with lib.maintainers; [ ]; mainProgram = "timelens"; }; } diff --git a/pkgs/applications/virtualization/docker/buildx.nix b/pkgs/applications/virtualization/docker/buildx.nix index 609b0e97deb05..3b5f5669d7f7f 100644 --- a/pkgs/applications/virtualization/docker/buildx.nix +++ b/pkgs/applications/virtualization/docker/buildx.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "docker-buildx"; - version = "0.14.1"; + version = "0.15.1"; src = fetchFromGitHub { owner = "docker"; repo = "buildx"; rev = "v${version}"; - hash = "sha256-IseiGF+tQWv7Z2jlCINuWH2Gzcdow2qazvYVFBGyQPU="; + hash = "sha256-JaUCj9HY0MhHLkPTRd72NaGlBdPCPc+y2XjhVQ/3+NA="; }; doCheck = false; diff --git a/pkgs/applications/virtualization/ecs-agent/default.nix b/pkgs/applications/virtualization/ecs-agent/default.nix index e5fe625cdf9f1..ea58577680776 100644 --- a/pkgs/applications/virtualization/ecs-agent/default.nix +++ b/pkgs/applications/virtualization/ecs-agent/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "amazon-ecs-agent"; - version = "1.82.4"; + version = "1.84.0"; src = fetchFromGitHub { rev = "v${version}"; owner = "aws"; repo = pname; - hash = "sha256-bM/K3fxkeDwsXKsgZaEkurgYdSHnOgIQ2oUKc5atvZk="; + hash = "sha256-6Les4qio+ad10b172Xw5bwU2OZiLOjZZhaoNW0MYFzk="; }; vendorHash = null; diff --git a/pkgs/applications/virtualization/quickgui/default.nix b/pkgs/applications/virtualization/quickgui/default.nix index 244e438626e0a..cb3c79f36aa9c 100644 --- a/pkgs/applications/virtualization/quickgui/default.nix +++ b/pkgs/applications/virtualization/quickgui/default.nix @@ -5,7 +5,7 @@ , dpkg , wrapGAppsHook3 , quickemu -, gnome +, zenity }: stdenvNoCC.mkDerivation rec { @@ -25,7 +25,7 @@ stdenvNoCC.mkDerivation rec { buildInputs = [ quickemu - gnome.zenity + zenity ]; strictDeps = true; @@ -42,7 +42,7 @@ stdenvNoCC.mkDerivation rec { preFixup = '' gappsWrapperArgs+=( - --prefix PATH : ${lib.makeBinPath [ quickemu gnome.zenity ]} + --prefix PATH : ${lib.makeBinPath [ quickemu zenity ]} ) ''; diff --git a/pkgs/applications/virtualization/virt-manager/default.nix b/pkgs/applications/virtualization/virt-manager/default.nix index 281f451fddbd2..228c2ed6cb9f8 100644 --- a/pkgs/applications/virtualization/virt-manager/default.nix +++ b/pkgs/applications/virtualization/virt-manager/default.nix @@ -1,6 +1,6 @@ { lib, fetchFromGitHub, python3, intltool, file, wrapGAppsHook3, gtk-vnc , vte, avahi, dconf, gobject-introspection, libvirt-glib, system-libvirt -, gsettings-desktop-schemas, gst_all_1, libosinfo, gnome, gtksourceview4, docutils, cpio +, gsettings-desktop-schemas, gst_all_1, libosinfo, adwaita-icon-theme, gtksourceview4, docutils, cpio , e2fsprogs, findutils, gzip, cdrtools, xorriso, fetchpatch , desktopToDarwinBundle, stdenv , spiceSupport ? true, spice-gtk ? null @@ -50,7 +50,7 @@ python3.pkgs.buildPythonApplication rec { buildInputs = [ gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good - libvirt-glib vte dconf gtk-vnc gnome.adwaita-icon-theme avahi + libvirt-glib vte dconf gtk-vnc adwaita-icon-theme avahi gsettings-desktop-schemas libosinfo gtksourceview4 ] ++ lib.optional spiceSupport spice-gtk; diff --git a/pkgs/applications/window-managers/i3/bumblebee-status/plugins.nix b/pkgs/applications/window-managers/i3/bumblebee-status/plugins.nix index 6a1dda5842072..5810070d2ff43 100644 --- a/pkgs/applications/window-managers/i3/bumblebee-status/plugins.nix +++ b/pkgs/applications/window-managers/i3/bumblebee-status/plugins.nix @@ -28,7 +28,7 @@ in brightness.propagatedBuildInputs = [ ]; caffeine.propagatedBuildInputs = [ pkgs.xdg-utils pkgs.xdotool pkgs.xorg.xprop pkgs.libnotify ]; cmus.propagatedBuildInputs = [ pkgs.cmus ]; - cpu.propagatedBuildInputs = [ py.psutil pkgs.gnome.gnome-system-monitor ]; + cpu.propagatedBuildInputs = [ py.psutil pkgs.gnome-system-monitor ]; cpu2.propagatedBuildInputs = [ py.psutil pkgs.lm_sensors ]; cpu3.propagatedBuildInputs = [ py.psutil pkgs.lm_sensors ]; currency.propagatedBuildInputs = [ py.requests ]; @@ -85,8 +85,8 @@ in # NOTE: Yes, there is also a plugin named `layout-xkbswitch` with a dash. layout_xkbswitch.propagatedBuildInputs = [ pkgs.xkb-switch ]; libvirtvms.propagatedBuildInputs = [ py.libvirt ]; - load.propagatedBuildInputs = [ pkgs.gnome.gnome-system-monitor ]; - memory.propagatedBuildInputs = [ pkgs.gnome.gnome-system-monitor ]; + load.propagatedBuildInputs = [ pkgs.gnome-system-monitor ]; + memory.propagatedBuildInputs = [ pkgs.gnome-system-monitor ]; messagereceiver = { }; mocp.propagatedBuildInputs = [ pkgs.moc ]; mpd.propagatedBuildInputs = [ pkgs.mpc-cli ]; |