alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity
43766 commits 217 branches 121 tags 4.5 GiB
Commit graph

881 commits

Author SHA1 Message Date
viric e2d097c5c0 Merge pull request #333 from bjornfor/fix-typo 
my-env/default.nix: fix "sdl-env" vs "env-sdl" typo
 2013-02-24 12:39:20 -08:00
Bjørn Forsman 5b9a7fc95a my-env/default.nix: fix "sdl-env" vs "env-sdl" typo 
my-env/default.nix lists an example on how to create an SDL environment
that can be installed with "nix-env -i sdl-env". That is actually wrong
and will not work. The correct command is "nix-env -i env-sdl".
 2013-02-24 21:35:23 +01:00
Peter Simons 5f32207dfc Merge remote-tracking branch 'origin/master' into stdenv-updates. 2013-02-24 19:27:08 +01:00
Cillian de Róiste b2ad9627d6 oxygen-gtk: upgrade gtk2 version to 1.3.2.1 2013-02-24 02:30:53 +01:00
Vladimír Čunát 0d72174dbd Merge branch stdenv-updates into x-updates 
x-updates is supposed to merge after stdenv-updates, so let's test it

Conflicts:
	pkgs/development/libraries/gtk+/2.x.nix (both updated, taking newer)
	pkgs/development/libraries/mesa/default.nix (taking nativeBuildInputs)
 2013-02-21 12:43:00 +01:00
Lluís Batlle i Rossell bcbf9472ea Merge remote-tracking branch 'central/master' into x-updates 2013-02-18 13:49:11 +01:00
Eelco Dolstra 2aa6f262cb Merge remote-tracking branch 'origin/master' into stdenv-updates 2013-02-15 13:36:34 +01:00
Corey O'Connor fde87b3a9b add winetricks, modified by vcunat@gmail.com 
Originally from #89.
 2013-02-10 16:20:24 +01:00
Aristid Breitkreuz b2afb45b8d hplip: make pyqt4 dependency conditional on qtSupport 2013-02-08 00:27:07 +01:00
Aristid Breitkreuz b73dff89f7 enable networking support for hplip, net_snmp is available now 2013-02-06 14:08:27 +01:00
Aristid Breitkreuz b5e2a027c4 hplip: now hp-setup actually shows a dialog 2013-02-06 13:44:39 +01:00
Aristid Breitkreuz f590891ac2 hplip: start work on making python programs work 2013-02-06 13:44:38 +01:00
Александр Цамутали 5406828d76 jackaudio/default.nix: Update to 1.9.9.5. 2013-02-03 20:22:43 +04:00
Vladimír Čunát 35a927149f Merge branch 'master' into x-updates 
Conflicts (both messed with mesa):
	pkgs/top-level/all-packages.nix
 2013-02-02 21:11:00 +01:00
Vladimír Čunát 0fa7bc7379 wine: update to 1.5.23, update gecko 2013-02-02 15:03:02 +01:00
Vladimír Čunát 539d9bc1af ghostscript: fix infinite recursion in meta (sorry for that) 2013-01-31 13:21:21 +01:00
Vladimír Čunát a95c85fe94 ghostscript: minor update, replace more internal libraries by nix ones 2013-01-29 17:05:58 +01:00
Vladimír Čunát 570b0f8c54 libtiff: major update to 4.* 
Also minor modification of ghostscript to work with it.
 2013-01-29 14:07:30 +01:00
Eelco Dolstra 5d6da38d33 cups: Don't build on Darwin 2013-01-29 12:43:53 +01:00
Lluis Batlle 0353c08d38 uboot: updating the default uboot to 2012.07 
This is what I use in the sheevplug, with the provided patches.
The old sheevaplug uboot doesn't understand ubifs.
 2013-01-27 15:38:39 +01:00
Eelco Dolstra 5bb548d2e4 Merge remote-tracking branch 'origin/master' into stdenv-updates 2013-01-17 14:19:14 +01:00
Evgeny Egorochkin 5dcdcf4af3 Remove Wine-Warcraft because WarCraft 3 works just fine in vanilla Wine now. 2013-01-15 07:43:40 +02:00
Peter Simons b33ad366a1 Merge branch 'master' into stdenv-updates. 2013-01-11 15:46:10 +01:00
Michael Raskin 029d4fd1db Wine: Update to 1.5.21 2013-01-07 01:35:58 +04:00
Lluís Batlle i Rossell b58780c43d Merge remote-tracking branch 'eelco/master' into stdenv-updates 
Conflicts:
	pkgs/development/compilers/gcc/4.7/default.nix

Trivial solution.
 2012-12-28 23:28:16 +01:00
Eelco Dolstra 84779a6f7d Remove unnecessary parentheses around if conditions 
Pet peeve...
 2012-12-28 19:54:15 +01:00
Eelco Dolstra ab3eeabfed Rename buildNativeInputs -> nativeBuildInputs 
Likewise for propagatedBuildNativeInputs, etc.  "buildNativeInputs"
sounds like an imperative rather than a noun phrase.
 2012-12-28 19:20:09 +01:00
