nathan/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2026-09-29 03:10:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge master into staging-nixos

Browse Source
This commit is contained in:
nixpkgs-ci[bot]
2026-09-25 12:15:04 +00:00
committed by GitHub
parent 84ac4d6c85 a23dd85773
commit bd18a3560d
7 changed files with 17 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/backport.yml vendored
View File

@@ -51,7 +51,7 @@ jobs:
- name: Create backport PRs
id: backport
uses: korthout/backport-action@2e830a1d0b8269505846ddd407a70876913ad1f8 # v4.6.0
uses: korthout/backport-action@6b65649031ac6d18ffdfd0c0820e9436f3fde22b # v4.6.1
with:
# Config README: https://github.com/korthout/backport-action#backport-action
add_author_as_reviewer: true

6
pkgs/by-name/gl/globalping-cli/package.nix
View File

@@ -9,16 +9,16 @@
buildGoModule (finalAttrs: {
pname = "globalping-cli";
version = "1.5.2";
version = "1.6.0";
src = fetchFromGitHub {
owner = "jsdelivr";
repo = "globalping-cli";
rev = "v${finalAttrs.version}";
hash = "sha256-MaqBaR177gcgoqEpsER1+8oYZmiGeySfL/O9r6CxqCY=";
hash = "sha256-mzfskgv9w5jMNvALpvLTgCzHhcexyaZUnrLQi76z2gE=";
};
vendorHash = "sha256-7fhcQptMyq8IuRaqx3Znc9QFLaV0t6HpM4eCtdimupA=";
vendorHash = "sha256-HFgWH6kcCv3voyiWkcaNiK3NvnQlgop9DLC1o0xeSN0=";
nativeBuildInputs = [ installShellFiles ];

1
pkgs/by-name/li/libxml2Python/package.nix
View File

@@ -24,4 +24,5 @@ buildEnv {
mkdir "$out/nix-support"
cp '${pythonLibxml2.dev}/nix-support/propagated-build-inputs' "$out/nix-support/"
'';
meta.license = pythonLibxml2.meta.license;
}

6
pkgs/by-name/ya/yazi/plugins/keep-preferences/default.nix
View File

@@ -5,13 +5,13 @@
}:
mkYaziPlugin {
pname = "keep-preferences.yazi";
version = "0-unstable-2026-08-05";
version = "0-unstable-2026-09-24";
src = fetchFromGitHub {
owner = "XYenon";
repo = "keep-preferences.yazi";
rev = "5ff553eab2ca15014cd07a8cdf93cc0063be0d6f";
hash = "sha256-oeiumvTouv7k0JJxY7NuOqfiFDzOgIUOQO/G/2sYC1E=";
rev = "1e1fa5849a48690ff1398263c9595c31b618fe6f";
hash = "sha256-1pYrW7TzdkDTyh8uEGYyWROpPK3HxweJJbPxbreaE/w=";
};
meta = {

6
pkgs/by-name/ya/yazi/plugins/sshfs/default.nix
View File

@@ -5,13 +5,13 @@
}:
mkYaziPlugin (finalAttrs: {
pname = "sshfs.yazi";
version = "2.1.0";
version = "2.1.1";
src = fetchFromGitHub {
owner = "uhs-robert";
repo = "sshfs.yazi";
tag = "v2.1.0";
hash = "sha256-02LzKNptzs6o+YPGJRyYCly/Xqzi/5mvVBS+b28nY6U=";
tag = "v2.1.1";
hash = "sha256-RYZ0wFkYfR/TfYntRipNPvpSl4gvtmNukLBQONRk1jU=";
};
meta = {

10
pkgs/development/lua-modules/generated-packages.nix
View File

@@ -4484,15 +4484,15 @@ final: prev: {
}:
buildLuarocksPackage {
pname = "lz.n";
version = "3.1.0-1";
version = "3.1.1-1";
knownRockspec =
(fetchurl {
url = "mirror://luarocks/lz.n-3.1.0-1.rockspec";
sha256 = "0b6d61r0x9x0f03f9mx4l0na9jphlkihizvh7f29xfxvk9khgfp6";
url = "mirror://luarocks/lz.n-3.1.1-1.rockspec";
sha256 = "0wl3g8rf7wi22cbz0knpwsw71nqqp8x09p187843m0mdfygdmrs4";
}).outPath;
src = fetchzip {
url = "https://github.com/lumen-oss/lz.n/archive/v3.1.0.zip";
sha256 = "00xc3k6pcihz1cznmj4lsjwlcb54k0m5iv4x6zqkqkgwavsv62iw";
url = "https://github.com/lumen-oss/lz.n/archive/v3.1.1.zip";
sha256 = "0wz6darkc668i8kivi1c5r9rgix5sddsbxppnk830cwvdvyc857g";
};
disabled = lua.luaversion != "5.1";

2
pkgs/development/python-modules/dsinternals/default.nix
View File

@@ -36,7 +36,7 @@ buildPythonPackage (finalAttrs: {
meta = {
description = "Module to interact with Windows Active Directory";
homepage = "https://github.com/p0dalirius/pydsinternals";
license = lib.licenses.gpl2Only;
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ fab ];
};
})