From 4d1129828a7c8af8e75c54175141c009e6f0651f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Wed, 11 Nov 2015 11:53:38 +0100 Subject: [PATCH 01/13] nodejs: 4.1.2 -> 4.2.2 --- pkgs/development/web/nodejs/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/web/nodejs/default.nix b/pkgs/development/web/nodejs/default.nix index 1bd8dbec1e6..cff2e089756 100644 --- a/pkgs/development/web/nodejs/default.nix +++ b/pkgs/development/web/nodejs/default.nix @@ -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" ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 47881b7d2ab..f835bc0abaf 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2032,7 +2032,7 @@ let ninka = callPackage ../development/tools/misc/ninka { }; - nodejs-4_1 = callPackage ../development/web/nodejs { + nodejs-4_2 = callPackage ../development/web/nodejs { libtool = darwin.cctools; }; @@ -2044,16 +2044,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; From 3d02d332b0633dba21888de5fabac7cd412cf468 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Wed, 11 Nov 2015 11:54:04 +0100 Subject: [PATCH 02/13] nodejs: use openssl_1_0_2 as only supported --- pkgs/top-level/all-packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f835bc0abaf..0fa29fe1134 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2034,6 +2034,7 @@ let 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 { From 2ee7aaf46b6c986e4b1ba171900ce56e1aaf8f60 Mon Sep 17 00:00:00 2001 From: Thomas Strobel Date: Fri, 2 Oct 2015 12:09:30 +0200 Subject: [PATCH 03/13] miraclecast: init at 0.0-git-20151002 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (cherry picked from commit 9e33e2365eeff59e9a25701dc2cf8dbcc38a9dc8) Signed-off-by: Domen Kožar --- .../os-specific/linux/miraclecast/default.nix | 26 +++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 pkgs/os-specific/linux/miraclecast/default.nix diff --git a/pkgs/os-specific/linux/miraclecast/default.nix b/pkgs/os-specific/linux/miraclecast/default.nix new file mode 100644 index 00000000000..3d5a76144af --- /dev/null +++ b/pkgs/os-specific/linux/miraclecast/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, udev, systemd, glib, readline }: + +with stdenv.lib; +stdenv.mkDerivation rec { + name = "miraclecast-0.0-git-20151002"; + + src = fetchFromGitHub { + owner = "albfan"; + repo = "miraclecast"; + rev = "30b8c2d22391423f76ba582aaaa1e0936869103a"; + sha256 = "0i076n76kq64fayc7v06gr1853pk5r6ms86m57vd1xsjd0r9wyxd"; + }; + + # INFO: It is important to list 'systemd' first as for now miraclecast + # links against a customized systemd. Otherwise, a systemd package from + # a propagatedBuildInput could take precedence. + buildInputs = [ systemd autoreconfHook pkgconfig udev glib readline ]; + + meta = { + homepage = https://github.com/albfan/miraclecast; + description = "Connect external monitors via Wi-Fi"; + license = licenses.lgpl21Plus; + maintainers = with maintainers; [ tstrobel ]; + platforms = platforms.linux; + }; +} From 1616f131957b6354da3e56c3b29d185da2902864 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Wed, 11 Nov 2015 13:42:33 +0100 Subject: [PATCH 04/13] knockknock: fix build --- pkgs/tools/security/knockknock/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/security/knockknock/default.nix b/pkgs/tools/security/knockknock/default.nix index 2341d2110bf..7cf68d48e18 100644 --- a/pkgs/tools/security/knockknock/default.nix +++ b/pkgs/tools/security/knockknock/default.nix @@ -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"' ''; From 0ba740d26b3e851a181034d8650ece94163d0fae Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Wed, 11 Nov 2015 15:45:15 -0800 Subject: [PATCH 05/13] mesa: 11.0.4 -> 11.0.5 --- pkgs/development/libraries/mesa/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index b0c26def14a..11fafc8f038 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -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 ."; From cdf65ba19e4c72933bdc3e59a35bea65da41d161 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Fri, 13 Nov 2015 15:55:33 -0800 Subject: [PATCH 06/13] gtk3: 3.18.3 -> 3.18.4 --- pkgs/development/libraries/gtk+/3.x.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gtk+/3.x.nix b/pkgs/development/libraries/gtk+/3.x.nix index 2a7c7b88c38..174f12fc68c 100644 --- a/pkgs/development/libraries/gtk+/3.x.nix +++ b/pkgs/development/libraries/gtk+/3.x.nix @@ -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 ]; From 050bebb8c47051b8d7de3dfee5807f11c9baff69 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Fri, 13 Nov 2015 15:55:44 -0800 Subject: [PATCH 07/13] cmake: 3.3.2 -> 3.4.0 --- pkgs/development/tools/build-managers/cmake/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/build-managers/cmake/default.nix b/pkgs/development/tools/build-managers/cmake/default.nix index 5ddbefe0884..59bcfe45ea2 100644 --- a/pkgs/development/tools/build-managers/cmake/default.nix +++ b/pkgs/development/tools/build-managers/cmake/default.nix @@ -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; From 15913feb97f4ddd79034cb3fd0a649ee47baa7a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Fri, 13 Nov 2015 23:23:14 +0100 Subject: [PATCH 08/13] networkmanager098: add libgudev --- pkgs/tools/networking/network-manager/0.9.8.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/network-manager/0.9.8.nix b/pkgs/tools/networking/network-manager/0.9.8.nix index fe19550bc67..4fad1ca2ab9 100644 --- a/pkgs/tools/networking/network-manager/0.9.8.nix +++ b/pkgs/tools/networking/network-manager/0.9.8.nix @@ -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 ]; From 5e21f4e20bd1905c16488294eefeb9eb4a682953 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Sat, 14 Nov 2015 16:39:18 +0100 Subject: [PATCH 09/13] fix cython build --- pkgs/top-level/python-packages.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index fb64ae7e02e..4bda03a31cc 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2519,8 +2519,6 @@ let sha256 = "13hdffhd37mx3gjby018xl179jaj957fy7kzi01crmimxvn2zi7y"; }; - setupPyBuildFlags = ["--build-base=$out"]; - buildInputs = with self; [ pkgs.pkgconfig ]; meta = { From b87dad2839341c90e3f8fd21c5449f5ce78ba441 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Sat, 14 Nov 2015 16:42:27 +0100 Subject: [PATCH 10/13] cheese: libgudev --- pkgs/desktops/gnome-3/3.16/apps/cheese/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/3.16/apps/cheese/default.nix b/pkgs/desktops/gnome-3/3.16/apps/cheese/default.nix index ce43fe1637d..de61b73cf62 100644 --- a/pkgs/desktops/gnome-3/3.16/apps/cheese/default.nix +++ b/pkgs/desktops/gnome-3/3.16/apps/cheese/default.nix @@ -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; From fc8562c78590f269d9bf35f64ec21bdc5b3612c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Sat, 14 Nov 2015 16:48:48 +0100 Subject: [PATCH 11/13] udisks: add missing libgudev --- pkgs/os-specific/linux/udisks/1-default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/udisks/1-default.nix b/pkgs/os-specific/linux/udisks/1-default.nix index b3df300e519..a0596abb269 100644 --- a/pkgs/os-specific/linux/udisks/1-default.nix +++ b/pkgs/os-specific/linux/udisks/1-default.nix @@ -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 ]; From 5a16c0e6e4a547c7bdc99f8534b2e643744e0281 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Sun, 15 Nov 2015 13:49:20 +0100 Subject: [PATCH 12/13] buildPythonPackage: clean up shellHook --- pkgs/development/python-modules/generic/default.nix | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/generic/default.nix b/pkgs/development/python-modules/generic/default.nix index 55a8c14cd26..c9c03c52cb9 100644 --- a/pkgs/development/python-modules/generic/default.nix +++ b/pkgs/development/python-modules/generic/default.nix @@ -162,15 +162,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; { From b666ac3e9ff3f08b120d068770768be580e67f76 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Sun, 15 Nov 2015 13:49:24 +0100 Subject: [PATCH 13/13] Revert "python: skip build at install phase" This reverts commit d34f5b657051e268e41084e9751996d16f7f0a1a. PIL and NumPy don't like this change and I'd rather spend time on bringing wheels to Nix than fixing old infrastructure. --- pkgs/development/python-modules/generic/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/development/python-modules/generic/default.nix b/pkgs/development/python-modules/generic/default.nix index c9c03c52cb9..4827f374585 100644 --- a/pkgs/development/python-modules/generic/default.nix +++ b/pkgs/development/python-modules/generic/default.nix @@ -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: