Commit Graph

40075 Commits

Author SHA1 Message Date
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
Vladimír Čunát
e83b78b3ed
Merge older staging
This is almost fully rebuilt on staging (waiting for ~7.5k Darwin jobs),
but now master got ~17k rebuild, so staging wouldn't catch up this way.
2017-09-27 20:51:14 +02:00
Michael Weiss
2d640b9d6e wlc: Downgrade back to 0.0.9
Unfortunately wlc 0.0.10 seems to be the cause for segfaults on sway,
way-cooler and orbment.

This will also build wlc with all optional packages (i.e. zlib,
valgrind and doxygen).
2017-09-27 20:21:50 +02:00
Brad Jensen
0a4704bd19 lispPackages.cl-protobufs: init at 20170403-git 2017-09-27 09:07:26 -07:00
Robin Gloster
e253ae7d3a
rubyGems.pg: fix postgresql path 2017-09-27 17:26:03 +02:00
Robin Gloster
d0d992a9a0
urllib3: revert multiple outputs
only moved propagated build inputs to dev which broke packages depending
on it e.g. glusterfs

cc @edolstra
2017-09-27 17:11:14 +02:00
Robin Gloster
c0235ef611
libnfs: fix eval 2017-09-27 16:33:28 +02:00
Peter Simons
4398872523 libnfs: fix broken meta.license attribute
A license called "bsd" does not exist. Ping @peterhoeg.
2017-09-27 16:18:13 +02:00
Tristan Helmich
b015f62965 pythonPackages.phonenumbers: 8.8.1 -> 8.8.2 2017-09-27 13:56:58 +02:00
Eelco Dolstra
28299f669a Add even more dev outputs 2017-09-27 12:08:48 +02:00
Peter Hoeg
7f3cb3fe71 Merge pull request #29833 from rvl/bower2nix-v320
bower2nix: 3.1.1 -> 3.2.0
2017-09-27 15:06:27 +08:00
Rodney Lorrimar
3d4ed0181e bower2nix: 3.1.1 -> 3.2.0 2017-09-27 07:30:01 +01:00
Peter Hoeg
eba5dd84ef cwiid: boy scout cleanups 2017-09-27 10:00:10 +08:00
Peter Hoeg
97e586b812 libnfs: init at 2.0.0 2017-09-27 09:59:17 +08:00
Tuomas Tynkkynen
3ee733aafb imlib2: Make 'bin' the first output 2017-09-27 00:15:27 +03:00
Frederik Rietdijk
a33402b890 wlc: fix homepage / eval 2017-09-26 19:32:46 +02:00
Domen Kožar
61fbdb47a6
haskellPackages.foundation: disable tests on darwin 2017-09-26 19:00:27 +02:00
Franz Pletz
4d7d5c8c34
libressl_2_6: 2.6.0 -> 2.6.2 2017-09-26 17:28:46 +02:00
Michael Weiss
05d79c03ec wlc: 0.0.9 -> 0.0.10
Initially the build was failing but it seems like
4b85b23534 already fixed it.
2017-09-26 17:11:36 +02:00
Michael Weiss
4b85b23534 wlc: Refactor the code
The code was a bit messy (unused parameters, etc.) and caused some
warnings/errors which could potentially cause some problems.
2017-09-26 16:56:09 +02:00
Tim Steinbach
b4824605be Merge pull request #29693 from taku0/oraclejdk-9
oraclejdk: add version 9
2017-09-26 10:25:19 -04:00
Tim Steinbach
4ec02cc332
skopeo: 0.1.22 -> 0.1.23 2017-09-26 10:12:36 -04:00
Tim Steinbach
da8fb81dfa Merge pull request #29805 from yegortimoshenko/clojure/correct-license
clojure: correct license (three-clause BSD -> EPLv1.0)
2017-09-26 09:10:39 -04:00
Tim Steinbach
bec98b765d
kotlin: 1.1.4-2 -> 1.1.50 2017-09-26 08:52:44 -04:00
Yegor Timoshenko
2f3af251be clojure: correct license (three-clause BSD -> EPLv1.0)
This is retroactive. See: https://clojure.org/community/license
2017-09-26 12:38:26 +00:00
Jörg Thalheim
9c55fb146d Merge pull request #29794 from stesie/php-postgres
php: fix build wrt. new postgres.dev build output
2017-09-26 12:19:15 +01:00
berdario
472bb9681d rhino: remove dependency on GCJ (#29759) 2017-09-26 10:58:20 +01:00
Jörg Thalheim
40a58dbcbb Merge pull request #29602 from makefu/pkgs/oslo-config/fix
oslo-config: fix build
2017-09-26 09:57:47 +01:00
Stefan Siegl
2f23a83920
php: fix build wrt. new postgres.dev build output
Refs commit b0280f598e
2017-09-26 10:14:27 +02:00
Lancelot SIX
f1a2b8627e pythonPackages.channels: 1.1.6 -> 1.1.8 (#29772) 2017-09-26 07:51:54 +01:00
Alastair Pharo
8ac4682e85 purePackages.gen: Don't build on Hydra (#29763)
Until https://github.com/agraef/pure-lang/issues/8 is resolved, this
package can't be compiled.  This patch turns off Hydra builds of this
package as part of #28643 (zero Hydra failures)
2017-09-26 01:58:36 +00:00
makefu
032c50d45b
gdal: fix path to pg_config 2017-09-25 23:23:38 +02:00
makefu
dcc36a4a04
pyramid: 1.7 -> 1.9.1 2017-09-25 23:23:38 +02:00
makefu
d7c26f24b9
oslo-config,sqlalchemy: add makefu to list of maintainers 2017-09-25 23:23:38 +02:00
makefu
42edc6f35e
sqlalchemy-migrate: re-enable tests 2017-09-25 23:23:38 +02:00
makefu
97644a9f4f
keystoneauth1: enable tests
requires a later version of betamax, bumped to 0.8.0
2017-09-25 23:23:38 +02:00
makefu
7251699081
oslo-config: 4.11.0 -> 4.12.0, fix build
also updated the following dependencies:
keystoneauth1: 3.1.0 -> 3.2.0
  disabled tests which require oslo-config, oslo-test or requests-kerberos
oslo-i18n: 2.7.0 -> 3.18.0
oslotest: 1.12.0 -> 2.18.0
os-client-config: 1.8.1 -> 1.28.0
  needed to disable testing due to circular dependency with oslotest
mox3: 0.11.0 -> 0.23.0
  disable tests for py36 due to upstream bug
debtcollector: 0.9.0 -> 1.17.0
  tests enabled

extra packages:
requestsexceptions: init at 1.3.0
2017-09-25 23:23:38 +02:00
Vladimír Čunát
332dc7c719
mesa: maintenance 17.1.9 -> 17.1.10 2017-09-25 21:50:10 +02:00
Nikolay Amiantov
098c6825e0 blas: 3.5.0 -> 3.7.1 2017-09-25 22:46:44 +03:00
Nikolay Amiantov
74c3cdd893 python.buildEnv: add extraOutputsToInstall attribute 2017-09-25 22:40:09 +03:00
Nikolay Amiantov
864643ba27 tensorflow: support Python 3.5, fix dependencies
TensorBoard on Python 3 only works with 3.5.
2017-09-25 22:37:06 +03:00
Nikolay Amiantov
3d11dc7ca2 python.pkgs.tensorflow-tensorboard: init at 0.1.5 2017-09-25 22:37:06 +03:00
Jean-Philippe Bernardy
01d53df77f pythonPackages.tensorflow 1.1 -> 1.3 2017-09-25 22:37:06 +03:00
Eelco Dolstra
8ccce8de89 Add more dev outputs 2017-09-25 19:52:10 +02:00
Jörg Thalheim
8a1fb4b504 Merge pull request #29702 from robertodr/watson-ruby
watson-ruby: init at 1.6.3
2017-09-25 15:51:17 +01:00
Joerg Thalheim
407d8dac85 watson-ruby: hide bundlerEnv to avoid collisions
bundlerEnv also comes with a bundle script and ruby libraries
2017-09-25 15:49:14 +01:00
Eelco Dolstra
b986c8e510 Merge pull request #29776 from Mic92/libproxy
libproxy: 0.4.13 -> 0.4.15
2017-09-25 16:45:09 +02:00
Joerg Thalheim
30c380556c libproxy: 0.4.13 -> 0.4.15
reduces closure size from ~200mb to ~100mb

fixes #29775
2017-09-25 15:22:38 +01:00
Eelco Dolstra
60aaced9a0
Add some dev outputs 2017-09-25 16:05:10 +02:00
Eelco Dolstra
b790a31204
kdoctools: Move bin stuff to the "out" output
In particular, this moves share/kf5 to the "out" output. This prevents
kdelibs4support from pulling kdoctools.dev into its closure (via
share/kf5/kdoctools/customization/dtd/kdex.dtd, which references
${kdoctools}/share/kf5).

This reduces the closure size of kdelibs4support by 156 MiB.
2017-09-25 16:04:32 +02:00