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

Merge commit 'b666ac3e9ff3f08b120d068770768be580e67f76' (staging)

Browse Source 
Merge rest of the fixes from staging
This commit is contained in:
Domen Kožar 2015-11-16 11:23:06 +01:00
commit 4755afc385
11 changed files with 26 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/desktops/gnome-3/3.16/apps/cheese/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, intltool, fetchurl, wrapGAppsHook, gnome-video-effects, libcanberra_gtk3
, pkgconfig, gtk3, glib, clutter_gtk, clutter-gst_2, udev, gst_all_1, itstool
, adwaita-icon-theme, librsvg, gdk_pixbuf, gnome3, gnome_desktop, libxml2 }:
, adwaita-icon-theme, librsvg, gdk_pixbuf, gnome3, gnome_desktop, libxml2, libgudev }:
stdenv.mkDerivation rec {
name = "cheese-${gnome3.version}.1";
@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
gdk_pixbuf adwaita-icon-theme librsvg udev gst_all_1.gstreamer libxml2
gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good gnome_desktop
gst_all_1.gst-plugins-bad clutter_gtk clutter-gst_2
libcanberra_gtk3 ];
libcanberra_gtk3 libgudev ];
enableParallelBuilding = true;

4
pkgs/development/libraries/gtk+/3.x.nix
View File

@ -10,7 +10,7 @@ assert cupsSupport -> cups != null;
let
ver_maj = "3.18";
ver_min = "3";
ver_min = "4";
version = "${ver_maj}.${ver_min}";
in
stdenv.mkDerivation rec {
@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "mirror://gnome/sources/gtk+/${ver_maj}/gtk+-${version}.tar.xz";
sha256 = "f3c76791f93f51e260b03676f83007730b9875a0a9bf5cd42442e2f14e593546";
sha256 = "5400dcf280d28d24606f33d59ed48c717f7d3db425d4b6fb52e8002f0c76c7eb";
};
nativeBuildInputs = [ pkgconfig gettext gobjectIntrospection perl ];

4
pkgs/development/libraries/mesa/default.nix
View File

@ -22,7 +22,7 @@ else
*/
let
version = "11.0.4";
version = "11.0.5";
# this is the default search path for DRI drivers
driverLink = "/run/opengl-driver" + stdenv.lib.optionalString stdenv.isi686 "-32";
in
@ -36,7 +36,7 @@ stdenv.mkDerivation {
"https://launchpad.net/mesa/trunk/${version}/+download/mesa-${version}.tar.xz"
"ftp://ftp.freedesktop.org/pub/mesa/${version}/mesa-${version}.tar.xz"
];
sha256 = "40201bf7fc6fa12a6d9edfe870b41eb4dd6669154e3c42c48a96f70805f5483d";
sha256 = "9c255a2a6695fcc6ef4a279e1df0aeaf417dc142f39ee59dfb533d80494bb67a";
};
prePatch = "patchShebangs .";

12
pkgs/development/python-modules/generic/default.nix
View File

