Commit graph

723 commits

Author SHA1 Message Date
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
Peter Simons 62e37492b9 Merge remote-tracking branch 'origin/master' into stdenv-updates. 2013-04-04 00:51:30 +02:00
Vladimír Čunát 2cd7d9d29e Merge pull request #417 from the-kenny/g500-control
g500-control: add
2013-04-03 08:14:18 -07:00
Cameron Matheson 934bfc618a tmux: update to version 1.8 2013-04-01 16:24:08 -06:00
Peter Simons 64f600a010 Merge remote-tracking branch 'origin/master' into stdenv-updates. 2013-04-01 13:39:57 +02:00
Malcolm Matalka d819ee8b7e Add multitail 2013-03-31 19:40:11 +02:00
Peter Simons fdbe2878f0 Merge remote-tracking branch 'origin/master' into stdenv-updates. 2013-03-28 14:02:56 +01:00
Moritz Ulrich da90131e5a g500-control: Add meta.platforms.
Signed-off-by: Moritz Ulrich <moritz@tarn-vedra.de>
2013-03-27 20:59:57 +01:00
Moritz Ulrich e70954f8c8 New package: g500-control
g500-control is a small tool to configure internal profiles of a
Logitech G500 mouse.

Signed-off-by: Moritz Ulrich <moritz@tarn-vedra.de>
2013-03-27 19:51:32 +01:00
Peter Simons e825c522b6 Merge pull request #409 from pcapriotti/renameutils
Add renameutils package.
2013-03-25 11:40:36 -07:00
Lluís Batlle i Rossell 26ec1abf41 Adding Steam Locomotive, for the fun 2013-03-25 14:57:45 +01:00
Paolo Capriotti f85025a30e Add renameutils package. 2013-03-25 13:45:01 +00:00
Peter Simons 0823aea0a6 Merge branch 'master' into stdenv-updates.
Conflicts:
	pkgs/development/libraries/libxslt/default.nix

Commit 1764ea2b0a introduced changes to libxslt
in an awkward way to avoid re-builds on Linux. This patch has been simplified
during this merge.
2013-03-25 13:43:45 +01:00
Vladimír Čunát f8fb55b4cc gparted: update 2013-03-23 20:25:35 +01:00