Florian Friesdorf
bfa0495344
remove old inactive pth file creation for buildInputs
2013-01-15 17:52:53 +01:00
Florian Friesdorf
ed4f0b2657
Merge branch 'channel-nixos' into python
2013-01-15 17:42:48 +01:00
Evgeny Egorochkin
be989567c8
Torsocks is not compatible with certain apps like Kopete. Will integrate both in
...
NixOS.
Revert "removing tsocks as it has been replaced by torsocks."
This reverts commit f947527f184446572ad3e36c4423b23e797aeb5a.
2013-01-15 07:24:08 +02:00
Eelco Dolstra
8497455143
apr-util: Update to 1.5.1
2013-01-14 14:38:24 +01:00
Eelco Dolstra
7fd42a8380
Get rid of the "sf" alias for "sourceforge"
2013-01-14 12:00:32 +01:00
Lluís Batlle i Rossell
982dd693b3
Adding ffmpeg 1.1
...
Moving packages using 1.0 to using 1.1. Vlc built fine here.
2013-01-14 00:41:01 +01:00
Mathijs Kwik
6f90b481db
nss: add yet another mirror to get the patch from
...
the original url throws 500
the mirror's patch differs (probably upgraded for newer nss)
so I found one more source, with a (versioned) url
2013-01-13 14:30:55 +01:00
Mathijs Kwik
67ff54e4e9
iso-codes: upgrade to 3.40
2013-01-13 14:30:54 +01:00
Peter Simons
8d003b28e4
haskell-wai-extra: update to version 1.3.2
2013-01-12 15:30:35 +01:00
Peter Simons
cefe3bf331
haskell-reactive-banana: update to version 0.7.1.1
2013-01-12 15:30:35 +01:00
Peter Simons
a1ac3801dd
haskell-libmpd: update to version 0.8.0.2
2013-01-12 15:30:35 +01:00
Peter Simons
5c4b91506e
haskell-http-conduit: update to version 1.8.6.3
2013-01-12 15:30:35 +01:00
Peter Simons
4d6f490c31
haskell-gitit: update to version 0.10.1.2
2013-01-12 15:30:35 +01:00
Peter Simons
3180c593f0
haskell-cprng-aes: update to version 0.3.4
2013-01-12 15:30:34 +01:00
Peter Simons
bf86b890c8
haskell-cipher-aes: update to version 0.1.7
2013-01-12 15:30:34 +01:00
Florian Friesdorf
24d48d9170
don't put propagated recursivePthLoader into pth file, #257
2013-01-11 18:04:27 +01:00
Sander van der Burg
ed78245478
Merge branch 'master' of github.com:NixOS/nixpkgs
2013-01-11 18:02:58 +01:00
Sander van der Burg
f2c66f54e6
Fix compliation of gts on Darwin
2013-01-11 18:02:36 +01:00
Florian Friesdorf
a7a6173a3f
pygtk in pythonPackages, checks disabled, demo works, relates #223
...
Previously the checkPhase was not executed. It is now and a couple of
issues with it are seded away.
2013-01-11 17:45:26 +01:00
Florian Friesdorf
59879f6496
fixup: pygobject rename pth
2013-01-11 16:11:07 +01:00
Florian Friesdorf
e856c72159
pygobject: in pythonPackages, removed hack handled now by pth
2013-01-11 15:30:56 +01:00
Florian Friesdorf
87423443b8
pycairo: move to pythonPackages
2013-01-11 15:23:44 +01:00
Florian Friesdorf
a59164e931
modules propgate recursivePthLoader
...
An alternative would be to include it with the plain `python`.
2013-01-11 10:54:25 +01:00
Florian Friesdorf
212b4df91c
recursivePthLoader included via wrapper, not propagated by modules
2013-01-11 09:53:28 +01:00
Florian Friesdorf
4329ba3fb1
Merge branch 'channel-nixos' into python
2013-01-11 07:35:30 +01:00
Lluís Batlle i Rossell
7e1d0c12a3
stuntrally: updating from 1.4 to 1.8
...
I updated ogre and mygui, too. Now myguiSvn is older than mygui.
We should check if this commit breaks other games that use ogre (ror?)
2013-01-10 15:11:12 +01:00
Florian Friesdorf
42d49b47ba
comment unneeded buildInputStrings
2013-01-10 12:50:17 +01:00
Florian Friesdorf
0f52f5a945
Revert "don't propagate recursivePthLoader, it is needed to process it already"
...
This reverts commit edd160452e0c17bb5b0f07693dc1a1a4dd2dd511.
If we propagate it, derivations that use a python package will also
get the recursivePthLoader needed to process the pth files of the
package.
2013-01-09 22:29:46 +01:00
Florian Friesdorf
1cd2bd460b
whitespace
2013-01-09 22:29:41 +01:00
Florian Friesdorf
06ca1e4768
Merge branch 'channel-nixos' into python
2013-01-09 22:18:38 +01:00
Peter Simons
1036942197
haskell-dimensional-tf: add version 0.1.1
2013-01-09 17:08:51 +01:00
Peter Simons
9e1df1ada3
haskell-numtype-tf: add version 0.1
2013-01-09 17:08:17 +01:00
Peter Simons
029439c0f6
haskell-type-level-natural-number: add version 1.1.1
2013-01-09 16:57:46 +01:00
Peter Simons
aeef9a1ed4
haskell-warp: update to version 1.3.7
2013-01-09 16:54:31 +01:00
Peter Simons
65fe988502
haskell-multiarg: update to version 0.8.0.0
2013-01-09 16:54:31 +01:00
Peter Simons
7004eced83
haskell-monoid-extras: update to version 0.2.2.2
2013-01-09 16:54:31 +01:00
Peter Simons
c080c85572
haskell-lens: update to version 3.7.3
2013-01-09 16:54:31 +01:00
Peter Simons
8d1e639df2
haskell-dual-tree: update to version 0.1.0.1
2013-01-09 16:54:30 +01:00
Peter Simons
be8637c1f7
haskell-diagrams-lib: update to version 0.6.0.1
2013-01-09 16:54:30 +01:00
Peter Simons
ef4706675c
haskell-diagrams-core: update to version 0.6.0.1
2013-01-09 16:54:30 +01:00
Peter Simons
3b4b0d56be
haskell-active: update to version 0.1.0.3
2013-01-09 16:54:30 +01:00
Peter Simons
90952495db
haskell-naturals: add version 0.2.0.2
2013-01-09 16:54:29 +01:00
Peter Simons
59aa248876
haskell-nat: add version 0.3
2013-01-09 16:54:29 +01:00
Rob Vermaas
cfdf35d6f9
Add preInstall ot buildPythonPackage (postInstall already existed) to allow selenium to work properly again.
2013-01-09 15:46:14 +01:00
Florian Friesdorf
0f007baf70
Merge branch 'channel-nixos' into python
2013-01-09 10:44:45 +01:00
Florian Friesdorf
a37cabdbb7
fix python-2.6 build: purity for systems with stdenv.gcc.libc
...
On other systems python26 will continue to look for
/usr/include/netinet/in.h among others. I don't know whether/what to
do about that.
2013-01-09 08:45:03 +01:00
Florian Friesdorf
56517508d8
python-2.6.8: long overdue
2013-01-09 08:44:58 +01:00
Florian Friesdorf
ee0204d2c8
for some reason the python2.6 manpage is not gzipped
2013-01-09 08:27:39 +01:00
Florian Friesdorf
723d5a5581
fix python-2.6 build: purity for systems with stdenv.gcc.libc
...
On other systems python26 will continue to look for
/usr/include/netinet/in.h among others. I don't know whether/what to
do about that.
2013-01-09 08:26:15 +01:00
Florian Friesdorf
16e2a9133f
python-2.6.8: long overdue
2013-01-09 08:06:46 +01:00
