nathan/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2026-07-22 08:30:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge staging-next-24.05 into staging-24.05

Browse Source
This commit is contained in:
github-actions[bot]
2024-09-15 00:18:22 +00:00
committed by GitHub
parent 734b2f7cfe 9c89f1c28b
commit 6e15aeff1c
8 changed files with 31 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
nixos/modules/services/monitoring/ups.nix
View File

@@ -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
@@ -496,7 +501,9 @@ in
})
];
# For interactive use.
environment.systemPackages = [ pkgs.nut ];
environment.variables = envVars;
networking.firewall = mkIf cfg.openFirewall {
allowedTCPPorts =
@@ -520,8 +527,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 +546,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 +563,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
];

8
pkgs/applications/networking/browsers/brave/default.nix
View File

@@ -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

12
pkgs/applications/networking/browsers/microsoft-edge/default.nix
View File

@@ -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=";
};
}

4
pkgs/applications/networking/instant-messengers/discord/default.nix
View File

@@ -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 = {

4
pkgs/by-name/go/gowall/package.nix
View File

@@ -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=";

4
pkgs/development/python-modules/timetagger/default.nix
View File

@@ -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 = [

6
pkgs/servers/unifi/default.nix
View File

@@ -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=";
};
}

4
pkgs/tools/misc/timetagger_cli/default.nix
View File

@@ -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; [