Merge branch 'master' into hardened-stdenv

This commit is contained in:
Franz Pletz
2016-02-15 20:05:29 +01:00
310 changed files with 9217 additions and 1667 deletions
@@ -1,30 +1,30 @@
{ buildRubyGem, lib, bundler, ruby, nix, nix-prefetch-scripts }:
{ buildRubyGem, lib, bundler, ruby, nix, nix-prefetch-git }:
buildRubyGem rec {
inherit ruby;
name = "${gemName}-${version}";
gemName = "bundix";
version = "2.0.4";
version = "2.0.5";
sha256 = "0i7fdxi6w29yxnblpckczazb79m5x03hja8sfnabndg4yjc868qs";
sha256 = "0bsynhr44jz6nih0xn7v32h1qvywnb5335ka208gn7jp6bjwabhy";
buildInputs = [bundler];
postInstall = ''
gem_root=$GEM_HOME/gems/${gemName}-${version}
sed \
-e 's|NIX_INSTANTIATE =.*|NIX_INSTANTIATE = "${nix}/bin/nix-instantiate"|' \
-i $gem_root/lib/bundix.rb
sed \
-e 's|NIX_HASH =.*|NIX_HASH = "${nix}/bin/nix-hash"|' \
-i $gem_root/lib/bundix.rb
sed \
-e 's|NIX_PREFETCH_URL =.*|NIX_PREFETCH_URL = "${nix}/bin/nix-prefetch-url"|' \
-i $gem_root/lib/bundix.rb
sed \
-e 's|NIX_PREFETCH_GIT =.*|NIX_PREFETCH_GIT = "${nix-prefetch-scripts}/bin/nix-prefetch-git"|' \
-i $gem_root/lib/bundix.rb
substituteInPlace $GEM_HOME/gems/${gemName}-${version}/lib/bundix.rb \
--replace \
"'nix-instantiate'" \
"'${nix}/bin/nix-instantiate'" \
--replace \
"'nix-hash'" \
"'${nix}/bin/nix-hash'" \
--replace \
"'nix-prefetch-url'" \
"'${nix}/bin/nix-prefetch-url'" \
--replace \
"'nix-prefetch-git'" \
"'${nix-prefetch-git}/bin/nix-prefetch-git'"
'';
meta = {