Commit graph

14208 commits

Author SHA1 Message Date
Eelco Dolstra 4437b6c49e * libdbusmenu-qt updated to 0.8.3.
svn path=/nixpkgs/branches/kde-4.7/; revision=27816
2011-07-18 11:57:18 +00:00
Eelco Dolstra 3c668adea1 * Pass Phonon as a dependency where needed.
svn path=/nixpkgs/branches/kde-4.7/; revision=27815
2011-07-18 10:29:20 +00:00
Eelco Dolstra c416926580 * Qt: remove Phonon since we can just use the external Phonon
package.  This also removes the GStreamer dependency because only
  Phonon uses it.

svn path=/nixpkgs/branches/kde-4.7/; revision=27814
2011-07-18 09:18:38 +00:00
Eelco Dolstra 9e92839468 * Fix incorrect path to kde4-config in startkde.
svn path=/nixpkgs/branches/kde-4.7/; revision=27812
2011-07-17 15:55:33 +00:00
Eelco Dolstra f3d8b47f22 * Add kde-wallpapers, which contains the default KDE and KDM
wallpaper.

svn path=/nixpkgs/branches/kde-4.7/; revision=27811
2011-07-17 14:24:43 +00:00
Eelco Dolstra e482393ad1 * Add kde-runtime. It requires a newer Phonon than provided by Qt, so
add that as well.  Maybe we should build Qt without Phonon to remove
  potential interference...

svn path=/nixpkgs/branches/kde-4.7/; revision=27810
2011-07-17 14:10:41 +00:00
Eelco Dolstra b6b4761dc6 * libcanberra updated to 0.28. Disabled the gstreamer backend by
default because there doesn't seem to be much point to it.

svn path=/nixpkgs/branches/kde-4.7/; revision=27809
2011-07-17 13:27:12 +00:00
Eelco Dolstra f4ac1126ff * Sync with the trunk.
svn path=/nixpkgs/branches/kde-4.7/; revision=27796
2011-07-15 10:02:22 +00:00
Eelco Dolstra e14c8876d1 * Udev updated to 172.
svn path=/nixpkgs/branches/kde-4.7/; revision=27795
2011-07-15 09:59:45 +00:00
Eelco Dolstra bc16ee83ae * The NixOS kdm.nix module expects a kdebase_workspace attribute.
svn path=/nixpkgs/branches/kde-4.7/; revision=27794
2011-07-15 09:50:37 +00:00
Peter Simons 48b86237e5 mod_fastcgi, mod_wsgi: these modules don't build on Darwin, and I don't know how to fix that
According to Hydra:

  at `mod_fastcgi' [system = "i686-darwin"]:
  assertion failed at `/nix/store/jjbzdiilypsb8z38647hav2fxlp0bwfd-nixpkgs-r27790/pkgs/servers/http/apache-httpd/default.nix:8:1'

  at `mod_fastcgi' [system = "x86_64-darwin"]:
  assertion failed at `/nix/store/jjbzdiilypsb8z38647hav2fxlp0bwfd-nixpkgs-r27790/pkgs/servers/http/apache-httpd/default.nix:8:1'

  at `mod_wsgi' [system = "i686-darwin"]:
  assertion failed at `/nix/store/jjbzdiilypsb8z38647hav2fxlp0bwfd-nixpkgs-r27790/pkgs/servers/http/apache-httpd/default.nix:8:1'

  at `mod_wsgi' [system = "x86_64-darwin"]:
  assertion failed at `/nix/store/jjbzdiilypsb8z38647hav2fxlp0bwfd-nixpkgs-r27790/pkgs/servers/http/apache-httpd/default.nix:8:1'

svn path=/nixpkgs/trunk/; revision=27793
2011-07-14 21:54:58 +00:00
Peter Simons ffe01e880d git-annex: build only on platforms that support Haskell
svn path=/nixpkgs/trunk/; revision=27792
2011-07-14 21:54:53 +00:00
Peter Simons aeebf42fe6 pkgs/lib/platforms.nix: added 'haskellPlatforms', a list of all platforms on which a Haskell compiler is available
svn path=/nixpkgs/trunk/; revision=27791
2011-07-14 21:54:49 +00:00
Peter Simons fa99abdc89 gravit, stellarium: build software that depends on mesa only on mesa platforms
svn path=/nixpkgs/trunk/; revision=27790
2011-07-14 20:53:30 +00:00
Peter Simons 938fc8490e Added linux_2_6_38_ati, a kernel that supports hardware rendering on modern ATI graphics chips.
svn path=/nixpkgs/trunk/; revision=27789
2011-07-14 20:08:51 +00:00
Peter Simons 7c10cbb6c8 We cannot use thread-local store in mesa, because the rest of our xorg
installation has been built without support for it.

svn path=/nixpkgs/trunk/; revision=27788
2011-07-14 20:04:34 +00:00
Peter Simons fa5002d97b Revert my earlier commit that added libxml2 to pythonFull.
After some discussion on #nixos, the consensus is that expressions should not
provide functionality that is not part of the package itself, i.e. pythonFull
ought to include only those extensions that are part of the python
distribution.

svn path=/nixpkgs/trunk/; revision=27787
2011-07-14 19:35:24 +00:00
Peter Simons e7a9b41e9c mesa: enable full gallium, xcb, and egl support, and build all available dri back-ends
svn path=/nixpkgs/trunk/; revision=27786
2011-07-14 19:21:37 +00:00
Peter Simons 18bd4e67d7 mesa: add myself as a maintainer
svn path=/nixpkgs/trunk/; revision=27785
2011-07-14 19:21:33 +00:00
Peter Simons ea27b1b042 mesa: depend on python+libxml2Python rather than depending on pythonFull
The latter package contains Tcl/Tk and whatnot else, so using that
expression as a built input was a bad idea. I'm sorry.

The dependency on talloc is gone, too. It wasn't used, apparently, but
it broke the build on Darwin because talloc doesn't compile there.

svn path=/nixpkgs/trunk/; revision=27784
2011-07-14 19:21:29 +00:00
Peter Simons 05e489b24f Added packages for radeon-r600 and radeon-r700 firmware.
svn path=/nixpkgs/trunk/; revision=27783
2011-07-14 19:21:23 +00:00
Eelco Dolstra 4cc476fa52 * Update nixUnstable.
svn path=/nixpkgs/trunk/; revision=27782
2011-07-14 17:16:00 +00:00
Peter Simons 7049b34b10 glxinfo: updated to version 8.0.1
svn path=/nixpkgs/trunk/; revision=27779
2011-07-14 12:23:03 +00:00
Peter Simons 13db8d6999 mesa: updated to version 7.10.3
svn path=/nixpkgs/trunk/; revision=27778
2011-07-14 12:22:59 +00:00
Peter Simons 10b7a4fe96 mesa: updated to version 7.10.2
There changes are based on patch <http://sprunge.us/bOMG> from goibhniu.

svn path=/nixpkgs/trunk/; revision=27777
2011-07-14 12:22:55 +00:00
Peter Simons 1b53d1f22d xorg: updated xf86-video-ati to version 6.14.2
svn path=/nixpkgs/trunk/; revision=27776
2011-07-14 12:22:49 +00:00
Peter Simons 68957344fa git-annex: updated to version 3.20110707
svn path=/nixpkgs/trunk/; revision=27775
2011-07-14 12:22:26 +00:00
Peter Simons 6f1ec7512e python: added libxml2 bindings to the pythonFull attribute
svn path=/nixpkgs/trunk/; revision=27773
2011-07-14 11:13:41 +00:00
Eelco Dolstra 298c78ef40 * Build kdm.
svn path=/nixpkgs/branches/kde-4.7/; revision=27772
2011-07-14 08:42:01 +00:00
Eelco Dolstra e061898b74 * ConsoleKit updated to 0.4.5.
svn path=/nixpkgs/branches/kde-4.7/; revision=27770
2011-07-13 18:54:27 +00:00
Eelco Dolstra 71c508f641 * Akonadi updated to 1.6.0.
svn path=/nixpkgs/branches/kde-4.7/; revision=27768
2011-07-13 18:15:57 +00:00
Peter Simons aa8cea3e4d moderncv: updated description
svn path=/nixpkgs/trunk/; revision=27766
2011-07-13 16:49:33 +00:00
Peter Simons db9fc16b70 moderncv: cleanup the build instructions
Just add this package to texLiveAggregationFun to install it.

svn path=/nixpkgs/trunk/; revision=27765
2011-07-13 16:23:48 +00:00
Peter Simons a16e01fe19 Added moderncv package to texlive.
svn path=/nixpkgs/trunk/; revision=27762
2011-07-13 15:00:59 +00:00
Peter Simons 13720273bb haskell-funcmp: added version 1.5
svn path=/nixpkgs/trunk/; revision=27761
2011-07-13 15:00:51 +00:00
Eelco Dolstra a90c3142ee * KDE 4.7rc2.
svn path=/nixpkgs/branches/kde-4.7/; revision=27759
2011-07-13 13:08:49 +00:00
Peter Simons dc31e088c0 Added archivemount-0.6.1, a FUSE-based file system for mounting tar archives.
svn path=/nixpkgs/trunk/; revision=27758
2011-07-13 12:33:54 +00:00
Eelco Dolstra c7669210d1 * Whitespace.
svn path=/nixpkgs/branches/kde-4.7/; revision=27757
2011-07-13 12:31:43 +00:00
Peter Simons 78ccc14e3e ghc-6.10.1-binary: revert blind attempt to bootstrap GHC on x86_64-darwin with the i686 version of this compiler
Hydra says that we can *not* use the i686 compiler to bootstrap x86_64 on Darwin. Duh.

