Merge branch 'master' into staging-next
This commit is contained in:
Jan Tojnar
@@ -2,16 +2,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "eksctl";
|
||||
version = "0.5.0";
|
||||
version = "0.5.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "weaveworks";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "1aifdrxasg7d6gpy7s6kdjz9ky2kddpigh8z0f3zckw7hd68jk0g";
|
||||
sha256 = "0lfg7im43bslbg23xajdh0nhy4lj3y70gncxgqzfklb1ax0953r2";
|
||||
};
|
||||
|
||||
modSha256 = "18vsi1hrv3z36w7vwl2bg8b2p5dwzw7dsw434adw9l1k7yv5x4vv";
|
||||
modSha256 = "0c8hbb73w1922qh895lsk0m9i7lk9kzrvxjc4crwsfpn9pv0qgd3";
|
||||
|
||||
subPackages = [ "cmd/eksctl" ];
|
||||
|
||||
|
||||
@@ -4,16 +4,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "procs";
|
||||
version = "0.8.5";
|
||||
version = "0.8.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dalance";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "0ihww2sm9hnh748723lr1cxw9zyi9nfxbbiij5a465mypa2p7w0v";
|
||||
sha256 = "0gqbdk4gaxkpval52fsravjgvqz6c9zh1ahry57a2p6kszw96n13";
|
||||
};
|
||||
|
||||
cargoSha256 = "1aq2nhspb9kp9mzj5550xph09qvd0ahlw246hcx2mqkr4frh64x0";
|
||||
cargoSha256 = "1k0yl03rxbv009gb2jkc0f7mjq3pzc9bf8hppk2w9xicxpq6l55c";
|
||||
|
||||
buildInputs = stdenv.lib.optional stdenv.isDarwin Security;
|
||||
|
||||
|
||||
@@ -89,14 +89,15 @@ let
|
||||
ps.six
|
||||
]);
|
||||
|
||||
version = "14.2.1";
|
||||
version = "14.2.3";
|
||||
in rec {
|
||||
ceph = stdenv.mkDerivation {
|
||||
name="ceph-${version}";
|
||||
pname = "ceph";
|
||||
inherit version;
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://download.ceph.com/tarballs/ceph-${version}.tar.gz";
|
||||
sha256 = "0qa9p8xp26d45h3jfj1rbwhmqv44f9n1mvccmpzaf2i05v42kmzb";
|
||||
sha256 = "1pa8czb205pz4vjfh82gsgickj3cdjrx51mcx7acsyqgp3dfvl33";
|
||||
};
|
||||
|
||||
patches = [
|
||||
@@ -181,7 +182,7 @@ in rec {
|
||||
homepage = https://ceph.com/;
|
||||
description = "Tools needed to mount Ceph's RADOS Block Devices";
|
||||
license = with licenses; [ lgpl21 gpl2 bsd3 mit publicDomain ];
|
||||
maintainers = with maintainers; [ adev ak krav ];
|
||||
maintainers = with maintainers; [ adev ak johanot krav ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
} ''
|
||||
|
||||
@@ -1,37 +1,38 @@
|
||||
{ stdenv, fetchurl, cmake, recode, perl }:
|
||||
|
||||
let srcs = {
|
||||
fortune = fetchurl {
|
||||
url = "https://github.com/shlomif/fortune-mod/archive/fortune-mod-${version}.tar.gz";
|
||||
sha256 = "89223bb649ea62b030527f181539182d6a17a1a43b0cc499a52732b839f7b691";
|
||||
};
|
||||
shlomifCommon = fetchurl {
|
||||
url = https://bitbucket.org/shlomif/shlomif-cmake-modules/raw/default/shlomif-cmake-modules/Shlomif_Common.cmake;
|
||||
sha256 = "62f188a9f1b7ab0e757eb0bc6540d9c0026d75edc7acc1c3cdf7438871d0a94f";
|
||||
};
|
||||
};
|
||||
version = "2.6.2";
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "fortune-mod";
|
||||
inherit version;
|
||||
version = "2.10.0";
|
||||
|
||||
src = srcs.fortune;
|
||||
|
||||
sourceRoot = "fortune-mod-fortune-mod-${version}/fortune-mod";
|
||||
src = fetchurl {
|
||||
url = "https://www.shlomifish.org/open-source/projects/fortune-mod/arcs/fortune-mod-${version}.tar.xz";
|
||||
sha256 = "07g50hij87jb7m40pkvgd47qfvv4s805lwiz79jbqcxzd7zdyax7";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake perl ];
|
||||
|
||||
buildInputs = [ recode ];
|
||||
|
||||
preConfigure = ''
|
||||
cp ${srcs.shlomifCommon} cmake/Shlomif_Common.cmake
|
||||
'';
|
||||
cmakeFlags = [
|
||||
"-DLOCALDIR=${placeholder "out"}/share/fortunes"
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
mv $out/games/fortune $out/bin/fortune
|
||||
rm -r $out/games
|
||||
'';
|
||||
patches = [ (builtins.toFile "not-a-game.patch" ''
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 865e855..5a59370 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -154,7 +154,7 @@ ENDMACRO()
|
||||
my_exe(
|
||||
"fortune"
|
||||
"fortune/fortune.c"
|
||||
- "games"
|
||||
+ "bin"
|
||||
)
|
||||
|
||||
my_exe(
|
||||
--
|
||||
'') ];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "A program that displays a pseudorandom message from a database of quotations";
|
||||
|
||||
@@ -1,39 +0,0 @@
|
||||
{ stdenv, fetchurl, elk5Version, makeWrapper, jre }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = elk5Version;
|
||||
pname = "logstash";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://artifacts.elastic.co/downloads/logstash/${pname}-${version}.tar.gz";
|
||||
sha256 = "0sax9p2bwjdrcvkm1mgvljdjn2qkyjd5i8rzajdn3n98gqin1la0";
|
||||
};
|
||||
|
||||
dontBuild = true;
|
||||
dontPatchELF = true;
|
||||
dontStrip = true;
|
||||
dontPatchShebangs = true;
|
||||
|
||||
buildInputs = [
|
||||
makeWrapper jre
|
||||
];
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out
|
||||
cp -r {Gemfile*,modules,vendor,lib,bin,config,data,logstash-core,logstash-core-plugin-api} $out
|
||||
|
||||
wrapProgram $out/bin/logstash \
|
||||
--set JAVA_HOME "${jre}"
|
||||
|
||||
wrapProgram $out/bin/logstash-plugin \
|
||||
--set JAVA_HOME "${jre}"
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Logstash is a data pipeline that helps you process logs and other event data from a variety of systems";
|
||||
homepage = https://www.elastic.co/products/logstash;
|
||||
license = licenses.asl20;
|
||||
platforms = platforms.unix;
|
||||
maintainers = [ maintainers.wjlroe maintainers.offline ];
|
||||
};
|
||||
}
|
||||
@@ -1,15 +1,13 @@
|
||||
{ stdenv, rpmextract, ncurses5, patchelf, requireFile, unzip }:
|
||||
{ stdenv, rpmextract, ncurses5, patchelf, fetchurl, unzip }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "megacli";
|
||||
version = "8.07.14";
|
||||
|
||||
src =
|
||||
requireFile {
|
||||
name = "${builtins.replaceStrings ["."] ["-"] version}_MegaCLI.zip";
|
||||
url = https://docs.broadcom.com/docs/12351587;
|
||||
sha256 = "1sdn58fbmd3fj4nzbajq3gcyw71ilgdh45r5p4sa6xmb7np55cfr";
|
||||
};
|
||||
src = fetchurl {
|
||||
url = "https://docs.broadcom.com/docs-and-downloads/raid-controllers/raid-controllers-common-files/${builtins.replaceStrings ["."] ["-"] version}_MegaCLI.zip";
|
||||
sha256 = "1sdn58fbmd3fj4nzbajq3gcyw71ilgdh45r5p4sa6xmb7np55cfr";
|
||||
};
|
||||
|
||||
buildInputs = [rpmextract ncurses5 unzip];
|
||||
libPath =
|
||||
|
||||
@@ -1,28 +0,0 @@
|
||||
{ lib, systemd, buildGoPackage, fetchFromGitHub }:
|
||||
|
||||
buildGoPackage rec {
|
||||
pname = "journalbeat";
|
||||
version = "5.6.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mheese";
|
||||
repo = "journalbeat";
|
||||
rev = "v${version}";
|
||||
sha256 = "1vgpwnwqjc93nvdpcd52748bwl3r371jb55l17bsgdzrmlcyfm8a";
|
||||
};
|
||||
|
||||
goPackagePath = "github.com/mheese/journalbeat";
|
||||
|
||||
buildInputs = [ systemd.dev ];
|
||||
|
||||
postFixup = let libPath = lib.makeLibraryPath [ systemd.lib ]; in ''
|
||||
patchelf --set-rpath ${libPath} "$bin/bin/journalbeat"
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = https://github.com/mheese/journalbeat;
|
||||
description = "Journalbeat is a log shipper from systemd/journald to Logstash/Elasticsearch";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ mbrgm ];
|
||||
};
|
||||
}
|
||||
@@ -1,49 +1,55 @@
|
||||
{ stdenv, fetchurl, pkgconfig, libxml2, libxslt, popt, perl
|
||||
, glib, pango, pangoxsl, gtk2, libtool, autoconf, automake }:
|
||||
{ stdenv, fetchFromGitHub
|
||||
, autoreconfHook
|
||||
, gtk2
|
||||
, libxml2
|
||||
, libxslt
|
||||
, pango
|
||||
, pangoxsl
|
||||
, perl
|
||||
, pkgconfig
|
||||
, popt
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "xmlroff";
|
||||
version = "0.6.2";
|
||||
version = "0.6.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/xmlroff/xmlroff/archive/v${version}.tar.gz";
|
||||
sha256 = "1sczn6xjczsfdxlbjqv4xqlki2a95y2s8ih2nl9v1vhqfk17fiww";
|
||||
src = fetchFromGitHub {
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "0dgp72094lx9i9gvg21pp8ak7bg39707rdf6wz011p9s6n6lrq5g";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
nativeBuildInputs = [ autoreconfHook pkgconfig ];
|
||||
buildInputs = [
|
||||
autoconf
|
||||
automake
|
||||
libxml2
|
||||
libxslt
|
||||
libtool
|
||||
glib
|
||||
pango
|
||||
pangoxsl
|
||||
gtk2
|
||||
popt
|
||||
];
|
||||
|
||||
sourceRoot = "source/xmlroff/";
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
configureScript = "./autogen.sh";
|
||||
|
||||
configureFlags = [
|
||||
"--disable-pangoxsl"
|
||||
"--disable-gp"
|
||||
];
|
||||
|
||||
hardeningDisable = [ "format" ];
|
||||
|
||||
preBuild = ''
|
||||
substituteInPlace tools/insert-file-as-string.pl --replace "/usr/bin/perl" "${perl}/bin/perl"
|
||||
substituteInPlace Makefile --replace "docs" ""
|
||||
substituteInPlace Makefile --replace "docs" "" # docs target wants to download from network
|
||||
'';
|
||||
|
||||
sourceRoot = "${pname}-${version}/xmlroff/";
|
||||
|
||||
patches = [./xmlroff.patch];
|
||||
|
||||
meta = {
|
||||
platforms = stdenv.lib.platforms.unix;
|
||||
license = stdenv.lib.licenses.bsd3;
|
||||
meta = with stdenv.lib; {
|
||||
description = "XSL Formatter";
|
||||
homepage = "http://xmlroff.org/";
|
||||
platforms = platforms.unix;
|
||||
license = licenses.bsd3;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,11 +0,0 @@
|
||||
--- xmlroff-0.6.2.orig/libfo/fo-libfo-basic.h
|
||||
+++ xmlroff-0.6.2/libfo/fo-libfo-basic.h
|
||||
@@ -11,8 +11,7 @@
|
||||
#define __FO_LIBFO_BASIC_H__
|
||||
|
||||
#include <stdio.h>
|
||||
-#include <glib/gtypes.h>
|
||||
-#include <glib/gerror.h>
|
||||
+#include <glib.h>
|
||||
|
||||
G_BEGIN_DECLS
|
||||
Reference in New Issue
Block a user