Commit graph

49670 commits

Author SHA1 Message Date
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
Nikolay Amiantov
e81589e2c1 cmplayer: add package 2014-09-19 03:52:11 +04:00
William A. Kennington III
1ff027b304 Merge pull request #4121 from wkennington/master.nat
nixos/nat: Don't flush tables, create subchains for autogenerated rules
2014-09-18 16:30:42 -07: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
William A. Kennington III
8250059a9f nixos/tests/nat: Add tests for standalone and firewall based nat 2014-09-18 14:39:46 -07: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
ambrop7@gmail.com
2bdc12eeed Update KDevelop to 4.7.0. 2014-09-18 22:23:23 +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
b047f2ddec nixos/tests/nat: Modify test to accomodate for firewall consolidation 2014-09-18 11:28:58 -07:00
William A. Kennington III
ae195727b7 nixos/nat: Don't flush tables, create subchains for autogenerated rules 2014-09-18 11:28:58 -07:00
William A. Kennington III
194419244d radvd: 2.6 -> 2.7 2014-09-18 11:26:01 -07:00
Eelco Dolstra
0de982d75b httpd: Add option for specifying robots.txt 2014-09-18 19:05:26 +02:00
Eelco Dolstra
837a0c05e5 httpd: Don't emit robots.txt if there are no robots entries 2014-09-18 18:48:28 +02: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