ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-29 06:45:54 +03:00
Code Issues Projects Releases Wiki Activity
60,643 Commits 96 Branches 102 Tags 4.8 GiB
6ec373d776
Commit Graph

1524 Commits

Author SHA1 Message Date
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
Pascal Wittmann
10bbdf48ab groovy: update from 2.3.6 to 2.3.7 2014-09-25 16:49:50 +02:00
Eelco Dolstra
f13b383449 Revert "xulrunner: stick to firefox's src attribute" 
This reverts commit 04369b6819.

http://hydra.nixos.org/build/14760897
 2014-09-25 16:17:15 +02:00
Pascal Wittmann
3b2ba0ae42 falcon: update to lastest git revision as the lastest release does not build 2014-09-23 23:52:18 +02:00
Eelco Dolstra
cd71f7a2e6 Merge branch 'darwin-stdenv' of github.com:joelteon/nixpkgs into staging 
Conflicts:
	pkgs/development/interpreters/ruby/ruby-19.nix
	pkgs/development/libraries/libc++/default.nix
	pkgs/development/libraries/libc++abi/default.nix
	pkgs/tools/text/sgml/opensp/default.nix
 2014-09-23 11:27:53 +02:00
Mathijs Kwik
04369b6819 xulrunner: stick to firefox's src attribute 2014-09-23 09:16:55 +02:00
Jaka Hudoklin
aa7147c31b rubyLibs: add heroku client 2014-09-22 01:57:01 +02:00
wyvie
4d5336316c New package: lua-zip-1.2.3 
Closes #4138
 2014-09-20 23:32:17 +01:00
Michael Raskin
18ca33ee7c Adopt fix from ewemoa to give more memory to acl2 build 2014-09-20 12:13:43 +04:00
Siarhei Zirukin
56106d8e4c erlang/R17: update to 17.3 2014-09-19 09:23:28 +02:00
Eelco Dolstra
91ec6e0d90 Merge remote-tracking branch 'origin/master' into staging 2014-09-18 22:28:35 +02:00
Eelco Dolstra
f32e964cc4 perl: Fix assertion failure on Darwin 
This assertion doesn't make sense to me, because a multi-threaded
build on Darwin works fine, despite not having Glibc.
 2014-09-18 22:27:20 +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
Cillian de Róiste
a84c2d4357 Re-add rubyLibs.jekyll closes #4096 2014-09-16 15:31:29 +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
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
Gergely Risko
3a2134d46f Disable perl 5.16 tests 
They are on the path to stdenv rebuild.

Accidentally re-enabled by conflict resolution in cherry-pick 3196d4f.
 2014-09-14 22:34:51 +02:00
Gergely Risko
c5df246ba9 Cleanup perl logic in stdenvLinux 
Make thread disabling explicit.  This changes the semantics of the perl
derivation, so on other platforms it may require setting

  enableThreading = false

This commit doesn't change the derivation or out hash of stdenvLinux.
 2014-09-14 21:36:14 +02:00
Vladimír Čunát
d957b4bd78 Merge recent master into staging 
Hydra nixpkgs: ?compare=1151601
 2014-09-13 21:48:29 +02:00
Alexander Kjeldaas
3bf4362381 python: improve library determinism 
1) Make the core python libraries deterministic.
2) Make the python libraries created by glib deterministic.

@vcunat put back the removal of share/gtk-doc in glib.
 2014-09-13 15:03:12 +02:00
Alexander Kjeldaas
3196d4f7c7 perl-5.16: make it binary deterministic 2014-09-13 14:40:04 +02:00
Pascal Wittmann
3c6eceb5fb Merge pull request #4008 from dbohdan/master 
Add Jim Tcl interpreter
 2014-09-12 21:36:58 +02:00
