public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

svn merge ^/nixpkgs/trunk, one simple conflict in jruby

Browse Source 
svn path=/nixpkgs/branches/stdenv-updates/; revision=31721
This commit is contained in:
Yury G. Kudryashov
2012-01-19 21:31:51 +00:00
parent 3980444b2b b94fef3cba
commit 84c0185038
69 changed files with 763 additions and 352 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/tools/networking/openvpn/default.nix
+4 -5
View File
@@ -1,20 +1,19 @@
{stdenv, fetchurl, iproute, lzo, openssl, nettools}:
{stdenv, fetchurl, iproute, lzo, openssl}:
stdenv.mkDerivation rec {
name = "openvpn-2.2.0";
name = "openvpn-2.2.2";
src = fetchurl {
url = "http://swupdate.openvpn.net/community/releases/${name}.tar.gz";
sha256 = "0rr59b3ybqr2j5jxl2fdzmm5qbh0hvwi03xfaha6s7k4l6mymsvi";
sha256 = "005cpvdvh8pvsn3bc96lrznlkcccbz5jqa62hipb58rf1qk8pjjl";
};
buildInputs = [ iproute lzo openssl ];
configureFlags = ''
--enable-password-save
--with-ifconfig-path=${nettools}/sbin/ifconfig
--enable-iproute2
--with-iproute-path=${iproute}/sbin/ip
--with-route-path=${nettools}/sbin/route
'';
meta = {
pkgs/tools/networking/wicd/default.nix
+11
View File
@@ -85,6 +85,17 @@ stdenv.mkDerivation rec {
# <http://wicd.net/punbb/viewtopic.php?id=87>.
cp -v "${./wpa2-ttls}" "$out/etc/encryption/templates/wpa2-ttls"
echo "wpa2-ttls" >> "$out/etc/encryption/templates/active"
# have wicd generate upstart events
echo '#!/bin/sh
initctl emit -n wicd-preconnect ITYPE="$1" ESSID="$2" BSSID="$3"' > $out/etc/scripts/preconnect/upstart-emit
echo '#!/bin/sh
initctl emit -n wicd-postconnect ITYPE="$1" ESSID="$2" BSSID="$3"' > $out/etc/scripts/postconnect/upstart-emit
echo '#!/bin/sh
initctl emit -n wicd-predisconnect ITYPE="$1" ESSID="$2" BSSID="$3"' > $out/etc/scripts/predisconnect/upstart-emit
echo '#!/bin/sh
initctl emit -n wicd-postdisconnect ITYPE="$1" ESSID="$2" BSSID="$3"' > $out/etc/scripts/postdisconnect/upstart-emit
chmod a+x $out/etc/scripts/*/upstart-emit
'';
meta = {