Commit Graph

18925 Commits

Author SHA1 Message Date
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
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
58e233afbe Merge pull request #4159 from ftrvxmtrx/erlang-17.3
erlang/R17: update to 17.3
2014-09-19 12:26:10 +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
Siarhei Zirukin
56106d8e4c erlang/R17: update to 17.3 2014-09-19 09:23:28 +02:00
Moritz Ulrich
05c02b06f7 Leiningen: Bump to 2.5.0. 2014-09-19 00:29:16 +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
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
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
Eelco Dolstra
8e2e4216ba boehm-gc: Support --enable-large-config 2014-09-18 12:19:09 +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
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
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
Sander van der Burg
a2865eb8e0 nodejs: Bump to version 0.10.32 2014-09-17 16:48:37 +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
Daniel Peebles
44ca1a7f57 Add coreutils dependency to ant launcher script
Closes #4106.
2014-09-17 03:54:25 +01:00
Cillian de Róiste
a84c2d4357 Re-add rubyLibs.jekyll closes #4096 2014-09-16 15:31:29 +02:00
Oliver Charles
8384166ccd Merge pull request #4116 from joachifm/lens-family
Add haskell-lens-family{,-th}
2014-09-16 13:51:43 +01:00
Rickard Nilsson
1dab096432 lirc: Update from 0.9.1 to 0.9.1a 2014-09-16 13:53:18 +02:00
Georges Dubus
58c4bf5f20 rustc: fixed build after 7068828389
That commit changed the patch to work for the new HEAD, but that new
patch breaks 0.11. I made two patch for the two versions.
2014-09-16 13:51:57 +02:00
Joachim Fasting
735a478db6 haskell-lens-family-th: new expression 2014-09-16 13:15:56 +02:00
Joachim Fasting
79f605079e haskell-lens-family: new expression 2014-09-16 13:15:38 +02:00
Jaka Hudoklin
bfa3b28590 rubyLibs: fix bundler 2014-09-16 10:28:04 +02:00
Jaka Hudoklin
782c85ad27 rubyLibs: add compass, regenerate 2014-09-16 10:28:04 +02:00
Jaka Hudoklin
6f30a55f27 grafana: update 1.5.4 -> 1.8.0-rc1 2014-09-16 10:28:03 +02:00
Jaka Hudoklin
79a6bddc1e Add kibana, visualize logs and time-stamped data 2014-09-16 10:28:03 +02:00
Charles Strahan
c27a653bba improve ruby support
* add the 2.1.x versions
* include teeny version in passthru
* by default, apply the same patches used by RVM
* clean up file names and attribute names
2014-09-15 23:54:17 -04:00
Mateusz Kowalczyk
87eb8fcf83 agda-categories: add package 2014-09-16 02:47:13 +01:00
John Wiegley
3e5bcdc327 haskell-here: new expression 2014-09-15 21:50:11 +01:00
Thomas Strobel
7e4c24af7a Fix description in pam_mount and libHX. Add tstrobel as maintainer. 2014-09-15 12:30:19 +02:00
Thomas Strobel
6366509e54 Merge branch 'upstream' into pam_mount
Conflicts:
	pkgs/top-level/all-packages.nix
2014-09-15 12:15:11 +02:00
Thomas Strobel
66dbde4002 New packages: pam_mount and libHX
Add pam_mount package. Integration into NixOS is still missing.
2014-09-15 11:55:23 +02:00
Michel Kuhlmann
cb152d9ed0 r-rgdal/rgeos: adding gdal geos and proj as dependency 2014-09-15 11:15:51 +02:00
Michel Kuhlmann
67ba8bbbf9 r-jsonlite: update to 0.9.11 2014-09-15 10:22:17 +02:00
Charles Strahan
ff344624d6 add go-repo-root, dependency of go2nix 2014-09-15 09:53:30 +02:00
Peter Simons
c1df8e0cee Merge pull request #4088 from wavewave/master
haskell-pdf-toolbox-(core,content,document) library added
2014-09-15 09:51:47 +02:00
William A. Kennington III
9c27c33ea8 libibmad: Add derivation 2014-09-14 19:00:02 -07:00
William A. Kennington III
0511d49f2e libibumad: Add derivation 2014-09-14 18:59:43 -07:00
Ian-Woo Kim
6d01dddd6f haskell-pdf-toolbox-document added 2014-09-15 02:42:03 +02:00
Ian-Woo Kim
8a027d9827 haskell-pdf-toolbox-content: added 2014-09-15 02:31:08 +02:00