1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-09-11 15:08:33 +01:00
Commit graph

81505 commits

Author SHA1 Message Date
Frederik Rietdijk f7b983aeaf grin: use python2 2016-10-18 23:14:33 +02:00
Frederik Rietdijk b28db671bb pythonPackages.EasyProcess: 0.1.9 -> 0.2.3
- version bump
- rename to upstream name
- disable tests since there aren't any
2016-10-18 23:14:32 +02:00
Frederik Rietdijk f42a7068da scons: use python2 and refactor expression 2016-10-18 23:14:32 +02:00
Frederik Rietdijk 936bfd23e1 pythonPackages.jaraco_functools: add missing dependency 2016-10-18 23:14:32 +02:00
Frederik Rietdijk cc1fe56e72 pythonPackages.backports_functools_lru_cache: init at 1.3 2016-10-18 23:14:32 +02:00
Frederik Rietdijk 1c4377034a gobjectIntrospection: use Python 2
because of a TypeError.
2016-10-18 23:14:32 +02:00
Frederik Rietdijk 8e8800884c buildbot: use python2 2016-10-18 23:14:32 +02:00
Frederik Rietdijk 212ce1c3b8 xorg.libxcb: not compatible with Python 3
The following patch is not sufficient.

https://cgit.freedesktop.org/xcb/libxcb/commit/?id=8740a288ca468433141341347aa115b9544891d3
2016-10-18 23:14:32 +02:00
Frederik Rietdijk 47a95edc1e libxml2: use python2 2016-10-18 23:14:31 +02:00
Aneesh Agrawal 95b5d8f752 all-packages: Remove unnecessary python3 overrides
These are unnecessary with Python3 as default Python.
2016-10-18 23:14:31 +02:00
Aneesh Agrawal 708822250e Python 3.x: Add python symlink
Add a symlink for "python" in the python3 derivation to provide a
default Python executable.
2016-10-18 23:14:31 +02:00
Dan Peebles 4f8a1094bd cctools: add patch I forgot 2016-10-17 08:51:48 -04:00
Dan Peebles e4dba74e8a darwin.stdenv: update MACOSX_DEPLOYMENT_TARGET
No point in claiming we're compatible with a version we don't try to
support, and this will probably help with a few other things elsewhere.
2016-10-16 20:47:43 -04:00
Dan Peebles ead2424981 cctools: fix triple for the assembler
This was breaking `boost155` and would probably break anything else that
calls `as` with no explicit architecture.
2016-10-16 20:46:36 -04:00
Dan Peebles b91d64463f Libsystem: update to 10.11.6 version
This actually has no effect but it bugged me to keep seeing an old version
in the package names :) and since we're making a bunch of stdenv changes
at once, I might as well.
2016-10-16 20:44:14 -04:00
Frederik Rietdijk 107c035bf0 Python: remove pythonSmall
In #19309 a separate output for tkinter was added.

Several dependencies of Python depend indirectly on Python. We have the
following two paths:
```
‘python-2.7.12’ - ‘tk-8.6.6’ - ‘libXft-2.3.2’ - ‘libXrender-0.9.10’ -
‘libX11-1.6.4’ - ‘libxcb-1.12’ - ‘libxslt-1.1.29’- ‘libxml2-2.9.4’ -
‘python-2.7.12’

‘python-2.7.12’ - ‘tk-8.6.6’ - ‘libXft-2.3.2’ - ‘fontconfig-2.12.1’ -
‘dejavu-fonts-2.37’ - ‘fontforge-20160404’ - ‘python-2.7.12’
```
Because only `tkinter` needs this, I added
```
pythonSmall = python.override {x11Support = false;};
```
to break the infinite recursion. We also still have the output
`tkinter`.

However, we might as well build without x11Support by default. Then we build with x11Support as well so we get the tkinter module and put that in a separate package.
2016-10-16 14:31:26 +02:00
Frederik Rietdijk 80433e7030 Python: further unify expressions interpreters 2016-10-14 15:52:14 +02:00
Vladimír Čunát 061758490f Merge branch 'master' into staging
... to get the openssl mass rebuild: 942dbf89c.
2016-10-14 13:16:11 +02:00
zimbatm 6351c4d24b Merge pull request #19180 from zimbatm/bundler-env-bins
Bundler env bins
2016-10-14 11:51:23 +01:00
Nikolay Amiantov 7619bea1fe Merge pull request #19544 from kamilchm/blueman
blueman: hicolor_icon_theme dependency
2016-10-14 14:34:50 +04:00
Eelco Dolstra 942dbf89c6 openssl, curl, git: Respect $NIX_SSL_CERT_FILE
$NIX_SSL_CERT_FILE overrides $SSL_CERT_FILE, which in turn overrides
the default CA path (/etc/ssl/certs/ca-certificates.crt). This allows
Nix to set a CA path without interfering with other packages (such as
Homebrew).

