Commit Graph

97 Commits

Author SHA1 Message Date
Robin Gloster
c92bca56f8 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-05-02 22:58:02 +00:00
Damien Cassou
25d18f400f Merge pull request #14916 from NicolasPetton/file-roller-nautilus-extension
file-roller: Enable nautilus extension
2016-04-23 18:42:06 +02:00
Nicolas Petton
2c0a0ce3c5
file-roller: Enable nautilus extension 2016-04-22 18:30:40 +02:00
Robin Gloster
d020caa5b2 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-04-18 13:49:22 +00:00
Robert Helgesson
374af78a27 tracker: 1.4.0 -> 1.8.0
Also replace use of `makeWrapper` by `wrapGAppsHook`.
2016-04-15 20:51:20 +02:00
Luca Bruno
e5d00a28dd Merge pull request #14724 from NicolasPetton/grilo-update
grilo: 0.2.12 -> 0.2.14, grilo-plugins: 0.2.13 -> 0.2.16
2016-04-15 18:40:46 +02:00
Damien Cassou
05a956cbad Merge pull request #14716 from NicolasPetton/gnome-shell-extension-tool-does-not-run
gnome-shell: add missing python3 deps for gnome-shell-extension-tool
2016-04-15 17:31:52 +02:00
Nicolas Petton
5b526e9012
grilo: 0.2.12 -> 0.2.14, grilo-plugins: 0.2.13 -> 0.2.16
Fix #14717

GNOME Music 3.18 requires a more recent version of the 0.2.x series of
Grilo and its plugins to work.
2016-04-15 17:30:42 +02:00
Nicolas Petton
567b83bc91
gnome-shell: add missing python3 deps for gnome-shell-extension-tool
Fix #14651
2016-04-15 15:49:12 +02:00
Luca Bruno
5c7131213e Merge pull request #14707 from NicolasPetton/gnome-maps-coredump
gnome-maps: Add missing gsettings schemas
2016-04-15 01:42:45 +02:00
Nicolas Petton
032e3e53d3 gnome-maps: Add missing build inputs
Without gnome3.gsettings_desktop_schemas and
gnome3.evolution_data_server as buildInputs, gnome-maps won't start at
all.
2016-04-14 23:39:49 +02:00
Nicolas Petton
cf7d79de2c
totem: Add missing python3 dependencies for plugins
libpeas: build with python3 support
2016-04-14 22:18:56 +02:00
Arseniy Seroka
9cfa2029de Merge pull request #14656 from DamienCassou/add-pidgin-gnome-extension
pidgin-im-gnome-shell-extension: init at 1.0
2016-04-14 14:28:37 +03:00
Damien Cassou
c62c897bf8 pidgin-im-gnome-shell-extension: init at 1.0 2016-04-13 14:30:00 +02:00
Vladimír Čunát
39ebb01d6e Merge branch 'staging', containing closure-size #7701 2016-04-13 09:25:28 +02:00
Nicolas Petton
f353f0de00 totem: build with gst-libav and gst-plugins-ugly 2016-04-10 19:06:37 +02:00
Vladimír Čunát
30f14243c3 Merge branch 'master' into closure-size
Comparison to master evaluations on Hydra:
  - 1255515 for nixos
  - 1255502 for nixpkgs
