From f7771131b6ff0eaa2bfb5ed969a98cd7cc78220b Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Sat, 15 Aug 2015 17:12:07 +0300 Subject: [PATCH 01/20] nixos/tests/lightdm: Fix waiting for the login to succeed Currently the lightdm test detects a successful login by OCR'ing the screen and searching for the clock widget's text. Since the last IceWM update (commit bdd20ced), either the font or the colors of the clock changed such that the OCR doesn't pick it up anymore. Instead, just look for a matching (root) window title, e.g. "IceWM 1.3.9 (Linux/i686)" --- nixos/tests/lightdm.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/tests/lightdm.nix b/nixos/tests/lightdm.nix index b355081ffd6..67bd395be06 100644 --- a/nixos/tests/lightdm.nix +++ b/nixos/tests/lightdm.nix @@ -22,7 +22,7 @@ import ./make-test.nix ({ pkgs, ...} : { $machine->waitForText(qr/${user.description}/); $machine->screenshot("lightdm"); $machine->sendChars("${user.password}\n"); - $machine->waitForText(qr/^\d{2}(?::\d{2}){2} (?:AM|PM)$/m); + $machine->waitForWindow("^IceWM "); $machine->screenshot("session"); ''; }) From cff84b2a71c75e8ae0cc479bb2bd9b8dce40fac0 Mon Sep 17 00:00:00 2001 From: Raymond Gauthier Date: Thu, 13 Aug 2015 23:19:38 -0400 Subject: [PATCH 02/20] chromium: improvement. Fixed `*.desktop` refering to nix store for its icon. --- pkgs/applications/networking/browsers/chromium/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index 96852e93cb9..9a7f4a2757e 100644 --- a/pkgs/applications/networking/browsers/chromium/default.nix +++ b/pkgs/applications/networking/browsers/chromium/default.nix @@ -42,7 +42,7 @@ let desktopItem = makeDesktopItem { name = "chromium"; exec = "chromium %U"; - icon = "${chromium.browser}/share/icons/hicolor/48x48/apps/chromium.png"; + icon = "chromium"; comment = "An open source web browser from Google"; desktopName = "Chromium"; genericName = "Web browser"; From 62e2b2124a4336dd6967729442e05878c538f924 Mon Sep 17 00:00:00 2001 From: ssgen Date: Mon, 17 Aug 2015 21:45:37 +0300 Subject: [PATCH 03/20] fatresize: init at 1.0.2 --- pkgs/tools/filesystems/fatresize/default.nix | 39 ++++++++++ .../fatresize/fatresize_parted_nix.patch | 74 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 3 files changed, 115 insertions(+) create mode 100644 pkgs/tools/filesystems/fatresize/default.nix create mode 100644 pkgs/tools/filesystems/fatresize/fatresize_parted_nix.patch diff --git a/pkgs/tools/filesystems/fatresize/default.nix b/pkgs/tools/filesystems/fatresize/default.nix new file mode 100644 index 00000000000..7fb60d2f388 --- /dev/null +++ b/pkgs/tools/filesystems/fatresize/default.nix @@ -0,0 +1,39 @@ +{ stdenv, fetchurl, parted, substituteAll, utillinux }: + +stdenv.mkDerivation rec { + + version = "1.0.2"; + name = "fatresize-${version}"; + + src = fetchurl { + url = "mirror://sourceforge/fatresize/fatresize-${version}.tar.bz2"; + sha256 = "04wp48jpdvq4nn0dgbw5za07g842rnxlh9mig4mslz70zqs0izjm"; + }; + + buildInputs = [ parted utillinux ]; + + # This patch helps this unmantained piece of software to be built against recent parted + # It basically modifies the detection scheme for parted version (the current one has no micro version defined) + # The second change is to include a header for a moved function since 1.6+ to current 3.1+ parted + # The third change is to modify the call to PED_ASSERT that is no longer defined with 2 params + patches = [ ./fatresize_parted_nix.patch ]; + + preConfigure = '' + echo "Replacing calls to ped_free with free ..." + substituteInPlace ./fatresize.c --replace ped_free free + ''; + + # Filesystem resize functions were reintroduced in parted 3.1 due to no other available free alternatives + # but in a sepparate library -> libparted-fs-resize --- that's why the added LDFLAG + makeFlags = '' + LDFLAGS=-lparted-fs-resize + ''; + + propagatedBuildInputs = [ parted utillinux ]; + + meta = { + description = "The FAT16/FAT32 non-destructive resizer"; + homepage = http://sourceforge.net/projects/fatresize; + platform = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/tools/filesystems/fatresize/fatresize_parted_nix.patch b/pkgs/tools/filesystems/fatresize/fatresize_parted_nix.patch new file mode 100644 index 00000000000..e9aa87a2d56 --- /dev/null +++ b/pkgs/tools/filesystems/fatresize/fatresize_parted_nix.patch @@ -0,0 +1,74 @@ +diff --git a/aclocal.m4 b/aclocal.m4 +index 18e8176..2e75592 100644 +--- a/aclocal.m4 ++++ b/aclocal.m4 +@@ -88,8 +88,15 @@ int main () + if ( !(version = ped_get_version ()) ) + exit(1); + if (sscanf(version, "%d.%d.%d", &major, &minor, µ) != 3) { +- printf("%s, bad version string\n", version); +- exit(1); ++ if (sscanf(version, "%d.%d", &major, &minor) != 2) ++ { ++ printf("%s, bad version string\n", version); ++ exit(1); ++ } ++ else ++ { ++ micro = 0; ++ } + } + + if ((major > $parted_config_major_version) || +diff --git a/configure b/configure +index ed31457..e5f1705 100755 +--- a/configure ++++ b/configure +@@ -4793,8 +4793,15 @@ int main () + if ( !(version = ped_get_version ()) ) + exit(1); + if (sscanf(version, "%d.%d.%d", &major, &minor, µ) != 3) { +- printf("%s, bad version string\n", version); +- exit(1); ++ if (sscanf(version, "%d.%d", &major, &minor) != 2) ++ { ++ printf("%s, bad version string\n", version); ++ exit(1); ++ } ++ else ++ { ++ micro = 0; ++ } + } + + if ((major > $parted_config_major_version) || +diff --git a/fatresize.c b/fatresize.c +index 424d5d2..e439102 100644 +--- a/fatresize.c ++++ b/fatresize.c +@@ -30,6 +30,7 @@ + #include + #include + #include ++#include + #include + + #include "config.h" +@@ -217,7 +218,7 @@ fatresize_handler(PedException *ex) + static int + snap(PedSector* sector, PedSector new_sector, PedGeometry* range) + { +- PED_ASSERT(ped_geometry_test_sector_inside (range, *sector), return 0); ++ PED_ASSERT(ped_geometry_test_sector_inside (range, *sector)); + if (!ped_geometry_test_sector_inside(range, new_sector)) + return 0; + +@@ -281,7 +282,7 @@ snap_to_boundaries (PedGeometry* new_geom, PedGeometry* old_geom, + end_part->geom.end, end_part->geom.start - 1, -1); + } + +- PED_ASSERT (start <= end, return); ++ PED_ASSERT (start <= end); + ped_geometry_set (new_geom, start, end - start + 1); + } + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 66ea5265047..ee895a766df 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1519,6 +1519,8 @@ let lp_solve = callPackage ../applications/science/math/lp_solve { }; lprof = callPackage ../tools/graphics/lprof { }; + + fatresize = callPackage ../tools/filesystems/fatresize {}; fdk_aac = callPackage ../development/libraries/fdk-aac { }; From 8aa50beb1f1821ed8b1f054a81a82ee903c86560 Mon Sep 17 00:00:00 2001 From: Jaka Hudoklin Date: Thu, 20 Aug 2015 00:18:32 +0200 Subject: [PATCH 04/20] elasticsearch 1.4.5 -> 1.5.2 --- pkgs/servers/search/elasticsearch/default.nix | 9 +++++---- pkgs/servers/search/elasticsearch/es-home.patch | 16 +++++++--------- 2 files changed, 12 insertions(+), 13 deletions(-) diff --git a/pkgs/servers/search/elasticsearch/default.nix b/pkgs/servers/search/elasticsearch/default.nix index be30e12258b..859f1501bb3 100644 --- a/pkgs/servers/search/elasticsearch/default.nix +++ b/pkgs/servers/search/elasticsearch/default.nix @@ -3,11 +3,11 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "elasticsearch-1.4.5"; + name = "elasticsearch-1.5.2"; src = fetchurl { - url = "https://download.elasticsearch.org/elasticsearch/elasticsearch/${name}.tar.gz"; - sha256 = "1qjnffbxa1fz5f3sqahhgf45b4r1xa5lkjy9xj135g0w8jgala6w"; + url = "https://download.elastic.co/elasticsearch/elasticsearch/${name}.tar.gz"; + sha256 = "054s0k0y0g1x6wzbd6gmvrp5n89fqwqssbyhay0gmhvs6sbpibpg"; }; patches = [ ./es-home.patch ]; @@ -36,7 +36,8 @@ stdenv.mkDerivation rec { meta = { description = "Open Source, Distributed, RESTful Search Engine"; - license = stdenv.lib.licenses.asl20; + license = licenses.asl20; platforms = platforms.unix; + maintainers = [ maintainers.offline ]; }; } diff --git a/pkgs/servers/search/elasticsearch/es-home.patch b/pkgs/servers/search/elasticsearch/es-home.patch index b4ecbb5a709..2f7a7fe7919 100644 --- a/pkgs/servers/search/elasticsearch/es-home.patch +++ b/pkgs/servers/search/elasticsearch/es-home.patch @@ -1,8 +1,7 @@ -diff --git a/bin/elasticsearch b/bin/elasticsearch -index c7c9263..0fcecf6 100755 ---- a/bin/elasticsearch -+++ b/bin/elasticsearch -@@ -76,7 +76,10 @@ while [ -h "$SCRIPT" ] ; do +diff -rupN a/bin/elasticsearch b/bin/elasticsearch +--- a/bin/elasticsearch 2015-08-05 17:52:05.740819671 +0200 ++++ b/bin/elasticsearch 2015-08-05 17:22:34.664657364 +0200 +@@ -83,7 +83,10 @@ while [ -h "$SCRIPT" ] ; do done # determine elasticsearch home @@ -14,10 +13,9 @@ index c7c9263..0fcecf6 100755 # make ELASTICSEARCH_HOME absolute ES_HOME=`cd "$ES_HOME"; pwd` -diff --git a/bin/plugin b/bin/plugin -index a8c796a..daf7b99 100755 ---- a/bin/plugin -+++ b/bin/plugin +diff -rupN a/bin/plugin b/bin/plugin +--- a/bin/plugin 2015-08-05 17:57:07.903088815 +0200 ++++ b/bin/plugin 2015-08-05 17:57:38.979808139 +0200 @@ -16,7 +16,10 @@ while [ -h "$SCRIPT" ] ; do done From 1d1a336c6a02bd247007dc746ed64ff0bfca1eb0 Mon Sep 17 00:00:00 2001 From: Jaka Hudoklin Date: Thu, 20 Aug 2015 00:20:31 +0200 Subject: [PATCH 05/20] elasticsearch: update plugins --- pkgs/servers/search/elasticsearch/plugins.nix | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/servers/search/elasticsearch/plugins.nix b/pkgs/servers/search/elasticsearch/plugins.nix index 69941d5c46c..95973186677 100644 --- a/pkgs/servers/search/elasticsearch/plugins.nix +++ b/pkgs/servers/search/elasticsearch/plugins.nix @@ -24,10 +24,10 @@ in { elasticsearch_river_jdbc = esPlugin rec { name = "elasticsearch-river-jdbc-${version}"; pluginName = "elasticsearch-river-jdbc"; - version = "1.3.0.4"; + version = "1.5.0.5"; src = fetchurl { url = "http://xbib.org/repository/org/xbib/elasticsearch/plugin/elasticsearch-river-jdbc/${version}/${name}-plugin.zip"; - sha256 = "0272l6cr032iccwwa803shzfjg3505jc48d9qdazrwxjmnlkkzqk"; + sha256 = "1p75l3vcnb90ar4j3dci2xf8dqnqyy31kc1r075fa2xqlsxgigcp"; }; meta = { homepage = "https://github.com/jprante/elasticsearch-river-jdbc"; @@ -53,11 +53,11 @@ in { elasticsearch_http_basic = stdenv.mkDerivation rec { name = "elasticsearch-http-basic-${version}"; - version = "1.3.2"; + version = "1.5.0"; src = fetchurl { - url = "https://github.com/Asquera/elasticsearch-http-basic/releases/download/${version}/${name}.jar"; - sha256 = "1qq8z0233mzz699zbzjwmx7ghn8k0djgyc5ixr8i5xchfrsrymn2"; + url = "https://github.com/Asquera/elasticsearch-http-basic/releases/download/v${version}/${name}.jar"; + sha256 = "0fif6sbn2ich39lrgm039y9d5bxkylx9pvly04wss8rdhspvdskb"; }; phases = ["installPhase"]; @@ -75,11 +75,11 @@ in { name = pname + "-" + version; pname = "elasticsearch-river-twitter"; pluginName = "elasticsearch/" + pname + "/" + version; - version = "2.3.0"; + version = "2.5.0"; src = fetchurl { url = "http://download.elasticsearch.org/elasticsearch/${pname}/${name}.zip"; - sha256 = "1lxxh1r61r15mzqyl0li37kcnn3vvpklnbfyys0kd6a1l82f0qvj"; + sha256 = "0851yrmyrpp6whyxk34ykcj7b28f90w0nvkrhvl49dwqgr5s4mn4"; }; meta = { @@ -94,10 +94,10 @@ in { elasticsearch_kopf = esPlugin rec { name = "elasticsearch-kopf-${version}"; pluginName = "elasticsearch-kopf"; - version = "1.4.7"; + version = "1.5.7"; src = fetchurl { url = "https://github.com/lmenezes/elasticsearch-kopf/archive/v${version}.zip"; - sha256 = "17r9mmfjnraswij1glmglljga4i4mfiraivxmai6giwmm2grwlz3"; + sha256 = "0mq6jmjb4ldi03m431kzr7ly0bf7mdim7s5dx4wplb85gyhscns1"; }; meta = { homepage = https://github.com/lmenezes/elasticsearch-kopf; From 2bec93dde868968a50d6b8f5f1a864c402ad56bc Mon Sep 17 00:00:00 2001 From: Jaka Hudoklin Date: Thu, 20 Aug 2015 00:20:44 +0200 Subject: [PATCH 06/20] elasticsearch: add search_guard plugin --- pkgs/servers/search/elasticsearch/plugins.nix | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/pkgs/servers/search/elasticsearch/plugins.nix b/pkgs/servers/search/elasticsearch/plugins.nix index 95973186677..32b065364a6 100644 --- a/pkgs/servers/search/elasticsearch/plugins.nix +++ b/pkgs/servers/search/elasticsearch/plugins.nix @@ -106,4 +106,18 @@ in { }; }; + search_guard = esPlugin rec { + name = "elastic-search-guard-${version}"; + pluginName = "search-guard"; + version = "0.5"; + src = fetchurl { + url = "https://github.com/floragunncom/search-guard/releases/download/v${version}/${pluginName}-${version}.zip"; + sha256 = "1zima4jmq1rrcqxhlrp2xian80vp244d2splby015n5cgqrp39fl"; + }; + meta = { + homepage = https://github.com/floragunncom/search-guard; + description = "Plugin to fetch data from JDBC sources for indexing into Elasticsearch"; + license = licenses.asl20; + }; + }; } From 9146edd5be812eb681a9a61e1db9bc493691e585 Mon Sep 17 00:00:00 2001 From: Jaka Hudoklin Date: Wed, 19 Aug 2015 23:09:03 +0200 Subject: [PATCH 07/20] logstash: 1.4.2 -> 1.5.3 --- pkgs/tools/misc/logstash/default.nix | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/pkgs/tools/misc/logstash/default.nix b/pkgs/tools/misc/logstash/default.nix index 7f43ccdb625..081868589bc 100644 --- a/pkgs/tools/misc/logstash/default.nix +++ b/pkgs/tools/misc/logstash/default.nix @@ -1,31 +1,27 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - version = "1.4.2"; + version = "1.5.3"; name = "logstash-${version}"; src = fetchurl { url = "https://download.elasticsearch.org/logstash/logstash/logstash-${version}.tar.gz"; - sha256 = "0sc0bwyf96fzs5h3d7ii65v9vvpfbm7w67vk1im9djnlz0d1ggnm"; + sha256 = "1an476k4q2shdxvhcx4fzbrcpk6isjrrvzlb6ivxfqg5fih3cg7b"; }; - dontBuild = true; - dontPatchELF = true; - dontStrip = true; + dontBuild = true; + dontPatchELF = true; + dontStrip = true; dontPatchShebangs = true; installPhase = '' mkdir -p $out/bin mkdir -p $out/vendor mkdir -p $out/lib - mkdir -p $out/locales - mkdir -p $out/patterns cp -a bin $out cp -a vendor $out cp -a lib $out - cp -a locales $out - cp -a patterns $out - patchShebangs $out/bin + cp Gemfile* $out ''; meta = { From af7d5f27d01d6b2b9af80ef41a110410bedb8e0e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Wed, 19 Aug 2015 23:21:00 +0200 Subject: [PATCH 08/20] meshlab: 1.3.2 -> 1.3.3 Remove patches that no longer apply (integrated upstream I guess), but forward port the part that adds the missing "include "[1]. Build and run tested. [1]: http://sourceforge.net/p/meshlab/bugs/342/ --- .../applications/graphics/meshlab/default.nix | 12 ++--- .../graphics/meshlab/gcc-4.7.patch | 38 ------------- .../graphics/meshlab/qt-4.8.patch | 54 ------------------- 3 files changed, 4 insertions(+), 100 deletions(-) delete mode 100644 pkgs/applications/graphics/meshlab/gcc-4.7.patch delete mode 100644 pkgs/applications/graphics/meshlab/qt-4.8.patch diff --git a/pkgs/applications/graphics/meshlab/default.nix b/pkgs/applications/graphics/meshlab/default.nix index 9352ae092be..94102663a8c 100644 --- a/pkgs/applications/graphics/meshlab/default.nix +++ b/pkgs/applications/graphics/meshlab/default.nix @@ -1,22 +1,18 @@ {stdenv, fetchurl, qt4, bzip2, lib3ds, levmar, muparser, unzip}: stdenv.mkDerivation rec { - name = "meshlab-1.3.2"; + name = "meshlab-1.3.3"; src = fetchurl { - url = "mirror://sourceforge/meshlab/meshlab/MeshLab%20v1.3.2/MeshLabSrc_AllInc_v132.tgz"; - sha256 = "d57f0a99a55421aac54a66e2475d48f00f7b1752f9587cd69cf9b5b9c1a519b1"; + url = "mirror://sourceforge/meshlab/meshlab/MeshLab%20v1.3.3/MeshLabSrc_AllInc_v133.tgz"; + sha256 = "03wqaibfbfag2w1zi1a5z6h546r9d7pg2sjl5pwg24w7yp8rr0n9"; }; # I don't know why I need this; without this, the rpath set at the beginning of the # buildPhase gets removed from the 'meshlab' binary dontPatchELF = true; - # Patches are from the Arch Linux package - patchPhase = '' - patch -Np0 -i "${./qt-4.8.patch}" - patch -Np1 -i "${./gcc-4.7.patch}" - ''; + patches = [ ./include-unistd.diff ]; buildPhase = '' mkdir -p "$out/include" diff --git a/pkgs/applications/graphics/meshlab/gcc-4.7.patch b/pkgs/applications/graphics/meshlab/gcc-4.7.patch deleted file mode 100644 index 07dc1a08aff..00000000000 --- a/pkgs/applications/graphics/meshlab/gcc-4.7.patch +++ /dev/null @@ -1,38 +0,0 @@ -diff --git a/meshlab/src/meshlabplugins/decorate_base/colorhistogram.h b/meshlab/src/meshlabplugins/decorate_base/colorhistogram.h -index 2351b2a..90c6d76 100644 ---- a/meshlab/src/meshlabplugins/decorate_base/colorhistogram.h -+++ b/meshlab/src/meshlabplugins/decorate_base/colorhistogram.h -@@ -40,7 +40,7 @@ public: - - //! Reset histogram data. - void Clear() { -- this->::Clear(); -+ Histogram::Clear(); - CV.clear(); - } - /* -diff --git a/vcglib/wrap/gl/trimesh.h b/vcglib/wrap/gl/trimesh.h -index 5d40404..ab9d0aa 100644 ---- a/vcglib/wrap/gl/trimesh.h -+++ b/vcglib/wrap/gl/trimesh.h -@@ -1003,7 +1003,7 @@ void Crease(MESH_TYPE &m, typename MESH_TYPE::scalar_type angleRad) - } - } - -- m.vert.math::Swap(newvert); -+ m.vert.math.Swap(newvert); - m.vn=m.vert.size(); - } - -diff --git a/vcglib/wrap/ply/plystuff.h b/vcglib/wrap/ply/plystuff.h -index 3e41e63..4af9508 100644 ---- a/vcglib/wrap/ply/plystuff.h -+++ b/vcglib/wrap/ply/plystuff.h -@@ -75,6 +75,7 @@ using namespace vcg; - #define pb_close _close - #define DIR_SEP "\\" - #else -+#include - #define pb_mkdir(n) mkdir(n,0755) - #define pb_access access - #define pb_stat stat diff --git a/pkgs/applications/graphics/meshlab/qt-4.8.patch b/pkgs/applications/graphics/meshlab/qt-4.8.patch deleted file mode 100644 index abfd77d6f25..00000000000 --- a/pkgs/applications/graphics/meshlab/qt-4.8.patch +++ /dev/null @@ -1,54 +0,0 @@ -diff -Nur meshlab.orig/src/external/structuresynth/ssynth/SyntopiaCore/GLEngine/Raytracer/RayTracer.cpp meshlab/src/external/structuresynth/ssynth/SyntopiaCore/GLEngine/Raytracer/RayTracer.cpp ---- meshlab.orig/src/external/structuresynth/ssynth/SyntopiaCore/GLEngine/Raytracer/RayTracer.cpp 2011-01-25 18:51:28.000000000 +1100 -+++ meshlab/src/external/structuresynth/ssynth/SyntopiaCore/GLEngine/Raytracer/RayTracer.cpp 2012-01-07 11:47:12.836800072 +1100 -@@ -7,6 +7,12 @@ - #include "SyntopiaCore/Logging/Logging.h" - #include "SyntopiaCore/Misc/MiniParser.h" - -+#ifdef Q_WS_MAC -+#include -+#else -+#include -+#endif -+ - using namespace SyntopiaCore::Math; - using namespace SyntopiaCore::Misc; - -diff -Nur meshlab.orig/src/external/structuresynth/ssynth/SyntopiaCore/GLEngine/Sphere.h meshlab/src/external/structuresynth/ssynth/SyntopiaCore/GLEngine/Sphere.h ---- meshlab.orig/src/external/structuresynth/ssynth/SyntopiaCore/GLEngine/Sphere.h 2011-01-25 18:51:28.000000000 +1100 -+++ meshlab/src/external/structuresynth/ssynth/SyntopiaCore/GLEngine/Sphere.h 2012-01-07 11:45:26.795586149 +1100 -@@ -3,6 +3,12 @@ - #include "SyntopiaCore/Math/Vector3.h" - #include "Object3D.h" - -+#ifdef Q_WS_MAC -+#include -+#else -+#include -+#endif -+ - namespace SyntopiaCore { - namespace GLEngine { - -diff -Nur meshlab.orig/src/external/structuresynth/structuresynth.pro meshlab/src/external/structuresynth/structuresynth.pro ---- meshlab.orig/src/external/structuresynth/structuresynth.pro 2011-01-25 18:49:34.000000000 +1100 -+++ meshlab/src/external/structuresynth/structuresynth.pro 2012-01-07 11:51:46.695981995 +1100 -@@ -113,6 +113,7 @@ - ssynth/StructureSynth/Model/Rendering/TemplateRenderer.cpp - CONFIG+=opengl - QT+=xml opengl script -+unix:LIBS += -lGLU - macx:DESTDIR = ../lib/macx - win32-g++:DESTDIR = ../lib/win32-gcc - win32-msvc2005:DESTDIR = ../lib/win32-msvc2005 -diff -Nur meshlab.orig/src/meshlab/meshlab.pro meshlab/src/meshlab/meshlab.pro ---- meshlab.orig/src/meshlab/meshlab.pro 2011-02-15 20:39:47.000000000 +1100 -+++ meshlab/src/meshlab/meshlab.pro 2012-01-07 11:57:18.055586086 +1100 -@@ -85,6 +85,7 @@ - QT += xmlpatterns - QT += network - QT += script -+unix:LIBS += -lGLU - - - # the following line is needed to avoid mismatch between From ac8f2391f322e5c058dd08b8911d18c1e19fbcd9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Wed, 19 Aug 2015 23:31:46 +0200 Subject: [PATCH 09/20] pcl: 1.6.0 -> 1.7.2 (unbreaks build) New deps added: libXt (required), libpcap (optional). Releases are now at github. --- pkgs/development/libraries/pcl/default.nix | 20 +++++++++++--------- pkgs/top-level/all-packages.nix | 1 + 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/pkgs/development/libraries/pcl/default.nix b/pkgs/development/libraries/pcl/default.nix index a71709b554b..46e2da18aa1 100644 --- a/pkgs/development/libraries/pcl/default.nix +++ b/pkgs/development/libraries/pcl/default.nix @@ -1,23 +1,25 @@ -{ stdenv, fetchurl, cmake, qhull, flann, boost, vtk, eigen, pkgconfig, qt4, libusb1 }: +{ stdenv, fetchzip, cmake, qhull, flann, boost, vtk, eigen, pkgconfig, qt4 +, libusb1, libpcap, libXt +}: -stdenv.mkDerivation { - name = "pcl-1.6.0"; +stdenv.mkDerivation rec { + name = "pcl-1.7.2"; - buildInputs = [ cmake qhull flann boost vtk eigen pkgconfig qt4 libusb1 ]; - - src = fetchurl { - url = mirror://sourceforge/pointclouds/PCL-1.6.0-Source.tar.bz2; - sha256 = "0ip3djcjgynlr9vac6jlcw6kxhg2lm8fc0aqk747a6l0rqvllf1x"; + src = fetchzip { + name = name + "-src"; + url = "https://github.com/PointCloudLibrary/pcl/archive/${name}.tar.gz"; + sha256 = "0sm19p6wcls2d9l0vi5fgwqp7l372nh3g7bdin42w31zr8dmz8h8"; }; enableParallelBuilding = true; + buildInputs = [ cmake qhull flann boost vtk eigen pkgconfig qt4 libusb1 libpcap libXt ]; + meta = { homepage = http://pointclouds.org/; description = "Open project for 2D/3D image and point cloud processing"; license = stdenv.lib.licenses.bsd3; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; - broken = true; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2a963c701d2..6f09fd5d51a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7810,6 +7810,7 @@ let pcl = callPackage ../development/libraries/pcl { vtk = vtkWithQt4; + inherit (xorg) libXt; }; pcre = callPackage ../development/libraries/pcre { From 0ed06696998dd70af96ffa8644685afdbba6b23d Mon Sep 17 00:00:00 2001 From: aszlig Date: Thu, 20 Aug 2015 12:57:40 +0200 Subject: [PATCH 10/20] nixos/tests/lightdm: Drop "session" screenshot. Using waitForWindow on the IceWM root window doesn't necessarily mean that the panel will be shown. In the lightdm test, we only make sure that the login is working and thus it doesn't matter how the session itself will look or whether IceWM is broken, so we don't need that screenshot. Signed-off-by: aszlig --- nixos/tests/lightdm.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/nixos/tests/lightdm.nix b/nixos/tests/lightdm.nix index 67bd395be06..f30f9062dcd 100644 --- a/nixos/tests/lightdm.nix +++ b/nixos/tests/lightdm.nix @@ -23,6 +23,5 @@ import ./make-test.nix ({ pkgs, ...} : { $machine->screenshot("lightdm"); $machine->sendChars("${user.password}\n"); $machine->waitForWindow("^IceWM "); - $machine->screenshot("session"); ''; }) From 401782cb678d2e28c0f7f2d40c6421624f410148 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 20 Aug 2015 13:50:04 +0200 Subject: [PATCH 11/20] Revert "openssh: 6.9p1 -> 7.0p1" This reverts commit a8eb2a6a81524f3be0c8886f6d06090b50b0a513. OpenSSH 7.0 is causing too many interoperability problems so soon before the 15.08 release. For instance, it causes NixOps EC2 initial deployments to fail with "REMOTE HOST IDENTIFICATION HAS CHANGED". This is because the client knows the server's ssh-dss host key, but this key is no longer accepted by default. Setting "HostKeyAlgorithms" to "+ssh-dss" does not work because it causes ssh-dss to be ordered after "ecdsa-sha2-nistp521", which the server also offers. (Normally, ssh prioritizes host key algorithms for which the client has a known host key, but not if you set HostKeyAlgorithms.) --- nixos/modules/programs/ssh.nix | 3 --- nixos/modules/services/networking/ssh/sshd.nix | 3 --- pkgs/tools/networking/openssh/default.nix | 4 ++-- 3 files changed, 2 insertions(+), 8 deletions(-) diff --git a/nixos/modules/programs/ssh.nix b/nixos/modules/programs/ssh.nix index 9c94250cb1f..d3183f7d2dc 100644 --- a/nixos/modules/programs/ssh.nix +++ b/nixos/modules/programs/ssh.nix @@ -115,9 +115,6 @@ in ForwardX11 ${if cfg.forwardX11 then "yes" else "no"} - # Allow DSA keys for now. (These were deprecated in OpenSSH 7.0.) - PubkeyAcceptedKeyTypes +ssh-dss - ${cfg.extraConfig} ''; diff --git a/nixos/modules/services/networking/ssh/sshd.nix b/nixos/modules/services/networking/ssh/sshd.nix index be2dde12197..1c428ceddfd 100644 --- a/nixos/modules/services/networking/ssh/sshd.nix +++ b/nixos/modules/services/networking/ssh/sshd.nix @@ -413,9 +413,6 @@ in ${flip concatMapStrings cfg.hostKeys (k: '' HostKey ${k.path} '')} - - # Allow DSA keys for now. (These were deprecated in OpenSSH 7.0.) - PubkeyAcceptedKeyTypes +ssh-dss ''; assertions = [{ assertion = if cfg.forwardX11 then cfgc.setXAuthLocation else true; diff --git a/pkgs/tools/networking/openssh/default.nix b/pkgs/tools/networking/openssh/default.nix index 57bbf1da22e..357ee2b9f21 100644 --- a/pkgs/tools/networking/openssh/default.nix +++ b/pkgs/tools/networking/openssh/default.nix @@ -17,11 +17,11 @@ let in with stdenv.lib; stdenv.mkDerivation rec { - name = "openssh-7.0p1"; + name = "openssh-6.9p1"; src = fetchurl { url = "mirror://openbsd/OpenSSH/portable/${name}.tar.gz"; - sha256 = "1rc52jyc5v5b8j9kvasrnz9vnj9b0i7fw4nqac8wix0r794k4ngx"; + sha256 = "1zkci5nbpb4frmzj2vr3kv9j47x2h72kvybcpr0d8mzk73sls1vf"; }; prePatch = optionalString hpnSupport From 2d4b6405b36ca801a5f8d1a6b0a8e932db287969 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 20 Aug 2015 14:07:38 +0200 Subject: [PATCH 12/20] openssh: Apply some Fedora security backports --- pkgs/tools/networking/openssh/default.nix | 2 +- .../openssh/openssh-6.9p1-security-7.0.patch | 65 +++++++++++++++++++ 2 files changed, 66 insertions(+), 1 deletion(-) create mode 100644 pkgs/tools/networking/openssh/openssh-6.9p1-security-7.0.patch diff --git a/pkgs/tools/networking/openssh/default.nix b/pkgs/tools/networking/openssh/default.nix index 357ee2b9f21..2004e453a0d 100644 --- a/pkgs/tools/networking/openssh/default.nix +++ b/pkgs/tools/networking/openssh/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { export NIX_LDFLAGS="$NIX_LDFLAGS -lgcc_s" ''; - patches = [ ./locale_archive.patch ]; + patches = [ ./locale_archive.patch ./openssh-6.9p1-security-7.0.patch]; buildInputs = [ zlib openssl libedit pkgconfig pam ] ++ optional withKerberos [ kerberos ]; diff --git a/pkgs/tools/networking/openssh/openssh-6.9p1-security-7.0.patch b/pkgs/tools/networking/openssh/openssh-6.9p1-security-7.0.patch new file mode 100644 index 00000000000..02e9eb3a973 --- /dev/null +++ b/pkgs/tools/networking/openssh/openssh-6.9p1-security-7.0.patch @@ -0,0 +1,65 @@ +http://pkgs.fedoraproject.org/cgit/openssh.git/commit/openssh-6.9p1-security-7.0.patch?h=f22&id=4776fad91e7e1f626f33e8c240d0ccecd663554d + +diff --git a/sshpty.c b/sshpty.c +index 7bb7641..15da8c6 100644 +--- a/sshpty.c ++++ b/sshpty.c +@@ -1,4 +1,4 @@ +-/* $OpenBSD: sshpty.c,v 1.29 2014/09/03 18:55:07 djm Exp $ */ ++/* $OpenBSD: sshpty.c,v 1.30 2015/07/30 23:09:15 djm Exp $ */ + /* + * Author: Tatu Ylonen + * Copyright (c) 1995 Tatu Ylonen , Espoo, Finland +@@ -197,7 +197,7 @@ pty_setowner(struct passwd *pw, const char *tty) + /* Determine the group to make the owner of the tty. */ + grp = getgrnam("tty"); + gid = (grp != NULL) ? grp->gr_gid : pw->pw_gid; +- mode = (grp != NULL) ? 0622 : 0600; ++ mode = (grp != NULL) ? 0620 : 0600; + + /* + * Change owner and mode of the tty as required. +diff --git a/monitor.c b/monitor.c +index b410965..f1b873d 100644 +--- a/monitor.c ++++ b/monitor.c +@@ -1084,9 +1084,7 @@ extern KbdintDevice sshpam_device; + int + mm_answer_pam_init_ctx(int sock, Buffer *m) + { +- + debug3("%s", __func__); +- authctxt->user = buffer_get_string(m, NULL); + sshpam_ctxt = (sshpam_device.init_ctx)(authctxt); + sshpam_authok = NULL; + buffer_clear(m); +@@ -1166,14 +1166,16 @@ mm_answer_pam_respond(int sock, Buffer *m) + int + mm_answer_pam_free_ctx(int sock, Buffer *m) + { ++ int r = sshpam_authok != NULL && sshpam_authok == sshpam_ctxt; + + debug3("%s", __func__); + (sshpam_device.free_ctx)(sshpam_ctxt); ++ sshpam_ctxt = sshpam_authok = NULL; + buffer_clear(m); + mm_request_send(sock, MONITOR_ANS_PAM_FREE_CTX, m); + auth_method = "keyboard-interactive"; + auth_submethod = "pam"; +- return (sshpam_authok == sshpam_ctxt); ++ return r; + } + #endif + +diff --git a/monitor_wrap.c b/monitor_wrap.c +index e6217b3..eac421b 100644 +--- a/monitor_wrap.c ++++ b/monitor_wrap.c +@@ -614,7 +614,6 @@ mm_sshpam_init_ctx(Authctxt *authctxt) + + debug3("%s", __func__); + buffer_init(&m); +- buffer_put_cstring(&m, authctxt->user); + mm_request_send(pmonitor->m_recvfd, MONITOR_REQ_PAM_INIT_CTX, &m); + debug3("%s: waiting for MONITOR_ANS_PAM_INIT_CTX", __func__); + mm_request_receive_expect(pmonitor->m_recvfd, MONITOR_ANS_PAM_INIT_CTX, &m); From b661ebe3cbef28e81ea70f42cc6ea6af16a30144 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Thu, 20 Aug 2015 08:09:55 -0400 Subject: [PATCH 13/20] rcs: Use c99 on darwin --- pkgs/applications/version-management/rcs/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/version-management/rcs/default.nix b/pkgs/applications/version-management/rcs/default.nix index 266ab81777b..a829af8aa23 100644 --- a/pkgs/applications/version-management/rcs/default.nix +++ b/pkgs/applications/version-management/rcs/default.nix @@ -12,6 +12,8 @@ stdenv.mkDerivation rec { doCheck = true; + NIX_CFLAGS_COMPILE = if stdenv.isDarwin then "-std=gnu99" else null; + meta = { homepage = http://www.gnu.org/software/rcs/; description = "Revision control system"; From 3506c0bf04538c4a25b57dd43600b61907796008 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Thu, 20 Aug 2015 08:37:04 -0400 Subject: [PATCH 14/20] emacs: Build cocoa on darwin --- pkgs/applications/editors/emacs-24/default.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/editors/emacs-24/default.nix b/pkgs/applications/editors/emacs-24/default.nix index 178b2a306af..6c52a899108 100644 --- a/pkgs/applications/editors/emacs-24/default.nix +++ b/pkgs/applications/editors/emacs-24/default.nix @@ -50,7 +50,9 @@ stdenv.mkDerivation rec { ++ stdenv.lib.optional (stdenv.isDarwin && withX) cairo; configureFlags = - if withX + if stdenv.isDarwin + then [ "--with-ns" "--disable-ns-self-contained" ] + else if withX then [ "--with-x-toolkit=${toolkit}" "--with-xft" ] else [ "--with-x=no" "--with-xpm=no" "--with-jpeg=no" "--with-png=no" "--with-gif=no" "--with-tiff=no" ]; @@ -61,6 +63,9 @@ stdenv.mkDerivation rec { postInstall = '' mkdir -p $out/share/emacs/site-lisp/ cp ${./site-start.el} $out/share/emacs/site-lisp/site-start.el + '' + stdenv.lib.optionalString stdenv.isDarwin '' + mkdir -p $out/Applications + mv nextstep/Emacs.app $out/Applications ''; doCheck = true; From 304a5e6168f7c11f975a87fd29be6a1c49e22ba6 Mon Sep 17 00:00:00 2001 From: Jascha Geerds Date: Thu, 20 Aug 2015 16:00:07 +0200 Subject: [PATCH 15/20] gnome-calendar: Add missing dependency on hicolor_icon_theme (#9369) --- pkgs/desktops/gnome-3/3.16/apps/gnome-calendar/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/3.16/apps/gnome-calendar/default.nix b/pkgs/desktops/gnome-3/3.16/apps/gnome-calendar/default.nix index 043cd694bd4..38c4b930b03 100644 --- a/pkgs/desktops/gnome-3/3.16/apps/gnome-calendar/default.nix +++ b/pkgs/desktops/gnome-3/3.16/apps/gnome-calendar/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook , intltool, evolution_data_server, sqlite, libxml2, libsoup -, glib }: +, glib, hicolor_icon_theme }: stdenv.mkDerivation rec { name = "gnome-calendar-${gnome3.version}.2"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig gtk3 wrapGAppsHook intltool evolution_data_server - sqlite libxml2 libsoup glib + sqlite libxml2 libsoup glib hicolor_icon_theme ]; meta = with stdenv.lib; { From 50d90a2538ceb953fe3e88ae7ad29bd048b406c2 Mon Sep 17 00:00:00 2001 From: Jascha Geerds Date: Thu, 20 Aug 2015 16:03:58 +0200 Subject: [PATCH 16/20] gtkdialog: Add missing dependency on hicolor_icon_theme (#9369) --- pkgs/development/tools/misc/gtkdialog/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/gtkdialog/default.nix b/pkgs/development/tools/misc/gtkdialog/default.nix index cd8ad0d64cd..d58ba8cddf2 100644 --- a/pkgs/development/tools/misc/gtkdialog/default.nix +++ b/pkgs/development/tools/misc/gtkdialog/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, gtk, pkgconfig}: +{stdenv, fetchurl, gtk, pkgconfig, hicolor_icon_theme }: stdenv.mkDerivation { name = "gtkdialog-0.8.3"; @@ -8,7 +8,7 @@ stdenv.mkDerivation { sha256 = "ff89d2d7f1e6488e5df5f895716ac1d4198c2467a2a5dc1f51ab408a2faec38e"; }; - buildInputs = [ gtk pkgconfig ]; + buildInputs = [ gtk pkgconfig hicolor_icon_theme ]; meta = { homepage = http://gtkdialog.googlecode.com/; From c9c3a3cb721ca61b7e85183ffae56b8bcb44af30 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Thu, 20 Aug 2015 16:05:18 +0200 Subject: [PATCH 17/20] meshlab: add missing patch (doh!) Should have been included in af7d5f27d01d6 ("meshlab: 1.3.2 -> 1.3.3"). --- .../graphics/meshlab/include-unistd.diff | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 pkgs/applications/graphics/meshlab/include-unistd.diff diff --git a/pkgs/applications/graphics/meshlab/include-unistd.diff b/pkgs/applications/graphics/meshlab/include-unistd.diff new file mode 100644 index 00000000000..74f28a4d211 --- /dev/null +++ b/pkgs/applications/graphics/meshlab/include-unistd.diff @@ -0,0 +1,13 @@ +*** old/vcglib/wrap/ply/plystuff.h 2013-02-09 00:00:04.110705851 -0500 +--- new/vcglib/wrap/ply/plystuff.h 2013-02-09 15:20:53.482205183 -0500 +*************** +*** 75,80 **** +--- 75,81 ---- + #define pb_close _close + #define DIR_SEP "\\" + #else ++ #include + #define pb_mkdir(n) mkdir(n,0755) + #define pb_access access + #define pb_stat stat + From e059070ad3993d96075c452e84dac6bb3707f6a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benno=20F=C3=BCnfst=C3=BCck?= Date: Thu, 20 Aug 2015 17:05:02 +0200 Subject: [PATCH 18/20] ocamlPackages.ocurl: update from 0.7.2 to 0.7.5 --- pkgs/development/ocaml-modules/ocurl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/ocaml-modules/ocurl/default.nix b/pkgs/development/ocaml-modules/ocurl/default.nix index 73670fb3125..2cfb6af68a8 100644 --- a/pkgs/development/ocaml-modules/ocurl/default.nix +++ b/pkgs/development/ocaml-modules/ocurl/default.nix @@ -1,9 +1,9 @@ { stdenv, ocaml, findlib, fetchurl, curl, ncurses }: stdenv.mkDerivation rec { - name = "ocurl-0.7.2"; + name = "ocurl-0.7.5"; src = fetchurl { - url = "https://forge.ocamlcore.org/frs/download.php/1463/${name}.tar.gz"; + url = "https://forge.ocamlcore.org/frs/download.php/1463/${name}.tar.bz2"; sha256 = "0yn7f3g5wva8nqxh76adpq9rihggc405jkqysfghzwnf3yymyqrr"; }; From 1f10b44d3ece5486f79570e4675128307469c7a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benno=20F=C3=BCnfst=C3=BCck?= Date: Thu, 20 Aug 2015 17:07:06 +0200 Subject: [PATCH 19/20] xvkbd: update from 3.5 to 3.6 --- pkgs/tools/X11/xvkbd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/X11/xvkbd/default.nix b/pkgs/tools/X11/xvkbd/default.nix index 37af62e8cdf..7e570cbd396 100644 --- a/pkgs/tools/X11/xvkbd/default.nix +++ b/pkgs/tools/X11/xvkbd/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { name = "xvkbd-${version}"; - version = "3.5"; + version = "3.6"; src = fetchurl { url = "http://homepage3.nifty.com/tsato/xvkbd/xvkbd-${version}.tar.gz"; - sha256 = "1vlg5gl1bflx80prvwg6glw0g4fvbi6k3cy0pya0h7cz6nxbs6c8"; + sha256 = "1bjvv93xmmjjk6ir95shwrk6aaiqiprwk12npyahfsik4cf58y16"; }; buildInputs = [ imake libXt libXaw libXtst xextproto libXi Xaw3d libXpm gccmakedep ]; From 4ec87513b69b54f708f944c296cc008730c558cd Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 20 Aug 2015 17:26:16 +0200 Subject: [PATCH 20/20] packagekit: python3 attr. -> unversioned python --- pkgs/tools/package-management/packagekit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/package-management/packagekit/default.nix b/pkgs/tools/package-management/packagekit/default.nix index 1dcfd309559..15b6fd5fe9c 100644 --- a/pkgs/tools/package-management/packagekit/default.nix +++ b/pkgs/tools/package-management/packagekit/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, intltool, glib, pkgconfig, polkit, python3, sqlite }: +{ stdenv, fetchurl, intltool, glib, pkgconfig, polkit, python, sqlite }: let version = "1.0.7"; in stdenv.mkDerivation { @@ -9,7 +9,7 @@ stdenv.mkDerivation { url = "https://www.freedesktop.org/software/PackageKit/releases/PackageKit-${version}.tar.xz"; }; - buildInputs = [ glib polkit python3 ]; + buildInputs = [ glib polkit python ]; propagatedBuildInputs = [ sqlite ]; nativeBuildInputs = [ intltool pkgconfig ];