Merge staging-next into staging

maintainers/maintainer-list.nix

···
     githubId = 8316672;
     name = "Alex Chapman";
   };
-  alexeyre = {
-    email = "[e-mail]";
-    github = "alexeyre";
-    githubId = 38869148;
-    name = "Alex Eyre";
-  };
   alexfmpe = {
     email = "[e-mail]";
     github = "alexfmpe";

pkgs/applications/file-managers/yazi/default.nix

···
+{ rustPlatform
+, fetchFromGitHub
+, lib
+
+, makeWrapper
+, stdenv
+, Foundation
+
+, withFile ? true
+, file
+, withJq ? true
+, jq
+, withPoppler ? true
+, poppler_utils
+, withUnar ? true
+, unar
+, withFfmpegthumbnailer ? true
+, ffmpegthumbnailer
+, withFd ? true
+, fd
+, withRipgrep ? true
+, ripgrep
+, withFzf ? true
+, fzf
+, withZoxide ? true
+, zoxide
+
+, nix-update-script
+}:
+
+rustPlatform.buildRustPackage rec {
+  pname = "yazi";
+  version = "0.1.3";
+
+  src = fetchFromGitHub {
+    owner = "sxyazi";
+    repo = pname;
+    rev = "v${version}";
+    hash = "sha256-IUE2846AltYyEefkavCJOEak9mW0wygojWsucwUEgh4=";
+  };
+
+  cargoHash = "sha256-wwtdaReb+teXf+VDwqAqCbSy2qWI11IRlcygmWdaqF4=";
+
+  nativeBuildInputs = [ makeWrapper ];
+  buildInputs = lib.optionals stdenv.isDarwin [ Foundation ];
+
+  postInstall = with lib;
+    let
+      runtimePaths = [ ]
+        ++ optional withFile file
+        ++ optional withJq jq
+        ++ optional withPoppler poppler_utils
+        ++ optional withUnar unar
+        ++ optional withFfmpegthumbnailer ffmpegthumbnailer
+        ++ optional withFd fd
+        ++ optional withRipgrep ripgrep
+        ++ optional withFzf fzf
+        ++ optional withZoxide zoxide;
+    in
+    ''
+      wrapProgram $out/bin/yazi \
+         --prefix PATH : "${makeBinPath runtimePaths}"
+    '';
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = with lib; {
+    description = "Blazing fast terminal file manager written in Rust, based on async I/O";
+    homepage = "https://github.com/sxyazi/yazi";
+    license = licenses.mit;
+    maintainers = with maintainers; [ xyenon matthiasbeyer ];
+  };
+}

pkgs/applications/misc/nimbo/default.nix

···
     description = "Run machine learning jobs on AWS with a single command";
     homepage = "https://github.com/nimbo-sh/nimbo";
     license = licenses.bsl11;
-    maintainers = with maintainers; [ alexeyre noreferences ];
+    maintainers = with maintainers; [ noreferences ];
   };
 }

pkgs/applications/misc/scli/default.nix

···
     description = "Simple terminal user interface for Signal";
     homepage = "https://github.com/isamert/scli";
     license = licenses.gpl3Only;
-    maintainers = with maintainers; [ alexeyre ];
+    maintainers = with maintainers; [ ];
   };
 }

pkgs/applications/networking/cluster/bosh-cli/default.nix

