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

936 commits

Author SHA1 Message Date
Nixpkgs Monitor f90e505d50 units: update from 1.86 to 2.02 2013-12-16 01:36:17 +02:00
Nixpkgs Monitor 8a0a1b7768 pg_top: update from 3.6.2 to 3.7.0 2013-12-16 01:36:17 +02:00
Nixpkgs Monitor d7a82dfe6f lockfileProgs: update from 0.1.16 to 0.1.17 2013-12-15 13:21:56 +02:00
Nixpkgs Monitor f95db595e7 ised: update from 2.2.2 to 2.5.0 2013-12-15 13:11:20 +02:00
Nixpkgs Monitor 17588191ec dmg2img: update from 1.6.4 to 1.6.5 2013-12-15 11:40:25 +02:00
Nixpkgs Monitor 186f5f5f05 convmv: update from 1.14 to 1.15 2013-12-15 10:46:53 +02:00
Nixpkgs Monitor f7b64d0e66 testdisk: update from 6.13 to 6.14 2013-12-14 21:23:23 +02:00
Nixpkgs Monitor 0be455e0e4 youtubeDL: update from 2013.12.08.1 to 2013.12.11.2 2013-12-13 20:56:36 +02:00
Vladimir Still 6ffa9261f9 tmpwatch: Add package. 2013-12-13 20:56:35 +02:00
Nixpkgs Monitor aef9ae72d0 bogofilter: update from 1.1.7 to 1.2.4, potentially fixes CVE-2012-5468 2013-12-12 23:50:47 +02:00
Nixpkgs Monitor f453b1fd03 gnuvd: update from 1.0.10 to 1.0.12 2013-12-12 03:11:35 +02:00
Peter Simons 900786ab37 Fix more evaluation errors on Hydra. 2013-12-11 12:08:19 +01:00
Vladimír Čunát 089da3ee5c Merge master into x-updates 
Conflicts (simple):
	pkgs/top-level/all-packages.nix
 2013-12-10 13:00:02 +01:00
Peter Simons 486e7736df Merge remote-tracking branch 'origin/master' into stdenv-updates. 
Conflicts:
	pkgs/tools/networking/p2p/amule/default.nix
 2013-12-10 00:25:54 +01:00
Evgeny Egorochkin 328d59eab6 add meta.repositories.git to several packages 2013-12-10 01:07:30 +02:00
Nixpkgs Monitor d79177cc20 youtubeDL: update from 2013.10.23.2 to 2013.12.08.1 2013-12-09 10:42:07 +02:00
Vladimír Čunát 6690c97569 Merge branch 'master' into x-updates 
Conflicts (just different styles, same semantics):
	pkgs/development/libraries/libusb1/default.nix
 2013-12-07 14:17:16 +01:00
Peter Simons 125bf9e488 aescrypt: limit meta.hydraPlatforms to Linux 
Builds on other platforms such as FreeBSD fail.
 2013-12-06 19:29:22 +01:00
Peter Simons c32bf83301 Merge remote-tracking branch 'origin/master' into stdenv-updates. 
Conflicts:
	pkgs/development/interpreters/perl/5.16/default.nix
	pkgs/tools/networking/curl/default.nix
	pkgs/top-level/all-packages.nix
	pkgs/top-level/release-python.nix
	pkgs/top-level/release-small.nix
	pkgs/top-level/release.nix
 2013-12-04 18:33:52 +01:00
Nixpkgs Monitor 090d51cb37 bogofilter: update from 1.1.6 to 1.1.7, potentially fixes CVE-2012-5468 2013-12-04 06:12:46 +02:00
Vladimír Čunát d09b722f77 Merge master into x-updates 2013-12-02 21:41:16 +01:00
Moritz Ulrich c71d6f3b1a g500-control: Add myself as maintainer 
Signed-off-by: Moritz Ulrich <moritz@tarn-vedra.de>
 2013-11-29 11:47:00 +01:00
Rickard Nilsson e5f631883e keychain: Add missing binaries to PATH 2013-11-28 12:52:32 +01:00
Domen Kožar 945bcfad30 add ldapvi: interactive LDAP client for Unix terminals. Using it, you can update LDAP entries with a text editor. 2013-11-28 00:15:14 +01:00
Vladimír Čunát b5fba47147 Merge branch master into x-updates 
Conflicts (not used, deleted):
	pkgs/desktops/xfce/common.nix
 2013-11-23 10:22:26 +01:00
