Commit Graph
117618 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
Robin Gloster 50fb62994b bluez: remove unneeded dependencies and fix test bins 2017-09-27 21:25:05 +02:00
Vladimír Čunát 95b706f0db Merge branch 'master' into staging
Very many rebuilds from master :-(
2017-09-27 20:59:52 +02:00
Niklas Hambüchen 18eecae4b6 glusterfs service: Change default killMode to "control-group".
This is a better default for NixOS because it ensures that config
changes happen fully when NixOS users expect it.
2017-09-27 20:54:13 +02:00
Niklas Hambüchen 08f7e4516c glusterfs service: Ensure log directory exists for glustereventsd.
Prevents glustereventsd failing at startup in case it starts
before glusterd has started (whose `preStart` would also
create the needed directory).
2017-09-27 20:53:42 +02:00
Niklas Hambüchen e233a518bd glusterfs service: Add killMode and stopKillTimeout options 2017-09-27 20:53:39 +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
Vladimír Čunát f2955e4fde manuals: fixup steam note, as the change is in 17.09
I didn't notice the cherry-pick, but Globin found out immediately.
/cc #29180.
2017-09-27 20:33:24 +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
Vladimír Čunát 4013b381b3 manuals: document removal of newStdcpp from steam
/cc #29180.
2017-09-27 20:12:06 +02:00
Robin Gloster 13c9cbacdd bacula: fix after postgresql output splitting 2017-09-27 20:09:40 +02:00
Niklas Hambüchen bd54b72676 glusterfs service: Add settings to disable rpcbind and the events daemon.
See also https://github.com/NixOS/nixpkgs/pull/22225#pullrequestreview-26459886
2017-09-27 19:51:42 +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
Niklas Hambüchen 5e2815dfb7 glusterfs service: Don't make it a prerequisite of network-online.target.
This introduces dependency cycles.

A network file system to be running is not required for a network
connection to be available.

https://github.com/NixOS/nixpkgs/commit/19759cfeab0b749666dafdf52a0aad79123a2126#commitcomment-22044519
2017-09-27 19:17:23 +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
makefu 9636e75464 udpt: 2016-02-20 -> 2017-09-27 2017-09-27 19:09:03 +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
Rodney Lorrimar 34eefdfb9d nixos/release-notes: MySQL backup service breaking changes 2017-09-27 18:44:49 +02:00
Rodney Lorrimar 56eba66f77 mysqlBackup service: let it work with default settings
* Grants enough privileges to the configured user so that it can run
  mysqldump.

* Adds a nixos test.

* Use systemd timers instead of a cronjob (by @fadenb).

* Creates a new user for backups by default, instead of using mysql
  user.

* Ensures that backup user has write permissions on backup location.

* Write backup to a temporary file before renaming so that a failed
  backup won't overwrite the previous backup, and so that the backup
  location will never contain a partial backup.

Breaking changes:

 * Renamed period to calendar to reflect the change in how to
   configure the backup time.

 * A failed backup will no longer result in cron sending an e-mail --
   users' monitoring systems must be updated.

Resolves #24728
2017-09-27 18:44:49 +02:00
Yegor Timoshenko bbb26760a0 closure-compiler: 20170218 -> 20170910 2017-09-27 16:25:04 +00:00
Brad Jensen 0a4704bd19 lispPackages.cl-protobufs: init at 20170403-git 2017-09-27 09:07:26 -07:00
Joerg Thalheim 75ba415fbc nixos/tinc: remove useless script argument
ExecStart is sufficient and more transparent to the user.
2017-09-27 17:57:39 +02:00
Joerg Thalheim ad8cb0917f nixos/tinc: do not add Device= by default
tinc can figure this out based on DeviceType.
I also got `/dev/net/tun FD in bad state` after a particular upgrade.
2017-09-27 17:57:39 +02:00
lassulus 64d63907d8 electron-cash: init at 2.9.3 2017-09-27 17:44:35 +02: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
lassulus d82578addb bitcoin-abc: init at 0.15.0 2017-09-27 17:32:12 +02:00
Robin Gloster e253ae7d3a rubyGems.pg: fix postgresql path 2017-09-27 17:26:03 +02:00
Eelco Dolstra 79d547b4bb nix-daemon: Bump the default number of build users
While it's annoying to pollute the user database with a lot of nixbld*
users, 10 users is really too low for many modern systems.
2017-09-27 17:13:16 +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
Peter Brottveit Bock 76245e0b9d urweb: support darwin, depend on gcc, fix paths.
1. Add support for the darwing platform.
2. Depend on gcc, since the urweb executable will
   call gcc when it compiles an urweb-project.
3. Fix include path and link path for the dependencies.
2017-09-27 17:06:01 +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
xd1le 89238b8628 guile-lint: use substituteInPlace instead of sed for prePatch 2017-09-27 23:48:42 +10:00
xd1le ea4adc5f5f guile-lint: patchPhase -> prePatch 2017-09-27 23:42:16 +10:00
volth 547dba10c0 libmicrohttpd: fix darwin build 2017-09-27 13:37:22 +00:00
xd1le e7e52d4b83 guile-lint: use https src url 2017-09-27 23:36:12 +10:00
xd1le 3748013d22 guile-lint: add vyp as maintainer 2017-09-27 23:33:01 +10:00
xd1le a4601f9f40 guile-lint: add meta.platforms, with the same value as for guile 2017-09-27 23:32:03 +10:00
xd1le 5352a105f7 guile-lint: use correct license value, "GPL" -> gpl3Plus 2017-09-27 23:30:16 +10:00
xd1le 727fa0d81d guile-lint: use https version of homepage 2017-09-27 23:28:35 +10:00
xd1le f311898f67 guile-lint: remove package name prefix from meta.description 2017-09-27 23:28:07 +10:00