Commit Graph

42302 Commits

Author SHA1 Message Date
Georges Dubus
f72fdbd885 Merge pull request #4124 from k0ral/glances
Upgraded glances package to v2.1, and packaged its dependencies.
2014-09-19 14:42:26 +02:00
Peter Simons
ee4a606cdf Merge pull request #4165 from ftrvxmtrx/pcalc
added pcalc package
2014-09-19 14:42:07 +02:00
Peter Simons
93884f2d23 Merge pull request #4163 from Twey/tasty-program
New Haskell package: tasty-program
2014-09-19 14:40:36 +02: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
96f4a47199 graphite_api: disable on pypy 2014-09-19 14:07:27 +02:00
lostdj
639e8ddeec bittorrentsync: bump from 1.3.94 to 1.4.82. 2014-09-19 15:47:31 +04:00
Siarhei Zirukin
00298c7bba added pcalc package 2014-09-19 13:31:52 +02:00
cillianderoiste
1b8d79e0b2 Merge pull request #4143 from geerds/cask
Add "cask" package
2014-09-19 13:23:28 +02:00
James ‘Twey’ Kay
e4e5b17b8d Add tasty-program to haskell-packages 2014-09-19 12:18:37 +01:00
Peter Simons
bbca3a51a7 Merge pull request #4090 from michelk/r-jsonlite
r-jsonlite: update to 0.9.11
2014-09-19 12:41:00 +02:00
Peter Simons
d236e61327 Merge pull request #4091 from michelk/r-gdal-geos
r-rgdal/rgeos: adding gdal geos and proj as dependency
2014-09-19 12:40:43 +02:00
Peter Simons
2a54f52b22 coq_HEAD: Revert "update to latest Git version"
This reverts commit bf009f87a9. The update
breaks the build.
2014-09-19 12:29:07 +02:00
Peter Simons
58e233afbe Merge pull request #4159 from ftrvxmtrx/erlang-17.3
erlang/R17: update to 17.3
2014-09-19 12:26:10 +02:00
lethalman
76c4278014 Merge pull request #4154 from k0ral/termite
Added termite package and updated vte to be compatible.
2014-09-19 12:24:53 +02:00
James Cook
4d8d902e0c curl: update to 7.38.0, including security (#4161)
Fixes CVE-2014-3620 and CVE-2014-3613.
2014-09-19 11:53:08 +02:00
Vladimír Čunát
84b791ddd8 libav: update all branches, probably with security fixes
(cherry picked from commit ead6603b60)
2014-09-19 11:51:28 +02:00
James ‘Twey’ Kay
6b40a3aa17 New Haskell package: tasty-program 2014-09-19 10:30:55 +01:00
Cillian de Róiste
74f6be0e5f monero: only build on x86_64-linux, fails for i686 on hydra 2014-09-19 10:50:24 +02:00
Siarhei Zirukin
56106d8e4c erlang/R17: update to 17.3 2014-09-19 09:23:28 +02:00
Aristid Breitkreuz
64c156d198 Merge pull request #4156 from ambrop72/virtualbox-4.3.16
Update VirtualBox to 4.3.16.
2014-09-19 08:30:46 +02:00
Shea Levy
e0cd3ac03c strongswan: Fix some hard-coding 2014-09-19 01:09:00 -04:00
Nikolay Amiantov
f7ae09b5af wrapFirefox: add support for firefox.icedtea 2014-09-19 06:15:06 +04:00
Moritz Ulrich
05c02b06f7 Leiningen: Bump to 2.5.0. 2014-09-19 00:29:16 +02:00
ambrop7@gmail.com
f8738a6d09 Update VirtualBox to 4.3.16. 2014-09-18 23:43:11 +02:00
koral
2a56f3d3f3 Added termite package and updated vte to be compatible. 2014-09-18 23:29:58 +02:00
koral
867575b78e Upgraded glances package to v2.1, and packaged its dependencies.
Disabled glances for pypy.
2014-09-18 23:13:17 +02:00
Bjørn Forsman
f6148e10a3 grails: new package
Grails is an Open Source, full stack, web application framework for the
JVM. It takes advantage of the Groovy programming language and
convention over configuration to provide a productive and stream-lined
development experience.

http://grails.org/
2014-09-18 22:57:03 +02:00
Peter Simons
aa67e95bb5 haskell-here: revert "new expression"
This reverts commit 3e5bcdc327. The
package doesn't compile.
2014-09-18 21:16:44 +02:00
Russell O'Connor
88b7d32bee Comment on optional dependencies for Gnupg. 2014-09-18 14:55:49 -04:00
Russell O'Connor
2b4e35bfd3 Remove unmaintained gnupg2_1. 2014-09-18 14:46:54 -04:00
Moritz Ulrich
7f7505c620 dwarf-fortress: Bump to 0.40.13. 2014-09-18 20:41:54 +02:00
William A. Kennington III
194419244d radvd: 2.6 -> 2.7 2014-09-18 11:26:01 -07:00
Eelco Dolstra
ee082af1e0 Merge pull request #4151 from lostdj/ltp/master/tzdata2014g
tzdata: bump to 2014g
2014-09-18 18:37:37 +02:00
lethalman
ef8ac7fec4 Merge pull request #4147 from cstrahan/ruby-interp-fixes
Fix the new Ruby interpreters (fixes #3509).
2014-09-18 18:21:27 +02:00
lostdj
4dce30e510 tzdata: bump to 2014g. 2014-09-18 20:21:26 +04:00
Joachim Schiele
5b17ce8675 Merge pull request #4149 from qknight/dog
dog-1.7: added potential cat replacement
2014-09-18 18:08:55 +02:00
Joachim Schiele
03b411d968 Merge pull request #4150 from qknight/dfc
dfc-3.0.4: a colored df -h replacement
2014-09-18 18:08:38 +02:00
Joachim Schiele
2a3bae70b4 Merge pull request #4063 from qknight/dcfldd
dcfldd: added advanced dd replacement
2014-09-18 18:08:07 +02:00
Joachim Schiele
dc86f52740 dfc-3.0.4: a colored df -h replacement 2014-09-18 18:06:49 +02:00
lethalman
1fe2905b26 Merge pull request #4146 from DamienCassou/screenkey
Add screenkey to screencast your keys
2014-09-18 17:51:12 +02:00
Charles Strahan
e38d7cbfb2 Fix the new Ruby interpreters (fixes #3509).
Ruby >= 2.1.0 will try to download config.{sub,guess} if not already present.
This provides both files in a pure manner, and also deletes the download script
to prevent any future confusion.
2014-09-18 11:43:16 -04:00
Damien Cassou
092235bde6 Add screenkey to screencast your keys 2014-09-18 17:42:04 +02:00
Joachim Schiele
c60bd6e435 dog-1.7: added potential cat replacement 2014-09-18 17:41:36 +02:00
Luca Bruno
d9bd04b90c Revert "spiped: 1.3.1 -> 1.4.0"
This reverts commit 792afca113.

Version 1.4.0 failed to build.
2014-09-18 17:07:15 +02:00
_1126
7ef47b4810 ncmpc: bump version to 0.24. 2014-09-18 16:24:42 +02:00
_1126
6676816686 ncmpc: enable colors and lyrics screen. 2014-09-18 16:24:06 +02:00
Luca Bruno
eca58fd02f vimNox: fix after lua upgrade for ZHF 2014-09-18 16:22:37 +02:00
lethalman
72c2898e74 Merge pull request #4142 from wyvie/lua51filesystem
Added lua-filesystem module built with lua-5.1
2014-09-18 15:58:01 +02:00
wyvie
e8c2159809 Added lua-filesystem module built with lua-5.1 2014-09-18 17:17:06 +04:00
Domen Kožar
47761617d0 python33Packages.sqlalchemy_imageattach: disable 2014-09-18 14:21:55 +02:00
Domen Kožar
cee221bc84 setuptools: 2.1 -> 5.8 2014-09-18 14:03:16 +02:00
Domen Kožar
4742c886dd libtoxcore: disable tests for now 2014-09-18 13:53:40 +02:00
Domen Kožar
b851e970da Revert "protobuf: 2.5.0 -> 2.6.0"
This reverts commit 5dff5ede0a.
2014-09-18 13:12:01 +02:00
Michael Raskin
a87e5507c0 More specific Ocsigen license checked by FlorentBecker 2014-09-18 14:42:54 +04:00
Luca Bruno
979206c0b1 mysqlWorkbench: fix after lua upgrade for ZHF 2014-09-18 12:37:50 +02:00
Luca Bruno
634e9ab4f8 love: fix after lua upgrade for ZHF 2014-09-18 12:37:50 +02:00
Eelco Dolstra
8e2e4216ba boehm-gc: Support --enable-large-config 2014-09-18 12:19:09 +02:00
Luca Bruno
0ce741f571 eiskaltdcpp: fix after lua upgrade for ZHF 2014-09-18 11:26:26 +02:00
Luca Bruno
bca4fa5fc0 asc: fix after lua upgrade for ZHF 2014-09-18 11:26:26 +02:00
Cillian de Róiste
05e2859ab6 gem-nix: change platforms to unix, tested on OS X 2014-09-18 11:18:25 +02:00
Luca Bruno
6e6dc04a6b awesome 3.4: fix after lua upgrade for ZHF 2014-09-18 11:00:26 +02:00
lethalman
8f8f99bcc8 Revert "keepnote: add myself as a maintainer" 2014-09-18 10:44:01 +02:00
Pascal Wittmann
180b9939d7 Merge pull request #4130 from k0ral/httptunnel
Added httptunnel package.
2014-09-18 10:13:46 +02:00
Pascal Wittmann
d6b3d70a3b Merge pull request #4137 from robberer/bump/keepnote
keepnote: add myself as a maintainer
2014-09-18 10:11:11 +02:00
Pascal Wittmann
2157d47185 Merge pull request #4136 from robberer/pkgs/clamav
clamav: add myself as a maintainer
2014-09-18 10:10:46 +02:00
William A. Kennington III
b2600df4a8 protobuf-c: 0.15 -> 1.0.2 2014-09-18 00:49:18 -07:00
William A. Kennington III
5dff5ede0a protobuf: 2.5.0 -> 2.6.0 2014-09-18 00:49:18 -07:00
William A. Kennington III
e0479f3489 gtest: Update meta 2014-09-18 00:49:17 -07:00
Longrin Wischnewski
23db66e792 keepnote: add myself as a maintainer 2014-09-18 08:24:55 +02:00
Longrin Wischnewski
14b2b31113 clamav: add myself as a maintainer 2014-09-18 08:15:16 +02:00
Shea Levy
a70ecf4797 strongswan: build with clang
Fixes https://lists.strongswan.org/pipermail/users/2014-September/006597.html
2014-09-17 22:08:18 -04:00
Russell O'Connor
86204e322f Add roconnor to GnuPG maintainers. 2014-09-17 19:16:09 -04:00
Jascha Geerds
771d1bd865 Add "cask" package 2014-09-18 00:46:45 +02:00
Peter Simons
55d5747a90 Merge pull request #4102 from ftrvxmtrx/alock
added alock package
2014-09-17 23:42:49 +02:00
Aristid Breitkreuz
6fc7efa7b3 add mathematica 10 (slightly borked but runs) 2014-09-17 23:25:35 +02:00
Anonymous
55909ad36b dvdisaster: new package
dvdisaster: new package
2014-09-17 16:05:07 -04:00
Domen Kožar
4671e59576 python34Packages.sympy: disable due to test failures 2014-09-17 21:40:18 +02:00
Domen Kožar
784ceea75d python-packages-generated.nix: fix lxml-2.3.6 by hardcoding the fix 2014-09-17 21:37:37 +02:00
Domen Kožar
fdfc7f4cff Merge pull request #4115 from madjar/master
rustc: fixed build after 7068828389
2014-09-17 21:35:56 +02:00
Aristid Breitkreuz
a4e643a5fe opencv: update 2.4.7 -> 2.4.9 2014-09-17 21:18:54 +02:00
Peter Simons
89438059ab haskell-git-annex: update to version 5.20140915 2014-09-17 21:16:10 +02:00
Peter Simons
31fa722218 Re-generate Haskell packages with cabal2nix. 2014-09-17 21:16:10 +02:00
Emil Rangden
17d7f653c3 Make emulator script run without tools in path 2014-09-17 20:58:09 +02:00
Aristid Breitkreuz
d7124e8c34 wicd: add urwid and curses to PYTHONPATH of wicd-curses 2014-09-17 20:28:32 +02:00
koral
719b910eb3 Added httptunnel package. 2014-09-17 19:55:45 +02:00
Jaka Hudoklin
f8284a083f seyren: udpate to 1.1.0 2014-09-17 18:33:51 +02:00
Jaka Hudoklin
4d261e64f6 pythonPackages.graphite_api: fix testing, make more nix-shell friendly 2014-09-17 18:33:51 +02:00
Sander van der Burg
a2865eb8e0 nodejs: Bump to version 0.10.32 2014-09-17 16:48:37 +02:00
Domen Kožar
771e2d8d09 add xvidcap to the channel for linux 2014-09-17 13:35:59 +02:00
Rob Vermaas
f7f9580545 Merge pull request #4092 from ts468/pam_mount
New packages: pam_mount and libHX
2014-09-17 13:15:22 +02:00
Aycan iRiCAN
cef02482c6 haskellPackages: introduced ShellCheck. 2014-09-17 12:02:47 +03:00
Michael Raskin
d78973078a Adding AdvanceCOMP deflate compression optimizer 2014-09-17 11:27:13 +04:00
James Cook
1aba100546 krb5: Update to 12.2.2.
Fixes security vulnerabilities CVE-2014-4341, CVE-2014-4342,
CVE-2014-4343, CVE-2014-4344 and CVE-2014-4345.
2014-09-16 23:10:52 -07:00
Daniel Peebles
44ca1a7f57 Add coreutils dependency to ant launcher script
Closes #4106.
2014-09-17 03:54:25 +01:00
Russell O'Connor
df7444ec65 Apply recent changes from gnupg/default.nix to gnupg/git.nix
gnupg/git.nix doesn't build, but it didn't build before either.
2014-09-16 18:49:16 -04:00
Russell O'Connor
1274724c62 Remove use* options and let the user set optional dependies to null if
they don't want to use them.
2014-09-16 18:28:11 -04:00
Russell O'Connor
ae8629a0d4 Remove obsolete patch. 2014-09-16 17:45:05 -04:00
Russell O'Connor
5302ae0789 Configure gnupg to use pinentry by default.
This makes gnupg much more usable out of the box.
2014-09-16 17:32:39 -04:00
Shea Levy
d8f80630f7 Add strongswan IPsec manager 2014-09-16 14:10:37 -04:00
Shea Levy
e2331b52cd util-linux: bump 2014-09-16 11:53:20 -04:00