public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
90,858 Commits 1 Branch 0 Tags
Commit Graph

2233 Commits

Author SHA1 Message Date
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 d2c0011c2fafa92624b30a2408123a15a1af390f.

c04e49289871232ff3c2fd1239b64c2513f18fd1 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 e22889064f82be3

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