Michael Raskin 17a4e01c69 Wine: update to 1.5.20 2012-12-22 14:54:22 +04:00
Michael Raskin 50f368c0ec Update Wine 2012-12-08 13:28:15 +04:00
Peter Simons 7d3be6b5f9 dlx: link with gcc instead of g++ -- there is no c++ code here 2012-12-05 16:44:04 +01:00
Peter Simons c4038db19d dlx: install both hp.m and new.m microcode 2012-12-05 16:43:49 +01:00
Evgeny Egorochkin 0eecd67d14 Package Samsung unified printer driver. i686 only but apparently can be improved to support x86_64. Based on patch by James Cook <james.cook[NOSPAM]@utoronto.ca> 2012-12-05 05:43:19 +02:00
Peter Simons 50e7ddbdca Add DLX simulator. Upstream provides no version number. 2012-12-04 14:29:48 +01:00
Evgeny Egorochkin 21379504a4 Wine: add printing(cups) support 2012-12-03 17:02:01 +02:00
Ambrus Kaposi 0fc2fd5bfb Create a symbolic link to cups/lib so that gutenprintBin can be specified as a driver in services.printing.drivers in /etc/nixos/configuration.nix 2012-11-30 12:43:00 +01:00
Eelco Dolstra 5553546c21 Remove a bunch of unreferenced files 
Plus a small number of obsolete packages (like old versions of qemu).
 2012-11-29 13:43:37 +01:00
Peter Simons a814d0bc90 SANE: switch snapshot version of the backends to git (and general cleanup) 2012-11-26 16:18:05 +01:00
Peter Simons 0bf71add78 sane-backends: update snapshot to version: 1.0.22.git20121123 2012-11-23 21:31:23 +01:00
Lluís Batlle i Rossell 5c09167b67 myEnv: making it not to add -rpath /lib 
NIX_LDFLAGS was left with "-rpath /lib", which is annoying on non-nixos.
 2012-11-22 10:55:53 +01:00
Michael Raskin 3061db0bb2 Wine: update, add auto-update helper 2012-11-10 14:43:17 +04:00
Rickard Nilsson a25a84ff86 jackaudio: Add extra download URL. Main site seems down. 2012-10-18 14:17:21 +02:00
Eelco Dolstra f7436a9141 Merge remote-tracking branch 'origin/master' into x-updates 2012-10-17 12:07:03 -04:00
Michael Raskin 07f44ad945 Update Wine 2012-10-17 17:22:32 +04:00
Peter Simons 6ff829f19d Merge branch 'master' into x-updates 2012-10-10 18:46:48 +02:00
Rickard Nilsson e74916ed62 xscreensaver: Update to 5.19 2012-10-10 16:05:37 +02:00
Eelco Dolstra a779d2ba18 foomatic-filters: Update to 4.0.12 2012-10-08 14:52:06 -04:00
Eelco Dolstra c961c840f6 cups: Update to 1.5.4 2012-10-08 14:50:19 -04:00
Eelco Dolstra f5e0a05f80 Revert "cups: Update to 1.6.1" 
This reverts commit 5046d0628f.
 2012-10-08 14:43:49 -04:00
Eelco Dolstra 318202951e Revert "Remove cups-pdf-filter" 
This reverts commit 006002d16f.
 2012-10-08 14:43:47 -04:00
Eelco Dolstra f32979e2d8 Revert "cups: Drop unused dependencies and add libusb1 dependency" 
This reverts commit 6f700142c4.
 2012-10-08 14:43:42 -04:00
Eelco Dolstra 41e9f7cfed Merge remote-tracking branch 'origin/master' into x-updates 2012-10-08 13:48:30 -04:00
Michael Raskin 90f1e5b672 Add V4L support to SANE 2012-10-06 22:42:06 +04:00
Eelco Dolstra 31f89ba349 Merge remote-tracking branch 'origin/master' into x-updates 2012-10-03 14:43:10 -04:00
Cillian de Róiste c073071e13 Patch JACK to be compatible with the 2.1.0 release of ffado 2012-10-01 22:28:12 +02:00
Eelco Dolstra 6f700142c4 cups: Drop unused dependencies and add libusb1 dependency 2012-09-28 23:20:59 -04:00
Eelco Dolstra 006002d16f Remove cups-pdf-filter 
It has been obsoleted by the cups-filters package.
 2012-09-28 15:09:14 -04:00
Eelco Dolstra 5046d0628f cups: Update to 1.6.1 2012-09-26 18:11:23 -04:00
Peter Simons 94da2e30dd ghostscript: cosmetic don't rely on magic URL syntax; URLs are strings 2012-09-06 18:34:18 +02:00
Peter Simons 52e5b8e2c5 ghostscript: cosmetic 
Refer to the source code as "src" rather than "data".
 2012-09-06 18:32:59 +02:00
