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
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
Eelco Dolstra
0518ccf5af
Merge remote-tracking branch 'origin/master' into staging
...
Conflicts:
pkgs/stdenv/generic/default.nix
2014-11-06 10:16:39 +01:00
Mateusz Kowalczyk
007f80c1d0
Turn more licenses into lib.licenses style
...
Should eval cleanly, as far as -A tarball tells me.
Relevant: issue #2999 , issue #739
2014-11-06 00:48:16 +00:00
Rickard Nilsson
f2b6b9871f
new package: swaks, a command line SMTP tool
2014-11-05 21:43:25 +01:00
Vladimír Čunát
52404a868d
Merge recent master into staging
...
Nixpkgs Hydra: ?compare=1157272
TODO: port e22889064f
2014-11-05 15:00:44 +01:00
Michael Raskin
167115f1a2
Update siege HTTP load-tester
2014-11-05 11:56:19 +03:00
