Commit graph

5932 commits

Author SHA1 Message Date
Peter Simons
2feeeacb7b nbd: we don't generate statically linked binaries for that package
anymore, so it's no longer necessary to pass a special version of glib
to the expression.

svn path=/nixpkgs/trunk/; revision=29802
2011-10-13 07:26:44 +00:00
Andres Löh
1d70839b22 Added haskell-Zwaluw-0.1
svn path=/nixpkgs/trunk/; revision=29777
2011-10-11 22:18:21 +00:00
Yury G. Kudryashov
4289cff0c2 Remove gtkLibs216.*mm
svn path=/nixpkgs/trunk/; revision=29774
2011-10-11 20:47:30 +00:00
Yury G. Kudryashov
2ed828052e Remove wxPython26 since it is not used
svn path=/nixpkgs/trunk/; revision=29773
2011-10-11 19:46:31 +00:00
Yury G. Kudryashov
b5861542dd gtkLibs3x.atkmm
svn path=/nixpkgs/trunk/; revision=29748
2011-10-10 22:26:41 +00:00
Peter Simons
e3984c2caf synchronize with trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=29739
2011-10-10 17:01:17 +00:00
Joachim Schiele
f3f0940e25 added support for cntlm on nixos!
svn path=/nixpkgs/trunk/; revision=29736
2011-10-09 22:28:41 +00:00
Yury G. Kudryashov
9caf409d96 odt2txt-0.4
svn path=/nixpkgs/trunk/; revision=29734
2011-10-09 18:22:18 +00:00
Peter Simons
2133339ecf haskell-thespian: added version 0.999
svn path=/nixpkgs/trunk/; revision=29733
2011-10-09 17:47:04 +00:00
Yury G. Kudryashov
57d384459e Add gnome3. Do not recurse into attrs
svn path=/nixpkgs/trunk/; revision=29732
2011-10-09 17:23:54 +00:00
Yury G. Kudryashov
692ae674c1 gtklibs3x.glibmm-2.30
svn path=/nixpkgs/trunk/; revision=29730
2011-10-09 17:23:37 +00:00
Peter Simons
dbab602826 haskell-parallel: added version 3.2.0.0
svn path=/nixpkgs/trunk/; revision=29729
2011-10-09 15:30:05 +00:00
Peter Simons
fad97e3885 haskell-parsec: added version 3.1.2
svn path=/nixpkgs/trunk/; revision=29728
2011-10-09 15:29:59 +00:00
Yury G. Kudryashov
32dd8c0854 gtkLibx3x update
svn path=/nixpkgs/trunk/; revision=29726
2011-10-09 08:38:34 +00:00
Yury G. Kudryashov
e60fe8673b gnome: use callPackage, move to gnome-2
gnome28 was a mix of packages from various releases, so do not mention 2.28 in
the attribute name.

svn path=/nixpkgs/trunk/; revision=29721
2011-10-08 16:58:32 +00:00
Yury G. Kudryashov
c35c6ec9fa Drop 'gnomevfs = gnome_vfs;' alias
s/gnomevfs/gnome_vfs/ in packages

svn path=/nixpkgs/trunk/; revision=29718
2011-10-08 12:06:03 +00:00
Yury G. Kudryashov
1ef1f01e13 Remove thunderbird2/3 from release.nix
svn path=/nixpkgs/trunk/; revision=29716
2011-10-08 11:53:18 +00:00
Yury G. Kudryashov
c7d6b60287 Drop kde3.kile
Use kde4.kile instead

svn path=/nixpkgs/trunk/; revision=29715
2011-10-07 20:46:29 +00:00
Yury G. Kudryashov
7e3c1b357b Drop kde3.kdebase
Hydra fails to build it for a while, and nobody noticed.

svn path=/nixpkgs/trunk/; revision=29714
2011-10-07 20:46:21 +00:00
Eelco Dolstra
20778d629b * Updated Catalyst to 5.9. It now uses Plack for interfacing with the
web server, so add that as well.

