Merge remote-tracking branch 'origin/master' into haskell-updates

2022-07-11 15:54:35 +02:00 · 2022-07-11 15:54:35 +02:00 · 4cbd28a70c
commit 4cbd28a70c
parent 2b02f44395 51ae0c2a8c
55 changed files with 1284 additions and 1459 deletions
--- a/maintainers/team-list.nix
+++ b/maintainers/team-list.nix
@ -98,6 +98,7 @@ with lib.maintainers; {
    members = [
      astro
      SuperSandro2000
+      revol-xut
    ];
    scope = "Maintain packages used in the C3D2 hackspace";
    shortName = "c3d2";
--- a/nixos/modules/services/desktops/pipewire/wireplumber.nix
+++ b/nixos/modules/services/desktops/pipewire/wireplumber.nix
@ -50,6 +50,12 @@ in
        default_access.properties["enable-flatpak-portal"] = false
      '';
    };
+    environment.etc."wireplumber/bluetooth.lua.d/80-systemwide.lua" = lib.mkIf config.services.pipewire.systemWide {
+      text = ''
+        -- When running system-wide, logind-integration needs to be disabled.
+        bluez_monitor.properties["with-logind"] = false
+      '';
+    };

    systemd.packages = [ cfg.package ];

--- a/nixos/release.nix
+++ b/nixos/release.nix
@ -15,8 +15,8 @@ let
    (if stableBranch then "." else "pre") + "${toString nixpkgs.revCount}.${nixpkgs.shortRev}";

  # Run the tests for each platform.  You can run a test by doing
-  # e.g. ‘nix-build -A tests.login.x86_64-linux’, or equivalently,
-  # ‘nix-build tests/login.nix -A result’.
+  # e.g. ‘nix-build release.nix -A tests.login.x86_64-linux’,
+  # or equivalently, ‘nix-build tests/login.nix’.
  # See also nixosTests in pkgs/top-level/all-packages.nix
  allTestsForSystem = system:
    import ./tests/all-tests.nix {
--- a/nixos/tests/ipfs.nix
+++ b/nixos/tests/ipfs.nix
@ -54,6 +54,8 @@ import ./make-test-python.nix ({ pkgs, ...} : {
        "echo fnord3 | ipfs --api /ip4/127.0.0.1/tcp/2324 add --quieter"
    )

-    fuse.succeed(f"cat /ipfs/{ipfs_hash.strip()} | grep fnord3")
+    # The FUSE mount functionality is broken as of v0.13.0.
+    # See https://github.com/ipfs/kubo/issues/9044.
+    # fuse.succeed(f"cat /ipfs/{ipfs_hash.strip()} | grep fnord3")
  '';
 })
