Commit Graph
154076 Commits
Author SHA1 Message Date
Lluís Batlle i Rossell 6e281e46b7 I update the name of the memtest entry in grub of the iso images,
because it can be overriden choosing another memtest86.

As an effect of a change in nixpgks, the isos will include
memtest86 4.0a instead of memtest86+ 4.20, only because the 
former is released later, and I deduce it should work better.


svn path=/nixos/trunk/; revision=33691
2012-04-09 20:30:14 +00:00
Lluís Batlle i Rossell 0b8b6616b6 Making the memtest name come from the pkgs.memtest86, as the nixos
user can override choosing between two memtests.


svn path=/nixos/trunk/; revision=33690
2012-04-09 20:08:14 +00:00
Lluís Batlle i Rossell 0684ca8745 Adding the memtest86 from memtest86.com, and renaming the top-level attribute
name of memtest86+ to memtest86plus.

I think it makes more sense for the attribute memtest86 to point to the
upstream memtest86.com version.


svn path=/nixpkgs/trunk/; revision=33689
2012-04-09 19:54:34 +00:00
Rob Vermaas d4913759da Update darktable to version 1.0.
svn path=/nixpkgs/trunk/; revision=33688
2012-04-09 17:56:38 +00:00
Eelco Dolstra d3c1261665 * Add a combined NixOS/Nixpkgs jobset. This is to get a NixOS channel
containing Nixpkgs binaries.

svn path=/nixos/trunk/; revision=33686
2012-04-09 13:04:58 +00:00
Eelco Dolstra 80866302b4 * Disable two jobs that don't evaluate.
svn path=/nixos/trunk/; revision=33685
2012-04-09 12:52:15 +00:00
Eelco Dolstra defe1d36cb * Generate a NixOS channel.
svn path=/nixos/trunk/; revision=33684
2012-04-09 12:49:03 +00:00
Peter Simons b041d3e49b Updated Haskell packages.
- blaze-builder-conduit: updated to version 0.4.0.1
 - enumerator: updated to version 0.4.19
 - persistent-sqlite: updated to version 0.9.0.1
 - persistent-template: updated to version 0.9.0.1
 - persistent: updated to version 0.9.0.1
 - pool-conduit: updated to version 0.1.0.1
 - semigroups: updated to version 0.8.2
 - shakespeare-css: updated to version 1.0.1.1
 - shakespeare-i18n: updated to version 1.0.0.1
 - shakespeare-js: updated to version 1.0.0.1
 - shakespeare-text: updated to version 1.0.0.1
 - shakespeare: updated to version 1.0.0.1
 - void: updated to version 0.5.5.1
 - wai-app-static: updated to version 1.2.0.1
 - wai: updated to version 1.2.0.1
 - warp: updated to version 1.2.0.1
 - yesod-core: updated to version 1.0.0.2
 - yesod: updated to version 1.0.0.2
 - zlib-conduit: updated to version 0.4.0.1

svn path=/nixpkgs/trunk/; revision=33683
2012-04-09 12:37:39 +00:00
Mathijs Kwik 107c8325e5 added extra package for gnupg 2.1 git pre version.
contains the merge of gnupg-ecc, enabling ecdsa and other algorithms.

I mainly need this because I use ecdsa for my ssh keys, and want
gpg-agent to be able to handle them.

svn path=/nixpkgs/trunk/; revision=33682
2012-04-09 10:17:40 +00:00
Mathijs Kwik 0765ca769a libassuan: added extra package with current git version
needed for upcoming gnupg 2.1

svn path=/nixpkgs/trunk/; revision=33681
2012-04-09 10:17:36 +00:00
Mathijs Kwik 9779ae082a npth: successor of the pth library, used by upcoming versions of gnupg and its libraries
svn path=/nixpkgs/trunk/; revision=33680
2012-04-09 10:17:32 +00:00
Mathijs Kwik 81d6e98d34 gpgme: upgraded to 1.3.1
svn path=/nixpkgs/trunk/; revision=33679
2012-04-09 10:17:29 +00:00
Mathijs Kwik 5cdd04e950 gnupg: upgraded to 2.0.19
svn path=/nixpkgs/trunk/; revision=33678
2012-04-09 10:17:26 +00:00
Mathijs Kwik 94749e4463 libksba: upgraded to 1.2.0
svn path=/nixpkgs/trunk/; revision=33677
2012-04-09 10:17:23 +00:00
Mathijs Kwik 6ef610851e kde okular: include pkgconfig, otherwise libspectre isn't found (.ps viewing)
svn path=/nixpkgs/trunk/; revision=33676
2012-04-09 10:17:20 +00:00
Mathijs Kwik 4d34820fba UHC: upgraded and changed to the new official github repository
svn path=/nixpkgs/trunk/; revision=33675
2012-04-09 10:17:17 +00:00
Arie Middelkoop 2b18ccf305 * Added "easytag", a GUI for organizing id3tags in mp3s.
* Updated some ocaml packages.
* Updated coccinelle.

svn path=/nixpkgs/trunk/; revision=33674
2012-04-09 09:42:20 +00:00
Shea Levy 68f739cc45 nodejs/v8: Bump
svn path=/nixpkgs/trunk/; revision=33673
2012-04-08 14:32:00 +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
Peter Simons fc1bc797bd Updated Haskell packages.
- file-embed: updated to version 0.0.4.2
 - mtl: added version 2.1
 - texmath: updated to version 0.6.0.5
 - text: added version 0.11.2.0
 - removed obsolete overrides

