Skip to content

Commit

Permalink
Merge staging-next into staging
Browse files Browse the repository at this point in the history
  • Loading branch information
github-actions[bot] authored Nov 18, 2021
2 parents 6ed7100 + 91e24d0 commit 93d0908
Show file tree
Hide file tree
Showing 40 changed files with 2,960 additions and 990 deletions.
28 changes: 28 additions & 0 deletions maintainers/maintainer-list.nix
Original file line number Diff line number Diff line change
Expand Up @@ -1564,6 +1564,16 @@
githubId = 87764;
name = "Ben Ford";
};
boppyt = {
email = "boppy@nwcpz.com";
github = "boppyt";
githubId = 71049646;
name = "Zack A";
keys = [{
longkeyid = "rsa4096/0x6310C97DE31D1545";
fingerprint = "E8D7 5C19 9F65 269B 439D F77B 6310 C97D E31D 1545";
}];
};
borisbabic = {
email = "boris.ivan.babic@gmail.com";
github = "borisbabic";
Expand Down Expand Up @@ -4717,6 +4727,12 @@
githubId = 896431;
name = "Chris Hodapp";
};
hollowman6 = {
email = "hollowman@hollowman.ml";
github = "HollowMan6";
githubId = 43995067;
name = "Songlin Jiang";
};
holymonson = {
email = "holymonson@gmail.com";
github = "holymonson";
Expand Down Expand Up @@ -7839,6 +7855,12 @@
githubId = 99988;
name = "Maarten Hoogendoorn";
};
MoritzBoehme = {
email = "mail@moritzboeh.me";
github = "MoritzBoehme";
githubId = 42215704;
name = "Moritz Böhme";
};
MostAwesomeDude = {
email = "cds@corbinsimpson.com";
github = "MostAwesomeDude";
Expand Down Expand Up @@ -9985,6 +10007,12 @@
githubId = 592876;
name = "Robert W. Pearce";
};
rprecenth = {
email = "rasmus@precenth.eu";
github = "Prillan";
githubId = 1675190;
name = "Rasmus Précenth";
};
rprospero = {
email = "rprospero+nix@gmail.com";
github = "rprospero";
Expand Down
38 changes: 26 additions & 12 deletions nixos/modules/services/databases/hbase.nix
Original file line number Diff line number Diff line change
Expand Up @@ -5,18 +5,24 @@ with lib;
let
cfg = config.services.hbase;

configFile = pkgs.writeText "hbase-site.xml" ''
<configuration>
<property>
<name>hbase.rootdir</name>
<value>file://${cfg.dataDir}/hbase</value>
</property>
<property>
<name>hbase.zookeeper.property.dataDir</name>
<value>${cfg.dataDir}/zookeeper</value>
</property>
</configuration>
'';
defaultConfig = {
"hbase.rootdir" = "file://${cfg.dataDir}/hbase";
"hbase.zookeeper.property.dataDir" = "${cfg.dataDir}/zookeeper";
};

buildProperty = configAttr:
(builtins.concatStringsSep "\n"
(lib.mapAttrsToList
(name: value: ''
<property>
<name>${name}</name>
<value>${builtins.toString value}</value>
</property>
'')
configAttr));

configFile = pkgs.writeText "hbase-site.xml"
(buildProperty (defaultConfig // cfg.settings));

configDir = pkgs.runCommand "hbase-config-dir" { preferLocalBuild = true; } ''
mkdir -p $out
Expand Down Expand Up @@ -85,6 +91,14 @@ in {
'';
};

settings = mkOption {
type = with lib.types; attrsOf (oneOf [ str int bool ]);
default = defaultConfig;
description = ''
configurations in hbase-site.xml, see <link xlink:href="https://github.com/apache/hbase/blob/master/hbase-server/src/test/resources/hbase-site.xml"/> for details.
'';
};

};

};
Expand Down
2 changes: 2 additions & 0 deletions nixos/modules/services/matrix/mjolnir.nix
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@ let
else
cfg.homeserverUrl;

rawHomeserverUrl = cfg.homeserverUrl;

pantalaimon = {
inherit (cfg.pantalaimon) username;

Expand Down
65 changes: 65 additions & 0 deletions pkgs/applications/editors/lite-xl/default.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@
{ agg
, fetchFromGitHub
, fetchpatch
, Foundation
, freetype
, lib
, lua5_2
, meson
, ninja
, pcre2
, pkg-config
, reproc
, SDL2
, stdenv
}:

stdenv.mkDerivation rec {
pname = "lite-xl";
version = "2.0.1";

src = fetchFromGitHub {
owner = "lite-xl";
repo = "lite-xl";
rev = "v${version}";
sha256 = "sha256-+RbmT6H/5Ldhv3qOClxMjCSGMudbkGtkjo2SpGqExao=";
};

patches = [
# Fixes compatibility with Lua5.2, remove patch when PR merged
# https://github.com/lite-xl/lite-xl/pull/435
(fetchpatch {
name = "0001-replace-unpack-with-table.unpack.patch";
url = "https://github.com/lite-xl/lite-xl/commit/30ccde896d1ffe37cbd8990e9b8aaef275e18935.patch";
sha256 = "sha256-IAe3jIyD3OtZtu1V7MtPR4QzFKvU/aV/nLQ4U9nHyIQ=";
})
# Lets meson fallback to the system reproc if available.
# remove patch when 2.0.2 is proposed.
(fetchpatch {
name = "0002-use-dependency-fallbacks-use-system-reproc-if-available.patch";
url = "https://github.com/lite-xl/lite-xl/commit/973acb787aacb0164b2f4ae6fe335d250ba80a7b.patch";
sha256 = "sha256-GmgATsRlj1FePmw3+AoWEMZIo2eujHYewKQCx583qbU=";
})
];

nativeBuildInputs = [ meson ninja pkg-config ];

buildInputs = [
agg
freetype
lua5_2
pcre2
reproc
SDL2
] ++ lib.optionals stdenv.isDarwin [
Foundation
];

meta = with lib; {
description = "A lightweight text editor written in Lua";
homepage = "https://github.com/lite-xl/lite-xl";
license = licenses.mit;
maintainers = with maintainers; [ boppyt ];
platforms = platforms.unix;
};
}
4 changes: 3 additions & 1 deletion pkgs/applications/misc/cloak/default.nix
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ lib, rustPlatform, fetchFromGitHub }:
{ lib, stdenv, rustPlatform, fetchFromGitHub, Security }:

rustPlatform.buildRustPackage rec {
pname = "cloak";
Expand All @@ -13,6 +13,8 @@ rustPlatform.buildRustPackage rec {

cargoSha256 = "0af38wgwmsamnx63dwfm2nrkd8wmky3ai7zwy0knmifgkn4b7yyj";

buildInputs = lib.optionals stdenv.isDarwin [ Security ];

meta = with lib; {
homepage = "https://github.com/evansmurithi/cloak";
description = "Command-line OTP authenticator application";
Expand Down
10 changes: 6 additions & 4 deletions pkgs/applications/misc/osmscout-server/default.nix
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{ lib, mkDerivation, fetchFromGitHub, fetchpatch, pkg-config
, qmake, qttools, kirigami2, qtquickcontrols2, qtlocation
, libosmscout, mapnik, valhalla, libpostal, osrm-backend, protobuf
, libosmscout, valhalla, libpostal, osrm-backend, protobuf
, libmicrohttpd_0_9_70, sqlite, marisa, kyotocabinet, boost
}:

Expand Down Expand Up @@ -41,7 +41,7 @@ mkDerivation rec {
nativeBuildInputs = [ qmake pkg-config qttools ];
buildInputs = [
kirigami2 qtquickcontrols2 qtlocation
mapnik valhalla libosmscout osrm-backend libmicrohttpd_0_9_70
valhalla libosmscout osrm-backend libmicrohttpd_0_9_70
libpostal sqlite marisa kyotocabinet boost protobuf date
];

Expand All @@ -52,8 +52,10 @@ mkDerivation rec {
mv data/valhalla.json-3.1 data/valhalla.json
'';

# Choose to build the kirigami UI variant
qmakeFlags = [ "SCOUT_FLAVOR=kirigami" ];
qmakeFlags = [
"SCOUT_FLAVOR=kirigami" # Choose to build the kirigami UI variant
"CONFIG+=disable_mapnik" # Disable the optional mapnik backend
];

meta = with lib; {
description = "Maps server providing tiles, geocoder, and router";
Expand Down
21 changes: 21 additions & 0 deletions pkgs/applications/networking/cluster/tgswitch/default.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
{ buildGoPackage, lib, fetchFromGitHub }:
buildGoPackage rec {
pname = "tgswitch";
version = "0.5.378";

src = fetchFromGitHub {
owner = "warrensbox";
repo = "tgswitch";
rev = version;
sha256 = "0q2aqh75acbpkmvkws0rl3d5dzq3sisy637c0x6cnc88h34g3n3i";
};

goPackagePath = "github.com/warrensbox/tgswitch";

meta = with lib; {
description = "A command line tool to switch between different versions of terragrunt";
homepage = "https://github.com/warrensbox/tgswitch";
license = licenses.mit;
maintainers = with maintainers; [ psibi ];
};
}
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
{ appimageTools, lib, fetchurl }:
{ appimageTools, lib, fetchurl, libsecret }:

let
pname = "electron-mail";
version = "4.12.2";
version = "4.12.7";
name = "ElectronMail-${version}";

src = fetchurl {
url = "https://github.com/vladimiry/ElectronMail/releases/download/v${version}/electron-mail-${version}-linux-x86_64.AppImage";
sha256 = "D+0qoIb0EwUVbgKOiKQpqoLDgm8l/UKDWm/BjhW4MYU=";
sha256 = "42d0b49a2feba628f4845940ffd9607739bd5fcdbe6ba37e15f993c511d21e46";
};

appimageContents = appimageTools.extract { inherit name src; };
Expand All @@ -16,13 +16,16 @@ in appimageTools.wrapType2 {

extraInstallCommands = ''
mv $out/bin/${name} $out/bin/${pname}
install -m 444 -D ${appimageContents}/${pname}.desktop -t $out/share/applications
substituteInPlace $out/share/applications/${pname}.desktop \
--replace 'Exec=AppRun' 'Exec=${pname}'
cp -r ${appimageContents}/usr/share/icons $out/share
'';

extraPkgs = pkgs: with pkgs; [
libsecret
];

meta = with lib; {
description = "ElectronMail is an Electron-based unofficial desktop client for ProtonMail";
homepage = "https://github.com/vladimiry/ElectronMail";
Expand Down
4 changes: 3 additions & 1 deletion pkgs/applications/networking/mhost/default.nix
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ fetchFromGitHub, rustPlatform, lib }:
{ lib, stdenv, fetchFromGitHub, rustPlatform, Security }:

rustPlatform.buildRustPackage rec {
pname = "mhost";
Expand All @@ -13,6 +13,8 @@ rustPlatform.buildRustPackage rec {

cargoSha256 = "0gqrya0bpdd67k2sxib7f4npnrx84d9r4hjq2sg2xz4j8pmgs018";

buildInputs = lib.optional stdenv.isDarwin Security;

CARGO_CRATE_NAME = "mhost";

doCheck = false;
Expand Down
45 changes: 45 additions & 0 deletions pkgs/applications/networking/synology-drive/default.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
{ lib, mkDerivation, fetchurl, autoPatchelfHook, dpkg, glibc, gnome }:

mkDerivation rec {
pname = "synology-drive";
subVersion = "12674";
version = "3.0.1-${subVersion}";

src = fetchurl {
url = "https://global.download.synology.com/download/Utility/SynologyDriveClient/${version}/Ubuntu/Installer/x86_64/synology-drive-client-${subVersion}.x86_64.deb";
sha256 = "1yyv6zgszsym22kf4jvlan7n9lw09fw24fyrh7c8pzbb2029gp8a";
};

nativeBuildInputs = [ autoPatchelfHook dpkg ];

buildInputs = [ glibc gnome.nautilus ];

unpackPhase = ''
mkdir -p $out
dpkg -x $src $out
'';

installPhase = ''
# synology-drive executable
cp -av $out/usr/* $out
rm -rf $out/usr
runHook postInstall
'';

postInstall = ''
substituteInPlace $out/bin/synology-drive --replace /opt $out/opt
'';

meta = with lib; {
homepage = "https://www.synology.com/";
description = "Synchronize files between client and Synology NAS.";
longDescription = ''
Drive for PC, the desktop utility of the DSM add-on package.
Drive, allows you to sync and share files owned by you or shared by others between a centralized Synology NAS and multiple client computers.
'';
license = licenses.unfree;
maintainers = with maintainers; [ MoritzBoehme ];
platforms = [ "x86_64-linux" ];
};
}
25 changes: 9 additions & 16 deletions pkgs/applications/video/streamlink/default.nix
Original file line number Diff line number Diff line change
@@ -1,17 +1,16 @@
{ lib
, python3Packages
, rtmpdump
, ffmpeg
, fetchpatch
}:

python3Packages.buildPythonApplication rec {
pname = "streamlink";
version = "2.4.0";
version = "3.0.1";

src = python3Packages.fetchPypi {
inherit pname version;
sha256 = "e95588e222d1a7bd51e3171cd4bce84fd6f646418537aff37993d40f597810af";
sha256 = "sha256-GDbUlu5tRL5mdT7KrIdmxCbeAtYL1xvZXyZFwiuvKXo=";
};

checkInputs = with python3Packages; [
Expand All @@ -22,26 +21,20 @@ python3Packages.buildPythonApplication rec {
];

propagatedBuildInputs = (with python3Packages; [
isodate
lxml
pycountry
pycryptodome
pysocks
requests
iso-639
iso3166
websocket-client
isodate
lxml
]) ++ [
rtmpdump
ffmpeg
];

patches = [
# Patch failing tests to expect correct Accept-Encoding as generated by Requests
(fetchpatch {
url = "https://github.com/streamlink/streamlink/commit/ae747a113199c119bced4613d33edcc67a222bb9.patch";
includes = [ "tests/test_stream_json.py" ];
sha256 = "sha256-KEgyWdh5DNgNktmLSvKQowUQO9p9Q7zP4NbCQJPNgKw=";
})
];
postPatch = ''
substituteInPlace setup.cfg --replace 'lxml >=4.6.4,<5.0' 'lxml'
'';

meta = with lib; {
homepage = "https://streamlink.github.io/";
Expand Down
Loading

0 comments on commit 93d0908

Please sign in to comment.