Bjørn Forsman 325894eb1b smc: new package 
SMC is a state machine compiler. It generates state machine code from
text input files (state diagrams).

Homepage: http://smc.sourceforge.net/
 2013-11-23 00:11:23 +01:00
Jason "Don" O'Conal c987f5c14c ttmkfdir: update URL (close #1244) 2013-11-20 22:48:12 +01:00
zimbatm 55639c3aeb Adds a new package: direnv 2013-11-17 19:53:54 +01:00
Vladimír Čunát 04921cbae6 desktop_file_utils: update 2013-11-17 15:14:20 +01:00
Lluís Batlle i Rossell a5bc306985 Adding revisions to all fetch* of ngrok. 2013-11-12 21:44:16 +01:00
Eelco Dolstra 25ca1c30e2 screen: Only depend on PAM on Linux 2013-11-06 10:47:58 +01:00
Sergey Mironov 43ecb12e93 gparted: remove unwanted icon-theme.cache (close #1176) 2013-11-05 21:22:44 +01:00
Eelco Dolstra a0e21fd1ca Mark more packages as broken 2013-11-04 21:11:00 +01:00
Mathijs Kwik 609f8dc04b Merge branch 'master' into stdenv-updates 
Conflicts:
	pkgs/top-level/all-packages.nix
 2013-11-01 08:31:54 +01:00
Domen Kožar f4aaced654 ngrok: rewrite to download all dependencies with fetch* functions 2013-10-27 22:57:09 +01:00
Domen Kožar 3cad44d26c ngrok: linux only 2013-10-27 17:26:14 +01:00
Lluís Batlle i Rossell 37f7c96a7e Update youtubeDL. Now vimeo downloads work again. 2013-10-27 16:43:25 +01:00
Domen Kožar 78876a8292 add ngrok: Reverse proxy that creates a secure tunnel between from a public endpoint to a locally running web service 2013-10-27 14:26:24 +01:00
Peter Simons 91f2c362de Merge remote-tracking branch 'origin/master' into stdenv-updates. 
Conflicts:
	pkgs/top-level/all-packages.nix
 2013-10-26 18:28:05 +02:00
Arvin Moezzi ab94ccfc38 rockbox-utility: upgrade 1.2.8 -> 1.3.1 
Close #1116.
 2013-10-25 04:27:40 +03:00
Peter Simons 6be8ad3392 Merge branch 'origin/master' into stdenv-updates. 
There was a minor conflict in 'stumpwm'. The package needs texinfo
version 4.x. At least is used to, I'm not sure whether it still does.
 2013-10-18 18:57:24 +02:00
Bjørn Forsman 645cdce565 plantuml: new package 
PlantUML draws UML diagrams using a simple and human readable text
description.
 2013-10-14 20:13:49 +02:00
Shea Levy f7a1c8c2f5 s/gnu_efi/gnu-efi 
Signed-off-by: Shea Levy <shea@shealevy.com>
 2013-10-09 14:01:36 -04:00
Shea Levy e521757f21 Update gummiboot 
Signed-off-by: Shea Levy <shea@shealevy.com>
 2013-10-09 09:52:08 -04:00
Bjørn Forsman dc44195b95 pv: 1.3.4 -> 1.4.12 
See changelog in the "NEWS" section at
http://www.ivarch.com/programs/pv.shtml
 2013-10-06 18:40:41 +02:00
Bjørn Forsman 083d0890f5 More description fixes 
* Remove package name
* Start with upper case letter
* Remove trailing period

Also reword some descriptions and move some long descriptions to
longDescription.

I'm not touching generated packages.
 2013-10-06 12:01:38 +02:00
Bjørn Forsman 28ac782583 Some description fixes 
There are many more packages to fix, this is just a start.

Rules:
 * Don't repeat the package name (not always that easy...)
 * Start with capital letter
 * Don't end with full stop
 * Don't start with "The ..." or "A ..."

I've also added descriptions to some packages and rewritten others.
 2013-10-05 19:36:23 +02:00
Jonas Hoersch 47a05b9aec autorandr: add coroa as a maintainer 2013-10-04 09:34:17 +02:00
Peter Simons 883c10a663 Merge pull request #1013 from coroa/autorandr 
autorandr: add autorandr an automatic display configuration selector
 2013-10-03 06:58:43 -07:00
Peter Simons ac5d5297dd Merge remote-tracking branch 'origin/master' into stdenv-updates. 2013-10-02 22:44:12 +02:00
Eelco Dolstra e26b828f4a memtest86+: Remove bogus executable bit 2013-10-02 12:32:12 +02:00
Eelco Dolstra b8cf0a32fd memtest86+: Update to 5.01 2013-10-02 12:32:12 +02:00
Eelco Dolstra feeac34635 Move memtest86+ to its own directory 2013-10-02 12:32:11 +02:00
Peter Simons b4f10018cd screen: meta section cosmetic 2013-09-28 13:23:34 +02:00
Moritz Ulrich 36fca94805
Fix some issues in my packages reported by nixpkgs-lint. 
Signed-off-by: Moritz Ulrich <moritz@tarn-vedra.de>
 2013-09-26 20:03:57 +00:00
Domen Kožar 16f722500e autojump: correctly set prefix 2013-09-26 20:23:43 +02:00
Jonas Hoersch 683310e05e autorandr: make the dependencies on xrandr and disper configurable by enableX params 2013-09-26 13:12:01 +02:00
Domen Kožar 8f7545c45b autojump: 21.5.8 -> 21.6.9 2013-09-26 01:17:36 +02:00
Jonas Hoersch cd902179db autorandr: add autorandr an automatic display configuration selector 2013-09-25 00:11:54 +02:00
Peter Simons 9407832de4 Merge remote-tracking branch 'origin/master' into stdenv-updates. 
Conflicts:
	pkgs/development/libraries/gettext/default.nix
 2013-09-23 10:59:44 +02:00
Domen Kožar ede9c79ea7 Merge pull request #998 from offlinehacker/logstash/update 
logstash: update to 1.1.2
 2013-09-21 07:54:52 -07:00
Jaka Hudoklin 6630a35d39 logstash: update to 1.1.2 2013-09-21 16:32:47 +02:00
Jason \"Don\" O'Conal 4736e6d509 expect: fix build on freebsd? (close #981) 2013-09-18 20:50:13 +02:00
Eelco Dolstra f2254354f9 Fix Nixpkgs evaluation 
https://hydra.nixos.org/build/6169018
 2013-09-17 11:04:10 +02:00
Rob Vermaas 8041a33726 Add MegaCli, a command line tool to manage certain RAID cards. 2013-09-16 15:56:55 +02:00
Marc Weber 513dad6527 colord, gusb: package. 
Part of #517.
 2013-09-15 11:53:11 +03:00
Vladimír Čunát 961c2fe7c3 coreutils,gettext: don't change hash except for darwin 
Also some style cleanup.
Note that defining an empty-string variable *does* change the hash.
I would like to change this behaviour one day
(clean up attrs when compiling the derivation).
 2013-09-14 14:56:10 +02:00
Danie Roux 055e646bfc coreutils: Guard against compiler not supporting __builtin_stpncpy_chk 
From https://lists.macosforge.org/pipermail/macports-dev/2011-July/015263.html:

5) Building with a compiler that doesn't support newer __builtins