See https://github.com/NixOS/nix/issues/921.
2016-10-14 12:06:10 +02:00
Kamil Chmielewski 745b659481 blueman: hicolor_icon_theme dependency 2016-10-14 12:03:04 +02:00
Vladimír Čunát 027efec879 Merge staging without python splitting for now
The split needs more time to finish rebuilding,
but the rest seems OK and there are security fixes.
2016-10-14 09:24:21 +02:00
Vladimír Čunát e0210d7cbf tested job: fixup evaluation after 5dadc3a
I believe hardcoding system to builtins.currentSystem isn't very good,
as e.g. Hydra surely evaluates on Linux only...
2016-10-14 09:21:38 +02:00
Vladimír Čunát 3eec7ea3f0 gvfs: fix build after update in 0809aeb47f
(cherry picked from commit 56a49e6cda)
2016-10-14 09:11:28 +02:00
Vladimír Čunát d73646d270 Revert "gtkmm: fix build error by patching missing operator"
This reverts commit 7defda8356.
It breaks the package after update 61c467937b;

(cherry picked from commit 72e0135752)
2016-10-14 09:11:18 +02:00
Jörg Thalheim fe518a733f Merge pull request #19533 from siddharthist/r-modules/readme-nix-shell
r-modules: add more nix-shell documentation
2016-10-14 09:09:19 +02:00
Daniel Peebles 9615afa04b Merge pull request #19517 from dipinhora/darwin-yosemite-support
Re-enable support for OS X 10.10 for darwin.
2016-10-13 22:46:33 -04:00
Dan Peebles 5dadc3a30c darwin.make-bootstrap-tools: fix for new stdenv setup 2016-10-13 22:32:19 -04:00
Franz Pletz 8435c1637b
gimpPlugins.gap: disable format hardening 2016-10-13 20:33:16 -04:00
Franz Pletz bb7d270d85
pythonmagick: 0.9.12 -> 0.9.14 2016-10-13 20:33:16 -04:00
Franz Pletz 957a5bdcf3
phpPackages.imagick: 3.4.0RC4 -> 3.4.3RC1
Drops imagick31 as the current version also supports PHP 5.x.
2016-10-13 20:33:16 -04:00
Graham Christensen 241cd0e5db
imagemagick: 6.9.5-10 -> 6.9.6-2 for CVE-2016-7799, CVE-2016-7906 2016-10-13 20:33:10 -04:00
Graham Christensen fcd4b7ea58 Merge pull request #19510 from grahamc/nodejs
Nodejs: Upgrades for security patches
2016-10-13 20:26:47 -04:00
Graham Christensen 91c49433c9
nodejs-5_x: Remove, no longer supported 2016-10-13 20:04:24 -04:00
Graham Christensen 66f2a01222
nodejs-6_x: 6.7.0 -> 6.8.0 2016-10-13 20:04:24 -04:00
Graham Christensen f9df1b5de0
nodejs: 4.4.6 -> 4.6.0 2016-10-13 20:04:23 -04:00
Langston Barrett 2b300c9bef r-modules: add more environment documentation
Use nix-shell with a `default.nix` rather than using
config.nix
2016-10-13 22:18:16 +00:00
Vladimír Čunát 6eeea6effd Python: more evaluation fixups. 2016-10-14 00:03:12 +02:00
Franz Pletz 4771ccd896
graphicsmagick: apply patches to fix security issues
Fixes CVE-2016-7996, CVE-2016-7996, CVE-2016-7800.

