mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-18 03:30:45 +00:00
Code Issues Wiki Activity

Merge remote-tracking branch 'origin/master' into staging-next

Browse source 
Conflicts:
- pkgs/development/python-modules/pixel-font-builder/default.nix
- pkgs/development/python-modules/unidata-blocks/default.nix
This commit is contained in:
Martin Weinelt 2024-06-24 15:34:55 +02:00
parent c05a24c10b 6acfb07b7f
commit c02aa9b62f
No known key found for this signature in database
GPG key ID: 87C1E9888F856759
19 changed files with 125 additions and 232 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
doc/languages-frameworks/vim.section.md
View file

@ -214,7 +214,7 @@ Note: this is not possible anymore for Neovim.
Nix expressions for Vim plugins are stored in [pkgs/applications/editors/vim/plugins](https://github.com/NixOS/nixpkgs/tree/master/pkgs/applications/editors/vim/plugins). For the vast majority of plugins, Nix expressions are automatically generated by running [`nix-shell -p vimPluginsUpdater --run vim-plugins-updater`](https://github.com/NixOS/nixpkgs/blob/master/pkgs/applications/editors/vim/plugins/updater.nix). This creates a [generated.nix](https://github.com/NixOS/nixpkgs/blob/master/pkgs/applications/editors/vim/plugins/generated.nix) file based on the plugins listed in [vim-plugin-names](https://github.com/NixOS/nixpkgs/blob/master/pkgs/applications/editors/vim/plugins/vim-plugin-names).
After running the updater, if nvim-treesitter received an update, also run [`nvim-treesitter/update.py`](https://github.com/NixOS/nixpkgs/blob/master/pkgs/applications/editors/vim/plugins/update.py) to update the tree sitter grammars for `nvim-treesitter`.
When the vim updater detects an nvim-treesitter update, it also runs [`nvim-treesitter/update.py $(nix-build -A vimPlugins.nvim-treesitter)`](https://github.com/NixOS/nixpkgs/blob/master/pkgs/applications/editors/vim/plugins/update.py) to update the tree sitter grammars for `nvim-treesitter`.
Some plugins require overrides in order to function properly. Overrides are placed in [overrides.nix](https://github.com/NixOS/nixpkgs/blob/master/pkgs/applications/editors/vim/plugins/overrides.nix). Overrides are most often required when a plugin requires some dependencies, or extra steps are required during the build process. For example `deoplete-fish` requires both `deoplete-nvim` and `vim-fish`, and so the following override was added:

6
maintainers/maintainer-list.nix
View file

@ -19560,6 +19560,12 @@
githubId = 870673;
name = "Takuo Yonezawa";
};
TakWolf = {
email = "takwolf@foxmail.com";
github = "TakWolf";
githubId = 6064962;
name = "TakWolf";
};
talkara = {
email = "taito.horiuchi@relexsolutions.com";
github = "talkara";

2
pkgs/applications/editors/vim/plugins/nvim-treesitter/update.py
View file

@ -94,5 +94,5 @@ def update_grammars(nvim_treesitter_dir: str):
if __name__ == "__main__":
generated = update_grammars(sys.args[1])
generated = update_grammars(sys.argv[1])
open(join(os.path.dirname(__file__), "generated.nix"), "w").write(generated)

6
pkgs/applications/graphics/monado/default.nix
View file

@ -83,6 +83,7 @@ stdenv.mkDerivation {
"-DXRT_OPENXR_INSTALL_ABSOLUTE_RUNTIME_PATH=ON"
"-DXRT_HAVE_TRACY=ON"
"-DXRT_FEATURE_TRACING=ON"
"-DXRT_HAVE_STEAM=ON"
];
buildInputs = [
@ -142,11 +143,6 @@ stdenv.mkDerivation {
export XDG_CONFIG_DIRS=@out@/etc/xdg''${XDG_CONFIG_DIRS:+:''${XDG_CONFIG_DIRS}}
'';
patches = [
# We don't have $HOME/.steam when building
./force-enable-steamvr_lh.patch
];
passthru.tests = {
basic-service = nixosTests.monado;
};

12
pkgs/applications/graphics/monado/force-enable-steamvr_lh.patch
View file

@ -1,12 +0,0 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4308d73d..0081d536 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -219,6 +219,7 @@ option(BUILD_TESTING "Enable building of the test suite?" ON)
if(EXISTS "$ENV{HOME}/.steam/root")
set(XRT_HAVE_STEAM YES)
endif()
+set(XRT_HAVE_STEAM YES)
if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
set(XRT_HAVE_INTERNAL_HID ON)

11
pkgs/applications/virtualization/crosvm/default.nix
View file

@ -1,4 +1,4 @@
{ lib, rustPlatform, fetchgit
{ lib, rustPlatform, fetchgit, fetchpatch
, pkg-config, protobuf, python3, wayland-scanner
, libcap, libdrm, libepoxy, minijail, virglrenderer, wayland, wayland-protocols
}:
@ -14,6 +14,15 @@ rustPlatform.buildRustPackage rec {
fetchSubmodules = true;
};
patches = [
(fetchpatch {
name = "musl.patch";
url = "https://chromium.googlesource.com/chromiumos/platform/crosvm/+/128e591037c0be0362ed814d0b5583aa65ff09e1%5E%21/?format=TEXT";
decode = "base64 -d";
hash = "sha256-p5VzHRb0l0vCJNe48cRl/uBYHwTQMEykMcBOMzL3yaY=";
})
];
separateDebugInfo = true;
cargoHash = "sha256-1AUfd9dhIZvVVUsVbnGoLKc0lBfccwM4wqWgU4yZWOE=";

4
pkgs/applications/window-managers/e16/default.nix
View file

@ -16,6 +16,7 @@
, libsndfile
, pango
, perl
, python3
, gitUpdater
}:
@ -47,10 +48,13 @@ stdenv.mkDerivation rec {
libsndfile
pango
perl
python3
];
postPatch = ''
substituteInPlace scripts/e_gen_menu --replace "/usr/local:" "/run/current-system/sw:/usr/local:"
substituteInPlace scripts/e_gen_menu --replace "'/opt'" "'/opt', '/run/current-system/sw'"
substituteInPlace scripts/e_gen_menu --replace "'/.local'" "'/.nix-profile', '/.local'"
'';
passthru.updateScript = gitUpdater {

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

@ -19,7 +19,9 @@ buildPythonPackage rec {
owner = "amaranth-lang";
repo = "amaranth-boards";
rev = "aba2300dc83216523e1c98fdb22471cb4bac5027";
hash = "sha256-IMhNMkOf6dg4Djyi39TDTpU0S3TQM1+e6TBoyiITaos=";
# these files change depending on git branch status
postFetch = "rm -f $out/.git_archival.txt $out/.gitattributes";
hash = "sha256-jldXyMJtuSGcZKmtwpZBYrR/UBe4ufblPYRYpBmReM8=";
};
nativeBuildInputs = [

27
pkgs/development/python-modules/bdffont/default.nix
View file

@ -2,42 +2,41 @@
lib,
buildPythonPackage,
fetchPypi,
pytestCheckHook,
pythonOlder,
pytestCheckHook,
nix-update-script,
hatch-vcs,
hatchling,
brotli,
fonttools,
}:
buildPythonPackage rec {
pname = "bdffont";
version = "0.0.26";
pyproject = true;
disabled = pythonOlder "3.11";
disabled = pythonOlder "3.10";
src = fetchPypi {
inherit pname version;
pname = "bdffont";
inherit version;
hash = "sha256-Q8IqwJmAYFicTX7RrVU9UvGZX+oaPb0RKlIFwArktXk=";
};
format = "pyproject";
nativeBuildInputs = [
hatch-vcs
hatchling
];
build-system = [ hatchling ];
nativeCheckInputs = [ pytestCheckHook ];
pythonImportsCheck = [ "bdffont" ];
passthru.updateScript = nix-update-script { };
meta = {
homepage = "https://github.com/TakWolf/bdffont";
description = "Library for manipulating .bdf format fonts";
description = "A library for manipulating Glyph Bitmap Distribution Format (BDF) Fonts";
platforms = lib.platforms.all;
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ h7x4 ];
maintainers = with lib.maintainers; [
TakWolf
h7x4
];
};
}

23
pkgs/development/python-modules/character-encoding-utils/default.nix
View file

@ -2,10 +2,10 @@
lib,
buildPythonPackage,
fetchPypi,
hatch-vcs,
hatchling,
pytestCheckHook,
pythonOlder,
pytestCheckHook,
nix-update-script,
hatchling,
}:
buildPythonPackage rec {
@ -13,7 +13,7 @@ buildPythonPackage rec {
version = "0.0.8";
pyproject = true;
disabled = pythonOlder "3.11";
disabled = pythonOlder "3.10";
src = fetchPypi {
pname = "character_encoding_utils";
@ -21,19 +21,22 @@ buildPythonPackage rec {
hash = "sha256-UXX4L/x7fP37ZEFDCPc0KRNyx47xvwY0Jz+lfxzUulg=";
};
build-system = [
hatch-vcs
hatchling
];
build-system = [ hatchling ];
nativeCheckInputs = [ pytestCheckHook ];
pythonImportsCheck = [ "character_encoding_utils" ];
passthru.updateScript = nix-update-script { };
meta = {
description = "Some character encoding utils";
homepage = "https://github.com/TakWolf/character-encoding-utils";
description = "Some character encoding utils";
platforms = lib.platforms.all;
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ h7x4 ];
maintainers = with lib.maintainers; [
TakWolf
h7x4
];
};
}

26
pkgs/development/python-modules/pcffont/default.nix
View file

@ -1,11 +1,12 @@
{
lib,
buildPythonPackage,
fetchFromGitHub,
hatchling,
bdffont,
fetchPypi,
pythonOlder,
pytestCheckHook,
nix-update-script,
hatchling,
bdffont,
}:
buildPythonPackage rec {
@ -13,11 +14,12 @@ buildPythonPackage rec {
version = "0.0.14";
pyproject = true;
src = fetchFromGitHub {
owner = "TakWolf";
repo = "pcffont";
rev = "refs/tags/${version}";
hash = "sha256-UIRhUlsRd3ICdLAjUasQ1NX5NofSKCEqa8cf1c1voGM=";
disabled = pythonOlder "3.10";
src = fetchPypi {
pname = "pcffont";
inherit version;
hash = "sha256-S3mK4tY7zNGRX8K81QJVvaYpIaTDLx5zn4vKbhrK9VM=";
};
build-system = [ hatchling ];
@ -31,9 +33,13 @@ buildPythonPackage rec {
passthru.updateScript = nix-update-script { };
meta = {
description = "Library for manipulating Portable Compiled Format (PCF) fonts";
homepage = "https://github.com/TakWolf/pcffont";
description = "A library for manipulating Portable Compiled Format (PCF) Fonts";
platforms = lib.platforms.all;
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ ];
maintainers = with lib.maintainers; [
TakWolf
h7x4
];
};
}

38
pkgs/development/python-modules/pixel-font-builder/default.nix
View file

@ -2,16 +2,15 @@
lib,
buildPythonPackage,
fetchPypi,
pytestCheckHook,
pythonOlder,
pytestCheckHook,
nix-update-script,
hatch-vcs,
hatchling,
bdffont,
brotli,
fonttools,
pypng,
brotli,
bdffont,
pcffont,
pypng,
}:
buildPythonPackage rec {
@ -27,25 +26,19 @@ buildPythonPackage rec {
hash = "sha256-bgs2FbOA5tcUXe5+KuVztWGAv5yFxQNBaiZMeZ+ic+8=";
};
pythonRelaxDeps = [ "fonttools" ];
build-system = [ hatchling ];
build-system = [
hatch-vcs
hatchling
];
nativeCheckInputs = [
pytestCheckHook
dependencies = [
fonttools
brotli
bdffont
pcffont
pypng
];
dependencies = [
bdffont
brotli
fonttools
pcffont
];
nativeCheckInputs = [ pytestCheckHook ];
pythonImportsCheck = [ "pixel_font_builder" ];
passthru.updateScript = nix-update-script { };
@ -54,6 +47,9 @@ buildPythonPackage rec {
description = "Library that helps create pixel style fonts";
platforms = lib.platforms.all;
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ h7x4 ];
maintainers = with lib.maintainers; [
TakWolf
h7x4
];
};
}

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

@ -12,7 +12,7 @@
buildPythonPackage rec {
pname = "pygame-gui";
version = "0611";
version = "0612";
pyproject = true;
# nixpkgs-update: no auto update
@ -20,7 +20,7 @@ buildPythonPackage rec {
owner = "MyreMylar";
repo = "pygame_gui";
rev = "refs/tags/v_${version}";
hash = "sha256-bibw6RUQKsOsaISunVEdQCT39KnXJ2VKVrAqsPS+Lu8=";
hash = "sha256-6Ps3pmQ8tYwQyv0TliOvUNLy3GjSJ2jdDQTTxfYej0o=";
};
nativeBuildInputs = [ setuptools ];

21
pkgs/development/python-modules/pyside6/default.nix
View file

@ -8,18 +8,12 @@
shiboken6,
}:
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "pyside6";
inherit (shiboken6) version src;
patches = [
# stripped down version of https://github.com/pyside/pyside-setup/commit/a0d68856d67ce6e178e3cfc2fccc236707e02fcd
# FIXME: remove in next release
./qt-6.7.1.patch
];
sourceRoot = "pyside-setup-everywhere-src-${version}/sources/${pname}";
sourceRoot = "pyside-setup-everywhere-src-${finalAttrs.version}/sources/pyside6";
# FIXME: cmake/Macros/PySideModules.cmake supposes that all Qt frameworks on macOS
# reside in the same directory as QtCore.framework, which is not true for Nix.
@ -80,18 +74,19 @@ stdenv.mkDerivation rec {
cp -r PySide6.egg-info $out/${python.sitePackages}/
'';
meta = with lib; {
meta = {
description = "Python bindings for Qt";
license = with licenses; [
license = with lib.licenses; [
lgpl3Only
gpl2Only
gpl3Only
];
homepage = "https://wiki.qt.io/Qt_for_Python";
maintainers = with maintainers; [
changelog = "https://code.qt.io/cgit/pyside/pyside-setup.git/tree/doc/changelogs/changes-${finalAttrs.version}?h=v${finalAttrs.version}";
maintainers = with lib.maintainers; [
gebner
Enzime
];
platforms = platforms.all;
platforms = lib.platforms.all;
};
}
})

87
pkgs/development/python-modules/pyside6/qt-6.7.1.patch
View file

@ -1,87 +0,0 @@
--- a/PySide6/QtMultimedia/CMakeLists.txt
+++ b/PySide6/QtMultimedia/CMakeLists.txt
@@ -12,6 +12,7 @@ ${QtMultimedia_GEN_DIR}/qaudioinput_wrapper.cpp
${QtMultimedia_GEN_DIR}/qaudiooutput_wrapper.cpp
${QtMultimedia_GEN_DIR}/qaudiosink_wrapper.cpp
${QtMultimedia_GEN_DIR}/qaudiosource_wrapper.cpp
+${QtMultimedia_GEN_DIR}/qaudio_wrapper.cpp
${QtMultimedia_GEN_DIR}/qcameraformat_wrapper.cpp
${QtMultimedia_GEN_DIR}/qcameradevice_wrapper.cpp
${QtMultimedia_GEN_DIR}/qcamera_wrapper.cpp
@@ -28,7 +29,6 @@ ${QtMultimedia_GEN_DIR}/qmediatimerange_wrapper.cpp
${QtMultimedia_GEN_DIR}/qmediatimerange_interval_wrapper.cpp
${QtMultimedia_GEN_DIR}/qscreencapture_wrapper.cpp
${QtMultimedia_GEN_DIR}/qsoundeffect_wrapper.cpp
-${QtMultimedia_GEN_DIR}/qtaudio_wrapper.cpp
${QtMultimedia_GEN_DIR}/qtvideo_wrapper.cpp
${QtMultimedia_GEN_DIR}/qvideoframe_wrapper.cpp
${QtMultimedia_GEN_DIR}/qvideoframeformat_wrapper.cpp
diff --git a/PySide6/QtMultimedia/typesystem_multimedia.xml b/PySide6/QtMultimedia/typesystem_multimedia.xml
index dd58f41cc..d37eb15fd 100644
--- a/PySide6/QtMultimedia/typesystem_multimedia.xml
+++ b/PySide6/QtMultimedia/typesystem_multimedia.xml
@@ -9,7 +9,7 @@
<load-typesystem name="QtGui/typesystem_gui.xml" generate="no"/>
<load-typesystem name="QtNetwork/typesystem_network.xml" generate="no"/>
- <namespace-type name="QtAudio">
+ <namespace-type name="QAudio">
<enum-type name="Error"/>
<enum-type name="State"/>
<enum-type name="VolumeScale"/>
@@ -65,9 +65,6 @@
</modify-argument>
</modify-function>
<modify-function signature="stop()" allow-thread="true"/>
- <!-- FIXME PYSIDE 7: Remove this (QT6_DECL_NEW_OVERLOAD_TAIL) -->
- <declare-function signature="state()const" return-type="QtAudio::State"/>
- <declare-function signature="error()const" return-type="QtAudio::Error"/>
</object-type>
<object-type name="QAudioSink">
@@ -82,9 +79,6 @@
</modify-argument>
</modify-function>
<modify-function signature="stop()" allow-thread="true"/>
- <!-- FIXME PYSIDE 7: Remove this (QT6_DECL_NEW_OVERLOAD_TAIL) -->
- <declare-function signature="state()const" return-type="QtAudio::State"/>
- <declare-function signature="error()const" return-type="QtAudio::Error"/>
</object-type>
<object-type name="QCamera">
diff --git a/PySide6/glue/qtmultimedia.cpp b/PySide6/glue/qtmultimedia.cpp
index d193b1bd3..ac8434b97 100644
--- a/PySide6/glue/qtmultimedia.cpp
+++ b/PySide6/glue/qtmultimedia.cpp
@@ -2,6 +2,7 @@
// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
// @snippet qvideoframe-bits
+#include "object.h"
%BEGIN_ALLOW_THREADS
%RETURN_TYPE %0 = %CPPSELF.%FUNCTION_NAME(%1);
%END_ALLOW_THREADS
@@ -23,5 +24,5 @@ const auto size = %CPPSELF.byteCount();
// @snippet qtaudio-namespace-compatibility-alias
Py_INCREF(pyType);
-PyModule_AddObject(module, "QAudio", reinterpret_cast<PyObject *>(pyType));
+PyModule_AddObject(module, "QtAudio", reinterpret_cast<PyObject *>(pyType));
// @snippet qtaudio-namespace-compatibility-alias
diff --git a/libpyside/signalmanager.cpp b/libpyside/signalmanager.cpp
index 625e4a405..557f130e0 100644
--- a/libpyside/signalmanager.cpp
+++ b/libpyside/signalmanager.cpp
@@ -813,11 +813,6 @@ static PyObject *parseArguments(const QMetaMethod &method, void **args)
for (qsizetype i = 0; i < argsSize; ++i) {
void *data = args[i+1];
auto param = paramTypes.at(i);
-#if QT_VERSION < QT_VERSION_CHECK(7, 0, 0)
- // Qt 6.7 renamed namespace "QAudio"->"QtAudio" except for signals
- if (param.startsWith("QAudio::"_ba))
- param.insert(1, 't');
-#endif
Shiboken::Conversions::SpecificConverter converter(param.constData());
if (!converter) {
PyErr_SetString(PyExc_TypeError, msgCannotConvertParameter(method, i).constData());

48
pkgs/development/python-modules/shiboken6/default.nix
View file

@ -1,7 +1,6 @@
{
lib,
fetchurl,
fetchpatch,
llvmPackages,
python,
cmake,
@ -12,28 +11,19 @@
let
stdenv' = if stdenv.cc.isClang then stdenv else llvmPackages.stdenv;
in
stdenv'.mkDerivation rec {
stdenv'.mkDerivation (finalAttrs: {
pname = "shiboken6";
version = "6.7.0";
version = "6.7.2";
src = fetchurl {
# https://download.qt.io/official_releases/QtForPython/shiboken6/
url = "https://download.qt.io/official_releases/QtForPython/shiboken6/PySide6-${version}-src/pyside-setup-everywhere-src-${version}.tar.xz";
hash = "sha256-gurjcHN99ez1OcFl0J18gdX8YVOlQbjT03sRJ1+ePo8=";
url = "mirror://qt/official_releases/QtForPython/shiboken6/PySide6-${finalAttrs.version}-src/pyside-setup-everywhere-src-${finalAttrs.version}.tar.xz";
hash = "sha256-OisNDW54yapd3H8GyktvEaP+FFYLrrFI7qU7XZjjaMc=";
};
sourceRoot = "pyside-setup-everywhere-src-${version}/sources/${pname}";
sourceRoot = "pyside-setup-everywhere-src-${finalAttrs.version}/sources/shiboken6";
patches = [
./fix-include-qt-headers.patch
# Remove this patch when updating to 6.8.0
(fetchpatch {
name = "backwards-compatibility-with-6.6.x.patch";
url = "https://code.qt.io/cgit/pyside/pyside-setup.git/patch/?id=4f9a20e3635f4f0957e0774588b1d9156e88a572";
hash = "sha256-B2jhLWopgaSF/rUXMZFPZArDUNojlBgn7kdVyQull+I=";
stripLen = 2;
})
];
patches = [ ./fix-include-qt-headers.patch ];
nativeBuildInputs = [
cmake
@ -57,21 +47,6 @@ stdenv'.mkDerivation rec {
substituteInPlace cmake/ShibokenHelpers.cmake --replace-fail '#!/bin/bash' '#!''${BASH}'
'';
# Due to Shiboken.abi3.so being linked to libshiboken6.abi3.so.6.6 in the build tree,
# we need to remove the build tree reference from the RPATH and then add the correct
# directory to the RPATH. On Linux, the second part is handled by autoPatchelfHook.
# https://bugreports.qt.io/browse/PYSIDE-2233
preFixup =
''
echo "fixing RPATH of Shiboken.abi3.so"
''
+ lib.optionalString stdenv.isDarwin ''
install_name_tool -change {@rpath,$out/lib}/libshiboken6.abi3.6.6.dylib $out/${python.sitePackages}/shiboken6/Shiboken.abi3.so
''
+ lib.optionalString stdenv.isLinux ''
patchelf $out/${python.sitePackages}/shiboken6/Shiboken.abi3.so --shrink-rpath --allowed-rpath-prefixes ${builtins.storeDir}
'';
postInstall = ''
cd ../../..
${python.pythonOnBuildForHost.interpreter} setup.py egg_info --build-type=shiboken6
@ -80,18 +55,19 @@ stdenv'.mkDerivation rec {
dontWrapQtApps = true;
meta = with lib; {
meta = {
description = "Generator for the pyside6 Qt bindings";
license = with licenses; [
license = with lib.licenses; [
lgpl3Only
gpl2Only
gpl3Only
];
homepage = "https://wiki.qt.io/Qt_for_Python";
maintainers = with maintainers; [
changelog = "https://code.qt.io/cgit/pyside/pyside-setup.git/tree/doc/changelogs/changes-${finalAttrs.version}?h=v${finalAttrs.version}";
maintainers = with lib.maintainers; [
gebner
Enzime
];
platforms = platforms.all;
platforms = lib.platforms.all;
};
}
})

22
pkgs/development/python-modules/unidata-blocks/default.nix
View file

@ -2,10 +2,9 @@
lib,
buildPythonPackage,
fetchPypi,
pytestCheckHook,
pythonOlder,
pytestCheckHook,
nix-update-script,
hatch-vcs,
hatchling,
langcodes,
}:
@ -13,8 +12,9 @@
buildPythonPackage rec {
pname = "unidata-blocks";
version = "0.0.12";
pyproject = true;
disabled = pythonOlder "3.11";
disabled = pythonOlder "3.10";
src = fetchPypi {
pname = "unidata_blocks";
@ -22,17 +22,16 @@ buildPythonPackage rec {
hash = "sha256-V8xmw8CDq0Y89pidcMF+f0A40PfAmkRwcduTFkUguU4=";
};
format = "pyproject";
build-system = [ hatchling ];
nativeBuildInputs = [
hatch-vcs
hatchling
dependencies = [
langcodes
];
propagatedBuildInputs = [ langcodes ];
nativeCheckInputs = [ pytestCheckHook ];
pythonImportsCheck = [ "unidata_blocks" ];
passthru.updateScript = nix-update-script { };
meta = {
@ -40,6 +39,9 @@ buildPythonPackage rec {
description = "Library that helps query unicode blocks by Blocks.txt";
platforms = lib.platforms.all;
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ h7x4 ];
maintainers = with lib.maintainers; [
TakWolf
h7x4
];
};
}

6
pkgs/servers/pocketbase/default.nix
View file

@ -6,16 +6,16 @@
buildGoModule rec {
pname = "pocketbase";
version = "0.22.13";
version = "0.22.14";
src = fetchFromGitHub {
owner = "pocketbase";
repo = "pocketbase";
rev = "v${version}";
hash = "sha256-eps1sLtE/yBLyq1iTzOWu+RqFAjAg4EXWV7QZnr2KjQ=";
hash = "sha256-d2gqw3IJBkU2sfBf5J0E45VzFtuSox4cHpPucsl/o4s=";
};
vendorHash = "sha256-hxI/0ask3iQW0Ox+HuJ6Oi1jiHF/0NZ+L7cLJijqyyQ=";
vendorHash = "sha256-G5VD5Joq/p1rur0SmK1xNQxtNZh7ZqR5I4j8fgswoDo=";
# This is the released subpackage from upstream repo
subPackages = [ "examples/base" ];

8
pkgs/tools/networking/haproxy/default.nix
View file

@ -14,7 +14,6 @@
, openssl
, lua5_4
, pcre2
, systemd
}:
assert lib.assertOneOf "sslLibrary" sslLibrary [ "quictls" "openssl" "libressl" "wolfssl" ];
@ -29,17 +28,16 @@ let
sslPkg = sslPkgs.${sslLibrary};
in stdenv.mkDerivation (finalAttrs: {
pname = "haproxy";
version = "2.9.7";
version = "3.0.2";
src = fetchurl {
url = "https://www.haproxy.org/download/${lib.versions.majorMinor finalAttrs.version}/src/haproxy-${finalAttrs.version}.tar.gz";
hash = "sha256-0aClbwCKjS8Ae8DDffaylSUg0fTd4zuNOAJxDlFYwTE=";
hash = "sha256-lnLuQ7EJ8ZNWw11yaHsiLc+CuHk2DG6CZ3OXN2z13DY=";
};
buildInputs = [ sslPkg zlib libxcrypt ]
++ lib.optional useLua lua5_4
++ lib.optional usePcre pcre2
++ lib.optional stdenv.isLinux systemd;
++ lib.optional usePcre pcre2;
# TODO: make it work on bsd as well
makeFlags = [