If your port uses MacPorts compilers rather than the default compiler,
you may run into trouble with string functions.  You'll see errors at
link time about undefined __builtin_* functions.  If this happens, you
may want to compile with -D_FORTIFY_SOURCE=0 to tell the headers to
use unfortified versions which do not use compiler builtins.
 2013-09-14 14:45:07 +02:00
Danie Roux 123ab78ee0 coreutils: Remove 8.19 reference 2013-09-14 14:45:07 +02:00
Danie Roux c183c7b3ec coreutils: Make it build on OSX 10.0.8 
Take patch from: https://lists.gnu.org/archive/html/bug-coreutils/2013-01/msg00119.html
 2013-09-14 14:45:06 +02:00
Mathijs Kwik 2f428bbb46 Merge remote-tracking branch 'official/master' into stdenv-updates 2013-09-11 10:56:47 +02:00
Peter Simons 3d2caf1180 Merge remote-tracking branch 'origin/master' into stdenv-updates. 2013-09-08 22:54:35 +02:00
Vladimír Čunát b1be46e932 Merge branch 'master' into x-updates 2013-09-07 16:19:46 +02:00
Moritz Ulrich be9b6c0fe2 GNU Stow: package - Symlink manager which makes it easy to manage dotfiles 2013-09-05 15:49:35 +03:00
Vladimír Čunát 90575ababb expect: fix postInstall library suffix on darwin 2013-09-04 10:15:32 +02:00
Mathijs Kwik 636ba8f4ad heimdall: upgrade to 1.4.0 2013-09-04 09:28:59 +02:00
Vladimír Čunát 590cee5d19 expect: "minor" update, no longer depends on X/Tk 
ANN: https://groups.google.com/forum/#!topic/comp.lang.tcl/lwZjtKOfaLE
I hope this solves a darwin -lXss linkage problem.
(broke most X stuff through dejagnu -> libffi -> llvm or mesa)
 2013-09-04 00:00:01 +02:00
