Commit graph

2762 commits

Author SHA1 Message Date
Vladimír Čunát e9c12f6936
Merge older staging
There are some regressions, but not that many and I want
the security update of openssl fast.
2017-12-11 09:49:56 +01:00
Frederik Rietdijk 163ba09117 python.buildEnv: always include the $out output
28299f669a introduced the first Python
packages having multiple outputs. The required outputs were not picked
up by `python.buildEnv` (#31857).

This commit modifies `python.buildEnv` so that it always includes the
$out output and thus fixes #31857.
2017-12-10 15:21:35 +01:00
Shea Levy 3dfbf51a25
Add gurobipy for python2.7 on darwin. 2017-12-09 15:00:43 -05:00
Vladimír Čunát 2309acf723
Merge branch 'master' into staging 2017-12-09 21:00:07 +01:00
Shea Levy d077d22893
python27: Enable building with alternate UCS encoding 2017-12-09 12:00:52 -05:00
Daiderd Jordan b2e2490181
Merge pull request #32454 from andir/erlang-cleanup
Erlang cleanup (remove R17, R16 cleanup, updated couchdb to R19)
2017-12-09 14:48:56 +01:00
Orivej Desh 40950f6a2d
Merge pull request #31006 from florianjacob/prosody
Improvements for Prosody
2017-12-09 09:19:24 +00:00
Andreas Rammhold 14f1698649
erlangR17: removed outdated & unused version
erlangR17 doesn't receive any upstream updates anymore and none of our
packages depend on it.
2017-12-08 15:06:01 +01:00
Andreas Rammhold 9f39d0ef68
erlang_basho_R16B02: OTP_16B02_basho8 -> OTP_16B02_basho10
Also renamed the file since it is no longer version 8.
2017-12-08 15:06:00 +01:00
Andreas Rammhold b8b4d7ebf2
erlang: removed R16.nix, was a leftover from #32443 2017-12-08 15:06:00 +01:00
Daiderd Jordan 42d437129f
R16B02-8-basho: mark insecure 2017-12-08 13:03:54 +01:00
Daiderd Jordan 7d85f1b0e2
erlangR17: mark insecure 2017-12-08 13:03:54 +01:00
Andreas Rammhold 2107291346
erlangR18: 18.3.4.4 -> 18.3.4.7 (fixes CVE-2017-1000385) 2017-12-08 10:27:17 +01:00
Andreas Rammhold 366355f7eb
erlangR19: 19.3 -> 19.3.6.4 (fixes CVE-2017-1000385) 2017-12-08 10:27:14 +01:00
Andreas Rammhold 175f2e147f
erlangR20: 20.1 -> 20.1.7 (fixes CVE-2017-1000385) 2017-12-08 10:27:09 +01:00
Orivej Desh dc4200f934 perl522: do not apply the patch for parallel building
It does not apply and this version is not affected.
2017-12-07 07:07:58 +00:00
Orivej Desh 8ce5ee5c5a perl: fix parallel building
https://hydra.nixos.org/build/65428077/nixlog/1
2017-12-06 22:20:56 +00:00
Orivej Desh 7b1489e1a1 j: fix build
/usr/bin/env does not exist in the sandbox.
2017-12-02 06:04:00 +00:00
Joachim F 6ccf5617d2
Merge pull request #32208 from Synthetica9/master
j: 701_b -> 806
2017-12-01 17:24:04 +00:00
Patrick Hilhorst 4bb9ffef6a j: 701_b -> 806 2017-11-30 17:14:33 +01:00
Orivej Desh 00ced68a9e lua5_1: provide version 2017-11-29 03:01:15 +00:00
Orivej Desh d202a0ce67 nix-exec: mark as broken
It has not been compatible with nix unstable since 2017-05.
2017-11-29 00:20:34 +00:00
Orivej Desh b00c65103d luajit: symlink missing lua.hpp 2017-11-27 16:14:18 +00:00
Frederik Rietdijk 35f5912db5 Merge remote-tracking branch 'upstream/python-unstable' into HEAD 2017-11-23 16:38:39 +01:00
Frederik Rietdijk 6ad79678d4 Merge remote-tracking branch 'upstream/master' into HEAD 2017-11-23 16:38:31 +01:00
Frederik Rietdijk 80329e7123 python.pkgs.buildPythonPackage: some comments 2017-11-23 15:11:03 +01:00
Frederik Rietdijk 209ee2f20f python.pkgs.buildPythonPackage: do not pass attributes that stdenv.mkDerivation does not use 2017-11-23 15:11:03 +01:00
Frederik Rietdijk 42eece04e4 python.pkgs.buildPythonPackage: meta.maintainers: don't add chaoflow 2017-11-23 15:11:03 +01:00
Frederik Rietdijk 40851a4d26 Python: the pythonModule attribute
Python libraries or modules now have an attribute `pythonModule = interpreter;` to indicate
they provide Python modules for the specified `interpreter`.

The package set provides the following helper functions:

- hasPythonModule: Check whether a derivation provides a Python module.
- requiredPythonModules: Recurse into a list of Python modules, returning all Python modules that are required.
- makePythonPath: Create a PYTHONPATH from a list of Python modules.

Also included in this commit is:
- disabledIf: Helper function for disabling non-buildPythonPackage functions.
2017-11-23 15:11:02 +01:00
John Ericson 405412dfd9
Merge pull request #31775 from obsidiansystems/stdenv-both-propagated-files
stdenv setup: Always use both propagated files
2017-11-22 15:23:37 -05:00
Jörg Thalheim acfd95a249
Merge pull request #30808 from andir/fix-luajit-include-directory
luajit: do not override INSTALL_INC
2017-11-22 13:38:26 +00:00
Joerg Thalheim 17a0c80355 pypy: cleanup indentation mess 2017-11-21 20:52:54 +00:00
Joerg Thalheim b99226706d pypy: 5.8 -> 5.9 2017-11-21 20:50:54 +00:00
John Ericson da19c34d0f stdenv setup: Always use both propagated files
This continues #23374, which always kept around both attributes, by
always including both propagated files: `propgated-native-build-inputs`
and `propagated-build-inputs`. `nativePkgs` and `crossPkgs` are still
defined as before, however, so this change should only barely
observable.

This is an incremental step to fully keeping the dependencies separate
in all cases.
2017-11-21 10:44:44 -05:00
Orivej Desh 1161741351 Merge branch 'master' into staging
* master: (28 commits)
  go_1_9: skip flaky TestWaitGroupMisuse2
  erlangR18: fix patch hashes with fetchpatch
  xml2: replace dead links
  nixos/pam: fix docs about path to u2f_keys file
  cinelerra: add a note about parallel building
  msmtp: install docs and examples (#31769)
  kernel: Fix out-of-tree modules on aarch64
  nixos/tests/acme: update terms of service to fix test
  gixy: init at 0.1.8
  pythonPackages.ConfigArgParse: 0.9.3 -> 0.12.0, refactor, move to python-modules
  mono: init at 4.8
  wal-g: fix license so not to break evaluation
  wal-g: init at 0.1.2
  maintainers: add backuitist
  nixos/prometheus: Correct documentation for external_labels
  spidermonkey: replace broken links
  vagrant: removed custom rake gem
  vagrant: 2.0.0 -> 2.0.1
  nixos/prometheus: add external_labels option
  nixos/prometheus: add scrape_configs.honor_labels
  ...
2017-11-17 18:06:22 +00:00
Orivej Desh 587642bddc erlangR18: fix patch hashes with fetchpatch 2017-11-17 17:04:23 +00:00
Orivej Desh ceed4b2d12 spidermonkey: replace broken links
people.mozilla.org is gone
2017-11-17 11:04:28 +00:00
Orivej Desh d99a2fc093 Merge branch 'master' into staging
* master: (293 commits)
  go_1_9: skip flaky TestServerCancelsReadTimeoutWhenIdle
  qsyncthingtray: fix build
  qt56.qtwebengine: fix build
  stdman: d860212 -> 2017.04.02
  jackett: use mono50
  hg-git: disable with python3
  hg-git: 0.8.5 -> 0.8.10
  xfce4-settings: enable parallel building
  gcc-snapshot: mark as broken
  heaptrack: 2017-02-14 -> 2017-10-30
  nixos-container: Modify existing test to cover show-ip command
  nixos-container: Make show-ip work together with ipv4 + netmask
  linux-copperhead: 4.13.12.a -> 4.13.13.a
  matterbridge: 1.1.0 -> 1.4.1
  nixos/nghttpx: add module for the nghttpx proxy server (#31680)
  mattermost: 4.3.0 -> 4.4.0
  breakpad: delete
  simp_le: 0.2.0 -> 0.6.1
  certbot: 0.11.1 -> 0.19.0
  afl: 2.51b -> 2.52b
  ...
2017-11-17 05:35:09 +00:00
Michael Raskin c127e94bf7 clisp-tip: 2.50pre20170130 -> 2.50pre20171114; progress on #31696 2017-11-15 19:05:58 +01:00
John Ericson 728446f755
Merge pull request #30484 from obsidiansystems/libbfd
bfd, opcodes: Init separate derivations for binutils libraries
2017-11-14 12:10:44 -05:00
Dan Peebles 34fe3e0a49 perl: remove unsupported sandboxProfile 2017-11-14 10:34:03 -05:00
Michael Raskin eac38d0b1e
Merge pull request #31617 from orivej/clisp
clisp_2_44_1, libsigsegv_25: delete
2017-11-14 09:42:20 +01:00
Orivej Desh b62ad4f22b
Merge pull request #31526 from srhb/fix-php-external-pcre
php: Fix php pcre by using external lib
2017-11-13 20:15:37 +00:00
Orivej Desh c3b6a63961 clisp_2_44_1, libsigsegv_25: delete 2017-11-13 18:36:25 +00:00
Gabriel Ebner 82687ffeed
Merge pull request #31556 from gebner/racket_docs
racket: reenable docs by default
2017-11-13 09:03:56 +01:00
John Ericson d7bddc27b2 treewide: Try to avoid depending on binutils directly
One should depend on

 - `stdenv.cc.bintools`: for executables at build time
 - `libbfd` or `libiberty`: for those libraries
 - `targetPackages.cc.bintools`: for exectuables at *run* time
 - `binutils`: only for specifically GNU Binutils's executables, regardless of
   the host platform, at run time.
2017-11-13 00:47:48 -05:00
Sarah Brofeldt 7e17685d09 php: Disallow bundled pcre 2017-11-12 13:19:17 +01:00
Sarah Brofeldt 201444f02d php: Move test comment to the top 2017-11-12 13:07:22 +01:00
Gabriel Ebner 30cf73cbde racket: reenable docs by default 2017-11-12 10:12:29 +01:00
Sarah Brofeldt 58d07e2d6b php: Add nixos test to ensure php-pcre works in httpd 2017-11-12 08:05:27 +01:00