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
Vladimír Čunát
fc82aa049b
hddtemp: try to fix by Gentoo patches
2013-02-28 16:00:49 +01:00
Peter Simons
5f32207dfc
Merge remote-tracking branch 'origin/master' into stdenv-updates.
2013-02-24 19:27:08 +01:00
Vladimír Čunát
e469bc503e
kdePackages.partitionManager: fix via update to Gentoo version
2013-02-23 20:32:54 +01:00
Vladimír Čunát
0eeae100fd
wv2: update and fix
2013-02-23 19:29:02 +01:00
Shea Levy
754f9a44fd
Gummiboot: Update to 23.
...
Requires a corresponding change in nixos to work there.
2013-02-21 12:39:25 -05:00
Bjørn Forsman
52531cef21
file: bump from 5.11 to 5.12
2013-02-18 11:46:47 +01:00
Eelco Dolstra
2aa6f262cb
Merge remote-tracking branch 'origin/master' into stdenv-updates
2013-02-15 13:36:34 +01:00
Vladimír Čunát
35f1bbc433
parted: remove 2.3.*, no longer used
2013-02-14 13:13:51 +01:00
Vladimír Čunát
cdebe7617f
gparted: upgrade, use newer parted, clean expression
2013-02-14 13:13:10 +01:00
Shea Levy
40e86be5b1
Gummiboot: Switch to zip archive.
...
For some reason tarballs from cgit have a different hash each time you download.
2013-02-02 19:39:11 -05:00
Shea Levy
b73b7e29bd
Gummiboot: Fix build on 32-bit Linux
2013-02-02 11:03:01 -05:00
Shea Levy
3f3ac212fb
Forgot maintainers
2013-02-01 17:50:41 -05:00
Shea Levy
f5f5eff924
Add gummiboot UEFI boot manager
2013-02-01 17:42:19 -05:00
Eelco Dolstra
80056ddc01
Add cowsay to the channel
2013-01-30 12:52:07 +01:00