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] committed Jun 30, 2022
2 parents dcbdbb9 + e4e7d22 commit 49270f7
Show file tree
Hide file tree
Showing 24 changed files with 296 additions and 111 deletions.
1 change: 1 addition & 0 deletions nixos/modules/module-list.nix
Original file line number Diff line number Diff line change
Expand Up @@ -1082,6 +1082,7 @@
./services/web-apps/nexus.nix
./services/web-apps/nifi.nix
./services/web-apps/node-red.nix
./services/web-apps/phylactery.nix
./services/web-apps/pict-rs.nix
./services/web-apps/peertube.nix
./services/web-apps/plantuml-server.nix
Expand Down
8 changes: 7 additions & 1 deletion nixos/modules/services/system/cachix-agent/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,12 @@ in {
defaultText = "config.networking.hostName";
};

verbose = mkOption {
type = types.bool;
description = "Enable verbose output";
default = false;
};

profile = mkOption {
type = types.nullOr types.str;
default = null;
Expand Down Expand Up @@ -54,7 +60,7 @@ in {
serviceConfig = {
Restart = "on-failure";
EnvironmentFile = cfg.credentialsFile;
ExecStart = "${cfg.package}/bin/cachix deploy agent ${cfg.name} ${if cfg.profile != null then profile else ""}";
ExecStart = "${cfg.package}/bin/cachix ${lib.optionalString cfg.verbose "--verbose"} deploy agent ${cfg.name} ${if cfg.profile != null then profile else ""}";
};
};
};
Expand Down
51 changes: 51 additions & 0 deletions nixos/modules/services/web-apps/phylactery.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
{ config, lib, pkgs, ... }:

