Commit Graph

319 Commits

Author SHA1 Message Date
Domen Kožar
567e67f05f bash doesn't allow comments between multiline statements 2014-02-20 01:19:16 +01:00
Domen Kožar
fa98edf2b1 fix eval 2014-02-20 01:19:16 +01:00
Domen Kožar
b1ffb9ede4 buildPythonPackage: Add --old-and-unmanageable flag to install command and add more docs.
For explanation see inline comments.
2014-02-20 01:19:16 +01:00
Domen Kožar
c80feaf542 document setuptools monkeypatching and DETERMINISTIC_BUILD=1 2014-02-20 01:19:16 +01:00
Domen Kožar
21ada5b105 garden 2014-02-20 01:19:16 +01:00
Domen Kožar
ab6865c3a4 distutils.cfg: name as others coding conventions for python packages 2014-02-20 01:19:15 +01:00
Domen Kožar
7cdab2c024 pythonPackages.setuptools: 2.0.2 -> 2.1 2014-02-20 01:19:15 +01:00
Domen Kožar
fae6079a01 adopt rest of the packages that were failing with the buildPythonPackage changes 2014-02-20 01:19:15 +01:00
Domen Kožar
6adfd13dd4 adopt setuptools to new python infrastructure (also make sure we unzip setuptools while building) 2014-02-20 01:19:15 +01:00
Domen Kožar
bf5d6fb9b1 Refactor buildPythonPackage to modularize building process.
Before we used `easy_install` command to handle installation
in one shot, now this is split into two phases:

 - buildPhase: python setup.py build
 - installPhase: python setup.py install

Each of those commands have the ability to pass extra
parameters through buildPythonPackage parameters as
`setupPyInstallFlags` and `setupPyBuildFlags`.

Phases now correctly execute post/pre hooks.

In configurePhase we inject setuptools dependency before distutils
is imported to apply monkeypatching by setuptools that is needed
for special features to apply.

We don't have to reorder default phases anymore, as test
phase comes after build and that works.

I rewrote offineDistutils into distutils-cfg with a bit cleaner
syntax and ability to specify extraCfg to the config file.

Plone packages are failing and garbas said he will adopt them to
the new functions. The rest of the packages I fixed and these commits
shouldn't break any package (according to my testings) and they introduce
16 new jobs and fix 38 that were broken before.
2014-02-20 01:19:15 +01:00
Domen Kožar
29b7f2e182 setuptools: remove obsolete patch 2014-02-20 01:19:15 +01:00
Domen Kožar
6cbc1d554f remove unused setuptools/site.nix 2014-02-20 01:19:14 +01:00
William A. Kennington III
bdb842d5eb Move all db4 packages to the default db5 2014-02-15 12:03:02 +01:00
Petr Rockai
63478d9590 Add fedpkg, koji &c. + their python dependencies. 2014-02-08 14:37:53 +01:00
Linquize
206b276fed Add pycangjie
[Bjørn Forsman <bjorn.forsman@gmail.com>: expression cleanup]
2014-02-02 14:54:40 +01:00
Oliver Charles
8ab1160079 pythonPackages.tarsnapper: New expression 2014-01-25 10:30:35 +00:00
Eelco Dolstra
e07ce3314d Fix some "meta.licenses" attributes 2014-01-25 03:04:46 +01:00
Vladimír Čunát
15a19994c9 kde4(10).pykde4: fix build via downgrading sip and pyqt4
Cf. 501008ad6f (commitcomment-5080684)
2014-01-16 08:59:31 +01:00
Song Wenwu
501008ad6f pyqt4: update to 4.10.3 and add python3 support
also add python3 support for dbus-python
2014-01-11 20:07:29 +01:00
Song Wenwu
98d2f7ea45 sip: update to 4.15.4 and add python3 support 2014-01-11 20:07:28 +01:00
Vladimír Čunát
7cce1ff58b Merge pull request #1462 from ktosiek/pr/dfeet
Add d-feet, a DBus debugger
2014-01-07 05:54:43 -08:00
Sander van der Burg
ad8974fc53 Disable test for setuptools on darwin, and add darwin to supported platforms for serf. This should make nodejs working on darwin again 2014-01-06 14:12:37 +01:00
Tomasz Kontusz
14eba9f3f9 Bump libwnck3 and pygobject3, and enable introspection 2014-01-05 23:50:25 +01:00
Domen Kožar
c73f118af6 setuptools: 0.9.8 -> 2.0.2 2013-12-29 19:15:36 +01:00
Vladimír Čunát
50ac037864 Merge master into x-updates 2013-12-23 19:27:14 +01:00
Mathijs Kwik
5e2921df64 bsddb3: upgrade to 6.0.1
should be backward compatible with all bdb 3 and 4 versions
2013-12-23 10:25:16 +01:00
Vladimír Čunát
4c5a71f777 Merge master into x-updates
Conflicts:
	pkgs/desktops/gnome-2/desktop/gvfs/default.nix
	pkgs/development/libraries/cogl/default.nix
	pkgs/development/libraries/libsoup/2.44.nix
