From 45ddcc04cd9350c64fbabda5c5d32539da9e549b Mon Sep 17 00:00:00 2001 From: Yevhen Shymotiuk Date: Fri, 8 Jul 2022 17:44:08 +0300 Subject: [PATCH 1/8] wluma: 4.1.0 -> 4.1.2 --- pkgs/tools/wayland/wluma/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/wayland/wluma/default.nix b/pkgs/tools/wayland/wluma/default.nix index 555e40384cef..52b88f8b3ebf 100644 --- a/pkgs/tools/wayland/wluma/default.nix +++ b/pkgs/tools/wayland/wluma/default.nix @@ -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"; From 15fd45470f38fe91c997eff1a42e34a663c13c74 Mon Sep 17 00:00:00 2001 From: Astro Date: Mon, 11 Jul 2022 03:30:23 +0200 Subject: [PATCH 2/8] wander: init at 0.4.1 --- pkgs/tools/admin/wander/default.nix | 22 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 24 insertions(+) create mode 100644 pkgs/tools/admin/wander/default.nix diff --git a/pkgs/tools/admin/wander/default.nix b/pkgs/tools/admin/wander/default.nix new file mode 100644 index 000000000000..b8157483ebc7 --- /dev/null +++ b/pkgs/tools/admin/wander/default.nix @@ -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; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index dba8666286e7..86718943bb3f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11642,6 +11642,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; }; From 9805aedbcccadd363aeaf8e7b6be9b82688b9d8b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 11 Jul 2022 07:11:23 +0000 Subject: [PATCH 3/8] pre-commit: 2.19.0 -> 2.20.0 --- pkgs/tools/misc/pre-commit/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/pre-commit/default.nix b/pkgs/tools/misc/pre-commit/default.nix index f85490736d9f..4c455d6fb2d7 100644 --- a/pkgs/tools/misc/pre-commit/default.nix +++ b/pkgs/tools/misc/pre-commit/default.nix @@ -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 = [ From 67258310baaa0d6fd42e1d6efa8e36c161ce3605 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 11 Jul 2022 11:25:26 +0000 Subject: [PATCH 4/8] python310Packages.casbin: 1.16.8 -> 1.16.9 --- pkgs/development/python-modules/casbin/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/casbin/default.nix b/pkgs/development/python-modules/casbin/default.nix index cc8406306075..e98ee9d4fe39 100644 --- a/pkgs/development/python-modules/casbin/default.nix +++ b/pkgs/development/python-modules/casbin/default.nix @@ -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 = [ From 29b37f58e9f8d0321a0e5ffe1b42ddad4150df03 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 11 Jul 2022 15:38:42 +0200 Subject: [PATCH 5/8] python310Packages.pyupgrade: 2.34.0 -> 2.37.1 --- pkgs/development/python-modules/pyupgrade/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyupgrade/default.nix b/pkgs/development/python-modules/pyupgrade/default.nix index ce8694be61ba..4751ded3f39a 100644 --- a/pkgs/development/python-modules/pyupgrade/default.nix +++ b/pkgs/development/python-modules/pyupgrade/default.nix @@ -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 = [ From ac42c6c976d84712f2423f82f0a59866997a893a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 11 Jul 2022 14:32:24 +0000 Subject: [PATCH 6/8] python310Packages.dvc-data: 0.0.18 -> 0.0.23 --- pkgs/development/python-modules/dvc-data/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/dvc-data/default.nix b/pkgs/development/python-modules/dvc-data/default.nix index 676eea8b3cd4..70b17c74a0e1 100644 --- a/pkgs/development/python-modules/dvc-data/default.nix +++ b/pkgs/development/python-modules/dvc-data/default.nix @@ -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; From af66b47b3aa13b24f6cc1e1db925d721d5ed6d64 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 8 Jul 2022 17:12:24 +0200 Subject: [PATCH 7/8] nixos/postgresql-backup: allow setting compression level --- .../services/backup/postgresql-backup.nix | 29 +++++++++++++++---- 1 file changed, 23 insertions(+), 6 deletions(-) diff --git a/nixos/modules/services/backup/postgresql-backup.nix b/nixos/modules/services/backup/postgresql-backup.nix index 562458eb4571..f22b61338273 100644 --- a/nixos/modules/services/backup/postgresql-backup.nix +++ b/nixos/modules/services/backup/postgresql-backup.nix @@ -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 = [ From 20390cad8a470ba2fffe95524db0a308384f70c0 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 11 Jul 2022 14:40:52 +0200 Subject: [PATCH 8/8] gjs: add profiler support Necessary to be able to use Sysprof for profiling GJS apps such as GNOME Shell: https://gitlab.gnome.org/GNOME/gjs/-/blob/105c0a44b16ee8b178ad9f6e880da33e9c6313e7/doc/Profiling.md https://blogs.gnome.org/chergert/2020/03/15/how-to-use-sysprof-to-part-ii/ --- pkgs/development/libraries/gjs/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/gjs/default.nix b/pkgs/development/libraries/gjs/default.nix index 42ba3bd46df8..4ceea50d16bf 100644 --- a/pkgs/development/libraries/gjs/default.nix +++ b/pkgs/development/libraries/gjs/default.nix @@ -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"}" ];