Commit Graph

22995 Commits

Author SHA1 Message Date
Nikolay Amiantov
98ef62e51a glfw3: cleanup dependencies, propagate mesa_noglu 2017-09-27 23:31:07 +03:00
Nikolay Amiantov
d68e9b4938 glfw2: don't use mesa 2017-09-27 23:31:02 +03:00
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
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
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
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
berdario
472bb9681d rhino: remove dependency on GCJ (#29759) 2017-09-26 10:58:20 +01:00
makefu
032c50d45b
gdal: fix path to pg_config 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
Eelco Dolstra
8ccce8de89 Add more dev outputs 2017-09-25 19:52:10 +02: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
Joerg Thalheim
f8078db863 gmime3: reduce propagated closure
only libraries required pkg-config files
2017-09-25 11:03:16 +01:00
Kai Harries
32e4e2c47b libvirt: Add qemu to runtime closure
The program `qemu-img` is needed during creation of virtual machines
with qcow2 images. Otherwise creation of such VMs (e.g. with
virt-manager) are failing.
2017-09-25 07:46:29 +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
Vladimír Čunát
00b4e2646c
glib: 2.52.3 -> 2.54.0
License was updated upstream.  Also tidy the expression a bit,
and unify the nix coding style.
2017-09-24 11:28:31 +02:00
Vladimír Čunát
b4be1cb8e0
harfbuzz: 1.4.8 -> 1.5.1 2017-09-24 11:28:31 +02:00
Vladimír Čunát
68bfcad289
libsoup: 2.59.90.1 -> 2.60.0
There are basically no changes, but the version number is much nicer ;-)
Explicit deletion of gtk-goc isn't needed anymore (see doc/multiple-output.xml).
2017-09-24 11:28:31 +02:00
Vladimír Čunát
40e163e4f2
pango: maintenance 1.40.11 -> 1.40.12
The patch is included in this release.
2017-09-24 11:28:31 +02:00
Vladimír Čunát
7b5edfd288
at-spi2-*: 2.24.1 -> 2.26.0 2017-09-24 11:28:31 +02:00
Vladimír Čunát
81a074fbd6
atk: 2.22.0 -> 2.26.0 2017-09-24 11:28:30 +02:00
Daiderd Jordan
db2538fb0c
qt5-qtbase: fix darwin build
Fixes #27474
2017-09-23 21:06:09 +02:00
Thomas Tuegel
5eb2c7a753 Merge pull request #28237 from avnik/qt5-mktemp
qt5: use `mktemp -d` to create fake Qt prefix in nix-shell
2017-09-23 07:18:25 -05:00
Vladimír Čunát
73282c8cc2
Merge branch 'master' into staging
Thousands of rebuilds from master :-/
2017-09-23 09:57:23 +02:00
mimadrid
00bdbcd99e
libfilezilla: 0.10.0 -> 0.10.1 2017-09-23 00:42:29 +02:00
Daiderd Jordan
84bd2f4ab0
lmdb: fix library id on darwin 2017-09-22 23:33:29 +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
ab71280823 darwin: Disable some packages that have never built successfully
mate.mate-desktop: https://hydra.nixos.org/build/61110037
gdmap: https://hydra.nixos.org/build/61144743
redsocks: https://hydra.nixos.org/build/61123106
resolv_wrapper: https://hydra.nixos.org/build/61121132
ogmtools: https://hydra.nixos.org/build/61108726
mp3info: https://hydra.nixos.org/build/61139015
lxappearance-gtk3: https://hydra.nixos.org/build/61126327
hdf5-fortran: https://hydra.nixos.org/build/61146631
pqiv: https://hydra.nixos.org/build/61124724
2017-09-22 17:25:38 +03:00
Thomas Tuegel
6237ece367 Merge pull request #29665 from vyp/issue/29589
qt-5/qtbase-setup-hook.sh: attempt to make directories only if needed
2017-09-22 07:51:05 -05:00
xd1le
99eabd6c06 qt-5/qtbase-setup-hook.sh: attempt to make directories only if needed
Resolves #29589.
2017-09-22 22:26:02 +10:00
Jaka Hudoklin
e17e22d455 Merge pull request #29529 from holidaycheck/nodejs-8.5.0
libuv: 1.14.1 and nodejs 8.5.0
2017-09-22 13:21:50 +02:00
Daiderd Jordan
62f8e255a4
vapoursynth: fix darwin build 2017-09-21 22:30:56 +02:00
Daiderd Jordan
7c30c83b7b
vmmlib: fix darwin frameworks 2017-09-21 21:52:10 +02:00
Daiderd Jordan
bafb9c4d50
vsqlite: fix darwin build 2017-09-21 21:10:03 +02:00
Vladimír Čunát
4683c374fa
Merge branch 'master' into staging
A couple thousand rebuilds again.
2017-09-21 21:09:32 +02:00
Daiderd Jordan
1ae204d2fa
zroc-ice: cleanup and fix darwin build 2017-09-21 20:48:56 +02:00
Shea Levy
c3b41a77e6 openldap: Use a global localstatedir 2017-09-21 08:18:45 -06:00
Jörg Thalheim
116c34a748 Merge pull request #29613 from bcdarwin/nifti
nifticlib: init at 2.0.0
2017-09-21 09:11:39 +01:00
Jörg Thalheim
aab8f8df4b nifticlib: use mirror for sourceforge 2017-09-21 09:10:12 +01:00