Merge master into staging-next

This commit is contained in:
github-actions[bot] 2022-09-17 12:01:34 +00:00 committed by GitHub
commit 568df7e30a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
36 changed files with 246 additions and 66 deletions

View file

@ -8104,6 +8104,13 @@
githubId = 109141; githubId = 109141;
name = "Georges Dubus"; name = "Georges Dubus";
}; };
madonius = {
email = "nixos@madoni.us";
github = "madonius";
githubId = 1246752;
name = "madonius";
matrix = "@madonius:entropia.de";
};
Madouura = { Madouura = {
email = "madouura@gmail.com"; email = "madouura@gmail.com";
github = "Madouura"; github = "Madouura";

View file

@ -123,6 +123,13 @@
PHP now defaults to PHP 8.1, updated from 8.0. PHP now defaults to PHP 8.1, updated from 8.0.
</para> </para>
</listitem> </listitem>
<listitem>
<para>
Perl has been updated to 5.36, and its core module
<literal>HTTP::Tiny</literal> was patched to verify SSL/TLS
certificates by default.
</para>
</listitem>
<listitem> <listitem>
<para> <para>
Cinnamon has been updated to 5.4. While at it, the cinnamon Cinnamon has been updated to 5.4. While at it, the cinnamon
@ -225,6 +232,13 @@
<link linkend="opt-services.outline.enable">services.outline</link>. <link linkend="opt-services.outline.enable">services.outline</link>.
</para> </para>
</listitem> </listitem>
<listitem>
<para>
<link xlink:href="https://git.sr.ht/~migadu/alps">alps</link>,
a simple and extensible webmail. Available as
<link linkend="opt-services.alps.enable">services.alps</link>.
</para>
</listitem>
<listitem> <listitem>
<para> <para>
<link xlink:href="https://netbird.io">netbird</link>, a zero <link xlink:href="https://netbird.io">netbird</link>, a zero

View file

@ -50,6 +50,8 @@ In addition to numerous new and upgraded packages, this release has the followin
- PHP now defaults to PHP 8.1, updated from 8.0. - PHP now defaults to PHP 8.1, updated from 8.0.
- Perl has been updated to 5.36, and its core module `HTTP::Tiny` was patched to verify SSL/TLS certificates by default.
- Cinnamon has been updated to 5.4. While at it, the cinnamon module now defaults to - Cinnamon has been updated to 5.4. While at it, the cinnamon module now defaults to
blueman as bluetooth manager and slick-greeter as lightdm greeter to match upstream. blueman as bluetooth manager and slick-greeter as lightdm greeter to match upstream.
@ -83,6 +85,8 @@ In addition to numerous new and upgraded packages, this release has the followin
- [Outline](https://www.getoutline.com/), a wiki and knowledge base similar to Notion. Available as [services.outline](#opt-services.outline.enable). - [Outline](https://www.getoutline.com/), a wiki and knowledge base similar to Notion. Available as [services.outline](#opt-services.outline.enable).
- [alps](https://git.sr.ht/~migadu/alps), a simple and extensible webmail. Available as [services.alps](#opt-services.alps.enable).
- [netbird](https://netbird.io), a zero configuration VPN. - [netbird](https://netbird.io), a zero configuration VPN.
Available as [services.netbird](options.html#opt-services.netbird.enable). Available as [services.netbird](options.html#opt-services.netbird.enable).

View file

@ -1054,6 +1054,7 @@
./services/video/epgstation/default.nix ./services/video/epgstation/default.nix
./services/video/mirakurun.nix ./services/video/mirakurun.nix
./services/video/replay-sorcery.nix ./services/video/replay-sorcery.nix
./services/web-apps/alps.nix
./services/web-apps/atlassian/confluence.nix ./services/web-apps/atlassian/confluence.nix
./services/web-apps/atlassian/crowd.nix ./services/web-apps/atlassian/crowd.nix
./services/web-apps/atlassian/jira.nix ./services/web-apps/atlassian/jira.nix

View file

@ -0,0 +1,96 @@
{ lib, pkgs, config, ... }:
with lib;
let
cfg = config.services.alps;
in {
options.services.alps = {
enable = mkEnableOption (lib.mdDoc "alps");
port = mkOption {
type = types.port;
default = 1323;
description = lib.mdDoc ''
TCP port the service should listen on.
'';
};
bindIP = mkOption {
default = "[::]";
type = types.str;
description = lib.mdDoc ''
The IP the service should listen on.
'';
};
theme = mkOption {
type = types.enum [ "alps" "sourcehut" ];
default = "sourcehut";
description = lib.mdDoc ''
The frontend's theme to use.
'';
};
imaps = {
port = mkOption {
type = types.port;
default = 993;
description = lib.mdDoc ''
The IMAPS server port.
'';
};
host = mkOption {
type = types.str;
default = "[::1]";
example = "mail.example.org";
description = lib.mdDoc ''
The IMAPS server address.
'';
};
};
smtps = {
port = mkOption {
type = types.port;
default = 445;
description = lib.mdDoc ''
The SMTPS server port.
'';
};
host = mkOption {
type = types.str;
default = cfg.imaps.host;
defaultText = "services.alps.imaps.host";
example = "mail.example.org";
description = lib.mdDoc ''
The SMTPS server address.
'';
};
};
};
config = mkIf cfg.enable {
systemd.services.alps = {
description = "alps is a simple and extensible webmail.";
documentation = [ "https://git.sr.ht/~migadu/alps" ];
wantedBy = [ "multi-user.target" ];
after = [ "network.target" "network-online.target" ];
serviceConfig = {
ExecStart = ''
${pkgs.alps}/bin/alps \
-addr ${cfg.bindIP}:${toString cfg.port} \
-theme ${cfg.theme} \
imaps://${cfg.imaps.host}:${toString cfg.imaps.port} \
smpts://${cfg.smtps.host}:${toString cfg.smtps.port}
'';
StateDirectory = "alps";
WorkingDirectory = "/var/lib/alps";
DynamicUser = true;
};
};
};
}

View file

@ -2,13 +2,13 @@
buildGoModule rec { buildGoModule rec {
pname = "argocd"; pname = "argocd";
version = "2.4.11"; version = "2.4.12";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "argoproj"; owner = "argoproj";
repo = "argo-cd"; repo = "argo-cd";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-o4mDqLbGsrlpPNEBqsvIGpelL5IocHnFpRrvoLExGes="; sha256 = "sha256-U3Qct7wL/oJDgU+PXL5UMMTsQo4maeKShDwU2crSWxk=";
}; };
vendorSha256 = "sha256-n6elT6ETOtbZsFqfwMo9d2qqamS8jdrROjFjStNkalc="; vendorSha256 = "sha256-n6elT6ETOtbZsFqfwMo9d2qqamS8jdrROjFjStNkalc=";

View file

@ -12,9 +12,9 @@
buildGoModule rec { buildGoModule rec {
pname = "minikube"; pname = "minikube";
version = "1.26.1"; version = "1.27.0";
vendorSha256 = "sha256-aw2B5wdhEQiTDp/BpJdXzY3XBm3eXlSQt83j4RHhMg0="; vendorSha256 = "sha256-wAjgeq//vRUDUyVNTsVIxLXhA6fzTrYvn4klAPAv7DE=";
doCheck = false; doCheck = false;
@ -22,7 +22,7 @@ buildGoModule rec {
owner = "kubernetes"; owner = "kubernetes";
repo = "minikube"; repo = "minikube";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-08q/IdQEq1/KaIBN6ss8r1KbjSjZnhOW/BeaJ8BuYZM="; sha256 = "sha256-Pn0F3363YJoOdWyoPy46HmIUwWr/I5TekalBp9hHg7I=";
}; };
nativeBuildInputs = [ installShellFiles pkg-config which makeWrapper ]; nativeBuildInputs = [ installShellFiles pkg-config which makeWrapper ];

View file

@ -6,13 +6,13 @@
}: }:
python3.pkgs.buildPythonApplication rec { python3.pkgs.buildPythonApplication rec {
pname = "nanovna-saver"; pname = "nanovna-saver";
version = "0.5.2"; version = "0.5.3";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "NanoVNA-Saver"; owner = "NanoVNA-Saver";
repo = pname; repo = pname;
rev = "refs/tags/v${version}"; rev = "refs/tags/v${version}";
sha256 = "sha256-PP4VHEp6NSSLsuYABr0/S3+YuhpAyvh/xGnQGyszCtM="; sha256 = "sha256-wKKjMcOx7NS2VAIk3OTAj7KWE1+CeAzctdgdidT+HMA=";
}; };
nativeBuildInputs = [ wrapQtAppsHook ]; nativeBuildInputs = [ wrapQtAppsHook ];

View file

@ -2,13 +2,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "v2ray-geoip"; pname = "v2ray-geoip";
version = "202209080101"; version = "202209150105";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "v2fly"; owner = "v2fly";
repo = "geoip"; repo = "geoip";
rev = "2e77e5d149f0a8f9c284333b206d0f017b0b66ef"; rev = "6666b85fc48179414d59613cdfd6f83354f778bc";
sha256 = "sha256-vkWRBSwLpCqZWMlfwOyPWn2MF+/lG+VXnSrDCSR+dak="; sha256 = "sha256-iBQvfVvfTG8zQdoTGOFxME0tr/YWCVxjXFQhP/zmRVU=";
}; };
installPhase = '' installPhase = ''

View file

@ -2,12 +2,12 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "clojure"; pname = "clojure";
version = "1.11.1.1149"; version = "1.11.1.1161";
src = fetchurl { src = fetchurl {
# https://clojure.org/releases/tools # https://clojure.org/releases/tools
url = "https://download.clojure.org/install/clojure-tools-${version}.tar.gz"; url = "https://download.clojure.org/install/clojure-tools-${version}.tar.gz";
sha256 = "sha256-IIhonPSwpADNAuv9DQIKrdsJcGAlX+6uHe+jvA6i3KQ="; sha256 = "sha256-B+NSIS1lHLqtLImY2gRYwYTrilJrbmDUvqd2H8UunA4=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

View file

@ -0,0 +1,22 @@
{ stdenv, cmake, fetchFromGitHub, lib }: let
version = "0.2.0";
in stdenv.mkDerivation {
name = "scope-lite-${version}";
src = fetchFromGitHub {
owner = "martinmoene";
repo = "scope-lite";
rev = "v${version}";
hash = "sha256-/Vu3blgyEOQRFqhQjuT/6ukV0iWA0TdPrLnt2Z/gd6E=";
};
nativeBuildInputs = [ cmake ];
meta = {
description = "A migration path to C++ library extensions scope_exit, scope_fail, scope_success, unique_resource";
license = lib.licenses.boost;
maintainers = [ lib.maintainers.shlevy ];
homepage = "https://github.com/martinmoene/scope-lite";
platforms = lib.platforms.all;
};
}

View file

@ -0,0 +1,22 @@
{ stdenv, cmake, fetchFromGitHub, lib }: let
version = "1.2.2";
in stdenv.mkDerivation {
name = "stduuid-${version}";
src = fetchFromGitHub {
owner = "mariusbancila";
repo = "stduuid";
rev = "v${version}";
hash = "sha256-itx1OF1gmEEMy2tJlkN5dpF6o0dlesecuHYfpJdhf7c=";
};
nativeBuildInputs = [ cmake ];
meta = {
description = "A C++17 cross-platform implementation for UUIDs";
license = lib.licenses.mit;
maintainers = [ lib.maintainers.shlevy ];
homepage = "https://github.com/mariusbancila/stduuid";
platforms = lib.platforms.all;
};
}

View file

@ -13,14 +13,14 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "aioswitcher"; pname = "aioswitcher";
version = "2.0.10"; version = "3.0.0";
format = "pyproject"; format = "pyproject";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "TomerFi"; owner = "TomerFi";
repo = pname; repo = pname;
rev = "refs/tags/${version}"; rev = "refs/tags/${version}";
sha256 = "sha256-Me0BvmCfj9bA7TXUHXLYe9a+d7nFnm7RpNVGtAzkBZM="; sha256 = "sha256-zJS09YQRMv3B0daW0cgBRPoLQkPyGuBgMohf6E2yqaM=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

View file

@ -14,7 +14,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "appthreat-vulnerability-db"; pname = "appthreat-vulnerability-db";
version = "2.0.5"; version = "2.0.6";
format = "setuptools"; format = "setuptools";
disabled = pythonOlder "3.7"; disabled = pythonOlder "3.7";
@ -23,7 +23,7 @@ buildPythonPackage rec {
owner = "AppThreat"; owner = "AppThreat";
repo = "vulnerability-db"; repo = "vulnerability-db";
rev = "refs/tags/v${version}"; rev = "refs/tags/v${version}";
sha256 = "sha256-ThUkDCoRKefAqTmOxCk9W9LZlCqUU+jxF0egjthH4JI="; sha256 = "sha256-tmvt5jqgfKxCW+/XvmSu7bTsT1Qk902c1qfR4IK66vg=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

View file

@ -7,14 +7,14 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "asysocks"; pname = "asysocks";
version = "0.2.1"; version = "0.2.2";
format = "setuptools"; format = "setuptools";
disabled = pythonOlder "3.7"; disabled = pythonOlder "3.7";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "sha256-j0UWCI6+x/CNjFSeXnXnqGtB5gQ6+SC6SJXPP2xlQVA="; sha256 = "sha256-rhqML/w8Hp8xZogjc2ZD+Y9C9c/w1e4X7WNoFaLz9Ps=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

View file

@ -6,6 +6,7 @@
, lxml , lxml
, packageurl-python , packageurl-python
, poetry-core , poetry-core
, pytestCheckHook
, python , python
, pythonOlder , pythonOlder
, requirements-parser , requirements-parser
@ -14,7 +15,6 @@
, toml , toml
, types-setuptools , types-setuptools
, types-toml , types-toml
, unittestCheckHook
, xmldiff , xmldiff
}: }:
@ -48,7 +48,7 @@ buildPythonPackage rec {
]; ];
checkInputs = [ checkInputs = [
unittestCheckHook pytestCheckHook
jsonschema jsonschema
lxml lxml
xmldiff xmldiff
@ -59,9 +59,17 @@ buildPythonPackage rec {
]; ];
preCheck = '' preCheck = ''
rm tests/test_output_json.py export PYTHONPATH=tests''${PYTHONPATH+:$PYTHONPATH}
''; '';
pytestFlagsArray = [ "tests/" ];
disabledTests = [
# These tests require network access.
"test_bom_v1_3_with_metadata_component"
"test_bom_v1_4_with_metadata_component"
];
meta = with lib; { meta = with lib; {
description = "Python library for generating CycloneDX SBOMs"; description = "Python library for generating CycloneDX SBOMs";
homepage = "https://github.com/CycloneDX/cyclonedx-python-lib"; homepage = "https://github.com/CycloneDX/cyclonedx-python-lib";

View file

@ -8,7 +8,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "fastcore"; pname = "fastcore";
version = "1.5.26"; version = "1.5.27";
format = "setuptools"; format = "setuptools";
disabled = pythonOlder "3.8"; disabled = pythonOlder "3.8";
@ -17,7 +17,7 @@ buildPythonPackage rec {
owner = "fastai"; owner = "fastai";
repo = pname; repo = pname;
rev = "refs/tags/${version}"; rev = "refs/tags/${version}";
sha256 = "sha256-WA6EgdyZ6zQGCzeQsHUD304WMCarjhGEpqXXBhBsxNw="; sha256 = "sha256-LFkjxcotJoHIX0GdKKqUSFF4/HSWc/sLwb34iuBrQIg=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

View file

@ -8,7 +8,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "life360"; pname = "life360";
version = "5.1.0"; version = "5.1.1";
format = "setuptools"; format = "setuptools";
disabled = pythonOlder "3.8"; disabled = pythonOlder "3.8";
@ -17,7 +17,7 @@ buildPythonPackage rec {
owner = "pnbruckner"; owner = "pnbruckner";
repo = pname; repo = pname;
rev = "refs/tags/v${version}"; rev = "refs/tags/v${version}";
hash = "sha256-/daZ/R3qhdPfvdGra0W0rEEXl6Bux5O8oTuEuCkO3bE="; hash = "sha256-Fsv0lK0C9suVqgeaxKVuyAacHzHJJ1FHXzzy95RnhWw=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

View file

@ -7,7 +7,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "pysensibo"; pname = "pysensibo";
version = "1.0.19"; version = "1.0.20";
format = "setuptools"; format = "setuptools";
disabled = pythonOlder "3.7"; disabled = pythonOlder "3.7";
@ -16,7 +16,7 @@ buildPythonPackage rec {
owner = "andrey-git"; owner = "andrey-git";
repo = pname; repo = pname;
rev = "refs/tags/${version}"; rev = "refs/tags/${version}";
hash = "sha256-pqg+NsdbSyXgC+4/AtbI4BZ5h2pMhvvBdQI9lHj6HME="; hash = "sha256-L2NP4XS+dPlBr2h8tsGoa4G7tI9yiI4fwrhvQaKkexk=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

View file

@ -5,14 +5,14 @@
python3.pkgs.buildPythonApplication rec { python3.pkgs.buildPythonApplication rec {
pname = "circup"; pname = "circup";
version = "1.1.2"; version = "1.1.3";
format = "setuptools"; format = "setuptools";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "adafruit"; owner = "adafruit";
repo = pname; repo = pname;
rev = "refs/tags/${version}"; rev = "refs/tags/${version}";
hash = "sha256-zrpld0yexzoXJx4qqDPEMf58SN67SGoP3umNqqsFJgw="; hash = "sha256-BCAsCwQCKMtmjISMVKDblRdev87K4EfX5D2Ot0L5PoQ=";
}; };
SETUPTOOLS_SCM_PRETEND_VERSION = version; SETUPTOOLS_SCM_PRETEND_VERSION = version;

View file

@ -2,13 +2,13 @@
buildGoModule rec { buildGoModule rec {
pname = "oh-my-posh"; pname = "oh-my-posh";
version = "9.3.0"; version = "9.3.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "jandedobbeleer"; owner = "jandedobbeleer";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-5VI7L6aGJcaqcNK0bNGv5Hb0YQxTfLFDcMmiWKTyzWA="; sha256 = "sha256-dVHf6nm7IRMpZ8Tx4VxRfBb8HOEfWc/5LgWZQ5LDbuk=";
}; };
vendorSha256 = "sha256-A4+sshIzPla7udHfnMmbFqn+fW3SOCrI6g7tArzmh1E="; vendorSha256 = "sha256-A4+sshIzPla7udHfnMmbFqn+fW3SOCrI6g7tArzmh1E=";

View file

@ -2,13 +2,13 @@
buildGoModule rec { buildGoModule rec {
pname = "okteto"; pname = "okteto";
version = "2.6.0"; version = "2.7.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "okteto"; owner = "okteto";
repo = "okteto"; repo = "okteto";
rev = version; rev = version;
sha256 = "sha256-leJvrbtKTtHins46YbPm7kTpcFTC5l2idOXEz+oPeZE="; sha256 = "sha256-xAK2gxIMyiC3GEd4As5FrGQqa4f+FiQLZZs4VROSpgQ=";
}; };
vendorSha256 = "sha256-Na0t9uxmA7lIRTRp6I+eDHjUbo7YQzbMQfqDZd6T62k="; vendorSha256 = "sha256-Na0t9uxmA7lIRTRp6I+eDHjUbo7YQzbMQfqDZd6T62k=";

View file

@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "pqrs"; pname = "pqrs";
version = "0.2.1"; version = "0.2.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "manojkarthick"; owner = "manojkarthick";
repo = "pqrs"; repo = "pqrs";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-/PNGqveN4BSkURFVUpNgHDcPtz9vFhzdY8UK00AMaks="; sha256 = "sha256-fqxPQUcd8DG+UYJRWLDJ9RpRkCWutEXjc6J+w1qv8PQ=";
}; };
cargoSha256 = "sha256-3mrNS0zNgsG7mX3RileFLi5iw3SrlEQC96FSANjpKT8="; cargoSha256 = "sha256-/nfVu8eiQ8JAAUplSyA4eCQqZPCSrcxFzdc2gV95a2w=";
meta = with lib; { meta = with lib; {
description = "CLI tool to inspect Parquet files"; description = "CLI tool to inspect Parquet files";

View file

@ -2,16 +2,16 @@
buildGoModule rec { buildGoModule rec {
pname = "protoc-gen-validate"; pname = "protoc-gen-validate";
version = "0.6.7"; version = "0.6.8";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "envoyproxy"; owner = "envoyproxy";
repo = "protoc-gen-validate"; repo = "protoc-gen-validate";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-ouo6raNbvQyuY4IY1JEN45Ss7zb3EoR/WIRzL7hXLNI="; sha256 = "sha256-s66HfafyiAwr4tvWiPVj7ivWE9C03KTGgI/iu0LgNGk=";
}; };
vendorSha256 = "sha256-HbUEhoB6PPHwN/xym6dTkS54+EqVU1n8EIym8W2wt3I="; vendorSha256 = "sha256-vFi1DT7o2fyzxO/aZHtdsU1/G/sGmamqZPeql0vQVjs=";
excludedPackages = [ "tests" ]; excludedPackages = [ "tests" ];

View file

@ -7,13 +7,13 @@
buildPythonApplication rec { buildPythonApplication rec {
pname = "legendary-gl"; # Name in pypi pname = "legendary-gl"; # Name in pypi
version = "0.20.28"; version = "0.20.29";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "derrod"; owner = "derrod";
repo = "legendary"; repo = "legendary";
rev = "refs/tags/${version}"; rev = "refs/tags/${version}";
sha256 = "sha256-33EsxwwvgkN9U8kpYywV0wsRnLzjGv87zYJ9jSVi91c="; sha256 = "sha256-yocGjPZzuLHvWQ1EuS+kMxb/6ikfPvKqFmvHK+SyE+E=";
}; };
propagatedBuildInputs = [ requests ]; propagatedBuildInputs = [ requests ];

View file

@ -14,6 +14,8 @@ buildGoModule rec {
vendorSha256 = "sha256-cpY+lYM/nAX3nUaFknrRAavxDk8UDzJkoqFjJ1/KWeg="; vendorSha256 = "sha256-cpY+lYM/nAX3nUaFknrRAavxDk8UDzJkoqFjJ1/KWeg=";
ldflags = [ ldflags = [
"-s"
"-w"
"-X main.themesPath=${placeholder "out"}/share/alps/themes" "-X main.themesPath=${placeholder "out"}/share/alps/themes"
"-X git.sr.ht/~migadu/alps.PluginDir=${placeholder "out"}/share/alps/plugins" "-X git.sr.ht/~migadu/alps.PluginDir=${placeholder "out"}/share/alps/plugins"
]; ];
@ -33,6 +35,6 @@ buildGoModule rec {
description = "A simple and extensible webmail."; description = "A simple and extensible webmail.";
homepage = "https://git.sr.ht/~migadu/alps"; homepage = "https://git.sr.ht/~migadu/alps";
license = licenses.mit; license = licenses.mit;
maintainers = with maintainers; [ gordias booklearner ]; maintainers = with maintainers; [ gordias booklearner madonius ];
}; };
} }

View file

@ -2,18 +2,18 @@
buildGoModule rec { buildGoModule rec {
pname = "mautrix-whatsapp"; pname = "mautrix-whatsapp";
version = "0.6.1"; version = "0.7.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "mautrix"; owner = "mautrix";
repo = "whatsapp"; repo = "whatsapp";
rev = "v${version}"; rev = "v${version}";
sha256 = "1AcjcE57ttjypnLU/+qpPsvApiuJfSX0qbPEQKOWfIM="; hash = "sha256-OUGFp25M8wn8eWMuQHDh8Zp67x+VHVbyvuBHq+UE+NY=";
}; };
buildInputs = [ olm ]; buildInputs = [ olm ];
vendorSha256 = "4CA/kDGohoJfdiXALN8M8fuPHQUrU2REHqVI7kKMnoY="; vendorSha256 = "sha256-9pOe7jHgyrFP1Sj8O1KEVxcEaUPEE0+41HUfQoPxa2E=";
doCheck = false; doCheck = false;

View file

@ -2,13 +2,13 @@
buildGoModule rec { buildGoModule rec {
pname = "tailscale"; pname = "tailscale";
version = "1.30.1"; version = "1.30.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "tailscale"; owner = "tailscale";
repo = "tailscale"; repo = "tailscale";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-sR1DB8Hc/JkCFaoj9FRRJhTeUWWoGUee2kx0EreUbWE="; sha256 = "sha256-xs3LhldFP4gB5ouW1q8eiCZ5nZD6j9QROm/s+qFMA88=";
}; };
vendorSha256 = "sha256-+7Cr7wmt4PheHJRAlyKhRd6QRIZBqrbVtn5I94h8lLo="; vendorSha256 = "sha256-+7Cr7wmt4PheHJRAlyKhRd6QRIZBqrbVtn5I94h8lLo=";

View file

@ -4,13 +4,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "xsecurelock"; pname = "xsecurelock";
version = "1.7.0"; version = "1.8.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "google"; owner = "google";
repo = "xsecurelock"; repo = "xsecurelock";
rev = "v${version}"; rev = "v${version}";
sha256 = "020y2mi4sshc5dghcz37aj5wwizbg6712rzq2a72f8z8m7mnxr5y"; sha256 = "sha256-sK3KrtZzrV2jkQveZnSHDR5I4v7baL/sARje2mDpIMI=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

View file

@ -5,17 +5,17 @@
buildGoModule rec { buildGoModule rec {
pname = "trivy"; pname = "trivy";
version = "0.31.3"; version = "0.32.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "aquasecurity"; owner = "aquasecurity";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-e+H5FH9UU2zK4GmxN04T87GdZYRZDVtA0FNw6t4kjgQ="; sha256 = "sha256-o4wmHPdNKFcgLPFYLluLLP9ReXt2vL1LHmUmhNl/5cE=";
}; };
# hash missmatch on across linux and darwin # hash missmatch on across linux and darwin
proxyVendor = true; proxyVendor = true;
vendorSha256 = "sha256-QjJHmVqZTw5w1jR+EctS4VzeJMBpkCL3VGjeKeQmyPA="; vendorSha256 = "sha256-QIJZwu+b8xkp3z7A+QESa3VdwEEtsWIDG2gdcCiFPh0=";
excludedPackages = "misc"; excludedPackages = "misc";

View file

@ -3,16 +3,16 @@
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "macchina"; pname = "macchina";
version = "6.0.6"; version = "6.1.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "Macchina-CLI"; owner = "Macchina-CLI";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-G95eQ5cIa5313k8YcuicbzPeq9VXVo2DgPMwfFMNXtk="; sha256 = "sha256-zJr5RG1bbcKhPGygERSROC9JVfVigHauFzaqfY4KXC4=";
}; };
cargoSha256 = "sha256-mkAklLtG/sB0eLla5cveMqyPXwMCE5ufer8qA5L9chg="; cargoSha256 = "sha256-QwZWm50D3N4OES9ypnIQOxEPYcUXVUcwKQ0/SUy7jyI=";
nativeBuildInputs = [ installShellFiles ]; nativeBuildInputs = [ installShellFiles ];
buildInputs = lib.optionals stdenv.isDarwin [ libiconv Foundation ]; buildInputs = lib.optionals stdenv.isDarwin [ libiconv Foundation ];

View file

@ -2,16 +2,16 @@
buildGoModule rec { buildGoModule rec {
pname = "mutagen-compose"; pname = "mutagen-compose";
version = "0.15.2"; version = "0.15.3";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "mutagen-io"; owner = "mutagen-io";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-Ass6BXOevFuyT6eLZ8J5XRN44YAfBdoQ7N+/5152uR0="; sha256 = "sha256-B7ZMECeNYIfFQ7+VM+tBLj6KLCxicNfopXzL7AtrSFc=";
}; };
vendorSha256 = "sha256-rzMcUQvP27GBGohcWrSzu7fEP6lwEwgo3sWXuEeZES8="; vendorSha256 = "sha256-AfOsnD3e2C2c/Qc26IlP9CeaoSAhP78Nupu245ma1Z0=";
doCheck = false; doCheck = false;

View file

@ -8,16 +8,16 @@
}: }:
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "rathole"; pname = "rathole";
version = "0.4.3"; version = "0.4.4";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "rapiz1"; owner = "rapiz1";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-gqWgx03mUk6+9K4Yw5PHEBwFxsOR+48wvngT+wQnN1k="; sha256 = "sha256-qhkgXS+Rku9OcFgFbHfELcjQmIHNvi3sC4bh5LKYzJQ=";
}; };
cargoSha256 = "sha256-dafOgZtiszkoi97PpAVMtdvJd5O3EK9hDVNLJ32FYzE="; cargoSha256 = "sha256-3WY+VIRycqFmkVA+NdbU4glEkZecRM5eKI/reyNWVao=";
nativeBuildInputs = [ pkg-config ]; nativeBuildInputs = [ pkg-config ];

View file

@ -5,16 +5,16 @@
buildGoModule rec { buildGoModule rec {
pname = "dalfox"; pname = "dalfox";
version = "2.7.5"; version = "2.8.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "hahwul"; owner = "hahwul";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-MCKXhDhpFLZTf0CYS3W4+4FykTuBu7q3Dy+R7RNp11s="; sha256 = "sha256-JNEKFbhJlBUvAzqd1UODWv8HIo5LDVPvFfwmztsRW2o=";
}; };
vendorSha256 = "sha256-GW2DgfHEKKWBfW5A7DYqhV2jP3FLDjzpYOMWSTNCN0Q="; vendorSha256 = "sha256-PVtUC8UfUBGL7m1SsMK48Bcm9poCSFcPWJs1e+/UfSI=";
meta = with lib; { meta = with lib; {
description = "Tool for analysing parameter and XSS scanning"; description = "Tool for analysing parameter and XSS scanning";

View file

@ -6,13 +6,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "exploitdb"; pname = "exploitdb";
version = "2022-09-02"; version = "2022-09-16";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "offensive-security"; owner = "offensive-security";
repo = pname; repo = pname;
rev = "refs/tags/${version}"; rev = "refs/tags/${version}";
hash = "sha256-gZdoaY3wm45DhM2jlKneOzMupmKsPbeOzHIBhmgDeV0="; hash = "sha256-idQx5q5tO+jI3nb2LvFfAmd+nGbrBxWcn34daVZxWdE=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

View file

@ -21496,6 +21496,8 @@ with pkgs;
autoreconfHook = buildPackages.autoreconfHook269; autoreconfHook = buildPackages.autoreconfHook269;
}; };
scope-lite = callPackage ../development/libraries/scope-lite { };
SDL_classic = callPackage ../development/libraries/SDL ({ SDL_classic = callPackage ../development/libraries/SDL ({
inherit (darwin.apple_sdk.frameworks) OpenGL CoreAudio CoreServices AudioUnit Kernel Cocoa GLUT; inherit (darwin.apple_sdk.frameworks) OpenGL CoreAudio CoreServices AudioUnit Kernel Cocoa GLUT;
} // lib.optionalAttrs stdenv.hostPlatform.isAndroid { } // lib.optionalAttrs stdenv.hostPlatform.isAndroid {
@ -21794,6 +21796,8 @@ with pkgs;
stb = callPackage ../development/libraries/stb { }; stb = callPackage ../development/libraries/stb { };
stduuid = callPackage ../development/libraries/stduuid { };
stegsolve = callPackage ../tools/graphics/stegsolve { }; stegsolve = callPackage ../tools/graphics/stegsolve { };
StormLib = callPackage ../development/libraries/StormLib { }; StormLib = callPackage ../development/libraries/StormLib { };