1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-25 23:20:55 +00:00
Commit graph

393 commits

Author SHA1 Message Date
aszlig 78ef5f9c14
nixpart: Move all 0.4 dependencies into one dir.
Once nixpart 1.0 is released we then only need to delete one single
directory rather than searching for needles in a haystack, that is, all
of <nixpkgs>. Also, it keeps my sanity at an almost healthy level.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-10-22 08:22:59 +02:00
aszlig cff26e2d38
nixos: Add VM test for blivet.
I'm really not sure whether these tests are actually run upstream,
because there are quite a few oddities which either are my fault by just
missing something important or upstream really doesn't bother to run
those tests.

One example of this are testDiskChunk1 and testDiskChunk2, which create
two non-existing partitions and tries to allocate them. Now, in
allocatePartitions(), the partedPartition attributes are reset to None
and shortly afterwards a for loop is expecting it to be NOT None.

So, for now I'm disabling these tests and will see if we stumble on them
during work on nixpart 1.0, so we're really sure whether it's my fault
or a real bug in blivet.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-10-22 08:22:58 +02:00
aszlig cb2c34f1bb
blivet: Update to new upstream version 0.67.
Put a copy of old version 0.17 expression into 0.17.nix and update the
pointers from nixpart0 accordingly.

This also means, that plain nixpart is now way more broken than
nixpart0 (we might want to temporarily fix 0.4 anyway).

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-10-22 08:22:57 +02:00
Nikolay Amiantov 307af9148b use rpmextract in some packages 2014-10-20 03:16:59 +04:00
Rok Garbas 602f7e5aa4 python: collision in names when developing 2 and more python packages with nix
when you run nix-shell 2 times at the same time of project (but different
branches) you get collision in names inside /tmp folder. i solved this by
hashing current path of developing folder and using that as indentifier while
still keeping name at the end.

diff --git a/pkgs/development/python-modules/generic/default.nix
b/pkgs/development/python-modules/generic/default.nix index 4c9c53a..6ec7934
100644 --- a/pkgs/development/python-modules/generic/default.nix +++
b/pkgs/development/python-modules/generic/default.nix @@ -161,11 +161,12 @@ if
disabled then throw "${name} not supported for interpreter ${python.executabl

   shellHook = attrs.shellHook or ''
     if test -e setup.py; then
-       mkdir -p /tmp/$name/lib/${python.libPrefix}/site-packages
+       tmp_path=/tmp/`pwd | md5sum | cut -f 1 -d " "`-$name
+       mkdir -p $tmp_path/lib/${python.libPrefix}/site-packages
        ${preShellHook}
-       export PATH="/tmp/$name/bin:$PATH"
-       export PYTHONPATH="/tmp/$name/lib/${python.libPrefix}/site-packages:$PYTHONPATH"
-       ${python}/bin/${python.executable} setup.py develop --prefix /tmp/$name
+       export PATH="$tmp_path/bin:$PATH"
+       export PYTHONPATH="$tmp_path/lib/${python.libPrefix}/site-packages:$PYTHONPATH"
+       ${python}/bin/${python.executable} setup.py develop --prefix $tmp_path
        ${postShellHook}
     fi
   '';
2014-09-19 14:23:45 +02:00
Domen Kožar cee221bc84 setuptools: 2.1 -> 5.8 2014-09-18 14:03:16 +02:00
Domen Kožar 2632afa131 pypy: handle unsupported packages 2014-09-12 00:26:50 +02:00
Domen Kožar 33ce850b82 fix a bunch of packages with lua5_1 2014-09-10 17:24:56 +02:00
Domen Kožar c6fa90f322 rbtools: 0.4.1 -> 0.6.1 2014-09-10 15:41:07 +02:00
Andreas Herrmann 970f51ac0a mpi4py: Disable for Python3 and PyPy
Builds for Python3 and PyPy are failing at the moment [1-3]. Therefore, they
are disabled.

