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 May 19, 2024
2 parents b08a915 + e18e972 commit bd935fc
Show file tree
Hide file tree
Showing 57 changed files with 765 additions and 388 deletions.
6 changes: 6 additions & 0 deletions maintainers/maintainer-list.nix
Original file line number Diff line number Diff line change
Expand Up @@ -22140,6 +22140,12 @@
githubId = 474343;
name = "Xavier Zwirtz";
};
XBagon = {
name = "XBagon";
email = "xbagon@outlook.de";
github = "XBagon";
githubId = 1523292;
};
xbreak = {
email = "xbreak@alphaware.se";
github = "xbreak";
Expand Down
9 changes: 7 additions & 2 deletions nixos/modules/services/monitoring/loki.nix
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,12 @@ in {

serviceConfig = let
conf = if cfg.configFile == null
then prettyJSON cfg.configuration
then
# Config validation may fail when using extraFlags = [ "-config.expand-env=true" ].
# To work around this, we simply skip it when extraFlags is not empty.
if cfg.extraFlags == []
then validateConfig (prettyJSON cfg.configuration)
else prettyJSON cfg.configuration
else cfg.configFile;
validateConfig = file:
pkgs.runCommand "validate-loki-conf" {
Expand All @@ -108,7 +113,7 @@ in {
'';
in
{
ExecStart = "${cfg.package}/bin/loki --config.file=${validateConfig conf} ${escapeShellArgs cfg.extraFlags}";
ExecStart = "${cfg.package}/bin/loki --config.file=${conf} ${escapeShellArgs cfg.extraFlags}";
User = cfg.user;
Restart = "always";
PrivateTmp = true;
Expand Down
6 changes: 4 additions & 2 deletions nixos/modules/services/networking/rosenpass.nix
Original file line number Diff line number Diff line change
Expand Up @@ -225,8 +225,10 @@ in
# See <https://www.freedesktop.org/software/systemd/man/systemd.unit.html#Specifiers>
environment.CONFIG = "%t/${serviceConfig.RuntimeDirectory}/config.toml";

preStart = "${getExe pkgs.envsubst} -i ${config} -o \"$CONFIG\"";
script = "rosenpass exchange-config \"$CONFIG\"";
script = ''
${getExe pkgs.envsubst} -i ${config} -o "$CONFIG"
rosenpass exchange-config "$CONFIG"
'';
};
};
}
21 changes: 21 additions & 0 deletions nixos/tests/step-ca.nix
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,24 @@ import ./make-test-python.nix ({ pkgs, ... }:
};
};

caclientcaddy =
{ config, pkgs, ... }: {
security.pki.certificateFiles = [ "${test-certificates}/root_ca.crt" ];

networking.firewall.allowedTCPPorts = [ 80 443 ];

services.caddy = {
enable = true;
virtualHosts."caclientcaddy".extraConfig = ''
respond "Welcome to Caddy!"
tls caddy@example.org {
ca https://caserver:8443/acme/acme/directory
}
'';
};
};

catester = { config, pkgs, ... }: {
security.pki.certificateFiles = [ "${test-certificates}/root_ca.crt" ];
};
Expand All @@ -73,5 +91,8 @@ import ./make-test-python.nix ({ pkgs, ... }:
caserver.wait_for_unit("step-ca.service")
caclient.wait_for_unit("acme-finished-caclient.target")
catester.succeed("curl https://caclient/ | grep \"Welcome to nginx!\"")
caclientcaddy.wait_for_unit("caddy.service")
catester.succeed("curl https://caclientcaddy/ | grep \"Welcome to Caddy!\"")
'';
})
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
mktplcRef = {
name = "typst-preview";
publisher = "mgt19937";
version = "0.11.4";
hash = "sha256-GwlzFphZmP87pLys01+PWTv13imcdGjunCMH6atz9xs=";
version = "0.11.6";
hash = "sha256-8//6eUzMg5AX9NNQm5mzNGlOG50Cxl0Rt1+dPq0J2DU=";
};

