public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge staging-next-21.05 into staging-21.05

This commit is contained in:
github-actions[bot] 2021-10-03 18:03:08 +00:00 committed by GitHub
parent 937e114200 14d9fbcd6c
commit 28796cd12c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/applications/misc/psi-notify/default.nix
View File

@ -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
'';

6
pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix
View File

@ -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

8
pkgs/desktops/xfce/applications/xfce4-notifyd/default.nix
View File

@ -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";

4
pkgs/tools/system/foreman/Gemfile.lock
View File

@ -4,10 +4,10 @@ GEM
foreman (0.87.2)
PLATFORMS
x86_64-linux
ruby
DEPENDENCIES
foreman
BUNDLED WITH
2.2.20
2.1.4