Commit graph

707 commits

Author SHA1 Message Date
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
Peter Simons 22fb1ad99e Merge remote-tracking branch 'origin/master' into stdenv-updates. 2013-03-21 09:23:54 +01:00
Peter Simons 4fce144369 Merge pull request #387 from aforemny/cloc
Add cloc-1.58
2013-03-18 04:04:04 -07:00
Jan Malakhovski 16972d2415 screen: fix some annoying bugs by importing patches from ArchLinux 2013-03-17 12:24:49 +00:00
Danny Wilson d007a78ccb Merge remote-tracking branch 'origin/stdenv-updates' into illumos
Conflicts:
	pkgs/development/libraries/gmp/5.1.1.nix
	pkgs/development/libraries/mpc/default.nix
	pkgs/development/libraries/mpfr/default.nix
	pkgs/development/libraries/ppl/default.nix
	pkgs/tools/misc/coreutils/default.nix
2013-03-17 13:22:24 +01:00
Alexander Foremny 4e5b7cd5d1 Add cloc-1.58 2013-03-16 15:06:23 +01:00
Lluís Batlle i Rossell 8d1ff12cdc mktorrent: fixing the usual pthread_cancel problem 2013-03-12 20:01:07 +01:00
Lluís Batlle i Rossell 90bca24b38 Adding mktorrent 1.0 2013-03-12 19:43:57 +01:00
Vladimír Čunát 2e1dd8e076 recutils: supply the forgotten patch 2013-03-09 13:54:55 +01:00
Vladimír Čunát 87ec597ce7 recutils: fix build with new glibc 2013-03-09 13:24:31 +01:00
Shea Levy 1de517844b Whoops, buildNativeInputs is now nativeBuildInputs 2013-03-08 16:39:09 -05:00
Shea Levy b938cacbe1 tmux: Update to 1.7 2013-03-08 15:49:22 -05:00
Eelco Dolstra 92656e5f52 coreutils: Update to 8.21
Now "df" finally hides bind mounts and rootfs!
2013-03-06 14:10:54 +01:00
Danny Wilson 242b4d23a7 Update less to version 451 2013-02-28 20:33:37 +01:00
Danny Wilson 15e865ac09 GCC 4.7.2 + updated libraries compiles on Illumos/SmartOS!
- Add solaris native ld support to GCC build wrapper
- Add solaris ld wrapper that fixes -L argument order
2013-02-28 20:04:02 +01:00
Danny Wilson bcaea92a12 Attempt at getting GCC 4.7 compiled on Illumos...
No success yet :-(
2013-02-28 20:04:01 +01:00
Danny Wilson cf42601f92 Coreutils update and Illumos compatibility fixes.
- GNU Coreutils 8.21
- Add is64Bit checks to stdenv for Solaris.
- Fix OpenSSL Illumos build.
2013-02-28 20:04:01 +01:00