cc #19481
2016-10-14 00:02:30 +02:00
Franz Pletz c766c7f095
fastd: fix meta.platforms typo 2016-10-14 00:02:30 +02:00
Franz Pletz f30f7d0cff
powertop: add homepage, cleanup 2016-10-14 00:02:30 +02:00
Tuomas Tynkkynen c66124e9b7 sshpass: 1.05 -> 1.06 2016-10-14 00:58:07 +03:00
Jörg Thalheim 13ff831440 Merge pull request #19524 from nshalman/shfmt-0.2.0
shfmt: 2016-06-16 -> 0.2.0
2016-10-13 22:22:34 +02:00
Frederik Rietdijk efb6052f40 Python: fixup modules that were removed 2016-10-13 22:11:30 +02:00
Daniel Peebles 9703a72f70 Merge pull request #19495 from LnL7/darwin-gdb
gdb: disable format hardening
2016-10-13 15:57:19 -04:00
Vladimír Čunát e4d3254101 intltool: fix #19487 patch download
It's strange.  Maybe they prune the history.
2016-10-13 21:55:25 +02:00
Franz Pletz 29bd3898a6
fastd: init at 18 2016-10-13 21:42:17 +02:00
Franz Pletz 3b58daf315
libuecc: init at 7 2016-10-13 21:42:16 +02:00
Franz Pletz 2c47729a75
libsodium: 1.0.10 -> 1.0.11 2016-10-13 21:42:15 +02:00
Daiderd Jordan c5a7728152
gdb: disable format hardening 2016-10-13 21:33:07 +02:00
Nahum Shalman 94cf6fbc35 shfmt: 2016-06-16 -> 0.2.0 2016-10-13 15:24:39 -04:00
Jörg Thalheim 0cdc181409 Merge pull request #19500 from romildo/upd.smartgithg
smartgithg: 7_1_2 -> 8_0_3
2016-10-13 21:23:35 +02:00
Vladimír Čunát 56a49e6cda gvfs: fix build after update in 0809aeb47f 2016-10-13 19:32:45 +02:00
Vladimír Čunát 72e0135752 Revert "gtkmm: fix build error by patching missing operator"
This reverts commit 7defda8356.
It breaks the package after update 61c467937b;
2016-10-13 19:32:45 +02:00
dipinhora 6152c1ea7f Re-enable support for OS X 10.10 for darwin. 2016-10-13 11:09:37 -04:00
Domen Kožar 6d9fe5dc8a Revert "nixpkgs: add tested alias for unstable job"
This reverts commit 69e614d1e6.
2016-10-13 17:06:03 +02:00
Graham Christensen 9a668ec58b Merge pull request #19511 from grahamc/mujs
mujs: 2016-02-22 -> 2016-09-21
2016-10-13 08:40:00 -04:00
Daniel Peebles 3e2fe0127b Merge pull request #19437 from gnidorah/master
pakcs: fixed for darwin
2016-10-13 08:08:06 -04:00
Graham Christensen 85c9f014ed
mujs: 2016-02-22 -> 2016-09-21 2016-10-13 07:42:30 -04:00
Jörg Thalheim d5316884e4 Merge pull request #19024 from adnelson/docker_refactor
dockerTools: add docs to docker build functions
2016-10-13 11:50:21 +02:00
Carles Pagès d037837cf9 kodi: link to libva-full
Fixes #19480 (vaapi support)
2016-10-13 11:28:50 +02:00
Frederik Rietdijk ffa65afdcd edk2: use python env 2016-10-13 10:47:07 +02:00
Frederik Rietdijk cffdffe1f6 Merge pull request #19309 from FRidh/outputs
Python: use separate output for tkinter
2016-10-13 10:40:14 +02:00
Frederik Rietdijk 1e544b2993 pythonPackages.tkinter: use this instead of the output python.tkinter 2016-10-13 10:38:21 +02:00
Vladimír Čunát 727fc259d6 Merge branch 'master' into staging 2016-10-13 09:53:16 +02:00
Alex Ivanov 1fa5aceda8 pakcs: fixed for darwin 2016-10-13 09:37:02 +03:00
Alex Ivanov e9e69993b2 swiProlog: fixed for darwin 2016-10-13 09:36:49 +03:00
Alex Ivanov 82986b7369 erlangR16_odbc: fixed for darwin 2016-10-13 09:23:45 +03:00
Alex Ivanov 4e87ea7f73 unixODBC: enable build for darwin 2016-10-13 09:23:14 +03:00
Dan Peebles 9617f61164 xcbuild: init at 49f8a592 2016-10-13 00:32:19 -04:00
Franz Pletz ccd45f8854
audacious: 3.7.2 -> 3.8 2016-10-13 03:19:43 +02:00
Franz Pletz 6adc67d8d7
vaapiIntel: 1.7.0 -> 1.7.2 2016-10-13 03:19:28 +02:00
Franz Pletz cdd019811c
intel-gpu-tools: 1.14 -> 1.16 2016-10-13 03:18:52 +02:00
Franz Pletz 1566fb150e
opusfile: 0.6 -> 0.8 2016-10-13 03:18:46 +02:00
Franz Pletz d514bf3fcc
libsamplerate: 0.1.8 -> 0.1.9 2016-10-13 03:18:42 +02:00
Franz Pletz 29b04017b5
libmpcdec: cleanup, use sha256 hash 2016-10-13 03:18:37 +02:00
Franz Pletz f7454f6a15
libmikmod: 3.3.7 -> 3.3.10 2016-10-13 03:18:32 +02:00
Franz Pletz e50be9ff75
libcue: 1.4.0 -> 2.1.0 2016-10-13 03:18:28 +02:00
Franz Pletz a637b4d950
mumble: 1.2.16 -> 1.2.17 2016-10-13 03:18:23 +02:00
Franz Pletz e8e50bf696
zeroc_ice: 3.6.1 -> 3.6.3 2016-10-13 03:18:17 +02:00
romildo 83d25e490b smartgithg: 7_1_2 -> 8_0_3 2016-10-12 20:15:35 -03:00
Graham Christensen 88a47f1950 Merge pull request #19467 from grahamc/nvidia-x11-master
nvidia-x11: 367.35 -> 367.57
2016-10-12 19:07:29 -04:00
Daniel Peebles 77d1fb94f1 Merge pull request #19470 from copumpkin/fix-sierra
Fix Darwin stdenv to work on Sierra
2016-10-12 19:04:03 -04:00
aszlig 09d3493282
buildLinux/linuxManualConfig: Allow .override
Regression introduced by da36847d92.

