JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
126,014 Commits 2 Branches 0 Tags 13 GiB
7b062dc57a
Commit Graph

2816 Commits

Author SHA1 Message Date
John Ericson
f037625f87 Merge remote-tracking branch 'upstream/staging' into deps-reorg 2017-09-28 12:32:57 -04:00
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 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
Tim Steinbach
da8fb81dfa Merge pull request #29805 from yegortimoshenko/clojure/correct-license 
clojure: correct license (three-clause BSD -> EPLv1.0)
 2017-09-26 09:10:39 -04:00
Yegor Timoshenko
2f3af251be clojure: correct license (three-clause BSD -> EPLv1.0) 
This is retroactive. See: https://clojure.org/community/license
 2017-09-26 12:38:26 +00:00
Stefan Siegl
2f23a83920
php: fix build wrt. new postgres.dev build output 
Refs commit b0280f598e
 2017-09-26 10:14:27 +02:00
Nikolay Amiantov
74c3cdd893 python.buildEnv: add extraOutputsToInstall attribute 2017-09-25 22:40:09 +03:00
John Ericson
ed14223f8c treewide: Manual fix more pkg-config build-inputs 2017-09-21 15:49:54 -04:00
John Ericson
f8a18cd4cf misc pkgs: Manual fixup pkgconfig nativeBuildInputs after sed 
Importantly, this included regenerating pkgs/servers/x11/xorg, to
clobber the old sed.
 2017-09-21 15:49:54 -04:00
John Ericson
531e4b80c9 misc pkgs: Basic sed to get fix pkgconfig and autoreconfHook buildInputs 
Only acts on one-line dependency lists.
 2017-09-21 15:49:53 -04:00
John Ericson
9f2e05662b treewide: Manually fix miscategorized autoreconfHook buildInputs 
These are the ones with odd indentation my script will mess up on.
 2017-09-21 15:49:53 -04:00
Frederik Rietdijk
96d15eaddb python27: support test/support 
In the maintenance release bump in
90059701a8 a certain change to /test/ was
backported from Python 3:

- bpo-30207: To simplify backports from Python 3, the test.test_support
  module was converted into a package and renamed to test.support.  The
  test.script_helper module was moved into the test.support package.
  Names test.test_support and test.script_helper are left as aliases to
  test.support and test.support.script_helper.
 2017-09-17 11:09:26 +02:00
Frederik Rietdijk
90059701a8 python27: 2.7.13 -> 2.7.14 
The enosys patch is not needed anymore since the patch is included in
this maintenance release.
 2017-09-17 09:57:55 +02:00
Frederik Rietdijk
03fa6965ad Merge remote-tracking branch 'upstream/master' into HEAD 2017-09-16 12:34:32 +02:00
Tuomas Tynkkynen
a0a8f0ac87 python2: Use system libffi on Aarch64 
libffi needs a patch to actually work on aarch64 (or the cffi Python package
fails its testsuite). Of course the bundled version of libffi has the
same bug, so don't use the buggy version on aarch64.

Python3 already uses the system libffi on all platforms. I don't know
why Python2 doesn't.
 2017-09-16 01:16:08 +03:00
