movefasta/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-06-09 19:13:26 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge staging-next into staging

Browse source
This commit is contained in:
nixpkgs-ci[bot] 2025-06-09 06:06:55 +00:00 • committed by GitHub
commit 6994b8f921
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
29 changed files with 148 additions and 150 deletions
Download patch file Download diff file Expand all files Collapse all files

3
doc/languages-frameworks/python.section.md
View file

@ -2180,7 +2180,8 @@ The following rules are desired to be respected:
* Make sure the tests are enabled using for example [`pytestCheckHook`](#using-pytestcheckhook) and, in the case of * Make sure the tests are enabled using for example [`pytestCheckHook`](#using-pytestcheckhook) and, in the case of
libraries, are passing for all interpreters. If certain tests fail they can be libraries, are passing for all interpreters. If certain tests fail they can be
disabled individually. Try to avoid disabling the tests altogether. In any disabled individually. Try to avoid disabling the tests altogether. In any
case, when you disable tests, leave a comment explaining why. case, when you disable tests, leave a comment explaining not only _what_ the failure
is but _why_ the test failure can be ignored for safe distribution with nixpkgs.
* `pythonImportsCheck` is set. This is still a good smoke test even if `pytestCheckHook` is set. * `pythonImportsCheck` is set. This is still a good smoke test even if `pytestCheckHook` is set.
* `meta.platforms` takes the default value in many cases. * `meta.platforms` takes the default value in many cases.
It does not need to be set explicitly unless the package requires a specific platform. It does not need to be set explicitly unless the package requires a specific platform.

4
pkgs/applications/editors/android-studio/default.nix
View file

@ -24,8 +24,8 @@ let
sha256Hash = "sha256-tPRTDFyKGPR1DKuJRBcwjWjNxylS/8Zv/Nd6vBmcujg="; sha256Hash = "sha256-tPRTDFyKGPR1DKuJRBcwjWjNxylS/8Zv/Nd6vBmcujg=";
}; };
latestVersion = { latestVersion = {
version = "2025.1.2.2"; # "Android Studio Narwhal Feature Drop | 2025.1.2 Canary 2" version = "2025.1.2.4"; # "Android Studio Narwhal Feature Drop | 2025.1.2 Canary 4"
sha256Hash = "sha256-zQ3PK9Fq8iYocSRFsYXNrnJ34QJGUkQoLtSNhFA2Ido="; sha256Hash = "sha256-MhonmDupcXGvwWUB+p/9AkqxCP9+j8a7D1bCseEu8GY=";
}; };
in in
{ {

8
pkgs/by-name/am/amp-cli/package-lock.json generated
View file

@ -5,7 +5,7 @@
"packages": { "packages": {
"": { "": {
"dependencies": { "dependencies": {
"@sourcegraph/amp": "^0.0.1748865683-g71e54e" "@sourcegraph/amp": "^0.0.1749297687-g3e4f54"
} }
}, },
"node_modules/@colors/colors": { "node_modules/@colors/colors": {
@ -29,9 +29,9 @@
} }
}, },
"node_modules/@sourcegraph/amp": { "node_modules/@sourcegraph/amp": {
"version": "0.0.1748865683-g71e54e", "version": "0.0.1749297687-g3e4f54",
"resolved": "https://registry.npmjs.org/@sourcegraph/amp/-/amp-0.0.1748865683-g71e54e.tgz", "resolved": "https://registry.npmjs.org/@sourcegraph/amp/-/amp-0.0.1749297687-g3e4f54.tgz",
"integrity": "sha512-ZiNbIbgCb/l7Q7wRT0sva6Ju7VDtq7+lijMWK8jotPorTq1DYUy3h7XJIOjyJEdvqlQkEfwrnbOfREmsnwlPyg==", "integrity": "sha512-KfAu6Ju4aeTKW3dQ17GmaVXJ+96IqUMCC8KJlb1uzOBcNudGVnwYogjkEAMu4N3hg1PJH6XcrimqmFRqPZb1+Q==",
"dependencies": { "dependencies": {
"@types/runes": "^0.4.3", "@types/runes": "^0.4.3",
"@vscode/ripgrep": "1.15.11", "@vscode/ripgrep": "1.15.11",

6
pkgs/by-name/am/amp-cli/package.nix
View file

@ -9,11 +9,11 @@
buildNpmPackage (finalAttrs: { buildNpmPackage (finalAttrs: {
pname = "amp-cli"; pname = "amp-cli";
version = "0.0.1748865683-g71e54e"; version = "0.0.1749297687-g3e4f54";
src = fetchzip { src = fetchzip {
url = "https://registry.npmjs.org/@sourcegraph/amp/-/amp-${finalAttrs.version}.tgz"; url = "https://registry.npmjs.org/@sourcegraph/amp/-/amp-${finalAttrs.version}.tgz";
hash = "sha256-kkQKjw1SzDjV8/206i+NUyxeDhZ/35My9gyXRe/U7I8="; hash = "sha256-WreJsyqyW/Z+TUPnQC7sKIpSgdpIzXQTgkXBthKCMZ4=";
}; };
postPatch = '' postPatch = ''
@ -45,7 +45,7 @@ buildNpmPackage (finalAttrs: {
chmod +x bin/amp-wrapper.js chmod +x bin/amp-wrapper.js
''; '';
npmDepsHash = "sha256-yeZ5UCVUCbVjpYTYYN5mI6eCkShtnCKxumjpb5GRCws="; npmDepsHash = "sha256-dAJePSRKnXrdW8hr72JNxunQAiUtxH53sDrtYYX6++0=";
propagatedBuildInputs = [ propagatedBuildInputs = [
ripgrep ripgrep

3
pkgs/by-name/ap/apt-dater/package.nix
View file

@ -44,7 +44,8 @@ stdenv.mkDerivation {
prePatch = '' prePatch = ''
substituteInPlace etc/Makefile.am \ substituteInPlace etc/Makefile.am \
--replace-fail 02770 0770 --replace-fail 02770 0770 \
--replace-fail '../../../$(pkglibdir)' '$(pkglibdir)'
''; '';
postPatch = '' postPatch = ''

4
pkgs/by-name/bo/boxflat/package.nix
View file

@ -14,14 +14,14 @@
python3Packages.buildPythonPackage rec { python3Packages.buildPythonPackage rec {
pname = "boxflat"; pname = "boxflat";
version = "1.31.0"; version = "1.32.0";
pyproject = true; pyproject = true;
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "Lawstorant"; owner = "Lawstorant";
repo = "boxflat"; repo = "boxflat";
tag = "v${version}"; tag = "v${version}";
hash = "sha256-2x7voGnbvaUg1G2SfdjD0QPVXolHkUcrwGyoclnOLMo="; hash = "sha256-zxaBz2ooo+h3a9svtC+j23EhpH8TTQIxjdRDCnhAvJ4=";
}; };
build-system = [ python3Packages.setuptools ]; build-system = [ python3Packages.setuptools ];

2
pkgs/by-name/co/codec2/package.nix
View file

@ -84,8 +84,6 @@ stdenv.mkDerivation (finalAttrs: {
license = licenses.lgpl21Only; license = licenses.lgpl21Only;
platforms = platforms.unix; platforms = platforms.unix;
maintainers = with maintainers; [ markuskowa ]; maintainers = with maintainers; [ markuskowa ];
# generate_codebook only built for host platform
broken = !stdenv.buildPlatform.canExecute stdenv.hostPlatform;
pkgConfigModules = [ "codec2" ]; pkgConfigModules = [ "codec2" ];
}; };
}) })

4
pkgs/by-name/cu/cura-appimage/package.nix
View file

@ -13,7 +13,7 @@
stdenvNoCC.mkDerivation rec { stdenvNoCC.mkDerivation rec {
pname = "cura-appimage"; pname = "cura-appimage";
version = "5.10.0"; version = "5.10.1";
# Give some good names so the intermediate packages are easy # Give some good names so the intermediate packages are easy
# to recognise by name in the Nix store. # to recognise by name in the Nix store.
@ -22,7 +22,7 @@ stdenvNoCC.mkDerivation rec {
src = fetchurl { src = fetchurl {
url = "https://github.com/Ultimaker/Cura/releases/download/${version}/Ultimaker-Cura-${version}-linux-X64.AppImage"; url = "https://github.com/Ultimaker/Cura/releases/download/${version}/Ultimaker-Cura-${version}-linux-X64.AppImage";
hash = "sha256-8Km249t0m4YnOsyXyjJJD0y4n9kUCrA/AcsqBcrVf5Q="; hash = "sha256-c89GkgfOSY4hriY66GUCgBYiiJJspM9Fg07lne+KXgw=";
}; };
appimageContents = appimageTools.extract { appimageContents = appimageTools.extract {

2
pkgs/by-name/dn/dnstake/package.nix
View file

@ -16,7 +16,7 @@ buildGoModule rec {
hash = "sha256-k6j7DIwK8YAKmEjn8JJO7XBcap9ui6cgUSJG7CeHAAM="; hash = "sha256-k6j7DIwK8YAKmEjn8JJO7XBcap9ui6cgUSJG7CeHAAM=";
}; };
vendorHash = "sha256-lV6dUl+OMUQfhlgNL38k0Re1Mr3VP9b8SI3vTJ8CP18="; vendorHash = "sha256-l3IKvcO10C+PVDX962tFWny7eMNC48ATIVqiHjpVH/Y=";
meta = with lib; { meta = with lib; {
description = "Tool to check missing hosted DNS zones"; description = "Tool to check missing hosted DNS zones";

21
pkgs/by-name/fw/fwupd-efi/package.nix
View file

@ -1,7 +1,7 @@
{ {
lib, lib,
stdenv, stdenv,
fetchurl, fetchFromGitHub,
pkg-config, pkg-config,
meson, meson,
ninja, ninja,
@ -10,13 +10,15 @@
python3Packages, python3Packages,
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation (finalAttrs: {
pname = "fwupd-efi"; pname = "fwupd-efi";
version = "1.6"; version = "1.7";
src = fetchurl { src = fetchFromGitHub {
url = "https://github.com/fwupd/fwupd-efi/releases/download/${version}/fwupd-efi-${version}.tar.xz"; owner = "fwupd";
hash = "sha256-r9CAWirQgafK/y71vABM46AUe1OAFejsqWY0FxaxJg4="; repo = "fwupd-efi";
rev = "${finalAttrs.version}";
hash = "sha256-PcVqnnFrxedkhYgm+8EUF2I65R5gTXqbVrk69Pw1m1g=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
@ -43,9 +45,10 @@ stdenv.mkDerivation rec {
"-Defi-ldsdir=${gnu-efi}/lib" "-Defi-ldsdir=${gnu-efi}/lib"
"-Defi_sbat_distro_id=nixos" "-Defi_sbat_distro_id=nixos"
"-Defi_sbat_distro_summary=NixOS" "-Defi_sbat_distro_summary=NixOS"
"-Defi_sbat_distro_pkgname=${pname}" "-Defi_sbat_distro_pkgname=${finalAttrs.pname}"
"-Defi_sbat_distro_version=${version}" "-Defi_sbat_distro_version=${finalAttrs.version}"
"-Defi_sbat_distro_url=https://search.nixos.org/packages?channel=unstable&show=fwupd-efi&from=0&size=50&sort=relevance&query=fwupd-efi" "-Defi_sbat_distro_url=https://search.nixos.org/packages?channel=unstable&show=fwupd-efi&from=0&size=50&sort=relevance&query=fwupd-efi"
"-Dgenpeimg=disabled"
]; ];
meta = with lib; { meta = with lib; {
@ -54,4 +57,4 @@ stdenv.mkDerivation rec {
license = licenses.lgpl21Plus; license = licenses.lgpl21Plus;
platforms = platforms.linux; platforms = platforms.linux;
}; };
} })

40
pkgs/by-name/la/lazpaint/package.nix
View file

@ -10,29 +10,27 @@
python3, python3,
}: }:
let stdenv.mkDerivation (finalAttrs: {
bgrabitmap = fetchFromGitHub {
owner = "bgrabitmap";
repo = "bgrabitmap";
rev = "2814b069d55f726b9f3b4774d85d00dd72be9c05";
hash = "sha256-YibwdhlgjgI30gqYsKchgDPlOSpBiDBDJNlUDFMygGs=";
};
bgracontrols = fetchFromGitHub {
owner = "bgrabitmap";
repo = "bgracontrols";
rev = "v8.0";
hash = "sha256-5L05eGVN+xncd0/0XLFN6EL2ux4aAOsiU0BMoy0dKgg=";
};
in
stdenv.mkDerivation {
pname = "lazpaint"; pname = "lazpaint";
version = "7.2.2-unstable-2024-01-23"; version = "7.3";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "bgrabitmap"; owner = "bgrabitmap";
repo = "lazpaint"; repo = "lazpaint";
rev = "45a7a471d531d6adb5ee557ff917a99af76e92f1"; tag = "v${finalAttrs.version}";
hash = "sha256-KgCxSK72Ow29T58mlcYCJiS4D0Ov2/p37c1FSNgKZew="; hash = "sha256-yT1HyvJcYEJgMkQxzCSD8s7/ttemxZaur9T+As8WdIo=";
};
bgrabitmap = fetchFromGitHub {
owner = "bgrabitmap";
repo = "bgrabitmap";
tag = "v11.6.6";
hash = "sha256-bA8tvo7Srm5kIZTVWEA2+gjqHab7LByyL/zqdQxeFlA=";
};
bgracontrols = fetchFromGitHub {
owner = "bgrabitmap";
repo = "bgracontrols";
tag = "v9.0.2";
hash = "sha256-HqX9n4VpOyMwTz3fTweTTqzW+jA2BU62mm/X7Iwjd/8=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
@ -59,8 +57,8 @@ stdenv.mkDerivation {
runHook preBuild runHook preBuild
export HOME=$(mktemp -d) export HOME=$(mktemp -d)
cp -r --no-preserve=mode ${bgrabitmap} bgrabitmap cp -r --no-preserve=mode ${finalAttrs.bgrabitmap} bgrabitmap
cp -r --no-preserve=mode ${bgracontrols} bgracontrols cp -r --no-preserve=mode ${finalAttrs.bgracontrols} bgracontrols
lazbuild --lazarusdir=${lazarus-qt5}/share/lazarus \ lazbuild --lazarusdir=${lazarus-qt5}/share/lazarus \
--build-mode=ReleaseQt5 \ --build-mode=ReleaseQt5 \
@ -86,4 +84,4 @@ stdenv.mkDerivation {
maintainers = with lib.maintainers; [ aleksana ]; maintainers = with lib.maintainers; [ aleksana ];
mainProgram = "lazpaint"; mainProgram = "lazpaint";
}; };
} })

2
pkgs/by-name/lo/logdy/package.nix
View file

@ -13,7 +13,7 @@ buildGoModule rec {
owner = "logdyhq"; owner = "logdyhq";
repo = "logdy-core"; repo = "logdy-core";
tag = "v${version}"; tag = "v${version}";
hash = "sha256-779ZO9WhE3IKbHJLchCfrIepMH+GOrlQJALLpoNZvbc="; hash = "sha256-hhmzTJn136J8DZ719WSu8tafRp8s4MBj6vDVWYTfFyc=";
}; };
vendorHash = "sha256-kFhcbBMymzlJ+2zw7l09LJfCdps26Id+VzOehqrLDWU="; vendorHash = "sha256-kFhcbBMymzlJ+2zw7l09LJfCdps26Id+VzOehqrLDWU=";

4
pkgs/by-name/ne/newelle/package.nix
View file

@ -20,14 +20,14 @@
python3Packages.buildPythonApplication rec { python3Packages.buildPythonApplication rec {
pname = "newelle"; pname = "newelle";
version = "0.9.7"; version = "0.9.8";
pyproject = false; # uses meson pyproject = false; # uses meson
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "qwersyk"; owner = "qwersyk";
repo = "Newelle"; repo = "Newelle";
tag = version; tag = version;
hash = "sha256-h0dWjnUqWcPdSbR60HF2KvQxUyYeR3qHf2GMHt/kSm0="; hash = "sha256-VyUng/ZX8+wInRX705IWdBgTbX439R60h62ONdpZ0+8=";
}; };
postPatch = '' postPatch = ''

8
pkgs/by-name/pk/pkgsite/package.nix
View file

@ -7,16 +7,16 @@
buildGoModule { buildGoModule {
pname = "pkgsite"; pname = "pkgsite";
version = "0-unstable-2025-05-23"; version = "0-unstable-2025-06-08";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "golang"; owner = "golang";
repo = "pkgsite"; repo = "pkgsite";
rev = "0e6de173c6b5ef31749de2ae384bb05ddc6726ba"; rev = "82c52f1754cd0ea741a56981d4830176071531d3";
hash = "sha256-WRNw+BjUY8/gj7tcPs0Ifz47JtBlU+SEIt12EZmtOjw="; hash = "sha256-bI5jVmCM5pSdiT+OJGrg1pBQ6ozPbXdZzrdLxr9cMUU=";
}; };
vendorHash = "sha256-s8uYvMQENqeUN8DbZ/jNhcTe2dJeiE9UYPCPGeScO10="; vendorHash = "sha256-dZKm3dMI969HKPBrC95vVmY1cZmjy+NWq7xOzXsTE14=";
subPackages = [ "cmd/pkgsite" ]; subPackages = [ "cmd/pkgsite" ];

4
pkgs/by-name/pl/plasma-panel-colorizer/package.nix
View file

@ -9,13 +9,13 @@
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
pname = "plasma-panel-colorizer"; pname = "plasma-panel-colorizer";
version = "4.2.0"; version = "4.3.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "luisbocanegra"; owner = "luisbocanegra";
repo = "plasma-panel-colorizer"; repo = "plasma-panel-colorizer";
tag = "v${finalAttrs.version}"; tag = "v${finalAttrs.version}";
hash = "sha256-fqhuW7SoUluUJU0tv1MIUX1IhOn3j514Hlrdxlnqvvg="; hash = "sha256-B0aP49udYTV/zfEdZS4uvkGG4wZUScqTVn9+d5SYCEQ=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

4
pkgs/by-name/sc/scite/package.nix
View file

@ -8,11 +8,11 @@
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
pname = "scite"; pname = "scite";
version = "5.5.6"; version = "5.5.7";
src = fetchurl { src = fetchurl {
url = "https://www.scintilla.org/scite${lib.replaceStrings [ "." ] [ "" ] finalAttrs.version}.tgz"; url = "https://www.scintilla.org/scite${lib.replaceStrings [ "." ] [ "" ] finalAttrs.version}.tgz";
hash = "sha256-VmNP6NepkF7Ln9eh9pfStmch9nwIKKZTOYxkeduSxrI="; hash = "sha256-L/UceHGFgFbzUPvc2VBehXXJNmwyyPwBfgxvuv3Vxu8=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

6
pkgs/by-name/ta/tailwindcss-language-server/package.nix
View file

@ -10,13 +10,13 @@
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
pname = "tailwindcss-language-server"; pname = "tailwindcss-language-server";
version = "0.14.19"; version = "0.14.21";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "tailwindlabs"; owner = "tailwindlabs";
repo = "tailwindcss-intellisense"; repo = "tailwindcss-intellisense";
tag = "v${finalAttrs.version}"; tag = "v${finalAttrs.version}";
hash = "sha256-lAZ3BoecPB3+zmI8RataAcbk32avV9Ie+Ek6q/JcXnU="; hash = "sha256-UmeaNCMuXSPVuzYAjOhhHkKkTcsBnjLbB3oeXG8uv5U=";
}; };
pnpmDeps = pnpm_9.fetchDeps { pnpmDeps = pnpm_9.fetchDeps {
@ -27,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: {
pnpmWorkspaces pnpmWorkspaces
prePnpmInstall prePnpmInstall
; ;
hash = "sha256-TxWaapm/nkyMi3JCj6TE56DhJYPBWBDGXOnzgB9uPjs="; hash = "sha256-SUEq20gZCiTDkFuNgMc5McHBPgW++8P9Q1MJb7a7pY8=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

6
pkgs/by-name/va/vale/package.nix
View file

@ -11,7 +11,7 @@
buildGoModule rec { buildGoModule rec {
pname = "vale"; pname = "vale";
version = "3.11.2"; version = "3.12.0";
subPackages = [ "cmd/vale" ]; subPackages = [ "cmd/vale" ];
@ -19,10 +19,10 @@ buildGoModule rec {
owner = "errata-ai"; owner = "errata-ai";
repo = "vale"; repo = "vale";
tag = "v${version}"; tag = "v${version}";
hash = "sha256-7wBMdATN2kAXUG6fWwq/8JifLrhxDjjPWlZSA47yrxM="; hash = "sha256-j228Gt2cHkO1XZv+KqH6U8EjttQzDZiOMLppdJUJwvA=";
}; };
vendorHash = "sha256-Zhhp/qbwGTQEZ28S+p7GJodwQcnkFNqNU7WCZKdeoz0="; vendorHash = "sha256-3gmgKcpCEeFjHpm+iKQvm4Cv5UfzFrcDDNIAnlY/a5s=";
ldflags = [ ldflags = [
"-s" "-s"

6
pkgs/by-name/we/wechat-uos/package.nix
View file

@ -210,6 +210,12 @@ buildFHSEnv {
substituteInPlace $out/share/applications/com.tencent.wechat.desktop \ substituteInPlace $out/share/applications/com.tencent.wechat.desktop \
--replace-quiet 'Exec=/usr/bin/wechat' "Exec=$out/bin/wechat-uos --" --replace-quiet 'Exec=/usr/bin/wechat' "Exec=$out/bin/wechat-uos --"
# See https://github.com/NixOS/nixpkgs/issues/413491
sed -i \
-e '/\[Desktop Entry\]/a\' \
-e 'StartupWMClass=wechat' \
$out/share/applications/com.tencent.wechat.desktop
''; '';
targetPkgs = pkgs: [ wechat-uos-env ]; targetPkgs = pkgs: [ wechat-uos-env ];

4
pkgs/development/python-modules/aioamazondevices/default.nix
View file

@ -16,14 +16,14 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "aioamazondevices"; pname = "aioamazondevices";
version = "3.0.5"; version = "3.0.6";
pyproject = true; pyproject = true;
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "chemelli74"; owner = "chemelli74";
repo = "aioamazondevices"; repo = "aioamazondevices";
tag = "v${version}"; tag = "v${version}";
hash = "sha256-CgIkrq5Eni7Iva/bzlcbj1/mqtKPA4mknHC/fQzL7RU="; hash = "sha256-+o3LOp0gSjG1/x5IFA0FK5LQUFG9T6JgDLb104vJcM0=";
}; };
build-system = [ poetry-core ]; build-system = [ poetry-core ];

4
pkgs/development/python-modules/aioimmich/default.nix
View file

@ -13,14 +13,14 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "aioimmich"; pname = "aioimmich";
version = "0.9.0"; version = "0.9.1";
pyproject = true; pyproject = true;
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "mib1185"; owner = "mib1185";
repo = "aioimmich"; repo = "aioimmich";
tag = "v${version}"; tag = "v${version}";
hash = "sha256-s2W/Z/psCLvd7zMsaaYi3ZIcEuuRSpyRSvUUfIPe8a4="; hash = "sha256-bEbWvDNcKH/9Mtr3fZMk7+Qa41suSUpVAGAsnCmzGaY=";
}; };
postPatch = '' postPatch = ''

4
pkgs/development/python-modules/google-genai/default.nix
View file

@ -16,14 +16,14 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "google-genai"; pname = "google-genai";
version = "1.17.0"; version = "1.19.0";
pyproject = true; pyproject = true;
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "googleapis"; owner = "googleapis";
repo = "python-genai"; repo = "python-genai";
tag = "v${version}"; tag = "v${version}";
hash = "sha256-ks8MU+Sg6TM57QiNmZD6rTGF8Di32mKtHFTF1pCTouQ="; hash = "sha256-p9W34v1ToLwketM+wOfrouLLl9pFBljL5doykuZRINo=";
}; };
build-system = [ build-system = [

2
pkgs/development/python-modules/gotify/default.nix
View file

@ -33,7 +33,7 @@ buildPythonPackage rec {
]; ];
# tests raise an exception if the system is not Linux or Windows # tests raise an exception if the system is not Linux or Windows
doCheck = !stdenv.isDarwin; doCheck = !stdenv.buildPlatform.isDarwin;
# tests require gotify-server to be located in ./tests/test-server/gotify-linux-{arch} # tests require gotify-server to be located in ./tests/test-server/gotify-linux-{arch}
postPatch = '' postPatch = ''

4
pkgs/development/python-modules/netbox-routing/default.nix
View file

@ -11,14 +11,14 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "netbox-routing"; pname = "netbox-routing";
version = "0.3.0"; version = "0.3.1";
pyproject = true; pyproject = true;
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "DanSheps"; owner = "DanSheps";
repo = "netbox-routing"; repo = "netbox-routing";
tag = "v${version}"; tag = "v${version}";
hash = "sha256-QJ4/6eRPo2SIgOWNiK+3jrXW+KaXvzERLcXQqKwCNDU="; hash = "sha256-qtGzZDRo80pdmt3CbM+HG/S7uLvLS7V6lHNB8sM6bcA=";
}; };
build-system = [ setuptools ]; build-system = [ setuptools ];

36
pkgs/development/python-modules/pdfminer-six/default.nix
View file

@ -2,53 +2,39 @@
lib, lib,
buildPythonPackage, buildPythonPackage,
fetchFromGitHub, fetchFromGitHub,
fetchpatch2,
cryptography, cryptography,
charset-normalizer, charset-normalizer,
pythonOlder,
pytestCheckHook, pytestCheckHook,
setuptools, setuptools,
replaceVars, setuptools-scm,
ocrmypdf, ocrmypdf,
}: }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "pdfminer-six"; pname = "pdfminer-six";
version = "20240706"; version = "20250506";
pyproject = true; pyproject = true;
disabled = pythonOlder "3.8";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "pdfminer"; owner = "pdfminer";
repo = "pdfminer.six"; repo = "pdfminer.six";
tag = version; tag = version;
hash = "sha256-aY7GQADRxeiclr6/G3RRgrPcl8rGiC85JYEIjIa+vG0="; hash = "sha256-BE/HMl/e1KnkSc2jXU5Du5FMF+rCBv5AJ7a88oFrBgM=";
}; };
patches = [ build-system = [
# https://github.com/pdfminer/pdfminer.six/pull/1027 setuptools
(fetchpatch2 { setuptools-scm
name = "fix-dereference-MediaBox.patch";
url = "https://github.com/pdfminer/pdfminer.six/pull/1027/commits/ad101c152c71431a21bfa5a8dbe33b3ba385ceec.patch?full_index=1";
excludes = [ "CHANGELOG.md" ];
hash = "sha256-fsSXvN92MVtNFpAst0ctvGrbxVvoe4Nyz4wMZqJ1aw8=";
})
(replaceVars ./disable-setuptools-git-versioning.patch {
inherit version;
})
]; ];
build-system = [ setuptools ];
dependencies = [ dependencies = [
charset-normalizer charset-normalizer
cryptography cryptography
]; ];
postInstall = '' postInstall = ''
for file in $out/bin/*.py; do for file in "$out/bin/"*.py; do
ln $file ''${file//.py/} mv "$file" "''${file%.py}"
done done
''; '';
@ -71,11 +57,11 @@ buildPythonPackage rec {
}; };
}; };
meta = with lib; { meta = {
changelog = "https://github.com/pdfminer/pdfminer.six/blob/${src.rev}/CHANGELOG.md"; changelog = "https://github.com/pdfminer/pdfminer.six/blob/${src.rev}/CHANGELOG.md";
description = "PDF parser and analyzer"; description = "PDF parser and analyzer";
homepage = "https://github.com/pdfminer/pdfminer.six"; homepage = "https://github.com/pdfminer/pdfminer.six";
license = licenses.mit; license = lib.licenses.mit;
maintainers = with maintainers; [ psyanticy ]; maintainers = with lib.maintainers; [ psyanticy ];
}; };
} }

16
pkgs/development/python-modules/pdfminer-six/disable-setuptools-git-versioning.patch
View file

@ -1,16 +0,0 @@
diff --git a/setup.py b/setup.py
index 42764e2..e7b93d3 100644
--- a/setup.py
+++ b/setup.py
@@ -19,10 +19,7 @@ if sys.version_info < (3, 12):
setup(
name="pdfminer.six",
- setuptools_git_versioning={
- "enabled": True,
- },
- setup_requires=["setuptools-git-versioning<3"],
+ version="@version@",
packages=["pdfminer"],
package_data={"pdfminer": ["cmap/*.pickle.gz", "py.typed"]},
install_requires=[

29
pkgs/development/python-modules/pdfplumber/default.nix
View file

@ -1,8 +1,9 @@
{ {
lib,
pkgs, pkgs,
lib,
buildPythonPackage, buildPythonPackage,
fetchFromGitHub, fetchFromGitHub,
setuptools,
jupyterlab, jupyterlab,
nbexec, nbexec,
pandas, pandas,
@ -14,33 +15,29 @@
pytest-parallel, pytest-parallel,
pytestCheckHook, pytestCheckHook,
types-pillow, types-pillow,
writableTmpDirAsHomeHook,
}: }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "pdfplumber"; pname = "pdfplumber";
version = "0.11.5"; version = "0.11.6";
format = "setuptools"; pyproject = true;
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "jsvine"; owner = "jsvine";
repo = "pdfplumber"; repo = "pdfplumber";
tag = "v${version}"; tag = "v${version}";
hash = "sha256-oe6lZyQKXASzG7Ho6o7mlXY+BOgVBaACebxbYD+1+x0="; hash = "sha256-ljoM252w0oOqTUgYT6jtAW+jElPU9a49K6Atwdv5Dvo=";
}; };
build-system = [ setuptools ];
dependencies = [ dependencies = [
pdfminer-six pdfminer-six
pillow pillow
pypdfium2 pypdfium2
]; ];
preCheck = ''
export HOME=$(mktemp -d)
# test_issue_1089 assumes the soft limit on open files is "low", otherwise it never completes
# reported at: https://github.com/jsvine/pdfplumber/issues/1263
ulimit -n 1024
'';
nativeCheckInputs = [ nativeCheckInputs = [
pkgs.ghostscript pkgs.ghostscript
jupyterlab jupyterlab
@ -51,6 +48,16 @@ buildPythonPackage rec {
pytest-parallel pytest-parallel
pytestCheckHook pytestCheckHook
types-pillow types-pillow
writableTmpDirAsHomeHook
];
pythonRelaxDeps = [ "pdfminer.six" ];
disabledTestPaths = [
# AssertionError
"tests/test_convert.py::Test::test_cli_csv"
"tests/test_convert.py::Test::test_cli_csv_exclude"
"tests/test_convert.py::Test::test_csv"
]; ];
pythonImportsCheck = [ "pdfplumber" ]; pythonImportsCheck = [ "pdfplumber" ];

6
pkgs/development/python-modules/pdoc/default.nix
View file

@ -15,7 +15,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "pdoc"; pname = "pdoc";
version = "15.0.3"; version = "15.0.4";
disabled = pythonOlder "3.9"; disabled = pythonOlder "3.9";
pyproject = true; pyproject = true;
@ -23,8 +23,8 @@ buildPythonPackage rec {
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "mitmproxy"; owner = "mitmproxy";
repo = "pdoc"; repo = "pdoc";
rev = "v${version}"; tag = "v${version}";
hash = "sha256-qr0K+ZOmEPWMkm/cPisdw6gSPZI4FvICaKQNt/sef40="; hash = "sha256-l0aaQbjxAMcTZZwDN6g8A7bjSsl6yP2FoAnwTYkKYH8=";
}; };
build-system = [ setuptools ]; build-system = [ setuptools ];

56
pkgs/games/openttd/default.nix
View file

@ -11,7 +11,6 @@
xz, xz,
freetype, freetype,
fontconfig, fontconfig,
nlohmann_json,
curl, curl,
icu, icu,
harfbuzz, harfbuzz,
@ -35,30 +34,43 @@
alsa-lib, alsa-lib,
libjack2, libjack2,
makeWrapper, makeWrapper,
buildPackages,
}: }:
let let
opengfx = fetchzip { opengfx = fetchzip {
url = "https://cdn.openttd.org/opengfx-releases/7.1/opengfx-7.1-all.zip"; url = "https://cdn.openttd.org/opengfx-releases/7.1/opengfx-7.1-all.zip";
sha256 = "sha256-daJ/Qwg/okpmLQkXcCjruIiP8GEwyyp02YWcGQepxzs="; hash = "sha256-daJ/Qwg/okpmLQkXcCjruIiP8GEwyyp02YWcGQepxzs=";
}; };
opensfx = fetchzip { opensfx = fetchzip {
url = "https://cdn.openttd.org/opensfx-releases/1.0.3/opensfx-1.0.3-all.zip"; url = "https://cdn.openttd.org/opensfx-releases/1.0.3/opensfx-1.0.3-all.zip";
sha256 = "sha256-QmfXizrRTu/fUcVOY7tCndv4t4BVW+fb0yUi8LgSYzM="; hash = "sha256-QmfXizrRTu/fUcVOY7tCndv4t4BVW+fb0yUi8LgSYzM=";
}; };
openmsx = fetchzip { openmsx = fetchzip {
url = "https://cdn.openttd.org/openmsx-releases/0.4.2/openmsx-0.4.2-all.zip"; url = "https://cdn.openttd.org/openmsx-releases/0.4.2/openmsx-0.4.2-all.zip";
sha256 = "sha256-Cgrg2m+uTODFg39mKgX+hE8atV7v5bVyZd716vSZB8M="; hash = "sha256-Cgrg2m+uTODFg39mKgX+hE8atV7v5bVyZd716vSZB8M=";
}; };
# OpenTTD builds and uses some of its own tools during the build and we need those to be available for cross-compilation.
# Build the tools for buildPlatform with minimal dependencies, using the "OPTION_TOOLS_ONLY" flag.
crossTools = buildPackages.openttd.overrideAttrs (oldAttrs: {
pname = "openttd-tools";
buildInputs = [ ];
cmakeFlags = oldAttrs.cmakeFlags or [ ] ++ [ (lib.cmakeBool "OPTION_TOOLS_ONLY" true) ];
installPhase = ''
install -Dm555 src/strgen/strgen -t $out/bin
install -Dm555 src/settingsgen/settingsgen -t $out/bin
'';
});
in in
stdenv.mkDerivation rec { stdenv.mkDerivation (finalAttrs: {
pname = "openttd"; pname = "openttd";
version = "14.1"; version = "14.1";
src = fetchzip { src = fetchzip {
url = "https://cdn.openttd.org/openttd-releases/${version}/${pname}-${version}-source.tar.xz"; url = "https://cdn.openttd.org/openttd-releases/${finalAttrs.version}/openttd-${finalAttrs.version}-source.tar.xz";
hash = "sha256-YT4IE/rJ9pnpeMWKbOra6AbSUwW19RwOKlXkxwoMeKY="; hash = "sha256-YT4IE/rJ9pnpeMWKbOra6AbSUwW19RwOKlXkxwoMeKY=";
}; };
@ -72,11 +84,16 @@ stdenv.mkDerivation rec {
}) })
]; ];
nativeBuildInputs = [ nativeBuildInputs =
cmake [
pkg-config cmake
makeWrapper pkg-config
]; makeWrapper
]
++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [
crossTools
];
buildInputs = buildInputs =
[ [
SDL2 SDL2
@ -85,7 +102,6 @@ stdenv.mkDerivation rec {
zlib zlib
freetype freetype
fontconfig fontconfig
nlohmann_json
curl curl
icu icu
harfbuzz harfbuzz
@ -107,9 +123,7 @@ stdenv.mkDerivation rec {
libjack2 libjack2
]; ];
prefixKey = "--prefix-dir="; strictDeps = true;
configureFlags = [ "--without-liblzo2" ];
postPatch = '' postPatch = ''
substituteInPlace src/music/fluidsynth.cpp \ substituteInPlace src/music/fluidsynth.cpp \
@ -128,7 +142,7 @@ stdenv.mkDerivation rec {
tar -xf ${openmsx}/*.tar -C $out/share/games/openttd/baseset tar -xf ${openmsx}/*.tar -C $out/share/games/openttd/baseset
''; '';
meta = with lib; { meta = {
description = ''Open source clone of the Microprose game "Transport Tycoon Deluxe"''; description = ''Open source clone of the Microprose game "Transport Tycoon Deluxe"'';
mainProgram = "openttd"; mainProgram = "openttd";
longDescription = '' longDescription = ''
@ -142,12 +156,12 @@ stdenv.mkDerivation rec {
- observe as spectators - observe as spectators
''; '';
homepage = "https://www.openttd.org/"; homepage = "https://www.openttd.org/";
changelog = "https://cdn.openttd.org/openttd-releases/${version}/changelog.txt"; changelog = "https://cdn.openttd.org/openttd-releases/${finalAttrs.version}/changelog.txt";
license = licenses.gpl2Only; license = lib.licenses.gpl2Only;
platforms = platforms.linux; platforms = lib.platforms.linux;
maintainers = with maintainers; [ maintainers = with lib.maintainers; [
jcumming jcumming
fpletz fpletz
]; ];
}; };
} })