jolheiser/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
130,999 Commits 266 Branches 122 Tags 5.3 GiB
2b114a8c29
Commit Graph

52 Commits

Author SHA1 Message Date
Michel Kuhlmann
b2282b0e1d gdal: 2.2.1 -> 2.2.3 2018-01-03 20:17:41 +01:00
Robin Gloster
d3a0663a7d gdal_1_11: needs mysql57 not mariadb 2017-12-29 02:18:35 +01:00
Robin Gloster
ee1c85aee9 mariadb: lib -> connector-c 2017-12-29 02:18:35 +01:00
Robin Gloster
6b05651c20
Revert "postgresql: Add dev output" 
Firstly this creates a cycle in 9.6 .out <-> .dev after fixing the PGXS
path.

Secondly this breaks extension handling and the pg_config as it
resolves a lot of paths relatively resulting in the following bogus
output:

BINDIR = /nix/store/csiq6zkn2c994kkdjln461jvgbka4yb1-postgresql-9.5.9-dev/bin
DOCDIR = /nix/store/csiq6zkn2c994kkdjln461jvgbka4yb1-postgresql-9.5.9-dev/share/doc
HTMLDIR = /nix/store/csiq6zkn2c994kkdjln461jvgbka4yb1-postgresql-9.5.9-dev/share/doc
INCLUDEDIR = /nix/store/csiq6zkn2c994kkdjln461jvgbka4yb1-postgresql-9.5.9-dev/include
PKGINCLUDEDIR = /nix/store/csiq6zkn2c994kkdjln461jvgbka4yb1-postgresql-9.5.9-dev/include
INCLUDEDIR-SERVER = /nix/store/csiq6zkn2c994kkdjln461jvgbka4yb1-postgresql-9.5.9-dev/include/server
LIBDIR = /nix/store/85s9m7hpfzsl93wcb5gr6ii2km9mpx3z-postgresql-9.5.9-lib/lib
PKGLIBDIR = /nix/store/85s9m7hpfzsl93wcb5gr6ii2km9mpx3z-postgresql-9.5.9-lib/lib
LOCALEDIR = /nix/store/csiq6zkn2c994kkdjln461jvgbka4yb1-postgresql-9.5.9-dev/share/locale
MANDIR = /nix/store/csiq6zkn2c994kkdjln461jvgbka4yb1-postgresql-9.5.9-dev/share/man
SHAREDIR = /nix/store/csiq6zkn2c994kkdjln461jvgbka4yb1-postgresql-9.5.9-dev/share
SYSCONFDIR = /etc/postgresql
PGXS = /nix/store/csiq6zkn2c994kkdjln461jvgbka4yb1-postgresql-9.5.9-dev/lib/pgxs/src/makefiles/pgxs.mk
CONFIGURE = '--prefix=/nix/store/irqqq4g173g9xrk1mh12kxv0s1d8dbyh-postgresql-9.5.9' '--with-openssl' '--with-libxml' '--sysconfdir=/etc' '--libdir=/nix/store/85s9m7hpfzsl93wcb5gr6ii2km9mpx3z-postgresql-9.5.9-lib/lib' '--with-ossp-uuid' 'CC=gcc'
CC = gcc
CPPFLAGS = -D_GNU_SOURCE -I/nix/store/z6r0j2b4bcdfw3pck2x6ay0vvx0qzb92-libxml2-2.9.5-dev/include/libxml2
CFLAGS = -Wall -Wmissing-prototypes -Wpointer-arith -Wdeclaration-after-statement -Wendif-labels -Wmissing-format-attribute -Wformat-security -fno-strict-aliasing -fwrapv -fexcess-precision=standard -O2
CFLAGS_SL = -fPIC
LDFLAGS = -L../../../src/common -L/nix/store/ighspl5sa3qi1zy7nkih0c9p73xjfqa6-libxml2-2.9.5/lib -Wl,--as-needed -Wl,-rpath,'/nix/store/85s9m7hpfzsl93wcb5gr6ii2km9mpx3z-postgresql-9.5.9-lib/lib',--enable-new-dtags
LDFLAGS_EX =
LDFLAGS_SL =
LIBS = -lpgcommon -lpgport -lxml2 -lssl -lcrypto -lz -lreadline -lrt -lcrypt -ldl -lm
VERSION = PostgreSQL 9.5.9

