mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-22 21:50:55 +00:00
Code Issues Wiki Activity
60502 commits 327 branches 124 tags 6.8 GiB
Commit graph

1497 commits

Author SHA1 Message Date
Lluís Batlle i Rossell 4c0ba3f01c cjdns: Setting no SECCOMP for ARM. It fails to build. 2015-02-05 23:02:55 +01:00
Edward Tjörnhammar e647414e4a i2pd: update url 2015-02-05 20:23:22 +01:00
Luca Bruno 3f718a743d Add dontInstallSrc flag to buildGoPackage 2015-02-05 18:07:28 +01:00
Edward Tjörnhammar 83925c33f6 i2pd: 0.6.0 -> 0.7.0 
nixos: i2pd.service, fix string escaping
 2015-02-05 12:09:59 +01:00
William A. Kennington III 1dd23a28cb openntpd: More build fixes 2015-02-04 16:17:38 -08:00
William A. Kennington III 6a872c304c openntpd: Fix url 2015-02-04 16:04:24 -08:00
William A. Kennington III da1a2184b9 openntpd: 2008 -> 5.7p3 2015-02-04 15:59:53 -08:00
Matej Cotman 6a042a9272 Merge pull request #6118 from devhell/connman 
connman: 1.26 -> 1.28
 2015-02-04 20:01:42 +01:00
Shea Levy c1aefe5d7e Merge branch 'master' of git://github.com/gridaphobe/nixpkgs 
make wget build on darwin
 2015-02-04 16:41:15 +00:00
Pascal Wittmann 97e50cac40 Merge pull request #6142 from k0ral/aria 
aria2: 1.18.8 -> 1.18.9
 2015-02-04 16:30:31 +01:00
Luca Bruno 040d475103 Port flannel to buildGoPackage 2015-02-04 15:56:40 +01:00
koral a3f0c7bff4 aria2: 1.18.8 -> 1.18.9 2015-02-04 15:55:49 +01:00
Luca Bruno 3e20e4c5e6 Drop cjdcmd because of broken go crypto 2015-02-04 10:41:33 +01:00
Eric Seidel 9a1817c778 make wget build on darwin 2015-02-04 00:09:13 -08:00
devhell 968571af95 connman: 1.26 -> 1.28 
ConnMan 1.28 was released Sunday, February 1st, 2015.

Upgrading ConnMan is strongly encouraged as this release fixes an issue
with DHCPv6 retransmission timer calculation that causes system load to
jump to 100%. In addition, all WiFi P2P issues encountered with Miracast
have been addressed thanks to persistent the reporting and fixing by
Jussi Kukkonen, Tomasz Bursztyka and Jukka Rissanen.

ConnMan no longer hands off foreground autoscanning to wpa_supplicant as
it causes issues when finding hidden WiFi networks. As a result, the
previously recommended build time option has be removed from the
documentation. wpa_supplicant can still be built with autoscan enabled
but as ConnMan no longer enables it run time the issue is mitigated.

Other changes and fixes include:

  * Several fixes for handling IPv6 contexts via oFono (Pasi Sjöholm)
  * Fix memory deallocation in exit code paths (Hannu Mallat)
  * Use OPEN auth_alg for wpa_supplicant open WiFi networks (Slava Monich)
  * A WiFi Access Point with unknown strength now has a proper minimum value
    which translates to a service 'Strenght' property of 30 (Patrik Flykt)
  * Fix byte order in DHCP server identifier (Jukka Rissanen)
  * Properly cancel an ongoing service connect if the Agent exits
    (Patrik Flykt)
 2015-02-03 16:12:47 +00:00
Emery Hemingway faa5dccab8 new Go support function 'buildGoPackage' 
add a setupHook to the Go compiler that builds a GOPATH
new buildGoPackage function that overides the phases of stdenv
 2015-02-03 14:21:48 +01:00
Shea Levy c45372f038 Merge commit 'cfb29ab882323d379aba20a95020c7c24f883eae' 
Partial staging merge, including cc-wrapper fixes

Conflicts:
	pkgs/applications/audio/spotify/default.nix
	pkgs/build-support/cc-wrapper/default.nix
	pkgs/development/compilers/cryptol/1.8.x.nix
 2015-02-02 21:14:28 -05:00
lethalman 87377cec15 Merge pull request #6064 from ktosiek/sstp 
Add sstp client.
 2015-01-31 13:30:08 +01:00