svn path=/nixpkgs/trunk/; revision=27753
2011-07-13 12:00:19 +00:00
Eelco Dolstra 35505a442e * Remove some dead files.
svn path=/nixpkgs/trunk/; revision=27752
2011-07-13 11:40:47 +00:00
Peter Simons ce11df9d80 ghc-6.10.1-binary: blind attempt to bootstrap GHC on x86_64-darwin with the i686 version of this compiler
I have no idea whether that's going to work, and I can't test it for
lack of access to a MacOS X machine, but think chances are pretty good
that this is going to succeed.

svn path=/nixpkgs/trunk/; revision=27751
2011-07-13 11:09:06 +00:00
Peter Simons 14c9d26112 jfsrec: build with boost 1.44.0
Compilation with the latest version, boost 1.47.0, fails as follows:

  g++ -DHAVE_CONFIG_H -I. -I. -I..     -g -O2 -c -o inode.o inode.cpp
  inode.cpp: In member function 'virtual boost::filesystem3::path jfsrec::Inode::get_full_path()':
  inode.cpp:70:54: error: invalid conversion from 'bool (*)(const std::string&)' to 'boost::enable_if_c<true, void>::type*'
  inode.cpp:70:54: error:   initializing argument 2 of 'boost::filesystem3::path::path(const Source&, typename boost::enable_if<boost::filesystem3::path_traits::is_pathable<typename boost::decay<Source>::type> >::type*) [with Source = std::basic_string<char>, typename boost::enable_if<boost::filesystem3::path_traits::is_pathable<typename boost::decay<Source>::type> >::type = void]'
  inode.cpp:72:54: error: invalid conversion from 'bool (*)(const std::string&)' to 'boost::enable_if_c<true, void>::type*'
  inode.cpp:72:54: error:   initializing argument 2 of 'boost::filesystem3::path::path(const Source&, typename boost::enable_if<boost::filesystem3::path_traits::is_pathable<typename boost::decay<Source>::type> >::type*) [with Source = std::basic_string<char>, typename boost::enable_if<boost::filesystem3::path_traits::is_pathable<typename boost::decay<Source>::type> >::type = void]'
  make[2]: *** [inode.o] Error 1

It appears that jfsrec assumes that fs::path is a string, which isn't
true anymore in Boost.FS v3.

svn path=/nixpkgs/trunk/; revision=27750
2011-07-13 10:56:52 +00:00
Peter Simons 2eb4c12012 git: prefer 'utillinuxcurses' over 'utillinux' in user profiles
Packages that need util-linux-ng as a build-time or run-time dependency
typically refer to the attribute 'utillinux', which is the expression with
the least possible set of features.

Users, however, who run "nix-env -i util-linux", don't want that version,
because it lacks support for perl and curses. In other words, users want
utillinuxngCurses by default, which is what this change accomplishes.

svn path=/nixpkgs/trunk/; revision=27749
2011-07-13 10:50:22 +00:00
Peter Simons 4e5cc9b965 git: removed 'lowPri' wrapper around gitFull
Packages that need git as build-time or run-time dependency typically refer to
the attribute 'git', which is the expression with the least possible set of
features.

Users, however, who run "nix-env -i git", don't want that version, because it
lacks support for SVN, for sending e-mail, and it doesn't include the GUI. In
other words, users want gitFull by default, which is what this change
accomplishes.

svn path=/nixpkgs/trunk/; revision=27748
2011-07-13 10:46:17 +00:00
Peter Simons 9edc2574dd git-annex: the build system uses 'which' to determine whether ikiwiki is installed
svn path=/nixpkgs/trunk/; revision=27747
2011-07-13 10:41:10 +00:00
Peter Simons d6f364ca8c ikiwiki: removed unconditional dependencies on monotone and git
Both build inputs 'monotone' and 'git' are non-null in nixpkgs, so their
respective store paths were always included in the generated wrapper
script -- even if 'monotoneSupport' and 'gitSupport' were false.

svn path=/nixpkgs/trunk/; revision=27746
2011-07-13 10:41:05 +00:00
Peter Simons 7c8871512d wxmaxima: ensure that wxMaxima will find Maxima even if it's not in $PATH
svn path=/nixpkgs/trunk/; revision=27745
2011-07-13 09:56:58 +00:00
Peter Simons bcaaba6ea7 gnucash: improved comments
svn path=/nixpkgs/trunk/; revision=27744
2011-07-13 09:56:54 +00:00
Peter Simons 3cd02cd43d maxima: switch from clisp to sbcl, enable tk gui, and fix various impurities
* Build maxima with sbcl for better performance.

 * Enable the regression test suite.

 * Configure $PATH at start-up so that maxima knows how to find sbcl,
   wish, rlwrap, and gnuplot.

 * Move installed documentation and Emacs lisp modules into standard
   locations.

 * Enable parallel building.

svn path=/nixpkgs/trunk/; revision=27743
2011-07-13 09:13:32 +00:00
Peter Simons 9485e2392b monotone: strip trailing whitespace
svn path=/nixpkgs/trunk/; revision=27742
2011-07-13 09:13:28 +00:00