Michael Fellinger
2edb7e9b2d ruby: 2.4.1 -> 2.4.2 (#29417) 2017-09-15 13:06:51 +01:00
John Ericson
e5567bae2d treewide: Do not limit hardenging because gcc 4.9 in bootstrap 
Bootstrap tools has since been bumped
 2017-09-14 10:27:13 -04:00
Frederik Rietdijk
77baf6e818 python35: check LD_LIBRARY_PATH 
Backports support for LD_LIBRARY_PATH from 3.6
 2017-09-14 10:17:58 +02:00
Frederik Rietdijk
03898f2f23 python34: check LD_LIBRARY_PATH 
Backports support for LD_LIBRARY_PATH from 3.6
 2017-09-14 10:17:36 +02:00
geistesk
af2ceaf63c racket: 6.10 -> 6.10.1 2017-09-13 23:16:18 +02:00
Frederik Rietdijk
febd5e323d Merge remote-tracking branch 'upstream/master' into HEAD 2017-09-08 20:48:14 +02:00
Jörg Thalheim
9897303cd6 Merge pull request #29102 from peterhoeg/f/gems 
rubygems: 2.6.10 -> 2.6.13
 2017-09-08 16:17:12 +01:00
Frederik Rietdijk
c3a0c3c9f1 Revert "python.pkgs.buildPythonPackage: use distutils-cfg to block downloads, fixes #25428" 
This reverts commit b73e3bfafd.

See https://github.com/NixOS/nixpkgs/issues/29103
 2017-09-08 08:55:05 +02:00
Peter Hoeg
9f51b3c105 rubygems: 2.6.10 -> 2.6.13 
Fixes a number of CVEs:

- a DNS request hijacking vulnerability. (CVE-2017-0902)
- an ANSI escape sequence vulnerability. (CVE-2017-0899)
- a DoS vulnerability in the query command. (CVE-2017-0900)
- a vulnerability in the gem installer that allowed a malicious gem to overwrite arbitrary files. (CVE-2017-0901)
 2017-09-08 12:07:55 +08:00
Peter Hoeg
01a6878bb1 ruby: boy scout cleanups 2017-09-08 12:07:39 +08:00
Frederik Rietdijk
b73e3bfafd python.pkgs.buildPythonPackage: use distutils-cfg to block downloads, fixes #25428 
While we tell pip not to fetch (with the `--no-index` option),
`setuptools` can do so itself. In the past we used a `distutils.cfg`
with `allow-hosts = None` to prevent setuptools from fetching itself.
This was removed when we started building wheels in
2562f94de4e4fd2ddc677187fa2e2848L69.

The `dist-utils.cfg` code was still there, and adding it to
`buildInputs` is sufficient.

Tested with python.pkgs.passlib by removing the `checkInputs` / `nose`.
 2017-09-07 19:22:06 +02:00
Eelco Dolstra
ec8d41f08c
Revert "Merge pull request #28557 from obsidiansystems/binutils-wrapper" 
This reverts commit 0a944b345e, reversing
changes made to 61733ed6cc.

I dislike these massive stdenv changes with unclear motivation,
especially when they involve gratuitous mass renames like NIX_CC ->
NIX_BINUTILS. The previous such rename (NIX_GCC -> NIX_CC) caused
months of pain, so let's not do that again.
 2017-09-07 12:51:21 +02:00
John Ericson
0a944b345e Merge pull request #28557 from obsidiansystems/binutils-wrapper 
Binutils-wrapper: Init by refactoring out of cc-wrapper
 2017-09-03 10:37:27 -04:00
Vladimír Čunát
37242d98de
Merge branch 'master' into staging 2017-09-03 10:51:11 +02:00
Vladimír Čunát
53998f5036
treewide: purge explicit usage of gcc6 
It's now the default. /cc #19456
This makes a real build simplification, because in our current
bootstrapping+aliases, `gcc6` attribute is not the default compiler
but a derivation *built by* the default compiler.

nix-exec didn't build before this commit already
 2017-09-03 09:57:20 +02:00
Robin Gloster
fc8fc63b67
ruby_2_0_0: fix eval due to nested list 2017-09-02 13:08:09 +02:00
John Ericson
3f30cffa55 misc pkgs: Use $NIX_BINUTILS for when needed 
Certain files are now only there instead of $NIX_CC (some are in both)
 2017-09-01 11:44:55 -04:00
Frederik Rietdijk
6d4bd78fad Merge commit '2858c41' into HEAD 2017-08-30 21:07:07 +02:00
Frederik Rietdijk
b2686dce25 Merge pull request #27636 from bendlas/update-pypy 
pypy: 5.6 -> 5.8
 2017-08-30 13:57:24 +02:00
Vladimír Čunát
2858c41823
Merge branch 'master' into staging 
There were some conflicts in python modules, commented at #28314.
 2017-08-29 10:51:54 +02:00
Maximilian Güntner
94351197cd cpython: include test.support and test.regrtest 
test.{support, regrtest} are the internal packages cpython
developers use to write tests.
Although they are not public and the API may change/break
some developers use these packages to write tests for their
(3rd party) software.
The derivations for cpython now only remove the actual tests
but leave the packages in place that are used to write them.

Discussion: https://github.com/NixOS/nixpkgs/pull/28540
 2017-08-28 09:49:08 +02:00
Frederik Rietdijk
a7ddca6e3d python 3.4, 3.5, 3.6: Don't use ldconfig and speed up uuid load, fixes #28349 
These patches had already been merged for 3.5 and 3.6 but not yet for
3.4. However, they did contain a mistake as explained in #28349.
 2017-08-28 09:42:59 +02:00
Jörg Thalheim
5ae506e94a racket: fix shared library build 2017-08-26 20:12:07 +01:00
geistesk
8dc06a2385 racket: 6.9 -> 6.10 2017-08-26 18:35:40 +02:00
Volth
ee51e73120
perl: 5.24.1 -> 5.24.2 and 5.22.3 -> 5.22.4 
Scavenged by vcunat from #28353.
 2017-08-26 12:35:33 +02:00
Peter Simons
194a779df4 hugs: fix build by un-defining the erroneous default for $STRIP 2017-08-23 19:53:11 +02:00
Matthew Justin Bauer
2eacddf0dc treewide: homepage URL fixes (#28475) 
* pgadmin: use https homepage

* msn-pecan: move homepage to github

google code is now unavailable

* pidgin-latex: use https for homepage

* pidgin-opensteamworks: use github for homepage

google code is unavailable

* putty: use https for homepage

* ponylang: use https for homepage

* picolisp: use https for homepage

* phonon: use https for homepage

* pugixml: use https for homepage

* pioneer: use https for homepage

* packer: use https for homepage

* pokerth: usee https for homepage

* procps-ng: use https for homepage

* pycaml: use https for homepage

* proot: move homepage to .github.io

* pius: use https for homepage

* pdfread: use https for homepage

* postgresql: use https for homepage

* ponysay: move homepage to new site

* prometheus: use https for homepage

* powerdns: use https for homepage

* pm-utils: use https for homepage

* patchelf: move homepage to https

* tesseract: move homepage to github

* quodlibet: move homepage from google code

* jbrout: move homepage from google code

* eiskaltdcpp: move homepage to github

* nodejs: use https to homepage

* nix: use https for homepage

* pdf2djvu: move homepage from google code

* game-music-emu: move homepage from google code

* vacuum: move homepae from google code
 2017-08-22 20:50:04 +02:00
Frederik Rietdijk
8f2ea38f8f Merge remote-tracking branch 'upstream/master' into HEAD 2017-08-17 18:34:17 +02:00
Jörg Thalheim
dc282c1285 Merge pull request #28147 from uralbash/red 
red: init at 0.6.3
 2017-08-16 14:09:16 +01:00
Svintsov Dmitry
7bd8ac64c3 red: init at 0.6.3 2017-08-16 17:39:38 +05:00
Eelco Dolstra
9eb901b70d
Merge remote-tracking branch 'origin/gcc-6' into staging 2017-08-14 11:38:00 +02:00
Frederik Rietdijk
62dac1bdd9 Merge remote-tracking branch 'upstream/master' into HEAD 2017-08-14 09:34:10 +02:00
Frederik Rietdijk
13bbaee21d Merge pull request #27881 from mimadrid/fix/http-https 
Update homepage attributes: http -> https
 2017-08-13 21:53:20 +02:00
Frederik Rietdijk
748589bf60 python36: remove symlink to pip 
Symbolic links were added pointing to the executables that end with 3 as
part of the Python 2 to 3 migration. At some point I disabled ensurepip
but forgot to remove this symbolic link.
 2017-08-13 12:22:54 +02:00
Frederik Rietdijk
53d2838f27 python35: remove symlink to pip 
Symbolic links were added pointing to the executables that end with 3 as
part of the Python 2 to 3 migration. At some point I disabled ensurepip
but forgot to remove this symbolic link.
 2017-08-13 12:22:54 +02:00
Frederik Rietdijk
3b56edae94 python34: remove symlink to pip 
Symbolic links were added pointing to the executables that end with 3 as
part of the Python 2 to 3 migration. At some point I disabled ensurepip
but forgot to remove this symbolic link.
 2017-08-13 12:22:54 +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
Frederik Rietdijk
71615c19af python35: add no-ldconfig.patch again 
after it was accidentally removed in
d6c5109276
 2017-08-12 13:22:23 +02:00
Vladimír Čunát
6899c7fdb9
Merge branch 'master' into gcc-6 2017-08-12 10:09:41 +02:00
Jörg Thalheim
fc988f0d61 Merge pull request #28064 from couchemar/elixir-1.5.1 
elixir: 1.5.0 -> 1.5.1
 2017-08-11 23:28:40 +01:00
Robin Gloster
4495bfe138
python.buildEnv: only wrap executables 2017-08-09 15:07:03 +02:00
Andrey Pavlov
da430a1597 elixir: 1.5.0 -> 1.5.1 
Also homepage URL is updated
 2017-08-09 11:51:49 +03:00
Frederik Rietdijk
616fb95356 python34: 3.4.6 -> 3.4.7 2017-08-09 09:41:59 +02:00
Frederik Rietdijk
d6c5109276 python35: 3.5.3 -> 3.5.4 2017-08-08 18:06:29 +02:00
Frederik Rietdijk
468fdddde6 Merge pull request #27753 from FRidh/python33eol 
python33: end-of-life
 2017-08-08 09:11:11 +02:00
Daiderd Jordan
44c354317d Merge pull request #27911 from LnL7/erlang-no-gcc 
erlang: remove explicit gcc dependency
 2017-08-07 22:23:58 +02:00
Herwig Hochleitner
189bba047e pypy: use pycparser from passed python 2017-08-03 22:20:49 +02:00
Daiderd Jordan
eaf9faef60
erlang: remove explicit gcc dependency 2017-08-03 21:22:30 +02:00
mimadrid
09e0cc7cc7
Update homepage attributes: http -> https 
Homepage link "http://.../" is a permanent redirect to "https://.../" and should be updated
https://repology.org/repository/nix_stable/problems
 2017-08-03 11:56:15 +02:00
Frederik Rietdijk
6e6271e82f python.buildEnv: undo removal of passthru.python 2017-08-02 15:05:00 +02:00
Frederik Rietdijk
4f66c0cf21 Merge remote-tracking branch 'upstream/master' into HEAD 2017-08-02 10:22:24 +02:00
Silvan Mosberger
f5fa5fa4d6 pkgs: refactor needless quoting of homepage meta attribute (#27809) 
* pkgs: refactor needless quoting of homepage meta attribute

A lot of packages are needlessly quoting the homepage meta attribute
(about 1400, 22%), this commit refactors all of those instances.

* pkgs: Fixing some links that were wrongfully unquoted in the previous
commit

* Fixed some instances
 2017-08-01 22:03:30 +02:00
Frederik Rietdijk
29825ebf93 Merge pull request #27850 from mimadrid/update/groovy-2.4.12 
groovy: 2.4.10 -> 2.4.12
 2017-08-01 21:50:49 +02:00
mimadrid
5f831b381c
groovy: 2.4.10 -> 2.4.12 2017-08-01 20:56:09 +02:00
Frederik Rietdijk
ea4121d225 python.buildEnv: fix passthru 
Python envs did not pass through any of the properties the Python
interpreter has. That could be annoying, especially not having
`python.interpreter` which is the path to the interpreter. This commit
fixes the situation and inherit python.passthru.
 2017-08-01 16:27:16 +02:00
Frederik Rietdijk
85a0ab4b23 Python: disable user site-packages for programs and environments. 
Python by default checks a `site-packages` folder in the user's home
folder. We do not want such an impurity and therefore disable it.
Fixes #26846.
 2017-07-31 13:16:29 +02:00
Frederik Rietdijk
feeed410ff Merge pull request #27751 from FRidh/pythonldconfig 
python36 and python35: Don't use ldconfig and speed up uuid load
 2017-07-30 10:54:36 +02:00
Frederik Rietdijk
6128dd4d50 Python wrapper: undo change 8d76effc17 
because we would otherwise end up with broken wrappers because PATH and
PTYHONPATH weren't set.
 2017-07-30 08:42:33 +02:00
Frederik Rietdijk
d387cac375 python33: end-of-life 
Python 3.3 reaches end-of-life when we release 17.09.

https://mail.python.org/pipermail/python-dev/2017-July/148584.html
 2017-07-29 20:49:24 +02:00
Frederik Rietdijk
d64e798c82 python35: Don't use ldconfig and speed up uuid load 
A Python 3.5 version of de1b4e71c1.
 2017-07-29 20:41:02 +02:00
Frederik Rietdijk
0a7e705f62 python36: Don't use ldconfig and speed up uuid load 
A Python 3.6 version of de1b4e71c1.
 2017-07-29 20:40:35 +02:00
John Ericson
9be40841ea Merge remote-tracking branch 'upstream/master' into staging-base 
Conflicts:
	pkgs/build-support/cc-wrapper/default.nix
	pkgs/build-support/gcc-wrapper-old/builder.sh
	pkgs/build-support/trivial-builders.nix
	pkgs/desktops/kde-4.14/kde-package/default.nix
	pkgs/development/compilers/openjdk-darwin/8.nix
	pkgs/development/compilers/openjdk-darwin/default.nix
	pkgs/development/compilers/openjdk/7.nix
	pkgs/development/compilers/openjdk/8.nix
	pkgs/development/compilers/oraclejdk/jdk-linux-base.nix
	pkgs/development/compilers/zulu/default.nix
	pkgs/development/haskell-modules/generic-builder.nix
	pkgs/misc/misc.nix
	pkgs/stdenv/generic/builder.sh
	pkgs/stdenv/generic/setup.sh
 2017-07-26 13:46:04 -04:00
Justin Wood
b7709539b4 elixir: 1.5.0-rc.2 -> 1.5.0 2017-07-25 09:44:49 -04:00
Herwig Hochleitner
fec79a9b15 pypy: 5.6 -> 5.8 
this commit includes a patch, backported from master, to skip a
failing test
 2017-07-25 12:01:28 +02:00
Frederik Rietdijk
29f91c107f Merge remote-tracking branch 'upstream/master' into HEAD 2017-07-23 11:23:43 +02:00
Eelco Dolstra
a13802b2c8
Merge remote-tracking branch 'origin/master' into gcc-6 2017-07-21 11:05:58 +02:00
Justin Wood
b61f0fe40b
elixir: 1.5.0-rc.1 -> 1.5.0-rc.2 2017-07-20 08:14:35 -04:00
Alastair Pharo
0383c0aa6b jruby: make package compatible with bundix; add devEnv 
- Adds the necessary passthru vars for bundler, bundix, etc. to accept
  the package as a ruby.
- Adds the devEnv attribute, so that jruby.devEnv can be used to get
  an environment with bundler and bundix installed.
 2017-07-19 16:17:44 +10:00
Alastair Pharo
5c6e4ea4be jruby: only wrap jruby executables 
Other executables all invoke jruby, and so don't need to be wrapped.

In some cases wrapping breaks the executables because one file is a ruby
script that directly loads the other (e.g. `gem` is a wrapper that loads
`jgem`).  In this case, if the latter script has been wrapped by nix,
loading will fail.
 2017-07-19 16:13:09 +10:00
Frederik Rietdijk
3eceecb90d Merge remote-tracking branch 'upstream/master' into HEAD 2017-07-17 13:52:01 +02:00
Frederik Rietdijk
8e98811f76 python36: 3.6.1 -> 3.6.2 2017-07-17 10:06:14 +02:00
Daiderd Jordan
fa74d99e42 Merge pull request #27295 from ankhers/generalize_lfe 
Generalize building of LFE
 2017-07-16 14:36:24 +02:00
Vladimír Čunát
e2b7b09960
Merge branch 'master' into staging 2017-07-15 12:15:56 +02:00
Kirill Radzikhovskyy
9728d77cf3 jruby: 9.1.5.0 -> 9.1.12.0 2017-07-14 17:21:31 +10:00
John Ericson
ea9af6e3bd Merge pull request #27336 from obsidiansystems/stdenv-setup-cleanup 
Stdenv setup misc cleanups
 2017-07-13 18:41:33 -04:00
John Ericson
8d76effc17 stdenv-setup: Make the package accumulators associative arrays instead of strings 
This is generally cleaner: less eval, less worrying about separators,
and probably also faster. I got the idea from that python wrapper
script.
 2017-07-12 15:30:56 -04:00
Justin Wood
811142aa71
elixir: 1.5.0-rc.0 -> 1.5.0-rc.1 2017-07-12 10:10:13 -04:00
Justin Wood
8dc7d34942
LFE 1.2 does not support OTP 20 2017-07-12 10:01:40 -04:00
Justin Wood
0573610a5f
Make sure the LFE test suite is being run 2017-07-11 14:16:48 -04:00
Justin Wood
c87d4d4a19 Generalize building of LFE 2017-07-10 20:37:33 -04:00
Vladimír Čunát
08743fe0a3
luajit: 2.0 actually doesn't support aarch64 at all 
I suppose 2.1 with caveats with some pointers is better than nothing.
I'm sorry for the potential confusion.  In particular, the problem
about 64-bit pointers is the same in 2.0 and 2.1, despite the warning
only being shown for 2.1 on the web site.
 2017-07-10 14:22:35 +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
Daiderd Jordan
5ba05aaab9 Merge pull request #26716 from ankhers/generalize-elixir 
Generalize building of Elixir interpreter
 2017-07-09 10:50:24 +02:00
Justin Wood
6db77ccef4
Fix quoting in Elixir generic builder 2017-07-08 20:32:16 -04:00
Daiderd Jordan
980346592c
Merge branch 'staging' into master 2017-07-08 22:22:17 +02:00
Vladimír Čunát
e08e354e04
luajit: revert to 2.1 on aarch64 for now 
https://nix-cache.s3.amazonaws.com/log/irncmyl5d6h21jzg5rm10q8s2sxqirmv-luajit-2.0.5.drv
It's hard to debug for me, without an aarch64 machine.
 2017-07-07 18:25:17 +02:00
Vladimír Čunát
b8726c346c
luajit: switch to 2.0.5 on aarch64 by default 2017-07-07 10:54:06 +02:00
Vladimír Čunát
e36b588f93
luajit: add 2.0 version again 
The reason will be apparent from the followup commit.
Also order the phases, quote shell variables, add myself to
maintainers, etc.
 2017-07-07 10:54:05 +02:00
Eelco Dolstra
942422a646
Merge branch 'glibc' of https://github.com/rnhmjoj/nixpkgs into staging 2017-07-06 15:14:57 +02:00
Vincent Laporte
f9a2866508 maude: set available on all Unix platforms 2017-07-05 17:29:13 +00:00
Volth
b935b21ffd fix regressions where "${repo}-${rev}-scr" pattern was hardcoded 2017-07-04 20:22:13 +00:00
Vladimír Čunát
d1a89ae9d7
Merge branch 'master' into staging 2017-07-03 09:48:58 +02:00
Vincent Laporte
982af09d2c perl522: fix build on Darwin 
The sw_vers patch only applies to version 5.24
 2017-07-01 12:26:44 +00:00
Vladimír Čunát
ddf864f8aa
Merge branch 'master' into staging 
Mass rebuilds from master (>7k on x86_64-linux).
 2017-06-30 18:16:58 +02:00
John Ericson
16be434b0b Merge accepted cross compilation PRs into staging 2017-06-28 23:17:21 -04:00
John Ericson
e1faeb574a Merge pull request #26884 from obsidiansystems/purge-stdenv-cross 
Purge stdenv cross
 2017-06-28 21:39:16 -04:00
John Ericson
5d1e51a199 lua 5: Don't use stdenv.cross, and use less make flags 
cc-wrapper will define environment variables matching those now
 2017-06-28 18:21:06 -04:00
John Ericson
c3c5793ab2 guile: Don't use stdenv.cross 2017-06-28 18:21:05 -04:00
Justin Wood
46faaa69b8 Make assertion for OTP version in the generic elixir builder 
Changed Elixir 1.5 to include the fact it is an rc release
 2017-06-26 23:13:58 -04:00
Justin Wood
909da3998e Include Elixir 1.5 rc 2017-06-26 23:13:58 -04:00
Justin Wood
019afb0c80 Generalize building of Elixir interpreter 2017-06-26 23:13:58 -04:00
Michael Zaccari
107fabf41c jruby: 9.0.5.0 -> 9.1.5.0 2017-06-26 14:45:15 -04:00
David McFarland
087c32715b python2: copy stub library to output on cygwin 2017-06-26 09:26:10 -03:00
Matthew Daiter
d79b4766a5 erlangR20: init 2017-06-23 12:51:58 +02:00
Robin Gloster
15f6dcb668
Merge remote-tracking branch 'upstream/master' into gcc-6 2017-06-20 11:24:39 +02:00
Jörg Thalheim
8a4a4efbe6
clooj: fix download src 2017-06-18 11:39:55 +01:00
Daiderd Jordan
4010313ab9 Merge pull request #26381 from gleber/generalize-beam 
erlang: refactor to generalize Erlang/OTP derivations
 2017-06-11 20:35:07 +02:00
Gleb Peregud
c9cb6403d3 erlang: move erlang_basho_R16B02 to Erlang's general builder. 2017-06-11 13:31:25 +02:00
Tuomas Tynkkynen
d373b7b61a pixie: Broken on aarch64 
https://nix-cache.s3.amazonaws.com/log/m7r1nzz080wvgrbph7ss145aiwgs24dh-pixie-0-r1356-jit.drv
 2017-06-11 04:45:44 +03:00
Gleb Peregud
3426c88bff erlang: Generalize Erlang/OTP derivations. 
Switch official Erlang versions to use a common builder.
 2017-06-08 11:29:47 +02:00
geistesk
c57d0be40a racket: 6.8 -> 6.9 2017-06-04 09:20:55 +02:00
Robin Gloster
c1359ce04b
Merge remote-tracking branch 'upstream/master' into gcc-6 2017-06-02 15:39:25 +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
Eelco Dolstra
1318120484
Fix indentation 2017-05-30 18:11:37 +02:00
Robert Scott
45ac7700fa mkPythonDerivation: obey a dontWrapPythonPrograms attribute 
This should allow a python derivation to disable possibly overzealous
python program wrapping without having to override the whole fixupPhase
 2017-05-27 14:25:08 +02:00
Frederik Rietdijk
c10af9e744 Python: wrapPythonPrograms: only wrap in $out/bin 
Thus far all executables in a derivation were wrapped. This commit
only wraps executables in $out/bin. If other scripts need to be wrapped
as well, then one can use wrapPythonProgramsIn.
 2017-05-27 14:25:08 +02:00
Frederik Rietdijk
97f67d1b5a buildPythonPackage: do not keep checkInputs 
When tests are disabled, we do not want to pass checkInputs to
stdenv.mkDerivation. This reduces the build requirements and, more
importantly, helps cutting cycles.
 2017-05-27 14:25:08 +02:00
Peter Simons
8a11612d50 maude: disable CVC4 support to fix the build 2017-05-26 20:37:36 +02:00
Vladimír Čunát
00672dec8a
Merge older staging 
This still causes some uncached rebuilds, but master(!) and staging
move too fast forward rebuild-wise, so Hydra might never catch up.
(There are also other occasional problems.)
Therefore I merge at this point where the rebuild isn't that bad.
 2017-05-26 15:45:43 +02:00
Franz Pletz
9bb358316f
php71: 7.1.2 -> 7.1.5 2017-05-25 02:44:16 +02:00
Vladimír Čunát
b7fed33057
python-3.3: fixup evaluation after #25916 2017-05-24 14:09:14 +02:00
Frederik Rietdijk
1267b155c4 Merge pull request #25916 from FRidh/reproducible 
Python: set DETERMINISTIC_BUILD and PYTHONHASHSEED in setupHook
 2017-05-22 10:20:04 +02:00
Robin Gloster
da9adb8fab
Merge remote-tracking branch 'upstream/master' into gcc-6 2017-05-20 14:55:44 +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
Frederik Rietdijk
acd32a4caf Python: set DETERMINISTIC_BUILD and PYTHONHASHSEED in setupHook 
The Python interpreters are patched so they can build .pyc bytecode free
of certain indeterminism.

When building Python packages we currently set

```
compiling python files.
in nix store.
DETERMINISTIC_BUILD=1;
PYTHONHASHSEED = 0;
```

Instead if setting these environment variables in the function that
builds the package, this commit sets the variables instead in the Python
setup hook. That way, whenever Python is included in a derivation, these
variables are set.

See also the issue https://github.com/NixOS/nixpkgs/issues/25707.
 2017-05-19 16:28:11 +02:00
mimadrid
4187d31ab7
elixir: 1.4.2 -> 1.4.4 2017-05-15 20:10:45 +02:00
Vladimír Čunát
d7501b986a
luajit: 2.1.0-beta2 -> 2.1.0-beta3 
The removal of `luaL_reg` alias caused lots of breakage.
Only sysdig and knot-resolver needed (also) other changes.
 2017-05-02 14:00:45 +02:00
Vladimír Čunát
9ad1aaae53
lua5_{sec,1_sockets,expat}: convert to aliases 
There's nothing better in these expressions than what we have in
lua-packages.nix
 2017-05-02 14:00:44 +02:00
Michael Raskin
6008ede40d Merge pull request #24648 from asppsa/php-config-fix2 
php: fix php-config header file paths
 2017-05-01 11:05:43 +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
Frederik Rietdijk
4fc9b1852a Merge remote-tracking branch 'upstream/master' into HEAD 2017-04-23 11:26:47 +02:00
Daiderd Jordan
004ecac47b
perl: add patch for sw_vers on darwin 
Fixes #25090
 2017-04-22 15:29:46 +02:00
Tomas Hlavaty
bcd349d70d picolisp: 16.6 -> 16.12 2017-04-21 00:25:23 +02:00
Frederik Rietdijk
c275158f06 python36: 3.6.0 -> 3.6.1 2017-04-18 13:14:40 +02:00
Maksim Bronsky
f78c032934
perl: init 5.24.1 and set as default perl 2017-04-18 01:24:44 +02:00
Maksim Bronsky
d6b42b4008
perl: 5.22.2 -> 5.22.3 2017-04-18 01:24:39 +02:00
Frederik Rietdijk
5c8ffe0311 Python 3.x: do not regenerate _sysconfigdata 
This commit fixes several issues:

- as reported in https://github.com/NixOS/nixpkgs/issues/24924 it was
possible that the file _sysconfigdata.pyc was generated after the actual
build of the CPython interpreter. We forgot to regenerate that file
during the build. This is now fixed

- the expression of the 3.3 interpreter now also includes some of the
determinism patches even though the output isn't yet reproducible. The
reason for adding them is that this makes the expressions of the
different interpreters more similar.

- references to -dev packages are now also removed in the 3.6 package,
thereby reducing its closure size
 2017-04-16 10:41:35 +02:00
Alastair Pharo
813eb41cf6 octaveHg: add package 2017-04-09 21:54:14 +10:00
Alastair Pharo
250ddfe1a2 octave: add runtime texinfo dependency 
makeinfo (provided by the texinfo package) is used by the "help"
command in Octave to display info about functions, etc.  By default,
Octave looks for "makeinfo" in the PATH, rather than specifying the
location of the executable.  This results in Nix not being aware that
makeinfo is required at runtime (so unless you happen have makeinfo
available from your path, "help" won't work).

This patch fixes that by setting the path to makeinfo in Octave,
thereby creating a runtime dependency on texinfo.
 2017-04-09 16:42:56 +10:00
Vladimír Čunát
26766f0e57
Merge branch 'staging' 
There are a few dozen new failures on Darwin, probably related to
updates of stdenv's llvm and/or pkgconfig.
Still the total number of successes increases.
 2017-04-08 11:02:36 +02:00
Andrew R. M
106214a7c9 hy: 0.11.1 -> 0.12.1 
Fixed build inputs up a little while bumping version
 2017-04-07 23:15:16 -04:00
Vladimír Čunát
c6bc4cfdbc
Merge branch 'master' into staging 2017-04-06 00:16:59 +02:00
Tim Steinbach
3535a6bf3c
ruby: 2.0.0-p647 -> 2.0.0-p648 2017-04-03 15:40:26 -04:00
Tim Steinbach
ec2c469230
ruby: 2.2.5 -> 2.2.7 2017-04-03 15:33:26 -04:00
Tim Steinbach
482566939e
ruby: 2.3.3 -> 2.3.4 2017-04-03 15:28:38 -04:00
Tim Steinbach
bc45ee50c4
ruby: 2.4.0 -> 2.4.1 2017-04-03 15:23:18 -04:00
Johannes Bornhold
249b34aadc
python: Move catch_conflicts.py into subdirectory (#23600) 
Python does add the script's directory into "sys.path". For the case of
"catch_conflicts.py" this means "/nix/store" is added to "sys.path". This can
result in very long delays if the store contains a lot of entries.

(moved from master commit 76213d102c)
 2017-04-01 12:22:36 +02:00
Vladimír Čunát
46ea770b2b Revert "python: Move catch_conflicts.py into subdirectory (#23600)" (#24528) 
This reverts commit 76213d102c.
 2017-04-01 12:20:31 +02:00
Johannes Bornhold
76213d102c python: Move catch_conflicts.py into subdirectory (#23600) 
Python does add the script's directory into "sys.path". For the case of
"catch_conflicts.py" this means "/nix/store" is added to "sys.path". This can
result in very long delays if the store contains a lot of entries.
 2017-04-01 12:19:53 +02:00
Lancelot SIX
0848d1c2e1 gnuapl: 1.6 -> 1.7 
See http://lists.gnu.org/archive/html/info-gnu/2017-03/msg00007.html
for release announcement.
 2017-03-31 07:33:53 +02:00
Robin Gloster
84db2dffe9
nix-exec: fix build 2017-03-30 16:23:34 +02:00
Victor Calvert
2fcc32f42b groovy: 2.4.8 -> 2.4.10 2017-03-26 11:18:37 -04:00
Thomas Tuegel
f87d3d6f80
supercollider: pin to Qt 5.6 2017-03-25 08:49:40 -05:00
Anthony Cowley
506a5df014 octave: fix on darwin 
This change is required on darwin, but did not make it into the 4.2.1
release of Octave. It is a very small change, and a comment on the
patch includes a link for more information and a note that it should
be removed from subsequent releases.
 2017-03-22 10:49:10 -04:00
Robin Gloster
9c730bc40b
clooj: fix url 2017-03-21 11:00:49 +01: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
Dan Peebles
de0849d180 erlangR14: delete unreferenced ancient file 2017-03-19 14:59:58 -04:00
Dan Peebles
5a81c66906 erlang: patch all versions to work with clang 4 2017-03-19 14:59:58 -04:00
Michael Raskin
0cf93fda07 guile_2_0: init at 2.0.13 
Reinstate guile 2.0.x. Use it for autogen
 2017-03-19 20:05:14 +01:00
Rahul Gopinath
5498dd6364 guile: 2.0 -> 2.2 2017-03-19 10:47:22 -07:00
Eric Bailey
a91afef89e
erlangR19: update maintainers 
Use the list of direct committers:
https://github.com/NixOS/nixpkgs/commits/master/pkgs/development/interpreters/erlang/R19.nix

Originally, I just copied and pasted from R18.nix, I think.
 2017-03-18 00:36:57 -05:00
Eric Bailey
05b1f8276b
erlangR19: 19.2.3 -> 19.3 2017-03-18 00:24:18 -05:00
Michael Raskin
8388cb8bff renpy: 6.17.6 -> 6.99.12.4; still a strange mistake on launch 2017-03-17 14:14:38 +01:00
Linus Heckemann
9b62e41c1e renpy: mark as broken 2017-03-17 10:07:12 +00:00
Christopher League
cfc7a1877a clips: init at 6.30 
CLIPS is a language for building expert systems.
 2017-03-16 00:05:02 +02:00
Andrzej Trzaska
162845d5b1 Use gem 2.6.10 (#23902) 2017-03-15 14:55:45 +00:00
Lluís Batlle i Rossell
46c9eac980 guile: enable parallel building 
civodul today on irc said that 2.0.13 likely has the parallel building
issue fixed (case equal-or-over 8 cores). Let's try.
 2017-03-13 23:38:52 +01:00
Michael Raskin
a77380b34c Merge pull request #23780 from asppsa/pure-0.66 
pure: 0.64 -> 0.66
 2017-03-13 10:56:08 +01:00
Michael Raskin
54b7c3b63f clisp-git: update to the upstream fix of 32-bit builds 
The current exact tip fails to build on x86_64, there probably is a
fresher safe commit, but I haven't try bisecting.
 2017-03-13 00:00:13 +01:00
Vladimír Čunát
848423f223
clisp-tip: make the build more reliable 
Hydra shows it sometimes fails without autoconf:
http://hydra.nixos.org/job/nixos/trunk-combined/nixpkgs.clisp-tip.x86_64-linux
I can't say I understand why this happened.
 2017-03-12 23:07:55 +01:00
Alastair Pharo
2188e0f61f pure: 0.64 -> 0.66 2017-03-12 12:22:52 +11:00
Vladimír Čunát
d56e596da7
lua-{5.2,5.3}: fixup dylib symlink names on Darwin 
Hopefully; I didn't test it.
https://github.com/NixOS/nixpkgs/pull/6311#issuecomment-285521028
 2017-03-10 00:54:32 +01:00
Henry Till
d95f21f6a1 racket: add readline support 2017-03-07 15:08:02 -05:00
Tim Digel
0b2502a284 elixir: 1.4.0 -> 1.4.2 2017-03-07 11:50:32 +01:00
Henry Till
6ed6731e36 racket: disable i686 builds 
ref #23253
 2017-03-05 14:51:48 -05:00
Vladimír Čunát
2839b101f9
Merge commit older staging 
No new failures on Hydra.
 2017-03-05 08:00:42 +01:00
Domen Kožar
fb40889ddb
mk-python-derivation: remove me as maintainer 
The time has come ...
 2017-03-03 14:37:28 +01:00
Vladimír Čunát
5060f22839
Merge branch 'master' into staging 2017-03-03 14:20:15 +01:00
Frederik Rietdijk
a1f6b8b5fc Python 3.6 fixup expat and libffi, fixes #23406 2017-03-03 07:46:52 +01:00
Daiderd Jordan
423bab129a Merge pull request #23330 from yurrriq/update/pkgs/development/interpreters/erlang/R19 
erlangR19: 19.2 -> 19.2.3
 2017-03-02 21:07:59 +01:00