Michael Raskin
dcf04b6063
zbar requires v4l1; disabe video
2013-03-09 12:59:45 +04:00
Shea Levy
8934644d20
tor: minor cleanups
...
Signed-off-by: Shea Levy <shea@shealevy.com>
2013-03-08 19:15:26 -05:00
Shea Levy
9a5ca5aced
tor: Don't use NIX_CFLAGS_LINK where CFLAGS will do
2013-03-08 19:14:43 -05:00
Shea Levy
35d957b8f9
Merge branch 'tor.130308' of git://github.com/jcumming/nixpkgs
...
This commit ensures tor is linked to lgcc_s. Tests didn't pass before,
pass now.
Signed-off-by: Shea Levy <shea@shealevy.com>
2013-03-08 19:13:17 -05:00
Shea Levy
9158ad45f1
Merge branch 'xchainkeys' of git://github.com/iyzsong/nixpkgs
...
This adds a new package, xchainkeys. It builds, so I ship.
Signed-off-by: Shea Levy <shea@shealevy.com>
2013-03-08 19:08:56 -05:00
Shea Levy
064155ad38
Merge branch 'recode.130306' of git://github.com/jcumming/nixpkgs
...
Attempts to fix recode build on darwin, verified by inspection (don't
have a readily available darwin machine for testing right now, will let
hydra see if this worked).
Signed-off-by: Shea Levy <shea@shealevy.com>
2013-03-08 18:22:13 -05: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
Jack Cummings
e863477995
need to link against -lgcc_s for the testsuite to work
2013-03-08 07:43:30 -08:00
David Guibert
856f6c2aea
fix iftop
2013-03-08 09:08:57 +01:00
Song Wenwu
9cbcbc5323
add xchainkeys-0.11
2013-03-08 13:55:32 +08:00
Eelco Dolstra
234c6b74c6
Merge remote-tracking branch 'origin/stdenv-updates'
2013-03-07 23:09:05 +01:00
Lluís Batlle i Rossell
197f6c6c4c
idle3-tools can build only on linux, I think.
2013-03-07 22:39:53 +01:00
Lluís Batlle i Rossell
78e71242d7
Adding idle3-tools (for WD Green HDDs)
2013-03-07 21:40:28 +01:00
Eelco Dolstra
674c51af3c
Merge remote-tracking branch 'origin/master' into stdenv-updates
2013-03-07 19:33:52 +01:00
Jack Cummings
a1c4fa8edc
recode: attempt to fix Darwin testsuite build problem
2013-03-06 10:12:21 -08: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
Jack Cummings
ed99c87a26
get recode testsuite running.
2013-03-06 01:07:54 -08:00
Jack Cummings
e61bdcfacd
recode-3.7-git
2013-03-05 14:31:51 -08:00
Vladimír Čunát
26af997d41
Merge branch 'master' into stdenv-updates
...
Conflicts (simple):
pkgs/applications/networking/browsers/chromium/default.nix
pkgs/development/libraries/libsoup/default.nix
pkgs/os-specific/linux/kernel/manual-config.nix
pkgs/os-specific/linux/qemu-kvm/default.nix
2013-03-02 10:41:53 +01:00
Vladimír Čunát
c8b940072d
koffice, kbluetooth: remove from hydra
2013-03-02 09:21:11 +01:00
Lluís Batlle i Rossell
097705cd86
virtualgl: fixing and updating to 2.3.2
2013-03-01 10:18:00 +01:00
Eelco Dolstra
1166b82fca
nix: Update to 1.5.1
2013-03-01 02:03:09 +01:00
Vladimír Čunát
fc82aa049b
hddtemp: try to fix by Gentoo patches
2013-02-28 16:00:49 +01:00
Vladimír Čunát
c0f6910758
fuse_zip: fix with new libzip
2013-02-28 15:43:06 +01:00
Eelco Dolstra
adef38370c
nix: Update to 1.5
2013-02-28 01:20:39 +01:00
Rickard Nilsson
ad76386ff7
Add mkpasswd, an overfeatured front end to crypt
2013-02-27 12:14:09 +01:00
Eelco Dolstra
5847037d84
nix: Update to 1.4
2013-02-26 14:41:02 +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
f20ff74afe
recode: fix with new automake
2013-02-24 16:40:36 +01:00
Vladimír Čunát
4768a0cea6
netboot: change to a fixed version, fix build
2013-02-23 23:19:35 +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
Vladimír Čunát
350bd42274
opensc stuff: fix some packages by updating
2013-02-23 14:00:49 +01:00
Rok Garbas
6b30610672
offlineimap: updating license and add myself as maintainer
2013-02-23 10:55:11 +01:00
Rok Garbas
71a9716fd4
offlineimap: update to 6.5.5-rc2
2013-02-23 10:51:14 +01:00
Shea Levy
c3a55db090
bacula: Remove some duplication to avoid errors when updating.
2013-02-22 15:24:20 -05:00
Bjørn Forsman
2c4d695a1b
bacula: fix version mismatch between name and src attribute
...
Commit 207443b184
2013-02-22 21:05:40 +01:00
cillianderoiste
33eae7dfec
Merge pull request #330 from iElectric/bacula
...
upgrade bacula
2013-02-21 13:51:28 -08:00
Cillian de Róiste
c2ba006ec9
aespipe: Fix typo in maintainer id
2013-02-21 22:30:14 +01:00
Domen Kozar
207443b184
upgrade bacula
2013-02-21 21:18:26 +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
Eelco Dolstra
f9c4ce79c8
Comment out non-existent maintainer attribute
...
http://hydra.nixos.org/build/4191101
2013-02-21 17:48:46 +01:00
Shea Levy
acd4299e75
Merge branch 'master' into stdenv-updates
...
Conflicts:
pkgs/applications/networking/browsers/chromium/default.nix
pkgs/top-level/all-packages.nix
Merge conflicts seemed trivial, but a look from viric and aszlig would be nice.
2013-02-21 11:13:30 -05:00
Peter Simons
45eb9f5589
snx: add version 800007027 of the CheckPoint SSL Network Extender
2013-02-21 15:56:16 +01:00
Peter Simons
0d7f427620
davfs2: read config files from /etc/davfs2 instead of ${out}/etc/davfs2
...
This patch makes the 'noDavsUser' argument to the build expression obsolete.
2013-02-21 12:03:52 +01:00
Shea Levy
aacca1902c
Merge branch 'upstream-master' into stdenv-updates
2013-02-19 10:09:39 -05:00
Eelco Dolstra
3a1d3990e5
openssh: Just use a mirror of the HPN patch
2013-02-19 11:03:10 +01:00
Lluís Batlle i Rossell
cde20d6951
Fixing openssh hpn support for 6.1p1
...
I had to write a weird download derivation to overcome their download procedure.
2013-02-19 10:50:50 +01:00
Cillian de Róiste
4400a752e9
Add aespipe, an AES encrypting or decrypting pipe
2013-02-18 22:47:55 +01:00
