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

Merge master into staging-next

Browse Source
This commit is contained in:
Frederik Rietdijk
2020-11-04 09:27:42 +01:00
parent a31fd3cb7f 9957d406a2
commit 9e6d7d3c74
170 changed files with 7077 additions and 4472 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/servers/keycloak/default.nix
+40 -7
View File
@@ -1,5 +1,21 @@
{ stdenv, fetchzip, makeWrapper, jre }:
{ stdenv, lib, fetchzip, makeWrapper, jre, writeText, nixosTests
, postgresql_jdbc ? null, mysql_jdbc ? null
}:
let
mkModuleXml = name: jarFile: writeText "module.xml" ''
<?xml version="1.0" ?>
<module xmlns="urn:jboss:module:1.3" name="${name}">
<resources>
<resource-root path="${jarFile}"/>
</resources>
<dependencies>
<module name="javax.api"/>
<module name="javax.transaction.api"/>
</dependencies>
</module>
'';
in
stdenv.mkDerivation rec {
pname = "keycloak";
version = "11.0.2";
@@ -16,20 +32,37 @@ stdenv.mkDerivation rec {
cp -r * $out
rm -rf $out/bin/*.{ps1,bat}
rm -rf $out/bin/add-user-keycloak.sh
rm -rf $out/bin/jconsole.sh
chmod +x $out/bin/standalone.sh
wrapProgram $out/bin/standalone.sh \
--prefix PATH ":" ${jre}/bin ;
module_path=$out/modules/system/layers/keycloak
if ! [[ -d $module_path ]]; then
echo "The module path $module_path not found!"
exit 1
fi
${lib.optionalString (postgresql_jdbc != null) ''
mkdir -p $module_path/org/postgresql/main
ln -s ${postgresql_jdbc}/share/java/postgresql-jdbc.jar $module_path/org/postgresql/main/
ln -s ${mkModuleXml "org.postgresql" "postgresql-jdbc.jar"} $module_path/org/postgresql/main/module.xml
''}
${lib.optionalString (mysql_jdbc != null) ''
mkdir -p $module_path/com/mysql/main
ln -s ${mysql_jdbc}/share/java/mysql-connector-java.jar $module_path/com/mysql/main/
ln -s ${mkModuleXml "com.mysql" "mysql-connector-java.jar"} $module_path/com/mysql/main/module.xml
''}
wrapProgram $out/bin/standalone.sh --set JAVA_HOME ${jre}
wrapProgram $out/bin/add-user-keycloak.sh --set JAVA_HOME ${jre}
wrapProgram $out/bin/jboss-cli.sh --set JAVA_HOME ${jre}
'';
passthru.tests = nixosTests.keycloak;
meta = with stdenv.lib; {
homepage = "https://www.keycloak.org/";
description = "Identity and access management for modern applications and services";
license = licenses.asl20;
platforms = jre.meta.platforms;
maintainers = [ maintainers.ngerstle ];
maintainers = with maintainers; [ ngerstle talyz ];
};
}
pkgs/servers/lidarr/default.nix
+2 -2
View File
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "lidarr";
version = "0.7.1.1381";
version = "0.7.2.1878";
src = fetchurl {
url = "https://github.com/lidarr/Lidarr/releases/download/v${version}/Lidarr.master.${version}.linux.tar.gz";
sha256 = "1vk1rlsb48ckdc4421a2qs0v5gy7kc4fad24dm3k14znh7llwypr";
sha256 = "0kv0x3vvv4rp3i5k5985zp95mm8ca7gpm7kr82l11v3hm3n6yvqn";
};
nativeBuildInputs = [ makeWrapper ];
pkgs/servers/mail/freepops/default.nix
-29
View File
@@ -1,29 +0,0 @@
{stdenv, fetchurl, pkgconfig, openssl, lua5, curl, readline, bison, expat}:
stdenv.mkDerivation {
name = "freepops-0.2.9";
src = fetchurl {
url = "mirror://sourceforge/freepops/0.2.9/freepops-0.2.9.tar.gz";
sha256 = "3a065e30cafed03d9b6fdb28251ae5bf0d8aeb62181746154beecd25dc0c9cae";
};
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ openssl lua5 curl readline bison expat];
configurePhase =
''
export WHERE=$prefix/
export LOCALEDIR=$prefix/share/locale/
./configure.sh linux
'';
meta = {
description = "An extensible pop3 server";
longDescription = ''
FreePOPs is an extensible pop3 server. Its main purpose is to provide
a pop3 interface to a webmail.
'';
homepage = "http://www.freepops.org/";
platforms = with stdenv.lib.platforms; linux;
maintainers = with stdenv.lib.maintainers; [ pierron ];
broken = true;
};
}
pkgs/servers/monitoring/kapacitor/default.nix
+2 -2
View File
@@ -2,7 +2,7 @@
buildGoPackage rec {
pname = "kapacitor";
version = "1.5.6";
version = "1.5.7";
goPackagePath = "github.com/influxdata/kapacitor";
@@ -10,7 +10,7 @@ buildGoPackage rec {
owner = "influxdata";
repo = "kapacitor";
rev = "v${version}";
sha256 = "1jb04lnxjrms7x5nlrsd1s465rramm9z4zkqpfw1vfdsqa2dd8rc";
sha256 = "0lzx25d4y5d8rsddgnypfskcxa5qlwc294sdzmn8dlq995yphpac";
};
meta = with lib; {
pkgs/servers/monitoring/munin/default.nix
+2 -2
View File
@@ -3,14 +3,14 @@
}:
stdenv.mkDerivation rec {
version = "2.0.64";
version = "2.0.65";
pname = "munin";
src = fetchFromGitHub {
owner = "munin-monitoring";
repo = "munin";
rev = version;
sha256 = "00gvvy7s2h1kxdxss7n63ir87fn66kq48lp94ackdyj49526maz4";
sha256 = "0gz9kp1x39xpklq77xpm8kldsc4w87732if90w5p9pw0ip4cn6df";
};
buildInputs = [
pkgs/servers/mqtt/mosquitto/default.nix
+2 -2
View File
@@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
pname = "mosquitto";
version = "1.6.11";
version = "1.6.12";
src = fetchFromGitHub {
owner = "eclipse";
repo = "mosquitto";
rev = "v${version}";
sha256 = "05mwghfmp459f7c0yph0xp1a5k6c0wghxzqm0n8jw7yfj7qixv88";
sha256 = "0y9jna2p7wg57vv2g6ls1dj6w89vaw828y9z1wb3vwz1yhvs35s8";
};
postPatch = ''
pkgs/servers/nosql/riak-cs/2.1.1.nix
-70
View File
@@ -1,70 +0,0 @@
{ stdenv, lib, fetchurl, unzip, erlang, git, wget, which, pam
, Carbon ? null, Cocoa ? null }:
stdenv.mkDerivation {
name = "riak_cs-2.1.1";
buildInputs = [
which unzip erlang git wget
] ++ lib.optionals stdenv.isDarwin [ Carbon Cocoa ]
++ lib.optional stdenv.isLinux [ pam ];
src = fetchurl {
url = "https://s3.amazonaws.com/downloads.basho.com/riak-cs/2.1/2.1.1/riak-cs-2.1.1.tar.gz";
sha256 = "115cac127aac6d759c1b429a52e0d18e491c0719a6530b1b88aa52c4efdbedd5";
};
postPatch = ''
sed -i deps/node_package/priv/base/env.sh \
-e 's@{{platform_data_dir}}@''${RIAK_DATA_DIR:-/var/db/riak-cs}@' \
-e 's@^RUNNER_SCRIPT_DIR=.*@RUNNER_SCRIPT_DIR='$out'/bin@' \
-e 's@^RUNNER_BASE_DIR=.*@RUNNER_BASE_DIR='$out'@' \
-e 's@^RUNNER_ETC_DIR=.*@RUNNER_ETC_DIR=''${RIAK_ETC_DIR:-/etc/riak-cs}@' \
-e 's@^RUNNER_LOG_DIR=.*@RUNNER_LOG_DIR=''${RIAK_LOG_DIR:-/var/log}@'
sed -i ./Makefile \
-e 's@rel: deps compile@rel: deps compile-src@'
'';
preBuild = ''
patchShebangs .
'';
buildPhase = ''
runHook preBuild
make locked-deps
make rel
runHook postBuild
'';
doCheck = false;
installPhase = ''
runHook preInstall
mkdir $out
mv rel/riak-cs/etc rel/riak-cs/riak-etc
mkdir -p rel/riak-cs/etc
mv rel/riak-cs/riak-etc rel/riak-cs/etc/riak-cs
mv rel/riak-cs/* $out
for prog in $out/bin/*; do
substituteInPlace $prog \
--replace '. "`cd \`dirname $0\` && /bin/pwd`/../lib/env.sh"' \
". $out/lib/env.sh"
done
runHook postInstall
'';
meta = with lib; {
description = "Dynamo inspired NoSQL DB by Basho with S3 compatibility";
platforms = [ "x86_64-linux" "x86_64-darwin" ];
license = licenses.asl20;
maintainers = with maintainers; [ mdaiter ];
knownVulnerabilities = [ "CVE-2017-3163 - see https://github.com/NixOS/nixpkgs/issues/33876" ];
};
}
pkgs/servers/nosql/riak-cs/stanchion.nix
-65
View File
@@ -1,65 +0,0 @@
{ stdenv, lib, fetchurl, unzip, erlang, git, wget, which, pam
, Carbon ? null, Cocoa ? null }:
stdenv.mkDerivation {
name = "stanchion-2.1.1";
buildInputs = [
which unzip erlang git wget
] ++ lib.optionals stdenv.isDarwin [ Carbon Cocoa ]
++ lib.optional stdenv.isLinux [ pam ];
src = fetchurl {
url = "https://s3.amazonaws.com/downloads.basho.com/stanchion/2.1/2.1.1/stanchion-2.1.1.tar.gz";
sha256 = "1443arwgg7qvlx3msyg99qvvhck7qxphdjslcp494i60fhr2g8ja";
};
postPatch = ''
sed -i deps/node_package/priv/base/env.sh \
-e 's@{{platform_data_dir}}@''${RIAK_DATA_DIR:-/var/db/stanchion}@' \
-e 's@^RUNNER_SCRIPT_DIR=.*@RUNNER_SCRIPT_DIR='$out'/bin@' \
-e 's@^RUNNER_BASE_DIR=.*@RUNNER_BASE_DIR='$out'@' \
-e 's@^RUNNER_ETC_DIR=.*@RUNNER_ETC_DIR=''${RIAK_ETC_DIR:-/etc/stanchion}@' \
-e 's@^RUNNER_LOG_DIR=.*@RUNNER_LOG_DIR=''${RIAK_LOG_DIR:-/var/log}@'
'';
preBuild = ''
patchShebangs .
'';
buildPhase = ''
runHook preBuild
make rel
runHook postBuild
'';
doCheck = false;
installPhase = ''
runHook preInstall
mkdir $out
mv rel/stanchion/etc rel/stanchion/riak-etc
mkdir -p rel/stanchion/etc
mv rel/stanchion/riak-etc rel/stanchion/etc/stanchion
mv rel/stanchion/* $out
for prog in $out/bin/*; do
substituteInPlace $prog \
--replace '. "`cd \`dirname $0\` && /bin/pwd`/../lib/env.sh"' \
". $out/lib/env.sh"
done
runHook postInstall
'';
meta = with lib; {
maintainers = with maintainers; [ mdaiter ];
description = "Manager for Riak CS";
platforms = [ "x86_64-linux" "x86_64-darwin" ];
license = licenses.asl20;
};
}
pkgs/servers/rtsp-simple-server/default.nix
+35
View File
@@ -0,0 +1,35 @@
{ stdenv
, fetchFromGitHub
, buildGoModule
}:
buildGoModule rec {
pname = "rtsp-simple-server";
version = "0.10.0";
src = fetchFromGitHub {
owner = "aler9";
repo = pname;
rev = "v${version}";
sha256 = "rnUmPyT9jAqm7Vf2TokgRGPTn7rTBUvrpJU21IopFsM=";
};
vendorSha256 = "jAWDz/TclfCKQR/Gh99zSiGAsraciNU+yzFe5DGTeQI=";
# Tests need docker
doCheck = false;
buildFlagsArray = [
"-ldflags=-X main.Version=${version}"
];
meta = with stdenv.lib; {
description =
"Ready-to-use RTSP server and RTSP proxy that allows to read and publish video and audio streams"
;
inherit (src.meta) homepage;
license = licenses.mit;
maintainers = with maintainers; [ doronbehar ];
};
}
pkgs/servers/tailscale/default.nix
+5 -4
View File
@@ -2,20 +2,21 @@
buildGoModule rec {
pname = "tailscale";
version = "1.0.5";
version = "1.2.1";
tagHash = "614f6730fe7f46bc6e2128b9efd33bee92f3ff93"; # from `git rev-parse v1.2.1`
src = fetchFromGitHub {
owner = "tailscale";
repo = "tailscale";
rev = "v${version}";
sha256 = "0ib2s694kf5iz5hvrlzfs80z0931dhva7yir80crq0pji9y4rp7b";
sha256 = "1xkzh9b67fgp7flfvjja6328254j8gmlzmpnmb69klj3km5v6qmy";
};
nativeBuildInputs = [ makeWrapper ];
CGO_ENABLED = 0;
vendorSha256 = "0l9lzwwvshg9a2kmmq1cvvlaxncbas78a9hjhvjjar89rjr2k2sv";
vendorSha256 = "01g3jkgl3jrygd154gmjm3dq13nkppd993iym7assdz8mr3rq31s";
doCheck = false;
@@ -24,7 +25,7 @@ buildGoModule rec {
preBuild = ''
export buildFlagsArray=(
-tags="xversion"
-ldflags="-X tailscale.com/version.LONG=${version} -X tailscale.com/version.SHORT=${version}"
-ldflags="-X tailscale.com/version.Long=${version} -X tailscale.com/version.Short=${version} -X tailscale.com/version.GitCommit=${tagHash}"
)
'';
pkgs/servers/tracing/tempo/default.nix
+26
View File
@@ -0,0 +1,26 @@
{ lib, buildGoModule, fetchFromGitHub }:
buildGoModule rec {
version = "0.2.0";
pname = "tempo";
src = fetchFromGitHub {
rev = "v${version}";
owner = "grafana";
repo = "tempo";
sha256 = "061l72il8arxa53zfbasiwyjdxc4bf498glxrdj5ijcwgvx14275";
};
vendorSha256 = null;
# tests use docker
doCheck = false;
meta = with lib; {
description = "A high volume, minimal dependency trace storage";
license = licenses.asl20;
homepage = "https://grafana.com/oss/tempo/";
maintainers = with maintainers; [ willibutz ];
platforms = platforms.linux;
};
}