···
 buildGoModule rec {
   pname = "bosh-cli";
 
-  version = "7.3.1";
+  version = "7.4.0";
 
   src = fetchFromGitHub {
     owner = "cloudfoundry";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-bCZuX4c/ltnq1se/tbqQmWBc7/6IRUWqSNg7T3pFl3k=";
+    sha256 = "sha256-Hxak76S3+i5G81Xv4wdFvR/+vg5Eh86YjeqRzNUmfh4=";
   };
   vendorHash = null;
 

pkgs/applications/networking/irc/weechat/default.nix

···
-{ stdenv, fetchurl, fetchpatch, lib
+{ stdenv, fetchurl, lib
 , ncurses, openssl, aspell, gnutls, gettext
 , zlib, curl, pkg-config, libgcrypt
 , cmake, libobjc, libresolv, libiconv
···
   in
     assert lib.all (p: p.enabled -> ! (builtins.elem null p.buildInputs)) plugins;
     stdenv.mkDerivation rec {
-      version = "4.0.3";
+      version = "4.0.4";
       pname = "weechat";
 
       hardeningEnable = [ "pie" ];
 
       src = fetchurl {
         url = "https://weechat.org/files/src/weechat-${version}.tar.xz";
-        hash = "sha256-iA29zo5zs/SAKggsShp8YZQ9vFhn16lWleTkY8ZTWpI=";
+        hash = "sha256-rl9JebWtoDObhOdB1ffkge6R4/7NQKCZB7ZHUYKetvY=";
       };
-
-      patches = lib.optional (perlSupport && lib.versionAtLeast perl.version "5.38") (fetchpatch {
-        name = "perl538-locale.patch";
-        url = "https://github.com/weechat/weechat/commit/c5eb982424150894959b978d98dcf6a005eb6c9f.patch";
-        excludes = [ "ChangeLog.adoc" ];
-        sha256 = "sha256-SSDZy4/c12LOxjvFMuJSv6gJEX298wF62/gQLQ/geiU=";
-      });
 
       outputs = [ "out" "man" ] ++ map (p: p.name) enabledPlugins;
 

pkgs/applications/networking/newsreaders/liferea/default.nix

···
 
 stdenv.mkDerivation rec {
   pname = "liferea";
-  version = "1.15.0";
+  version = "1.15.1";
 
   src = fetchurl {
     url = "https://github.com/lwindolf/${pname}/releases/download/v${version}/${pname}-${version}.tar.bz2";
-    sha256 = "1a7dlwuUOHeCsB+ofAOPlbyuh/QAB8kf50MsocMNz70=";
+    sha256 = "QOdGltz4wns1vq0Nv/O65koMYkLmPAAP4hKp301dAKI=";
   };
 
   nativeBuildInputs = [

pkgs/applications/version-management/gitea/default.nix

···
 
 buildGoModule rec {
   pname = "gitea";
-  version = "1.20.2";
+  version = "1.20.3";
 
   # not fetching directly from the git repo, because that lacks several vendor files for the web UI
   src = fetchurl {
     url = "https://dl.gitea.com/gitea/${version}/gitea-src-${version}.tar.gz";
-    hash = "sha256-a88ltflOcZQVWcEjC3r6rbPSk6LRtATcEQecYt/wg04=";
+    hash = "sha256-cn61Z5nYMmzSoHcDoXwuhm+IMn6+iIYPi7KxzO/b5Nw=";
   };
 
   vendorHash = null;

pkgs/desktops/pantheon/apps/elementary-feedback/default.nix

···
 , meson
 , ninja
 , vala
-, python3
-, gtk3
+, gtk4
 , glib
-, granite
+, granite7
+, libadwaita
 , libgee
-, libhandy
-, wrapGAppsHook
+, wrapGAppsHook4
 , appstream
 }:
 
 stdenv.mkDerivation rec {
   pname = "elementary-feedback";
-  version = "7.0.0";
+  version = "7.1.0";
 
   src = fetchFromGitHub {
     owner = "elementary";
     repo = "feedback";
     rev = version;
-    sha256 = "sha256-QvqyaI9szZuYuE3D6o4zjr5J6mvEzNHqTBWii+gjyMc=";
+    sha256 = "sha256-hAObgD2Njg1We0rGEu508khoBo+hj0DQAB7N33CVDiM=";
   };
 
   patches = [
···
     meson
     ninja
     pkg-config
-    python3
     vala
-    wrapGAppsHook
+    wrapGAppsHook4
   ];
 
   buildInputs = [
     appstream
-    granite
-    gtk3
+    granite7
+    gtk4
+    libadwaita
     libgee
-    libhandy
     glib
   ];
-
-  postPatch = ''
-    chmod +x meson/post_install.py
-    patchShebangs meson/post_install.py
-  '';
 
   passthru = {
     updateScript = nix-update-script { };

pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/0001-Remove-Install-Unlisted-Engines-function.patch

···
-From f23363ad2fa402d59b41ffe2c13a46462c6d2194 Mon Sep 17 00:00:00 2001
-From: Bobby Rong <[e-mail]>
-Date: Fri, 16 Jul 2021 23:28:56 +0800
-Subject: [PATCH] Remove Install Unlisted Engines function
-
-https://github.com/elementary/switchboard-plug-keyboard/issues/324
-
-Co-Authored-By: WORLDofPEACE <[e-mail]>
-
----
- src/Dialogs/InstallEngineDialog.vala          | 140 -----------------
- src/Dialogs/ProgressDialog.vala               |  82 ----------
- src/InputMethod/Installer/InstallList.vala    |  73 ---------
- .../Installer/UbuntuInstaller.vala            | 142 ------------------
- src/InputMethod/Installer/aptd-client.vala    |  93 ------------
- .../InputMethod/AddEnginesPopover.vala        |  12 --
- src/Widgets/InputMethod/LanguagesRow.vala     |  43 ------
- src/meson.build                               |   6 -
- 8 files changed, 591 deletions(-)
- delete mode 100644 src/Dialogs/InstallEngineDialog.vala
- delete mode 100644 src/Dialogs/ProgressDialog.vala
- delete mode 100644 src/InputMethod/Installer/InstallList.vala
- delete mode 100644 src/InputMethod/Installer/UbuntuInstaller.vala
- delete mode 100644 src/InputMethod/Installer/aptd-client.vala
- delete mode 100644 src/Widgets/InputMethod/LanguagesRow.vala
-
-diff --git a/src/Dialogs/InstallEngineDialog.vala b/src/Dialogs/InstallEngineDialog.vala
-deleted file mode 100644
-index ffba3a8..0000000
---- a/src/Dialogs/InstallEngineDialog.vala
-+++ /dev/null
-@@ -1,140 +0,0 @@
--/*
--* Copyright 2019-2020 elementary, Inc. (https://elementary.io)
--*
--* This program is free software: you can redistribute it and/or modify
--* it under the terms of the GNU General Public License as published by
--* the Free Software Foundation, either version 3 of the License, or
--* (at your option) any later version.
--*
--* This program is distributed in the hope that it will be useful,
--* but WITHOUT ANY WARRANTY; without even the implied warranty of
--* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
--* GNU General Public License for more details.
--*
--* You should have received a copy of the GNU General Public License
--* along with this program.  If not, see <https://www.gnu.org/licenses/>.
--*/
--
--public class Pantheon.Keyboard.InputMethodPage.InstallEngineDialog : Granite.MessageDialog {
--    private InstallList? engines_filter;
--
--    public InstallEngineDialog (Gtk.Window parent) {
--        Object (
--            primary_text: _("Choose an engine to install"),
--            secondary_text: _("Select an engine from the list to install and use."),
--            image_icon: new ThemedIcon ("extension"),
--            transient_for: parent,
--            buttons: Gtk.ButtonsType.CANCEL
--        );
--    }
--
--    construct {
--        var languages_list = new Gtk.ListBox () {
--            activate_on_single_click = true,
--            expand = true,
--            selection_mode = Gtk.SelectionMode.NONE
--        };
--
--        foreach (var language in InstallList.get_all ()) {
--            var lang = new LanguagesRow (language);
--            languages_list.add (lang);
--        }
--
--        var back_button = new Gtk.Button.with_label (_("Languages")) {
--            halign = Gtk.Align.START,
--            margin = 6
--        };
--        back_button.get_style_context ().add_class (Granite.STYLE_CLASS_BACK_BUTTON);
--
--        var language_title = new Gtk.Label ("");
--
--        var language_header = new Gtk.Box (Gtk.Orientation.HORIZONTAL, 6);
--        language_header.pack_start (back_button);
--        language_header.set_center_widget (language_title);
--
--        var listbox = new Gtk.ListBox () {
--            expand = true
--        };
--        listbox.set_filter_func (filter_function);
--        listbox.set_sort_func (sort_function);
--
--        foreach (var language in InstallList.get_all ()) {
--            foreach (var engine in language.get_components ()) {
--                listbox.add (new EnginesRow (engine));
--            }
--        }
--
--        var scrolled = new Gtk.ScrolledWindow (null, null);
--        scrolled.add (listbox);
--
--        var engine_list_grid = new Gtk.Grid () {
--            orientation = Gtk.Orientation.VERTICAL
--        };
--        engine_list_grid.get_style_context ().add_class (Gtk.STYLE_CLASS_VIEW);
--        engine_list_grid.add (language_header);
--        engine_list_grid.add (new Gtk.Separator (Gtk.Orientation.HORIZONTAL));
--        engine_list_grid.add (scrolled);
--
--        var stack = new Gtk.Stack () {
--            height_request = 200,
--            width_request = 300,
--            transition_type = Gtk.StackTransitionType.SLIDE_LEFT_RIGHT
--        };
--        stack.add (languages_list);
--        stack.add (engine_list_grid);
--
--        var frame = new Gtk.Frame (null);
--        frame.add (stack);
--
--        custom_bin.add (frame);
--        custom_bin.show_all ();
--
--        var install_button = add_button (_("Install"), Gtk.ResponseType.OK);
--        install_button.sensitive = false;
--        install_button.get_style_context ().add_class (Gtk.STYLE_CLASS_SUGGESTED_ACTION);
--
--        languages_list.row_activated.connect ((row) => {
--            stack.visible_child = engine_list_grid;
--            language_title.label = ((LanguagesRow) row).language.get_name ();
--            engines_filter = ((LanguagesRow) row).language;
--            listbox.invalidate_filter ();
--            var adjustment = scrolled.get_vadjustment ();
--            adjustment.set_value (adjustment.lower);
--        });
--
--        back_button.clicked.connect (() => {
--            stack.visible_child = languages_list;
--            install_button.sensitive = false;
--        });
--
--        listbox.selected_rows_changed.connect (() => {
--            foreach (var engines_row in listbox.get_children ()) {
--                ((EnginesRow) engines_row).selected = false;
--            }
--
--            ((EnginesRow) listbox.get_selected_row ()).selected = true;
--            install_button.sensitive = true;
--        });
--
--        response.connect ((response_id) => {
--            if (response_id == Gtk.ResponseType.OK) {
--                string engine_to_install = ((EnginesRow) listbox.get_selected_row ()).engine_name;
--                UbuntuInstaller.get_default ().install (engine_to_install);
--            }
--        });
--    }
--
--    [CCode (instance_pos = -1)]
--    private bool filter_function (Gtk.ListBoxRow row) {
--        if (InstallList.get_language_from_engine_name (((EnginesRow) row).engine_name) == engines_filter) {
--            return true;
--        }
--
--        return false;
--    }
--
--    [CCode (instance_pos = -1)]
--    private int sort_function (Gtk.ListBoxRow row1, Gtk.ListBoxRow row2) {
--        return ((EnginesRow) row1).engine_name.collate (((EnginesRow) row1).engine_name);
--    }
--}
-diff --git a/src/Dialogs/ProgressDialog.vala b/src/Dialogs/ProgressDialog.vala
-deleted file mode 100644
-index 868f167..0000000
---- a/src/Dialogs/ProgressDialog.vala
-+++ /dev/null
-@@ -1,82 +0,0 @@
--/*
--* Copyright 2011-2020 elementary, Inc. (https://elementary.io)
--*
--* This program is free software: you can redistribute it
--* and/or modify it under the terms of the GNU Lesser General Public License as
--* published by the Free Software Foundation, either version 3 of the
--* License, or (at your option) any later version.
--*
--* This program is distributed in the hope that it will be
--* useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
--* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
--* Public License for more details.
--*
--* You should have received a copy of the GNU General Public License along
--* with this program. If not, see http://www.gnu.org/licenses/.
--*/
--
--public class Pantheon.Keyboard.InputMethodPage.ProgressDialog : Granite.Dialog {
--    public int progress {
--        set {
--            if (value >= 100) {
--                destroy ();
--            }
--
--            progress_bar.fraction = value / 100.0;
--        }
--    }
--
--    private Gtk.ProgressBar progress_bar;
--
--    construct {
--        var image = new Gtk.Image.from_icon_name ("preferences-desktop-locale", Gtk.IconSize.DIALOG) {
--            valign = Gtk.Align.START
--        };
--
--        var primary_label = new Gtk.Label (null) {
--            max_width_chars = 50,
--            wrap = true,
--            xalign = 0
--        };
--        primary_label.get_style_context ().add_class (Granite.STYLE_CLASS_PRIMARY_LABEL);
--
--        unowned UbuntuInstaller installer = UbuntuInstaller.get_default ();
--        switch (installer.transaction_mode) {
--            case UbuntuInstaller.TransactionMode.INSTALL:
--                primary_label.label = _("Installing %s").printf (installer.engine_to_address);
--                break;
--            case UbuntuInstaller.TransactionMode.REMOVE:
--                primary_label.label = _("Removing %s").printf (installer.engine_to_address);
--                break;
--        }
--
--        progress_bar = new Gtk.ProgressBar () {
--            hexpand = true,
--            valign = Gtk.Align.START,
--            width_request = 300
--        };
--
--        var cancel_button = (Gtk.Button) add_button (_("Cancel"), 0);
--
--        installer.bind_property ("install-cancellable", cancel_button, "sensitive");
--
--        var grid = new Gtk.Grid () {
--            column_spacing = 12,
--            margin = 6,
--            row_spacing = 6
--        };
--        grid.attach (image, 0, 0, 1, 2);
--        grid.attach (primary_label, 1, 0);
--        grid.attach (progress_bar, 1, 1);
--        grid.show_all ();
--
--        border_width = 6;
--        deletable = false;
--        get_content_area ().add (grid);
--
--        cancel_button.clicked.connect (() => {
--            installer.cancel_install ();
--            destroy ();
--        });
--    }
--}
-diff --git a/src/InputMethod/Installer/InstallList.vala b/src/InputMethod/Installer/InstallList.vala
-deleted file mode 100644
-index 275c302..0000000
---- a/src/InputMethod/Installer/InstallList.vala
-+++ /dev/null
-@@ -1,75 +0,0 @@
--/*
--* 2019-2020 elementary, Inc. (https://elementary.io)
--*
--* This program is free software: you can redistribute it and/or modify
--* it under the terms of the GNU General Public License as published by
--* the Free Software Foundation, either version 3 of the License, or
--* (at your option) any later version.
--*
--* This program is distributed in the hope that it will be useful,
--* but WITHOUT ANY WARRANTY; without even the implied warranty of
--* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
--* GNU General Public License for more details.
--*
--* You should have received a copy of the GNU General Public License
--* along with this program.  If not, see <https://www.gnu.org/licenses/>.
--*/
--
--public enum Pantheon.Keyboard.InputMethodPage.InstallList {
--    JA,
--    KO,
--    ZH;
--
--    public string get_name () {
--        switch (this) {
--            case JA:
--                return _("Japanese");
--            case KO:
--                return _("Korean");
--            case ZH:
--                return _("Chinese");
--            default:
--                assert_not_reached ();
--        }
--    }
--
--    public string[] get_components () {
--        switch (this) {
--            case JA:
--                return { "ibus-anthy", "ibus-mozc", "ibus-skk" };
--            case KO:
--                return { "ibus-hangul" };
--            case ZH:
--                return { "ibus-cangjie", "ibus-chewing", "ibus-pinyin", "ibus-rime" };
--            default:
--                assert_not_reached ();
--        }
--    }
--
--    public static InstallList get_language_from_engine_name (string engine_name) {
--        switch (engine_name) {
--            case "ibus-anthy":
--                return JA;
--            case "ibus-mozc":
--                return JA;
--            case "ibus-skk":
--                return JA;
--            case "ibus-hangul":
--                return KO;
--            case "ibus-cangjie":
--                return ZH;
--            case "ibus-chewing":
--                return ZH;
--            case "ibus-pinyin":
--                return ZH;
--            case "ibus-rime":
--                return ZH;
--            default:
--                assert_not_reached ();
--        }
--    }
--
--    public static InstallList[] get_all () {
--        return { JA, KO, ZH };
--    }
--}
-diff --git a/src/InputMethod/Installer/UbuntuInstaller.vala b/src/InputMethod/Installer/UbuntuInstaller.vala
-deleted file mode 100644
-index b65aa1f..0000000
---- a/src/InputMethod/Installer/UbuntuInstaller.vala
-+++ /dev/null
-@@ -1,142 +0,0 @@
--/*
--* Copyright 2011-2020 elementary, Inc. (https://elementary.io)
--*
--* This program is free software: you can redistribute it
--* and/or modify it under the terms of the GNU Lesser General Public License as
--* published by the Free Software Foundation, either version 3 of the
--* License, or (at your option) any later version.
--*
--* This program is distributed in the hope that it will be
--* useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
--* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
--* Public License for more details.
--*
--* You should have received a copy of the GNU General Public License along
--* with this program. If not, see http://www.gnu.org/licenses/.
--*/
--
--public class Pantheon.Keyboard.InputMethodPage.UbuntuInstaller : Object {
--    private AptdProxy aptd;
--    private AptdTransactionProxy proxy;
--
--    public bool install_cancellable { get; private set; }
--    public TransactionMode transaction_mode { get; private set; }
--    public string engine_to_address { get; private set; }
--
--    public signal void install_finished (string langcode);
--    public signal void install_failed ();
--    public signal void remove_finished (string langcode);
--    public signal void progress_changed (int progress);
--
--    public enum TransactionMode {
--        INSTALL,
--        REMOVE,
--        INSTALL_MISSING,
--    }
--
--    Gee.HashMap<string, string> transactions;
--
--    private static GLib.Once<UbuntuInstaller> instance;
--    public static unowned UbuntuInstaller get_default () {
--        return instance.once (() => {
--            return new UbuntuInstaller ();
--        });
--    }
--
--    private UbuntuInstaller () {}
--
--    construct {
--        transactions = new Gee.HashMap<string, string> ();
--        aptd = new AptdProxy ();
--
--        try {
--            aptd.connect_to_aptd ();
--        } catch (Error e) {
--            warning ("Could not connect to APT daemon");
--        }
--    }
--
--    public void install (string engine_name) {
--        transaction_mode = TransactionMode.INSTALL;
--        engine_to_address = engine_name;
--        string[] packages = {};
--        packages += engine_to_address;
--
--        foreach (var packet in packages) {
--            message ("Packet: %s", packet);
--        }
--
--        aptd.install_packages.begin (packages, (obj, res) => {
--            try {
--                var transaction_id = aptd.install_packages.end (res);
--                transactions.@set (transaction_id, "i-" + engine_name);
--                run_transaction (transaction_id);
--            } catch (Error e) {
--                warning ("Could not queue downloads: %s", e.message);
--            }
--        });
--    }
--
--    public void cancel_install () {
--        if (install_cancellable) {
--            warning ("cancel_install");
--            try {
--                proxy.cancel ();
--            } catch (Error e) {
--                warning ("cannot cancel installation:%s", e.message);
--            }
--        }
--    }
--
--    private void run_transaction (string transaction_id) {
--        proxy = new AptdTransactionProxy ();
--        proxy.finished.connect (() => {
--            on_apt_finshed (transaction_id, true);
--        });
--
--        proxy.property_changed.connect ((prop, val) => {
--            if (prop == "Progress") {
--                progress_changed ((int) val.get_int32 ());
--            }
--
--            if (prop == "Cancellable") {
--                install_cancellable = val.get_boolean ();
--            }
--        });
--
--        try {
--            proxy.connect_to_aptd (transaction_id);
--            proxy.simulate ();
--
--            proxy.run ();
--        } catch (Error e) {
--            on_apt_finshed (transaction_id, false);
--            warning ("Could no run transaction: %s", e.message);
--        }
--    }
--
--    private void on_apt_finshed (string id, bool success) {
--        if (!success) {
--            install_failed ();
--            transactions.unset (id);
--            return;
--        }
--
--        if (!transactions.has_key (id)) { //transaction already removed
--            return;
--        }
--
--        var action = transactions.get (id);
--        var lang = action[2:action.length];
--
--        message ("ID %s -> %s", id, success ? "success" : "failed");
--
--        if (action[0:1] == "i") { // install
--            install_finished (lang);
--        } else {
--            remove_finished (lang);
--        }
--
--        transactions.unset (id);
--    }
--}
-diff --git a/src/InputMethod/Installer/aptd-client.vala b/src/InputMethod/Installer/aptd-client.vala
-deleted file mode 100644
-index ee5c3f5..0000000
---- a/src/InputMethod/Installer/aptd-client.vala
-+++ /dev/null
-@@ -1,93 +0,0 @@
--/*
-- * Copyright (C) 2012 Canonical Ltd
-- *
-- * This program is free software: you can redistribute it and/or modify
-- * it under the terms of the GNU General Public License version 3 as
-- * published by the Free Software Foundation.
-- *
-- * This program is distributed in the hope that it will be useful,
-- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-- * GNU General Public License for more details.
-- *
-- * You should have received a copy of the GNU General Public License
-- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
-- *
-- * Authored by Pawel Stolowski <[e-mail]>
-- */
--
--namespace Pantheon.Keyboard.InputMethodPage {
--    private const string APTD_DBUS_NAME = "org.debian.apt";
--    private const string APTD_DBUS_PATH = "/org/debian/apt";
--
--    /**
--    * Expose a subset of org.debian.apt interfaces -- only what's needed by applications lens.
--    */
--    [DBus (name = "org.debian.apt")]
--    public interface AptdService : GLib.Object {
--        public abstract async string install_packages (string[] packages) throws GLib.Error;
--        public abstract async string remove_packages (string[] packages) throws GLib.Error;
--        public abstract async void quit () throws GLib.Error;
--    }
--
--    [DBus (name = "org.debian.apt.transaction")]
--    public interface AptdTransactionService : GLib.Object {
--        public abstract void run () throws GLib.Error;
--        public abstract void simulate () throws GLib.Error;
--        public abstract void cancel () throws GLib.Error;
--        public signal void finished (string exit_state);
--        public signal void property_changed (string property, Variant val);
--    }
--
--    public class AptdProxy : GLib.Object {
--        private AptdService _aptd_service;
--
--        public void connect_to_aptd () throws GLib.Error {
--            _aptd_service = Bus.get_proxy_sync (BusType.SYSTEM, APTD_DBUS_NAME, APTD_DBUS_PATH);
--        }
--
--        public async string install_packages (string[] packages) throws GLib.Error {
--            string res = yield _aptd_service.install_packages (packages);
--            return res;
--        }
--
--        public async string remove_packages (string[] packages) throws GLib.Error {
--            string res = yield _aptd_service.remove_packages (packages);
--            return res;
--        }
--
--        public async void quit () throws GLib.Error {
--            yield _aptd_service.quit ();
--        }
--    }
--
--    public class AptdTransactionProxy : GLib.Object {
--        public signal void finished (string transaction_id);
--        public signal void property_changed (string property, Variant variant);
--
--        private AptdTransactionService _aptd_service;
--
--        public void connect_to_aptd (string transaction_id) throws GLib.Error {
--            _aptd_service = Bus.get_proxy_sync (BusType.SYSTEM, APTD_DBUS_NAME, transaction_id);
--            _aptd_service.finished.connect ((exit_state) => {
--                debug ("aptd transaction finished: %s\n", exit_state);
--                finished (transaction_id);
--            });
--            _aptd_service.property_changed.connect ((prop, variant) => {
--                property_changed (prop, variant);
--            });
--        }
--
--        public void simulate () throws GLib.Error {
--            _aptd_service.simulate ();
--        }
--
--        public void run () throws GLib.Error {
--            _aptd_service.run ();
--        }
--
--        public void cancel () throws GLib.Error {
--            _aptd_service.cancel ();
--        }
--    }
--}
-diff --git a/src/Widgets/InputMethod/AddEnginesPopover.vala b/src/Widgets/InputMethod/AddEnginesPopover.vala
-index 110bc1d..8a03ca8 100644
---- a/src/Widgets/InputMethod/AddEnginesPopover.vala
-+++ b/src/Widgets/InputMethod/AddEnginesPopover.vala
-@@ -43,8 +43,6 @@ public class Pantheon.Keyboard.InputMethodPage.AddEnginesPopover : Gtk.Popover {
-         };
-         scrolled.add (listbox);
- 
--        var install_button = new Gtk.Button.with_label (_("Install Unlisted Engines…"));
--
-         var cancel_button = new Gtk.Button.with_label (_("Cancel"));
- 
-         var add_button = new Gtk.Button.with_label (_("Add Engine"));
-@@ -55,10 +53,8 @@ public class Pantheon.Keyboard.InputMethodPage.AddEnginesPopover : Gtk.Popover {
-             margin = 12,
-             spacing = 6
-         };
--        button_box.add (install_button);
-         button_box.add (cancel_button);
-         button_box.add (add_button);
--        button_box.set_child_secondary (install_button, true);
- 
-         var grid = new Gtk.Grid ();
-         grid.attach (search_entry, 0, 0);
-@@ -88,14 +84,6 @@ public class Pantheon.Keyboard.InputMethodPage.AddEnginesPopover : Gtk.Popover {
-             listbox.invalidate_filter ();
-         });
- 
--        install_button.clicked.connect (() => {
--            popdown ();
--
--            var install_dialog = new InstallEngineDialog ((Gtk.Window) get_toplevel ());
--            install_dialog.run ();
--            install_dialog.destroy ();
--        });
--
-         cancel_button.clicked.connect (() => {
-             popdown ();
-         });
-diff --git a/src/Widgets/InputMethod/LanguagesRow.vala b/src/Widgets/InputMethod/LanguagesRow.vala
-deleted file mode 100644
-index dc064ae..0000000
---- a/src/Widgets/InputMethod/LanguagesRow.vala
-+++ /dev/null
-@@ -1,43 +0,0 @@
--/*
--* 2019-2020 elementary, Inc. (https://elementary.io)
--*
--* This program is free software: you can redistribute it and/or modify
--* it under the terms of the GNU General Public License as published by
--* the Free Software Foundation, either version 3 of the License, or
--* (at your option) any later version.
--*
--* This program is distributed in the hope that it will be useful,
--* but WITHOUT ANY WARRANTY; without even the implied warranty of
--* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
--* GNU General Public License for more details.
--*
--* You should have received a copy of the GNU General Public License
--* along with this program.  If not, see <https://www.gnu.org/licenses/>.
--*/
--
--public class Pantheon.Keyboard.InputMethodPage.LanguagesRow : Gtk.ListBoxRow {
--    public InstallList language { get; construct; }
--
--    public LanguagesRow (InstallList language) {
--        Object (language: language);
--    }
--
--    construct {
--        var label = new Gtk.Label (language.get_name ()) {
--            halign = Gtk.Align.START,
--            hexpand = true
--        };
--
--        var caret = new Gtk.Image.from_icon_name ("pan-end-symbolic", Gtk.IconSize.MENU);
--
--        var grid = new Gtk.Grid () {
--            margin = 3,
--            margin_start = 6,
--            margin_end = 6
--        };
--        grid.add (label);
--        grid.add (caret);
--
--        add (grid);
--    }
--}
-diff --git a/src/meson.build b/src/meson.build
-index 77a51d0..26711c5 100644
---- a/src/meson.build
-+++ b/src/meson.build
-@@ -17,7 +17,6 @@ plug_files = files(
-     'Widgets/Layout/Display.vala',
-     'Widgets/Layout/AdvancedSettingsPanel.vala',
-     'Widgets/Layout/AdvancedSettingsGrid.vala',
--    'Widgets/InputMethod/LanguagesRow.vala',
-     'Widgets/InputMethod/EnginesRow.vala',
-     'Widgets/InputMethod/AddEnginesPopover.vala',
-     'Views/Shortcuts.vala',
-@@ -33,11 +32,6 @@ plug_files = files(
-     'InputSources/SourceSettings.vala',
-     'InputSources/InputSource.vala',
-     'InputMethod/AddEnginesList.vala',
--    'InputMethod/Installer/UbuntuInstaller.vala',
--    'InputMethod/Installer/InstallList.vala',
--    'InputMethod/Installer/aptd-client.vala',
--    'Dialogs/ProgressDialog.vala',
--    'Dialogs/InstallEngineDialog.vala',
-     'Dialogs/ConflictDialog.vala',
-     'Dialogs/AddLayoutDialog.vala'
- )

pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/default.nix

···
 
 stdenv.mkDerivation rec {
   pname = "switchboard-plug-keyboard";
-  version = "3.2.0";
+  version = "3.2.1";
 
   src = fetchFromGitHub {
     owner = "elementary";
     repo = pname;
     rev = version;
-    sha256 = "sha256-X5EGDS8/EazIHiDBHCisd+XPE9dMx/0lQ8hrz9imUno=";
+    sha256 = "sha256-4LfS2F8pLbZw+HhnEVmZqbEaNCM96q+lqnf4sUBDVJI=";
   };
 
   patches = [
-    ./0001-Remove-Install-Unlisted-Engines-function.patch
+    # This will try to install packages with apt.
+    # https://github.com/elementary/switchboard-plug-keyboard/issues/324
+    ./hide-install-unlisted-engines-button.patch
+
     (substituteAll {
       src = ./fix-paths.patch;
       inherit ibus onboard libgnomekbd;

pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/fix-paths.patch

···
 diff --git a/src/Views/InputMethod.vala b/src/Views/InputMethod.vala
-index 7f73c1e1..1f0d6400 100644
+index ba12d6db..b9263c1d 100644
 --- a/src/Views/InputMethod.vala
 +++ b/src/Views/InputMethod.vala
-@@ -328,7 +328,7 @@ public class Pantheon.Keyboard.InputMethodPage.Page : Gtk.Grid {
+@@ -338,7 +338,7 @@ public class Keyboard.InputMethodPage.Page : Gtk.Grid {
      private void spawn_ibus_daemon () {
          bool is_spawn_succeeded = false;
          try {
···
          } catch (GLib.SpawnError e) {
              warning (e.message);
              set_visible_view (e.message);
-diff --git a/src/Views/Layout.vala b/src/Views/Layout.vala
-index 75d2d805..b86252a4 100644
---- a/src/Views/Layout.vala
-+++ b/src/Views/Layout.vala
-@@ -219,7 +219,7 @@ namespace Pantheon.Keyboard {
+diff --git a/src/Views/Behavior.vala b/src/Views/Behavior.vala
+index 8a89a0a4..a4f98668 100644
+--- a/src/Views/Behavior.vala
++++ b/src/Views/Behavior.vala
+@@ -270,7 +270,7 @@ public class Keyboard.Behaviour.Page : Gtk.Box {
  
-             onscreen_keyboard_settings.clicked.connect (() => {
-                 try {
--                    var appinfo = AppInfo.create_from_commandline ("onboard-settings", null, AppInfoCreateFlags.NONE);
-+                    var appinfo = AppInfo.create_from_commandline ("@onboard@/bin/onboard-settings", null, AppInfoCreateFlags.NONE);
-                     appinfo.launch (null, null);
-                 } catch (Error e) {
-                     warning ("Unable to launch onboard-settings: %s", e.message);
+         onscreen_keyboard_settings.clicked.connect (() => {
+             try {
+-                var appinfo = AppInfo.create_from_commandline ("onboard-settings", null, NONE);
++                var appinfo = AppInfo.create_from_commandline ("@onboard@/bin/onboard-settings", null, NONE);
+                 appinfo.launch (null, null);
+             } catch (Error e) {
+                 critical ("Unable to launch onboard-settings: %s", e.message);
 diff --git a/src/Dialogs/AddLayoutDialog.vala b/src/Dialogs/AddLayoutDialog.vala
-index 7c2efda3..de77094f 100644
+index aa084295..a486b52a 100644
 --- a/src/Dialogs/AddLayoutDialog.vala
 +++ b/src/Dialogs/AddLayoutDialog.vala
-@@ -197,7 +197,7 @@ public class Pantheon.Keyboard.LayoutPage.AddLayoutDialog : Granite.Dialog {
+@@ -197,7 +197,7 @@ public class Keyboard.LayoutPage.AddLayoutDialog : Granite.Dialog {
          });
  
          keyboard_map_button.clicked.connect (() => {

pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/hide-install-unlisted-engines-button.patch

···
+diff --git a/src/Widgets/InputMethod/AddEnginesPopover.vala b/src/Widgets/InputMethod/AddEnginesPopover.vala
+index 478e6b02..5b25f2e9 100644
+--- a/src/Widgets/InputMethod/AddEnginesPopover.vala
++++ b/src/Widgets/InputMethod/AddEnginesPopover.vala
+@@ -43,7 +43,6 @@ public class Keyboard.InputMethodPage.AddEnginesPopover : Gtk.Popover {
+         };
+         scrolled.add (listbox);
+ 
+-        var install_button = new Gtk.Button.with_label (_("Install Unlisted Engines…"));
+ 
+         var cancel_button = new Gtk.Button.with_label (_("Cancel"));
+ 
+@@ -55,10 +54,8 @@ public class Keyboard.InputMethodPage.AddEnginesPopover : Gtk.Popover {
+             margin = 12,
+             spacing = 6
+         };
+-        button_box.add (install_button);
+         button_box.add (cancel_button);
+         button_box.add (add_button);
+-        button_box.set_child_secondary (install_button, true);
+ 
+         var grid = new Gtk.Grid ();
+         grid.attach (search_entry, 0, 0);
+@@ -88,30 +85,6 @@ public class Keyboard.InputMethodPage.AddEnginesPopover : Gtk.Popover {
+             listbox.invalidate_filter ();
+         });
+ 
+-        install_button.clicked.connect (() => {
+-            popdown ();
+-
+-            var installer = UbuntuInstaller.get_default ();
+-            var install_dialog = new InstallEngineDialog ((Gtk.Window) get_toplevel ());
+-            install_dialog.response.connect ((response_id) => {
+-                if (response_id == Gtk.ResponseType.OK) {
+-                    string engine_to_install = install_dialog.get_selected_engine_name ();
+-                    install_dialog.destroy ();
+-                    installer.install (engine_to_install);
+-
+-                    var progress_dialog = new ProgressDialog () {
+-                        transient_for = (Gtk.Window) get_toplevel ()
+-                    };
+-                    installer.progress_changed.connect ((p) => {
+-                        progress_dialog.progress = p;
+-                    });
+-                    progress_dialog.run ();
+-                } else {
+-                    install_dialog.destroy ();
+-                }
+-            });
+-            install_dialog.run ();
+-        });
+ 
+         cancel_button.clicked.connect (() => {
+             popdown ();
+diff --git a/src/meson.build b/src/meson.build
+index 83cde9f6..63d6a88a 100644
+--- a/src/meson.build
++++ b/src/meson.build
+@@ -19,7 +19,6 @@ plug_files = files(
+     'Widgets/Layout/Display.vala',
+     'Widgets/Layout/AdvancedSettingsPanel.vala',
+     'Widgets/Layout/AdvancedSettingsGrid.vala',
+-    'Widgets/InputMethod/LanguagesRow.vala',
+     'Widgets/InputMethod/EnginesRow.vala',
+     'Widgets/InputMethod/AddEnginesPopover.vala',
+     'Views/Shortcuts.vala',
+@@ -35,11 +34,6 @@ plug_files = files(
+     'InputSources/SourceSettings.vala',
+     'InputSources/InputSource.vala',
+     'InputMethod/AddEnginesList.vala',
+-    'InputMethod/Installer/UbuntuInstaller.vala',
+-    'InputMethod/Installer/InstallList.vala',
+-    'InputMethod/Installer/aptd-client.vala',
+-    'Dialogs/ProgressDialog.vala',
+-    'Dialogs/InstallEngineDialog.vala',
+     'Dialogs/ConflictDialog.vala',
+     'Dialogs/AddLayoutDialog.vala'
+ )

pkgs/desktops/pantheon/services/elementary-notifications/default.nix

···
 { lib
 , stdenv
 , fetchFromGitHub
-, fetchpatch
 , nix-update-script
 , meson
 , ninja
···
 , libgee
 , libhandy
 , libcanberra-gtk3
-, python3
 , wrapGAppsHook
 }:
 
 stdenv.mkDerivation rec {
   pname = "elementary-notifications";
-  version = "7.0.0";
+  version = "7.0.1";
 
   src = fetchFromGitHub {
     owner = "elementary";
     repo = "notifications";
     rev = version;
-    sha256 = "sha256-i7fSKnP4W12cfax5IXm/Zgy5vP5z7S43S80gvzWpFCE=";
+    sha256 = "sha256-of7Tw38yJAhHKICU3XxGwIOwqfUhrL7SGKqFd9Dps/I=";
   };
 
-  patches = [
-    # Fix broken notification filter
-    # https://github.com/elementary/notifications/pull/207
-    (fetchpatch {
-      url = "https://github.com/elementary/notifications/commit/4691ec869316be94598d8e55e1cd3bd525e8e149.patch";
-      sha256 = "sha256-4x/Us92Mgws5v+ZQiKvjQ4ixfBnU8oTQ92rc+nf8Zdg=";
-    })
-  ];
-
   nativeBuildInputs = [
     glib # for glib-compile-schemas
     meson
     ninja
     pkg-config
-    python3
     vala
     wrapGAppsHook
   ];
···
     libgee
     libhandy
   ];
-
-  postPatch = ''
-    chmod +x meson/post_install.py
-    patchShebangs meson/post_install.py
-  '';
 
   passthru = {
     updateScript = nix-update-script { };

pkgs/desktops/pantheon/services/xdg-desktop-portal-pantheon/default.nix

···
 
 stdenv.mkDerivation rec {
   pname = "xdg-desktop-portal-pantheon";
-  version = "7.1.0";
+  version = "7.1.1";
 
   src = fetchFromGitHub {
     owner = "elementary";
     repo = "portals";
     rev = version;
-    sha256 = "sha256-uy/etQiJuaROw8bWg2PUdptNr4I8uqqUZ8BWK6D2bog=";
+    sha256 = "sha256-JZ2VYsNAjNGCzKOEhHCZx2uNLHFs+ktjFmROLHdFjX4=";
   };
 
   nativeBuildInputs = [

pkgs/development/interpreters/rune/default.nix

···
+{ lib
+, rustPlatform
+, fetchCrate
+, stdenv
+, darwin
+}:
+
+rustPlatform.buildRustPackage rec {
+  pname = "rune";
+  version = "0.12.4";
+
+  src = fetchCrate {
+    pname = "rune-cli";
+    inherit version;
+    hash = "sha256-Fw6vCy6EMLzNbhwOUwCCsGSueDxfh7KMjLhhbvTzclc=";
+  };
+
+  cargoHash = "sha256-F1FI7ZVNXIFzxIzimq0KXtGNWw26x1eQyqv+hVYaS1E=";
+
+  buildInputs = lib.optionals stdenv.isDarwin [
+    darwin.apple_sdk.frameworks.Security
+  ];
+
+  env = {
+    RUNE_VERSION = version;
+  };
+
+  meta = with lib; {
+    description = "An interpreter for the Rune Language, an embeddable dynamic programming language for Rust";
+    homepage = "https://rune-rs.github.io/";
+    changelog = "https://github.com/rune-rs/rune/releases/tag/${version}";
+    license = with licenses; [ asl20 mit ];
+    maintainers = with maintainers; [ figsoda ];
+    mainProgram = "rune";
+  };
+}

pkgs/development/ocaml-modules/cstruct/ppx.nix

···
-{ lib, buildDunePackage, cstruct, sexplib, ppxlib, stdlib-shims
+{ lib, buildDunePackage, cstruct, sexplib, ppxlib
+, ocaml-migrate-parsetree-2
 , ounit, cppo, ppx_sexp_conv, cstruct-unix, cstruct-sexp
 }:
 
···
     inherit (cstruct) version src meta;
 
     minimalOCamlVersion = "4.08";
-    duneVersion = "3";
 
-    propagatedBuildInputs = [ cstruct ppxlib sexplib stdlib-shims ];
+    propagatedBuildInputs = [ cstruct ppxlib sexplib ];
 
     doCheck = true;
     nativeCheckInputs = [ cppo ];
-    checkInputs = [ ounit ppx_sexp_conv cstruct-sexp cstruct-unix ];
+    checkInputs = [ ounit ppx_sexp_conv cstruct-sexp cstruct-unix ocaml-migrate-parsetree-2 ];
   }

pkgs/development/ocaml-modules/ppxlib/default.nix

···
   if lib.versionAtLeast ocaml.version "4.07"
   then if lib.versionAtLeast ocaml.version "4.08"
   then if lib.versionAtLeast ocaml.version "4.11"
-  then "0.28.0" else "0.24.0" else "0.15.0" else "0.13.0"
+  then "0.30.0" else "0.24.0" else "0.15.0" else "0.13.0"
 , ocaml-compiler-libs, ocaml-migrate-parsetree, ppx_derivers, stdio
 , stdlib-shims, ocaml-migrate-parsetree-2
 }:
···
     sha256 = "sha256-pct57oO7qAMEtlvEfymFOCvviWaLG0b5/7NzTC8vdSE=";
     max_version = "4.10";
     useDune2 = false;
-    useOMP2 = false;
+    OMP = [ ocaml-migrate-parsetree ];
   };
   "0.13.0" = {
     sha256 = "sha256-geHz0whQDg5/YQjVsN2iuHlkClwh7z3Eqb2QOBzuOdk=";
     max_version = "4.11";
     useDune2 = false;
-    useOMP2 = false;
+    OMP = [ ocaml-migrate-parsetree ];
   };
   "0.15.0" = {
     sha256 = "sha256-C2MNf410qJmlXMJxiLXOA+c1qT8H6gwt5WUy2P2TszA=";
     min_version = "4.07";
     max_version = "4.12";
-    useOMP2 = false;
+    OMP = [ ocaml-migrate-parsetree ];
   };
   "0.18.0" = {
     sha256 = "sha256-nUg8NkZ64GHHDfcWbtFGXq3MNEKu+nYPtcVDm/gEfcM=";
     min_version = "4.07";
     max_version = "4.12";
+    OMP = [ ocaml-migrate-parsetree-2 ];
   };
   "0.22.0" = {
     sha256 = "sha256-PuuR4DlmZiKEoyIuYS3uf0+it2N8U9lXLSp0E0u5bXo=";
     min_version = "4.07";
     max_version = "4.13";
+    OMP = [ ocaml-migrate-parsetree-2 ];
   };
   "0.22.2" = {
     sha256 = "sha256-0Oih69xiILFXTXqSbwCEYMURjM73m/mgzgJC80z/Ilo=";
     min_version = "4.07";
     max_version = "4.14";
+    OMP = [ ocaml-migrate-parsetree-2 ];
   };
   "0.23.0" = {
     sha256 = "sha256-G1g2wYa51aFqz0falPOWj08ItRm3cpzYao/TmXH+EuU=";
···
   "0.24.0" = {
     sha256 = "sha256-d2YCfC7ND1s7Rg6SEqcHCcZ0QngRPrkfMXxWxB56kMg=";
     min_version = "4.07";
+    max_version = "5.1";
   };
   "0.28.0" = {
     sha256 = "sha256-2Hrl+aCBIGMIypZICbUKZq646D0lSAHouWdUSLYM83c=";
+    min_version = "4.07";
+    max_version = "5.1";
+  };
+  "0.30.0" = {
+    sha256 = "sha256-3UpjvenSm0mBDgTXZTk3yTLxd6lByg4ZgratU6xEIRA=";
     min_version = "4.07";
   };
 }."${version}"; in
···
 
   propagatedBuildInputs = [
     ocaml-compiler-libs
-    (if param.useOMP2 or true
-     then ocaml-migrate-parsetree-2
-     else ocaml-migrate-parsetree)
+  ] ++ (param.OMP or []) ++ [
     ppx_derivers
     stdio
     stdlib-shims

pkgs/development/python-modules/datasette-publish-fly/default.nix

···
 
 buildPythonPackage rec {
   pname = "datasette-publish-fly";
-  version = "1.3";
+  version = "1.3.1";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
···
     owner = "simonw";
     repo = pname;
     rev = "refs/tags/${version}";
-    hash = "sha256-L94QYcrTWjuoz0aEFTxPi8Xg0xERP1zCs7+vzhoJagc=";
+    hash = "sha256-diaxr+fNNgkJvLGkLo+lK0ThTsXYDePFsvTetMbDRMk=";
   };
 
   propagatedBuildInputs = [

pkgs/development/python-modules/imageio-ffmpeg/default.nix

···
 { lib
 , buildPythonPackage
-, isPy3k
 , fetchPypi
 , substituteAll
 , ffmpeg_4
···
 buildPythonPackage rec {
   pname = "imageio-ffmpeg";
   version = "0.4.8";
-
-  disabled = !isPy3k;
+  format = "setuptools";
 
   src = fetchPypi {
     inherit pname version;
···
       ffmpeg = "${ffmpeg_4}/bin/ffmpeg";
     })
   ];
+
+  # https://github.com/imageio/imageio-ffmpeg/issues/59
+  postPatch = ''
+    sed -i '/setup_requires=\["pip>19"\]/d' setup.py
+  '';
 
   checkPhase = ''
     runHook preCheck

pkgs/development/python-modules/protonvpn-nm-lib/default.nix

···
 
 buildPythonPackage rec {
   pname = "protonvpn-nm-lib";
-  version = "3.14.0";
+  version = "3.16.0";
   disabled = pythonOlder "3.7";
 
   src = fetchFromGitHub {
     owner = "ProtonVPN";
     repo = pname;
     rev = "refs/tags/${version}";
-    hash = "sha256-xpK3l8BI6/DUt46VR8DS89hzdHUljAbrYhEyf00giGg=";
+    hash = "sha256-n3jfBHMYqyQZgvFFJcylNbTWZ3teuqhdelTfpNrwWuA=";
   };
 
   propagatedBuildInputs = [

pkgs/development/python-modules/pyerfa/default.nix

···
 { lib
 , buildPythonPackage
 , fetchPypi
+, jinja2
+, oldest-supported-numpy
 , setuptools-scm
+, wheel
 , liberfa
 , packaging
 , numpy
···
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "2fd4637ffe2c1e6ede7482c13f583ba7c73119d78bef90175448ce506a0ede30";
+    hash = "sha256-L9Rjf/4sHm7edILBP1g7p8cxGdeL75AXVEjOUGoO3jA=";
   };
 
   nativeBuildInputs = [
+    jinja2
+    oldest-supported-numpy
     packaging
     setuptools-scm
+    wheel
   ];
 
   propagatedBuildInputs = [

pkgs/development/python-modules/python-bsblan/default.nix

···
 
 buildPythonPackage rec {
   pname = "python-bsblan";
-  version = "0.5.11";
+  version = "0.5.12";
   format = "pyproject";
 
   disabled = pythonOlder "3.9";
···
     owner = "liudger";
     repo = pname;
     rev = "refs/tags/v${version}";
-    hash = "sha256-fTjeJZhKPFi0cxZStegVdq7a48rQ236DnnCGngwZ5GU=";
+    hash = "sha256-ftu79SnVa7wOMx/RiRBDPmmG7Mmw84r30G4yDzBea2k=";
   };
 
+  postPatch = ''
+    substituteInPlace pyproject.toml \
+      --replace 'version = "0.0.0"' 'version = "${version}"' \
+      --replace "--cov" ""
+    sed -i "/covdefaults/d" pyproject.toml
+    sed -i "/ruff/d" pyproject.toml
+  '';
+
   nativeBuildInputs = [
     poetry-core
   ];
···
     pytest-mock
     pytestCheckHook
   ];
-
-  postPatch = ''
-    substituteInPlace pyproject.toml \
-      --replace 'version = "0.0.0"' 'version = "${version}"' \
-      --replace "--cov" ""
-  '';
 
   pythonImportsCheck = [
     "bsblan"

pkgs/development/tools/analysis/rizin/cutter.nix

···
 
 let cutter = mkDerivation rec {
   pname = "cutter";
-  version = "2.3.0";
+  version = "2.3.1";
 
   src = fetchFromGitHub {
     owner = "rizinorg";
     repo = "cutter";
     rev = "v${version}";
-    hash = "sha256-oQ3sLIGKMEw3k27aSFcrJqo0TgGkkBNdzl6GSoOIYak=";
+    hash = "sha256-OxF6lKH4nnBU8pLzaCGVl8DUIxsbWD4RMevyGRirkPM=";
     fetchSubmodules = true;
   };
 

pkgs/development/tools/continuous-integration/cirrus-cli/default.nix

···
 
 buildGoModule rec {
   pname = "cirrus-cli";
-  version = "0.101.2";
+  version = "0.102.0";
 
   src = fetchFromGitHub {
     owner = "cirruslabs";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-vPfdv1EtI5FAK2tIaHc+5hd1kiQvDk1Gwwqv5ug5Lco=";
+    sha256 = "sha256-JF93tVEwGY4wHNNkQyzxjai6S+qLzBd0SPdDgkn4Wdc=";
   };
 
-  vendorHash = "sha256-qYt3NRjlImRE/G2CUYTukOCP37slseYxiJGLFtZCiDk=";
+  vendorHash = "sha256-ryEFSFQFASH+yzmHbxLSywg9xewbvg9JGliSJrFC4U0=";
 
   ldflags = [
     "-X github.com/cirruslabs/cirrus-cli/internal/version.Version=v${version}"

pkgs/development/tools/ctlptl/default.nix

···
 
 buildGoModule rec {
   pname = "ctlptl";
-  version = "0.8.20";
+  version = "0.8.21";
 
   src = fetchFromGitHub {
     owner = "tilt-dev";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-t7lcUbD3840kClFr4+RYRD4d2yGeYhnr2HO5giYLhNU=";
+    hash = "sha256-ulP159bhiVxZ5D7YamPR7AhCZ5qBr63Eitgf0/Sc6lo=";
   };
 
-  vendorHash = "sha256-6NHaOF+fXs49JXEog/t2Fmr8llLmMBj7/OISssyzRK4=";
+  vendorHash = "sha256-nfSqu1u7NWbZYL7CEZ/i2tdxQBblRbwJwdwoEtol/Us=";
 
   nativeBuildInputs = [ installShellFiles ];
 

pkgs/development/tools/pipenv/default.nix

···
 { lib
 , stdenv
 , python3
-, fetchPypi
+, fetchFromGitHub
 , installShellFiles
 }:
 
···
 in buildPythonApplication rec {
   pname = "pipenv";
   version = "2023.2.4";
+  format = "pyproject";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "sha256-GKPrpRnjbVnw1af5xCvSaFIeS5t7PRvWrc8TFWkyMnU=";
+  src = fetchFromGitHub {
+    owner = "pypa";
+    repo = "pipenv";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-jZOBu4mWyu8U6CGqtYgfcCCDSa0pGqoZEFnXl5IO+JY=";
   };
 
-  LC_ALL = "en_US.UTF-8";
+  env.LC_ALL = "en_US.UTF-8";
 
-  nativeBuildInputs = [ installShellFiles ];
+  nativeBuildInputs = [
+    installShellFiles
+    setuptools
+    wheel
+  ];
 
   postPatch = ''
     # pipenv invokes python in a subprocess to create a virtualenv
···
 
   propagatedBuildInputs = runtimeDeps python3.pkgs;
 
+  preCheck = ''
+    export HOME="$TMPDIR"
+  '';
+
+  nativeCheckInputs = [
+    mock
+    pytestCheckHook
+    pytest-xdist
+    pytz
+    requests
+  ];
+
+  disabledTests = [
+    "test_convert_deps_to_pip"
+    "test_download_file"
+  ];
+
+  disabledTestPaths = [
+    "tests/integration"
+  ];
+
   postInstall = ''
     installShellCompletion --cmd pipenv \
       --bash <(_PIPENV_COMPLETE=bash_source $out/bin/pipenv) \
       --zsh <(_PIPENV_COMPLETE=zsh_source $out/bin/pipenv) \
       --fish <(_PIPENV_COMPLETE=fish_source $out/bin/pipenv)
-  '';
-
-  doCheck = true;
-  checkPhase = ''
-    export HOME=$(mktemp -d)
-    cp -r --no-preserve=mode ${wheel.src} $HOME/wheel-src
-    $out/bin/pipenv install $HOME/wheel-src
   '';
 
   meta = with lib; {

pkgs/development/tools/rust/svd2rust/default.nix

···
 
 rustPlatform.buildRustPackage rec {
   pname = "svd2rust";
-  version = "0.29.0";
+  version = "0.30.0";
 
   src = fetchCrate {
     inherit pname version;
-    sha256 = "sha256-VxjoS93OwJAc9Cb0VL9R/49pAcXPYrzC7q6vYJSDYB4=";
+    hash = "sha256-/fB6Ay9t5WkBtHVYne/dbj+PXurMpzKAb7/OFD4j7U4=";
   };
 
-  cargoHash = "sha256-f8dht3HCgzeTfyhFhJS2F+TL5Y0qi+A5PGZkNXF1AUw=";
+  cargoHash = "sha256-PD2UsLVfc6D726BpE6a1MKjspL3/g2D9sweCmVXtH1E=";
+
+  # error: linker `aarch64-linux-gnu-gcc` not found
+  postPatch = ''
+    rm .cargo/config.toml
+  '';
 
   meta = with lib; {
     description = "Generate Rust register maps (`struct`s) from SVD files";

pkgs/development/tools/xc/default.nix

···
 
 buildGoModule rec {
   pname = "xc";
-  version = "0.4.1";
+  version = "0.5.0";
 
   src = fetchFromGitHub {
     owner = "joerdav";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-Dc7MVn9hF2HtXqMvWQ5UsLQW5ZKcFKt7AHcXdiWDs1I=";
+    sha256 = "sha256-cVTa2ot95Hcm+1V1QXnlxSL9OjmoQNR9nVUgW/rZhl0=";
   };
 
-  vendorHash = "sha256-hCdIO377LiXFKz0GfCmAADTPfoatk8YWzki7lVP3yLw=";
+  vendorHash = "sha256-J4/a4ujM7A6bDwRlLCYt/PmJf6HZUmdYcJMux/3KyUI=";
 
   ldflags = [
     "-s"

pkgs/os-specific/linux/bpftune/default.nix

···
 
 stdenv.mkDerivation rec {
   pname = "bpftune";
-  version = "unstable-2023-08-02";
+  version = "unstable-2023-08-22";
 
   src = fetchFromGitHub {
-    owner = "oracle-samples";
+    owner = "oracle";
     repo = "bpftune";
-    rev = "f7e051a011d581a3c667b7f7b769862407d85f04";
-    hash = "sha256-1tfr2vB/XRnpGJVwo2NQkXomz+J6AzvpS1P3rcAyAyI=";
+    rev = "ae3047976d6ba8c3ec7c21ec8c85b92d11c64169";
+    hash = "sha256-yXfS3zrUxRlmWsXyDpPhvYDqgYFQTAZ2dlmiQp6/zVQ=";
   };
 
   postPatch = ''

pkgs/servers/dgraph/default.nix

···
 
 buildGoModule rec {
   pname = "dgraph";
-  version = "23.0.1";
+  version = "23.1.0";
 
   src = fetchFromGitHub {
     owner = "dgraph-io";
     repo = "dgraph";
     rev = "v${version}";
-    sha256 = "sha256-FB+bgrv6KojbuXDB4FKKe7eW4d9lcm9x4gA6Ceop734=";
+    sha256 = "sha256-AC/5ykNH2eb6IrZ3KlU0DTP4r8RiHE5iUZFCUn6H2cw=";
   };
 
-  vendorHash = "sha256-HoZpxY+xT1gRHgEpkscPXogVq2eDKGlKE6KTMIQ+mMI=";
+  vendorHash = "sha256-YRfFRCCm25zS+tQer6UcrBBltOxA7+Iqi+Ejyrjdu/A=";
 
   doCheck = false;
 

pkgs/tools/admin/ansible/doctor.nix

···
 { lib
 , fetchFromGitHub
+, fetchpatch
 , python3
 }:
 
···
     hash = "sha256-nZv1PdR0kGrke2AjcDWjDWBdsw64UpHYFNDFAe/UoJo=";
   };
 
+  patches = [
+    # https://github.com/thegeeklab/ansible-doctor/pull/541
+    (fetchpatch {
+      name = "poetry-dynamic-versioning-pep517.patch";
+      url = "https://github.com/thegeeklab/ansible-doctor/commit/b77ba9dccaef4b386bd54b128136c948665eb61a.patch";
+      hash = "sha256-XfdTkRk9B857V5DQnxlbwxTb098YwHzKGzNQBTQzWCM=";
+    })
+  ];
+
   pythonRelaxDeps = true;
 
-  postPatch = ''
-    substituteInPlace pyproject.toml \
-      --replace 'version = "0.0.0"' 'version = "${version}"'
-  '';
-
   nativeBuildInputs = with python3.pkgs; [
     poetry-core
+    poetry-dynamic-versioning
     pythonRelaxDepsHook
   ];
 

pkgs/tools/admin/ansible/later.nix

···
 { lib
 , fetchFromGitHub
+, fetchpatch
 , python3
 }:
 
···
     hash = "sha256-7k81eEcM+BXNrln6+Lu0+1LjsZdYkUidrRQCdlBbQB8=";
   };
 
+  patches = [
+    # https://github.com/thegeeklab/ansible-later/pull/658
+    (fetchpatch {
+      name = "poetry-dynamic-versioning-pep517.patch";
+      url = "https://github.com/thegeeklab/ansible-later/commit/a2c278fb45769648df1439df5bb25883dddfc58a.patch";
+      hash = "sha256-++CiwwHZoaPC8XHaYbNQeU3zqEi2a4eIYbuSQkO0jTI=";
+    })
+  ];
+
   postPatch = ''
     substituteInPlace pyproject.toml \
-      --replace 'version = "0.0.0"' 'version = "${version}"' \
       --replace " --cov=ansiblelater --cov-report=xml:coverage.xml --cov-report=term --no-cov-on-fail" ""
   '';
 
···
 
   nativeBuildInputs = with python3.pkgs; [
     poetry-core
+    poetry-dynamic-versioning
     pythonRelaxDepsHook
   ];
 

pkgs/tools/filesystems/dysk/default.nix

···
 
 rustPlatform.buildRustPackage rec {
   pname = "dysk";
-  version = "2.7.2";
+  version = "2.8.0";
 
   src = fetchFromGitHub {
     owner = "Canop";
     repo = "dysk";
     rev = "v${version}";
-    hash = "sha256-3uukeuxB1GjmJ59bkgDEzgG9RMZhmB5TSv3uiXV8GNg=";
+    hash = "sha256-BbL7liiZ1Xcg2Pr2JDnP5DAbjVdDVRs/hndZyIX8jfQ=";
   };
 
-  cargoHash = "sha256-td4B9/DAmASqLGO3PVLLWeO3GeDbLHI7wNcOT1qk20k=";
+  cargoHash = "sha256-vMWr3cV1ttjjwBvgQgi3aCpejr/enoYILVhI4wP9wa0=";
 
   nativeBuildInputs = [
     installShellFiles

pkgs/tools/graphics/netpbm/default.nix

···
   # Determine version and revision from:
   # https://sourceforge.net/p/netpbm/code/HEAD/log/?path=/advanced
   pname = "netpbm";
-  version = "11.3.2";
+  version = "11.3.4";
 
   outputs = [ "bin" "out" "dev" ];
 
   src = fetchsvn {
     url = "https://svn.code.sf.net/p/netpbm/code/advanced";
-    rev = "4574";
-    sha256 = "fJv+74QN7Jro4vUCcMWL4Yvv1C0KkfiOoNHt6ldGn/s=";
+    rev = "4606";
+    sha256 = "raWpqPlORgL5vBkmHbvj7UCrGjpPLulWjeTuaPnuB98=";
   };
 
   nativeBuildInputs = [

pkgs/tools/misc/esphome/default.nix

···
 in
 python.pkgs.buildPythonApplication rec {
   pname = "esphome";
-  version = "2023.8.1";
+  version = "2023.8.2";
   format = "setuptools";
 
   src = fetchFromGitHub {
     owner = pname;
     repo = pname;
     rev = "refs/tags/${version}";
-    hash = "sha256-a85nNUVaa7CbYdI/xM30fp7i1gMRz18Ior4mwseFZqU=";
+    hash = "sha256-KizeBaDw/9XoPwIjjc3VKkiaHTK5VYQXss4cQZZaGzs=";
   };
 
   postPatch = ''

pkgs/tools/misc/eza/default.nix

···
 
 rustPlatform.buildRustPackage rec {
   pname = "eza";
-  version = "0.10.7";
+  version = "0.10.8";
 
   src = fetchFromGitHub {
     owner = "eza-community";
     repo = "eza";
     rev = "v${version}";
-    hash = "sha256-f8js+zToP61lgmxucz2gyh3uRZeZSnoxS4vuqLNVO7c=";
+    hash = "sha256-3g4eauJqnbIqWtDmRvKsDiZh1eAz171FP9idF2nBXLQ=";
   };
 
-  cargoHash = "sha256-G3zNv8pG9uS12PsBug51RaS9Hx0sGHHnVEF4bHb+v18=";
+  cargoHash = "sha256-HS/nmLxr5zvyneiSJk9tPUhszF5vFwSo5HMsRql9I38=";
 
   nativeBuildInputs = [ cmake pkg-config installShellFiles pandoc ];
   buildInputs = [ zlib ]

pkgs/tools/misc/starry/default.nix

···
+{ lib
+, rustPlatform
+, fetchCrate
+, pkg-config
+, openssl
+, stdenv
+, darwin
+}:
+
+rustPlatform.buildRustPackage rec {
+  pname = "starry";
+  version = "2.0.1";
+
+  src = fetchCrate {
+    inherit pname version;
+    hash = "sha256-CPEMjg70MXlV+ruYnEHpTmqlc27NMTUKTR4/fpQmYcI=";
+  };
+
+  cargoHash = "sha256-d6icXOgju4qEV2+J+G09/xeQMIX3/4XUFmuWfD/Cqhc=";
+
+  nativeBuildInputs = [
+    pkg-config
+  ];
+
+  buildInputs = [
+    openssl
+  ] ++ lib.optionals stdenv.isDarwin [
+    darwin.apple_sdk.frameworks.Security
+  ];
+
+  meta = with lib; {
+    description = "Current stars history tells only half the story";
+    homepage = "https://github.com/Canop/starry";
+    license = licenses.agpl3Only;
+    maintainers = with maintainers; [ figsoda ];
+    mainProgram = "starry";
+  };
+}

pkgs/tools/networking/clash/default.nix

···
 
 buildGoModule rec {
   pname = "clash";
-  version = "1.17.0";
+  version = "1.18.0";
 
   src = fetchFromGitHub {
     owner = "Dreamacro";
     repo = pname;
-    rev = "refs/tags/v${version}";
-    hash = "sha256-hUkUfNsThir0txO7cdxJl3sUF8/wHDvDPVspGp5xYUQ=";
+    rev = "v${version}";
+    hash = "sha256-LqjSPlPkR5sB4Z1pmpdE9r66NN7pwgE9GK4r1zSFlxs=";
   };
 
-  vendorHash = "sha256-M2hoorCBdq2nm5Gc5Xm6r7Cg9XUOirDyqTKwrmu121s=";
+  vendorHash = "sha256-EWAbEFYr15RiJk9IXF6KaaX4GaSCa6E4+8rKL4/XG8Y=";
 
   # Do not build testing suit
   excludedPackages = [ "./test" ];
···
     "-s"
     "-w"
     "-X github.com/Dreamacro/clash/constant.Version=${version}"
+  ];
+
+  checkFlags = [
+    "-skip=TestParseRule" # Flaky tests
   ];
 
   passthru.tests.version = testers.testVersion {

pkgs/tools/text/clima/default.nix

···
+{ lib
+, rustPlatform
+, fetchFromGitHub
+, stdenv
+, darwin
+}:
+
+rustPlatform.buildRustPackage rec {
+  pname = "clima";
+  version = "1.1.0";
+
+  src = fetchFromGitHub {
+    owner = "Canop";
+    repo = "clima";
+    rev = "v${version}";
+    hash = "sha256-CRnAxhkuCTyHR4uQofA51Dm3+YKqm3iwBkFNkbLTv1A=";
+  };
+
+  cargoHash = "sha256-jKY+Ta6lqMBUlqSViKk3W0CiO8oU+ucmleKDYRA54HQ=";
+
+  buildInputs = lib.optionals stdenv.isDarwin [
+    darwin.apple_sdk.frameworks.Security
+  ];
+
+  meta = with lib; {
+    description = "A minimal viewer for Termimad";
+    homepage = "https://github.com/Canop/clima";
+    changelog = "https://github.com/Canop/clima/releases/tag/${src.rev}";
+    license = licenses.mit;
+    maintainers = with maintainers; [ figsoda ];
+    mainProgram = "clima";
+  };
+}

pkgs/top-level/all-packages.nix

···
 
   map-cmd = callPackage ../tools/misc/map { };
 
-  clash = callPackage ../tools/networking/clash { };
+  clash = callPackage ../tools/networking/clash {
+    buildGoModule = buildGo121Module;
+  };
 
   clash-geoip = callPackage ../data/misc/clash-geoip { };
 
···
   ;
   citrix_workspace = citrix_workspace_23_07_0;
 
+  clima = callPackage ../tools/text/clima { };
+
   cmigemo = callPackage ../tools/text/cmigemo { };
 
   cmospwd = callPackage ../tools/security/cmospwd { };
···
   };
 
   rar2fs = callPackage ../tools/filesystems/rar2fs { };
+
+  rune = callPackage ../development/interpreters/rune { };
 
   s9fes = callPackage ../development/interpreters/s9fes { };
 
···
 
   starfetch = callPackage ../tools/misc/starfetch { };
 
+  starry = callPackage ../tools/misc/starry { };
+
   starship = callPackage ../tools/misc/starship {
     inherit (darwin.apple_sdk.frameworks) Security Foundation Cocoa;
   };
···
 
   lifelines = callPackage ../applications/misc/lifelines { };
 
-  liferea = callPackage ../applications/networking/newsreaders/liferea { };
+  liferea = callPackage ../applications/networking/newsreaders/liferea {
+    libsoup = libsoup_3;
+    webkitgtk = webkitgtk_4_1;
+  };
 
   lightworks = callPackage ../applications/video/lightworks { };
 
···
   wttrbar = callPackage ../applications/misc/wttrbar { };
 
   wpm = callPackage ../applications/misc/wpm { };
+
+  yazi = callPackage ../applications/file-managers/yazi { inherit (darwin.apple_sdk.frameworks) Foundation; };
 }