mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-26 23:52:33 +00:00
Code Issues Wiki Activity
52480 commits 232 branches 124 tags 7.3 GiB
Commit graph

1030 commits

Author SHA1 Message Date
Michael Raskin 90f1e5b672 Add V4L support to SANE 2012-10-06 22:42:06 +04:00
Eelco Dolstra 31f89ba349 Merge remote-tracking branch 'origin/master' into x-updates 2012-10-03 14:43:10 -04:00
Cillian de Róiste c073071e13 Patch JACK to be compatible with the 2.1.0 release of ffado 2012-10-01 22:28:12 +02:00
Eelco Dolstra 6f700142c4 cups: Drop unused dependencies and add libusb1 dependency 2012-09-28 23:20:59 -04:00
Eelco Dolstra 006002d16f Remove cups-pdf-filter 
It has been obsoleted by the cups-filters package.
 2012-09-28 15:09:14 -04:00
Eelco Dolstra 5046d0628f cups: Update to 1.6.1 2012-09-26 18:11:23 -04:00
Peter Simons 94da2e30dd ghostscript: cosmetic don't rely on magic URL syntax; URLs are strings 2012-09-06 18:34:18 +02:00
Peter Simons 52e5b8e2c5 ghostscript: cosmetic 
Refer to the source code as "src" rather than "data".
 2012-09-06 18:32:59 +02:00
Rob Vermaas 77948b7204 Remove old maven versions, aliased maven to maven3. Updated maven 3 to 3.0.4 2012-08-25 19:43:54 +02:00
Michael Raskin 2a2b52201e Wine: update to 1.5.10 2012-08-09 12:55:30 +04:00
Michael Raskin bdb1ccaf80 Lilypond: update to 2.14.2 2012-08-05 23:10:49 +04:00
Eelco Dolstra 0435f39008 wine: Update to 1.5.9 2012-07-22 01:18:02 -04:00
Peter Simons 0a7e280587 xscreensaver: update to version 5.18 2012-07-17 12:48:15 +02:00
Peter Simons f7a95ce194 wine: update to version 1.5.5 
Patch submitted by Jan Malakhovski <oxij@oxij.org>.
 2012-07-02 16:53:51 +02:00
Eelco Dolstra b5949d2509 busybox: Update to 1.20.1 2012-06-28 14:05:56 -04:00
Lluís Batlle i Rossell 002ffde4a4 trac: Removing the old misc/trac. 
There is a much newer trac at python-packages.nix, and it is used
by nixos' trac apache service.
 2012-06-27 22:34:27 +02:00
Antono Vasiljev 584ff70a16 Use installPhase instead of builder for BSOD 2012-06-25 18:04:08 +03:00
Antono Vasiljev 182f0dfe5e Added bsod emulator for unix 2012-06-25 17:25:01 +03:00
Peter Simons 7b14de6733 Add package for vlock from Debian mirror. 
This is mainly because the original upstream URL is not available anymore.

svn path=/nixpkgs/trunk/; revision=34442
 2012-06-11 07:16:11 +00:00
Yury G. Kudryashov 70dbdd0e5b cups-bjnp: fix FTBFS 
svn path=/nixpkgs/trunk/; revision=34410
 2012-06-09 20:10:40 +00:00
Yury G. Kudryashov 94726d19e7 gutenprint-5.2.7, fix FTBFS 
svn path=/nixpkgs/trunk/; revision=34409
 2012-06-09 20:10:35 +00:00
Lluís Batlle i Rossell f5cb1ecaf4 Updating the sheevaplug uboot. I've not tried it, but the old one disappeared from the server. 
svn path=/nixpkgs/trunk/; revision=34394
 2012-06-09 07:27:40 +00:00
Lluís Batlle i Rossell 6934b46182 Making a trick on myEnv so I can put the cross gcc and some 'propagatedBuildInputs', 
to have myEnv with cross-builders and cross-built libs.

