Commit graph

706 commits

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