This can probably only be properly fixed by rewriting pg_config in large
parts as it does not in any way respect splitting the postgres tree and
assumes it can simply resolve paths relative to its location. This does
not even handle symlinks:

$ result-dev/bin/pg_config
BINDIR = /home/robin/dev/nixpkgs-upstream/result-dev/bin
DOCDIR = /home/robin/dev/nixpkgs-upstream/result-dev/share/doc
HTMLDIR = /home/robin/dev/nixpkgs-upstream/result-dev/share/doc
INCLUDEDIR = /home/robin/dev/nixpkgs-upstream/result-dev/include
PKGINCLUDEDIR = /home/robin/dev/nixpkgs-upstream/result-dev/include
INCLUDEDIR-SERVER = /home/robin/dev/nixpkgs-upstream/result-dev/include/server
LIBDIR = /nix/store/85s9m7hpfzsl93wcb5gr6ii2km9mpx3z-postgresql-9.5.9-lib/lib
PKGLIBDIR = /nix/store/85s9m7hpfzsl93wcb5gr6ii2km9mpx3z-postgresql-9.5.9-lib/lib
LOCALEDIR = /home/robin/dev/nixpkgs-upstream/result-dev/share/locale
MANDIR = /home/robin/dev/nixpkgs-upstream/result-dev/share/man
SHAREDIR = /home/robin/dev/nixpkgs-upstream/result-dev/share
SYSCONFDIR = /etc/postgresql
PGXS = /nix/store/csiq6zkn2c994kkdjln461jvgbka4yb1-postgresql-9.5.9-dev/lib/pgxs/src/makefiles/pgxs.mk
CONFIGURE = '--prefix=/nix/store/irqqq4g173g9xrk1mh12kxv0s1d8dbyh-postgresql-9.5.9' '--with-openssl' '--with-libxml' '--sysconfdir=/etc' '--libdir=/nix/store/85s9m7hpfzsl93wcb5gr6ii2km9mpx3z-postgresql-9.5.9-lib/lib' '--with-ossp-uuid' 'CC=gcc'
CC = gcc
CPPFLAGS = -D_GNU_SOURCE -I/nix/store/z6r0j2b4bcdfw3pck2x6ay0vvx0qzb92-libxml2-2.9.5-dev/include/libxml2
CFLAGS = -Wall -Wmissing-prototypes -Wpointer-arith -Wdeclaration-after-statement -Wendif-labels -Wmissing-format-attribute -Wformat-security -fno-strict-aliasing -fwrapv -fexcess-precision=standard -O2
CFLAGS_SL = -fPIC
LDFLAGS = -L../../../src/common -L/nix/store/ighspl5sa3qi1zy7nkih0c9p73xjfqa6-libxml2-2.9.5/lib -Wl,--as-needed -Wl,-rpath,'/nix/store/85s9m7hpfzsl93wcb5gr6ii2km9mpx3z-postgresql-9.5.9-lib/lib',--enable-new-dtags
LDFLAGS_EX =
LDFLAGS_SL =
LIBS = -lpgcommon -lpgport -lxml2 -lssl -lcrypto -lz -lreadline -lrt -lcrypt -ldl -lm
VERSION = PostgreSQL 9.5.9

cc @edolstra

Revert "bacula: fix after postgresql output splitting"

This reverts commit 13c9cbacdded00558084fda7037ca80849208e99.

Revert "postgresql: fix pgxs dir in pg_config"

This reverts commit 21998d597bd257c1a769e2be4b7a52b5b7e482a6.

Revert "rubyGems.pg: fix postgresql path"

This reverts commit e253ae7d3a4ab992d2432c87514e3333a3cf744d.

Revert "kea: fix path to pg_config"

This reverts commit 086c636eb7f894a55f752b6164dac4a87d8bcee9.

Revert "php: fix build wrt. new postgres.dev build output"

This reverts commit 2f23a83920107678ca1792a11d19e1cb37df3ace.

Revert "gdal: fix path to pg_config"

