nathan/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2026-09-29 19:30:11 +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-11-25 00:18:44 +00:00
committed by GitHub
parent fc8109136a b6b252d1fd
commit e4fde561ae
12 changed files with 23 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
nixos/modules/services/monitoring/mackerel-agent.nix
View File

@@ -98,7 +98,7 @@ in {
RuntimeDirectory = "mackerel-agent";
StateDirectory = "mackerel-agent";
ExecStart = "${pkgs.mackerel-agent}/bin/mackerel-agent supervise";
ExecStopPost = mkIf cfg.autoRetirement "${pkg.mackerel-agent}/bin/mackerel-agent retire -force";
ExecStopPost = mkIf cfg.autoRetirement "${pkgs.mackerel-agent}/bin/mackerel-agent retire -force";
ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";
LimitNOFILE = mkDefault 65536;
LimitNPROC = mkDefault 65536;

2
nixos/modules/services/security/haka.nix
View File

@@ -124,7 +124,7 @@ in
{ assertion = cfg.pcap != cfg.nfqueue;
message = "either pcap or nfqueue can be enabled, not both.";
}
{ assertion = cfg.nfqueue -> !dump.enable;
{ assertion = cfg.nfqueue -> !cfg.dump.enable;
message = "dump can only be used with nfqueue.";
}
{ assertion = cfg.interfaces != [];

3
pkgs/applications/networking/instant-messengers/element/element-desktop.nix
View File

@@ -8,7 +8,7 @@
, nodejs
, fetchYarnDeps
, jq
, electron
, electron_33
, element-web
, sqlcipher
, callPackage
@@ -25,6 +25,7 @@ let
executableName = "element-desktop";
keytar = callPackage ./keytar { inherit Security AppKit; };
seshat = callPackage ./seshat { inherit CoreServices; };
electron = electron_33;
in
stdenv.mkDerivation (finalAttrs: builtins.removeAttrs pinData [ "hashes" ] // {
pname = "element-desktop";

10
pkgs/applications/networking/instant-messengers/element/pin.nix
View File

@@ -1,9 +1,9 @@
{
"version" = "1.11.85";
"version" = "1.11.86";
"hashes" = {
"desktopSrcHash" = "sha256-KNt7UgQBKoieV3IV/qFjk6PKYlgjHk4tLA8cZZlYtIw=";
"desktopYarnHash" = "1wh867yw7ic3nx623c5dknn9wk4zgq9b000p9mdf79spfp57lqlw";
"webSrcHash" = "sha256-JR7kA2thttBle+BT/zH8QjIjp5mJPsRMYx8nd/I3IEw=";
"webYarnHash" = "0f38gizj9cnb7dqj10wljxkbjfabznh3s407n9vsl7ig0hm91zf9";
"desktopSrcHash" = "sha256-GP5KnXL63J0076cVu0OpodlNT7Ypeso4iGrQNKq/17M=";
"desktopYarnHash" = "0bcq89nmx03h106hp875mv482d4r1xahdsimw3cs5c592zl50kx2";
"webSrcHash" = "sha256-cqB77ffTbFLoNsGjXUOb2tdlXhSIS3X1/oDXOzOn99s=";
"webYarnHash" = "1cwj77a997lb4229ngry0b6kip1ggs82b9v126rzfgzavvwh9k1v";
};
}

4
pkgs/by-name/ra/raycast/package.nix
View File

@@ -11,12 +11,12 @@
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "raycast";
version = "1.85.2";
version = "1.86.0";
src = fetchurl {
name = "Raycast.dmg";
url = "https://releases.raycast.com/releases/${finalAttrs.version}/download?build=universal";
hash = "sha256-pmzoRZ0EMEA0kU37skGuEDu6ggBuUdFYCLRpZty5kgs=";
hash = "sha256-UvMPRLCaGgunpVwoF0Nbz+7Gma7zQP+nMMh5Cvqn0MA=";
};
dontPatch = true;

12
pkgs/development/interpreters/php/8.1.nix
View File

@@ -2,16 +2,8 @@
let
base = callPackage ./generic.nix ((removeAttrs _args [ "fetchpatch" ]) // {
version = "8.1.30";
hash = "sha256-yxYl5axJuRA3R34+d2e7BiQ0OXGuuZL0eRthivVx0j4=";
extraPatches = [
# Fix build with libxml 2.12+.
# Patch from https://github.com/php/php-src/commit/0a39890c967aa57225bb6bdf4821aff7a3a3c082
(fetchpatch {
url = "https://github.com/php/php-src/commit/0a39890c967aa57225bb6bdf4821aff7a3a3c082.patch";
hash = "sha256-HvpTL7aXO9gr4glFdhqUWQPrG8TYTlvbNINq33M3zS0=";
})
];
version = "8.1.31";
hash = "sha256-CzmCizRRUcrxt5XZ9LkjyYhyMXdsMwdt/J2QpEOQ0Nw=";
});
in
base.withExtensions ({ all, ... }: with all; ([

4
pkgs/development/interpreters/php/8.2.nix
View File

@@ -2,8 +2,8 @@
let
base = callPackage ./generic.nix (_args // {
version = "8.2.24";
hash = "sha256-TMduxkTu6X0XySv+jQ6EcU/t8pmlOLffrcBjndDcQy8=";
version = "8.2.26";
hash = "sha256-vlfDR9RRyQW8tDNoMqhk2ZKN0OIJibhycF/qC6ZHbGs=";
});
in
base.withExtensions ({ all, ... }: with all; ([

4
pkgs/development/interpreters/php/8.3.nix
View File

@@ -2,8 +2,8 @@
let
base = callPackage ./generic.nix (_args // {
version = "8.3.13";
hash = "sha256-x3kcguGlVMyvhKQLpxzBQXupr2f7Wzl4CDf9fH628SQ=";
version = "8.3.14";
hash = "sha256-9W+mac5MAUUqKSH0ADTXedjCuX0HSUk61HgYE7kiHPg=";
});
in
base.withExtensions ({ all, ... }: with all; ([

4
pkgs/development/libraries/nss/latest.nix
View File

@@ -5,6 +5,6 @@
# Example: nix-shell ./maintainers/scripts/update.nix --argstr package cacert
import ./generic.nix {
version = "3.106";
hash = "sha256-j8B5RgEdBbtqPmIUniNF8ToGPIrPJ8gVTMplcv72fD0=";
version = "3.107";
hash = "sha256-c6ks/pBvZHipNkmBy784s96zMYP+D9q3VlVrPVSohLw=";
}

8
pkgs/os-specific/linux/kernel/xanmod-kernels.nix
View File

@@ -13,13 +13,13 @@ let
# kernel config in the xanmod version commit
variants = {
lts = {
version = "6.6.62";
hash = "sha256-KbD5YaaZLDDsp5wuEkenUe+/KrFjOgUomXtLKHtQzvs=";
version = "6.6.63";
hash = "sha256-P4B6r3p+Buu1Hf+RQsw5h2oUANVvQvQ4e/2gQcZ0vKw=";
};
main = {
version = "6.11.9";
hash = "sha256-lR7GXFy3eYq75+LwVlXScPYWbdVW6wAV+He0YZ+5AF4=";
version = "6.11.10";
hash = "sha256-WNzMM+P8c8Mv+FdrwcEPHwv/ppvgN2fiM+SHMmlAPYw=";
};
};

1
pkgs/top-level/all-packages.nix
View File

@@ -5067,7 +5067,6 @@ with pkgs;
element-desktop = callPackage ../applications/networking/instant-messengers/element/element-desktop.nix {
inherit (darwin.apple_sdk.frameworks) Security AppKit CoreServices;
electron = electron_32;
};
element-desktop-wayland = writeScriptBin "element-desktop" ''
#!/bin/sh

12
pkgs/top-level/php-packages.nix
View File

@@ -382,18 +382,6 @@ in {
configureFlags = [
"--enable-dom"
];
# Add a PHP lower version bound constraint to avoid applying the patch on older PHP versions.
patches = lib.optionals ((lib.versions.majorMinor php.version == "8.2" && lib.versionOlder php.version "8.2.14" && lib.versionAtLeast php.version "8.2.7") || (lib.versions.majorMinor php.version == "8.1" && lib.versionAtLeast php.version "8.1.27")) [
# Fix tests with libxml 2.12
# Part of 8.3.1RC1+, 8.2.14RC1+
(fetchpatch {
url = "https://github.com/php/php-src/commit/061058a9b1bbd90d27d97d79aebcf2b5029767b0.patch";
hash = "sha256-0hOlAG+pOYp/gUU0MUMZvzWpgr0ncJi5GB8IeNxxyEU=";
excludes = [
"NEWS"
];
})
];
}
{
name = "enchant";