From c2ae15cc31ab2bdb2315f8d1d5f966f544fc376c Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sun, 24 Oct 2021 11:48:54 +0800 Subject: [PATCH 01/27] touchegg: 2.0.11 -> 2.0.12 --- pkgs/tools/inputmethods/touchegg/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/inputmethods/touchegg/default.nix b/pkgs/tools/inputmethods/touchegg/default.nix index 69d05ceaed1e..a50770c73559 100644 --- a/pkgs/tools/inputmethods/touchegg/default.nix +++ b/pkgs/tools/inputmethods/touchegg/default.nix @@ -16,12 +16,12 @@ stdenv.mkDerivation rec { pname = "touchegg"; - version = "2.0.11"; + version = "2.0.12"; src = fetchFromGitHub { owner = "JoseExposito"; repo = pname; rev = version; - sha256 = "1zfiqs5vqlb6drnqx9nsmhgy8qc6svzr8zyjkqvwkpbgrc6ifap9"; + sha256 = "sha256-oJzehs7oLFTDn7GSm6bY/77tEfyEdlANn69EdCApdPA="; }; PKG_CONFIG_SYSTEMD_SYSTEMDSYSTEMUNITDIR = "${placeholder "out"}/lib/systemd/system"; From e26214dd6ced84c5dbcc02353d616d49c815d3a3 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Thu, 21 Oct 2021 20:14:34 +0800 Subject: [PATCH 02/27] xdg-desktop-portal-pantheon: init at 1.0.0 --- .../x11/desktop-managers/pantheon.nix | 5 +- .../xdg-desktop-portal-pantheon/default.nix | 63 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 3 files changed, 68 insertions(+), 2 deletions(-) create mode 100644 pkgs/development/libraries/xdg-desktop-portal-pantheon/default.nix diff --git a/nixos/modules/services/x11/desktop-managers/pantheon.nix b/nixos/modules/services/x11/desktop-managers/pantheon.nix index 112f493b811c..2fd8255030ac 100644 --- a/nixos/modules/services/x11/desktop-managers/pantheon.nix +++ b/nixos/modules/services/x11/desktop-managers/pantheon.nix @@ -226,8 +226,9 @@ in environment.sessionVariables.GTK_CSD = "1"; environment.etc."gtk-3.0/settings.ini".source = "${pkgs.pantheon.elementary-default-settings}/etc/gtk-3.0/settings.ini"; - xdg.portal.extraPortals = [ - pkgs.pantheon.elementary-files + xdg.portal.extraPortals = with pkgs; [ + pantheon.elementary-files + xdg-desktop-portal-pantheon ]; # Override GSettings schemas diff --git a/pkgs/development/libraries/xdg-desktop-portal-pantheon/default.nix b/pkgs/development/libraries/xdg-desktop-portal-pantheon/default.nix new file mode 100644 index 000000000000..ec43ff179d44 --- /dev/null +++ b/pkgs/development/libraries/xdg-desktop-portal-pantheon/default.nix @@ -0,0 +1,63 @@ +{ lib +, stdenv +, fetchFromGitHub +, nix-update-script +, meson +, ninja +, pkg-config +, vala +, wrapGAppsHook +, glib +, gtk3 +, libhandy +, pantheon +, systemd +, vte +}: + +stdenv.mkDerivation rec { + pname = "xdg-desktop-portal-pantheon"; + version = "1.0.0"; + + src = fetchFromGitHub { + owner = "elementary"; + repo = "portals"; + rev = version; + sha256 = "sha256-uPZUeyyn7HZwcBksY6X5s1bpbIRwqdCNfZKnkynVD+8="; + }; + + nativeBuildInputs = [ + meson + ninja + pkg-config + vala + wrapGAppsHook + ]; + + buildInputs = [ + glib + gtk3 + libhandy + pantheon.granite + systemd + vte + ]; + + mesonFlags = [ + "-Dsystemduserunitdir=${placeholder "out"}/lib/systemd/user" + ]; + + passthru = { + updateScript = nix-update-script { + attrPath = pname; + }; + }; + + meta = with lib; { + description = "Backend implementation for xdg-desktop-portal for the Pantheon desktop environment"; + homepage = "https://github.com/elementary/portals"; + license = licenses.gpl3Plus; + platforms = platforms.linux; + maintainers = teams.pantheon.members; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 87e40fcd02aa..1f0c6a934bb3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -28906,6 +28906,8 @@ with pkgs; xdg-desktop-portal-gtk = callPackage ../development/libraries/xdg-desktop-portal-gtk { }; + xdg-desktop-portal-pantheon = callPackage ../development/libraries/xdg-desktop-portal-pantheon { }; + xdg-desktop-portal-wlr = callPackage ../development/libraries/xdg-desktop-portal-wlr { }; xdg-user-dirs = callPackage ../tools/X11/xdg-user-dirs { }; From 4780b6df1a58ae0e210efd76de58f28309a07030 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Tue, 26 Oct 2021 08:42:26 +0800 Subject: [PATCH 03/27] pantheon.elementary-settings-daemon: 1.0.0 -> 1.1.0 --- nixos/modules/services/x11/desktop-managers/pantheon.nix | 1 + .../services/elementary-settings-daemon/default.nix | 6 ++++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/x11/desktop-managers/pantheon.nix b/nixos/modules/services/x11/desktop-managers/pantheon.nix index 2fd8255030ac..69b1f9879d9d 100644 --- a/nixos/modules/services/x11/desktop-managers/pantheon.nix +++ b/nixos/modules/services/x11/desktop-managers/pantheon.nix @@ -228,6 +228,7 @@ in xdg.portal.extraPortals = with pkgs; [ pantheon.elementary-files + pantheon.elementary-settings-daemon xdg-desktop-portal-pantheon ]; diff --git a/pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix b/pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix index d1aaad42e2f3..3b47ca3dc8d8 100644 --- a/pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix +++ b/pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix @@ -15,12 +15,13 @@ , gtk3 , granite , libgee +, systemd , wrapGAppsHook }: stdenv.mkDerivation rec { pname = "elementary-settings-daemon"; - version = "1.0.0"; + version = "1.1.0"; repoName = "settings-daemon"; @@ -28,7 +29,7 @@ stdenv.mkDerivation rec { owner = "elementary"; repo = repoName; rev = version; - sha256 = "1masvy1f9z2cp8w5ajnhy4k9bzvzgfziqlm59bf146pdd2567hiw"; + sha256 = "sha256-1Xp1uJzDFuGZlhJhKj00cYtb4Q1syMAm+82fTOtk0VI="; }; nativeBuildInputs = [ @@ -50,6 +51,7 @@ stdenv.mkDerivation rec { gtk3 granite libgee + systemd ]; postPatch = '' From 6ef3339cfb2391355c24672cad1799959497f8c7 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Tue, 26 Oct 2021 08:50:01 +0800 Subject: [PATCH 04/27] pantheon.granite: 6.1.1 -> 6.1.2 --- pkgs/desktops/pantheon/granite/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/pantheon/granite/default.nix b/pkgs/desktops/pantheon/granite/default.nix index 0e6d14d2425a..b4476ef839da 100644 --- a/pkgs/desktops/pantheon/granite/default.nix +++ b/pkgs/desktops/pantheon/granite/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { pname = "granite"; - version = "6.1.1"; + version = "6.1.2"; outputs = [ "out" "dev" ]; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { owner = "elementary"; repo = pname; rev = version; - sha256 = "13c6xk014psvmll9qybdqviskllw4g150m2k4ikjbv59g0rfp7xq"; + sha256 = "sha256-d48KQH8uwkSZWQEFSq1BD+TVUi9PWVVtMjKYmleRW58="; }; passthru = { From 28e96b4352bbdb4db06508aa224d5b2249eaffd1 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Tue, 26 Oct 2021 01:52:46 -0400 Subject: [PATCH 05/27] python3Packages.pyjet: 1.6.0 -> 1.8.2 --- pkgs/development/python-modules/pyjet/default.nix | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/pkgs/development/python-modules/pyjet/default.nix b/pkgs/development/python-modules/pyjet/default.nix index abf4beaada0d..90eea80ae3d9 100644 --- a/pkgs/development/python-modules/pyjet/default.nix +++ b/pkgs/development/python-modules/pyjet/default.nix @@ -2,26 +2,19 @@ buildPythonPackage rec { pname = "pyjet"; - version = "1.6.0"; + version = "1.8.2"; # tests not included in pypi tarball src = fetchFromGitHub { owner = "scikit-hep"; repo = pname; rev = version; - sha256 = "0b68jnbfk2rw9i1nnwsrbrbgkj7r0w1nw0i9f8fah1wmn78k9csv"; + sha256 = "sha256-0EI/dbanVDvILawnnK/Ce/5n/cD4Fv7VQEZfF9yPQio="; }; - # fix for python37 - # https://github.com/scikit-hep/pyjet/issues/8 nativeBuildInputs = [ cython ]; - preBuild = '' - for f in pyjet/src/*.{pyx,pxd}; do - cython --cplus "$f" - done - ''; - propagatedBuildInputs = [ numpy ]; + checkInputs = [ pytest ]; checkPhase = '' mv pyjet _pyjet @@ -31,7 +24,7 @@ buildPythonPackage rec { meta = with lib; { homepage = "https://github.com/scikit-hep/pyjet"; description = "The interface between FastJet and NumPy"; - license = licenses.gpl3; + license = licenses.gpl2Plus; maintainers = with maintainers; [ veprbl ]; }; } From 6a0e026b01e9ce386039d8d7439743adac5dc6bf Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Tue, 26 Oct 2021 09:33:38 +0800 Subject: [PATCH 06/27] pantheon.wingpanel-indicator-network: 2.3.0 -> 2.3.1 --- .../wingpanel-indicators/network/default.nix | 22 ++++--------------- .../network/fix-paths.patch | 13 ----------- 2 files changed, 4 insertions(+), 31 deletions(-) delete mode 100644 pkgs/desktops/pantheon/desktop/wingpanel-indicators/network/fix-paths.patch diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/network/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/network/default.nix index 92738df7b355..560d16111c50 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/network/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/network/default.nix @@ -1,6 +1,6 @@ -{ lib, stdenv +{ lib +, stdenv , fetchFromGitHub -, fetchpatch , nix-update-script , substituteAll , pantheon @@ -14,18 +14,17 @@ , libnma , wingpanel , libgee -, elementary-capnet-assist }: stdenv.mkDerivation rec { pname = "wingpanel-indicator-network"; - version = "2.3.0"; + version = "2.3.1"; src = fetchFromGitHub { owner = "elementary"; repo = pname; rev = version; - sha256 = "0q5ad2sj0nmigrh1rykb2kvik3hzibzyafdvkkmjd6y92145lwl1"; + sha256 = "sha256-xr1ZihWK8fU8M/rXRKk5dOjoQNe3aJO8ouKC/iVZ7Sk="; }; passthru = { @@ -50,19 +49,6 @@ stdenv.mkDerivation rec { wingpanel ]; - patches = [ - (substituteAll { - src = ./fix-paths.patch; - elementary_capnet_assist = elementary-capnet-assist; - }) - # Upstream code not respecting our localedir - # https://github.com/elementary/wingpanel-indicator-network/pull/228 - (fetchpatch { - url = "https://github.com/elementary/wingpanel-indicator-network/commit/eacc7d46a94a980005e87e38e6c943143a09692a.patch"; - sha256 = "1svg07fqmplchp1ass0h8qkr3g24pkw8dcsnd54ddmvnjzwrzz0a"; - }) - ]; - meta = with lib; { description = "Network Indicator for Wingpanel"; homepage = "https://github.com/elementary/wingpanel-indicator-network"; diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/network/fix-paths.patch b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/network/fix-paths.patch deleted file mode 100644 index b98c50b3e49a..000000000000 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/network/fix-paths.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/Indicator.vala b/src/Indicator.vala -index 83ce932a..f95ed142 100644 ---- a/src/Indicator.vala -+++ b/src/Indicator.vala -@@ -67,7 +67,7 @@ public class Network.Indicator : Wingpanel.Indicator { - - if (network_monitor.get_connectivity () == NetworkConnectivity.FULL || network_monitor.get_connectivity () == NetworkConnectivity.PORTAL) { - try { -- var appinfo = AppInfo.create_from_commandline ("io.elementary.capnet-assist", null, AppInfoCreateFlags.NONE); -+ var appinfo = AppInfo.create_from_commandline ("@elementary_capnet_assist@/bin/io.elementary.capnet-assist", null, AppInfoCreateFlags.NONE); - appinfo.launch (null, null); - } catch (Error e) { - warning ("%s\n", e.message); From a57a7c035f5152019541310883ffbaae480be62b Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Tue, 26 Oct 2021 12:52:56 +0800 Subject: [PATCH 07/27] tootle: pin vala version to 0.52 --- pkgs/applications/misc/tootle/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/tootle/default.nix b/pkgs/applications/misc/tootle/default.nix index 63ac88ecac9d..8c111ae6aa42 100644 --- a/pkgs/applications/misc/tootle/default.nix +++ b/pkgs/applications/misc/tootle/default.nix @@ -2,7 +2,7 @@ , fetchFromGitHub , nix-update-script , fetchpatch -, vala +, vala_0_52 , meson , ninja , pkg-config @@ -35,7 +35,9 @@ stdenv.mkDerivation rec { ninja pkg-config python3 - vala + # Does not build with vala 0.54 + # https://github.com/bleakgrey/tootle/issues/337 + vala_0_52 wrapGAppsHook ]; From 20a9ac8d35bb9a3b618df441bcc7c6f09353b040 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Wed, 27 Oct 2021 09:00:38 +0800 Subject: [PATCH 08/27] pantheon.epiphany: update patches https://github.com/elementary/browser/pull/41 --- pkgs/desktops/gnome/core/epiphany/default.nix | 29 +++++-- .../core/epiphany/pantheon-dark-style.patch | 76 ------------------- .../pantheon-navigation-buttons.patch | 12 --- 3 files changed, 24 insertions(+), 93 deletions(-) delete mode 100644 pkgs/desktops/gnome/core/epiphany/pantheon-dark-style.patch delete mode 100644 pkgs/desktops/gnome/core/epiphany/pantheon-navigation-buttons.patch diff --git a/pkgs/desktops/gnome/core/epiphany/default.nix b/pkgs/desktops/gnome/core/epiphany/default.nix index 617ef1cc38f5..6f9965520647 100644 --- a/pkgs/desktops/gnome/core/epiphany/default.nix +++ b/pkgs/desktops/gnome/core/epiphany/default.nix @@ -3,6 +3,7 @@ , ninja , gettext , fetchurl +, fetchpatch , pkg-config , gtk3 , glib @@ -46,12 +47,30 @@ stdenv.mkDerivation rec { sha256 = "s50YJUkllbC3TF1qZoaoV/lBnfpMAvgBPCl7yHDibdA="; }; - patches = lib.optionals withPantheon [ - # Make this respect dark mode settings from Pantheon + patches = [ + # tab-view: Update close button position on startup + # https://gitlab.gnome.org/GNOME/epiphany/-/merge_requests/1025 + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/epiphany/-/commit/6e9d6d3cf7fa7ddf21a70e9816a5cd4767a79523.patch"; + sha256 = "sha256-lBVliGCIKwTvsYnWjAcmJxhTg1HS/2x4wlOh+4sx/xQ="; + }) + ] ++ lib.optionals withPantheon [ + # Pantheon specific patches for epiphany # https://github.com/elementary/browser - # The patch currently differs from upstream (updated for epiphany 40 and 41). - ./pantheon-dark-style.patch - ./pantheon-navigation-buttons.patch + # + # Make this respect dark mode settings from Pantheon + # https://github.com/elementary/browser/pull/21 + # https://github.com/elementary/browser/pull/41 + (fetchpatch { + url = "https://raw.githubusercontent.com/elementary/browser/cc17559a7ac6effe593712b4f3d0bbefde6e3b62/dark-style.patch"; + sha256 = "sha256-RzMUc9P51UN3tRFefzRtMniXR9duOOmLj5eu5gL2TEQ="; + }) + # Patch to unlink nav buttons + # https://github.com/elementary/browser/pull/18 + (fetchpatch { + url = "https://raw.githubusercontent.com/elementary/browser/cc17559a7ac6effe593712b4f3d0bbefde6e3b62/navigation-buttons.patch"; + sha256 = "sha256-G1/JUjn/8DyO9sgL/5Kq205KbTOs4EMi4Vf3cJ8FHXU="; + }) ]; nativeBuildInputs = [ diff --git a/pkgs/desktops/gnome/core/epiphany/pantheon-dark-style.patch b/pkgs/desktops/gnome/core/epiphany/pantheon-dark-style.patch deleted file mode 100644 index 56ac5c1e5b2c..000000000000 --- a/pkgs/desktops/gnome/core/epiphany/pantheon-dark-style.patch +++ /dev/null @@ -1,76 +0,0 @@ -diff --git a/meson.build b/meson.build -index de9cbfa850..647f617605 100644 ---- a/meson.build -+++ b/meson.build -@@ -92,6 +92,7 @@ iso_codes_dep = dependency('iso-codes', version: '>= 0.35') - json_glib_dep = dependency('json-glib-1.0', version: '>= 1.6') - libarchive_dep = dependency('libarchive') - libdazzle_dep = dependency('libdazzle-1.0', version: '>= 3.37.1') -+libgranite_dep = dependency('granite', version: '>= 6.0.0') - libhandy_dep = dependency('libhandy-1', version: '>= 1.1.0') - libsecret_dep = dependency('libsecret-1', version: '>= 0.19.0') - libsoup_dep = dependency('libsoup-2.4', version: '>= 2.48.0') -diff --git a/src/ephy-shell.c b/src/ephy-shell.c -index 650531da86..b9d1355e86 100644 ---- a/src/ephy-shell.c -+++ b/src/ephy-shell.c -@@ -50,6 +50,7 @@ - - #include - #include -+#include - #include - - struct _EphyShell { -@@ -483,6 +484,20 @@ run_in_background_set_mapping (const GValue *value, - return g_variant_new_boolean (g_variant_get_boolean (var)); - } - -+static void -+ephy_shell_set_prefers_color_scheme (EphyShell *shell) -+{ -+ GtkSettings* gtk_settings = gtk_settings_get_default (); -+ GraniteSettings* granite_settings = granite_settings_get_default (); -+ -+ g_object_set ( -+ gtk_settings, -+ "gtk-application-prefer-dark-theme", -+ granite_settings_get_prefers_color_scheme (granite_settings) == GRANITE_SETTINGS_COLOR_SCHEME_DARK, -+ NULL -+ ); -+} -+ - static void - ephy_shell_startup (GApplication *application) - { -@@ -490,11 +505,18 @@ ephy_shell_startup (GApplication *application) - EphyShell *shell = EPHY_SHELL (application); - EphyEmbedShellMode mode; - GAction *action; -+ GraniteSettings* granite_settings = granite_settings_get_default (); - - G_APPLICATION_CLASS (ephy_shell_parent_class)->startup (application); - - hdy_init (); - -+ ephy_shell_set_prefers_color_scheme (shell); -+ -+ g_signal_connect (granite_settings, "notify::prefers-color-scheme", -+ G_CALLBACK (ephy_shell_set_prefers_color_scheme), shell -+ ); -+ - /* If we are under Pantheon set the icon-theme and cursor-theme accordingly. */ - if (is_desktop_pantheon ()) { - GtkSettings *settings = gtk_settings_get_default (); -diff --git a/src/meson.build b/src/meson.build -index 5bf3eb92ec..d17b1b6d93 100644 ---- a/src/meson.build -+++ b/src/meson.build -@@ -74,6 +74,7 @@ libephymain_deps = [ - gdk_dep, - gvdb_dep, - libarchive_dep, -+ libgranite_dep, - libhandy_dep - ] - diff --git a/pkgs/desktops/gnome/core/epiphany/pantheon-navigation-buttons.patch b/pkgs/desktops/gnome/core/epiphany/pantheon-navigation-buttons.patch deleted file mode 100644 index b7b3b620535f..000000000000 --- a/pkgs/desktops/gnome/core/epiphany/pantheon-navigation-buttons.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/src/resources/gtk/action-bar-start.ui b/src/resources/gtk/action-bar-start.ui -index e604b9601f..2bfe244d53 100644 ---- a/src/resources/gtk/action-bar-start.ui -+++ b/src/resources/gtk/action-bar-start.ui -@@ -7,7 +7,6 @@ - True - horizontal - - From 2fcee1e35c09b96ec6d39407ee338103d836ede4 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Wed, 27 Oct 2021 09:11:12 +0800 Subject: [PATCH 09/27] pantheon.elementary-calculator: 1.7.0 -> 1.7.1 --- pkgs/desktops/pantheon/apps/elementary-calculator/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/pantheon/apps/elementary-calculator/default.nix b/pkgs/desktops/pantheon/apps/elementary-calculator/default.nix index 7fbaa32dc39f..de01821edd6e 100644 --- a/pkgs/desktops/pantheon/apps/elementary-calculator/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-calculator/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { pname = "elementary-calculator"; - version = "1.7.0"; + version = "1.7.1"; repoName = "calculator"; @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { owner = "elementary"; repo = repoName; rev = version; - sha256 = "1kl2iximcmbk8inklb2xav7dp08lp5pn9xxa59327zw13gdy8fkf"; + sha256 = "sha256-GoQFWhEhUBVLYL1vsIIBMT8pKc0dK/ploiGfUtJAJQU="; }; passthru = { From c0c3b61e2e210546cb0bcc0953b3710476b46f5c Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Wed, 27 Oct 2021 09:34:18 +0800 Subject: [PATCH 10/27] pantheon.appcenter: 3.8.0 -> 3.8.1 --- pkgs/desktops/pantheon/apps/appcenter/default.nix | 4 ++-- .../pantheon/apps/appcenter/drop-homepage-banner.patch | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/desktops/pantheon/apps/appcenter/default.nix b/pkgs/desktops/pantheon/apps/appcenter/default.nix index 86580bd4c30f..c8526c489889 100644 --- a/pkgs/desktops/pantheon/apps/appcenter/default.nix +++ b/pkgs/desktops/pantheon/apps/appcenter/default.nix @@ -30,13 +30,13 @@ stdenv.mkDerivation rec { pname = "appcenter"; - version = "3.8.0"; + version = "3.8.1"; src = fetchFromGitHub { owner = "elementary"; repo = pname; rev = version; - sha256 = "07lkdpnjj9pxbq8h794qjiidvnysvzx0132w98r1wg9k7ca170bj"; + sha256 = "sha256-d7DGyAC8itBxTfuabDPN16W4S4d42s5UPp8AusZfy5k="; }; patches = [ diff --git a/pkgs/desktops/pantheon/apps/appcenter/drop-homepage-banner.patch b/pkgs/desktops/pantheon/apps/appcenter/drop-homepage-banner.patch index 3e7aa3efc126..4841a7b3ee63 100644 --- a/pkgs/desktops/pantheon/apps/appcenter/drop-homepage-banner.patch +++ b/pkgs/desktops/pantheon/apps/appcenter/drop-homepage-banner.patch @@ -1,6 +1,6 @@ -From b1e09653d755ca6ffd03a1e3e67750e6bcc2bc6f Mon Sep 17 00:00:00 2001 +From c1916699cd388cc8d9968127e43ba955471623bf Mon Sep 17 00:00:00 2001 From: Bobby Rong -Date: Wed, 22 Sep 2021 11:54:48 +0800 +Date: Wed, 27 Oct 2021 09:33:15 +0800 Subject: [PATCH 2/2] Drop homepage banner --- @@ -8,7 +8,7 @@ Subject: [PATCH 2/2] Drop homepage banner 1 file changed, 1 insertion(+), 180 deletions(-) diff --git a/src/Views/Homepage.vala b/src/Views/Homepage.vala -index 576fc02c..80a1d221 100644 +index 52cb36cc..80a1d221 100644 --- a/src/Views/Homepage.vala +++ b/src/Views/Homepage.vala @@ -31,67 +31,12 @@ public class AppCenter.Homepage : AbstractView { @@ -193,7 +193,7 @@ index 576fc02c..80a1d221 100644 - } - } - -- if (!installed && !(package in packages_in_banner) && !package.is_explicit) { +- if (!installed && !(package in packages_in_banner)) { - var package_row = new AppCenter.Widgets.ListPackageRowGrid (package); - recently_updated_carousel.add (package_row); - } From 36cc1ae2ab7ad9257bf1499b58195fa16489af1d Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Wed, 27 Oct 2021 09:48:02 +0800 Subject: [PATCH 11/27] pantheon.elementary-calendar: 6.0.2 -> 6.0.3 --- .../apps/elementary-calendar/default.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/desktops/pantheon/apps/elementary-calendar/default.nix b/pkgs/desktops/pantheon/apps/elementary-calendar/default.nix index 549493966c13..744184cc3d27 100644 --- a/pkgs/desktops/pantheon/apps/elementary-calendar/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-calendar/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { pname = "elementary-calendar"; - version = "6.0.2"; + version = "6.0.3"; repoName = "calendar"; @@ -36,13 +36,7 @@ stdenv.mkDerivation rec { owner = "elementary"; repo = repoName; rev = version; - sha256 = "16xp8gfgpyz9xpjsxm6jlk4skkknj65g0q4x0qvw9sg9f1p6a514"; - }; - - passthru = { - updateScript = nix-update-script { - attrPath = "pantheon.${pname}"; - }; + sha256 = "sha256-+RQUiJLuCIbmcbtsOCfF9HYFrxtldZMbg2vg/a/IOaY="; }; nativeBuildInputs = [ @@ -78,6 +72,12 @@ stdenv.mkDerivation rec { patchShebangs meson/post_install.py ''; + passthru = { + updateScript = nix-update-script { + attrPath = "pantheon.${pname}"; + }; + }; + meta = with lib; { description = "Desktop calendar app designed for elementary OS"; homepage = "https://github.com/elementary/calendar"; From 4ce576b36ff9b177a4ec0db38201663eaf9a5643 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Wed, 27 Oct 2021 10:00:45 +0800 Subject: [PATCH 12/27] pantheon.wingpanel-indicator-notifications: 6.0.1 -> 6.0.2 --- .../notifications/default.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/notifications/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/notifications/default.nix index 46d90e4acc31..5adf2c7da6f5 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/notifications/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/notifications/default.nix @@ -16,19 +16,13 @@ stdenv.mkDerivation rec { pname = "wingpanel-indicator-notifications"; - version = "6.0.1"; + version = "6.0.2"; src = fetchFromGitHub { owner = "elementary"; repo = pname; rev = version; - sha256 = "1qrbg8l3ifz09jx6v5j7hmgw0hmirj6mh3z634yl1cadz45p8fc9"; - }; - - passthru = { - updateScript = nix-update-script { - attrPath = "pantheon.${pname}"; - }; + sha256 = "sha256-ZuOZlfxtRq8ZcrXGe9wlFGwn2isdvMoXQveKKnEPFdo="; }; nativeBuildInputs = [ @@ -47,6 +41,12 @@ stdenv.mkDerivation rec { wingpanel ]; + passthru = { + updateScript = nix-update-script { + attrPath = "pantheon.${pname}"; + }; + }; + meta = with lib; { description = "Notifications Indicator for Wingpanel"; homepage = "https://github.com/elementary/wingpanel-indicator-notifications"; From acb17adef6be1b1779dbbd2a6c9e9fda12698cbc Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Wed, 27 Oct 2021 10:10:49 +0800 Subject: [PATCH 13/27] pantheon.elementary-photos: 2.7.2 -> 2.7.3 --- .../pantheon/apps/elementary-photos/default.nix | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/pkgs/desktops/pantheon/apps/elementary-photos/default.nix b/pkgs/desktops/pantheon/apps/elementary-photos/default.nix index efd59f6ca0f7..0b51f6209ddc 100644 --- a/pkgs/desktops/pantheon/apps/elementary-photos/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-photos/default.nix @@ -1,6 +1,5 @@ { lib, stdenv , fetchFromGitHub -, fetchpatch , nix-update-script , pantheon , meson @@ -35,7 +34,7 @@ stdenv.mkDerivation rec { pname = "elementary-photos"; - version = "2.7.2"; + version = "2.7.3"; repoName = "photos"; @@ -43,18 +42,9 @@ stdenv.mkDerivation rec { owner = "elementary"; repo = repoName; rev = version; - sha256 = "1zq9zfsc987vvrzadw9xqi3rlbi4jv2s82axkgy7ijm3ibi58ddc"; + sha256 = "sha256-ja4ElW0FNm9oNyn+00SdI2Cxep6LyWTYM8Blc6bnuiY="; }; - patches = [ - # Fix build with vala 0.54 - # https://github.com/elementary/photos/pull/650 - (fetchpatch { - url = "https://github.com/elementary/photos/commit/bc7feca8caa4c8fc076a759a2d36e26e93c75596.patch"; - sha256 = "sha256-iOHYKV7rSAuMm4ZhoJWjlpu96zlxwTosQe+z/iEVFR8="; - }) - ]; - nativeBuildInputs = [ appstream desktop-file-utils From 2ce343951d90cfb8dc443b6f46dec73ee01a4ac8 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Wed, 27 Oct 2021 10:19:06 +0800 Subject: [PATCH 14/27] pantheon.wingpanel-applications-menu: 2.9.0 -> 2.9.1 --- .../applications-menu/default.nix | 28 +++++++++---------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/default.nix index 6799887247d8..c2a4ad64ce95 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { pname = "wingpanel-applications-menu"; - version = "2.9.0"; + version = "2.9.1"; repoName = "applications-menu"; @@ -34,14 +34,15 @@ stdenv.mkDerivation rec { owner = "elementary"; repo = repoName; rev = version; - sha256 = "0mwjw2ghbdj336ax5srxbqnjprdhj1if7sm9k9idqkmifpzccs7i"; + sha256 = "sha256-Q0ee8S8wWhK0Y16SWfE79Us6QD/oRE5Pxm3o//eb/po="; }; - passthru = { - updateScript = nix-update-script { - attrPath = "pantheon.${pname}"; - }; - }; + patches = [ + (substituteAll { + src = ./fix-paths.patch; + bc = "${bc}/bin/bc"; + }) + ]; nativeBuildInputs = [ gettext @@ -76,18 +77,17 @@ stdenv.mkDerivation rec { "--sysconfdir=${placeholder "out"}/etc" ]; - patches = [ - (substituteAll { - src = ./fix-paths.patch; - bc = "${bc}/bin/bc"; - }) - ]; - postPatch = '' chmod +x meson/post_install.py patchShebangs meson/post_install.py ''; + passthru = { + updateScript = nix-update-script { + attrPath = "pantheon.${pname}"; + }; + }; + meta = with lib; { description = "Lightweight and stylish app launcher for Pantheon"; homepage = "https://github.com/elementary/applications-menu"; From 04af89173e47902e853e42d616bbe5c8b70f2941 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Wed, 27 Oct 2021 10:25:31 +0800 Subject: [PATCH 15/27] pantheon.elementary-camera: 6.0.0 -> 6.0.1 --- .../pantheon/apps/elementary-camera/default.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/desktops/pantheon/apps/elementary-camera/default.nix b/pkgs/desktops/pantheon/apps/elementary-camera/default.nix index 432e5fdf00e7..c8e6e4da37d0 100644 --- a/pkgs/desktops/pantheon/apps/elementary-camera/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-camera/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { pname = "elementary-camera"; - version = "6.0.0"; + version = "6.0.1"; repoName = "camera"; @@ -33,13 +33,7 @@ stdenv.mkDerivation rec { owner = "elementary"; repo = repoName; rev = version; - sha256 = "1z5c6pkc7psglxwzby5idsdxvplpi28ckjxrwdngnr22knfdcgag"; - }; - - passthru = { - updateScript = nix-update-script { - attrPath = "pantheon.${pname}"; - }; + sha256 = "sha256-OdBinryF6XTcvtY4A1wdDVazjf/VritEGF97ts6d4RY="; }; nativeBuildInputs = [ @@ -75,6 +69,12 @@ stdenv.mkDerivation rec { patchShebangs meson/post_install.py ''; + passthru = { + updateScript = nix-update-script { + attrPath = "pantheon.${pname}"; + }; + }; + meta = with lib; { description = "Camera app designed for elementary OS"; homepage = "https://github.com/elementary/camera"; From ca4560cbc01f0998e0191ebea390a0747330e6c6 Mon Sep 17 00:00:00 2001 From: dan4ik <6057430gu@gmail.com> Date: Wed, 27 Oct 2021 19:35:21 +0700 Subject: [PATCH 16/27] github-desktop: 2.9.3 -> 2.9.4 --- .../version-management/github-desktop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/github-desktop/default.nix b/pkgs/applications/version-management/github-desktop/default.nix index 5e8061c157c8..a13aa4ddfabd 100644 --- a/pkgs/applications/version-management/github-desktop/default.nix +++ b/pkgs/applications/version-management/github-desktop/default.nix @@ -19,11 +19,11 @@ stdenv.mkDerivation rec { pname = "github-desktop"; - version = "2.9.3"; + version = "2.9.4"; src = fetchurl { url = "https://github.com/shiftkey/desktop/releases/download/release-${version}-linux1/GitHubDesktop-linux-${version}-linux1.deb"; - sha256 = "sha256-e3XDjVQ5VcsS/MGxNsDs2h77joZAz8mNn+SwrqiUAR0="; + sha256 = "sha256-CcAOATIEcrUKhVQWFr0dMvY9Q5rHWQI9/KdSEZ/ncD4="; }; nativeBuildInputs = [ From d5ea3f60b1fa67d72c41dfa93c506d2e4e855c20 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 27 Oct 2021 13:46:16 +0000 Subject: [PATCH 17/27] pipreqs: 0.4.10 -> 0.4.11 --- pkgs/tools/misc/pipreqs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/pipreqs/default.nix b/pkgs/tools/misc/pipreqs/default.nix index 3f27be2c9f94..70a5ec69ff51 100644 --- a/pkgs/tools/misc/pipreqs/default.nix +++ b/pkgs/tools/misc/pipreqs/default.nix @@ -4,11 +4,11 @@ with python3.pkgs; buildPythonApplication rec { pname = "pipreqs"; - version = "0.4.10"; + version = "0.4.11"; src = fetchPypi { inherit pname version; - sha256 = "0fdr3mbxjpmrxr7yfc1sn9kbpcyb0qwafimhhrrqvf989dj1sdcy"; + sha256 = "c793b4e147ac437871b3a962c5ce467e129c859ece5ba79aca83c20f4d9c3aef"; }; propagatedBuildInputs = [ yarg docopt ]; From c5d741263099674cbba74e496e201afbb1ec29ed Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 27 Oct 2021 23:36:13 +0000 Subject: [PATCH 18/27] ansible-lint: 5.2.0 -> 5.2.1 --- pkgs/development/python-modules/ansible-lint/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ansible-lint/default.nix b/pkgs/development/python-modules/ansible-lint/default.nix index d035c3267a85..9962ebdc491f 100644 --- a/pkgs/development/python-modules/ansible-lint/default.nix +++ b/pkgs/development/python-modules/ansible-lint/default.nix @@ -18,13 +18,13 @@ buildPythonPackage rec { pname = "ansible-lint"; - version = "5.2.0"; + version = "5.2.1"; disabled = isPy27; format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "sha256-eQIDVtk/UD0syGmnJw48BDFtUQ4ztiZO3AjH0NsOgGE="; + sha256 = "sha256-1krKWcjYllQdN5uSBbISa4UQiKqwosLKsZ/3SxhM3xw="; }; nativeBuildInputs = [ From 572dcd44a11c5c597495db1102ce7110ca266eff Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 28 Oct 2021 00:45:19 +0000 Subject: [PATCH 19/27] zoxide: 0.7.7 -> 0.7.8 --- pkgs/tools/misc/zoxide/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/zoxide/default.nix b/pkgs/tools/misc/zoxide/default.nix index 5fa6e849ac1e..f4d6d2a346f7 100644 --- a/pkgs/tools/misc/zoxide/default.nix +++ b/pkgs/tools/misc/zoxide/default.nix @@ -10,13 +10,13 @@ rustPlatform.buildRustPackage rec { pname = "zoxide"; - version = "0.7.7"; + version = "0.7.8"; src = fetchFromGitHub { owner = "ajeetdsouza"; repo = "zoxide"; rev = "v${version}"; - sha256 = "18sm7smp0r7rmbq6ajl905947l5vni7hb4dfd0hhnrqjxwlkynds"; + sha256 = "sha256-NGSeGrYEWYE1gmYZs4UmZCIKJKckROWZtl+PykGWDEM="; }; nativeBuildInputs = [ installShellFiles ]; @@ -28,7 +28,7 @@ rustPlatform.buildRustPackage rec { --replace '"fzf"' '"${fzf}/bin/fzf"' ''; - cargoSha256 = "0km4bgdl03m5ri4wzy0fsvvwlifx99m9x2j599x58ryq6lx2kkyc"; + cargoSha256 = "sha256-gtXIMYklcQg75VUuPzftI9OJ+S8iutpnJAT37VsB+KY="; postInstall = '' installManPage man/* From ec1463beb6e44110eaf101fcc2ab8f718bb359b7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 28 Oct 2021 00:56:07 +0000 Subject: [PATCH 20/27] yq-go: 4.13.2 -> 4.13.5 --- pkgs/development/tools/yq-go/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/yq-go/default.nix b/pkgs/development/tools/yq-go/default.nix index dab3e6200022..5095d85d3ca3 100644 --- a/pkgs/development/tools/yq-go/default.nix +++ b/pkgs/development/tools/yq-go/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "yq-go"; - version = "4.13.2"; + version = "4.13.5"; src = fetchFromGitHub { owner = "mikefarah"; repo = "yq"; rev = "v${version}"; - sha256 = "sha256-manTuR7/3FE+q08WTVAtKilPCQBK136O8w1r5OX9T08="; + sha256 = "sha256-ckcuA9jf8aFgcuts3VOE629WGkvBkdZP86PKXqzBvks="; }; - vendorSha256 = "sha256-u7elWOW/tz1ISM/KC1njkZmPi8AEEssZ5QtxK/+1/1I="; + vendorSha256 = "sha256-jlQ4TH5PiO/68ZFOzOVUTYKkVe9lQleVjZoP4adRrUI="; doCheck = false; From 14d3b5fd01cfc73b934ac1bf1d6cbfecf21818f6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 27 Oct 2021 18:18:37 +0000 Subject: [PATCH 21/27] img2pdf: 0.4.2 -> 0.4.3 --- pkgs/development/python-modules/img2pdf/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/img2pdf/default.nix b/pkgs/development/python-modules/img2pdf/default.nix index 48557d34bc86..ee11e1280c15 100644 --- a/pkgs/development/python-modules/img2pdf/default.nix +++ b/pkgs/development/python-modules/img2pdf/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "img2pdf"; - version = "0.4.2"; + version = "0.4.3"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "sha256-qs9YZQPWET5Tv7A8hcheVGw4RBOlbBXd0I7lHIZEeaI="; + sha256 = "sha256-jlHFBD76lddRSBtRYHGgBvh8KkBZlhqaxD7COJFd4J8="; }; propagatedBuildInputs = [ From ba55036722ed94745f5decde2df7e00a14be4b56 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 28 Oct 2021 01:50:09 +0000 Subject: [PATCH 22/27] angle-grinder: 0.17.0 -> 0.18.0 --- pkgs/tools/text/angle-grinder/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/text/angle-grinder/default.nix b/pkgs/tools/text/angle-grinder/default.nix index 02235b057d4d..a2303c10a639 100644 --- a/pkgs/tools/text/angle-grinder/default.nix +++ b/pkgs/tools/text/angle-grinder/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "angle-grinder"; - version = "0.17.0"; + version = "0.18.0"; src = fetchFromGitHub { owner = "rcoh"; repo = pname; rev = "v${version}"; - sha256 = "sha256-jG3jHFqFOrIT/e5oyLOEckw5C3LIs7amFAa4QDEI/EY="; + sha256 = "sha256-kohw95pvcBLviPgTDGWIbvZuz1cJmKh4eB0Bx4AEk1E="; }; - cargoSha256 = "sha256-Rkex+fnnacV+DCRpX3Zh9J3vGuG4QfFhFezHTs33peY="; + cargoSha256 = "sha256-m44hFYcyQ1yRf1O5OlomF7rEpkdnnX3FNhB8kUdriKg="; meta = with lib; { description = "Slice and dice logs on the command line"; From 44ffcb836239ef0e608728223166740b632ce994 Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Thu, 28 Oct 2021 01:56:09 +0000 Subject: [PATCH 23/27] discourse: 2.7.8 -> 2.7.9 https://nvd.nist.gov/vuln/detail/CVE-2021-41163 --- pkgs/servers/web-apps/discourse/default.nix | 4 ++-- .../web-apps/discourse/rubyEnv/Gemfile.lock | 12 +++++------ .../web-apps/discourse/rubyEnv/gemset.nix | 20 +++++++++---------- 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/pkgs/servers/web-apps/discourse/default.nix b/pkgs/servers/web-apps/discourse/default.nix index 587cb363fc6e..9206d39a3466 100644 --- a/pkgs/servers/web-apps/discourse/default.nix +++ b/pkgs/servers/web-apps/discourse/default.nix @@ -10,13 +10,13 @@ }@args: let - version = "2.7.8"; + version = "2.7.9"; src = fetchFromGitHub { owner = "discourse"; repo = "discourse"; rev = "v${version}"; - sha256 = "sha256-p4eViEvzIU6W89FZRtMBXsT7bvf2H12bTPZ/h3iD8rA="; + sha256 = "sha256-SOERjFbG4l/tUfOl51XEW0nVbza3L4adjiPhz4Hj0YU="; }; runtimeDeps = [ diff --git a/pkgs/servers/web-apps/discourse/rubyEnv/Gemfile.lock b/pkgs/servers/web-apps/discourse/rubyEnv/Gemfile.lock index f7fca7dae772..0b83d3483392 100644 --- a/pkgs/servers/web-apps/discourse/rubyEnv/Gemfile.lock +++ b/pkgs/servers/web-apps/discourse/rubyEnv/Gemfile.lock @@ -52,9 +52,9 @@ GEM activerecord (>= 3.2, < 7.0) rake (>= 10.4, < 14.0) ast (2.4.2) - aws-eventstream (1.1.1) - aws-partitions (1.432.0) - aws-sdk-core (3.112.1) + aws-eventstream (1.2.0) + aws-partitions (1.516.0) + aws-sdk-core (3.121.2) aws-eventstream (~> 1, >= 1.0.2) aws-partitions (~> 1, >= 1.239.0) aws-sigv4 (~> 1.1) @@ -66,10 +66,10 @@ GEM aws-sdk-core (~> 3, >= 3.112.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.1) - aws-sdk-sns (1.38.0) - aws-sdk-core (~> 3, >= 3.112.0) + aws-sdk-sns (1.46.0) + aws-sdk-core (~> 3, >= 3.121.2) aws-sigv4 (~> 1.1) - aws-sigv4 (1.2.3) + aws-sigv4 (1.4.0) aws-eventstream (~> 1, >= 1.0.2) barber (0.12.2) ember-source (>= 1.0, < 3.1) diff --git a/pkgs/servers/web-apps/discourse/rubyEnv/gemset.nix b/pkgs/servers/web-apps/discourse/rubyEnv/gemset.nix index 2fe2587d25f5..f63b68164ef2 100644 --- a/pkgs/servers/web-apps/discourse/rubyEnv/gemset.nix +++ b/pkgs/servers/web-apps/discourse/rubyEnv/gemset.nix @@ -135,20 +135,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0jfki5ikfr8ln5cdgv4iv1643kax0bjpp29jh78chzy713274jh3"; + sha256 = "1pyis1nvnbjxk12a43xvgj2gv0mvp4cnkc1gzw0v1018r61399gz"; type = "gem"; }; - version = "1.1.1"; + version = "1.2.0"; }; aws-partitions = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0y0z25hgghy3i8azx0mn8pda2qvd47zkilwjps0x32zn091blzgg"; + sha256 = "1jx44f1hc41712k8fqmzrbpqs2j9yl0msdqcmmfp0pirkbqw6ri0"; type = "gem"; }; - version = "1.432.0"; + version = "1.516.0"; }; aws-sdk-core = { dependencies = ["aws-eventstream" "aws-partitions" "aws-sigv4" "jmespath"]; @@ -156,10 +156,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0r5f7pb9dh95f7cb4rdj1z766c88735y6y6msbgzak0v8g8j3dw9"; + sha256 = "0d44wgbzlwc6gb2ql9cayljdwhlvz9byp2grk0n9favb7rq42fwc"; type = "gem"; }; - version = "3.112.1"; + version = "3.121.2"; }; aws-sdk-kms = { dependencies = ["aws-sdk-core" "aws-sigv4"]; @@ -189,10 +189,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0cqri14igfmcxlapbagg0nmy79zzg29awzybv51gl76m3mljbafb"; + sha256 = "1s2ggpwg7v0s0f4bw3887r5y92cbnrjld53lm69irqmx0h7q2564"; type = "gem"; }; - version = "1.38.0"; + version = "1.46.0"; }; aws-sigv4 = { dependencies = ["aws-eventstream"]; @@ -200,10 +200,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1d9zhmi3mpfzkkpg7yw7s9r1dwk157kh9875j3c7gh6cy95lmmaw"; + sha256 = "1wh1y79v0s4zgby2m79bnifk65hwf5pvk2yyrxzn2jkjjq8f8fqa"; type = "gem"; }; - version = "1.2.3"; + version = "1.4.0"; }; barber = { dependencies = ["ember-source" "execjs"]; From 99494ca98d782e7653796534288181d50252872f Mon Sep 17 00:00:00 2001 From: rewine Date: Thu, 28 Oct 2021 10:35:23 +0800 Subject: [PATCH 24/27] tdlib: 1.7.0 -> 1.7.8 (#143176) --- pkgs/development/libraries/tdlib/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/tdlib/default.nix b/pkgs/development/libraries/tdlib/default.nix index 895faa8847ac..25935ca71c39 100644 --- a/pkgs/development/libraries/tdlib/default.nix +++ b/pkgs/development/libraries/tdlib/default.nix @@ -1,16 +1,16 @@ { fetchFromGitHub, gperf, openssl, readline, zlib, cmake, lib, stdenv }: stdenv.mkDerivation rec { - version = "1.7.0"; + version = "1.7.8"; pname = "tdlib"; src = fetchFromGitHub { owner = "tdlib"; repo = "td"; - rev = "v${version}"; + rev = "a68d8e77efb03896f3a04fc316c47136b0bab7df"; - sha256 = "sha256-sZzp9k7KDnqftcSGSgXkIy0siCksGPBmRckySU/J0TU="; + sha256 = "0zis1mxb495lazmhax91h94nw73nyq82bhbx3f1zlxkvc8664099"; }; buildInputs = [ gperf openssl readline zlib ]; From 46905d953d9b4c66fc5f76836d0a344c3e37d828 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Wed, 27 Oct 2021 21:52:23 -0500 Subject: [PATCH 25/27] flexget: 3.1.140 -> 3.1.148 --- .../networking/flexget/default.nix | 34 +++++++++---------- 1 file changed, 16 insertions(+), 18 deletions(-) diff --git a/pkgs/applications/networking/flexget/default.nix b/pkgs/applications/networking/flexget/default.nix index 96ed5a86a169..cb2abecf8287 100644 --- a/pkgs/applications/networking/flexget/default.nix +++ b/pkgs/applications/networking/flexget/default.nix @@ -2,14 +2,14 @@ python3Packages.buildPythonApplication rec { pname = "flexget"; - version = "3.1.140"; + version = "3.1.148"; # Fetch from GitHub in order to use `requirements.in` src = fetchFromGitHub { owner = "flexget"; repo = "flexget"; rev = "v${version}"; - sha256 = "15ngmpqqx902l7gxg2lb6h8q8vmjk247jbqhc92l1apr1imjqcc5"; + sha256 = "0gf07qa1wsysvl0mckh2r3a40065rxhgszf4767jkbryz8z174bc"; }; postPatch = '' @@ -32,38 +32,36 @@ python3Packages.buildPythonApplication rec { # See https://github.com/Flexget/Flexget/blob/master/requirements.in APScheduler beautifulsoup4 - cherrypy - colorama - colorclass feedparser - flask-compress - flask-cors - flask_login - flask-restful - flask-restx - flask - greenlet guessit html5lib jinja2 jsonschema loguru more-itertools - progressbar + psutil pynzb - pyparsing PyRSS2Gen python-dateutil pyyaml rebulk requests + rich rpyc - sgmllib3k sqlalchemy - terminaltables + + # WebUI requirements + cherrypy + flask-compress + flask-cors + flask_login + flask-restful + flask-restx + flask + pyparsing zxcvbn - psutil - # plugins + + # Plugins requirements transmission-rpc ]; From 631baa9ab92f198b0899bcee92a5fb1656c85264 Mon Sep 17 00:00:00 2001 From: Benoit de Chezelles Date: Thu, 28 Oct 2021 03:59:22 +0200 Subject: [PATCH 26/27] delta: 0.8.3 -> 0.9.1 --- .../version-management/git-and-tools/delta/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/delta/default.nix b/pkgs/applications/version-management/git-and-tools/delta/default.nix index 46d19f2814db..c7ad0547b85b 100644 --- a/pkgs/applications/version-management/git-and-tools/delta/default.nix +++ b/pkgs/applications/version-management/git-and-tools/delta/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "delta"; - version = "0.8.3"; + version = "0.9.1"; src = fetchFromGitHub { owner = "dandavison"; repo = pname; rev = version; - sha256 = "sha256-lwdsl3dzqrIL1JoBFmldwsCvNCWUcTlgeoEoCvmlTCQ="; + sha256 = "sha256-LyKkkQlYdCyvlru+o/QeA7CDWYgCRTFKAdAjJxJX+oM="; }; - cargoSha256 = "sha256-7TvxkSJ3iWJnjD3Xe7WDXBNWIyl8U9XTCn9muUG1AmI="; + cargoSha256 = "sha256-+ao2nVRkXNWs00oUiATgzsDTfPo09BV66AioZQqBhGk="; nativeBuildInputs = [ installShellFiles ]; From c535db45ceb6d9aaecd5d260127ecf8335000378 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Wed, 20 Oct 2021 15:40:02 +0200 Subject: [PATCH 27/27] =?UTF-8?q?ocamlPackages.cppo:=201.6.7=20=E2=86=92?= =?UTF-8?q?=201.6.8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/tools/ocaml/cppo/default.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/development/tools/ocaml/cppo/default.nix b/pkgs/development/tools/ocaml/cppo/default.nix index 032f346bf9c3..55e9692a0a3b 100644 --- a/pkgs/development/tools/ocaml/cppo/default.nix +++ b/pkgs/development/tools/ocaml/cppo/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchFromGitHub, ocaml, findlib, ocamlbuild +{ lib, stdenv, fetchFromGitHub, ocaml, findlib, ocamlbuild , buildDunePackage }: @@ -21,13 +21,15 @@ if lib.versionAtLeast ocaml.version "4.02" then buildDunePackage rec { inherit pname; - version = "1.6.7"; + version = "1.6.8"; useDune2 = true; - src = fetchurl { - url = "https://github.com/ocaml-community/cppo/releases/download/v${version}/cppo-v${version}.tbz"; - sha256 = "17ajdzrnmnyfig3s6hinb56mcmhywbssxhsq32dz0v90dhz3wmfv"; + src = fetchFromGitHub { + owner = "ocaml-community"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256:0xjb1dnj8lvdcccskrhrakknd9q4vfy5330sjbqpf4h95dsz90k9"; }; doCheck = true;