Commit Graph

3146 Commits

Author SHA1 Message Date
Frederik Rietdijk
740d76371e Merge commit 'ba68231273bea4cba01413fd2a0e56d68db9234c' into HEAD 2017-07-31 09:12:15 +02:00
Thomas Tuegel
346bc1fbf5
Merge commit 'refs/pull/27491/head' of github.com:NixOS/nixpkgs into feature/plasma-5.10.4 2017-07-29 14:34:23 -05:00
John Ericson
f6f40e3fe5 stdenv-setup and misc pkgs: Revert to space-deliminated propagated-* files
We cannot switch to line-delimited yet, because certain Nix commands do
not read in the entire file, but just the first line.
2017-07-26 09:07:55 -04:00
John Ericson
b087618ac0 Revert "stdenv: Store one package per line in nix-support/propagated-*"
As @oxij points out in [1], this breakage is especially serious because
it changes the contents of built environments without a corresonding
change in their hashes. Also, the revert is easier than I thought.

This reverts commit 3cb745d5a6.

[1]: https://github.com/NixOS/nixpkgs/pull/27427#issuecomment-317293040
2017-07-24 01:05:30 -04:00
adisbladis
176c15a06e
plasma5: 5.10.3 -> 5.10.4 2017-07-19 12:36:52 +08:00
vbgl
c17ddcd40c Merge pull request #25412 from romildo/fix.efl
{terminology,ephoto,rage,econnman}: wrap libcurl.so in LD_LIBRARY_PATH
2017-07-18 21:30:38 +02:00
Robin Gloster
adb178c0e5
gnomeExtensions.topicons-plus: fix version string
It has to start with a digit.
2017-07-18 18:43:47 +02:00
Robin Gloster
46ead28a58
gnome3.gexiv2: 0.10.4 -> 0.10.6 2017-07-18 00:05:50 +02:00
Vladimír Čunát
efe66e221f
evince: patch CVE-2017-1000083 + minor changes
This removes help for now but fixes #27388.
The minor update might be related to the patch so it's included.
2017-07-15 10:07:45 +02:00
Domen Kožar
0eb4f6fd25
Merge commit 'a889454869e4f7d5ba6067ebcc0ba7fcd26e4417'
Merge staging. It includes fixes for cc-wrapper parsing speed and
some other minor things.

http://hydra.nixos.org/eval/1375094
2017-07-14 11:55:41 +02:00
Robin Gloster
d518096abc
gnome3.gnome_control_center: remove unused variable
This broke the evaluation.
2017-07-13 15:50:48 +02:00
Stefan Lau
2b4bc03969 gnome-online-accounts: wrap with wrapGAppsHook 2017-07-13 15:05:07 +02:00
Stefan Lau
8ff35d6adf gnome-control-center: wrap with wrapGAppsHook 2017-07-13 15:05:07 +02:00
Jörg Thalheim
451b23beb2 Merge pull request #27297 from jtojnar/fix/ghex
ghex: init at 3.18.3
2017-07-11 18:43:10 +01:00
Jan Tojnar
bf60fbe2e1
ghex: init at 3.18.3 2017-07-11 10:05:06 +02:00
John Ericson
3cb745d5a6 stdenv: Store one package per line in nix-support/propagated-*
This makes those files a bit easier to read. Also, for what it's worth,
it brings us one baby step closer to handling spaces in store paths.

Also, I optimized handling of many transitive deps with read. Probably,
not very beneficial, but nice to enforce the pkg-per-line structure.
Doing so let me find much dubious code and fix it.

Two misc notes:

 - `propagated-user-env-packages` also needed to be adjusted as
   sometimes it is copied to/from the propagated input files.

 - `local fd` should ensure that file descriptors aren't clobbered
   during recursion.
