forked from mirrors/nixpkgs
* Neon: build with the new and patched OpenSSL. With this,
Subversion can check out the Nix repositories without any warnings about untrusted certificates. * Make Firefox 7 the default. svn path=/nixpkgs/trunk/; revision=29691
This commit is contained in:
parent
8ec876642e
commit
0982859b6c
|
@ -4203,6 +4203,7 @@ let
|
||||||
neon029 = callPackage ../development/libraries/neon/0.29.nix {
|
neon029 = callPackage ../development/libraries/neon/0.29.nix {
|
||||||
compressionSupport = true;
|
compressionSupport = true;
|
||||||
sslSupport = true;
|
sslSupport = true;
|
||||||
|
openssl = opensslNew;
|
||||||
};
|
};
|
||||||
|
|
||||||
nethack = builderDefsPackage (import ../games/nethack) {
|
nethack = builderDefsPackage (import ../games/nethack) {
|
||||||
|
@ -5958,7 +5959,7 @@ let
|
||||||
tunctl = true; mconsole = true;
|
tunctl = true; mconsole = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
untie = callPackage ../os-specific/linux/untie {};
|
untie = callPackage ../os-specific/linux/untie { };
|
||||||
|
|
||||||
upower = callPackage ../os-specific/linux/upower {
|
upower = callPackage ../os-specific/linux/upower {
|
||||||
dbus_glib = pkgs.dbus_glib_0_94;
|
dbus_glib = pkgs.dbus_glib_0_94;
|
||||||
|
|
Loading…
Reference in a new issue