JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
39,332 Commits 2 Branches 0 Tags 13 GiB
625b42838a
Commit Graph

983 Commits

Author SHA1 Message Date
Evgeny Egorochkin
829b29153b clean up git revision handling in several packages 2013-11-13 12:46:55 +02:00
Domen Kožar
9b35dac0c0 iperf: 2.0.4 -> 2.0.5 2013-11-08 16:53:19 +01:00
Eelco Dolstra
52ad0eaca5 openssh: Security fix 
CVE-2013-4548
 2013-11-08 16:42:59 +01:00
Eric Kow
29b2aec233 wget darwin: disable Test-iri-disabled.px 
This test fails on MacOS X. The failure has something to do with
the tests expecting filesystems to accept/store filenames as
bytes. On the HFS+ filesystem, however, filenames are Unicode
characters (Normalisation Form D).

This wget ticket appears to be relevant
    http://savannah.gnu.org/bugs/index.php?27541

The maintainer does not seem to think that this test
failure represents a problem in practice:
    http://article.gmane.org/gmane.comp.web.wget.general/8988

But this patch should be revisited/removed if this aspect of wget is
ever addressed in the future.

NB: I'm also a bit concerned/confused that none of the tests mentioned
in that message seem to fail, so I'm not 100% sure if this is the
relevant issue.
 2013-11-08 09:36:42 +00:00
Eelco Dolstra
a0e21fd1ca Mark more packages as broken 2013-11-04 21:11:00 +01:00
Eelco Dolstra
59cad4dc07 socate: Update to 1.7.2.2, 2.0.0-b6 
CVE-2013-3571
 2013-11-04 21:10:59 +01:00
Rok Garbas
a22c0fa54a offlineimap: update to (latest) 6.5.5 2013-11-04 19:39:13 +01:00
Mathijs Kwik
609f8dc04b Merge branch 'master' into stdenv-updates 
Conflicts:
	pkgs/top-level/all-packages.nix
 2013-11-01 08:31:54 +01:00
Domen Kožar
9726dded27 openssh: build on unix platforms 2013-10-29 17:47:38 +01:00
Rok Garbas
562b453b93 nixos: haproxy module 2013-10-29 15:55:25 +01:00
Peter Simons
91f2c362de Merge remote-tracking branch 'origin/master' into stdenv-updates. 
Conflicts:
	pkgs/top-level/all-packages.nix
 2013-10-26 18:28:05 +02:00
Jaka Hudoklin
427798268c Add netcat-openbsd, TCP/IP swiss army knife, openbsd variant 2013-10-24 10:57:33 +03:00
Jack Cummings
e6f2ac65e2 Gratuitous Space Battles. Needs libcurl.so.3, so put an old version of that in, too 2013-10-19 14:45:03 +02:00
Peter Simons
6be8ad3392 Merge branch 'origin/master' into stdenv-updates. 
There was a minor conflict in 'stumpwm'. The package needs texinfo
version 4.x. At least is used to, I'm not sure whether it still does.
 2013-10-18 18:57:24 +02:00
Eelco Dolstra
2147a07938 Fix a bunch of Hydra evaluation errors 2013-10-07 17:36:47 +02:00
Lluís Batlle i Rossell
1b794c098b filegive update to 0.7.1 2013-10-07 09:34:25 +02:00
Bjørn Forsman
083d0890f5 More description fixes 
* Remove package name
* Start with upper case letter
* Remove trailing period

Also reword some descriptions and move some long descriptions to
longDescription.

I'm not touching generated packages.
 2013-10-06 12:01:38 +02:00
Bjørn Forsman
28ac782583 Some description fixes 
There are many more packages to fix, this is just a start.

Rules:
 * Don't repeat the package name (not always that easy...)
 * Start with capital letter
 * Don't end with full stop
 * Don't start with "The ..." or "A ..."

I've also added descriptions to some packages and rewritten others.
 2013-10-05 19:36:23 +02:00
Rickard Nilsson
6d247f81b4 network-manager: Rename dispatcher service 
Rename NetworkManager-dispatcher.service to
dbus-org.freedesktop.nm-dispatcher.service so it is found by systemd (NixOS
doesn't handle the Alias directive in the unit file)
 2013-10-03 14:46:49 +02:00
Peter Simons
ac5d5297dd Merge remote-tracking branch 'origin/master' into stdenv-updates. 2013-10-02 22:44:12 +02:00
Moritz Ulrich
dc7ed72066 mu: Install msg2pdf (render html mail to pdf) and mug (gtk gui) 
Signed-off-by: Moritz Ulrich <moritz@tarn-vedra.de>
 2013-10-02 13:55:17 +02:00
Moritz Ulrich
62ea4e1d38 mu: update to 0.9.9.5 
Signed-off-by: Moritz Ulrich <moritz@tarn-vedra.de>
 2013-10-01 23:47:57 +02:00
Lluís Batlle i Rossell
d19d528f97 Fixing filegie url 2013-10-01 09:19:46 +02:00
Lluís Batlle i Rossell
d71b3724de Updating filegive to 0.7 2013-09-30 22:33:06 +02:00
Domen Kožar
fc15a0da64 Merge pull request #991 from fignuts/master 
Bump networkmanagement version to 0.9.0.9
 2013-09-30 05:09:08 -07:00
Domen Kožar
a68128ab8c NetworkManager: 0.9.8.0 -> 0.9.8.4 2013-09-29 17:00:41 +02:00
Peter Simons
9407832de4 Merge remote-tracking branch 'origin/master' into stdenv-updates. 
Conflicts:
	pkgs/development/libraries/gettext/default.nix
 2013-09-23 10:59:44 +02:00
Andrew Morsillo
5e1a268b6b Bump networkmanagement version to 0.9.0.9 2013-09-18 20:43:17 -04:00
Jason \"Don\" O'Conal
613cf79237 esniper: fix build on darwin 2013-09-16 15:51:15 +02:00
Ricardo M. Correia
1ac7ba823d tinc: Update to 1.0.22 
close #957
 2013-09-15 06:34:44 +03:00
Vladimír Čunát
aa8e8303e1 Merge branch 'x-updates' into master 2013-09-11 08:37:03 +02:00
Peter Simons
3d2caf1180 Merge remote-tracking branch 'origin/master' into stdenv-updates. 2013-09-08 22:54:35 +02:00
Peter Simons
c4115d45a0 nbd: update to version 3.4 2013-09-08 21:12:34 +02:00
Vladimír Čunát
74488e2b58 Merge branch 'x-updates' into stdenv-updates 
Conflicts (simple):
	pkgs/development/libraries/glib/default.nix
	pkgs/development/libraries/mesa/default.nix
 2013-09-02 15:44:57 +02:00
Vladimír Čunát
2fda1165da Merge branch 'master' into x-updates 2013-08-28 10:37:41 +02:00
Peter Simons
9ac8ea937c Merge branch 'origin/master' into stdenv-updates. 2013-08-26 12:21:23 +02:00
Domen Kožar
cf9a8f5d25 getmail: 4.20.0 -> 4.42.0 2013-08-25 10:55:44 +02:00
Vladimír Čunát
c1e62e7e91 Merge branch 'master' into x-updates 2013-08-22 19:29:09 +02:00
Christophe Raffalli
2c089337e7 OpenSSH: add Kerberos support 2013-08-22 12:53:06 +03:00
Bjørn Forsman
d65cea26dc ncftp: 3.2.4 -> 3.2.5 
Also, add missing ncurses buildInput and add/update meta attributes. The
homepage is back up!
 2013-08-21 20:58:14 +02:00
Peter Simons
d2194a294e mpack: add version 1.6 2013-08-17 14:42:06 +02:00
Peter Simons
0d7118814b Merge branch 'origin/master' into stdenv. 2013-08-17 10:00:16 +02:00
Ludovic Courtès
2e937c437a unmaintain several packages 2013-08-16 23:45:01 +02:00
Peter Simons
76244ac2e2 Merge branch 'master' into stdenv-updates 
Conflicts:
	pkgs/development/compilers/ghc/with-packages.nix
 2013-08-16 22:51:13 +02:00
Vladimir Still
eb97daf88d networking: Add bwm-ng expression. 2013-08-16 14:57:16 +02:00
Jaka Hudoklin
941055dae9 curl: Add support for c-ares, asynchronous dns resolver 2013-08-12 19:53:08 +02:00
Eelco Dolstra
7fc87a865e openssh: Update to 6.2p2 2013-08-12 14:50:55 +02:00
Vladimír Čunát
72a8019334 introspection disabling -- clutter-gtk, NM-applet, gnome_panel 
Didn't build as it was, and not needed anywhere AFAIK.
 2013-08-06 09:27:34 +02:00
Jaka Hudoklin
018b39d28b iodined: Fix iptables and route path to bin instead of sbin 2013-08-05 01:00:34 +02:00
Bjørn Forsman
2238a23352 wicd: wrapper env vars prefix -> postfix 
Change PATH=$PATH:deps to PATH=deps:$PATH in the wicd wrappers, because
the latter is more deterministic; it prevents possibly wrong versions of
dependencies to sneak in from the environment.

Do the same for PYTHONPATH.
 2013-07-31 21:54:09 +02:00
Rok Garbas
77063f3f75 adding description to networkmanager plugins 2013-07-31 15:36:17 +02:00
Rok Garbas
537a71a51e openconnect and vpnc NetworkManager plugins added 
also openvpn plugin updated to the same version as NetworkManager
 2013-07-31 15:36:17 +02:00
Bjørn Forsman
7e0bd8d360 offlineimap: remove python prefix from package name 
OfflineIMAP is primarily a program/tool, not a python module (although
it installs a python module too, for those who want to poke at its
internals).

Now we can install it with "nix-env -i offlineimap" instead of
"nix-env -i python2.7-offlineimap".
 2013-07-30 21:30:34 +02:00
Peter Simons
522acfd2f4 Merge remote-tracking branch 'master' into stdenv-updates. 
Conflicts:
	pkgs/applications/version-management/git-and-tools/git/default.nix
	pkgs/top-level/all-packages.nix
 2013-07-30 11:29:30 +02:00
Domen Kozar
0be7ef35bb gmvault: use logbook 0.4.2 2013-07-29 21:16:35 +02:00
Bjørn Forsman
386bef322d iftop: improve meta attributes 
- The description attribute is very long, so rename it to
  longDescription and add a short text in the description attribute.
- Use licenses.gpl2Plus instead of free form text "GPLv2+".
- Add platforms attribute so that hydra will build the package.
 2013-07-28 14:04:44 +02:00
Jason \"Don\" O'Conal
b4105cfaff php53: fix build on darwin (close #748) 
* add empty unix.h header
* build with kerberos
* ensure the binary has no extension
 2013-07-28 09:41:58 +02:00
Domen Kozar
0f98ddf8fd Revert "networkmanager: we dont need networkmanager group anymore, just use at_console policy" 
This reverts commit 52fe694360.
 2013-07-26 23:09:50 +02:00
Domen Kozar
52fe694360 networkmanager: we dont need networkmanager group anymore, just use at_console policy 2013-07-23 18:51:20 +02:00
Domen Kozar
949c4fe758 networkmanagerapplet: fix the build 2013-07-23 18:23:13 +02:00
Domen Kozar
11eef4f79f networkmanagerapplet: fix build 2013-07-23 13:18:54 +02:00
Domen Kozar
bea0ac29d4 networkmanagerapplet: propagatedBuildInputs -> propagatedUserEnvPkgs 2013-07-23 11:53:12 +02:00
Domen Kozar
a143c0bb10 networkmanagerapplet: add GConf libgnome_keyring to propagatedBuildInputs 2013-07-23 11:19:32 +02:00
Lluís Batlle i Rossell
04a9e809d4 Updating go to 1.1.1 2013-07-23 11:19:32 +02:00
Domen Kozar
8ea138d212 add development version of speedtest-cli 2013-07-20 12:48:32 +02:00
Evgeny Egorochkin
da4be371e9 make package use mirror:// for gnu, savannah and gnome repositories where possible 2013-07-14 05:23:06 +03:00
Evgeny Egorochkin
b084b29d26 Even more mirror:// fixes 2013-07-14 04:17:07 +03:00
Evgeny Egorochkin
cea107c07f More mirror:// URL fixes 2013-07-14 03:31:12 +03:00
Evgeny Egorochkin
aa85b80459 Change package urls to use mirror://sourceforge 2013-07-14 02:35:26 +03:00
Evgeny Egorochkin
4c952c64de eggdrop: fix version to match tarball 2013-07-14 02:08:54 +03:00
Evgeny Egorochkin
9afe9c9c53 uw-imap: fix version to match tarball 2013-07-14 02:08:53 +03:00
Evgeny Egorochkin
a42ba6d8fe filegive: change url so that it's friendlyto automated processing. This changes the tarball a 
little(likely metadata) but it still builds.
 2013-07-14 02:08:48 +03:00
Jaka Hudoklin
9a8677caeb Add easyrsa 2013-07-10 21:00:56 +02:00
Domen Kožar
17962c1aa0 Merge pull request #683 from grwlf/wicd-fixes 
wicd: obtain dhclinet's config template from shares correctly
 2013-07-10 01:00:38 -07:00
Rickard Nilsson
92083803e6 nss-pam-ldapd: Upgrade to 0.8.13 2013-07-10 08:49:54 +02:00
Domen Kozar
58975755ea add bpython 2013-07-08 20:58:44 +02:00
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
Michael Raskin
b2e912fd8d Update fdm 2013-07-05 18:43:21 +04:00
Jonas Hoersch
5597e9a2a5 aria2: update to version 1.17.1 and add sqlite support 
also add missing pkgconfig dependency, so that the buildInputs zlib,
openssl, and sqlite are properly found.
 2013-07-04 19:26:03 +02:00
Jason \"Don\" O'Conal
1f9005a3f6 php53: add imap option 2013-07-04 13:12:13 +02:00
Eelco Dolstra
80213cbb05 meta.license is a list of strings (not attribute sets) 
http://hydra.nixos.org/build/5453648
 2013-07-03 12:41:27 +02:00
Rok Garbas
bf540904de haproxy: update to 1.4.24 (set platform to linux, for now) 2013-07-03 03:36:15 +02:00
Domen Kozar
efa4aac21e dd-agent: ab14fde6f9 -> 3.8.0 2013-06-29 18:46:37 +02:00
James Cook
af53fd451f curl: update to version 7.31.0 2013-06-28 07:04:07 +02:00
Sergey Mironov
6afd6588d3 wicd: fix copying dhclient's config to it's initial location 2013-06-27 14:03:09 +04: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
Domen Kozar
dbe9bf7e59 networkmanagerapplet: 0.9.8.0 -> 0.9.8.2 
Upgraded because some icons weren't displaying. Also adds new
dependency libsecret.
 2013-06-21 19:59:20 +02:00
Lluís Batlle i Rossell
b38308553b Adding cjdns. 
The executable runs; I haven't tried to run a node.
 2013-06-20 20:53:37 +02:00
Vladimír Čunát
842420c3e1 Merge branch 'master' into stdenv-updates 
Conflicts (relatively simple):
	pkgs/development/interpreters/python/2.7/default.nix
	pkgs/development/libraries/dbus/default.nix
	pkgs/development/libraries/glib/default.nix
	pkgs/development/libraries/glibc/2.17/common.nix
 2013-06-20 19:21:25 +02:00
Lluís Batlle i Rossell
83dee22f4a Fixing a crash bug in dropbear. 2013-06-18 23:35:53 +02:00
Lluís Batlle i Rossell
ae98b61850 dropbear: update to 2013.58, and build dynamically 
I had to do a trick with GNU make, to allow it to find libs.
 2013-06-18 23:35:53 +02:00
Vladimír Čunát
2058d95eb4 non-Linux platforms: extend to some important pkgs 2013-06-18 22:03:35 +02:00
Michael Raskin
1a45886454 Merge branch 'master' into x-updates 2013-06-11 15:46:10 +04: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
Peter Simons
a2328d7b80 Merge pull request #609 from coroa/ppp-ipv6 
ppp: enable ipv6 support
 2013-06-11 02:21:42 -07:00
Jonas Hoersch
b39a6ef532 ppp: enable ipv6 support 
networkmanager requires pppd to have ipv6 support for managing mobile
connections since version 0.9.5.95, ref. to commit 7575f4d.
 2013-06-11 01:07:06 +02:00
Michael Raskin
8271de6727 Merge remote-tracking branch 'upstream/master' into x-updates 
Conflicts:
	pkgs/misc/emulators/wine/default.nix
 2013-06-10 10:04:46 +04:00
Vladimír Čunát
7db886fdb9 Merge remote-tracking branch 'hydra/master' into x-updates 
Conflicts (taken from @7c6f434c):
	pkgs/development/libraries/libgphoto2/default.nix
 2013-06-08 15:41:39 +00:00
Christophe Raffalli
e4c2a5ddc7 Upgraded openconnect to 5.01. 
Added the new option --no-xmlpost to avoid a cisco server bug
 2013-06-08 12:38:12 +02:00
Christophe Raffalli
8be8701db7 Added openconnect 2013-06-06 10:48:58 +02:00
Vladimír Čunát
7af694700c Merge branch 'master' into x-updates 
Silently merged badly the firefox 20/21 things. I got that, hopefully
there aren't more (my nixos-rebuild dry-run finds no more errors).
 2013-06-05 12:59:47 +02:00
Ricardo M. Correia
76b18e4204 gmvault: Fix start script 2013-06-05 02:27:18 +00:00
Ricardo M. Correia
6eb8048c8f gmvault: New package 
Gmvault Gmail Backup - Backup and restore your gmail account at will.
 2013-06-05 02:27:18 +00:00
Vladimír Čunát
22967c71f8 network-manager: update all to 0.9.8.0 
This should fix compilation with newer glib versions.
 2013-06-04 16:36:21 +02:00
Domen Kozar
96b193a7b1 typos 2013-06-03 00:31:43 +02:00
Domen Kozar
d9fe34aeb4 aircrackng: add platform & maintainers 2013-06-02 20:37:14 +02:00
Lluís Batlle i Rossell
778e09625f aircarck-ng: updating and fixing build 
Requested in issue #585
 2013-06-02 19:54:50 +02:00
Peter Simons
5718931dd3 Merge remote-tracking branch 'origin/master' into stdenv-updates. 2013-06-01 11:48:21 +02:00
Rickard Nilsson
1ddfbae86a stunnel: Add explicit openssl reference (latest stunnel version did not build for me otherwise) 2013-05-30 12:12:18 +02:00
Lluís Batlle i Rossell
f54c4c99e3 tcpdmup/libpcap udpate 2013-05-29 19:23:40 +02:00
Lluís Batlle i Rossell
21cb347f20 Adding babeld. 2013-05-29 19:16:02 +02:00
Lluís Batlle i Rossell
08f8371a50 Adding ahcpd. 2013-05-29 19:16:01 +02:00
Lluís Batlle i Rossell
55eccc68bb Adding oslrd. 2013-05-28 22:37:59 +02:00
Eelco Dolstra
6c03d641fa openvpn: Update to 2.3.1 2013-05-28 14:48:56 +02:00
Lluís Batlle i Rossell
7e7b669b3e megatools: fixing the network part 
It requires some env vars to work
 2013-05-25 00:08:42 +02:00
Lluís Batlle i Rossell
a403f55ccf Adding megatools 2013-05-24 23:43:26 +02:00
Ricardo M. Correia
200fd97b04 chrony: Add readline and libcap (on Linux) as dependencies 
libcap is needed for chronyd to drop privileges when starting up.
readline was added as a convenience for when using chronyc.
 2013-05-23 02:11:21 +00:00
Lluís Batlle i Rossell
f93971ef0c filegive: update to 0.6.1 2013-05-22 19:21:11 +02:00
Peter Simons
728e305205 Merge remote-tracking branch 'origin/master' into stdenv-updates. 2013-05-22 12:30:02 +02:00
Ricardo M. Correia
e28b51360d Add chrony. 
Chrony is a pair of programs which are used to maintain the accuracy of the system clock on a computer.
 2013-05-22 00:41:58 +02:00
Lluís Batlle i Rossell
8160f816af mtr: adding ncurses support 2013-05-20 17:43:27 +02:00
Ricardo M. Correia
84e69bf619 tinc: update to 1.0.21 (fixes CVE-2013-1428) (merge #545) 2013-05-20 17:18:28 +02:00
Petr Rockai
7abebbad4d curl: Optionally add support for GSSAPI (Kerberos). 
@vcunat also did some configureFlags refactoring
 2013-05-18 13:24:30 +02:00
Lluís Batlle i Rossell
61e7a72931 mosh: update to 1.2.4 2013-05-18 13:17:41 +02:00
Domen Kozar
b38ae22a2d make openvpn work with networkmanagerapplet 2013-05-11 19:17:48 +02:00
Domen Kozar
1aaa1a7b5b add networ-manager-openvpn, WIP 2013-05-10 19:17:51 +02:00
Eelco Dolstra
84b0bf63b7 pwnat: Fix evaluation 2013-05-09 13:21:10 +02:00
Lluís Batlle i Rossell
e9cbe5439e Adding udptunnel 
(Fixing a semicolon in pwnat expr too)
 2013-05-08 22:51:39 +02:00
Lluís Batlle i Rossell
a8b576ecaf Adding pwnat. 2013-05-08 22:51:39 +02:00
Lluís Batlle i Rossell
e087ce095e filegive: update to 0.5.2 
(fixing miniupnpd support)
 2013-05-07 12:19:38 +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
Lluís Batlle i Rossell
a5adbf19a6 filegive: fixing licence, adding maintainer 2013-05-04 10:08:52 +04:00
Lluís Batlle i Rossell
5465a118e1 filegive: update to 0.5.1 
nat-pmp, fixed upnp bugs, ...
 2013-05-04 01:04:17 +04:00
Moritz Ulrich
24466df152 Update isync to 1.0.6 2013-05-03 11:03:49 +02:00
Evgeny Egorochkin
6414a306a4 filegive: bump version to 0.3.1 2013-05-02 13:15:50 +03:00
Lluís Batlle i Rossell
28f87c0eb5 Adding description to filegive 2013-05-02 11:34:42 +04:00
Lluís Batlle i Rossell
bd55358159 Adding filegive, my file sending program 2013-05-02 11:32:58 +04:00
Lennart Kats
aa555c56ac lftp: use a download location that keeps old versions around 2013-05-01 10:58:32 +02:00
Lluís Batlle i Rossell
678e983f5e Adding reaver-wps. 2013-04-26 17:14:09 +04:00
Eelco Dolstra
607437122b dhcpcd: Update to 5.6.8 2013-04-26 14:06:32 +02:00
Lluís Batlle i Rossell
b4687c6966 tahoe-lafs: update to 1.9.2 
I had to update a python package too (foolscap)
 2013-04-24 22:41:17 +04:00
Eelco Dolstra
d44ffc5338 curl: Update to 7.30.0 
CVE-2013-1944
 2013-04-23 14:54:51 +02:00
Rok Garbas
f1184916dd Merge pull request #477 from coroa/offlineimap 
offlineimap: enable support for the sqlite status backend
 2013-04-23 03:47:15 -07:00
Jonas Hoersch
93c39d24b5 offlineimap: enable support for the sqlite status backend 2013-04-22 10:40:36 +02:00
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