2017-07-10 13:32:13 -04:00
Emanuele Peruffo
240b632026 gnomeExtensions.topicons-plus: init at v20 (#27116)
TopIcons extension for Gnome 3
2017-07-04 17:56:06 +01:00
Emanuele Peruffo
0b1c8793fc gnomeExtensions.caffeine: init at revision unstable-2017-06-21 (#26901)
Caffeine extension for Gnome 3
2017-07-03 08:35:31 +01:00
romildo
c5ff68b3c2 lumina: 1.2.0-p1 -> 1.3.0
- Update to version 1.3.0

- Remove dependency on `oxygen-icons5`, as Lumina desktop now distributes
it’s own "material-design-[light/dark]" icon themes and uses them as the
default icon sets.
2017-06-29 08:13:09 -03:00
Aristid Breitkreuz
fe2e3cea51 gnome-control-center: add missing dependency on cracklib 2017-06-28 21:43:15 +02:00
Frederik Rietdijk
8a62a9b064 Merge pull request #26125 from volth/webkitgtk-naming
rename webkitgtk24x⇒webkitgtk24x-gtk3; webkitgtk2⇒webkitgtk24x-gtk2
2017-06-28 13:54:38 +02:00
Thomas Tuegel
074bccb43b
plasma5: 5.10.2 -> 5.10.3
This is a scheduled bugfix release. Several fixes are related to integrating
Plasma 5.10 and Qt 5.9, particularly a serious bug in KWin.
2017-06-27 06:58:34 -05:00
Bjørn Forsman
6916f24e84 treewide: enableParallelBuild -> enableParallelBuilding 2017-06-24 22:22:48 +02:00
Thomas Tuegel
69438a397f
khotkeys: fix intermittant parallel build failure 2017-06-24 15:18:58 -05:00
Thomas Tuegel
0d1a1a4954
plasma-workspace: no propagatedBuildInputs
Only libraries may have propagatedBuildInputs.
2017-06-23 09:55:04 -05:00
Thomas Tuegel
0030c66103
kdeFrameworks, plasma5: fix setup hooks
The setup hooks for many kdeFrameworks and plasma5 packages were erroneously
running before $outputDev was set. This lead to .dev outputs being propagated
into the user environment.
2017-06-22 17:46:44 -05:00
Franz Pletz
76de6e4f39
libcroco: 0.6.11 -> 0.6.12 2017-06-20 07:47:52 +02:00
Peter Hoeg
9193bcb6b4 kde-applications: 17.04.1 -> 17.04.2
use https as the remote server expects it
2017-06-19 19:26:52 +08:00
Peter Hoeg
359aff876c plasma-workspace: requires libXtst 2017-06-19 10:37:39 +08:00
Peter Hoeg
f151daaa67 plasma: 5.9.5 -> 5.10.2 2017-06-19 10:37:39 +08:00
Thomas Tuegel
d9094c087e
libkscreen: use QLatin1String instead of QStringLiteral
QStringLiteral stores strings in UTF-16 format, preventing Nix from detecting
dependencies.
2017-06-18 08:44:46 -05:00
Thomas Tuegel
8538d75734
plasma5: fixup inputs and outputs 2017-06-18 08:44:45 -05:00
Thomas Tuegel
7f95d4834f
kwin: pass path to Xwayland through preprocessor macro 2017-06-18 08:44:45 -05:00
Thomas Tuegel
a4be1a68f8
plasma-desktop: pass path to hwclock through preprocessor macro 2017-06-18 08:44:45 -05:00
Thomas Tuegel
faf0d3e91d
kdeFrameworks: fixup inputs and outputs
- Reduce environment pollution with a separate $bin output containing programs,
  plugins, and shared data. Libraries remain in $out and are not installed into
  the environment.
- Only propagate build inputs as required.
2017-06-18 08:44:45 -05:00
Thomas Tuegel
30ff56a20f
breeze-gtk: patch builder to find GTK2 pixmap engine
This does not seem to be strictly necessary, but it also cannot hurt.
2017-06-18 08:44:43 -05:00
Thomas Tuegel
da942ea23f
breeze-gtk: bump GTK3 version 2017-06-18 08:44:43 -05:00
Thomas Tuegel
078c88a7a7
startkde: use absolute paths to required programs
The dependency on socat is removed because kwallet setup is deferred to kwallet-pam.
2017-06-18 08:44:43 -05:00
Thomas Tuegel
b9ae0c7185
kwallet-pam: set path to socat 2017-06-18 08:44:43 -05:00
Thomas Tuegel
c816bbc8a8
qt5: remove makeQtWrapper 2017-06-18 08:44:42 -05:00
Thomas Tuegel
be7b7d908f
Remove kdeWrapper 2017-06-18 08:43:39 -05:00
Thomas Tuegel
eaa644a5af
plasma5: rename plasmaPackage to mkDerivation 2017-06-18 08:42:20 -05:00
Thomas Tuegel
7b6f8dc77f
qt5: move kdeDerivation to qt5.mkDerivation 2017-06-18 08:42:19 -05:00
Thomas Tuegel
210f688802
qt5: rename qmakeHook to qmake 2017-06-18 08:41:57 -05:00
Thomas Tuegel
3f3d33a078
qt5: use distinct lib/qt-5.x prefix for each minor version
Using a distinct prefix for plugins and QML libraries allows multiple Qt 5 minor
versions to coexist in the same environment.
2017-06-18 08:41:57 -05:00
armijnhemel
73744e700c atril: init at 1.19.0 (#25765) 2017-06-18 11:39:59 +02:00
Vladimír Čunát
5ad7d3106e
kde4.kdepimlibs: fixup build by using older cmake
I have no idea why, but apparently the last cmake update caused:
  kdepimlibs-4.14.3/akonadi/tests/../pastehelper.cpp:343:27:
    fatal error: pastehelper.moc: No such file or directory
2017-06-13 14:27:44 +02:00
volth
26abdb81c8 xfce4-dockbarx-plugin: fix unwrapped python scripts 2017-06-10 10:44:23 +01:00
Jörg Thalheim
cea91a426b Merge pull request #26401 from volth/xfce4-namebar-plugin
xfce4_namebar_plugin: init at 0.3.1
2017-06-10 10:40:56 +01:00
romildo
11623c5fca lxappearance: add variant for Gtk+-3
lxappearance supports both Gtk+-2 and Gtk+-3. The current `lxappearance'
package continues to be for Gtk+-2. Add `lxappearance-gtk3' for Gtk+-3.

A patch is needed in order to look for themes in system data dirs with
Gtk+-3.
2017-06-09 18:05:09 -03:00