1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-02 10:31:36 +00:00
Commit graph

26076 commits

Author SHA1 Message Date
Frederik Rietdijk b33d3cca02 ecryptfs: use python2
print statement
2016-10-18 23:16:04 +02:00
Frederik Rietdijk 37eba07810 firefox: drop pysqlite dependency
since our interpreter ships with sqlite
2016-10-18 23:16:04 +02:00
Frederik Rietdijk 36b4dc54bb Python: bring back pythonFull
As there could be quite some users depending pythonFull.
2016-10-18 23:15:59 +02:00
Frederik Rietdijk 365762fcb5 pythonPackages.colored: disable tests 2016-10-18 23:14:36 +02:00
Frederik Rietdijk 57e5b78a2a pythonPackages.gevent-websocket: disable python3 2016-10-18 23:14:36 +02:00
Frederik Rietdijk e979855566 ansible: use python2 2016-10-18 23:14:34 +02:00
Frederik Rietdijk 1d12d20bcf pythonPackages.consul: broken 2016-10-18 23:14:34 +02:00
Frederik Rietdijk ba28ce748a pythonPackages.mitmproxy: broken 2016-10-18 23:14:34 +02:00
Frederik Rietdijk f17f64d203 http-parser: use python2 2016-10-18 23:14:34 +02:00
Frederik Rietdijk 77fa967363 pythonPackages.gyp: disabled on Python 3.x 2016-10-18 23:14:34 +02:00
Frederik Rietdijk 6b05584176 pythonPackages.ofxtools: broken 2016-10-18 23:14:33 +02:00
Frederik Rietdijk e0e29e249a pythonPackages.gcutil: broken 2016-10-18 23:14:33 +02:00
Frederik Rietdijk 053dd436c9 pythonPackages.pypdf2: disable tests 2016-10-18 23:14:33 +02:00
Frederik Rietdijk 161df3f276 pythonPackages.thumbor: broken 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 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
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
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
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 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
Vladimír Čunát 6eeea6effd Python: more evaluation fixups. 2016-10-14 00:03:12 +02:00
Frederik Rietdijk efb6052f40 Python: fixup modules that were removed 2016-10-13 22:11:30 +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
Domen Kožar 6d9fe5dc8a Revert "nixpkgs: add tested alias for unstable job"
This reverts commit 69e614d1e6.
2016-10-13 17:06:03 +02:00
Daniel Peebles 3e2fe0127b Merge pull request #19437 from gnidorah/master
pakcs: fixed for darwin
2016-10-13 08:08:06 -04:00
Carles Pagès d037837cf9 kodi: link to libva-full
Fixes #19480 (vaapi support)
2016-10-13 11:28:50 +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
Alex Ivanov 82986b7369 erlangR16_odbc: fixed for darwin 2016-10-13 09:23:45 +03:00
Dan Peebles 9617f61164 xcbuild: init at 49f8a592 2016-10-13 00:32:19 -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
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
Tim Steinbach d313a114f1 Merge pull request #19488 from peterhoeg/mysqltuner
mysqltuner: init at 1.6.18
2016-10-12 12:41:08 -04:00
Tim Steinbach 259dcac753 Merge pull request #19484 from peterhoeg/vala
vala: unify builders for various versions
2016-10-12 09:32:38 -04:00
Peter Hoeg 7849677a70 mysqltuner: init at 1.6.18 2016-10-12 21:26:53 +08:00
Peter Hoeg a6d1d06a95 vala: unify builders for various versions
We are currently carrying a number of vala versions where each version
is essentially just a copy of the earlier version.

This PR gets rid of a ton of duplication and uses a standard builder.

Secondly, we add a definition for the latest vala 0.34.1.

Lastly, we add a generic "vala" that refers to the latest stable
version.

I have tried changing the definitions for "simple-scan" and "valum" to use
the latest vala version and they at least compile OK so I'll try a
massive sed job to replace all the definitions later to simply use the
latest version through "vala" instead of specifying a version directly.

According to upstream:

"Well-maintained packages are expected to always build with the latest
stable Vala version."

Maybe this means that my generic builder is then no longer necessary. Oh well...

I added myself to the maintainer array for vala although I have no
interest in the language - this was purely a nix exercise for me but I
thought it was reasonable to be the one to clean up the mess if this has
side effects...

Cc: @antono and @lethalman
2016-10-12 21:12:05 +08:00
Robin Gloster b743ddf8f9
sslscan: enable ssl2 checking 2016-10-12 14:36:41 +02:00
Robin Gloster 9838b80e91 docker-distribution: init at 2.5.1 2016-10-12 14:05:09 +02:00
Jörg Thalheim 9079bc08e5 Merge pull request #19362 from davorb/purple-facebook
purple-facebook: init at 66ee77378d82
2016-10-12 13:38:34 +02:00
Franz Pletz 8a59ad167e atlassian-crowd: init at 2.10.1 2016-10-12 13:17:24 +02:00