svn path=/nixpkgs/trunk/; revision=29709
2011-10-07 12:18:17 +00:00
Eelco Dolstra
79ab307dd7 * Fix Chatzilla (it doesn't work with recent Xulrunners).
* Get rid of xulrunnerWrapper.

svn path=/nixpkgs/trunk/; revision=29706
2011-10-07 09:26:03 +00:00
Lluís Batlle i Rossell
fefaa7a6ea Adding boinc. It installs. I don't know how to use it.
svn path=/nixpkgs/trunk/; revision=29704
2011-10-06 20:25:05 +00:00
Eelco Dolstra
ee74cf87dc * Set the Chrome icon in its desktop item.
svn path=/nixpkgs/trunk/; revision=29701
2011-10-06 13:52:54 +00:00
Eelco Dolstra
57f482e2c3 * Get rid of old Thunderbird versions.
svn path=/nixpkgs/trunk/; revision=29700
2011-10-06 13:28:03 +00:00
Peter Simons
a60193db6b release-small.nix: updated name of "dbus" attribute
svn path=/nixpkgs/branches/stdenv-updates/; revision=29698
2011-10-06 13:21:07 +00:00
Eelco Dolstra
f4d88c2197 * Thunderbird 7.0.1.
svn path=/nixpkgs/trunk/; revision=29697
2011-10-06 13:21:05 +00:00
Peter Simons
1add4b2e6d synchronize with trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=29696
2011-10-06 13:16:47 +00:00
Eelco Dolstra
0982859b6c * Neon: build with the new and patched OpenSSL. With this,
Subversion can check out the Nix repositories without any
  warnings about untrusted certificates.
* Make Firefox 7 the default.

svn path=/nixpkgs/trunk/; revision=29691
2011-10-06 11:31:14 +00:00
Eelco Dolstra
8ec876642e * Give the desktop items for Chrome and IceCat the right name.
svn path=/nixpkgs/trunk/; revision=29689
2011-10-06 11:22:50 +00:00
Peter Simons
d5d5ff5a78 release-small.nix: dropped obsolete 'aterm242fixes' package
svn path=/nixpkgs/branches/stdenv-updates/; revision=29686
2011-10-06 10:29:56 +00:00
Peter Simons
ba6cc24ca8 synchronize with trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=29685
2011-10-06 10:27:33 +00:00
Peter Simons
667e2020cc cppunit: dropped obsolete version 1.10
svn path=/nixpkgs/trunk/; revision=29682
2011-10-06 10:23:23 +00:00
Peter Simons
1abdc56a12 Synchronized stdenv-updates branch with trunk.
There were conflicting patches of pkgs/os-specific/linux/module-init-tools.
Apparently, the expression was updated independently in both branches. I've
resolved the conflict by preferring the patches from stdenv-updates, because
those patches appeared to be more sophisticated, i.e. they build the manual,
etc.

svn path=/nixpkgs/branches/stdenv-updates/; revision=29680
2011-10-06 09:37:22 +00:00
Peter Simons
b88f691163 haskell-hamlet: updated to version 0.10.3
svn path=/nixpkgs/trunk/; revision=29672
2011-10-05 17:10:00 +00:00
Peter Simons
105f30bba6 haskell-hakyll: updated to version 3.2.0.9
svn path=/nixpkgs/trunk/; revision=29671
2011-10-05 17:09:51 +00:00
Peter Simons
a38b628246 haskell-haddock: updated to version 2.9.4
svn path=/nixpkgs/trunk/; revision=29635
2011-10-04 14:58:28 +00:00
Sander van der Burg
df1cea1903 dotnetfx 4.0 is now the default
svn path=/nixpkgs/trunk/; revision=29628
2011-10-04 13:28:32 +00:00
Yury G. Kudryashov
dd19f22e7e Add kde4.kile
svn path=/nixpkgs/trunk/; revision=29622
2011-10-04 11:12:11 +00:00
Russell O'Connor
8c40562197 New package for CamlIDL 1.05
svn path=/nixpkgs/trunk/; revision=29619
2011-10-04 01:40:45 +00:00
Peter Simons
492c7016d0 haskell-hamlet: updated to version 0.10.2
svn path=/nixpkgs/trunk/; revision=29607
2011-10-03 20:20:58 +00:00
Peter Simons
21887cf61e we would like to test cups
svn path=/nixpkgs/branches/stdenv-updates/; revision=29604
2011-10-03 18:40:12 +00:00
Shea Levy
936c460abb Ruby: Separate 'install the current version of ruby' from 'install version x of ruby' when x is also the current version
svn path=/nixpkgs/trunk/; revision=29600
2011-10-03 15:35:50 +00:00
Yury G. Kudryashov
371cd8bc51 kde3: use meta.platforms
svn path=/nixpkgs/trunk/; revision=29596
2011-10-02 21:15:36 +00:00
Yury G. Kudryashov
86d3591d7e Switch to unzip-6.0
svn path=/nixpkgs/trunk/; revision=29595
2011-10-02 21:15:29 +00:00
Yury G. Kudryashov
9839a5d924 policykit: use meta.platforms
This makes it easier to remove policykit in the future

svn path=/nixpkgs/trunk/; revision=29594
2011-10-02 21:15:19 +00:00
Peter Simons
13b67df58e haskell-convertible-text: added version 0.3.0.10
svn path=/nixpkgs/trunk/; revision=29585
2011-10-02 20:28:19 +00:00
Peter Simons
1d0620f3ae haskell-data-object: added version 0.3.1.7
svn path=/nixpkgs/trunk/; revision=29583
2011-10-02 20:28:09 +00:00
Peter Simons
54a78ff2ed haskell-yaml: added version 0.4.1.1
svn path=/nixpkgs/trunk/; revision=29582
2011-10-02 20:28:04 +00:00
Peter Simons
944a9932bc haskell-network: added version 2.3.0.6
svn path=/nixpkgs/trunk/; revision=29581
2011-10-02 20:28:00 +00:00
Peter Simons
ec549646da haskell-haddock: added version 2.9.3
svn path=/nixpkgs/trunk/; revision=29572
2011-10-02 20:27:20 +00:00
Yury G. Kudryashov
4cdf639958 Remove unused parameter from xorg call
svn path=/nixpkgs/trunk/; revision=29569
2011-10-02 19:53:20 +00:00
Shea Levy
2a94841c64 Enable building 3.1 with an efi stub
It's still not enabled by default, you need to set CONFIG_EFI_STUB=y

svn path=/nixpkgs/trunk/; revision=29565
2011-10-02 14:20:49 +00:00
Shea Levy
d3cf97b56e Cleaner decoupling of glibc and linuxPackages while keeping kernelHeaders a linuxPackage and having a single default.nix for kernelHeaders
svn path=/nixpkgs/branches/stdenv-updates/; revision=29554
2011-10-01 22:25:28 +00:00
Shea Levy
3b260bfbf7 Merge from trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=29553
2011-10-01 18:12:00 +00:00
Rob Vermaas
c85c8c9d01 update jinja2
svn path=/nixpkgs/trunk/; revision=29550
2011-09-30 17:26:38 +00:00
Michael Raskin
a8a3ede5e9 Adding Firefox 8.0beta1
svn path=/nixpkgs/trunk/; revision=29549
2011-09-30 15:44:22 +00:00
Shea Levy
dcef7ad3bf Have the kernel headers be a linuxPackage, use the current linuxPackage's headers
svn path=/nixpkgs/branches/stdenv-updates/; revision=29546
2011-09-30 15:34:37 +00:00
Michael Raskin
8e02768459 Firefox 7.0 release
svn path=/nixpkgs/trunk/; revision=29544
2011-09-30 07:10:47 +00:00
Shea Levy
a54473bc5d Use ruby 1.9 as the default
svn path=/nixpkgs/trunk/; revision=29543
2011-09-29 21:55:12 +00:00
Shea Levy
ad076fc3d5 shells/bash/4.1,2.nix have been replaced by default.nix
svn path=/nixpkgs/branches/stdenv-updates/; revision=29542
2011-09-29 21:48:33 +00:00
Shea Levy
cba02ddc3c aufs2: Only build if the kernel supports it
svn path=/nixpkgs/trunk/; revision=29540
2011-09-28 23:38:39 +00:00
Shea Levy
ed38cc3545 aufs3-util
svn path=/nixpkgs/trunk/; revision=29535
2011-09-28 21:59:07 +00:00
Shea Levy
4add420a48 aufs3 kernelPackage
svn path=/nixpkgs/trunk/; revision=29534
2011-09-28 21:46:07 +00:00
Shea Levy
2e012018bb makeAufs3StandalonePatch: Don't unpack the kernel source
svn path=/nixpkgs/trunk/; revision=29533
2011-09-28 21:09:54 +00:00
Shea Levy
60b155479d linux-3.0: Add aufs3 patch
svn path=/nixpkgs/trunk/; revision=29532
2011-09-28 20:48:08 +00:00
Peter Simons
e460e459bf synchronize with trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=29531
2011-09-28 19:26:00 +00:00
Yury G. Kudryashov
e2c4af0946 Update opera to the latest version
Also add missing dependencies (KDE, cups, gstreamer)

svn path=/nixpkgs/trunk/; revision=29527
2011-09-28 15:23:28 +00:00
Peter Simons
07a5a121fb synchronize with trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=29524
2011-09-28 14:48:34 +00:00
Peter Simons
dc55be9e05 pkgs/shells/bash: updated "interactive" bash to version 4.2
The non-interactive variant, which is part of stdenv, remains unchanged.

svn path=/nixpkgs/trunk/; revision=29523
2011-09-28 14:37:03 +00:00
Shea Levy
0f2e4160c0 Linux 3.0: Don't use aufs2.1, there's aufs 3.x for Linux 3.x kernels
svn path=/nixpkgs/trunk/; revision=29520
2011-09-28 14:18:26 +00:00
Rob Vermaas
6fd4c26fc2 add google perftools 1.8.3
svn path=/nixpkgs/trunk/; revision=29517
2011-09-27 17:24:01 +00:00
Yury G. Kudryashov
109b36eca9 Move soprano to top-level namespace
svn path=/nixpkgs/trunk/; revision=29513
2011-09-27 15:40:40 +00:00
Peter Simons
27e30f03fc python-packages.nix: strip trailing whitespace
svn path=/nixpkgs/trunk/; revision=29510
2011-09-27 14:00:48 +00:00
Peter Simons
ed6328b5ee python-matplotlib: enable Linux builds by Hydra
svn path=/nixpkgs/trunk/; revision=29509
2011-09-27 14:00:40 +00:00
Peter Simons
6bd8eea788 python-matplotlib: move dependencies like numpy into the propagatedBuildInputs
section to ensure that these libraries are being found at run-time by the
python wrapper.

svn path=/nixpkgs/trunk/; revision=29508
2011-09-27 14:00:31 +00:00
Eelco Dolstra
a3143f0bbd * Added Statistics::TTest.
svn path=/nixpkgs/trunk/; revision=29507
2011-09-27 11:06:41 +00:00
Alexander Tsamutali
e3ccdb4bcd desktops/e17:
Add e17. WIP. Make hangs during build of enlightenment.

svn path=/nixpkgs/trunk/; revision=29506
2011-09-26 22:28:35 +00:00
Eelco Dolstra
12d42a5850 * Added Statistics::Descriptive.
svn path=/nixpkgs/trunk/; revision=29504
2011-09-26 22:08:44 +00:00
Peter Simons
201fab6841 all-packages.nix: strip trailing whitespace
svn path=/nixpkgs/trunk/; revision=29492
2011-09-26 08:12:18 +00:00
Peter Simons
01022a1502 lxc: moved package into the "applications/virtualization" category
svn path=/nixpkgs/trunk/; revision=29491
2011-09-26 08:12:14 +00:00
Yury G. Kudryashov
e496b86594 Remove kde3.kcachegrind
Use kde4.kcachegrind instead.

svn path=/nixpkgs/trunk/; revision=29484
2011-09-25 22:56:48 +00:00
Michael Raskin
d65cab3852 Adding Allegro 5
svn path=/nixpkgs/trunk/; revision=29482
2011-09-25 21:07:48 +00:00
Michael Raskin
4d6030f56b Adding hyenae - patch by MarcWeber
svn path=/nixpkgs/trunk/; revision=29470
2011-09-24 09:14:21 +00:00
Peter Simons
0ad122f4e6 sync with trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=29468
2011-09-24 08:04:47 +00:00
Andres Löh
a154670250 Added haskell-derp.
svn path=/nixpkgs/trunk/; revision=29465
2011-09-24 02:49:04 +00:00
Florian Friesdorf
0c32d209ca python wrapper that sets PYTHONHOME to the profile it is in
svn path=/nixpkgs/trunk/; revision=29462
2011-09-23 17:00:13 +00:00
Shea Levy
01df54f5cc Merge from trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=29461
2011-09-23 16:58:45 +00:00
Peter Simons
03deb61330 haskell-NumInstances: added version 1.0
svn path=/nixpkgs/trunk/; revision=29457
2011-09-23 16:08:52 +00:00
Shea Levy
f5e5bc24be Get ruby-1.9.2-p290 to build
svn path=/nixpkgs/trunk/; revision=29453
2011-09-23 15:08:55 +00:00
Ludovic Courtès
7f08716911 BitlBee: Use GnuTLS 2.x.
svn path=/nixpkgs/trunk/; revision=29445
2011-09-22 19:46:39 +00:00
Lluís Batlle i Rossell
ddcb4a295d Adding pdnsd
svn path=/nixpkgs/trunk/; revision=29438
2011-09-22 11:28:56 +00:00
Lluís Batlle i Rossell
1175e3e46b Adding etherape, although it wants those gconf things I think.
svn path=/nixpkgs/trunk/; revision=29437
2011-09-22 09:19:33 +00:00
Michael Raskin
234a58870a Check bittornado with newer wxGTK, generic cleanup
svn path=/nixpkgs/trunk/; revision=29433
2011-09-22 06:31:35 +00:00
Florian Friesdorf
3822bfd8d7 ipython also as pythonPackages.ipython
svn path=/nixpkgs/trunk/; revision=29428
2011-09-21 20:05:24 +00:00
Peter Simons
4821046eb3 haskell-skein: added version 0.1
svn path=/nixpkgs/trunk/; revision=29418
2011-09-21 16:46:59 +00:00
Peter Simons
54acb66473 haskell-prolog: added version 0.1
haskell-prolog-graph: added version 0.1.0.2
haskell-prolog-graph-lib: added version 0.1

svn path=/nixpkgs/trunk/; revision=29417
2011-09-21 16:46:54 +00:00
Peter Simons
d10badf202 haskell-graphviz: build with the latest fgl version
This change is required for building the Haskell prolog interpreter.

svn path=/nixpkgs/trunk/; revision=29416
2011-09-21 16:46:48 +00:00
Peter Simons
3a44af3acc Updated 'fgl' attribute to point to the latest version of the library.
This has no practical effect, because we override that attributed based
on the compiler version that's being used, but it still feels like the
right thing to do.

svn path=/nixpkgs/trunk/; revision=29415
2011-09-21 16:46:44 +00:00
Peter Simons
6bc5b0f215 haskell-maude: added version 0.2.1
svn path=/nixpkgs/trunk/; revision=29414
2011-09-21 16:46:39 +00:00
Eelco Dolstra
b4a6893b85 * Fix Compress::Zlib.
svn path=/nixpkgs/trunk/; revision=29412
2011-09-21 09:13:18 +00:00
Lluís Batlle i Rossell
ed9d78b75f Adding pngcrush
svn path=/nixpkgs/trunk/; revision=29411
2011-09-21 07:33:38 +00:00
Eelco Dolstra
77c5f8754c * Remove comment.
svn path=/nixpkgs/trunk/; revision=29410
2011-09-21 07:30:04 +00:00
Eelco Dolstra
1cf90e9d35 * Added Catalyst::Plugin::Unicode::Encoding.
svn path=/nixpkgs/trunk/; revision=29409
2011-09-21 07:22:19 +00:00
Lluís Batlle i Rossell
99863cb87b Making bison 2.4 and 2.5 cross build (I hope), and setting the main bison as
2.5. Let's see what builds and what not.


svn path=/nixpkgs/branches/stdenv-updates/; revision=29406
2011-09-21 06:18:23 +00:00
Yury G. Kudryashov
9ee5230537 Move qt3/qt4 choice to .nix expressions
svn path=/nixpkgs/trunk/; revision=29404
2011-09-20 22:49:13 +00:00
Yury G. Kudryashov
d9ad31c468 pfstools-1.8.3; builds against qt4
svn path=/nixpkgs/trunk/; revision=29403
2011-09-20 22:49:07 +00:00
Peter Simons
f844c8730e haskell-json: added version 0.5
svn path=/nixpkgs/trunk/; revision=29402
2011-09-20 20:30:20 +00:00
Yury G. Kudryashov
de89582238 Add gtk-3.x libraries
Let hydra build it but do not show in nix-env -qa

svn path=/nixpkgs/trunk/; revision=29398
2011-09-20 16:18:12 +00:00
Lluís Batlle i Rossell
8e28c8fcfa Making 'nix-env -qa *' work
svn path=/nixpkgs/trunk/; revision=29394
2011-09-20 09:53:19 +00:00
Yury G. Kudryashov
87b968e858 Use fetchurl_gnome in dia
+small style changes (though almost all string changed)

svn path=/nixpkgs/trunk/; revision=29389
2011-09-20 06:31:37 +00:00
Yury G. Kudryashov
31d77b3e2f gtkmm-2.24
svn path=/nixpkgs/trunk/; revision=29388
2011-09-20 06:23:27 +00:00
Yury G. Kudryashov
1c6d328898 Add atkmm
svn path=/nixpkgs/trunk/; revision=29387
2011-09-20 06:23:17 +00:00
Yury G. Kudryashov
501cc845a0 pangomm-2.28
svn path=/nixpkgs/trunk/; revision=29386
2011-09-20 06:23:08 +00:00
Yury G. Kudryashov
ff25d193ad glibmm-2.28
svn path=/nixpkgs/trunk/; revision=29385
2011-09-20 06:22:59 +00:00
Yury G. Kudryashov
4e9fbf18ed Build cairo-gobject library
Move cairo to gtkLibs.cairo

svn path=/nixpkgs/trunk/; revision=29380
2011-09-20 06:22:14 +00:00
Yury G. Kudryashov
058fc8da82 gdk-pixbuf-2.24
svn path=/nixpkgs/trunk/; revision=29378
2011-09-20 06:21:56 +00:00
Yury G. Kudryashov
c130be537b Add fetchurl_gnome wrapper
It just creates correct mirror://gnome/sources/... URL.

svn path=/nixpkgs/trunk/; revision=29377
2011-09-20 06:21:46 +00:00
Rob Vermaas
59c04d2d9a libpng revert
svn path=/nixpkgs/trunk/; revision=29374
2011-09-19 23:09:20 +00:00
Rob Vermaas
2c33be2d8b revert previous commits related to libpng 1.2.44, until we are able to build 1.2.45
svn path=/nixpkgs/trunk/; revision=29373
2011-09-19 23:05:02 +00:00
Rob Vermaas
6e0c059235 use older libpng for tetex
svn path=/nixpkgs/trunk/; revision=29368
2011-09-19 21:37:05 +00:00
Rob Vermaas
78acc23d18 forgot .nix extension
svn path=/nixpkgs/trunk/; revision=29367
2011-09-19 21:22:31 +00:00
Rob Vermaas
30e9cae7d2 added some python packages, add variant for libpng 1.2.44 as matplotlib does not compile with newer versions
svn path=/nixpkgs/trunk/; revision=29366
2011-09-19 21:00:37 +00:00
Peter Simons
caf02e266f all-packages.nix: fixed evaluation error in the 'mumble' attribute
svn path=/nixpkgs/trunk/; revision=29364
2011-09-19 20:20:17 +00:00
Yury G. Kudryashov
63959f2a5a Let poppler use ${POPPLER_DATADIR}
Also upgrade poppler-data

svn path=/nixpkgs/trunk/; revision=29342
2011-09-19 08:35:30 +00:00
Yury G. Kudryashov
de2105b740 scorched3d: latest version, build against wxgtk-2.8
svn path=/nixpkgs/trunk/; revision=29341
2011-09-19 05:17:00 +00:00
Yury G. Kudryashov
fa506acf29 comical: build with wxGTK28
svn path=/nixpkgs/trunk/; revision=29339
2011-09-19 05:16:32 +00:00
Yury G. Kudryashov
5565ec4eec Remove unused gtkLibs220
svn path=/nixpkgs/trunk/; revision=29337
2011-09-19 05:16:02 +00:00
Alexander Tsamutali
f7567f8717 misc/screensavers/slock: New nixpkg.
svn path=/nixpkgs/trunk/; revision=29326
2011-09-17 17:40:07 +00:00
Lluís Batlle i Rossell
98f6452a70 Adding the gnunet 0.9 (svn), which works incompatible with the latest gnunet released.
I updated some libs to get it built.


svn path=/nixpkgs/trunk/; revision=29313
2011-09-16 20:50:24 +00:00
Eelco Dolstra
fd68946fa8 * Bump the default Linux kernel to 2.6.35 (the most recent longterm
stability kernel).

svn path=/nixpkgs/trunk/; revision=29312
2011-09-16 19:15:06 +00:00
Peter Simons
6ed0f99b70 haskell-helium: the package has disappeared from the upstream web server
svn path=/nixpkgs/trunk/; revision=29311
2011-09-16 18:29:32 +00:00
Peter Simons
95ae45256a haskell-get-options: the package doesn't build, because the upstream archive has vanished
svn path=/nixpkgs/trunk/; revision=29308
2011-09-16 18:17:20 +00:00
Eelco Dolstra
7df0d1cc58 * Updated IO::Compress.
svn path=/nixpkgs/trunk/; revision=29301
2011-09-16 10:32:37 +00:00
Peter Simons
d0ffef49bb os-specific/linux/e1000e: added recent a version of the e1000e kernel module
That module is required to support modern Intel Gigabit Ethernet cards.

svn path=/nixpkgs/trunk/; revision=29297
2011-09-15 15:18:45 +00:00
Eelco Dolstra
cdb830bef2 * Fix nixPerk.
svn path=/nixpkgs/trunk/; revision=29292
2011-09-15 08:29:52 +00:00
Andres Löh
54039c51f8 Added haskell-gloss and modified haskell-GLURaw.
I know that GLURaw is currently a modification of the generated file.
Not making the change prevents GLURaw from being loaded into ghci.

svn path=/nixpkgs/trunk/; revision=29290
2011-09-15 05:03:31 +00:00
Eelco Dolstra
0578ceb11b * Support communicating with the MTurk API via SSL.
svn path=/nixpkgs/trunk/; revision=29289
2011-09-14 22:55:02 +00:00
Yury G. Kudryashov
5fd7590140 Add NetworkManager-pptp
svn path=/nixpkgs/trunk/; revision=29271
2011-09-14 15:50:14 +00:00
Yury G. Kudryashov
1d91e3ac45 Add pptp client
svn path=/nixpkgs/trunk/; revision=29267
2011-09-14 08:39:51 +00:00
Peter Simons
60edb6348f python-packages.nix: strip trailing whitespace
svn path=/nixpkgs/trunk/; revision=29252
2011-09-13 20:10:37 +00:00
Peter Simons
86683f9c04 pycryptopp: updated to version 0.5.29
svn path=/nixpkgs/trunk/; revision=29251
2011-09-13 20:10:33 +00:00
Peter Simons
6426183c0c python-foolscap: updated to version 0.6.1
svn path=/nixpkgs/trunk/; revision=29250
2011-09-13 20:10:29 +00:00
Peter Simons
3c5ff4a118 haskell-hledger-web: added version 0.15.3
svn path=/nixpkgs/trunk/; revision=29243
2011-09-13 17:35:18 +00:00
Peter Simons
6557b25b37 haskell-io-storage: added version 0.3
svn path=/nixpkgs/trunk/; revision=29242
2011-09-13 17:35:12 +00:00
Peter Simons
8c8d88080d haskell-time: updated to version 1.4
svn path=/nixpkgs/trunk/; revision=29241
2011-09-13 17:35:07 +00:00
Michael Raskin
f75f1871d7 all-packages.nix entry for disser
svn path=/nixpkgs/trunk/; revision=29231
2011-09-12 20:50:32 +00:00
Peter Simons
c88d870123 Haskell packages that require access to libc (for <time.h>, etc.)
consistently depend on the (non-existent) attribute 'libc'. That
dependency is then fulfilled by defining

  libc = pkgs.stdenv.gcc.libc;

in haskell-packages.nix where appropriate. On platforms impure platforms,
such as Darwin, that attribute evaluates to 'null'.

svn path=/nixpkgs/trunk/; revision=29223
2011-09-12 16:46:14 +00:00
Peter Simons
20c7526891 haskell-vector-algorithms: dropped obsolete version 0.4
svn path=/nixpkgs/trunk/; revision=29212
2011-09-12 16:45:23 +00:00
Peter Simons
107201f99f haskell-case-insensitive: dropped obsolete version 0.3
svn path=/nixpkgs/trunk/; revision=29211
2011-09-12 16:45:18 +00:00
Peter Simons
d1219f3e3a haskell-snap-server: updated to version 0.5.4
svn path=/nixpkgs/trunk/; revision=29210
2011-09-12 16:45:13 +00:00
Peter Simons
3ac8f8c892 haskell-snap-core: updated to version 0.5.4
svn path=/nixpkgs/trunk/; revision=29209
2011-09-12 16:45:08 +00:00
Eelco Dolstra
3e54387efd * Added OpenSSL 1.0.0e (not updating the default yet because a lot
depends on it).  Also, install the manpages in $out/share/man rather
  than $out/ssl/man.

svn path=/nixpkgs/trunk/; revision=29208
2011-09-12 16:09:00 +00:00
Shea Levy
d1808a89d3 haskellPackages.{cairo,pango,glib,gtk}: Depend on the stdenv libc instead of glibc
svn path=/nixpkgs/trunk/; revision=29190
2011-09-11 18:48:46 +00:00
Shea Levy
2155a9b00f Fix evaluation errors for haskellPackages.gtk on darwin. Note that the build is currently not successful.
svn path=/nixpkgs/trunk/; revision=29189
2011-09-11 18:28:14 +00:00
Michael Raskin
7bb4bf3fe0 Adding LOVE Lua-based game framework/interpreter
svn path=/nixpkgs/trunk/; revision=29188
2011-09-11 17:05:48 +00:00
Michael Raskin
8351a946d2 Adding libmodplug
svn path=/nixpkgs/trunk/; revision=29186
2011-09-11 16:45:42 +00:00
Andres Löh
23737894ec Updating comments: latest ghc-7.3 snapshot succeeds on more packages.
svn path=/nixpkgs/trunk/; revision=29183
2011-09-11 15:18:53 +00:00
Yury G. Kudryashov
b6648e207d KDE SC 4.7.1
Mostly automatic update. The only manual change caused by some movements on
projects.kde.org. Untested.

svn path=/nixpkgs/trunk/; revision=29179
2011-09-11 12:39:06 +00:00
Peter Simons
e364367ec9 haskell-hamlet: updated to version 0.10.1
svn path=/nixpkgs/trunk/; revision=29166
2011-09-11 10:33:08 +00:00
Peter Simons
ee57346eb9 haskell-shakespeare-text: added version 0.10.1
svn path=/nixpkgs/trunk/; revision=29165
2011-09-11 10:32:59 +00:00
Marco Maggesi
3f94f217d1 Add clooj, IDE for clojure
svn path=/nixpkgs/trunk/; revision=29149
2011-09-09 21:15:20 +00:00
Andres Löh
bc3c074cb8 Added unbound, RepLib, type-equality.
svn path=/nixpkgs/trunk/; revision=29148
2011-09-09 20:45:04 +00:00
Peter Simons
4e6013e909 haskell-gtk still fails an assertion on Darwin; my attempt to fix that
hasn't worked, so I revert the change. Someone with access to that
platform will have to worry about those on Hydra assertions, I'm afraid.

svn path=/nixpkgs/trunk/; revision=29143
2011-09-09 19:57:44 +00:00
Andres Löh
19995681f3 Added instant-generics.
svn path=/nixpkgs/trunk/; revision=29139
2011-09-09 19:43:04 +00:00
Andres Löh
29de18d262 Added generic-deriving.
svn path=/nixpkgs/trunk/; revision=29137
2011-09-09 19:30:53 +00:00
Peter Simons
b917ed0493 haskell-deepseq-th: added version 0.1.0.2
svn path=/nixpkgs/trunk/; revision=29136
2011-09-09 18:44:40 +00:00
Peter Simons
4b66e4ce25 haskell-happstack-hamlet: added version 6.2.0
svn path=/nixpkgs/trunk/; revision=29135
2011-09-09 18:44:33 +00:00
Peter Simons
a13bbb3b10 haskell-cabal-ghci: added version 0.1
svn path=/nixpkgs/trunk/; revision=29133
2011-09-09 18:44:19 +00:00
Rob Vermaas
2610ed2ac9 added scipy, reportlab, pyreport, updated numpy matplotlib
svn path=/nixpkgs/trunk/; revision=29132
2011-09-09 14:20:43 +00:00
Eelco Dolstra
958b146424 * Added flvtool2.
svn path=/nixpkgs/trunk/; revision=29116
2011-09-08 21:48:10 +00:00
Peter Simons
80ec5348e0 haskell-packages.nix: blind attempt to fix assertion error on Darwin
svn path=/nixpkgs/trunk/; revision=29115
2011-09-08 19:06:59 +00:00
Peter Simons
050d264bfc haskell-deepseq: added version 1.2.0.1
svn path=/nixpkgs/trunk/; revision=29110
2011-09-08 17:25:09 +00:00
Peter Simons
18f76f04ac pkgs/top-level/all-packages.nix: stripped extraneous whitespace
svn path=/nixpkgs/trunk/; revision=29109
2011-09-08 16:39:14 +00:00
Peter Simons
c292d234ea haskell-system-filepath: added version 0.4.1
haskell-system-fileio: added version 0.3.2

svn path=/nixpkgs/trunk/; revision=29100
2011-09-07 20:21:01 +00:00
Peter Simons
d923ec714e haskell-WebBits-Html: added version 1.0.2
svn path=/nixpkgs/trunk/; revision=29096
2011-09-07 17:30:07 +00:00
Peter Simons
460164c1b3 haskell-flapjax: build this package with the latest version of WebBits
svn path=/nixpkgs/trunk/; revision=29095
2011-09-07 17:30:02 +00:00
Peter Simons
437f2b0603 haskell-packages.nix: disable repaExamples in all instances of haskellPackages older than GHC 7.2
Without this hack, "nix-env -u *" would update repa-examples to the GHC 7.0.4
version, because the package isn't tagged with the version of the compiler.
Repa and friends don't build with older GHCs anymore, though.

svn path=/nixpkgs/trunk/; revision=29094
2011-09-07 17:29:59 +00:00
Peter Simons
41dcf578ef haskell-repa: updated to version 2.2.0.1
Note that the latest version requires GHC 7.2.1 or later; older GHC
versions are no longer supported.

svn path=/nixpkgs/trunk/; revision=29089
2011-09-07 17:29:38 +00:00
Peter Simons
4fba6f2bf3 haskell-vector: added version 0.9
svn path=/nixpkgs/trunk/; revision=29086
2011-09-07 16:53:27 +00:00
Peter Simons
0d137ccd67 haskell-primitive: added version 0.4.0.1
svn path=/nixpkgs/trunk/; revision=29085
2011-09-07 16:53:20 +00:00
Shea Levy
93be0770d7 Add unstable version of freerdp
svn path=/nixpkgs/trunk/; revision=29070
2011-09-07 03:41:18 +00:00
Shea Levy
02aa1d7cde Add cunit
svn path=/nixpkgs/trunk/; revision=29069
2011-09-07 01:12:38 +00:00
Shea Levy
84e3e287c3 Add freerdp
svn path=/nixpkgs/trunk/; revision=29068
2011-09-06 23:32:01 +00:00
Shea Levy
9dd496c687 highlight: Update to 3.5
svn path=/nixpkgs/trunk/; revision=29064
2011-09-06 17:10:08 +00:00
Peter Simons
bbc00bd0e7 haskell-packages.nix: removed more obsolete manual overrides
svn path=/nixpkgs/trunk/; revision=29042
2011-09-05 19:45:49 +00:00
Peter Simons
72ae88b019 haskell-WebBits: renamed nix file for consistency
svn path=/nixpkgs/trunk/; revision=29041
2011-09-05 19:45:45 +00:00
Peter Simons
b1277cea39 haskell-ghc-paths: updated default version to 0.1.0.8 (and dropped obsolete older versions)
svn path=/nixpkgs/trunk/; revision=29040
2011-09-05 19:31:49 +00:00
Peter Simons
65c90e5d01 haskell-packages.nix: removed lots of explicit argument assignments that have become obsolete
svn path=/nixpkgs/trunk/; revision=29038
2011-09-05 19:24:12 +00:00
Peter Simons
e373f558da haskell-X11: updated build expression
svn path=/nixpkgs/trunk/; revision=29036
2011-09-05 19:24:01 +00:00
Andres Löh
51124b08b5 Bumping the GHC HEAD snapshot.
svn path=/nixpkgs/trunk/; revision=29026
2011-09-05 13:29:33 +00:00
Nicolas Pierron
ad416e1cff Add additional Intel firmwares (naming iwlwifig2{a,b}-ucode).
svn path=/nixpkgs/trunk/; revision=29018
2011-09-05 08:33:03 +00:00
Nicolas Pierron
174153238a rdiff-backup: Fix nix expression.
svn path=/nixpkgs/trunk/; revision=29017
2011-09-05 08:32:55 +00:00
Peter Simons
92153bc2d5 haskell-xss-sanitize: dropped obsolete version 0.2.6
svn path=/nixpkgs/trunk/; revision=29004
2011-09-04 13:44:39 +00:00
Michael Raskin
09114ea858 Adding ZBar
svn path=/nixpkgs/trunk/; revision=29001
2011-09-04 09:12:00 +00:00
Peter Simons
c79027e3ab haskell-hxt: added version 9.1.4
haskell-hxt-charproperties: added version 9.1.0
haskell-hxt-regex-xmlschema: added version 9.0.1
haskell-hxt-unicode: added version 9.0.1

svn path=/nixpkgs/trunk/; revision=28995
2011-09-03 13:17:29 +00:00
Peter Simons
9bc7fee30d haskell-hS3: added version 0.5.6
svn path=/nixpkgs/trunk/; revision=28994
2011-09-03 13:17:23 +00:00
Russell O'Connor
2bc0a91739 bitcoin cannot use the recent versions of boost.
setting boost dependency to 1.44

svn path=/nixpkgs/trunk/; revision=28988
2011-09-02 20:19:42 +00:00
Peter Simons
35e1b7ddee haskell-vector-algorithms: updated to version 0.5.3
svn path=/nixpkgs/trunk/; revision=28985
2011-09-02 18:31:44 +00:00
Peter Simons
6295090cc6 haskell-unix-compat: added version 0.3
svn path=/nixpkgs/trunk/; revision=28984
2011-09-02 18:24:27 +00:00
Peter Simons
fb05c34051 haskell-HaskellForMaths: added version 0.3.4
svn path=/nixpkgs/trunk/; revision=28983
2011-09-02 18:20:35 +00:00
Andres Löh
33afa20575 Added HDBC-odbc.
svn path=/nixpkgs/trunk/; revision=28975
2011-09-02 15:11:52 +00:00
Eelco Dolstra
e8c849f8e3 * Re-enable the fbcondecor patch for Linux 2.6.35, seems to work fine.
svn path=/nixpkgs/trunk/; revision=28974
2011-09-02 13:41:38 +00:00
Michael Raskin
32754d3c19 Adding Regina-REXX interpreter
svn path=/nixpkgs/trunk/; revision=28969
2011-09-02 08:05:51 +00:00
Peter Simons
70c47021a7 haskell-xhtml: updated to version 3000.2.0.4
svn path=/nixpkgs/trunk/; revision=28962
2011-09-01 17:59:22 +00:00
Lluís Batlle i Rossell
bff99fe8b5 Making gcc 4.6 that of stdenv.
svn path=/nixpkgs/branches/stdenv-updates/; revision=28958
2011-09-01 14:28:13 +00:00
Michael Raskin
8fa5d91e51 adding VUE mindmapper
svn path=/nixpkgs/trunk/; revision=28957
2011-09-01 13:41:42 +00:00
Marco Maggesi
a02960ae4e Add clojure.
(Install with command
   nix-env -i clojure-wrapper
 start REPL with command
   clojure)


svn path=/nixpkgs/trunk/; revision=28956
2011-09-01 13:38:59 +00:00
Peter Simons
fe445aa5b2 haskell-xhtml: added version 3000.2.0.2
svn path=/nixpkgs/trunk/; revision=28940
2011-08-31 12:40:53 +00:00
Peter Simons
577ddef0be antiword: added version 0.37
svn path=/nixpkgs/trunk/; revision=28938
2011-08-31 11:55:51 +00:00
Rob Vermaas
4c7418cb29 add protobuf based on the default version in nixpkgs
svn path=/nixpkgs/trunk/; revision=28936
2011-08-30 19:57:29 +00:00
Rob Vermaas
a63bf23f32 add enum-0.4.4
svn path=/nixpkgs/trunk/; revision=28935
2011-08-30 19:50:36 +00:00
Peter Simons
1392096d69 Updated the default version of haskell-text to 0.11.1.5.
A growing number of packages don't build with the old version. I was
reluctant to make that change because Haskell Platform 2011.2.0.1 says
that text 0.11.0.6 ought to be used, but then HP says we shouldn't be
using GHC 7.0.4 either, yet we do. Anyway, upgrading the text library
caused no problems: all packages just built fine, so there you go.

svn path=/nixpkgs/trunk/; revision=28923
2011-08-30 09:49:04 +00:00
Peter Simons
fb37aed285 Dropped obsolete versions of haskell-HaXml.
svn path=/nixpkgs/trunk/; revision=28917
2011-08-30 08:55:14 +00:00
Michael Raskin
6a01304317 Adding TFTP-HPA
svn path=/nixpkgs/trunk/; revision=28915
2011-08-30 07:02:01 +00:00
Rob Vermaas
c508b4cf04 add get_iplayer 2.80
svn path=/nixpkgs/trunk/; revision=28912
2011-08-30 00:14:16 +00:00
Yury G. Kudryashov
94c6bb3ed4 Add kmymoney
svn path=/nixpkgs/trunk/; revision=28910
2011-08-29 22:43:11 +00:00
Peter Simons
d84962624e Dropped obsolete haskell-emgm.
The package doesn't build with any of our compilers.

svn path=/nixpkgs/trunk/; revision=28906
2011-08-29 21:46:22 +00:00
Peter Simons
6f23bfc52f Dropped obsolete haskell-MaybeT-transformers.
The package doesn't build with any of our compilers.

svn path=/nixpkgs/trunk/; revision=28904
2011-08-29 21:44:36 +00:00
Peter Simons
a96de07ceb Dropped obsolete Haskell packages monads-fd, salvia, and salvia-protocol.
These packages don't build with any of our compilers.

svn path=/nixpkgs/trunk/; revision=28903
2011-08-29 21:44:30 +00:00
Peter Simons
ddb2097b3f haskell-packages.nix: added shakespeare packages
haskell-shakespeare-css: added version 0.10.0
  haskell-shakespeare-js: added version 0.10.1
  haskell-shakespeare: added version 0.10.0

svn path=/nixpkgs/trunk/; revision=28888
2011-08-29 20:27:05 +00:00
Peter Simons
5eb504674a haskell-hamlet: added version 0.10.0
svn path=/nixpkgs/trunk/; revision=28887
2011-08-29 20:26:52 +00:00
Peter Simons
70f424ee5e haskell-xss-sanitize: added version 0.3.0.1
svn path=/nixpkgs/trunk/; revision=28886
2011-08-29 20:26:45 +00:00
Peter Simons
3895e45e51 haskell-blaze-textual-native: added version 0.2.1
svn path=/nixpkgs/trunk/; revision=28885
2011-08-29 20:26:40 +00:00
Peter Simons
1bc2601ae1 haskell-aeson-native: added version 0.3.3
svn path=/nixpkgs/trunk/; revision=28884
2011-08-29 20:26:35 +00:00
Peter Simons
7e2dcdc5ee pkgs/top-level/all-packages.nix: fixed Darwin build of haskellPackages_ghc704_{,no_}profiling
svn path=/nixpkgs/trunk/; revision=28880
2011-08-29 18:57:35 +00:00
Shea Levy
e309c50e7e Get libdrm to compile on darwin
The added patch uses mach_absolute_time() to get a nanosecond-resolution monotonic clock on darwin systems (See http://developer.apple.com/library/mac/#qa/qa1398/_index.html for an understanding of the added code). In addition, the patch changes one use of clock_gettime to gettimeofday since only resolution of a second is needed at that point. This code compiles on darwin, but the resulting library is not yet tested.

svn path=/nixpkgs/trunk/; revision=28879
2011-08-29 18:55:37 +00:00
Michael Raskin
b612e07c0b Adding atftp
svn path=/nixpkgs/trunk/; revision=28874
2011-08-29 12:47:39 +00:00
Michael Raskin
04e84c2c13 Adding netboot
svn path=/nixpkgs/trunk/; revision=28872
2011-08-29 10:16:36 +00:00
Peter Simons
7d9c4b06ad pkgs/top-level/all-packages.nix: don't use tabs for indention
svn path=/nixpkgs/trunk/; revision=28865
2011-08-29 07:46:38 +00:00
Peter Simons
b6d994e9b7 pkgs/top-level/all-packages.nix: bootstrap ghc 7.0.4 and 7.2.1 with 7.0.4-binary on Darwin
svn path=/nixpkgs/trunk/; revision=28864
2011-08-29 07:46:30 +00:00
Peter Simons
7d9ac73058 pkgs/top-level/all-packages.nix: strip trailing whitespace
svn path=/nixpkgs/trunk/; revision=28862
2011-08-29 07:39:08 +00:00
Shea Levy
346481f483 Add GHC 7.0.4 binary for x86_64-darwin
svn path=/nixpkgs/trunk/; revision=28859
2011-08-29 01:20:12 +00:00
Nicolas Pierron
d528cba5b8 fetchgit: Handle https.
svn path=/nixpkgs/trunk/; revision=28857
2011-08-28 16:03:14 +00:00
Michael Raskin
6a49d6a920 Re-add GNU TLS 2.12 - it does fix glib-networking
svn path=/nixpkgs/trunk/; revision=28853
2011-08-27 17:04:25 +00:00
Eelco Dolstra
3f02dcf735 * Fix indentation/layout.
svn path=/nixpkgs/trunk/; revision=28848
2011-08-27 15:19:19 +00:00
Eelco Dolstra
f823626fd8 * Get Firefox 6.0 to build with an upstream patch for building Firefox
separately from Xulrunner
  (https://bugzilla.mozilla.org/show_bug.cgi?id=639554).

svn path=/nixpkgs/trunk/; revision=28846
2011-08-27 13:44:36 +00:00
Yury G. Kudryashov
5d6cc2ef84 Add note about drop-kde4.5 branch
svn path=/nixpkgs/trunk/; revision=28841
2011-08-26 16:02:43 +00:00
Yury G. Kudryashov
2683407fe4 Add newer dbus and dbus-glib
Old versions are kept to prevent huge rebuild

svn path=/nixpkgs/trunk/; revision=28836
2011-08-26 14:57:48 +00:00
Eelco Dolstra
fde10569b0 * Added XML::LibXSLT.
* Updated XML::LibXML.

svn path=/nixpkgs/trunk/; revision=28835
2011-08-26 14:22:09 +00:00
Yury G. Kudryashov
597412252a Wrap kde-related packages in kdePackagesFor
This lets hydra build kde packages for all available KDE releases.
Will commit NixOS-fix in a few minutes.

svn path=/nixpkgs/trunk/; revision=28833
2011-08-26 13:49:23 +00:00
Yury G. Kudryashov
8c26e61e42 Remove outPath from dbus
This was a compatibility hack. Packages should depend on dbus.libs explicitly.
Should not change any hash. Will fix NixOS dbus.nix in the next commit.

svn path=/nixpkgs/trunk/; revision=28831
2011-08-26 13:46:32 +00:00
Peter Simons
becb1962c2 haskell-random: added version 1.0.1.0
svn path=/nixpkgs/trunk/; revision=28818
2011-08-26 09:20:54 +00:00
Peter Simons
dc7e7b7dcf haskell-extensible-exceptions: added version 0.1.1.3
svn path=/nixpkgs/trunk/; revision=28817
2011-08-26 09:20:42 +00:00
Eelco Dolstra
69a8ca2dc8 * Added Catalyst::View::JSON.
svn path=/nixpkgs/trunk/; revision=28815
2011-08-25 18:37:52 +00:00
Rob Vermaas
9690dc026b add dbench
svn path=/nixpkgs/trunk/; revision=28807
2011-08-25 01:00:25 +00:00
Peter Simons
c9914f5559 haskell-hackage-db: added version 1.0
svn path=/nixpkgs/trunk/; revision=28803
2011-08-24 22:04:38 +00:00
Yury G. Kudryashov
b65578c776 Trivial merge with trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=28802
2011-08-24 21:33:16 +00:00
Yury G. Kudryashov
c19d8396e4 Merge with udev-173 (trivial)
svn path=/nixpkgs/trunk/; revision=28800
2011-08-24 21:23:53 +00:00
Yury G. Kudryashov
2b619dd126 Merge with trunk (trivial svn merge URL/trunk)
svn path=/nixpkgs/branches/stdenv-updates/; revision=28799
2011-08-24 21:15:58 +00:00
Yury G. Kudryashov
7101fbff89 There is no pkgs.xfce4
svn path=/nixpkgs/trunk/; revision=28798
2011-08-24 20:41:02 +00:00