Peter Simons 98fcc2f746 Merge remote-tracking branch 'origin/master' into stdenv-updates. 2013-08-30 10:45:11 +02:00
Evgeny Egorochkin ce57c3e917 lbdb: fix formatting 2013-08-28 10:57:31 +03:00
Jean-Alexandre Peyroux 1ffc963383 correct indent platforms line in default.nix 2013-08-27 14:39:38 +02:00
Jean-Alexandre Peyroux ed522b59c6 Modif lbdb package. Following the remarks after the 1st commit. 
* add in all-packages.nix sorted alphabetically
* add platforms and license in default.nix
 2013-08-27 11:08:11 +02:00
Jean-Alexandre Peyroux d0f40f17b8 Add The Little Brother's Database (lbdb) package 2013-08-27 09:28:36 +02:00
Eelco Dolstra 1f60a7c4bc less: Update to 458 
For some crazy reason, less is a stdenv dependency.
 2013-08-26 14:50:45 +02:00
Peter Simons 9ac8ea937c Merge branch 'origin/master' into stdenv-updates. 2013-08-26 12:21:23 +02:00
Song Wenwu 540b998555 parcellite: update to 1.1.6 
Set platforms and add myself as a maintainer.
 2013-08-19 21:58:43 +02:00
Bodil Stokke de462dcae2 Cleaned up ponysay build, and added maintainer metadata. 2013-08-18 18:23:35 +02:00
Peter Simons 0d7118814b Merge branch 'origin/master' into stdenv. 2013-08-17 10:00:16 +02:00
Ludovic Courtès 2e937c437a unmaintain several packages 2013-08-16 23:45:01 +02:00
Peter Simons 76244ac2e2 Merge branch 'master' into stdenv-updates 
Conflicts:
	pkgs/development/compilers/ghc/with-packages.nix
 2013-08-16 22:51:13 +02:00
Domen Kožar ab1c1773e2 python: fix alot by having magic and python_magic packages 2013-08-13 14:49:42 +02:00
Domen Kožar 1974c55d91 add python application substanced and it's dependencies 2013-08-13 11:14:24 +02:00
Domen Kožar f3cae400e0 unclutter: add to channel 2013-08-10 20:26:51 +02:00
Bodil Stokke 14c5f6bd74 Adding ponysay. 2013-08-10 01:21:25 +02:00
Jason "Don" O'Conal f3aedccfd4 grc: add expression 2013-08-06 09:42:24 +10:00
Peter Simons 522acfd2f4 Merge remote-tracking branch 'master' into stdenv-updates. 
Conflicts:
	pkgs/applications/version-management/git-and-tools/git/default.nix
	pkgs/top-level/all-packages.nix
 2013-07-30 11:29:30 +02:00
aszlig 311c96ac0f
hetzner-nixops-installer: Remove package. 
This package now is in NixOps directly, so we don't need it here
anymore.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2013-07-26 06:18:04 +02:00
Bjørn Forsman 7b4b03616c bmon: new package 
bmon is a ncurses network bandwidth monitor.

Homepage: http://www.carisma.slowglass.com/~tgr/bmon/
 2013-07-25 12:43:40 +02:00
Bjørn Forsman 63f9aed9eb minicom: 2.4 -> 2.6.2 
This also fixes the annoying issue that minicom doesn't work out of the
box:

  $ minicom
  minicom: there is no global configuration file /etc/minirc.dfl
  Ask your sysadmin to create one (with minicom -s).

  $ sudo minicom -s
  minicom: there is no global configuration file /etc/minirc.dfl
  Ask your sysadmin to create one (with minicom -s).

minicom 2.4 basically refuses to enter setup unless /etc/minirc.dfl
already exists. sudo touch /etc/minirc.dfl is enough to fix that though,
but with this commit "sudo minicom -s" will work out of the box.
 2013-07-24 14:40:40 +02:00