--- a/pkgs/applications/audio/audacious/default.nix
+++ b/pkgs/applications/audio/audacious/default.nix
@ -11,15 +11,15 @@

 mkDerivation rec {
  pname = "audacious";
-  version = "4.1";
+  version = "4.2";

  src = fetchurl {
    url = "http://distfiles.audacious-media-player.org/audacious-${version}.tar.bz2";
-    sha256 = "0p734psjjvjcmla2hg5h6a9v1prvy63jj9xm2g2ngs49jy7qan0z";
+    sha256 = "sha256-/rME5HCkgf4rPEyhycs7I+wmJUDBLQ0ebCKl62JeBLM=";
  };
  pluginsSrc = fetchurl {
    url = "http://distfiles.audacious-media-player.org/audacious-plugins-${version}.tar.bz2";
-    sha256 = "0k0xnqmxi5lna034i2cnzvfzrykxmv4fbs1nkrc9sd2ma1igrmns";
+    sha256 = "sha256-b6D2nDoQQeuHfDcQlROrSioKVqd9nowToVgc8UOaQX8=";
  };

  nativeBuildInputs = [ gettext pkg-config ];
--- a/pkgs/applications/audio/radioboat/default.nix
+++ b/pkgs/applications/audio/radioboat/default.nix
@ -0,0 +1,60 @@
+{ lib
+, fetchFromGitHub
+, buildGoModule
+, mpv
+, makeWrapper
+, installShellFiles
+, nix-update-script
+, testers
+, radioboat
+}:
+
+buildGoModule rec {
+  pname = "radioboat";
+  version = "0.2.1";
+
+  src = fetchFromGitHub {
+    owner = "slashformotion";
+    repo = "radioboat";
+    rev = "v${version}";
+    sha256 = "sha256-ZAKTWmK3hCJxm/578cjtdgMA2ZRhCFtzfGdta0gmuFY=";
+  };
+
+  vendorSha256 = "sha256-X3KiqaiOQYQBfVckh50C+4oxIVN6gXyNuQtBwGvjdFQ=";
+
+  ldflags = [
+    "-s"
+    "-w"
+    "-X github.com/slashformotion/radioboat/internal/buildinfo.Version=${version}"
+  ];
+
+  nativeBuildInputs = [ makeWrapper installShellFiles ];
+
+  preFixup = ''
+    wrapProgram $out/bin/radioboat --prefix PATH ":" "${lib.makeBinPath [ mpv ]}";
+  '';
+
+  postInstall = ''
+    installShellCompletion --cmd radioboat \
+      --bash <($out/bin/radioboat completion bash) \
+      --fish <($out/bin/radioboat completion fish) \
+      --zsh <($out/bin/radioboat completion zsh)
+  '';
+
+  passthru = {
+    updateScript = nix-update-script { attrPath = pname; };
+    tests.version = testers.testVersion {
+      package = radioboat;
+      command = "radioboat version";
+      version = version;
+    };
+  };
+
+  meta = with lib; {
+    description = "A terminal web radio client";
+    homepage = "https://github.com/slashformotion/radioboat";
+    license = licenses.asl20;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ zendo ];
+  };
+}
--- a/pkgs/applications/blockchains/alfis/default.nix
+++ b/pkgs/applications/blockchains/alfis/default.nix
@ -14,16 +14,16 @@

 rustPlatform.buildRustPackage rec {
  pname = "alfis";
-  version = "0.7.3";
+  version = "0.7.4";

  src = fetchFromGitHub {
    owner = "Revertron";
    repo = "Alfis";
    rev = "v${version}";
-    sha256 = "sha256-P+usJCzf92WZ46mdaDbej59/RUzmFcMvlYXVe2VpgY0=";
+    sha256 = "sha256-mwiG9DwnCX/9REq/oNHi2n/l829Ozgum/WygIb+FV04=";
  };

-  cargoSha256 = "sha256-N5qHu0sCmIWtDYerWqMlD3qr8QtXLvEC7VqPEvnW2cw=";
+  cargoSha256 = "sha256-ylSVyrI9LuctuoMZsZpIH7loBBjxE2onk6L19uV8zCQ=";

  checkFlags = [
    # these want internet access, disable them
--- a/pkgs/applications/graphics/digikam/default.nix
+++ b/pkgs/applications/graphics/digikam/default.nix
@ -1,4 +1,4 @@
-{ mkDerivation, lib, fetchurl, fetchpatch, cmake, doxygen, extra-cmake-modules, wrapGAppsHook
+{ mkDerivation, lib, fetchurl, cmake, doxygen, extra-cmake-modules, wrapGAppsHook

 # For `digitaglinktree`
 , perl, sqlite
@ -56,21 +56,13 @@

 mkDerivation rec {
  pname   = "digikam";
-  version = "7.6.0";
+  version = "7.7.0";

  src = fetchurl {
    url = "mirror://kde/stable/${pname}/${version}/digiKam-${version}.tar.xz";
-    sha256 = "sha256-2OHucyHT/DE5FvUVdW4wKaxBh9xFO2kzhI1N5TFLZkE=";
+    sha256 = "sha256-wMbdLqigdRSsvyRi86VFGOfoCZszN/iBM2Foz/Y9dxw=";
  };

-  patches = [
-    (fetchpatch {
-      name = "akonadi-22.04.patch";
-      url = "https://github.com/archlinux/svntogit-packages/raw/1b3c76a4482055524120f598325d90545ff9c020/trunk/akonadi-22.04.patch";
-      sha256 = "sha256-ittgkl2t/nAD0ci2fNYoAd4E2M6Gg0vqqjxqZugBuko=";
-    })
-  ];
-
  nativeBuildInputs = [ cmake doxygen extra-cmake-modules kdoctools wrapGAppsHook ];

  buildInputs = [
--- a/pkgs/applications/graphics/glimpse/default.nix
+++ b/pkgs/applications/graphics/glimpse/default.nix
@ -1,200 +0,0 @@
-{ stdenv
-, lib
-, fetchFromGitHub
-, substituteAll
-, pkg-config
-, intltool
-, babl
-, gegl
-, gtk2
-, glib
-, gdk-pixbuf
-, isocodes
-, pango
-, cairo
-, freetype
-, fontconfig
-, lcms
-, libpng
-, libjpeg
-, poppler
-, poppler_data
-, libtiff
-, libmng
-, librsvg
-, libwmf
-, zlib
-, libzip
-, ghostscript
-, aalib
-, shared-mime-info
-, python2
-, libexif
-, gettext
-, xorg
-, glib-networking
-, libmypaint
-, gexiv2
-, harfbuzz
-, mypaint-brushes1
-, libwebp
-, libheif
-, libgudev
-, openexr
-, AppKit
-, Cocoa
-, gtk-mac-integration-gtk2
-, libxslt
-, automake
-, autoconf
-, libtool
-, makeWrapper
-, autoreconfHook
-, gtk-doc
-, graphviz
-}:
-let
-  python = python2.withPackages (pp: [ pp.pygtk ]);
-in
-stdenv.mkDerivation rec {
-  pname = "glimpse";
-  version = "0.2.0";
-
-  outputs = [ "out" "dev" ];
-
-  src = fetchFromGitHub {
-    owner = "glimpse-editor";
-    repo = "Glimpse";
-    rev = "v${version}";
-    sha256 = "sha256-qbZQmAo7fuJWWbn0QTyxAwAenZOdsGueUq5/3IV8Njc=";
-  };
-
-  patches = [
-    # to remove compiler from the runtime closure, reference was retained via
-    # gimp --version --verbose output
-    (substituteAll {
-      src = ./remove-cc-reference.patch;
-      cc_version = stdenv.cc.cc.name;
-    })
-    ../gimp/hardcode-plugin-interpreters.patch
-  ];
-
-  postPatch = ''
-    ln -s ${gtk-doc}/share/gtk-doc/data/gtk-doc.make .
-  '';
-
-  nativeBuildInputs = [
-    autoreconfHook
-    pkg-config
-    intltool
-    gettext
-    automake
-    autoconf
-    makeWrapper
-    gtk-doc
-    libxslt
-    libtool
-  ];
-
-  buildInputs = [
-    babl
-    gegl
-    gtk2
-    glib
-    gdk-pixbuf
-    pango
-    cairo
-    gexiv2
-    harfbuzz
-    isocodes
-    freetype
-    fontconfig
-    lcms
-    libpng
-    libjpeg
-    poppler
-    poppler_data
-    libtiff
-    openexr
-    libmng
-    librsvg
-    libwmf
-    zlib
-    libzip
-    ghostscript
-    aalib
-    shared-mime-info
-    libwebp
-    libheif
-    python
-    libexif
-    xorg.libXpm
-    glib-networking
-    libmypaint
-    mypaint-brushes1
-  ] ++ lib.optionals stdenv.isDarwin [
-    AppKit
-    Cocoa
-    gtk-mac-integration-gtk2
-  ] ++ lib.optionals stdenv.isLinux [
-    libgudev
-  ];
-
-  # needed by gimp-2.0.pc
-  propagatedBuildInputs = [
-    gegl
-  ];
-
-  # Check if librsvg was built with --disable-pixbuf-loader.
-  PKG_CONFIG_GDK_PIXBUF_2_0_GDK_PIXBUF_MODULEDIR = "${librsvg}/${gdk-pixbuf.moduleDir}";
-
-  preAutoreconf = ''
-    # The check runs before glib-networking is registered
-    export GIO_EXTRA_MODULES="${glib-networking}/lib/gio/modules:$GIO_EXTRA_MODULES"
-  '';
-
-  postFixup = ''
-    wrapProgram $out/bin/glimpse-${lib.versions.majorMinor version} \
-      --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
-      --prefix PATH ":" ${ lib.makeBinPath [ graphviz ] }
-  '';
-
-  passthru = rec {
-    # The declarations for `glimpse-with-plugins` wrapper,
-    # used for determining plug-in installation paths
-    majorVersion = "2.0";
-    targetPluginDir = "lib/glimpse/${majorVersion}/plug-ins";
-    targetScriptDir = "share/glimpse/${majorVersion}/scripts";
-    targetDataDir = "share/gimp/${majorVersion}";
-    targetLibDir = "lib/gimp/${majorVersion}";
-
-    # probably its a good idea to use the same gtk in plugins ?
-    gtk = gtk2;
-  };
-
-  configureFlags = [
-    "--without-webkit" # old version is required
-    "--with-bug-report-url=https://github.com/NixOS/nixpkgs/issues/new"
-    "--with-icc-directory=/run/current-system/sw/share/color/icc"
-    # fix libdir in pc files (${exec_prefix} needs to be passed verbatim)
-    "--libdir=\${exec_prefix}/lib"
-  ];
-
-  # on Darwin,
-  # test-eevl.c:64:36: error: initializer element is not a compile-time constant
-  doCheck = !stdenv.isDarwin;
-
-  enableParallelBuilding = true;
-
-  meta = with lib; {
-    description = "An open source image editor based on the GNU Image Manipulation Program";
-    longDescription = ''
-      Glimpse is an open source image editor based on the GNU Image Manipulation Program (GIMP). The goal is to experiment with new ideas and expand the use of free software.
-    '';
-    homepage = "https://glimpse-editor.org";
-    maintainers = with maintainers; [ ashkitten erictapen ];
-    license = licenses.gpl3Plus;
-    platforms = platforms.unix;
-    mainProgram = "glimpse";
-  };
-}
--- a/pkgs/applications/graphics/glimpse/plugins/default.nix
+++ b/pkgs/applications/graphics/glimpse/plugins/default.nix
@ -1,11 +0,0 @@
-# Use `glimpse-with-plugins` package for Glimpse with all plug-ins.
-# If you just want a subset of plug-ins, you can specify them explicitly:
-# `glimpse-with-plugins.override { plugins = with glimpsePlugins; [ gap ]; }`.
-
-{ gimpPlugins, glimpse }:
-
-# This attrs can be extended in the future if there happen to be glimpse-only
-# plugins or some that need further modification in order to work with Glimpse.
-gimpPlugins.overrideScope' (self: super: {
-  gimp = glimpse;
-})
--- a/pkgs/applications/graphics/glimpse/remove-cc-reference.patch
+++ b/pkgs/applications/graphics/glimpse/remove-cc-reference.patch
@ -1,13 +0,0 @@
-diff --git a/app/gimp-version.c b/app/gimp-version.c
-index b584398231..1b40a1570f 100644
--- a/app/gimp-version.c
-+++ b/app/gimp-version.c
-@@ -230,7 +230,7 @@ gimp_version (gboolean be_verbose,
-                                       GIMP_BUILD_ID,
-                                       gimp_version_get_revision (),
-                                       GIMP_BUILD_PLATFORM_FAMILY,
-                                      CC_VERSION,
-+                                      "@cc_version@",
-                                       lib_versions);
-       g_free (lib_versions);
- 
--- a/pkgs/applications/graphics/glimpse/wrapper.nix
+++ b/pkgs/applications/graphics/glimpse/wrapper.nix
@ -1,32 +0,0 @@
-{ lib, symlinkJoin, glimpse, makeWrapper, glimpsePlugins, gnome, plugins ? null }:
-
-let
-  allPlugins = lib.filter (pkg: lib.isDerivation pkg && !pkg.meta.broken or false) (lib.attrValues glimpsePlugins);
-  selectedPlugins = if plugins == null then allPlugins else plugins;
-  extraArgs = map (x: x.wrapArgs or "") selectedPlugins;
-  versionBranch = lib.versions.majorMinor glimpse.version;
-
-in
-symlinkJoin {
-  name = "glimpse-with-plugins-${glimpse.version}";
-
-  paths = [ glimpse ] ++ selectedPlugins;
-
-  nativeBuildInputs = [ makeWrapper ];
-
-  postBuild = ''
-    for each in glimpse-${versionBranch} glimpse-console-${versionBranch}; do
-      wrapProgram $out/bin/$each \
-        --set GIMP2_PLUGINDIR "$out/lib/glimpse/2.0" \
-        --set GIMP2_DATADIR "$out/share/glimpse/2.0" \
-        --prefix GTK_PATH : "${gnome.gnome-themes-extra}/lib/gtk-2.0" \
-        ${toString extraArgs}
-    done
-
-    for each in glimpse glimpse-console; do
-      ln -sf "$each-${versionBranch}" $out/bin/$each
-    done
-  '';
-
-  inherit (glimpse) meta;
-}
--- a/pkgs/applications/kde/default.nix
+++ b/pkgs/applications/kde/default.nix
@ -78,8 +78,8 @@ let
      akregator = callPackage ./akregator.nix {};
      ark = callPackage ./ark {};
      baloo-widgets = callPackage ./baloo-widgets.nix {};
-      bovo = callPackage ./bovo.nix {};
      bomber = callPackage ./bomber.nix {};
+      bovo = callPackage ./bovo.nix {};
      calendarsupport = callPackage ./calendarsupport.nix {};
      dolphin = callPackage ./dolphin.nix {};
      dolphin-plugins = callPackage ./dolphin-plugins.nix {};
@ -120,13 +120,13 @@ let
      kdegraphics-thumbnailers = callPackage ./kdegraphics-thumbnailers.nix {};
      kdenetwork-filesharing = callPackage ./kdenetwork-filesharing.nix {};
      kdenlive = callPackage ./kdenlive {};
-      kdepim-runtime = callPackage ./kdepim-runtime {};
      kdepim-addons = callPackage ./kdepim-addons.nix {};
-      kdevelop-pg-qt = callPackage ./kdevelop/kdevelop-pg-qt.nix {};
-      kdevelop-unwrapped = callPackage ./kdevelop/kdevelop.nix {};
+      kdepim-runtime = callPackage ./kdepim-runtime {};
      kdev-php = callPackage ./kdevelop/kdev-php.nix {};
      kdev-python = callPackage ./kdevelop/kdev-python.nix {};
      kdevelop = callPackage ./kdevelop/wrapper.nix {};
+      kdevelop-pg-qt = callPackage ./kdevelop/kdevelop-pg-qt.nix {};
+      kdevelop-unwrapped = callPackage ./kdevelop/kdevelop.nix {};
      kdf = callPackage ./kdf.nix {};
      kdialog = callPackage ./kdialog.nix {};
      kdiamond = callPackage ./kdiamond.nix {};
@ -142,10 +142,10 @@ let
      kigo = callPackage ./kigo.nix {};
      killbots = callPackage ./killbots.nix {};
      kimap = callPackage ./kimap.nix {};
-      kipi-plugins = callPackage ./kipi-plugins.nix {};
-      kitinerary = callPackage ./kitinerary.nix {};
      kio-extras = callPackage ./kio-extras.nix {};
      kio-gdrive = callPackage ./kio-gdrive.nix {};
+      kipi-plugins = callPackage ./kipi-plugins.nix {};
+      kitinerary = callPackage ./kitinerary.nix {};
      kldap = callPackage ./kldap.nix {};
      kleopatra = callPackage ./kleopatra.nix {};
      klettres = callPackage ./klettres.nix {};
@ -169,25 +169,26 @@ let
      kollision = callPackage ./kollision.nix {};
      kolourpaint = callPackage ./kolourpaint.nix {};
      kompare = callPackage ./kompare.nix {};
+      konqueror = callPackage ./konqueror.nix {};
+      konquest = callPackage ./konquest.nix {};
      konsole = callPackage ./konsole.nix {};
      kontact = callPackage ./kontact.nix {};
+      konversation = callPackage ./konversation.nix {};
      kontactinterface = callPackage ./kontactinterface.nix {};
-      konquest = callPackage ./konquest.nix {};
-      konqueror = callPackage ./konqueror.nix {};
      korganizer = callPackage ./korganizer.nix {};
      kpat = callPackage ./kpat.nix {};
      kpimtextedit = callPackage ./kpimtextedit.nix {};
-      ksmtp = callPackage ./ksmtp {};
-      ksquares = callPackage ./ksquares.nix {};
-      kqtquickcharts = callPackage ./kqtquickcharts.nix {};
      kpkpass = callPackage ./kpkpass.nix {};
      kpublictransport = callPackage ./kpublictransport.nix {};
-      kreversi = callPackage ./kreversi.nix {};
+      kqtquickcharts = callPackage ./kqtquickcharts.nix {};
      krdc = callPackage ./krdc.nix {};
+      kreversi = callPackage ./kreversi.nix {};
      krfb = callPackage ./krfb.nix {};
      kruler = callPackage ./kruler.nix {};
      kshisen = callPackage ./kshisen.nix {};
+      ksmtp = callPackage ./ksmtp {};
      kspaceduel = callPackage ./kspaceduel.nix {};
+      ksquares = callPackage ./ksquares.nix {};
      ksudoku = callPackage ./ksudoku.nix {};
      ksystemlog = callPackage ./ksystemlog.nix {};
      kteatime = callPackage ./kteatime.nix {};
@ -220,9 +221,9 @@ let
      minuet = callPackage ./minuet.nix {};
      okular = callPackage ./okular.nix {};
      picmi = callPackage ./picmi.nix {};
-      pimcommon = callPackage ./pimcommon.nix {};
      pim-data-exporter = callPackage ./pim-data-exporter.nix {};
      pim-sieve-editor = callPackage ./pim-sieve-editor.nix {};
+      pimcommon = callPackage ./pimcommon.nix {};
      print-manager = callPackage ./print-manager.nix {};
      rocs = callPackage ./rocs.nix {};
      skanlite = callPackage ./skanlite.nix {};
--- a/pkgs/applications/kde/fetch.sh
+++ b/pkgs/applications/kde/fetch.sh
@ -1 +1 @@
-WGET_ARGS=( https://download.kde.org/stable/release-service/22.04.2/src -A '*.tar.xz' )
+WGET_ARGS=( https://download.kde.org/stable/release-service/22.04.3/src -A '*.tar.xz' )
--- a/pkgs/applications/networking/irc/konversation/default.nix
+++ b/pkgs/applications/networking/irc/konversation/default.nix
@ -1,7 +1,5 @@
 { mkDerivation
 , lib
-, fetchurl
-, fetchpatch
 , extra-cmake-modules
 , kdoctools
 , kbookmarks
@ -17,6 +15,7 @@
 , kiconthemes
 , kidletime
 , kitemviews
+, knewstuff
 , knotifications
 , knotifyconfig
 , kwindowsystem
@ -26,16 +25,11 @@
 , solid
 , sonnet
 , phonon
+, qtmultimedia
 }:

-mkDerivation rec {
+mkDerivation {
  pname = "konversation";
-  version = "1.7.7";
-
-  src = fetchurl {
-    url = "mirror://kde/stable/${pname}/${version}/src/${pname}-${version}.tar.xz";
-    sha256 = "R+wWHBOFmBqLmdKMQZ6Iskgj3AG2j7FiOJSBiXTCGKc=";
-  };

  buildInputs = [
    kbookmarks
@ -52,6 +46,7 @@ mkDerivation rec {
    kiconthemes
    kidletime
    kitemviews
+    knewstuff
    knotifications
    knotifyconfig
    kwindowsystem
@ -61,6 +56,7 @@ mkDerivation rec {
    solid
    sonnet
    phonon
+    qtmultimedia
  ];

  nativeBuildInputs = [
@ -71,7 +67,6 @@ mkDerivation rec {
  meta = {
    description = "Integrated IRC client for KDE";
    license = with lib.licenses; [ gpl2 ];
-    maintainers = with lib.maintainers; [ fridh ];
    homepage = "https://konversation.kde.org";
  };
 }
--- a/pkgs/applications/kde/srcs.nix
+++ b/pkgs/applications/kde/srcs.nix
--- a/pkgs/applications/networking/browsers/firefox-bin/default.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/default.nix
@ -199,12 +199,12 @@ stdenv.mkDerivation {
    inherit pname channel writeScript xidel coreutils gnused gnugrep gnupg curl runtimeShell;
    baseUrl =
      if channel == "devedition"
-        then "http://archive.mozilla.org/pub/devedition/releases/"
-        else "http://archive.mozilla.org/pub/firefox/releases/";
+        then "https://archive.mozilla.org/pub/devedition/releases/"
+        else "https://archive.mozilla.org/pub/firefox/releases/";
  };
  meta = with lib; {
    description = "Mozilla Firefox, free web browser (binary package)";
-    homepage = "http://www.mozilla.org/firefox/";
+    homepage = "https://www.mozilla.org/firefox/";
    license = licenses.mpl20;
    sourceProvenance = with sourceTypes; [ binaryNativeCode ];
    platforms = builtins.attrNames mozillaPlatforms;
--- a/pkgs/applications/networking/cluster/argocd-autopilot/default.nix
+++ b/pkgs/applications/networking/cluster/argocd-autopilot/default.nix
@ -2,16 +2,16 @@

 buildGoModule rec {
  pname = "argocd-autopilot";
-  version = "0.3.7";
+  version = "0.3.9";

  src = fetchFromGitHub {
    owner = "argoproj-labs";
    repo = "argocd-autopilot";
    rev = "v${version}";
-    sha256 = "sha256-dLmJQCASdWkzWOPQ0bdJLe2AD06+L2ghP2yWry1XL1k=";
+    sha256 = "sha256-LX/26fOvQYnzCbVuMxsuD/3bdZx/mVD47v8l4DppUPA=";
  };

-  vendorSha256 = "sha256-0v/HTiQf/mZUU1b55jAnSj86NEFOUaiM+/MrVvwJYBM=";
+  vendorSha256 = "sha256-UYTEQ3RvSJB+9zduw0xCDU71Zp54ilZzNucuzTMKEHA=";

  proxyVendor = true;

--- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/tdlib-purple/default.nix
+++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/tdlib-purple/default.nix
@ -0,0 +1,39 @@
+{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, libwebp, pidgin, tdlib } :
+
+stdenv.mkDerivation rec {
+  pname = "tdlib-purple";
+  version = "0.8.1";
+
+  src = fetchFromGitHub {
+    owner = "ars3niy";
+    repo = "tdlib-purple";
+    rev = "v${version}";
+    sha256 = "sha256-mrowzTtNLyMc2WwLVIop8Mg2DbyiQs0OPXmJuM9QUnM=";
+  };
+
+  patches = [
+    # Update to tdlib 1.8.0
+    (fetchpatch {
+      url = "https://github.com/ars3niy/tdlib-purple/commit/8c87b899ddbec32ec6ab4a34ddf0dc770f97d396.patch";
+      sha256 = "sha256-sysPYPno+wS8mZwQAXtX5eVnhwKAZrtr5gXuddN3mko=";
+    })
+  ];
+
+  preConfigure = ''
+    sed -i -e 's|DESTINATION.*PURPLE_PLUGIN_DIR}|DESTINATION "lib/purple-2|' CMakeLists.txt
+    sed -i -e 's|DESTINATION.*PURPLE_DATA_DIR}|DESTINATION "share|' CMakeLists.txt
+  '';
+
+  nativeBuildInputs = [ cmake ];
+  buildInputs = [ libwebp pidgin tdlib ];
+
+  cmakeFlags = [ "-DNoVoip=True" ]; # libtgvoip required
+
+  meta = with lib; {
+    homepage = "https://github.com/ars3niy/tdlib-purple";
+    description = "libpurple Telegram plugin using tdlib";
+    license = licenses.gpl2Plus;
+    maintainers = with maintainers; [ sikmir ];
+    platforms = platforms.unix;
+  };
+}
--- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/telegram-purple/default.nix
+++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/telegram-purple/default.nix
@ -1,41 +0,0 @@
-{ lib, stdenv, fetchFromGitHub, pkg-config, pidgin, libwebp, libgcrypt, gettext } :
-
-stdenv.mkDerivation rec {
-  pname = "telegram-purple";
-  version = "1.3.1";
-
-  src = fetchFromGitHub {
-    owner = "majn";
-    repo = "telegram-purple";
-    rev = "v${version}";
-    sha256 = "sha256-14VzCMvzAEmye0N98r+P+ub5CeA9vu8c/xqefuWVI10=";
-  };
-
-  NIX_CFLAGS_COMPILE = "-Wno-error=cast-function-type";
-
-  nativeBuildInputs = [ pkg-config ];
-  buildInputs = [ pidgin libwebp libgcrypt gettext ];
-
-  preConfigure = ''
-    sed -i "s|/etc/telegram-purple/server.tglpub|$out/lib/purple-2/server.tglpub|g" telegram-purple.c
-    echo "#define GIT_COMMIT \"${builtins.substring 0 10 src.rev}\"" > commit.h
-  '';
-
-  installPhase = ''
-    mkdir -p $out/lib/purple-2/
-    cp bin/*.so $out/lib/purple-2/ #*/
-    cp tg-server.tglpub $out/lib/purple-2/server.tglpub
-    mkdir -p $out/pixmaps/pidgin/protocols/{16,22,48}
-    cp imgs/telegram16.png $out/pixmaps/pidgin/protocols/16
-    cp imgs/telegram22.png $out/pixmaps/pidgin/protocols/22
-    cp imgs/telegram48.png $out/pixmaps/pidgin/protocols/48
-  '';
-
-  meta = with lib; {
-    homepage = "https://github.com/majn/telegram-purple";
-    description = "Telegram for Pidgin / libpurple";
-    license = licenses.gpl2;
-    maintainers = [ maintainers.jagajaga ];
-    platforms = platforms.linux;
-  };
-}
--- a/pkgs/applications/networking/ipfs/default.nix
+++ b/pkgs/applications/networking/ipfs/default.nix
@ -2,15 +2,15 @@

 buildGoModule rec {
  pname = "ipfs";
-  version = "0.13.0"; # When updating, also check if the repo version changed and adjust repoVersion below
+  version = "0.13.1"; # When updating, also check if the repo version changed and adjust repoVersion below
  rev = "v${version}";

-  repoVersion = "12"; # Also update ipfs-migrator when changing the repo version
+  passthru.repoVersion = "12"; # Also update ipfs-migrator when changing the repo version

  # go-ipfs makes changes to it's source tarball that don't match the git source.
  src = fetchurl {
    url = "https://github.com/ipfs/go-ipfs/releases/download/${rev}/go-ipfs-source.tar.gz";
-    sha256 = "sha256-eEIHsmtD3vF48RVFHEz28gkVv7u50pMBE8Z+oaM6pLM=";
+    sha256 = "sha256-kGtqFb4Fxx9mxDqX8YSqnY875sU70pzL2BwWBQg5sTU=";
  };

  # tarball contains multiple files/directories
--- a/pkgs/applications/networking/remote/rustdesk/cargo.patch
+++ b/pkgs/applications/networking/remote/rustdesk/cargo.patch
@ -1,26 +1,24 @@
 diff --git a/Cargo.lock b/Cargo.lock
-index c3e139e..b77d8bd 100644
+index fb17c7e..ef157e5 100644
 --- a/Cargo.lock
 +++ b/Cargo.lock
-@@ -1761,11 +1761,11 @@ dependencies = [
- 
+@@ -2332,10 +2332,10 @@ dependencies = [
 [[package]]
 name = "magnum-opus"
-version = "0.3.4-2"
-source = "git+https://github.com/open-trade/magnum-opus#ad0836164abf4a4df69009b1ee08eabe3a13b33f"
-+version = "0.4.0"
+ version = "0.4.0"
+-source = "git+https://github.com/open-trade/magnum-opus#3c3d0b86ae95c84930bebffe4bcb03b3bd83342b"
 +source = "git+https://github.com/TheRadioGuy/magnum-opus#171e1d021004626f7444d1e39b98f50bc3cb2604"
 dependencies = [
- "bindgen 0.59.1",
+- "bindgen",
 - "target_build_utils",
 + "libc",
 + "opusic-sys",
 ]
 
 [[package]]
-@@ -2188,6 +2188,16 @@ version = "0.1.4"
+@@ -2796,6 +2796,16 @@ version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
- checksum = "28988d872ab76095a6e6ac88d99b54fd267702734fd7ffe610ca27f533ddb95a"
+ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf"
 
 +[[package]]
 +name = "opusic-sys"
@ -33,18 +31,18 @@ index c3e139e..b77d8bd 100644
 +]
 +
 [[package]]
- name = "parity-tokio-ipc"
- version = "0.7.2"
+ name = "os_str_bytes"
+ version = "6.0.0"
 diff --git a/Cargo.toml b/Cargo.toml
-index 75504a0..43e1624 100644
+index 1b715bd..960e8da 100644
 --- a/Cargo.toml
 +++ b/Cargo.toml
-@@ -32,7 +32,7 @@ libc = "0.2"
+@@ -35,7 +35,7 @@ libc = "0.2"
 parity-tokio-ipc = { git = "https://github.com/open-trade/parity-tokio-ipc" }
- flexi_logger = "0.17"
+ flexi_logger = { version = "0.22", features = ["async", "use_chrono_for_offset"] }
 runas = "0.2"
 -magnum-opus = { git = "https://github.com/open-trade/magnum-opus" }
 +magnum-opus = { git = "https://github.com/TheRadioGuy/magnum-opus" }
 dasp = { version = "0.11", features = ["signal", "interpolate-linear", "interpolate"], optional = true }
- rubato = { version = "0.8", optional = true }
+ rubato = { version = "0.12", optional = true }
 samplerate = { version = "0.2", optional = true }
--- a/pkgs/applications/networking/remote/rustdesk/default.nix
+++ b/pkgs/applications/networking/remote/rustdesk/default.nix
@ -24,20 +24,21 @@
 , libsciter
 , llvmPackages
 , wrapGAppsHook
+, writeText
 }:

 rustPlatform.buildRustPackage rec {
  pname = "rustdesk";
-  version = "1.1.8";
+  version = "1.1.9";

  src = fetchFromGitHub {
    owner = "rustdesk";
    repo = "rustdesk";
-    rev = "0325500ebf331b66220cec6e9078afb83b0e98a7";
-    sha256 = "sha256-xglyyoiAjJx3y8+A2OYHZffjqjDkcTjIluPA/J42VVg=";
+    rev = version;
+    sha256 = "sha256-IlrfqwNyaSHE9Ct0mn7MUxEg7p1Ku34eOMYelEAYFW8=";
  };

-  cargoSha256 = "sha256-4MQKa54f3X7IHGd29H6RY7v2toeHvTHInIpgXjdotjw=";
+  cargoSha256 = "sha256-1OMWEk+DerltF7kwdo4d04rbgIFLHBRq3vZaL7jtrdE=";

  LIBCLANG_PATH="${llvmPackages.libclang.lib}/lib";

@ -51,10 +52,29 @@ rustPlatform.buildRustPackage rec {
  # properly.
  postUnpack = let
    vcpkg_target = "x64-linux";
+
+    updates_vcpkg_file = writeText "update_vcpkg_rustdesk"
+    ''
+    Package : libyuv
+    Architecture : ${vcpkg_target}
+    Version : 1.0
+    Status : is installed
+
+    Package : libvpx
+    Architecture : ${vcpkg_target}
+    Version : 1.0
+    Status : is installed
+    '';
  in ''
    export VCPKG_ROOT="$TMP/vcpkg";

+    mkdir -p $VCPKG_ROOT/.vcpkg-root
    mkdir -p $VCPKG_ROOT/installed/${vcpkg_target}/lib
+    mkdir -p $VCPKG_ROOT/installed/vcpkg/updates
+    ln -s ${updates_vcpkg_file} $VCPKG_ROOT/installed/vcpkg/status
+    mkdir -p $VCPKG_ROOT/installed/vcpkg/info
+    touch $VCPKG_ROOT/installed/vcpkg/info/libyuv_1.0_${vcpkg_target}.list
+    touch $VCPKG_ROOT/installed/vcpkg/info/libvpx_1.0_${vcpkg_target}.list

    ln -s ${libvpx.out}/lib/* $VCPKG_ROOT/installed/${vcpkg_target}/lib/
    ln -s ${libyuv.out}/lib/* $VCPKG_ROOT/installed/${vcpkg_target}/lib/
--- a/pkgs/applications/science/misc/bada-bib/default.nix
+++ b/pkgs/applications/science/misc/bada-bib/default.nix
@ -10,14 +10,17 @@
 , gnome
 , gobject-introspection
 , gtk4
+, gtksourceview5
+, libadwaita
 , libxml2
 , pkg-config
 , python3Packages
-, wrapGAppsHook4 }:
+, wrapGAppsHook4
+}:

 python3Packages.buildPythonApplication rec {
  pname = "bada-bib";
-  version = "0.6.2";
+  version = "0.7.2";
  format = "other";
  strictDeps = false; # https://github.com/NixOS/nixpkgs/issues/56943

@ -25,7 +28,7 @@ python3Packages.buildPythonApplication rec {
    owner = "RogerCrocker";
    repo = "BadaBib";
    rev = "refs/tags/v${version}";
-    sha256 = "sha256-3dXtBwqEqiXLjntmqLYeuwLv0RDb774+yOXc7vdf8+Y=";
+    sha256 = "sha256-+b4Ko2srWZUs8zsH9jU+aiKQYZti3z2Bil8PogfpPlc=";
  };

  nativeBuildInputs = [
@ -42,6 +45,8 @@ python3Packages.buildPythonApplication rec {
    gdk-pixbuf
    glib
    gtk4
+    gtksourceview5
+    libadwaita
  ];

  checkInputs = [
--- a/pkgs/applications/virtualization/nixpacks/default.nix
+++ b/pkgs/applications/virtualization/nixpacks/default.nix
@ -0,0 +1,25 @@
+{ lib, rustPlatform, fetchFromGitHub }:
+
+rustPlatform.buildRustPackage rec {
+  pname = "nixpacks";
+  version = "0.1.7";
+
+  src = fetchFromGitHub {
+    owner = "railwayapp";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "sha256-UxdK2e5VYcOEYdZn0oGRFIVGiwnPixiZ3rOnqJDSQO8=";
+  };
+
+  cargoSha256 = "sha256-dJdPs4BJ1R2ZbGmGmvBerLPVqUHn5b/fz9C0kEnxA6U=";
+
+  # skip test due FHS dependency
+  doCheck = false;
+
+  meta = with lib; {
+    description = "App source + Nix packages + Docker = Image Resources";
+    homepage = "https://github.com/railwayapp/nixpacks";
+    license = licenses.mit;
+    maintainers = [ maintainers.zoedsoupe ];
+  };
+}
--- a/pkgs/data/themes/materia-kde/default.nix
+++ b/pkgs/data/themes/materia-kde/default.nix
@ -2,13 +2,13 @@

 stdenv.mkDerivation rec {
  pname = "materia-kde-theme";
-  version = "20210814";
+  version = "20220607";

  src = fetchFromGitHub {
    owner = "PapirusDevelopmentTeam";
    repo = "materia-kde";
    rev = version;
-    sha256 = "KfC1nB5WUcYixqSy5XCP+6Uqhs07Y3p2F1H+5HB8wAg=";
+    sha256 = "sha256-xshkp1Y5V8A3Fj4HCkmFpWcw3xEuNyRJqOLBkIKhwpQ=";
  };

  makeFlags = [ "PREFIX=$(out)" ];
--- a/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix
@ -120,13 +120,6 @@ self: super: {
  path = doJailbreak super.path;
  polyparse = overrideCabal (drv: { postPatch = "sed -i -e 's, <0.11, <0.12,' polyparse.cabal"; }) (doJailbreak super.polyparse);
  primitive = doJailbreak super.primitive;
-  # https://github.com/protolude/protolude/pull/136
-  protolude = appendPatches [
-    (pkgs.fetchpatch {
-      url = "https://github.com/protolude/protolude/commit/47820a36c25ea6f0c6e44382f7d4f3507358b8e7.diff";
-      sha256 = "sha256-PtHx5SyTgqFzI03YVeQD+RqglO6ASMQWSxdpy4ROMDY=";
-    })
-  ] (doJailbreak super.protolude);
  regex-posix = doJailbreak super.regex-posix;
  resolv = doJailbreak super.resolv;
  retrie = doDistribute (dontCheck self.retrie_1_2_0_1);
--- a/pkgs/development/libraries/intel-gmmlib/default.nix
+++ b/pkgs/development/libraries/intel-gmmlib/default.nix
@ -6,13 +6,13 @@

 stdenv.mkDerivation rec {
  pname = "intel-gmmlib";
-  version = "22.1.3";
+  version = "22.1.5";

  src = fetchFromGitHub {
    owner = "intel";
    repo = "gmmlib";
    rev = "intel-gmmlib-${version}";
-    sha256 = "sha256-YckzS9f0q+5YOR+8mTZ/u67NVFrwLllxfEuojuJC84E=";
+    sha256 = "sha256-A7XZXkYBsFa8NMQA7EBnvEReSTorAGgoow08bMZ+WkQ=";
  };

  nativeBuildInputs = [ cmake ];
--- a/pkgs/development/libraries/libhandy/default.nix
+++ b/pkgs/development/libraries/libhandy/default.nix
@ -26,7 +26,7 @@

 stdenv.mkDerivation rec {
  pname = "libhandy";
-  version = "1.6.2";
+  version = "1.6.3";

  outputs = [
    "out"
@ -40,7 +40,7 @@ stdenv.mkDerivation rec {

  src = fetchurl {
    url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "sha256-f6iaqoeWa20PX0700+/a9lTisB6ix84r1wMB0fn0LKM=";
+    sha256 = "sha256-R3iL01gE69M8sJkR6XU0TIQ1ngttlSCv0cgh66i6d/8=";
  };

  nativeBuildInputs = [
@ -112,6 +112,7 @@ stdenv.mkDerivation rec {
  passthru = {
    updateScript = gnome.updateScript {
      packageName = pname;
+      versionPolicy = "odd-unstable";
    };
  } // lib.optionalAttrs (!enableGlade) {
    glade =
--- a/pkgs/development/libraries/libsolv/default.nix
+++ b/pkgs/development/libraries/libsolv/default.nix
@ -1,4 +1,6 @@
-{ lib, stdenv, fetchFromGitHub, cmake, ninja, zlib, expat, rpm, db }:
+{ lib, stdenv, fetchFromGitHub, cmake, ninja, pkg-config
+, zlib, lzma, bzip2, zchunk, zstd
+, expat, rpm, db }:

 stdenv.mkDerivation rec {
  version  = "0.7.22";
@ -17,10 +19,15 @@ stdenv.mkDerivation rec {
    "-DENABLE_RPMDB=true"
    "-DENABLE_PUBKEY=true"
    "-DENABLE_RPMDB_BYRPMHEADER=true"
+    "-DENABLE_LZMA_COMPRESSION=true"
+    "-DENABLE_BZIP2_COMPRESSION=true"
+    "-DENABLE_ZSTD_COMPRESSION=true"
+    "-DENABLE_ZCHUNK_COMPRESSION=true"
+    "-DWITH_SYSTEM_ZCHUNK=true"
  ];

-  nativeBuildInputs = [ cmake ninja ];
-  buildInputs = [ zlib expat rpm db ];
+  nativeBuildInputs = [ cmake ninja pkg-config ];
+  buildInputs = [ zlib lzma bzip2 zchunk zstd expat rpm db ];

  meta = with lib; {
    description = "A free package dependency solver";
--- a/pkgs/development/libraries/physics/fastjet-contrib/default.nix
+++ b/pkgs/development/libraries/physics/fastjet-contrib/default.nix
@ -18,6 +18,11 @@ stdenv.mkDerivation rec {
    patchShebangs ./configure ./utils/check.sh ./utils/install-sh
  '';

+  # Written in shell manually, does not support autoconf-style
+  # --build=/--host= options:
+  #   Error: --build=x86_64-unknown-linux-gnu: unrecognised argument
+  configurePlatforms = [ ];
+
  enableParallelBuilding = true;

  doCheck = true;
--- a/pkgs/development/python-modules/bc-python-hcl2/default.nix
+++ b/pkgs/development/python-modules/bc-python-hcl2/default.nix
@ -8,14 +8,14 @@

 buildPythonPackage rec {
  pname = "bc-python-hcl2";
-  version = "0.3.44";
+  version = "0.3.45";
  format = "setuptools";

  disabled = pythonOlder "3.6";

  src = fetchPypi {
    inherit pname version;
-    hash = "sha256-C7dknDfoN4rwXI5/YhsKXoertpQUpoOKrbbW4yVXrgQ=";
+    hash = "sha256-OmUN6wpsVP9/CS+JkEhirDBp1MqeA3oEcU77T5nJ9GU=";
  };

  # Nose is required during build process, so can not use `checkInputs`.
--- a/pkgs/development/python-modules/dvc-objects/default.nix
+++ b/pkgs/development/python-modules/dvc-objects/default.nix
@ -16,7 +16,7 @@

 buildPythonPackage rec {
  pname = "dvc-objects";
-  version = "0.0.20";
+  version = "0.0.23";
  format = "pyproject";

  disabled = pythonOlder "3.8";
@ -25,7 +25,7 @@ buildPythonPackage rec {
    owner = "iterative";
    repo = pname;
    rev = "refs/tags/${version}";
-    hash = "sha256-n5knh8MbT0CUvPBABRAewMN9AU5afV5CBAM8hqgdHw0=";
+    hash = "sha256-kiPDBhqQQJkVR/PWCKd4OFCIRznY3y6pgXiBQ3hBaaM=";
  };

  SETUPTOOLS_SCM_PRETEND_VERSION = version;
--- a/pkgs/development/python-modules/google-cloud-datastore/default.nix
+++ b/pkgs/development/python-modules/google-cloud-datastore/default.nix
@ -13,11 +13,11 @@

 buildPythonPackage rec {
  pname = "google-cloud-datastore";
-  version = "2.7.1";
+  version = "2.7.2";

  src = fetchPypi {
    inherit pname version;
-    sha256 = "sha256-Q0dLstAwLamc2DCN1RMwPFHkvxGeGjLiUnyrkeAol0E=";
+    sha256 = "sha256-8o6OeewuiptrlkVNm2I7fwtqPAt+nNOHveIUEWDjyN0=";
  };

  propagatedBuildInputs = [
--- a/pkgs/development/python-modules/hahomematic/default.nix
+++ b/pkgs/development/python-modules/hahomematic/default.nix
@ -14,7 +14,7 @@

 buildPythonPackage rec {
  pname = "hahomematic";
-  version = "2022.7.1";
+  version = "2022.7.3";
  format = "pyproject";

  disabled = pythonOlder "3.9";
@ -23,7 +23,7 @@ buildPythonPackage rec {
    owner = "danielperna84";
    repo = pname;
    rev = "refs/tags/${version}";
-    sha256 = "sha256-V+g4TlwnTuirmxoMmq/A0dGKqubEH8ObPuroXKbSH8U=";
+    sha256 = "sha256-nzP2BvEH9PytauF0q86s4vCSEuGtku+WIu4ttIzf8bU=";
  };

  propagatedBuildInputs = [
--- a/pkgs/development/python-modules/jupyterlab_server/default.nix
+++ b/pkgs/development/python-modules/jupyterlab_server/default.nix
@ -42,6 +42,10 @@ buildPythonPackage rec {
    ruamel-yaml
  ];

+  preCheck = ''
+    export HOME=$(mktemp -d)
+  '';
+
  __darwinAllowLocalNetworking = true;

  meta = with lib; {
--- a/pkgs/development/python-modules/teslajsonpy/default.nix
+++ b/pkgs/development/python-modules/teslajsonpy/default.nix
@ -15,7 +15,7 @@

 buildPythonPackage rec {
  pname = "teslajsonpy";
-  version = "2.2.1";
+  version = "2.3.0";
  format = "pyproject";

  disabled = pythonOlder "3.7";
@ -24,7 +24,7 @@ buildPythonPackage rec {
    owner = "zabuldon";
    repo = pname;
    rev = "refs/tags/v${version}";
-    sha256 = "sha256-fDHtdznxawX+gmFedxQLTTEvpDhhZLSbEndtXOgahUM=";
+    sha256 = "sha256-wAhi8TW0rOeJ3QWjmfLqJ3cKnLZShMekyQ6j7I2uwGY=";
  };

  nativeBuildInputs = [
--- a/pkgs/development/tools/vala-language-server/default.nix
+++ b/pkgs/development/tools/vala-language-server/default.nix
@ -15,13 +15,13 @@

 stdenv.mkDerivation rec {
  pname = "vala-language-server";
-  version = "0.48.4";
+  version = "0.48.5";

  src = fetchFromGitHub {
-    owner = "Prince781";
+    owner = "vala-lang";
    repo = pname;
    rev = version;
-    sha256 = "sha256-vCQ/j0DxG9sSEquPh9TtZ5hTADPh0d8sDIDSJdUDK4s=";
+    sha256 = "sha256-gntGnz8uqGz2EGwWWyty/N1ImaUKAPtXVZcjgp73SQM=";
  };

  passthru = {
@ -49,7 +49,7 @@ stdenv.mkDerivation rec {

  meta = with lib; {
    description = "Code Intelligence for Vala & Genie";
-    homepage = "https://github.com/Prince781/vala-language-server";
+    homepage = "https://github.com/vala-lang/vala-language-server";
    license = licenses.lgpl21Plus;
    maintainers = with maintainers; [ andreasfelix ];
    platforms = platforms.linux;
--- a/pkgs/development/web/bun/default.nix
+++ b/pkgs/development/web/bun/default.nix
@ -4,25 +4,25 @@ let
    aarch64-darwin = {
      arch = "aarch64";
      shortName = "darwin";
-      sha256 = "06kf4dyb8y486r2bbpz8znnaxah9y2hwc9km3cigacfchi4dy28j";
+      sha256 = "sha256-6mi1I8dga16dQLFy2+qa4dzDzlW6J0fdiv104Re3cZ0=";
    };

    x86_64-darwin = {
      arch = "x64";
      shortName = "darwin";
-      sha256 = "06q8cajxra8lgyd1ap6iqzqdw31gkvlc6l2ma0mm22y63msgdn8b";
+      sha256 = "sha256-RGlpwRKLo4Y6uPvwubclIg3wJWePgKTDJvuzdxOrtfM=";
    };

    x86_64-linux = {
      arch = "x64";
      shortName = "linux";
-      sha256 = "038w54yyk94042hg27hfm49w12xsg8wh0skza9l9iybvc9qlvh2i";
+      sha256 = "sha256-Xjm+1wkAsC5Mn6Fm4MRdGyL4gpw2L++N0nKo7ofXLXs=";
    };
  };
  dist = dists.${stdenvNoCC.hostPlatform.system} or (throw "Unsupported system: ${stdenvNoCC.hostPlatform.system}");
 in
 stdenvNoCC.mkDerivation rec {
-  version = "0.1.1";
+  version = "0.1.2";
  pname = "bun";

  src = fetchurl {
--- a/pkgs/games/ferium/default.nix
+++ b/pkgs/games/ferium/default.nix
@ -15,13 +15,15 @@ rustPlatform.buildRustPackage rec {

  cargoSha256 = "sha256-hR2PKQqSvtSBOOhZKW2IsGGjuU4jCdLMeruAHxErQtU=";

-  buildNoDefaultFeatures = true; # by default pulls in GTK 3 just for its directory picker
+  # Disable the GUI file picker so that GTK/XDG dependencies aren't used
+  buildNoDefaultFeatures = true;

-  doCheck = false; # requires internet
+  # Requires an internet connection
+  doCheck = false;

  meta = with lib; {
-    description = "A CLI Minecraft mod manager for mods from Modrinth, CurseForge, and Github Releases";
-    homepage = "https://github.com/theRookieCoder/ferium";
+    description = "Fast and multi-source CLI program for managing Minecraft mods and modpacks from Modrinth, CurseForge, and GitHub Releases";
+    homepage = "https://github.com/gorilla-devs/ferium";
    license = licenses.mpl20;
    maintainers = [ maintainers.leo60228 ];
  };
--- a/pkgs/os-specific/linux/dmidecode/default.nix
+++ b/pkgs/os-specific/linux/dmidecode/default.nix
@ -1,58 +1,14 @@
-{ lib, stdenv, fetchurl, fetchpatch }:
+{ lib, stdenv, fetchurl }:

 stdenv.mkDerivation rec {
  pname = "dmidecode";
-  version = "3.2";
+  version = "3.4";

  src = fetchurl {
    url = "mirror://savannah/dmidecode/dmidecode-${version}.tar.xz";
-    sha256 = "1pcfhcgs2ifdjwp7amnsr3lq95pgxpr150bjhdinvl505px0cw07";
+    sha256 = "sha256-Q8uoUdhGfJl5zNvqsZLrZjjH06aX66Xdt3naiDdUIhI=";
  };

-  patches = [
-    # suggested patches for 3.2 according to https://www.nongnu.org/dmidecode/
-    (fetchpatch {
-      name = "0001-fix_redfish_hostname_print_length.patch";
-      url = "https://git.savannah.gnu.org/cgit/dmidecode.git/patch/?id=fde47bb227b8fa817c88d7e10a8eb771c46de1df";
-      sha256 = "133nd0c72p68hnqs5m714167761r1pp6bd3kgbsrsrwdx40jlc3m";
-    })
-    (fetchpatch {
-      name = "0002-add_logical_non-volatile_device_to_memory_device_types.patch";
-      url = "https://git.savannah.gnu.org/cgit/dmidecode.git/patch/?id=74dfb854b8199ddb0a27e89296fa565f4706cb9d";
-      sha256 = "0wdpmlcwmqdyyrsmyis8jb7cx3q6fnqpdpc5xly663dj841jcvwh";
-    })
-    (fetchpatch {
-      name = "0003-only-scan-devmem-for-entry-point-on-x86.patch";
-      url = "https://git.savannah.gnu.org/cgit/dmidecode.git/patch/?id=e12ec26e19e02281d3e7258c3aabb88a5cf5ec1d";
-      sha256 = "1y2858n98bfa49syjinx911vza6mm7aa6xalvzjgdlyirhccs30i";
-    })
-    (fetchpatch {
-      name = "0004-fix_formatting_of_tpm_table_output.patch";
-      url = "https://git.savannah.gnu.org/cgit/dmidecode.git/patch/?id=1d0db85949a5bdd96375f6131d393a11204302a6";
-      sha256 = "11s8jciw7xf2668v79qcq2c9w2gwvm3dkcik8dl9v74p654y1nr8";
-    })
-    (fetchpatch {
-      name = "0005-fix_system-slot_information_for_pcie_ssd.patch";
-      url = "https://git.savannah.gnu.org/cgit/dmidecode.git/patch/?id=fd08479625b5845e4d725ab628628f7ebfccc407";
-      sha256 = "07l61wvsw1d8g14zzf6zm7l0ri9kkqz8j5n4h116qwhg1p2k49y4";
-    })
-    (fetchpatch {
-      name = "0006-print_type_33_name_unconditionally.patch";
-      url = "https://git.savannah.gnu.org/cgit/dmidecode.git/patch/?id=65438a7ec0f4cddccf810136da6f280bd148af71";
-      sha256 = "0gqz576ccxys0c8217spf1qmw9lxi9xalw85jjqwsi2bj1k6vy4n";
-    })
-    (fetchpatch {
-      name = "0007-dont_choke_on_invalid_processor_voltage.patch";
-      url = "https://git.savannah.gnu.org/cgit/dmidecode.git/patch/?id=5bb7eb173b72256f70c6b3f3916d7a444be93340";
-      sha256 = "1dkg4lq9kn2g1w5raz1gssn6zqk078zjqbnh9i32f822f727syhp";
-    })
-    (fetchpatch {
-      name = "0008-fix_the_alignment_of_type_25_name.patch";
-      url = "https://git.savannah.gnu.org/cgit/dmidecode.git/patch/?id=557c3c373a9992d45d4358a6a2ccf53b03276f39";
-      sha256 = "18hc91pk7civyqrlilg3kn2nmp2warhh49xlbzrwqi7hgipyf12z";
-    })
-  ];
-
  makeFlags = [
    "prefix=$(out)"
    "CC=${stdenv.cc.targetPrefix}cc"
@ -63,5 +19,6 @@ stdenv.mkDerivation rec {
    description = "A tool that reads information about your system's hardware from the BIOS according to the SMBIOS/DMI standard";
    license = licenses.gpl2Plus;
    platforms = platforms.linux;
+    maintainers = with maintainers; [ delroth ];
  };
 }
--- a/pkgs/os-specific/linux/kernel/common-config.nix
+++ b/pkgs/os-specific/linux/kernel/common-config.nix
@ -44,8 +44,7 @@ let
      # Reduced debug info conflict with BTF and have been enabled in
      # aarch64 defconfig since 5.13
      DEBUG_INFO_REDUCED        = whenAtLeast "5.13" (option no);
-      # Disabled on 32-bit platforms, fails to build on 5.15+ with `Failed to parse base BTF 'vmlinux': -22`
-      DEBUG_INFO_BTF            = whenAtLeast "5.2" (option (if stdenv.hostPlatform.is32bit && (versionAtLeast version "5.15") then no else yes));
+      DEBUG_INFO_BTF            = whenAtLeast "5.2" (option yes);
      BPF_LSM                   = whenAtLeast "5.7" (option yes);
      DEBUG_KERNEL              = yes;
      DEBUG_DEVRES              = no;
--- a/pkgs/os-specific/linux/nvidia-x11/builder.sh
+++ b/pkgs/os-specific/linux/nvidia-x11/builder.sh
@ -120,8 +120,7 @@ installPhase() {
        fi

        # Install libraries needed by Proton to support DLSS
-        install -Dm644 nvngx.dll $i/lib/nvidia/wine/
-        install -Dm644 _nvngx.dll $i/lib/nvidia/wine/
+        install -Dm644 -t $i/lib/nvidia/wine/ nvngx.dll _nvngx.dll

    done

--- a/pkgs/servers/confluent-platform/default.nix
+++ b/pkgs/servers/confluent-platform/default.nix
@ -3,11 +3,11 @@

 stdenv.mkDerivation rec {
  pname = "confluent-platform";
-  version = "7.1.0";
+  version = "7.2.0";

  src = fetchurl {
    url = "https://packages.confluent.io/archive/${lib.versions.majorMinor version}/confluent-${version}.tar.gz";
-    sha256 = "sha256-uoJQQZxUGniMLJk/BwwiNnpgYFcqJ+27GFQLEpsFxCw=";
+    sha256 = "sha256-TtHPsrkmZ53mNL+/Ru2eHb0RKoXW/xSagrD6HF2s5ew=";
  };

  nativeBuildInputs = [ makeWrapper ];
--- a/pkgs/servers/monitoring/loki/default.nix
+++ b/pkgs/servers/monitoring/loki/default.nix
@ -8,14 +8,14 @@
 }:

 buildGoModule rec {
-  version = "2.5.0";
+  version = "2.6.0";
  pname = "grafana-loki";

  src = fetchFromGitHub {
    rev = "v${version}";
    owner = "grafana";
    repo = "loki";
-    sha256 = "sha256-3GeWrkTL3HJQsVBafjSQXHsf1nbVzSVSDZWcJlD22Nw=";
+    sha256 = "sha256-LPunSNKF0HBlmYOn0AIT0zLSVmLaizDnDchJhMjexfM=";
  };

  vendorSha256 = null;
--- a/pkgs/tools/backup/kopia/default.nix
+++ b/pkgs/tools/backup/kopia/default.nix
@ -2,16 +2,16 @@

 buildGoModule rec {
  pname = "kopia";
-  version = "0.11.1";
+  version = "0.11.2";

  src = fetchFromGitHub {
    owner = pname;
    repo = pname;
    rev = "v${version}";
-    sha256 = "sha256-Az3l11J2IhgugPHP3cMT7b2iwQ/TCbdjYKvmHG3c7II=";
+    sha256 = "sha256-WxbD68KTO9hYhwwSSj7wwDGOiJdaLFdqJR+xw3dLfio=";
  };

-  vendorSha256 = "sha256-phQ39li/iCoZFwmaKel6r4bRV8NZXbQhNgWdJbyqdIo=";
+  vendorSha256 = "sha256-i3hK1567KrxBSS3iGeNnKfsFuHsukRI6l9jG+UztY+c=";

  doCheck = false;

--- a/pkgs/tools/misc/gtkterm/default.nix
+++ b/pkgs/tools/misc/gtkterm/default.nix
@ -1,14 +1,14 @@
-{ stdenv, lib, fetchFromGitHub, meson, ninja, pkg-config, gtk3, vte, libgudev, wrapGAppsHook }:
+{ stdenv, lib, fetchFromGitHub, meson, ninja, pkg-config, gtk3, vte, libgudev, wrapGAppsHook, pcre2 }:

 stdenv.mkDerivation rec {
  pname = "gtkterm";
-  version = "1.1.1";
+  version = "1.2.1";

  src = fetchFromGitHub {
    owner = "Jeija";
    repo = "gtkterm";
    rev = "${version}";
-    sha256 = "0s2cx8w1n8d37pl80gll5h6dyvbqrfcam8l4wmvnqqww9jml6577";
+    sha256 = "sha256-4Z+8fs4VEk2+Ci1X3oUuInylTdIbQ5AiPenFqnyNXvc=";
  };

  nativeBuildInputs = [
@ -22,6 +22,7 @@ stdenv.mkDerivation rec {
    gtk3
    vte
    libgudev
+    pcre2
  ];

  meta = with lib; {
--- a/pkgs/tools/misc/ntfy-sh/default.nix
+++ b/pkgs/tools/misc/ntfy-sh/default.nix
@ -2,16 +2,16 @@

 buildGoModule rec {
  pname = "ntfy-sh";
-  version = "1.26.0";
+  version = "1.27.2";

  src = fetchFromGitHub {
    owner = "binwiederhier";
    repo = "ntfy";
    rev = "v${version}";
-    sha256 = "sha256-LR3orzh/xwmxt5RhmjOacFs8NUp6tKPUwYDdzVFhx4k=";
+    sha256 = "sha256-0b4yC2kXh3c2SgKF11voWZh2qS3Y/4KJlt9WtjXswcE=";
  };

-  vendorSha256 = "sha256-16S3Up1D4PycBY2Wk11cm0F4z5PkQL2reXj1mGpsOv4=";
+  vendorSha256 = "sha256-PXYSjhMNtDa0uCaLu0AyM1SMhZPr2wC+xMPDjeQIhDU=";

  doCheck = false;

--- a/pkgs/tools/networking/croc/default.nix
+++ b/pkgs/tools/networking/croc/default.nix
@ -2,16 +2,16 @@

 buildGoModule rec {
  pname = "croc";
-  version = "9.5.6";
+  version = "9.6.0";

  src = fetchFromGitHub {
    owner = "schollz";
    repo = pname;
    rev = "v${version}";
-    sha256 = "sha256-VXbrwUf43qvXd+/GXNA+Wkt4E5EM4+1V0wPj3JONzlU=";
+    sha256 = "sha256-/alVraVGggViOxWZsFgdBE49PPzZijLP+ky9F686Ano=";
  };

-  vendorSha256 = "sha256-45rQHG5Std7m7Xu8OEFfjdG6RyriM4yAPzJl7M2lPW8=";
+  vendorSha256 = "sha256-RBaMQyjqlQkH4tvgkqemIG3c0IzZiMpaa3SsSebV2Zs=";

  subPackages = [ "." ];

--- a/pkgs/tools/networking/godns/default.nix
+++ b/pkgs/tools/networking/godns/default.nix
@ -2,13 +2,13 @@

 buildGoModule rec {
  pname = "godns";
-  version = "2.8.1";
+  version = "2.8.3";

  src = fetchFromGitHub {
    owner = "TimothyYe";
    repo = "godns";
    rev = "v${version}";
-    sha256 = "sha256-dZnCvpidQsQ2eLULkcMuKqFcBwYoy6Pd1NOCXv+Umzo=";
+    sha256 = "sha256-EQ296oFb6C/xA9Ww45PbPyvQQjWxxd/9aDDcfZ4uFcw=";
  };

  vendorSha256 = "sha256-PGqknRGtN0XRGPnAsWzQrlJZG5BzQIhlSysGefkxysE=";
--- a/pkgs/tools/networking/voms/default.nix
+++ b/pkgs/tools/networking/voms/default.nix
@ -11,17 +11,25 @@
 , gsoap
 , openssl
 , zlib
+  # Configuration overridable with .override
+  # If not null, the builder will
+  # move "$out/etc" to "$out/etc.orig" and symlink "$out/etc" to externalEtc.
+, externalEtc ? "/etc"
 }:

 stdenv.mkDerivation rec{
  pname = "voms-unstable";
-  version = "2021-05-04";
+  version = "2022-06-14";

  src = fetchFromGitHub {
    owner = "italiangrid";
    repo = "voms";
-    rev = "61563152fce3a4e6860dd8ab8ab6e72b7908d8b8";
-    sha256 = "LNR0G4XrgxqjQmjyaKoZJLNoxtAGiTM93FG3jIU1u+Y=";
+    rev = "8e99bb96baaf197f0f557836e2829084bb1bb00e"; # develop branch
+    hash = "sha256-FG4fHO2lsQ3t/ZaKT9xY+xqdQHfdtzi5ULtxLhdPnss=";
+  };
+
+  passthru = {
+    inherit externalEtc;
  };

  nativeBuildInputs = [
@ -59,8 +67,15 @@ stdenv.mkDerivation rec{
    "--with-gsoap-wsdl2h=${gsoap}/bin/wsdl2h"
  ];

+  postFixup = ''
+    ${lib.optionalString (externalEtc != null) ''
+      mv "$out"/etc{,.orig}
+      ln -s ${lib.escapeShellArg externalEtc} "$out/etc"
+    ''}
+  '';
+
  meta = with lib; {
-    description = "The VOMS native service and APIs";
+    description = "The C/C++ VOMS server, client and APIs v2.x";
    homepage = "https://italiangrid.github.io/voms/";
    changelog = "https://github.com/italiangrid/voms/blob/master/ChangeLog";
    license = licenses.asl20;
--- a/pkgs/tools/networking/xrootd/default.nix
+++ b/pkgs/tools/networking/xrootd/default.nix
@ -20,14 +20,14 @@

 stdenv.mkDerivation rec {
  pname = "xrootd";
-  version = "5.4.2";
+  version = "5.4.3";

  src = fetchFromGitHub {
    owner = "xrootd";
    repo = "xrootd";
    rev = "v${version}";
    fetchSubmodules = true;
-    sha256 = "sha256-k6uAJbUhpwnRrSeGn4JQiHDBrGJNQDf5vG2a+je5ByU=";
+    hash = "sha256-BlMYm4ffSpUxqMjlDVZC59KOuLvwsk/BeBB3VBjAwjs=";
  };

  outputs = [ "bin" "out" "dev" "man" ];
--- a/pkgs/tools/text/xidel/default.nix
+++ b/pkgs/tools/text/xidel/default.nix
@ -1,4 +1,4 @@
-{ lib, stdenv, fetchsvn, fetchFromGitHub, fpc }:
+{ lib, stdenv, fetchsvn, fetchFromGitHub, fpc, openssl }:

 let
  flreSrc = fetchFromGitHub {
@ -36,6 +36,9 @@ in stdenv.mkDerivation rec {
  };

  nativeBuildInputs = [ fpc ];
+  buildInputs = [ openssl ];
+
+  NIX_LDFLAGS = [ "-lcrypto" ];

  patchPhase = ''
    patchShebangs \
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@ -1655,15 +1655,15 @@ mapAliases ({
    kgamma5 kget kgpg khelpcenter kig kigo killbots kinfocenter kitinerary
    kleopatra klettres klines kmag kmail kmenuedit kmines kmix kmplot
    knavalbattle knetwalk knights kollision kolourpaint kompare konsole kontact
-    korganizer kpkpass krdc kreversi krfb kscreen kscreenlocker kshisen ksquares
-    ksshaskpass ksystemlog kteatime ktimer ktorrent ktouch kturtle kwallet-pam
-    kwalletmanager kwave kwayland-integration kwin kwrited marble milou minuet
-    okular oxygen oxygen-icons5 picmi plasma-browser-integration plasma-desktop
-    plasma-integration plasma-nano plasma-nm plasma-pa plasma-mobile
-    plasma-systemmonitor plasma-thunderbolt plasma-vault plasma-workspace
-    plasma-workspace-wallpapers polkit-kde-agent powerdevil qqc2-breeze-style
-    sddm-kcm skanlite skanpage spectacle systemsettings xdg-desktop-portal-kde
-    yakuake zanshin
+    konversation korganizer kpkpass krdc kreversi krfb kscreen kscreenlocker
+    kshisen ksquares ksshaskpass ksystemlog kteatime ktimer ktorrent ktouch
+    kturtle kwallet-pam kwalletmanager kwave kwayland-integration kwin kwrited
+    marble milou minuet okular oxygen oxygen-icons5 picmi
+    plasma-browser-integration plasma-desktop plasma-integration plasma-nano
+    plasma-nm plasma-pa plasma-mobile plasma-systemmonitor plasma-thunderbolt
+    plasma-vault plasma-workspace plasma-workspace-wallpapers polkit-kde-agent
+    powerdevil qqc2-breeze-style sddm-kcm skanlite skanpage spectacle
+    systemsettings xdg-desktop-portal-kde yakuake zanshin
  ;

  inherit (plasma5Packages.thirdParty)
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@ -8085,6 +8085,8 @@ with pkgs;

  netsniff-ng = callPackage ../tools/networking/netsniff-ng { };

+  nixpacks = callPackage ../applications/virtualization/nixpacks { };
+
  nkeys = callPackage ../tools/system/nkeys { };

  nyxt = callPackage ../applications/networking/browsers/nyxt { };
@ -9052,7 +9054,9 @@ with pkgs;

  ntfy = callPackage ../tools/misc/ntfy {};

-  ntfy-sh = callPackage ../tools/misc/ntfy-sh {};
+  ntfy-sh = callPackage ../tools/misc/ntfy-sh {
+    buildGoModule = buildGo118Module;
+  };

  ntirpc = callPackage ../development/libraries/ntirpc { };

@ -27120,18 +27124,6 @@ with pkgs;

  gimpPlugins = recurseIntoAttrs (callPackage ../applications/graphics/gimp/plugins {});

-  glimpse = callPackage ../applications/graphics/glimpse {
-    autoreconfHook = buildPackages.autoreconfHook269;
-    lcms = lcms2;
-    inherit (darwin.apple_sdk.frameworks) AppKit Cocoa;
-  };
-
-  glimpse-with-plugins = callPackage ../applications/graphics/glimpse/wrapper.nix {
-    plugins = null; # All packaged plugins enabled, if not explicit plugin list supplied
-  };
-
-  glimpsePlugins = recurseIntoAttrs (callPackage ../applications/graphics/glimpse/plugins {});
-
  girara = callPackage ../applications/misc/girara {
    gtk = gtk3;
  };
@ -28041,8 +28033,6 @@ with pkgs;

  kondo = callPackage ../applications/misc/kondo { };

-  konversation = libsForQt5.callPackage ../applications/networking/irc/konversation { };
-
  kooha = callPackage ../applications/video/kooha { };

  # Qt 5.15 is not default on mac, tdesktop requires 5.15 (and kotatogram subsequently)
@ -29480,7 +29470,7 @@ with pkgs;

  purple-xmpp-http-upload = callPackage ../applications/networking/instant-messengers/pidgin-plugins/purple-xmpp-http-upload { };

-  telegram-purple = callPackage ../applications/networking/instant-messengers/pidgin-plugins/telegram-purple { };
+  tdlib-purple = callPackage ../applications/networking/instant-messengers/pidgin-plugins/tdlib-purple { };

  toxprpl = callPackage ../applications/networking/instant-messengers/pidgin-plugins/tox-prpl {
    libtoxcore = libtoxcore-new;
@ -29782,6 +29772,8 @@ with pkgs;

  roomeqwizard = callPackage ../applications/audio/roomeqwizard { };

+  radioboat = callPackage ../applications/audio/radioboat { };
+
  radiotray-ng = callPackage ../applications/audio/radiotray-ng {
    wxGTK = wxGTK30;
  };