1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-11 23:24:35 +00:00
Commit graph

2777 commits

Author SHA1 Message Date
Vladimír Čunát a7d4fb8e1d
Merge branch 'master' into staging
Hydra: ?compare=1420346
2017-12-21 22:45:40 +01:00
John Ericson 31e5662785
Merge pull request #32953 from obsidiansystems/python-dep-fix
buildPythonPackage: Make setup hook part of nativeBuildInputs
2017-12-21 13:13:28 -08:00
John Ericson dc906952be buildPythonPackage: Make setup hook part of nativeBuildInputs
This is better organization in general, but also needed to make python
work with #26805.
2017-12-21 15:54:52 -05:00
Justin Wood ab0825615b elixir: 1.5.2 -> 1.5.3 2017-12-21 01:38:21 +00:00
Frederik Rietdijk c9044dee32 python36: 3.6.3 -> 3.6.4 2017-12-20 10:27:10 +01:00
Justin Wood c6496aea49 erlang: 20.1.7 -> 20.2.2 2017-12-19 22:05:12 +00:00
Orivej Desh 7c58e8dfc2 Merge branch 'master' into staging
* master: (125 commits)
  scummvm: fix eval
  tinycc: 0.9.27pre-20171016 -> 0.9.27
  Update terraform provider versions
  vscode: 1.18.1 -> 1.19.0
  linux: 4.14.6 -> 4.14.7
  scummvm: 1.9.0 -> 2.0.0
  cmst: 2017.03.18 -> 2017.09.19
  albert: 0.14.7 -> 0.14.14
  obs-studio: fix vlc plugin
  ffmpeg, ffmpeg-full: 3.4 -> 3.4.1
  uchiwa: 0.26.3 -> 1.1.0
  linux-testing: 4.15-rc3 -> 4.15-rc4
  steam: override nss, nspr, fixes #32781
  ponyc: 0.20.0 -> 0.21.0
  pythonPackages.pwntools: disable tests
  gnome3.gnome-tweak-tool: 3.26.3 → 3.26.4
  vim-rhubarb: init at 2017-06-28
  atom: depend on libsecret
  nvidia-settings: Make sure binary can find libXv.so
  backblaze-b2: 0.6.2 -> 1.1.0
  ...
2017-12-18 15:56:03 +00:00
André Stylianos Ramos dac6aa7d4e joker: 0.8.6 -> 0.8.7 2017-12-17 04:40:53 +01:00
Vladimír Čunát 24d81d6332
Merge branch 'master' into staging 2017-12-15 21:40:23 +01:00
Ales Huzik 81f4aa72b5 clojure: 1.8.0 -> 1.9.0.273
Clojure 1.9 adds native cli tools, which are now used instead of
creating a java wrapper with a clojure.jar arguments. See
https://clojure.org/guides/deps_and_cli for more details on
clojure native cli tools.
2017-12-15 17:22:59 +11:00
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 35ccdb8632
Merge pull request #32544 from FRidh/pythonmodule
Python: rewrite requiredPythonModules to prevent stack overflows
2017-12-11 09:46:15 +01:00
Frederik Rietdijk 44f46a3293
Merge pull request #32542 from FRidh/bytecode
buildPythonPackage: remove bytecode from bin folder
2017-12-11 09:45:50 +01:00
Frederik Rietdijk a334930490 Python: rewrite requiredPythonModules. Add requiredPythonModules attribute to derivation 2017-12-10 20:40:34 +01:00
Orivej Desh dd604d575f Merge branch 'master' into staging
* master: (39 commits)
  pythonPackages: rename dns -> dnspython
  awesome: fix LUA_PATH/LUA_CPATH to lgi [now for version 3.5]
  qt4: fix qmake on darwin and delete custom install phase
  python.buildEnv: always include the $out output
  nix-bash-completions: lazy load aware install
  borg: 1.1.1 -> 1.1.3
  nixos/programs/bash: document that /etc/bash_completion.d is obsolete
  ocamlPackages.markup: 0.7.4 -> 0.7.5
  hhvm: 3.21 -> 3.23.2
  ocamlPackages.ulex: 1.1 -> 1.2
  notmuch: 0.25.2 -> 0.25.3
  gmime3: 3.0.1 -> 3.0.5
  qt4: fix darwin install phase
  nixos/programs/bash: Let bash-completion lazy load scripts
  Revert "gmime: 3.0.1 -> 3.0.5"
  rawtherapee: delete unused files
  pythonPackages: rename dns -> dnspython
  nixpkgs: remove sqlite/kyotocabinet deps for leveldb
  tor-browser-bundle-bin: 7.0.10 -> 7.0.11
  networkmanager: remove restart after suspend from resume
  ...
2017-12-10 15:24:30 +00:00
Frederik Rietdijk d945b3e53b buildPythonPackage: remove bytecode from bin folder
When a Python script has the extension `.py`, bytecode is generated.
Typically, executables in bin have no extension, so no bytecode is
generated. However, some packages do provide executables with
extensions, and thus bytecode is generated.
2017-12-10 16:01:09 +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