Merge remote-tracking branch 'upstream/master' into staging

Conflicts: pkgs/applications/networking/browsers/vivaldi/default.nix pkgs/misc/emulators/wine/base.nix
2016-05-03 23:12:48 +03:00
parent 2362891dc8 e7d3166656
commit aadaa91379
506 changed files with 31436 additions and 5404 deletions
@@ -49,7 +49,7 @@ stdenv.mkDerivation {
    ./install.sh "--prefix=$out"
  '' + (if stdenv.isLinux then ''
    patchelf --interpreter "${stdenv.glibc.out}/lib/${stdenv.cc.dynamicLinker}" \
-             --set-rpath "${stdenv.cc.cc}/lib/:${stdenv.cc.cc}/lib64/:${zlib.out}/lib" \
+             --set-rpath "${stdenv.cc.cc.lib}/lib/:${stdenv.cc.cc.lib}/lib64/:${zlib.out}/lib" \
             "$out/bin/cargo"
  '' else "") + postInstall;
 }
@@ -0,0 +1,2 @@
+source 'https://rubygems.org'
+gem 'rake'
@@ -0,0 +1,13 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    rake (11.1.1)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  rake
+
+BUNDLED WITH
+   1.10.5
@@ -0,0 +1,17 @@
+{ lib, bundlerEnv, ruby }:
+
+bundlerEnv {
+  name = "rake-11.1.1";
+
+  inherit ruby;
+  gemfile = ./Gemfile;
+  lockfile = ./Gemfile.lock;
+  gemset = ./gemset.nix;
+  
+  meta = with lib; {
+    description = "A software task management and build automation tool";
+    homepage = https://github.com/ruby/rake;
+    license  = with licenses; mit;
+    platforms = platforms.unix;
+  };
+}
@@ -0,0 +1,9 @@
+{
+  "rake" = {
+    version = "11.1.1";
+    source = {
+      type = "gem";
+      sha256 = "0h8wcic2xh3lv7yvs05pqnfqb80jyl488f7136lgxmajb0s1rqhg";
+    };
+  };
+}