cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2
64451 commits 1 branch 0 tags 3.7 GiB
Commit graph

1593 commits

Author SHA1 Message Date
Charles Strahan
7d8b2f0d60 ruby: make buildInputs work 2015-01-20 22:20:28 -05:00
Charles Strahan
dfc225d143 Merge branch 'master' of github.com:nixos/nixpkgs into pleasant-ruby 
Conflicts:
	pkgs/applications/version-management/git-and-tools/default.nix
	pkgs/applications/version-management/git-and-tools/hub/default.nix
	pkgs/tools/audio/mpdcron/default.nix
 2015-01-20 20:21:03 -05:00
Charles Strahan
bd53746646 ruby: patching gems works 2015-01-20 19:09:02 -05:00
Charles Strahan
221509b0a6 ruby: refactoring, and package bundix 2015-01-20 01:07:55 -05:00
Charles Strahan
bf16d03075 ruby: support for proper bundler installs 2015-01-19 20:02:47 -05:00
Peter Simons
ec6b82a0c2 Merge branch 'master' into staging. 2015-01-19 18:41:17 +01:00
Charles Strahan
673fccf505 ruby: new bundler approach 2015-01-18 18:47:28 -05:00
Domen Kožar
652cfc36e9 python2.6: add a patch to fix parallel make failure 
(cherry picked from commit 23a202519cb1d8704a0b4294d8d13a224efb1a74)
Signed-off-by: Domen Kožar <domen@dev.si>
 2015-01-18 19:20:07 +01:00
Pascal Wittmann
e4294c27e0 mujs: update to latest commit 2015-01-18 18:42:01 +01:00
Domen Kožar
029dae30ac Merge pull request #5696 from mdesantis/ruby-2.2.0-package 
Add Ruby 2.2.0 package
 2015-01-18 11:41:03 +01:00
Vladimír Čunát
88089559b9 Merge #5676: gcc-wrapper -> cc-wrapper and related 2015-01-17 08:43:04 +01:00
Charles Strahan
9ad38ec322 ruby: allow for overriding the src 2015-01-15 20:58:05 -05:00
Vincent Laporte
1fd73de1d4 Lua4: adds branch information 2015-01-15 10:28:40 +01:00
Eric Seidel
f3c6827373 rename all occurrences of stdenv.cc.gcc to stdenv.cc.cc 2015-01-14 20:27:55 -08:00
Charles Strahan
1a1e6cfc04 ruby: various fixes 2015-01-14 21:19:53 -05:00
Georges Dubus
c2f8791e83 pypy: added patch to fix build with gcc 4.9.2 2015-01-14 16:02:08 +01:00
Charles Strahan
aaa2e9705a ruby: cache gem files 2015-01-14 04:20:50 -05:00
Charles Strahan
32bae8d09a bundler: update HEAD version 2015-01-14 01:13:51 -05:00
Vladimír Čunát
1575bc652e Merge branch 'master' into staging 
Conflicts (simple):
	pkgs/os-specific/linux/util-linux/default.nix

It seems this merge creates a new stdenv hash,
because we had changes on both branches :-/
 2015-01-13 18:07:11 +01:00
Maurizio De Santis
5bcd29466e ruby: add 2.2.0 package 2015-01-10 19:25:37 +01:00
Maurizio De Santis
369f04ac96 ruby: update RVM patchsets 2015-01-10 19:25:12 +01:00
lethalman
1e46e8a964 Merge pull request #5567 from ktosiek/test-kitchen 
Add test-kitchen gem, with plugins for Ansible and Vagrant
 2015-01-08 14:56:55 +01:00
lethalman
7665a97d06 Merge pull request #5601 from robberer/tmp1 
php: add optional ZTS support and new PECL module pthreads
 2015-01-08 13:22:08 +01:00
William A. Kennington III
c82410eeda java: Normalize to the default jre / jdk 2015-01-07 14:55:41 -08:00
Eelco Dolstra
37ac9deb3d Revert "php: Update to 5.4.36" 
This reverts commit e7d4d39c6e. The
build fails in a chroot because it tries to download a PEAR from the
network:

http://hydra.nixos.org/build/18517333
 2015-01-07 12:53:01 +01:00
Eelco Dolstra
e7d4d39c6e php: Update to 5.4.36 
CVE-2014-8142
 2015-01-07 11:36:01 +01:00
