3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

2691 commits

Author SHA1 Message Date
Tuomas Tynkkynen e2c6740c37 Merge commit 'adaee73' from staging into master
This one was already merged into release-16.09, so let's not have the
stable branch is ahead of master and confuse things. In addition to
that, currently we have an odd situation that master has less things
actually finished building than in staging.

Conflicts:
	pkgs/data/documentation/man-pages/default.nix
2016-09-03 01:02:51 +03:00
Eelco Dolstra 452afd1ed6 ilmbase: Use separate outputs 2016-09-01 18:57:43 +02:00
Eelco Dolstra 8172cd734c docdev -> devdoc
It's "developer documentation", not "documentation developer" after
all.
2016-09-01 11:07:23 +02:00
Tuomas Tynkkynen fa1a1f527b gnome3: Use dev output of nss 2016-08-30 02:41:13 +03:00
Tuomas Tynkkynen dcf0e8ac48 kde5.plasma: Use 'dev' output of xf86inputsynaptics 2016-08-29 14:49:54 +03:00
Tuomas Tynkkynen a17216af4c treewide: Shuffle outputs
Make either 'bin' or 'out' the first output.
2016-08-29 14:49:51 +03:00
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
Thomas Tuegel 3616b52e20
kde5.startkde: initialize session variables before loading user env
The desktop session variables need to be initialized before loading the
user environment scripts so that these scripts can exec programs that
rely on the session variables. For example, these variables must be set
when gpg-agent is started or pinentry-qt will not respect the user's
theme settings.
2016-08-26 08:42:28 -05:00
Joachim F 0cbba7c673 Merge pull request #17941 from romildo/upd.efl
efl: 1.17.2 -> 1.18.0
2016-08-26 15:04:29 +02:00
Frederik Rietdijk 76927783e0 Merge pull request #18003 from peterhoeg/kdf
kdiskfree: init at 16.08.0
2016-08-26 12:40:42 +02:00
Peter Hoeg e459abe612 kdiskfree: init at 16.08.0 2016-08-26 14:36:45 +08:00
Franz Pletz e0bf3a111b
eog: 3.20.3 -> 3.20.4 (security)
Fixes CVE-2016-6855.
2016-08-25 23:30:33 +02:00
Thomas Tuegel 4dc1823e73
kde5.plasma: 5.7.3 -> 5.7.4 2016-08-25 10:07:03 -05:00
Thomas Tuegel f4bb247bd6
fetch-kde-qt.sh: modularize script allowing multiple versions 2016-08-25 10:07:03 -05:00
Graham Christensen 5f37b1f98b Merge pull request #17950 from myguidingstar/master
yelp: adding groff to build inputs for man pages
2016-08-25 07:05:37 -04:00
Hoàng Minh Thắng 93d8c3dea5 yelp: adding groff to build inputs for man pages 2016-08-25 16:09:21 +07:00
Thomas Tuegel b63d68ad83 kdelibs: remove setup hook
Fixes #17346.

The kdelibs setup hook unnecessarily propagates kdelibs into the system
environment, leading to KDE 4 services running in a KDE 5 session.
2016-08-24 09:47:13 -05: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
Thomas Tuegel be1406eb79 kde5.startkde: actually check that D-Bus is running 2016-08-23 12:00:16 -05:00
Thomas Tuegel 1df7279384 kde5.startkde: update from plasma-workspace-5.7.3
* Read the screen scale factor (for HiDPI displays) from KScreen
  correctly.
* Disable automaticy scale factor detection in Qt applications.
* Force font DPI at startup, if requested.
* Allow kded to invoke kbuildsycoca5 automatically.
2016-08-23 12:00:16 -05:00
José Romildo Malaquias adb0cf53e8 efl: remove elementary, evas and emotion, as they are integrated into efl-0.18.0 2016-08-23 11:50:45 -03:00
José Romildo Malaquias c7ce3b2d88 enlightenment: adapt for efl-0.18.0 2016-08-23 11:50:45 -03:00
José Romildo Malaquias 58a52f7e10 rage: 0.1.4 -> 0.2.0 2016-08-23 11:50:45 -03:00
José Romildo Malaquias b2222b1e91 econnman: adapt for efl-1.18.0 2016-08-23 11:50:44 -03:00
José Romildo Malaquias 193ded2d99 terminology: adapt for efl-1.18.0 2016-08-23 11:50:44 -03:00
José Romildo Malaquias 4480c4fa00 enlightenment: 0.21.1 -> 0.21.2 2016-08-23 11:50:44 -03:00
José Romildo Malaquias 198b0b5e4a efl: 1.17.2 -> 1.18.0 2016-08-23 11:50:44 -03: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 27bb66bd94 treewide: Make explicit that 'dev' output of gst_all_1.gst-plugins-base is used 2016-08-23 03:52:06 +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 2a6a324c8b pantheon-terminal: vala -> vala_0_23 2016-08-21 20:04:55 +03: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