jolheiser/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
117,309 Commits 266 Branches 122 Tags 5.3 GiB
0071b61a74
Commit Graph

223 Commits

Author SHA1 Message Date
Franz Pletz
09b6f1e605
php71: 7.1.8 -> 7.1.9 2017-09-28 14:52:37 +02:00
Franz Pletz
d27ebcbae3
php70: 7.0.22 -> 7.0.24 2017-09-28 14:52:37 +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 13c9cbacdded00558084fda7037ca80849208e99.

Revert "postgresql: fix pgxs dir in pg_config"

This reverts commit 21998d597bd257c1a769e2be4b7a52b5b7e482a6.

Revert "rubyGems.pg: fix postgresql path"

This reverts commit e253ae7d3a4ab992d2432c87514e3333a3cf744d.

Revert "kea: fix path to pg_config"

This reverts commit 086c636eb7f894a55f752b6164dac4a87d8bcee9.

Revert "php: fix build wrt. new postgres.dev build output"

This reverts commit 2f23a83920107678ca1792a11d19e1cb37df3ace.

Revert "gdal: fix path to pg_config"

This reverts commit 032c50d45b3fd1ebb4af592b83e776ed7004b4c0.

Revert "postgresql: Add dev output"

This reverts commit b0280f598e4b3f6ebf33ad2115734e4735df443a.
 2017-09-27 21:58:44 +02:00
Stefan Siegl
2f23a83920
php: fix build wrt. new postgres.dev build output 
Refs commit b0280f598e4b3f6ebf33ad2115734e4735df443a
 2017-09-26 10:14:27 +02:00
Robin Gloster
bd1a78aa34
php: 7.1.7 -> 7.1.8 2017-08-12 18:27:08 +02:00
Robin Gloster
4ce80c5ed5
php70: 7.0.21 -> 7.0.22 2017-08-12 18:27:08 +02:00
Franz Pletz
456c76169d
php71: 7.1.5 -> 7.1.7 
Fixes:
  * CVE-2017-9224
  * CVE-2017-9226
  * CVE-2017-9227
  * CVE-2017-9228
  * CVE-2017-9229

See:
  * https://secure.php.net/ChangeLog-7.php#7.1.6
  * https://secure.php.net/ChangeLog-7.php#7.1.7
 2017-07-10 00:22:15 +02:00
Franz Pletz
f15f580cca
php70: 7.0.19 -> 7.0.21 for multiple CVEs 
Fixes:
  * CVE-2017-9224
  * CVE-2017-9226
  * CVE-2017-9227
  * CVE-2017-9228
  * CVE-2017-9229

See:
  * https://secure.php.net/ChangeLog-7.php#7.0.20
  * https://secure.php.net/ChangeLog-7.php#7.0.21
 2017-07-10 00:22:14 +02:00
Franz Pletz
586f780828
php56: 5.6.30 -> 5.6.31 for multiple CVEs 
Fixes:
  * CVE-2017-9224
  * CVE-2017-9226
  * CVE-2017-9227
  * CVE-2017-9228
  * CVE-2017-9229

See https://secure.php.net/ChangeLog-5.php#5.6.31.
 2017-07-10 00:22:14 +02:00
Pascal Bach
624887a354 php: set extension dir to correct location 
The extension dir was no longer correctly set to $out/lib/php/extensions
as PHP expects the EXTENSION_DIR as environment variable not config flag.
 2017-06-01 23:17:13 +02:00
Franz Pletz
9bb358316f
php71: 7.1.2 -> 7.1.5 2017-05-25 02:44:16 +02:00
Robin Gloster
d0ffb23442
php70: 7.0.16 -> 7.0.19 
fixes build with openssl 1.1
 2017-05-20 13:22:46 +02:00
