Commit graph

508 commits

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