with lib;
let cfg = config.services.phylactery;
in {
options.services.phylactery = {
enable = mkEnableOption "Whether to enable Phylactery server";

host = mkOption {
type = types.str;
default = "localhost";
description = "Listen host for Phylactery";
};

port = mkOption {
type = types.port;
description = "Listen port for Phylactery";
};

library = mkOption {
type = types.path;
description = "Path to CBZ library";
};

package = mkOption {
type = types.package;
default = pkgs.phylactery;
defaultText = literalExpression "pkgs.phylactery";
description = "The Phylactery package to use";
};
};

config = mkIf cfg.enable {
systemd.services.phylactery = {
environment = {
PHYLACTERY_ADDRESS = "${cfg.host}:${toString cfg.port}";
PHYLACTERY_LIBRARY = "${cfg.library}";
};

wantedBy = [ "multi-user.target" ];

serviceConfig = {
ConditionPathExists = cfg.library;
DynamicUser = true;
ExecStart = "${cfg.package}/bin/phylactery";
};
};
};

meta.maintainers = with maintainers; [ McSinyx ];
}
1 change: 1 addition & 0 deletions nixos/tests/all-tests.nix
Original file line number Diff line number Diff line change
Expand Up @@ -426,6 +426,7 @@ in {
php = handleTest ./php {};
php80 = handleTest ./php { php = pkgs.php80; };
php81 = handleTest ./php { php = pkgs.php81; };
phylactery = handleTest ./web-apps/phylactery.nix {};
pict-rs = handleTest ./pict-rs.nix {};
pinnwand = handleTest ./pinnwand.nix {};
plasma5 = handleTest ./plasma5.nix {};
Expand Down
20 changes: 20 additions & 0 deletions nixos/tests/web-apps/phylactery.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
import ../make-test-python.nix ({ pkgs, lib, ... }: {
name = "phylactery";

nodes.machine = { ... }: {
services.phylactery = rec {
enable = true;
port = 8080;
library = "/tmp";
};
};

testScript = ''
start_all()
machine.wait_for_unit('phylactery')
machine.wait_for_open_port(8080)
machine.wait_until_succeeds('curl localhost:8080')
'';

meta.maintainers = with lib.maintainers; [ McSinyx ];
})
4 changes: 2 additions & 2 deletions pkgs/applications/editors/neovim/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,13 @@ let
in
stdenv.mkDerivation rec {
pname = "neovim-unwrapped";
version = "0.7.0";
version = "0.7.2";

src = fetchFromGitHub {
owner = "neovim";
repo = "neovim";
rev = "v${version}";
sha256 = "sha256-eYYaHpfSaYYrLkcD81Y4rsAMYDP1IJ7fLJJepkACkA8=";
sha256 = "sha256-eKKQNM02Vhy+3yL2QV+0FSEpcniEa5Aq6hkAUIgLo1k=";
};

patches = [
Expand Down
24 changes: 12 additions & 12 deletions pkgs/applications/editors/vscode/extensions/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -218,8 +218,8 @@ let
mktplcRef = {
name = "nord-visual-studio-code";
publisher = "arcticicestudio";
version = "0.18.0";
sha256 = "sha256-Uo6peR+2ZNX6nwJ0Yar32Pe0rfBZ+f6ef1cYhUvVUbE=";
version = "0.19.0";
sha256 = "sha256-awbqFv6YuYI0tzM/QbHRTUl4B2vNUdy52F4nPmv+dRU=";
};
meta = with lib; {
description = "An arctic, north-bluish clean and elegant Visual Studio Code theme.";
Expand Down Expand Up @@ -247,8 +247,8 @@ let
mktplcRef = {
name = "nix-env-selector";
publisher = "arrterian";
version = "1.0.7";
sha256 = "0e76885c9dbb6dca4eac8a75866ec372b948cc64a3a3845327d7c3ef6ba42a57";
version = "1.0.9";
sha256 = "sha256-TkxqWZ8X+PAonzeXQ+sI9WI+XlqUHll7YyM7N9uErk0=";
};
meta = {
license = lib.licenses.mit;
Expand Down Expand Up @@ -779,8 +779,8 @@ let
mktplcRef = {
name = "gitlens";
publisher = "eamodio";
version = "12.0.7";
sha256 = "sha256-gPhiytthf35eDhtzkSK2JZjtj4877la3hB1Cswbrszw=";
version = "12.1.1";
sha256 = "0i1wxgc61rrf11zff0481dg9s2lmv1ngpwx8nb2ygf6lh0axr7cj";
};
meta = with lib; {
changelog = "https://marketplace.visualstudio.com/items/eamodio.gitlens/changelog";
Expand Down Expand Up @@ -1150,8 +1150,8 @@ let
mktplcRef = {
name = "vscode-pull-request-github";
publisher = "github";
version = "0.37.2022030309";
sha256 = "1icmg2ssdkxvwp8mn8zzakwn42hrdglsdgfnaf8va4vd9mqixl1v";
version = "0.45.2022062709";
sha256 = "119dz79vl2pngf6327zbfw97qnci8xg14d23wdd4n75jmra2wrbz";
};
meta = { license = lib.licenses.mit; };
};
Expand Down Expand Up @@ -1502,8 +1502,8 @@ let
mktplcRef = {
name = "vscode-clangd";
publisher = "llvm-vs-code-extensions";
version = "0.1.15";
sha256 = "0skasnc490wp0l5xzpdmwdzjr4qiy63kg2qi27060m5yqkq3h8xn";
version = "0.1.17";
sha256 = "1vgk4xsdbx0v6sy09wkb63qz6i64n6qcmpiy49qgh2xybskrrzvf";
};
meta = {
license = lib.licenses.mit;
Expand Down Expand Up @@ -2172,8 +2172,8 @@ let
mktplcRef = {
name = "code-spell-checker";
publisher = "streetsidesoftware";
version = "2.1.7";
sha256 = "sha256-C0jYDIDBK1JH8eFaFmCUilBXCbU5y2TRF3OZAw9ijoY=";
version = "2.2.5";
sha256 = "0ayhlzh3b2mcdx6mdj00y4qxvv6mirfpnp8q5zvidm6sv3vwlcj0";
};
meta = with lib; {
changelog = "https://marketplace.visualstudio.com/items/streetsidesoftware.code-spell-checker/changelog";
Expand Down
47 changes: 38 additions & 9 deletions pkgs/applications/networking/davmail/default.nix
Original file line number Diff line number Diff line change
@@ -1,32 +1,61 @@
{ fetchurl, lib, stdenv, jre, glib, libXtst, gtk2, makeWrapper, unzip }:
{ stdenv
, fetchurl
, lib
, makeWrapper
, unzip
, glib
, gtk2
, gtk3
, jre
, libXtst
, zulu
, preferGtk3 ? true
, preferZulu ? true
}:

let
rev = 3390;
jre' = if preferZulu then zulu else jre;
gtk' = if preferGtk3 then gtk3 else gtk2;

inherit (lib) makeLibraryPath versions;

in
stdenv.mkDerivation rec {
pname = "davmail";
version = "5.5.1";
version = "6.0.1";

src = fetchurl {
url = "mirror://sourceforge/${pname}/${version}/${pname}-${version}-3299.zip";
sha256 = "sha256-NN/TUOcUIifNzrJnZmtYhs6UVktjlfoOYJjYaMEQpI4=";
url = "mirror://sourceforge/${pname}/${version}/${pname}-${version}-${toString rev}.zip";
sha256 = "1i1z1kdglccg7pyidlfbagdhgs0wqvybl8dwxcpglh2hkvi0dba0";
};

postPatch = ''
sed -i -e '/^JAVA_OPTS/d' davmail
'';

sourceRoot = ".";

nativeBuildInputs = [ makeWrapper unzip ];

installPhase = ''
runHook preInstall
mkdir -p $out/share/davmail
cp -vR ./* $out/share/davmail
makeWrapper $out/share/davmail/davmail $out/bin/davmail \
--prefix PATH : ${jre}/bin \
--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ glib gtk2 libXtst ]}
--set-default JAVA_OPTS "-Xmx512M -Dsun.net.inetaddr.ttl=60 -Djdk.gtk.version=${lib.versions.major gtk'.version}" \
--prefix PATH : ${jre'}/bin \
--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ glib gtk' libXtst ]}
runHook postInstall
'';

meta = with lib; {
homepage = "http://davmail.sourceforge.net/";
description = "A Java application which presents a Microsoft Exchange server as local CALDAV, IMAP and SMTP servers";
maintainers = [ ];
platforms = platforms.all;
homepage = "http://davmail.sourceforge.net/";
license = licenses.gpl2Plus;
maintainers = with maintainers; [ peterhoeg ];
platforms = platforms.all;
};
}
6 changes: 3 additions & 3 deletions pkgs/applications/networking/ipget/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,16 @@

buildGoModule rec {
pname = "ipget";
version = "0.8.1";
version = "0.9.1";

src = fetchFromGitHub {
owner = "ipfs";
repo = "ipget";
rev = "v${version}";
sha256 = "sha256-gtDmBy7IpZCbeDG8JeKvMoaJmXpjnmKGustaNLIlTlY=";
sha256 = "sha256-JGG3DsmFXmWFOFvJ8pKVhQMRgZ0cbkdtmBjMkLYqOwU=";
};

vendorSha256 = "sha256-La9V5B+UDaOswh/R8ad4xsnCF5ewtF7G+uiqnarM4Mg=";
vendorSha256 = "sha256-scrueQoqr9nUONnpitUontcX3Xe0KmmUmvxOcpxK7M8=";

postPatch = ''
# main module (github.com/ipfs/ipget) does not contain package github.com/ipfs/ipget/sharness/dependencies
Expand Down
15 changes: 5 additions & 10 deletions pkgs/development/ocaml-modules/mirage-vnetif/default.nix
Original file line number Diff line number Diff line change
@@ -1,28 +1,23 @@
{ lib, buildDunePackage, fetchurl
, lwt, mirage-time, mirage-clock, mirage-net
, lwt, mirage-net
, cstruct, ipaddr, macaddr, mirage-profile
, duration, logs
}:

buildDunePackage rec {
pname = "mirage-vnetif";
version = "0.5.0";
version = "0.6.0";

minimumOCamlVersion = "4.06";

# due to cstruct
useDune2 = true;
minimalOCamlVersion = "4.06";

src = fetchurl {
url = "https://github.com/mirage/${pname}/releases/download/v${version}/${pname}-v${version}.tbz";
sha256 = "0cpqwf51v2cpz41dfqxabf3bsabwyl6a0h0v2ncrn33q58i60m5q";
url = "https://github.com/mirage/${pname}/releases/download/v${version}/${pname}-${version}.tbz";
sha256 = "sha256-fzRoNFqdnj4Ke+eNdo5crvbnKDx6/+dQyu+K3rD5dYw=";
};

propagatedBuildInputs = [
lwt
mirage-net
mirage-time
mirage-clock
cstruct
ipaddr
macaddr
Expand Down
1 change: 1 addition & 0 deletions pkgs/development/python-modules/keyring/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ buildPythonPackage rec {
] ++ lib.optionals stdenv.isLinux [
jeepney
secretstorage
dbus-python
];

pythonImportsCheck = [
Expand Down
4 changes: 2 additions & 2 deletions pkgs/development/python-modules/temescal/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,14 @@

buildPythonPackage rec {
pname = "temescal";
version = "0.3";
version = "0.5";
format = "setuptools";

disabled = pythonOlder "3.7";

src = fetchPypi {
inherit pname version;
hash = "sha256-V1wsncIm4f6NPa6lwlO9pkDIFBG1K3VhmOQCwyrPGm4=";
hash = "sha256-MfTftheNj8zI3iXIIJU+jy9xikvX9eO58LA0NCMJBnY=";
};

propagatedBuildInputs = [
Expand Down
4 changes: 2 additions & 2 deletions pkgs/development/python-modules/twilio/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

buildPythonPackage rec {
pname = "twilio";
version = "7.9.3";
version = "7.10.0";
format = "setuptools";

disabled = pythonOlder "3.6";
Expand All @@ -20,7 +20,7 @@ buildPythonPackage rec {
owner = "twilio";
repo = "twilio-python";
rev = "refs/tags/${version}";
hash = "sha256-tTtfrIapIaC3oidqWRntkZ1T1eKZ9/ggKbZk2cMiPSQ=";
hash = "sha256-UoSZ4g9RVnmnfZ7XxLafsNCSj396rrHz36fMwEoNL84=";
};

propagatedBuildInputs = [
Expand Down
6 changes: 3 additions & 3 deletions pkgs/development/tools/misc/clojure-lsp/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,18 @@

buildGraalvmNativeImage rec {
pname = "clojure-lsp";
version = "2022.06.22-14.09.50";
version = "2022.06.29-19.32.13";

src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = version;
sha256 = "sha256-QMzjoxcEbzOZKh3nN+kMwjp5NfARBFiVnZ/1B3yzVK0=";
sha256 = "sha256-skU1p0rEO+9JMxaOepULZhG/xG56KuGNLEUiQ945Pv0=";
};

jar = fetchurl {
url = "https://github.com/clojure-lsp/clojure-lsp/releases/download/${version}/clojure-lsp-standalone.jar";
sha256 = "ff400595723af878f5d6edfed78d403eb1ce18bd439d4bb0eb8eccf3d20a2b51";
sha256 = "97446cacf42966e6096570b9f9c48c653a81903a33e98987cba4b855b417c76f";
};

extraNativeImageBuildArgs = [
Expand Down
4 changes: 2 additions & 2 deletions pkgs/games/wesnoth/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@

stdenv.mkDerivation rec {
pname = "wesnoth";
version = "1.16.1";
version = "1.16.3";

src = fetchFromGitHub {
rev = version;
owner = "wesnoth";
repo = "wesnoth";
sha256 = "sha256-eRegE+Q5dEtuT2XRKAK0sycRuK6sdSXKS6aLCsBDU8g=";
sha256 = "sha256-om6Tps5ZdAWq1WE9lq9v2oGwfPDPSRJ08pmMlT6DjGk=";
};

nativeBuildInputs = [ cmake pkg-config ];
Expand Down
Loading

0 comments on commit 49270f7

Please sign in to comment.