Merge master into staging-nixos

This commit is contained in:
nixpkgs-ci[bot]
2026-01-04 12:08:08 +00:00
committed by GitHub
27 changed files with 105 additions and 66 deletions
+1 -1
View File
@@ -117,7 +117,7 @@ body:
options:
- label: "I assert that this is a bug and not a support request."
required: true
- label: "I assert that this is not a [duplicate of an existing issue](https://github.com/NixOS/nixpkgs/issues?q=is%3Aopen+is%3Aissue+label%3A%220.kind%3A+bug%22+-label%3A%226.topic%3A+darwin%22+-label%3A%226.topic%3A+nixos%22). "
- label: "I assert that this is not a [duplicate of an existing issue](https://github.com/NixOS/nixpkgs/issues?q=is%3Aissue+label%3A%220.kind%3A+bug%22+-label%3A%226.topic%3A+darwin%22+-label%3A%226.topic%3A+nixos%22). "
required: true
- label: "I assert that I have read the [NixOS Code of Conduct](https://github.com/NixOS/.github/blob/master/CODE_OF_CONDUCT.md) and agree to abide by it."
required: true
@@ -131,7 +131,7 @@ body:
options:
- label: "I assert that this is a bug and not a support request."
required: true
- label: "I assert that this is not a [duplicate of an existing issue](https://github.com/NixOS/nixpkgs/issues?q=is%3Aopen+is%3Aissue+label%3A%220.kind%3A+bug%22+label%3A%226.topic%3A+darwin%22). "
- label: "I assert that this is not a [duplicate of an existing issue](https://github.com/NixOS/nixpkgs/issues?q=is%3Aissue+label%3A%220.kind%3A+bug%22+label%3A%226.topic%3A+darwin%22). "
required: true
- label: "I assert that I have read the [NixOS Code of Conduct](https://github.com/NixOS/.github/blob/master/CODE_OF_CONDUCT.md) and agree to abide by it."
required: true
@@ -121,7 +121,7 @@ body:
options:
- label: "I assert that this is a bug and not a support request."
required: true
- label: "I assert that this is not a [duplicate of an existing issue](https://github.com/NixOS/nixpkgs/issues?q=is%3Aopen+is%3Aissue+label%3A%220.kind%3A+bug%22+label%3A%226.topic%3A+nixos%22). "
- label: "I assert that this is not a [duplicate of an existing issue](https://github.com/NixOS/nixpkgs/issues?q=is%3Aissue+label%3A%220.kind%3A+bug%22+label%3A%226.topic%3A+nixos%22). "
required: true
- label: "I assert that I have read the [NixOS Code of Conduct](https://github.com/NixOS/.github/blob/master/CODE_OF_CONDUCT.md) and agree to abide by it."
required: true
+1 -1
View File
@@ -127,7 +127,7 @@ body:
options:
- label: "I assert that this is a bug and not a support request."
required: true
- label: "I assert that this is not a [duplicate of an existing issue](https://github.com/NixOS/nixpkgs/issues?q=is%3Aopen+is%3Aissue+label%3A%220.kind%3A+build+failure%22). "
- label: "I assert that this is not a [duplicate of an existing issue](https://github.com/NixOS/nixpkgs/issues?q=is%3Aissue+label%3A%220.kind%3A+build+failure%22)."
required: true
- label: "I assert that I have read the [NixOS Code of Conduct](https://github.com/NixOS/.github/blob/master/CODE_OF_CONDUCT.md) and agree to abide by it."
required: true
+1 -1
View File
@@ -100,7 +100,7 @@ body:
options:
- label: "I assert that this package update does not yet exist in an [open pull request](https://github.com/NixOS/nixpkgs/pulls?q=is%3Aopen+is%3Apr+label%3A%228.has%3A+package+%28update%29%22) or in [Nixpkgs Unstable](https://search.nixos.org/packages?channel=unstable)."
required: true
- label: "I assert that this is not a [duplicate of any known issue](https://github.com/NixOS/nixpkgs/issues?q=is%3Aopen+is%3Aissue+label%3A%229.needs%3A+package+%28update%29%22)."
- label: "I assert that this is not a [duplicate of any known issue](https://github.com/NixOS/nixpkgs/issues?q=is%3Aissue+label%3A%229.needs%3A+package+%28update%29%22)."
required: true
- label: "I assert that I have read the [NixOS Code of Conduct](https://github.com/NixOS/.github/blob/master/CODE_OF_CONDUCT.md) and agree to abide by it."
required: true
+1 -1
View File
@@ -75,7 +75,7 @@ body:
options:
- label: "I assert that this module does not yet exist in an [open pull request](https://github.com/NixOS/nixpkgs/pulls?q=is%3Aopen+is%3Apr+label%3A%228.has%3A+module+%28new%29%22) or in [NixOS Unstable](https://search.nixos.org/options?channel=unstable)."
required: true
- label: "I assert that this is not a [duplicate of an existing issue](https://github.com/NixOS/nixpkgs/issues?q=is%3Aopen+is%3Aissue+label%3A%229.needs%3A+module+%28new%29%22). "
- label: "I assert that this is not a [duplicate of an existing issue](https://github.com/NixOS/nixpkgs/issues?q=is%3Aissue+label%3A%229.needs%3A+module+%28new%29%22). "
required: true
- label: "I assert that I have read the [NixOS Code of Conduct](https://github.com/NixOS/.github/blob/master/CODE_OF_CONDUCT.md) and agree to abide by it."
required: true
@@ -81,7 +81,7 @@ body:
options:
- label: "I assert that this backport does not yet exist in an [open pull request](https://github.com/NixOS/nixpkgs/pulls?q=is%3Apr+in%3Atitle+backport)."
required: true
- label: "I assert that this is not a [duplicate of any known issue](https://github.com/NixOS/nixpkgs/issues?q=is%3Aissue+is%3Aopen+label%3A%229.needs%3A+port+to+stable%22+)."
- label: "I assert that this is not a [duplicate of any known issue](https://github.com/NixOS/nixpkgs/issues?q=is%3Aissue+label%3A%229.needs%3A+port+to+stable%22+)."
required: true
- label: "I assert that I have read the [NixOS Code of Conduct](https://github.com/NixOS/.github/blob/master/CODE_OF_CONDUCT.md) and agree to abide by it."
required: true
@@ -63,7 +63,7 @@ body:
options:
- label: "I assert that this request is not already implemented in the latest [NixOS](https://nixos.org/manual/nixos/unstable/) or [Nixpkgs](https://nixos.org/manual/nixpkgs/unstable/) manuals."
required: true
- label: "I assert that this is not a [duplicate of an existing documentation issue](https://github.com/NixOS/nixpkgs/issues?q=is%3Aissue+is%3Aopen+label%3A%229.needs%3A+documentation%22)."
- label: "I assert that this is not a [duplicate of an existing documentation issue](https://github.com/NixOS/nixpkgs/issues?q=is%3Aissue+label%3A%229.needs%3A+documentation%22)."
required: true
- label: "I assert that I have read the [NixOS Code of Conduct](https://github.com/NixOS/.github/blob/master/CODE_OF_CONDUCT.md) and agree to abide by it."
required: true
@@ -133,7 +133,7 @@ body:
attributes:
label: "I assert that this issue is relevant for Nixpkgs"
options:
- label: "I assert that this is not a [duplicate of any known issue](https://github.com/NixOS/nixpkgs/issues?q=is%3Aopen+is%3Aissue+label%3A%226.topic%3A+reproducible+builds%22)."
- label: "I assert that this is not a [duplicate of any known issue](https://github.com/NixOS/nixpkgs/issues?q=is%3Aissue+label%3A%226.topic%3A+reproducible+builds%22)."
required: true
- label: "I assert that I have read the [NixOS Code of Conduct](https://github.com/NixOS/.github/blob/master/CODE_OF_CONDUCT.md) and agree to abide by it."
required: true
+3 -3
View File
@@ -7,16 +7,16 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "autocorrect";
version = "2.16.2";
version = "2.16.3";
src = fetchFromGitHub {
owner = "huacnlee";
repo = "autocorrect";
rev = "v${finalAttrs.version}";
hash = "sha256-IpBEmgZ40CFHMISP4tRzt2c2bE2Di9tn8e+/YJPg9RA=";
hash = "sha256-SRG603v6yP8/p3aUgGKRdbZScd818A+WqizcyPXaGB4=";
};
cargoHash = "sha256-sn+72+Qq7qppaiiiMS46RXVhFcm27lCPgXmAIYORKU8=";
cargoHash = "sha256-4CuvHOXGXUPN46HbiblVa6gSVA+jkYbo7i4uRFWc5+0=";
cargoBuildFlags = [
"-p"
+3 -3
View File
@@ -12,16 +12,16 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "bottom";
version = "0.12.2";
version = "0.12.3";
src = fetchFromGitHub {
owner = "ClementTsang";
repo = "bottom";
tag = finalAttrs.version;
hash = "sha256-+VfXxLKIdrg+ytmx29TPm46t3yhAgqBSJ+ykiIjuNmA=";
hash = "sha256-arbVp0UjapM8SQ99XQCP7c+iGInyuxxx6LMEONRVl6o=";
};
cargoHash = "sha256-dvU/iAgLC0+l8FH1bnOdIvZrXHqltE1hMkf+IaLQZxE=";
cargoHash = "sha256-miSMcqy4OFZFhAs9M+zdv4OzYgFxN2/uBo6V/kJql90=";
nativeBuildInputs = [
autoAddDriverRunpath
+3 -12
View File
@@ -23,7 +23,7 @@ let
in
with python3.pkgs;
buildPythonApplication rec {
version = "5.0";
version = "5.1";
pname = "buku";
pyproject = true;
@@ -31,7 +31,7 @@ buildPythonApplication rec {
owner = "jarun";
repo = "buku";
tag = "v${version}";
sha256 = "sha256-b3j3WLMXl4sXZpIObC+F7RRpo07cwJpAK7lQ7+yIzro=";
sha256 = "sha256-7ezAhKqykTpnfyK4+BLr/7+GBH720GxnEnkoJ/AIL08=";
};
nativeBuildInputs = [
@@ -60,16 +60,7 @@ buildPythonApplication rec {
]
++ lib.optionals withServer serverRequire;
preCheck = ''
# Disables a test which requires internet
substituteInPlace tests/test_bukuDb.py \
--replace "@pytest.mark.slowtest" "@unittest.skip('skipping')" \
--replace "self.assertEqual(shorturl, \"http://tny.im/yt\")" "" \
--replace "self.assertEqual(url, \"https://www.google.com\")" ""
substituteInPlace setup.py \
--replace mypy-extensions==0.4.1 mypy-extensions>=0.4.1
''
+ lib.optionalString (!withServer) ''
preCheck = lib.optionalString (!withServer) ''
rm tests/test_{server,views}.py
'';
+1 -1
View File
@@ -65,7 +65,7 @@ maven.buildMavenPackage rec {
'';
mvnJdk = jre_headless;
mvnHash = "sha256-HZK/o/RMbMj7OUfucizO5/LpJhwNhHfwbyvUOcO13dA=";
mvnHash = "sha256-Y4imt+eB9KrLN6f1X5CqYoj0FiGU/6ST79R5tK4rWw4=";
manualMvnArtifacts = [ "com.coderplus.maven.plugins:copy-rename-maven-plugin:1.0.1" ];
buildOffline = true;
+2 -2
View File
@@ -6,12 +6,12 @@
python3.pkgs.buildPythonApplication rec {
pname = "distgen";
version = "2.1";
version = "2.2";
pyproject = true;
src = fetchPypi {
inherit pname version;
hash = "sha256-VG9EX9LHoZamBM3PEm5qGpViK39qD+PA8vcHTzvsW+o=";
hash = "sha256-w+/aiLv5NCQFD0ItlC+Wy9BuvA/ndDQcLf6Iyb9trF4=";
};
build-system = with python3.pkgs; [
+3 -3
View File
@@ -8,16 +8,16 @@
buildGoModule rec {
pname = "fabric-ai";
version = "1.4.364";
version = "1.4.369";
src = fetchFromGitHub {
owner = "danielmiessler";
repo = "fabric";
tag = "v${version}";
hash = "sha256-XOvvT13L2vOQiq0gYeWdRP/H+mu0BI47koG+DzvuAhg=";
hash = "sha256-azji8qBX+pxhUo3kH2WdyfMSJSDKEjLSzb5JnweHefU=";
};
vendorHash = "sha256-U7oVc7DiFWdnEfemSDtmo4XYJj/564qDOZzQX0AVOqc=";
vendorHash = "sha256-147i0ZnNtph5DhaxK330kyUkDA4MBcpzrtIJGBEJHHQ=";
# Fabric introduced plugin tests that fail in the nix build sandbox.
doCheck = false;
@@ -12,13 +12,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "highscore-sameboy";
version = "0-unstable-2025-12-31";
version = "0-unstable-2026-01-04";
src = fetchFromGitHub {
owner = "highscore-emu";
repo = "SameBoy";
rev = "80e1d0b5aef4098539979a4670882d590ac9a1ca";
hash = "sha256-Fp9GODDu0170NoCHCfX5+vs8hQccS/P1N4jM+L784+o=";
rev = "80578af6531ac2da2a9ba76318e8e1dab856fabe";
hash = "sha256-LB0HTcTNEe9WlxTi8xwYsbas0SX6Cs2VNo/ljyrcxzQ=";
};
sourceRoot = "${finalAttrs.src.name}/highscore";
+3 -3
View File
@@ -37,7 +37,7 @@
}:
ags.bundle {
pname = "hyprpanel";
version = "0-unstable-2025-12-24";
version = "0-unstable-2026-01-03";
__structuredAttrs = true;
strictDeps = true;
@@ -45,8 +45,8 @@ ags.bundle {
src = fetchFromGitHub {
owner = "Jas-SinghFSU";
repo = "HyprPanel";
rev = "17ecff630bece1ac81569e427088ee8b11322f36";
hash = "sha256-xgMcrwKhFSQeSQN7ak0iUHNsnxaprEzuRYRo2ADeTtg=";
rev = "b8c255b610f045925e3e41b946a29db99639fcfe";
hash = "sha256-Sa3EOZHlhD1JwyxbxLzVm3C9d6pe7Iitcad5FofOeaI=";
};
# keep in sync with https://github.com/Jas-SinghFSU/HyprPanel/blob/master/flake.nix#L42
+2 -2
View File
@@ -23,11 +23,11 @@
stdenv.mkDerivation (finalAttrs: {
pname = "ironwail";
version = "0.8.0";
version = "0.8.1";
src = fetchurl {
url = "https://github.com/andrei-drexler/ironwail/archive/refs/tags/v${finalAttrs.version}.tar.gz";
hash = "sha256-IcODVQ0FgfTi74cvJnM6cPh/Der1bbltdTTo5hITUeI=";
hash = "sha256-TlEMuwmpQIoIyjyQo9T/h3T7rPHX+K8TqHKSt+UtMBg=";
};
sourceRoot = "${finalAttrs.pname}-${finalAttrs.version}/Quake";
@@ -9,18 +9,18 @@ buildGoModule (finalAttrs: {
# "chatgpt-cli" is taken by another package with the same upsteam name.
# To keep "pname" and "package attribute name" identical, the owners name (kardolus) gets prefixed as identifier.
pname = "kardolus-chatgpt-cli";
version = "1.8.12";
version = "1.9.0";
src = fetchFromGitHub {
owner = "kardolus";
repo = "chatgpt-cli";
rev = "v${finalAttrs.version}";
hash = "sha256-5/gRFecSge1iPLZdhO9e8eGqYXgLVvhkzq1SS0sWOBQ=";
hash = "sha256-Ya8Ttud9sJ94jdZK7LctGI5kcHcIonzcmsAteelkLYY=";
};
vendorHash = null;
# The tests of kardolus/chatgpt-cli require an OpenAI API Key to be present in the environment,
# (e.g. https://github.com/kardolus/chatgpt-cli/blob/v1.8.12/test/contract/contract_test.go#L35)
# (e.g. https://github.com/kardolus/chatgpt-cli/blob/v1.9.0/test/contract/contract_test.go#L35)
# which will not be the case in the pipeline.
# Therefore, tests must be skipped.
doCheck = false;
+8 -6
View File
@@ -7,16 +7,18 @@
buildGoModule rec {
pname = "mactop";
version = "0.2.3";
version = "2.0.5";
src = fetchFromGitHub {
owner = "context-labs";
owner = "metaspartan";
repo = "mactop";
tag = "v${version}";
hash = "sha256-xWUCOmNwhxmutY7G+FmxT7mabexuBIcgFzX++zsdnN4=";
hash = "sha256-0M3nV3gjsY1vg+uqXbKUAF/8311jc8UJ2UYUFyrRiAo=";
};
vendorHash = "sha256-BFvd1jJzGYsI2E6BdFy+BwHOAy7VgblcByV/oRCKORs=";
vendorHash = "sha256-nlbifuj4kued8ugawAfd4V6uirkQEZ1yRQXVsF+ZEdc=";
proxyVendor = true;
ldflags = [
"-s"
@@ -28,8 +30,8 @@ buildGoModule rec {
meta = {
description = "Terminal-based monitoring tool 'top' designed to display real-time metrics for Apple Silicon chips";
homepage = "https://github.com/context-labs/mactop";
changelog = "https://github.com/context-labs/mactop/releases/tag/${src.tag}";
homepage = "https://github.com/metaspartan/mactop";
changelog = "https://github.com/metaspartan/mactop/releases/tag/${src.tag}";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ natsukium ];
mainProgram = "mactop";
@@ -7,16 +7,16 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "markdown-code-runner";
version = "0.2.3";
version = "0.3.2";
src = fetchFromGitHub {
owner = "drupol";
repo = "markdown-code-runner";
tag = finalAttrs.version;
hash = "sha256-fmyjrsEBUskN/cYmsqOprw56vpjonXETRdBH3y0ypkA=";
hash = "sha256-0AIW9rRIGKOCVdOmWH+vs4T3k++joo8DQpdiok6aAX0=";
};
cargoHash = "sha256-hBFUsluSZluWJIbvJjFSFe+Y2ICr+mug0Mxrz4pLW5E=";
cargoHash = "sha256-Q2KhNPrUU8X95Z7qsWqwkFDzJlLAmpH1Fn5f47fYr1o=";
dontUseCargoParallelTests = true;
+2 -2
View File
@@ -9,11 +9,11 @@
}:
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "proton-ge-bin";
version = "GE-Proton10-27";
version = "GE-Proton10-28";
src = fetchzip {
url = "https://github.com/GloriousEggroll/proton-ge-custom/releases/download/${finalAttrs.version}/${finalAttrs.version}.tar.gz";
hash = "sha256-yBPjPb2LzxdgEobuoeSfs3UZ1XUxZF6vIMYF+fAnLA0=";
hash = "sha256-6NvSGX8445la6WU6z9UaaKJm30eg094cuTyhHVDjbOo=";
};
dontUnpack = true;
+2 -6
View File
@@ -3,7 +3,7 @@
fetchFromGitea,
fetchNpmDeps,
buildGoModule,
nodejs,
nodejs_22,
npmHooks,
python3,
}:
@@ -20,12 +20,8 @@ buildGoModule rec {
hash = "sha256-9M9Bgl1CJ35x/Onlk5xUNCFkZKW40efF6qMOM+2/HR0=";
};
postPatch = ''
sed -i -e '/^go /s/1.25.5/1.25.4/' go.mod
'';
nativeBuildInputs = [
nodejs
nodejs_22
npmHooks.npmConfigHook
(python3.withPackages (ps: with ps; [ babel ]))
];
+3 -3
View File
@@ -30,19 +30,19 @@
stdenv.mkDerivation (finalAttrs: {
pname = "typesetter";
version = "0.8.3";
version = "0.8.4";
src = fetchFromGitea {
domain = "codeberg.org";
owner = "haydn";
repo = "typesetter";
tag = "v${finalAttrs.version}";
hash = "sha256-IJK5ZqrQ7I85d5ULJ9TW61gQ5G0E4XRwPn93i6Sk+OU=";
hash = "sha256-P92n2ly60czewff5d2tC0nkXMtFGAzNkRY+Jh8Pi4iQ=";
};
cargoDeps = rustPlatform.fetchCargoVendor {
inherit (finalAttrs) pname version src;
hash = "sha256-rqcJuDyuw/kpXp4MIboKLWmHvV7AtdH/Qrv9Phcvhjs=";
hash = "sha256-jG6FLt74nDAYfaAhaw+foVZBeLQIvtCHcxB8s/HSvIQ=";
};
strictDeps = true;
@@ -0,0 +1,48 @@
{
lib,
buildPythonPackage,
fetchFromGitHub,
pytestCheckHook,
setuptools,
pybind11,
}:
buildPythonPackage {
pname = "libparse-python";
version = "0-unstable-2025-08-30";
pyproject = true;
src = fetchFromGitHub {
owner = "librelane";
repo = "libparse-python";
rev = "ff5b26da3d66affb60696fd6c4af7f8726729c8c";
fetchSubmodules = true;
hash = "sha256-H2UHh5RbxJ65yTbLybCEanl5qA4o0e/0rAQKmIhvXeQ=";
};
postPatch = ''
substituteInPlace yosys/passes/techmap/libparse.cc \
--replace-fail \
"void LibertyParser::error" \
"__attribute__((weak)) void LibertyParser::error"
'';
build-system = [
pybind11
setuptools
];
nativeCheckInputs = [
pytestCheckHook
];
pythonImportsCheck = [ "libparse" ];
meta = {
description = "Python library for parsing Yosys output";
homepage = "https://github.com/librelane/libparse-python";
license = lib.licenses.asl20;
maintainers = with lib.maintainers; [ gonsolo ];
platforms = lib.platforms.linux;
};
}
@@ -8,14 +8,14 @@
buildPythonPackage rec {
pname = "oelint-data";
version = "1.2.11";
version = "1.3.0";
pyproject = true;
src = fetchFromGitHub {
owner = "priv-kweihmann";
repo = "oelint-data";
tag = version;
hash = "sha256-Verxvo81rFphT1fV6fs6JaVM/kSVqni9Zn5rq5Yq3rU=";
hash = "sha256-+QavuUIj6aKaxIp0NPj0doKV/+SL7bh5LaH1TLe/LZ4=";
};
build-system = [
+2
View File
@@ -8552,6 +8552,8 @@ self: super: with self; {
}
);
libparse-python = callPackage ../development/python-modules/libparse-python/package.nix { };
libpass = callPackage ../development/python-modules/libpass { };
libpcap = callPackage ../development/python-modules/libpcap {