Commit graph

869 commits

Author SHA1 Message Date
obadz 57ddc155fc Merge branch 'master' into staging
Conflicts:
	pkgs/games/scummvm/default.nix
2016-08-28 12:20:59 +01:00
Benjamin Herr dbae71570f gitg: use wrapGAppsHook, pull in dconf (#18040)
Without dconf, gitg doesn't remember preferences such as window size.
2016-08-28 07:55:51 +00:00
obadz 3de6e5be50 Merge branch 'master' into staging
Conflicts:
      pkgs/applications/misc/navit/default.nix
      pkgs/applications/networking/mailreaders/alpine/default.nix
      pkgs/applications/networking/mailreaders/realpine/default.nix
      pkgs/development/compilers/ghc/head.nix
      pkgs/development/libraries/openssl/default.nix
      pkgs/games/liquidwar/default.nix
      pkgs/games/spring/springlobby.nix
      pkgs/os-specific/linux/kernel/perf.nix
      pkgs/servers/sip/freeswitch/default.nix
      pkgs/tools/archivers/cromfs/default.nix
      pkgs/tools/graphics/plotutils/default.nix
2016-08-27 23:54:54 +01:00
Franz Pletz e0bf3a111b
eog: 3.20.3 -> 3.20.4 (security)
Fixes CVE-2016-6855.
2016-08-25 23:30:33 +02:00
Hoàng Minh Thắng 93d8c3dea5 yelp: adding groff to build inputs for man pages 2016-08-25 16:09:21 +07:00
obadz 0e8d2725dc Merge branch 'master' into staging 2016-08-23 18:50:06 +01:00
obadz c49f2a0854 gnome3.gnome-calculator: less hacky fix to #17912
Closes #17912
2016-08-23 18:16:34 +01:00
obadz 6581f53593 Revert "gnome-calculator: work around #17912, in a hacky way"
This reverts commit c255395219.
2016-08-23 18:16:34 +01:00
Tuomas Tynkkynen 01c197df68 glib: Add some FIXMEs about inappropriate outputs 2016-08-23 05:05:42 +03:00
Tuomas Tynkkynen d801e8a011 treewide: Fix output references to glib 2016-08-23 04:54:51 +03:00
Tuomas Tynkkynen fe0f39113e treewide: Fix output references to gtk3 2016-08-23 04:53:13 +03:00
Tuomas Tynkkynen 4db1657fa7 treewide: Make explicit that 'dev' output of glib is used 2016-08-23 04:32:21 +03:00
Tuomas Tynkkynen e9bf11b039 gnome-user-share: Fix apache paths 2016-08-23 04:32:21 +03:00
Tuomas Tynkkynen 911ccc4078 treewide: Make explicit that 'dev' output of poppler is used 2016-08-23 03:52:07 +03:00
Tuomas Tynkkynen 311900f019 treewide: Make explicit that 'dev' output of nspr (and glib) is used 2016-08-23 03:52:07 +03:00
Tuomas Tynkkynen d1031bff57 treewide: Make explicit that 'dev' output of gnome3.glib is used 2016-08-23 03:52:05 +03:00
Tuomas Tynkkynen 14f3be4cb0 treewide: Make explicit that 'dev' output of dbus_libs is used 2016-08-23 03:52:05 +03:00
Tuomas Tynkkynen fbb7d93148 treewide: Make explicit that 'dev' output of dbus_glib is used 2016-08-23 03:52:05 +03:00
Tuomas Tynkkynen f064bfe803 treewide: Use more makeLibraryPath 2016-08-23 02:56:12 +03:00
Tuomas Tynkkynen 74a3a2cd7e treewide: Use makeBinPath 2016-08-23 01:18:10 +03:00
Vladimír Čunát c255395219 gnome-calculator: work around #17912, in a hacky way 2016-08-22 23:49:41 +02:00
obadz 24a9183f90 Merge branch 'hardened-stdenv' into staging
Closes #12895

Amazing work by @globin & @fpletz getting hardened compiler flags by
enabled default on the whole package set
2016-08-22 01:19:35 +01:00
Ram Kromberg c5204e5374 pomodoro: vala -> vala_0_32 2016-08-21 20:02:15 +03:00
Ram Kromberg 168d8c6b1b libgit2-glib: vala -> vala_0_32 2016-08-21 20:02:14 +03:00
Ram Kromberg 16e9360a06 gpaste: vala -> vala_0_32 2016-08-21 20:02:14 +03:00
Ram Kromberg 7d210a49ad gitg: vala -> vala_0_32 2016-08-21 20:02:14 +03:00
Ram Kromberg 1da4a65fc4 geary: vala -> vala_0_32 2016-08-21 20:02:13 +03:00
Ram Kromberg b41fda2ab0 california: vala -> vala_0_32 2016-08-21 20:02:13 +03:00
Ram Kromberg be40f3236f vte: vala -> vala_0_32 2016-08-21 20:02:13 +03:00
Ram Kromberg b0d2458922 tracker: vala -> vala_0_32 2016-08-21 20:02:12 +03:00
Ram Kromberg 12c49722c9 libgee-1: vala -> vala_0_32 2016-08-21 20:02:12 +03:00
Ram Kromberg 60ed22ea80 libgee: vala -> vala_0_32 2016-08-21 20:02:12 +03:00
Ram Kromberg ff371cdf2a gnome-terminal: vala -> vala_0_32 2016-08-21 20:02:11 +03:00
Ram Kromberg 69c78f7c02 gnome-contacts: vala -> vala_0_32 2016-08-21 20:02:11 +03:00
Ram Kromberg a33d54d385 gcr: vala -> vala_0_32 2016-08-21 20:02:11 +03:00
Ram Kromberg 3960144641 folks: vala -> vala_0_32 2016-08-21 20:02:10 +03:00
Ram Kromberg 405a975373 evolution-data-server: vala -> vala_0_32 2016-08-21 20:02:10 +03:00
Ram Kromberg 9258c49c91 dconf: vala -> vala_0_32 2016-08-21 20:02:10 +03:00
Ram Kromberg 15a4042a44 dconf-editor: vala -> vala_0_32 2016-08-21 20:02:09 +03:00
Ram Kromberg b2a7774a0c baobab: vala -> vala_0_32 2016-08-21 20:02:09 +03:00
Ram Kromberg 0e02f67b7c seahorse: vala -> vala_0_32 2016-08-21 20:02:09 +03:00
Ram Kromberg 76119281a5 gnome-boxes: vala -> vala_0_32 2016-08-21 20:02:08 +03:00
Frederik Rietdijk 5a501bd828 Remove top-level dbus_python and pythonDBus.
See #11567.

Furthermore, it renames pythonPackages.dbus to pythonPackages.dbus-
python as that's the name upstream uses.

There is a small rebuild but I couldn't figure out the actual cause.
2016-08-16 22:52:37 +02:00
Frederik Rietdijk 6b23bd99a3 Remove top-level pyatspi
See #11567.
2016-08-16 22:52:37 +02:00
Robin Gloster 33e1c78ae3 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-08-16 07:54:01 +00:00
Robin Gloster 45d183614d gnome3.gnome_control_center: remove unneeded substituteInPlace 2016-08-14 22:55:21 +00:00
Robin Gloster f11f3b0519 gnome3.vte: remove unnecessary substituteInPlace
`substituteInPlace` was operating on a non-existant file.
2016-08-14 22:55:21 +00:00
Franz Pletz bd4490e277 Merge branch 'master' into hardened-stdenv 2016-08-13 16:59:55 +02:00
Damien Cassou eafdae9fd5 Merge pull request #17687 from DamienCassou/update-gnome3.20-packages-august
Update gnome3.20 packages august
2016-08-13 09:00:21 +02:00
Luca Bruno 7d110f46c7 Merge pull request #17546 from juliendehos/nemiver
nemiver: init at 0.9.6
2016-08-12 22:02:16 +01:00