1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-22 21:50:55 +00:00
Commit graph

19154 commits

Author SHA1 Message Date
Yury G. Kudryashov 613a8ecaf9 Remove some trailing spaces
svn path=/nixpkgs/trunk/; revision=33456
2012-03-28 15:43:39 +00:00
Yury G. Kudryashov defd86049c Merge ^/nixpkgs/trunk.
This merge leads to a big rebuild, but this wouldn't hurt as I'm going to
reintegrate this branch soon.

svn path=/nixpkgs/branches/glib-2.30-take2/; revision=33455
2012-03-28 15:42:42 +00:00
Yury G. Kudryashov 49b7f13128 Upgrading dssi to 1.1.1 (cherry-pick trunk@33360)
svn path=/nixpkgs/branches/glib-2.30-take2/; revision=33454
2012-03-28 15:11:50 +00:00
Peter Simons db8f709430 Updated Haskell packages.
- derp: updated to version 0.1.6
 - happstack-server: updated to version 6.6.5
 - hlint: updated to version 1.8.26

svn path=/nixpkgs/trunk/; revision=33453
2012-03-28 13:49:20 +00:00
Peter Simons e94fd0e83c all-packages.nix: stripped trailing whitespace
svn path=/nixpkgs/trunk/; revision=33452
2012-03-28 13:49:16 +00:00
Peter Simons b575fa1259 all-packages.nix: removed virtmanager and virtinst attributes, which point to non-existent files
svn path=/nixpkgs/trunk/; revision=33451
2012-03-28 13:49:14 +00:00
Joachim Schiele 37e67f9888 wgetpaste is a handy shell utility getting things pasted on pasting services online
svn path=/nixpkgs/trunk/; revision=33450
2012-03-28 13:21:42 +00:00
Mathijs Kwik a6238bce68 avidemux: upgraded to 2.5.6
- added support for vp8 (libvpx)
- added support for xvid
- added support for libva output

svn path=/nixpkgs/trunk/; revision=33447
2012-03-28 08:40:41 +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
Lluís Batlle i Rossell 68b5044cc0 Adding 'usernixos', where I start a modular kind-of-nixos that can go into
"nix-env -i" profiles, as a container for flexible configuration at the style
of nixos, to be defined in .nixpkgs/config.nix, with the main target of
generating an activation script.


svn path=/nixpkgs/trunk/; revision=33445
2012-03-27 20:33:49 +00:00
Shea Levy db28c68df0 mkDerivation handles propagatedUserEnvPkgs properly now
svn path=/nixpkgs/trunk/; revision=33444
2012-03-27 15:20:37 +00:00
Shea Levy 092487c1fb Update rubygems
svn path=/nixpkgs/trunk/; revision=33443
2012-03-27 15:14:13 +00:00
Eelco Dolstra a0f057e805 * Updated jdiskreport.
svn path=/nixpkgs/trunk/; revision=33440
2012-03-27 11:31:25 +00:00
Rob Vermaas 5a3a3a4e17 * Fix JDK/JRE error: /nix/store/.../jre/lib/i386/xawt/libmawt.so: file not recognized: File format not recognized.
Patch provided by Ambrus Kaposi.


svn path=/nixpkgs/trunk/; revision=33439
2012-03-27 11:19:00 +00:00
Joachim Schiele 194c822cce version 88.0 of spring has arrived
svn path=/nixpkgs/trunk/; revision=33438
2012-03-27 11:07:53 +00:00
Eelco Dolstra bb311ce1d0 * Boto updated to 2.3.0.
svn path=/nixpkgs/trunk/; revision=33437
2012-03-27 10:48:45 +00:00
Peter Simons e85794243f Update Haskell packages.
- blaze-html: updated to version 0.4.3.2
 - ghc-mod: updated to version 1.10.12
 - gloss: updated to version 1.7.0.1