buildInputs = [ typst-preview ];
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
mktplcRef = {
name = "r";
publisher = "reditorsupport";
version = "2.8.3";
hash = "sha256-3HVBBXMdRhnKLnhrbEQFIlIbB/rbj+AAb4/z3/Ch7eg=";
version = "2.8.4";
hash = "sha256-wVT9/JUuqP8whW99q1gwVMf7PRzgZNLoIdlXsclpbck=";
};
nativeBuildInputs = [
jq
Expand Down
4 changes: 2 additions & 2 deletions pkgs/applications/misc/lswt/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@

stdenv.mkDerivation rec {
pname = "lswt";
version = "1.0.4";
version = "2.0.0";

src = fetchFromSourcehut {
owner = "~leon_plickat";
repo = pname;
rev = "v${version}";
hash = "sha256-Orwa7sV56AeznEcq/Xj5qj4PALMxq0CI+ZnXuY4JYE0=";
hash = "sha256-8jP6I2zsDt57STtuq4F9mcsckrjvaCE5lavqKTjhNT0=";
};

nativeBuildInputs = [ wayland-scanner ];
Expand Down
4 changes: 2 additions & 2 deletions pkgs/applications/networking/datovka/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@

mkDerivation rec {
pname = "datovka";
version = "4.23.7";
version = "4.23.8";

src = fetchurl {
url = "https://gitlab.nic.cz/datovka/datovka/-/archive/v${version}/datovka-v${version}.tar.gz";
sha256 = "sha256-mGuTxOqudDhoJKZ9517H+A4PZxBqAOD+PfBHunhPXGw=";
sha256 = "sha256-YmXpbSrbibkH0+DKE+ujFSLqxnWiA3XpuQSzOQUyEOo=";
};

buildInputs = [ libdatovka qmake qtbase qtsvg libxml2 qtwebsockets ];
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@

stdenv.mkDerivation rec {
pname = "armcord";
version = "3.2.6";
version = "3.2.7";

src =
let
Expand All @@ -47,11 +47,11 @@ stdenv.mkDerivation rec {
{
x86_64-linux = fetchurl {
url = "${base}/v${version}/ArmCord_${version}_amd64.deb";
hash = "sha256-9AcxqCxhLAjYclaw6lri06R0PgQQeRHTbLJLEdhDCWU=";
hash = "sha256-TFgO9ddz/Svi4QfugjTTejpV/m+xc1548cokzhVgwkw=";
};
aarch64-linux = fetchurl {
url = "${base}/v${version}/ArmCord_${version}_arm64.deb";
hash = "sha256-/uk2slpNF1sSTW6z319Yg9yx/s45fJPvJQJpY11ULVw=";
hash = "sha256-AJ4TSG3ry2P40vzK1fsaWgQ/O0z9r3z8+0uxSmddZKo=";
};
}.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
callPackage ./generic.nix { } rec {
pname = "signal-desktop";
dir = "Signal";
version = "7.8.0";
version = "7.9.0";
url = "https://updates.signal.org/desktop/apt/pool/s/signal-desktop/signal-desktop_${version}_amd64.deb";
hash = "sha256-gBcfe3lU2pmRHSXNNXBFU7Qv83Bf6OPv5LM/HxeLkjM=";
hash = "sha256-Iv2WG1kvB3tEiFu4Oy0po0KlpWCwfalDNOXstO/C+e0=";
}
4 changes: 2 additions & 2 deletions pkgs/applications/office/planify/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -28,13 +28,13 @@

stdenv.mkDerivation rec {
pname = "planify";
version = "4.7.2";
version = "4.7.4";

src = fetchFromGitHub {
owner = "alainm23";
repo = "planify";
rev = version;
hash = "sha256-G0A3U0TUGL4RT1wpIXw/cIwDDlaLCPpo5QG6bJfoIYc=";
hash = "sha256-x76HasjETqXqE5yXE69/69NAYEWAksHSt0nYRq8/P0k=";
};

nativeBuildInputs = [
Expand Down
4 changes: 2 additions & 2 deletions pkgs/applications/video/haruna/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,13 @@

stdenv.mkDerivation rec {
pname = "haruna";
version = "1.1.0";
version = "1.1.1";

src = fetchFromGitLab {
owner = "multimedia";
repo = "haruna";
rev = "v${version}";
hash = "sha256-403ZqllSSaOdTS1GSf8EIQk9gHOxMsWogbK9qh+MhpY=";
hash = "sha256-m4u1V+vp4wOSqRbdbxgxDNgC28biiB3A6w1pSfuczHs=";
domain = "invent.kde.org";
};

Expand Down
35 changes: 35 additions & 0 deletions pkgs/by-name/ag/age-plugin-fido2-hmac/package.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
{ lib
, buildGoModule
, fetchFromGitHub
, libfido2
, stdenv
}:

buildGoModule rec {
pname = "age-plugin-fido2-hmac";
version = "0.2.3";

src = fetchFromGitHub {
owner = "olastor";
repo = "age-plugin-fido2-hmac";
rev = "v${version}";
hash = "sha256-P2gNOZeuODWEb/puFe6EA1wW3pc0xgM567qe4FKbFXg=";
};

vendorHash = "sha256-h4/tyq9oZt41IfRJmmsLHUpJiPJ7YuFu59ccM7jHsFo=";

ldflags = [ "-s" "-w" ];

buildInputs = [
libfido2
];

meta = with lib; {
description = "Age plugin to encrypt files with fido2 tokens using the hmac-secret extension and non-discoverable credentials";
homepage = "https://github.com/olastor/age-plugin-fido2-hmac/";
license = licenses.mit;
maintainers = with maintainers; [ matthewcroughan ];
mainProgram = "age-plugin-fido2-hmac";
broken = stdenv.isDarwin;
};
}
6 changes: 3 additions & 3 deletions pkgs/by-name/ba/badkeys/package.nix
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,14 @@
}:
python3Packages.buildPythonApplication rec {
pname = "badkeys";
version = "0.0.10";
version = "0.0.11";
pyproject = true;

src = fetchFromGitHub {
owner = "badkeys";
repo = "badkeys";
rev = "v${version}";
hash = "sha256-4vIPOKU/R+wASEx4OQHjtP6mJSKJDtPgQB968vuT24Y=";
rev = "refs/tags/v${version}";
hash = "sha256-VfkJeHEdvRc0Khf/C7ZUNpjd6t+hUULCTXXY80rs4Ko=";
};

build-system = with python3Packages; [
Expand Down
81 changes: 81 additions & 0 deletions pkgs/by-name/ca/catppuccinifier-gui/package.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,81 @@
{
lib,
gtk3,
glib,
dbus,
curl,
wget,
cairo,
stdenv,
librsvg,
libsoup,
fetchzip,
openssl_3,
webkitgtk,
gdk-pixbuf,
pkg-config,
makeDesktopItem,
copyDesktopItems,
autoPatchelfHook,
}:
let
version = "8.0.0";
in
stdenv.mkDerivation {
pname = "catppuccinifier-gui";
inherit version;

src = fetchzip {
url = "https://github.com/lighttigerXIV/catppuccinifier/releases/download/${version}/Catppuccinifer-Linux-${version}.zip";
hash = "sha256-fG6YhLsjvMUIWsOnm+GSOh6LclCAISPSRiDQdWLlAR4=";
};

nativeBuildInputs = [
autoPatchelfHook
pkg-config
copyDesktopItems
];

buildInputs = [
curl
wget
webkitgtk
gtk3
cairo
gdk-pixbuf
libsoup
glib
dbus
openssl_3
librsvg
];

installPhase = ''
runHook preInstall
install -Dm555 installation-files/catppuccinifier-gui "$out/bin/catppuccinifier-gui"
install -Dm644 installation-files/catppuccinifier.png "$out/share/pixmaps/catppuccinifier.png"
runHook postInstall
'';

desktopItems = [
(makeDesktopItem {
desktopName = "catppuccinifier";
name = "catppuccinifier";
exec = "catppuccinifier-gui";
icon = "catppuccinifier";
comment = "Apply catppuccin flavors to your wallpapers";
})
];

meta = {
description = "Apply catppuccin flavors to your wallpapers";
homepage = "https://github.com/lighttigerXIV/catppuccinifier";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ isabelroses ];
platforms = [ "x86_64-linux" ];
mainProgram = "catppuccinifier-gui";
sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
};
}
37 changes: 37 additions & 0 deletions pkgs/by-name/ga/gate/package.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
{ lib
, buildGoModule
, fetchFromGitHub
}:

let
pname = "gate";
version = "0.36.7";
in
buildGoModule {
inherit pname version;

src = fetchFromGitHub {
owner = "minekube";
repo = "gate";
rev = "refs/tags/v${version}";
hash = "sha256-WHxpx20O/HuCWqbY4zTxcjyIhW3+FQtTz5sUGAda71g=";
};

vendorHash = "sha256-dswNJQWqN+u/mnpbj9se2j9uEi0ewNTXVlN3WnNbcyg=";

ldflags = [ "-s" "-w" ];

meta = {
description = "High-Performance, Low-Memory, Lightweight, Extensible Minecraft Reverse Proxy";
longDescription = ''
Gate is an extensible, high performant & paralleled Minecraft proxy server
with scalability, flexibility & excellent server version support - written in Go
and ready for the cloud!
'';
homepage = "https://github.com/minekube/gate";
license = lib.licenses.asl20;
maintainers = with lib.maintainers; [ XBagon ];
mainProgram = "gate";
};
}

4 changes: 2 additions & 2 deletions pkgs/by-name/ma/marcel/package.nix
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,14 @@

python3Packages.buildPythonApplication rec {
pname = "marcel";
version = "0.22.2";
version = "0.27.2";
pyproject = true;

src = fetchFromGitHub {
owner = "geophile";
repo = "marcel";
rev = "refs/tags/v${version}";
hash = "sha256-CiAIY4qXv5V2VOsi+vat7OvFcmeFpIrmHCfqlY+JRXc=";
hash = "sha256-jzb4kSrcN+pLFkWYy0hc7NCCextWgZQuf3P+kiouEfY=";
};

nativeBuildInputs = with python3Packages; [
Expand Down
Loading

0 comments on commit bd935fc

Please sign in to comment.