Commit graph

676 commits

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