Rok Garbas 626c4d5f5b venus: new package 2013-07-23 22:41:18 +02:00
Evgeny Egorochkin 589d6ff51c vfdecrypt: fix source location 2013-07-19 07:30:17 +03:00
Mathijs Kwik 0fa697405c dmg2img: upgrade to 1.6.4 2013-07-14 08:57:47 +02:00
Evgeny Egorochkin da4be371e9 make package use mirror:// for gnu, savannah and gnome repositories where possible 2013-07-14 05:23:06 +03:00
Evgeny Egorochkin b084b29d26 Even more mirror:// fixes 2013-07-14 04:17:07 +03:00
Evgeny Egorochkin cea107c07f More mirror:// URL fixes 2013-07-14 03:31:12 +03:00
Evgeny Egorochkin f61a4118d0 renameutils: fix version to match tarball 2013-07-14 02:08:53 +03:00
Evgeny Egorochkin 8c8ac0fc8b mktorrent: fix version to match tarball 2013-07-14 02:08:50 +03:00
Evgeny Egorochkin 9a3d4fba5e hdf5: fix version to match tarball 2013-07-14 02:08:49 +03:00
Bjørn Forsman 1af178559f ethtool: 3.2 -> 3.10 
And add package meta data.
 2013-07-12 16:26:48 +02:00
aszlig aa35e66257
hetzner-nixops-installer: Build on Hydra. 
This is in order to prepare for fetching the build output from the corresponding
target machine to even further speed up deployment.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2013-07-09 11:54:50 +02:00
aszlig 049d2381c5
hetzner-nixops-install: Correct typo in meta attr. 
I think it's called maintainerS :-)

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2013-07-09 11:45:24 +02:00
aszlig 99e4890e9e
hetzner-nixops-installer: Reset helper timestamps. 
This should prevent some annoying messages such as:

tar: usr/bin/nix-build: time stamp 2013-07-09 07:45:19 is 0.159248271 s in the f
uture
tar: usr/bin/nix-channel: time stamp 2013-07-09 07:45:19 is 0.159088763 s in the
future
tar: usr/bin/nix-collect-garbage: time stamp 2013-07-09 07:45:19 is 0.15901664 s
in the future
tar: usr/bin/nix-copy-closure: time stamp 2013-07-09 07:45:19 is 0.158948028 s i
n the future
tar: usr/bin/nix-daemon: time stamp 2013-07-09 07:45:19 is 0.158888042 s in the
future

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2013-07-09 08:27:53 +02:00
aszlig d58a5eb572
Move nixpartHetzner into hetzner-nixops-installer. 
This should keep all Hetzner/NixOps specific stuff in one place.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2013-07-09 08:27:53 +02:00
aszlig 2fd13d8fca
Add new hetzner-nixops-installer package. 
This fixes a bunch of issues for the NixOps Hetzner backend, because over there,
it's quite difficult to export the references graph without either duplicaing
lots of code or make a bunch of workarounds.

A detailed description about how it works can be found in the
meta.longDescription attribute.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2013-07-09 08:27:52 +02:00
Vladimír Čunát 8ba92b8895 Merge master into stdenv-updates 
Conflicts (simple):
	pkgs/development/tools/misc/binutils/default.nix
	pkgs/tools/package-management/disnix/default.nix
	pkgs/top-level/all-packages.nix
 2013-07-08 10:48:05 +02:00
Jason \"Don\" O'Conal 3fe02f7c8b aescrypt: fix build on darwin 
* add libiconvOrEmpty to build inputs
* add '-liconv' to LDFLAGS
 2013-07-07 13:46:08 +02:00
Jason "Don" O'Conal 03f716d05e autojump: fix build on darwin 
* remove install.sh shell check
 2013-07-07 19:21:45 +10:00
Eelco Dolstra 20301af497 testdisk: Add to channel 2013-07-05 17:29:53 +02:00
Joachim Schiele e6bf2413ef Merge pull request #685 from qknight/aescrypt 
added AES crypt with fixes from edolstra
 2013-07-02 01:02:28 -07:00
Joachim Schiele 431cd91f01 fixed requested changes 2013-07-01 18:24:43 +02:00
Vladimír Čunát f573b58428 file: minor update 5.12 -> 5.14 2013-06-30 09:00:11 +02:00
Domen Kožar 13017198de Merge pull request #688 from bencahill/master 
rmlint: Install to /bin, not /usr/bin
 2013-06-29 10:12:39 -07:00
Domen Kozar 175eb450cd Revert "fix rmlint" 
This reverts commit 18ddfda81a.
 2013-06-29 19:12:11 +02:00
