diff options
Diffstat (limited to 'pkgs/by-name')
87 files changed, 361 insertions, 201 deletions
diff --git a/pkgs/by-name/ad/ad-miner/package.nix b/pkgs/by-name/ad/ad-miner/package.nix index d5d224957a943..b77ecb7256bc5 100644 --- a/pkgs/by-name/ad/ad-miner/package.nix +++ b/pkgs/by-name/ad/ad-miner/package.nix @@ -22,10 +22,6 @@ python3.pkgs.buildPythonApplication rec { poetry-core ]; - nativeBuildInputs = with python3.pkgs; [ - pythonRelaxDepsHook - ]; - dependencies = with python3.pkgs; [ neo4j numpy diff --git a/pkgs/by-name/ai/airlift/package.nix b/pkgs/by-name/ai/airlift/package.nix index afcd1545aa663..1293a70cdb950 100644 --- a/pkgs/by-name/ai/airlift/package.nix +++ b/pkgs/by-name/ai/airlift/package.nix @@ -27,7 +27,6 @@ python3.pkgs.buildPythonApplication rec { nativeBuildInputs = [ python3.pkgs.poetry-core - python3.pkgs.pythonRelaxDepsHook ]; buildInputs = [ diff --git a/pkgs/by-name/al/alsa-plugins/package.nix b/pkgs/by-name/al/alsa-plugins/package.nix index ababb767955bb..bba1944f109e2 100644 --- a/pkgs/by-name/al/alsa-plugins/package.nix +++ b/pkgs/by-name/al/alsa-plugins/package.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "alsa-plugins"; - version = "1.2.7.1"; + version = "1.2.12"; src = fetchurl { url = "mirror://alsa/plugins/${pname}-${version}.tar.bz2"; - hash = "sha256-jDN4FJVLt8FnRWczpgRhQqKTHxLsy6PsKkrmGKNDJRE="; + hash = "sha256-e9ioPTBOji2GoliV2Nyw7wJFqN8y4nGVnNvcavObZvI="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/au/audible-cli/package.nix b/pkgs/by-name/au/audible-cli/package.nix index e9ee1bda75cd9..b0026fef46419 100644 --- a/pkgs/by-name/au/audible-cli/package.nix +++ b/pkgs/by-name/au/audible-cli/package.nix @@ -13,7 +13,6 @@ python3Packages.buildPythonApplication rec { }; nativeBuildInputs = with python3Packages; [ - pythonRelaxDepsHook setuptools ] ++ [ installShellFiles diff --git a/pkgs/by-name/au/audiness/package.nix b/pkgs/by-name/au/audiness/package.nix index f1f64afb3140f..8ad9d63973414 100644 --- a/pkgs/by-name/au/audiness/package.nix +++ b/pkgs/by-name/au/audiness/package.nix @@ -23,7 +23,6 @@ python3.pkgs.buildPythonApplication rec { build-system = with python3.pkgs; [ poetry-core ]; - nativeBuildInputs = with python3.pkgs; [ pythonRelaxDepsHook ]; dependencies = with python3.pkgs; diff --git a/pkgs/by-name/aw/aws-gate/package.nix b/pkgs/by-name/aw/aws-gate/package.nix index cafe14c611bda..1561d1c17a92e 100644 --- a/pkgs/by-name/aw/aws-gate/package.nix +++ b/pkgs/by-name/aw/aws-gate/package.nix @@ -27,7 +27,6 @@ python3Packages.buildPythonApplication rec { nativeBuildInputs = [ installShellFiles - python3Packages.pythonRelaxDepsHook python3Packages.setuptools python3Packages.wheel ]; diff --git a/pkgs/by-name/ba/backgroundremover/package.nix b/pkgs/by-name/ba/backgroundremover/package.nix index 67c2f2eaa6a87..3ee27b6923939 100644 --- a/pkgs/by-name/ba/backgroundremover/package.nix +++ b/pkgs/by-name/ba/backgroundremover/package.nix @@ -32,7 +32,7 @@ let --replace 'os.path.expanduser(os.path.join("~", ".u2net", model_name + ".pth"))' "os.path.join(\"$models\", model_name + \".pth\")" ''; - nativeBuildInputs = [ p.setuptools p.wheel p.pythonRelaxDepsHook ]; + nativeBuildInputs = [ p.setuptools p.wheel ]; pythonRelaxDeps = [ "pillow" "torchvision" ]; diff --git a/pkgs/by-name/ch/charmcraft/package.nix b/pkgs/by-name/ch/charmcraft/package.nix index a78fb1c3557fd..6c340102a502f 100644 --- a/pkgs/by-name/ch/charmcraft/package.nix +++ b/pkgs/by-name/ch/charmcraft/package.nix @@ -45,7 +45,6 @@ python3Packages.buildPythonApplication rec { ]; nativeBuildInputs = with python3Packages; [ - pythonRelaxDepsHook setuptools ]; diff --git a/pkgs/by-name/ch/chow-kick/package.nix b/pkgs/by-name/ch/chow-kick/package.nix index b9dec059d1f18..da2e44d73d804 100644 --- a/pkgs/by-name/ch/chow-kick/package.nix +++ b/pkgs/by-name/ch/chow-kick/package.nix @@ -6,7 +6,7 @@ , dbus , libepoxy , fetchFromGitHub -, freeglut +, libglut , freetype , gtk2-x11 , lib @@ -58,7 +58,7 @@ stdenv.mkDerivation (finalAttrs: { curl dbus libepoxy - freeglut + libglut freetype gtk2-x11 libGL diff --git a/pkgs/by-name/ch/chow-phaser/package.nix b/pkgs/by-name/ch/chow-phaser/package.nix index 23cfe684d81f5..fd329070d0aa5 100644 --- a/pkgs/by-name/ch/chow-phaser/package.nix +++ b/pkgs/by-name/ch/chow-phaser/package.nix @@ -1,4 +1,4 @@ -{ alsa-lib, at-spi2-core, cmake, curl, dbus, libepoxy, fetchFromGitHub, freeglut +{ alsa-lib, at-spi2-core, cmake, curl, dbus, libepoxy, fetchFromGitHub, libglut , freetype, gcc-unwrapped, gtk3, lib, libGL, libXcursor, libXdmcp, libXext , libXinerama, libXrandr, libXtst, libdatrie, libjack2, libpsl, libselinux , libsepol, libsysprof-capture, libthai, libxkbcommon, pcre, pkg-config @@ -24,7 +24,7 @@ stdenv.mkDerivation (finalAttrs: { curl dbus libepoxy - freeglut + libglut freetype gtk3 libGL diff --git a/pkgs/by-name/ch/chow-tape-model/package.nix b/pkgs/by-name/ch/chow-tape-model/package.nix index 44fc35073d364..89c58fcaf4b15 100644 --- a/pkgs/by-name/ch/chow-tape-model/package.nix +++ b/pkgs/by-name/ch/chow-tape-model/package.nix @@ -5,7 +5,7 @@ , dbus , libepoxy , fetchFromGitHub -, freeglut +, libglut , freetype , gtk3 , lib @@ -59,7 +59,7 @@ stdenv.mkDerivation (finalAttrs: { curl dbus libepoxy - freeglut + libglut freetype gtk3 libGL diff --git a/pkgs/by-name/cm/cmake/package.nix b/pkgs/by-name/cm/cmake/package.nix index 5c2a9983d6270..c03c1055f7244 100644 --- a/pkgs/by-name/cm/cmake/package.nix +++ b/pkgs/by-name/cm/cmake/package.nix @@ -48,11 +48,11 @@ stdenv.mkDerivation (finalAttrs: { + lib.optionalString isMinimalBuild "-minimal" + lib.optionalString cursesUI "-cursesUI" + lib.optionalString qt5UI "-qt5UI"; - version = "3.29.3"; + version = "3.29.6"; src = fetchurl { url = "https://cmake.org/files/v${lib.versions.majorMinor finalAttrs.version}/cmake-${finalAttrs.version}.tar.gz"; - hash = "sha256-JSruFEjUnKoElU/V4n0YndUVcFVzE+eygWNnFqI4vMs="; + hash = "sha256-E5ExMAO4PUjiqxFai1JaVX942MFURhi0jR2QGEoQ8K8="; }; patches = [ @@ -115,7 +115,7 @@ stdenv.mkDerivation (finalAttrs: { --subst-var-by libc_dev ${lib.getDev stdenv.cc.libc} \ --subst-var-by libc_lib ${lib.getLib stdenv.cc.libc} # CC_FOR_BUILD and CXX_FOR_BUILD are used to bootstrap cmake - configureFlags="--parallel=''${NIX_BUILD_CORES:-1} CC=$CC_FOR_BUILD CXX=$CXX_FOR_BUILD $configureFlags" + configureFlags="--parallel=''${NIX_BUILD_CORES:-1} CC=$CC_FOR_BUILD CXX=$CXX_FOR_BUILD $configureFlags $cmakeFlags" ''; # The configuration script is not autoconf-based, although being similar; diff --git a/pkgs/by-name/co/corrscope/package.nix b/pkgs/by-name/co/corrscope/package.nix index 8b8607d723a6f..0148ab90eb078 100644 --- a/pkgs/by-name/co/corrscope/package.nix +++ b/pkgs/by-name/co/corrscope/package.nix @@ -26,7 +26,6 @@ python3Packages.buildPythonApplication rec { wrapQtAppsHook ]) ++ (with python3Packages; [ poetry-core - pythonRelaxDepsHook ]); buildInputs = [ diff --git a/pkgs/by-name/co/cosmic-edit/package.nix b/pkgs/by-name/co/cosmic-edit/package.nix index 8120fcc61e16c..2fc1f95082d99 100644 --- a/pkgs/by-name/co/cosmic-edit/package.nix +++ b/pkgs/by-name/co/cosmic-edit/package.nix @@ -97,7 +97,7 @@ rustPlatform.buildRustPackage rec { wrapProgram "$out/bin/${pname}" \ --suffix XDG_DATA_DIRS : "${cosmic-icons}/share" \ --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ - xorg.libX11 xorg.libXcursor xorg.libXi xorg.libXrandr vulkan-loader libxkbcommon mesa.drivers wayland + xorg.libX11 xorg.libXcursor xorg.libXi xorg.libXrandr vulkan-loader libxkbcommon wayland ]} ''; diff --git a/pkgs/by-name/co/cosmic-store/package.nix b/pkgs/by-name/co/cosmic-store/package.nix index 1a89a00a23014..fb4eb787cb709 100644 --- a/pkgs/by-name/co/cosmic-store/package.nix +++ b/pkgs/by-name/co/cosmic-store/package.nix @@ -86,7 +86,6 @@ rustPlatform.buildRustPackage rec { xorg.libXrandr libxkbcommon vulkan-loader - mesa.drivers ] } ''; diff --git a/pkgs/by-name/co/cosmic-term/package.nix b/pkgs/by-name/co/cosmic-term/package.nix index 9a0453e0ee2ed..b2bcf3ebccbce 100644 --- a/pkgs/by-name/co/cosmic-term/package.nix +++ b/pkgs/by-name/co/cosmic-term/package.nix @@ -99,7 +99,6 @@ rustPlatform.buildRustPackage rec { --suffix XDG_DATA_DIRS : "${cosmic-icons}/share" \ --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libxkbcommon - mesa.drivers vulkan-loader xorg.libX11 xorg.libXcursor diff --git a/pkgs/by-name/cu/cups-printers/package.nix b/pkgs/by-name/cu/cups-printers/package.nix index 50af156ff668d..b6e124fef07d6 100644 --- a/pkgs/by-name/cu/cups-printers/package.nix +++ b/pkgs/by-name/cu/cups-printers/package.nix @@ -23,7 +23,6 @@ python3.pkgs.buildPythonApplication rec { build-system = with python3.pkgs; [ poetry-core ]; - nativeBuildInputs = with python3.pkgs; [ pythonRelaxDepsHook ]; dependencies = with python3.pkgs; diff --git a/pkgs/by-name/do/donpapi/package.nix b/pkgs/by-name/do/donpapi/package.nix index 1271d67d398f6..c2a777b3dc431 100644 --- a/pkgs/by-name/do/donpapi/package.nix +++ b/pkgs/by-name/do/donpapi/package.nix @@ -23,7 +23,6 @@ python3.pkgs.buildPythonApplication rec { nativeBuildInputs = with python3.pkgs; [ poetry-core - pythonRelaxDepsHook ]; propagatedBuildInputs = with python3.pkgs; [ diff --git a/pkgs/by-name/do/dooit/package.nix b/pkgs/by-name/do/dooit/package.nix index b8fae74dd85e6..ea549fff71962 100644 --- a/pkgs/by-name/do/dooit/package.nix +++ b/pkgs/by-name/do/dooit/package.nix @@ -20,7 +20,6 @@ python3.pkgs.buildPythonApplication rec { nativeBuildInputs = with python3.pkgs; [ poetry-core - pythonRelaxDepsHook ]; pythonRelaxDeps = [ diff --git a/pkgs/by-name/f2/f2fs-tools/f2fs-tools-cross-fix.patch b/pkgs/by-name/f2/f2fs-tools/f2fs-tools-cross-fix.patch new file mode 100644 index 0000000000000..e01a97b0bc3c9 --- /dev/null +++ b/pkgs/by-name/f2/f2fs-tools/f2fs-tools-cross-fix.patch @@ -0,0 +1,29 @@ +diff --git a/configure.ac b/configure.ac +index 9b0e872..0108219 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -20,14 +20,16 @@ AC_DEFINE([F2FS_MINOR_VERSION], m4_bpatsubst(f2fs_tools_version, + [\([0-9]*\).\([0-9]*\)\(\w\|\W\)*], [\2]), + [Minor version for f2fs-tools]) + +-AS_IF([test -d .git],[ +- AC_DEFINE([F2FS_TOOLS_DATE], +- "m4_bpatsubst(f2fs_tools_gitdate, +- [\([0-9-]*\)\(\w\|\W\)*], [\1])", +- [f2fs-tools date based on Git commits])],[ +- AC_DEFINE([F2FS_TOOLS_DATE], +- "f2fs_tools_date", +- [f2fs-tools date based on Source releases])]) ++dnl AS_IF([test -d .git],[ ++dnl AC_DEFINE([F2FS_TOOLS_DATE], ++dnl "m4_bpatsubst(f2fs_tools_gitdate, ++dnl [\([0-9-]*\)\(\w\|\W\)*], [\1])", ++dnl [f2fs-tools date based on Git commits])],[ ++dnl AC_DEFINE([F2FS_TOOLS_DATE], ++dnl "f2fs_tools_date", ++dnl [f2fs-tools date based on Source releases])]) ++ ++AC_DEFINE([F2FS_TOOLS_DATE], "f2fs_tools_date", [f2fs-tools date based on Source releases]) + + AC_CONFIG_SRCDIR([config.h.in]) + AC_CONFIG_HEADER([config.h]) diff --git a/pkgs/by-name/f2/f2fs-tools/package.nix b/pkgs/by-name/f2/f2fs-tools/package.nix new file mode 100644 index 0000000000000..0c91e41da45fe --- /dev/null +++ b/pkgs/by-name/f2/f2fs-tools/package.nix @@ -0,0 +1,54 @@ +{ + lib, + stdenv, + fetchzip, + fetchpatch, + autoreconfHook, + libselinux, + libuuid, + pkg-config, + lz4, + lzo, +}: + +stdenv.mkDerivation rec { + pname = "f2fs-tools"; + version = "1.16.0"; + + src = fetchzip { + url = "https://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs-tools.git/snapshot/f2fs-tools-v${version}.tar.gz"; + sha256 = "sha256-zNG1F//+BTBzlEc6qNVixyuCB6PMZD5Kf8pVK0ePYiA="; + }; + + nativeBuildInputs = [ + autoreconfHook + pkg-config + ]; + buildInputs = [ + libselinux + libuuid + lz4 + lzo + ]; + + patches = [ + ./f2fs-tools-cross-fix.patch + + (fetchpatch { + name = "lfs64.patch"; + url = "https://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs-tools.git/patch/?id=b15b6cc56ac7764be17acbdbf96448f388992adc"; + hash = "sha256-9XrNf9MMMDGOsuP3DvUhm30Sa2xICDtXbUIvM/TP35o="; + }) + ]; + + meta = { + homepage = "https://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs-tools.git/"; + description = "Userland tools for the f2fs filesystem"; + license = lib.licenses.gpl2Only; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ + ehmry + jagajaga + ]; + }; +} diff --git a/pkgs/by-name/fl/flite/package.nix b/pkgs/by-name/fl/flite/package.nix new file mode 100644 index 0000000000000..f39e1257185a8 --- /dev/null +++ b/pkgs/by-name/fl/flite/package.nix @@ -0,0 +1,74 @@ +{ + lib, + stdenv, + fetchFromGitHub, + fetchpatch, + alsa-lib, + libpulseaudio, + testers, + audioBackend ? "pulseaudio", +}: +assert lib.assertOneOf "audioBackend" audioBackend [ + "alsa" + "pulseaudio" +]; +stdenv.mkDerivation (finalAttrs: { + pname = "flite"; + version = "2.2"; + + outputs = [ + "bin" + "dev" + "lib" + "out" + ]; + + src = fetchFromGitHub { + owner = "festvox"; + repo = "flite"; + rev = "v${finalAttrs.version}"; + hash = "sha256-Tq5pyg3TiQt8CPqGXTyLOaGgaeLTmPp+Duw3+2VAF9g="; + }; + + # https://github.com/festvox/flite/pull/60. + # Replaces `ar` with `$(AR)` in config/common_make_rules. + # Improves cross-compilation compatibility. + patches = [ + (fetchpatch { + url = "https://github.com/festvox/flite/commit/54c65164840777326bbb83517568e38a128122ef.patch"; + hash = "sha256-hvKzdX7adiqd9D+9DbnfNdqEULg1Hhqe1xElYxNM1B8="; + }) + ]; + + buildInputs = lib.optional stdenv.isLinux ( + { + alsa = alsa-lib; + pulseaudio = libpulseaudio; + } + .${audioBackend} or (throw "${audioBackend} is not a supported backend!") + ); + + configureFlags = [ + "--enable-shared" + ] ++ lib.optionals stdenv.isLinux [ "--with-audio=${audioBackend}" ]; + + # main/Makefile creates and removes 'flite_voice_list.c' from multiple targets: + # make[1]: *** No rule to make target 'flite_voice_list.c', needed by 'all'. Stop + enableParallelBuilding = false; + + passthru = { + tests.version = testers.testVersion { + # `flite` does have a `--version` command, but it returns 1 + command = "flite --help"; + package = finalAttrs.finalPackage; + }; + }; + + meta = { + description = "Small, fast run-time speech synthesis engine"; + homepage = "http://www.festvox.org/flite/"; + license = lib.licenses.bsdOriginal; + maintainers = with lib.maintainers; [ getchoo ]; + mainProgram = "flite"; + }; +}) diff --git a/pkgs/by-name/fl/flye/aarch64-fix.patch b/pkgs/by-name/fl/flye/aarch64-fix.patch deleted file mode 100644 index 02588fc63e218..0000000000000 --- a/pkgs/by-name/fl/flye/aarch64-fix.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/Makefile b/Makefile -index 75f62aed..91b9571b 100644 ---- a/Makefile -+++ b/Makefile -@@ -16,6 +16,10 @@ ifeq ($(shell uname -m),arm64) - export aarch64=1 - endif - -+ifeq ($(shell uname -m),aarch64) -+ export aarch64=1 -+endif -+ - .PHONY: clean all profile debug minimap2 samtools - - .DEFAULT_GOAL := all diff --git a/pkgs/by-name/fl/flye/package.nix b/pkgs/by-name/fl/flye/package.nix index 76ea84a1c9a04..41e098609597a 100644 --- a/pkgs/by-name/fl/flye/package.nix +++ b/pkgs/by-name/fl/flye/package.nix @@ -1,5 +1,6 @@ { lib , fetchFromGitHub +, fetchpatch , python3Packages , zlib , curl @@ -11,6 +12,7 @@ python3Packages.buildPythonApplication rec { pname = "flye"; version = "2.9.4"; + pyproject = true; src = fetchFromGitHub { owner = "fenderglass"; @@ -19,7 +21,33 @@ python3Packages.buildPythonApplication rec { hash = "sha256-lwiY0VTEsLMMXt1VowsS3jj44v30Z766xNRwQtQKr10="; }; - nativeCheckInputs = [ python3Packages.pytestCheckHook ]; + patches = [ + (fetchpatch { + # https://github.com/mikolmogorov/Flye/pull/691 + name = "aarch64-fix.patch"; + url = "https://github.com/mikolmogorov/Flye/commit/e4dcc3fdf0fa1430a974fcd7da31b03ea642df9b.patch"; + hash = "sha256-Ny2daPt8eYOKnwZ6bdBoCcFWhe9eiIHF4vJU/occwU0="; + }) + (fetchpatch { + # https://github.com/mikolmogorov/Flye/pull/711 + name = "remove-distutils.patch"; + url = "https://github.com/mikolmogorov/Flye/commit/fb34f1ccfdf569d186a4ce822ee18eced736636b.patch"; + hash = "sha256-52bnZ8XyP0HsY2OpNYMU3xJgotNVdQc/O2w3XIReUdQ="; + }) + (fetchpatch { + # https://github.com/mikolmogorov/Flye/pull/670 + name = "remove-find_module.patch"; + url = "https://github.com/mikolmogorov/Flye/commit/441b1c6eb0f60b7c4fb1a40d659c7dabb7ad41b6.patch"; + hash = "sha256-RytFIN1STK33/nvXpck6woQcwV/e1fmA8AgmptiIiDU="; + }) + ]; + + postPatch = '' + substituteInPlace flye/polishing/alignment.py \ + --replace-fail "/bin/bash" "${lib.getExe bash}" + ''; + + build-system = [ python3Packages.setuptools ]; propagatedBuildInputs = [ coreutils ]; @@ -29,22 +57,18 @@ python3Packages.buildPythonApplication rec { libdeflate ]; - patches = [ ./aarch64-fix.patch ]; + pythonImportsCheck = [ "flye" ]; - postPatch = '' - substituteInPlace flye/polishing/alignment.py \ - --replace-fail "/bin/bash" "${lib.getExe bash}" + nativeCheckInputs = [ python3Packages.pytestCheckHook ]; - substituteInPlace flye/tests/test_toy.py \ - --replace-fail "find_executable(\"flye" "find_executable(\"$out/bin/flye" \ - --replace-fail "[\"flye" "[\"$out/bin/flye" + preCheck = '' + export PATH=$out/bin:$PATH ''; meta = with lib; { description = "De novo assembler for single molecule sequencing reads using repeat graphs"; homepage = "https://github.com/fenderglass/Flye"; license = licenses.bsd3; - platforms = platforms.unix; mainProgram = "flye"; maintainers = with maintainers; [ assistant ]; }; diff --git a/pkgs/by-name/fr/fritz-exporter/package.nix b/pkgs/by-name/fr/fritz-exporter/package.nix index d79b74eb9a2bc..ee4099d207fc1 100644 --- a/pkgs/by-name/fr/fritz-exporter/package.nix +++ b/pkgs/by-name/fr/fritz-exporter/package.nix @@ -20,6 +20,10 @@ python3.pkgs.buildPythonApplication rec { sed -i "/^addopts/d" pyproject.toml ''; + pythonRelaxDeps = [ + "defusedxml" + ]; + nativeBuildInputs = with python3.pkgs; [ poetry-core ]; diff --git a/pkgs/by-name/gc/gcp-scanner/package.nix b/pkgs/by-name/gc/gcp-scanner/package.nix index a577790d16a6e..0e16965f63f01 100644 --- a/pkgs/by-name/gc/gcp-scanner/package.nix +++ b/pkgs/by-name/gc/gcp-scanner/package.nix @@ -20,7 +20,6 @@ python3.pkgs.buildPythonApplication rec { nativeBuildInputs = with python3.pkgs; [ setuptools setuptools-git-versioning - pythonRelaxDepsHook ]; propagatedBuildInputs = with python3.pkgs; [ diff --git a/pkgs/by-name/gh/ghunt/package.nix b/pkgs/by-name/gh/ghunt/package.nix index 8f26785bda8f9..580f3a5e28470 100644 --- a/pkgs/by-name/gh/ghunt/package.nix +++ b/pkgs/by-name/gh/ghunt/package.nix @@ -18,7 +18,6 @@ python3.pkgs.buildPythonApplication rec { pythonRelaxDeps = true; nativeBuildInputs = with python3.pkgs; [ - pythonRelaxDepsHook setuptools ]; diff --git a/pkgs/by-name/ha/ha-mqtt-discoverable-cli/package.nix b/pkgs/by-name/ha/ha-mqtt-discoverable-cli/package.nix index b3f2528ce2a2c..d9ea3eeb4787f 100644 --- a/pkgs/by-name/ha/ha-mqtt-discoverable-cli/package.nix +++ b/pkgs/by-name/ha/ha-mqtt-discoverable-cli/package.nix @@ -20,7 +20,6 @@ python3.pkgs.buildPythonApplication rec { build-system = with python3.pkgs; [ poetry-core ]; - nativeBuildInputs = with python3.pkgs; [ pythonRelaxDepsHook ]; dependencies = with python3.pkgs; [ ha-mqtt-discoverable ]; diff --git a/pkgs/by-name/ha/hatch/package.nix b/pkgs/by-name/ha/hatch/package.nix index 06f2911faafb3..c3c760abafec5 100644 --- a/pkgs/by-name/ha/hatch/package.nix +++ b/pkgs/by-name/ha/hatch/package.nix @@ -4,26 +4,23 @@ , python3 , cargo , git +, uv }: python3.pkgs.buildPythonApplication rec { pname = "hatch"; - version = "1.9.7"; + version = "1.12.0"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-Gae4IXn5Tyrd2612qn5lq5DK1VqxA9U4J2N5NcnmYkw="; + hash = "sha256-roBHjRAxLfK0TWWck7wu1NM67N3OS3Y3gjG9+ByL9q0="; }; - postPatch = '' - # Loosen hatchling runtime version dependency - sed -i 's/hatchling<1.22/hatchling/' pyproject.toml - ''; - nativeBuildInputs = with python3.pkgs; [ hatchling hatch-vcs + uv ]; propagatedBuildInputs = with python3.pkgs; [ @@ -62,25 +59,15 @@ python3.pkgs.buildPythonApplication rec { disabledTests = [ # AssertionError: assert (1980, 1, 2, 0, 0, 0) == (2020, 2, 2, 0, 0, 0) "test_default" - "test_explicit_path" - "test_default_auto_detection" - "test_editable_default" - "test_editable_default_extra_dependencies" - "test_editable_default_force_include" - "test_editable_default_force_include_option" - "test_editable_exact" - "test_editable_exact_extra_dependencies" - "test_editable_exact_force_include" - "test_editable_exact_force_include_option" - "test_editable_exact_force_include_build_data_precedence" - "test_editable_pth" - # expects sh, finds bash - "test_all" - "test_already_installed_update_flag" - "test_already_installed_update_prompt" # Loosen hatchling runtime version dependency "test_core" - "test_correct" + # New failing + "test_guess_variant" + "test_open" + "test_no_open" + "test_uv_env" + "test_pyenv" + "test_pypirc" ] ++ lib.optionals stdenv.isDarwin [ # https://github.com/NixOS/nixpkgs/issues/209358 "test_scripts_no_environment" diff --git a/pkgs/by-name/he/hekatomb/package.nix b/pkgs/by-name/he/hekatomb/package.nix index 1d9df3a032156..0b6e708f65b2d 100644 --- a/pkgs/by-name/he/hekatomb/package.nix +++ b/pkgs/by-name/he/hekatomb/package.nix @@ -21,7 +21,6 @@ python3.pkgs.buildPythonApplication rec { nativeBuildInputs = with python3.pkgs; [ poetry-core - pythonRelaxDepsHook ]; propagatedBuildInputs = with python3.pkgs; [ diff --git a/pkgs/by-name/ho/homeassistant-satellite/package.nix b/pkgs/by-name/ho/homeassistant-satellite/package.nix index c5a6026d8ec37..cf69238d8af5c 100644 --- a/pkgs/by-name/ho/homeassistant-satellite/package.nix +++ b/pkgs/by-name/ho/homeassistant-satellite/package.nix @@ -16,7 +16,6 @@ python3.pkgs.buildPythonApplication rec { }; nativeBuildInputs = with python3.pkgs; [ - pythonRelaxDepsHook setuptools ]; diff --git a/pkgs/by-name/ic/icloudpd/package.nix b/pkgs/by-name/ic/icloudpd/package.nix index e345ca65c7adf..ea7386c4e8d83 100644 --- a/pkgs/by-name/ic/icloudpd/package.nix +++ b/pkgs/by-name/ic/icloudpd/package.nix @@ -20,10 +20,6 @@ python3Packages.buildPythonApplication rec { pythonRelaxDeps = true; - nativeBuildInputs = with python3Packages; [ - pythonRelaxDepsHook - ]; - propagatedBuildInputs = with python3Packages; [ wheel setuptools diff --git a/pkgs/by-name/ir/irrd/package.nix b/pkgs/by-name/ir/irrd/package.nix index ba62bf6e6cc27..b6d323129abd9 100644 --- a/pkgs/by-name/ir/irrd/package.nix +++ b/pkgs/by-name/ir/irrd/package.nix @@ -76,7 +76,6 @@ py.pkgs.buildPythonPackage rec { nativeBuildInputs = with python3.pkgs; [ poetry-core - pythonRelaxDepsHook ]; nativeCheckInputs = [ diff --git a/pkgs/by-name/ja/jasper/package.nix b/pkgs/by-name/ja/jasper/package.nix index 11a298208f567..ad364086efa90 100644 --- a/pkgs/by-name/ja/jasper/package.nix +++ b/pkgs/by-name/ja/jasper/package.nix @@ -1,10 +1,11 @@ { lib , cmake , fetchFromGitHub -, freeglut +, libglut , libGL , libheif , libjpeg +, darwin , pkg-config , stdenv , enableHEIFCodec ? true @@ -36,8 +37,10 @@ stdenv.mkDerivation (finalAttrs: { ] ++ lib.optionals enableJPGCodec [ libjpeg ] ++ lib.optionals enableOpenGL [ - freeglut + libglut libGL + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ + darwin.apple_sdk.frameworks.Cocoa ]; # Since "build" already exists and is populated, cmake tries to use it, @@ -55,6 +58,14 @@ stdenv.mkDerivation (finalAttrs: { strictDeps = true; + # The value of __STDC_VERSION__ cannot be automatically determined when cross-compiling + # https://github.com/jasper-software/jasper/blob/87668487/CMakeLists.txt#L415 + # workaround taken from + # https://github.com/openembedded/meta-openembedded/blob/907b9c0a/meta-oe/recipes-graphics/jasper/jasper_4.1.1.bb#L16 + preConfigure = lib.optionalString (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' + cmakeFlagsArray+=(-DJAS_STDC_VERSION="$(echo __STDC_VERSION__ | $CXX -E -P -)") + ''; + meta = { homepage = "https://jasper-software.github.io/jasper/"; description = "Image processing/coding toolkit"; @@ -79,9 +90,6 @@ stdenv.mkDerivation (finalAttrs: { mainProgram = "jasper"; maintainers = with lib.maintainers; [ AndersonTorres ]; platforms = lib.platforms.unix; - # The value of __STDC_VERSION__ cannot be automatically determined when - # cross-compiling. - broken = stdenv.buildPlatform != stdenv.hostPlatform; }; }) # TODO: investigate opengl support diff --git a/pkgs/by-name/ki/kikit/solidpython/default.nix b/pkgs/by-name/ki/kikit/solidpython/default.nix index 2244166bbfeac..777f4db9c2bb1 100644 --- a/pkgs/by-name/ki/kikit/solidpython/default.nix +++ b/pkgs/by-name/ki/kikit/solidpython/default.nix @@ -2,7 +2,6 @@ { buildPythonPackage , fetchFromGitHub , lib -, pythonRelaxDepsHook , poetry-core , prettytable @@ -24,7 +23,6 @@ buildPythonPackage rec { nativeBuildInputs = [ poetry-core - pythonRelaxDepsHook ]; propagatedBuildInputs = [ diff --git a/pkgs/by-name/ko/koodousfinder/package.nix b/pkgs/by-name/ko/koodousfinder/package.nix index 103863b76ee35..b6602e2c6000e 100644 --- a/pkgs/by-name/ko/koodousfinder/package.nix +++ b/pkgs/by-name/ko/koodousfinder/package.nix @@ -22,7 +22,6 @@ python3.pkgs.buildPythonApplication rec { build-system = with python3.pkgs; [ poetry-core ]; - nativeBuildInputs = with python3.pkgs; [ pythonRelaxDepsHook ]; dependencies = with python3.pkgs; [ keyring diff --git a/pkgs/by-name/kr/krbjack/package.nix b/pkgs/by-name/kr/krbjack/package.nix index a26b55144277c..bd7455cef9a4b 100644 --- a/pkgs/by-name/kr/krbjack/package.nix +++ b/pkgs/by-name/kr/krbjack/package.nix @@ -23,7 +23,6 @@ python3.pkgs.buildPythonApplication rec { poetry-core ]; - nativeBuildInputs = with python3.pkgs; [ pythonRelaxDepsHook ]; dependencies = with python3.pkgs; [ colorama diff --git a/pkgs/by-name/li/libcamera/package.nix b/pkgs/by-name/li/libcamera/package.nix index c122f840df32e..6795a5bf5cfd7 100644 --- a/pkgs/by-name/li/libcamera/package.nix +++ b/pkgs/by-name/li/libcamera/package.nix @@ -25,18 +25,18 @@ stdenv.mkDerivation rec { pname = "libcamera"; - version = "0.2.0"; + version = "0.3.0"; src = fetchgit { url = "https://git.libcamera.org/libcamera/libcamera.git"; rev = "v${version}"; - hash = "sha256-x0Im9m9MoACJhQKorMI34YQ+/bd62NdAPc2nWwaJAvM="; + hash = "sha256-eCtOtdjpwn0S56ZyRVdG1QCBk1KGPh8YTXD50xev7Bc="; }; outputs = [ "out" "dev" ]; postPatch = '' - patchShebangs utils/ + patchShebangs src/py/ utils/ ''; # libcamera signs the IPA module libraries at install time, but they are then @@ -81,6 +81,7 @@ stdenv.mkDerivation rec { pkg-config python3 python3Packages.jinja2 + python3Packages.pybind11 python3Packages.pyyaml python3Packages.ply python3Packages.sphinx diff --git a/pkgs/by-name/li/linux-wallpaperengine/package.nix b/pkgs/by-name/li/linux-wallpaperengine/package.nix index 02838ccb83cc2..0ec85d195db76 100644 --- a/pkgs/by-name/li/linux-wallpaperengine/package.nix +++ b/pkgs/by-name/li/linux-wallpaperengine/package.nix @@ -3,7 +3,7 @@ , fetchFromGitHub , cmake , ffmpeg -, freeglut +, libglut , freeimage , glew , glfw @@ -44,7 +44,7 @@ stdenv.mkDerivation { buildInputs = [ ffmpeg - freeglut + libglut freeimage glew glfw diff --git a/pkgs/by-name/ma/malwoverview/package.nix b/pkgs/by-name/ma/malwoverview/package.nix index 853aeab3bb71b..02a5fc0151624 100644 --- a/pkgs/by-name/ma/malwoverview/package.nix +++ b/pkgs/by-name/ma/malwoverview/package.nix @@ -19,10 +19,6 @@ python3.pkgs.buildPythonApplication rec { "pathlib" ]; - nativeBuildInputs = with python3.pkgs; [ - pythonRelaxDepsHook - ]; - build-system = with python3.pkgs; [ setuptools ]; diff --git a/pkgs/by-name/me/mealie/package.nix b/pkgs/by-name/me/mealie/package.nix index 6646a8ec09803..f93d6de6fb764 100644 --- a/pkgs/by-name/me/mealie/package.nix +++ b/pkgs/by-name/me/mealie/package.nix @@ -39,7 +39,6 @@ in pythonpkgs.buildPythonPackage rec { nativeBuildInputs = [ pythonpkgs.poetry-core - pythonpkgs.pythonRelaxDepsHook makeWrapper ]; diff --git a/pkgs/by-name/me/mednafen/package.nix b/pkgs/by-name/me/mednafen/package.nix index f3e0f8478c08c..88079e48155d8 100644 --- a/pkgs/by-name/me/mednafen/package.nix +++ b/pkgs/by-name/me/mednafen/package.nix @@ -5,7 +5,7 @@ alsa-lib, fetchurl, flac, - freeglut, + libglut, libGL, libGLU, libX11, @@ -39,7 +39,7 @@ stdenv.mkDerivation (finalAttrs: { SDL2 SDL2_net flac - freeglut + libglut libcdio libjack2 libsamplerate diff --git a/pkgs/by-name/mo/mokuro/package.nix b/pkgs/by-name/mo/mokuro/package.nix index 95054f371480b..1fb6ca5443b43 100644 --- a/pkgs/by-name/mo/mokuro/package.nix +++ b/pkgs/by-name/mo/mokuro/package.nix @@ -22,7 +22,6 @@ python3Packages.buildPythonApplication rec { --replace-fail 'opencv-python' 'opencv' ''; - nativeBuildInputs = with python3Packages; [ pythonRelaxDepsHook ]; pythonRelaxDeps = [ "torchvision" ]; diff --git a/pkgs/by-name/mo/mov-cli/package.nix b/pkgs/by-name/mo/mov-cli/package.nix index 05691e619285a..16244793662ef 100644 --- a/pkgs/by-name/mo/mov-cli/package.nix +++ b/pkgs/by-name/mo/mov-cli/package.nix @@ -35,10 +35,6 @@ python3.pkgs.buildPythonPackage { tldextract ]; - nativeBuildInputs = [ - python3.pkgs.pythonRelaxDepsHook - ]; - pythonRelaxDeps = [ "httpx" "tldextract" diff --git a/pkgs/by-name/ng/nginx-language-server/package.nix b/pkgs/by-name/ng/nginx-language-server/package.nix index 891d6e4d5cb61..39a5a55f5abd9 100644 --- a/pkgs/by-name/ng/nginx-language-server/package.nix +++ b/pkgs/by-name/ng/nginx-language-server/package.nix @@ -17,7 +17,6 @@ python3.pkgs.buildPythonApplication rec { build-system = with python3.pkgs; [ poetry-core - pythonRelaxDepsHook ]; pythonRelaxDeps = [ diff --git a/pkgs/by-name/no/normcap/package.nix b/pkgs/by-name/no/normcap/package.nix index a7c349a7a3566..e862247b0df53 100644 --- a/pkgs/by-name/no/normcap/package.nix +++ b/pkgs/by-name/no/normcap/package.nix @@ -52,7 +52,6 @@ ps.buildPythonApplication rec { ]; nativeBuildInputs = [ - ps.pythonRelaxDepsHook ps.hatchling ps.babel ]; @@ -76,7 +75,7 @@ ps.buildPythonApplication rec { ps.toml ] ++ lib.optionals stdenv.isLinux [ ps.pytest-xvfb - xorg.xorgserver + xorg.xvfb ]; preCheck = '' diff --git a/pkgs/by-name/on/onthespot/package.nix b/pkgs/by-name/on/onthespot/package.nix index 138ac6e94b7c5..696a7e51f78e5 100644 --- a/pkgs/by-name/on/onthespot/package.nix +++ b/pkgs/by-name/on/onthespot/package.nix @@ -21,7 +21,6 @@ python3.pkgs.buildPythonApplication rec { nativeBuildInputs = with python3.pkgs; [ copyDesktopItems - pythonRelaxDepsHook libsForQt5.wrapQtAppsHook ]; diff --git a/pkgs/by-name/op/open-webui/package.nix b/pkgs/by-name/op/open-webui/package.nix index 1292ff3c27923..4a034130c09ff 100644 --- a/pkgs/by-name/op/open-webui/package.nix +++ b/pkgs/by-name/op/open-webui/package.nix @@ -116,7 +116,6 @@ python3.pkgs.buildPythonApplication rec { build-system = with python3.pkgs; [ hatchling ]; - nativeBuildInputs = [ python3.pkgs.pythonRelaxDepsHook ]; pythonImportsCheck = [ "open_webui" ]; diff --git a/pkgs/by-name/op/opencomposite/package.nix b/pkgs/by-name/op/opencomposite/package.nix index 5607d55a0be6c..d9e6508b0c559 100644 --- a/pkgs/by-name/op/opencomposite/package.nix +++ b/pkgs/by-name/op/opencomposite/package.nix @@ -43,6 +43,7 @@ stdenv.mkDerivation { cmakeFlags = [ (lib.cmakeBool "USE_SYSTEM_OPENXR" true) (lib.cmakeBool "USE_SYSTEM_GLM" true) + (lib.cmakeFeature "CMAKE_CXX_FLAGS" "-DGLM_ENABLE_EXPERIMENTAL") # debug logging macros cause format-security warnings (lib.cmakeFeature "CMAKE_CXX_FLAGS" "-Wno-error=format-security") ]; diff --git a/pkgs/by-name/op/openctm/package.nix b/pkgs/by-name/op/openctm/package.nix index e255e209111dd..169e4469abcd8 100644 --- a/pkgs/by-name/op/openctm/package.nix +++ b/pkgs/by-name/op/openctm/package.nix @@ -3,7 +3,7 @@ stdenv, fetchurl, pkg-config, - freeglut, + libglut, gtk2, libGLU, }: @@ -27,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ pkg-config ]; buildInputs = [ - freeglut + libglut gtk2 libGLU ]; diff --git a/pkgs/by-name/op/openscad-unstable/package.nix b/pkgs/by-name/op/openscad-unstable/package.nix index 1e14580b42bb5..09514490ebf99 100644 --- a/pkgs/by-name/op/openscad-unstable/package.nix +++ b/pkgs/by-name/op/openscad-unstable/package.nix @@ -149,11 +149,14 @@ clangStdenv.mkDerivation rec { "-DCMAKE_EXE_LINKER_FLAGS=-fuse-ld=lld" "-DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON" ]; + doCheck = true; + + nativeCheckInputs = [ + mesa.llvmpipeHook + ]; + checkPhase = '' - # for running mesa llvmpipe - export __EGL_VENDOR_LIBRARY_FILENAMES=${mesa.drivers}/share/glvnd/egl_vendor.d/50_mesa.json - export LIBGL_DRIVERS_PATH=${mesa.drivers}/lib:${mesa.drivers}/lib/dri # some fontconfig issues cause pdf output to have wrong font ctest -j$NIX_BUILD_CORES -E pdfexporttest.\* ''; diff --git a/pkgs/by-name/op/opensplat/package.nix b/pkgs/by-name/op/opensplat/package.nix index cd6052f5369b0..d808a403e7bd8 100644 --- a/pkgs/by-name/op/opensplat/package.nix +++ b/pkgs/by-name/op/opensplat/package.nix @@ -4,13 +4,13 @@ cmake, ninja, fetchFromGitHub, - fetchpatch, python3, opencv, nlohmann_json, nanoflann, glm, cxxopts, + nix-update-script, config, # Upstream has rocm/hip support, too. anyone? cudaSupport ? config.cudaSupport, @@ -18,7 +18,7 @@ autoAddDriverRunpath, }: let - version = "1.1.2"; + version = "1.1.3"; torch = python3.pkgs.torch.override { inherit cudaSupport; }; # Using a normal stdenv with cuda torch gives # ld: /nix/store/k1l7y96gv0nc685cg7i3g43i4icmddzk-python3.11-torch-2.2.1-lib/lib/libc10.so: undefined reference to `std::ios_base_library_init()@GLIBCXX_3.4.32' @@ -32,27 +32,9 @@ stdenv'.mkDerivation { owner = "pierotofy"; repo = "OpenSplat"; rev = "refs/tags/v${version}"; - hash = "sha256-3tk62b5fSf6wzuc5TwkdfAKgUMrw3ZxetCJa2RVMS/s="; + hash = "sha256-2NcKb2SWU/vNsnd2KhdU85J60fJPuc44ZxIle/1UT6g="; }; - patches = [ - (fetchpatch { - name = "install-executables.patch"; - url = "https://github.com/pierotofy/OpenSplat/commit/b4c4176819b508978583b7ebf66306171807a8e6.patch"; - hash = "sha256-BUgPMcO3lt3ZEzv24u36k3aTEIoloOhxrCGi1KQ5Epk="; - }) - ]; - - postPatch = '' - # the two vendored gsplats are so heavily modified they may be considered a fork - find vendor ! -name 'gsplat*' -maxdepth 1 -mindepth 1 -exec rm -rf {} + - mkdir vendor/{nanoflann,glm} - ln -s ${glm}/include/glm vendor/glm/glm - ln -s ${nanoflann}/include/nanoflann.hpp vendor/nanoflann/nanoflann.hpp - ln -s ${nlohmann_json}/include/nlohmann vendor/json - ln -s ${cxxopts}/include/cxxopts.hpp vendor/cxxopts.hpp - ''; - nativeBuildInputs = [ cmake ninja @@ -63,6 +45,9 @@ stdenv'.mkDerivation { buildInputs = [ nlohmann_json + nanoflann + glm + cxxopts torch.cxxdev torch opencv @@ -74,15 +59,23 @@ stdenv'.mkDerivation { cmakeFlags = [ (lib.cmakeBool "CMAKE_SKIP_RPATH" true) + (lib.cmakeFeature "FETCHCONTENT_TRY_FIND_PACKAGE_MODE" "ALWAYS") ] ++ lib.optionals cudaSupport [ (lib.cmakeFeature "GPU_RUNTIME" "CUDA") (lib.cmakeFeature "CUDA_TOOLKIT_ROOT_DIR" "${cudaPackages.cudatoolkit}/") ]; + passthru.updateScript = nix-update-script { }; + meta = { description = "Production-grade 3D gaussian splatting"; homepage = "https://github.com/pierotofy/OpenSplat/"; - license = lib.licenses.mit; + license = [ + # main + lib.licenses.agpl3Only + # vendored+modified gsplat + lib.licenses.asl20 + ]; maintainers = [ lib.maintainers.jcaesar ]; platforms = lib.platforms.linux ++ lib.optionals (!cudaSupport) lib.platforms.darwin; }; diff --git a/pkgs/by-name/ot/oterm/package.nix b/pkgs/by-name/ot/oterm/package.nix index 9651b8d9cf3ba..680a66820d872 100644 --- a/pkgs/by-name/ot/oterm/package.nix +++ b/pkgs/by-name/ot/oterm/package.nix @@ -28,7 +28,6 @@ python3Packages.buildPythonApplication rec { build-system = with python3Packages; [ poetry-core ]; - nativeBuildInputs = with python3Packages; [ pythonRelaxDepsHook ]; dependencies = with python3Packages; [ aiohttp diff --git a/pkgs/by-name/pa/pacu/package.nix b/pkgs/by-name/pa/pacu/package.nix index 46143afdb5e38..5c87d124ee962 100644 --- a/pkgs/by-name/pa/pacu/package.nix +++ b/pkgs/by-name/pa/pacu/package.nix @@ -32,7 +32,6 @@ python.pkgs.buildPythonApplication rec { build-system = with python.pkgs; [ poetry-core ]; - nativeBuildInputs = with python.pkgs; [ pythonRelaxDepsHook ]; dependencies = [ awscli ] diff --git a/pkgs/by-name/pr/pre2k/package.nix b/pkgs/by-name/pr/pre2k/package.nix index 4865269b55654..98b763cb011df 100644 --- a/pkgs/by-name/pr/pre2k/package.nix +++ b/pkgs/by-name/pr/pre2k/package.nix @@ -24,7 +24,6 @@ python3.pkgs.buildPythonApplication rec { nativeBuildInputs = with python3.pkgs; [ poetry-core - pythonRelaxDepsHook ]; propagatedBuildInputs = with python3.pkgs; [ diff --git a/pkgs/by-name/pr/pretalx/package.nix b/pkgs/by-name/pr/pretalx/package.nix index 784976d06eaf8..8e1c213e2b2ad 100644 --- a/pkgs/by-name/pr/pretalx/package.nix +++ b/pkgs/by-name/pr/pretalx/package.nix @@ -91,7 +91,6 @@ python.pkgs.buildPythonApplication rec { nativeBuildInputs = [ gettext ] ++ (with python.pkgs; [ - pythonRelaxDepsHook setuptools ]); diff --git a/pkgs/by-name/pr/prowler/package.nix b/pkgs/by-name/pr/prowler/package.nix index cf843d8ab1c75..4b19cadb0e3af 100644 --- a/pkgs/by-name/pr/prowler/package.nix +++ b/pkgs/by-name/pr/prowler/package.nix @@ -34,10 +34,6 @@ python3.pkgs.buildPythonApplication rec { "slack-sdk" ]; - nativeBuildInputs = with python3.pkgs; [ - pythonRelaxDepsHook - ]; - build-system = with python3.pkgs; [ poetry-core ]; diff --git a/pkgs/by-name/py/pysqlrecon/package.nix b/pkgs/by-name/py/pysqlrecon/package.nix index e2019c45b1340..d9d8c51bb8285 100644 --- a/pkgs/by-name/py/pysqlrecon/package.nix +++ b/pkgs/by-name/py/pysqlrecon/package.nix @@ -22,7 +22,6 @@ python3.pkgs.buildPythonApplication rec { nativeBuildInputs = with python3.pkgs; [ poetry-core - pythonRelaxDepsHook ]; propagatedBuildInputs = with python3.pkgs; [ diff --git a/pkgs/by-name/ra/rabbit/package.nix b/pkgs/by-name/ra/rabbit/package.nix index 09fb2d7894233..1ec1e092c1f19 100644 --- a/pkgs/by-name/ra/rabbit/package.nix +++ b/pkgs/by-name/ra/rabbit/package.nix @@ -20,7 +20,6 @@ python3.pkgs.buildPythonApplication rec { build-system = [ python3.pkgs.setuptools python3.pkgs.wheel - python3.pkgs.pythonRelaxDepsHook ]; dependencies = with python3.pkgs; [ diff --git a/pkgs/by-name/rc/rclip/package.nix b/pkgs/by-name/rc/rclip/package.nix index 4be5a5429d1e4..8cca9c52e26ac 100644 --- a/pkgs/by-name/rc/rclip/package.nix +++ b/pkgs/by-name/rc/rclip/package.nix @@ -27,7 +27,7 @@ python3Packages.buildPythonApplication rec { tqdm ]; - nativeCheckInputs = with python3Packages; [ pytestCheckHook pythonRelaxDepsHook ]; + nativeCheckInputs = with python3Packages; [ pytestCheckHook ]; pythonRelaxDeps = [ "torch" "torchvision" ]; diff --git a/pkgs/by-name/rd/rdwatool/package.nix b/pkgs/by-name/rd/rdwatool/package.nix index 49459eb39a9e1..7ae9db0bfae76 100644 --- a/pkgs/by-name/rd/rdwatool/package.nix +++ b/pkgs/by-name/rd/rdwatool/package.nix @@ -24,7 +24,6 @@ python3.pkgs.buildPythonApplication rec { ]; nativeBuildInputs = with python3.pkgs; [ - pythonRelaxDepsHook setuptools ]; diff --git a/pkgs/by-name/re/rerun/package.nix b/pkgs/by-name/re/rerun/package.nix index 6fedb10cfed12..4d9c8da8041c0 100644 --- a/pkgs/by-name/re/rerun/package.nix +++ b/pkgs/by-name/re/rerun/package.nix @@ -126,8 +126,5 @@ rustPlatform.buildRustPackage rec { ]; maintainers = with maintainers; [ SomeoneSerge ]; mainProgram = "rerun"; - # See comment about wasm32-unknown-unknown in rustc.nix. - broken = lib.any (a: lib.hasAttr a stdenv.hostPlatform.gcc) [ "cpu" "float-abi" "fpu" ] || - !stdenv.hostPlatform.gcc.thumb or true; }; } diff --git a/pkgs/by-name/re/retool/package.nix b/pkgs/by-name/re/retool/package.nix index 84bba4dae2ee6..fda7361ee8b78 100644 --- a/pkgs/by-name/re/retool/package.nix +++ b/pkgs/by-name/re/retool/package.nix @@ -21,7 +21,6 @@ python3.pkgs.buildPythonApplication rec { nativeBuildInputs = with python3.pkgs; [ hatchling - pythonRelaxDepsHook qt6.wrapQtAppsHook ]; diff --git a/pkgs/by-name/ro/route-graph/package.nix b/pkgs/by-name/ro/route-graph/package.nix index 36158282f783b..7e6e8d2bd6a62 100644 --- a/pkgs/by-name/ro/route-graph/package.nix +++ b/pkgs/by-name/ro/route-graph/package.nix @@ -25,10 +25,6 @@ python3.pkgs.buildPythonApplication rec { poetry-core ]; - nativeBuildInputs = with python3.pkgs; [ - pythonRelaxDepsHook - ]; - propagatedBuildInputs = [ graphviz ] ++ (with python3.pkgs; [ diff --git a/pkgs/by-name/se/selenium-manager/package.nix b/pkgs/by-name/se/selenium-manager/package.nix index 4dac1c11b4333..d9f127a1c953b 100644 --- a/pkgs/by-name/se/selenium-manager/package.nix +++ b/pkgs/by-name/se/selenium-manager/package.nix @@ -7,18 +7,18 @@ rustPlatform.buildRustPackage rec { pname = "selenium-manager"; - version = "4.18.1"; + version = "4.22.0"; src = fetchFromGitHub { owner = "SeleniumHQ"; repo = "selenium"; rev = "selenium-${version}"; - hash = "sha256-1C9Epsk9rFlShxHGGzbWl6smrMzPn2h3yCWlzUIMpY8="; + hash = "sha256-qBuZgI5SSBwxbSBrAT0W/HzzV2JmPL00hPJ6s57QTeg="; }; sourceRoot = "${src.name}/rust"; - cargoHash = "sha256-BystESOFIitw3ER2K1TPOf5luOBvKXFuqc/unL93yRY="; + cargoHash = "sha256-1CPUOAfBfUeZt5S8t5SM3oyrNwXKHplhHG5idVy4YrE="; buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.SystemConfiguration diff --git a/pkgs/by-name/sh/shell-gpt/package.nix b/pkgs/by-name/sh/shell-gpt/package.nix index 92f451b24088f..6558c612d84fc 100644 --- a/pkgs/by-name/sh/shell-gpt/package.nix +++ b/pkgs/by-name/sh/shell-gpt/package.nix @@ -26,7 +26,6 @@ python3.pkgs.buildPythonApplication rec { build-system = with python3.pkgs; [ hatchling ]; - nativeBuildInputs = with python3.pkgs; [ pythonRelaxDepsHook ]; propagatedBuildInputs = with python3.pkgs; [ click diff --git a/pkgs/by-name/sm/smassh/package.nix b/pkgs/by-name/sm/smassh/package.nix index eb82f51399acd..d723be41d2b9b 100644 --- a/pkgs/by-name/sm/smassh/package.nix +++ b/pkgs/by-name/sm/smassh/package.nix @@ -19,7 +19,6 @@ python3.pkgs.buildPythonApplication rec { nativeBuildInputs = with python3.pkgs; [ poetry-core - pythonRelaxDepsHook ]; pythonRelaxDeps = [ diff --git a/pkgs/by-name/sn/snapcraft/package.nix b/pkgs/by-name/sn/snapcraft/package.nix index 38d0f47edbaaa..5fd0b80ce6ecd 100644 --- a/pkgs/by-name/sn/snapcraft/package.nix +++ b/pkgs/by-name/sn/snapcraft/package.nix @@ -105,7 +105,6 @@ python3Packages.buildPythonApplication rec { ]; nativeBuildInputs = with python3Packages; [ - pythonRelaxDepsHook setuptools ]; diff --git a/pkgs/by-name/st/streamdeck-ui/package.nix b/pkgs/by-name/st/streamdeck-ui/package.nix index 4af7ad66c7898..1549d2c6e1c9c 100644 --- a/pkgs/by-name/st/streamdeck-ui/package.nix +++ b/pkgs/by-name/st/streamdeck-ui/package.nix @@ -40,7 +40,6 @@ python3Packages.buildPythonApplication rec { nativeBuildInputs = [ python3Packages.poetry-core - python3Packages.pythonRelaxDepsHook copyDesktopItems qt6.wrapQtAppsHook wrapGAppsHook3 diff --git a/pkgs/by-name/st/strictdoc/package.nix b/pkgs/by-name/st/strictdoc/package.nix index 95d11ba10aeef..05575c98ec9a9 100644 --- a/pkgs/by-name/st/strictdoc/package.nix +++ b/pkgs/by-name/st/strictdoc/package.nix @@ -17,7 +17,6 @@ python3.pkgs.buildPythonApplication rec { nativeBuildInputs = [ python3.pkgs.hatchling - python3.pkgs.pythonRelaxDepsHook ]; propagatedBuildInputs = with python3.pkgs; [ diff --git a/pkgs/by-name/su/surrealist/package.nix b/pkgs/by-name/su/surrealist/package.nix index 53290ea042c73..0c1e0abd1e57b 100644 --- a/pkgs/by-name/su/surrealist/package.nix +++ b/pkgs/by-name/su/surrealist/package.nix @@ -166,8 +166,5 @@ in stdenv.mkDerivation (finalAttrs: { mainProgram = "surrealist"; maintainers = with maintainers; [ frankp ]; platforms = platforms.linux; - # See comment about wasm32-unknown-unknown in rustc.nix. - broken = lib.any (a: lib.hasAttr a stdenv.hostPlatform.gcc) [ "cpu" "float-abi" "fpu" ] || - !stdenv.hostPlatform.gcc.thumb or true; }; }) diff --git a/pkgs/by-name/tb/tbump/package.nix b/pkgs/by-name/tb/tbump/package.nix index 2812dd2f05d0c..1314c1ec6d126 100644 --- a/pkgs/by-name/tb/tbump/package.nix +++ b/pkgs/by-name/tb/tbump/package.nix @@ -18,7 +18,6 @@ python3Packages.buildPythonApplication rec { pythonRelaxDeps = [ "tomlkit" ]; - nativeBuildInputs = with python3Packages; [ pythonRelaxDepsHook ]; build-system = with python3Packages; [ poetry-core ]; diff --git a/pkgs/by-name/te/tetrio-desktop/tetrio-plus.nix b/pkgs/by-name/te/tetrio-desktop/tetrio-plus.nix index c01bc623c9d9d..0ee89e9e037bb 100644 --- a/pkgs/by-name/te/tetrio-desktop/tetrio-plus.nix +++ b/pkgs/by-name/te/tetrio-desktop/tetrio-plus.nix @@ -78,9 +78,6 @@ let license = lib.licenses.mit; maintainers = with lib.maintainers; [ huantian wackbyte ]; platforms = lib.platforms.linux; - # See comment about wasm32-unknown-unknown in rustc.nix. - broken = lib.any (a: lib.hasAttr a stdenv.hostPlatform.gcc) [ "cpu" "float-abi" "fpu" ] || - !stdenv.hostPlatform.gcc.thumb or true; }; }; diff --git a/pkgs/by-name/tr/troubadix/package.nix b/pkgs/by-name/tr/troubadix/package.nix index 0906dd4becb23..a23d8da4eaf7c 100644 --- a/pkgs/by-name/tr/troubadix/package.nix +++ b/pkgs/by-name/tr/troubadix/package.nix @@ -21,7 +21,6 @@ python3.pkgs.buildPythonApplication rec { build-system = with python3.pkgs; [ poetry-core ]; - nativeBuildInputs = with python3.pkgs; [ pythonRelaxDepsHook ]; dependencies = with python3.pkgs; [ chardet diff --git a/pkgs/by-name/tu/tunnelgraf/package.nix b/pkgs/by-name/tu/tunnelgraf/package.nix index d7f2c77dab0a8..a24ea1b67fc6a 100644 --- a/pkgs/by-name/tu/tunnelgraf/package.nix +++ b/pkgs/by-name/tu/tunnelgraf/package.nix @@ -22,7 +22,6 @@ python3.pkgs.buildPythonApplication rec { build-system = with python3.pkgs; [ hatchling - pythonRelaxDepsHook ]; dependencies = with python3.pkgs; [ diff --git a/pkgs/by-name/tw/twitch-dl/package.nix b/pkgs/by-name/tw/twitch-dl/package.nix index 81c444ea340fb..b98f88d300602 100644 --- a/pkgs/by-name/tw/twitch-dl/package.nix +++ b/pkgs/by-name/tw/twitch-dl/package.nix @@ -24,7 +24,6 @@ python3Packages.buildPythonApplication rec { nativeBuildInputs = [ python3Packages.setuptools python3Packages.setuptools-scm - python3Packages.pythonRelaxDepsHook installShellFiles scdoc ]; diff --git a/pkgs/by-name/un/unsilence/package.nix b/pkgs/by-name/un/unsilence/package.nix index c82fe04616b69..76a362f279c33 100644 --- a/pkgs/by-name/un/unsilence/package.nix +++ b/pkgs/by-name/un/unsilence/package.nix @@ -17,7 +17,6 @@ python3Packages.buildPythonPackage rec { nativeBuildInputs = with python3Packages; [ rich - pythonRelaxDepsHook ]; propagatedBuildInputs = [ diff --git a/pkgs/by-name/up/upiano/package.nix b/pkgs/by-name/up/upiano/package.nix index 46224f45a9bb3..4ad1456fc96e9 100644 --- a/pkgs/by-name/up/upiano/package.nix +++ b/pkgs/by-name/up/upiano/package.nix @@ -23,7 +23,6 @@ python3.pkgs.buildPythonApplication rec { nativeBuildInputs = with python3.pkgs; [ poetry-core - pythonRelaxDepsHook ]; propagatedBuildInputs = with python3.pkgs; [ diff --git a/pkgs/by-name/uw/uwhoisd/package.nix b/pkgs/by-name/uw/uwhoisd/package.nix index 2fb31c23669d3..81080d476e8e3 100644 --- a/pkgs/by-name/uw/uwhoisd/package.nix +++ b/pkgs/by-name/uw/uwhoisd/package.nix @@ -22,7 +22,6 @@ python3.pkgs.buildPythonApplication rec { build-system = with python3.pkgs; [ poetry-core - pythonRelaxDepsHook ]; propagatedBuildInputs = with python3.pkgs; [ diff --git a/pkgs/by-name/vu/vunnel/package.nix b/pkgs/by-name/vu/vunnel/package.nix index 9ca3f5d42c334..53df74f8533c7 100644 --- a/pkgs/by-name/vu/vunnel/package.nix +++ b/pkgs/by-name/vu/vunnel/package.nix @@ -22,7 +22,6 @@ python3.pkgs.buildPythonApplication rec { "sqlalchemy" ]; - nativeBuildInputs = with python3.pkgs; [ pythonRelaxDepsHook ]; build-system = with python3.pkgs; [ poetry-core diff --git a/pkgs/by-name/wa/waf/package.nix b/pkgs/by-name/wa/waf/package.nix index 812c6dd9b8d73..a30c5df8d8511 100644 --- a/pkgs/by-name/wa/waf/package.nix +++ b/pkgs/by-name/wa/waf/package.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "waf"; - version = "2.0.27"; + version = "2.1.1"; src = fetchFromGitLab { owner = "ita1024"; repo = "waf"; rev = "waf-${finalAttrs.version}"; - hash = "sha256-GeEoD5CHubwR4ndGk7J7czEf0hWtPQr88TqJDPqeK0s="; + hash = "sha256-38u8DJ1KLkb7FfeCr+1e5UBE3Qkx1q2FBsm5HDXnunQ="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/wi/witnessme/package.nix b/pkgs/by-name/wi/witnessme/package.nix index a19a387f3185f..de83d1475360a 100644 --- a/pkgs/by-name/wi/witnessme/package.nix +++ b/pkgs/by-name/wi/witnessme/package.nix @@ -28,10 +28,6 @@ python3.pkgs.buildPythonApplication rec { pythonRelaxDeps = true; - nativeBuildInputs = with python3.pkgs; [ - pythonRelaxDepsHook - ]; - build-system = with python3.pkgs; [ poetry-core ]; diff --git a/pkgs/by-name/ws/wsrepl/package.nix b/pkgs/by-name/ws/wsrepl/package.nix index 9bab0957d5b3a..9557fec2210c6 100644 --- a/pkgs/by-name/ws/wsrepl/package.nix +++ b/pkgs/by-name/ws/wsrepl/package.nix @@ -19,10 +19,6 @@ python3.pkgs.buildPythonApplication rec { "textual" ]; - nativeBuildInputs = with python3.pkgs; [ - pythonRelaxDepsHook - ]; - build-system = with python3.pkgs; [ poetry-core ]; diff --git a/pkgs/by-name/wt/wtfis/package.nix b/pkgs/by-name/wt/wtfis/package.nix index ad710bf8f2291..3d8e97ea80f0d 100644 --- a/pkgs/by-name/wt/wtfis/package.nix +++ b/pkgs/by-name/wt/wtfis/package.nix @@ -17,10 +17,6 @@ in python3.pkgs.buildPythonApplication { format = "pyproject"; - nativeBuildInputs = [ - python3.pkgs.pythonRelaxDepsHook - ]; - propagatedBuildInputs = [ python3.pkgs.hatchling python3.pkgs.pydantic diff --git a/pkgs/by-name/wy/wyoming-satellite/package.nix b/pkgs/by-name/wy/wyoming-satellite/package.nix index cb34afc5b2f1a..f23a5864b452f 100644 --- a/pkgs/by-name/wy/wyoming-satellite/package.nix +++ b/pkgs/by-name/wy/wyoming-satellite/package.nix @@ -17,7 +17,6 @@ python3Packages.buildPythonApplication rec { nativeBuildInputs = with python3Packages; [ setuptools - pythonRelaxDepsHook ]; pythonRelaxDeps = [ diff --git a/pkgs/by-name/xs/xsimd/disable-test_error_gamma.patch b/pkgs/by-name/xs/xsimd/disable-test_error_gamma.patch new file mode 100644 index 0000000000000..49957ea62ed74 --- /dev/null +++ b/pkgs/by-name/xs/xsimd/disable-test_error_gamma.patch @@ -0,0 +1,30 @@ +diff --git i/test/test_error_gamma.cpp w/test/test_error_gamma.cpp +index 214cbb5..299e5b8 100644 +--- i/test/test_error_gamma.cpp ++++ w/test/test_error_gamma.cpp +@@ -131,25 +131,6 @@ struct error_gamma_test + INFO("lgamma"); + CHECK_EQ(diff, 0); + } +-#if !(XSIMD_WITH_AVX && !XSIMD_WITH_AVX2) +- +- // tgamma (negative input) +- { +- std::transform(gamma_neg_input.cbegin(), gamma_neg_input.cend(), expected.begin(), +- [](const value_type& v) +- { return std::lgamma(v); }); +- batch_type in, out; +- for (size_t i = 0; i < nb_input; i += size) +- { +- detail::load_batch(in, gamma_neg_input, i); +- out = lgamma(in); +- detail::store_batch(out, res, i); +- } +- size_t diff = detail::get_nb_diff(res, expected); +- INFO("lgamma (negative input)"); +- CHECK_EQ(diff, 0); +- } +-#endif + } + }; + diff --git a/pkgs/by-name/xs/xsimd/package.nix b/pkgs/by-name/xs/xsimd/package.nix new file mode 100644 index 0000000000000..8f8c72bc3f6a1 --- /dev/null +++ b/pkgs/by-name/xs/xsimd/package.nix @@ -0,0 +1,61 @@ +{ lib +, stdenv +, fetchFromGitHub +, fetchpatch +, cmake +, doctest +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "xsimd"; + version = "13.0.0"; + src = fetchFromGitHub { + owner = "xtensor-stack"; + repo = "xsimd"; + rev = finalAttrs.version; + hash = "sha256-qElJYW5QDj3s59L3NgZj5zkhnUMzIP2mBa1sPks3/CE="; + }; + patches = [ + # Fix of https://github.com/xtensor-stack/xsimd/pull/1024 for + # https://github.com/xtensor-stack/xsimd/issues/456 and + # https://github.com/xtensor-stack/xsimd/issues/807, + (fetchpatch { + url = "https://github.com/xtensor-stack/xsimd/commit/c8a87ed6e04b6782f48f94713adfb0cad6c11ddf.patch"; + hash = "sha256-2/FvBGdqTPcayD7rdHPSzL+F8IYKAfMW0WBJ0cW9EZ0="; + }) + ] ++ lib.optionals stdenv.isDarwin [ + # https://github.com/xtensor-stack/xsimd/issues/1030 + ./disable-test_error_gamma.patch + ]; + + # strictDeps raises the chance that xsimd will be able to be cross compiled + strictDeps = true; + + nativeBuildInputs = [ + cmake + ]; + + buildInputs = [ + doctest + ]; + + cmakeFlags = [ + # Always build the tests, even if not running them, because testing whether + # they can be built is a test in itself. + "-DBUILD_TESTS=ON" + ]; + + doCheck = true; + checkTarget = "xtest"; + + meta = with lib; { + changelog = "https://github.com/xtensor-stack/xsimd/blob/${finalAttrs.version}/Changelog.rst#${ + builtins.replaceStrings [ "." ] [ "" ] finalAttrs.version + }"; + description = "C++ wrappers for SIMD intrinsics"; + homepage = "https://github.com/xtensor-stack/xsimd"; + license = licenses.bsd3; + maintainers = with maintainers; [ tobim doronbehar ]; + platforms = platforms.all; + }; +}) |