Commit graph

101834 commits

Author SHA1 Message Date
Joachim Fasting 931da53e50
tor-browser-bundle: support passing additional extensions 2017-09-27 22:58:12 +02:00
Joachim Fasting 2651602c17
tor-browser-bundle: factor out extensions 2017-09-27 22:58:07 +02:00
Nikolay Amiantov 47f099777c mupdf: cleanup dependencies
This slims down build inputs (notably not requiring mesa anymore).
2017-09-27 23:31:13 +03:00
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
Franz Pletz 259df64ef5
postgresql: default to 9.6 like in the nixos module 2017-09-27 22:01:08 +02: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
Robin Gloster 50fb62994b
bluez: remove unneeded dependencies and fix test bins 2017-09-27 21:25:05 +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
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
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 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
Robin Gloster 21998d597b
postgresql: fix pgxs dir in pg_config 2017-09-27 19:19:53 +02:00
Michael Raskin c43550effa Merge pull request #29862 from bradleyjensen/protobuf
lispPackages.cl-protobufs: init at 20170403-git
2017-09-27 19:15:33 +02:00
Tim Steinbach ab3ff4af9f
linux: 4.13.3 -> 4.13.4 2017-09-27 13:08:21 -04:00
Tim Steinbach 2ca84cfa29
linux: 4.9.51 -> 4.9.52 2017-09-27 13:03:27 -04:00
Tim Steinbach 964672dde5
linux: Remove 4.12 (EOL) 2017-09-27 13:03:06 -04:00
Brad Jensen 0a4704bd19 lispPackages.cl-protobufs: init at 20170403-git 2017-09-27 09:07:26 -07:00
Tim Steinbach fc565fb8ef Merge pull request #29843 from NeQuissimus/docker_17_09
docker: add 17.09.0-ce
2017-09-27 11:35:26 -04:00
Joerg Thalheim b775b2cd4f metasploit: use makeWrapper instead 2017-09-27 16:34:09 +01: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
Tristan Helmich 71cc54300e emby: 3.2.30.0 -> 3.2.32.0 2017-09-27 16:37: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
WilliButz 43b7e69d13 splUnstable: fix hash 2017-09-27 15:22:02 +02:00
makefu 3abee357e6 pyramid: fix propagated builds
hupper and plaster need to be propagated to dependent packages
2017-09-27 14:48:45 +02:00
Tim Steinbach 825e417457
docker: add 17.09.0-ce 2017-09-27 08:18:40 -04:00
Tristan Helmich b015f62965 pythonPackages.phonenumbers: 8.8.1 -> 8.8.2 2017-09-27 13:56:58 +02:00
Tim Steinbach 0bc5d15aee Merge pull request #29834 from florianjacob/mariadb-10.1.26
mariadb: 10.1.25 -> 10.1.26
2017-09-27 07:22:58 -04:00
Eelco Dolstra 28299f669a Add even more dev outputs 2017-09-27 12:08:48 +02: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
Florian Jacob e911e39c26 mariadb: 10.1.25 -> 10.1.26 2017-09-27 09:42:32 +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
Robin Gloster 1a681a6ecb
shotcut: 17.02 -> 17.09
fixes the previously broken build
2017-09-27 00:51:20 +02:00
Tuomas Tynkkynen 9824ca6975 caffe: Make 'bin' the first output
So ${caffe}/bin/foo always works in scripts.
2017-09-27 00:39:55 +03:00
Joachim Fasting 206e4a6d69
tor-browser-bundle: basic checks for the wrapper script 2017-09-26 23:17:12 +02:00
Joachim Fasting fc44e91ad5
tor-browser-bundle: use fonts from Nixpkgs 2017-09-26 23:17:11 +02:00
Joachim Fasting f05d50f36c
tor-browser-bundle: approximate upstream bundle & purity control 2017-09-26 23:17:10 +02:00
Joachim Fasting 93b9109b46
tor-browser-bundle: clear pref bootstrappedAddons for purity 2017-09-26 23:17:09 +02:00
Joachim Fasting 0c26be5bd2
tor-browser-bundle: improve organization of distribution dir
Store TBB specific files under TorBrowser-Data
2017-09-26 23:17:08 +02:00
Joachim Fasting 346661d77b
tor-browser-bundle: redo extensions 2017-09-26 23:17:08 +02:00
Joachim Fasting fe3b95e749
tor-browser-bundle: customization via extraPrefs 2017-09-26 23:17:02 +02:00