2013-12-18 23:21:29 +01:00
Evgeny Egorochkin
c53d8c81f5 pycrypto: remove version 2.5 since it's vulnerable to CVE-2012-2417, CVE-2013-1445 2013-12-13 11:13:23 +02:00
Vladimír Čunát
6690c97569 Merge branch 'master' into x-updates
Conflicts (just different styles, same semantics):
	pkgs/development/libraries/libusb1/default.nix
2013-12-07 14:17:16 +01:00
Nixpkgs Monitor
a830c0eb9d pyopenssl: update from 0.13 to 0.13.1, potentially fixes CVE-2013-4314 2013-12-04 05:26:34 +02:00
Nixpkgs Monitor
e3f69c5dcc python33Packages.pycrypto: update from 2.6 to 2.6.1, potentially fixes CVE-2013-1445 2013-12-04 05:25:38 +02:00
Vladimír Čunát
b5fba47147 Merge branch master into x-updates
Conflicts (not used, deleted):
	pkgs/desktops/xfce/common.nix
2013-11-23 10:22:26 +01:00
Rok Garbas
d14831c5da zc_buildout_nix: update to 2.2.1 2013-11-21 12:30:04 +01:00
Vladimír Čunát
017b36a5df dbus_python: update 1.1.1 -> 1.2.0 2013-11-17 15:10:46 +01:00
Cillian de Róiste
bfac9f828e Bugfix: zc_buildout_nix, replace links to eggs in the store which have been gc-ed 2013-10-08 01:51:24 +02:00
Eelco Dolstra
2147a07938 Fix a bunch of Hydra evaluation errors 2013-10-07 17:36:47 +02:00
Bjørn Forsman
083d0890f5 More description fixes
* Remove package name
* Start with upper case letter
* Remove trailing period

Also reword some descriptions and move some long descriptions to
longDescription.

I'm not touching generated packages.
2013-10-06 12:01:38 +02:00
aszlig
ae47ba445c
python-gyp: Fix no-xcode.patch for Darwin.
The last hunk of the patch doesn't apply anymore and causes a build
failure on Darwin systems:

https://hydra.nixos.org/build/6294943

Fixed the hunk manually.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-09-27 15:52:44 +02:00
aszlig
ad4156e497
python-blivet: Fix udev path for Debian Wheezy.
Only affects "useNixUdev = false" and we now include the udev paths for
the latest Debian Wheezy release, so we can properly deploy Hetzner
machines with NixOps again as they've updated their rescue system to
Wheezy.

This fixes NixOS/nixops#137, thanks to @lovek323 for reporting.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-09-20 13:13:37 +02:00
Bjørn Forsman
cadc9a03a7 recursive-pth-loader: fix python path
This should work for both python2 and python3.
2013-09-08 22:07:20 +02:00
Ricardo M. Correia
5f3b19e661 recursive-pth-loader: build sitecustomize.pyc
If this file is not created at build time, then python (when run as root) will
create it at run time and mess up the consistency of the nix store.
2013-09-08 21:21:28 +02:00
Cillian de Róiste
01cc4301f3 Add a patched version of buildout 2.2.0 for development with nix
Without this patch buildout will copy eggs from the nix store into the
./eggs directory and then try to compile them. This fails because they
are read only. This patch changes the behaviour to create symlinks to
eggs available in the nix store instead of copying them, and not to
try to compile the eggs in the store. To differentiate this from the
default buildout (which may be provided otherwise e.g. as a
dependency) the executable is renamed to buildout-nix.

This can be used in conjuntion with myEnvFun to create development
environments which make use of the python modules available in the
store while downloading any additional required eggs. A pleasant side
effect is that you can conveniently replace the symlink with a copy
for debugging purposes.
2013-08-28 00:26:06 +02:00
Domen Kožar
7ef49ddee5 setuptools: add note why darwin tests are disabled 2013-08-23 12:41:19 +02:00
Jason "Don" O'Conal
32a3516b2c pythonPackages.googlecl: add expression 2013-08-06 09:43:57 +10:00
aszlig
9b9fa35ebd
blivet: Update sha256, as it changed upstream.
The sha256 was magically changed upstream with the same contents but
different timestamps, so let's update it. Thanks to @rbvermaa for
noticing.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-08-02 10:59:06 +02:00
Domen Kožar
332dd4854f Move namePrefix="" python packages out of python-packges.nix
It doesn't make sense to build tools/applications with three different
python interpreter versions, so move them out of python modules list.

Also reverts 53ffc6e0ef.
2013-07-31 13:34:11 +02:00
Domen Kozar
7458f29dc9 don't wrap scripts in EGG-INFO/scripts since they are called from python 2013-07-29 19:31:58 +02:00
Domen Kozar
918e5efb99 recurse into python33 and pypy packages 2013-07-29 14:52:19 +02:00
Domen Kozar
4993f07fee python: include python version when prefixing python packages 2013-07-29 12:09:06 +02:00
Domen Kozar
5ec6cf3756 add python3 support to pythonPackages 2013-07-29 12:09:06 +02:00