[1]: https://github.com/NixOS/nixpkgs/pull/3938#issuecomment-54750065
[2]: http://hydra.nixos.org/build/13993137/nixlog/1/raw
[3]: http://hydra.nixos.org/build/13873028/log/raw
2014-09-07 19:44:08 +02:00
Domen Kožar 0418d8299d disable a bunch of python packages on pypy 2014-09-06 22:25:00 +02:00
Andreas Herrmann 4cae816420 h5py: Change description 2014-09-04 18:48:08 +02:00
Andreas Herrmann 3a38a9b127 mpi4py: Change description 2014-09-04 18:47:57 +02:00
Andreas Herrmann 9ac9a06f13 h5py: Adhere to package description convention 2014-09-03 21:32:42 +02:00
Andreas Herrmann f50c5602e9 mpi4py: Adhere to package description convention 2014-09-03 21:32:36 +02:00
Andreas Herrmann 728793ef0b h5py: New package, version 2.3.1 2014-09-02 13:56:54 +02:00
Andreas Herrmann 1e786087e4 mpi4py: New package, version 1.3.1 2014-09-02 13:56:47 +02:00
Domen Kožar 7e91d1c8a1 Revert "mpi4py: New package, version 1.3.1"
This reverts commit 63c062947e.

Doesn't build.
2014-08-31 15:12:34 +02:00
Domen Kožar b63496ba6b Revert "h5py: New package, version 2.3.1"
This reverts commit 3c6afb3496.

Doesn't build.
2014-08-31 15:12:17 +02:00
Michael Raskin 0078bc5d8f Merge pull request #3316 from aherrmann/pr_mpi
MPI support for HDF5 and SGE support for OpenMPI
2014-08-29 01:22:02 +04:00
Domen Kožar 62345fee55 python: provide better message if python interpreter is not supported 2014-08-27 15:53:15 +02:00
Domen Kožar 0a1d52711b pygtk: disable on py3k 2014-08-26 14:41:44 +02:00
Domen Kožar 6417cf14b1 python3Packages.BTrees: fix build on i686-linux 2014-08-26 10:47:22 +02:00
Bjørn Forsman c9baba9212 Fix many package descriptions
(My OCD kicked in today...)

Remove repeated package names, capitalize first word, remove trailing
periods and move overlong descriptions to longDescription.

I also simplified some descriptions as well, when they were particularly
long or technical, often based on Arch Linux' package descriptions.

I've tried to stay away from generated expressions (and I think I
succeeded).

Some specifics worth mentioning:
 * cron, has "Vixie Cron" in its description. The "Vixie" part is not
   mentioned anywhere else. I kept it in a parenthesis at the end of the
   description.

 * ctags description started with "Exuberant Ctags ...", and the
   "exuberant" part is not mentioned elsewhere. Kept it in a parenthesis
   at the end of description.

 * nix has the description "The Nix Deployment System". Since that
   doesn't really say much what it is/does (especially after removing
   the package name!), I changed that to "Powerful package manager that
   makes package management reliable and reproducible" (borrowed from
   nixos.org).

 * Tons of "GNU Foo, Foo is a [the important bits]" descriptions
   is changed to just [the important bits]. If the package name doesn't
   contain GNU I don't think it's needed to say it in the description
   either.
2014-08-24 22:31:37 +02:00
Domen Kožar ecb77869d2 pythonPackages.pil: put it inside python-packages.nix and disable on py3k 2014-08-24 16:55:15 +02:00
Domen Kožar 47673e43c9 buildPythonPackage: introduce "disabled" argument
Useful to disable the package for specific python versions.

Typically usage: disable = isPy3k;
2014-08-24 16:02:57 +02:00
Domen Kožar 9cbc216576 pypyPackages.pycrypto: make it work 2014-08-23 19:18:27 +02:00
Domen Kožar f1a1c89f50 PIL: use python executable names 2014-08-23 19:18:27 +02:00
ambrop7@gmail.com 8516495560 python-pyuv: new package
Pyuv is a Python interface to libuv, a cross-platform asychronous I/O
library.

The setup.py is tweaked to that the system version of libuv is used,
instead of tying to fetch one with git.

[Bjørn: change commit message]
2014-08-22 21:57:14 +02:00
Vladimír Čunát 566058b477 Merge #3152: add pyqt5 2014-08-12 20:33:34 +02:00
Lluís Batlle i Rossell 5e35fef0eb freecad: updating to 0.14
I had to update all the pyside programs, or freecad failed to build.  I picked
the versions advertised in http://qt-project.org/wiki/PySideDownloads . The
rest I took for github latest releases.
2014-08-01 16:56:27 +02:00
aszlig 21a2f99dd3
python-wrapper: Fix handling of line breaks.
Not really critical for anything we have in <nixpkgs> I guess, but
skipping lines three times really was a workaround and we're better off
just appending the lines ending with backslash to the pattern space so
we can accumulate all the crap until the last line of crap (crap, that
is "broken lines").

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-07-29 06:53:17 +02:00
aszlig ff15c31c37
python-wrapper: Fix handling __future__ imports.
The bazaar package is still broken even with 5f01cc7, because __future__
imports need to be the first imports before anything else. So this time
I'm going to make the sed expression with explicit branching so we can
properly match all the occasions we want to skip and insert the line
modifying sys.argv[0] only _once_ and leave the command block after
that one substitution. So no ugly swaps between hold and pattern space.

