public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into staging

Browse Source 
Conflicts:
	pkgs/tools/system/facter/default.nix
This commit is contained in:
obadz
2016-08-29 12:44:17 +01:00
parent f3c994ca11 898edb0fbc
commit b74793bd1c
21 changed files with 291 additions and 208 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/tools/system/facter/default.nix
View File

@@ -1,11 +1,11 @@
{ stdenv, fetchurl, boost, cmake, curl, leatherman, libyamlcpp, openssl, ruby, utillinux }:
{ stdenv, fetchurl, boost, cmake, cpp-hocon, curl, leatherman, libyamlcpp, openssl, ruby, utillinux }:
stdenv.mkDerivation rec {
name = "facter-${version}";
version = "3.1.8";
version = "3.4.1";
src = fetchurl {
url = "https://downloads.puppetlabs.com/facter/${name}.tar.gz";
sha256 = "1fhfjf5bm5kyjiady14fxhpp7hdrkgx56vsvdbqj82km0xqcxpj9";
sha256 = "1vvvqni68l3hmnxi8jp0n2rwzxyh1vmgv6xa2954h94dfax6dmcj";
};
cmakeFlags = [ "-DFACTER_RUBY=${ruby}/lib/libruby.so" ];
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
# since we cant expand $out in cmakeFlags
preConfigure = "cmakeFlags+=\" -DRUBY_LIB_INSTALL=$out/lib/ruby\"";
buildInputs = [ boost cmake curl leatherman libyamlcpp openssl ruby utillinux ];
buildInputs = [ boost cmake cpp-hocon curl leatherman libyamlcpp openssl ruby utillinux ];
meta = with stdenv.lib; {
homepage = https://github.com/puppetlabs/facter;

8
pkgs/tools/system/runit/default.nix
View File

@@ -1,4 +1,6 @@
{ stdenv, fetchurl }:
{ stdenv, fetchurl
, static ? false
}:
stdenv.mkDerivation rec {
name = "runit-${version}";
@@ -15,7 +17,9 @@ stdenv.mkDerivation rec {
doCheck = true;
postPatch = ''
buildInputs = stdenv.lib.optionals static [ stdenv.cc.libc stdenv.cc.libc.static ];
postPatch = stdenv.lib.optionalString (!static) ''
sed -i 's,-static,,g' src/Makefile
'';

48
pkgs/tools/typesetting/kindlegen/default.nix Normal file
View File

@@ -0,0 +1,48 @@
{ fetchurl, stdenv }:
let
version = "2.9";
fileVersion = builtins.replaceStrings [ "." ] [ "_" ] version;
sha256 = {
"x86_64-linux" = "15i20kzhdcmi94w7wfhqbl6j20v47cdakjm2mn3x8w495iddna4q";
"i686-linux" = "15i20kzhdcmi94w7wfhqbl6j20v47cdakjm2mn3x8w495iddna4q";
"x86_64-darwin" = "0zniyn0s41fxqrajbgwxbcsj5vzf9m7a6yvdz2b11mphr00kpbbs";
"i686-darwin" = "0zniyn0s41fxqrajbgwxbcsj5vzf9m7a6yvdz2b11mphr00kpbbs";
"x86_64-cygwin" = "02slfh1bbpijay4skj85cjiv7z43ha8vm5aa1lwiqjk86qbl1f3h";
"i686-cygwin" = "02slfh1bbpijay4skj85cjiv7z43ha8vm5aa1lwiqjk86qbl1f3h";
}."${stdenv.system}" or (throw "system #{stdenv.system.} is not supported");
url = {
"x86_64-linux" = "http://kindlegen.s3.amazonaws.com/kindlegen_linux_2.6_i386_v${fileVersion}.tar.gz";
"i686-linux" = "http://kindlegen.s3.amazonaws.com/kindlegen_linux_2.6_i386_v${fileVersion}.tar.gz";
"x86_64-darwin" = "http://kindlegen.s3.amazonaws.com/KindleGen_Mac_i386_v${fileVersion}.zip";
"i686-darwin" = "http://kindlegen.s3.amazonaws.com/KindleGen_Mac_i386_v${fileVersion}.zip";
"x86_64-cygwin" = "http://kindlegen.s3.amazonaws.com/kindlegen_win32_v${fileVersion}.zip";
"i686-cygwin" = "http://kindlegen.s3.amazonaws.com/kindlegen_win32_v${fileVersion}.zip";
}."${stdenv.system}" or (throw "system #{stdenv.system.} is not supported");
in stdenv.mkDerivation rec {
name = "kindlegen-${version}";
src = fetchurl {
inherit url;
inherit sha256;
};
sourceRoot = ".";
installPhase = ''
mkdir -p $out/bin $out/share/kindlegen/doc
install -m755 kindlegen $out/bin/kindlegen
cp -r *.txt *.html docs/* $out/share/kindlegen/doc
'';
meta = with stdenv.lib; {
description = "Convert documents to .mobi for use with Amazon Kindle";
homepage = https://www.amazon.com/gp/feature.html?docId=1000765211;
license = licenses.unfree;
maintainers = with maintainers; [ peterhoeg ];
platforms = [ "x86_64-linux" "i686-linux" "x86_64-darwin" "i686-darwin" "x86_64-cygwin" "i686-cygwin" ];
};
}