Merge master into staging-next
This commit is contained in:
github-actions[bot]
@@ -2,7 +2,7 @@
|
||||
# Do not edit!
|
||||
|
||||
{
|
||||
version = "2021.5.0";
|
||||
version = "2021.5.1";
|
||||
components = {
|
||||
"abode" = ps: with ps; [ abodepy ];
|
||||
"accuweather" = ps: with ps; [ accuweather ];
|
||||
@@ -660,7 +660,7 @@
|
||||
"pushover" = ps: with ps; [ pushover-complete ];
|
||||
"pushsafer" = ps: with ps; [ ];
|
||||
"pvoutput" = ps: with ps; [ jsonpath xmltodict ];
|
||||
"pvpc_hourly_pricing" = ps: with ps; [ ]; # missing inputs: aiopvpc
|
||||
"pvpc_hourly_pricing" = ps: with ps; [ aiopvpc ];
|
||||
"pyload" = ps: with ps; [ ];
|
||||
"python_script" = ps: with ps; [ restrictedpython ];
|
||||
"qbittorrent" = ps: with ps; [ ]; # missing inputs: python-qbittorrent
|
||||
|
||||
@@ -105,7 +105,7 @@ let
|
||||
extraBuildInputs = extraPackages py.pkgs;
|
||||
|
||||
# Don't forget to run parse-requirements.py after updating
|
||||
hassVersion = "2021.5.0";
|
||||
hassVersion = "2021.5.1";
|
||||
|
||||
in with py.pkgs; buildPythonApplication rec {
|
||||
pname = "homeassistant";
|
||||
@@ -124,7 +124,7 @@ in with py.pkgs; buildPythonApplication rec {
|
||||
owner = "home-assistant";
|
||||
repo = "core";
|
||||
rev = version;
|
||||
sha256 = "1kwx0bq2i76p9gbx5kkzkjxd88vzf2daccm0wf123693isk1nwzs";
|
||||
sha256 = "0bipjfkz4zqhy84jgrn3qxvs4nxya3j08lcsq3xa31xfz8wnpxwj";
|
||||
};
|
||||
|
||||
# leave this in, so users don't have to constantly update their downstream patch handling
|
||||
@@ -204,6 +204,7 @@ in with py.pkgs; buildPythonApplication rec {
|
||||
"calendar"
|
||||
"camera"
|
||||
"cast"
|
||||
"climacell"
|
||||
"climate"
|
||||
"cloud"
|
||||
"comfoconnect"
|
||||
@@ -216,6 +217,7 @@ in with py.pkgs; buildPythonApplication rec {
|
||||
"deconz"
|
||||
"default_config"
|
||||
"demo"
|
||||
"denonavr"
|
||||
"derivative"
|
||||
"device_automation"
|
||||
"device_sun_light_trigger"
|
||||
@@ -320,6 +322,7 @@ in with py.pkgs; buildPythonApplication rec {
|
||||
"prometheus"
|
||||
"proximity"
|
||||
"push"
|
||||
"pvpc_hourly_pricing"
|
||||
"python_script"
|
||||
"random"
|
||||
"recorder"
|
||||
|
||||
@@ -1,57 +0,0 @@
|
||||
{ lib, stdenv, fetchurl, erlang, icu, openssl, spidermonkey_1_8_5
|
||||
, coreutils, bash, makeWrapper, python3 }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "couchdb";
|
||||
version = "2.3.1";
|
||||
|
||||
|
||||
# when updating this, please consider bumping the OTP version
|
||||
# in all-packages.nix
|
||||
src = fetchurl {
|
||||
url = "mirror://apache/couchdb/source/${version}/apache-${pname}-${version}.tar.gz";
|
||||
sha256 = "0z926hjqyhxhyr65kqxwpmp80nyfqbig6d9dy8dqflpb87n8rss3";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
buildInputs = [ erlang icu openssl spidermonkey_1_8_5 (python3.withPackages(ps: with ps; [ requests ]))];
|
||||
|
||||
patches = [ ./jsapi.patch ];
|
||||
postPatch = ''
|
||||
substituteInPlace src/couch/rebar.config.script --replace '-DHAVE_CURL -I/usr/local/include' "-DHAVE_CURL -I/usr/local/include $NIX_CFLAGS_COMPILE"
|
||||
|
||||
patch bin/rebar <<EOF
|
||||
1c1
|
||||
< #!/usr/bin/env escript
|
||||
---
|
||||
> #!${coreutils}/bin/env escript
|
||||
EOF
|
||||
|
||||
'';
|
||||
|
||||
# Configure a username. The build system would use "couchdb" as
|
||||
# default if none is provided. Note that it is unclear where this
|
||||
# username is actually used in the build, as any choice seems to be
|
||||
# working.
|
||||
configurePhase = ''
|
||||
./configure -u nobody
|
||||
'';
|
||||
|
||||
buildPhase = ''
|
||||
make release
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out
|
||||
cp -r rel/couchdb/* $out
|
||||
wrapProgram $out/bin/couchdb --suffix PATH : ${bash}/bin
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "A database that uses JSON for documents, JavaScript for MapReduce queries, and regular HTTP for an API";
|
||||
homepage = "http://couchdb.apache.org";
|
||||
license = licenses.asl20;
|
||||
platforms = platforms.all;
|
||||
maintainers = with maintainers; [ ];
|
||||
};
|
||||
}
|
||||
@@ -1,39 +0,0 @@
|
||||
{ lib, stdenv, fetchurl, erlang, icu, openssl, spidermonkey_1_8_5, curl, help2man
|
||||
, sphinx, which, file, pkg-config, getopt }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "couchdb";
|
||||
version = "1.7.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://apache/couchdb/source/${version}/apache-${pname}-${version}.tar.gz";
|
||||
sha256 = "1b9cbdrmh1i71mrwvhm17v4cf7lckpil1vvq7lpmxyn6zfk0l84i";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ help2man which file pkg-config sphinx ];
|
||||
buildInputs = [ erlang icu openssl spidermonkey_1_8_5 curl ];
|
||||
|
||||
postInstall = ''
|
||||
substituteInPlace $out/bin/couchdb --replace getopt "${getopt}/bin/getopt"
|
||||
'';
|
||||
|
||||
/*
|
||||
Versions of SpiderMonkey after the js185-1.0.0 release remove the optional
|
||||
enforcement of preventing anonymous functions in a statement context. This
|
||||
will most likely break your existing JavaScript code as well as render all
|
||||
example code invalid.
|
||||
|
||||
If you wish to ignore this error pass --enable-js-trunk to ./configure.
|
||||
*/
|
||||
configureFlags = [
|
||||
"--enable-js-trunk"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A database that uses JSON for documents, JavaScript for MapReduce queries, and regular HTTP for an API";
|
||||
homepage = "http://couchdb.apache.org";
|
||||
license = licenses.asl20;
|
||||
platforms = platforms.all;
|
||||
maintainers = with maintainers; [ ];
|
||||
};
|
||||
}
|
||||
@@ -1,60 +0,0 @@
|
||||
diff -ru couch_js/http.c couch_js-patched/http.c
|
||||
--- apache-couchdb-2.0.0/src/couch/priv/couch_js/http.c 2016-09-12 11:28:51.000000000 +0200
|
||||
+++ apache-couchdb-2.0.0-patched/src/couch/priv/couch_js/http.c 2017-02-10 10:52:33.025854045 +0100
|
||||
@@ -15,7 +15,7 @@
|
||||
#include <string.h>
|
||||
#include <sys/types.h>
|
||||
#include <sys/stat.h>
|
||||
-#include <jsapi.h>
|
||||
+#include <js/jsapi.h>
|
||||
#include "config.h"
|
||||
#include "utf8.h"
|
||||
#include "util.h"
|
||||
diff -ru couch_js/main.c couch_js-patched/main.c
|
||||
--- apache-couchdb-2.0.0/src/couch/priv/couch_js/main.c 2016-09-12 11:28:51.000000000 +0200
|
||||
+++ apache-couchdb-2.0.0-patched/src/couch/priv/couch_js/main.c 2017-02-10 10:52:33.001854154 +0100
|
||||
@@ -20,7 +20,7 @@
|
||||
#include <unistd.h>
|
||||
#endif
|
||||
|
||||
-#include <jsapi.h>
|
||||
+#include <js/jsapi.h>
|
||||
#include "config.h"
|
||||
#include "http.h"
|
||||
#include "utf8.h"
|
||||
diff -ru couch_js/utf8.c couch_js-patched/utf8.c
|
||||
--- apache-couchdb-2.0.0/src/couch/priv/couch_js/utf8.c 2016-09-12 11:28:51.000000000 +0200
|
||||
+++ apache-couchdb-2.0.0-patched/src/couch/priv/couch_js/utf8.c 2017-02-10 10:52:33.009854117 +0100
|
||||
@@ -10,7 +10,7 @@
|
||||
// License for the specific language governing permissions and limitations under
|
||||
// the License.
|
||||
|
||||
-#include <jsapi.h>
|
||||
+#include <js/jsapi.h>
|
||||
#include "config.h"
|
||||
|
||||
static int
|
||||
diff -ru couch_js/util.c couch_js-patched/util.c
|
||||
--- apache-couchdb-2.0.0/src/couch/priv/couch_js/util.c 2016-09-12 11:28:51.000000000 +0200
|
||||
+++ apache-couchdb-2.0.0-patched/src/couch/priv/couch_js/util.c 2017-02-10 10:52:33.017854081 +0100
|
||||
@@ -13,7 +13,7 @@
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
|
||||
-#include <jsapi.h>
|
||||
+#include <js/jsapi.h>
|
||||
|
||||
#include "help.h"
|
||||
#include "util.h"
|
||||
diff -ru couch_js/util.h couch_js-patched/util.h
|
||||
--- apache-couchdb-2.0.0/src/couch/priv/couch_js/util.h 2016-09-12 11:28:51.000000000 +0200
|
||||
+++ apache-couchdb-2.0.0-patched/src/couch/priv/couch_js/util.h 2017-02-10 10:52:32.988854212 +0100
|
||||
@@ -13,7 +13,7 @@
|
||||
#ifndef COUCHJS_UTIL_H
|
||||
#define COUCHJS_UTIL_H
|
||||
|
||||
-#include <jsapi.h>
|
||||
+#include <js/jsapi.h>
|
||||
|
||||
typedef struct {
|
||||
int no_eval;
|
||||
@@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "jackett";
|
||||
version = "0.17.865";
|
||||
version = "0.17.1027";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/Jackett/Jackett/releases/download/v${version}/Jackett.Binaries.Mono.tar.gz";
|
||||
sha256 = "sha256-kjrch++WncedVkRm05RifUGEYlc5NFAss/E6fgPZWyQ=";
|
||||
sha256 = "sha256:1kmi4f1ghx82rfd8y4laggg8cs9apnhcdkakfi0mah7hqcnqmhm3";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
+122
-61
@@ -1,46 +1,24 @@
|
||||
{ lib, stdenv, buildEnv, fetchurl, perl, perlPackages, makeWrapper }:
|
||||
{ lib, stdenv, autoreconfHook, buildEnv, fetchFromGitHub, perl, perlPackages, makeWrapper, gnupg, openssl }:
|
||||
|
||||
# This package isn't extremely useful as it is, but is getting close.
|
||||
# After running:
|
||||
#
|
||||
# nix-build . -A rt
|
||||
#
|
||||
# I created a config file named myconfig.pm with:
|
||||
#
|
||||
# use utf8;
|
||||
# Set($rtname, '127.0.0.1');
|
||||
# # These dirs need to be pre-created:
|
||||
# Set($MasonSessionDir, '/home/grahamc/foo/sessiondir/');
|
||||
# Set($MasonDataDir, '/home/grahamc/foo/localstate/');
|
||||
# Set($WebPort, 8080);
|
||||
#
|
||||
# Set($DatabaseType, "SQLite");
|
||||
# Set( $DatabaseName, '/home/grahamc/projects/foo/my.db' );
|
||||
#
|
||||
# 1;
|
||||
#
|
||||
# and ran
|
||||
#
|
||||
# RT_SITE_CONFIG=$(pwd)/myconfig.pm ./result/bin/rt-setup-database --action init
|
||||
#
|
||||
# Then:
|
||||
#
|
||||
# RT_SITE_CONFIG=$(pwd)/myconfig.pm ./result/bin/rt-server
|
||||
#
|
||||
# Make sure to check out result/etc/RT_Config.pm
|
||||
#
|
||||
# Good luck.
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "rt";
|
||||
version = "5.0.1";
|
||||
|
||||
version = "4.4.4";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://download.bestpractical.com/pub/rt/release/${pname}-${version}.tar.gz";
|
||||
sha256 = "1108jhz1gvalcfnbzgpbk7fkxzxkkc7m74a3bnwyjzldlyj1dhrl";
|
||||
src = fetchFromGitHub {
|
||||
repo = pname;
|
||||
rev = "${pname}-${version}";
|
||||
owner = "bestpractical";
|
||||
sha256 = "1qqh6w094x7dljz001va802v4s6mixs9lkhs2cs47lf5ph3vwq2q";
|
||||
};
|
||||
|
||||
patches = [ ./override-generated.patch ];
|
||||
patches = [
|
||||
./dont-check-users_groups.patch # needed for "make testdeps" to work in the build
|
||||
./override-generated.patch
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
autoreconfHook
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
makeWrapper
|
||||
@@ -48,28 +26,102 @@ stdenv.mkDerivation rec {
|
||||
(buildEnv {
|
||||
name = "rt-perl-deps";
|
||||
paths = with perlPackages; (requiredPerlModules [
|
||||
ApacheSession BusinessHours CGIEmulatePSGI CGIPSGI
|
||||
CSSMinifierXS CSSSquish ConvertColor CryptEksblowfish
|
||||
CryptSSLeay DBDSQLite DBDmysql DBIxSearchBuilder DataGUID
|
||||
DataICal DataPagePageset DateExtract DateManip
|
||||
DateTimeFormatNatural DevelGlobalDestruction EmailAddress
|
||||
EmailAddressList FCGI FCGIProcManager FileShareDir FileWhich
|
||||
GD GDGraph GnuPGInterface GraphViz HTMLFormatTextWithLinks
|
||||
HTMLFormatTextWithLinksAndTables HTMLMason
|
||||
HTMLMasonPSGIHandler HTMLQuoted HTMLRewriteAttributes
|
||||
HTMLScrubber IPCRun IPCRun3 JSON JavaScriptMinifierXS LWP
|
||||
LWPProtocolHttps LocaleMaketextFuzzy LocaleMaketextLexicon
|
||||
LogDispatch MIMETools MIMETypes MailTools ModuleRefresh
|
||||
ModuleVersionsReport MozillaCA NetCIDR NetIP PerlIOeol Plack
|
||||
RegexpCommon RegexpCommonnetCIDR RegexpIPv6 RoleBasic
|
||||
ScopeUpper Starlet SymbolGlobalName TermReadKey
|
||||
TextPasswordPronounceable TextQuoted TextTemplate
|
||||
TextWikiFormat TextWrapper TimeParseDate TreeSimple
|
||||
UNIVERSALrequire XMLRSS
|
||||
ApacheSession
|
||||
BusinessHours
|
||||
CGIEmulatePSGI
|
||||
CGIPSGI
|
||||
CSSMinifierXS
|
||||
CSSSquish
|
||||
ConvertColor
|
||||
CryptEksblowfish
|
||||
CryptSSLeay
|
||||
CryptX509
|
||||
DBDPg
|
||||
DBIxSearchBuilder
|
||||
DataGUID
|
||||
DataICal
|
||||
DataPage
|
||||
DataPagePageset
|
||||
DateExtract
|
||||
DateManip
|
||||
DateTimeFormatNatural
|
||||
DevelGlobalDestruction
|
||||
EmailAddress
|
||||
EmailAddressList
|
||||
EncodeDetect
|
||||
EncodeHanExtra
|
||||
FCGI
|
||||
FCGIProcManager
|
||||
FileShareDir
|
||||
FileWhich
|
||||
GD
|
||||
GDGraph
|
||||
GnuPGInterface
|
||||
GraphViz
|
||||
HTMLFormatExternal
|
||||
HTMLFormatTextWithLinks
|
||||
HTMLFormatTextWithLinksAndTables
|
||||
HTMLGumbo
|
||||
HTMLMason
|
||||
HTMLMasonPSGIHandler
|
||||
HTMLQuoted
|
||||
HTMLRewriteAttributes
|
||||
HTMLScrubber
|
||||
IPCRun
|
||||
IPCRun3
|
||||
JSON
|
||||
JavaScriptMinifierXS
|
||||
LWP
|
||||
LWPProtocolHttps
|
||||
LocaleMaketextFuzzy
|
||||
LocaleMaketextLexicon
|
||||
LogDispatch
|
||||
MIMETools
|
||||
MIMETypes
|
||||
MailTools
|
||||
ModulePath
|
||||
ModuleRefresh
|
||||
ModuleVersionsReport
|
||||
Moose
|
||||
MooseXNonMoose
|
||||
MooseXRoleParameterized
|
||||
MozillaCA
|
||||
NetCIDR
|
||||
NetIP
|
||||
PathDispatcher
|
||||
PerlIOeol
|
||||
Plack
|
||||
PodParser
|
||||
RegexpCommon
|
||||
RegexpCommonnetCIDR
|
||||
RegexpIPv6
|
||||
RoleBasic
|
||||
ScopeUpper
|
||||
Starlet
|
||||
Starman
|
||||
StringShellQuote
|
||||
SymbolGlobalName
|
||||
TermReadKey
|
||||
TextPasswordPronounceable
|
||||
TextQuoted
|
||||
TextTemplate
|
||||
TextWikiFormat
|
||||
TextWordDiff
|
||||
TextWrapper
|
||||
TimeParseDate
|
||||
TreeSimple
|
||||
UNIVERSALrequire
|
||||
WebMachine
|
||||
XMLRSS
|
||||
perlldap
|
||||
]);
|
||||
})
|
||||
];
|
||||
|
||||
preAutoreconf = ''
|
||||
substituteInPlace configure.ac \
|
||||
--replace "rt-3.9.EXPORTED" "rt-${version}"
|
||||
'';
|
||||
preConfigure = ''
|
||||
configureFlags="$configureFlags --with-web-user=$UID"
|
||||
configureFlags="$configureFlags --with-web-group=$(id -g)"
|
||||
@@ -82,18 +134,27 @@ stdenv.mkDerivation rec {
|
||||
"--enable-graphviz"
|
||||
"--enable-gd"
|
||||
"--enable-gpg"
|
||||
"--with-db-type=SQLite"
|
||||
"--enable-smime"
|
||||
"--with-db-type=Pg"
|
||||
];
|
||||
|
||||
buildPhase = ''
|
||||
make testdeps | grep -i missing | sort
|
||||
make testdeps
|
||||
'';
|
||||
|
||||
preFixup = ''
|
||||
for i in $(find $out/bin -type f; find $out/sbin -type f); do
|
||||
wrapProgram $i \
|
||||
--prefix PERL5LIB ':' $PERL5LIB
|
||||
postFixup = ''
|
||||
for i in $(find $out/bin -type f); do
|
||||
wrapProgram $i --prefix PERL5LIB ':' $PERL5LIB \
|
||||
--prefix PATH ":" "${lib.makeBinPath [ openssl gnupg ]}"
|
||||
done
|
||||
|
||||
rm -r $out/var
|
||||
mkdir -p $out/var/data
|
||||
ln -s /var/log/rt $out/var/log
|
||||
ln -s /run/rt/mason_data $out/var/mason_data
|
||||
ln -s /var/lib/rt/shredder $out/var/data/RT-Shredder
|
||||
ln -s /var/lib/rt/smime $out/var/data/smime
|
||||
ln -s /var/lib/rt/gpg $out/var/data/gpg
|
||||
'';
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -0,0 +1,12 @@
|
||||
diff --git a/sbin/rt-test-dependencies.in b/sbin/rt-test-dependencies.in
|
||||
index e51feb197..d75b1bc4e 100644
|
||||
--- a/sbin/rt-test-dependencies.in
|
||||
+++ b/sbin/rt-test-dependencies.in
|
||||
@@ -423,6 +423,7 @@ sub check_perl_version {
|
||||
}
|
||||
|
||||
sub check_users_groups {
|
||||
+ return 0;
|
||||
section("users / groups");
|
||||
|
||||
my $fails = 0;
|
||||
Reference in New Issue
Block a user