(I'm trying by now to mingw64 + librsync.hostDrv)


svn path=/nixpkgs/trunk/; revision=34249
 2012-05-25 17:53:37 +00:00
Eelco Dolstra 1a22e9761d * By default, build a dynamically linked Busybox. In the initrd we 
need Glibc anyway, so there is no point in static linking.  This
  saves about a megabyte from the initrd.

svn path=/nixpkgs/trunk/; revision=34197
 2012-05-21 17:51:40 +00:00
Karn Kallio cccc48263f Sane backends URL seems to have changed. 
Also advance version to 1.0.22

svn path=/nixpkgs/trunk/; revision=33803
 2012-04-16 15:14:19 +00:00
Lluís Batlle i Rossell 9595946c73 Fixing details of debugVersion, and adding a 'symbolsVersion'. 
I could merge both into one, but I'll do that later.


svn path=/nixpkgs/trunk/; revision=33715
 2012-04-10 07:13:52 +00:00
Cillian de Roiste 11040732bd It seems to get stuck on the line break so I'm putting it all on one line now 
svn path=/nixpkgs/trunk/; revision=33672
 2012-04-08 12:03:15 +00:00
Cillian de Roiste d989f361ac Updating to 0.121.3, adding optional FireWire support and replacing composableDerivation with mkDerivation 
svn path=/nixpkgs/trunk/; revision=33666
 2012-04-08 00:16:59 +00:00
Cillian de Roiste bce9de06bd Adding firewire support 
svn path=/nixpkgs/trunk/; revision=33665
 2012-04-08 00:00:03 +00:00
Peter Simons b73fb52648 Oops, fixed typo from previous commit. 
svn path=/nixpkgs/trunk/; revision=33656
 2012-04-06 19:39:43 +00:00
Peter Simons 8beb891d52 xscreensaver: updated to version 5.15 (and moved to pkgs/misc/screensavers hierarchy) 
svn path=/nixpkgs/trunk/; revision=33655
 2012-04-06 19:30:30 +00:00
Peter Simons 44b6ab6d32 slock: updated to version 1.0 
svn path=/nixpkgs/trunk/; revision=33653
 2012-04-06 18:56:05 +00:00
Peter Simons f04ca020f3 xlockmore: updated to version 5.38 
svn path=/nixpkgs/trunk/; revision=33652
 2012-04-06 18:56:00 +00:00
Lluís Batlle i Rossell 6d23fe4501 Adding meta to busybox, and setting me as maintainer, and asking hydra to build it. 
svn path=/nixpkgs/trunk/; revision=33446
 2012-03-27 22:05:03 +00:00
Joachim Schiele 9f73f39527 renamed load-sdl-env to load-env-sdl so that 'nix-env -i env-sdl' and 'load-env-sdl' have a common naming scheme 
svn path=/nixpkgs/trunk/; revision=33421
 2012-03-26 10:20:32 +00:00
Lluís Batlle i Rossell fc3ac31540 Updating the script of loading myEnv environments, for something close to what I was using. 
It sets a fixed PS1, maybe breaking someone's taste, though. But I find it easier to use.


svn path=/nixpkgs/trunk/; revision=33304
 2012-03-20 18:49:44 +00:00
Joachim Schiele fc152de1c2 rewrote the text to make virics and my edits seem like from one author 
svn path=/nixpkgs/trunk/; revision=33298
 2012-03-20 14:51:18 +00:00
Cillian de Roiste ec78373642 Update jackdbus to 1.9.8 
svn path=/nixpkgs/trunk/; revision=33218
 2012-03-17 22:03:15 +00:00
Shea Levy 5f6bb1fce6 Ghostscript: Fix darwin build 
svn path=/nixpkgs/trunk/; revision=33160
 2012-03-16 14:27:58 +00:00
Joachim Schiele f108651e9f fixed forgotten bracket.... maybe this is not my-env at all 
svn path=/nixpkgs/trunk/; revision=33095
 2012-03-14 23:38:28 +00:00
Lluís Batlle i Rossell 914a042d7d Fixing some details about the myEnv documentation. 
I thought load-xxx-eenv worked like my own private 'loadenv' script, but looks like not.


svn path=/nixpkgs/trunk/; revision=33093
 2012-03-14 23:07:59 +00:00
Yury G. Kudryashov 68fe867e19 Get rid of most references to gtkLibs 
svn path=/nixpkgs/trunk/; revision=33088
 2012-03-14 21:57:32 +00:00
Lluís Batlle i Rossell 635d1d9bec I try to improve the documentation on my-env 
svn path=/nixpkgs/trunk/; revision=33075
 2012-03-14 18:59:09 +00:00
Joachim Schiele 7bf2d4966e some more comments and examples 
svn path=/nixpkgs/trunk/; revision=33073
 2012-03-14 18:46:18 +00:00
Joachim Schiele 0416bc1ddb added a few fixes from the discussion on irc with marc weber 
svn path=/nixpkgs/trunk/; revision=33072
 2012-03-14 18:18:49 +00:00
Lluís Batlle i Rossell 5ada5e0712 Updating busybox and fixing its configurator. 
svn path=/nixpkgs/trunk/; revision=32998
 2012-03-11 21:23:15 +00:00
Lluís Batlle i Rossell 6bb466ed9b Making GPL Ghostscript use the system libraries (libjpeg, libpng, ...) so 
the previous troubles with a mixture of libpng versions fade away.

I also enable back GPL Ghostscript as the default.

I checked that 'awesome' builds fine (it calls imagemagick for some pictures in
its build script), as a proof that imagemagick does not crash anymore.


svn path=/nixpkgs/trunk/; revision=32958
 2012-03-09 17:15:11 +00:00
Peter Simons a98e6bdc29 pdf-filter.nix: strip trailing whitespace 
svn path=/nixpkgs/trunk/; revision=32950
 2012-03-09 10:22:34 +00:00
Peter Simons 70fca00b78 cups-pdf-filter: register MIME conversions from PDF to PS 
CUPS 1.5.x doesn't do that automatically anymore.

svn path=/nixpkgs/trunk/; revision=32949
 2012-03-09 10:22:30 +00:00
Lluís Batlle i Rossell e277e44e34 Updating GPL Ghostscript. 
svn path=/nixpkgs/trunk/; revision=32914
 2012-03-08 22:28:26 +00:00
Lluís Batlle i Rossell 02ac39aef8 Setting myself as maintainer for xsane and cdecl, and telling hydra to build them. 
svn path=/nixpkgs/trunk/; revision=32868
 2012-03-07 22:20:23 +00:00
Lluís Batlle i Rossell 65f45ef322 Updating xsane, and making it build with the old libpng. The previous url is gone. 
svn path=/nixpkgs/trunk/; revision=32862
 2012-03-07 21:59:48 +00:00
Peter Simons 0be4183bd5 cups: updated to version 1.5.2 
svn path=/nixpkgs/trunk/; revision=32829
 2012-03-06 16:02:04 +00:00
Michael Raskin ef3a71007a Forgotten part of xsane: Use libpng specified, not the one propagated 
svn path=/nixpkgs/trunk/; revision=32822
 2012-03-06 12:21:09 +00:00
Yury G. Kudryashov 57fd764a39 svn merge ^/nixpkgs/trunk 
svn path=/nixpkgs/branches/stdenv-updates/; revision=32792
 2012-03-05 10:00:23 +00:00
Yury G. Kudryashov 84fb9ca331 svn merge ^/nixpkgs/trunk 
svn path=/nixpkgs/branches/libpng15/; revision=32719
 2012-03-01 15:05:27 +00:00
Yury G. Kudryashov 0210e20b5a svn merge ^/nixpkgs/trunk 
svn path=/nixpkgs/branches/stdenv-updates/; revision=32713
 2012-03-01 07:04:39 +00:00
Arie Middelkoop 298f4df4af Changed 'myEnvFun' to in addition put a script in 'bin' so that you can run '. load-<name>-env' to load your environment. 
svn path=/nixpkgs/trunk/; revision=32690
 2012-02-29 12:55:51 +00:00
Yury G. Kudryashov c615cbae70 svn merge ^/nixpkgs/trunk 
svn path=/nixpkgs/branches/libpng15/; revision=32099
 2012-02-07 09:38:20 +00:00
Yury G. Kudryashov 215a07c1a9 svn merge ^/nixpkgs/trunk 
Merge conflicts:
* unzip (almost trivial)
* dvswitch (trivial)
* gmp (copied result of `git merge`)

The last item introduced gmp-5.0.3, thus full rebuild.
+ensureDir->mkdir -p in TeX packages was catched by git but not svn.

svn path=/nixpkgs/branches/stdenv-updates/; revision=32091
 2012-02-06 23:03:12 +00:00
Peter Simons b69d6bf7e0 Moved all LaTeX expressions into tools/typesetting hierarchy. 
svn path=/nixpkgs/trunk/; revision=32028
 2012-02-04 09:31:07 +00:00
Yury G. Kudryashov df037ddafd svn merge ^/nixpkgs/trunk 
svn path=/nixpkgs/branches/libpng15/; revision=31987
 2012-02-02 20:36:11 +00:00
Yury G. Kudryashov 9d67ff2a48 Remove glib-1.x and its reverse dependencies 
Nobody told me that he uses generator or xmms, so I'm removing this old stuff.

svn path=/nixpkgs/trunk/; revision=31907
 2012-01-28 13:06:07 +00:00
Yury G. Kudryashov e155073b2c svn merge ^/nixpkgs/trunk 
svn path=/nixpkgs/branches/libpng15/; revision=31888
 2012-01-27 17:49:20 +00:00
Yury G. Kudryashov b31c67e24d svn merge ^/nixpkgs/trunk 
svn path=/nixpkgs/branches/stdenv-updates/; revision=31887
 2012-01-27 16:43:39 +00:00
Ludovic Courtès 41445f89c3 TeXLive/ModernCV: Fix source hash. 
svn path=/nixpkgs/trunk/; revision=31881
 2012-01-27 14:40:58 +00:00
Yury G. Kudryashov 5b132f6e96 svn merge ^/nixpkgs/trunk 
Conflicts: cups, all-packages.nix (gcc45_debug)

svn path=/nixpkgs/branches/stdenv-updates/; revision=31863
 2012-01-26 15:27:03 +00:00
Yury G. Kudryashov 2ced89b7f1 svn merge ^/nixpkgs/trunk 
svn path=/nixpkgs/branches/libpng15/; revision=31846
 2012-01-26 08:45:19 +00:00
Eelco Dolstra f878980c8b * Fix building Dosbox with GCC 4.6. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=31796
 2012-01-23 17:21:37 +00:00
Peter Simons 33cfa26445 cups: don't build with dbus support on non-Linux platforms 
svn path=/nixpkgs/trunk/; revision=31769
 2012-01-21 18:46:09 +00:00
Peter Simons 9c55349494 cups: cosmetic, no functional change 
svn path=/nixpkgs/trunk/; revision=31746
 2012-01-20 18:08:54 +00:00
Peter Simons c99249d0c2 cups: blind attempt to fix the CUPS build for non-Linux platforms, particularly Darwin 
svn path=/nixpkgs/trunk/; revision=31745
 2012-01-20 18:08:50 +00:00
Eelco Dolstra bafc4ff59d * Sync with the trunk. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=31739
 2012-01-20 15:29:04 +00:00
Yury G. Kudryashov 734de478a6 svn merge ^/nixpkgs/trunk, no conflicts 
svn path=/nixpkgs/branches/libpng15/; revision=31731
 2012-01-20 00:50:16 +00:00
Peter Simons bf71d12fd4 texlive-moderncv: updated to version 2012.01.16 
svn path=/nixpkgs/trunk/; revision=31725
 2012-01-19 22:10:41 +00:00
Eelco Dolstra 6208059079 * The postHook substitution is not used anywhere, so get rid of it. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=31702
 2012-01-19 15:39:12 +00:00
Eelco Dolstra c556a6ea46 * "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless 
function, so obsolete it.

svn path=/nixpkgs/branches/stdenv-updates/; revision=31644
 2012-01-18 20:16:00 +00:00
Yury G. Kudryashov 13c81f6c79 svn merge ^/nixpkgs/trunk 
svn path=/nixpkgs/branches/libpng15/; revision=31568
 2012-01-14 21:40:24 +00:00
Yury G. Kudryashov 0c79434ccb svn merge ^/nixpkgs/trunk 
svn path=/nixpkgs/branches/stdenv-updates/; revision=31567
 2012-01-14 21:34:37 +00:00
Peter Simons 0d69e2a9d0 ghostscript: cosmetic change to simplify the DLL build and install procedure 
svn path=/nixpkgs/trunk/; revision=31488
 2012-01-11 23:14:12 +00:00
Peter Simons 1aaf70f4d7 ghostscript: CUPS support is no longer enabled by default in version 9.x 
We must explicitly give the "--with-install-cups" option at configure time to
get the gstoraster filter installed.

svn path=/nixpkgs/trunk/; revision=31487
 2012-01-11 23:14:07 +00:00
Yury G. Kudryashov 9ee0a9df9b svn merge ^/nixpkgs/trunk 
A few trivial conflicts

svn path=/nixpkgs/branches/stdenv-updates/; revision=31434
 2012-01-08 16:01:12 +00:00
Yury G. Kudryashov ca28f8ce31 svn merge ^/nixpkgs/trunk 
svn path=/nixpkgs/branches/libpng15/; revision=31430
 2012-01-07 22:43:23 +00:00
Yury G. Kudryashov 7e320a7043 State qt version (3/4) in packages, not in all-packages.nix 
svn path=/nixpkgs/trunk/; revision=31406
 2012-01-07 17:06:49 +00:00
Lluís Batlle i Rossell d391d56f97 Setting the nanonote uboot to load 4MiB, and not 2MiB. My last 2.6.37 kernel 
has more than 2MiB.


svn path=/nixpkgs/trunk/; revision=31393
 2012-01-07 09:20:16 +00:00
Yury G. Kudryashov 3d61c49b42 svn merge ^/nixpkgs/trunk 
svn path=/nixpkgs/branches/stdenv-updates/; revision=31268
 2012-01-04 09:54:17 +00:00
Yury G. Kudryashov bdb01cc707 svn merge /path/to/nixpkgs/trunk 
svn path=/nixpkgs/branches/libpng15/; revision=31266
 2012-01-04 09:45:28 +00:00
Karn Kallio 0e1ea067ab Cause ghostscript to build libgs. 
This fixes the failed build of libspectre.

svn path=/nixpkgs/trunk/; revision=31260
 2012-01-04 00:26:48 +00:00
Yury G. Kudryashov b0f1da6b75 svn merge /path/to/nixpkgstrunk; resolve ghostscript as "theirs-full" 
svn path=/nixpkgs/branches/libpng15/; revision=31250
 2012-01-03 18:13:10 +00:00
Yury G. Kudryashov ec3f38712a svn merge /path/to/trunk; svn revert path/to/cmake/default.nix 
svn path=/nixpkgs/branches/stdenv-updates/; revision=31249
 2012-01-03 18:04:57 +00:00
Peter Simons b916544651 Updated GNU ghostscript to version 9.04.1. 
- Merged the builder.sh file into the expression itself.

 - Need to force "-lz" flag to fix linker errors. This is probably a bug
   in the build system, so further updates may not need that hack.

 - Need to force "-rpath=${freetype}/lib" flag to fix run-time errors
   because gs can't find the libfreetype.so.6 library. I don't quite
   understand why that path isn't hard-coded to begin with.

svn path=/nixpkgs/trunk/; revision=31247
 2012-01-03 17:50:10 +00:00
Yury G. Kudryashov 08761e83fc Merge trunk 
svn path=/nixpkgs/branches/stdenv-updates/; revision=31207
 2012-01-02 14:12:40 +00:00
Yury G. Kudryashov 455d1e934b Merge trunk 
svn path=/nixpkgs/branches/libpng15/; revision=31205
 2012-01-02 13:43:54 +00:00
Lluís Batlle i Rossell be12dae1ec Fixing the busybox installation. All symlinks were pointing wrong. 
svn path=/nixpkgs/trunk/; revision=31191
 2012-01-01 20:14:50 +00:00
Yury G. Kudryashov 571365c5bd Merge trunk into branches/libpng15. No conflicts. 
svn path=/nixpkgs/branches/libpng15/; revision=30917
 2011-12-15 20:14:55 +00:00
Eelco Dolstra eda3fd1730 * Sync with the trunk. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=30852
 2011-12-12 16:54:35 +00:00
Eelco Dolstra 3ea1c30846 * Remove the NIX_STRIP_DEBUG flag. It was undocumented and confusing 
in its interaction with the ‘dontStrip’ attribute.

svn path=/nixpkgs/branches/stdenv-updates/; revision=30848
 2011-12-12 14:02:12 +00:00
Michael Raskin c09dbda83e Rebuild-checked: does not break boot 
svn path=/nixpkgs/trunk/; revision=30817
 2011-12-10 05:05:15 +00:00
Shea Levy 1be13f458f Apply mornfall's SANE patches 
Fix sane-backends to generate udev rules, add a snapshot of sane-backends's unstable repo, and add a SANE nixos module

svn path=/nixpkgs/trunk/; revision=30764
 2011-12-05 17:32:45 +00:00
Eelco Dolstra 050ea14022 * DBLaTeX updated to 0.3.2. 
svn path=/nixpkgs/trunk/; revision=30523
 2011-11-22 12:59:22 +00:00
Michael Raskin 279e5fb324 Update Wine 
svn path=/nixpkgs/trunk/; revision=30366
 2011-11-10 04:31:52 +00:00
Peter Simons f68e44a602 cups: updated to version 1.5.0 
svn path=/nixpkgs/branches/stdenv-updates/; revision=29681
 2011-10-06 09:57:32 +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
Yury G. Kudryashov 8b511df7b9 Fix visualboyadvance compilation with libpng-1.5; patch from gentoo 
svn path=/nixpkgs/branches/libpng15/; revision=29651
 2011-10-05 06:33:10 +00:00
Yury G. Kudryashov 85fc2de83e svn merge trunk 
svn path=/nixpkgs/branches/libpng15/; revision=29627
 2011-10-04 13:12:45 +00:00
Peter Simons f74e361e45 added myself as maintainer 
svn path=/nixpkgs/branches/stdenv-updates/; revision=29618
 2011-10-03 20:50:08 +00:00
Eelco Dolstra fc77db6d21 * Wine 1.3.29. 
svn path=/nixpkgs/trunk/; revision=29617
 2011-10-03 20:42:45 +00:00
Yury G. Kudryashov d0654efc84 ghostscript: build with libpng-1.5 
svn path=/nixpkgs/branches/libpng15/; revision=29599
 2011-10-03 15:30:10 +00:00
Peter Simons 0be69080e8 pkgs/misc/cups/drivers/splix: added myself as a maintainer 
svn path=/nixpkgs/trunk/; revision=29400
 2011-09-20 20:25:26 +00:00
Alexander Tsamutali f7567f8717 misc/screensavers/slock: New nixpkg. 
svn path=/nixpkgs/trunk/; revision=29326
 2011-09-17 17:40:07 +00:00
Russell O'Connor eaa3e31695 Reverting CUPS update. 
svn path=/nixpkgs/trunk/; revision=29282
 2011-09-14 17:57:49 +00:00
Russell O'Connor 15293fa398 Upgrading cups to 1.5.0 
(this fixes http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=634325)


svn path=/nixpkgs/trunk/; revision=29237
 2011-09-13 13:57:46 +00:00
Michael Raskin f00f3ef88d Fix disser build 
svn path=/nixpkgs/trunk/; revision=29230
 2011-09-12 20:50:07 +00:00
Michael Raskin ce77d02c9e Update Wine 
svn path=/nixpkgs/trunk/; revision=28844
 2011-08-27 07:22:17 +00:00
Lluís Batlle i Rossell b58016b007 Updating the nongnu ghostscript 
svn path=/nixpkgs/trunk/; revision=28790
 2011-08-24 15:44:54 +00:00
Yury G. Kudryashov 385ae7d2c4 Let cups-pdf-filter use cups.src 
svn path=/nixpkgs/trunk/; revision=28652
 2011-08-18 12:52:22 +00:00
Peter Simons 01d9831f4b pkgs/misc/misc.nix: removed the warning I added earlier 
What I did was to add two versions of the same package into the same
collection, i.e. ghc-7.0.4 and ghc-7.2.1. I was surprised to see the
build succeed, because there are file collisions between these two. So I
(wrongly) assumed that the collection function was to blame, but in fact
this is a "feature" of nix-env. Apparently, file collision detection
doesn't take place when the user installs two versions of the same
package simultaneously. File collisions are detected only between
different packages!

For example, the command

  nix-env -i ghc-7.0.4 ghc-7.2.1-wrapper

is going to fail, but

  nix-env -i ghc-7.0.4-wrapper ghc-7.2.1-wrapper

is going to succeed. Maybe I just didn't read the documentation
thoroughly enough, but this behavior sure is unexpected to me.

svn path=/nixpkgs/trunk/; revision=28638
 2011-08-16 23:42:29 +00:00
Peter Simons 1e7f572683 pkgs/misc/misc.nix: document the fact that 'collection' does not detect file collisions 
svn path=/nixpkgs/trunk/; revision=28610
 2011-08-16 13:03:46 +00:00
Shea Levy 3afb3eba27 busybox: Bump to 1.19.0 
svn path=/nixpkgs/trunk/; revision=28548
 2011-08-13 20:41:49 +00:00
Shea Levy 03b53d595d busybox: Move $out/usr/{s,}bin to $out/{s,}bin 
svn path=/nixpkgs/trunk/; revision=28547
 2011-08-13 20:41:40 +00:00
Eelco Dolstra ae6fa8071f * Wine updated to 1.3.26. 
svn path=/nixpkgs/trunk/; revision=28209
 2011-08-06 23:26:38 +00:00
Cillian de Roiste a751ada1ce Updating oxygen-gtk to 1.1.1 
svn path=/nixpkgs/trunk/; revision=28191
 2011-08-06 10:33:52 +00:00
Eelco Dolstra fcce78c0f4 * Sync with the trunk. 
svn path=/nixpkgs/branches/kde-4.7/; revision=28144
 2011-08-03 22:00:49 +00:00
Michael Raskin 6e2572440a Update Wine 
svn path=/nixpkgs/trunk/; revision=28126
 2011-08-02 18:58:42 +00:00
Eelco Dolstra 1b427fe052 * Sync with the trunc. 
* Fixed the hash in PulseAudio: I updated the name/version, but forgot
  to update the hash.  So secretly it was still building the old
  version.  Also, now that we've realised that the PulseAudio server
  and library don't need to be the same build, disable some
  dependencies by default (avahi and bluez).

svn path=/nixpkgs/branches/kde-4.7/; revision=28023
 2011-07-31 19:44:58 +00:00
Sander van der Burg 14be409d8f Removed hardcoded paths to /bin and /usr/bin 
svn path=/nixpkgs/trunk/; revision=27906
 2011-07-22 20:09:00 +00:00
Sander van der Burg f635aceb5b Updated some meta information for the emulators I've tried recently. They all seem to work fine :-) 
svn path=/nixpkgs/trunk/; revision=27905
 2011-07-22 19:25:31 +00:00
Sander van der Burg 6ac699ba97 Added VisualBoy advance; a gameboy/gameboy color/gameboy advance emulator 
svn path=/nixpkgs/trunk/; revision=27904
 2011-07-22 18:31:42 +00:00
Sander van der Burg cb8409612c Added Mupen64 Plus, a nintendo 64 emulator 
svn path=/nixpkgs/trunk/; revision=27902
 2011-07-22 14:03:23 +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
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 758e85cfac texlive: fixed erroneous forwarder scripts 
- Generate a forwarder scripts only for executable files. This change
   removes the broken 'man' script, for example.

 - Run the real binaries with 'exec'.

 - Use $SHELL to interpret the forwarder scripts rather than /bin/sh.

 - Indent consistently with blanks.

 - Removed some debug output from the build expression.

svn path=/nixpkgs/trunk/; revision=27679
 2011-07-08 22:45:23 +00:00
Eelco Dolstra 5caed864e5 * CUPS updated to 1.4.7. 
svn path=/nixpkgs/branches/kde-4.7/; revision=27620
 2011-07-07 13:11:51 +00:00
Sander van der Burg b2548922bf Added UAE: Ultimate Amiga Emulator 
svn path=/nixpkgs/trunk/; revision=27541
 2011-06-26 19:49:51 +00:00
Sander van der Burg e4126afa44 Added ZSNES emulator package 
svn path=/nixpkgs/trunk/; revision=27539
 2011-06-25 22:25:50 +00:00
Eelco Dolstra 614e5a525c * Clean up foomatic-filters. 
svn path=/nixpkgs/trunk/; revision=27470
 2011-06-15 12:40:58 +00:00
Michael Raskin db4fdfec67 Update Wine 
svn path=/nixpkgs/trunk/; revision=27416
 2011-06-11 07:26:37 +00:00
Lluís Batlle i Rossell c6d377eadf Adding mainline ghostscript as an option. 
svn path=/nixpkgs/trunk/; revision=27297
 2011-05-24 15:35:38 +00:00
Rob Vermaas 77db753065 update maven3 
svn path=/nixpkgs/trunk/; revision=27233
 2011-05-12 08:39:09 +00:00
Cillian de Roiste 3fb9e2214b Replacing JACK1 with JACK2 (also jackdbus instead of jackd), this works much better for me 
svn path=/nixpkgs/trunk/; revision=27205
 2011-05-09 20:49:51 +00:00
Shea Levy 5acb2cbb1e Fix typo in pkgs/misc/misc.nix 
svn path=/nixpkgs/trunk/; revision=27152
 2011-05-04 18:55:22 +00:00
Michael Raskin 9926941bf2 Fixing forgotten hash for Wine update 
svn path=/nixpkgs/trunk/; revision=27065
 2011-04-30 19:42:48 +00:00
Michael Raskin bb809bb2c3 Update Wine 
svn path=/nixpkgs/trunk/; revision=27063
 2011-04-30 16:32:53 +00:00
Cillian de Roiste 59f16bc779 Fixing the url for jack 
svn path=/nixpkgs/trunk/; revision=26934
 2011-04-23 13:16:33 +00:00
Cillian de Roiste 55bbbbaf84 Updating jack to version 0.120.1 (some newer applications e.g. Yoshimi require a more recent version) 
svn path=/nixpkgs/trunk/; revision=26932
 2011-04-23 12:50:03 +00:00
Nicolas Pierron f40afa1ade tex4ht: Fix package location. 
svn path=/nixpkgs/trunk/; revision=26863
 2011-04-17 08:27:16 +00:00
Nicolas Pierron 0069aa0637 texlive Aggregate: 
- Add bouncer to binaries stored in /bin directory.
- Avoid manipulation of patterns as a match.

svn path=/nixpkgs/trunk/; revision=26862
 2011-04-17 08:27:09 +00:00
Lluís Batlle i Rossell a602209a6b Fixing the name of darcnes. 
svn path=/nixpkgs/trunk/; revision=26552
 2011-03-27 20:14:42 +00:00
Lluís Batlle i Rossell bd3f5e7340 Adding a key 'exit 0' to myenv. Otherwise it fails to build if pkgconfig is one of the build inputs. 
svn path=/nixpkgs/trunk/; revision=26547
 2011-03-27 14:08:13 +00:00
Eelco Dolstra 20912b654b * runLaTeX: detect the existence of a pre-generated .bbl file and use 
it.  Useful if you're supposed to stick a \balancecolumns in the
  middle of the file.

svn path=/nixpkgs/trunk/; revision=26522
 2011-03-26 00:14:28 +00:00
Lluís Batlle i Rossell ef57b57b92 Adding two NES emulators. 
Because of them, I made allegro build the allegrogl library.
I also added the HawkNL library.


svn path=/nixpkgs/trunk/; revision=26517
 2011-03-25 22:15:48 +00:00
Yury G. Kudryashov ba3c547f6d Fixing hardcoded paths in foo2zjs. Still no firmware 
svn path=/nixpkgs/trunk/; revision=26332
 2011-03-15 23:08:59 +00:00
Eelco Dolstra 37a95e0084 * Fix the gens-gs build (http://hydra.nixos.org/build/955354). 
svn path=/nixpkgs/branches/x-updates/; revision=26297
 2011-03-14 10:54:10 +00:00
Eelco Dolstra f16a2dc2f6 * Sync with the trunk. Remove glib_2_28 because the branch already 
has it.

svn path=/nixpkgs/branches/x-updates/; revision=26189
 2011-03-07 12:17:12 +00:00
Yury G. Kudryashov da4447afd7 foo2zjs: less hardcoded paths 
svn path=/nixpkgs/trunk/; revision=26179
 2011-03-06 16:07:53 +00:00
Yury G. Kudryashov 513ee9fc4f hplip-3.11.1, enable polkit support 
svn path=/nixpkgs/trunk/; revision=26178
 2011-03-06 16:07:47 +00:00
Yury G. Kudryashov d1d9da2ff3 Trying to fix foo2zjs 
There are still some hardcoded paths

svn path=/nixpkgs/trunk/; revision=26177
 2011-03-06 16:07:43 +00:00
Eelco Dolstra d6c6f9f0e0 * Sync with the trunk. 
svn path=/nixpkgs/branches/x-updates/; revision=26018
 2011-02-17 16:33:39 +00:00
Cillian de Roiste da00930257 Adding version, fixing the mirror path and the license and adding myself as maintainer 
svn path=/nixpkgs/trunk/; revision=26005
 2011-02-16 23:52:14 +00:00
Cillian de Roiste e80dc8eb7f Applying a patch for pstoraster, without this the cups test page was printing solid black, as described in the bug report: http://bugs.ghostscript.com/show_bug.cgi?id=691108 The patch was kindly taken from https://bugs.archlinux.org/task/18339 
svn path=/nixpkgs/trunk/; revision=26003
 2011-02-16 23:34:19 +00:00
Eelco Dolstra a08d99715d * Sync with the trunk. 
svn path=/nixpkgs/branches/x-updates/; revision=25900
 2011-02-11 13:08:45 +00:00
Cillian de Roiste 42f818969d Bumping to version 5.2.6 and fixing the url 
svn path=/nixpkgs/trunk/; revision=25858
 2011-02-09 20:34:52 +00:00
Eelco Dolstra b8e7238254 * CUPS updated to 1.4.6. 
svn path=/nixpkgs/branches/x-updates/; revision=25823
 2011-02-09 10:45:45 +00:00
Michael Raskin c6ee103fc3 Update paths - does not fix all the problems, apparently 
svn path=/nixpkgs/trunk/; revision=25714
 2011-01-28 10:22:30 +00:00
Michael Raskin 2990b8fb5a Install PPD files, too 
svn path=/nixpkgs/trunk/; revision=25713
 2011-01-28 09:06:21 +00:00
Michael Raskin 1cd5efa338 Trying to add foomatic-filters and foo2zjs 
svn path=/nixpkgs/trunk/; revision=25712
 2011-01-28 08:44:31 +00:00
Peter Simons edfedf6736 pkgs/misc/emulators/wine: enable Hydra builds on x86_64-linux 
Wine is supposed to compile on both 32 and 64-bit Linux. When I try to build
it in a 64 bit environment, however, the build fails while compiling libgmp,
saying that the C compiler in bootstrap-tools doesn't support C++. I'm not
sure why that happens. Hopefully, the builds in Hydra give me some clue
about this phenomenon.

svn path=/nixpkgs/trunk/; revision=25693
 2011-01-26 15:39:40 +00:00
Cillian de Roiste 5f3455dde5 Adding the Oxygen-GTK theme 
svn path=/nixpkgs/trunk/; revision=25676
 2011-01-23 21:04:12 +00:00
Michael Raskin c54320c307 Adding Rosegarden music editor; builds succesfully, starts, but frequently segfaults. I temporarily give up 
svn path=/nixpkgs/trunk/; revision=25527
 2011-01-12 19:01:26 +00:00
Michael Raskin c05a95f8f6 Update Lilypond - this also fixes its build 
svn path=/nixpkgs/trunk/; revision=25525
 2011-01-12 18:19:43 +00:00
Yury G. Kudryashov 35fe5dadb1 splix-2.0.0: fix compilation with gcc-4.5 
svn path=/nixpkgs/branches/stdenv-updates/; revision=25312
 2010-12-28 18:47:41 +00:00
Eelco Dolstra aa6f43149a * Sync with the trunk. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=25308
 2010-12-28 16:42:00 +00:00
Karn Kallio 4bbb72da2f Add tex macro lkproof for making proof figures. 
svn path=/nixpkgs/trunk/; revision=25277
 2010-12-25 18:06:36 +00:00
Lluís Batlle i Rossell b48b2a7bb4 Merging from trunk. I solved some trivial merge conflicts. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=25188
 2010-12-17 20:39:58 +00:00
Yury G. Kudryashov d1781e4b41 Add pdftops CUPS filter 
I've packaged this as a separate expression because it depends on poppler (why
don't they look for pdftops on runtime?..).

svn path=/nixpkgs/trunk/; revision=25124
 2010-12-14 13:30:17 +00:00
Yury G. Kudryashov a28a75f737 cups-1.4.5, add acl support 
svn path=/nixpkgs/trunk/; revision=25123
 2010-12-14 13:30:12 +00:00
Lluís Batlle i Rossell ee04ffcb55 Updating from trunk. I resolved simple conflicts. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=25061
 2010-12-11 12:47:00 +00:00
Michael Raskin 961c737634 Update Wine 
svn path=/nixpkgs/trunk/; revision=24892
 2010-11-27 18:41:49 +00:00
Lluís Batlle i Rossell 5007314654 Updating busybox 
svn path=/nixpkgs/branches/stdenv-updates/; revision=24850
 2010-11-25 09:05:04 +00:00
Lluís Batlle i Rossell df8db9a701 Making the nanonote uboot not start the default console in ttyS0, but in tty0 
instead.
It's more comfortable for those not having a serial line attached to it.


svn path=/nixpkgs/branches/stdenv-updates/; revision=24828
 2010-11-23 20:46:45 +00:00
Michael Raskin 6af8a1debd Merging from trunk 
svn path=/nixpkgs/branches/stdenv-updates/; revision=24804
 2010-11-22 11:39:42 +00:00
Lluís Batlle i Rossell 7715dc2beb Updating busybox. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=24800
 2010-11-21 20:39:52 +00:00
Rob Vermaas db8748b170 added eclipse 3.6.1, maven3, szip 
svn path=/nixpkgs/trunk/; revision=24772
 2010-11-19 13:24:11 +00:00
Lluís Batlle i Rossell d7b494a2f4 Updating from trunk to get a security fix on openssl. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=24759
 2010-11-18 20:00:39 +00:00
Sander van der Burg 239c243b0e Updated vice to version 2.2 
svn path=/nixpkgs/trunk/; revision=24756
 2010-11-18 13:59:25 +00:00
Michael Raskin fb58f74d82 Updating from trunk again 
svn path=/nixpkgs/branches/stdenv-updates/; revision=24745
 2010-11-17 17:03:09 +00:00
Evgeny Egorochkin 6748294477 wine-warcraft: add missing deps 
svn path=/nixpkgs/trunk/; revision=24683
 2010-11-14 08:57:42 +00:00
Lluís Batlle i Rossell f4f84af4ab Updating from trunk. I only had to take away the usual stdenv2 in 
all-packages.nix


svn path=/nixpkgs/branches/stdenv-updates/; revision=24553
 2010-10-31 19:30:31 +00:00
Eelco Dolstra ca4a6cc933 * Hack to handle PGF/TikZ constructs that require an additional run. 
svn path=/nixpkgs/trunk/; revision=24505
 2010-10-27 16:09:07 +00:00
Lluís Batlle i Rossell 6dc839d344 Merging from trunk. I resolved some conflicts; I hope that well. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=24429
 2010-10-23 14:52:21 +00:00
Evgeny Egorochkin a1b688cbfd Wine-Warcraft: minor cleanup 
svn path=/nixpkgs/trunk/; revision=24307
 2010-10-15 20:06:20 +00:00
Evgeny Egorochkin 9822e68b19 sane-backends: fix firmware loading for gt86xx-based scanners 
svn path=/nixpkgs/trunk/; revision=24280
 2010-10-14 11:54:19 +00:00
Lluís Batlle i Rossell e7e103b8eb Updating from trunk (to catch cron changes) 
svn path=/nixpkgs/branches/stdenv-updates/; revision=24200
 2010-10-10 11:44:28 +00:00
Michael Raskin d61a0a42ca Update wine 
svn path=/nixpkgs/trunk/; revision=24166
 2010-10-08 05:33:59 +00:00
Lluís Batlle i Rossell fca582bff0 Updating from trunk. I had to resolve the pcre and some stdenv2 in all-packages 
svn path=/nixpkgs/branches/stdenv-updates/; revision=24155
 2010-10-07 21:21:31 +00:00
Ludovic Courtès 0f5aed60d4 U-Boot: Fix the environment address for the GuruPlug. 
svn path=/nixpkgs/trunk/; revision=24126
 2010-10-07 07:29:12 +00:00
Ludovic Courtès bcba3664d9 Add U-Boot for the GuruPlug. 
svn path=/nixpkgs/trunk/; revision=24060
 2010-10-04 22:23:57 +00:00
Peter Simons 8b37e1a514 pkgs/misc/emulators/wine: enable multi-threaded builds 
svn path=/nixpkgs/trunk/; revision=24051
 2010-10-04 11:51:17 +00:00
Peter Simons 94826ffee2 pkgs/misc/emulators/wine: encode paths to libpng and libjpeg in RPATH to ensure that WINE will find them at run-time 
svn path=/nixpkgs/trunk/; revision=24050
 2010-10-04 11:51:10 +00:00
Lluís Batlle i Rossell cd4b54748a Updating from trunk 
svn path=/nixpkgs/branches/stdenv-updates/; revision=24038
 2010-10-03 09:25:34 +00:00
Peter Simons fb4249da1a pkgs/misc/emulators/wine: add support for gecko HTML rendering engine 
svn path=/nixpkgs/trunk/; revision=24021
 2010-10-01 13:45:19 +00:00
Peter Simons 30eddde3f5 pkgs/misc/emulators/wine: added support for gnutls 
svn path=/nixpkgs/trunk/; revision=24020
 2010-10-01 13:45:12 +00:00
Peter Simons 0a0fe89bf7 pkgs/misc/emulators/wine: strip trailing whitespace 
svn path=/nixpkgs/trunk/; revision=24019
 2010-10-01 13:45:02 +00:00
Evgeny Egorochkin 3cc7d2ed7c Wine-Warcraft: finally it works 
svn path=/nixpkgs/trunk/; revision=23993
 2010-09-30 09:01:04 +00:00
Yury G. Kudryashov b2c54656ee homepage 
svn path=/nixpkgs/trunk/; revision=23978
 2010-09-28 05:39:39 +00:00
Peter Simons e5a71f8151 pkgs/misc/ghostscript: disable parallel building 
Parallel builds occasionally fail on (at least) Linux/x86_64.

svn path=/nixpkgs/trunk/; revision=23968
 2010-09-27 15:59:12 +00:00
Evgeny Egorochkin e91ff5eabd Wine with patches for Warcraft 3 
svn path=/nixpkgs/trunk/; revision=23933
 2010-09-26 05:05:18 +00:00
Michael Raskin 93e22996b1 Update Wine 
svn path=/nixpkgs/trunk/; revision=23887
 2010-09-21 21:43:32 +00:00
Evgeny Egorochkin 3a6c172b77 HPLiP: Fix compilation. Had to move the comment out of configure flags. Very sneaky! 
Make hydra compile it.

svn path=/nixpkgs/trunk/; revision=23878
 2010-09-21 01:24:00 +00:00
Ludovic Courtès 7541a88120 GNU Ghostscript 8.71.1. 
svn path=/nixpkgs/trunk/; revision=23874
 2010-09-20 20:46:27 +00:00
Lluís Batlle i Rossell 2c5de61327 Updating from trunk. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=23840
 2010-09-17 19:10:21 +00:00
Peter Simons 9640592265 pkgs/misc/ghostscript/default.nix: strip trailing white space, no functional change 
svn path=/nixpkgs/trunk/; revision=23828
 2010-09-17 14:46:49 +00:00
Lluís Batlle i Rossell cca1cae042 Updating from trunk. I had to do some changes to make it fit. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=23500
 2010-08-29 11:09:23 +00:00
Michael Raskin 9570117dc4 Make TeXLive-linkdir skip not try to wrap directories in libexec 
svn path=/nixpkgs/trunk/; revision=23429
 2010-08-25 19:31:23 +00:00
Eelco Dolstra 8e73500282 * Gens/GS doesn't build on 64-bit systems. 
svn path=/nixpkgs/trunk/; revision=23390
 2010-08-24 09:57:57 +00:00
Eelco Dolstra 261a3eec35 * Added Gens/GS, a Mega Drive emulator. 
svn path=/nixpkgs/trunk/; revision=23377
 2010-08-23 20:28:14 +00:00
Lluís Batlle i Rossell 30892ab9fd Updating busybox and adding a patch that allows it to build with make 3.82 
svn path=/nixpkgs/branches/stdenv-updates/; revision=23345
 2010-08-21 23:13:21 +00:00
Lluís Batlle i Rossell 79653715d6 Fixing the build of busybox without extraConfig 
svn path=/nixpkgs/branches/stdenv-updates/; revision=23311
 2010-08-21 16:52:45 +00:00
Lluís Batlle i Rossell f16353b6f2 Updated from trunk. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=23275
 2010-08-20 13:41:12 +00:00
Eelco Dolstra e897a308a6 * Added MESS, the Multi Emulator Super System. 
svn path=/nixpkgs/trunk/; revision=23126
 2010-08-11 19:47:05 +00:00
Lluís Batlle i Rossell b17d1d7d07 Adding nanonote kernel and uboot 
svn path=/nixpkgs/branches/stdenv-updates/; revision=22943
 2010-08-04 11:07:13 +00:00
Lluís Batlle i Rossell 5417c720fd Merging from trunk. 
I tried to fix some trivial conflicts.
I don't know if I merged well some more difficult conflicts on openssl/darwin_patch
or haskell-platform.


svn path=/nixpkgs/branches/stdenv-updates/; revision=22878
 2010-08-02 15:48:19 +00:00
Michael Raskin 21580dc847 Update Wine 
svn path=/nixpkgs/trunk/; revision=22866
 2010-08-02 10:02:23 +00:00
Lluís Batlle i Rossell 908c67b7ee Fixing a bit the busybox expression and its new flexible config 
svn path=/nixpkgs/branches/stdenv-updates/; revision=22852
 2010-08-01 21:25:37 +00:00
Lluís Batlle i Rossell fbad1b3a56 Trying to make busybox more configurable 
svn path=/nixpkgs/branches/stdenv-updates/; revision=22846
 2010-08-01 21:06:45 +00:00
Eelco Dolstra 4bf5b0d36b * Fix some more "args: with args". 
svn path=/nixpkgs/trunk/; revision=22828
 2010-07-30 14:47:23 +00:00
Eelco Dolstra f1598a8941 * More cleanup. 
svn path=/nixpkgs/trunk/; revision=22798
 2010-07-28 18:01:17 +00:00
Eelco Dolstra 749b8607ca * More cleanup. 
svn path=/nixpkgs/trunk/; revision=22795
 2010-07-28 15:35:01 +00:00
Eelco Dolstra 6609710409 * Get rid of many instances of "args: with args;", and other coding 
guidelines violations.
* Updated libsamplerate to 0.1.7.

svn path=/nixpkgs/trunk/; revision=22782
 2010-07-28 11:55:54 +00:00
Eelco Dolstra 32a8fbde4f * CUPS updated to 1.4.4. 
svn path=/nixpkgs/branches/x-updates/; revision=22636
 2010-07-18 21:52:25 +00:00
Eelco Dolstra 9fa00f1a76 * Wine 1.2rc7. 
svn path=/nixpkgs/trunk/; revision=22555
 2010-07-12 09:17:27 +00:00
Lluís Batlle i Rossell 583ca54705 Fixing the hplip meta info, so nixpkgs can be evaluated again by hydra (and nix-env -qa) 
svn path=/nixpkgs/trunk/; revision=22323
 2010-06-18 09:45:23 +00:00
Lluís Batlle i Rossell 034005647b Adding hplip (HP's driver suite for printers and multi-function devices), which builds 
but I have not tried to do anything with it

svn path=/nixpkgs/trunk/; revision=22321
 2010-06-18 08:16:17 +00:00
Lluís Batlle i Rossell 20d949a6f5 Adding libusb to cups, so it can access usb printers. 
svn path=/nixpkgs/trunk/; revision=22163
 2010-06-07 08:24:06 +00:00
Eelco Dolstra 76143618b6 svn path=/nixpkgs/trunk/; revision=22059 2010-05-30 19:03:26 +00:00
Eelco Dolstra 514caa90d3 * Dosbox updated to 0.74. 
svn path=/nixpkgs/trunk/; revision=22039
 2010-05-28 09:35:49 +00:00
Michael Raskin 1975b1e1af Update Wine to 1.2-rc1 
svn path=/nixpkgs/trunk/; revision=22025
 2010-05-28 05:09:32 +00:00
Marc Weber 32edcce80b Build a package with debugging information so that you can run it within gdb or run valgrind on it. 
Example: xmessageDebug = misc.debugVersion xorg.xmessage

svn path=/nixpkgs/trunk/; revision=21945
 2010-05-23 15:54:10 +00:00
Marc Weber 258d886a17 remove duplication in derivation adding tags to source 
svn path=/nixpkgs/trunk/; revision=21685
 2010-05-09 14:17:24 +00:00
Marc Weber 6fe4db1c7d sane-backends update provided by David Brown 
svn path=/nixpkgs/trunk/; revision=21676
 2010-05-09 01:09:28 +00:00
Yury G. Kudryashov 7f8c11af2f Remove obsolete pkgs.synaptics package 
svn path=/nixpkgs/trunk/; revision=21278
 2010-04-23 18:56:15 +00:00
Yury G. Kudryashov 0ab619066b Add splix cups driver 
svn path=/nixpkgs/trunk/; revision=21078
 2010-04-14 19:27:15 +00:00
Yury G. Kudryashov 1336665f0d Typo in path, style 
svn path=/nixpkgs/trunk/; revision=21077
 2010-04-14 19:27:04 +00:00
Yury G. Kudryashov 62bcea0382 Remove linuxwacom: it is not compatible with new xserver 
svn path=/nixpkgs/trunk/; revision=21016
 2010-04-11 21:03:43 +00:00
Yury G. Kudryashov 9cef0c7941 Update linuxwacom, add 0.8.4.x 
svn path=/nixpkgs/trunk/; revision=21001
 2010-04-10 20:26:41 +00:00
Michael Raskin 09e05eb46a Update wine 
svn path=/nixpkgs/trunk/; revision=20816
 2010-03-25 07:55:11 +00:00
Eelco Dolstra eb083a3999 * Increase `max_print_line' to prevent TeX from breaking lines at 79 
characters, which is stupid.  (For instance, it breaks grepping for
  words when they are broken across multiple lines.)
* Print warnings in the condensed log output.

svn path=/nixpkgs/trunk/; revision=20625
 2010-03-15 10:02:24 +00:00
Lluís Batlle i Rossell 5b7f1ef09a Making busybox cross build with kernel 2.4 for mipsel (I had to disable 'ionice', which 
requires some headers >= 2.6.12).

I also add the kernel 2.4 headers expression I forgot in my last commit.

svn path=/nixpkgs/trunk/; revision=20540
 2010-03-10 21:32:35 +00:00
Ludovic Courtès dbf2a74829 TeXLive: Building the format files, again. 
svn path=/nixpkgs/trunk/; revision=20517
 2010-03-09 22:47:22 +00:00
Lluís Batlle i Rossell 33e549fa4f Adding a busybox option to build it statically. 
Adding it to the cross builds.


svn path=/nixpkgs/trunk/; revision=20516
 2010-03-09 22:44:45 +00:00
Lluís Batlle i Rossell fb6adb13ac Updating busybox. I left only a single busybox in its directory. The others, coming from the old 
cross-building nixpkgs implementation, were not referenced anywhere.

This new busybox builds natively, and also cross-builds with uclibc.

I updated the uclibc config with a busybox defconfig requirement (something about RPC).

I made the gcc-cross-wrapper properly set the dynamic loader to programs.

After this, 'qemu-arm' can run the dynamically linked busybox cross built for armv5tel--linux-gnueabi.



svn path=/nixpkgs/trunk/; revision=20514
 2010-03-09 22:17:38 +00:00
Ludovic Courtès 6961831c73 TeXLive: Try again building the format files. 
svn path=/nixpkgs/trunk/; revision=20503
 2010-03-09 15:57:33 +00:00
Ludovic Courtès 249c487efa TeXLive: Pass `mktexfmt' the argument it wants. 
svn path=/nixpkgs/trunk/; revision=20480
 2010-03-08 21:38:05 +00:00
Ludovic Courtès cd0f5826df TeXLive: Run mktexfmt' after the first mktexlsr'. 
svn path=/nixpkgs/trunk/; revision=20476
 2010-03-08 13:22:45 +00:00
Ludovic Courtès 9502391275 TeXLive: attempt to pre-build format files. 
svn path=/nixpkgs/trunk/; revision=20473
 2010-03-08 10:40:05 +00:00
Lluís Batlle i Rossell eb047010f8 Trying to get a better expression for uboot upstream, allowing normal and cross build 
with proper assertions.


svn path=/nixpkgs/trunk/; revision=20319
 2010-03-01 23:22:48 +00:00
Lluís Batlle i Rossell 95e22a39c7 Trying to make uboot not annoy the nixpkgs tarball. Tested. 
svn path=/nixpkgs/trunk/; revision=20310
 2010-03-01 15:21:24 +00:00
Michael Raskin ecc14afbda Roll back the changes to TeXLive. I failed to make Context work, and these changes made the situation worse 
svn path=/nixpkgs/trunk/; revision=20202
 2010-02-23 19:14:31 +00:00
Michael Raskin 17c0e537e3 Fixing some mistakes in TeXLive expressions. Context still does not work, but in a more complicated way 
svn path=/nixpkgs/trunk/; revision=20186
 2010-02-23 10:52:19 +00:00
Michael Raskin 023ff2a74a Fix some interpreter paths 
svn path=/nixpkgs/trunk/; revision=20182
 2010-02-22 23:40:39 +00:00
Michael Raskin ea7c7d1932 Update TeXLive packages w.r.t. TeXLive2009 texmf vs. prefix layout 
svn path=/nixpkgs/trunk/; revision=20151
 2010-02-21 10:31:21 +00:00
Michael Raskin ed1c9cefdd Remove xcolor documentation until I understand how to compile it.. 
svn path=/nixpkgs/trunk/; revision=20143
 2010-02-21 06:56:24 +00:00
Lluís Batlle i Rossell e1760d529b I still did not fix the nixpkgs tarball in the previous commit... 
Next attempt, now simpler.

svn path=/nixpkgs/trunk/; revision=20129
 2010-02-19 14:42:50 +00:00
Lluís Batlle i Rossell 7b4529cfc7 Allowing multiplatform uboot (sheevaplug/integratorcp). 
svn path=/nixpkgs/trunk/; revision=20079
 2010-02-17 21:09:27 +00:00
Lluís Batlle i Rossell aca3e65338 Adding the mainline uboot. 
svn path=/nixpkgs/trunk/; revision=20078
 2010-02-17 20:53:01 +00:00
Michael Raskin 76328b76b7 Update TeX packages 
svn path=/nixpkgs/trunk/; revision=19926
 2010-02-11 09:45:07 +00:00
Michael Raskin db5fae520c TeXLive insists on texmf in $prefix/texmf 
svn path=/nixpkgs/trunk/; revision=19921
 2010-02-11 05:20:16 +00:00
Michael Raskin 62e31307ec If I understand anything, this fixes TeXLive. Has not yet finished the build 
svn path=/nixpkgs/trunk/; revision=19914
 2010-02-10 18:16:32 +00:00
Michael Raskin dc75a9dc6e Update TeXLive 
svn path=/nixpkgs/trunk/; revision=19892
 2010-02-10 04:38:11 +00:00
Eelco Dolstra a617a7c239 * Sync with the trunk. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=19786
 2010-02-03 14:23:43 +00:00
Eelco Dolstra 0662fcbd23 * Fix teTeX on Glibc 2.11. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=19781
 2010-02-03 13:04:12 +00:00
Nicolas Pierron 5a7228a099 Add tex4ht. 
svn path=/nixpkgs/trunk/; revision=19739
 2010-01-31 12:13:33 +00:00
Rob Vermaas 13417770a3 applying patches provided by griswold 
svn path=/nixpkgs/trunk/; revision=19707
 2010-01-27 12:12:35 +00:00
Lluís Batlle i Rossell fedf79faea Fixing 'my-env' on stdenv-updates, considering that users will add 
'buildInputs' to its mkDerivation parameter, while the stdenv setup.sh script
would expect buildNativeInputs.


svn path=/nixpkgs/branches/stdenv-updates/; revision=19615
 2010-01-22 15:00:15 +00:00
Lluís Batlle i Rossell 70dd97620c Updating from trunk 
svn path=/nixpkgs/branches/stdenv-updates/; revision=19485
 2010-01-16 15:19:23 +00:00
Marc Weber 8b94315e22 tag .hsc files as well 
svn path=/nixpkgs/trunk/; revision=19471
 2010-01-15 19:35:09 +00:00
Michael Raskin 241b80a1d3 Steal patch idea from Debian to build with fresher backend 
svn path=/nixpkgs/trunk/; revision=19456
 2010-01-15 08:59:45 +00:00
Michael Raskin 2ce16710bc Steal patch idea from Debian to build with fresher backend 
svn path=/nixpkgs/trunk/; revision=19455
 2010-01-15 08:55:33 +00:00
Lluís Batlle i Rossell 9183f21f7e Merging from trunk. 
I fixed conflicts regarding the renaming 'kernel' -> 'linux' in all-packages.
Also a small conflict in all-packages about making openssl overridable.
And I some linux 2.6.31-zen kernel files also marked in conflict.


svn path=/nixpkgs/branches/stdenv-updates/; revision=19438
 2010-01-14 14:49:31 +00:00
Michael Raskin 3f30914672 Update wine dependency on flex and add myself as maintainer 
svn path=/nixpkgs/trunk/; revision=19433
 2010-01-14 13:17:40 +00:00
Michael Raskin 98bf3aef49 Update Wine 
svn path=/nixpkgs/trunk/; revision=19428
 2010-01-14 10:09:08 +00:00
Lluís Batlle i Rossell d864771e26 Updating from trunk. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=19139
 2009-12-28 11:40:34 +00:00
Armijn Hemel 305c1b8ae5 update to 2.13.9 
svn path=/nixpkgs/trunk/; revision=19103
 2009-12-25 00:01:31 +00:00
Armijn Hemel 866856b77f update to 1.0.20 
svn path=/nixpkgs/trunk/; revision=19102
 2009-12-24 23:27:05 +00:00
Armijn Hemel e07c69c924 update to 0.996 
svn path=/nixpkgs/trunk/; revision=19101
 2009-12-24 23:19:53 +00:00
Lluís Batlle i Rossell bed103ef53 Updating myEnv for the new crossCompiling stdenv, so it puts in the environment buildNativeInputs 
and not builtInputs.


svn path=/nixpkgs/branches/stdenv-updates/; revision=19078
 2009-12-22 11:49:20 +00:00
Lluís Batlle i Rossell 5bae851b1e Merging from trunk. I had to give away some structure to build the native 
sheevaplug kernel, so the kernel does not build in the sheevaplug right now.
I will try to fix that in next commits.


svn path=/nixpkgs/branches/stdenv-updates/; revision=19045
 2009-12-19 11:14:16 +00:00
Michael Raskin 67ed6bf75b Update wine 
svn path=/nixpkgs/trunk/; revision=18988
 2009-12-16 09:26:55 +00:00
Lluís Batlle i Rossell dae3eb2383 Merging from trunk. 
I resolved two conflicts:
- cmake (trunk fixes + stdenv-updates cross-compiling)
- all-packages (trunk gcc-wrapper2 + stdenv-updates gcc44)


svn path=/nixpkgs/branches/stdenv-updates/; revision=18912
 2009-12-12 18:39:09 +00:00
Marc Weber 5319704f80 removing old bleeding edge cruft replacing it by a niftier version using 
source regions which are substituded by the tool nix-repository-manager.
See http://github.com/MarcWeber/nix-repository-manager/raw/master/README.

sourceByName is called sourceFromHead now.

updates: MPlayerTrunk, haxe, neko, netsurf, cinelerra, ctags
cinelerra does no longer build due to Xorg update

svn path=/nixpkgs/trunk/; revision=18894
 2009-12-11 13:58:23 +00:00
Marc Weber f2ec65a538 fix source-and-tags 
svn path=/nixpkgs/trunk/; revision=18892
 2009-12-11 13:58:15 +00:00
Lluís Batlle i Rossell 89fe676bb3 Updating from trunk. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=18878
 2009-12-10 14:48:45 +00:00
Eelco Dolstra c726012afe * Refactoring: move most filesystem utilities / FUSE filesystems to 
tools/filesystems.  Previously they were all over the place.

svn path=/nixpkgs/trunk/; revision=18809
 2009-12-04 15:39:49 +00:00
Marc Weber 4a999a3811 adding neko 
adding repository locations for haxe* and neko repositories

svn path=/nixpkgs/trunk/; revision=18709
 2009-11-30 01:05:07 +00:00
Marc Weber c5b2c2c40a adding haxe 
svn path=/nixpkgs/trunk/; revision=18708
 2009-11-30 01:05:04 +00:00
Lluís Batlle i Rossell a3403e6828 Finishing the update from trunk, having resolved the eclipse related directory 
renaming.
I think directory renaming breaks the usual merges... because it leaves the
'to be removed' directory in the working directory still. A manual 'rm' of the
'to be removed' directory fixed the commit.

svn merge  ^/nixpkgs/trunk


svn path=/nixpkgs/branches/stdenv-updates/; revision=18661
 2009-11-26 21:46:08 +00:00
Rob Vermaas 2ffa48af25 update maven2 
svn path=/nixpkgs/trunk/; revision=18609
 2009-11-25 07:51:06 +00:00
Ludovic Courtès 87a62e5409 gutenprint: Fix name, improve style. 
svn path=/nixpkgs/trunk/; revision=18532
 2009-11-22 19:11:27 +00:00
Lluís Batlle i Rossell 4dfc635cbb Fixing the uboot cross-build. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=18473
 2009-11-19 21:43:03 +00:00
Lluís Batlle i Rossell 7ade207f6b - Removed all *NoCross expressions I dupilcated in nixpkgs, while maintaining 
the cross compilation functionality.
- I renamed some expected stdenv.mkDerivation parameter attributes so we can
  keep this branch properly updated from trunk. We agreed with Nicolas Pierron
  doing a massive renaming, so all current buildInputs become hostInputs (input
  as build for the host machine, in autotools terminology) , and
  then buildInputs would mean "input as for the build machine".
  By now, the specific "input as for the build machine" is specified through
  buildNativeInputs. We should fix this in the merge to trunk.
- I made the generic stdenv understand the buildNativeInputs, otherwise if
  we start changing nixpkgs expressions so they distinguish the current
  buildInputs into buildInputs and buildNativeInputs, we could break even more
  nixpkgs for other platforms.
- I changed the default result of mkDerivation so it becomes the derivation for
  to be run in the build machine. This allows, without any special rewriting,
  "fetchurl" derivations to be always results for the build machine to use
  them.
- The change above implies that, for anyone wanting to cross-compile, has to
  build the hostDrv of the wanted derivation. For example, after this commit,
  the usual test of "nix-build -A bison.hostDrv arm.nix" works. I described
  the contents of this arm.nix in r18398.


svn path=/nixpkgs/branches/stdenv-updates/; revision=18471
 2009-11-19 19:03:34 +00:00
Lluís Batlle i Rossell d82c7e0a69 Adding uboot cross compilation. I had to adapt the package a bit, because it 
does not use autotools.


svn path=/nixpkgs/branches/stdenv-updates/; revision=18362
 2009-11-15 22:56:06 +00:00
Lluís Batlle i Rossell 4b27d28701 Porting changes from stdenv-updates into this branch. 
This comes from:
svn diff  ^/nixpkgs/trunk/@18255 ^/nixpkgs/branches/stdenv-updates/ > diff
patch -p0 < diff
and then adding into svn all files new from the patch.

trunk@18255 comes from the last time I updated stdenv-updates from trunk.


svn path=/nixpkgs/stdenv-updates2/; revision=18272
 2009-11-08 00:32:12 +00:00
Michael Raskin 490ca07c68 Update Linux Wacom 
svn path=/nixpkgs/trunk/; revision=18246
 2009-11-07 09:25:06 +00:00
Peter Simons 1981322cc5 pkgs/misc/cups/default.nix: don't install files to /etc or /usr 
The cups build tries to install files into global system directories.
This patch changes those paths to locations underneath of $out.

svn path=/nixpkgs/trunk/; revision=18134
 2009-11-05 13:33:36 +00:00
Eelco Dolstra 404007aab3 * Build CUPS with dbus support, plus some purity fixes. 
svn path=/nixpkgs/branches/xorg-7.5/; revision=18051
 2009-10-30 12:33:34 +00:00
Eelco Dolstra 78648561c5 * Updated CUPS to 1.4.1. 
svn path=/nixpkgs/branches/xorg-7.5/; revision=18048
 2009-10-30 09:46:51 +00:00
Michael Raskin 658b350235 Remove duplicate declaration 
svn path=/nixpkgs/trunk/; revision=17982
 2009-10-28 05:25:52 +00:00
Marc Weber a7261348d8 Netsurf update 
svn path=/nixpkgs/trunk/; revision=17978
 2009-10-27 17:46:45 +00:00
Michael Raskin 742dcbc12e Update Wine 
svn path=/nixpkgs/trunk/; revision=17947
 2009-10-23 23:27:59 +00:00
Michael Raskin 5e1c057878 If this url then this hash 
svn path=/nixpkgs/trunk/; revision=17637
 2009-10-04 22:01:26 +00:00
Michael Raskin dc14fc06da Updating linuxwacom 
svn path=/nixpkgs/trunk/; revision=17488
 2009-09-29 06:48:37 +00:00
Marc Weber afbb4d0b59 update topgit - using official release now 
svn path=/nixpkgs/trunk/; revision=17457
 2009-09-26 23:33:08 +00:00
Peter Simons d874ec17a4 xlock: fixed typo in default.nix 
svn path=/nixpkgs/trunk/; revision=17360
 2009-09-23 11:01:14 +00:00
Peter Simons 04558d8496 xlock: fixed build and updated to version 5.24 
svn path=/nixpkgs/trunk/; revision=17356
 2009-09-22 20:16:38 +00:00
Marc Weber d816babb74 jackaudio: symlink pkg-config description to lib 
svn path=/nixpkgs/trunk/; revision=17321
 2009-09-21 09:58:24 +00:00
Eelco Dolstra a54fc7e7f7 svn path=/nixpkgs/trunk/; revision=17083 2009-09-13 10:54:47 +00:00
Marc Weber 5478df996a adding netsurf browser. No JavaScript yet 
svn path=/nixpkgs/trunk/; revision=17077
 2009-09-13 08:54:47 +00:00
Sander van der Burg 3a5645269d Claimed maintainership of VICE package and added VICE to the releases.nix 
svn path=/nixpkgs/trunk/; revision=17049
 2009-09-11 13:16:00 +00:00
Marc Weber 09920037c0 adding mplayer trunk cause the stable source distribution is said to be 
outdated

svn path=/nixpkgs/trunk/; revision=17030
 2009-09-10 16:58:02 +00:00
Marc Weber 3201717bdb adding lilypond 
svn path=/nixpkgs/trunk/; revision=17028
 2009-09-10 16:57:56 +00:00
Eelco Dolstra 580096378b * Fixed the Wacom package (version 0.8.4 has disappeared). 
svn path=/nixpkgs/trunk/; revision=17003
 2009-09-10 12:21:25 +00:00
Eelco Dolstra f560f49faa * Fix nix-env evaluation. 
svn path=/nixpkgs/trunk/; revision=16931
 2009-09-02 13:22:34 +00:00
Marc Weber 8ff2647169 adding gutenprint (former gimp-print) and gutenprintBin. I still haven't 
found the source of the binary package containing the .ppd files
Still impure but works. See comment.

svn path=/nixpkgs/trunk/; revision=16881
 2009-08-27 23:32:13 +00:00
Marc Weber bc8a85288d cups-bjnp driver 
svn path=/nixpkgs/trunk/; revision=16880
 2009-08-27 23:32:10 +00:00
Michael Raskin f0a3ff997f Update wine (use new updater script in the process) 
svn path=/nixpkgs/trunk/; revision=16817
 2009-08-23 22:24:17 +00:00
Eelco Dolstra c8886f7215 * dblatex 0.2.12. 
svn path=/nixpkgs/trunk/; revision=16815
 2009-08-22 23:11:12 +00:00
Marc Weber 075f9712f2 fix soappy by using trunk version 
svn path=/nixpkgs/trunk/; revision=16790
 2009-08-20 20:19:04 +00:00
Eelco Dolstra 0fa5cdc251 * Remove some trace calls. 
svn path=/nixpkgs/trunk/; revision=16705
 2009-08-13 08:37:00 +00:00
Michael Raskin caede3beb5 Update LinuxWacom driver 
svn path=/nixpkgs/trunk/; revision=16565
 2009-08-03 14:15:22 +00:00
Marc Weber c3ddc9df62 cdtenv: also store PATH and PKG_CONFIG_PATH 
svn path=/nixpkgs/trunk/; revision=16478
 2009-07-27 16:05:36 +00:00
Andres Löh 5164d2ec62 Added lhs2TeX support to LaTeX builder. 
svn path=/nixpkgs/trunk/; revision=16439
 2009-07-23 14:13:09 +00:00
Eelco Dolstra 04cc6b721a * Made findLaTeXIncludes pure. Previously find-includes.pl looked 
outside of the Nix store for the dependencies of the root source
  file, which is impure.  That's why it needed the
  `builtins.currentTime' hack to force a rebuild.  It also didn't work
  in a chroot.  Now find-includes.pl only scans the source file at
  hand, and we use builtins.genericClosure to find all includes
  recursively.

svn path=/nixpkgs/trunk/; revision=16414
 2009-07-17 15:10:01 +00:00
Marc Weber 62eccd21d4 updating bleeding edge source file info for nix-repository-manager 
svn path=/nixpkgs/trunk/; revision=16349
 2009-07-14 12:31:37 +00:00
Eelco Dolstra 46db02a5e3 * Fix xrefs and callouts that refer to xml:ids (rather than ids). 
Will send upstream.

svn path=/nixpkgs/trunk/; revision=16312
 2009-07-10 12:09:58 +00:00
Marc Weber 25a1533d9a removing old haskell stuff. I was using my own branch for a long time. 
It will be replaced by something else anyway.
Some of those patches may still be of interest (?)

svn path=/nixpkgs/trunk/; revision=16298
 2009-07-09 22:24:08 +00:00
Marc Weber 676f4c4e2d haskellPackages: adding bytestring, networkBytestring, getOptions, ghcSyb, hslogger, tar 
svn path=/nixpkgs/trunk/; revision=16296
 2009-07-09 22:24:02 +00:00
Marc Weber 6abf8471fb fix sourceWithTagsDerivation, myhasktags now based on current haskell derivations 
svn path=/nixpkgs/trunk/; revision=16263
 2009-07-09 03:50:47 +00:00
Rob Vermaas 5c13747775 dblatex 0.2.11 
svn path=/nixpkgs/trunk/; revision=16246
 2009-07-08 13:12:27 +00:00
Marc Weber 5ef46894e0 adding cdtEnv symlinking deps into one $out/cdt-env/{lib,include} directory 
and collection which let's you install and update a set of derivations at once

svn path=/nixpkgs/trunk/; revision=16224
 2009-07-07 20:53:16 +00:00
Eelco Dolstra d3f5d94ac7 * Fix some attributes that now make nix-env -q --meta barf. 
svn path=/nixpkgs/trunk/; revision=16134
 2009-07-02 09:08:01 +00:00
Marc Weber ffb53a0e6f adding sqlalchemy which is a nice orm mapper for python 
svn path=/nixpkgs/trunk/; revision=16059
 2009-06-26 16:52:54 +00:00
Eelco Dolstra 83c3123617 * Wine 1.1.23. 
svn path=/nixpkgs/trunk/; revision=15886
 2009-06-07 19:48:49 +00:00
Sander van der Burg ec871e6400 Upgraded DOSBox to 0.73 and removed glibc fixes which are obsolete now 
svn path=/nixpkgs/trunk/; revision=15786
 2009-05-29 12:14:56 +00:00
Ludovic Courtès f3706471e8 GNU Ghostscript: Add pointers to the URW++ font files in the fontmap. 
svn path=/nixpkgs/trunk/; revision=15780
 2009-05-28 22:11:02 +00:00
Sander van der Burg 5990b0d95f Added VICE emulator package 
svn path=/nixpkgs/trunk/; revision=15776
 2009-05-28 19:22:00 +00:00
Marc Weber 3157bb1098 removed all __primops from nixpkgs 
svn path=/nixpkgs/trunk/; revision=15693
 2009-05-24 10:57:46 +00:00
Marc Weber 52647ea3b0 FullDepEntry -> fullDepEntry, PackEntry -> packEntry 
svn path=/nixpkgs/trunk/; revision=15662
 2009-05-19 23:25:58 +00:00
Sander van der Burg c0605f9d3c Added desktop item to DOSBox 
svn path=/nixpkgs/trunk/; revision=15599
 2009-05-14 11:17:41 +00:00
Eelco Dolstra d78a404063 * Removed some assertions that rely on pointer equality. (It's kind 
of unfortunate that consitency checks like "httpd.apr == apr" don't
  really work.  Perhaps equality tests on derivations should just
  compare the drvPath or outPath attributes.)

svn path=/nixpkgs/trunk/; revision=15569
 2009-05-12 12:50:07 +00:00
Michael Raskin d8e3181425 Update URLs for TeXLive 
svn path=/nixpkgs/trunk/; revision=15544
 2009-05-10 23:26:19 +00:00
Marc Weber 90344f9e1e use svn sources for ctgas. 
The last release has a bug. I got "no end of file expected" while tagging

svn path=/nixpkgs/trunk/; revision=15501
 2009-05-07 18:28:19 +00:00
Eelco Dolstra f0e8c6aaef * Updated dblatex. 
svn path=/nixpkgs/trunk/; revision=15495
 2009-05-07 13:18:35 +00:00
Eelco Dolstra b5e67e699b * CUPS 1.3.10. 
svn path=/nixpkgs/trunk/; revision=15472
 2009-05-06 14:05:32 +00:00
Marc Weber 94a01668a1 cleaned up and fixed autofs v5 
svn path=/nixpkgs/trunk/; revision=15419
 2009-05-01 05:42:32 +00:00
Eelco Dolstra 2d1bcbeacf * Electric Sheep, a screensaver. 
svn path=/nixpkgs/trunk/; revision=15415
 2009-04-30 17:41:19 +00:00
Marc Weber cd9c9a2431 fix broken myEnv 
svn path=/nixpkgs/trunk/; revision=15382
 2009-04-28 16:52:36 +00:00
Ludovic Courtès 2dc368f084 GNU Ghostscript 8.64.0. 
svn path=/nixpkgs/trunk/; revision=15334
 2009-04-27 10:19:59 +00:00
Marc Weber 829e0da0e5 topgit update 
there is now a tg push command pushing branch and its base optionally
including all dependency

svn path=/nixpkgs/trunk/; revision=15328
 2009-04-27 01:18:07 +00:00
Eelco Dolstra 5a2284ac61 * Sync with the trunk. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=15313
 2009-04-25 22:45:32 +00:00
Lluís Batlle i Rossell 1e8fff0915 Updating Wine. 
svn path=/nixpkgs/trunk/; revision=15308
 2009-04-25 16:22:08 +00:00
Eelco Dolstra 7689a348c4 * Got rid of a lot of "postInstall=postInstall" and similar lines in 
builders.  These are redundant now.
* Inlined some trivial builders.
* Removed a few explicit setup-hook creations.  This is done
  automatically now if setupHook is set.
* Deleted the initscripts package.  NixOS doesn't use it anymore.

svn path=/nixpkgs/branches/stdenv-updates/; revision=15276
 2009-04-23 13:31:10 +00:00
Eelco Dolstra 6e32a4cea8 svn path=/nixpkgs/branches/stdenv-updates/; revision=15273 2009-04-23 12:46:14 +00:00
Eelco Dolstra f762b50991 * Another sync with the trunk. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=15269
 2009-04-23 11:59:43 +00:00
Eelco Dolstra 94d7d1fdbb * Got rid of all --disable-static flags; they're redundant now. 
* Also a bunch of style cleanups (tabs, with args, ...).

svn path=/nixpkgs/branches/stdenv-updates/; revision=15235
 2009-04-21 23:18:09 +00:00
Sander van der Burg 883eb4371c Fixed dosbox expression 
svn path=/nixpkgs/branches/stdenv-updates/; revision=15220
 2009-04-21 18:30:54 +00:00
Lluís Batlle i Rossell 98f6f77709 Adding a folding-at-home client. 
svn path=/nixpkgs/trunk/; revision=15122
 2009-04-17 20:36:54 +00:00
Eelco Dolstra 2eb05cf933 * Sync with the trunk. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=14965
 2009-04-09 12:19:57 +00:00
Eelco Dolstra 7ae8544b4c * ntfs-3g updated to 2009.4.4. The old version has disappeared 
anyway.

svn path=/nixpkgs/trunk/; revision=14915
 2009-04-07 16:03:30 +00:00
Eelco Dolstra d27514cb28 * Sync with the trunk once more. 
* Turn on everything in Hydra.

svn path=/nixpkgs/branches/stdenv-updates/; revision=14806
 2009-03-31 15:30:47 +00:00
Marc Weber 5af6ba01fd doh (forgotten to update name) 
svn path=/nixpkgs/trunk/; revision=14782
 2009-03-30 14:21:18 +00:00
Marc Weber 0be7534b0f maven-2 version bump to 2.1.0 
svn path=/nixpkgs/trunk/; revision=14781
 2009-03-30 14:20:05 +00:00
Marc Weber 27db9f1dfd updated synergy cvs source 
svn path=/nixpkgs/trunk/; revision=14772
 2009-03-30 10:32:44 +00:00
Eelco Dolstra 58ae185001 * Latest ntfs-3g, FUSE. 
svn path=/nixpkgs/trunk/; revision=14696
 2009-03-25 10:55:40 +00:00
Eelco Dolstra f3815e7ad5 * Fixed ntfsprogs. 
svn path=/nixpkgs/trunk/; revision=14695
 2009-03-25 10:55:28 +00:00
Eelco Dolstra 3593b97d63 * Sync with the trunk. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=14557
 2009-03-16 12:45:27 +00:00
Eelco Dolstra 808f12e369 * Dosbox 0.72. 
svn path=/nixpkgs/trunk/; revision=14556
 2009-03-16 12:22:47 +00:00
Eelco Dolstra 2ae9a1c947 * Doh. 
svn path=/nixpkgs/trunk/; revision=14498
 2009-03-10 20:04:08 +00:00
Marc Weber b56ed35851 replacing applyAndFun by lib.defaultOverridableDelayableArgs 
applyAndFun has a bug resulting in the same arg beeing added more than
once when using a concatenating merge function for the attr set.

I've tried giving the function a name "overridableDelayableArgs" which
resembles its usage much more.

important refactoring:
  applyAndFun had .fun and .funMerge only when passing the merge
  function lib.mergeOrApply

  composableDerivation {
    initial = {
      ...
    };
  }

to

  overridableDelayableArgs has always .replace and .merge
  composableDerivation {} {
    ...
  }

svn path=/nixpkgs/trunk/; revision=14428
 2009-03-06 23:21:28 +00:00
Eelco Dolstra 0175270bf9 * Wine 1.1.15. 
svn path=/nixpkgs/trunk/; revision=14273
 2009-02-27 12:52:55 +00:00
Eelco Dolstra 390695e73f * Sync with the trunk. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=14057
 2009-02-12 21:16:55 +00:00
Marc Weber 5778dd836d mend 
svn path=/nixpkgs/trunk/; revision=14035
 2009-02-11 16:12:14 +00:00
Marc Weber 944d6221df my-env: add some hackish support for zsh 
svn path=/nixpkgs/trunk/; revision=14034
 2009-02-11 16:12:12 +00:00
Eelco Dolstra ca5e6b9624 svn path=/nixpkgs/trunk/; revision=14033 2009-02-11 14:53:17 +00:00
Tobias Hammerschmidt b7f9c33989 version bump 
svn path=/nixpkgs/trunk/; revision=13999
 2009-02-06 20:18:08 +00:00
Eelco Dolstra f45ed4b74e * Remove obsolete comment. 
svn path=/nixpkgs/trunk/; revision=13977
 2009-02-03 22:15:02 +00:00
Eelco Dolstra c584bb878a * Sync with trunk. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=13903
 2009-01-29 16:33:02 +00:00
Marc Weber 0ad62a0edb adding gitAttr 
now containing qgit, stgit, topGit, hg2git
updating gitGit (git dev version), adding qgit-git (dev version)

svn path=/nixpkgs/trunk/; revision=13816
 2009-01-20 22:15:42 +00:00
Eelco Dolstra e7a94d6fef * Ghostscript: build the CUPS filter. This allows CUPS to print to 
non-Postscript printers.

svn path=/nixpkgs/trunk/; revision=13793
 2009-01-17 13:08:51 +00:00
Eelco Dolstra c1579d2e78 * stdenv branch: synced with the trunk. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=13785
 2009-01-16 10:59:27 +00:00
Eelco Dolstra 5689d7338e * Support LaTeX documents that have multiple bibliographies (using the 
multibib package).

svn path=/nixpkgs/trunk/; revision=13723
 2009-01-08 09:54:04 +00:00
Marc Weber e4a6036ca9 adding cvs zsh version because it has better hg, tg completion support 
svn path=/nixpkgs/trunk/; revision=13670
 2008-12-22 18:36:26 +00:00
Marc Weber e996113be7 removed mkDerivationByConfiguration, using composableDerivation instead 
qgis, vim_configurable both work now

svn path=/nixpkgs/trunk/; revision=13661
 2008-12-20 01:20:35 +00:00
Eelco Dolstra 9ed6e06b38 * Wine 1.1.10. 
svn path=/nixpkgs/trunk/; revision=13625
 2008-12-12 23:00:15 +00:00
Eelco Dolstra e31341510d * Merged from the trunk. Let's see how well this works with 
Subversion 1.5...

svn path=/nixpkgs/branches/stdenv-updates/; revision=13601
 2008-12-10 09:59:21 +00:00
Marc Weber 90b53dcccc bleeding edge octave version (without docs) 
svn path=/nixpkgs/trunk/; revision=13561
 2008-12-02 22:55:45 +00:00
Eelco Dolstra 2ffc686b67 * Latest Wine, Thunderbird. 
svn path=/nixpkgs/trunk/; revision=13527
 2008-12-01 00:06:14 +00:00
Eelco Dolstra aa84bce64d * Get rid of all references to nix.cs.uu.nl. 
svn path=/nixpkgs/trunk/; revision=13299
 2008-11-14 16:57:19 +00:00
Eelco Dolstra 6c107b6706 * CUPS 1.3.9. 
svn path=/nixpkgs/trunk/; revision=13217
 2008-11-07 13:36:57 +00:00