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
Lancelot SIX
f39ead7c74
ibus-engines.hangul: add python dependency
2017-09-27 20:41:02 +02:00
Lancelot SIX
be697dca4c
ibus-anthy: fix pygobject3 dependency
2017-09-27 20:31:14 +02:00
Eelco Dolstra
ba22ad45fe
ibus-wrapper: Fix build
2017-09-27 20:28:13 +02:00
Eelco Dolstra
3378dbbeed
Revert "Revert "ibus: Move ibus-setup to .dev""
...
This reverts commit e0771a2410
.
2017-09-27 20:28:13 +02:00
Robin Gloster
13c9cbacdd
bacula: fix after postgresql output splitting
2017-09-27 20:09:40 +02:00
Robin Gloster
e0771a2410
Revert "ibus: Move ibus-setup to .dev"
...
This reverts commit af44f99dca
.
ibus-with-plugins was broken by this.
cc @edolstra
2017-09-27 19:42:01 +02:00
Joerg Thalheim
b775b2cd4f
metasploit: use makeWrapper instead
2017-09-27 16:34:09 +01:00
Eelco Dolstra
65b04b8bef
network-manager-applet: Don't depend on webkitgtk by default
...
This added significant bloat to non-Gnome systems.
2017-09-27 12:08:33 +02:00
Eelco Dolstra
af44f99dca
ibus: Move ibus-setup to .dev
...
This removes python3.buildEnv from the runtime closure.
2017-09-26 23:14:39 +02:00
Daiderd Jordan
3ad8cc1300
Merge pull request #29757 from berdario/sshuttle-darwin
...
Fix tests for Sshuttle on Darwin.
2017-09-26 23:09:57 +02:00
Jörg Thalheim
21abe34a2b
Merge pull request #29801 from yegortimoshenko/sct/patch-segfault
...
sct: fix segfault when DISPLAY is empty, clean up derivation
2017-09-26 17:52:11 +01:00
Yegor Timoshenko
44beb56540
sct: fix segfault when DISPLAY is empty, clean up derivation
2017-09-26 13:15:55 +00:00
Tim Steinbach
5c137d8c59
Merge pull request #29751 from fadenb/oath-toolkit_2.6.2
...
oath-toolkit: 2.6.1 -> 2.6.2
2017-09-26 09:12:19 -04:00
Stefan Siegl
086c636eb7
kea: fix path to pg_config
...
refs commit b0280f598e
2017-09-26 12:50:18 +02:00
Francesco Gazzetta
1d163835c8
bash-supergenpass: init at 2012-11-02 ( #29797 )
...
* Add fgaz to mantainers
* bash-supergenpass: init at 2012-11-02
2017-09-26 11:01:11 +01:00
Dario Bertini
08d05f1ef5
Fetch sshuttle-darwin patch from github
2017-09-26 07:16:14 +01:00
Jaka Hudoklin
76752e4c7e
Merge pull request #29685 from eqyiel/networkmanager_openvpn-1.8.0
...
networkmanager_openvpn: 1.2.8 -> 1.8.0
2017-09-26 01:07:29 +02:00
Nikolay Amiantov
b241bcf388
google-cloud-sdk: 161.0.0 -> 171.0.0
2017-09-25 22:47:03 +03:00
Nikolay Amiantov
8d53efb19c
google-compute-engine: 20170523 -> 20170914
2017-09-25 22:46:44 +03:00
Eelco Dolstra
60aaced9a0
Add some dev outputs
2017-09-25 16:05:10 +02:00
Rickard Nilsson
72b46f3631
Merge pull request #29375 from bkchr/network_manager_1_8_2
...
network-manager: 1.6.2 -> 1.8.2
2017-09-25 09:52:19 +02:00
Dario Bertini
7055b4aa45
Fix tests for Sshuttle on Darwin.
2017-09-24 23:46:07 +01:00
Tristan Helmich
62597385c3
oath-toolkit: 2.6.1 -> 2.6.2
2017-09-24 21:05:00 +02:00
Vladimír Čunát
cb9a846762
Merge older staging
...
Hydra looks OK; not finished yet but already has more successes than
on master.
2017-09-24 20:56:11 +02:00
Jean-François Roche
b50ae94ed3
Update kbfs: 20170429.44efa06 -> 20170922.f76290 ( #29716 )
...
kbfs was not working with the lastest keybase update
(ef3cb5cc47
).
We should enforce update of keybase/keybase-ui and kbfs (like done here:
f74a1e6bcb
)
all together to avoid API problems.
2017-09-24 18:06:31 +01:00
zimbatm
eaa0e19a34
keybase: add darwin support
...
Fixes the cyclic dependency issue as described in #18131 .
2017-09-24 17:50:33 +01:00
Jörg Thalheim
975c7b2204
Merge pull request #29450 from jerith666/djb-1709
...
Add modules for tinydns and dnscache from djbdns
2017-09-24 15:39:29 +01:00
Jörg Thalheim
20ee87e0fd
Merge pull request #29736 from womfoo/bump/pick-1.9.0
...
pick: 1.7.0 -> 1.9.0
2017-09-24 14:21:00 +01:00
Kranium Gikos Mendoza
f43baf94a3
pick: 1.7.0 -> 1.9.0
2017-09-24 21:44:01 +10:00
Florian Jacob
8704e82eba
tinc: 1.0.31 -> 1.0.32
2017-09-24 11:42:00 +02:00
Joachim F
92513b8a41
Merge pull request #29020 from danbst/salt-update
...
salt: 2016.11.5 -> 2017.7.1, patch fix
2017-09-24 03:31:41 +00:00
Joachim Fasting
c951a0ad07
encfs: 1.9.1 -> 1.9.2
...
See https://github.com/vgough/encfs/releases/tag/v1.9.2
2017-09-23 23:56:44 +02:00
Michael Weiss
699231ed78
sshfs: 3.2.0 -> 3.3.0
2017-09-23 23:15:36 +02:00
Michael Raskin
8d001911db
asymptote: do not install sty-files, let texlive care of it
...
TeXLive version is effectively identical anyway, and it caused an
unneccessary file name collision.
Fixes : #29671
2017-09-23 19:28:09 +02:00
Pascal Wittmann
ad8958a747
Merge pull request #29678 from mimadrid/update/axel-2.14.1
...
axel: 2.13.1 -> 2.14.1
2017-09-23 19:03:31 +02:00
Pascal Wittmann
359b3b9c4c
Merge pull request #29677 from mimadrid/update/entr-3.8
...
entr: 3.7 -> 3.8
2017-09-23 19:03:16 +02:00
Robin Gloster
d6879f930a
radsecproxy: fix license
2017-09-23 15:37:28 +02:00
Joachim F
2756fac2ae
Merge pull request #29667 from sargon/radsecproxy
...
radsecproxy: init at 1.6.9
2017-09-23 11:58:06 +00:00
Vladimír Čunát
73282c8cc2
Merge branch 'master' into staging
...
Thousands of rebuilds from master :-/
2017-09-23 09:57:23 +02:00
Ruben Maher
b1c4498b41
awsebcli: init at 3.10.5
2017-09-23 08:23:43 +02:00
Michael Weiss
5f0a7cded7
nox: Add a temporary patch for the "wip" command
...
See #29684 .
2017-09-23 04:25:11 +02:00
Ruben Maher
a557d3a848
networkmanager_openvpn: 1.2.8 -> 1.8.0
2017-09-23 09:50:23 +09:30
Jörg Thalheim
21cadbb8f4
Merge pull request #29672 from andir/upstream-ferm
...
ferm: 2.3.1 -> 2.4.1
2017-09-22 23:38:15 +01:00
mimadrid
9c46ef3d9a
axel: 2.13.1 -> 2.14.1
2017-09-23 00:32:04 +02:00
mimadrid
47974b2670
entr: 3.7 -> 3.8
2017-09-23 00:28:02 +02:00
Joachim F
456e96fbbf
Merge pull request #29620 from joachifm/pkg/snapper-0_5_0
...
snapper: 0.3.3 -> 0.5.0
2017-09-22 20:49:19 +00:00
Joachim Fasting
fd3a9e6468
tor: enable parallel building
2017-09-22 22:37:15 +02:00
Tuomas Tynkkynen
4acb425c39
darwin: Disable yet another bunch of packages never having built successfully
...
cjdns: https://hydra.nixos.org/build/61134279
jonprl: https://hydra.nixos.org/build/61123711
mate.libmatemixer: https://hydra.nixos.org/build/61126968
dirac: https://hydra.nixos.org/build/61132432
idnkit: https://hydra.nixos.org/build/61123544
trousers: https://hydra.nixos.org/build/61109766
packetdrill: https://hydra.nixos.org/build/61116190
osm2pgsql: https://hydra.nixos.org/build/61118017
nawk: https://hydra.nixos.org/build/61139000
2017-09-22 21:16:39 +03:00
Tuomas Tynkkynen
a7440aa7c6
hdf5: Re-enable on darwin
...
Oops, ab71280823
intended to only disable hdf5-fortran but also
disabled the others that are fine.
2017-09-22 19:56:49 +03:00