Tomasz Kontusz 99c0af0d73 Add sstp client. 2015-01-30 20:09:35 +01:00
lethalman d4e7fada66 Merge pull request #5951 from arno01/socat 
socat: Update from 1.7.2.4 to 1.7.3.0, fixes a possible denial of service attack
 2015-01-30 11:31:06 +01:00
Lluís Batlle i Rossell adf6ef3865 cjdns: updating with bugfix, and readd nodejs tools 
(cherry picked from commit cd80d050cb)
 2015-01-30 09:26:53 +01:00
Shea Levy 52d4b9d982 Merge branch 'tlsdate' of git://github.com/4z3/nixpkgs 2015-01-30 01:07:59 -05:00
Lluís Batlle i Rossell 8ea408be56 Update cjdns to v15 
(cherry picked from commit aeefbe552a)
 2015-01-29 19:50:19 +01:00
Eelco Dolstra 6f8fad2253 Remove executable bits from non-executable files 2015-01-27 18:54:38 +01:00
Moritz Ulrich 54cfcbc826 isync: update from 1.1.1 to 1.1.2 2015-01-25 22:37:34 +01:00
Andrey Arapov 7a7e59d2a9 socat: Update from 1.7.2.4 to 1.7.3.0, fixes a possible denial of service attack 
socat: Update from 1.7.2.4 to 1.7.3.0, fixes a possible denial of service attack
(CVE Id pending), improves SSL client security, and provides a couple of bug and
porting fixes.

Among new features, socat now enables OpenSSL server side use of ECDHE ciphers,
providing PFS (Perfect Forward Secrecy)

http://www.dest-unreach.org/socat/doc/CHANGES
 2015-01-25 13:48:11 +01:00
Edward Tjörnhammar 6ff63ebbfd Merge pull request #5934 from k0ral/traceroute 
traceroute: 2.0.20 -> 2.0.21
 2015-01-24 20:33:31 +01:00
koral a4fcdc0ce9 traceroute: 2.0.20 -> 2.0.21 2015-01-24 17:05:57 +01:00
Edward Tjörnhammar 54908bc9c2 Merge pull request #5898 from DamienCassou/asynk-1.1.0 
Add asynk
 2015-01-23 12:47:57 +01:00
Damien Cassou 3886e1c93d Add asynk 2015-01-23 12:44:10 +01:00
Lluís Batlle i Rossell 8dd230aa09 Updating cjdns to protocol version 14 2015-01-23 09:35:13 +01:00
Pascal Wittmann c514182fd4 vtun: update from 3.0.1 to 3.0.3 2015-01-22 19:30:49 +01:00
Austin Seipp 978954b2e7 Merge pull request #5831 from mcox/unbound-fix-5728 
nixpkgs: patch unbound 1.5.1 for linux < 3.15
 2015-01-21 01:34:43 -06:00