2016-04-10 11:17:52 +02:00
Robin Gloster
696d85a62d Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-04-03 11:01:57 +00:00
Luca Bruno
5e1de67abb Merge pull request #14370 from jgillich/patch-5
gnome-boxes: add qemu to PATH
2016-04-01 18:04:20 +02:00
Luca Bruno
0805920132 Merge pull request #14021 from Mayeu/patch-4
librest 0.7.92 -> 0.7.93
2016-04-01 17:58:35 +02:00
Jakob Gillich
00a794b960 gnome-boxes: add qemu to PATH 2016-04-01 17:02:41 +02:00
Vladimír Čunát
ab15a62c68 Merge branch 'master' into closure-size
Beware that stdenv doesn't build. It seems something more will be needed
than just resolution of merge conflicts.
2016-04-01 10:06:01 +02:00
Robin Gloster
f60c9df0ba Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-03-28 15:16:29 +00:00
Domen Kožar
3027abe927 libgda: 5.2.2 -> 5.2.4 (fix build)
(cherry picked from commit efc7b847e3)
Signed-off-by: Domen Kožar <domen@dev.si>
2016-03-27 21:42:56 +01:00
José Romildo Malaquias
c53a762b7e evince: add shared_mime_info dir to XDG_DATA_DIRS env variable 2016-03-26 11:02:33 -03:00
José Romildo Malaquias
5b642fb8db epiphany: refactor wrapping variables in binaries 2016-03-22 14:28:34 -03:00
José Romildo Malaquias
c326507dbe gedit: refactor wrapping variables in binaries 2016-03-22 14:27:19 -03:00
José Romildo Malaquias
5fe5a777e4 file-roller: refactor wrapping variables in binaries 2016-03-22 14:26:17 -03:00
José Romildo Malaquias
4fc7fa9d1d nautilus: refactor wrapping variables in binaries 2016-03-22 14:26:11 -03:00
José Romildo Malaquias
877a08b7d5 gnome-calculator: refactor wrapping variables in binaries 2016-03-22 14:23:27 -03:00
José Romildo Malaquias
e4d8d4d234 evince: refactor wrapping variables in binaries 2016-03-22 14:22:12 -03:00
José Romildo Malaquias
768b9d852d eog: refactor wrapping variables in binaries 2016-03-22 14:20:31 -03:00
José Romildo Malaquias
416f10528a dconf-editor: refactor wrapping variables in binaries 2016-03-22 13:31:41 -03:00
José Romildo Malaquias
fdc0edff3e gnome-terminal: refactor wrapping variables in binaries 2016-03-22 08:41:10 -03:00
Mayeu - Cast
9fa2ad9635 librest 0.7.92 -> 0.7.93 2016-03-18 17:16:37 +01:00
Thomas Tuegel
3ef7671cea ncurses: combine $lib and $out outputs
The $lib output refers to the terminfo database in $out, which is about
10x larger than the ncurses shared library. Splitting these outputs
saves a small amount of space for any derivations that use the terminfo
database but not the ncurses library, but we do not have evidence that
any such exist.
2016-03-08 11:35:24 -06:00
Vladimír Čunát
09af15654f Merge master into closure-size
The kde-5 stuff still didn't merge well.
I hand-fixed what I saw, but there may be more problems.
2016-03-08 09:58:19 +01:00
Franz Pletz
aff1f4ab94 Use general hardening flag toggle lists
The following parameters are now available:

  * hardeningDisable
    To disable specific hardening flags
  * hardeningEnable
    To enable specific hardening flags

Only the cc-wrapper supports this right now, but these may be reused by
other wrappers, builders or setup hooks.

cc-wrapper supports the following flags:

  * fortify
  * stackprotector
  * pie (disabled by default)
  * pic
  * strictoverflow
  * format
  * relro
  * bindnow
2016-03-05 18:55:26 +01:00
Robin Gloster
d47857c3d9 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-03-01 21:09:17 +00:00
Eelco Dolstra
02891a0de9 gnome: Drop installerIso from nix-env evaluation
This makes nix-env -qa depend on NixOS, which is not a good thing.

@lethalman
2016-03-01 22:05:23 +01:00
Luca Bruno
b2889efff2 devhelp: fix build with new webkitgtk 2016-03-01 12:50:41 +01:00
Luca Bruno
55c20bfe89 Merge pull request #10288 from lethalman/gnomeiso
installer: add graphical GNOME iso
2016-02-29 15:56:47 +01:00
Luca Bruno
aa9576bceb installer: add graphical GNOME iso 2016-02-29 15:51:38 +01:00
Robin Gloster
3477e662e6 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-02-27 00:08:08 +00:00
Charles Strahan
ce7aa71880 vte-ng: 0.42.1.a -> 0.42.4.a 2016-02-26 00:48:39 -05:00
Robin Gloster
4036e9ba8c Merge branch 'up' into hardened-stdenv 2016-02-20 22:27:33 +00:00
Jascha Geerds
78c99d8f4e Merge pull request #13133 from spacefrogg/evince-xps-support
gnome3.evince: Add XPS file support
2016-02-20 19:12:19 +01:00
Robin Gloster
bc21db3692 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-02-19 21:16:14 +00:00
Michael Raitza
58cbe7d068 gnome3.evince: Add XPS file support
XPS support is optional via supportXPS argument and turned off by
default.
2016-02-19 20:15:19 +01:00
Michael Raitza
6d6a7881ef gnome3.libgxps: Fix dependency propagation bug
Packages that want to use libgxps also need libarchive, thus it is moved
to propagatedBuildInputs.
2016-02-19 20:11:28 +01:00