jolheiser/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
ae259ff83b
nixpkgs/pkgs/servers
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 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
..
amqp rabbitmq_server: 3.6.6 -> 3.6.10 2017-09-14 13:47:42 +08:00
apache-kafka pkgs: refactor needless quoting of homepage meta attribute (#27809) 2017-08-01 22:03:30 +02:00
apcupsd apcupsd: unbreak build 2017-08-15 22:11:14 +02:00
asterisk asterisk-lts: 13.15.0 -> 13.17.1 2017-09-05 13:10:13 +02:00
atlassian atlassian-jira: 7.4.1 -> 7.5.0 2017-09-20 23:51:42 +02:00
beanstalkd
bird bird: 1.6.2 -> 1.6.3 2016-12-23 20:09:12 +01:00
brickd Update homepage attributes: http -> https 2017-08-03 11:56:15 +02:00
caddy caddy: 0.10.7 -> 0.10.9 2017-09-16 16:54:47 +08:00
cayley pkgs: refactor needless quoting of homepage meta attribute (#27809) 2017-08-01 22:03:30 +02:00
clickhouse clickhouse: 1.1.54190 -> 1.1.54236 2017-06-10 12:11:37 +02:00
cloud-print-connector replace "Mac OS X" and "OS X" with "macOS" 2017-08-07 21:41:30 +02:00
computing pkgs: refactor needless quoting of homepage meta attribute (#27809) 2017-08-01 22:03:30 +02:00
consul consul: fix output cycle on darwin 2017-09-09 00:22:45 +02:00
corosync
coturn coturn: 4.5.0.3 -> 4.5.0.6 2017-05-20 13:22:46 +02:00
couchpotato couchpotato: init at 3.0.1 2017-01-16 12:54:43 +01:00
dante
dex dex: init at 2.4.1 2017-06-03 17:43:36 -04:00
dgraph dgraph: init at 0.8.1 2017-08-23 21:21:10 -07:00
dico
dict dict: enable the default upstream server so the client works out of the box 2017-09-07 17:17:49 +08:00
diod
dns knot-*: simplify lmdb dependency 2017-09-23 14:15:56 +02:00
dnschain dnschain: fix build 2017-02-03 19:49:14 +01:00
elasticmq
emby emby: 3.2.30.0 -> 3.2.32.0 2017-09-27 16:37:50 +02:00
etcd etcd: 3.0.6 -> 3.1.6 2017-04-23 09:26:57 +01:00
exhibitor pkgs: refactor needless quoting of homepage meta attribute (#27809) 2017-08-01 22:03:30 +02:00
fcgiwrap
felix felix: 2.0.5 -> 5.6.1, fix build 2017-01-29 00:35:38 +01:00
fingerd/bsd-fingerd
firebird firebird: 2.5.6.27020-0 -> 2.5.7.27050-0 for '2.5.7.27050-0' bypass 2017-02-22 20:52:15 -05:00
fleet Update homepage attributes: http -> https 2017-08-03 11:56:15 +02:00
foswiki
freeradius Merge remote-tracking branch 'upstream/master' into HEAD 2017-09-02 11:10:52 +02:00
ftp pkgs: refactor needless quoting of homepage meta attribute (#27809) 2017-08-01 22:03:30 +02:00
games/ghost-one
gopher/gofish
gotty pkgs: refactor needless quoting of homepage meta attribute (#27809) 2017-08-01 22:03:30 +02:00
gpm gpm: allow cygwin 2017-06-26 09:33:12 -03:00
gpsd
h2 h2: init at 1.4.193 (#21893) 2017-01-15 14:01:07 +01:00
hbase hbase: 0.98.19 -> 0.98.24 2017-01-20 09:51:05 +01:00
http nginxModules.echo: 0.57 -> 0.61 2017-09-21 11:01:35 +00:00
icecast icecast: 2.4.1 -> 2.4.3 2017-06-20 03:56:25 +02:00
identd/oidentd
inginious pkgs: refactor needless quoting of homepage meta attribute (#27809) 2017-08-01 22:03:30 +02:00
interlock Getting rid of the var indirection and using a bin path instead 2017-01-29 04:11:01 -06:00
irc charybdis: use new homepage link 2017-08-17 15:04:40 -07:00
irker pkgs: refactor needless quoting of homepage meta attribute (#27809) 2017-08-01 22:03:30 +02:00
jackett jackett: 0.7.1308 -> 0.8.151 2017-09-05 21:38:42 +02:00
kippo
kwakd kwakd: init at 0.5 2017-03-17 22:07:15 +13:00
ldap/389 389-ds-base: 1.3.5.17 -> 1.3.5.19 2017-08-20 16:22:59 -04:00
limesurvey
mail pfixtools: patch to work with gcc 6 2017-09-04 18:37:01 +01:00
matrix-synapse matrix-synapse: 0.21.0 -> 0.22.1 2017-07-10 09:36:05 +02:00
matterbridge matterbridge: fix src hash 2017-09-18 23:24:48 +02:00
mattermost matterircd: 0.11.4 -> 0.12.0 2017-09-18 21:52:06 +02:00
mediatomb
memcached memcached: 1.4.33 -> 1.4.39 for CVE-2017-9951 2017-08-01 10:26:19 +02:00
mesos-dns
meteor meteor: 1.4.2.3 -> 1.5 (#28905) 2017-09-13 19:35:36 +00:00
minio minio: 20170316 -> 20170613 2017-06-26 04:07:37 +02:00
mirrorbits mirrorbits: init at 0.4 2017-09-18 21:55:41 +02:00
misc client-ip-echo: init at 0.1.0.1 2017-09-16 21:16:53 -04:00
monitoring uchiwa: 0.25.3 -> 0.26.0 2017-09-26 17:53:42 +08:00
mpd Merge pull request #27881 from mimadrid/fix/http-https 2017-08-13 21:53:20 +02:00
mqtt/mosquitto libwebsockets: revert making libuv a propagated build input 2017-09-20 02:49:31 +01:00
nas nas: init at 1.9.4 2017-06-28 14:13:20 +03:00
neard
news/leafnode pkgs: refactor needless quoting of homepage meta attribute (#27809) 2017-08-01 22:03:30 +02:00
nextcloud nextcloud-news-updater: 9.0.2 -> 10.0.0 2017-08-27 11:50:30 +02:00
nosql redis: 3.2.9 -> 4.0.1 2017-09-18 11:26:16 +08:00
nsq
oauth2_proxy
openafs-client openafs-client: 1.6.21 -> 1.6.21.1 2017-09-23 23:56:38 +02:00
openpts pkgs: refactor needless quoting of homepage meta attribute (#27809) 2017-08-01 22:03:30 +02:00
openxpki pkgs: refactor needless quoting of homepage meta attribute (#27809) 2017-08-01 22:03:30 +02:00
osrm-backend
owncloud
p910nd
pies pies: look in /etc for configuration 2017-08-29 23:16:19 +01:00
plex plex: 1.8.4 -> 1.9.1 2017-09-23 19:58:16 -07:00
polipo
prayer
ps3netsrv
pulseaudio pulseaudio: 10.0 -> 11.0 2017-09-08 13:29:45 -07:00
quagga quagga: 1.2.0 -> 1.2.1 2017-06-20 07:04:16 +02:00
radarr radarr: 0.2.0.778 -> 0.2.0.846 2017-09-10 13:07:35 +02:00
radicale radicale: 2.1.2 -> 2.1.6 2017-09-18 00:29:01 -07:00
rippled rippled: mark build broken 2017-08-29 08:19:34 -05:00
rpcbind pkgs: refactor needless quoting of homepage meta attribute (#27809) 2017-08-01 22:03:30 +02:00
rt rt: improve packaging, with a progress note 2017-04-22 16:24:33 -04:00
sabnzbd sabnzbd: 1.2.0 -> 1.2.1 2017-02-25 17:09:34 +01:00
samba samba: 4.6.4 -> 4.6.7 2017-09-01 21:00:31 +02:00
search elk: 5.5.2 -> 5.6.1 2017-09-19 10:52:08 +02:00
serf pkgs: refactor needless quoting of homepage meta attribute (#27809) 2017-08-01 22:03:30 +02:00
shairport-sync shairport-sync: 2.3.6.5 -> 3.0.2 2017-07-30 21:00:55 +02:00
shellinabox shellinabox: 2.19 -> 2.20 2016-12-28 21:03:22 -05:00
shishi Introduce mapNullable into lib and use it in a few places 2017-04-17 17:04:04 -04:00
silc-server
sip freeswitch: fix build 2017-09-16 20:08:08 +10:00
sks sks: fix build with ocaml 4.02+ 2017-02-19 13:05:46 +01:00
skydns
slimserver Fix plugins by not moving Slim folder 2017-03-18 13:01:36 +01:00
smcroute pkgs: refactor needless quoting of homepage meta attribute (#27809) 2017-08-01 22:03:30 +02:00
softether
sonarr sonarr: 2.0.0.4928 -> 2.0.0.4949 2017-09-05 21:52:00 +02:00
sql Revert "postgresql: Add dev output" 2017-09-27 21:58:44 +02:00
squid squid4: 4.0.20 -> 4.0.21 2017-08-27 02:33:33 +02:00
sslh
traefik traefik: link against libc, set build version/codename 2017-09-19 08:14:57 +01:00
trezord trezord: rebuild protobuf files 2017-09-11 23:26:43 +03:00
tt-rss tt-rss: 16.3 -> 17.4 2017-07-17 02:20:16 +02:00
tvheadend pkgs: refactor needless quoting of homepage meta attribute (#27809) 2017-08-01 22:03:30 +02:00
u9fs
udpt
uftp utftp: Fix manpage fallout from previous commits 2017-08-11 21:32:55 +03:00
uhub
ums
unfs3
unifi unifi: 5.5.20 -> 5.6.16 2017-09-20 23:51:48 +02:00
uwsgi pkgs: refactor needless quoting of homepage meta attribute (#27809) 2017-08-01 22:03:30 +02:00
varnish varnish: enable Darwin build 2017-09-22 17:45:10 -07:00
web-apps piwik: 3.1.0 -> 3.1.1 2017-09-21 08:58:02 +02:00
x11 misc pkgs: Recategorize some dependencies 2017-09-05 11:37:10 -04:00
xinetd
xmpp ejabberd: 17.01 -> 17.07 2017-07-27 17:07:45 +03:00
zookeeper Merge pull request #28023 from volth/zookeeper-3.4.10 2017-08-08 07:20:22 -04:00