Commit Graph

3183 Commits

Author SHA1 Message Date
Yann Hodique
ae259ff83b lftp: 4.8.0 -> 4.8.2 2017-09-28 00:29:22 +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
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
Stefan Siegl
086c636eb7
kea: fix path to pg_config
refs commit b0280f598e
2017-09-26 12:50:18 +02: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
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
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
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
Florian Jacob
8704e82eba tinc: 1.0.31 -> 1.0.32 2017-09-24 11:42:00 +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
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
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
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
Andreas Rammhold
e9a56e798a
ferm: 2.3.1 -> 2.4.1 2017-09-22 18:42:38 +02: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
Daniel Ehlers
8bb57bce2a radsecproxy: init at 1.6.9 2017-09-22 15:08:19 +02:00
Jörg Thalheim
81569ecd72 assh: add openssh to PATH 2017-09-21 23:03:55 +01:00
Diego Zamboni
334dfc3086 assh: init at 2.6.0
Powerful wrapper around ssh.
2017-09-21 22:23:16 +02:00
Joachim Fasting
c41af35c04
unbound: 1.6.5 -> 1.6.6 2017-09-20 22:23:05 +02:00
Peter Simons
56207cdbd1 rtorrent: update to current git HEAD to avoid build errors with recent cppunit
Fixes https://github.com/NixOS/nixpkgs/issues/29601.
2017-09-20 16:53:03 +02:00
Peter Simons
6b0e6e2e97 libtorrent: update to current git HEAD to avoid build errors with recent cppunit 2017-09-20 16:53:03 +02:00
Jean-Francois Roche
0b39118494 openfortivpn: 1.2.0 -> 1.5.0
fixes #29578
2017-09-20 09:21:42 +01:00
Peter Hoeg
971eb19dbc ifstat-legacy: init at 1.1 2017-09-18 18:25:54 +08:00
Matt McHenry
a80ef5b88a djbdns: init at 1.05 2017-09-16 21:14:36 -04:00
Jaka Hudoklin
4dc3551397 Merge pull request #29315 from xtruder/pkgs/telepresence/init
pkgs/telepresence: init at 0.65
2017-09-16 15:51:15 +02:00
Ruben Maher
6c9a1b7aa3 network-manager-applet: 1.4.6 -> 1.8.2
Make `network-manager-applet` version match `network-manager` version.

Ref: https://github.com/NixOS/nixpkgs/pull/29375#issuecomment-329923662
2017-09-16 11:32:22 +02:00
lassulus
f4dfa30d24 tinc_pre: 1.1pre14 -> 1.1pre15
Remove an obsolete patch
Add lassulus to maintainers
Supply the build with the correct version number and changelog
2017-09-15 17:54:20 +02:00
Bastian Köcher
adec41e573 network-manager: 1.6.2 -> 1.8.2 2017-09-15 08:49:38 +02:00
Jaka Hudoklin
18245fd222 pkgs/telepresence: init at 0.65 2017-09-14 17:32:32 +02:00
Peter Hoeg
68764d50b3 mtr: 0.87 -> 0.92 2017-09-14 18:14:19 +08:00
John Ericson
8fccaa284d Merge pull request #29282 from obsidiansystems/soext
lib, treewide: Add `*Platform.extensions` and use it where possible
2017-09-13 11:20:06 -04:00
John Ericson
5aec3f96a2 treewide: Use *Platform.extensions 2017-09-13 11:16:10 -04:00
Joachim F
9b31035ea4 Merge pull request #29268 from rnhmjoj/pirate-get
pirate-get: 0.2.10 -> 0.2.12
2017-09-12 22:34:47 +00:00
Vladimír Čunát
422adc3063
Merge branch 'staging'
10k staging builds are not yet finished on Hydra (mostly darwin),
but we now have a 20k jobs rebuilding directly on master, so we would
never get to merge this way...
2017-09-12 19:17:52 +02:00
Jörg Thalheim
7786aab173 openssh: update gssapi patch 2017-09-12 14:28:33 +01:00
rnhmjoj
375ff71380
pirate-get: 0.2.10 -> 0.2.12 2017-09-12 13:59:36 +02:00
Edward Tjörnhammar
90e78aafad
i2pd: 2.14.0 -> 2.15.0 2017-09-12 10:13:49 +02:00
Frederik Rietdijk
628b6c0e9d Merge remote-tracking branch 'upstream/master' into HEAD 2017-09-11 22:52:53 +02:00
Michael Weiss
89ae07b05b iouyap: init at 0.97 2017-09-11 19:21:49 +02:00
Frederik Rietdijk
dab3272f47 Merge remote-tracking branch 'upstream/master' into HEAD 2017-09-10 08:56:39 +02:00
Daiderd Jordan
479c15b08b
eggdrop: fix tcllib reference on darwin 2017-09-09 23:07:07 +02:00
Daiderd Jordan
6226fd05ba
dibbler: fix darwin build 2017-09-09 15:23:17 +02:00
Joachim F
3df16e83f7 Merge pull request #29147 from fuzzy-id/master
haproxy: 1.7.8 -> 1.7.9, download source via https
2017-09-09 13:05:12 +00:00
Thomas Bach
d34386792d haproxy: 1.7.8 -> 1.7.9 2017-09-09 17:53:20 +08:00
Thomas Bach
fd84128595 haproxy: haproxy.org is now accessible via https 2017-09-09 17:52:37 +08:00