From 64da7fe56f721bd1ced947b5d19f21373a4b6d8c Mon Sep 17 00:00:00 2001 From: FliegendeWurst <2012gdwu+github@posteo.de> Date: Wed, 15 Sep 2021 17:27:06 +0200 Subject: [PATCH 1/4] tor-browser-bundle-bin: 10.5.5 -> 10.5.6 (cherry picked from commit 582e0a4926b435715cf4c2b339f458e8917c979f) --- .../networking/browsers/tor-browser-bundle-bin/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix index 0bdcbaf7cc4..f920be52d25 100644 --- a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix +++ b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix @@ -88,19 +88,19 @@ let fteLibPath = makeLibraryPath [ stdenv.cc.cc gmp ]; # Upstream source - version = "10.5.5"; + version = "10.5.6"; lang = "en-US"; srcs = { x86_64-linux = fetchurl { url = "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz"; - sha256 = "0847lib2z21fgb7x5szwvprc77fhdpmp4z5d6n1sk6d40dd34spn"; + sha256 = "1hxjixriah08c65nngjdp1blbji1vlnhqkphp8f96hy34hk4dpiw"; }; i686-linux = fetchurl { url = "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz"; - sha256 = "0i26fb0r234nrwnvb2c9vk9yn869qghq0n4qlm1d7mr62dy6prxa"; + sha256 = "018kwwbbn02drvdj0bjkcyhsnbx97wnmd3lxkrx0kc9dw1s4r418"; }; }; in From 7daf35532d2d8bf5e6f7f962e6cd13a66d01a71d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Sat, 4 Sep 2021 13:11:34 -0300 Subject: [PATCH 2/4] xfce.xfce4-notifyd: enable starting the daemon via DBus Start daemon via DBus instead of regular session autostart (which is the default) (cherry picked from commit b81ba2e9195c5959ced35ffa0857ffedf2a1df7c) --- pkgs/desktops/xfce/applications/xfce4-notifyd/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/xfce/applications/xfce4-notifyd/default.nix b/pkgs/desktops/xfce/applications/xfce4-notifyd/default.nix index 64ab34d2b6f..5ff43ddacad 100644 --- a/pkgs/desktops/xfce/applications/xfce4-notifyd/default.nix +++ b/pkgs/desktops/xfce/applications/xfce4-notifyd/default.nix @@ -1,4 +1,4 @@ -{ mkXfceDerivation, glib, exo, gtk3, libnotify, libxfce4ui, libxfce4util +{ mkXfceDerivation, glib, gtk3, libnotify, libxfce4ui, libxfce4util , xfce4-panel, xfconf }: mkXfceDerivation { @@ -8,7 +8,11 @@ mkXfceDerivation { sha256 = "1q8n7dffyqbfyy6vpqlmnsfpavlc7iz6hhv1h27fkwzswy2rx28s"; - buildInputs = [ exo gtk3 glib libnotify libxfce4ui libxfce4util xfce4-panel xfconf ]; + buildInputs = [ gtk3 glib libnotify libxfce4ui libxfce4util xfce4-panel xfconf ]; + + configureFlags = [ + "--enable-dbus-start-daemon" + ]; meta = { description = "Simple notification daemon for Xfce"; From 336da77eaca48a819f79f55b76ad9fb23411b7a2 Mon Sep 17 00:00:00 2001 From: Eduard Bachmakov Date: Wed, 29 Sep 2021 17:18:19 +0200 Subject: [PATCH 3/4] psi-notify: move systemd unit to $out/lib In $out/share it is NOT picked up into /etc/systemd/... when psi-notify is added to configuration.systemd.packages . (Originally put in $out/share b/c a hook copies from $out/lib into there ... so why not just put there? This is why.) (cherry picked from commit a774af3605a86719f813ccb80e9f8a5bdef2ee0a) --- pkgs/applications/misc/psi-notify/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/misc/psi-notify/default.nix b/pkgs/applications/misc/psi-notify/default.nix index 5a4b6f385df..9e4dcd783b7 100644 --- a/pkgs/applications/misc/psi-notify/default.nix +++ b/pkgs/applications/misc/psi-notify/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { install -D psi-notify $out/bin/psi-notify substituteInPlace psi-notify.service --replace psi-notify $out/bin/psi-notify - install -D psi-notify.service $out/share/systemd/user/psi-notify.service + install -D psi-notify.service $out/lib/systemd/user/psi-notify.service runHook postInstall ''; From cbc3b23cf031c6cb4e6a9a642d72d512d7ea022e Mon Sep 17 00:00:00 2001 From: Antoine Eiche Date: Sun, 3 Oct 2021 17:38:08 +0200 Subject: [PATCH 4/4] foreman: bundled with 2.1.4 The version update has been cherrypicked from master where bundle has been updated to 2.2.20. It was then failing to run with: ./result/bin/foreman Warning: the running version of Bundler (2.1.4) is older than the version that created the lockfile (2.2.20). We suggest you to upgrade to the version that created the lockfile by running `gem install bundler:2.2.20`. Traceback (most recent call last): 2: from ./result/bin/foreman:20:in `
' 1: from /nix/store/ggqacj06n6qfm1iww0bih9ph0j89wcna-bundler-2.1.4/lib/ruby/gems/2.7.0/gems/bundler-2.1.4/lib/bundler/rubygems_integration.rb:413:in `block in replace_bin_path' /nix/store/ggqacj06n6qfm1iww0bih9ph0j89wcna-bundler-2.1.4/lib/ruby/gems/2.7.0/gems/bundler-2.1.4/lib/bundler/rubygems_integration.rb:374:in `block in replace_bin_path': can't find executable foreman for gem foreman. foreman is not currently included in the bundle, perhaps you meant to add it to your Gemfile? (Gem::Exception) --- pkgs/tools/system/foreman/Gemfile.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/system/foreman/Gemfile.lock b/pkgs/tools/system/foreman/Gemfile.lock index 1bafc658cbc..f11a353ef9e 100644 --- a/pkgs/tools/system/foreman/Gemfile.lock +++ b/pkgs/tools/system/foreman/Gemfile.lock @@ -4,10 +4,10 @@ GEM foreman (0.87.2) PLATFORMS - x86_64-linux + ruby DEPENDENCIES foreman BUNDLED WITH - 2.2.20 + 2.1.4