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
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
Charles Strahan
e1c40a679c
fix gem builder
2014-11-02 22:05:37 +00: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
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
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
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
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
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
Jaka Hudoklin
aa7147c31b
rubyLibs: add heroku client
2014-09-22 01:57:01 +02:00