Domen Kozar 18ddfda81a fix rmlint 2013-06-29 18:43:17 +02:00
Benjamin Cahill baf822a287 rmlint: Install to /bin, not /usr/bin 2013-06-28 16:48:40 -05:00
Joachim Schiele 4d3c59f454 added AES crypt 2013-06-27 13:44:29 +02:00
Joachim Schiele b0c946a86a added mcrypt 2013-06-27 12:04:57 +02:00
Eelco Dolstra acba9240cd nixos.org/tarballs -> tarballs.nixos.org 
It's currently the same machine, but tarballs.nixos.org should become
an S3/CloudFront site eventually.
 2013-06-25 14:12:16 +02:00
Mathijs Kwik e387731b82 youtube-dl: upgrade to 2013.06.21 2013-06-23 16:26:37 +02:00
Jaka Hudoklin 2f4d1a5656 memtest86: udpate to 4.1.0, fix download url 2013-06-22 14:11:47 +02:00
Peter Simons 6b1ebeccf2 Merge branch 'master' into stdenv-updates. 
There were conflicts in pkgs/development/interpreters/ruby/ruby-19.nix,
which I resolved to the best of my knowledge. I'd appreciate if some of
the ruby gurus could have a look at the outcome of my merge, though.
 2013-06-11 12:11:25 +02:00
Benjamin Cahill 923b3d032d rmlint: Remove unneeded dependency 2013-06-09 14:44:06 -05:00
Benjamin Cahill 6e6181bc89 Add rmlint, a tool for removing duplicate files 2013-06-09 13:34:50 -05:00
Evgeny Egorochkin dc54358ce9 Change package versions to conform to nixpkgs conventions. 2013-06-09 05:41:44 +03:00
Evgeny Egorochkin 9c6f7cc9c1 Add package versions to some of the packages or fix existing ones to conform to nixpkgs conventions. 2013-06-07 03:15:45 +03:00
Bjørn Forsman aaac7100c8 txt2man: new package 
txt2man converts flat ASCII text to man page format. (Solfege, which is
added in the next commit, needs this.)
 2013-06-06 19:15:18 +02:00
Lluís Batlle i Rossell 0e57e74e6f youtube-dl: without pandoc on non-pc 2013-06-02 14:56:44 +02:00
Peter Simons 728e305205 Merge remote-tracking branch 'origin/master' into stdenv-updates. 2013-05-22 12:30:02 +02:00
Song Wenwu d762e574fa add parcellite-1.1.4 2013-05-18 13:22:49 +08:00
Joachim Schiele fd8e249b5d byobu 5.37 integration 2013-05-06 11:06:59 +00:00
Rickard Nilsson 9c73572ecf gnu parallel: Update to version 20130422 2013-05-06 11:27:28 +02:00
Domen Kozar 1a003e7dfc autojump: add bash as buildInput 2013-05-05 16:24:16 +02:00
David Guibert 9b5685271d fix autojump licence attribute 2013-05-05 12:46:23 +02:00
Domen Kozar 8aabef6875 autojump: bump and reogranize a bit, not functional yet 2013-05-05 11:06:13 +02:00
Shea Levy fde3526e7d Merge branch 'master' into stdenv-updates 
Conflict in kerberos, which was updated both in master and in
stdenv-updates. Kept the stdenv-updates version, except pulled in the
enableParallelBuilding change from master.

Signed-off-by: Shea Levy <shea@shealevy.com>

Conflicts:
	pkgs/development/libraries/kerberos/krb5.nix
 2013-05-04 18:28:48 -04:00
Domen Kozar 301d2e5431 ncdu: set platforms 2013-05-04 20:34:15 +02:00
Peter Simons 4914e63a89 Merge changes from branch 'master' into stdenv-updates. 
Conflicts:
	pkgs/development/libraries/icu/default.nix
	pkgs/tools/misc/coreutils/default.nix
 2013-04-19 11:48:11 +02:00
Cillian de Róiste 7f8ecc65ac hdf5: download URL no longer available for 1.8.5, upgrade to 1.8.10 2013-04-11 10:54:31 +02:00
Lluís Batlle i Rossell 91a94932d9 coreutils: fixing cross-build 
coreutils can't generate the man pages cross-building. I do a trick
to get them from a non-cross-built coreutils.
 2013-04-10 15:56:14 +02:00
Peter Simons 022f120a2c Merge branch 'master' into stdenv-updates. 2013-04-07 23:37:12 +02:00
Peter Simons 938486848e grub: fix download URL for grub-0.97-once.patch 2013-04-07 23:33:20 +02:00