colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
623,236 Commits 124 Branches 0 Tags 3.3 GiB
wip-ffado-cross
Commit Graph

308 Commits

Author SHA1 Message Date
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
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
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
Jan Tojnar
373bdced7f
gnome2.GConf: 2.32.4 → 3.2.6 
Update and clean up the expression. For example, GTK was only used for
removed utility and examples.
 2018-07-10 12:14:40 +02:00
Vincent Laporte
0b1823ff84 gnome2.gtksourceview: fix build on darwin (#41353) 2018-06-01 20:56:40 +02:00
Jan Tojnar
89c20aa46c
gnome2.vte: fix patch url 2018-05-29 10:57:50 +02:00
Jan Tojnar
86270fc19e
gnome2.gtksourceview: fix patch url 2018-05-29 10:34:17 +02:00
John Ericson
ddbe9191ef Merge remote-tracking branch 'upstream/master' into staging 
Keep the dontCheck because the test suite fails, get rid of the LDFLAGS
hack because we don't need it!
 2018-05-16 15:16:08 -04:00
Matthew Bauer
c605d171bb treewide: remove lintl references 
libintl should be used directly, not through NIX_LDFLAGS.
 2018-05-16 01:02:31 -05:00
Matthew Bauer
6748534d83 Merge remote-tracking branch 'upstream/master' into staging 2018-05-08 09:36:00 -05:00
Matthew Justin Bauer
4f1f7c4655
libgweather: fixup assertion error 2018-05-03 18:05:04 -05:00
John Ericson
cf06e42d1c Merge remote-tracking branch 'upstream/master' into staging 2018-05-03 16:35:36 -04:00
Matthew Bauer
143978a477 treewide: remove platform assertions 
linux: readd assertion
 2018-05-03 13:09:20 -05:00
Matthew Justin Bauer
eeb016e8f0
Merge branch 'staging' into fix-ncurses-darwin-extensions 2018-05-02 15:40:38 -05:00
Jan Tojnar
0dec4fa1db
rarian: merge gnome{2,3}.rarian 2018-04-25 15:53:26 +02:00
Jan Malakhovski
7438083a4d tree-wide: disable doCheck and doInstallCheck where it fails (the trivial part) 2018-04-25 04:18:46 +00:00
Jan Tojnar
d4f97d5fed
gnome2.gtkglext: patch deprecated symbols 2018-04-15 17:21:23 +02:00
Jan Tojnar
3bea518b36
gnome2.gtkglext: fix build with glibc ≥ 2.27 2018-04-15 17:21:22 +02:00
Matthew Justin Bauer
75616ceb49
Merge pull request #37840 from matthewbauer/unixtools 
Cross-platform "unixtools"
 2018-03-27 18:43:03 -05:00
Michael Raskin
762e2388d7
Merge pull request #37775 from vbgl/gtksourceview-2-darwin 
gnome2.gtksourceview: fix build on Darwin
 2018-03-25 18:05:30 +00:00
Vincent Laporte
ef4a5e2fc0
gnome2.gtksourceview: fix build on Darwin 2018-03-25 16:50:59 +00:00
Matthew Bauer
ed2a9cf65f treewide: remove libintl hacks 2018-03-22 16:50:11 -05:00
Corey O'Connor
4b625fd25a gnome2.gnome-control-center: Add docbook_xml_dtd_412 to prevent build from attempting to reference DTD from network and failing. 2018-03-14 12:08:06 -07:00
Corey O'Connor
a31b2ca00f gnome2.zenity: Add docbook_xml_dtd_412 to prevent build from attempting to reference DTD from network and failing. 2018-03-14 11:36:03 -07:00
Vladimír Čunát
565bd805e6
Merge branch 'master' 2018-03-05 14:53:27 +01:00
Robin Gloster
e43dd6f164
gnome2.gnome-session: remove 2018-03-02 11:56:45 +01:00
Jan Tojnar
a31d98f312
tree-wide: autorename gnome packages to use dashes 2018-02-25 17:41:16 +01:00
Alexander V. Nikolaev
0acec7e984 treewide: transition mesa to libGLU_combined 2018-02-24 17:06:49 +02:00
Jan Tojnar
224853d4dc
libcanberra: init without gtk 2017-12-17 02:54:24 +01:00
Andreas Rammhold
4c6f7ee729
gnome2.vte: fix CVE-2012-2738 2017-12-09 12:25:04 +01:00
Jan Tojnar
f15f06c901
gnome2.libglademm: split out devdoc output 2017-11-24 02:13:57 +01:00
Orivej Desh
fda26c8476 Merge branch 'master' into staging 
* master: (271 commits)
  pysmbc: clarify license
  pysmbc: fix license
  bazel: 0.5.4 -> 0.6.0 (#29990)
  googler: init at 3.3
  go: declare support for aarch64
  firefox-beta-bin: 56.0b5 -> 57.0b4
  spotify: 1.0.64.401.g9d720389-21 -> 1.0.64.407.g9bd02c2d-26
  gogs: 0.11.19 -> 0.11.29
  grafana: 4.5.1 -> 4.5.2
  mopidy-iris: 3.4.1 -> 3.4.9
  nextcloud: 12.0.2 -> 12.0.3
  haskell-json-autotype: jailbreak to fix build within LTS 9.x
  kore: fix up
  kore: init at 2.0.0
  glusterfs service: fix issues with useRpcbind
  tig: 2.2.2 -> 2.3.0
  haskell-hspec-core: enable test suite again
  hackage-packages.nix: automatic Haskell package set update
  librsvg: fix thumbnailer path
  awscli: 1.11.108 -> 1.11.162
  ...
 2017-10-02 00:22:12 +00:00
John Ericson
f037625f87 Merge remote-tracking branch 'upstream/staging' into deps-reorg 2017-09-28 12:32:57 -04:00
Jan Tojnar
13649ee12f
libgnomeui: fix compatibility with GLib 
Picked from #29392, like the parent commit.
 2017-09-28 12:17:27 +02:00
Vladimír Čunát
f1e6c43d45
gnome2.glibgnome: fixup build with updated glib 2017-09-28 12:00:22 +02:00
Eelco Dolstra
8ccce8de89 Add more dev outputs 2017-09-25 19:52:10 +02:00
John Ericson
7c73ff4e92 gnome-vfs: Recategorize dependencies 2017-09-21 15:49:55 -04:00
John Ericson
ed14223f8c treewide: Manual fix more pkg-config build-inputs 2017-09-21 15:49:54 -04:00
John Ericson
531e4b80c9 misc pkgs: Basic sed to get fix pkgconfig and autoreconfHook buildInputs 
Only acts on one-line dependency lists.
 2017-09-21 15:49:53 -04:00
Samuel Leathers
2aa8bc45d3 gnome2.gtkhtml4: init at 4.10.0 2017-09-04 08:23:52 -04:00
Frederik Rietdijk
62dac1bdd9 Merge remote-tracking branch 'upstream/master' into HEAD 2017-08-14 09:34:10 +02:00
Tuomas Tynkkynen
1ff422aa23 treewide: Add man & info outputs where necessary (instead of doc) 
Because man & info pages won't be going to $doc after the next commit.
Scripted change for the files having one-package-per-file.
 2017-08-11 21:32:54 +03:00
mimadrid
09e0cc7cc7
Update homepage attributes: http -> https 
Homepage link "http://.../" is a permanent redirect to "https://.../" and should be updated
https://repology.org/repository/nix_stable/problems
 2017-08-03 11:56:15 +02:00
Silvan Mosberger
f5fa5fa4d6 pkgs: refactor needless quoting of homepage meta attribute (#27809) 
* pkgs: refactor needless quoting of homepage meta attribute

A lot of packages are needlessly quoting the homepage meta attribute
(about 1400, 22%), this commit refactors all of those instances.

* pkgs: Fixing some links that were wrongfully unquoted in the previous
commit

* Fixed some instances
 2017-08-01 22:03:30 +02:00
Dan Peebles
90b9719f4f treewide: fix the remaining issues with meta attributes 2017-04-29 04:24:34 +00:00
Tuomas Tynkkynen
8dce538640 gtkglextmm: Mark as broken 
No release since 2010. Build broken. Sounds like a library, but no
users. GNOME 2 stuff.

http://hydra.nixos.org/build/49554500/nixlog/3
 2017-03-08 20:15:36 +02:00
Eelco Dolstra
5a84059c61
gnome-vfs: Drop unused Samba dependency 
It does not appear in the runtime closure so let's ditch it.
 2017-02-07 20:23:42 +01:00
Johannes Bornhold
f025d2c189 gtksourceview: Add gtk-mac-integration for darwin 
Had to pick two commits as patches from the repository which update the
dependency ige-mac-integration to gtk-mac-integration.
 2017-01-07 19:21:43 +01:00
Nikolay Amiantov
c041743598 gnome2.gnome_python_desktop: init from gnome2.python_rsvg 2016-12-22 01:35:11 +03:00
Nikolay Amiantov
c22b243b3b gnome2.gnome_python: use standard build system 2016-12-22 01:35:10 +03:00
Dejan Lukan
6295d387d0 mail-notification: remove unneeded patches, fix die, fix license 2016-12-04 22:25:09 +01:00
Dejan Lukan
d78b890178 mail-notification: init at 5.4 2016-12-02 11:47:35 +01:00
Frederik Rietdijk
948a3b7eb6 vte: do not use top-level python packages 2016-09-25 23:19:26 +02:00
Frederik Rietdijk
e1619caf9b python-rsvg: do not use top-level python packages 2016-09-25 23:19:17 +02:00
Kirill Boltaev
0f37287df5 treewide: explicitly specify gtk version 2016-09-13 21:09:24 +03:00
Kirill Boltaev
bccd75094f treewide: explicitly specify gtk and related package versions 2016-09-12 18:26:06 +03:00
Kirill Boltaev
241fa7fa26 gnome2.gnome_settings_daemon: add libSM to fix build 2016-09-12 03:10:21 +03:00
Kirill Boltaev
e3033d87b3 gnome2.gnome_control_center: add libSM to fix build 2016-09-12 02:50:38 +03:00
Kirill Boltaev
605ddb1047 gnome2.gnome_session: mark as broken 2016-09-12 02:50:38 +03:00
Kirill Boltaev
8b96b391db gnome2.at_spi: disable hardening to fix build 2016-09-12 02:50:38 +03:00
Tuomas Tynkkynen
8f023eb129 gnome2.gnome_panel: Fix build 2016-09-05 18:56:04 +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
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
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
Franz Pletz
f8d481754c
Merge remote-tracking branch 'origin/master' into hardened-stdenv 2016-05-18 17:10:02 +02:00
Robin Gloster
c92bca56f8 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-05-02 22:58:02 +00:00
Thomas Tuegel
b6bd3ea805 libgnomecanvas: multiple outputs 2016-04-30 12:20:11 -05:00
Thomas Tuegel
79c9949d38 libgnome: multiple outputs 2016-04-30 12:20:11 -05:00
Thomas Tuegel
ce367a7a9b libglade: multiple outputs 2016-04-30 12:20:11 -05:00
Thomas Tuegel
c9e929bbbd libbonobo: multiple outputs 2016-04-30 12:20:10 -05:00
Thomas Tuegel
1b57ef0baa gnome-vfs: multiple outputs 2016-04-30 12:20:10 -05:00
Thomas Tuegel
a15fa4533c GConf: multiple outputs 2016-04-30 12:20:10 -05:00
Thomas Tuegel
f67be47333 ORBit2: multiple outputs 2016-04-30 12:20:08 -05:00
Vladimír Čunát
9445bb25fc gtksourceview-2: update 2.9.9 -> 2.10.5 
It doesn't seem to help with mousepad problems #14862,
but it shouldn't hurt.
 2016-04-21 12:20:10 +02:00
Robin Gloster
d020caa5b2 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-04-18 13:49:22 +00:00
obadz
16e2dd9a72 gnome-panel: add dependency on xorg.(libice|libsm) 
Fixes gtk-sharp, gnome-sharp & dependencies...
 2016-04-15 22:31:02 +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
Vladimír Čunát
d039c87984 Merge branch 'master' into closure-size 2016-02-14 08:33:51 +01:00
Robin Gloster
9229e9c656 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-02-07 11:17:57 +00:00
Nikolay Amiantov
2b989f9d73 gtkglext: propagate pangox-compat dependency 2016-02-06 05:18:40 +03:00
Robin Gloster
f6d3b7a2ae switch hardening flags 2016-01-30 16:36:57 +00:00
Franz Pletz
954e9903ad Use a hardened stdenv by default 2016-01-30 16:36:57 +00:00
Vladimír Čunát
333d69a5f0 Merge staging into closure-size 
The most complex problems were from dealing with switches reverted in
the meantime (gcc5, gmp6, ncurses6).
It's likely that darwin is (still) broken nontrivially.
 2015-11-20 14:32:58 +01:00
Vladimír Čunát
783c40eb68 dbus: split into multiple outputs and fix referrers 2015-10-13 20:19:01 +02:00
Luca Bruno
3c45ef3627 gnome-common: fix derivation name for the patch 2015-10-05 15:17:53 +02:00
Vladimír Čunát
88c9f8b574 xlibs: replace occurrences by xorg 
This seems to have been confusing people, using both xlibs and xorg, etc.
- Avoided renaming local (and different) xlibs binding in gcc*.
- Fixed cases where both xorg and xlibs were used.
Hopefully everything still works as before.
 2015-09-15 12:54:34 +02:00
Vladimír Čunát
0c74f18e4c xlibs.xlibs: remove 
It was really ugly that `xlibs.xlibs` meant something else than `xlibs`,
especially when using `with xlibs`, such as in wine.
Also, now `xlibs` is the same as `xorg`.
 2015-09-15 11:59:33 +02:00
Jim Garrison
7a2c69c785 vte (gtk2): apply change-scroll-region.patch (close #9688) 
More info (including upstream fix):
cb07c67478/index.html (L754-L773)
Patch from: https://bug542087.bugzilla-attachments.gnome.org/attachment.cgi?id=176035
 2015-09-07 10:56:16 +02:00
William A. Kennington III
aaef42ab8c Merge branch 'master.upstream' into staging.upstream 2015-07-29 10:23:08 -07:00
Vladimír Čunát
7c36b4611d gnome3.adwaita-icon-theme: remove empty dir tree 
Also similar for old gnome2 icon theme.
/cc maintainer @lethalman.
 2015-07-28 17:05:07 +02:00
Eelco Dolstra
a951f11021 Move some more gtk-docs to the doc output 2015-07-26 13:43:49 +02:00
Bjørn Forsman
903183d9e4 gtkglextmm: unbreak build 
* Add missing build inputs: pangox_compat, libXmu
* Add patch from debian to fix build with newer gtk
 2015-06-14 19:53:01 +02:00
William A. Kennington III
b07929b0a3 Use libpulseaudio instead of pulseaudio 2015-05-29 14:32:56 -07:00
koral
e52afb24da gconf: removed heavy dependency on gtk by default. 2015-05-02 07:37:50 +00:00
Ryan Mulligan
93f1029b0f Get rid of fetchurlGnome 
closes #1707
 2015-04-04 22:22:12 -07:00
aszlig
764f428ede
libgnomecups: Add CUPS >= 1.6 compatibility patch. 
Patch is from Gentoo at:

http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/net-print/libgnomecups/files/libgnomecups-0.2.3-cups-1.6.patch

Fixes the following Hydra build failure:

http://hydra.cryp.to/build/250133/nixlog/5/raw

Thanks to @peti for the notification.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2014-11-23 18:20:09 +01:00
Domen Kožar
ca1d7dea55 fix scrollkeeper build 2014-10-28 11:36:44 +01:00
Ivan Brkanac
841f45b231 added darwin ass supported platform for meld, added get text as requirement for scroollkeeper 2014-09-09 15:21:04 +02:00
Damien Cassou
9a26b38ad3 Make sure gnome-python has gnomevfs binding 2014-08-30 15:56:22 +02:00
Domen Kožar
e93eb33058 gtkglext: cleanup 2014-08-23 11:46:54 +02:00
Mateusz Kowalczyk
7a45996233 Turn some license strings into lib.licenses values 2014-07-28 11:31:14 +02:00
Wout Mertens
8e7fded9c9 vte: store patch in repo, source offline 2014-06-30 16:10:50 +02:00
Peter Simons
ca9f7f47ec libgnome: add libogg some more 2014-06-20 18:51:32 +02:00
Peter Simons
9c1a803019 libgnome: fix build by adding missing libogg 2014-06-20 18:40:14 +02:00
Eelco Dolstra
46b77d3bb4 fetchurl_gnome -> fetchurlGnome 2014-05-08 15:30:17 +02:00
Eelco Dolstra
2ca913c509 Add some packages to the channel 2014-04-28 18:34:23 +02:00
Vladimír Čunát
fbc8424cc2 libstartup_notification: remove duplicate in gnome2 2014-04-19 13:59:18 +02:00
Vladimír Čunát
d39d5cbc16 gnome2.vte: fix CVE-2012-2738 (just DOS) 2014-02-05 20:25:21 +01:00
Vladimír Čunát
a2c316288c Merge master into stdenv-updates 
Conflicts:
	pkgs/development/lisp-modules/stumpwm/default.nix (auto-solved)
	pkgs/top-level/all-packages.nix (trivial)
 2014-01-12 12:29:24 +01:00
Domen Kožar
d33e5eadd0 Add gnome3.nautilus and remove gnome2.nautilus (didn't compile) 
Some icons are still missing (and theme), didn't find a way to fix that.
 2014-01-10 01:45:34 +01:00
Vladimír Čunát
72478f1c8e gnome2.libgnomeprint: fix build by using bison2 2014-01-05 11:03:30 +01:00
Shea Levy
4af1c79c06 Remove uses of __overrides feature 
In addition to replacing use of a feature with IMO confusing semantics,
this will also let us cleanly separate out all-packages.nix into
category-specific files without changing the structure of the pkgs
attrset.

Signed-off-by: Shea Levy <shea@shealevy.com>
 2013-12-30 11:04:45 -05:00
Vladimír Čunát
4c5a71f777 Merge master into x-updates 
Conflicts:
	pkgs/desktops/gnome-2/desktop/gvfs/default.nix
	pkgs/development/libraries/cogl/default.nix
	pkgs/development/libraries/libsoup/2.44.nix
 2013-12-18 23:21:29 +01:00
Nixpkgs Monitor
68e201b41c gnome.libgnomeprintui: update from 2.18.4 to 2.18.6 2013-12-18 18:18:29 +02:00
Nixpkgs Monitor
3b3e7e8f25 gnome.gvfs: update from 1.14.1 to 1.14.2 2013-12-11 09:47:45 +02:00
Vladimír Čunát
747e757500 libunique: fix build, make the package unique 
The one in gnome2 was failing to build,
but all there is likely in a desolate state anyway.

In gmpc it also seemed without any reason to have a duplicate.
 2013-11-17 22:26:49 +01:00
Vladimír Čunát
4aa1dff1d6 gvfs: major update 1.14.2 -> 1.18.3, unify to one 
There were several files defining gvfs, now use one common.
Also delete long-unused forgotten xfce file.
 2013-11-17 20:20:13 +01:00
Marc Weber
4a96c8cf6a gnome-autogen.sh: make check_m4macros aware of ACLOCAL_PATH 2013-11-01 10:32:24 +01:00
Eelco Dolstra
9db68de9e6 polkit, pulseaudio: Drop some Linux-specific dependencies 2013-10-06 00:21:28 +02:00
Eelco Dolstra
fca11ef500 Fix evaluation errors 2013-10-01 13:12:45 +02:00
Peter Simons
75c5fc541d pkgs/desktops/gnome-2/desktop/libgweather: remove dubious assertion 
Fix assertion failure from http://hydra.nixos.org/build/5985506/nixlog/1/raw
for some suitable definition of "fixing". Let's see what happens now.
 2013-09-15 21:36:18 +02:00
Jason \"Don\" O'Conal
2a73189a9c deluge: fix build on darwin (close #930) 2013-09-14 15:26:48 +02:00
Vladimír Čunát
2fda1165da Merge branch 'master' into x-updates 2013-08-28 10:37:41 +02:00
Matej Cotman
93c4fd2855 vte: patch for alt key (close #858) 
Edit (vcunat): bump to latest version supporting gtk2.
 2013-08-25 19:08:59 +02:00
Vladimír Čunát
c1e62e7e91 Merge branch 'master' into x-updates 2013-08-22 19:29:09 +02:00
Ludovic Courtès
2e937c437a unmaintain several packages 2013-08-16 23:45:01 +02:00
Vladimír Čunát
72a8019334 introspection disabling -- clutter-gtk, NM-applet, gnome_panel 
Didn't build as it was, and not needed anywhere AFAIK.
 2013-08-06 09:27:34 +02:00
Evgeny Egorochkin
da4be371e9 make package use mirror:// for gnu, savannah and gnome repositories where possible 2013-07-14 05:23:06 +03:00
Evgeny Egorochkin
fb07ba725b libgnomeprintui: fix version to match tarball 2013-07-14 02:08:50 +03:00
Jason "Don" O'Conal
a42133a102 gnome.GConf: fix build on darwin 
* disable polkit
* add --enable-static to configureFlags
 2013-07-04 00:21:46 +10:00
Jason "Don" O'Conal
6307798b45 gnome.ORBit2: fix build on darwin 
* add libintlOrEmpty to build inputs
 2013-07-03 22:03:47 +10:00
Domen Kozar
35431a7d7b libgnomeprint: build on linux 2013-06-18 22:50:15 +02:00
Vladimír Čunát
60ff4d0c7a python_rsvg: couldn't find gtk, fixed now 2013-04-18 10:04:56 +02:00
Vladimír Čunát
469d098083 gnome2.libgnome: fix for new glib (my own patch) 2013-04-17 19:01:28 +02:00
Vladimír Čunát
6bd036d5f9 non-linux attempts to fix: libbonobo and libjpeg 2013-04-14 14:06:10 +02:00
Vladimír Čunát
f4f8857284 gnome_vfs: fix build by disabling fatality of deprecations 2013-04-13 23:59:24 +02:00
Marc Weber
88a8330d44 make ORBit2 build again by disabling deprecation warnings for linc2, the commit introducing it didn't show any strong reason 2013-04-08 14:50:10 +02:00
Vladimír Čunát
86639d9bb9 Merge branch 'master' into x-updates 
Conflicts (taken master versions):
	pkgs/desktops/xfce-4.8/core/libxfcegui4.nix
	pkgs/desktops/xfce/applications/gigolo.nix
	pkgs/desktops/xfce/applications/mousepad.nix
	pkgs/desktops/xfce/applications/ristretto.nix
	pkgs/desktops/xfce/applications/terminal.nix
	pkgs/desktops/xfce/applications/xfce4-mixer.nix
	pkgs/desktops/xfce/applications/xfce4-notifyd.nix
	pkgs/desktops/xfce/applications/xfce4-taskmanager.nix
	pkgs/desktops/xfce/art/xfce4-icon-theme.nix
	pkgs/desktops/xfce/core/exo.nix
	pkgs/desktops/xfce/core/garcon.nix
	pkgs/desktops/xfce/core/gtk-xfce-engine.nix
	pkgs/desktops/xfce/core/libxfce4ui.nix
	pkgs/desktops/xfce/core/libxfce4util.nix
	pkgs/desktops/xfce/core/libxfcegui4.nix
	pkgs/desktops/xfce/core/thunar-volman.nix
	pkgs/desktops/xfce/core/thunar.nix
	pkgs/desktops/xfce/core/tumbler.nix
	pkgs/desktops/xfce/core/xfce4-appfinder.nix
	pkgs/desktops/xfce/core/xfce4-panel.nix
	pkgs/desktops/xfce/core/xfce4-power-manager.nix
	pkgs/desktops/xfce/core/xfce4-session.nix
	pkgs/desktops/xfce/core/xfce4-settings.nix
	pkgs/desktops/xfce/core/xfconf.nix
	pkgs/desktops/xfce/core/xfdesktop.nix
	pkgs/desktops/xfce/core/xfwm4.nix
	pkgs/desktops/xfce/panel-plugins/xfce4-cpufreq-plugin.nix
	pkgs/development/libraries/webkit/default.nix
	pkgs/top-level/all-packages.nix
 2013-03-09 17:55:37 +01:00
Peter Simons
5f32207dfc Merge remote-tracking branch 'origin/master' into stdenv-updates. 2013-02-24 19:27:08 +01:00
Vladimír Čunát
787b150089 gnome2.libart_lgpl: update 2013-02-21 21:51:09 +01:00
Vladimír Čunát
0d72174dbd Merge branch stdenv-updates into x-updates 
x-updates is supposed to merge after stdenv-updates, so let's test it

Conflicts:
	pkgs/development/libraries/gtk+/2.x.nix (both updated, taking newer)
	pkgs/development/libraries/mesa/default.nix (taking nativeBuildInputs)
 2013-02-21 12:43:00 +01:00
Vladimír Čunát
f536aa7e7a Merge pull request #293 from vcunat/vlada/intltool 
unify intltool
 2013-02-14 12:29:29 -08:00
Vladimír Čunát
94cc7c5c83 gtkglext: fix by using pangox_compat 2013-02-02 14:39:21 +01:00
Vladimír Čunát
38ee738b8a unify intltool 
IMHO:
	- It's no longer GNOME package.
	- It seems best for everyone to use the newest version.
 2013-01-31 16:43:52 +01:00
Eelco Dolstra
ab3eeabfed Rename buildNativeInputs -> nativeBuildInputs 
Likewise for propagatedBuildNativeInputs, etc.  "buildNativeInputs"
sounds like an imperative rather than a noun phrase.
 2012-12-28 19:20:09 +01:00
Cillian de Róiste
d900c86302 Add python-rsvg 
this is required by solfrege, key-mon, and probably many more gtk applications
 2012-11-11 18:11:37 +01:00
Cillian de Róiste
60898eb064 Copy bonobo defs 
python-rsvg will fail to build if if can't find the bonobo defs files
 2012-11-11 18:03:35 +01:00
Eelco Dolstra
1d8e80f1b9 Fix gvfs build 
http://hydra.nixos.org/build/3156351
 2012-10-15 12:13:39 -04:00