Rob Vermaas 77948b7204 Remove old maven versions, aliased maven to maven3. Updated maven 3 to 3.0.4 2012-08-25 19:43:54 +02:00
Michael Raskin 2a2b52201e Wine: update to 1.5.10 2012-08-09 12:55:30 +04:00
Michael Raskin bdb1ccaf80 Lilypond: update to 2.14.2 2012-08-05 23:10:49 +04:00
Eelco Dolstra 0435f39008 wine: Update to 1.5.9 2012-07-22 01:18:02 -04:00
Peter Simons 0a7e280587 xscreensaver: update to version 5.18 2012-07-17 12:48:15 +02:00
Peter Simons f7a95ce194 wine: update to version 1.5.5 
Patch submitted by Jan Malakhovski <oxij@oxij.org>.
 2012-07-02 16:53:51 +02:00
Eelco Dolstra b5949d2509 busybox: Update to 1.20.1 2012-06-28 14:05:56 -04:00
Lluís Batlle i Rossell 002ffde4a4 trac: Removing the old misc/trac. 
There is a much newer trac at python-packages.nix, and it is used
by nixos' trac apache service.
 2012-06-27 22:34:27 +02:00
Antono Vasiljev 584ff70a16 Use installPhase instead of builder for BSOD 2012-06-25 18:04:08 +03:00
Antono Vasiljev 182f0dfe5e Added bsod emulator for unix 2012-06-25 17:25:01 +03:00
Peter Simons 7b14de6733 Add package for vlock from Debian mirror. 
This is mainly because the original upstream URL is not available anymore.

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

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


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

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

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


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


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


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

I also enable back GPL Ghostscript as the default.

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


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

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

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

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

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

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

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

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

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


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

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

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

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

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

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

svn path=/nixpkgs/trunk/; revision=30764
 2011-12-05 17:32:45 +00:00
Eelco Dolstra 050ea14022 * DBLaTeX updated to 0.3.2. 
svn path=/nixpkgs/trunk/; revision=30523
 2011-11-22 12:59:22 +00:00
Michael Raskin 279e5fb324 Update Wine 
svn path=/nixpkgs/trunk/; revision=30366
 2011-11-10 04:31:52 +00:00
Peter Simons f68e44a602 cups: updated to version 1.5.0 
svn path=/nixpkgs/branches/stdenv-updates/; revision=29681
 2011-10-06 09:57:32 +00:00
Peter Simons 1abdc56a12 Synchronized stdenv-updates branch with trunk. 
There were conflicting patches of pkgs/os-specific/linux/module-init-tools.
Apparently, the expression was updated independently in both branches. I've
resolved the conflict by preferring the patches from stdenv-updates, because
those patches appeared to be more sophisticated, i.e. they build the manual,
etc.

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


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

For example, the command

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

is going to fail, but

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

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

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

svn path=/nixpkgs/branches/kde-4.7/; revision=28023
 2011-07-31 19:44:58 +00:00
Sander van der Burg 14be409d8f Removed hardcoded paths to /bin and /usr/bin 
svn path=/nixpkgs/trunk/; revision=27906
 2011-07-22 20:09:00 +00:00
Sander van der Burg f635aceb5b Updated some meta information for the emulators I've tried recently. They all seem to work fine :-) 
svn path=/nixpkgs/trunk/; revision=27905
 2011-07-22 19:25:31 +00:00
Sander van der Burg 6ac699ba97 Added VisualBoy advance; a gameboy/gameboy color/gameboy advance emulator 
svn path=/nixpkgs/trunk/; revision=27904
 2011-07-22 18:31:42 +00:00
Sander van der Burg cb8409612c Added Mupen64 Plus, a nintendo 64 emulator 
svn path=/nixpkgs/trunk/; revision=27902
 2011-07-22 14:03:23 +00:00
Eelco Dolstra f4ac1126ff * Sync with the trunk. 
svn path=/nixpkgs/branches/kde-4.7/; revision=27796
 2011-07-15 10:02:22 +00:00
Peter Simons aa8cea3e4d moderncv: updated description 
svn path=/nixpkgs/trunk/; revision=27766
 2011-07-13 16:49:33 +00:00
Peter Simons db9fc16b70 moderncv: cleanup the build instructions 
Just add this package to texLiveAggregationFun to install it.

svn path=/nixpkgs/trunk/; revision=27765
 2011-07-13 16:23:48 +00:00
Peter Simons a16e01fe19 Added moderncv package to texlive. 
svn path=/nixpkgs/trunk/; revision=27762
 2011-07-13 15:00:59 +00:00
Peter Simons 758e85cfac texlive: fixed erroneous forwarder scripts 
- Generate a forwarder scripts only for executable files. This change
   removes the broken 'man' script, for example.

 - Run the real binaries with 'exec'.

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

 - Indent consistently with blanks.

 - Removed some debug output from the build expression.

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

svn path=/nixpkgs/trunk/; revision=26862
 2011-04-17 08:27:09 +00:00