Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Updated proj to 6.1.0 #63134

Closed
wants to merge 6 commits into from
Closed

Conversation

o1lo01ol1o
Copy link

Motivation for this change
Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nix-review --run "nix-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Assured whether relevant documentation is up to date
  • Fits CONTRIBUTING.md.

pkgs/top-level/all-packages.nix Outdated Show resolved Hide resolved
@ofborg ofborg bot requested a review from vbgl June 15, 2019 03:01
@vbgl
Copy link
Contributor

vbgl commented Jun 15, 2019

@GrahamcOfBorg build libspatialite

@vbgl
Copy link
Contributor

vbgl commented Jun 15, 2019

This breaks libspatialite; here is a possible patch:

diff --git a/pkgs/development/libraries/libspatialite/default.nix b/pkgs/development/libraries/libspatialite/default.nix
index 8e7b539527e..df8134ef9e0 100644
--- a/pkgs/development/libraries/libspatialite/default.nix
+++ b/pkgs/development/libraries/libspatialite/default.nix
@@ -17,6 +17,8 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
+  CFLAGS = "-DACCEPT_USE_OF_DEPRECATED_PROJ_API_H=1";
+
   postInstall = "" + optionalString stdenv.isDarwin ''
     ln -s $out/lib/mod_spatialite.{so,dylib}
   '';

@vbgl vbgl mentioned this pull request Jun 15, 2019
10 tasks
@o1lo01ol1o
Copy link
Author

o1lo01ol1o commented Jun 15, 2019 via email

@o1lo01ol1o
Copy link
Author

@GrahamcOfBorg build libspatialite

@o1lo01ol1o
Copy link
Author

@vbgl I'm not sure I'm authorized to tell

@GrahamcOfBorg build libspatialite

but this builds for me locally

@Mic92
Copy link
Member

Mic92 commented Jun 15, 2019

@GrahamcOfBorg build libspatialite

@o1lo01ol1o
Copy link
Author

@vbgl ping

@vbgl
Copy link
Contributor

vbgl commented Jun 15, 2019

@GrahamcOfBorg build python37Packages.cartopy

@vbgl
Copy link
Contributor

vbgl commented Jun 16, 2019

You also need to update libgeotiff. Here is a possible patch.

diff --git a/pkgs/development/libraries/libgeotiff/default.nix b/pkgs/development/libraries/libgeotiff/default.nix
index 33b9e7830e7..abdaa69ba59 100644
--- a/pkgs/development/libraries/libgeotiff/default.nix
+++ b/pkgs/development/libraries/libgeotiff/default.nix
@@ -1,21 +1,20 @@
-{ stdenv, fetchurl, libtiff, libjpeg, proj, zlib}:
+{ stdenv, fetchurl, libtiff, libjpeg, proj, zlib }:
 
 stdenv.mkDerivation rec {
-  version = "1.4.3";
+  version = "1.5.1";
   name = "libgeotiff-${version}";
 
   src = fetchurl {
-    url = "https://download.osgeo.org/geotiff/libgeotiff/${name}.tar.gz";
-    sha256 = "0rbjqixi4c8yz19larlzq6jda0px2gpmpp9c52cyhplbjsdhsldq";
+    url = "https://github.com/OSGeo/libgeotiff/releases/download/${version}/${name}.tar.gz";
+    sha256 = "0b31mlzcv5b1y7jdvb7p0pa3xradrg3x5g32ym911lbhq4rrgsgr";
   };
 
   configureFlags = [
     "--with-jpeg=${libjpeg.dev}"
     "--with-zlib=${zlib.dev}"
   ];
-  buildInputs = [ libtiff proj ];
 
-  hardeningDisable = [ "format" ];
+  buildInputs = [ libtiff proj ];
 
   meta = {
     description = "Library implementing attempt to create a tiff based interchange format for georeferenced raster imagery";

@o1lo01ol1o
Copy link
Author

@vbgl building for me.

@vbgl
Copy link
Contributor

vbgl commented Jun 16, 2019

@GrahamcOfBorg build python37Packages.cartopy

@vbgl
Copy link
Contributor

vbgl commented Jun 17, 2019

This breaks python3Packages.cartopy. Here is the build error:

In file included from lib/cartopy/_trace.h:27:0,
                 from lib/cartopy/trace.cpp:608:
/nix/store/vwkxzx4iwwjk10rmq7i2c7phr9mq8svj-proj-6.1.0/include/proj_api.h:37:2: error: #error 'To use the proj_api.h you must define the macro ACCEPT_USE_OF_DEPRECATED_PROJ_API_H'
 #error 'To use the proj_api.h you must define the macro ACCEPT_USE_OF_DEPRECATED_PROJ_API_H'
  ^~~~~
/nix/store/8l17hs2nyc79432hw3caw2vzx5z00d78-python3.7-Cython-0.29.7/lib/python3.7/site-packages/Cython/Compiler/Main.py:367: FutureWarning: Cython directive 'language_level' not set, using 2 for now (Py2). This will change in a later release! File: /build/Cartopy-0.17.0/lib/cartopy/trace.pyx
  tree = Parsing.p_module(s, pxd, full_module_name)
error: command 'gcc' failed with exit status 1

This breaks saga_2_3_2:

libtool: compile:  g++ -DHAVE_CONFIG_H -I. -I../../../.. -fPIC -I../../../../src/saga_core -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD -D_SAGA_UNICODE -fopenmp -lgomp -c crs_assign.cpp  -fPIC -DPIC -o .libs/crs_assign.o
In file included from PROJ4_Shapes.h:68:0,
                 from MLB_Interface.cpp:104:
PROJ4_Base.h:71:10: fatal error: projects.h: No such file or directory
 #include <projects.h>
          ^~~~~~~~~~~~
compilation terminated.
make[5]: *** [Makefile:562: MLB_Interface.lo] Error 1

@vbgl vbgl mentioned this pull request Jun 17, 2019
10 tasks
This was referenced Jul 10, 2019
@FRidh
Copy link
Member

FRidh commented Jul 13, 2019

Closing in favor of #64551

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants