chn/nixpkgs
1
0
Fork 0
mirror of https://github.com/CHN-beta/nixpkgs.git synced 2026-01-12 02:40:31 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge master into staging-next

Browse Source
This commit is contained in:
nixpkgs-ci[bot]
2025-04-08 12:06:25 +00:00
committed by GitHub
parent d121800fdb 3367e70de7
commit 85c8cd8e7a
14 changed files with 155 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
doc/release-notes/rl-2505.section.md
View File

@@ -338,7 +338,7 @@
### NexusMods.App upgraded {#sec-nixpkgs-release-25.05-incompatibilities-nexusmods-app-upgraded}
- `nexusmods-app` has been upgraded from version 0.6.3 to 0.8.3.
- `nexusmods-app` has been upgraded from version 0.6.3 to 0.9.2.
- Before upgrading, you **must reset all app state** (mods, games, settings, etc). NexusMods.App will crash if any state from a version older than 0.7.0 is still present.

9
nixos/modules/services/backup/syncoid.nix
View File

@@ -106,14 +106,17 @@ in
package = lib.mkPackageOption pkgs "sanoid" { };
interval = lib.mkOption {
type = lib.types.str;
type = with lib.types; either str (listOf str);
default = "hourly";
example = "*-*-* *:15:00";
description = ''
Run syncoid at this interval. The default is to run hourly.
The format is described in
{manpage}`systemd.time(7)`.
Must be in the format described in {manpage}`systemd.time(7)`. This is
equivalent to adding a corresponding timer unit with
{option}`OnCalendar` set to the value given here.
Set to an empty list to avoid starting syncoid automatically.
'';
};

4
pkgs/applications/networking/mailreaders/thunderbird/packages.nix
View File

@@ -99,8 +99,8 @@ rec {
thunderbird-128 = common {
applicationName = "Thunderbird ESR";
version = "128.8.1esr";
sha512 = "f1ef0a665f2cef49b427cbfb4a3548df0cccf4470c03367cdb3d2729d4f6bbf25056c378ffa9e1184b6687332998d12ff9ba251b97b7ca859d9d43be9d7414ba";
version = "128.9.1esr";
sha512 = "bc53ad210c6942fd4a5d31e693d6f376c009873397ea4e3c36d9de33d9dc1af5a3ff9e6ca9039dd8849ea8b56daa220f08b7bef4e2ea1b86e98dfe3b9b58dc0d";
updateScript = callPackage ./update.nix {
attrPath = "thunderbirdPackages.thunderbird-128";

86
pkgs/by-name/la/laravel/composer.lock generated
View File

@@ -168,16 +168,16 @@
},
{
"name": "illuminate/collections",
"version": "v12.3.0",
"version": "v12.7.2",
"source": {
"type": "git",
"url": "https://github.com/illuminate/collections.git",
"reference": "0094b162fa505126c1391222f27fd98734d24525"
"reference": "f1d8ae882c014673b1f7bedab6435989553776e3"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/illuminate/collections/zipball/0094b162fa505126c1391222f27fd98734d24525",
"reference": "0094b162fa505126c1391222f27fd98734d24525",
"url": "https://api.github.com/repos/illuminate/collections/zipball/f1d8ae882c014673b1f7bedab6435989553776e3",
"reference": "f1d8ae882c014673b1f7bedab6435989553776e3",
"shasum": ""
},
"require": {
@@ -220,20 +220,20 @@
"issues": "https://github.com/laravel/framework/issues",
"source": "https://github.com/laravel/framework"
},
"time": "2025-03-16T23:50:18+00:00"
"time": "2025-04-03T17:58:47+00:00"
},
{
"name": "illuminate/conditionable",
"version": "v12.3.0",
"version": "v12.7.2",
"source": {
"type": "git",
"url": "https://github.com/illuminate/conditionable.git",
"reference": "a2b3c66f3ca532e12e694bd5c9254adc303b922d"
"reference": "251ef166c6ee46cc8a141403253f83fe7ee50507"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/illuminate/conditionable/zipball/a2b3c66f3ca532e12e694bd5c9254adc303b922d",
"reference": "a2b3c66f3ca532e12e694bd5c9254adc303b922d",
"url": "https://api.github.com/repos/illuminate/conditionable/zipball/251ef166c6ee46cc8a141403253f83fe7ee50507",
"reference": "251ef166c6ee46cc8a141403253f83fe7ee50507",
"shasum": ""
},
"require": {
@@ -266,20 +266,20 @@
"issues": "https://github.com/laravel/framework/issues",
"source": "https://github.com/laravel/framework"
},
"time": "2025-02-19T19:08:33+00:00"
"time": "2025-03-19T20:10:05+00:00"
},
{
"name": "illuminate/contracts",
"version": "v12.3.0",
"version": "v12.7.2",
"source": {
"type": "git",
"url": "https://github.com/illuminate/contracts.git",
"reference": "88962e0a73fb837e048ebdbbc67afd2f6b30e8e6"
"reference": "bbaec083da240396f2186f4c3a9952da207f28a0"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/illuminate/contracts/zipball/88962e0a73fb837e048ebdbbc67afd2f6b30e8e6",
"reference": "88962e0a73fb837e048ebdbbc67afd2f6b30e8e6",
"url": "https://api.github.com/repos/illuminate/contracts/zipball/bbaec083da240396f2186f4c3a9952da207f28a0",
"reference": "bbaec083da240396f2186f4c3a9952da207f28a0",
"shasum": ""
},
"require": {
@@ -314,20 +314,20 @@
"issues": "https://github.com/laravel/framework/issues",
"source": "https://github.com/laravel/framework"
},
"time": "2025-03-16T23:56:53+00:00"
"time": "2025-03-19T20:10:05+00:00"
},
{
"name": "illuminate/filesystem",
"version": "v12.3.0",
"version": "v12.7.2",
"source": {
"type": "git",
"url": "https://github.com/illuminate/filesystem.git",
"reference": "e59cfec3c16d71be2da85cf9385ddd82f0c15857"
"reference": "4fa2995bad173c1a0067b285bb7fef47a4b441c6"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/illuminate/filesystem/zipball/e59cfec3c16d71be2da85cf9385ddd82f0c15857",
"reference": "e59cfec3c16d71be2da85cf9385ddd82f0c15857",
"url": "https://api.github.com/repos/illuminate/filesystem/zipball/4fa2995bad173c1a0067b285bb7fef47a4b441c6",
"reference": "4fa2995bad173c1a0067b285bb7fef47a4b441c6",
"shasum": ""
},
"require": {
@@ -381,11 +381,11 @@
"issues": "https://github.com/laravel/framework/issues",
"source": "https://github.com/laravel/framework"
},
"time": "2025-03-12T14:22:47+00:00"
"time": "2025-03-19T20:10:05+00:00"
},
{
"name": "illuminate/macroable",
"version": "v12.3.0",
"version": "v12.7.2",
"source": {
"type": "git",
"url": "https://github.com/illuminate/macroable.git",
@@ -431,16 +431,16 @@
},
{
"name": "illuminate/support",
"version": "v12.3.0",
"version": "v12.7.2",
"source": {
"type": "git",
"url": "https://github.com/illuminate/support.git",
"reference": "bcba98dcdbc758261b3b872a9b9dc789aed1eb57"
"reference": "1d5d07534bb2d9f16e655c2cb99607517ad43e8f"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/illuminate/support/zipball/bcba98dcdbc758261b3b872a9b9dc789aed1eb57",
"reference": "bcba98dcdbc758261b3b872a9b9dc789aed1eb57",
"url": "https://api.github.com/repos/illuminate/support/zipball/1d5d07534bb2d9f16e655c2cb99607517ad43e8f",
"reference": "1d5d07534bb2d9f16e655c2cb99607517ad43e8f",
"shasum": ""
},
"require": {
@@ -504,7 +504,7 @@
"issues": "https://github.com/laravel/framework/issues",
"source": "https://github.com/laravel/framework"
},
"time": "2025-03-13T14:51:35+00:00"
"time": "2025-04-02T19:35:42+00:00"
},
{
"name": "laravel/prompts",
@@ -567,16 +567,16 @@
},
{
"name": "nesbot/carbon",
"version": "3.8.6",
"version": "3.9.0",
"source": {
"type": "git",
"url": "https://github.com/CarbonPHP/carbon.git",
"reference": "ff2f20cf83bd4d503720632ce8a426dc747bf7fd"
"reference": "6d16a8a015166fe54e22c042e0805c5363aef50d"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/CarbonPHP/carbon/zipball/ff2f20cf83bd4d503720632ce8a426dc747bf7fd",
"reference": "ff2f20cf83bd4d503720632ce8a426dc747bf7fd",
"url": "https://api.github.com/repos/CarbonPHP/carbon/zipball/6d16a8a015166fe54e22c042e0805c5363aef50d",
"reference": "6d16a8a015166fe54e22c042e0805c5363aef50d",
"shasum": ""
},
"require": {
@@ -669,7 +669,7 @@
"type": "tidelift"
}
],
"time": "2025-02-20T17:33:38+00:00"
"time": "2025-03-27T12:57:33+00:00"
},
{
"name": "psr/clock",
@@ -899,16 +899,16 @@
},
{
"name": "symfony/console",
"version": "v7.2.1",
"version": "v7.2.5",
"source": {
"type": "git",
"url": "https://github.com/symfony/console.git",
"reference": "fefcc18c0f5d0efe3ab3152f15857298868dc2c3"
"reference": "e51498ea18570c062e7df29d05a7003585b19b88"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/console/zipball/fefcc18c0f5d0efe3ab3152f15857298868dc2c3",
"reference": "fefcc18c0f5d0efe3ab3152f15857298868dc2c3",
"url": "https://api.github.com/repos/symfony/console/zipball/e51498ea18570c062e7df29d05a7003585b19b88",
"reference": "e51498ea18570c062e7df29d05a7003585b19b88",
"shasum": ""
},
"require": {
@@ -972,7 +972,7 @@
"terminal"
],
"support": {
"source": "https://github.com/symfony/console/tree/v7.2.1"
"source": "https://github.com/symfony/console/tree/v7.2.5"
},
"funding": [
{
@@ -988,7 +988,7 @@
"type": "tidelift"
}
],
"time": "2024-12-11T03:49:26+00:00"
"time": "2025-03-12T08:11:12+00:00"
},
{
"name": "symfony/deprecation-contracts",
@@ -1517,16 +1517,16 @@
},
{
"name": "symfony/process",
"version": "v7.2.4",
"version": "v7.2.5",
"source": {
"type": "git",
"url": "https://github.com/symfony/process.git",
"reference": "d8f411ff3c7ddc4ae9166fb388d1190a2df5b5cf"
"reference": "87b7c93e57df9d8e39a093d32587702380ff045d"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/process/zipball/d8f411ff3c7ddc4ae9166fb388d1190a2df5b5cf",
"reference": "d8f411ff3c7ddc4ae9166fb388d1190a2df5b5cf",
"url": "https://api.github.com/repos/symfony/process/zipball/87b7c93e57df9d8e39a093d32587702380ff045d",
"reference": "87b7c93e57df9d8e39a093d32587702380ff045d",
"shasum": ""
},
"require": {
@@ -1558,7 +1558,7 @@
"description": "Executes commands in sub-processes",
"homepage": "https://symfony.com",
"support": {
"source": "https://github.com/symfony/process/tree/v7.2.4"
"source": "https://github.com/symfony/process/tree/v7.2.5"
},
"funding": [
{
@@ -1574,7 +1574,7 @@
"type": "tidelift"
}
],
"time": "2025-02-05T08:33:46+00:00"
"time": "2025-03-13T12:21:46+00:00"
},
{
"name": "symfony/service-contracts",

6
pkgs/by-name/la/laravel/package.nix
View File

@@ -7,19 +7,19 @@
}:
php.buildComposerProject2 (finalAttrs: {
pname = "laravel";
version = "5.14.1";
version = "5.14.2";
src = fetchFromGitHub {
owner = "laravel";
repo = "installer";
tag = "v${finalAttrs.version}";
hash = "sha256-3DgiOybYN9G8BONK7kmyO21B5WqeY7DcHunWcT6h124=";
hash = "sha256-A/uyYi2CAlj8ozX65frCM32kNM2kZ/FpV1ZHr6UXWWY=";
};
nativeBuildInputs = [ makeWrapper ];
composerLock = ./composer.lock;
vendorHash = "sha256-6oPbR6cpsdr2aJWjJvLWVD1NfuZF38sUMJEdBAjl/aA=";
vendorHash = "sha256-yj0AfN+jCDMtuAQ69yEyI+dGTHgeRNGj86YnvKVKkqQ=";
# Adding npm (nodejs) and php composer to path
postInstall = ''

38
pkgs/by-name/la/layan-cursors/package.nix Normal file
View File

@@ -0,0 +1,38 @@
{
lib,
stdenvNoCC,
fetchFromGitHub,
nix-update-script,
}:
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "layan-cursors";
version = "2021-08-01";
src = fetchFromGitHub {
owner = "vinceliuice";
repo = "Layan-cursors";
tag = finalAttrs.version;
hash = "sha256-Izc5Q3IuM0ryTIdL+GjhRT7JKbznyxS2Fc4pY5dksq4=";
};
installPhase = ''
runHook preInstall
install -dm 0755 $out/share/icons
cp -R dist $out/share/icons/layan-cursors
runHook postInstall
'';
passthru.updateScript = nix-update-script { };
meta = {
description = "Cursor theme inspired by layan gtk theme and based on capitaine-cursors";
changelog = "https://github.com/vinceliuice/Layan-cursors/releases/tag/${finalAttrs.version}/CHANGELOG.md";
homepage = "https://github.com/vinceliuice/Layan-cursors/";
license = lib.licenses.gpl3Only;
maintainers = with lib.maintainers; [ idlip ];
};
})

4
pkgs/by-name/mi/mieru/package.nix
View File

@@ -6,13 +6,13 @@
buildGoModule rec {
pname = "mieru";
version = "3.13.0";
version = "3.13.1";
src = fetchFromGitHub {
owner = "enfein";
repo = "mieru";
rev = "v${version}";
hash = "sha256-Hy5Uy6lC3d8N2lsnGLrcN/D5/eiycp7X7h6V8vo3tPA=";
hash = "sha256-jZvF0vagzQRhw2vPhY61/ayki/gneG66e2MPBaqwlyk=";
};
vendorHash = "sha256-pKcdvP38fZ2KFYNDx6I4TfmnnvWKzFDvz80xMkUojqM=";

4
pkgs/by-name/mp/mpb/package.nix
View File

@@ -19,13 +19,13 @@ assert !lapack.isILP64;
stdenv.mkDerivation rec {
pname = "mpb";
version = "1.11.1";
version = "1.12.0";
src = fetchFromGitHub {
owner = "NanoComp";
repo = "mpb";
tag = "v${version}";
hash = "sha256-+2cMjZSGdfngtGoAeZRPRPBDvflTEIOWO8Se0W6jv9k=";
hash = "sha256-naxVKD7pxefb/ht5Pa4e/T9eDzlZ0raNYPSvKNaZUn8=";
};
nativeBuildInputs = [

4
pkgs/by-name/ne/nexusmods-app/deps.json generated
View File

@@ -1606,8 +1606,8 @@
},
{
"pname": "NexusMods.Archives.Nx",
"version": "0.6.3",
"hash": "sha256-E4bOexmmPqMJoXs2gDAhgierGAFyc2JVrP3HBn3KAXs="
"version": "0.6.4",
"hash": "sha256-jDOCZ6VWPqcKE6gqqAdkyLL3G2g6pbG78mpMRhgYx2o="
},
{
"pname": "NexusMods.Hashing.xxHash3",

10
pkgs/by-name/ne/nexusmods-app/package.nix
View File

@@ -24,12 +24,12 @@ let
in
buildDotnetModule (finalAttrs: {
inherit pname;
version = "0.8.3";
version = "0.9.2";
src = fetchgit {
url = "https://github.com/Nexus-Mods/NexusMods.App.git";
rev = "refs/tags/v${finalAttrs.version}";
hash = "sha256-b6Tpwy0DepbT80+Jil8celeiNN3W+5prt57NjgLD+u0=";
hash = "sha256-Xb/i25l0jLn87OeouD0+CRv11d8aOn7Sr69z3TkS6I4=";
fetchSubmodules = true;
fetchLFS = true;
};
@@ -65,12 +65,6 @@ buildDotnetModule (finalAttrs: {
postPatch = ''
# for some reason these tests fail (intermittently?) with a zero timestamp
touch tests/NexusMods.UI.Tests/WorkspaceSystem/*.verified.png
# Bump StrawberryShake so we can drop .NET 8
# See https://github.com/Nexus-Mods/NexusMods.App/pull/2830
substituteInPlace Directory.Packages.props \
--replace-fail 'Include="StrawberryShake.Server" Version="14.1.0"' \
'Include="StrawberryShake.Server" Version="15.0.3"'
'';
makeWrapperArgs = [

37
pkgs/by-name/so/source-meta-json-schema/package.nix Normal file
View File

@@ -0,0 +1,37 @@
{
stdenv,
lib,
fetchFromGitHub,
cmake,
}:
let
version = "7.0.3";
in
stdenv.mkDerivation (finalAttrs: {
pname = "source-meta-json-schema";
inherit version;
src = fetchFromGitHub {
owner = "sourcemeta";
repo = "jsonschema";
rev = "v${version}";
hash = "sha256-x/bRLeH76zqcHxYodVrJYtb8CO35D3ZWYxHvvZ3Jg9A=";
};
nativeBuildInputs = [
cmake
];
meta = {
homepage = "https://github.com/sourcemeta/jsonschema";
description = "The CLI for working with JSON Schema. Covers formatting, linting, testing, bundling, and more for both local development and CI/CD pipelines ";
changelog = "https://github.com/sourcemeta/jsonschema/releases";
license = with lib.licenses; [
agpl3Plus
];
maintainers = with lib.maintainers; [
amerino
];
platforms = lib.platforms.all;
};
})

17
pkgs/desktops/lomiri/qml/lomiri-ui-extras/default.nix
View File

@@ -18,18 +18,18 @@
stdenv.mkDerivation (finalAttrs: {
pname = "lomiri-ui-extras";
version = "0.6.3";
version = "0.7.0";
src = fetchFromGitLab {
owner = "ubports";
repo = "development/core/lomiri-ui-extras";
rev = finalAttrs.version;
hash = "sha256-SF/UF84K9kNtLHO9FDuIFdQId0NfbmRiRZiPrOKvE9o=";
tag = finalAttrs.version;
hash = "sha256-fN9rZC8J8xyAStvBNTpLqAcssaiQQpu6INwMLlnkvfw=";
};
postPatch = ''
substituteInPlace modules/Lomiri/Components/Extras{,/{plugin,PamAuthentication}}/CMakeLists.txt \
--replace "\''${CMAKE_INSTALL_LIBDIR}/qt5/qml" "\''${CMAKE_INSTALL_PREFIX}/${qtbase.qtQmlPrefix}"
--replace-fail "\''${CMAKE_INSTALL_LIBDIR}/qt\''${QT_VERSION_MAJOR}/qml" "\''${CMAKE_INSTALL_PREFIX}/${qtbase.qtQmlPrefix}"
'';
strictDeps = true;
@@ -62,6 +62,7 @@ stdenv.mkDerivation (finalAttrs: {
cmakeFlags = [
(lib.cmakeBool "ENABLE_TESTS" finalAttrs.finalPackage.doCheck)
(lib.cmakeBool "ENABLE_QT6" (lib.strings.versionAtLeast qtbase.version "6"))
(lib.cmakeFeature "CMAKE_CTEST_ARGUMENTS" (
lib.concatStringsSep ";" [
# Exclude tests
@@ -103,7 +104,7 @@ stdenv.mkDerivation (finalAttrs: {
updateScript = gitUpdater { };
};
meta = with lib; {
meta = {
description = "Lomiri UI Extra Components";
longDescription = ''
A collection of UI components that for various reasons can't be included in
@@ -112,8 +113,8 @@ stdenv.mkDerivation (finalAttrs: {
'';
homepage = "https://gitlab.com/ubports/development/core/lomiri-ui-extras";
changelog = "https://gitlab.com/ubports/development/core/lomiri-ui-extras/-/blob/${finalAttrs.version}/ChangeLog";
license = licenses.gpl3Only;
maintainers = teams.lomiri.members;
platforms = platforms.linux;
license = lib.licenses.gpl3Only;
maintainers = lib.teams.lomiri.members;
platforms = lib.platforms.linux;
};
})

11
pkgs/servers/lidarr/default.nix
View File

@@ -22,19 +22,21 @@ let
x86_64-linux = "x64";
aarch64-linux = "arm64";
x86_64-darwin = "x64";
aarch64-darwin = "arm64";
}
."${stdenv.hostPlatform.system}" or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
hash =
{
x64-linux_hash = "sha256-fgOe0xZMepec+DDi/6Kq1j5EVuw45Igvrvucdnklj1w=";
arm64-linux_hash = "sha256-Jhjwpwgo1vRluWTzpn0gd17uII3rw6OPV/+SW8TMolQ=";
x64-osx_hash = "sha256-htSMl+Y22YE2SnUOsx+2ZfRvWCeF4K9b+wVfDoxK4+M=";
x64-linux_hash = "sha256-PwHIUbXxk9VOKd+I7EcrTEYlikfw2NUdO6IQdiQWhWs=";
arm64-linux_hash = "sha256-uu7iVexyss29Q7mZ280KeDLZWp6wwCh+TJj9XeZc/lQ=";
x64-osx_hash = "sha256-POjIY2iPoYOQQci6AV/7X8t7GGbxVqROjlMzwERH/3c=";
arm64-osx_hash = "sha256-JSdiyA0opa4dy5/RTSn/QvnKJ9VCWJcGhTkH5YIi5lg=";
}
."${arch}-${os}_hash";
in
stdenv.mkDerivation rec {
pname = "lidarr";
version = "2.9.6.4552";
version = "2.10.3.4602";
src = fetchurl {
url = "https://github.com/lidarr/Lidarr/releases/download/v${version}/Lidarr.master.${version}.${os}-core-${arch}.tar.gz";
@@ -79,6 +81,7 @@ stdenv.mkDerivation rec {
"x86_64-linux"
"aarch64-linux"
"x86_64-darwin"
"aarch64-darwin"
];
};
}

1
pkgs/servers/lidarr/update.sh
View File

@@ -40,3 +40,4 @@ updateVersion $latestVersion
updateHash $latestVersion x64 linux
updateHash $latestVersion arm64 linux
updateHash $latestVersion x64 osx
updateHash $latestVersion arm64 osx