svn path=/nixpkgs/trunk/; revision=33671
2012-04-08 11:14:28 +00:00
Cillian de Roiste e1155499ad Reverting to revision 1995, this is what AVLinux uses, and works well with jackdbus too
svn path=/nixpkgs/trunk/; revision=33670
2012-04-08 11:10:11 +00:00
Peter Simons 4292793d40 git-annex: updated to version 3.20120406
svn path=/nixpkgs/trunk/; revision=33669
2012-04-08 10:48:14 +00:00
Cillian de Roiste 3ec76c0a25 Adding a2jmidid, a daemon for exposing legacy ALSA sequencer applications in JACK MIDI system
svn path=/nixpkgs/trunk/; revision=33668
2012-04-08 00:28:37 +00:00
Cillian de Roiste 78ffc6b30d Adding a2jmidid
svn path=/nixpkgs/trunk/; revision=33667
2012-04-08 00:25:09 +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
Cillian de Roiste 285af645e6 Adding extra requirements, fixing some of the ffado utilities
svn path=/nixpkgs/trunk/; revision=33664
2012-04-07 23:57:30 +00:00
Rob Vermaas 6b34bd8564 remove remaining reference to nixos-deploy-nwtork
svn path=/nixos/trunk/; revision=33663
2012-04-07 15:18:39 +00:00
Eelco Dolstra 301c4d96b1 * Remove nixos-deploy-network. It has been superceded by Charon.
svn path=/nixos/trunk/; revision=33662
2012-04-07 13:26:35 +00:00
Eelco Dolstra 6e7859814c * Move misc/deployment.nix to Charon, since these options don't really
make sense outside of a Charon deployment.

svn path=/nixos/trunk/; revision=33661
2012-04-07 13:17:03 +00:00
Peter Simons 7b00953c70 haskell-hoogle: fixed build
svn path=/nixpkgs/trunk/; revision=33660
2012-04-07 13:16:33 +00:00
Peter Simons 9b0323859f Updated Haskell packages.
- cabal2nix: updated to version 1.31
 - gloss: updated to version 1.7.2.1
 - repa-algorithms: updated to version 3.1.0.1
 - repa-bytestring: deleted obsolete package
 - repa-examples: updated to version 3.1.0.1
 - repa-io: updated to version 3.1.0.1
 - repa: updated to version 3.1.0.1
 - semigroups: updated to version 0.8.0.1

svn path=/nixpkgs/trunk/; revision=33659
2012-04-07 11:59:28 +00:00
Peter Simons bf47f4bbe3 Updated Haskell packages.
- HsOpenSSL: updated to version 0.10.2
 - zip-archive: updated to version 0.1.1.8

svn path=/nixpkgs/trunk/; revision=33657
2012-04-06 19:48:24 +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 ec3dca188c Dropped the unused/unknown/obsolete module i8042 from 'boot.initrd.kernelModules'.
svn path=/nixos/trunk/; revision=33654
2012-04-06 19:21:50 +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 6a838a4ba1 Making x11perf build.
svn path=/nixpkgs/trunk/; revision=33651
2012-04-06 18:33:51 +00:00
Eelco Dolstra 4f4c529979 Stage 1 improvements:
* Load scsi_wait_scan after all other kernel modules to ensure that
  all SCSI device nodes have been created.
* Increase the timeout for the appearance of the root device to 20
  seconds.
* Do a "udevadm settle" just after the root device has appeared to
  make sure that udev isn't accessing the device anymore (hopefully).
  On EC2 (Xen), I've seen fsck on the root fail randomly with "device
  in use" errors.

svn path=/nixos/trunk/; revision=33650
2012-04-06 14:20:43 +00:00
Ludovic Courtès e24eab9b87 GNU: Use `callPackage'.
svn path=/nixpkgs/trunk/; revision=33649
2012-04-06 13:18:58 +00:00
Eelco Dolstra 9f2068ac9b * Don't build Boost on Cygwin. It takes way too long.
svn path=/nixpkgs/trunk/; revision=33648
2012-04-06 13:10:19 +00:00
Lluís Batlle i Rossell 3e923680d2 Making gnash build with the default firefox xulrunner.
I have not checked if gnash needs it; I only changed it from the
xulrunner of iceweasel (which does not build) to that more maintained xulrunner
that builds.


svn path=/nixpkgs/trunk/; revision=33647
2012-04-06 13:01:55 +00:00
Eelco Dolstra 1e8e83408b * Revert unintended commit.
svn path=/nixos/trunk/; revision=33646
2012-04-06 12:23:44 +00:00
Eelco Dolstra 852e513638 * Handle booting from /dev/xvda.
svn path=/nixos/trunk/; revision=33645
2012-04-06 12:23:12 +00:00
Eelco Dolstra 6e195330d6 * Lower priority for stdenv jobs.
svn path=/nixpkgs/branches/stdenv-updates/; revision=33644
2012-04-06 11:19:48 +00:00
Eelco Dolstra 29ae6a2332 * Remove unused file.
svn path=/nixpkgs/trunk/; revision=33643
2012-04-06 11:06:07 +00:00
Michael Raskin 45fbf22761 Solve missing symbol problem
svn path=/nixpkgs/trunk/; revision=33642
2012-04-06 10:20:37 +00:00
Ludovic Courtès 292e9d1029 Ogre: Rewrite using `stdenv'; enable various plug-ins.
svn path=/nixpkgs/trunk/; revision=33641
2012-04-06 09:07:23 +00:00
Ludovic Courtès 725745c5b4 Add VRPN.
svn path=/nixpkgs/trunk/; revision=33640
2012-04-06 08:32:50 +00:00