From b146bf525b3b60dd8880268caffed667f0c16128 Mon Sep 17 00:00:00 2001 From: Sean Buckley Date: Wed, 11 Sep 2024 19:13:32 -0400 Subject: [PATCH 01/10] brave: 1.69.162 -> 1.69.168 https://community.brave.com/t/release-channel-1-69-168/568160 (cherry picked from commit cdc356b8ec43994c29ac2ef36ab639861813db78) --- pkgs/applications/networking/browsers/brave/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/browsers/brave/default.nix b/pkgs/applications/networking/browsers/brave/default.nix index caddc7e0be62..a78454196e39 100644 --- a/pkgs/applications/networking/browsers/brave/default.nix +++ b/pkgs/applications/networking/browsers/brave/default.nix @@ -6,17 +6,17 @@ callPackage ./make-brave.nix (removeAttrs args [ "callPackage" ]) if stdenv.isAarch64 then rec { pname = "brave"; - version = "1.69.162"; + version = "1.69.168"; url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_arm64.deb"; - hash = "sha256-uG3I91XyuEn/ZFjlv84041ZTCslkC5XElag/4R7MBHc="; + hash = "sha256-ZSFhbj/Tw+jOaFP2HHnn74DO2w4l37upS+rxLcF5P9I="; platform = "aarch64-linux"; } else if stdenv.isx86_64 then rec { pname = "brave"; - version = "1.69.162"; + version = "1.69.168"; url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb"; - hash = "sha256-O8sf0sw6ljemNdSJwHyX2JjqQWEuKvSP9hj0H2VXQC8="; + hash = "sha256-smLyA4eZAw62BfbPPFKjKaZd8FJ1FMSV1SUWXCFCzD4="; platform = "x86_64-linux"; } else From c5380adf6b88b75d99568f1ef66f1fa77eb9e0d9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 8 Sep 2024 18:54:54 +0000 Subject: [PATCH 02/10] microsoft-edge: 128.0.2739.54 -> 128.0.2739.67 (cherry picked from commit f6564dde2f9cf262c9ea7c8aef7ec31973252a40) --- .../networking/browsers/microsoft-edge/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/networking/browsers/microsoft-edge/default.nix b/pkgs/applications/networking/browsers/microsoft-edge/default.nix index 2dee22ef74fe..3946aff88551 100644 --- a/pkgs/applications/networking/browsers/microsoft-edge/default.nix +++ b/pkgs/applications/networking/browsers/microsoft-edge/default.nix @@ -1,20 +1,20 @@ { beta = import ./browser.nix { channel = "beta"; - version = "129.0.2792.12"; + version = "129.0.2792.21"; revision = "1"; - hash = "sha256-LWu5DKCoGSFqUZqgvKx3aoZRzAf6FR3hJnk/agAV9sI="; + hash = "sha256-NrDRroKyjY9zC9KoMWaEPAPnu+JNNDZwLVbuDvoUG1M="; }; dev = import ./browser.nix { channel = "dev"; - version = "129.0.2792.10"; + version = "130.0.2808.0"; revision = "1"; - hash = "sha256-jw/muaunLlrtZADrD7asVH+o/u3cp3NyvjRXqPWyHJI="; + hash = "sha256-6mqStxS9HJvfKbrGqQGlqQKXc2SnvOycirPihfnkaLI="; }; stable = import ./browser.nix { channel = "stable"; - version = "128.0.2739.54"; + version = "128.0.2739.67"; revision = "1"; - hash = "sha256-qiLZExLU3f6l+qPEGiqOuDgjqOtSyhPwSt7kQfBBSyg="; + hash = "sha256-Y8PxyAibuEhwKJpqnhtBy1F2Kn+ONw6NVtC25R+fFVo="; }; } From 474e47c1644d02b8e4b8ff7cf8d399f1daef50e5 Mon Sep 17 00:00:00 2001 From: qubitnano <146656568+qubitnano@users.noreply.github.com> Date: Tue, 10 Sep 2024 20:49:48 -0400 Subject: [PATCH 03/10] unifi8: 8.4.59 -> 8.4.62 (cherry picked from commit 8abb5c21ef64be2ea2c7ebc18c26b4bccfdf00e7) --- pkgs/servers/unifi/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/unifi/default.nix b/pkgs/servers/unifi/default.nix index d42b076aad68..1c7684f273a9 100644 --- a/pkgs/servers/unifi/default.nix +++ b/pkgs/servers/unifi/default.nix @@ -54,8 +54,8 @@ in rec { }; unifi8 = generic { - version = "8.4.59"; - suffix = "-y2b2oj1o96"; - sha256 = "sha256-VwRvU+IHJs6uThdWF0uOqxz4cegBykYzB/fD0/AGPaM="; + version = "8.4.62"; + suffix = "-i3q2j125cz"; + sha256 = "sha256-7qEk6zpihJfgxCoVa8fVSMZN87sHG5XhWpuZoBvB5QU="; }; } From 7ea9a39b4dd80701b68f21b562d55ea21cc28810 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Tue, 10 Sep 2024 21:26:42 +0200 Subject: [PATCH 04/10] nixos/ups: deduplicate environment variables No functional change, but more DRY. (cherry picked from commit 801388a6fa413e6d4c7afd07d83aca86a9da8b28) --- nixos/modules/services/monitoring/ups.nix | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/nixos/modules/services/monitoring/ups.nix b/nixos/modules/services/monitoring/ups.nix index 3c102be691c3..1d2968b3b485 100644 --- a/nixos/modules/services/monitoring/ups.nix +++ b/nixos/modules/services/monitoring/ups.nix @@ -8,6 +8,11 @@ let cfg = config.power.ups; defaultPort = 3493; + envVars = { + NUT_CONFPATH = "/etc/nut"; + NUT_STATEPATH = "/var/lib/nut"; + }; + nutFormat = { type = with lib.types; let @@ -520,8 +525,7 @@ in ExecReload = "${pkgs.nut}/sbin/upsmon -c reload"; LoadCredential = mapAttrsToList (name: monitor: "upsmon_password_${name}:${monitor.passwordFile}") cfg.upsmon.monitor; }; - environment.NUT_CONFPATH = "/etc/nut"; - environment.NUT_STATEPATH = "/var/lib/nut"; + environment = envVars; }; systemd.services.upsd = let @@ -540,8 +544,7 @@ in ExecReload = "${pkgs.nut}/sbin/upsd -c reload"; LoadCredential = mapAttrsToList (name: user: "upsdusers_password_${name}:${user.passwordFile}") cfg.users; }; - environment.NUT_CONFPATH = "/etc/nut"; - environment.NUT_STATEPATH = "/var/lib/nut"; + environment = envVars; restartTriggers = [ config.environment.etc."nut/upsd.conf".source ]; @@ -558,8 +561,7 @@ in # TODO: replace 'root' by another username. ExecStart = "${pkgs.nut}/bin/upsdrvctl -u root start"; }; - environment.NUT_CONFPATH = "/etc/nut"; - environment.NUT_STATEPATH = "/var/lib/nut"; + environment = envVars; restartTriggers = [ config.environment.etc."nut/ups.conf".source ]; From 6ecc647b4e0cf2e17f9d2a45b64e2a8df06ae516 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Tue, 10 Sep 2024 21:29:41 +0200 Subject: [PATCH 05/10] nixos/ups: set env vars in the global environment This allows using upsdrvctl interactively, which otherwise tries to use a missing ups.conf in the Nix store, instead of the correct /etc/nut/ups.conf. (cherry picked from commit 1cb392fdcd14fb7a4dbf6ad79b303aaccc682ca7) --- nixos/modules/services/monitoring/ups.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/modules/services/monitoring/ups.nix b/nixos/modules/services/monitoring/ups.nix index 1d2968b3b485..adc403e66360 100644 --- a/nixos/modules/services/monitoring/ups.nix +++ b/nixos/modules/services/monitoring/ups.nix @@ -501,7 +501,9 @@ in }) ]; + # For interactive use. environment.systemPackages = [ pkgs.nut ]; + environment.variables = envVars; networking.firewall = mkIf cfg.openFirewall { allowedTCPPorts = From a6b9c9658652f7f1f4c219e07711581bd6a7e1b2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 13 Sep 2024 15:07:00 +0000 Subject: [PATCH 06/10] gowall: 0.1.7 -> 0.1.8 (cherry picked from commit 16b85ae6ad5f75b64c8a41f7d8cf4f40748cfe96) --- pkgs/by-name/go/gowall/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/go/gowall/package.nix b/pkgs/by-name/go/gowall/package.nix index 5a11fc766372..328661d770a6 100644 --- a/pkgs/by-name/go/gowall/package.nix +++ b/pkgs/by-name/go/gowall/package.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "gowall"; - version = "0.1.7"; + version = "0.1.8"; src = fetchFromGitHub { owner = "Achno"; repo = "gowall"; rev = "v${version}"; - hash = "sha256-R7dOONfyzj6V3101Rp/WhUcFpqrSKWEkVm4a2riXZAI="; + hash = "sha256-r2IvwpvtWMlIKG0TNM4cLUPKFRgUV8E06VzkPSVCorI="; }; vendorHash = "sha256-H2Io1K2LEFmEPJYVcEaVAK2ieBrkV6u+uX82XOvNXj4="; From 14cb97791552c04e1852bea41859d6debc5898aa Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 14 Sep 2024 02:24:45 +0000 Subject: [PATCH 07/10] discord-development: 0.0.27 -> 0.0.28 (cherry picked from commit 7ff689061ea1641a1394c692078434e8a556af3d) --- .../networking/instant-messengers/discord/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix index 720ed0af7bcb..891bc2423b98 100644 --- a/pkgs/applications/networking/instant-messengers/discord/default.nix +++ b/pkgs/applications/networking/instant-messengers/discord/default.nix @@ -5,7 +5,7 @@ let stable = "0.0.67"; ptb = "0.0.103"; canary = "0.0.483"; - development = "0.0.27"; + development = "0.0.28"; } else { stable = "0.0.318"; ptb = "0.0.133"; @@ -29,7 +29,7 @@ let }; development = fetchurl { url = "https://dl-development.discordapp.net/apps/linux/${version}/discord-development-${version}.tar.gz"; - hash = "sha256-0AfATkHqw5gfbQ27DvM+QoLZgspYWKG09jWWNWERnmQ="; + hash = "sha256-326KAuqt3VQSgyJAdsdc7YgrdF3vCVoJoKUCVC2UdaU="; }; }; x86_64-darwin = { From 47f81b3d5213968e6f2f0d6b59c911f3ecb21bda Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 24 Jul 2024 17:58:32 +0000 Subject: [PATCH 08/10] timetagger: 24.4.1 -> 24.07.1 (cherry picked from commit 92c68739ef82131733cc1f4f045cef628f8e99f6) --- pkgs/development/python-modules/timetagger/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/timetagger/default.nix b/pkgs/development/python-modules/timetagger/default.nix index a775c3d01f25..abcfc66cd33c 100644 --- a/pkgs/development/python-modules/timetagger/default.nix +++ b/pkgs/development/python-modules/timetagger/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "timetagger"; - version = "24.4.1"; + version = "24.07.1"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "almarklein"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-Qt6VKExigzMaEb5ZEEPHCe5DSYdx5KPIfVC0khx7pP4="; + hash = "sha256-zm+3vk2ZeaZjciANNVSVxDT5S2LhOAl3B4AE2RgA5Tw="; }; propagatedBuildInputs = [ From 8c2d7530d3d292e374471db439fd47e65622a9fe Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 24 Jul 2024 18:13:29 +0000 Subject: [PATCH 09/10] python312Packages.timetagger: 24.4.1 -> 24.07.1 (cherry picked from commit 491caca6862e826b480c7252040e0c3f9e9e6f43) --- pkgs/development/python-modules/timetagger/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/timetagger/default.nix b/pkgs/development/python-modules/timetagger/default.nix index a775c3d01f25..abcfc66cd33c 100644 --- a/pkgs/development/python-modules/timetagger/default.nix +++ b/pkgs/development/python-modules/timetagger/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "timetagger"; - version = "24.4.1"; + version = "24.07.1"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "almarklein"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-Qt6VKExigzMaEb5ZEEPHCe5DSYdx5KPIfVC0khx7pP4="; + hash = "sha256-zm+3vk2ZeaZjciANNVSVxDT5S2LhOAl3B4AE2RgA5Tw="; }; propagatedBuildInputs = [ From dab969f95b907d89604977a0273b7482191b6b66 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 2 Aug 2024 20:18:36 +0000 Subject: [PATCH 10/10] timetagger_cli: 23.8.3 -> 24.7.1 (cherry picked from commit 0c69b24df08f3e6a13a2679e8209207028bee0ab) --- pkgs/tools/misc/timetagger_cli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/timetagger_cli/default.nix b/pkgs/tools/misc/timetagger_cli/default.nix index f6204e2d8fe1..1b4f4b54696f 100644 --- a/pkgs/tools/misc/timetagger_cli/default.nix +++ b/pkgs/tools/misc/timetagger_cli/default.nix @@ -5,14 +5,14 @@ python3.pkgs.buildPythonApplication rec { pname = "timetagger_cli"; - version = "23.8.3"; + version = "24.7.1"; format = "setuptools"; src = fetchFromGitHub { owner = "almarklein"; repo = "timetagger_cli"; rev = "refs/tags/v${version}"; - hash = "sha256-vOpwMR7/EGf/l5KvlHn7mQ1vGGZ1Whd5x2uxLV9nCbk="; + hash = "sha256-PEuSFDkBqDegZD0Nh8jRJ/zm/6vT2lq7/llbXBvojkc="; }; propagatedBuildInputs = with python3.pkgs; [