John Wiegley
ce59dec5bb python34: as a workaround, explicitly set MACOSX_DEPLOYMENT_TARGET 
Otherwise, it crashes with a segfault while running the tests.
 2015-01-06 09:56:08 -05:00
Longrin Wischnewski
ef3a755c1f php: add optional ZTS support and new PECL module pthreads 2015-01-06 12:08:47 +00:00
Tomasz Kontusz
decc019220 Add test-kitchen gem, with plugins for Ansible and Vagrant 
test-kitchen is a framework for testing Configuration Management scripts.
 2015-01-04 02:06:06 +01:00
Charles Strahan
94dd4b9721 ruby: WIP 2014-12-30 21:05:00 -05:00
Vladimír Čunát
d8c5d95330 determinism: change some fixed timestamp to != (time_t)0 
vcunat removed the unrelated glib change.
Conflicts:
	pkgs/development/libraries/glib/default.nix
	pkgs/os-specific/linux/kernel/generic.nix
	pkgs/os-specific/linux/kernel/manual-config.nix
 2014-12-30 17:03:39 +01:00
Charles Strahan
74a4f01fe4 ruby: add git fetcher 2014-12-29 00:48:01 -05:00
Charles Strahan
145733c479 Merge branch 'master' of github.com:nixos/nixpkgs into pleasant-ruby 
Conflicts:
	pkgs/applications/version-management/redmine/default.nix
	pkgs/development/interpreters/ruby/gem.nix
	pkgs/development/interpreters/ruby/generated.nix
	pkgs/development/interpreters/ruby/patches.nix
	pkgs/development/tools/vagrant/default.nix
	pkgs/servers/consul/default.nix
 2014-12-28 14:29:52 -05:00
Shea Levy
05edd656f6 Missed gcc refs 2014-12-26 12:28:15 -05:00
John Wiegley
28b6fb61e6 Change occurrences of gcc to the more general cc 
This is done for the sake of Yosemite, which does not have gcc, and yet
this change is also compatible with Linux.
 2014-12-26 11:06:21 -06:00
Pascal Wittmann
f94580da69 Fix license attribute of many bsd-like licensed packages 2014-12-21 00:00:35 +01:00
Evgeny Egorochkin
d9dbeeca79 ruby gems: propagate ruby because it contains the hooks to add gem search paths, needed by nix-shell-created environments 2014-12-20 01:01:39 +02:00
Pascal Wittmann
12673d28fa groovy: update from 2.3.8 to 2.3.9 2014-12-19 14:42:31 +01:00
wmertens
6fa7ea0537 Merge pull request #5383 from robberer/tmp1 
php: make curl wrappers optional
 2014-12-18 17:49:10 +01:00
Longrin Wischnewski
96f4758d09 php: make curl wrappers optional 
cURL wrappers are experimental and break any application/library
that rely on $http_response_header
 2014-12-18 09:04:26 +01:00
Shea Levy
3cf0677087 Add rubyLibs.redis 2014-12-16 13:10:35 -05:00
Shea Levy
487325a68c Add rubyLibs.rabbitmq_manager 2014-12-16 13:09:46 -05:00
Shea Levy
a1e0944263 Add rubyLibs.newrelic_plugin 2014-12-16 13:07:03 -05:00
Domen Kožar
8bfd6af9ed pypy: disable whole ssl test suit instead of a single test 
(cherry picked from commit 118fd6f526618ec6fc243bc2cdf89a99c4172d9a)
Signed-off-by: Domen Kožar <domen@dev.si>
 2014-12-16 17:13:24 +01:00
Domen Kožar
5819f29875 pypy: disable cpickle test.. 2014-12-15 14:17:39 +01:00
Pascal Wittmann
934afff8fb Merge pull request #5306 from sjmackenzie/erlang-bump 
Erlang bump from 17.3 to 17.4 as 17.3 has a serious ssl bug
 2014-12-15 00:50:46 +01:00
Domen Kožar
272206e706 python: 2.7.8 -> 2.7.9 
(cherry picked from commit 1f059cd5a91fee7d4ec50c7272bca5bc6733f245)
Signed-off-by: Domen Kožar <domen@dev.si>
 2014-12-14 19:05:59 +01:00
Michael Raskin
fbceebd868 Merge pull request #5288 from mstarzyk/j 
j: Fix building libj.so
 2014-12-13 10:49:30 +03:00
