Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 71a7fbf613a0
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 0732c3993bb5
Choose a head ref
  • 2 commits
  • 28 files changed
  • 2 contributors

Commits on May 20, 2019

  1. xfce4-13: 4.13.x -> 4.14pre1

    volth committed May 20, 2019
    Copy the full SHA
    dd61fdf View commit details

Commits on Jun 25, 2019

  1. Merge pull request #61772 from volth/xfce-4.14pre1

    xfce4-13: 4.13.x -> 4.14pre1
    lukateras authored Jun 25, 2019
    Copy the full SHA
    0732c39 View commit details
Showing with 82 additions and 185 deletions.
  1. +5 −4 pkgs/desktops/xfce4-13/exo/default.nix
  2. +0 −37 pkgs/desktops/xfce4-13/garcon/12700.patch
  3. +0 −75 pkgs/desktops/xfce4-13/garcon/13785.patch
  4. +5 −5 pkgs/desktops/xfce4-13/garcon/default.nix
  5. +5 −4 pkgs/desktops/xfce4-13/gigolo/default.nix
  6. +3 −2 pkgs/desktops/xfce4-13/libxfce4ui/default.nix
  7. +3 −2 pkgs/desktops/xfce4-13/libxfce4util/default.nix
  8. +2 −2 pkgs/desktops/xfce4-13/parole/default.nix
  9. +2 −2 pkgs/desktops/xfce4-13/ristretto/default.nix
  10. +3 −2 pkgs/desktops/xfce4-13/thunar-volman/default.nix
  11. +3 −2 pkgs/desktops/xfce4-13/thunar/default.nix
  12. +3 −2 pkgs/desktops/xfce4-13/tumbler/default.nix
  13. +3 −2 pkgs/desktops/xfce4-13/xfce4-appfinder/default.nix
  14. +2 −2 pkgs/desktops/xfce4-13/xfce4-battery-plugin/default.nix
  15. +2 −2 pkgs/desktops/xfce4-13/xfce4-clipman-plugin/default.nix
  16. +2 −2 pkgs/desktops/xfce4-13/xfce4-cpufreq-plugin/default.nix
  17. +2 −2 pkgs/desktops/xfce4-13/xfce4-dict/default.nix
  18. +2 −2 pkgs/desktops/xfce4-13/xfce4-notifyd/default.nix
  19. +3 −2 pkgs/desktops/xfce4-13/xfce4-panel/default.nix
  20. +3 −2 pkgs/desktops/xfce4-13/xfce4-power-manager/default.nix
  21. +2 −2 pkgs/desktops/xfce4-13/xfce4-screenshooter/default.nix
  22. +3 −2 pkgs/desktops/xfce4-13/xfce4-session/default.nix
  23. +3 −2 pkgs/desktops/xfce4-13/xfce4-settings/default.nix
  24. +5 −11 pkgs/desktops/xfce4-13/xfce4-taskmanager/default.nix
  25. +2 −2 pkgs/desktops/xfce4-13/xfce4-whiskermenu-plugin/default.nix
  26. +3 −2 pkgs/desktops/xfce4-13/xfconf/default.nix
  27. +3 −2 pkgs/desktops/xfce4-13/xfdesktop/default.nix
  28. +8 −7 pkgs/desktops/xfce4-13/xfwm4/default.nix