The kernelPackages NixOS module option now uses .override to add kernel
patches defined in boot.kernelPatches into the kernel within the
kernelPackages set.

For generic kernels, we already have an .override which comes with
callPackage, but pkgs.linuxManualConfig is a function where we want to
override the attributes passed to it.

The callPackage to manual-config.nix only allows us to override its
internal attributes but not the attributes of the function returned.

Simplified it looks like this:

                                      .----- .override provided by
                                    __|__    callPackage
                                   |     |
(callPackage .../manual-config.nix { ... }) { ... }
                                            |_____|
                                               |
                                  the one -----'
                                  we actually want to override

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2016-10-12 23:52:23 +02:00
Vladimír Čunát af38c05587 stdenv stripHash(): fixup after #19324 2016-10-12 23:45:30 +02:00
Joachim F d4a22b4de3 Merge pull request #19479 from sternenseemann/master
libhttpseverywhere: build api documentation
2016-10-12 22:37:45 +02:00
Joachim F 71fd469d45 Merge pull request #19385 from taku0/android_sdk_sources
androidenv: Add API sources
2016-10-12 22:37:36 +02:00
Dan Peebles f35ab9c2f8 rpm-ostree: 2016.1 -> 2016.10
This also updates a bunch of its dependencies to enable the update,
and gets rid of libhif because upstream stopped maintaining it as
such, instead using it internally in other projects until they can
agree on an interface for it. Nothing seemed to be using libhif so
I'm not too concerned about removing it.
2016-10-12 20:31:02 +00:00
Jörg Thalheim 1371499530 Merge pull request #19486 from Mic92/neovim
python3Packages.neovim: include trollius only for py < 3.4
2016-10-12 20:57:57 +02:00
Jörg Thalheim da32d7ea85
python3Packages.neovim: include trollius only for py < 3.4
trollius breaks python3 because it includes the enum module
2016-10-12 20:56:58 +02:00
Eelco Dolstra ed6006790a libunistring: Do propagate libiconv on non-Linux
Fixes #19492.
2016-10-12 20:26:43 +02:00
zimbatm 985dec611b terraform: 0.7.4 -> 0.7.5 2016-10-12 18:51:16 +01:00
Tim Steinbach d313a114f1 Merge pull request #19488 from peterhoeg/mysqltuner
mysqltuner: init at 1.6.18
2016-10-12 12:41:08 -04:00
Peter Simons ea1a8cf5f0 git-annex: bump to latest version 2016-10-12 17:50:20 +02:00
Tobias Geerinckx-Rice 61a789888a Merge pull request #19482 from peterhoeg/ss
simple-scan: 3.21 -> 3.22
2016-10-12 17:36:35 +02:00
Peter Simons 8c95f0ffaf ghcjs: revert "mark build as broken"
This reverts commit 8f07d4bd78. The build
failure blocking this package has been fixed in the meanwhile. Thanks to
@basvandijk for the heads-up.

(cherry picked from commit 56d033ac1b)
2016-10-12 16:52:41 +02:00
Peter Simons 5925d14525 haddock-library: fix build with GHC 7.10.x
Required by GHCJS.
2016-10-12 16:52:41 +02:00
Peter Simons 7c1d952a56 hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.0.2-12-g87e23de from Hackage revision
d009766695.
2016-10-12 16:52:41 +02:00
Peter Simons 8939e2a26b haskell-nvvm: disable build on Hydra since it depends on unfree cudatoolkit 2016-10-12 16:52:40 +02:00