Commit graph

818 commits

Author SHA1 Message Date
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