Commit graph

4437 commits

Author SHA1 Message Date
Frederik Rietdijk b61b993b75 Merge master into staging 2018-08-26 12:10:05 +02:00
Jan Tojnar c429c9a8bb
Merge pull request #45571 from jtojnar/gconf-to-error
gnome3.gconf: re-add as a pointer to the removal PR
2018-08-26 01:20:36 +02:00
Jan Tojnar 9364a931e9
gnome3.quadrapassel: clean up 2018-08-26 01:18:31 +02:00
Jan Tojnar 6e2c115235
gnome3.gnome-desktop: use substituteAll for patch 2018-08-25 21:41:14 +02:00
Jan Tojnar 64ddf1de6d
xfce.xfce4-settings: remove unneeded dependency
https://bluesabre.org/2018/06/20/xfce-settings-4-12-4-and-4-13-4-released/
2018-08-25 21:41:13 +02:00
Jan Tojnar 1bd430e3d4
gnome3.gnome-keyring: clean up 2018-08-25 21:41:13 +02:00
Jan Tojnar 9f0eb759a4
gnome3.gconf: re-add as a pointer to the removal PR
https://github.com/NixOS/nixpkgs/pull/43268 removed GConf from GNOME 3
package set, let’s add an error for a little while to save people
digging through the commit log.
2018-08-25 20:41:34 +02:00
Jan Tojnar 5e3c1c2e32
gnome3.gnome-documents: 3.28.1 → 3.28.2 2018-08-25 15:57:25 +02:00
Jan Tojnar f3f6854033
gnome3.gnome-nibbles: 3.24.0 → 3.24.1 2018-08-25 15:57:24 +02:00
Jan Tojnar d6a6f9eb95
gnome3.caribou: fix on GNOME Flashback 2018-08-25 15:57:24 +02:00
Jan Tojnar 40535ced63
gnome3.vinagre: clean up 2018-08-25 15:57:24 +02:00
Jan Tojnar 05992b9b1b
gtk-vnc: rename from gtkvnc
Upstream uses gtk-vnc, let’s be consistent.
2018-08-25 15:57:23 +02:00
Jan Tojnar 21e9b85928
gnome3.tracker-miners: 2.0.5 → 2.1.1 2018-08-25 15:57:23 +02:00
Jan Tojnar c219d313dd
gnome3.tracker: 2.0.4 → 2.1.2 2018-08-25 15:57:23 +02:00
Jan Tojnar ede0b56cae
gnome3.libgnome-games-support: 1.4.1 → 1.4.2 2018-08-25 15:57:22 +02:00
Jan Tojnar 9c066735d5
gnome3.gnome-bluetooth: 3.28.1 → 3.28.2 2018-08-25 15:57:22 +02:00
Vladimír Čunát 2c1e736ae8
gnome3.libgda: build with gcc6 on aarch64
Fixes #45618.  I don't know what's the matter.
Feel free to come with a better fix.
2018-08-25 10:49:18 +02:00
Vladimír Čunát 153a19df05
Merge branch 'master' into staging-next
Hydra: ?compare=1474536
2018-08-20 09:15:33 +02:00
José Romildo Malaquias 7ad689f241 efl: 1.20.7 -> 1.21.0 (#45331) 2018-08-19 23:35:11 +02:00
R. RyanTM 2da80b118f mate.mate-themes: 3.22.17 -> 3.22.18 (#45185)
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/mate-themes/versions.
2018-08-19 22:52:08 +02:00
Vladimír Čunát 14aa936ec5
Merge branch 'staging-next' into staging 2018-08-17 20:53:27 +02:00
Vladimír Čunát 209730208a
Merge branch 'staging-next' 2018-08-17 20:51:31 +02:00
Vladimír Čunát cbabebcc2e
Merge branch 'master' into staging-next
Hydra: ?compare=1473892
2018-08-17 13:45:21 +02:00
Andreas Rammhold a4ded94f95
gnome3.gdm: 2.28.2 -> 2.28.3
Changes:
  - CVE-2018-14424 - double free fix
  - lifecycle fixes to libgdm/GdmClient
  - follow up fixes dealing with login screen reaping form last release
  - allow pam modules to use SIGUSR1
  - set PWD for user session
  - tell cirrus not to use wayland
  - Translation updates
2018-08-17 09:22:27 +02:00
Jan Tojnar 2f801195fc
gnome3.libgnome-games-support: propagate required dependencies 2018-08-14 22:02:20 +02:00
Jan Tojnar 5d62b6698a
gnome3.atomix: init at 3.29.3 2018-08-14 22:02:20 +02:00
Vladimír Čunát ded9a4b1aa
Merge branch 'staging-next' into staging
Commits from master, conflict resolutions, etc.
2018-08-13 20:57:50 +02:00
Vladimír Čunát 5b0398dc36
Merge branch 'master' into staging-next
Conflicts: gobby and libinfinity - I took the hand-edited versions
instead of those resuting from the mass-replacement.

Hydra: ?compare=1473190
2018-08-13 20:43:59 +02:00
R. RyanTM 1fd0792777 mate.mate-media: 1.20.1 -> 1.21.0 (#44745)
Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/mate-media/versions.
2018-08-13 14:23:47 +02:00
Vladimír Čunát 00df25ee57
Merge branch 'master' into staging-next
Hydra: ?compare=1472947
2018-08-12 10:33:41 +02:00
Jan Malakhovski 99974ea930 gnome3.gcr: make tests run, but disable 2018-08-11 09:35:34 +00:00
Jan Malakhovski 411ef0e0f9 gnome3.gnome-keyring: use checkInputs 2018-08-11 09:35:23 +00:00
Bastian Köcher cf88d4cd18 plasma5: 5.13.2 -> 5.13.4 (#44643) 2018-08-10 10:45:59 +02:00
Jan Tojnar 59186af889
Merge pull request #44803 from cdepillabout/add-correct-propagatedbuildinput-to-vte
add gtk3 as propagatedBuildInput to vte
2018-08-09 18:56:33 +02:00
Jan Tojnar c83e929b94
Merge pull request #44689 from jtojnar/gnome-cleanup
GNOME2 cleanup
2018-08-09 18:55:59 +02:00
Frederik Rietdijk d9fa74ba78 Merge master into staging 2018-08-09 18:28:15 +02:00
Jan Tojnar e4929b7c1a
gnome3: fix networkmanager gnome usage 2018-08-09 18:17:41 +02:00
Jan Tojnar aebb64f59f
gnome2.gnome-desktop: drop 2018-08-09 17:36:49 +02:00
Jan Tojnar ba4835dea8
gnome2.libgnomekbd: drop 2018-08-09 17:36:49 +02:00
Jan Tojnar f82f302743
gnome2.libgweather: drop 2018-08-09 17:36:49 +02:00
Jan Tojnar 0e68d11b86
gnome2.zenity: drop 2018-08-09 17:36:48 +02:00
Jan Tojnar 34aea495eb
gnome2.gnome_keyring: drop 2018-08-09 17:36:48 +02:00
Jan Tojnar 6b2a175c5e
gnome2.gnome_vfs_monikers: drop 2018-08-09 17:36:48 +02:00
Jan Tojnar d76754fe80
gnome2.at_spi: drop 2018-08-09 17:36:47 +02:00
Jan Tojnar 5d23756c7b
gnome2.gnome_menus: drop 2018-08-09 17:36:47 +02:00
Jan Tojnar 27a938b414
gnome2.metacity: drop 2018-08-09 17:36:47 +02:00
Jan Tojnar aab242e1c5
gnome3.gucharmap: clean up
Clean up package, split into multiple outputs, enable devdoc.
2018-08-09 17:36:46 +02:00
Jan Tojnar 31559eb969
gnome2.gnome-panel: drop 2018-08-09 17:36:46 +02:00
Jan Tojnar c3ce3714ac
gnome3.gnome-applets: init at 3.28.0 2018-08-09 17:36:45 +02:00
Jan Tojnar d293fca58a
gnome2.gnome-settings-daemon: drop 2018-08-09 17:36:44 +02:00
Jan Tojnar f27f4be540
gnome2.gnome-control-center: drop 2018-08-09 17:36:44 +02:00
Jan Tojnar ea286b0610
gnome3.gnome-flashback: init at 3.28.0 2018-08-09 17:36:44 +02:00
Jan Tojnar 64b5e0773b
gnome3.gnome-panel: init at 3.28.0 2018-08-09 17:36:43 +02:00
Jan Tojnar 46dcfd27c3
gnome3.metacity: init at 3.28.0 2018-08-09 17:36:43 +02:00
Jan Tojnar f48108e52a
gnome3.gnome-desktop: clean up 2018-08-09 17:36:43 +02:00
Jan Tojnar 0c9273509a
gnome3.gnome-terminal: clean up 2018-08-09 17:36:43 +02:00
(cdep)illabout 05c0c3f05c
vte: Change comment to talk about vte-2.91.pc file instead of .gir file. 2018-08-09 23:21:50 +09:00
Jörg Thalheim 337d6de450
Merge pull request #44791 from r-ryantm/auto-update/deepin-gtk-theme
deepin.deepin-gtk-theme: 17.10.6 -> 17.10.8
2018-08-09 07:29:21 +01:00
(cdep)illabout 8edc67c468
vte: Add gtk3 as propagatedBuildInput
The `Vte.2.91.gir` imports `Gtk.3.0.gir`.  So in order to use
`Vte.2.91.gir`, you must also have `Gtk.3.0.gir` on the GI_TYPELIB_PATH.
Adding gtk3 to the `propagatedBuildInputs` of vte accomplishes this.
2018-08-09 11:58:17 +09:00
R. RyanTM 300c0f8438 deepin.deepin-gtk-theme: 17.10.6 -> 17.10.8
Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/deepin-gtk-theme/versions.
2018-08-08 18:34:37 -07:00
Jan Tojnar 83a18e14d9
Merge pull request #39792 from Moredread/fwupd
WIP fwupd: 1.0.5 -> 1.1.0
2018-08-08 11:57:39 +02:00
Jan Tojnar 82bf0a2cd2
gnome3.gnome-software: enable fwupd 2018-08-07 23:25:22 +02:00
José Romildo Malaquias 1d60b5c99a mate-screensaver: 1.20.1 -> 1.21.0 (#44572) 2018-08-07 00:39:42 +02:00
Tuomas Tynkkynen 008fd5fcf5 Merge remote-tracking branch 'upstream/master' into staging 2018-08-04 15:17:42 +03:00
Jan Tojnar 880bc29d45
gnome3.gnome-todo: init at 3.28.1 2018-08-04 11:58:05 +02:00
John Ericson db965063b3 treewide: Make configureFlags lists 2018-08-03 17:06:03 -04:00
John Ericson 85a9913edd treewide: Make more complicated configureFlags lists 2018-08-03 17:06:03 -04:00
xeji f2f28654d5
Merge pull request #43778 from volth/xfce413-updates
xfce4-13: backport panel plugins and icon themes from xfce4-12
2018-08-03 21:26:07 +02:00
Jan Tojnar f735d6a38d
Merge pull request #43992 from jtojnar/upstream-sessions
Upstream sessions
2018-08-03 14:23:17 +02:00
volth e8cc4b76b2 xfce4-13.xfce4-panel: fix path to tzdata (#44350) 2018-08-02 14:08:44 +02:00
volth 66939ec363 xfce4-13: backport panel plugins from xfce4-12 2018-08-02 09:17:25 +00:00
volth cd794f4216 xfce4-13.xfce4-session: init at 4.13.0 (#44336) 2018-08-02 10:35:21 +02:00
volth 726d59b795 xfce4-13.xfce4-clipman-plugin: init at 1.4.2 (#44319) 2018-08-02 09:13:42 +02:00
volth 68fdf47135 xfce4-13.xfce4-xkb-plugin: init at 0.8.1 (#44320) 2018-08-02 09:12:42 +02:00
volth ee23bd7046 xfce4-13.xfce4-whiskermenu-plugin: init at 2.2.0 (#44317) 2018-08-01 22:48:21 +02:00
volth b129cd165a xfce4-13.xfce4-cpufreq-plugin: init at 1.2.0 (#44316) 2018-08-01 22:47:15 +02:00
volth 63c295caef xfce4-13.xfce4-netload-plugin: init at 1.3.1 (#44315) 2018-08-01 22:46:08 +02:00
volth 781428a849 xfce4-13.xfce4-pulseaudio-plugin: init at 0.4.1 (#44314) 2018-08-01 22:45:32 +02:00
Jan Tojnar adbe4e1c68
gnome3.gnome-session: use absolute paths
TryExec needs absolute path too, otherwise the desktop file will be ignored
unless gnome-session is in PATH, in which case, we would not need to patch
Exec.
2018-08-01 19:14:31 +02:00
Jan Tojnar f63d94eba3
gnome3.gpaste: hard-code paths
GPaste GNOME Shell extension uses GPaste library generated via introspection. Previously, we added the gpaste package to services.xserver.desktopManager.gnome3.sessionPath option, which
added its typelib directory to GI_TYPELIB_PATH environment variable globally, in order for GNOME Shell to be able to find it. This is not very Nix-y, though, so we have decided to patch the code to
append the path to the GI repository search path.

Additionally, the code relies on GPaste’s GSettings schemas, so we had to hard-code the paths to them as well. We ignored the GNOME Shell’s schemas, since they will already be available for the
extension inside GNOME Shell program.
2018-08-01 19:14:30 +02:00
Jan Tojnar cc6d77c83f
gnome3.gdm: add upstream xsession 2018-08-01 19:14:30 +02:00
Yarny0 bdf6f8528e plasma-nm: fix path to mobile broadband provider file (#44302)
When creating a new mobile broadband connection
with the plasma network manager connection editor,
it tries to find a file containing provider
information somewhere in /usr/share/... .
The build recipe contains a patch to fix the lookup path
such that it finds the file in the corresponding package,
probably added due to
https://github.com/NixOS/nixpkgs/issues/9389 .
The actual lookup path is injected into
the patch file with substituteAll.

With commit a31d98f312 ,
the variable name used in subsituteAll changed from
mobile_broadband_provider_info to mobile-broadband-provider-info
(underscores in package names turned into dashes).
Apparently, substituteAll can't handle dashes in variable names.
Consequently, the variable name was no longer resolved.
plasma-nm failed to create new mobile broadband connections;
the connection creator silently exited and logged the error
> plasma-nm: Error opening providers file "@mobile-broadband-provider-info@/share/mobile-broadband-provider-info/serviceproviders.xml"

This commit keeps the dashes in package names, but it
restores the underscores in the variable used by substituteAll,
thereby ensuring the variable gets resolved properly.
2018-08-01 15:23:28 +02:00
Jan Tojnar be066d0b27
Merge pull request #44278 from jtojnar/gnome-update
Gnome update
2018-08-01 14:38:45 +02:00
Jan Tojnar f91dd5a610
gnome3.totem: 3.28.1 → 3.28.2 2018-07-31 23:05:08 +02:00
Jan Tojnar c1c9119699
gnome3.mutter: 3.28.2 → 3.28.3 2018-07-31 23:03:40 +02:00
Jan Tojnar a0cecbf159
gnome3.grilo: 0.3.4 → 0.3.6 2018-07-31 23:03:23 +02:00
Jan Tojnar 11845d65cb
gnome3.grilo-plugins: 0.3.5 → 0.3.7 2018-07-31 23:03:09 +02:00
Jan Tojnar d15f2f0e0a
gnome3.gnome-shell: 3.28.2 → 3.28.3 2018-07-31 23:01:40 +02:00
Jan Tojnar c4f1123342
gnome3.gnome-bluetooth: 3.28.0 → 3.28.1 2018-07-31 23:01:24 +02:00
Jan Tojnar ca565a3015
evolution-data-server: 3.28.3 → 3.28.5 2018-07-31 23:01:02 +02:00
Jan Tojnar 5644addb3c
gnome3.eog: 3.28.2 → 3.28.3 2018-07-31 23:00:44 +02:00
Jan Tojnar 82482073d7
gnome3.polari: 3.28.0 → 3.28.1 2018-07-31 23:00:29 +02:00
Jan Tojnar 30e535a93f
gnome3.file-roller: 3.28.0 → 3.28.1 2018-07-31 23:00:17 +02:00
Jan Tojnar c5d8e70a42
gnome3.evolution: 3.28.3 → 3.28.5 2018-07-31 22:58:52 +02:00
xeji 315a47d249
Merge pull request #43927 from volth/xfce4-battery-plugin-1.1.0
xfce4-13.xfce4-battery-plugin: init at 1.1.0
2018-07-31 18:08:44 +02:00
Jan Tojnar e0d8c80f01
gnome3.devhelp: 3.28.1 → 3.30.0 2018-07-31 11:34:52 +02:00
R. RyanTM ca4ed1c3d2 mate.mate-control-center: 1.20.3 -> 1.21.0 (#43748)
Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/mate-control-center/versions.
2018-07-30 20:44:10 +02:00
xeji 2791900608
Merge pull request #40982 from romildo/upd.lxqt
lxqt: 0.12.0 -> 0.13.0
2018-07-29 20:43:38 +02:00
Thomas Tuegel 4ac6a8ba54
Merge pull request #44139 from bkchr/plasma_wayland
Plasma Wayland
2018-07-28 16:19:52 -05:00
Bastian Köcher 6e5d977b97 plasma-workspace: Improve the NixOS patch set
We changed some if condition that is not required to be changed.
2018-07-26 23:28:29 +02:00
Bastian Köcher af44ab8400 plasma.kwin: Adds libdrm depdency
Libdrm is required to enable the DRM backend that is used by Wayland.
2018-07-26 23:28:29 +02:00
José Romildo Malaquias 836b827226 lxqt: add update script 2018-07-26 15:22:05 -03:00
José Romildo Malaquias 507951e889 screengrab: 1.97 -> 1.98 2018-07-26 15:22:05 -03:00
José Romildo Malaquias ef6b6ce142 qps: 1.10.17 -> 1.10.18 2018-07-26 15:22:05 -03:00
José Romildo Malaquias 0fd1f4660c qterminal: 0.8.0 -> 0.9.0 2018-07-26 15:22:05 -03:00
José Romildo Malaquias c89832527c lximage-qt: 0.6.0 -> 0.7.0 2018-07-26 15:22:05 -03:00
José Romildo Malaquias ef42aa1f95 pcmanfm-qt: 0.12.0 -> 0.13.0 2018-07-26 15:22:05 -03:00
José Romildo Malaquias 386c75105c lxqt-sudo: 0.12.0 -> 0.13.0 2018-07-26 14:04:29 -03:00
José Romildo Malaquias b3b9322e9d lxqt-session: 0.12.0 -> 0.13.0 2018-07-26 14:04:29 -03:00
José Romildo Malaquias 48ad824bb3 lxqt-runner: 0.12.0 -> 0.13.0 2018-07-26 14:04:29 -03:00
José Romildo Malaquias 81c1f4be7a lxqt-powermanagement: 0.12.0 -> 0.13.0 2018-07-26 14:04:28 -03:00
José Romildo Malaquias 2067252410 lxqt-policykit: 0.12.0 -> 0.13.0 2018-07-26 14:04:28 -03:00
José Romildo Malaquias 3df3087164 lxqt-panel: 0.12.0 -> 0.13.0 2018-07-26 14:04:28 -03:00
José Romildo Malaquias a0fe2ed5ad lxqt-openssh-askpass: 0.12.0 -> 0.13.0 2018-07-26 14:04:28 -03:00
José Romildo Malaquias 5d04e45ca7 lxqt-notificationd: 0.12.0 -> 0.13.0 2018-07-26 14:04:28 -03:00
José Romildo Malaquias 874a1c6a3e lxqt-globalkeys: 0.12.0 -> 0.13.0 2018-07-26 14:04:28 -03:00
José Romildo Malaquias 3f3c179a55 lxqt-config: 0.12.0 -> 0.13.0 2018-07-26 14:04:28 -03:00
José Romildo Malaquias 4aed09d06a lxqt-admin: 0.12.0 -> 0.13.0 2018-07-26 14:04:28 -03:00
José Romildo Malaquias 89d0c54498 lxqt-about: 0.12.0 -> 0.13.0 2018-07-26 14:04:28 -03:00
José Romildo Malaquias 165a228117 liblxqt: 0.12.0 -> 0.13.0 2018-07-26 14:04:28 -03:00
José Romildo Malaquias 4de15eea4a libqtxdg: 3.1.0 -> 3.2.0 2018-07-26 14:04:27 -03:00
José Romildo Malaquias 8a32b379e2 lxqt: source moved to the lxqt organization in github 2018-07-26 14:04:27 -03:00
Tuomas Tynkkynen b619e0b016 gnome2.GConf: Add python2 dependency for gsettings-schema-convert
https://hydra.nixos.org/build/78312507
2018-07-25 11:23:55 +03:00
Frederik Rietdijk 099c13da1b Merge staging-next into master (#44009)
* substitute(): --subst-var was silently coercing to "" if the variable does not exist.

* libffi: simplify using `checkInputs`

* pythonPackges.hypothesis, pythonPackages.pytest: simpify dependency cycle fix

* utillinux: 2.32 -> 2.32.1

https://lkml.org/lkml/2018/7/16/532

* busybox: 1.29.0 -> 1.29.1

* bind: 9.12.1-P2 -> 9.12.2

https://ftp.isc.org/isc/bind9/9.12.2/RELEASE-NOTES-bind-9.12.2.html

* curl: 7.60.0 -> 7.61.0

* gvfs: make tests run, but disable

* ilmbase: disable tests on i686. Spooky!

* mdds: fix tests

* git: disable checks as tests are run in installcheck

* ruby: disable tests

* libcommuni: disable checks as tests are run in installcheck

* librdf: make tests run, but disable

* neon, neon_0_29: make tests run, but disable

* pciutils: 3.6.0 -> 3.6.1

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/pciutils/versions.

* mesa: more include fixes

mostly from void-linux (thanks!)

* npth: 1.5 -> 1.6

minor bump

* boost167: Add lockfree next_prior patch

* stdenv: cleanup darwin bootstrapping

Also gets rid of the full python and some of it's dependencies in the
stdenv build closure.

* Revert "pciutils: use standardized equivalent for canonicalize_file_name"

This reverts commit f8db20fb3a.
Patching should no longer be needed with 3.6.1.

* binutils-wrapper: Try to avoid adding unnecessary -L flags

(cherry picked from commit f3758258b8895508475caf83e92bfb236a27ceb9)
Signed-off-by: Domen Kožar <domen@dev.si>

* libffi: don't check on darwin

libffi usages in stdenv broken darwin. We need to disable doCheck for that case.

* "rm $out/share/icons/hicolor/icon-theme.cache" -> hicolor-icon-theme setup-hook

* python.pkgs.pytest: setupHook to prevent creation of .pytest-cache folder, fixes #40273

When `py.test` was run with a folder as argument, it would not only
search for tests in that folder, but also create a .pytest-cache folder.
Not only is this state we don't want, but it was also causing
collisions.

* parity-ui: fix after merge

* python.pkgs.pytest-flake8: disable test, fix build

* Revert "meson: 0.46.1 -> 0.47.0"

With meson 0.47.0 (or 0.47.1, or git)
things are very wrong re:rpath handling
resulting in at best missing libs but
even corrupt binaries :(.

When we run patchelf it masks the problem
by removing obviously busted paths.
Which is probably why this wasn't noticed immediately.

Unfortunately the binary already
has a long series of paths scribbled
in a space intended for a much smaller string;
in my testing it was something like
lengths were 67 with 300+ written to it.

I think we've reported the relevant issues upstream,
but unfortunately it appears our patches
are what introduces the overwrite/corruption
(by no longer being correct in what they assume)

This doesn't look so bad to fix but it's
not something I can spend more time on
at the moment.

--

Interestingly the overwritten string data
(because it is scribbled past the bounds)
remains in the binary and is why we're suddenly
seeing unexpected references in various builds
-- notably this is is the reason we're
seeing the "extra-utils" breakage
that entirely crippled NixOS on master
(and probably on staging before?).

Fixes #43650.

This reverts commit 305ac4dade.

(cherry picked from commit 273d68eff8f7b6cd4ebed3718e5078a0f43cb55d)
Signed-off-by: Domen Kožar <domen@dev.si>
2018-07-24 15:04:48 +01:00
Frederik Rietdijk 6c72782d36 Merge staging-next into master 2018-07-22 11:04:28 +02:00
volth cc55a3ebcb treewide: fix build with disallowed aliases (#43872)
fixes build with disallowed aliases
2018-07-21 22:03:24 -04:00
volth e87a1a5182 mkXfceDerivation: use hicolor-icon-theme's setup-hook 2018-07-21 21:07:49 +00:00
volth b07de4c7c2 xfce4-13.xfce4-battery-plugin: init at 1.1.0 2018-07-21 21:00:53 +00:00
Jan Tojnar 452017032a
fix Merge 8213ff161c
cc @FRidh
2018-07-21 20:20:36 +02:00
Frederik Rietdijk ad47d658d1 Merge master into staging-next 2018-07-21 19:43:53 +02:00
Jörg Thalheim 1399243081
Merge pull request #43776 from volth/xfce413-mousepad
xfce4-13.mousepad: 0.4.0 -> 0.4.1
2018-07-21 16:41:21 +01:00
Jörg Thalheim 218298b30f
Merge branch 'master' into unused5 2018-07-21 15:41:22 +01:00
Frederik Rietdijk 153d2241c1
Merge pull request #43749 from r-ryantm/auto-update/mate-panel
mate.mate-panel: 1.21.0 -> 1.21.1
2018-07-21 12:06:08 +02:00
volth 52f53c69ce pkgs/*: remove unreferenced function arguments 2018-07-21 02:48:04 +00:00
Frederik Rietdijk 8213ff161c Merge master into staging-next 2018-07-19 18:24:24 +02:00
Matthew Bauer 4ed7a4b993 treewide: preserve hashes from 76999cc40e
76999cc40e changed some hashes resulting in this PR being technically
a mass rebuild. To avoid this, I am restoring some of the hashes (even
though it seems silly). My main goal is to get this PR merged quickly
as treewide changes like this get out-of-date quickly.

This commit should be reverted on the next mass rebuild.
2018-07-19 00:09:01 -04:00
Matthew Bauer 76999cc40e treewide: remove aliases in nixpkgs
This makes the command ‘nix-env -qa -f. --arg config '{skipAliases =
true;}'’ work in Nixpkgs.

Misc...

- qtikz: use libsForQt5.callPackage

  This ensures we get the right poppler.

- rewrites:

  docbook5_xsl -> docbook_xsl_ns
  docbook_xml_xslt -> docbook_xsl

diffpdf: fixup
2018-07-18 23:25:20 -04:00
volth def83ddf4d xfce4-13.mousepad: 0.4.0 -> 0.4.1 2018-07-18 22:33:16 +00:00
volth a7e5927b47 xfce4-13.parole: 0.9.2 -> 1.0.1 (#43765) 2018-07-19 00:19:06 +02:00
volth 25b10dfaec xfce4-13.xfce4-dict: 0.8.0 -> 0.8.1 (#43764) 2018-07-19 00:14:36 +02:00
volth 4c58c20efc xfce4-13.xfce4-taskmanager: 1.2.0 -> 1.2.1 (#43763) 2018-07-18 23:58:36 +02:00
volth 022e9894d4 xfce4-13.xfwm4: fix build (add libXdamage dependency) (#43762) 2018-07-18 23:56:54 +02:00
volth d72d3b30ac xfce4-13.libxfce4util: 4.13.1 -> 4.13.2 (#43761) 2018-07-18 23:51:43 +02:00
volth d47b0ab019 xfce4-notifyd: 0.4.1 -> 0.4.2 (#43707) 2018-07-18 23:42:47 +02:00
volth e07ee596d6 xfconf: 4.13.4 -> 4.13.5 (#43703) 2018-07-18 23:42:28 +02:00
volth 58327eb214 xfce4-13.xfce4-volumed-pulse: 0.2.2 -> 0.2.3 (#43704) 2018-07-18 23:36:24 +02:00
volth 471c14b9d1 xfdesktop: 4.13.1 -> 4.13.2 (#43701) 2018-07-18 22:25:18 +02:00
volth 4884f58f4e tumbler: 0.2.0 -> 0.2.1 (#43699) 2018-07-18 21:22:24 +02:00
volth 061c7445ed xfce4-settings: 4.13.1 -> 4.13.4 (#43705) 2018-07-18 21:18:45 +02:00
volth 5e3d434a91 thunar: 1.7.0 -> 1.8.1 (#43698) 2018-07-18 21:15:50 +02:00