BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge master into staging-next

Browse source
This commit is contained in:
github-actions[bot] 2022-07-12 00:02:27 +00:00 committed by GitHub
commit 2caa4189ea
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
9 changed files with 62 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
nixos/modules/services/backup/postgresql-backup.nix
View file

@ -17,8 +17,8 @@ let
compressCmd = getAttr cfg.compression {
"none" = "cat";
"gzip" = "${pkgs.gzip}/bin/gzip -c";
"zstd" = "${pkgs.zstd}/bin/zstd -c";
"gzip" = "${pkgs.gzip}/bin/gzip -c -${toString cfg.compressionLevel}";
"zstd" = "${pkgs.zstd}/bin/zstd -c -${toString cfg.compressionLevel}";
};
mkSqlPath = prefix: suffix: "${cfg.location}/${db}${prefix}.sql${suffix}";
@ -130,16 +130,33 @@ in {
The type of compression to use on the generated database dump.
'';
};
compressionLevel = mkOption {
type = types.ints.between 1 19;
default = 6;
description = ''
The compression level used when compression is enabled.
gzip accepts levels 1 to 9. zstd accepts levels 1 to 19.
'';
};
};
};
config = mkMerge [
{
assertions = [{
assertion = cfg.backupAll -> cfg.databases == [];
message = "config.services.postgresqlBackup.backupAll cannot be used together with config.services.postgresqlBackup.databases";
}];
assertions = [
{
assertion = cfg.backupAll -> cfg.databases == [];
message = "config.services.postgresqlBackup.backupAll cannot be used together with config.services.postgresqlBackup.databases";
}
{
assertion = cfg.compression == "none" ||
(cfg.compression == "gzip" && cfg.compressionLevel >= 1 && cfg.compressionLevel <= 9) ||
(cfg.compression == "zstd" && cfg.compressionLevel >= 1 && cfg.compressionLevel <= 19);
message = "config.services.postgresqlBackup.compressionLevel must be set between 1 and 9 for gzip and 1 and 19 for zstd";
}
];
}
(mkIf cfg.enable {
systemd.tmpfiles.rules = [

3
pkgs/development/libraries/gjs/default.nix
View file

@ -12,6 +12,7 @@
, pango
, cairo
, readline
, libsysprof-capture
, glib
, libxml2
, dbus
@ -60,6 +61,7 @@ in stdenv.mkDerivation rec {
gobject-introspection
cairo
readline
libsysprof-capture
spidermonkey_91
dbus # for dbus-run-session
];
@ -73,7 +75,6 @@ in stdenv.mkDerivation rec {
];
mesonFlags = [
"-Dprofiler=disabled"
"-Dinstalled_test_prefix=${placeholder "installedTests"}"
];

4
pkgs/development/python-modules/casbin/default.nix
View file

@ -9,7 +9,7 @@
buildPythonPackage rec {
pname = "casbin";
version = "1.16.8";
version = "1.16.9";
format = "setuptools";
disabled = pythonOlder "3.6";
@ -18,7 +18,7 @@ buildPythonPackage rec {
owner = pname;
repo = "pycasbin";
rev = "refs/tags/v${version}";
sha256 = "sha256-l98QfrRg7ghZ+jT9J2BNILUcinOKwhpnIMS+W8NQFr4=";
sha256 = "sha256-1xxjFNkCb50ndmXuRjt7svPOvSyzZbw+J49Zpyy1FUc=";
};
propagatedBuildInputs = [

6
pkgs/development/python-modules/dvc-data/default.nix
View file

@ -14,7 +14,7 @@
buildPythonPackage rec {
pname = "dvc-data";
version = "0.0.18";
version = "0.0.23";
format = "pyproject";
disabled = pythonOlder "3.8";
@ -22,8 +22,8 @@ buildPythonPackage rec {
src = fetchFromGitHub {
owner = "iterative";
repo = pname;
rev = version;
hash = "sha256-jS+96LjHJyhkCREjMhhlWOlvRBhjiKmfNtEcBVS+YCU=";
rev = "refs/tags/${version}";
hash = "sha256-4npImK6OML0/nhM+S7YiguN7RNHOnxnH+WAuqcdiVSw=";
};
SETUPTOOLS_SCM_PRETEND_VERSION = version;

4
pkgs/development/python-modules/pyupgrade/default.nix
View file

@ -8,7 +8,7 @@
buildPythonPackage rec {
pname = "pyupgrade";
version = "2.34.0";
version = "2.37.1";
format = "setuptools";
disabled = pythonOlder "3.6";
@ -17,7 +17,7 @@ buildPythonPackage rec {
owner = "asottile";
repo = pname;
rev = "v${version}";
sha256 = "sha256-3Go0w/7jcv1XzZ7ypSdPzMZgzEj2+sMlrIm4X1r34MA=";
sha256 = "sha256-nWiaKfs2eVnwyA+UACcB/OImWSb5Nn6n/8gcGPNevM4=";
};
checkInputs = [

22
pkgs/tools/admin/wander/default.nix Normal file
View file

@ -0,0 +1,22 @@
{ buildGoModule, fetchFromGitHub, lib }:
buildGoModule rec {
pname = "wander";
version = "0.4.1";
src = fetchFromGitHub {
owner = "robinovitch61";
repo = pname;
rev = "v${version}";
sha256 = "sha256-Z3jvKBhzlATTh6zPoJoMmg/DAE5/Ur3Tb3sdgGPEm6k=";
};
vendorSha256 = "sha256-gWQ8GbtghhCRq6tOU6qmWBuponmfUkUDAk3+dPtmMiE=";
meta = with lib; {
description = "Terminal app/TUI for HashiCorp Nomad";
license = licenses.mit;
homepage = "https://github.com/robinovitch61/wander";
maintainers = teams.c3d2.members;
};
}

6
pkgs/tools/misc/pre-commit/default.nix
View file

@ -13,7 +13,7 @@
with python3Packages;
buildPythonPackage rec {
pname = "pre-commit";
version = "2.19.0";
version = "2.20.0";
format = "setuptools";
disabled = pythonOlder "3.6";
@ -21,8 +21,8 @@ buildPythonPackage rec {
src = fetchFromGitHub {
owner = "pre-commit";
repo = "pre-commit";
rev = "v${version}";
sha256 = "sha256-5YV0FJhHiq/NJFKYvwddIWUQVxKJpnIJLLNmyY0NX4A=";
rev = "refs/tags/v${version}";
sha256 = "sha256-+JrnJz+wFbzVw9ysPX85DDE6suF3VU7gQZdp66x5TKY=";
};
patches = [

6
pkgs/tools/wayland/wluma/default.nix
View file

@ -12,7 +12,7 @@
rustPlatform.buildRustPackage rec {
pname = "wluma";
version = "4.1.0";
version = "4.1.2";
src = fetchFromGitHub {
owner = "maximbaz";
@ -21,6 +21,8 @@ rustPlatform.buildRustPackage rec {
sha256 = "sha256-kUYh4RmD4zRI3ZNZWl2oWcO0Ze5czLBXUgPMl/cLW/I=";
};
cargoSha256 = "sha256-0AeFFJd/eMuT1eNY+Vq8MEyItKNBsAlhKKa6CsttMIY=";
nativeBuildInputs = [
makeWrapper
pkg-config
@ -37,8 +39,6 @@ rustPlatform.buildRustPackage rec {
--prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ vulkan-loader ]}"
'';
cargoSha256 = "sha256-oOIL18gij7DdvgNOuaHtuyFemNBUB85Ouh/sdhKas+s=";
meta = with lib; {
description = "Automatic brightness adjustment based on screen contents and ALS";
homepage = "https://github.com/maximbaz/wluma";

2
pkgs/top-level/all-packages.nix
View file

@ -11646,6 +11646,8 @@ with pkgs;
wal_e = callPackage ../tools/backup/wal-e { };
wander = callPackage ../tools/admin/wander { };
watchexec = callPackage ../tools/misc/watchexec {
inherit (darwin.apple_sdk.frameworks) CoreServices Foundation;
};