Danyil Bohdan
2a89610d9a jimtcl: add dbohdan as maintainer 2014-09-12 22:23:59 +03:00
William A. Kennington III
3141ce3e15 gems: Add rdoc, execjs, uglifier 2014-09-11 15:41:45 -07:00
Domen Kožar
3f441d82f9 rubyLibs: add erubis and yajl 2014-09-12 00:31:37 +02:00
Domen Kožar
aa162b388d package gim-nix and document it 2014-09-12 00:26:51 +02:00
Rob Vermaas
960b664a13 php: update from 5.4.31 to 5.4.32, potentially fixes CVE-2014-3587, CVE-2014-3597, CVE-2014-5120 2014-09-11 13:30:46 +02:00
Alexander Flatter
c387049c29 Elixir is now 1.0.0! 
Closes #4027
 2014-09-10 17:09:09 +01:00
Joel Taylor
6f949b2e87 get rid of nasty CC stuff 2014-09-09 13:54:26 -07:00
Joel Taylor
3e8344d334 suitable clang stdenv 2014-09-09 13:54:24 -07:00
Vladimír Čunát
d09736b7c1 lua5 sockets: our version only works with lua 5.1 2014-09-09 21:49:35 +02:00
Vladimír Čunát
15cb79e48e lua-5.1: fix CVE-2014-5461 by upstream+Debian patch 2014-09-09 21:46:44 +02:00
Danyil Bohdan
dee958d3e6 jimtcl: remove end dot from description 2014-09-09 14:30:03 +03:00
Danyil Bohdan
03df715281 Add Jim Tcl interpreter 2014-09-09 14:19:49 +03:00
Vladimír Čunát
82797f98f2 Merge branch 'staging' into modular-stdenv 
Conflicts:
	pkgs/development/interpreters/perl/5.10/setup-hook.sh
	pkgs/development/interpreters/perl/5.8/setup-hook.sh
	pkgs/stdenv/linux/default.nix
 2014-09-08 18:24:58 +02:00
Vladimír Čunát
1e389c976c merge 'staging' into modular-stdenv 
In 2c62a36b77 the messages in pkgs/stdenv/generic/default.nix
were not merged correctly.

Conflicts:
	pkgs/stdenv/generic/default.nix
 2014-09-08 18:16:54 +02:00