This reverts commit 032c50d45b3fd1ebb4af592b83e776ed7004b4c0.

Revert "postgresql: Add dev output"

This reverts commit b0280f598e4b3f6ebf33ad2115734e4735df443a.
 2017-09-27 21:58:44 +02:00
makefu
032c50d45b
gdal: fix path to pg_config 2017-09-25 23:23:38 +02:00
Robin Gloster
4d858a2a17
gdal: don't use composableDerivation 2017-08-27 20:14:36 +02:00
Robin Gloster
400abb8877
gdal: 2.1.3 -> 2.2.1 2017-08-11 11:40:35 +02:00
Frederik Rietdijk
56fe381490 gdal: enable parallel building 2017-07-30 10:24:19 +02:00
Josef Kemetmueller
7b25d31825 gdal: Add hdf4 support 2017-06-08 07:52:16 +00:00
Chris Hodapp
f277137522 gdal: add GeoPDF support via poppler 2017-05-04 09:34:19 +02:00
Daiderd Jordan
516f909acb
gdal: fix darwin build 2017-05-02 22:21:03 +02:00
Chris Hodapp
610570e979 gdal: Add SQLite & Spatialite support 2017-04-30 20:21:16 -04:00
Lancelot SIX
4f644cd004
gdal: 2.1.1 -> 2.1.3 2017-03-14 17:59:07 +01:00
Josef Kemetmueller
9141b8cad1 gdal: enable darwin support 
Also some minor tweaks:
There didn't seem any need to use -O0 optimization level anymore.
Also the option "with-libpng" should have been "with-png" all along.
 2016-11-07 20:42:53 +01:00
Dmitry Kalinkin
468a5bc224
dgal: fix 2016-10-17 11:23:14 -04:00
Tuomas Tynkkynen
f97ba3070a gdal: Fix reference to mysql dev output 2016-08-30 23:00:13 +03:00
Robin Gloster
1be4907ca2 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-08-02 13:46:36 +00:00
Michel Kuhlmann
6cf020fc29 gdal: 2.0.2 -> 2.1.1 2016-07-27 16:04:03 +02:00
Robin Gloster
2d382f3d98 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-05-30 19:39:34 +00:00
Tuomas Tynkkynen
7fb29bfa73 treewide: Make explicit that 'dev' output of zlib is used 2016-05-19 10:04:38 +02:00
Tuomas Tynkkynen
ad1a47061e treewide: Make explicit that 'dev' output of libtiff is used 2016-05-19 10:00:46 +02:00
Tuomas Tynkkynen
309b2644ac treewide: Make explicit that 'dev' output of libpng is used 2016-05-19 10:00:44 +02:00
Tuomas Tynkkynen
be00816cab treewide: Make explicit that 'dev' output of libjpeg is used 2016-05-19 10:00:42 +02:00
Franz Pletz
aff1f4ab94 Use general hardening flag toggle lists 
The following parameters are now available:

  * hardeningDisable
    To disable specific hardening flags
  * hardeningEnable
    To enable specific hardening flags

Only the cc-wrapper supports this right now, but these may be reused by
other wrappers, builders or setup hooks.

cc-wrapper supports the following flags:

  * fortify
  * stackprotector
  * pie (disabled by default)
  * pic
  * strictoverflow
  * format
  * relro
  * bindnow
 2016-03-05 18:55:26 +01:00
Robin Gloster
3477e662e6 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-02-27 00:08:08 +00:00
Bruno Bzeznik Bruno.Bzeznik@imag.fr
c4644c8b43 gdal: 2.0.1 -> 2.0.2 + netCDF format support 
may be disabled by netcdfSupport=false
 2016-02-24 10:39:44 +01:00
Robin Gloster
dcc046f5c7 gdal_1_11: turn off format hardening 2016-02-12 01:10:08 +00:00
Robin Gloster
8e2adea08a gdal: turn off format hardening 2016-02-11 01:35:53 +00:00
vbgl
f9e681e09e Merge pull request #10802 from michelk/gdal/update2 
gdal: 2.0.0 -> 2.0.1
 2015-11-04 00:37:15 +01:00
