Peter Simons
2ffd0b6dac
Merge changes from branch 'origin/master' into stdenv-updates.
2013-04-20 22:19:39 +02:00
Vladimír Čunát
1c22316af6
Merge pull request #429 from ierton/wicd-fixes
...
wicd: some fixes
2013-04-20 01:32:29 -07: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
Peter Simons
d6bdc558c7
nbd: update to version 3.3
2013-04-14 21:33:04 +02:00
Eelco Dolstra
4d5ba15ea9
openssh: Update to 6.2p1
2013-04-12 15:27:13 +02:00
Eelco Dolstra
8fc1fe9f6b
socat: Update to 1.7.2.1
...
CVE-2012-0219
2013-04-12 15:01:01 +02:00
Cillian de Róiste
277816eb00
lftp: update to 4.4.5
2013-04-10 14:13:27 +02:00
Rickard Nilsson
08f1b426bc
stunnel: Update to 4.56
...
Note, I had to add "fips = no" to my stunnel configuration after
the update.
2013-04-09 16:34:59 +02:00
Sergey Mironov
8b3b208f33
wicd: rename icons/hicolour to icons/hicolor
2013-04-09 09:27:45 +04:00
Peter Simons
adfc924015
Merge branch 'master' into stdenv-updates.
2013-04-08 01:19:38 +02:00
Peter Simons
48a2fb0aaa
httpie: update to version 0.4.1 to fix the build
2013-04-08 01:19:20 +02:00
Peter Simons
2fe970d6f2
httpie: the build input 'requests014' doesn't exist anymore, it's now called 'requests'
2013-04-08 01:17:44 +02:00
Sergey Mironov
18681ae58e
wicd: remove unused patches, remove ast with plain rm
2013-04-04 13:44:43 +04:00
Peter Simons
62e37492b9
Merge remote-tracking branch 'origin/master' into stdenv-updates.
2013-04-04 00:51:30 +02:00
Cillian de Róiste
69ad5c5c04
Fix the path to ping
...
iputils-20101006/sbin/ping has moved to iputils-20121221/bin/ping
Wicd uses ping to test the connection and produced and error message.
2013-04-03 23:34:02 +02:00
Peter Simons
64f600a010
Merge remote-tracking branch 'origin/master' into stdenv-updates.
2013-04-01 13:39:57 +02:00
Sergey Mironov
6901f6346d
wicd: [HACK] fix various gtk issues
...
* hack around s.translate situation
* fix KeyError exception in error dialog
* fix Russian translation
2013-03-31 18:10:28 +00:00
Domen Kozar
ea4b0c33d8
Set correct paths when using nm-applet without desktop
2013-03-31 20:08:01 +02:00
Sergey Mironov
ee921d9df4
wicd: fix missing application icon
2013-03-31 13:06:31 +04:00
Sergey Mironov
f7efab5fd8
wicd: bring translations back.
2013-03-31 13:06:27 +04:00
Sergey Mironov
a8a3cc00fd
wicd: fix dhclient interaction
...
wicd used to write dhclient config file into $out/var/lib/wicd directory attempting
to change nix-store. That didn't work and thats why we couldn't use dhclient.
With this patch wicd will generate temporary file name for this purpose. File is
generated each time the daemon starts.
2013-03-31 13:06:24 +04:00
Domen Kozar
9a31d2ef0d
aircrack-ng: bump
2013-03-29 19:02:51 +01:00
Rob Vermaas
2fa4e36946
Add weighttp 0.3
2013-03-29 15:04:59 +01:00
Peter Simons
22fb1ad99e
Merge remote-tracking branch 'origin/master' into stdenv-updates.
2013-03-21 09:23:54 +01:00
Vladimír Čunát
7cb4d92bec
amule: update and fix build on gcc47
2013-03-17 10:15:03 +01:00
Cillian de Róiste
924be9b524
Wicd: #379 Also add the gtk-2.0 directory in pygobject to the PYTHONPATH
2013-03-16 08:34:14 +01:00
Cillian de Róiste
0037e518b0
Merge branch 'wicd-gobject'
2013-03-15 01:00:19 +01:00
Cillian de Róiste
ef3da5eecd
#379 wicd: Add ifconfig and ping to the PATH
...
/var/log/wicd/wicd.log showed that it failed to find ifconfig
that was probably the main issue (after the gobject import failure)
2013-03-15 00:59:17 +01:00
Cillian de Róiste
2393f6b96f
#379 Update wicd to 1.7.2.4, fix patches, disable translations
2013-03-15 00:14:30 +01:00
Cillian de Róiste
0d191de368
Fix wicd to find the python gobject on its PYTHONPATH
2013-03-14 01:22:55 +01:00
Peter Simons
746bf427a8
pkgs/tools/networking/snx/snx_install.sh: delete file accidentally checked in earlier
2013-03-11 11:01:28 +01:00
David Guibert
856f6c2aea
fix iftop
2013-03-08 09:08:57 +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
4768a0cea6
netboot: change to a fixed version, fix build
2013-02-23 23:19:35 +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
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
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
f81dbf4893
wicd: NixOS/nixos#88 add resolvconf to PATH for wicd
...
with this patch resolvconf is used to set the DNS via wicd, although
this doesn't seem to stop dhcpcd from clobbering /etc/resolv.conf
2013-02-18 21:46:15 +01:00
Shea Levy
c42d77aa35
Merge remote-tracking branch 'upstream/master' into stdenv-updates
2013-02-17 08:19:40 -05:00
Eelco Dolstra
954d519af7
minidlna: Update to 1.0.25 and use ffmpeg instead of libav
2013-02-16 21:49:55 +01:00
Vladimír Čunát
b79c0bd2f3
httpie: fix
2013-02-16 19:56:21 +01:00
Eelco Dolstra
2aa6f262cb
Merge remote-tracking branch 'origin/master' into stdenv-updates
2013-02-15 13:36:34 +01:00
Eelco Dolstra
a3da633b84
openresolv: Update to 3.5.4
2013-02-11 17:46:29 +01:00
Eelco Dolstra
7c2e9cf2bf
dhcpcd: Update to 5.6.7
2013-02-11 17:46:29 +01:00
Shea Levy
e2abed75ec
Revert "Revert "curl: Update to version 7.29.0.""
...
This reverts commit ec4f56b347
.
With the added patch, the curl segfault seems to be fixed.
2013-02-10 13:44:00 -05:00
Shea Levy
ec4f56b347
Revert "curl: Update to version 7.29.0."
...
This reverts commit fd2cff9479
.
nix's substituter fails with this curl, so revert it until that's fixed.
2013-02-10 11:37:14 -05:00