Alastair Pharo
b330329768 php: fix php-config header file paths 
Split outputs mean that the "include" folder from PHP gets placed into a
"dev" derivation. However php-config is not aware of this, which means
that compiling extensions with phpize fails with an error about being
unable to find header files (see #24357, #24420).  This fixes that by:

1. passing the `--includedir` flag to `configure` so that `php-config`
   gives the correct paths.

2. moving the `phpize` and `php-config` scripts and man pages to the
   dev derivation, to prevent cylic references.

3. ensuring that the `configure` script arguments are stripped from
   all binaries, including `php-embed`, to prevent cyclic references.
 2017-04-24 16:45:20 +10:00
Eelco Dolstra
b751036a74
php: Add a dev output 
This reduces the closure size from 438 to 174 MiB.
 2017-03-20 17:31:37 +01:00
Eelco Dolstra
3ff08d6f13
php: Strip modules 
This reduces the closure size from 566 to 438 MiB.
 2017-03-20 17:31:31 +01:00
Franz Pletz
78abfe951b
php71: 7.1.1 -> 7.1.2 2017-02-18 14:50:16 +01:00
Franz Pletz
405e117d31
php70: 7.0.15 -> 7.0.16 2017-02-18 14:49:59 +01:00
Robin Gloster
cb30150bd5
php: fix build in case mysql is not mariadb 
fixes #20986
 2017-01-25 18:11:38 +01:00
Michael Raskin
e5acde0cf4 php71: 7.1.0 -> 7.1.1 
@NixOS/security-notifications (for all three updates)

Relevant to #21967
 2017-01-20 11:54:44 +01:00
Michael Raskin
ff5ef7d052 php70: 7.0.14 -> 7.0.15 2017-01-20 11:54:34 +01:00
Michael Raskin
35fdfd88d4 php56: 5.6.29 -> 5.6.30 2017-01-20 11:54:03 +01:00
schneefux
a7f25fe167 php: add embedded package 2017-01-19 22:47:10 +01:00
Franz Pletz
60dfc245c7
php70: 7.0.13 -> 7.0.14 2016-12-13 21:56:47 +01:00
Franz Pletz
2ec19900ab
php56: 5.6.28 -> 5.6.29 2016-12-13 21:56:10 +01:00
Franz Pletz
762d902b1d
php71: init at 7.1.0 2016-12-13 21:55:05 +01:00
Franz Pletz
7c65e225dd
php70: 7.0.12 -> 7.0.13 2016-11-17 21:17:56 +01:00
Franz Pletz
e53b902559
php56: 5.6.27 -> 5.6.28 2016-11-17 21:17:56 +01:00
Periklis Tsirakidis
61ce404598 php: fix pr review comments 2016-10-19 09:35:06 +02:00
Periklis Tsirakidis
b336be90cc php: fix darwin build 2016-10-19 09:32:06 +02:00
Franz Pletz
5456d8f007
php70: 7.0.11 -> 7.0.12 
Fixes some security vulnerabilities:

    https://secure.php.net/ChangeLog-7.php#7.0.12
 2016-10-18 14:18:04 +02:00
Franz Pletz
0f42ee7c88
php56: 5.6.26 -> 5.6.27 
Fixes some security vulnerabilities:

    https://secure.php.net/ChangeLog-5.php#5.6.27
 2016-10-18 14:17:01 +02:00
Jörg Thalheim
8a690b2a9f Merge pull request #17922 from bjornfor/php-config-file-scan-dir 
php: change config-file-scan-dir from /etc to /etc/php.d
 2016-10-09 21:45:48 +02:00
Peter Hoeg
5a6626f47c php fpm: add systemd support 
PHP FPM will now notify systemd when it's done initializing and ready to
serve requests.

Additionally ```systemctl status phpfpm``` will now show statistics such
as:

```
Status: "Processes active: 0, idle: 8, Requests: 0, slow: 0, Traffic: 0req/sec"
```
 2016-10-05 23:30:31 +08:00
Graham Christensen
f01e56e576
php5: 5.6.25 -> 5.6.26 for CVEs (http://www.php.net/ChangeLog-5.php\#5.6.26) 2016-09-22 21:36:30 -04:00
Franz Pletz
a32281639e
php70: 7.0.10 -> 7.0.11 (security) 
See https://secure.php.net/ChangeLog-7.php#7.0.11.
 2016-09-15 13:57:32 +02:00
Bjørn Forsman
41c8aa8d63 php: change config-file-scan-dir from /etc to /etc/php.d 
By chance I noticed that php picked up my /etc/odbc.ini file (clearly
wrong!). This fixes it by adding a namespace for php.

WARNING: This is a breaking change for anyone that happen to rely on php
picking up .ini files from /etc.
 2016-09-08 09:40:07 +02:00
Tuomas Tynkkynen
55fa3b52a3 php: Fix mysql reference 
TODO: Fix the mysql expression so this isn't needed.
 2016-08-29 14:49:53 +03:00
obadz
3de6e5be50 Merge branch 'master' into staging 
Conflicts:
      pkgs/applications/misc/navit/default.nix
      pkgs/applications/networking/mailreaders/alpine/default.nix
      pkgs/applications/networking/mailreaders/realpine/default.nix
      pkgs/development/compilers/ghc/head.nix
      pkgs/development/libraries/openssl/default.nix
      pkgs/games/liquidwar/default.nix
      pkgs/games/spring/springlobby.nix
      pkgs/os-specific/linux/kernel/perf.nix
      pkgs/servers/sip/freeswitch/default.nix
      pkgs/tools/archivers/cromfs/default.nix
      pkgs/tools/graphics/plotutils/default.nix
 2016-08-27 23:54:54 +01:00
Robin Gloster
9ed7196eac
php70: 7.0.9 -> 7.0.10 2016-08-25 00:02:48 +00:00
Robin Gloster
765e1e30ba
php56: 5.6.24 -> 5.6.25 2016-08-25 00:00:48 +00:00
Robin Gloster
07b8f53612
php55: remove unmaintained version 
Does not receive security updates from upstream
 2016-08-25 00:00:48 +00:00
Robin Gloster
b7787d932e Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-08-12 09:46:53 +00:00
Vladimír Čunát
950feb70b2 treewide: fixup various mysql ocurrences after re-split 2016-08-07 20:46:37 +02:00
Robin Gloster
63c7b4f9a7 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-07-31 20:51:34 +00:00
Franz Pletz
63784b8021 php: 5.5.37 -> 5.5.38, 5.6.23 -> 5.6.24 (security) 
https://secure.php.net/ChangeLog-5.php#5.5.38
https://secure.php.net/ChangeLog-5.php#5.6.24
 2016-07-28 06:22:23 +02:00
Robin Gloster
f222d98746 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-07-25 12:47:13 +00:00
Franz Pletz
77a9ab33a6 php: 7.0.8 -> 7.0.9 (security) 
https://secure.php.net/ChangeLog-7.php#7.0.9
 2016-07-21 14:12:29 +02:00
Robin Gloster
5185bc1773 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-07-15 14:41:01 +00:00
Franz Pletz
5c59a30191 php: fix hashes for 5.5 and 5.6 2016-06-27 00:47:39 +02:00
Franz Pletz
56bbc4cc61 php56: 5.6.22 -> 5.6.23 (security) 
See https://secure.php.net/ChangeLog-5.php#5.6.23.
 2016-06-27 00:14:00 +02:00