Unverified Commit 7576e5c0 authored by Bobby Rong's avatar Bobby Rong Committed by GitHub
Browse files

Merge pull request #222018 from bobby285271/upd/xfce 

Xfce updates
parents eb1e4291 b4744bf2

pkgs/desktops/xfce/applications/xfce4-screensaver/default.nix

+4 −2
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ 
, libXrandr

, libwnck

, libxfce4ui

, libxfce4util

, libxklavier

, pam

, systemd
@@ -18,9 +19,9 @@ 
mkXfceDerivation {

  category = "apps";

  pname = "xfce4-screensaver";

  version = "4.16.0";

  version = "4.18.0";



  sha256 = "1vblqhhzhv85yd5bz1xg14yli82ys5qrjdcabg3l53glbk61n99p";

  sha256 = "sha256-W9rEssR6jHMBM2m1lCBvj7YMOGOTaqBAOP7grQ01880=";



  buildInputs = [

    dbus-glib
@@ -32,6 +33,7 @@ mkXfceDerivation { 
    libXrandr

    libwnck

    libxfce4ui

    libxfce4util

    libxklavier

    pam

    systemd

pkgs/desktops/xfce/panel-plugins/xfce4-notes-plugin/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -13,11 +13,11 @@ let 
  category = "panel-plugins";

in stdenv.mkDerivation rec {

  pname  = "xfce4-notes-plugin";

  version = "1.9.0";

  version = "1.10.0";



  src = fetchurl {

    url = "mirror://xfce/src/${category}/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.bz2";

    sha256 = "sha256-E/kJyUi2Oflt5kz3k+t0yxd5WJIB05M+/yFO6PNasIg=";

    sha256 = "sha256-LuRAYELt01KpHhZsg7YNEyIO8E3OP6a54OsTY21jaSk=";

  };



  nativeBuildInputs = [

pkgs/desktops/xfce/panel-plugins/xfce4-windowck-plugin/default.nix

+25 −15
Original line number Diff line number Diff line 
{ lib

, mkXfceDerivation

, imagemagick

{ stdenv

, lib

, fetchurl

, intltool

, pkg-config

, libwnck

, libxfce4ui

, python3

, xfce4-panel

, xfconf

, gitUpdater

}:



mkXfceDerivation {

  category = "panel-plugins";

stdenv.mkDerivation rec {

  pname = "xfce4-windowck-plugin";

  version = "0.5.0";

  rev-prefix = "v";

  odd-unstable = false;

  sha256 = "sha256-MhNSgI74VLdoS5yL6nfRrVrPvv7+0P5meO4zQheYFzo=";

  version = "0.5.1";



  src = fetchurl {

    # Use dist tarballs to avoid pulling extra deps and generating images ourselves.

    url = "mirror://xfce/src/panel-plugins/xfce4-windowck-plugin/${lib.versions.majorMinor version}/xfce4-windowck-plugin-${version}.tar.bz2";

    sha256 = "sha256-p4FEi3gemE072lmw2qsNGE1M7CJSMW9zcKxKmO/kgfQ=";

  };



  nativeBuildInputs = [

    intltool

    pkg-config

  ];



  buildInputs = [

    imagemagick

    libwnck

    libxfce4ui

    python3

    xfce4-panel

    xfconf

  ];



  postPatch = ''

    patchShebangs themes/windowck{,-dark}/{xfwm4,unity}/generator.py

  '';

  passthru.updateScript = gitUpdater {

    url = "https://gitlab.xfce.org/panel-plugins/xfce4-windowck-plugin";

    rev-prefix = "xfce4-windowck-plugin-";

  };



  meta = with lib; {

    description = "Xfce panel plugin for displaying window title and buttons";

    homepage = "https://gitlab.xfce.org/panel-plugins/xfce4-windowck-plugin";

    license = licenses.gpl3Plus;

    platforms = platforms.linux;

    maintainers = with maintainers; [ ] ++ teams.xfce.members;

  };

}

pkgs/desktops/xfce/panel-plugins/xfce4-xkb-plugin/default.nix

+4 −3
Original line number Diff line number Diff line 
{ lib

, mkXfceDerivation

, gtk3

, libnotify

, librsvg

, libwnck

, libxklavier
@@ -14,13 +15,13 @@ 
mkXfceDerivation {

  category = "panel-plugins";

  pname = "xfce4-xkb-plugin";

  version = "0.8.2";

  rev-prefix = "";

  sha256 = "sha256-xmCoNMxykeaThYEJo6BcbraFo9CruFZL6YPjovzb6hg=";

  version = "0.8.3";

  sha256 = "sha256-qWxjULrBpueQS3gxwRg49cQ3ovlQ8iWvYZ6Z/THm+/s=";



  buildInputs = [

    garcon

    gtk3

    libnotify # optional notification support

    librsvg

    libxfce4ui

    libxfce4util

pkgs/desktops/xfce/thunar-plugins/archive/default.nix

+3 −2
Original line number Diff line number Diff line
@@ -11,9 +11,10 @@ 
mkXfceDerivation {

  category = "thunar-plugins";

  pname  = "thunar-archive-plugin";

  version = "0.4.0";

  version = "0.5.0";

  odd-unstable = false;



  sha256 = "sha256-aEAErm87K2k8TAz2ZtMQEhmzhOeR2hkJjcoBUFn8I50=";

  sha256 = "sha256-3a42chfv4UQYkvWKCX0FShAcEwt9icJARTHGEgs6/8M=";



  nativeBuildInputs = [

    intltool