9 changes: 5 additions & 4 deletions pkgs/desktops/xfce4-13/exo/default.nix
Original file line number Diff line number Diff line change
@@ -1,15 +1,16 @@
{ mkXfceDerivation, docbook_xsl, libxslt, perlPackages, gtk2, gtk3
{ mkXfceDerivation, docbook_xsl, libxslt, perlPackages, gtk3
, libxfce4ui, libxfce4util }:

mkXfceDerivation rec {
category = "xfce";
pname = "exo";
version = "0.12.2";
version = "4.14pre1";
rev = "xfce-4.14pre1";

sha256 = "1b4hl9yxvf8b8akqf2zngq3m93yqnqcmxqqds1dwzm9vm5sqydgh";
sha256 = "1gf9fb48nkafb4jj0hmm2s00mpl32dp5iqxfaxm5i1nc6884hipw";

nativeBuildInputs = [ libxslt perlPackages.URI ];
buildInputs = [ gtk2 gtk3 libxfce4ui libxfce4util ];
buildInputs = [ gtk3 libxfce4ui libxfce4util ];

postPatch = ''
substituteInPlace docs/reference/Makefile.am \
37 changes: 0 additions & 37 deletions pkgs/desktops/xfce4-13/garcon/12700.patch

This file was deleted.

75 changes: 0 additions & 75 deletions pkgs/desktops/xfce4-13/garcon/13785.patch

This file was deleted.

10 changes: 5 additions & 5 deletions pkgs/desktops/xfce4-13/garcon/default.nix
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
{ mkXfceDerivation, gtk2 ? null, gtk3, libxfce4ui, libxfce4util }:
{ mkXfceDerivation, gtk3, libxfce4ui, libxfce4util }:

mkXfceDerivation rec {
category = "xfce";
pname = "garcon";
version = "0.6.1";
version = "4.14pre1";
rev = "xfce-4.14pre1";

sha256 = "19k8bwn29x7hkg882pxv5xxmrbfagdqgkxg166pwz2k0prab6hl8";
sha256 = "0gmvi6m3iww7m3xxx5wiqd8vsi18igzhcpjfzknfc8z741vc38yj";

patches = [ ./12700.patch ./13785.patch ];
buildInputs = [ gtk2 gtk3 libxfce4ui libxfce4util ];
buildInputs = [ gtk3 libxfce4ui libxfce4util ];
}
9 changes: 5 additions & 4 deletions pkgs/desktops/xfce4-13/gigolo/default.nix
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
{ mkXfceDerivation, gtk2, libX11 }:
{ mkXfceDerivation, exo, gtk3 }:

mkXfceDerivation rec {
category = "apps";
pname = "gigolo";
version = "0.4.2";
version = "0.4.91";

sha256 = "0qd2jkf3zsvfyd9jn8bfnljja1xfj3ph4wjh3fx10dcwcd791al1";
sha256 = "1r075hw1jxbpv7jxzyqgfmd2rsw1lykd7snnx736gm55v84k15i7";

buildInputs = [ gtk2 libX11 ];
nativeBuildInputs = [ exo ];
buildInputs = [ gtk3 ];
}
5 changes: 3 additions & 2 deletions pkgs/desktops/xfce4-13/libxfce4ui/default.nix
Original file line number Diff line number Diff line change
@@ -4,9 +4,10 @@
mkXfceDerivation rec {
category = "xfce";
pname = "libxfce4ui";
version = "4.13.4";
version = "4.14pre1";
rev = "xfce-4.14pre1";

sha256 = "0m9h3kvkk2nx8pxxmsg9sjnyp6ajwjrz9djjxxvranjsdw3ilydy";
sha256 = "0z4sadqwp71b3qmxlbms26d8vnxd9cks84mr2f1qaiww6rp7v69y";

buildInputs = [ gobject-introspection gtk2 gtk3 libstartup_notification xfconf ];
propagatedBuildInputs = [ libxfce4util libICE libSM ];
5 changes: 3 additions & 2 deletions pkgs/desktops/xfce4-13/libxfce4util/default.nix
Original file line number Diff line number Diff line change
@@ -3,9 +3,10 @@
mkXfceDerivation rec {
category = "xfce";
pname = "libxfce4util";
version = "4.13.2";
version = "4.14pre1";
rev = "xfce-4.14pre1";

sha256 = "0sb6pzhmh0qzfdhixj1ard56zi68318k86z3a1h3f2fhqy7gyf98";
sha256 = "13cqv4b34rmr9h7nr9gmk3x2mi2y0v91xzwrwhikd1lmz9ir5lkf";

buildInputs = [ gobject-introspection ];

4 changes: 2 additions & 2 deletions pkgs/desktops/xfce4-13/parole/default.nix
Original file line number Diff line number Diff line change
@@ -8,9 +8,9 @@
mkXfceDerivation rec {
category = "apps";
pname = "parole";
version = "1.0.1";
version = "1.0.2";

sha256 = "0zq1imbjqmwfk3yrsha2s7lclzbh8xgggz0rbksa51siqk73swbb";
sha256 = "11i20pvbrcf1jbn77skb1cg72jdmdd0jvmf5khfn91slqky8gcbl";

postPatch = ''
substituteInPlace src/plugins/mpris2/Makefile.am \
4 changes: 2 additions & 2 deletions pkgs/desktops/xfce4-13/ristretto/default.nix
Original file line number Diff line number Diff line change
@@ -4,7 +4,7 @@
mkXfceDerivation rec {
category = "apps";
pname = "ristretto";
version = "0.8.3";
version = "0.8.4";

postPatch = ''
automakeAddFlags src/Makefile.am ristretto_CFLAGS DBUS_GLIB_CFLAGS
@@ -14,5 +14,5 @@ mkXfceDerivation rec {
nativeBuildInputs = [ automakeAddFlags exo ];
buildInputs = [ dbus-glib gtk2 libexif libxfce4ui libxfce4util xfconf ];

sha256 = "02i61ddzpv0qjwahkksnzla57zdmkywyg1qrqs57z4bzj6l4nmkx";
sha256 = "0vnivwl0xwhzpflys9zwds6x9gqd3v069qn04afmakhi2m8qr6hf";
}
5 changes: 3 additions & 2 deletions pkgs/desktops/xfce4-13/thunar-volman/default.nix
Original file line number Diff line number Diff line change
@@ -3,9 +3,10 @@
mkXfceDerivation rec {
category = "xfce";
pname = "thunar-volman";
version = "0.9.0";
version = "4.14pre1";
rev = "xfce-4.14pre1";

buildInputs = [ exo gtk3 libgudev libxfce4ui libxfce4util xfconf ];

sha256 = "08aqbp3i0z6frj7z3laz9nj641iakrcr7vh2dxb057ky24gj61i7";
sha256 = "1g784yjhjacjnkhr8m62xyhnxlfbwk0fwb366p9kkz035k51idrv";
}
5 changes: 3 additions & 2 deletions pkgs/desktops/xfce4-13/thunar/default.nix
Original file line number Diff line number Diff line change
@@ -4,9 +4,10 @@
mkXfceDerivation rec {
category = "xfce";
pname = "thunar";
version = "1.8.1";
version = "4.14pre1";
rev = "xfce-4.14pre1";

sha256 = "00n5iinhg3xgzj2rcy7zl6g9449i59x2l09cnlkhyrjzghb4k5ha";
sha256 = "13l1nw526jz80p0ynhxqd3a8flp561z0321z7h4rvnidicvdr32n";

postPatch = ''
substituteInPlace docs/Makefile.am \
5 changes: 3 additions & 2 deletions pkgs/desktops/xfce4-13/tumbler/default.nix
Original file line number Diff line number Diff line change
@@ -6,9 +6,10 @@
mkXfceDerivation rec {
category = "xfce";
pname = "tumbler";
version = "0.2.3";
version = "4.14pre1";
rev = "xfce-4.14pre1";

sha256 = "1gb4dav6q9bn64c2ayi4896cr79lb8k63ja2sm3lwsjxgg1r4hw9";
sha256 = "1bvcxqs3391dkf36gpfr0hbylsk84nqhv6kf3lf1hq6p7s9f9z3z";

buildInputs = [ gdk_pixbuf ffmpegthumbnailer libgsf poppler ];
}
5 changes: 3 additions & 2 deletions pkgs/desktops/xfce4-13/xfce4-appfinder/default.nix
Original file line number Diff line number Diff line change
@@ -3,9 +3,10 @@
mkXfceDerivation rec {
category = "xfce";
pname = "xfce4-appfinder";
version = "4.13.0";
version = "4.14pre1";
rev = "xfce-4.14pre1";

sha256 = "13xsshzw04gx5rhalx4r0khjb0dbq26fv6n20biyiai1ykznyryy";
sha256 = "02ds3s7wbpxka7qnliq4c5p428ricdf0jwv01dkfg88gpgqgvswg";

nativeBuildInputs = [ exo ];
buildInputs = [ garcon gtk3 libxfce4ui libxfce4util xfconf ];
4 changes: 2 additions & 2 deletions pkgs/desktops/xfce4-13/xfce4-battery-plugin/default.nix
Original file line number Diff line number Diff line change
@@ -3,9 +3,9 @@
mkXfceDerivation rec {
category = "panel-plugins";
pname = "xfce4-battery-plugin";
version = "1.1.0";
version = "1.1.2";
rev = version;
sha256 = "0mz0lj3wjrsj9n4wcqrvv08430g38nkjbdimxdy8316n6bqgngfn";
sha256 = "0329miiclc8da6j0sz495p99hyrf9fjhvpmdl0556fphybz5agc0";

buildInputs = [ gtk3 libxfce4ui libxfce4util xfce4-panel xfconf ];
}
4 changes: 2 additions & 2 deletions pkgs/desktops/xfce4-13/xfce4-clipman-plugin/default.nix
Original file line number Diff line number Diff line change
@@ -3,9 +3,9 @@
mkXfceDerivation rec {
category = "panel-plugins";
pname = "xfce4-clipman-plugin";
version = "1.4.2";
version = "1.4.3";
rev = version;
sha256 = "1c2h1cs7pycf1rhpirmvb0l0dfvlacb7xgm31q9rxmhihnycd2na";
sha256 = "1xk79xh1zk0x4r1z9m1dakp79pip0zh3naviybvl1dnpwwfc03gq";

buildInputs = [ exo gtk3 libXtst libxfce4ui libxfce4util xfce4-panel xfconf ];
}
4 changes: 2 additions & 2 deletions pkgs/desktops/xfce4-13/xfce4-cpufreq-plugin/default.nix
Original file line number Diff line number Diff line change
@@ -3,8 +3,8 @@
mkXfceDerivation rec {
category = "panel-plugins";
pname = "xfce4-cpufreq-plugin";
version = "1.2.0";
sha256 = "0zhs7b7py1njczmpnib4532fwpnd3vnpqfhss2r136cfgy72kp6g";
version = "1.2.1";
sha256 = "1p7c4g3yfc19ksdckxpzq1q35jvplh5g55299cvv0afhdb5l8zhv";

buildInputs = [ gtk3 libxfce4ui libxfce4util xfce4-panel xfconf ];
}
4 changes: 2 additions & 2 deletions pkgs/desktops/xfce4-13/xfce4-dict/default.nix
Original file line number Diff line number Diff line change
@@ -3,9 +3,9 @@
mkXfceDerivation rec {
category = "apps";
pname = "xfce4-dict";
version = "0.8.1";
version = "0.8.2";

sha256 = "0kxirzqmpp7qlr8220i8kipz4bgzkam7h1lpx7yzld5xf7wdzvaf";
sha256 = "1zbb0k0984ny7wy4gbk6ymkh87rbfakpim54yq4r3h5ymslx7iv7";

patches = [ ./configure-gio.patch ];

4 changes: 2 additions & 2 deletions pkgs/desktops/xfce4-13/xfce4-notifyd/default.nix
Original file line number Diff line number Diff line change
@@ -4,9 +4,9 @@
mkXfceDerivation rec {
category = "apps";
pname = "xfce4-notifyd";
version = "0.4.2";
version = "0.4.4";

sha256 = "1zxwzigrhms74crasbqpnzidmq2mnyxpmc9pqr4p4qj14yw4sam9";
sha256 = "1lmm9h3ych8dz9jpjkxg91f9ln14xs527nxjxsryks00kmqk4kai";

buildInputs = [ dbus-glib exo gtk3 libnotify libxfce4ui libxfce4util xfce4-panel xfconf ];
}
5 changes: 3 additions & 2 deletions pkgs/desktops/xfce4-13/xfce4-panel/default.nix
Original file line number Diff line number Diff line change
@@ -3,9 +3,10 @@
mkXfceDerivation rec {
category = "xfce";
pname = "xfce4-panel";
version = "4.13.4";
version = "4.14pre1";
rev = "xfce-4.14pre1";

sha256 = "13hnzh31d2b1331lnsbfaxg4fqhqa7hmdwkiqsl9hyr8pqimjb2g";
sha256 = "03jyglimm4wgpmg5a128fshrygzwmpf5wdw26l9azqj8b6iz55al";

nativeBuildInputs = [ makeWrapper ];
buildInputs = [ exo garcon gtk2 gtk3 libxfce4ui libxfce4util libwnck3 xfconf ];
5 changes: 3 additions & 2 deletions pkgs/desktops/xfce4-13/xfce4-power-manager/default.nix
Original file line number Diff line number Diff line change
@@ -4,9 +4,10 @@
mkXfceDerivation rec {
category = "xfce";
pname = "xfce4-power-manager";
version = "1.6.1";
version = "4.14pre1";
rev = "xfce-4.14pre1";

sha256 = "0b32m46v3dv1ln3xwlpqbnpflknm4gyfk2w6gn7xjx1k7igcjym3";
sha256 = "1n9i62jh5ldf8g9n64mm6nh1182abbf96444j14dppb82r94q077";

nativeBuildInputs = [ automakeAddFlags exo ];
buildInputs = [ gtk3 libnotify libxfce4ui libxfce4util upower xfconf ];
4 changes: 2 additions & 2 deletions pkgs/desktops/xfce4-13/xfce4-screenshooter/default.nix
Original file line number Diff line number Diff line change
@@ -3,9 +3,9 @@
mkXfceDerivation rec {
category = "apps";
pname = "xfce4-screenshooter";
version = "1.9.2";
version = "1.9.5";

sha256 = "1zl16xcmgrb1s6rsrn37mpl5w522i1i9s7x167xf2d092x333yx2";
sha256 = "1h14sywvk9l06p3z1cpb79911j8w2wqbk03ldknjkia2rfymjk06";

nativeBuildInputs = [ wrapGAppsHook ]; # fix "No GSettings schemas are installed on the system"
buildInputs = [ exo gtk3 libsoup libxfce4ui libxfce4util xfce4-panel glib-networking ];
5 changes: 3 additions & 2 deletions pkgs/desktops/xfce4-13/xfce4-session/default.nix
Original file line number Diff line number Diff line change
@@ -3,9 +3,10 @@
mkXfceDerivation rec {
category = "xfce";
pname = "xfce4-session";
version = "4.13.0";
version = "4.14pre1";
rev = "xfce-4.14pre1";

sha256 = "0d6h1kgqq6g084jrxx4jxw98h5g0vwsxqrvk0bmapyxh2sbrg07y";
sha256 = "14bn3wn5qrciy2nbhbx634bz0d6lnxb135bx1qglcf35wn6f0hqk";

buildInputs = [ exo dbus-glib dbus gtk3 libxfce4ui libxfce4util libwnck3 xfconf polkit iceauth ];

5 changes: 3 additions & 2 deletions pkgs/desktops/xfce4-13/xfce4-settings/default.nix
Original file line number Diff line number Diff line change
@@ -5,9 +5,10 @@
mkXfceDerivation rec {
category = "xfce";
pname = "xfce4-settings";
version = "4.13.4";
version = "4.14pre1";
rev = "xfce-4.14pre1";

sha256 = "0qnnpvcs2hpfq3n4byjwq343p95i9xw96rq7ym4md4mahnk176dy";
sha256 = "0q6jh3fqw9n9agp018xiwidrld445irnli5jgwpszi9hc435dbpc";

postPatch = ''
automakeAddFlags xfce4-settings-editor/Makefile.am xfce4_settings_editor_CFLAGS DBUS_GLIB_CFLAGS
Loading