cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2
nixpkgs/pkgs/development/interpreters
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
..
acl2
angelscript
bats
ceptre
chibi pkgs: refactor needless quoting of homepage meta attribute (#27809) 2017-08-01 22:03:30 +02:00
clips pkgs: refactor needless quoting of homepage meta attribute (#27809) 2017-08-01 22:03:30 +02:00
clisp clisp-git: update to the upstream fix of 32-bit builds 2017-03-13 00:00:13 +01:00
clojure clojure: correct license (three-clause BSD -> EPLv1.0) 2017-09-26 12:38:26 +00:00
dart Revert "Merge pull request #28557 from obsidiansystems/binutils-wrapper" 2017-09-07 12:51:21 +02:00
eff pkgs: refactor needless quoting of homepage meta attribute (#27809) 2017-08-01 22:03:30 +02:00
elixir elixir: 1.5.0 -> 1.5.1 2017-08-09 11:51:49 +03:00
erlang erlang: remove explicit gcc dependency 2017-08-03 21:22:30 +02:00
falcon
gnu-apl gnuapl: 1.6 -> 1.7 2017-03-31 07:33:53 +02:00
groovy groovy: 2.4.10 -> 2.4.12 2017-08-01 20:56:09 +02:00
gtk-server pkgs: refactor needless quoting of homepage meta attribute (#27809) 2017-08-01 22:03:30 +02:00
guile Merge remote-tracking branch 'origin/master' into gcc-6 2017-07-21 11:05:58 +02:00
hugs hugs: fix build by un-defining the erroneous default for $STRIP 2017-08-23 19:53:11 +02:00
hy hy: 0.11.1 -> 0.12.1 2017-04-07 23:15:16 -04:00
icon-lang
io
j
jimtcl
jruby jruby: make package compatible with bundix; add devEnv 2017-07-19 16:17:44 +10:00
jython
kona
lfe LFE 1.2 does not support OTP 20 2017-07-12 10:01:40 -04:00
lolcode
love pkgs: refactor needless quoting of homepage meta attribute (#27809) 2017-08-01 22:03:30 +02:00
lua-4 pkgs: refactor needless quoting of homepage meta attribute (#27809) 2017-08-01 22:03:30 +02:00
lua-5 pkgs: refactor needless quoting of homepage meta attribute (#27809) 2017-08-01 22:03:30 +02:00
luajit luajit: 2.0 actually doesn't support aarch64 at all 2017-07-10 14:22:35 +02:00
lush
maude pkgs: refactor needless quoting of homepage meta attribute (#27809) 2017-08-01 22:03:30 +02:00
mujs
nix-exec treewide: purge explicit usage of gcc6 2017-09-03 09:57:20 +02:00
octave octaveHg: add package 2017-04-09 21:54:14 +10:00
perl treewide: Do not limit hardenging because gcc 4.9 in bootstrap 2017-09-14 10:27:13 -04:00
php Revert "postgresql: Add dev output" 2017-09-27 21:58:44 +02:00
picoc
picolisp treewide: homepage URL fixes (#28475) 2017-08-22 20:50:04 +02:00
pixie pkgs: refactor needless quoting of homepage meta attribute (#27809) 2017-08-01 22:03:30 +02:00
pure pure: 0.64 -> 0.66 2017-03-12 12:22:52 +11:00
pyrex
python python.buildEnv: add extraOutputsToInstall attribute 2017-09-25 22:40:09 +03:00
qnial
racket racket: 6.10 -> 6.10.1 2017-09-13 23:16:18 +02:00
rakudo
rascal
rebol Revert "Merge pull request #28557 from obsidiansystems/binutils-wrapper" 2017-09-07 12:51:21 +02:00
red red: init at 0.6.3 2017-08-16 17:39:38 +05:00
regina
renpy pkgs: refactor needless quoting of homepage meta attribute (#27809) 2017-08-01 22:03:30 +02:00
ruby ruby: 2.4.1 -> 2.4.2 (#29417) 2017-09-15 13:06:51 +01:00
scheme48
scsh
self
spidermonkey Merge branch 'master' into gcc-6 2017-08-12 10:09:41 +02:00
supercollider pkgs: refactor needless quoting of homepage meta attribute (#27809) 2017-08-01 22:03:30 +02:00
tcl
unicon-lang
wasm