svn path=/nixpkgs/trunk/; revision=33436
2012-03-27 10:31:45 +00:00
Russell O'Connor bba264d897 Adding forgotten configure_130312 patch for matitia.
svn path=/nixpkgs/trunk/; revision=33433
2012-03-26 19:11:25 +00:00
Ludovic Courtès 95703347b6 GCC 4.7: Fix the `name' attribute.
svn path=/nixpkgs/trunk/; revision=33432
2012-03-26 17:47:47 +00:00
Ludovic Courtès f6af9b84c6 GCC 4.7.0.
svn path=/nixpkgs/trunk/; revision=33431
2012-03-26 15:36:43 +00:00
Yury G. Kudryashov d465b0798c virtuoso-6.1.5
svn path=/nixpkgs/trunk/; revision=33426
2012-03-26 15:07:37 +00:00
Eelco Dolstra e1b49fe69d * Drop some recurseIntoAttrs calls.
svn path=/nixpkgs/trunk/; revision=33425
2012-03-26 14:22:28 +00:00
Eelco Dolstra a559cc270e * Let nix-env only search Python 2.7 packages. Reported by Konrad
Hinsen.

  We should add a check to enforce that every package/version pair in
  "nix-env -qa" is unique :-)

svn path=/nixpkgs/trunk/; revision=33424
2012-03-26 14:07:34 +00:00
Eelco Dolstra b62900880a * Fix the build of Task::Catalyst::Tutorial (http://hydra.nixos.org/build/2307296).
svn path=/nixpkgs/trunk/; revision=33423
2012-03-26 11:38:49 +00:00
Eelco Dolstra 2d0e07c242 * Don't recurse into perl510Packages. It confuses nix-env -u since it
can't distinguish between 5.10 and 5.14 packages.  (We should
  probably include the Perl version number in the name of Perl
  packages, like GHC packages.)

svn path=/nixpkgs/trunk/; revision=33422
2012-03-26 10:22:27 +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
Russell O'Connor ec5dda12d2 Reparing stable build of Matita.
Also correcting the version and simplifying the prerelease package of Matita.


svn path=/nixpkgs/trunk/; revision=33420
2012-03-25 21:27:30 +00:00
Russell O'Connor 4bccef4db2 Updating hash for ocaml_sqlite3
Markus Mottl <markus.mottl@gmail.com> said by email to me that 

``Note that this link is served by a Mercurial Apache module, i.e. this
is not static content.  It's likely that e.g. tar or bzip2 produce
slightly different output, which would explain changing hashes.

So I guess we shouldn't worry too much about the change in hash?


svn path=/nixpkgs/trunk/; revision=33419
2012-03-25 21:24:23 +00:00
Russell O'Connor 510308e039 Adding a package for a preview release of Matita.
svn path=/nixpkgs/trunk/; revision=33418
2012-03-25 20:43:00 +00:00
Lluís Batlle i Rossell 00dc25ba43 Making wrapFirefox also propagate the browser to the userenv, so it gets
the manpages. That's useful for vimperator2 for example.


svn path=/nixpkgs/trunk/; revision=33417
2012-03-25 20:21:45 +00:00
Lluís Batlle i Rossell 778abfc6c0 Updating vimprobable2.
svn path=/nixpkgs/trunk/; revision=33416
2012-03-25 20:16:01 +00:00
Lluís Batlle i Rossell 0589bffdf4 Typo of semicolon.
svn path=/nixpkgs/trunk/; revision=33415
2012-03-25 20:11:32 +00:00
Lluís Batlle i Rossell f389901fd2 Adding 'tabbed'. I think Alexander Foremny wanted to send this patch
long ago, but I could not find it.


svn path=/nixpkgs/trunk/; revision=33414
2012-03-25 20:10:25 +00:00
Shea Levy 343fb0be1e Add kmod, the replacement for the now-defunct module-init-tools
The kmod tools appear to take a flag to name the location of the modules
directory, so we may not need to migrate our module-init-tools patches

svn path=/nixpkgs/trunk/; revision=33413
2012-03-25 20:05:36 +00:00
Peter Simons 31507bc274 nbd: don't try to link -lrt and -lpthread on non-Linux platforms
svn path=/nixpkgs/trunk/; revision=33412
2012-03-25 19:40:04 +00:00
Peter Simons d44e55866a Updated Haskell packages.
- cabal2nix: updated to version 1.30
 - cmdargs: updated to version 0.9.5
 - derive: updated to version 2.5.6
 - hlint: updated to version 1.8.25
 - io-choice: added version 0.0.1

svn path=/nixpkgs/trunk/; revision=33411
2012-03-25 19:33:53 +00:00
Peter Simons a058381657 haskell-ghc-mod: updated to version 1.10.11
This expression can now be generated by cabal2nix. Note that it doesn't
propagate Emacs and haskell-mode, though, these dependencies must be
installed by the user in addition to ghc-mod.

To active ghc-mod, add the following snippet to your ~/.emacs file:

  (autoload 'ghc-init "ghc" nil t)
  (add-hook 'haskell-mode-hook (lambda () (ghc-init)))

svn path=/nixpkgs/trunk/; revision=33410
2012-03-25 19:33:48 +00:00
Peter Simons 48ce33903a haskell-hoogle: added version 4.2.10
svn path=/nixpkgs/trunk/; revision=33409
2012-03-25 18:22:20 +00:00
Peter Simons 41081c4eb0 nbd: re-introduced linking with -lrt, and added an additional -lpthread on top of it
Linking these libraries makes sure that they can be found at run-time,
because a proper rpath into the Nix store is added to the generated
executable. Without that rpath, nbd-server will try to load the system's
libpthread.so.0, which may not be what we want.

svn path=/nixpkgs/trunk/; revision=33408
2012-03-25 18:10:30 +00:00
Lluís Batlle i Rossell fa183b675b Adding wrapFirefox for midori and vimprobable2, so they can enjoy the flash plugin.
OTH, I'd prefer naming the attributes like "midoriWrapped" instead of "midoriWrapper". 
But I chose the 2nd to follow the example of those already in all-packages.


svn path=/nixpkgs/trunk/; revision=33406
2012-03-25 13:59:17 +00:00
Lluís Batlle i Rossell b24bab3873 Getting a much newer version of the openchrome X driver
svn path=/nixpkgs/trunk/; revision=33405
2012-03-25 13:53:07 +00:00
Alexander Tsamutali b1952ce587 desktops/e17: Updated.
svn path=/nixpkgs/trunk/; revision=33404
2012-03-25 13:50:39 +00:00
Lluís Batlle i Rossell e4443dfc8d Telling hydra to build vimprobable.
svn path=/nixpkgs/trunk/; revision=33402
2012-03-25 11:39:43 +00:00
Lluís Batlle i Rossell 2ccec99d8c Making webkit build further. They want an older perl.
svn path=/nixpkgs/trunk/; revision=33401
2012-03-25 11:27:13 +00:00
Michael Raskin 99f198ab9f Update/fix Midori
svn path=/nixpkgs/branches/glib-2.30-take2/; revision=33400
2012-03-25 11:22:32 +00:00
Arie Middelkoop 797c0f86fa Recovered OCaml 3.11 by using version 3.11.2 and a patch from ocaml's bugtracker.
svn path=/nixpkgs/trunk/; revision=33399
2012-03-24 22:59:08 +00:00
Cillian de Roiste 9810e6110f Upgrading to 2.0.1, bugfix for smb error. Thanks to Kirill Elagin
svn path=/nixpkgs/trunk/; revision=33398
2012-03-24 19:52:46 +00:00
Cillian de Roiste d2d41e9b78 Adding mhwaveedit, a sample editor
svn path=/nixpkgs/trunk/; revision=33397
2012-03-24 18:59:26 +00:00
Cillian de Roiste 32df0f365e Removing the obsolete specimen folder (replaced by petrifoo)
svn path=/nixpkgs/trunk/; revision=33396
2012-03-24 18:08:34 +00:00
Cillian de Roiste a305102589 Adding Petri-Foo, a fork of the Specimen sampler project
svn path=/nixpkgs/trunk/; revision=33395
2012-03-24 13:22:14 +00:00