nathan/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2026-10-03 21:40:12 +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-07 18:11:41 +00:00
committed by GitHub
parent c51bb4b1ec 6d23318049
commit fa4573beba
6 changed files with 27 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/by-name/ap/apfel-llm/package.nix
View File

@@ -8,7 +8,7 @@
stdenv.mkDerivation (finalAttrs: {
pname = "apfel-llm";
version = "1.9.1";
version = "1.10.0";
__structuredAttrs = true;
strictDeps = true;
@@ -16,7 +16,7 @@ stdenv.mkDerivation (finalAttrs: {
# Building from source requires swift 6.3.0 while nixpkgs only has 5.10.1
src = fetchurl {
url = "https://github.com/Arthur-Ficial/apfel/releases/download/v${finalAttrs.version}/apfel-${finalAttrs.version}-arm64-macos.tar.gz";
hash = "sha256-CWM2S+/+IAF7juSEsLx8glYKUY8q5iKfPySQ9xdQ1AM=";
hash = "sha256-0tNOw888GGKVNVHUaL3Pzbu/f0YAz0tMhhKKkdvNOzo=";
};
sourceRoot = ".";

12
pkgs/by-name/bm/bmputil/package.nix
View File

@@ -11,16 +11,16 @@
}:
rustPlatform.buildRustPackage rec {
pname = "bmputil";
version = "1.1.0";
version = "1.2.0";
src = fetchFromCodeberg {
owner = "blackmagic-debug";
repo = "bmputil";
tag = "v${version}";
hash = "sha256-ZD/JXsx52U+O3FazRc9xnShx34fxTXcD2zhW5mgSYtU=";
hash = "sha256-WX26rDFLWtEG/BvVwPjsY3X1ebvNseEpdgJRGMynyBo=";
};
cargoHash = "sha256-/I1chzqnhgky/+cKGhFrdgZvoLGM9P75ga5UDTMOI3Q=";
cargoHash = "sha256-Uj+TLD1SGx5lFFhSDKRr6iMg4QnjgE1+1KbXTi/5iCI=";
nativeBuildInputs = [ pkg-config ];
@@ -32,8 +32,6 @@ rustPlatform.buildRustPackage rec {
install -Dm 444 ${blackmagic.src}/driver/99-blackmagic-plugdev.rules $out/lib/udev/rules.d/99-blackmagic-plugdev.rules
'';
doCheck = false; # fails at least 1 test
nativeInstallCheckInputs = [
versionCheckHook
udevCheckHook
@@ -41,8 +39,8 @@ rustPlatform.buildRustPackage rec {
doInstallCheck = true;
meta = {
description = "Black Magic Probe Firmware Manager";
homepage = "https://github.com/blackmagic-debug/bmputil";
description = "Black Magic Probe companion utility";
homepage = "https://codeberg.org/blackmagic-debug/bmputil";
license = with lib.licenses; [
mit
asl20

6
pkgs/by-name/ke/ketesa/package.nix
View File

@@ -17,18 +17,18 @@ assert lib.asserts.assertMsg (
stdenv.mkDerivation (finalAttrs: {
pname = "ketesa";
version = "1.4.0";
version = "1.5.0";
src = fetchFromGitHub {
owner = "etkecc";
repo = "ketesa";
tag = "v${finalAttrs.version}";
hash = "sha256-tW7lOYl/TNQgvsMFMDQKXzqzzfnxNIUQ8Iqld8M5Hjc=";
hash = "sha256-whIimrKTyFoUggy/mvdVQ2/Jel195+sEkQjfQ3N+8aI=";
};
yarnOfflineCache = fetchYarnDeps {
yarnLock = finalAttrs.src + "/yarn.lock";
hash = "sha256-+xWyq/jGJke4HQ6p37y+fJJ73wxNmNMKA3zrP6ANh8E=";
hash = "sha256-kTtWqEEbZaC9ZWtJcQ+CQem6au0bfum8iQoHUm0pgDY=";
};
nativeBuildInputs = [

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

@@ -12,7 +12,7 @@ in
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "rad-key";
version = "0.2.0";
version = "0.2.1";
__structuredAttrs = true;
strictDeps = true;
@@ -21,7 +21,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
seed = "radicle.defelo.de";
repo = "zFF3JpT1VrrsDYogDPtVZMHw6P4x";
tag = "releases/${finalAttrs.version}";
hash = "sha256-l0PJo8unFWgBu+0NofjjryWsQx3RcT0oPHe/j2YEZW0=";
hash = "sha256-zQMfxEAWDP+4kNObtrf7dJCLrLeJB48Lv6g+bTF8d68=";
};
nativeBuildInputs = [ zig ];

10
pkgs/by-name/ty/typesetter/package.nix
View File

@@ -13,6 +13,7 @@
pkg-config,
python3,
rustc,
shared-mime-info,
wrapGAppsHook4,
# buildInputs
@@ -30,19 +31,19 @@
stdenv.mkDerivation (finalAttrs: {
pname = "typesetter";
version = "0.13.5";
version = "0.15.2";
__structuredAttrs = true;
src = fetchFromCodeberg {
owner = "haydn";
repo = "typesetter";
tag = "v${finalAttrs.version}";
hash = "sha256-sJUuc7Ado0NFbLrnO3WVxgMA2l5Uh7X0uLvJVhgwwPA=";
hash = "sha256-ck7kW2dVBvl0zbXurTXaxQetWZ57mVSmVl1mE3zg2YE=";
};
cargoDeps = rustPlatform.fetchCargoVendor {
inherit (finalAttrs) pname version src;
hash = "sha256-E2ADu5jo8ulXGIw+vd9m4oFcxMMvo85oIetsIJy9ql4=";
hash = "sha256-n50EBOcwrbFPQAxfxK3fQWPSp/g6DRIbETOlS+ooWgo=";
};
strictDeps = true;
@@ -57,6 +58,7 @@ stdenv.mkDerivation (finalAttrs: {
python3
rustPlatform.cargoSetupHook
rustc
shared-mime-info # update-mime-database
wrapGAppsHook4
];
@@ -78,7 +80,7 @@ stdenv.mkDerivation (finalAttrs: {
meta = {
description = "Minimalist, local-first Typst editor";
homepage = "https://codeberg.org/haydn/typesetter";
license = lib.licenses.gpl3Only;
license = lib.licenses.gpl3Plus;
maintainers = with lib.maintainers; [ GaetanLepage ];
mainProgram = "typesetter";
};

13
pkgs/development/python-modules/colorzero/default.nix
View File

@@ -2,23 +2,28 @@
lib,
buildPythonPackage,
fetchFromGitHub,
setuptools,
pkginfo,
pytestCheckHook,
pytest-cov-stub,
}:
buildPythonPackage rec {
buildPythonPackage (finalAttrs: {
pname = "colorzero";
version = "2.0";
format = "setuptools";
pyproject = true;
__structuredAttrs = true;
src = fetchFromGitHub {
owner = "waveform80";
repo = "colorzero";
tag = "release-${version}";
tag = "release-${finalAttrs.version}";
hash = "sha256-0NoQsy86OHQNLZsTEuF5s2MlRUoacF28jNeHgFKAH14=";
};
build-system = [ setuptools ];
nativeBuildInputs = [ pkginfo ];
pythonImportsCheck = [ "colorzero" ];
@@ -34,4 +39,4 @@ buildPythonPackage rec {
license = lib.licenses.bsd3;
maintainers = with lib.maintainers; [ hexa ];
};
}
})