Michel Kuhlmann
7c9be48423 gdal: 2.0.0 -> 2.0.1 2015-11-03 09:04:07 +01:00
Michel Kuhlmann
8e9a8a8fd0 gdal: 1.11.2 -> 1.11.3 2015-11-03 09:00:08 +01:00
Vincent Laporte
4501d4f5d9 gdal: fix standalone python programs 2015-08-24 14:32:07 +02:00
Michel Kuhlmann
e30c99d40a gdal: adding version 1.11.2 for merkaartor and openscenegraph 2015-07-10 09:33:08 +02:00
Michel Kuhlmann
1278a8ff9b gdal: update from 1.11.2 to 2.0.0 2015-07-09 14:36:48 +02:00
Luca Bruno
b247577487 Revert "Merge pull request #7450 from risicle/gdaldisablepy" 
This reverts commit e1db3adbac26d2119c01b3c908bd3ae4ee60c2a7, reversing
changes made to ca0d1aa9a3c2bf6e421f3fde4c4a4a234e1b9625.

See https://github.com/NixOS/nixpkgs/pull/7450#issuecomment-94259269
 2015-04-19 12:19:52 +02:00
lethalman
e1db3adbac Merge pull request #7450 from risicle/gdaldisablepy 
gdal: just disable python support instead of marking gdal broken wholesa...
 2015-04-19 11:54:50 +02:00
Charles Strahan
1645795c53 gdal: unbreak the python lib 2015-04-18 17:33:49 -04:00
Robert Scott
f2e8e6a598 gdal: just disable python support instead of marking gdal broken wholesale 2015-04-18 20:38:50 +01:00
Peter Simons
08f3c8cbac gdal: mark broken 
The build tries to install files outside of its prefix. A complete build log
with the error is at http://hydra.nixos.org/build/21344907/nixlog/1/raw.

The subject came up in https://github.com/NixOS/nixpkgs/pull/7411.
 2015-04-17 15:37:32 +02:00
William A. Kennington III
b524480695 More mysql migrations 2015-04-01 16:50:47 -07:00
Karn Kallio
2758e7c246 gdal: add libpng (for mysql workbench support) 2015-03-31 13:21:02 +02:00
Vladimír Čunát
2ed90cd27f gdal: fix build by adding openssl 
I'm not sure why it started needing it, but I suspect mysql (mariadb).
 2015-03-17 13:58:09 +01:00
Michel Kuhlmann
3e87b82fe2 gdal: enabling geos 
In order to use ogr2ogr for clipping, this options needs to be
enabled.
 2015-02-24 08:35:34 +01:00
Michel Kuhlmann
0c22975cb2 gdal: update to 1.11.2 2015-02-23 11:29:14 +01:00
Benjamin Staffin
b3d33d398c gdal: fix the build 
Commit 28b6fb61e651a3e2cca57d087781e7ba6ab45e7c added explicit CC and
CXX assignments in pkgs/build-support/gcc-wrapper/setup-hook.sh.
That breaks the gdal python extension build somehow, presumably by
confusing libtool.

This appears to revert gdal to building with g++ and gcc (on linux at
least), but at least it builds this way.

Change-Id: I83fb78daa9314dc60c4f635d3f1e937a90349b8a
 2015-01-13 23:46:26 -08:00
Peter Simons
6b47d8c610 gdal: the build is broken on (at least) Linux 
http://hydra.nixos.org/build/18650326/nixlog/1/raw
 2015-01-13 12:44:11 +01:00
Michel Kuhlmann
e65bd08b32 gdal: update to 1.11.1 and compiling with proj 
proj is needed by ogr2ogr to convert in between coordinate systems
 2014-12-15 12:01:51 +01:00
Michel Kuhlmann
e83550cae5 gdal: update from 1.7.1 to 1.11.0 and add python support 2014-09-26 15:48:18 +02:00
Mateusz Kowalczyk
7a45996233 Turn some license strings into lib.licenses values 2014-07-28 11:31:14 +02:00
Vladimír Čunát
2abbce201a gdal: add libtiff to buildInputs as well (fix build) 
so that its private deps propagate.
 2013-12-25 11:11:59 +01:00