Pascal Wittmann
377822fb64 mujs: update to latest revision 2014-12-12 12:14:13 +01:00
Stewart Mackenzie
1e7f7edd72 Erlang bump from 17.3 to 17.4 as 17.3 has a serious ssl bug 2014-12-12 15:13:10 +08:00
Maciek Starzyk
8989a32d34 j: Fix building libj.so 2014-12-10 22:43:42 +01:00
Eelco Dolstra
4d918cb6c7 php-5.3: Remove 
PHP 5.3 is EOL (see http://php.net/supported-versions.php). NixOS
14.12 is a good opportunity to drop it.
 2014-12-10 17:19:37 +01:00
Eelco Dolstra
55d59eefb3 php: Really update to 5.4.34 
75738437a4 only updated the version string...
 2014-12-10 17:09:47 +01:00
Domen Kožar
4aa3eec330 Merge branch 'master' into staging 
Conflicts:
	pkgs/development/libraries/fontconfig/default.nix
 2014-12-07 14:02:48 +01:00
Shea Levy
b02d059f5d nix-exec: bump 2014-12-03 22:23:47 -05:00
Jaka Hudoklin
61e19d6e81 rubyLibs: add tmuxinator, update 2014-12-01 00:39:40 +01:00
Pascal Wittmann
faf6e067d1 add mujs, a lightweight, embeddable Javascript interpreter 2014-11-29 14:21:16 +01:00
Vladimír Čunát
e75fe2e528 cairo: pull an upstream patch to fix racket 
Close #5165, #5166.
Also enableParallelBuilding in racket.
 2014-11-28 20:28:47 +01:00
Vladimír Čunát
cbd2305d4d Merge branch 'master' into staging 2014-11-28 18:59:07 +01:00
Pascal Wittmann
02ca1adc05 groovy: update from 2.3.7 to 2.3.8 2014-11-28 11:08:12 +01:00
Vladimír Čunát
b5ff06eda4 Merge branch 'master' into staging 2014-11-26 21:48:26 +01:00
Edward Tjörnhammar
456882b142 Merge pull request #5115 from iu-parfunc/racket 
racket: add libreadline to ffi libs - enables xrepl.
 2014-11-26 12:08:50 +01:00
Vladimír Čunát
a9bad25ffe Merge branch 'master' into staging 2014-11-24 22:14:25 +01:00
Ryan Newton
fd73e9948d racket: add libreadline to ffi libs - enables xrepl. 2014-11-24 13:58:22 -05:00
Shea Levy
5c9ee48de1 nix-exec: bump 2014-11-24 10:13:31 -05:00
Domen Kožar
d562934ee7 nokogiri: use libiconvOrEmpty. assert libiconv is not used on linux 2014-11-22 21:13:22 +01:00
Shea Levy
76854052f9 nix-exec: bump 2014-11-21 09:59:53 -05:00
Shea Levy
b7b956ffec nix-exec: bump 2014-11-20 19:40:14 -05:00
Vladimír Čunát
a19eeddd70 ruby-2.1.1: fix patch numbering (and build) 
Wrong patch paths were ignored until recently by our stdenv.
It's slightly unclear to me which patches were supposed to be used.
 2014-11-20 13:22:56 +01:00
Vladimír Čunát
c14dee55e8 ruby-2.0: fix patch paths (and build) 
Wrong patch paths were ignored until recently by our stdenv.
 2014-11-20 12:54:49 +01:00
Pascal Wittmann
75738437a4 php: update from 5.4.34 to 5.4.35 (fixes CVE-2014-3710) 2014-11-19 08:47:41 +01:00
Eelco Dolstra
9f914a3f82 perl-5.14: Remove 
It's EOL and unmaintained. There was only one package using it which
I've marked as broken.
 2014-11-18 10:42:23 +01:00
Charles Strahan
e1149b71cc fix shebang patching for ruby gems 2014-11-18 03:05:44 +00:00
Eelco Dolstra
847b7fe697 perl: Fix evaluation on Darwin 2014-11-17 15:21:29 +01:00
Shea Levy
eba921130b nix-exec: bump 2014-11-16 00:02:29 -05:00
Domen Kožar
dc626a9f5c pypy: disable test_default_ciphers test 2014-11-15 19:32:05 +01:00
Vladimír Čunát
b4af993c3f Merge branch 'master' into staging 
Conflicts (simple):
	pkgs/development/lisp-modules/clwrapper/setup-hook.sh
 2014-11-14 14:28:23 +01:00
Michael Raskin
a6d991ea07 Merge pull request #4980 from henrytill/racket 
racket: update to 6.1.1
 2014-11-13 23:44:35 +03:00
Domen Kožar
419e96a5ce Merge branch 'python/docs' 2014-11-13 21:32:01 +01:00
Henry Till
67ee94b237 racket: update to 6.1.1 2014-11-13 14:29:44 -05:00
Shea Levy
f1b8880a2f nix-exec: bump 2014-11-12 21:06:37 -05:00
Domen Kožar
39d1bc755e python: add python.interpreter attribute 2014-11-13 00:42:36 +01:00
Luca Bruno
6af0d6974f Merge branch 'master' into staging 2014-11-10 10:03:52 +01:00
Charles Strahan
cf8f4963a7 rename rubyLibs to rubyPackages 2014-11-09 22:16:58 +00:00
Charles Strahan
2b0750f87a passthru ruby, make stdenv overridable 2014-11-09 21:31:48 +00:00
Charles Strahan
2a3f2cfce8 add path fetcher 2014-11-08 23:46:34 +00:00
Domen Kožar
c1d6a4a8fb remove unused pythonLinkmeWrapper 2014-11-08 20:19:55 +01:00
James Cook
576092eec4 Revert "ruby: Fix build on systems with store optimisation. Closes #4273. #4266 promises a better fix." 
This reverts commit d2c0011c2f.

c04e492898 gives a cleaner solution that's
not specific to ruby.
 2014-11-06 09:22:20 -08:00
Eelco Dolstra
0518ccf5af Merge remote-tracking branch 'origin/master' into staging 
Conflicts:
	pkgs/stdenv/generic/default.nix
 2014-11-06 10:16:39 +01:00
Mateusz Kowalczyk
007f80c1d0 Turn more licenses into lib.licenses style 
Should eval cleanly, as far as -A tarball tells me.

Relevant: issue #2999, issue #739
 2014-11-06 00:48:16 +00:00
Vladimír Čunát
52404a868d Merge recent master into staging 
Nixpkgs Hydra: ?compare=1157272

TODO: port e22889064f

Conflicts:
	nixos/tests/gnome3_10.nix (auto-solved)
	pkgs/applications/video/aegisub/default.nix
	pkgs/development/libraries/boost/1.55.nix
 2014-11-05 15:00:44 +01:00
Eelco Dolstra
7495c61d49 Merge remote-tracking branch 'origin/darwin-clang-stdenv' into staging 
Conflicts:
	pkgs/applications/editors/vim/macvim.nix
 2014-11-04 14:30:43 +01:00
Michael Raskin
05c8f5c102 Disable parallel building of Guile for now 2014-11-04 14:24:23 +03:00
Rob Vermaas
6d79132553 php: update from 5.4.33 to 5.4.34, potentially fixes CVE-2014-3668, CVE-2014-3669, CVE-2014-3670 2014-11-04 10:16:14 +01:00
Michael Raskin
19645e229c Update PicoLisp 2014-11-04 12:04:43 +03:00
Arseniy Seroka
2d47366e4c Merge pull request #4756 from iyzsong/guile-sdl 
add guile-sdl and bump guile to 2.0.11
 2014-11-03 17:09:57 +03:00
Charles Strahan
e1c40a679c fix gem builder 2014-11-02 22:05:37 +00:00
Michael Raskin
ec186d5f16 Update Angelscript 2014-11-02 23:51:58 +03:00
Michael Raskin
1b49e78cd4 Update Regina interpreter 2014-11-02 23:51:57 +03:00
Peter Simons
a9c53037fa Merge remote-tracking branch 'origin/master' into staging. 2014-11-02 16:15:53 +01:00
宋文武
1e4e719ffb guile: 2.0.9 -> 2.0.11 2014-11-01 16:56:09 +08:00
Domen Kožar
92503a0424 python: 3.3.5 -> 3.3.6 2014-11-01 04:50:26 +01:00
Domen Kožar
7fe78cad98 python: 3.2.5 -> 3.2.6 2014-11-01 04:50:26 +01:00
Peter Simons
b11060d8db Merge remote-tracking branch 'origin/master' into staging. 2014-10-31 11:14:24 +01:00
Charles Strahan
143698555a add documentation 2014-10-31 02:03:37 +00:00
Charles Strahan
3eeabc4523 more cleanup 2014-10-31 01:44:57 +00:00
Charles Strahan
845fed122a various fixes 2014-10-29 23:14:19 +00:00
Charles Strahan
d5b3a6d508 update fixes 2014-10-29 01:16:02 +00:00
cillianderoiste
60bf93c5da Merge pull request #4701 from jirkamarsik/eff 
Added eff-20140928
 2014-10-28 17:59:45 +01:00
Jirka Marsik
3ee1f6ee79 Added eff-20140928 2014-10-28 17:21:55 +01:00
Charles Strahan
e4a2a7e73e simplification / refactoring 2014-10-28 04:16:14 +00:00
Charles Strahan
857f017a0d misc. cleanup 2014-10-28 01:22:17 +00:00
Charles Strahan
1eb31c0838 remove old stuff 2014-10-27 22:36:00 +00:00
Charles Strahan
9eedf0f218 simplify expressions 2014-10-27 22:13:36 +00:00
Alexander Flatter
b4c81a1f15 importGems now accepts an attrset 2014-10-27 21:55:13 +00:00
Alexander Flatter
5b928301c1 Expose gems when using loadRubyEnv 2014-10-27 21:55:12 +00:00
Alexander Flatter
4d3932a29e loadRubyEnv instantiates sources 2014-10-27 21:55:12 +00:00
Alexander Flatter
2cb31d576a Improve buildRubyGem 2014-10-27 21:55:12 +00:00
Alexander Flatter
f4d5fa4da6 importGems doesn't crash if gemOverrides not given 2014-10-27 21:55:12 +00:00
Alexander Flatter
3b59fbd608 WIP 2014-10-27 21:55:12 +00:00
Alexander Flatter
c786da0569 importGems now reads attrsets instead of derivations 2014-10-27 21:55:12 +00:00
Charles Strahan
3e499b7b65 silence rm failures 2014-10-27 21:55:12 +00:00
Charles Strahan
6863853879 fixup gem install flags 2014-10-27 21:55:12 +00:00
Charles Strahan
11903c4c10 ruby: expose RUBY_ENGINE, include teeny version in paths 2014-10-27 21:55:11 +00:00
Joel Taylor
c05e0602ca fix self refs 2014-10-27 21:55:11 +00:00
Joel Taylor
0ee5695bd4 properly fix patching 2014-10-27 21:55:11 +00:00
Joel Taylor
efa528a415 also recursively patch "self" 2014-10-27 21:55:11 +00:00
Joel Taylor
e5783d017d don't forget: patch gems in gems.nix too! 2014-10-27 21:55:11 +00:00
Joel Taylor
820ae58ba5 inherit the correct rake in buildRubyGem 
this avoids accidentally depending on Ruby 1.9.3's rake for *every* gem
 2014-10-27 21:55:11 +00:00
Joel Taylor
8c072a33a1 update patch comments 2014-10-27 21:55:11 +00:00
Joel Taylor
020b204767 remove depsPath 2014-10-27 21:55:11 +00:00
Joel Taylor
4a5e725a00 patch logic 2014-10-27 21:55:10 +00:00
Joel Taylor
9c8c4c8655 reorder gem phases 2014-10-27 21:55:10 +00:00
Joel Taylor
05238cd353 call patches with the right nix 2014-10-27 21:55:10 +00:00
Joel Taylor
f14f73da76 ruby updates 2014-10-27 21:55:04 +00:00
Shea Levy
c8be814f25 nix-exec: bump 2014-10-27 14:27:55 -04:00
Joel Taylor
081343f099 gem build updates 2014-10-26 17:34:52 +00:00
Joel Taylor
763975d2cf ruby-dotenv 2014-10-26 17:34:52 +00:00
Joel Taylor
37640cca9f terminal-notifier 2014-10-26 17:34:52 +00:00
Joel Taylor
321ee119a8 more gem improvements 2014-10-26 17:34:52 +00:00
Joel Taylor
289b7e5068 further improvements to patches and build process 2014-10-26 17:34:52 +00:00
Joel Taylor
2dedbe6bbe correctly implement patching 2014-10-26 17:34:10 +00:00
Joel Taylor
1edaff1a2a include patches 2014-10-26 17:34:10 +00:00
Joel Taylor
c694425a03 allow importGems to override cp args 2014-10-26 17:34:10 +00:00
Joel Taylor
e9328fa7c3 stop using gross dependency resolution 2014-10-26 17:34:10 +00:00
Joel Taylor
3026d8833d add libs to GEM_PATH 2014-10-26 17:34:10 +00:00
Joel Taylor
cfff6e8c82 some improvements 2014-10-26 17:34:10 +00:00
Joel Taylor
794740b7e3 pleasant ruby 2014-10-26 17:34:10 +00:00
Charles Strahan
7231b95f4f Ruby: 2.1.3 and Fiddle support 
This packages Ruby 2.1.3, and adds Fiddle support for all 2.x versions.

closes #4656
 2014-10-26 04:48:09 +00:00
Aristid Breitkreuz
6ea96be470 Merge pull request #4635 from asppsa/pure-0.63 
Upgrade Pure to 0.63
 2014-10-25 15:30:02 +02:00
James Cook
d2c0011c2f ruby: Fix build on systems with store optimisation. Closes #4273. #4266 promises a better fix. 
(The build process attempted to copy file a overwriting file b, where a
and b are hard-linked, which results in cp returning a non-zero exit
code.)
https://github.com/NixOS/nixpkgs/issues/4266
 2014-10-25 06:13:16 +03:00
Shea Levy
aab11d6963 nix-exec: bump 2014-10-24 17:06:54 -04:00
Domen Kožar
0272a469a9 Merge pull request #4646 from geerds/python26-sqlite3 
Fix python26Packages.sqlite3
 2014-10-24 16:13:45 +02:00
Eelco Dolstra
f4be4f5e54 Merge remote-tracking branch 'origin/master' into staging 2014-10-24 12:24:13 +02:00
Rok Garbas
c44c00d56c python: adding test/test_support.py module in all python versions 
- test/test_support.py module is used by many libraries which backport python
  3.0 functionality to 2.6/2.7
- enable subprocess32 tests (now passing for python 2.6/2.7)
 2014-10-24 10:44:15 +02:00
Mateusz Kowalczyk
25e552664a Merge pull request #4479 from sjmackenzie/elixir-mix-fix 
Elixir's mix shouldn't be added to wrapProgram
 2014-10-24 06:37:02 +01:00
Jascha Geerds
d49556a976 Fix python26Packages.sqlite3 2014-10-23 22:56:55 +02:00
Vladimír Čunát
2cf17b0802 Merge recent master into staging 
Hydra nixpkgs: ?compare=1156478
 2014-10-23 17:40:41 +02:00
Alastair Pharo
d37835295a Upgrade Pure to 0.63 2014-10-23 23:30:27 +11:00
Aron Fyodor Asor
758b937120 update elixir to v1.0.2 2014-10-22 10:55:43 -07:00
Mathijs Kwik
6af6bd9b51 xulrunner: fix for building on i686 2014-10-22 16:20:43 +02:00
Mathijs Kwik
2140adf11f Revert "Revert "xulrunner: stick to firefox's src attribute"" 
This reverts commit f13b383449.
 2014-10-22 16:20:43 +02:00
Michael Raskin
ea5b21edd8 Merge pull request #4590 from henrytill/racket 
racket: update to 6.1
 2014-10-20 22:02:48 +04:00
Patrick Mahoney
c46c37efb5 j: Relax platform restriction. 
Builds and runs on x86_64-darwin.
 2014-10-20 12:52:19 -05:00
Domen Kožar
2d6582d14e python27FullBuildEnv -> python.buildEnv for all interpreters 2014-10-19 19:48:18 +02:00
Henry Till
065c5ff853 racket: update to 6.1 2014-10-18 12:11:07 -04:00
Michael Raskin
fac3c95ce6 Add clisp 2.33.2 — for testing SBCL bootstrap 2014-10-18 19:52:59 +04:00
Shea Levy
d982a78eec nix-exec: Bump 2014-10-17 13:19:22 -04:00
Eelco Dolstra
09dc132e04 Merge remote-tracking branch 'origin/master' into staging 
Conflicts:
	pkgs/development/libraries/poppler/default.nix
 2014-10-16 15:16:50 +02:00
Domen Kožar
74fde7c388 Merge pull request #4495 from NixOS/pythonFull_improvements 
PythonFull improvements
 2014-10-16 13:24:18 +02:00
Domen Kožar
68b183e309 simplify 2014-10-16 13:13:13 +02:00
William A. Kennington III
eed5207845 python27: Remove avoid daemon thread shutdown #i21963 2014-10-16 11:28:37 +02:00
Domen Kožar
d589684cae pypy: disable test_zipfile64 because timeouts 2014-10-16 11:14:42 +02:00
Domen Kožar
a2a7abc67c pythonFull -> python with all modules, pythonFullWithPkgs -> buildEnv 2014-10-13 21:35:21 +02:00
Domen Kožar
8de9ac5bd4 python: make 2.6 and 2.7 expr similar, introduce includeModules 
When includeModules is true, python is built with all optional modules
as part of derivation.
 2014-10-13 21:35:21 +02:00
Domen Kožar
37e1794425 Revert "xulrunner: update from 31.0 to 32.0" 
This reverts commit 109547b902.

Breaks on 32bit linux: http://hydra.nixos.org/eval/1154529#tabs-still-fail
 2014-10-12 13:38:42 +02:00
Alastair Pharo
f522344285 Update pure to 0.62 
Closes #4486
 2014-10-12 12:08:29 +01:00
Domen Kožar
482779e582 python: get rid of ssl module as it's always builtin 2014-10-11 20:23:51 +02:00
stewart
e4d98459d7 Elixir's mix shouldn't be added to wrapProgram 2014-10-11 14:49:05 +00:00
Moritz Ulrich
109547b902 xulrunner: update from 31.0 to 32.0 2014-10-11 01:57:57 +02:00
Lluís Batlle i Rossell
704fc40bd8 Fix ARM/Arm typo. 2014-10-10 17:12:50 +02:00
Lluís Batlle i Rossell
372b0cda52 Making spidermonkey_185 build on ARM, and so also polkit. 2014-10-10 17:12:49 +02:00
Eelco Dolstra
811de3bfaa Merge remote-tracking branch 'origin/staging' into darwin-clang-stdenv 
Conflicts:
	pkgs/tools/security/gnupg/default.nix
 2014-10-09 10:57:57 +02:00
Domen Kožar
9aeb10fa12 python: 3.4.1 -> 3.4.2 2014-10-08 13:43:36 +02:00
Aristid Breitkreuz
34e2c6cc6f perl520: update from 5.20.0 to 5.20.1 2014-10-07 22:43:08 +02:00
Aristid Breitkreuz
a31d6a0b61 php_fpm53: update from 5.3.28 to 5.3.29, potentially fixes CVE-2014-0237, CVE-2014-0238, CVE-2014-4721, CVE-2014-5459 2014-10-07 21:05:57 +02:00
Aristid Breitkreuz
9fc7eed1dc php: update from 5.4.32 to 5.4.33 2014-10-07 20:57:33 +02:00
Michael Raskin
1be33f81d1 Specify meta.branch for CLisp-2.44.1 2014-10-07 16:23:27 +04:00
Eelco Dolstra
a85dcf4a00 Merge remote-tracking branch 'origin/master' into staging 
Conflicts:
	pkgs/development/libraries/libav/default.nix
	pkgs/shells/bash/bash-4.2-patches.nix
	pkgs/stdenv/generic/default.nix
 2014-10-07 00:09:37 +02:00
Michael Raskin
02e221eb11 Fix the version 2014-10-06 02:43:57 +04:00
Austin Seipp
5f7d5c09f3 Merge pull request #4298 from daogames/tb/elixir-mix-curl-fix 
elixir: make curl available to mix
 2014-10-01 18:54:24 -05:00
Tino Breddin
4ef1099310 fix double slash in mix binary path 2014-10-01 20:27:55 +02:00
Shea Levy
ee58e82855 nix-exec: set platforms 2014-09-28 20:10:11 -04:00
Shea Levy
d34cd13a31 Add nix-exec package 2014-09-28 15:24:38 -04:00
Tino Breddin
cba717fd7b elixir: make curl available to mix 2014-09-27 21:58:58 +02:00
Pascal Wittmann
d346a9cc07 fixed some meta.maintainers attributes 2014-09-26 23:44:29 +02:00
Bjørn Forsman
25e726b283 pypy: fix copy-paste error in setup-hook 
Introduced in 428fdc879f
("pypy: 2.3 -> 2.4").
 2014-09-26 20:10:06 +02:00
Domen Kožar
4fa05bdc6f pypy: disable test_urllib2net and test_urllibnet 2014-09-26 18:12:49 +02:00
Domen Kožar
3aefa63c75 pypy: pytest syntax change 2014-09-26 18:12:37 +02:00
Domen Kožar
428fdc879f pypy: 2.3 -> 2.4 2014-09-26 18:12:24 +02:00