From 0cf88814bdcd57ac95f5d2eebabae53b2a77b8b5 Mon Sep 17 00:00:00 2001 From: Will Cohen Date: Sat, 19 Mar 2022 14:10:49 -0400 Subject: [PATCH 1/7] proj: 8.2.1 -> 9.0.0 --- pkgs/development/libraries/proj/default.nix | 23 ++++++++++++++------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/pkgs/development/libraries/proj/default.nix b/pkgs/development/libraries/proj/default.nix index 376cb36edd61..a8e42fb6fb17 100644 --- a/pkgs/development/libraries/proj/default.nix +++ b/pkgs/development/libraries/proj/default.nix @@ -7,36 +7,43 @@ , libtiff , curl , gtest +, nlohmann_json }: stdenv.mkDerivation rec { pname = "proj"; - version = "8.2.1"; + version = "9.0.0"; src = fetchFromGitHub { owner = "OSGeo"; repo = "PROJ"; rev = version; - hash = "sha256-tnaIqYKgYHY1Tg33jsKYn9QL8YUobgXKbQsodoCXNys="; + sha256 = "sha256-zMP+WzC65BFz8g8mF5t7toqxmxCJePysd6WJuqpe8yg="; }; - outputs = [ "out" "dev"]; + outputs = [ "out" "dev" ]; nativeBuildInputs = [ cmake pkg-config ]; - buildInputs = [ sqlite libtiff curl ]; + buildInputs = [ sqlite libtiff curl nlohmann_json ]; checkInputs = [ gtest ]; cmakeFlags = [ "-DUSE_EXTERNAL_GTEST=ON" "-DRUN_NETWORK_DEPENDENT_TESTS=OFF" + "-DNLOHMANN_JSON_ORIGIN=external" ]; - preCheck = '' - export HOME=$TMPDIR - export TMP=$TMPDIR - ''; + preCheck = + let + libPathEnvVar = if stdenv.isDarwin then "DYLD_LIBRARY_PATH" else "LD_LIBRARY_PATH"; + in + '' + export HOME=$TMPDIR + export TMP=$TMPDIR + export ${libPathEnvVar}=$PWD/lib + ''; doCheck = true; From 6f23da1e7e13f7174e3eecf8ccdc3fa1359ca456 Mon Sep 17 00:00:00 2001 From: Will Cohen Date: Wed, 27 Apr 2022 14:57:17 -0400 Subject: [PATCH 2/7] libosmscout: 2017.06.30 -> 2022.04.25 --- .../libraries/libosmscout/default.nix | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/pkgs/development/libraries/libosmscout/default.nix b/pkgs/development/libraries/libosmscout/default.nix index b11ec3eb94c1..76a1ba534b71 100644 --- a/pkgs/development/libraries/libosmscout/default.nix +++ b/pkgs/development/libraries/libosmscout/default.nix @@ -1,20 +1,21 @@ -{ lib, mkDerivation, fetchgit, cmake, pkg-config -, marisa, qtlocation }: +{ lib, mkDerivation, fetchFromGitHub, cmake, pkg-config +, marisa, qttools, qtlocation }: mkDerivation rec { pname = "libosmscout"; - version = "2017.06.30"; + version = "2022.04.25"; - src = fetchgit { - url = "git://git.code.sf.net/p/libosmscout/code"; - rev = "0c0fde4d9803539c99911389bc918377a93f350c"; - sha256 = "1pa459h52kw88mvsdvkz83f4p35vvgsfy2qfjwcj61gj4y9d2rq4"; + src = fetchFromGitHub { + owner = "Framstag"; + repo = "libosmscout"; + rev = "4c3b28472864b8e9cdda80a05ec73ef22cb39323"; + sha256 = "sha256-Qe5TkF4BwlsEI7emC0gdc7SmS4QrSGLiO0QdjuJA09g="; }; cmakeFlags = [ "-DOSMSCOUT_BUILD_TESTS=OFF" ]; nativeBuildInputs = [ cmake pkg-config ]; - buildInputs = [ marisa qtlocation ]; + buildInputs = [ marisa qttools qtlocation ]; meta = with lib; { description = "Simple, high-level interfaces for offline location and POI lokup, rendering and routing functionalities based on OpenStreetMap (OSM) data"; From a59442c86ec396866ddc5095e5551e28a3edbc6f Mon Sep 17 00:00:00 2001 From: Will Cohen Date: Wed, 27 Apr 2022 15:13:21 -0400 Subject: [PATCH 3/7] osmscout-server: 1.17.1 -> 2.1.2 --- .../misc/osmscout-server/default.nix | 27 +++---------------- 1 file changed, 3 insertions(+), 24 deletions(-) diff --git a/pkgs/applications/misc/osmscout-server/default.nix b/pkgs/applications/misc/osmscout-server/default.nix index d6041554705e..cefce001eba9 100644 --- a/pkgs/applications/misc/osmscout-server/default.nix +++ b/pkgs/applications/misc/osmscout-server/default.nix @@ -1,4 +1,4 @@ -{ lib, mkDerivation, fetchFromGitHub, fetchpatch, pkg-config +{ lib, mkDerivation, fetchFromGitHub, pkg-config , qmake, qttools, kirigami2, qtquickcontrols2, qtlocation , libosmscout, valhalla, libpostal, osrm-backend, protobuf , libmicrohttpd_0_9_70, sqlite, marisa, kyotocabinet, boost @@ -14,30 +14,16 @@ let in mkDerivation rec { pname = "osmscout-server"; - version = "1.17.1"; + version = "2.1.2"; src = fetchFromGitHub { owner = "rinigus"; repo = "osmscout-server"; rev = version; - sha256 = "0rpsi6nyhcz6bv0jab4vixkxhjmn84xi0q2xz15a097hn46cklx9"; + sha256 = "sha256-I14nQL0H2rMga+RDdAjykqmf7QIZveA6oGWu5PfZ89s="; fetchSubmodules = true; }; - # Two patches required to work with valhalla 3.1 - patches = [ - # require C++14 to match latest Valhalla - (fetchpatch { - url = "https://github.com/rinigus/osmscout-server/commit/78b41b9b4c607fe9bfd6fbd61ae31cb7c8a725cd.patch"; - sha256 = "0gk9mdwa75awl0bj30gm8waj454d8k2yixxwh05m0p550cbv3lg0"; - }) - # add Valhalla 3.1 config - (fetchpatch { - url = "https://github.com/rinigus/osmscout-server/commit/584de8bd47700053960fa139a2d7f8d3d184c876.patch"; - sha256 = "0liz72n83q93bzzyyiqjkxa6hp9zjx7v9rgsmpwf88gc4caqm2dz"; - }) - ]; - nativeBuildInputs = [ qmake pkg-config qttools ]; buildInputs = [ kirigami2 qtquickcontrols2 qtlocation @@ -45,13 +31,6 @@ mkDerivation rec { libpostal sqlite marisa kyotocabinet boost protobuf date ]; - # OSMScout server currently defaults to an earlier version of valhalla, - # but valhalla 3.1 support has been added. (See patches above) - # Replace the default valhalla.json with the valhalla 3.1 version - postPatch = '' - mv data/valhalla.json-3.1 data/valhalla.json - ''; - qmakeFlags = [ "SCOUT_FLAVOR=kirigami" # Choose to build the kirigami UI variant "CONFIG+=disable_mapnik" # Disable the optional mapnik backend From 72f4cf36bd1acfc742703fef169bea5f52b7da8c Mon Sep 17 00:00:00 2001 From: Will Cohen Date: Wed, 27 Apr 2022 15:22:02 -0400 Subject: [PATCH 4/7] octavePackages.octproj: mark as broken --- pkgs/development/octave-modules/octproj/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/octave-modules/octproj/default.nix b/pkgs/development/octave-modules/octproj/default.nix index 74596c015f85..4bb2962ed6e1 100644 --- a/pkgs/development/octave-modules/octproj/default.nix +++ b/pkgs/development/octave-modules/octproj/default.nix @@ -28,5 +28,6 @@ buildOctavePackage rec { license = licenses.gpl3Plus; maintainers = with maintainers; [ KarlJoad ]; description = "GNU Octave bindings to PROJ library for cartographic projections and CRS transformations"; + broken = true; # error: unlink: operation failed: No such file or directory }; } From 2dbb0a7d6c9ca53e0f75ef3c9bc6484c4bc1311f Mon Sep 17 00:00:00 2001 From: Will Cohen Date: Wed, 27 Apr 2022 15:26:45 -0400 Subject: [PATCH 5/7] pythonPackages.pyplatec: mark as broken on linux --- pkgs/development/python-modules/pyplatec/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/pyplatec/default.nix b/pkgs/development/python-modules/pyplatec/default.nix index 0c8c6c4328af..aff4d54abc4d 100644 --- a/pkgs/development/python-modules/pyplatec/default.nix +++ b/pkgs/development/python-modules/pyplatec/default.nix @@ -1,4 +1,5 @@ { lib +, stdenv , buildPythonPackage , fetchPypi }: @@ -16,6 +17,7 @@ buildPythonPackage rec { description = "Library to simulate plate tectonics with Python bindings"; homepage = "https://github.com/Mindwerks/plate-tectonics"; license = licenses.lgpl3; + broken = stdenv.isLinux; }; } From dd9b25ca2b83b94bde0414805e878a5defeaf842 Mon Sep 17 00:00:00 2001 From: Will Cohen Date: Wed, 27 Apr 2022 15:50:23 -0400 Subject: [PATCH 6/7] gdal_2: mark as broken on linux --- pkgs/development/libraries/gdal/2.4.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/gdal/2.4.nix b/pkgs/development/libraries/gdal/2.4.nix index 0e57160f1947..800c7797d1c0 100644 --- a/pkgs/development/libraries/gdal/2.4.nix +++ b/pkgs/development/libraries/gdal/2.4.nix @@ -78,5 +78,6 @@ stdenv.mkDerivation rec { license = lib.licenses.mit; maintainers = [ lib.maintainers.marcweber ]; platforms = with lib.platforms; linux ++ darwin; + broken = stdenv.isLinux; #r2000.cpp:824:13: error: expected primary-expression before '}' token }; } From aed4d163f6668719201f6e4b881dcb3d00172f48 Mon Sep 17 00:00:00 2001 From: Will Cohen Date: Wed, 27 Apr 2022 15:53:40 -0400 Subject: [PATCH 7/7] cloudcompare: mark as broken on linux --- pkgs/applications/graphics/cloudcompare/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/graphics/cloudcompare/default.nix b/pkgs/applications/graphics/cloudcompare/default.nix index 6a6820240f4a..1d5556b6a8b5 100644 --- a/pkgs/applications/graphics/cloudcompare/default.nix +++ b/pkgs/applications/graphics/cloudcompare/default.nix @@ -1,4 +1,5 @@ { lib +, stdenv , mkDerivation , fetchFromGitHub , fetchpatch @@ -114,5 +115,6 @@ mkDerivation rec { license = licenses.gpl2Plus; maintainers = with maintainers; [ nh2 ]; platforms = with platforms; linux; # only tested here; might work on others + broken = stdenv.isLinux; # plugins/core/IO/qPDALIO/CMakeFiles/QPDAL_IO_PLUGIN.dir/src/LASFilter.cpp.o] Error 1 }; }