tv 263a179946 tlsdate: add version 0.0.12 2015-01-21 05:09:23 +01:00
Franz Pletz 07e1566b7d fetchurl: add mirrors for OpenBSD (close #5551) 
This changes source URLs for openssh and libressl accordingly.
 2015-01-20 16:24:00 +01:00
Lluís Batlle i Rossell 8aaac406bf Updating megatools to 1.9.94. 
Fixing the glib network part splice, which wasn't working.
 2015-01-20 12:49:50 +01:00
Peter Simons ec6b82a0c2 Merge branch 'master' into staging. 2015-01-19 18:41:17 +01:00
Rickard Nilsson b64eeaf727 new package: httping 2.3.4 2015-01-19 03:52:26 +01:00
Pascal Wittmann 09c4fe4999 Merge pull request #5837 from nckx/darkstat 
Add darkstat: light-weight network monitor web interface
 2015-01-19 01:04:32 +01:00
Matthew William Cox 3ae922a50c nixpkgs: patch unbound 1.5.1 for linux < 3.15 
Fixes #5728
 2015-01-18 15:54:17 -05:00
Tobias Geerinckx-Rice 5c2041ca5d Add darkstat: light-weight network monitor web interface 2015-01-18 21:53:17 +01:00
Tobias Geerinckx-Rice 96812d6adc netsniff-ng: use libsodium to build curvetun 2015-01-17 18:39:51 +01:00
Tobias Geerinckx-Rice b37e3f6233 netsniff-ng: flowtop is now included 2015-01-17 18:39:51 +01:00
Tobias Geerinckx-Rice 5d143fae58 netsniff-ng: enable "mausezahn" tool 2015-01-17 15:50:55 +01:00
Tobias Geerinckx-Rice 3c3ede970e netsniff-ng: don't work around tput now that we have ncurses 2015-01-17 15:31:41 +01:00
Domen Kožar 60f83499eb Merge pull request #5789 from nckx/netsniff-ng 
Add netsniff-ng 0.5.9-rc4-40-g5107740: Linux networking toolkit
 2015-01-17 15:22:16 +01:00
Patrick Mahoney 1459600c36 s6-networking: update to 2.0.1.0 2015-01-15 16:11:58 -06:00
Patrick Mahoney ffed4e93be s6-dns: update to 2.0.0.2 2015-01-15 16:11:20 -06:00
Tobias Geerinckx-Rice 2f32d8f848 Add netsniff-ng 0.5.9-rc4-40-g5107740: Linux networking toolkit 2015-01-15 21:03:32 +01:00
Eric Seidel f3c6827373 rename all occurrences of stdenv.cc.gcc to stdenv.cc.cc 2015-01-14 20:27:55 -08:00
Pascal Wittmann d6dfe59394 tinc: update from 1.0.24 to 1.0.25 2015-01-15 00:57:47 +01:00
Edward Tjörnhammar a512ddbb3e nylon: fix metas and patch configure to use libevent.so not the absent libevent.a 2015-01-14 22:08:47 +01:00
Charles Strahan 5ac7febcb3 biosdevname: update to 0.6.1 2015-01-13 22:11:41 -05:00
Charles Strahan 7893933625 bud: udpate to 0.34.1 2015-01-13 21:54:37 -05:00
Ludovic Courtès 41b53577a8 unmaintain a bunch of packages 2015-01-13 22:33:49 +01:00
Matti Niemenmaa 85e405c1eb wicd: fix wicd-curses with new urwid 
See e.g. https://bugzilla.redhat.com/show_bug.cgi?id=894646 — without
this patch, wicd-curses throws an AttributeError on startup. The patch
is a cut-down version of the one added there by Pavel Zhukov.
 2015-01-13 00:40:51 -08:00
William A. Kennington III 37bb586452 tinc-pre: Update to ae5b56c 2015-01-12 15:25:53 -08:00
Domen Kožar f5445f2660 Merge pull request #5687 from nckx/ipv6calc 
Add ipv6calc: calculate/manipulate (not only) IPv6 addresses
 2015-01-12 23:13:31 +01:00
Tobias Geerinckx-Rice 0761330f64 Add ipv6calc: calculate/manipulate (not only) IPv6 addresses 2015-01-11 15:28:57 +01:00
Moritz Maxeiner 56fe81a2e6 seafile: update client, ccnet, libsearpc and shared 2015-01-09 13:37:44 +01:00
William A. Kennington III eb4c88cb70 radvd: 2.8 -> 2.9 2015-01-08 13:19:46 -08:00
Austin Seipp be707c5c6b Merge pull request #5609 from ehmry/cjdns 
cjdns: bump to protocol version 13
 2015-01-08 02:54:46 -06:00
Edward Tjörnhammar 3a3a53d6a7 i2pd: 0.4.0 -> 0.6.0 2015-01-07 23:48:27 +01:00
Emery Hemingway 5b8e1be7ba cjdns: bump to protocol version 13 2015-01-06 13:23:24 -05:00
John Wiegley b63caa13b3 Revert "curl: wrap binary so it can find the zlib dylib" 
This reverts commit b4a5a049d8.
 2015-01-06 10:36:15 -06:00
John Wiegley 7cd3ace827 Revert "curl: Correct a syntax error" 
This reverts commit 053083368b.
 2015-01-06 10:36:15 -06:00
John Wiegley 053083368b curl: Correct a syntax error 2015-01-06 10:15:17 -06:00
John Wiegley b4a5a049d8 curl: wrap binary so it can find the zlib dylib 
This is needed at least when first installing on a clean Mavericks
machine.
 2015-01-06 10:12:57 -06:00
Rob Vermaas 87b9925f23 Update dd-agent to 5.1.1 
(cherry picked from commit 7f02b1f350)
 2015-01-05 13:15:36 +01:00
William A. Kennington III 371de847ed tinc_pre: 199573 -> d28f332 2015-01-02 10:43:55 -08:00
William A. Kennington III feabfa0cc2 iperf: 3.0.9 -> 3.0.10 2015-01-02 10:43:55 -08:00
Peter Simons 37ae6de95d s6: don't depend on GNU Make 4.0 
The website gives no indication that version 4.x is required to build
this package, and even it if were, then there should be an override in
all-packages.nix instead of referring to the 'gnumake40' attribute
directly in this expression.
 2015-01-01 20:36:58 +01:00
Michael Raskin fdb785f4d1 Merge pull request #5453 from pmahoney/skarnet-2.0 
Update skarnet.org software for 2.0 release.
 2015-01-01 16:14:17 +03:00
Michael Raskin b4ea438f3d fdm: 1.7 -> 1.8 2014-12-31 21:20:39 +03:00
Domen Kožar 503071b77f Merge pull request #5495 from mcox/unbound 
nixpkgs: unbound 1.4.22 -> 1.5.1
 2014-12-30 03:46:36 +01:00
Tobias Geerinckx-Rice c64257b8e5 Fix user-facing typos (mainly in descriptions) 2014-12-30 03:31:03 +01:00
Matthew William Cox 676c462faa nixpkgs: unbound 1.4.22 -> 1.5.1 2014-12-28 17:52:03 -05:00
Eelco Dolstra 782440310d ntp: Don't depend on openssl, don't install docs 2014-12-28 19:38:45 +01:00
John Wiegley 28b6fb61e6 Change occurrences of gcc to the more general cc 
This is done for the sake of Yosemite, which does not have gcc, and yet
this change is also compatible with Linux.
 2014-12-26 11:06:21 -06:00
muflax 001f2110bd par2cmdline: update to 0.6.11 and adopt it 
[Bjørn: break overlong longDescription line]
 2014-12-26 14:09:56 +01:00
Domen Kožar 4e87c458c4 Merge pull request #5470 from DamienCassou/mu-0.9.11 
Update mu to 0.9.11
 2014-12-25 17:50:47 +01:00
Damien Cassou 41cff1e9d0 Update mu to 0.9.11 2014-12-25 17:15:47 +01:00
Vladimír Čunát 0fbc5ddadb ntp: security update, and use libcrypto 
http://support.ntp.org/bin/view/Main/SecurityNotice#Recent_Vulnerabilities

The package would no longer build without libcrypto,
and it wouldn't find it without pkgconfig.
I checked that Debian and Arch do use openssl as a dependency,
so it's probably not so bad a thing to have.

CC maintainer @edolstra.
 2014-12-25 12:30:53 +01:00
Patrick Mahoney 26e74d8a3e Update skarnet.org software for 2.0 release. 
New build system using configure script and GNU Make 4.0, and new
releases of the following using the new build system:

execline 2.0.0.0
s6 2.0.0.0
s6-dns 2.0.0.0
s6-linux-utils 2.0.0.0
s6-networking 2.0.0.0
s6-portable-utils 2.0.0.0
skalibs 2.0.0.0
 2014-12-23 15:24:30 -06:00
Patrick Mahoney a6f35b3e60 connect 1.104 
Upstream moved to https://bitbucket.org/gotoh/connect
 2014-12-23 09:07:39 -06:00
Igor Pashev 17d8029150 Strongswan: preserve PATH 2014-12-22 20:20:58 +00:00
Igor Pashev 9bbe674927 Strongswan: use full path to ipsec 
This fixes issue:

... charon[6135]: 11[CHD] updown: /bin/sh: ipsec: command not found
 2014-12-22 20:20:15 +00:00
Pascal Wittmann f94580da69 Fix license attribute of many bsd-like licensed packages 2014-12-21 00:00:35 +01:00
Pascal Wittmann f55545c0c9 fix maintainer information 
s/maintainer/maintainers
 2014-12-20 21:54:22 +01:00
Pascal Wittmann 197ea06a73 axel: add meta-information 2014-12-19 22:57:38 +01:00
Evgeny Egorochkin 4bf9039abf privoxy: update from 3.0.21 to 3.0.22 2014-12-19 08:34:32 +02:00
Eelco Dolstra 011e581a4e dhcpcd: Update to 6.6.6 2014-12-18 14:11:10 +01:00
William A. Kennington III 1368e94ae2 tinc: Update pre 1.1 2014-12-16 13:54:44 -08:00
Domen Kožar de99c9c955 Merge branch 'staging' 2014-12-08 16:28:45 +01:00
Jaka Hudoklin 51fe9d17a8 Merge pull request #5261 from matejc/connman126 
connman: update to 1.26
 2014-12-08 13:01:12 +01:00
Matej Cotman 4b74502a35 cmst: update to 2014.12.05 2014-12-08 12:49:28 +01:00
Matej Cotman 94f8f28433 connman: update to 1.26 2014-12-08 12:47:00 +01:00
Domen Kožar 4aa3eec330 Merge branch 'master' into staging 
Conflicts:
	pkgs/development/libraries/fontconfig/default.nix
 2014-12-07 14:02:48 +01:00
Rob Vermaas 6ae8983a5e Update dd-agent to 4.4.0 2014-12-03 16:08:39 +01:00
Thomas Tuegel 02157ab123 libcurl: honor $SSL_CERT_FILE (fixed) 
The previous attempt to patch libcurl used

getenv("CURL_CA_BUNDLE") || getenv("SSL_CERT_FILE")

to get the second environment variable if the first is unset.
Unfortunately, this broke libcurl because the (||) operator is C returns
only 0 or 1, so it is inappropriate for pointer comparisons! Now we use

getenv("CURL_CA_BUNDLE") ? getenv("CURL_CA_BUNDLE") : getenv("SSL_CERT_FILE")

instead. This has one downside: it always calls getenv twice! But,
that's a small price to pay for actually being correct.
 2014-12-02 10:41:24 -06:00
Domen Kožar f57d22fd05 openvpn: fix build 2014-12-02 15:30:25 +01:00
Domen Kožar cc0d52846e openvpn: 2.3.4 -> 2.3.6 (CVE-2014-8104) 2014-12-02 13:11:37 +01:00
AndersonTorres 3af34aa2b1 Megatools: update to 1.9.93 2014-11-30 12:07:44 -02:00
Jaka Hudoklin 88d4ae98ae Merge pull request #5168 from pmahoney/skarnet-refactor 
Skarnet refactor
 2014-11-29 02:48:06 +01:00
Ricardo M. Correia d4b4bae307 Update my maintainership 2014-11-29 02:15:39 +01:00
Patrick Mahoney cf5f282940 Consolidate conf-compile steps for skarnet.org pkgs. 2014-11-28 13:10:37 -06:00
Vladimír Čunát cbd2305d4d Merge branch 'master' into staging 2014-11-28 18:59:07 +01:00
Pascal Wittmann 4261ab39a8 nzbget: update from 14.0 to 14.1 2014-11-28 11:08:12 +01:00
Wout Mertens cacf3f6c1e Merge branch 'curl-ssl-cert-file' of https://github.com/the-kenny/nixpkgs into staging 
Standardize NixOS on using only SSL_CERT_FILE for the trusted SSL certificate store.
 2014-11-27 13:29:50 +01:00
Domen Kožar 34ca304f58 network-manager: 0.9.8.8 -> 0.9.8.10 2014-11-27 12:10:20 +01:00
Domen Kožar 91bdca38a0 NetworkManager.service -> network-manager.service 2014-11-27 12:10:20 +01:00
Vladimír Čunát abcb355453 restund, openssh_hpn: mark as broken 2014-11-27 01:19:24 +01:00
Vladimír Čunát a68c1adc35 *: fix builds by disregarding warning from new glibc 
Says: #warning "_BSD_SOURCE and _SVID_SOURCE are deprecated, use _DEFAULT_SOURCE"
CC: #4803. There will likely appear more of these errors on Hydra in time.
 2014-11-26 23:40:03 +01:00
Vladimír Čunát b5ff06eda4 Merge branch 'master' into staging 2014-11-26 21:48:26 +01:00
Domen Kožar f45b6fb078 fix tarball job 2014-11-26 21:04:59 +01:00
Edward Tjörnhammar 49e112c309 i2pd: 0.3.0 -> 0.4.0 2014-11-25 21:15:53 +01:00
Igor Pashev 4f9111e91f strongSwan needs python for building (Closes #4940) 2014-11-25 15:29:05 +01:00
Shea Levy 140e1de0ec strongswan: dont patchelf 
fixes #5045 ('fixes')
 2014-11-24 20:50:26 -05:00
Vladimír Čunát a9bad25ffe Merge branch 'master' into staging 2014-11-24 22:14:25 +01:00
Arseniy Seroka fd5566da41 Merge pull request #5080 from joachifm/dnscrypt-refactor 
dnscrypt-proxy: minor superficial improvements
 2014-11-24 15:48:47 +03:00
Domen Kožar 10592215a7 Merge pull request #5076 from ehmry/cjdns 
cjdns: update 20141023 -> 20141121
 2014-11-22 22:53:35 +01:00
Joachim Fasting 119d93e223 dnscrypt-proxy: minor superficial improvements 
- Use upstream description and explicitly set platforms = all
- Coding conventions fix
 2014-11-22 16:19:06 +01:00
Thomas Tuegel c2740b5017 network-manager: patch for libnl-3.2.25 2014-11-21 21:15:18 -06:00
Emery Hemingway 9f1bd2d419 cjdns: update 20141023 -> 20141121 
include protocol version in package version string
 2014-11-21 18:04:53 -05:00
Edward Tjörnhammar 2151abb92d i2pd: 0.2.0 -> 0.3.0 2014-11-21 11:53:04 +01:00
Eelco Dolstra 87419c016f openssh: Update to 6.7p1 2014-11-20 12:12:33 +01:00
Moritz Ulrich f4ab3dc223 libcurl: Honor $SSL_CERT_FILE 2014-11-19 23:50:48 +01:00
Mateusz Kowalczyk 5b156eb20a Merge pull request #5019 from Fuuzetsu/updates 
Updates (orphans)
 2014-11-19 18:31:45 +00:00
Pascal Wittmann 6e3318e233 nzbget: update from 0.13 to 0.14 and adopt it 2014-11-19 08:47:41 +01:00
Mateusz Kowalczyk f4c350d26e dropbear: update from 2013.62 to 2014.66 2014-11-17 18:09:30 +00:00
tv a9a10ac2ed urlwatch: update to version 1.17 2014-11-17 04:18:09 +01:00
Eelco Dolstra a0f3faf34e Merge remote-tracking branch 'origin/glibc-2.20' into staging 2014-11-16 22:17:36 +01:00
Aristid Breitkreuz 7bb0ff509c remove gcc 3.3 and snx ("SSL Network Extender"), the only package that depends on it 2014-11-16 14:57:42 +01:00
Michael Raskin cee91fe789 Update lftp 2014-11-16 10:54:02 +03:00
Michael Raskin b3b9ec4c89 Add a fallback URL for lftp 2014-11-16 10:54:02 +03:00
William A. Kennington III cd9619f871 dhcp: 4.3.0 -> 4.3.1 2014-11-14 22:44:13 -08:00
Shea Levy 4fe383de48 strongswan: bump 2014-11-14 15:22:22 -05:00
Vladimír Čunát b4af993c3f Merge branch 'master' into staging 
Conflicts (simple):
	pkgs/development/lisp-modules/clwrapper/setup-hook.sh
 2014-11-14 14:28:23 +01:00
Michael Raskin 0d6306be4d Merge pull request #4950 from joachifm/dnscrypt-proxy 
dnscrypt-proxy service
 2014-11-13 00:25:05 +03:00
Eelco Dolstra f33fa1b66b Merge remote-tracking branch 'origin/master' into staging 
Conflicts:
	pkgs/development/libraries/boost/generic.nix
 2014-11-11 23:48:08 +01:00
Joachim Fasting 216ed76821 dnscrypt-proxy: new expression 2014-11-11 22:46:49 +01:00
Pascal Wittmann 8df0e0b151 Fixed many descriptions 2014-11-11 14:36:34 +01:00
Vladimír Čunát adb831e8bc strongswan: -lgcc_s, fixes #4925 
CC maint. @shlevy.
 2014-11-11 07:42:00 +01:00
Vladimír Čunát 4849e32abe curl: update to fix CVE-2014-3707 2014-11-10 21:34:03 +01:00
Luca Bruno 6af0d6974f Merge branch 'master' into staging 2014-11-10 10:03:52 +01:00
Edward Tjörnhammar c329e5bbd9 i2pd: added package, service 2014-11-09 09:55:35 +01:00
Emery Hemingway 67a2a58314 cjdns: service tweaks, new NixOS test 2014-11-08 23:39:02 +01:00
Aristid Breitkreuz 928177aa91 Merge pull request #4834 from offlinehacker/pkgs/flannel/add 
Add flannel, etcd backed network fabric for containers
 2014-11-08 19:56:16 +01:00
Luca Bruno 83221f3886 Merge branch 'master' into staging 
Makes the build more useful:
- Disabled hybrid iso, makes installer tests pass again
- Imagemagick fixes to the "Illegal instruction" thing
 2014-11-08 15:56:40 +01:00
Michael Raskin 3e118edf3a Refactor and fix fdm build. Moved makeFlags definition because non-builderDefs packages cannot use $out in direct variable definitions like makeFlags. 2014-11-07 12:05:15 +03:00