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

Merge commit 'cb21b77' into master.upstream

Browse Source 
This is a partial merge of staging for builds which are working
This commit is contained in:
William A. Kennington III
2015-11-13 15:53:10 -08:00
parent 83aeb00a78 cb21b77ff1
commit 9579c9ec7f
392 changed files with 7282 additions and 7266 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/tools/networking/curl/default.nix
+2 -2
View File
@@ -16,11 +16,11 @@ assert scpSupport -> libssh2 != null;
assert c-aresSupport -> c-ares != null;
stdenv.mkDerivation rec {
name = "curl-7.44.0";
name = "curl-7.45.0";
src = fetchurl {
url = "http://curl.haxx.se/download/${name}.tar.bz2";
sha256 = "050q6i20lbh7dyyhva2sbp8dbyp6sghlkbpvq2bvcasqwsx4298y";
sha256 = "1slq5c0v9wa8hajgimhkxhvsrd07jmih8sa3gjsl597qp5k4w5b5";
};
# Zlib and OpenSSL must be propagated because `libcurl.la' contains
pkgs/tools/networking/modemmanager/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, udev, polkit, dbus_glib, ppp, intltool, pkgconfig, libmbim, libqmi }:
{ stdenv, fetchurl, udev, libgudev, polkit, dbus_glib, ppp, intltool, pkgconfig, libmbim, libqmi }:
stdenv.mkDerivation rec {
name = "ModemManager-${version}";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ intltool pkgconfig ];
buildInputs = [ udev polkit dbus_glib ppp libmbim libqmi ];
buildInputs = [ udev libgudev polkit dbus_glib ppp libmbim libqmi ];
configureFlags = [
"--with-polkit"
pkgs/tools/networking/network-manager-applet/default.nix
+2 -2
View File
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, intltool, pkgconfig, libglade, networkmanager, gnome3
, libnotify, libsecret, dbus_glib, polkit, isocodes
, mobile_broadband_provider_info, glib_networking, gsettings_desktop_schemas
, makeWrapper, udev, hicolor_icon_theme }:
, makeWrapper, udev, libgudev, hicolor_icon_theme }:
let
pn = "network-manager-applet";
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
buildInputs = [
gnome3.gtk libglade networkmanager libnotify libsecret dbus_glib gsettings_desktop_schemas
polkit isocodes makeWrapper udev gnome3.gconf gnome3.libgnome_keyring
polkit isocodes makeWrapper udev libgudev gnome3.gconf gnome3.libgnome_keyring
];
nativeBuildInputs = [ intltool pkgconfig ];
pkgs/tools/networking/network-manager/default.nix
+2 -2
View File
@@ -1,5 +1,5 @@
{ stdenv, fetchurl, intltool, wirelesstools, pkgconfig, dbus_glib, xz
, udev, libnl, libuuid, polkit, gnutls, ppp, dhcp, dhcpcd, iptables
, udev, libgudev, libnl, libuuid, polkit, gnutls, ppp, dhcp, dhcpcd, iptables
, libgcrypt, dnsmasq, avahi, bind, perl, bluez5, substituteAll, readline
, gobjectIntrospection, modemmanager, openresolv, libndp, newt, libsoup }:
@@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
"--with-libsoup=yes"
];
buildInputs = [ wirelesstools udev libnl libuuid polkit ppp libndp
buildInputs = [ wirelesstools udev libgudev libnl libuuid polkit ppp libndp
xz bluez5 dnsmasq gobjectIntrospection modemmanager readline newt libsoup ];
propagatedBuildInputs = [ dbus_glib gnutls libgcrypt ];