Merge pull request #16620 from zimbatm/ronn-0.7.3

Ronn 0.7.3
This commit is contained in:
Rok Garbas 2016-07-21 01:23:06 +02:00 committed by GitHub
commit e2f6c6b9d2
6 changed files with 108 additions and 15 deletions

View file

@ -0,0 +1,3 @@
source "https://rubygems.org"
gem "ronn"

View file

@ -0,0 +1,19 @@
GEM
remote: https://rubygems.org/
specs:
hpricot (0.8.6)
mustache (1.0.3)
rdiscount (2.2.0.1)
ronn (0.7.3)
hpricot (>= 0.8.2)
mustache (>= 0.7.0)
rdiscount (>= 1.5.8)
PLATFORMS
ruby
DEPENDENCIES
ronn
BUNDLED WITH
1.11.2

View file

@ -0,0 +1,31 @@
{ stdenv, lib, bundlerEnv, makeWrapper, groff }:
stdenv.mkDerivation rec {
name = "ronn-${version}";
version = env.gems.ronn.version;
env = bundlerEnv rec {
name = "ronn-gems";
gemfile = ./Gemfile;
lockfile = ./Gemfile.lock;
gemset = ./gemset.nix;
};
phases = ["installPhase"];
buildInputs = [ makeWrapper ];
installPhase = ''
mkdir -p $out/bin
makeWrapper ${env}/bin/ronn $out/bin/ronn \
--set PATH ${groff}/bin
'';
meta = with lib; {
description = "markdown-based tool for building manpages";
homepage = https://rtomayko.github.io/ronn/;
license = licenses.mit;
maintainers = with maintainers; [ zimbatm ];
platforms = env.ruby.meta.platforms;
};
}

View file

@ -0,0 +1,34 @@
{
hpricot = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "1jn8x9ch79gqmnzgyz78kppavjh5lqx0y0r6frykga2b86rz9s6z";
type = "gem";
};
version = "0.8.6";
};
mustache = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "1v4pdvgvs8gw0zbh5sy3l308amlsjg8sdfrkml0g0m0wwj4x7naf";
type = "gem";
};
version = "1.0.3";
};
rdiscount = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "1arvk3k06prxasq1djbj065ixar4zl171340g7wr1ww4gj9makx3";
type = "gem";
};
version = "2.2.0.1";
};
ronn = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "07plsxxfx5bxdk72ii9za6km0ziqlq8jh3bicr4774dalga6zpw2";
type = "gem";
};
version = "0.7.3";
};
}

View file

@ -1,6 +1,4 @@
{ stdenv, fetchurl, openssl, lzo, zlib, gcc, iproute }:
with stdenv.lib;
{ stdenv, fetchurl, openssl, lzo, zlib, iproute, which, ronn }:
stdenv.mkDerivation rec {
version = "1.1.12";
@ -12,29 +10,35 @@ stdenv.mkDerivation rec {
};
preConfigure = ''
substituteInPlace ./make-linux.mk \
--replace 'CC=$(shell which clang gcc cc 2>/dev/null | head -n 1)' "CC=${gcc}/bin/gcc";
substituteInPlace ./make-linux.mk \
--replace 'CXX=$(shell which clang++ g++ c++ 2>/dev/null | head -n 1)' "CC=${gcc}/bin/g++";
substituteInPlace ./osdep/LinuxEthernetTap.cpp \
--replace 'execlp("ip",' 'execlp("${iproute}/bin/ip",'
--replace 'execlp("ip",' 'execlp("${iproute}/bin/ip",'
patchShebangs ./doc/build.sh
substituteInPlace ./doc/build.sh \
--replace '/usr/bin/ronn' '${ronn}/bin/ronn' \
--replace 'ronn -r' '${ronn}/bin/ronn -r'
'';
buildInputs = [ openssl lzo zlib gcc iproute ];
buildFlags = [ "one" ]; # TODO: Add support for building and installing manpages as well.
buildInputs = [ openssl lzo zlib iproute which ronn ];
installPhase = ''
install -Dt "$out/bin/" zerotier-one
ln -s $out/bin/zerotier-one $out/bin/zerotier-idtool
ln -s $out/bin/zerotier-one $out/bin/zerotier-cli
mkdir -p $man/share/man/man8
for cmd in zerotier-one.8 zerotier-cli.1 zerotier-idtool.1; do
cat doc/$cmd | gzip -9 > $man/share/man/man8/$cmd.gz
done
'';
meta = {
outputs = [ "out" "man" ];
meta = with stdenv.lib; {
description = "Create flat virtual Ethernet networks of almost unlimited size";
homepage = https://www.zerotier.com;
license = stdenv.lib.licenses.gpl3;
maintainers = [ stdenv.lib.maintainers.sjmackenzie ];
platforms = with stdenv.lib; platforms.allBut [ "i686-linux" ];
license = licenses.gpl3;
maintainers = [ sjmackenzie ];
platforms = platforms.allBut [ "i686-linux" ];
};
}

View file

@ -9185,6 +9185,8 @@ in
rote = callPackage ../development/libraries/rote { };
ronn = callPackage ../development/tools/ronn { };
rubberband = callPackage ../development/libraries/rubberband {
inherit (vamp) vampSDK;
};