The label which is resonsible for not escaping the command block is "r"
and we jump to it as long as we need to skip something from the start of
the file.

While at it, I'm not only skipping every line with __future__ in it but
also backslashes at the end of the line, so for example:

```python
from __future__ import shiny_feature1, \
                       shiny_feature2, \
                       shiny_feature3
```

... will now be properly skipped as well.

Tested against bazaar and nixops.

Thanks to @edolstra for reporting this.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-07-29 06:40:39 +02:00
Mateusz Kowalczyk 7a45996233 Turn some license strings into lib.licenses values 2014-07-28 11:31:14 +02:00
aszlig 5f01cc70d3
python-wrapper: Fix fixup for wrapped argv[0].
Fixes issues introduced by 24ef871e6a.

The problem here is that "import sys; sys.argv[0] = ..." is just
appended after the first "#!", which in turn breaks things such as
encoding specifications. A second problem - although not very common -
is when there's another #! within the script.

This should take care of both cases.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-07-28 04:18:21 +02:00
Christian Theune 24ef871e6a python: fix argv[0] for wrapped console_scripts.
Previously programs would see '.<program>-wrapped' as their program name. This is a workaround
but should be reasonably safe and reliable.
2014-07-27 13:23:15 +02:00
Sven Keidel 4ef371e1f6 added platform meta information to gpodder 2014-07-22 09:39:06 +02:00
Sven Keidel ee9ffde1cb added metainformation for gpodder and mygpoclient 2014-07-21 21:41:27 +02:00
Sven Keidel eeeed00950 added gpodder package 2014-07-20 21:14:00 +02:00
Andreas Herrmann 3c6afb3496 h5py: New package, version 2.3.1
A pythonic interface to the hdf5 library. It also supports parallel hdf5.
2014-07-18 22:41:56 +02:00
Andreas Herrmann 63c062947e mpi4py: New package, version 1.3.1
Python wrapper for the message passing interface standard.

Currently building without mpe, or vampir-trace support.
2014-07-18 22:41:56 +02:00
宋文武 f44c056490 add pyqt5 2014-07-07 14:23:55 +08:00
宋文武 05c0bb929e add sip-4.16.1 2014-07-07 14:20:15 +08:00
Andreas Herrmann ddfdd85171 tables: Define license 2014-07-05 21:41:04 +02:00
Florian Friesdorf ba654b9368 Merge pull request #3056 from aherrmann/pr_tables
Python module tables
2014-06-23 22:58:04 +02:00
Bjørn Forsman 686d847ee2 4suite: mark as broken
None of the tools installed to bin/ work. They all throw an exception
similar to this:
  ImportError: No module named Ft.Xml.XPath._4xpath
2014-06-22 20:52:52 +02:00
Andreas Herrmann 52762ed416 tables: add new package, version 3.1.1
From the project page [1]:
> PyTables is a package for managing hierarchical datasets and designed to
> efficiently and easily cope with extremely large amounts of data.

It offers read/write access to hdf5 archives through a hierarchical interface.

I am adding it, because pandas depends on tables for hdf5 read/write
functionality.

Note: The name is a bit of an issue. The project is called pytables, whereas
the python module is simply called tables. I chose to name the nix-expression
tables for consistency with the source-tarball and the module name.

[1]: http://www.pytables.org/moin
2014-06-22 20:05:21 +02:00
Domen Kožar 0d71d2b631 fixes #2926 2014-06-15 16:05:18 +02:00
Vladimír Čunát e1775895a6 Merge #2711: add ansible-1.6.1
Conflicts (trivial):
	lib/maintainers.nix
2014-06-11 20:29:55 +02:00
Michael Raskin cc13182795 Create a PIL symlink when installing PIL so the recommended way of importing PIL.something works 2014-06-11 10:01:15 +04:00