JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
cc96fb6810
nixpkgs/pkgs/tools/backup
History
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 13c9cbacdd.

Revert "postgresql: fix pgxs dir in pg_config"

This reverts commit 21998d597b.

Revert "rubyGems.pg: fix postgresql path"

This reverts commit e253ae7d3a.

Revert "kea: fix path to pg_config"

This reverts commit 086c636eb7.

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

This reverts commit 2f23a83920.

Revert "gdal: fix path to pg_config"

This reverts commit 032c50d45b.

Revert "postgresql: Add dev output"

This reverts commit b0280f598e.
2017-09-27 21:58:44 +02:00
..
amazon-glacier-cmd-interface amazon-glacier-cmd-interface: fix missing argparse dep 2017-06-18 10:27:13 +01:00
attic pythonPackages.llfuse-0-41: move into attic 2017-05-07 08:50:14 +02:00
backup backup: use gemdir 2017-01-18 00:52:48 +01:00
bacula Revert "postgresql: Add dev output" 2017-09-27 21:58:44 +02:00
bareos bareos: use python2 2016-11-24 22:28:02 +01:00
borg borgbackup: fix build with python36 2017-09-10 16:27:12 +02:00
btar Turn some license strings into lib.licenses values 2014-07-28 11:31:14 +02:00
btrbk btrbk: 0.22.2 -> 0.24.0 2016-12-10 14:08:28 +01:00
bup pkgs: refactor needless quoting of homepage meta attribute (#27809) 2017-08-01 22:03:30 +02:00
burp burp_1_3: remove 2017-06-26 03:48:41 +02:00
chunksync pkgs: refactor needless quoting of homepage meta attribute (#27809) 2017-08-01 22:03:30 +02:00
duplicity duplicity: 0.7.07.1 -> 0.7.12 2017-03-24 18:08:05 +08:00
duply treewide: use less phases if not necessary 2017-08-11 11:40:36 +02:00
flockit flockit: init at 2012-08-11 2017-08-06 00:38:29 +02:00
httrack httraqt: init at 1.4.9 2017-08-30 15:02:39 +08:00
mt-st mt-st: init at 1.3 2016-05-28 19:33:14 +02:00
mtx mtx: init at 1.3.12 2016-05-28 10:43:03 -04:00
obnam obnam: 1.21 -> 1.22 2017-09-17 11:52:48 -04:00
ori ori: enable orilocal 2014-05-15 23:00:18 +02:00
partclone treewide: fix darwin builds by using getOutput 2016-08-25 08:44:20 +00:00
partimage Captialize meta.description of all packages 2016-06-20 13:55:52 +02:00
rdiff-backup rdiff-backup: use python2 and buildPythonApplication 2016-11-24 22:28:03 +01:00
rdup maintainers: rename lukasepple according to github account name 2016-10-09 22:04:22 +02:00
restic restic: enable darwin builds 2017-08-03 16:37:04 +02:00
rsnapshot rsnapshot: 1.4.1 -> 1.4.2 2016-05-16 16:12:22 +02:00
s3ql pkgs: refactor needless quoting of homepage meta attribute (#27809) 2017-08-01 22:03:30 +02:00
store-backup treewide: Use makeBinPath 2016-08-23 01:18:10 +03:00
tarsnap tarsnap: 1.0.38 -> 1.0.39 2017-07-30 20:58:07 +02:00
tarsnapper tarsnapper: 0.2.1 -> 0.4 2017-07-16 11:12:38 +01:00
ugarit ugarit: bump aes input from 1.3 to 1.5 2016-09-06 19:30:01 +02:00
ugarit-manifest-maker ugarit-manifest-maker: init at 0.1 2016-02-20 01:30:54 +08:00
wal-e buildPythonApplication: use new function for Python applications 2016-02-19 13:16:41 +01:00
zbackup pkgs: refactor needless quoting of homepage meta attribute (#27809) 2017-08-01 22:03:30 +02:00
znapzend znapzend: 0.15.7 -> 0.17.0 2017-07-24 05:01:08 +02:00