Eelco Dolstra
af69fcde47 Fix Nixpkgs evaluation 
error: attribute `luaversion' missing, at /home/eelco/Dev/nixpkgs/pkgs/development/interpreters/lua-5/expat.nix:16:34
 2014-09-08 13:10:13 +02:00
Eelco Dolstra
585983bc95 Merge remote-tracking branch 'origin/staging' 
Conflicts:
	pkgs/applications/version-management/subversion/default.nix
 2014-09-08 11:42:09 +02:00
Vladimír Čunát
420385f81a lua-5.2: minor update to fix CVE-2014-5461 
Note that almost all packages use lua-5.1 which does remain vulnerable,
as they released no update on that branch. CC: @peti.
 2014-09-06 21:26:03 +02:00
Vladimír Čunát
06fea81c6e Merge recent master into staging 
Hydra: ?compare=1150594
 2014-09-06 16:52:45 +02:00
Moritz Ulrich
332395b262 Add myself as a maintainer to a bunch of packages. 2014-09-04 17:05:21 +02:00
Moritz Ulrich
c30b23166b scheme48: update from 1.9 to 1.9.2 2014-09-04 17:05:21 +02:00
Moritz Ulrich
dcf3ad6a2a chibi: Add missing meta.license field. 2014-09-04 17:05:20 +02:00
Moritz Heidkamp
6f682f9afb Add Chibi-Scheme expression 2014-09-04 16:06:42 +02:00
William Roe
9a30ea90f0 Elixir and rebar aren't Linux-specific tools 
Widen platform support to all unix
 2014-09-03 20:14:57 +01:00
Rüdiger Sonderfeld
8abe312cde octave: Add qscintilla support. #3711 2014-09-03 12:12:00 +04:00
Peter Simons
1c0d15b90e Merge branch 'origin/master' into staging. 
Conflicts:
	pkgs/development/libraries/ffmpeg/2.x.nix
	pkgs/development/libraries/serf/default.nix
 2014-09-02 12:31:03 +02:00
Michael Raskin
3ba3ec0f8f Update Regina-REXX 2014-09-02 14:25:17 +04:00
Michael Raskin
bbcf58b217 Merge pull request #3599 from RumataEstor/erlang-odbc 
Support odbc in erlang R16 and R17
 2014-09-02 02:09:46 +04:00
Michael Raskin
ef22c53905 Update ACL2 2014-09-01 09:11:32 +04:00
Michael Fellinger
57b667fe65 ruby: add version 2.1.2 2014-08-31 13:24:10 +01:00
Domen Kožar
df98dda81d pypy: compile also curses 2014-08-30 23:01:09 +02:00
Domen Kožar
33949a413c python34: include a patch to fix http://bugs.python.org/issue21121 2014-08-30 20:43:31 +02:00
Vladimír Čunát
e51f73652d Merge recent master into staging 
Hydra: ?compare=1149952

Conflicts:
	nixos/doc/manual/configuration.xml (changed split file)
	nixos/modules/config/users-groups.nix (choosing filterNull instead of inline definition)
	pkgs/development/libraries/readline/readline6.3.nix (auto-solved)
 2014-08-30 10:04:02 +02:00
Rüdiger Sonderfeld
05b83fe6a2 octave: Update to 3.8.2. 
Also change "," placement to be consistent and remove unnecessary let.
 2014-08-29 16:44:18 +02:00
Domen Kožar
17b88f1b09 pypy: wrap to provide sqlite3 at runtime 2014-08-29 13:49:12 +02:00
Michael Raskin
c7bb162710 Factor out the maintainer 2014-08-29 01:19:24 +04:00
Michael Raskin
ef974b1c24 Merge pull request #3175 from doublec/self 
Add Self programming language
 2014-08-29 01:09:47 +04:00
Domen Kožar
7b7fb63314 pypy: disable test_sqlite again... 2014-08-27 19:04:38 +02:00
Domen Kožar
df30066790 pypy: test sqlite3 and verify the module 2014-08-27 11:20:24 +02:00
Domen Kožar
4f2781019e pypy: properly hint sqlite3 headers 2014-08-26 19:51:39 +02:00
Domen Kožar
0ba31c1e6d pypy: give hints about sqlite3 2014-08-26 12:26:09 +02:00
Domen Kožar
276220262e pypy: hint about tcl/tk headers/libs paths 2014-08-26 09:57:38 +02:00
Dmitry Belyaev
93697e85ca Support odbc in erlang R16 and R17 2014-08-26 13:11:24 +10:00
Domen Kožar
db47d51592 pypy: add X libs to build tkinter 2014-08-25 19:00:37 +02:00
Bjørn Forsman
c9baba9212 Fix many package descriptions 
(My OCD kicked in today...)

Remove repeated package names, capitalize first word, remove trailing
periods and move overlong descriptions to longDescription.

I also simplified some descriptions as well, when they were particularly
long or technical, often based on Arch Linux' package descriptions.

I've tried to stay away from generated expressions (and I think I
succeeded).

Some specifics worth mentioning:
 * cron, has "Vixie Cron" in its description. The "Vixie" part is not
   mentioned anywhere else. I kept it in a parenthesis at the end of the
   description.

 * ctags description started with "Exuberant Ctags ...", and the
   "exuberant" part is not mentioned elsewhere. Kept it in a parenthesis
   at the end of description.

 * nix has the description "The Nix Deployment System". Since that
   doesn't really say much what it is/does (especially after removing
   the package name!), I changed that to "Powerful package manager that
   makes package management reliable and reproducible" (borrowed from
   nixos.org).

 * Tons of "GNU Foo, Foo is a [the important bits]" descriptions
   is changed to just [the important bits]. If the package name doesn't
   contain GNU I don't think it's needed to say it in the description
   either.
 2014-08-24 22:31:37 +02:00
Domen Kožar
bce42c282a rubyLibs.nokogiri: fix build 2014-08-24 18:33:47 +02:00
Domen Kožar
3df019067d pypy: add tcl support 2014-08-24 17:33:27 +02:00
Michael Raskin
ede8be9281 Fix tarball evaluation; had to regenerate Ruby gem list 2014-08-24 12:55:08 +04:00