@ -118,7 +118,6 @@ python.stdenv.mkDerivation (builtins.removeAttrs attrs ["disabled"] // {
${python}/bin/${python.executable} setup.py install \
--install-lib=$out/lib/${python.libPrefix}/site-packages \
--old-and-unmanageable \
--skip-build \
--prefix="$out" ${lib.concatStringsSep " " setupPyInstallFlags}
# --install-lib:
@ -162,15 +161,14 @@ python.stdenv.mkDerivation (builtins.removeAttrs attrs ["disabled"] // {
'';
shellHook = attrs.shellHook or ''
${preShellHook}
if test -e setup.py; then
tmp_path=/tmp/`pwd | md5sum | cut -f 1 -d " "`-$name
mkdir -p $tmp_path/lib/${python.libPrefix}/site-packages
${preShellHook}
tmp_path=$(mktemp -d)
export PATH="$tmp_path/bin:$PATH"
export PYTHONPATH="$tmp_path/lib/${python.libPrefix}/site-packages:$PYTHONPATH"
${python}/bin/${python.executable} setup.py develop --prefix $tmp_path
${postShellHook}
export PYTHONPATH="$tmp_path/${python.sitePackages}:$PYTHONPATH"
${python.interpreter} setup.py develop --prefix $tmp_path
fi
${postShellHook}
'';
meta = with lib.maintainers; {

6
pkgs/development/tools/build-managers/cmake/default.nix
View File

@ -10,8 +10,8 @@ assert wantPS -> (ps != null);
let
os = stdenv.lib.optionalString;
majorVersion = "3.3";
minorVersion = "2";
majorVersion = "3.4";
minorVersion = "0";
version = "${majorVersion}.${minorVersion}";
in
@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "${meta.homepage}files/v${majorVersion}/cmake-${version}.tar.gz";
sha256 = "08pwy9ip9cgwgynhn5vrjw8drw29gijy1rmziq22n65zds6ifnp7";
sha256 = "1shwim3gfdybjx9f11ykxz5l09rh58vmvz8ip76q3i76mkv2pf55";
};
enableParallelBuilding = true;

4
pkgs/development/web/nodejs/default.nix
View File

@ -7,7 +7,7 @@
assert stdenv.system != "armv5tel-linux";
let
version = "4.1.2";
version = "4.2.2";
deps = {
inherit openssl zlib libuv;
@ -31,7 +31,7 @@ in stdenv.mkDerivation {
src = fetchurl {
url = "http://nodejs.org/dist/v${version}/node-v${version}.tar.gz";
sha256 = "0j9ca1fjgljzh4m9l9d8g81510j0ljvaf031qij9psiz79qc7gpy";
sha256 = "1c8c45b39fg2mz1c88jl0q0yhpxixdr25rpmpfskdd1m6hshkrq0";
};
configureFlags = concatMap sharedConfigureFlags (builtins.attrNames deps) ++ [ "--without-dtrace" ];

4
pkgs/os-specific/linux/udisks/1-default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, fetchurl, pkgconfig, sg3_utils, udev, glib, dbus, dbus_glib
, polkit, parted, lvm2, libatasmart, intltool, libuuid, mdadm
, libxslt, docbook_xsl, utillinux }:
, libxslt, docbook_xsl, utillinux, libgudev }:
stdenv.mkDerivation rec {
name = "udisks-1.0.5";
@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
'';
buildInputs =
[ sg3_utils udev glib dbus dbus_glib polkit parted
[ sg3_utils udev glib dbus dbus_glib polkit parted libgudev
lvm2 libatasmart intltool libuuid libxslt docbook_xsl
];

4
pkgs/tools/networking/network-manager/0.9.8.nix
View File

@ -1,6 +1,6 @@
{ stdenv, fetchurl, intltool, pkgconfig, dbus_glib
, udev, libnl, libuuid, gnutls, dhcp
, libgcrypt, perl }:
, libgcrypt, perl, libgudev }:
stdenv.mkDerivation rec {
name = "network-manager-${version}";
@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
"--disable-ppp"
];
buildInputs = [ udev libnl libuuid gnutls libgcrypt ];
buildInputs = [ udev libnl libuuid gnutls libgcrypt libgudev ];
propagatedBuildInputs = [ dbus_glib ];

1
pkgs/tools/security/knockknock/default.nix
View File

@ -14,6 +14,7 @@ buildPythonPackage rec {
propagatedBuildInputs = [ pycrypto ];
patchPhase = ''
sed -i '/build\//d' setup.py
substituteInPlace setup.py --replace "/etc" "$out/etc"
substituteInPlace knockknock.py --replace 'existsInPath("hping3")' '"${hping}/bin/hping3"'
'';

9
pkgs/top-level/all-packages.nix
View File

@ -2048,8 +2048,9 @@ let
ninka = callPackage ../development/tools/misc/ninka { };
nodejs-4_1 = callPackage ../development/web/nodejs {
nodejs-4_2 = callPackage ../development/web/nodejs {
libtool = darwin.cctools;
openssl = openssl_1_0_2;
};
nodejs-0_10 = callPackage ../development/web/nodejs/v0_10.nix {
@ -2060,16 +2061,16 @@ let
nodejs = if stdenv.system == "armv5tel-linux" then
nodejs-0_10
else
nodejs-4_1;
nodejs-4_2;
nodePackages_4_1 = recurseIntoAttrs (callPackage ./node-packages.nix { self = nodePackages_4_1; nodejs = nodejs-4_1; });
nodePackages_4_2 = recurseIntoAttrs (callPackage ./node-packages.nix { self = nodePackages_4_2; nodejs = nodejs-4_2; });
nodePackages_0_10 = callPackage ./node-packages.nix { self = nodePackages_0_10; nodejs = nodejs-0_10; };
nodePackages = if stdenv.system == "armv5tel-linux" then
nodePackages_0_10
else
nodePackages_4_1;
nodePackages_4_2;
npm2nix = nodePackages.npm2nix;

2
pkgs/top-level/python-packages.nix
View File

@ -2519,8 +2519,6 @@ let
sha256 = "13hdffhd37mx3gjby018xl179jaj957fy7kzi01crmimxvn2zi7y";
};
setupPyBuildFlags = ["--build-base=$out"];
buildInputs = with self; [ pkgs.pkgconfig ];
meta = {