diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index e0eb9d8ca1ee..f55f28805d45 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -19683,12 +19683,6 @@ githubId = 7239200; name = "panda2134"; }; - pandaman = { - email = "kointosudesuyo@infoseek.jp"; - github = "pandaman64"; - githubId = 1788628; - name = "pandaman"; - }; pandanz = { email = "gate.rules-5j@icloud.com"; github = "pandanz"; diff --git a/nixos/modules/programs/wayland/gtklock.nix b/nixos/modules/programs/wayland/gtklock.nix index a3cef937ca83..e1162ad99a64 100644 --- a/nixos/modules/programs/wayland/gtklock.nix +++ b/nixos/modules/programs/wayland/gtklock.nix @@ -39,7 +39,7 @@ in }; style = mkOption { - type = with types; nullOr str; + type = with types; nullOr lines; default = null; description = '' CSS Stylesheet for gtklock. diff --git a/nixos/modules/services/desktop-managers/plasma6.nix b/nixos/modules/services/desktop-managers/plasma6.nix index 529734bd503f..26507d2887f7 100644 --- a/nixos/modules/services/desktop-managers/plasma6.nix +++ b/nixos/modules/services/desktop-managers/plasma6.nix @@ -166,7 +166,6 @@ in spectacle ffmpegthumbs krdp - xwaylandvideobridge # exposes Wayland windows to X11 screen capture ] ++ lib.optionals config.hardware.sensor.iio.enable [ # This is required for autorotation in Plasma 6 diff --git a/nixos/modules/services/monitoring/uptime-kuma.nix b/nixos/modules/services/monitoring/uptime-kuma.nix index c673a09832b0..cab1e989c14e 100644 --- a/nixos/modules/services/monitoring/uptime-kuma.nix +++ b/nixos/modules/services/monitoring/uptime-kuma.nix @@ -53,6 +53,7 @@ in serviceConfig = { Type = "simple"; StateDirectory = "uptime-kuma"; + StateDirectoryMode = "750"; DynamicUser = true; ExecStart = "${cfg.package}/bin/uptime-kuma-server"; Restart = "on-failure"; @@ -60,18 +61,20 @@ in CapabilityBoundingSet = ""; LockPersonality = true; MemoryDenyWriteExecute = false; # enabling it breaks execution + MountAPIVFS = true; NoNewPrivileges = true; PrivateDevices = true; PrivateMounts = true; PrivateTmp = true; + PrivateUsers = true; ProtectClock = true; - ProtectControlGroups = true; + ProtectControlGroups = "strict"; ProtectHome = true; ProtectHostname = true; ProtectKernelLogs = true; ProtectKernelModules = true; ProtectKernelTunables = true; - ProtectProc = "noaccess"; + ProtectProc = "invisible"; ProtectSystem = "strict"; RemoveIPC = true; RestrictAddressFamilies = [ diff --git a/nixos/tests/rabbitmq.nix b/nixos/tests/rabbitmq.nix index 94c7bdf49ba5..ab339b95d2ab 100644 --- a/nixos/tests/rabbitmq.nix +++ b/nixos/tests/rabbitmq.nix @@ -1,6 +1,6 @@ # This test runs rabbitmq and checks if rabbitmq is up and running. -{ pkgs, ... }: +{ lib, pkgs, ... }: let # in real life, you would keep this out of your repo and deploy it to a safe # location using safe means. @@ -40,6 +40,8 @@ in ]. ''; }; + systemd.services.rabbitmq.serviceConfig.Restart = lib.mkForce "no"; + # Ensure there is sufficient extra disk space for rabbitmq to be happy virtualisation.diskSize = 1024; }; diff --git a/pkgs/applications/audio/sonic-pi/default.nix b/pkgs/applications/audio/sonic-pi/default.nix index 87e1aefabc8d..11cedbaa1368 100644 --- a/pkgs/applications/audio/sonic-pi/default.nix +++ b/pkgs/applications/audio/sonic-pi/default.nix @@ -19,8 +19,6 @@ reproc, platform-folders, ruby_3_2, - erlang, - elixir, beamPackages, alsa-lib, rtmidi, @@ -73,8 +71,8 @@ stdenv.mkDerivation rec { cmake pkg-config ruby - erlang - elixir + beamPackages.erlang + beamPackages.elixir beamPackages.hex ]; @@ -224,8 +222,8 @@ stdenv.mkDerivation rec { fi # Remove runtime Erlang references - for file in $(grep -FrIl '${erlang}/lib/erlang' $out/app/server/beam/tau); do - substituteInPlace "$file" --replace '${erlang}/lib/erlang' $out/app/server/beam/tau/_build/prod/rel/tau + for file in $(grep -FrIl '${beamPackages.erlang}/lib/erlang' $out/app/server/beam/tau); do + substituteInPlace "$file" --replace '${beamPackages.erlang}/lib/erlang' $out/app/server/beam/tau/_build/prod/rel/tau done ''; diff --git a/pkgs/applications/editors/vscode/extensions/anthropic.claude-code/default.nix b/pkgs/applications/editors/vscode/extensions/anthropic.claude-code/default.nix index 2ada2cc21ddb..f9ab6f4edaff 100644 --- a/pkgs/applications/editors/vscode/extensions/anthropic.claude-code/default.nix +++ b/pkgs/applications/editors/vscode/extensions/anthropic.claude-code/default.nix @@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { name = "claude-code"; publisher = "anthropic"; - version = "2.0.9"; - hash = "sha256-uVCdFSpitKU0YPbhl1kbogrQ+bckhH6GYTd7GPjrMRA="; + version = "2.0.10"; + hash = "sha256-wtqtjvU7HZZWUxRRN/H7I0lgCMRzGZy/Mu5s30ZbJ0g="; }; meta = { diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index 289f0f72293c..85403a5e9855 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -3840,8 +3840,8 @@ let mktplcRef = { publisher = "redhat"; name = "java"; - version = "1.45.0"; - hash = "sha256-aLyAU5J+65Cw3UsYey9Y2/bSMWFiz3TNOwBBvjev8dY="; + version = "1.46.0"; + hash = "sha256-i7Nac47aJVdxxRgM8KCCI8zmwTCGxxy0PrejgjOCYXE="; }; buildInputs = [ jdk ]; meta = { diff --git a/pkgs/applications/misc/birdtray/default.nix b/pkgs/applications/misc/birdtray/default.nix index ee2d5bc033ef..ce8673ed6c09 100644 --- a/pkgs/applications/misc/birdtray/default.nix +++ b/pkgs/applications/misc/birdtray/default.nix @@ -31,6 +31,12 @@ mkDerivation rec { qtx11extras ]; + cmakeFlags = [ + # CMake 4 dropped support of versions lower than 3.5, + # versions lower than 3.10 are deprecated. + (lib.cmakeFeature "CMAKE_POLICY_VERSION_MINIMUM" "3.10") + ]; + # Wayland support is broken. # https://github.com/gyunaev/birdtray/issues/113#issuecomment-621742315 qtWrapperArgs = [ "--set QT_QPA_PLATFORM xcb" ]; diff --git a/pkgs/applications/misc/input-leap/default.nix b/pkgs/applications/misc/input-leap/default.nix index 808808b91f0d..5fdc6ecadcec 100644 --- a/pkgs/applications/misc/input-leap/default.nix +++ b/pkgs/applications/misc/input-leap/default.nix @@ -96,7 +96,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/input-leap/input-leap"; license = lib.licenses.gpl2Plus; maintainers = with lib.maintainers; [ - kovirobi phryneas twey shymega diff --git a/pkgs/applications/networking/browsers/chromium/info.json b/pkgs/applications/networking/browsers/chromium/info.json index f413c21961e0..1c02848bac03 100644 --- a/pkgs/applications/networking/browsers/chromium/info.json +++ b/pkgs/applications/networking/browsers/chromium/info.json @@ -1,10 +1,10 @@ { "chromium": { - "version": "141.0.7390.54", + "version": "141.0.7390.65", "chromedriver": { - "version": "141.0.7390.55", - "hash_darwin": "sha256-wo68N1aftGGyZR4rYI+96lXKJqPAYro3g4s/OL/CUco=", - "hash_darwin_aarch64": "sha256-5uUklsYRFhpLIAKoPl5EU5dQJcxwXVpJp0lyQ4SkspY=" + "version": "141.0.7390.66", + "hash_darwin": "sha256-0LLARLPwlZ3KB5xCq4Yx5S6vtnhVddJ62IdgEy0vp7o=", + "hash_darwin_aarch64": "sha256-rLW5FOMNyFEn1Du2VN2sGfWri2erjN7SENa01vA2Vp8=" }, "deps": { "depot_tools": { @@ -21,8 +21,8 @@ "DEPS": { "src": { "url": "https://chromium.googlesource.com/chromium/src.git", - "rev": "b95610d5c4a562d9cd834bc0a098d3316e2f533f", - "hash": "sha256-jraDPodJBdyFFHS30BcQTZOEUD+h9SFHQrO0GoMhtk8=", + "rev": "b2ec783d2b51a396804a4e3e33f6586be09a4e2d", + "hash": "sha256-9jZ7411NThelyL0R5yoLXB0lOkydOI3v6K5ORhjqfF4=", "recompress": true }, "src/third_party/clang-format/script": { @@ -252,8 +252,8 @@ }, "src/third_party/devtools-frontend/src": { "url": "https://chromium.googlesource.com/devtools/devtools-frontend", - "rev": "65f160d43dc97a2e8eb5e1c2814179a519313884", - "hash": "sha256-VLMJ/WWCIzk92mmuBdx+P6Gi0ouiXuMGkiR0KVK5GWI=" + "rev": "9c2c4cc7cf6c82ad460e1f3b49f34bb702d5fe11", + "hash": "sha256-qj1vR0FW2jiR2v18Nv8RqYgy/UEw2rgGUsQ68EhdHos=" }, "src/third_party/dom_distiller_js/dist": { "url": "https://chromium.googlesource.com/chromium/dom-distiller/dist.git", diff --git a/pkgs/applications/networking/browsers/librewolf/src.json b/pkgs/applications/networking/browsers/librewolf/src.json index 0096c24902bb..be1a3e715912 100644 --- a/pkgs/applications/networking/browsers/librewolf/src.json +++ b/pkgs/applications/networking/browsers/librewolf/src.json @@ -1,11 +1,11 @@ { - "packageVersion": "143.0.3-1", + "packageVersion": "143.0.4-1", "source": { - "rev": "143.0.3-1", - "hash": "sha256-0gOt8YEnyDcMHy+EdSi2MLtRZMnMzfeBBKiMa2QO3uQ=" + "rev": "143.0.4-1", + "hash": "sha256-RyLz5se2AqXAmsa/MckiUgcBfRxZVVsrNg2L757qOuo=" }, "firefox": { - "version": "143.0.3", - "hash": "sha512-wJK9Oqx5+FaoBMkIt21AQJzgUrABdiaeowKbWjpohdTSHOJr12yeoTgn/3VFm2tLBWb1qkkDWsI0rliQxnhFsA==" + "version": "143.0.4", + "hash": "sha512-K8veTnLqQenMyYg2kBY1NQtdx7UMYY4Zq2EDonrcDwF8o/p1VTeMivbuHzoU0Ck1KJ/isNNdhA1hD1rAeojktg==" } } diff --git a/pkgs/applications/networking/cluster/k3s/builder.nix b/pkgs/applications/networking/cluster/k3s/builder.nix index d26de30846ba..c4f52dd566e4 100644 --- a/pkgs/applications/networking/cluster/k3s/builder.nix +++ b/pkgs/applications/networking/cluster/k3s/builder.nix @@ -68,6 +68,7 @@ lib: socat, sqlite, stdenv, + su, systemdMinimal, util-linuxMinimal, yq-go, @@ -371,6 +372,7 @@ buildGoModule (finalAttrs: { conntrack-tools runc bash + su ]; k3sKillallDeps = [ diff --git a/pkgs/applications/networking/instant-messengers/gajim/default.nix b/pkgs/applications/networking/instant-messengers/gajim/default.nix index ca597422b8c0..e851db5322cd 100644 --- a/pkgs/applications/networking/instant-messengers/gajim/default.nix +++ b/pkgs/applications/networking/instant-messengers/gajim/default.nix @@ -43,14 +43,14 @@ python3.pkgs.buildPythonApplication rec { pname = "gajim"; - version = "2.3.5"; + version = "2.3.6"; src = fetchFromGitLab { domain = "dev.gajim.org"; owner = "gajim"; repo = "gajim"; tag = version; - hash = "sha256-tYcb4CLzK6GNSrVxt2bpynWpnaEE3WZ1H22Lm4s3wRw="; + hash = "sha256-Mvi69FI2zRefcCnLsurdVNMxYaqKsUCKgeFxOh6vg/o="; }; format = "pyproject"; diff --git a/pkgs/applications/networking/instant-messengers/linphone/README.md b/pkgs/applications/networking/instant-messengers/linphone/README.md new file mode 100644 index 000000000000..5828ca223747 --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/linphone/README.md @@ -0,0 +1,41 @@ +# Linphone + +Linphone is a SIP softphone application developed by Belledonne Communications. + +The main application is located in the [`linphone-desktop`](https://gitlab.linphone.org/BC/public/linphone-desktop) repository, and depends on many bespoke libraries, as well as third-party libraries with custom patches. +This scope provides all libraries and patches needed for Linphone to build. + +BC-developed libraries are housed within the [`linphone-sdk`](https://gitlab.linphone.org/BC/public/linphone-sdk) monorepo. +Current stable versions of the monorepo utilize git submodules to link the respective package repos, but BC has since integrated all of their libraries into the monorepo proper, which is why we're already using a single source for the entire repo. +An auxiliary function `mkLinphoneDerivation` is provided in this scope, to streamline building libraries from that repository. + +Other third-party libraries for which BC has provided custom patches, and are not included in the monorepo, are prefixed with `bc-`. + +All libraries and packages are exposed in nixpkgs under the `linphonePackage` scope via `pkgs/all-packages.nix`. + +## Updating + +Updating is done in 3 steps: + +1. Update the main Linphone application in the derivation directly +2. Update all libraries derived from the `linphone-sdk` monorepo, by updating the monorepo version and hash in `./default.nix` +3. Update all custom versions of third-party libraries individually (those prefixed with `bc-`) +4. Verify that the build is working by building (and running) `linphonePackages.linphone-desktop`. + +> [!TIP] +> +> When testing, run the app with `./result/bin/linphone --verbose` to get useful logs in `stdout`. + +## Adding new libraries + +To add a new package to this scope, simply add a new subdirectory containing a `default.nix` file with the appropriate package name. The scope automatically picks up any directories and adds an according toplevel package. + +If the package you are adding is contained within the `linphone-sdk` monorepo, it makes sense to use the `mkLinphoneDerivation` function to streamline the build process. + +If the package you are adding is a third-party libary with custom patches from BC, it should be prefixed with `bc-` for easy recognizability, so e.g. if BC were to patch `ffmpeg`, you would call the package `bc-ffmpeg`. + +## Notes for the future + +As mentioned before, currently most libraries within `linphone-sdk` are simply git submodules, but in the future, they will be properly integrated into the monorepo (this is already the case for their main branch). + +Also, currently the build relies on Qt5, but starting with Linphone 6.0.0, which as of 2025-09-20 is in its RC phase, the build will involve Qt6. diff --git a/pkgs/by-name/bc/bc-decaf/package.nix b/pkgs/applications/networking/instant-messengers/linphone/bc-decaf/default.nix similarity index 57% rename from pkgs/by-name/bc/bc-decaf/package.nix rename to pkgs/applications/networking/instant-messengers/linphone/bc-decaf/default.nix index 30535e1206c6..b873fc0aea1a 100644 --- a/pkgs/by-name/bc/bc-decaf/package.nix +++ b/pkgs/applications/networking/instant-messengers/linphone/bc-decaf/default.nix @@ -5,10 +5,10 @@ python3, stdenv, }: - stdenv.mkDerivation { pname = "bc-decaf"; - version = "unstable-2022-07-20"; + # version retrieved from `HISTORY.txt` + version = "1.0.2-unstable-2025-06-25"; nativeBuildInputs = [ cmake ]; buildInputs = [ @@ -20,21 +20,24 @@ stdenv.mkDerivation { group = "BC"; owner = "public/external"; repo = "decaf"; - rev = "876ddb4d465c94f97beba1be450e8538d866cc5d"; - sha256 = "sha256-QFOAgLiPbG2ZdwKoCOrVD5/sPq9IH4rtAWnnk/rZWcs="; + rev = "e5cc6240690d3ffdfcbdb1e4e851954b789cd5d9"; + sha256 = "sha256-4oZtpdelyKbd2k4LAhtsLkL5Y84C1Qb02fpVywYorr8="; }; # Do not build static libraries and do not enable -Werror cmakeFlags = [ "-DENABLE_STATIC=NO" + "-DBUILD_SHARED_LIBS=ON" "-DENABLE_STRICT=NO" ]; - meta = with lib; { + meta = { description = "Elliptic curve library supporting Ed448-Goldilocks and Curve25519. Belledonne Communications' fork for Linphone"; - homepage = "https://gitlab.linphone.org/BC/public/bctoolbox"; - license = licenses.mit; - maintainers = with maintainers; [ thibaultlemaire ]; - platforms = platforms.linux; + homepage = "https://gitlab.linphone.org/BC/public/external/decaf"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ + naxdy + ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/applications/networking/instant-messengers/linphone/bc-ispell/default.nix b/pkgs/applications/networking/instant-messengers/linphone/bc-ispell/default.nix new file mode 100644 index 000000000000..69c8fc8fcf8d --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/linphone/bc-ispell/default.nix @@ -0,0 +1,59 @@ +{ + cmake, + fetchFromGitLab, + lib, + stdenv, + + # tests + testers, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "bc-ispell"; + # version retrieved from `CHANGES` + version = "3.4.02-unstable-2025-05-05"; + + src = fetchFromGitLab { + domain = "gitlab.linphone.org"; + group = "BC"; + owner = "public/external"; + repo = "ispell"; + rev = "05574fe160222c3d0b6283c1433c9b087271fad1"; + sha256 = "sha256-YoRLiMjk2BxoI27xc2nzucxfHV9UbouFRSECb3RdHGo="; + }; + + patches = [ + # linphone has custom find modules that look for this package, + # but they do not work in nix, so we need to patch this library to + # install regular cmake config files + ./install-config-files.patch + ]; + + cmakeFlags = [ + "-DENABLE_STATIC=NO" + "-DBUILD_SHARED_LIBS=ON" + ]; + + nativeBuildInputs = [ cmake ]; + + passthru.tests = { + cmake-config = testers.hasCmakeConfigModules { + package = finalAttrs.finalPackage; + moduleNames = [ + "ISpell" + ]; + }; + }; + + meta = { + description = "Interactive spelling checker"; + homepage = "https://gitlab.linphone.org/BC/public/external/ispell"; + platforms = lib.platforms.all; + # NOTE: ISpell itself does not explicitly provide a license. From its + # 'Contributors' file, it can be deduced that it is distributed under + # "some" open source license, but the details are not clear. + license = lib.licenses.free; + maintainers = with lib.maintainers; [ + naxdy + ]; + }; +}) diff --git a/pkgs/applications/networking/instant-messengers/linphone/bc-ispell/install-config-files.patch b/pkgs/applications/networking/instant-messengers/linphone/bc-ispell/install-config-files.patch new file mode 100644 index 000000000000..c538fd617c09 --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/linphone/bc-ispell/install-config-files.patch @@ -0,0 +1,90 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 6edcc88..6f5601d 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -47,11 +47,62 @@ set(ISPELL_SOURCES + xgets.c + ) + ++set(ISPELL_HEADERS ++ config.h ++ defhash.h ++ exp_table.h ++ fields.h ++ ispell.h ++ libispell.h ++ local.h ++ msgs.h ++ proto.h ++ version.h ++) ++ + add_library(${ISPELL_TARGET_NAME} SHARED ${ISPELL_SOURCES}) + ++install( ++ FILES ++ ${ISPELL_HEADERS} ++ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} ++) ++ ++install(TARGETS ${ISPELL_TARGET_NAME} ++ EXPORT ${ISPELL_TARGET_NAME}Targets ++ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} ++ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ++ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} ++) ++ + install(TARGETS ${ISPELL_TARGET_NAME} + EXPORT ${ISPELL_TARGET_NAME}LibraryDepends + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} + ) ++ ++install( ++ EXPORT ${ISPELL_TARGET_NAME}Targets ++ FILE ${ISPELL_TARGET_NAME}Targets.cmake ++ DESTINATION "${CMAKE_INSTALL_DATADIR}/${ISPELL_TARGET_NAME}/cmake" ++ NAMESPACE ${ISPELL_TARGET_NAME}:: ++) ++ ++install( ++ EXPORT ${ISPELL_TARGET_NAME}LibraryDepends ++ FILE ${ISPELL_TARGET_NAME}LibraryDepends.cmake ++ DESTINATION "${CMAKE_INSTALL_DATADIR}/${ISPELL_TARGET_NAME}/cmake" ++ NAMESPACE ${ISPELL_TARGET_NAME}:: ++) ++ ++configure_package_config_file( ++ ${ISPELL_TARGET_NAME}Config.cmake.in ++ "${CMAKE_CURRENT_BINARY_DIR}/${ISPELL_TARGET_NAME}Config.cmake" ++ INSTALL_DESTINATION "${CMAKE_INSTALL_DATADIR}/${ISPELL_TARGET_NAME}/cmake" ++) ++ ++install( ++ FILES "${CMAKE_CURRENT_BINARY_DIR}/${ISPELL_TARGET_NAME}Config.cmake" ++ DESTINATION "${CMAKE_INSTALL_DATADIR}/${ISPELL_TARGET_NAME}/cmake" ++) +diff --git a/ISpellConfig.cmake.in b/ISpellConfig.cmake.in +index 052194b..cb71737 100644 +--- a/ISpellConfig.cmake.in ++++ b/ISpellConfig.cmake.in +@@ -6,13 +6,13 @@ + + @PACKAGE_INIT@ + +-include("${CMAKE_CURRENT_LIST_DIR}/@ISPELL_TARGET_NAME@LibraryDepends.cmake") ++include("${CMAKE_CURRENT_LIST_DIR}/ISpellLibraryDepends.cmake") + +-set(ISPELL_LIBRARIES "@ISPELL_TARGET_NAME@") +-get_target_property(ISPELL_INCLUDE_DIRS "@ISPELL_TARGET_NAME@" INTERFACE_INCLUDE_DIRECTORIES) ++set(ISPELL_LIBRARIES "ISpell") ++get_target_property(ISPELL_INCLUDE_DIRS "ISpell::ISpell" INTERFACE_INCLUDE_DIRECTORIES) + + if (CMAKE_VERSION VERSION_GREATER_EQUAL 3.18.0) +- add_library(@ISpell_TARGET_NAME@::@ISpell_TARGET_NAME@ ALIAS @ISpell_TARGET_NAME@) ++ add_library(ISpell ALIAS ISpell::ISpell) + endif() + +-check_required_components(@ISpell_TARGET_NAME@) ++check_required_components(ISpell) diff --git a/pkgs/development/libraries/soci/bc-soci.nix b/pkgs/applications/networking/instant-messengers/linphone/bc-soci/default.nix similarity index 73% rename from pkgs/development/libraries/soci/bc-soci.nix rename to pkgs/applications/networking/instant-messengers/linphone/bc-soci/default.nix index 1d8d4bc1e46a..cbac097deeda 100644 --- a/pkgs/development/libraries/soci/bc-soci.nix +++ b/pkgs/applications/networking/instant-messengers/linphone/bc-soci/default.nix @@ -10,15 +10,16 @@ stdenv.mkDerivation { pname = "bc-soci"; - version = "linphone-4.4.1"; + # version retrieved from `CHANGELOG.md` + version = "3.2.3-unstable-2025-05-05"; src = fetchFromGitLab { domain = "gitlab.linphone.org"; group = "BC"; owner = "public/external"; repo = "soci"; - rev = "bc8ce0c5628dd48eca6ef5ce0a0a2f52547d88b6"; - sha256 = "sha256-qo26aYp/G2C6UkGA1qkHQwTKD5go7TQ9JWxb9xtbe6M="; + rev = "3a9c79088212941d0175c22cd2da8fe1bdd639df"; + sha256 = "sha256-7aSTFD4yk1i6c9cEGqdo/eJtuqoOUZUTJlZijgjuYpM="; }; patches = [ @@ -44,11 +45,13 @@ stdenv.mkDerivation { boost ]; - meta = with lib; { + meta = { description = "Database access library for C++. Belledonne Communications' fork for Linphone"; homepage = "https://gitlab.linphone.org/BC/public/external/soci"; - license = licenses.boost; - platforms = platforms.all; - maintainers = with maintainers; [ thibaultlemaire ]; + license = lib.licenses.boost; + platforms = lib.platforms.all; + maintainers = with lib.maintainers; [ + naxdy + ]; }; } diff --git a/pkgs/applications/networking/instant-messengers/linphone/bctoolbox/default.nix b/pkgs/applications/networking/instant-messengers/linphone/bctoolbox/default.nix new file mode 100644 index 000000000000..55830150633f --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/linphone/bctoolbox/default.nix @@ -0,0 +1,50 @@ +{ + bcunit, + bc-decaf, + mkLinphoneDerivation, + openssl, + lib, + + # tests + testers, +}: +mkLinphoneDerivation (finalAttrs: { + pname = "bctoolbox"; + + propagatedBuildInputs = [ + bcunit + bc-decaf + openssl + ]; + + cmakeFlags = [ + "-DENABLE_STRICT=NO" + + # mbedtils does not build + "-DENABLE_MBEDTLS=NO" + "-DENABLE_OPENSSL=YES" + ]; + + strictDeps = true; + + passthru.tests = { + cmake-config = testers.hasCmakeConfigModules { + package = finalAttrs.finalPackage; + moduleNames = [ + "BCToolbox" + ]; + }; + }; + + meta = { + description = "Utilities library for Linphone"; + mainProgram = "bctoolbox_tester"; + license = lib.licenses.gpl3Only; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ + jluttine + naxdy + raskin + ]; + }; +}) diff --git a/pkgs/applications/networking/instant-messengers/linphone/bcunit/default.nix b/pkgs/applications/networking/instant-messengers/linphone/bcunit/default.nix new file mode 100644 index 000000000000..52bd8502d139 --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/linphone/bcunit/default.nix @@ -0,0 +1,17 @@ +{ + mkLinphoneDerivation, + lib, +}: +mkLinphoneDerivation { + pname = "bcunit"; + + meta = { + description = "Fork of the defunct project CUnit, a unit testing framework"; + license = lib.licenses.gpl2Only; + maintainers = with lib.maintainers; [ + jluttine + naxdy + raskin + ]; + }; +} diff --git a/pkgs/applications/networking/instant-messengers/linphone/belcard/default.nix b/pkgs/applications/networking/instant-messengers/linphone/belcard/default.nix new file mode 100644 index 000000000000..888f5c53c34a --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/linphone/belcard/default.nix @@ -0,0 +1,35 @@ +{ + bctoolbox, + belr, + lib, + mkLinphoneDerivation, + + # tests + testers, +}: +mkLinphoneDerivation (finalAttrs: { + pname = "belcard"; + + propagatedBuildInputs = [ + bctoolbox + belr + ]; + + cmakeFlags = [ + "-DENABLE_UNIT_TESTS=NO" # Do not build test executables + ]; + + passthru.tests = { + cmake-config = testers.hasCmakeConfigModules { + package = finalAttrs.finalPackage; + moduleNames = [ + "BelCard" + ]; + }; + }; + + meta = { + description = "C++ library to manipulate VCard standard format. Part of the Linphone project"; + license = lib.licenses.gpl3Only; + }; +}) diff --git a/pkgs/by-name/be/belle-sip/package.nix b/pkgs/applications/networking/instant-messengers/linphone/belle-sip/default.nix similarity index 53% rename from pkgs/by-name/be/belle-sip/package.nix rename to pkgs/applications/networking/instant-messengers/linphone/belle-sip/default.nix index 4efd5878e5a5..41890249a381 100644 --- a/pkgs/by-name/be/belle-sip/package.nix +++ b/pkgs/applications/networking/instant-messengers/linphone/belle-sip/default.nix @@ -1,34 +1,19 @@ { bctoolbox, belr, - cmake, - fetchFromGitLab, lib, libantlr3c, - mbedtls_2, stdenv, zlib, + python3, + mkLinphoneDerivation, }: - -stdenv.mkDerivation rec { +mkLinphoneDerivation { pname = "belle-sip"; - version = "5.2.98"; - src = fetchFromGitLab { - domain = "gitlab.linphone.org"; - owner = "public"; - group = "BC"; - repo = "belle-sip"; - tag = version; - hash = "sha256-PZnAB+LOlwkiJO0ICqYqn0TgqQY2KdUbgGJRFSzGxdE="; - }; - - nativeBuildInputs = [ cmake ]; - - buildInputs = [ zlib ]; - - # Do not build static libraries - cmakeFlags = [ "-DENABLE_STATIC=NO" ]; + nativeBuildInputs = [ + python3 + ]; env.NIX_CFLAGS_COMPILE = toString ( [ @@ -45,17 +30,14 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ libantlr3c - mbedtls_2 bctoolbox belr + zlib ]; - meta = with lib; { - homepage = "https://gitlab.linphone.org/BC/public/belle-sip"; + meta = { description = "Modern library implementing SIP (RFC 3261) transport, transaction and dialog layers. Part of the Linphone project"; mainProgram = "belle_sip_tester"; - license = licenses.gpl3Plus; - platforms = platforms.all; - maintainers = with maintainers; [ jluttine ]; + license = lib.licenses.gpl3Only; }; } diff --git a/pkgs/applications/networking/instant-messengers/linphone/belr/default.nix b/pkgs/applications/networking/instant-messengers/linphone/belr/default.nix new file mode 100644 index 000000000000..6cac18c9c103 --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/linphone/belr/default.nix @@ -0,0 +1,17 @@ +{ + bctoolbox, + lib, + mkLinphoneDerivation, +}: +mkLinphoneDerivation { + pname = "belr"; + + buildInputs = [ + bctoolbox + ]; + + meta = { + description = "Belledonne Communications' language recognition library (a SIP parsing library). Part of the Linphone project"; + license = lib.licenses.gpl3Only; + }; +} diff --git a/pkgs/applications/networking/instant-messengers/linphone/bzrtp/default.nix b/pkgs/applications/networking/instant-messengers/linphone/bzrtp/default.nix new file mode 100644 index 000000000000..dca76746222d --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/linphone/bzrtp/default.nix @@ -0,0 +1,24 @@ +{ + bctoolbox, + sqlite, + lib, + mkLinphoneDerivation, +}: +mkLinphoneDerivation { + pname = "bzrtp"; + + buildInputs = [ + bctoolbox + sqlite + ]; + + env.NIX_CFLAGS_COMPILE = toString [ + # Needed with GCC 12 + "-Wno-error=stringop-overflow" + ]; + + meta = { + description = "Opensource implementation of ZRTP keys exchange protocol. Part of the Linphone project"; + license = lib.licenses.gpl3Only; + }; +} diff --git a/pkgs/applications/networking/instant-messengers/linphone/default.nix b/pkgs/applications/networking/instant-messengers/linphone/default.nix index da15ef2657a7..0806bb93c17e 100644 --- a/pkgs/applications/networking/instant-messengers/linphone/default.nix +++ b/pkgs/applications/networking/instant-messengers/linphone/default.nix @@ -1,144 +1,20 @@ { - bctoolbox, - belcard, - belle-sip, - belr, - cmake, - fetchFromGitLab, + generateSplicesForMkScope, + makeScopeWithSplicing', lib, - liblinphone, - mediastreamer, - mediastreamer-openh264, - minizip-ng, - mkDerivation, - qtgraphicaleffects, - qtmultimedia, - qtquickcontrols2, - qttools, }: +makeScopeWithSplicing' { + otherSplices = generateSplicesForMkScope "linphonePackages"; + extra = self: { + mkLinphoneDerivation = self.mk-linphone-derivation; -# How to update Linphone? (The Qt desktop app) -# -# Belledonne Communications (BC), the company making Linphone, has split the -# project into several sub-projects that they maintain, plus some third-party -# dependencies that they also extend with commits of their own, specific to -# Linphone and not (yet?) upstreamed. -# -# All of this is organised in a Software Development Kit (SDK) meta-repository -# with git submodules to pin all those repositories into a coherent whole. -# -# The Linphone Qt desktop app uses this SDK as submodule as well. -# -# So, in order to update the desktop app to a new release, one has to follow -# the submodule chain and update the corresponding derivations here, in nixpkgs, -# with the corresponding version number (or commit hash) - -mkDerivation rec { - pname = "linphone-desktop"; - version = "5.1.2"; - - src = fetchFromGitLab { - domain = "gitlab.linphone.org"; - owner = "public"; - group = "BC"; - repo = "linphone-desktop"; - rev = version; - hash = "sha256-Pu2tGKe3C1uR4lzXkC5sJFu8iJBqF76UfWJXYjPwBkc="; - }; - - patches = [ - ./do-not-build-linphone-sdk.patch - ./remove-bc_compute_full_version-usage.patch - ./no-store-path-in-autostart.patch - ./reset-output-dirs.patch - ]; - - # See: https://gitlab.linphone.org/BC/public/linphone-desktop/issues/21 - postPatch = '' - echo "project(linphoneqt VERSION ${version})" >linphone-app/linphoneqt_version.cmake - substituteInPlace linphone-app/src/app/AppController.cpp \ - --replace "APPLICATION_SEMVER" "\"${version}\"" - substituteInPlace CMakeLists.txt \ - --subst-var out - ''; - - # TODO: After linphone-desktop and liblinphone split into separate packages, - # there might be some build inputs here that aren't needed for - # linphone-desktop. - buildInputs = [ - # Made by BC - bctoolbox - belcard - belle-sip - belr - liblinphone - mediastreamer - mediastreamer-openh264 - - minizip-ng - qtgraphicaleffects - qtmultimedia - qtquickcontrols2 - ]; - - nativeBuildInputs = [ - cmake - qttools - ]; - - cmakeFlags = [ - "-DMINIZIP_INCLUDE_DIRS=${minizip-ng}/include" - "-DMINIZIP_LIBRARIES=minizip" - - # RPATH of binary /nix/store/.../bin/... contains a forbidden reference to /build/ - "-DCMAKE_SKIP_BUILD_RPATH=ON" - - # Requires EQt5Keychain - "-DENABLE_QT_KEYCHAIN=OFF" - - "-DCMAKE_INSTALL_BINDIR=bin" - "-DCMAKE_INSTALL_INCLUDEDIR=include" - "-DCMAKE_INSTALL_LIBDIR=lib" - ]; - - preInstall = '' - mkdir -p $out/share/linphone - mkdir -p $out/share/sounds/linphone - ''; - - # In order to find mediastreamer plugins, mediastreamer package was patched to - # support an environment variable pointing to the plugin directory. Set that - # environment variable by wrapping the Linphone executable. - # - # Also, some grammar files needed to be copied too from some dependencies. I - # suppose if one define a dependency in such a way that its share directory is - # found, then this copying would be unnecessary. These missing grammar files - # were discovered when linphone crashed at startup and it was run with - # --verbose flag. Instead of actually copying these files, create symlinks. - # - # It is quite likely that there are some other files still missing and - # Linphone will randomly crash when it tries to access those files. Then, - # those just need to be copied manually below. - postInstall = '' - mkdir -p $out/lib/mediastreamer/plugins - ln -s ${mediastreamer-openh264}/lib/mediastreamer/plugins/* $out/lib/mediastreamer/plugins/ - ln -s ${mediastreamer}/lib/mediastreamer/plugins/* $out/lib/mediastreamer/plugins/ - - mkdir -p $out/share/belr/grammars - ln -s ${liblinphone}/share/belr/grammars/* $out/share/belr/grammars/ - ln -s ${liblinphone}/share/sounds/linphone/* $out/share/sounds/linphone/ - ln -s ${belle-sip}/share/belr/grammars/* $out/share/belr/grammars/ - - wrapProgram $out/bin/linphone \ - --set MEDIASTREAMER_PLUGINS_DIR $out/lib/mediastreamer/plugins - ''; - - meta = with lib; { - homepage = "https://www.linphone.org/"; - description = "Open source SIP phone for voice/video calls and instant messaging"; - mainProgram = "linphone"; - license = licenses.gpl3Plus; - platforms = platforms.linux; - maintainers = with maintainers; [ jluttine ]; + linphoneSdkVersion = "5.4.43"; + linphoneSdkHash = "sha256-lv2phU2qF51OIejzjgaBUo9NIdDv4bbK+bpY37Gnr8U="; }; + f = + self: + let + packages = lib.filterAttrs (name: value: value == "directory") (builtins.readDir ./.); + in + lib.mapAttrs (name: value: self.callPackage ./${name} { }) packages; } diff --git a/pkgs/applications/networking/instant-messengers/linphone/do-not-build-linphone-sdk.patch b/pkgs/applications/networking/instant-messengers/linphone/do-not-build-linphone-sdk.patch deleted file mode 100644 index f93f031bf690..000000000000 --- a/pkgs/applications/networking/instant-messengers/linphone/do-not-build-linphone-sdk.patch +++ /dev/null @@ -1,157 +0,0 @@ -From e6a9992461f368d08d1ad63ffe454714ec0c59ce Mon Sep 17 00:00:00 2001 -From: Lorenz Brun -Date: Fri, 28 Jan 2022 02:36:01 +0100 -Subject: [PATCH] Remove Linphone SDK build - ---- - CMakeLists.txt | 100 +----------------- - .../cmake_builder/additional_steps.cmake | 9 -- - 2 files changed, 5 insertions(+), 104 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index b5a4ab5..3afcd88 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -194,7 +194,6 @@ list(APPEND APP_OPTIONS "-DQTKEYCHAIN_TARGET_NAME=${QTKEYCHAIN_TARGET_NAME}") - - list(APPEND APP_OPTIONS "-DENABLE_QT_GL=${ENABLE_VIDEO}")#Activate on video - --include(ExternalProject) - set(PROJECT_BUILD_COMMAND "") - if(CMAKE_BUILD_PARALLEL_LEVEL) - list(APPEND APP_OPTIONS "-DCMAKE_BUILD_PARALLEL_LEVEL=${CMAKE_BUILD_PARALLEL_LEVEL}") -@@ -237,41 +236,8 @@ if(ENABLE_BUILD_APP_PLUGINS) - endif() - endif() - --if(NOT LINPHONE_QT_ONLY) --#add_subdirectory(external/qtkeychain) -- if(ENABLE_QT_KEYCHAIN) -- ExternalProject_Add(app-qtkeychain PREFIX "${CMAKE_BINARY_DIR}/qtkeychain" -- SOURCE_DIR "${CMAKE_SOURCE_DIR}/external/qtkeychain" -- INSTALL_DIR "${QTKEYCHAIN_OUTPUT_DIR}" -- BINARY_DIR "${SDK_BUILD_DIR}/qtkeychain" -- BUILD_COMMAND ${CMAKE_COMMAND} --build --config $ ${PROJECT_BUILD_COMMAND} -- LIST_SEPARATOR | # Use the alternate list separator -- CMAKE_ARGS ${APP_OPTIONS} ${QTKEYCHAIN_OPTIONS} ${USER_ARGS} -DCMAKE_INSTALL_PREFIX:PATH= -DCMAKE_PREFIX_PATH=${PREFIX_PATH} -DCMAKE_OSX_ARCHITECTURES=${LINPHONESDK_MACOS_ARCHS} -- BUILD_ALWAYS NO #${DO_BUILD} -- ) -- endif() -- ExternalProject_Add(sdk PREFIX "${CMAKE_BINARY_DIR}/sdk" -- SOURCE_DIR "${CMAKE_SOURCE_DIR}/linphone-sdk" -- INSTALL_DIR "${LINPHONE_OUTPUT_DIR}" -- STAMP_DIR "${SDK_BUILD_DIR}/stamp" -- BINARY_DIR "${SDK_BUILD_DIR}" -- STEP_TARGETS build -- BUILD_COMMAND ${CMAKE_COMMAND} --build --config $ ${PROJECT_BUILD_COMMAND} -- INSTALL_COMMAND ${CMAKE_COMMAND} -E echo "Install step is already done at build time." -- LIST_SEPARATOR | # Use the alternate list separator -- CMAKE_ARGS ${APP_OPTIONS} ${USER_ARGS} -DCMAKE_INSTALL_PREFIX:PATH= -DCMAKE_PREFIX_PATH=${PREFIX_PATH} -DCMAKE_OSX_ARCHITECTURES=${LINPHONESDK_MACOS_ARCHS} -- BUILD_ALWAYS NO #${DO_BUILD} -- ) -- ExternalProject_Add_Step(sdk force_build -- COMMENT "Forcing build for 'sdk'" -- DEPENDEES configure -- DEPENDERS build -- ALWAYS 1 -- ) --endif() - include(FindPkgConfig) - --set(APP_DEPENDS sdk)# Used if NOT LINPHONE_QT_ONLY - if(ENABLE_QT_KEYCHAIN) - list(APPEND APP_DEPENDS app-qtkeychain) - endif() -@@ -289,65 +255,9 @@ find_package(Mediastreamer2 CONFIG QUIET) - find_package(ortp CONFIG QUIET) - find_package(${QTKEYCHAIN_TARGET_NAME} CONFIG QUIET) - --if(NOT (LinphoneCxx_FOUND) OR NOT (Linphone_FOUND) OR NOT (bctoolbox_FOUND) OR NOT (belcard_FOUND) OR NOT (Mediastreamer2_FOUND) OR NOT (ortp_FOUND) -- OR ( ENABLE_QT_KEYCHAIN AND NOT(${QTKEYCHAIN_TARGET_NAME}_FOUND) ) -- OR FORCE_APP_EXTERNAL_PROJECTS --) -- message("Projects are set as External projects. You can start building them by using for example : cmake --build . --target install") -- ExternalProject_Add(linphone-qt PREFIX "${CMAKE_BINARY_DIR}/linphone-app" -- SOURCE_DIR "${CMAKE_SOURCE_DIR}/linphone-app" -- INSTALL_DIR "${APPLICATION_OUTPUT_DIR}" -- BINARY_DIR "${CMAKE_BINARY_DIR}/linphone-app" -- DEPENDS ${APP_DEPENDS} -- BUILD_COMMAND ${CMAKE_COMMAND} --build --config $ ${PROJECT_BUILD_COMMAND} -- INSTALL_COMMAND ${CMAKE_COMMAND} -E echo "Install step is already done at build time." -- LIST_SEPARATOR | # Use the alternate list separator -- CMAKE_ARGS ${APP_OPTIONS} ${USER_ARGS} -DCMAKE_INSTALL_PREFIX:PATH= -DCMAKE_PREFIX_PATH=${PREFIX_PATH} -DCMAKE_OSX_ARCHITECTURES=${LINPHONESDK_MACOS_ARCHS} -- # ${APP_OPTIONS} -- BUILD_ALWAYS ON -- ) -- if( ENABLE_BUILD_APP_PLUGINS) -- ExternalProject_Add(app-plugins PREFIX "${CMAKE_BINARY_DIR}/plugins-app" -- SOURCE_DIR "${CMAKE_SOURCE_DIR}/plugins" -- INSTALL_DIR "${APPLICATION_OUTPUT_DIR}" -- BINARY_DIR "${CMAKE_BINARY_DIR}/plugins-app" -- DEPENDS linphone-qt -- BUILD_COMMAND ${CMAKE_COMMAND} --build --config $ ${PROJECT_BUILD_COMMAND} -- INSTALL_COMMAND ${CMAKE_COMMAND} -E echo "Install step is already done at build time." -- LIST_SEPARATOR | # Use the alternate list separator -- CMAKE_ARGS ${APP_OPTIONS} ${USER_ARGS} -DCMAKE_INSTALL_PREFIX:PATH= -DCMAKE_PREFIX_PATH=${PREFIX_PATH} -DCMAKE_OSX_ARCHITECTURES=${LINPHONESDK_MACOS_ARCHS} -- ) -- endif() -- install(CODE "message(STATUS \"Running install\")") -- set(AUTO_REGENERATION auto_regeneration) -- if( ENABLE_BUILD_APP_PLUGINS) -- add_custom_target(${AUTO_REGENERATION} ALL -- COMMAND ${CMAKE_COMMAND} ${CMAKE_CURRENT_SOURCE_DIR} -- DEPENDS app-plugins) -- else() -- add_custom_target(${AUTO_REGENERATION} ALL -- COMMAND ${CMAKE_COMMAND} ${CMAKE_CURRENT_SOURCE_DIR} -- DEPENDS linphone-qt) -- endif() --else() -- message("Adding Linphone Desktop in an IDE-friendly state") -- set(CMAKE_INSTALL_PREFIX "${APPLICATION_OUTPUT_DIR}") -- add_subdirectory(${CMAKE_SOURCE_DIR}/linphone-app) -- if(NOT LINPHONE_QT_ONLY) -- add_dependencies(app-library ${APP_DEPENDS}) -- endif() -- if( ENABLE_BUILD_APP_PLUGINS) -- add_subdirectory(${CMAKE_SOURCE_DIR}/plugins "plugins-app") -- endif() -+message("Adding Linphone Desktop in an IDE-friendly state") -+set(CMAKE_INSTALL_PREFIX "${APPLICATION_OUTPUT_DIR}") -+add_subdirectory(${CMAKE_SOURCE_DIR}/linphone-app) -+if( ENABLE_BUILD_APP_PLUGINS) -+ add_subdirectory(${CMAKE_SOURCE_DIR}/plugins "plugins-app") - endif() --ExternalProject_Add(linphone-qt-only PREFIX "${CMAKE_BINARY_DIR}/linphone-app" -- SOURCE_DIR "${CMAKE_SOURCE_DIR}/linphone-app" -- INSTALL_DIR "${APPLICATION_OUTPUT_DIR}" -- BINARY_DIR "${CMAKE_BINARY_DIR}/linphone-app" -- BUILD_COMMAND ${CMAKE_COMMAND} --build --config $ ${PROJECT_BUILD_COMMAND} --# INSTALL_COMMAND ${CMAKE_COMMAND} -E echo "Install step is already done at build time." -- LIST_SEPARATOR | # Use the alternate list separator -- CMAKE_ARGS ${APP_OPTIONS} ${USER_ARGS} -DCMAKE_INSTALL_PREFIX:PATH= -DCMAKE_PREFIX_PATH=${PREFIX_PATH} -DCMAKE_OSX_ARCHITECTURES=${LINPHONESDK_MACOS_ARCHS} -- EXCLUDE_FROM_ALL ON -- #BUILD_ALWAYS ON --) -diff --git a/linphone-app/cmake_builder/additional_steps.cmake b/linphone-app/cmake_builder/additional_steps.cmake -index 7f7fd57..a69a04e 100644 ---- a/linphone-app/cmake_builder/additional_steps.cmake -+++ b/linphone-app/cmake_builder/additional_steps.cmake -@@ -54,14 +54,5 @@ if (ENABLE_PACKAGING) - linphone_builder_apply_flags() - linphone_builder_set_ep_directories(linphone_package) - linphone_builder_expand_external_project_vars() -- ExternalProject_Add(TARGET_linphone_package -- DEPENDS TARGET_linphone_builder -- TMP_DIR ${ep_tmp} -- BINARY_DIR ${ep_build} -- SOURCE_DIR "${CMAKE_CURRENT_LIST_DIR}/linphone_package" -- DOWNLOAD_COMMAND "" -- CMAKE_GENERATOR ${CMAKE_GENERATOR} -- CMAKE_ARGS ${LINPHONE_BUILDER_EP_ARGS} -DCMAKE_INSTALL_PREFIX=${LINPHONE_BUILDER_WORK_DIR}/PACKAGE -DTOOLS_DIR=${CMAKE_BINARY_DIR}/programs -DLINPHONE_OUTPUT_DIR=${CMAKE_INSTALL_PREFIX} -DLINPHONE_DESKTOP_DIR=${CMAKE_CURRENT_LIST_DIR}/.. -DLINPHONE_SOURCE_DIR=${EP_linphone_SOURCE_DIR} ${ENABLE_VARIABLES} -DLINPHONE_BUILDER_SIGNING_IDENTITY=${LINPHONE_BUILDER_SIGNING_IDENTITY} -- ) - endif () - endif () --- -2.39.3 (Apple Git-145) - diff --git a/pkgs/by-name/li/liblinphone/package.nix b/pkgs/applications/networking/instant-messengers/linphone/liblinphone/default.nix similarity index 55% rename from pkgs/by-name/li/liblinphone/package.nix rename to pkgs/applications/networking/instant-messengers/linphone/liblinphone/default.nix index e3eebef53ba3..41c7c5239a35 100644 --- a/pkgs/by-name/li/liblinphone/package.nix +++ b/pkgs/applications/networking/instant-messengers/linphone/liblinphone/default.nix @@ -3,49 +3,27 @@ bc-soci, belcard, belle-sip, - cmake, doxygen, - fetchFromGitLab, jsoncpp, libxml2, lime, - mediastreamer, + mediastreamer2, python3, sqlite, - stdenv, xercesc, zxing-cpp, + mkLinphoneDerivation, }: - -stdenv.mkDerivation rec { +mkLinphoneDerivation { pname = "liblinphone"; - version = "5.2.98"; - - src = fetchFromGitLab { - domain = "gitlab.linphone.org"; - owner = "public"; - group = "BC"; - repo = "liblinphone"; - rev = version; - hash = "sha256-kQZePMa7MTaSJLEObM8khfSFYLqhlgTcVyKfTPLwKYU="; - }; - - patches = [ - # zxing-cpp 2.0+ requires C++ 17 - # Manual backport as upstream ran formatters in the meantime - ./backport-cpp17.patch - ]; - - postPatch = '' - substituteInPlace src/CMakeLists.txt \ - --replace "jsoncpp_object" "jsoncpp" \ - --replace "jsoncpp_static" "jsoncpp" - ''; cmakeFlags = [ - "-DENABLE_STATIC=NO" # Do not build static libraries "-DENABLE_UNIT_TESTS=NO" # Do not build test executables "-DENABLE_STRICT=NO" # Do not build with -Werror + + # normally set by a cmake module, but + # we need to disable it to prevent downstream link errors + "-DJsonCPP_TARGET=jsoncpp" ]; buildInputs = [ @@ -53,27 +31,39 @@ stdenv.mkDerivation rec { belcard belle-sip lime - mediastreamer + mediastreamer2 # Vendored by BC bc-soci - jsoncpp libxml2 sqlite xercesc zxing-cpp ]; + propagatedBuildInputs = [ + jsoncpp + ]; + nativeBuildInputs = [ - cmake doxygen (python3.withPackages (ps: [ ps.pystache ps.six + ps.pyturbojpeg ])) ]; + postPatch = '' + substituteInPlace CMakeLists.txt \ + --replace-fail JsonCPP jsoncpp + ''; + + preConfigure = '' + rm cmake/FindJsonCPP.cmake + ''; + strictDeps = true; # Some grammar files needed to be copied too from some dependencies. I suppose @@ -85,11 +75,9 @@ stdenv.mkDerivation rec { ln -s ${belcard}/share/belr/grammars/* $out/share/belr/grammars/ ''; - meta = with lib; { - homepage = "https://www.linphone.org/technical-corner/liblinphone"; + meta = { description = "Library for SIP calls and instant messaging"; - license = licenses.gpl3Plus; - platforms = platforms.linux; - maintainers = with maintainers; [ jluttine ]; + license = lib.licenses.agpl3Plus; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/applications/networking/instant-messengers/linphone/lime/default.nix b/pkgs/applications/networking/instant-messengers/linphone/lime/default.nix new file mode 100644 index 000000000000..19c71d5e7c73 --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/linphone/lime/default.nix @@ -0,0 +1,31 @@ +{ + bctoolbox, + belle-sip, + lib, + bc-soci, + sqlite, + mkLinphoneDerivation, +}: +mkLinphoneDerivation { + pname = "lime"; + + buildInputs = [ + # Made by BC + bctoolbox + belle-sip + + # Vendored by BC + bc-soci + + sqlite + ]; + + cmakeFlags = [ + "-DENABLE_UNIT_TESTS=NO" # Do not build test executables + ]; + + meta = { + description = "End-to-end encryption library for instant messaging. Part of the Linphone project"; + license = lib.licenses.gpl3Only; + }; +} diff --git a/pkgs/applications/networking/instant-messengers/linphone/linphone-desktop/default.nix b/pkgs/applications/networking/instant-messengers/linphone/linphone-desktop/default.nix new file mode 100644 index 000000000000..5b05b31ed59f --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/linphone/linphone-desktop/default.nix @@ -0,0 +1,167 @@ +{ + bc-ispell, + bc-soci, + bctoolbox, + belcard, + belle-sip, + belr, + boost, + cmake, + doxygen, + fetchFromGitLab, + lib, + liblinphone, + libsForQt5, + lime, + mediastreamer2, + minizip-ng, + msopenh264, + python3, + python3Packages, + stdenv, + symlinkJoin, + xercesc, + zxing-cpp, +}: +let + grammars = symlinkJoin { + name = "belr-grammars"; + paths = + let + grammarPackages = [ + belle-sip + belcard + liblinphone + ]; + in + map (e: "${e}/share/belr/grammars") grammarPackages; + }; +in +stdenv.mkDerivation (finalAttrs: { + pname = "linphone-desktop"; + version = "5.3.0"; + + src = fetchFromGitLab { + domain = "gitlab.linphone.org"; + owner = "public"; + group = "BC"; + repo = "linphone-desktop"; + rev = finalAttrs.version; + hash = "sha256-SxYI2ZOtA49K2XPoTRPAIziAwC8SRrHMC3NISBFyuH0="; + }; + + patches = [ + ./require-finding-packages.patch + ./remove-bc-versions.patch + ./do-not-override-install-prefix.patch + ./fix-translation-dirs.patch + ./unset-qml-dir.patch + + # .mkv recordings are broken in NixOS and other distros (see + # https://github.com/NixOS/nixpkgs/issues/219551), and simply changing the + # file extension is enough to affect the chosen codec (wav makes more + # sense for audio recordings anyway) + ./record-in-wav-format.patch + ]; + + buildInputs = [ + # Made by BC + bctoolbox + belcard + belle-sip + belr + liblinphone + mediastreamer2 + msopenh264 + lime + bc-soci + bc-ispell + + xercesc + minizip-ng + libsForQt5.qtgraphicaleffects + libsForQt5.qtmultimedia + libsForQt5.qtquickcontrols2 + zxing-cpp + boost + + python3Packages.pystache + python3Packages.six + ]; + + nativeBuildInputs = [ + cmake + libsForQt5.qttools + libsForQt5.wrapQtAppsHook + python3 + doxygen + ]; + + cmakeFlags = [ + "-DCMAKE_POLICY_VERSION_MINIMUM=3.5" + "-DBUILD_SHARED_LIBS=ON" + "-DMINIZIP_INCLUDE_DIRS=${minizip-ng}/include" + "-DMINIZIP_LIBRARIES=minizip" + + # RPATH of binary /nix/store/.../bin/... contains a forbidden reference to /build/ + "-DCMAKE_SKIP_BUILD_RPATH=ON" + + # Requires EQt5Keychain + "-DENABLE_QT_KEYCHAIN=OFF" + + "-DCMAKE_INSTALL_BINDIR=bin" + "-DCMAKE_INSTALL_INCLUDEDIR=include" + "-DCMAKE_INSTALL_LIBDIR=lib" + "-DLINPHONEAPP_VERSION=${finalAttrs.version}" + "-DLINPHONE_QT_ONLY=ON" + "-DLINPHONEAPP_INSTALL_PREFIX=${placeholder "out"}" + "-DLINPHONE_QML_DIR=${placeholder "out"}/${libsForQt5.qtbase.qtQmlPrefix}/ui" + + # normally set by the custom find modules, which we have disabled + "-DLibLinphone_TARGET=liblinphone" + "-DLinphoneCxx_TARGET=liblinphone++" + "-DISpell_SOURCE_DIR=${bc-ispell.src}" + ]; + + preConfigure = '' + # custom "find" modules are causing issues during build, + # as they are blinding cmake to nix dependencies + rm -rf linphone-app/cmake + ''; + + preInstall = '' + mkdir -p $out/share/linphone + mkdir -p $out/share/sounds/linphone + mkdir -p $out/share/belr + ''; + + # In order to find mediastreamer plugins, mediastreamer package was patched to + # support an environment variable pointing to the plugin directory. Set that + # environment variable by wrapping the Linphone executable. + # + # It is quite likely that there are some other files still missing and + # Linphone will randomly crash when it tries to access those files. Then, + # those just need to be linked manually below. + postInstall = '' + mkdir -p $out/lib/mediastreamer/plugins + ln -s ${msopenh264}/lib/mediastreamer/plugins/* $out/lib/mediastreamer/plugins/ + ln -s ${mediastreamer2}/lib/mediastreamer/plugins/* $out/lib/mediastreamer/plugins/ + ln -s ${grammars} $out/share/belr/grammars + + wrapProgram $out/bin/linphone \ + --unset QML2_IMPORT_PATH \ + --set MEDIASTREAMER_PLUGINS_DIR $out/lib/mediastreamer/plugins + ''; + + meta = { + homepage = "https://www.linphone.org/"; + description = "Open source SIP phone for voice/video calls and instant messaging"; + mainProgram = "linphone"; + license = lib.licenses.gpl3Plus; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ + jluttine + naxdy + ]; + }; +}) diff --git a/pkgs/applications/networking/instant-messengers/linphone/linphone-desktop/do-not-override-install-prefix.patch b/pkgs/applications/networking/instant-messengers/linphone/linphone-desktop/do-not-override-install-prefix.patch new file mode 100644 index 000000000000..fced960ba7fb --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/linphone/linphone-desktop/do-not-override-install-prefix.patch @@ -0,0 +1,16 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 312df041d..43500be48 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -116,11 +116,6 @@ endif () + #------------------------------------------------------------------------------ + # Prepare gobal CMAKE configuration specific to the current project + +-if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT) +- set(CMAKE_INSTALL_PREFIX "${CMAKE_BINARY_DIR}/OUTPUT" CACHE PATH "Default linphone-app installation prefix" FORCE) +- set(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT FALSE) +-endif() +- + if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES) + message(STATUS "Setting build type to 'RelWithDebInfo' as none was specified") + set(CMAKE_BUILD_TYPE "RelWithDebInfo" CACHE STRING "Choose the type of build, options are: Debug Release RelWithDebInfo" FORCE) diff --git a/pkgs/applications/networking/instant-messengers/linphone/linphone-desktop/fix-translation-dirs.patch b/pkgs/applications/networking/instant-messengers/linphone/linphone-desktop/fix-translation-dirs.patch new file mode 100644 index 000000000000..9d2609d9dd8b --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/linphone/linphone-desktop/fix-translation-dirs.patch @@ -0,0 +1,15 @@ +diff --git a/linphone-app/assets/languages/CMakeLists.txt b/linphone-app/assets/languages/CMakeLists.txt +index ffe2b6a5b..12f02bdfe 100644 +--- a/linphone-app/assets/languages/CMakeLists.txt ++++ b/linphone-app/assets/languages/CMakeLists.txt +@@ -32,8 +32,8 @@ file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/${I18N_FILENAME}" "${I18N_CONTENT}") + + #Files or directories to inspect for translations references + set(TRANSLATION_SOURCES) +-list(APPEND TRANSLATION_SOURCES "${PROJECT_SOURCE_DIR}/src") +-list(APPEND TRANSLATION_SOURCES "${PROJECT_SOURCE_DIR}/ui") ++list(APPEND TRANSLATION_SOURCES "${PROJECT_SOURCE_DIR}/linphone-app/src") ++list(APPEND TRANSLATION_SOURCES "${PROJECT_SOURCE_DIR}/linphone-app/ui") + + if (WIN32) + foreach (lang ${LANGUAGES}) diff --git a/pkgs/applications/networking/instant-messengers/linphone/linphone-desktop/record-in-wav-format.patch b/pkgs/applications/networking/instant-messengers/linphone/linphone-desktop/record-in-wav-format.patch new file mode 100644 index 000000000000..1e71073968f1 --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/linphone/linphone-desktop/record-in-wav-format.patch @@ -0,0 +1,48 @@ +diff --git a/linphone-app/src/components/call/CallModel.cpp b/linphone-app/src/components/call/CallModel.cpp +index d0286a89a..483bc35e4 100644 +--- a/linphone-app/src/components/call/CallModel.cpp ++++ b/linphone-app/src/components/call/CallModel.cpp +@@ -289,7 +289,7 @@ void CallModel::setRecordFile (const shared_ptr &callParam + callParams->setRecordFile(Utils::appStringToCoreString( + CoreManager::getInstance()->getSettingsModel()->getSavedCallsFolder() + .append(generateSavedFilename()) +- .append(".mkv") ++ .append(".wav") + )); + } + +@@ -303,7 +303,7 @@ void CallModel::setRecordFile (const shared_ptr &callParam + callParams->setRecordFile(Utils::appStringToCoreString( + CoreManager::getInstance()->getSettingsModel()->getSavedCallsFolder() + .append(generateSavedFilename(from, to)) +- .append(".mkv") ++ .append(".wav") + )); + } + +diff --git a/linphone-app/src/components/conference/ConferenceProxyModel.cpp b/linphone-app/src/components/conference/ConferenceProxyModel.cpp +index 0cf654dd4..931c0e5cf 100644 +--- a/linphone-app/src/components/conference/ConferenceProxyModel.cpp ++++ b/linphone-app/src/components/conference/ConferenceProxyModel.cpp +@@ -84,7 +84,7 @@ void ConferenceProxyModel::startRecording () { + + + mLastRecordFile = +- QStringLiteral("%1%2.mkv") ++ QStringLiteral("%1%2.wav") + .arg(coreManager->getSettingsModel()->getSavedCallsFolder()) + .arg(QDateTime::currentDateTime().toString("yyyy-MM-dd_hh-mm-ss")); + conference->startRecording(Utils::appStringToCoreString(mLastRecordFile) ); +diff --git a/linphone-app/src/components/recorder/RecorderModel.cpp b/linphone-app/src/components/recorder/RecorderModel.cpp +index 0d17ff6f8..5c6d7c679 100644 +--- a/linphone-app/src/components/recorder/RecorderModel.cpp ++++ b/linphone-app/src/components/recorder/RecorderModel.cpp +@@ -83,7 +83,7 @@ QDateTime RecorderModel::getDateTimeSavedFilename(const QString& filename){ + + void RecorderModel::start(){ + bool soFarSoGood; +- QString filename = QStringLiteral("vocal_%1.mkv") ++ QString filename = QStringLiteral("vocal_%1.wav") + .arg(QDateTime::currentDateTime().toString("yyyy-MM-dd_hh-mm-ss-zzz")); + const QString safeFilePath = Utils::getSafeFilePath( + QStringLiteral("%1%2") diff --git a/pkgs/applications/networking/instant-messengers/linphone/linphone-desktop/remove-bc-versions.patch b/pkgs/applications/networking/instant-messengers/linphone/linphone-desktop/remove-bc-versions.patch new file mode 100644 index 000000000000..a1f8642b9979 --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/linphone/linphone-desktop/remove-bc-versions.patch @@ -0,0 +1,15 @@ +diff --git a/linphone-app/CMakeLists.txt b/linphone-app/CMakeLists.txt +index d40842fa2..7d7bc57d8 100644 +--- a/linphone-app/CMakeLists.txt ++++ b/linphone-app/CMakeLists.txt +@@ -40,10 +40,8 @@ set(version_minor) + set(version_patch) + set(identifiers ) + set(metadata ) +-bc_parse_full_version("${LINPHONEAPP_VERSION}" version_major version_minor version_patch identifiers metadata) + + +-project(linphoneqt VERSION "${version_major}.${version_minor}.${version_patch}") + + if(ENABLE_BUILD_VERBOSE) + #message("CMAKE_PREFIX_PATH ${CMAKE_PREFIX_PATH}") diff --git a/pkgs/applications/networking/instant-messengers/linphone/linphone-desktop/require-finding-packages.patch b/pkgs/applications/networking/instant-messengers/linphone/linphone-desktop/require-finding-packages.patch new file mode 100644 index 000000000000..2efcb4a9d2fb --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/linphone/linphone-desktop/require-finding-packages.patch @@ -0,0 +1,41 @@ +diff --git a/linphone-app/CMakeLists.txt b/linphone-app/CMakeLists.txt +index d40842fa2..5ea1330ca 100644 +--- a/linphone-app/CMakeLists.txt ++++ b/linphone-app/CMakeLists.txt +@@ -24,14 +24,11 @@ cmake_minimum_required(VERSION 3.22) + + + #Linphone targets +-set(LINPHONE_PACKAGES LinphoneCxx Mediastreamer2 Belcard LibLinphone) ++set(LINPHONE_PACKAGES LinphoneCxx Mediastreamer2 BelCard LibLinphone) + + list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake") + +-find_package(BCToolbox) +-if(NOT BCToolbox_FOUND) +- find_package(bctoolbox CONFIG REQUIRED) +-endif() ++find_package(BCToolbox REQUIRED) + if(NOT LINPHONEAPP_VERSION) + bc_compute_full_version(LINPHONEAPP_VERSION) + endif() +@@ -105,17 +102,14 @@ set(ENABLE_DB_STORAGE ON CACHE BOOLEAN "Enable Storage") + + foreach(PACKAGE ${LINPHONE_PACKAGES}) + message(STATUS "Trying to find ${PACKAGE}") +- find_package(${PACKAGE}) +- if(NOT ${PACKAGE}_FOUND) +- find_package(${PACKAGE} CONFIG REQUIRED) +- endif() ++ find_package(${PACKAGE} REQUIRED) + endforeach() + + set(PLUGIN_TARGETS ${LinphoneCxx_TARGET}) + set(APP_TARGETS ${LinphoneCxx_TARGET} + ${BCToolbox_TARGET}#Logger/App + ${Mediastreamer2_TARGET}#MediastreamerUtils +- ${Belcard_TARGET}#VCard Model ++ ${BelCard_TARGET}#VCard Model + ${LibLinphone_TARGET})#MediastreamerUtils + + #################################### diff --git a/pkgs/applications/networking/instant-messengers/linphone/linphone-desktop/unset-qml-dir.patch b/pkgs/applications/networking/instant-messengers/linphone/linphone-desktop/unset-qml-dir.patch new file mode 100644 index 000000000000..3d559f2d871c --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/linphone/linphone-desktop/unset-qml-dir.patch @@ -0,0 +1,13 @@ +diff --git a/linphone-app/CMakeLists.txt b/linphone-app/CMakeLists.txt +index d40842fa2..112d45711 100644 +--- a/linphone-app/CMakeLists.txt ++++ b/linphone-app/CMakeLists.txt +@@ -54,7 +54,6 @@ include(CheckCXXCompilerFlag) + + + set(TARGET_NAME linphone-qt) +-set(LINPHONE_QML_DIR "WORK/qml_files/ui") + set_property(GLOBAL PROPERTY TARGET_SUPPORTS_SHARED_LIBS true) + set(CMAKE_CXX_STANDARD 14) + + diff --git a/pkgs/development/libraries/mediastreamer/default.nix b/pkgs/applications/networking/instant-messengers/linphone/mediastreamer2/default.nix similarity index 56% rename from pkgs/development/libraries/mediastreamer/default.nix rename to pkgs/applications/networking/instant-messengers/linphone/mediastreamer2/default.nix index d9e5e3080e56..dbc987f8b9b1 100644 --- a/pkgs/development/libraries/mediastreamer/default.nix +++ b/pkgs/applications/networking/instant-messengers/linphone/mediastreamer2/default.nix @@ -1,10 +1,7 @@ { bctoolbox, bzrtp, - cmake, - fetchFromGitLab, - fetchpatch2, - ffmpeg, + ffmpeg_4, glew, gsm, lib, @@ -12,32 +9,21 @@ libXext, libopus, libpulseaudio, + libsForQt5, libv4l, libvpx, + mkLinphoneDerivation, ortp, python3, - qtbase, - qtdeclarative, speex, + sqlite, srtp, - stdenv, }: - -stdenv.mkDerivation rec { +mkLinphoneDerivation (finalAttrs: { pname = "mediastreamer2"; - version = "5.2.111"; dontWrapQtApps = true; - src = fetchFromGitLab { - domain = "gitlab.linphone.org"; - owner = "public"; - group = "BC"; - repo = "mediastreamer2"; - rev = version; - hash = "sha256-Le52tsyzOpepmvb+GOGCPwwTriPUjhYpa6GM+y/6USA="; - }; - patches = [ # Plugins directory is normally fixed during compile time. This patch makes # it possible to set the plugins directory run time with an environment @@ -45,19 +31,12 @@ stdenv.mkDerivation rec { # plugin directory with desired plugins and wrap executables so that the # environment variable points to that directory. ./plugins_dir.patch - - # Port to ffmpeg 5.0 API - (fetchpatch2 { - url = "https://salsa.debian.org/pkg-voip-team/linphone-stack/mediastreamer2/-/raw/4e7784802d2eac57dffe210c8c23e696f40ac6ec/debian/patches/ffmpeg_5_0_fixes.patch"; - hash = "sha256-5ay4iVbx8IOX952HEFaKLBGKLRYUWRntufciApUVhh0="; - }) ]; nativeBuildInputs = [ - cmake python3 - qtbase - qtdeclarative + libsForQt5.qtbase + libsForQt5.qtdeclarative ]; propagatedBuildInputs = [ @@ -66,7 +45,7 @@ stdenv.mkDerivation rec { bzrtp ortp - ffmpeg + ffmpeg_4 glew libX11 libXext @@ -74,6 +53,7 @@ stdenv.mkDerivation rec { libv4l speex srtp + sqlite # Optional gsm # GSM audio codec @@ -84,20 +64,17 @@ stdenv.mkDerivation rec { strictDeps = true; cmakeFlags = [ - "-DENABLE_STATIC=NO" # Do not build static libraries "-DENABLE_QT_GL=ON" # Build necessary MSQOGL plugin for Linphone desktop - "-DCMAKE_C_FLAGS=-DGIT_VERSION=\"v${version}\"" + "-DCMAKE_C_FLAGS=-DGIT_VERSION=\"v${finalAttrs.version}\"" "-DENABLE_STRICT=NO" # Disable -Werror "-DENABLE_UNIT_TESTS=NO" # Do not build test executables ]; NIX_LDFLAGS = "-lXext"; - meta = with lib; { + meta = { description = "Powerful and lightweight streaming engine specialized for voice/video telephony applications. Part of the Linphone project"; - homepage = "https://www.linphone.org/technical-corner/mediastreamer2"; - license = licenses.gpl3Only; - platforms = platforms.linux; - maintainers = with maintainers; [ jluttine ]; + license = lib.licenses.agpl3Plus; + platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/development/libraries/mediastreamer/plugins_dir.patch b/pkgs/applications/networking/instant-messengers/linphone/mediastreamer2/plugins_dir.patch similarity index 100% rename from pkgs/development/libraries/mediastreamer/plugins_dir.patch rename to pkgs/applications/networking/instant-messengers/linphone/mediastreamer2/plugins_dir.patch diff --git a/pkgs/applications/networking/instant-messengers/linphone/mk-linphone-derivation/default.nix b/pkgs/applications/networking/instant-messengers/linphone/mk-linphone-derivation/default.nix new file mode 100644 index 000000000000..8382fef530ac --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/linphone/mk-linphone-derivation/default.nix @@ -0,0 +1,61 @@ +{ + stdenv, + fetchFromGitLab, + lib, + cmake, + linphoneSdkVersion, + linphoneSdkHash, +}: +lib.extendMkDerivation { + constructDrv = stdenv.mkDerivation; + + excludeDrvArgNames = [ + "sourceRoot" + "version" + ]; + + extendDrvArgs = + finalAttrs: + { + sourceRoot ? finalAttrs.pname, + nativeBuildInputs ? [ ], + cmakeFlags ? [ ], + ... + }@args: + { + version = linphoneSdkVersion; + + src = fetchFromGitLab { + domain = "gitlab.linphone.org"; + owner = "public"; + group = "BC"; + repo = "linphone-sdk"; + tag = linphoneSdkVersion; + hash = linphoneSdkHash; + fetchSubmodules = true; + }; + + nativeBuildInputs = [ + cmake + ] + ++ nativeBuildInputs; + + sourceRoot = "${finalAttrs.src.name}/${sourceRoot}"; + + cmakeFlags = [ + "-DBUILD_SHARED_LIBS=ON" + ] + ++ cmakeFlags; + + meta = { + homepage = "https://gitlab.linphone.org/BC/public/linphone-sdk"; + # maintainers for all linphone packages + maintainers = [ + lib.maintainers.jluttine + lib.maintainers.naxdy + ]; + platforms = lib.platforms.all; + } + // (lib.optionalAttrs (args ? meta) args.meta); + }; +} diff --git a/pkgs/applications/networking/instant-messengers/linphone/msopenh264/default.nix b/pkgs/applications/networking/instant-messengers/linphone/msopenh264/default.nix new file mode 100644 index 000000000000..55c08c2dacf8 --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/linphone/msopenh264/default.nix @@ -0,0 +1,27 @@ +{ + mediastreamer2, + openh264, + lib, + mkLinphoneDerivation, +}: +mkLinphoneDerivation { + pname = "msopenh264"; + + buildInputs = [ + mediastreamer2 + openh264 + ]; + + # CMAKE_INSTALL_PREFIX has no effect so let's install manually. See: + # https://gitlab.linphone.org/BC/public/msopenh264/issues/1 + installPhase = '' + mkdir -p $out/lib/mediastreamer/plugins + cp lib/mediastreamer2/plugins/libmsopenh264.so $out/lib/mediastreamer/plugins/ + ''; + + meta = { + description = "H.264 encoder/decoder plugin for mediastreamer2. Part of the Linphone project"; + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.linux; + }; +} diff --git a/pkgs/applications/networking/instant-messengers/linphone/no-store-path-in-autostart.patch b/pkgs/applications/networking/instant-messengers/linphone/no-store-path-in-autostart.patch deleted file mode 100644 index dc1b0be916cd..000000000000 --- a/pkgs/applications/networking/instant-messengers/linphone/no-store-path-in-autostart.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 6a26922e5e4363de36057d635a1bf889160b2533 Mon Sep 17 00:00:00 2001 -From: Lorenz Brun -Date: Fri, 28 Jan 2022 18:44:43 +0100 -Subject: [PATCH] Do not use store path for autostart on Nix - ---- - linphone-app/src/app/App.cpp | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/linphone-app/src/app/App.cpp b/linphone-app/src/app/App.cpp -index 868f8f44..2c61c648 100644 ---- a/linphone-app/src/app/App.cpp -+++ b/linphone-app/src/app/App.cpp -@@ -858,6 +858,10 @@ void App::setAutoStart (bool enabled) { - exec = QProcessEnvironment::systemEnvironment().value(QStringLiteral("APPIMAGE")); - qDebug() << "exec path autostart set appimage=" << exec; - } -+ else if (binPath.startsWith("/nix/store")) { // Nix/NixOS -+ exec = QStringLiteral("linphone"); -+ qDebug() << "exec path autostart set nix=" << exec; -+ } - else { //classic package - exec = binPath; - qDebug() << "exec path autostart set classic package=" << exec; --- -2.25.1 - diff --git a/pkgs/applications/networking/instant-messengers/linphone/ortp/default.nix b/pkgs/applications/networking/instant-messengers/linphone/ortp/default.nix new file mode 100644 index 000000000000..3c93f71ceb68 --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/linphone/ortp/default.nix @@ -0,0 +1,18 @@ +{ + bctoolbox, + lib, + mkLinphoneDerivation, +}: +mkLinphoneDerivation { + pname = "ortp"; + + env.NIX_CFLAGS_COMPILE = "-Wno-error=stringop-truncation"; + + buildInputs = [ bctoolbox ]; + + meta = { + description = "Real-Time Transport Protocol (RFC3550) stack. Part of the Linphone project"; + mainProgram = "ortp_tester"; + license = lib.licenses.agpl3Plus; + }; +} diff --git a/pkgs/applications/networking/instant-messengers/linphone/remove-bc_compute_full_version-usage.patch b/pkgs/applications/networking/instant-messengers/linphone/remove-bc_compute_full_version-usage.patch deleted file mode 100644 index 225f0e78db23..000000000000 --- a/pkgs/applications/networking/instant-messengers/linphone/remove-bc_compute_full_version-usage.patch +++ /dev/null @@ -1,74 +0,0 @@ -From 4849d5633b98e6d3514355436eab5ba537cbfd99 Mon Sep 17 00:00:00 2001 -From: David P -Date: Fri, 23 Oct 2020 16:44:17 -0300 -Subject: [PATCH] remove bc_compute_full_version usage - ---- - linphone-app/CMakeLists.txt | 11 +---------- - linphone-app/build/CMakeLists.txt | 5 ----- - .../cmake_builder/linphone_package/CMakeLists.txt | 10 +--------- - 3 files changed, 2 insertions(+), 24 deletions(-) - -diff --git a/linphone-app/CMakeLists.txt b/linphone-app/CMakeLists.txt -index de7f917f..ee14ff78 100644 ---- a/linphone-app/CMakeLists.txt -+++ b/linphone-app/CMakeLists.txt -@@ -21,17 +21,8 @@ - ################################################################################ - cmake_minimum_required(VERSION 3.1) - -+include(linphoneqt_version.cmake) - find_package(bctoolbox CONFIG) --set(FULL_VERSION ) --bc_compute_full_version(FULL_VERSION) --set(version_major ) --set(version_minor ) --set(version_patch ) --set(identifiers ) --set(metadata ) --bc_parse_full_version("${FULL_VERSION}" version_major version_minor version_patch identifiers metadata) -- --project(linphoneqt VERSION "${version_major}.${version_minor}.${version_patch}") - - - if(ENABLE_BUILD_VERBOSE) -diff --git a/linphone-app/build/CMakeLists.txt b/linphone-app/build/CMakeLists.txt -index 8ef03faa..97d94bd6 100644 ---- a/linphone-app/build/CMakeLists.txt -+++ b/linphone-app/build/CMakeLists.txt -@@ -46,11 +46,6 @@ set(CPACK_SOURCE_IGNORE_FILES - "libmng.spec" - ) - --bc_compute_full_version(PROJECT_VERSION_BUILD) --if(PROJECT_VERSION_BUILD) -- set(CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}-${PROJECT_VERSION_BUILD}") --endif() -- - message("-- Package file name is ${CPACK_PACKAGE_FILE_NAME}") - - set(CPACK_SOURCE_PACKAGE_FILE_NAME ${CPACK_PACKAGE_FILE_NAME}) -diff --git a/linphone-app/cmake_builder/linphone_package/CMakeLists.txt b/linphone-app/cmake_builder/linphone_package/CMakeLists.txt -index ac85c68a..e6af5a66 100644 ---- a/linphone-app/cmake_builder/linphone_package/CMakeLists.txt -+++ b/linphone-app/cmake_builder/linphone_package/CMakeLists.txt -@@ -38,15 +38,7 @@ set(LINPHONE_QML_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../../ui") - # ============================================================================== - # Build package version. - # ============================================================================== --bc_compute_full_version(APP_PROJECT_VERSION) --if (GIT_EXECUTABLE AND NOT(APP_PROJECT_VERSION)) -- execute_process( -- COMMAND ${GIT_EXECUTABLE} describe --always -- OUTPUT_VARIABLE APP_PROJECT_VERSION -- OUTPUT_STRIP_TRAILING_WHITESPACE -- WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/../.." -- ) --elseif (NOT(APP_PROJECT_VERSION)) -+if (NOT(APP_PROJECT_VERSION)) - set(APP_PROJECT_VERSION "0.0.0") - endif () - string(REGEX REPLACE "([0-9.]+)-?.*" "\\1" LINPHONE_VERSION "${APP_PROJECT_VERSION}") --- -2.25.1 - diff --git a/pkgs/applications/networking/instant-messengers/linphone/reset-output-dirs.patch b/pkgs/applications/networking/instant-messengers/linphone/reset-output-dirs.patch deleted file mode 100644 index 2ad43fb17e28..000000000000 --- a/pkgs/applications/networking/instant-messengers/linphone/reset-output-dirs.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index b5a4ab5..b6b89c2 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -59,10 +59,10 @@ set(CMAKE_CXX_STANDARD 11) - - # Prepare gobal CMAKE configuration specific to the current project - set(SDK_BUILD_DIR "${CMAKE_BINARY_DIR}/WORK") # SDK build in WORK. Keep all in it. --set(LINPHONE_OUTPUT_DIR "${CMAKE_BINARY_DIR}/linphone-sdk/desktop") --set(QTKEYCHAIN_OUTPUT_DIR "${CMAKE_BINARY_DIR}/qtkeychain") -+set(LINPHONE_OUTPUT_DIR "@out@") -+set(QTKEYCHAIN_OUTPUT_DIR "@out@") - set(QTKEYCHAIN_TARGET_NAME "EQt5Keychain") --set(APPLICATION_OUTPUT_DIR "${CMAKE_BINARY_DIR}/OUTPUT") -+set(APPLICATION_OUTPUT_DIR "@out@") - - set(CMAKE_PREFIX_PATH "${LINPHONE_OUTPUT_DIR};${APPLICATION_OUTPUT_DIR};${APPLICATION_OUTPUT_DIR}/include${PREFIX_PATH}") - if(WIN32) diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_esr_sources.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_esr_sources.nix index 7d4900daf01a..e17dac25316c 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_esr_sources.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_esr_sources.nix @@ -1,1193 +1,1193 @@ { - version = "140.3.0esr"; + version = "140.3.1esr"; sources = [ { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.0esr/linux-x86_64/af/thunderbird-140.3.0esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-x86_64/af/thunderbird-140.3.1esr.tar.xz"; locale = "af"; arch = "linux-x86_64"; - sha256 = "e804766c6ac05c3d57fb5e1f0242a58fe8ceb500e256a96d018b7e5915ab9e01"; + sha256 = "e956f9633664fbea309bfaa7e61be6e393f8cd9f15c282f2c6489c2664e8162f"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.0esr/linux-x86_64/ar/thunderbird-140.3.0esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-x86_64/ar/thunderbird-140.3.1esr.tar.xz"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "e8bdf4172add5affcb4e90a0e619980043a6e9b7825edff9cdf0a0ef11f97d39"; + sha256 = "9ed23fd8154194da58dfa601a1d582645151ddfa8261fb29882bc6df960d289f"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.0esr/linux-x86_64/ast/thunderbird-140.3.0esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-x86_64/ast/thunderbird-140.3.1esr.tar.xz"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "a8a76b993a4cadd9990aa5b540c70f2810fbb9522e3189c5e468c6e58e2d97c1"; + sha256 = "0b352e82a6ff35dc7f5cc733f8bd27913a145665eefc5cc073b055699e55ea1f"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.0esr/linux-x86_64/be/thunderbird-140.3.0esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-x86_64/be/thunderbird-140.3.1esr.tar.xz"; locale = "be"; arch = "linux-x86_64"; - sha256 = "91aa559e917284b65b68fa63cb5090ee2939b7e6884c5cd3eed5882eef8aabc5"; + sha256 = "acf154e3aac9ba3476a7eb66eb8acd661fdd6bc8a3a14f3df45b9e84f413684c"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.0esr/linux-x86_64/bg/thunderbird-140.3.0esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-x86_64/bg/thunderbird-140.3.1esr.tar.xz"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "776e5e7560144c2cf8889bd2c5c0c6420b63f6b57c531e3c6184bacc3049a90d"; + sha256 = "2d6fe53a1c65a722e469e4c2951c32e9b6d549f6684e72d9622e9a0de13e88d2"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.0esr/linux-x86_64/br/thunderbird-140.3.0esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-x86_64/br/thunderbird-140.3.1esr.tar.xz"; locale = "br"; arch = "linux-x86_64"; - sha256 = "5503e82d3ea84222e8edb7bd21eb5db782c7365bd40adf6de898553f7ae2e33e"; + sha256 = "ba866ad75eebbbb857f487949a5b3e94ae801f24a1a101c6f68d2e03cf7d33f4"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.0esr/linux-x86_64/ca/thunderbird-140.3.0esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-x86_64/ca/thunderbird-140.3.1esr.tar.xz"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "44742162db445653aac88f3f4900892600403d85bbf0874b89eb983c6c7756da"; + sha256 = "953e7d88493c83fd7069fb9a2c2b40108f9c7b80dc87eabba447f018fe8789fd"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.0esr/linux-x86_64/cak/thunderbird-140.3.0esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-x86_64/cak/thunderbird-140.3.1esr.tar.xz"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "815546fb1110dc2767470a452641f1a8a46a24af5af3d16e2a79b1287a97abad"; + sha256 = "bb8766aa96bf876b7c594c3a454baa12d1e3006f6d7d99b05a540e7689ef63a0"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.0esr/linux-x86_64/cs/thunderbird-140.3.0esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-x86_64/cs/thunderbird-140.3.1esr.tar.xz"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "a4d63d2905293600894066c68bf7f1d8aa9618da2ac481d2a7f68fe4b82eff16"; + sha256 = "f8ec6daa98ebdbcf0386c3e3637101b06c6641f1e7bd9ddb43f27d5839a21712"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.0esr/linux-x86_64/cy/thunderbird-140.3.0esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-x86_64/cy/thunderbird-140.3.1esr.tar.xz"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "3a4b62d09cc7f99b5aa40795cd60e41d62028b0fce56c3ab5254b51480511477"; + sha256 = "2a6958a2333335d29a3d52b374792b11562efd080f72a90b8c764aa930165c5d"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.0esr/linux-x86_64/da/thunderbird-140.3.0esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-x86_64/da/thunderbird-140.3.1esr.tar.xz"; locale = "da"; arch = "linux-x86_64"; - sha256 = "a0f3e8c126804258505a9daf8332b74ecaec6fae818a9dd4ed37607f386ef3b7"; + sha256 = "dc68ab3c693832d16bb5e4ef6bf4cdddef3002c908ad8d89f92f7c1c8af059dd"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.0esr/linux-x86_64/de/thunderbird-140.3.0esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-x86_64/de/thunderbird-140.3.1esr.tar.xz"; locale = "de"; arch = "linux-x86_64"; - sha256 = "9096055281e3b3242e7917ad56fe6123c7594acbcf2a8c5d6dc0003c56e73472"; + sha256 = "d4c0f68036223d0d07615239fc11261a0b55369c449f93b5e6e1388a33bb521e"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.0esr/linux-x86_64/dsb/thunderbird-140.3.0esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-x86_64/dsb/thunderbird-140.3.1esr.tar.xz"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "7efee050027560b20f1285169830d47e34b2ab274fc07a9d5bbd11749c739e64"; + sha256 = "d8c1a6caf6f133f38bb3b8fd1ef6dc0e8c73e9ba1c026da6806896ed6bb2800f"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.0esr/linux-x86_64/el/thunderbird-140.3.0esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-x86_64/el/thunderbird-140.3.1esr.tar.xz"; locale = "el"; arch = "linux-x86_64"; - sha256 = "97b487366227ca9b1c50364d02832eb1c4e2bb0230328fd9b5c6833aae9c0731"; + sha256 = "09cfaa0bdd0dca490dac907823be0f4904280bd465be8f372befd0a40198f98c"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.0esr/linux-x86_64/en-CA/thunderbird-140.3.0esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-x86_64/en-CA/thunderbird-140.3.1esr.tar.xz"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "627ee0090872cf14dae2c202d386af80ddc4776487c067fc4c803bedf8ca330e"; + sha256 = "429cce649039c4cdfe7d7191a0fc5d63505ae62fbdf6052280850d0a5ce09f75"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.0esr/linux-x86_64/en-GB/thunderbird-140.3.0esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-x86_64/en-GB/thunderbird-140.3.1esr.tar.xz"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "6a5118d1fc96d9706cee6c76bd650017dc6ef3e9bf5f1eb31b04497e0f15d6fd"; + sha256 = "e5334909c6d9e994890930c68d16af1bc87c2a919edd1ddcbf94dfa248587280"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.0esr/linux-x86_64/en-US/thunderbird-140.3.0esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-x86_64/en-US/thunderbird-140.3.1esr.tar.xz"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "92e9a7aef63e2d8adaed832e23b91a55f6cd241e6b40189c2c3fb57f8ceebfba"; + sha256 = "c83d482d6319b52f37145398de4968eca2088f5ba9e1da0797fff8534c8ceaac"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.0esr/linux-x86_64/es-AR/thunderbird-140.3.0esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-x86_64/es-AR/thunderbird-140.3.1esr.tar.xz"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "65e3cb4c2a56e64711d1c5b75feaa21325a7979dbb574e333aa8b0e3b10b1ef7"; + sha256 = "2e4d597b016d7644f2833fe90166fb19987fca8a3b7a7919de12d166fb1cf9d8"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.0esr/linux-x86_64/es-ES/thunderbird-140.3.0esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-x86_64/es-ES/thunderbird-140.3.1esr.tar.xz"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "656b6cd369039cff86f14300714b529a8e570bf1ab805484b32ad59bdddb7ca7"; + sha256 = "f164b261572c8b0dccc01353a7a4c8548272cd58c76a55387b9f573e8586d6e8"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.0esr/linux-x86_64/es-MX/thunderbird-140.3.0esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-x86_64/es-MX/thunderbird-140.3.1esr.tar.xz"; locale = "es-MX"; arch = "linux-x86_64"; - sha256 = "226cc3833181e849439be8bcba9334a9ce4269ff2634f7824a35b82d6a58d8e6"; + sha256 = "28623be55dc8636b3d41cae572e5c34c1ec743fbb939a9989ff61852add1c258"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.0esr/linux-x86_64/et/thunderbird-140.3.0esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-x86_64/et/thunderbird-140.3.1esr.tar.xz"; locale = "et"; arch = "linux-x86_64"; - sha256 = "f9ea5f1304fba597b6d6ad946cf360f345d9fe51ca91ae5e33ba450749af566d"; + sha256 = "3ffe29447c94c79d16930a1be2ca274e3d65e729e830d5b304b2d3ad727ecb3f"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.0esr/linux-x86_64/eu/thunderbird-140.3.0esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-x86_64/eu/thunderbird-140.3.1esr.tar.xz"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "5e958e93c24bdd50e8da032ede0eb798f349266d8e5c77f7de0813b83e4fc384"; + sha256 = "1eabcd128257ba2f97218b43653c7a8269a686961bb579599fb3fdcdbaa2d706"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.0esr/linux-x86_64/fi/thunderbird-140.3.0esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-x86_64/fi/thunderbird-140.3.1esr.tar.xz"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "b48482984f0edbabba9cc552c7dc4e61fca08c17d1070e278610cf0dd900f9fe"; + sha256 = "dfbde834b2827c71e911b389786c809f7c05801b1bbbbd824ab9db4cdbeb1e50"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.0esr/linux-x86_64/fr/thunderbird-140.3.0esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-x86_64/fr/thunderbird-140.3.1esr.tar.xz"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "678c5a4a56b4bfed5a6cbf9c2c5b105475f7c1c5210fd7117292ffc065c24a57"; + sha256 = "5fd7c4b0711a78f9087095e528402f0fe5a6e770da74d7dd4884f5d0da9006a9"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.0esr/linux-x86_64/fy-NL/thunderbird-140.3.0esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-x86_64/fy-NL/thunderbird-140.3.1esr.tar.xz"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "4bbcb01f616d88b0d6c93c6b222c718a8228c79fdc303725e37f5d6f0bc2ba89"; + sha256 = "e373fbc067f55f1c26a3874607499e3b0c7e32896d5e644f40a8b201951224a4"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.0esr/linux-x86_64/ga-IE/thunderbird-140.3.0esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-x86_64/ga-IE/thunderbird-140.3.1esr.tar.xz"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "5f6d5777165f809a0e2b7d0ecca9eb83a5324874b9982ab2b42490ddc7f77218"; + sha256 = "1693d0f2a785f6d07dc3c6c6e7a6185366b879841230e6203f6a641f4f87adea"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.0esr/linux-x86_64/gd/thunderbird-140.3.0esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-x86_64/gd/thunderbird-140.3.1esr.tar.xz"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "2262da011809c13f822cff20814f3d4cc86a4606a6b2a21a2551bffffb851378"; + sha256 = "838fd1a6af7326ea8554b08d5b9f5b2626687b35ef317cb9e6a491d4c9c41acb"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.0esr/linux-x86_64/gl/thunderbird-140.3.0esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-x86_64/gl/thunderbird-140.3.1esr.tar.xz"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "45203873550ce0313b248602e3cca7fe744dfdd37384b33dcfbbaaabdd073ce9"; + sha256 = "f50487f1bbbd2929e373cdbc157b46ee1807eb688e7ae39de93d6ded24a0b0f4"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.0esr/linux-x86_64/he/thunderbird-140.3.0esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-x86_64/he/thunderbird-140.3.1esr.tar.xz"; locale = "he"; arch = "linux-x86_64"; - sha256 = "a0508339f43da5f2d58767327e9215298117230cb9076665843560003542a613"; + sha256 = "e8c0d2e8732cad25cc59920416babae37e41a203ca0403e34b47f451cef75326"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.0esr/linux-x86_64/hr/thunderbird-140.3.0esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-x86_64/hr/thunderbird-140.3.1esr.tar.xz"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "486e5bb0e1e35afe3c4516511f7640936e9fa04b86a5f33ace6145d3c9a0ad53"; + sha256 = "6a7f0a9e1699439a95359d1308f53a65ca6c43c6fde7a783869ca7f485095f1a"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.0esr/linux-x86_64/hsb/thunderbird-140.3.0esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-x86_64/hsb/thunderbird-140.3.1esr.tar.xz"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "3f40b4b8a6893dbed44d864dca8b6ad1ea5b706a158e367e02a25813b8aff29c"; + sha256 = "5cdf82e0cc6481080e9d4462908158032f12b6968da3afb2e20db7c3b6802d87"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.0esr/linux-x86_64/hu/thunderbird-140.3.0esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-x86_64/hu/thunderbird-140.3.1esr.tar.xz"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "819b93353adf9a10edd7809547c79a0221b53c3120c93b397faa22c80d9f1e82"; + sha256 = "662d03dd63318d1cd387d63c3451992b0f86d54c8ca362e722301db9a1419d03"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.0esr/linux-x86_64/hy-AM/thunderbird-140.3.0esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-x86_64/hy-AM/thunderbird-140.3.1esr.tar.xz"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "ea0779adbf95222596fa2ebd24f55277ee802b6c917fe8c73da301e954856815"; + sha256 = "eb7296de57519701feae045894777714a52bb0993bdae7b540d4e88153978b2d"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.0esr/linux-x86_64/id/thunderbird-140.3.0esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-x86_64/id/thunderbird-140.3.1esr.tar.xz"; locale = "id"; arch = "linux-x86_64"; - sha256 = "b4e68e8f112cabbce4cc4d69c953e643ebff25319bbf4819a6fcb16de495d49a"; + sha256 = "41d80326c0b7b1ca341ddd2dfa1e61d61f962e47680da37970945253f5664d7b"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.0esr/linux-x86_64/is/thunderbird-140.3.0esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-x86_64/is/thunderbird-140.3.1esr.tar.xz"; locale = "is"; arch = "linux-x86_64"; - sha256 = "1e0e18f05f7c19cf96d54e963e3f4c953eff908a95a5b8789f2bc903fa81d737"; + sha256 = "b51fb83ed7711b9f57780839ddfcb785b31640d7b5d3a6a9f43e9d6a9ce8a52a"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.0esr/linux-x86_64/it/thunderbird-140.3.0esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-x86_64/it/thunderbird-140.3.1esr.tar.xz"; locale = "it"; arch = "linux-x86_64"; - sha256 = "f59b7cdc7fd8dfdfadca4320e8c6ad340d7384f9b5be550b64025aba365d264b"; + sha256 = "f9b65a59c9f3b86d357a12dffb5839e5db51a62ec274e78e0919fd3f6964bf17"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.0esr/linux-x86_64/ja/thunderbird-140.3.0esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-x86_64/ja/thunderbird-140.3.1esr.tar.xz"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "4fd7d71dcf02403978af6207e8b3c3cdb62bf70538334e6067dd710e7fbd8465"; + sha256 = "d37693281d5a3d0eedca544f119b3dd77aae3b0d7d15c162336e6d7aa6619a33"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.0esr/linux-x86_64/ka/thunderbird-140.3.0esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-x86_64/ka/thunderbird-140.3.1esr.tar.xz"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "bc99d339e51c48aac1e38f597b63fcb7969c0e35e467361d2ada65265344b5b9"; + sha256 = "c5d56da1151b5f1e1bbfe6f80b3c60531a053ef15f7cf01205fbdb6b0599c0e4"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.0esr/linux-x86_64/kab/thunderbird-140.3.0esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-x86_64/kab/thunderbird-140.3.1esr.tar.xz"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "3fb923b6b25a6536406af5c4cb1757874f13c3a712c2271258d8cd491026ee6a"; + sha256 = "136ba1746163a811136d9e3b220039e74b4d987027e693a5c387a8f9491bdfbc"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.0esr/linux-x86_64/kk/thunderbird-140.3.0esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-x86_64/kk/thunderbird-140.3.1esr.tar.xz"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "6f78e9823031771ae150d7dda12065455c48abbf356606152a971b1337046b7c"; + sha256 = "d3f34e5a7f45bd6c8915964faaf62dbd0bba3affe14ed3e690ec225f34067b2c"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.0esr/linux-x86_64/ko/thunderbird-140.3.0esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-x86_64/ko/thunderbird-140.3.1esr.tar.xz"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "ed637618719397a70194d551b6510d1bdc62947caf51f47d1da4e66ad4826537"; + sha256 = "ff13e6ba995f2178e60d6d6a3ef18733945319f7be5dde45520f9c8c48131547"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.0esr/linux-x86_64/lt/thunderbird-140.3.0esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-x86_64/lt/thunderbird-140.3.1esr.tar.xz"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "689a75b8b97f0a0db40b53bd18794f047ed21b034a65b3cd898d0a132c389eef"; + sha256 = "e061e0e159bc68f623b0f8f80faed4ef069d3855f32b546dccb8ef9c9017bc3f"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.0esr/linux-x86_64/lv/thunderbird-140.3.0esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-x86_64/lv/thunderbird-140.3.1esr.tar.xz"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "77528a78efcff4efba53f0feed8cab1ad929fcf56295cf1d14f89f579a3349b3"; + sha256 = "3b678a9dade8e7e5e99d6cd14abb79b9873a7df5522a224386f0f72ed1c02c0e"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.0esr/linux-x86_64/ms/thunderbird-140.3.0esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-x86_64/ms/thunderbird-140.3.1esr.tar.xz"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "eede5b70d74905725d94725307bd69c7a10b8984d4cbec86f5f0b40f3ecbe804"; + sha256 = "50b1c3e4143dbba8369836854d002e044c0735562b990e2dcf34e9c25e25c27d"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.0esr/linux-x86_64/nb-NO/thunderbird-140.3.0esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-x86_64/nb-NO/thunderbird-140.3.1esr.tar.xz"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "627ae1779688a16c87984ac59ff27b68b0f944828caa68a0150c5261fbbf6b77"; + sha256 = "8acf2090a3e4b116826069ece232538eeb84fa519d9060536950044f5fd9c353"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.0esr/linux-x86_64/nl/thunderbird-140.3.0esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-x86_64/nl/thunderbird-140.3.1esr.tar.xz"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "0576ac3e67e8cd62f12f6c31589012219bdd8879afd47044999c1ad5cdcbce42"; + sha256 = "dfd2f250932a5fa400dd808b0b2afcef244976744389f7e68113a279d9ed6953"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.0esr/linux-x86_64/nn-NO/thunderbird-140.3.0esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-x86_64/nn-NO/thunderbird-140.3.1esr.tar.xz"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "a596df5ab012a5fefe332171e3e23a058b7922c814a2b36c9c9ae57f8a95f27d"; + sha256 = "136229be6bcaa7d306a6796ee947be4dcb85d16423581fb22485bfdb803e6991"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.0esr/linux-x86_64/pa-IN/thunderbird-140.3.0esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-x86_64/pa-IN/thunderbird-140.3.1esr.tar.xz"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "96ac92738d2de06438aa68a7b59f4828c2c7e54e4df51bde59197292473f66a1"; + sha256 = "788312b3105bbb376b8d5fa634c22a7e67a6b18535ffc29566c8ab94622222a4"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.0esr/linux-x86_64/pl/thunderbird-140.3.0esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-x86_64/pl/thunderbird-140.3.1esr.tar.xz"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "4b25e0aad2c535ab1d48e3397d9e83a8622bf53f6a3c4cee5a580a86e298e89a"; + sha256 = "13de91e131bc03c7e223e6d4e3dc0f751898029e8dee122d668487ab2beed46a"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.0esr/linux-x86_64/pt-BR/thunderbird-140.3.0esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-x86_64/pt-BR/thunderbird-140.3.1esr.tar.xz"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "3142a8f0f070a871cfaa5d8b00a8485b3d6f9241511276cdbe2aaf0e343a955a"; + sha256 = "b0be7c8d1093ce5bb4188b7f29e138b415a5b981b86ef4b7d61ff1ffbe4d2fa3"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.0esr/linux-x86_64/pt-PT/thunderbird-140.3.0esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-x86_64/pt-PT/thunderbird-140.3.1esr.tar.xz"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "190a75ef5dfa3c0a9aa8d412b6409b5c3db4cffb4d21cdcbf91cb5e86c5cfd3d"; + sha256 = "fc72f8be624ea97ab3df23f96d9060117c4599a0b150df9e52f6fc8cf5e52f57"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.0esr/linux-x86_64/rm/thunderbird-140.3.0esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-x86_64/rm/thunderbird-140.3.1esr.tar.xz"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "3f76386b31e8e6c7148dc8c31c92474d80d3a9babfb5688e52a78c201cd30012"; + sha256 = "d5833f037c0fe6a058660d5b20974690ac95666125e621b66154f523f2994bb1"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.0esr/linux-x86_64/ro/thunderbird-140.3.0esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-x86_64/ro/thunderbird-140.3.1esr.tar.xz"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "faf1b25b4b21837853aae33b1a3f76ac5418e84ca3fda2351b8267e34197d503"; + sha256 = "2d92168df1964adddb4ebdbd4631c2518a2726a877f072a9893c962d3d6188f9"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.0esr/linux-x86_64/ru/thunderbird-140.3.0esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-x86_64/ru/thunderbird-140.3.1esr.tar.xz"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "71b234553f237b59e67892ab45926e5af9a3e9f276de9793339b368e5ae0b05c"; + sha256 = "54d31a257426a014ccf389db7ce828262fae25672259ffadb41831bc90572640"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.0esr/linux-x86_64/sk/thunderbird-140.3.0esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-x86_64/sk/thunderbird-140.3.1esr.tar.xz"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "db7fe1b3c3409a6b6f54315bb5f4c5309c19af601b1344362ad915e9eb5869ba"; + sha256 = "335d00c141b40803163407b8901eb02d1770b2d9e26a7f04268482cd11135ca4"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.0esr/linux-x86_64/sl/thunderbird-140.3.0esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-x86_64/sl/thunderbird-140.3.1esr.tar.xz"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "43bf114fc8f5d2d3c79c874b14557835e70f744a91c373fcd22d90cbcda3b05f"; + sha256 = "02f5d100993b535eb9797125e18bcd8b019d5932b7939633d04c50cf92f57513"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.0esr/linux-x86_64/sq/thunderbird-140.3.0esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-x86_64/sq/thunderbird-140.3.1esr.tar.xz"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "6b43961dccc699e854517cf09804a7df896dba0f189635f92469589d9a4fba42"; + sha256 = "acc27f3458cc19087985ef1f1c404f98eca8b2c8c799f13fdbe0b9e121e2cbc6"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.0esr/linux-x86_64/sr/thunderbird-140.3.0esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-x86_64/sr/thunderbird-140.3.1esr.tar.xz"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "b9f46f3c2f6677c7edd1ed98354ba12046e1f9fcfd02a0821d5561f8b92069bc"; + sha256 = "5b377c0df4d23cf93d8b8dca9fd4c62089f4dcf5122885b93043765fd41ee479"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.0esr/linux-x86_64/sv-SE/thunderbird-140.3.0esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-x86_64/sv-SE/thunderbird-140.3.1esr.tar.xz"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "9a263fa90929675b78623c161b8359436e7a696b8d0b416a5dc19823ce5e3e98"; + sha256 = "e124daec978a8bcf3fa42241e1cf8deacb375da6a4278535f23e7c9c4cad1bdc"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.0esr/linux-x86_64/th/thunderbird-140.3.0esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-x86_64/th/thunderbird-140.3.1esr.tar.xz"; locale = "th"; arch = "linux-x86_64"; - sha256 = "3ab3db5ada5758620ee2e7b38a58aff0b58c69eda46418386a728814d7c3e9fb"; + sha256 = "e736d9238bc6b4080c48cc8f0e261d044f7684b8d868a17f759c672bd473cdbc"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.0esr/linux-x86_64/tr/thunderbird-140.3.0esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-x86_64/tr/thunderbird-140.3.1esr.tar.xz"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "7c163616a5e75cb8678c65c56a3491b7f2adcec5aaf5eab8b48f9e9b27065eab"; + sha256 = "a8d79f5317d042679dd0bce602a0b719f6883b02b76f5ec69e2b6dae84c99fc8"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.0esr/linux-x86_64/uk/thunderbird-140.3.0esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-x86_64/uk/thunderbird-140.3.1esr.tar.xz"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "65277fe487e70f2e1d58659933d6ef054d7c6159f2fdce3de58d772a88c51484"; + sha256 = "a8876dda0a5a79b58ee2e4fbf9c429c6a050b9e399b4a2f467425ebc9d0e7b1f"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.0esr/linux-x86_64/uz/thunderbird-140.3.0esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-x86_64/uz/thunderbird-140.3.1esr.tar.xz"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "9eed03f86eeb2129397146ce83e7660af96331c83614e2330c1be4276e6c87fa"; + sha256 = "99a143e3cd7da83ca51ed31cb517430206c86dcd747e7ded3ea4454f29dd9f04"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.0esr/linux-x86_64/vi/thunderbird-140.3.0esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-x86_64/vi/thunderbird-140.3.1esr.tar.xz"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "e194d6c854fa756cd8b9c9f598af55fb6ddd4f906dcf8520877e052b612cb5fd"; + sha256 = "beac93fff89368f9e5f70e26efac6491034212e7ebcbb40e397ab5e6b227b31a"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.0esr/linux-x86_64/zh-CN/thunderbird-140.3.0esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-x86_64/zh-CN/thunderbird-140.3.1esr.tar.xz"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "4d4f32d22de47b915c7af77685b3a60a0a6af33f6618940309aed0a03b785e55"; + sha256 = "32795b0feb937927c80bb5c62b4587b13103cab00d25f7b1f57ad53af145540d"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.0esr/linux-x86_64/zh-TW/thunderbird-140.3.0esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-x86_64/zh-TW/thunderbird-140.3.1esr.tar.xz"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "7e2410b91b2c7ddf990195ba5552bd0b0ee58818bb63ea24f6e6575043fa1870"; + sha256 = "7e57b8ffec05080c1ccd6f329660790aa8eec84679c768a0a7b7b40ed098aaaf"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.0esr/linux-i686/af/thunderbird-140.3.0esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-i686/af/thunderbird-140.3.1esr.tar.xz"; locale = "af"; arch = "linux-i686"; - sha256 = "e7c112c4217d93cc69b8b0eccd62e5f3c783ffa11a2032b7a7ace9e589b17230"; + sha256 = "141cbcdc5d7f1d5c45de0614f25c0001232f250ae039e2a029d7b721a1822632"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.0esr/linux-i686/ar/thunderbird-140.3.0esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-i686/ar/thunderbird-140.3.1esr.tar.xz"; locale = "ar"; arch = "linux-i686"; - sha256 = "341b35b7c4552600784f9556090064e4dbac9099d4c727e86d10d192b345fe93"; + sha256 = "2e2c0d221e19b930e617e93e63d5a11a86bcaca7b3ba667beb0b924ff0ddd6fb"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.0esr/linux-i686/ast/thunderbird-140.3.0esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-i686/ast/thunderbird-140.3.1esr.tar.xz"; locale = "ast"; arch = "linux-i686"; - sha256 = "cec41cebbbb331af4745834f7d4ddb62e81322bca4beb2f9f8c003b783134209"; + sha256 = "24261039a298823db9a9513ba3579118cb1b780234716236454714e3ad9242b0"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.0esr/linux-i686/be/thunderbird-140.3.0esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-i686/be/thunderbird-140.3.1esr.tar.xz"; locale = "be"; arch = "linux-i686"; - sha256 = "3a4cb06c9428ec0e39454c00e65155cebdaaf72b28b40707f8637e0057385bb8"; + sha256 = "f07f276975c2353ffe69c037568d79396bbd0d9c0c3d6e9047936ded98dfa059"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.0esr/linux-i686/bg/thunderbird-140.3.0esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-i686/bg/thunderbird-140.3.1esr.tar.xz"; locale = "bg"; arch = "linux-i686"; - sha256 = "07b2518dfe34fbf84acfa8896881425f626bf0eaf9ac660cde42c456c565b6e2"; + sha256 = "f31880553d9bc597d7d5009e0d10cfca2f7170f5c0bdd7f41e10be53ccc8c2d2"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.0esr/linux-i686/br/thunderbird-140.3.0esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-i686/br/thunderbird-140.3.1esr.tar.xz"; locale = "br"; arch = "linux-i686"; - sha256 = "c1319176b2a2010459b9a168182fcd84f277111c8f732ad5fa03c6cc618d5fcb"; + sha256 = "e56f2e56aee20a094d5362b56a455d0a3531df6ca1e5069d891b0635d16a0e26"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.0esr/linux-i686/ca/thunderbird-140.3.0esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-i686/ca/thunderbird-140.3.1esr.tar.xz"; locale = "ca"; arch = "linux-i686"; - sha256 = "6c65d7ff5397d6a3025659f8b1eee7e95ba38bcffdd7b96e55b67ed1aa3ee76d"; + sha256 = "d963a7daf319f196fb799aadc605c4927fe40795754fc8d7ecc26254d1ca376f"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.0esr/linux-i686/cak/thunderbird-140.3.0esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-i686/cak/thunderbird-140.3.1esr.tar.xz"; locale = "cak"; arch = "linux-i686"; - sha256 = "107e746f72b6ebbf633cac7ab70f2ff4406b7d7505011221142d910c031b196d"; + sha256 = "215e52a11c0f5fb8563ad9432c3578002cbfa840998b7419db09644f898e6ca3"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.0esr/linux-i686/cs/thunderbird-140.3.0esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-i686/cs/thunderbird-140.3.1esr.tar.xz"; locale = "cs"; arch = "linux-i686"; - sha256 = "e87832011419bfa38982a23d23e358a457c52cec2b78d14d783810d2fb3d0d4c"; + sha256 = "71405c6a56bfb7b46d646199ff82109ef75c25f1e2b7e07ade7428c5ebfece07"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.0esr/linux-i686/cy/thunderbird-140.3.0esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-i686/cy/thunderbird-140.3.1esr.tar.xz"; locale = "cy"; arch = "linux-i686"; - sha256 = "9f94acd38db31014ca3a3b93571efdb21192c12f3e5a180c88cb6d7a71d15928"; + sha256 = "96db58c3fc25f8196932fa11defe3c5a4a59682a8214a80691b09c9b0d5892eb"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.0esr/linux-i686/da/thunderbird-140.3.0esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-i686/da/thunderbird-140.3.1esr.tar.xz"; locale = "da"; arch = "linux-i686"; - sha256 = "4e684d169520091b08f434ba5f866924bbcadb45c7647583396ddb7ca78fb695"; + sha256 = "69242a3c5cc752142291db634c92286266d4460d020471d12f1ea02baaf391d3"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.0esr/linux-i686/de/thunderbird-140.3.0esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-i686/de/thunderbird-140.3.1esr.tar.xz"; locale = "de"; arch = "linux-i686"; - sha256 = "929ebb5e954828977b4494110c4aad944b4819ecd033a97e82ff3f475dc46128"; + sha256 = "8f36f835c7347c68267f620b3fa976c2708374447b2e9739452954023b94646c"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.0esr/linux-i686/dsb/thunderbird-140.3.0esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-i686/dsb/thunderbird-140.3.1esr.tar.xz"; locale = "dsb"; arch = "linux-i686"; - sha256 = "851837a36e6251925609792c4e1f7fc3203eddbcad02335097458989d98a3339"; + sha256 = "2d18cdf766b28b78293f6f49ba92956504669c04490e5ae8421727032fb0c698"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.0esr/linux-i686/el/thunderbird-140.3.0esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-i686/el/thunderbird-140.3.1esr.tar.xz"; locale = "el"; arch = "linux-i686"; - sha256 = "a04ac731e0f4a7d7e3420e14962315d55247fd2b9ca3e806af693b641a2b1a52"; + sha256 = "93f112a14887a4afdd0a33794c60c3b3cef2f2ed04019219b0994e534744c561"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.0esr/linux-i686/en-CA/thunderbird-140.3.0esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-i686/en-CA/thunderbird-140.3.1esr.tar.xz"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "8eaffb48c0e40dea59e0210f0d3de2bc5290d4df419252a1d652ff434443e0e4"; + sha256 = "096c889f4b020b48c2a4ef1e7f66b5b401b30f3d9304e74cdd8c75737bf781f5"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.0esr/linux-i686/en-GB/thunderbird-140.3.0esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-i686/en-GB/thunderbird-140.3.1esr.tar.xz"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "cbecdf629c789e70731b9ccab630421e35ea8dc62cb62d635e7f7525a60ba030"; + sha256 = "3ac3ae104e943e18522a21454328b4c89a8b4b626564aea82ec1b9306819e561"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.0esr/linux-i686/en-US/thunderbird-140.3.0esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-i686/en-US/thunderbird-140.3.1esr.tar.xz"; locale = "en-US"; arch = "linux-i686"; - sha256 = "beaa90bc4bcd8aacc255c2b6e0880183879d5d40be26d8640061fa078e5a64ea"; + sha256 = "978c2831a7b5e913d4d261cfa97af0c5900ba32e60a7cccf5425c8ff23f11c95"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.0esr/linux-i686/es-AR/thunderbird-140.3.0esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-i686/es-AR/thunderbird-140.3.1esr.tar.xz"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "7c99e4fabc455b0bcd5f5df043f7243e9ef63db2136face8aa417140237396a2"; + sha256 = "6182bec17e34784998c7e4cd76bfdc9712653f30a94331dfdb61d38b1540bf7b"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.0esr/linux-i686/es-ES/thunderbird-140.3.0esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-i686/es-ES/thunderbird-140.3.1esr.tar.xz"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "290021c05cebedbf5b67a9d0029e2cc868d32bc30c2d8e8a3cbb8f9abe6ce580"; + sha256 = "16416a0317dd208aac9e1d44067ec5f0ba609399033324d736f980f08409d1be"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.0esr/linux-i686/es-MX/thunderbird-140.3.0esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-i686/es-MX/thunderbird-140.3.1esr.tar.xz"; locale = "es-MX"; arch = "linux-i686"; - sha256 = "74c7cf55bf429b8c11a3aaff9a9214329ace16394dd67c75b1135b5ccb18ea3e"; + sha256 = "9cad4cf6d2efefecd36236b407b7a2204c02319cb673ac05921ed1afef0f0f4e"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.0esr/linux-i686/et/thunderbird-140.3.0esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-i686/et/thunderbird-140.3.1esr.tar.xz"; locale = "et"; arch = "linux-i686"; - sha256 = "98055657661a98671bb194db5f1ac59a1ffd5b83075ccd84e81857543b7d3bff"; + sha256 = "bd9fdece5679755582a058a3b8dee9bbe47f12b6264e08c3a977bb395c72248b"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.0esr/linux-i686/eu/thunderbird-140.3.0esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-i686/eu/thunderbird-140.3.1esr.tar.xz"; locale = "eu"; arch = "linux-i686"; - sha256 = "ea6f0bcf8a0a5839a9a42aff76b8ed993c69d95eb5146cb90c914550e9824f91"; + sha256 = "6799ed256d553d1ba2338811a31cd47ee57a9d54c7db597062391f95b669921d"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.0esr/linux-i686/fi/thunderbird-140.3.0esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-i686/fi/thunderbird-140.3.1esr.tar.xz"; locale = "fi"; arch = "linux-i686"; - sha256 = "89491d104861e0a69384a53ad27a40936a44f513f1c471a602fad8922e1482f6"; + sha256 = "c862d5bdf205a75b0304ccbee85ecb725cdfad848b75d99a6f6567ae59ef7cc7"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.0esr/linux-i686/fr/thunderbird-140.3.0esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-i686/fr/thunderbird-140.3.1esr.tar.xz"; locale = "fr"; arch = "linux-i686"; - sha256 = "21273830ec9585471f8442dda07a6656d13ea82cca95e047e35a2c4a92084723"; + sha256 = "196d1972c9f71cd8152f0dccf6642961b8b360423ad74a3facb40ca10b095b3a"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.0esr/linux-i686/fy-NL/thunderbird-140.3.0esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-i686/fy-NL/thunderbird-140.3.1esr.tar.xz"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "6b7e3e2d1c13762da3587b514ffe0c76959652e06381fdbeca39d8f8c0b89518"; + sha256 = "a2f7a4dc94fb17c0ceed511c6e591feb1894e1d707d4d74d69729f621690cd11"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.0esr/linux-i686/ga-IE/thunderbird-140.3.0esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-i686/ga-IE/thunderbird-140.3.1esr.tar.xz"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "5d101f924ec5ec3182de97a8e91b29feb6e68b7d0610502463bbf598542521a9"; + sha256 = "1786bc27d6849b482192dd2d2054f8a04ebf804399e8a99ddb67c98cbd57cdf7"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.0esr/linux-i686/gd/thunderbird-140.3.0esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-i686/gd/thunderbird-140.3.1esr.tar.xz"; locale = "gd"; arch = "linux-i686"; - sha256 = "d4c95fbe8ebe50c918511b90d4bcd278a9f4521eefd7943da514f39d6ea9df29"; + sha256 = "35dbb7deab2e51d189dc2403f0b07b033c0d02d2208759a0469e530851576922"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.0esr/linux-i686/gl/thunderbird-140.3.0esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-i686/gl/thunderbird-140.3.1esr.tar.xz"; locale = "gl"; arch = "linux-i686"; - sha256 = "6d8d42cd3e4c0c1ad68d22e54afb646f73ed6169c24772ae31897d722e85f852"; + sha256 = "92112627e51a1475b2d99e5db525de0c5584008411f41651f66078cefe0124ef"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.0esr/linux-i686/he/thunderbird-140.3.0esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-i686/he/thunderbird-140.3.1esr.tar.xz"; locale = "he"; arch = "linux-i686"; - sha256 = "bb01381526dc7c8b1d25dfa5aa0631535013d180a3b2407b368bb7678920c6dd"; + sha256 = "809376eebee2424dc7642f659a394269d143030faf5d29e9e76f548d68dbc1e2"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.0esr/linux-i686/hr/thunderbird-140.3.0esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-i686/hr/thunderbird-140.3.1esr.tar.xz"; locale = "hr"; arch = "linux-i686"; - sha256 = "1aa038a1213d12634db01b39a47cc730b14de6623f45e5832c9e960cef470097"; + sha256 = "68463819531333131e3d160acf4c52a02914cbde0213da1f9337e98d5206057c"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.0esr/linux-i686/hsb/thunderbird-140.3.0esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-i686/hsb/thunderbird-140.3.1esr.tar.xz"; locale = "hsb"; arch = "linux-i686"; - sha256 = "30ec569c44d6bbae7274f4c813fb28f98220a95bd7d9fd07af50c64606fb4397"; + sha256 = "dbd7bc581ffdc9a00028ccc4582582371518f001bbe25856177d5477907cd69a"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.0esr/linux-i686/hu/thunderbird-140.3.0esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-i686/hu/thunderbird-140.3.1esr.tar.xz"; locale = "hu"; arch = "linux-i686"; - sha256 = "889baf2d83680676b7b2dac365ae30311a6bb15da18fb35bdca1d73ccf894a7a"; + sha256 = "6a4fe0caeec91ef7a28bb3c958de33d4aecfa67ba80b7227e1bae6a2d9a25b41"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.0esr/linux-i686/hy-AM/thunderbird-140.3.0esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-i686/hy-AM/thunderbird-140.3.1esr.tar.xz"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "e11275886bc19f3450ef0fc32e11234722e94fbfd7c77595edf8eec74296b720"; + sha256 = "65f58458b447a59000d3e5ab32af9c95bb3b58857ec7501631f7e7b44f378aee"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.0esr/linux-i686/id/thunderbird-140.3.0esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-i686/id/thunderbird-140.3.1esr.tar.xz"; locale = "id"; arch = "linux-i686"; - sha256 = "61dbf17f675a189def5acedbfa387e06aad5de363c4ce05f586ea1389588d656"; + sha256 = "d8ddd3f21ae3917649ec55a6509596dc4aa83cbb8f90ac0faace100f06b87bd3"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.0esr/linux-i686/is/thunderbird-140.3.0esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-i686/is/thunderbird-140.3.1esr.tar.xz"; locale = "is"; arch = "linux-i686"; - sha256 = "96dba510b369204e86dc4fee1585d034a4d39a988b823251e0aaef0570f45e87"; + sha256 = "fc75b9242bfb4b8d7688c0ff0f8426924b9376ef9e989725c971bcf39fde47b8"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.0esr/linux-i686/it/thunderbird-140.3.0esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-i686/it/thunderbird-140.3.1esr.tar.xz"; locale = "it"; arch = "linux-i686"; - sha256 = "9fc3b0aa812ee20766a019b11c8b403a7907ea252d02f971d20041967aced7da"; + sha256 = "de12e0c38756d5ece677d773bb3674b125b918644d6eb58de347404363067332"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.0esr/linux-i686/ja/thunderbird-140.3.0esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-i686/ja/thunderbird-140.3.1esr.tar.xz"; locale = "ja"; arch = "linux-i686"; - sha256 = "fcd03c9720eadb4ce5addea1e459c6ffb926ee838e843967894d1cf6d8b400b3"; + sha256 = "2262dcf37e3742b580e86f0dacc077e1a855879b8ca2056888f6817f7c0376c0"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.0esr/linux-i686/ka/thunderbird-140.3.0esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-i686/ka/thunderbird-140.3.1esr.tar.xz"; locale = "ka"; arch = "linux-i686"; - sha256 = "1925bf4c71548681f38a61335fdc04e28c0aea3051080c8d9f3ba347ab0a0f23"; + sha256 = "86bebe321ee191f714626b48fe9650e5b5eab11683b428312ba5e6d405fc236e"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.0esr/linux-i686/kab/thunderbird-140.3.0esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-i686/kab/thunderbird-140.3.1esr.tar.xz"; locale = "kab"; arch = "linux-i686"; - sha256 = "e84921ab6dc8ef87dc99bb98b1ea36bff04478910d104b6c2a196a91e6988b3c"; + sha256 = "7bee584e9c44edf6b86e329deed33dddbf43f9c427c9bf499754829d166eba8e"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.0esr/linux-i686/kk/thunderbird-140.3.0esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-i686/kk/thunderbird-140.3.1esr.tar.xz"; locale = "kk"; arch = "linux-i686"; - sha256 = "39e5110ec2ed290c140d545a4a0f9f0d7b449a60f6fd6337ac2f853c6ba45bda"; + sha256 = "909190b3e17f1b52e5c0512b5385d71cfd14cc0be92899f27ea07c41f4fc8351"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.0esr/linux-i686/ko/thunderbird-140.3.0esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-i686/ko/thunderbird-140.3.1esr.tar.xz"; locale = "ko"; arch = "linux-i686"; - sha256 = "c5a526cedb703ac399752324952e88123ec1a3815f7f80a7e25227c4dbe56204"; + sha256 = "2c931f1ddcc65e5020f978e4a5cb49583e170bcb48cc72dff6697770430ad6fe"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.0esr/linux-i686/lt/thunderbird-140.3.0esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-i686/lt/thunderbird-140.3.1esr.tar.xz"; locale = "lt"; arch = "linux-i686"; - sha256 = "6ea82a8fef464e166e60f4c4adc2899b662a0e73819aa22b24a0d3ed44e0c082"; + sha256 = "06c55ea902253d74c648a957c048ab921edf706539b1adcb3a63e4046efa687e"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.0esr/linux-i686/lv/thunderbird-140.3.0esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-i686/lv/thunderbird-140.3.1esr.tar.xz"; locale = "lv"; arch = "linux-i686"; - sha256 = "8b48804d74a2dfa9869f237b95cef5fc079f88df0fe6ec4657f5a53b5f21d468"; + sha256 = "636dd4ddfc78815789b7952ebfce1445690d121fc841fc386da9c5bd59db4f28"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.0esr/linux-i686/ms/thunderbird-140.3.0esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-i686/ms/thunderbird-140.3.1esr.tar.xz"; locale = "ms"; arch = "linux-i686"; - sha256 = "cc86958a15d16c22752608555bda3c56060e98e98c5e437bed9c607099450f73"; + sha256 = "8b571092ddf88999761e6da188e6521d0880db20f1ae3b1958ae624f6c447f4e"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.0esr/linux-i686/nb-NO/thunderbird-140.3.0esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-i686/nb-NO/thunderbird-140.3.1esr.tar.xz"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "c5e8c13c878d1afffd91b19bcfbd2e6dd859c48c6c98e6dc471e846ee6cb874a"; + sha256 = "f061ffcfef6a56898cf66bf2261f74408b0d01e89dc5e6ff53dc94a9554f243f"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.0esr/linux-i686/nl/thunderbird-140.3.0esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-i686/nl/thunderbird-140.3.1esr.tar.xz"; locale = "nl"; arch = "linux-i686"; - sha256 = "83f2b7ff34c57d04c3ea925e0ca716dfdc63c4dc231da328cf56cf0a74fbe237"; + sha256 = "531298208ce88fcd05cbcd9bc03de473714f2c77f11a8485b97bdaf271834b92"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.0esr/linux-i686/nn-NO/thunderbird-140.3.0esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-i686/nn-NO/thunderbird-140.3.1esr.tar.xz"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "c990fdcd6a5743688d0bf618cf0301b7323c2004b0be066d701bf47aca878448"; + sha256 = "bc55ecda12d0dc53a6704d6229536003f4a720ae9c787b50d4e6f6bb4445a61a"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.0esr/linux-i686/pa-IN/thunderbird-140.3.0esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-i686/pa-IN/thunderbird-140.3.1esr.tar.xz"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "9ae43928b0546e3ef4432a5232cfdc7235b2a822eac18579e5ae8f747841c9bf"; + sha256 = "abfdaa63bcbd4428530df6459a108f0a7c8bc6e80f3fbafa8e4899e8f05eb39a"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.0esr/linux-i686/pl/thunderbird-140.3.0esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-i686/pl/thunderbird-140.3.1esr.tar.xz"; locale = "pl"; arch = "linux-i686"; - sha256 = "d282d87ae107f7f27f79f70e3761924d478440b4078277e8eca2c11088fae4d9"; + sha256 = "08f5fdbeb52a6cdcd9969fa233e2c985a640c9c0a59df61ae2fd7b0004f1fe46"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.0esr/linux-i686/pt-BR/thunderbird-140.3.0esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-i686/pt-BR/thunderbird-140.3.1esr.tar.xz"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "3053869c69e45bc335b55e38a10ecc40e4b464a3259fbf4ff0f0faa5fbb1c144"; + sha256 = "c866a05e3c72d6e05073d1373cd7bdfb3fb8faf746375ec4f51e3946caa22f46"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.0esr/linux-i686/pt-PT/thunderbird-140.3.0esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-i686/pt-PT/thunderbird-140.3.1esr.tar.xz"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "a571813f32f9ad62c60a2fcab9c68ac3a687a81b55b8bca97d023c7b5fa99a13"; + sha256 = "3936990bc963741ad780721dad715ba958c71818614523fb46621fb0dec147c6"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.0esr/linux-i686/rm/thunderbird-140.3.0esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-i686/rm/thunderbird-140.3.1esr.tar.xz"; locale = "rm"; arch = "linux-i686"; - sha256 = "9ecc9338d06b4b965e81c4151b25fdd581f733f01d3e8d629671ef1db22de6f8"; + sha256 = "ca044dc761fe2bebec563a37757b563cdfe2eec18e4cf2d451a1b7bd0e03a46f"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.0esr/linux-i686/ro/thunderbird-140.3.0esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-i686/ro/thunderbird-140.3.1esr.tar.xz"; locale = "ro"; arch = "linux-i686"; - sha256 = "60b32b44a33bf33fcb12bdc996cc4a70c59b28f105cdc8764208d4928293200b"; + sha256 = "13b98157852329a91240498112f841f03d90c239c41c57d0a31eec6a2eb01ad0"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.0esr/linux-i686/ru/thunderbird-140.3.0esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-i686/ru/thunderbird-140.3.1esr.tar.xz"; locale = "ru"; arch = "linux-i686"; - sha256 = "f42492d74b1c00e6a2c0daf3de65561bf6e58216acdff0a2c7c0f3443af3f69b"; + sha256 = "461a8c8433a5f49b979f03377f0ac7f2a81307660a83c4727b677a1487fd2a15"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.0esr/linux-i686/sk/thunderbird-140.3.0esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-i686/sk/thunderbird-140.3.1esr.tar.xz"; locale = "sk"; arch = "linux-i686"; - sha256 = "75341a1c13f5a0913bf0ed96d43dd58558b38ebdca4737fc5439e3de23f5a0ea"; + sha256 = "a24ccc5a44a459a5c15d9dd59ba4395a31abccd0bf9238c9ca1c0f229716d5ee"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.0esr/linux-i686/sl/thunderbird-140.3.0esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-i686/sl/thunderbird-140.3.1esr.tar.xz"; locale = "sl"; arch = "linux-i686"; - sha256 = "3b76f747c469f1bfa7bdf4b667b890103f24a045d3f3cf6166775afd2757097e"; + sha256 = "0c5fc0afeb40f6bf238e541e56ce414a43ef54fa195888c3862aa78f5c371326"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.0esr/linux-i686/sq/thunderbird-140.3.0esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-i686/sq/thunderbird-140.3.1esr.tar.xz"; locale = "sq"; arch = "linux-i686"; - sha256 = "0f8a869d79c0df8cf6afc1023bc96ead3fea40811c825666057ad538419d1a38"; + sha256 = "429bcc3349926e2ff220320092bfa0e24babb315dca3dc61a66f1f7a6b54c9c4"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.0esr/linux-i686/sr/thunderbird-140.3.0esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-i686/sr/thunderbird-140.3.1esr.tar.xz"; locale = "sr"; arch = "linux-i686"; - sha256 = "3ad2d861dac31a147fb96b689f8746e006dcb744fba26f46cff648ce35a87fe0"; + sha256 = "442d0363c258c61cdb1690380181712f9159d1b3a3a9a12df62efe403f145797"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.0esr/linux-i686/sv-SE/thunderbird-140.3.0esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-i686/sv-SE/thunderbird-140.3.1esr.tar.xz"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "9c81144f7d017d4bea62e54cdf25f91124e3adc80e83d39d89df89f6b286f5f9"; + sha256 = "055c4212a3650e53f43ab6fa859e03e7475fe0b6da1b4a87c5671dec827f53eb"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.0esr/linux-i686/th/thunderbird-140.3.0esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-i686/th/thunderbird-140.3.1esr.tar.xz"; locale = "th"; arch = "linux-i686"; - sha256 = "86984adb5db18f421a72ba182d3c9c8e1a9af040b731301fca48ce6c39a91108"; + sha256 = "37a9840af005b2aca0e024223bdc388f19b6e9d8ab381519266667b01eda8eac"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.0esr/linux-i686/tr/thunderbird-140.3.0esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-i686/tr/thunderbird-140.3.1esr.tar.xz"; locale = "tr"; arch = "linux-i686"; - sha256 = "9a432cb613445d7b53ddf89f7fa73337c4f5084043e86e5c5c721e31f10ac187"; + sha256 = "dbc8ae7228249b490dc845e3030e1c625facd625f322b6c1ba1b5201038a7f2c"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.0esr/linux-i686/uk/thunderbird-140.3.0esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-i686/uk/thunderbird-140.3.1esr.tar.xz"; locale = "uk"; arch = "linux-i686"; - sha256 = "aa2a082743838927affd36e224e5dcfaad55c44dd719391ed07732e816a0667a"; + sha256 = "5436eca8f68ee7833c2e3a3bcee56db0d3d66b3bd3a98059c07508181f4c8116"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.0esr/linux-i686/uz/thunderbird-140.3.0esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-i686/uz/thunderbird-140.3.1esr.tar.xz"; locale = "uz"; arch = "linux-i686"; - sha256 = "71a373909186341e36dee811de984992167f09a88caf920140313648e19b3ddb"; + sha256 = "af154fd7ec1c00bf8b5e0f8c2d8a03050caf5030923fa579736507cadc60f9d4"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.0esr/linux-i686/vi/thunderbird-140.3.0esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-i686/vi/thunderbird-140.3.1esr.tar.xz"; locale = "vi"; arch = "linux-i686"; - sha256 = "d9bf373e03851b397504d1d4adc3d4bcee61c7eeeec934a5b1fd85b244c07b2e"; + sha256 = "2c0310ea5985ef44a8edf9cbb2505e14f79f18d88852a1d6830b150daf4bdae9"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.0esr/linux-i686/zh-CN/thunderbird-140.3.0esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-i686/zh-CN/thunderbird-140.3.1esr.tar.xz"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "507174c9ee56297d7993910d11ccfdb46ebd8017916c265e761483492ee32ee9"; + sha256 = "d20df69fe34109f124e939af4dc52234c9e36e106491dac8f1fa8b82bd638871"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.0esr/linux-i686/zh-TW/thunderbird-140.3.0esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-i686/zh-TW/thunderbird-140.3.1esr.tar.xz"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "700ffe64f4f284c801d0b9a9b141c79028f2abd07c337d5688696fb088123357"; + sha256 = "d837f2211c60a8d9c14cf2ce125806631061f6bab758247d8baec0797207ef42"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.0esr/mac/af/Thunderbird%20140.3.0esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/mac/af/Thunderbird%20140.3.1esr.dmg"; locale = "af"; arch = "mac"; - sha256 = "d8b67f69e763390442ddfe80f1b6011e1278dea0a1073d7259c0a033e0ac5300"; + sha256 = "20f115cd2954afbaceeef193405212e80711cf76d0e0b6199a7edfd292bac237"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.0esr/mac/ar/Thunderbird%20140.3.0esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/mac/ar/Thunderbird%20140.3.1esr.dmg"; locale = "ar"; arch = "mac"; - sha256 = "aaa4112b46f660969bcd1f588a846084036fe0b068247ec8c39133936ed0b8e0"; + sha256 = "63a4e846d880eb81fb2a8fb81face1dd9ac0a0815a82a14f0e5c3cde898d33aa"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.0esr/mac/ast/Thunderbird%20140.3.0esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/mac/ast/Thunderbird%20140.3.1esr.dmg"; locale = "ast"; arch = "mac"; - sha256 = "f4487f0a2151dccea144d3839be6e248dc3b52c73f4ed650691dd670173c4833"; + sha256 = "4338e715e946f662471891008b5bc6e7adc8393cf5a96ab86a382ce04cbce6c5"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.0esr/mac/be/Thunderbird%20140.3.0esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/mac/be/Thunderbird%20140.3.1esr.dmg"; locale = "be"; arch = "mac"; - sha256 = "d0daee81f3b09cb657ae46b8660baf9f94aa1d4cc4bc63e2c71c33f4c05c709e"; + sha256 = "c4210d35120f742302b26db54acb8a6310c8c287908f996de72914010324786b"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.0esr/mac/bg/Thunderbird%20140.3.0esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/mac/bg/Thunderbird%20140.3.1esr.dmg"; locale = "bg"; arch = "mac"; - sha256 = "897db8b593aff38d4eb28647607ebe75b177de39b8fa97478c250ad028421bba"; + sha256 = "edbbda1f4982b1730b0f722bbf17cc05ad8b70e66c16af7812885e40e3606098"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.0esr/mac/br/Thunderbird%20140.3.0esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/mac/br/Thunderbird%20140.3.1esr.dmg"; locale = "br"; arch = "mac"; - sha256 = "63301a5eca53d5b6b4c523cc7a1b0fbae199aab1f108bd13892f3948153b2ad4"; + sha256 = "f1fa61c3db825155265371a382ce9fc3ea07fcdf375a6b0d10035afcd4f9aac2"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.0esr/mac/ca/Thunderbird%20140.3.0esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/mac/ca/Thunderbird%20140.3.1esr.dmg"; locale = "ca"; arch = "mac"; - sha256 = "5aa4a1bbeecbc5bee83c1050bdd26332b8e6d121dd1fda80d3dd88fd87722f34"; + sha256 = "75f5bf743b9d1fafa3f7f2ddf8689ed01ac507e8d4b896e3177f4c995f59706f"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.0esr/mac/cak/Thunderbird%20140.3.0esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/mac/cak/Thunderbird%20140.3.1esr.dmg"; locale = "cak"; arch = "mac"; - sha256 = "ef49d76b58b1624d54e7f50592d7108a7623150fff8fd2f54d4c5661e1b75e28"; + sha256 = "79c78160253c67a3e3429806703a9840ee9b5df047b6b4c0095ad4eeb683af66"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.0esr/mac/cs/Thunderbird%20140.3.0esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/mac/cs/Thunderbird%20140.3.1esr.dmg"; locale = "cs"; arch = "mac"; - sha256 = "199d81df9a93e66e8e3b22fd77ca79b1d5cddd452f78dc20e431662ca59dd6bf"; + sha256 = "115c1e9acd7dc63b8ef5b3d47d53d4b061137a2bb2d9d5cb015f098de6222b85"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.0esr/mac/cy/Thunderbird%20140.3.0esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/mac/cy/Thunderbird%20140.3.1esr.dmg"; locale = "cy"; arch = "mac"; - sha256 = "dc4254b2b32c35f6a2569131ca83efa96e13145a3f42da9c382c144e630ee158"; + sha256 = "6f690c8e1fa4465a147045c8f4b5f0e0bdc29723d69677a5fc29a66653954da2"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.0esr/mac/da/Thunderbird%20140.3.0esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/mac/da/Thunderbird%20140.3.1esr.dmg"; locale = "da"; arch = "mac"; - sha256 = "fcaa265222ebc1088c50304c7d02a9c41a96ea6a7c2c5c4025bd743b15fd93b1"; + sha256 = "ef54483cab54bfa8d00577c3741ab3c856190798ddfd154bd355822f7af7df8e"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.0esr/mac/de/Thunderbird%20140.3.0esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/mac/de/Thunderbird%20140.3.1esr.dmg"; locale = "de"; arch = "mac"; - sha256 = "33a08027f709340bb9fbf53b05eefd5b42e77896e73ffd12e83e15a2298da541"; + sha256 = "a2972ac2e3227e05b95b34df8ea9dbd46c3d8b6164bddba830af562b1c87ce1e"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.0esr/mac/dsb/Thunderbird%20140.3.0esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/mac/dsb/Thunderbird%20140.3.1esr.dmg"; locale = "dsb"; arch = "mac"; - sha256 = "fbfcf21ba07e8bfceef3ddf881ad36d06a0811827d167fe0e300ffb2df7cbaf1"; + sha256 = "9bc1a18d9987eb3a99767a6479cec05a8e3427a59235c3e0ddd585584cff915e"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.0esr/mac/el/Thunderbird%20140.3.0esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/mac/el/Thunderbird%20140.3.1esr.dmg"; locale = "el"; arch = "mac"; - sha256 = "4ffeac7748d22f33d85e5aac816693f8f96484ed008d0a6869eaaccab6e9d3db"; + sha256 = "c97bfbf95583470c947478a4c97d8cc92702e7ec8ceda7f633b1acd0ef08ab61"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.0esr/mac/en-CA/Thunderbird%20140.3.0esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/mac/en-CA/Thunderbird%20140.3.1esr.dmg"; locale = "en-CA"; arch = "mac"; - sha256 = "b56e80527cae2719fe2bafe97b9625b98e56a14f9a7df0f1f6c4c05fa47bcb73"; + sha256 = "1a8f768a30315f0c5014d859b32ed0f5c5c1c72811b81c18a89fba9df7ed6d09"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.0esr/mac/en-GB/Thunderbird%20140.3.0esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/mac/en-GB/Thunderbird%20140.3.1esr.dmg"; locale = "en-GB"; arch = "mac"; - sha256 = "87c4dee5de4188224e9cf605a937e9d1a47e7a3a589ba79adf966ecd1691370e"; + sha256 = "00930cbc380314c64919c41efaeff5ac236f1828ac8f8fef7611c857da29a860"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.0esr/mac/en-US/Thunderbird%20140.3.0esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/mac/en-US/Thunderbird%20140.3.1esr.dmg"; locale = "en-US"; arch = "mac"; - sha256 = "b9d14fd2837a85bb3ec4c4ca57af1a33f70a88d2ceabb411bba913e3d7afea4c"; + sha256 = "9b44c8ad3bfba131ab62d67c3a5af11ba73dd37edd19f9ed299380aa6d1ce9b0"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.0esr/mac/es-AR/Thunderbird%20140.3.0esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/mac/es-AR/Thunderbird%20140.3.1esr.dmg"; locale = "es-AR"; arch = "mac"; - sha256 = "21f18c20f31db732835c0483ef283c2b7f2362d8c925920db26fed899e34b16d"; + sha256 = "32686eb688f3a732acc6401b0e0883ee21860e0395808ef876fe39016e161952"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.0esr/mac/es-ES/Thunderbird%20140.3.0esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/mac/es-ES/Thunderbird%20140.3.1esr.dmg"; locale = "es-ES"; arch = "mac"; - sha256 = "652fa3c75598060c29842ed6d2365c2a64e51797e75013b0deb043a2a570e69d"; + sha256 = "b515957a2a876f7d2fab1007c52746909abaacd221a894014291f4baa46a75bc"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.0esr/mac/es-MX/Thunderbird%20140.3.0esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/mac/es-MX/Thunderbird%20140.3.1esr.dmg"; locale = "es-MX"; arch = "mac"; - sha256 = "2f036ae8d9ad1c268cf69c76795e70a4da74f9836f37dc80d4110263b0d5aef0"; + sha256 = "ad97b8b7cac5028d315e9b003600aeaaa16046545e58b5d7d825c1ce5ff958ac"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.0esr/mac/et/Thunderbird%20140.3.0esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/mac/et/Thunderbird%20140.3.1esr.dmg"; locale = "et"; arch = "mac"; - sha256 = "b0823eed629def4b2f61d24c83d358fa7c9271c10dfbe467ddd625d4c5cbd4e9"; + sha256 = "77d9cf797a1a5df00634178b672dea6227025d4d0919a1f42254421e9ab72468"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.0esr/mac/eu/Thunderbird%20140.3.0esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/mac/eu/Thunderbird%20140.3.1esr.dmg"; locale = "eu"; arch = "mac"; - sha256 = "556ddc55038f31ee0a8575daf8e5d5d340a60482eb0865c79353239a5cfe1155"; + sha256 = "e9665feb488e63a974c5e137685856dd46ae74d9d09b3db32ca623366b019a82"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.0esr/mac/fi/Thunderbird%20140.3.0esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/mac/fi/Thunderbird%20140.3.1esr.dmg"; locale = "fi"; arch = "mac"; - sha256 = "5d75d9f968371df2474567fb77e0dbf8bc3925b2b95130517c3cf1aac1d8907a"; + sha256 = "75083a46cb5b4fc0a5beba54fc8c96d54473fdfd58dcf48ca9f29f7e9006d236"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.0esr/mac/fr/Thunderbird%20140.3.0esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/mac/fr/Thunderbird%20140.3.1esr.dmg"; locale = "fr"; arch = "mac"; - sha256 = "b510216b558c3ef0b4b49d792a545c3b82505497c5353e273a26e4875c7ff2d7"; + sha256 = "4d37be8922dccf766c6c04b15823de2f8f30b9c9ef0816b9f464ba25b2edf5c1"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.0esr/mac/fy-NL/Thunderbird%20140.3.0esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/mac/fy-NL/Thunderbird%20140.3.1esr.dmg"; locale = "fy-NL"; arch = "mac"; - sha256 = "9a65868429b59ed91b20c42dfd55792a6e7f489f4dd1f0d4a32f06fe14493922"; + sha256 = "5346cb9a49fa822940000dea8401f537f02af2ea4fd97f377ca2ec8286b7e056"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.0esr/mac/ga-IE/Thunderbird%20140.3.0esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/mac/ga-IE/Thunderbird%20140.3.1esr.dmg"; locale = "ga-IE"; arch = "mac"; - sha256 = "5bfda7a8819bc3c04c262f929413a5022848a4f52a915afc4ca7fb4f671258eb"; + sha256 = "ba48461b4db3b3994487f7bc85f5e0e7c279afa85a07ce29c8713d618e08b24e"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.0esr/mac/gd/Thunderbird%20140.3.0esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/mac/gd/Thunderbird%20140.3.1esr.dmg"; locale = "gd"; arch = "mac"; - sha256 = "e6e1e251d563f345575837a4ea32d3c25d736802a4578cf2fb4ca7234bb963cd"; + sha256 = "f60a683e321af703876c0db82d8a0688f6b1c6ad973f131c81d69dd92d23cb8e"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.0esr/mac/gl/Thunderbird%20140.3.0esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/mac/gl/Thunderbird%20140.3.1esr.dmg"; locale = "gl"; arch = "mac"; - sha256 = "920a0224f338f0683654785f88ae19ab066e753a50af08de106405498d0c45f4"; + sha256 = "0a912b86029f48d9398a44cd003700d91c718e221e755d842a5747493faaa799"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.0esr/mac/he/Thunderbird%20140.3.0esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/mac/he/Thunderbird%20140.3.1esr.dmg"; locale = "he"; arch = "mac"; - sha256 = "d8ae14a98d9d08bdf91d384ee71b701bb1c1830b92f736c9144a424efab64ea4"; + sha256 = "ba7b5793af2091ec563ff56fe3583b0d60a4f3a11bd9dd12acc158e2e08609e4"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.0esr/mac/hr/Thunderbird%20140.3.0esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/mac/hr/Thunderbird%20140.3.1esr.dmg"; locale = "hr"; arch = "mac"; - sha256 = "b4d59bd4306b3bc994644e1a4e8f0cf85a9174549c83f797d5dd881ae340ad99"; + sha256 = "c4cdd8c36b112eb9a7740323ee1afc86b4b60b78f15a8b38740f6cb7d7234c94"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.0esr/mac/hsb/Thunderbird%20140.3.0esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/mac/hsb/Thunderbird%20140.3.1esr.dmg"; locale = "hsb"; arch = "mac"; - sha256 = "64564816f2d9e2ab7d2c5628ef0bce948519087f528f41c771491439f714d710"; + sha256 = "d76cd753cbc5476b7c1c9b9089a800ad703b79e9f00a5b411c533bd4e12e9864"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.0esr/mac/hu/Thunderbird%20140.3.0esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/mac/hu/Thunderbird%20140.3.1esr.dmg"; locale = "hu"; arch = "mac"; - sha256 = "e7b9b46e4d12ce5029958ded8412701806587c731d0a3180237c7b828ad17a6f"; + sha256 = "7fecb8178db42fb1624847991a88197cb7a25ad0b5b43da3c0ec5dd5e9ef7ed4"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.0esr/mac/hy-AM/Thunderbird%20140.3.0esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/mac/hy-AM/Thunderbird%20140.3.1esr.dmg"; locale = "hy-AM"; arch = "mac"; - sha256 = "0bb7a032cd9815194f685e201c1176bbee907593f1287c4061626d2016a9bb05"; + sha256 = "7cb89e818872a645d5f427dcfedde9b9be60c8770dc346875f634a50f124e7ee"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.0esr/mac/id/Thunderbird%20140.3.0esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/mac/id/Thunderbird%20140.3.1esr.dmg"; locale = "id"; arch = "mac"; - sha256 = "007401628f655621df9899027620a1012b6077d532e87ccc94c27d45bc4045b2"; + sha256 = "df77301b219a03897931bf94c9c6e677149f7c02dabacbea080a43f47d5e2e08"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.0esr/mac/is/Thunderbird%20140.3.0esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/mac/is/Thunderbird%20140.3.1esr.dmg"; locale = "is"; arch = "mac"; - sha256 = "232f8cf3fcf4c836438c56d2cb96eb73a83ee125f58ee40b265b8083e74c6021"; + sha256 = "47aac46979211e862345d767f22a0739ac1adb385e11cdc7f53bda47f3f59d92"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.0esr/mac/it/Thunderbird%20140.3.0esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/mac/it/Thunderbird%20140.3.1esr.dmg"; locale = "it"; arch = "mac"; - sha256 = "31ad867cf2e5502497a6e1cd91bc46532b6f506084fc90ec4bc421a382d4148a"; + sha256 = "7844c40d0cf241bcc6dc3e5f695f0aee540500ca23b62d43d3a65acb2b3fe1e0"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.0esr/mac/ja-JP-mac/Thunderbird%20140.3.0esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/mac/ja-JP-mac/Thunderbird%20140.3.1esr.dmg"; locale = "ja-JP-mac"; arch = "mac"; - sha256 = "76b235930d84e8050b227fc4895dd3e4b3d10af9667d10062909cea51bdf98fb"; + sha256 = "6773857a1d1e275c19616a00d859cb122a0bb62bf2edf3809e81ad3ecf837e0c"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.0esr/mac/ka/Thunderbird%20140.3.0esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/mac/ka/Thunderbird%20140.3.1esr.dmg"; locale = "ka"; arch = "mac"; - sha256 = "dbd16862c733cdb54daf895f5935a2252f88beb27859822a52642c0c05d74eb8"; + sha256 = "a5d6516204d4dceed0dd2fe5a021a30bbae66e3f0c8743749179fb1119e1d3f7"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.0esr/mac/kab/Thunderbird%20140.3.0esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/mac/kab/Thunderbird%20140.3.1esr.dmg"; locale = "kab"; arch = "mac"; - sha256 = "b82ea3e88e2432a06159a240d8224901695a2acf2f331168f9080268fb9b8ad6"; + sha256 = "67f8fc4a908d1a93fc8d3338c887569d3eb17bd2f177bf430b309bd954f9718f"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.0esr/mac/kk/Thunderbird%20140.3.0esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/mac/kk/Thunderbird%20140.3.1esr.dmg"; locale = "kk"; arch = "mac"; - sha256 = "7b2f95f60c78f55fc8ea08a7d3f88d6999a79a74cecd7f538af5a93a6d5fda3e"; + sha256 = "97a00e5a3b9fa2a93ea74f0fdf6a4a6d85cd97701e064eeb28fb288f09a4b7f1"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.0esr/mac/ko/Thunderbird%20140.3.0esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/mac/ko/Thunderbird%20140.3.1esr.dmg"; locale = "ko"; arch = "mac"; - sha256 = "d951b3a057f0f71601a8534a81b1cad5991a80d202fb3c80c6229f11df5ad9e5"; + sha256 = "8626dae3c88f63bbf7b4d324279102240ed26cebf53ff5a794f48fe218fb84e5"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.0esr/mac/lt/Thunderbird%20140.3.0esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/mac/lt/Thunderbird%20140.3.1esr.dmg"; locale = "lt"; arch = "mac"; - sha256 = "f8305d7e2ca22f1992c5cb7c3b64c11c0b60ac12edabfd93435c2ebac68caafe"; + sha256 = "17b6759a5671eb94feed2481fc80f211b37d95f89879f71ddefa74da5ab9f245"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.0esr/mac/lv/Thunderbird%20140.3.0esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/mac/lv/Thunderbird%20140.3.1esr.dmg"; locale = "lv"; arch = "mac"; - sha256 = "5b20eff201e71a6a97cd1e49bc7e4cc9d8fda8c3bab1690ab329894d03a85eb5"; + sha256 = "fec5316838fcb3d5c08381bd425c7b3395baf836b43c14c988862138fa7f7856"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.0esr/mac/ms/Thunderbird%20140.3.0esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/mac/ms/Thunderbird%20140.3.1esr.dmg"; locale = "ms"; arch = "mac"; - sha256 = "b901b34ac7db774adda1ef81b35c571f0f65f7bb2c5b9cd29e2aceb7f05f8ee2"; + sha256 = "b086d9eab3043be43fccb8c86635ab205f267df86e7e711c5378e9652e4666a0"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.0esr/mac/nb-NO/Thunderbird%20140.3.0esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/mac/nb-NO/Thunderbird%20140.3.1esr.dmg"; locale = "nb-NO"; arch = "mac"; - sha256 = "78009e1a8b20452af0e8abc49e7199fdda2a0db903375e5f1220d4e04c2ceeda"; + sha256 = "fff8619e734a0e1d2445e2a1b5f483f16acc7821fcd4a4e362de1de5e2f966dc"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.0esr/mac/nl/Thunderbird%20140.3.0esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/mac/nl/Thunderbird%20140.3.1esr.dmg"; locale = "nl"; arch = "mac"; - sha256 = "da0e45974ff7e2521067bc5242c97fd48811f4904cd9b5c8e71e8d1cb5c4ee37"; + sha256 = "33dc51ec3b5bc0791df31c84883c8e246fa8a477a251359b0200b40a0f5eeadd"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.0esr/mac/nn-NO/Thunderbird%20140.3.0esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/mac/nn-NO/Thunderbird%20140.3.1esr.dmg"; locale = "nn-NO"; arch = "mac"; - sha256 = "9163b300e5ab093cee5e53f437e170974026a72d652ba8d22aaae9b2e31dee8e"; + sha256 = "7f8b72cc02e6162713ed05c0b2bf80057ed935604b45241f4638dcf2c095969c"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.0esr/mac/pa-IN/Thunderbird%20140.3.0esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/mac/pa-IN/Thunderbird%20140.3.1esr.dmg"; locale = "pa-IN"; arch = "mac"; - sha256 = "b981d4dd1a030c814df649c928ad0e1cc30fda40c0a1f291a17c7d769e601382"; + sha256 = "858a024b316f96b629f1042c2cfad47c54da571887e5600d57b05856420bfdd6"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.0esr/mac/pl/Thunderbird%20140.3.0esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/mac/pl/Thunderbird%20140.3.1esr.dmg"; locale = "pl"; arch = "mac"; - sha256 = "bf309f2f863db4d1687b3ae242445d5d2ee330bdc5e3a10767fb84bc7a725c96"; + sha256 = "20124dc0ffda461f68ae1efc1e7277f439126d73d02f0c659961591853b7eadd"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.0esr/mac/pt-BR/Thunderbird%20140.3.0esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/mac/pt-BR/Thunderbird%20140.3.1esr.dmg"; locale = "pt-BR"; arch = "mac"; - sha256 = "83fc6a004b5c8f99d14078c77b76adb7f4602e22cba7d15c9384729baa6011a9"; + sha256 = "d9691bc4f1fa9c95ec2b140ea005eb292293de90cf70d30700f10c63b430c41a"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.0esr/mac/pt-PT/Thunderbird%20140.3.0esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/mac/pt-PT/Thunderbird%20140.3.1esr.dmg"; locale = "pt-PT"; arch = "mac"; - sha256 = "a0d09f2ade3d17ccedb6f05ff4656ee02748b4c9989fad8e4a9a4102e642945a"; + sha256 = "4b3a13d53f3c5042db0ee51df9d830e3f4fcb3f5beb76d08a4d7e879c33f752d"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.0esr/mac/rm/Thunderbird%20140.3.0esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/mac/rm/Thunderbird%20140.3.1esr.dmg"; locale = "rm"; arch = "mac"; - sha256 = "f17d836cee9c3fdbe1aad53cce9c83f1ec92f9355c4ce2b6d0ac03e6f64631ad"; + sha256 = "7e1b52adac3cfd0f99251d6d50eb4db7537d65cd2728f7e6ff318cef1388b34a"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.0esr/mac/ro/Thunderbird%20140.3.0esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/mac/ro/Thunderbird%20140.3.1esr.dmg"; locale = "ro"; arch = "mac"; - sha256 = "9a85bebb70991d8734f000d41f7a9c31db23e8eb7c9c38595eeaaa1c6bbba439"; + sha256 = "e671f0073aa33f92ab9d8876d105dd03bc2127d0ad9e27f450e9c40436780d67"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.0esr/mac/ru/Thunderbird%20140.3.0esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/mac/ru/Thunderbird%20140.3.1esr.dmg"; locale = "ru"; arch = "mac"; - sha256 = "27bb8a9034f04714fb323208811e0f751ef66fee030fc44b627dd8ada771739a"; + sha256 = "4402f6f45c5e187cbe324f078439cb8638cdd66128e667761b7c494f363e6306"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.0esr/mac/sk/Thunderbird%20140.3.0esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/mac/sk/Thunderbird%20140.3.1esr.dmg"; locale = "sk"; arch = "mac"; - sha256 = "0e2e765799ef555646484df1446f4bb63b8e2c1d6271381f224450d6008580d4"; + sha256 = "515a38a46266d3e3da73dcd530a8d503194e6107b2a600c5592fcc0f57408181"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.0esr/mac/sl/Thunderbird%20140.3.0esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/mac/sl/Thunderbird%20140.3.1esr.dmg"; locale = "sl"; arch = "mac"; - sha256 = "fbad3b6b5eb6700a7e8cd488fefa613c0dbeb4eab18086cf4a926e44a88fda43"; + sha256 = "bd1b726a9246a8100b3205568c727e7d1f63a7d383b8b9453af7a15ecd236261"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.0esr/mac/sq/Thunderbird%20140.3.0esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/mac/sq/Thunderbird%20140.3.1esr.dmg"; locale = "sq"; arch = "mac"; - sha256 = "be305b9479b24bf37bff775bc5734bec3013119581b889fa7598ce5606959569"; + sha256 = "766cd20dc1f533a398cb360681833ba48e11f6fe6929503082ab2c6ec2c76d3a"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.0esr/mac/sr/Thunderbird%20140.3.0esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/mac/sr/Thunderbird%20140.3.1esr.dmg"; locale = "sr"; arch = "mac"; - sha256 = "b5be50b7dec5c7f71edc574802a4392eb1686b3bd5242cdb138403f083dabd87"; + sha256 = "f7573ef1e846ebc0b32025e948a261602278f49eadb94b4d925f57ea50bf15f0"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.0esr/mac/sv-SE/Thunderbird%20140.3.0esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/mac/sv-SE/Thunderbird%20140.3.1esr.dmg"; locale = "sv-SE"; arch = "mac"; - sha256 = "96db334114cb6b1be20767f0da4d2dfa87789f01130f6a0171cb814d7aee05c6"; + sha256 = "2a17943aa5793632c0659cdc900392e350eea8e9610787923e75ba6d962ba6c4"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.0esr/mac/th/Thunderbird%20140.3.0esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/mac/th/Thunderbird%20140.3.1esr.dmg"; locale = "th"; arch = "mac"; - sha256 = "8178f2b9acdd173a6c1d52b63642e2427106ef21fafb0ef5958fa6162fcdfe76"; + sha256 = "c76af30c8339fe81ba5f1a96ab3975943377ecf01bb862a3f2806ba4a35ed7cb"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.0esr/mac/tr/Thunderbird%20140.3.0esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/mac/tr/Thunderbird%20140.3.1esr.dmg"; locale = "tr"; arch = "mac"; - sha256 = "78ebb13785654e0b803094c9c768ac739f0b45512015c579fd38348c19206717"; + sha256 = "b23c300baa227ee40d580498437cb68444e49a6e5006ade9eca64e49f4bf04f7"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.0esr/mac/uk/Thunderbird%20140.3.0esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/mac/uk/Thunderbird%20140.3.1esr.dmg"; locale = "uk"; arch = "mac"; - sha256 = "560657b578d245305f7541c8fe7adf8633021a89290c284a8502e04e67fd2dda"; + sha256 = "54f58b050f72a98143bc6ed14a64723879a76986d113bcd95ee7e6c8a27ad82b"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.0esr/mac/uz/Thunderbird%20140.3.0esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/mac/uz/Thunderbird%20140.3.1esr.dmg"; locale = "uz"; arch = "mac"; - sha256 = "51d235b38bb62b2cf1e3d2cbc5b3a99cb3ee9285a96e748555ec72ecf22d42b5"; + sha256 = "15711d642b42cb5e75a4b7bc5e8de929f296d7dff14ff17225b5ff54ea028896"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.0esr/mac/vi/Thunderbird%20140.3.0esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/mac/vi/Thunderbird%20140.3.1esr.dmg"; locale = "vi"; arch = "mac"; - sha256 = "32edacd4b44ba9a0373f588dc2331cd076ce2fa3ae37cb6b55b348adbbc555b5"; + sha256 = "b9499aaa463763e4bd1970d73e33bfef0fbadcf2e2d04689b8c45ac22d4959cd"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.0esr/mac/zh-CN/Thunderbird%20140.3.0esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/mac/zh-CN/Thunderbird%20140.3.1esr.dmg"; locale = "zh-CN"; arch = "mac"; - sha256 = "c31d16d81027d506a5036067b566a5f30857bb8d264522c95b4fe914b88d25d9"; + sha256 = "5b0ed3b9d0f0efc6ea79012e78a0f23a522d81e9efcff9f9a53fed4819184cc0"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.0esr/mac/zh-TW/Thunderbird%20140.3.0esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/mac/zh-TW/Thunderbird%20140.3.1esr.dmg"; locale = "zh-TW"; arch = "mac"; - sha256 = "9ba1ee2984a5ccebf807949037fec6cb2df971e80aab4b920c476d0300416343"; + sha256 = "c98421d56e8b46ab9768a45d2d55d0b7657671184abaf8b6834b359b48ef76ec"; } ]; } diff --git a/pkgs/applications/science/chemistry/siesta/default.nix b/pkgs/applications/science/chemistry/siesta/default.nix index 2a10942d8880..348fdaee60f4 100644 --- a/pkgs/applications/science/chemistry/siesta/default.nix +++ b/pkgs/applications/science/chemistry/siesta/default.nix @@ -52,6 +52,7 @@ stdenv.mkDerivation (finalAttrs: { NIX_LDFLAGS = "-lm"; cmakeFlags = [ + "-DCMAKE_POLICY_VERSION_MINIMUM=3.5" "-DCMAKE_INSTALL_INCLUDEDIR=include" "-DCMAKE_INSTALL_LIBDIR=lib" ]; diff --git a/pkgs/applications/version-management/fossil/default.nix b/pkgs/applications/version-management/fossil/default.nix index 01395975b149..cc7369fd0fbf 100644 --- a/pkgs/applications/version-management/fossil/default.nix +++ b/pkgs/applications/version-management/fossil/default.nix @@ -19,11 +19,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "fossil"; - version = "2.26"; + version = "2.27"; src = fetchurl { url = "https://www.fossil-scm.org/home/tarball/version-${finalAttrs.version}/fossil-${finalAttrs.version}.tar.gz"; - hash = "sha256-uzT3iOGB1MRQXWmtQNZWazOYiGH4kdtt/KJ6uVQrcqo="; + hash = "sha256-1YVOgyNBDy/CeuVfrhE/D4LfQwv5uFfykoYwiZ3eFFY="; }; # required for build time tool `./tools/translate.c` @@ -55,6 +55,11 @@ stdenv.mkDerivation (finalAttrs: { export USER=nonexistent-but-specified-user ''; + # see https://fossil-scm.org/home/vinfo/4619d2efab946460?diff=1 + preCheck = '' + mv test/settings.test test/settings.test.off + ''; + installPhase = '' mkdir -p $out/bin INSTALLDIR=$out/bin make install diff --git a/pkgs/by-name/ab/abuse/package.nix b/pkgs/by-name/ab/abuse/package.nix index 000acca99498..b74f320485da 100644 --- a/pkgs/by-name/ab/abuse/package.nix +++ b/pkgs/by-name/ab/abuse/package.nix @@ -58,6 +58,10 @@ stdenv.mkDerivation (finalAttrs: { env.NIX_CFLAGS_COMPILE = "-I${lib.getDev SDL2}/include/SDL2"; + cmakeFlags = [ + (lib.cmakeFeature "CMAKE_POLICY_VERSION_MINIMUM" "3.10") + ]; + nativeBuildInputs = [ copyDesktopItems cmake diff --git a/pkgs/by-name/aq/aquamarine/package.nix b/pkgs/by-name/aq/aquamarine/package.nix index 1e10e3c9329f..d361e634f8b3 100644 --- a/pkgs/by-name/aq/aquamarine/package.nix +++ b/pkgs/by-name/aq/aquamarine/package.nix @@ -23,13 +23,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "aquamarine"; - version = "0.9.4"; + version = "0.9.5"; src = fetchFromGitHub { owner = "hyprwm"; repo = "aquamarine"; tag = "v${finalAttrs.version}"; - hash = "sha256-POePremlUY5GyA1zfbtic6XLxDaQcqHN6l+bIxdT5gc="; + hash = "sha256-UNzYHLWfkSzLHDep5Ckb5tXc0fdxwPIrT+MY4kpQttM="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/av/avalanche-cli/package.nix b/pkgs/by-name/av/avalanche-cli/package.nix new file mode 100644 index 000000000000..ab6433678b3f --- /dev/null +++ b/pkgs/by-name/av/avalanche-cli/package.nix @@ -0,0 +1,88 @@ +{ + lib, + blst, + libusb1, + stdenv, + buildPackages, + buildGoModule, + fetchFromGitHub, + versionCheckHook, + installShellFiles, + makeWrapper, + writableTmpDirAsHomeHook, + nix-update-script, +}: +buildGoModule (finalAttrs: { + pname = "avalanche-cli"; + version = "1.9.2"; + + src = fetchFromGitHub { + owner = "ava-labs"; + repo = "avalanche-cli"; + tag = "v${finalAttrs.version}"; + hash = "sha256-/HwZUsggBeuSZLYQDWUU4rfktnvwVolE5mKiZW4IXXs="; + }; + + proxyVendor = true; + vendorHash = "sha256-JQEWEqseg5q0b8rPlO/19V1BLbWBdXldoWgUiqI9Qh4="; + + # Fix error: 'Caught SIGILL in blst_cgo_init' + # https://github.com/bnb-chain/bsc/issues/1521 + CGO_CFLAGS = "-O -D__BLST_PORTABLE__"; + CGO_CFLAGS_ALLOW = "-O -D__BLST_PORTABLE__"; + + ldflags = [ + "-s" + "-X=github.com/ava-labs/avalanche-cli/cmd.Version=${finalAttrs.version}" + ]; + + buildInputs = [ + blst + libusb1 + ]; + + nativeBuildInputs = [ + installShellFiles + makeWrapper + writableTmpDirAsHomeHook + ]; + + patches = [ ./skip_min_version_check.patch ]; + + postInstall = + let + exe = + if stdenv.buildPlatform.canExecute stdenv.hostPlatform then + "$out/bin/avalanche" + else + lib.getExe buildPackages.avalanche-cli; + in + '' + mv $out/bin/avalanche-cli $out/bin/avalanche + wrapProgram $out/bin/avalanche --add-flags "--skip-update-check" + + mkdir $HOME/.avalanche-cli + echo "{ }" > $HOME/.avalanche-cli/config.json + + installShellCompletion --cmd avalanche \ + --bash <(${exe} completion bash) \ + --fish <(${exe} completion fish) \ + --zsh <(${exe} completion zsh) + ''; + + nativeInstallCheckInputs = [ versionCheckHook ]; + doInstallCheck = true; + versionCheckProgram = "${placeholder "out"}/bin/avalanche"; + versionCheckProgramArg = "--version"; + + doCheck = false; + + meta = { + description = "Command line tool that gives developers access to everything Avalanche"; + homepage = "https://github.com/ava-labs/avalanche-cli"; + changelog = "https://github.com/ava-labs/avalanche-cli/releases/tag/v${finalAttrs.version}"; + license = lib.licenses.unfreeRedistributable; + maintainers = with lib.maintainers; [ iamanaws ]; + mainProgram = "avalanche"; + }; +}) diff --git a/pkgs/by-name/av/avalanche-cli/skip_min_version_check.patch b/pkgs/by-name/av/avalanche-cli/skip_min_version_check.patch new file mode 100644 index 000000000000..9d76b8715aee --- /dev/null +++ b/pkgs/by-name/av/avalanche-cli/skip_min_version_check.patch @@ -0,0 +1,14 @@ +diff --git a/cmd/root.go b/cmd/root.go +index c47518dd..9ae886eb 100644 +--- a/cmd/root.go ++++ b/cmd/root.go +@@ -147,6 +147,9 @@ func createApp(cmd *cobra.Command, _ []string) error { + return err + } + if err := version.CheckCLIVersionIsOverMin(app, app.GetVersion()); err != nil { ++ if strings.Contains(cmd.CommandPath(), "completion") { ++ return nil ++ } + return err + } + return nil diff --git a/pkgs/by-name/az/azurite/package.nix b/pkgs/by-name/az/azurite/package.nix index 5ad12be555d8..1069a16f4b13 100644 --- a/pkgs/by-name/az/azurite/package.nix +++ b/pkgs/by-name/az/azurite/package.nix @@ -1,21 +1,22 @@ { lib, - buildNpmPackage, - fetchFromGitHub, stdenv, + buildNpmPackage, + clang_20, + fetchFromGitHub, libsecret, + nodejs, pkg-config, - python3, }: -buildNpmPackage rec { +buildNpmPackage (finalAttrs: { pname = "azurite"; version = "3.35.0"; src = fetchFromGitHub { owner = "Azure"; repo = "Azurite"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-sVYiHQJ3nR5vM+oPAHzr/MjuNBMY14afqCHpw32WCiQ="; }; @@ -23,18 +24,21 @@ buildNpmPackage rec { nativeBuildInputs = [ pkg-config - python3 - ]; + nodejs.python + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ clang_20 ]; # clang_21 breaks @vscode/vsce's optional dependency keytar + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ libsecret ]; meta = { - description = "Open source Azure Storage API compatible server"; + description = "Lightweight server clone of Azure Storage that simulates most of the commands supported by it with minimal dependencies"; homepage = "https://github.com/Azure/Azurite"; - changelog = "https://github.com/Azure/Azurite/releases/tag/v${version}"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ danielalvsaaker ]; mainProgram = "azurite"; + maintainers = with lib.maintainers; [ + danielalvsaaker + ]; }; -} +}) diff --git a/pkgs/by-name/bc/bctoolbox/package.nix b/pkgs/by-name/bc/bctoolbox/package.nix deleted file mode 100644 index 46ccac25604e..000000000000 --- a/pkgs/by-name/bc/bctoolbox/package.nix +++ /dev/null @@ -1,56 +0,0 @@ -{ - bcunit, - cmake, - bc-decaf, - fetchFromGitLab, - mbedtls_2, - lib, - stdenv, -}: - -stdenv.mkDerivation rec { - pname = "bctoolbox"; - version = "5.2.109"; - - nativeBuildInputs = [ - cmake - ]; - buildInputs = [ - # Made by BC - bcunit - - # Vendored by BC - bc-decaf - - mbedtls_2 - ]; - - src = fetchFromGitLab { - domain = "gitlab.linphone.org"; - owner = "public"; - group = "BC"; - repo = "bctoolbox"; - tag = version; - hash = "sha256-OwwSGzMFwR2ajUUgAy7ea/Q2pWxn3DO72W7ukcjBJnU="; - }; - - # Do not build static libraries - cmakeFlags = [ - "-DENABLE_STATIC=NO" - "-DENABLE_STRICT=NO" - ]; - - strictDeps = true; - - meta = with lib; { - description = "Utilities library for Linphone"; - mainProgram = "bctoolbox_tester"; - homepage = "https://gitlab.linphone.org/BC/public/bctoolbox"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ - raskin - jluttine - ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/by-name/bc/bcunit/package.nix b/pkgs/by-name/bc/bcunit/package.nix deleted file mode 100644 index 67eda14c47c9..000000000000 --- a/pkgs/by-name/bc/bcunit/package.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ - cmake, - fetchFromGitLab, - lib, - stdenv, -}: - -stdenv.mkDerivation { - pname = "bcunit"; - version = "linphone-4.4.1"; - - nativeBuildInputs = [ cmake ]; - src = fetchFromGitLab { - domain = "gitlab.linphone.org"; - owner = "public"; - group = "BC"; - repo = "bcunit"; - rev = "c5eebcc7f794e9567d3c72d15d3f28bffe6bfd0f"; - sha256 = "sha256-8DSfqHerx/V00SJjTSQaG9Rjqx330iG6sGivBDUvQfA="; - }; - - meta = with lib; { - description = "Belledonne Communications' fork of CUnit test framework. Part of the Linphone project"; - homepage = "https://gitlab.linphone.org/BC/public/bcunit"; - license = licenses.lgpl2Plus; - maintainers = with maintainers; [ - raskin - jluttine - ]; - platforms = platforms.all; - }; -} diff --git a/pkgs/by-name/be/belcard/package.nix b/pkgs/by-name/be/belcard/package.nix deleted file mode 100644 index 57fbee6493a3..000000000000 --- a/pkgs/by-name/be/belcard/package.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ - bctoolbox, - belr, - cmake, - fetchFromGitLab, - lib, - stdenv, -}: - -stdenv.mkDerivation rec { - pname = "belcard"; - version = "5.2.98"; - - src = fetchFromGitLab { - domain = "gitlab.linphone.org"; - owner = "public"; - group = "BC"; - repo = "belcard"; - tag = version; - sha256 = "sha256-pRNJ1bDS2v0Cn+6cxMeFa0JQ27UZR6kCI9P6gQ5W2GA="; - }; - - buildInputs = [ - bctoolbox - belr - ]; - nativeBuildInputs = [ cmake ]; - - cmakeFlags = [ - "-DENABLE_STATIC=NO" # Do not build static libraries - "-DENABLE_UNIT_TESTS=NO" # Do not build test executables - ]; - - meta = with lib; { - description = "C++ library to manipulate VCard standard format. Part of the Linphone project"; - homepage = "https://gitlab.linphone.org/BC/public/belcard"; - license = licenses.gpl3Plus; - platforms = platforms.all; - maintainers = with maintainers; [ jluttine ]; - }; -} diff --git a/pkgs/by-name/be/belr/package.nix b/pkgs/by-name/be/belr/package.nix deleted file mode 100644 index 470c07f01f4b..000000000000 --- a/pkgs/by-name/be/belr/package.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ - bctoolbox, - cmake, - fetchFromGitLab, - lib, - stdenv, -}: - -stdenv.mkDerivation rec { - pname = "belr"; - version = "5.2.98"; - - src = fetchFromGitLab { - domain = "gitlab.linphone.org"; - owner = "public"; - group = "BC"; - repo = "belr"; - tag = version; - hash = "sha256-4keVUAsTs1DAhOfV71VD28I0PEHnyvW95blplY690LY="; - }; - - buildInputs = [ bctoolbox ]; - nativeBuildInputs = [ cmake ]; - - # Do not build static libraries - cmakeFlags = [ "-DENABLE_STATIC=NO" ]; - - meta = with lib; { - description = "Belledonne Communications' language recognition library. Part of the Linphone project"; - homepage = "https://gitlab.linphone.org/BC/public/belr"; - license = licenses.gpl3Plus; - platforms = platforms.all; - maintainers = with maintainers; [ jluttine ]; - }; -} diff --git a/pkgs/by-name/bl/blackmagic-desktop-video/package.nix b/pkgs/by-name/bl/blackmagic-desktop-video/package.nix index 6efcde582213..9a57031ac34a 100644 --- a/pkgs/by-name/bl/blackmagic-desktop-video/package.nix +++ b/pkgs/by-name/bl/blackmagic-desktop-video/package.nix @@ -14,7 +14,7 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "blackmagic-desktop-video"; - version = "15.0"; + version = "15.1"; buildInputs = [ autoPatchelfHook @@ -30,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: { { outputHashMode = "recursive"; outputHashAlgo = "sha256"; - outputHash = "sha256-+89enkB+Lxuzpkwwfy0y1NajNqx6QQfeVVrak4LgawQ="; + outputHash = "sha256-nZXfUbUyk9PDhBeXUHGt6T95hfMMDEH1oOgcm1wwi3E="; impureEnvVars = lib.fetchers.proxyImpureEnvVars; diff --git a/pkgs/by-name/br/brlaser/package.nix b/pkgs/by-name/br/brlaser/package.nix index 2cc36dd9d4ed..daf5f4b27199 100644 --- a/pkgs/by-name/br/brlaser/package.nix +++ b/pkgs/by-name/br/brlaser/package.nix @@ -29,6 +29,8 @@ stdenv.mkDerivation rec { ]; cmakeFlags = [ + # NOTE: this can be removed once version 6.2.8 is released + "-DCMAKE_POLICY_VERSION_MINIMUM=3.5" "-DCUPS_SERVER_BIN=lib/cups" "-DCUPS_DATA_DIR=share/cups" ]; diff --git a/pkgs/by-name/bu/bumpp/package.nix b/pkgs/by-name/bu/bumpp/package.nix index 29e00586b9d9..694c250318fe 100644 --- a/pkgs/by-name/bu/bumpp/package.nix +++ b/pkgs/by-name/bu/bumpp/package.nix @@ -13,19 +13,19 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "bumpp"; - version = "10.2.3"; + version = "10.3.1"; src = fetchFromGitHub { owner = "antfu-collective"; repo = "bumpp"; tag = "v${finalAttrs.version}"; - hash = "sha256-NVu8CpfW7YXTSOEZMhhF46tgh98lAL4LYVjzml4G3MQ="; + hash = "sha256-krJzPHlGgtEukOlSX0sXfCwXmdItDLhf6hS+zamNrN4="; }; pnpmDeps = pnpm.fetchDeps { inherit (finalAttrs) pname version src; fetcherVersion = 2; - hash = "sha256-GJEnZDPU4MNWUHM8YFB87F+JozV0fIsJSjShudV79XE="; + hash = "sha256-N6boJiwq5G4L/vOqp+GoYWtSI1sYScYadxXueeJgGMo="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/bz/bzrtp/package.nix b/pkgs/by-name/bz/bzrtp/package.nix deleted file mode 100644 index 600a23b474c8..000000000000 --- a/pkgs/by-name/bz/bzrtp/package.nix +++ /dev/null @@ -1,45 +0,0 @@ -{ - bctoolbox, - cmake, - fetchFromGitLab, - sqlite, - lib, - stdenv, -}: - -stdenv.mkDerivation rec { - pname = "bzrtp"; - version = "5.2.111"; - - src = fetchFromGitLab { - domain = "gitlab.linphone.org"; - owner = "public"; - group = "BC"; - repo = "bzrtp"; - tag = version; - hash = "sha256-sLvvQhJ9uVt/dx57xs9ftY/ETi46xmyGDH8372zpqj8="; - }; - - buildInputs = [ - bctoolbox - sqlite - ]; - nativeBuildInputs = [ cmake ]; - - # Do not build static libraries - cmakeFlags = [ "-DENABLE_STATIC=NO" ]; - - env.NIX_CFLAGS_COMPILE = toString [ - # Needed with GCC 12 - "-Wno-error=stringop-overflow" - "-Wno-error=unused-parameter" - ]; - - meta = with lib; { - description = "Opensource implementation of ZRTP keys exchange protocol. Part of the Linphone project"; - homepage = "https://gitlab.linphone.org/BC/public/bzrtp"; - license = licenses.gpl3Plus; - platforms = platforms.all; - maintainers = with maintainers; [ jluttine ]; - }; -} diff --git a/pkgs/by-name/ca/catimg/package.nix b/pkgs/by-name/ca/catimg/package.nix index 9b2df1c394ec..64ede6e57525 100644 --- a/pkgs/by-name/ca/catimg/package.nix +++ b/pkgs/by-name/ca/catimg/package.nix @@ -17,6 +17,13 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ cmake ]; + + # Fix build with CMake 4: https://github.com/NixOS/nixpkgs/issues/449801 + # CMake 4 removed support for CMake < 3.5, so we set the minimum policy version + cmakeFlags = [ + (lib.cmakeFeature "CMAKE_POLICY_VERSION_MINIMUM" "3.5") + ]; + env = lib.optionalAttrs (stdenv.hostPlatform.libc == "glibc") { CFLAGS = "-D_DEFAULT_SOURCE"; }; diff --git a/pkgs/by-name/cl/claude-code/package.nix b/pkgs/by-name/cl/claude-code/package.nix index c629da724535..3e7f6bf8d2b7 100644 --- a/pkgs/by-name/cl/claude-code/package.nix +++ b/pkgs/by-name/cl/claude-code/package.nix @@ -7,11 +7,11 @@ }: buildNpmPackage (finalAttrs: { pname = "claude-code"; - version = "2.0.9"; + version = "2.0.10"; src = fetchzip { url = "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-${finalAttrs.version}.tgz"; - hash = "sha256-eBhg8RCATVIgC5Dex+cTnLDzLKfnJI8M7eOSGDE4bAw="; + hash = "sha256-f90cIyUofV3emYtluLL/KtfAsgjG3gFQGQPGYgDWL2M="; }; npmDepsHash = "sha256-DehkeMZvzn+hvcCDzJfd4p9oYc1GSZm8gu8vKS4Uncw="; diff --git a/pkgs/by-name/cn/cnspec/package.nix b/pkgs/by-name/cn/cnspec/package.nix index ee4015133d7f..53457c1251b8 100644 --- a/pkgs/by-name/cn/cnspec/package.nix +++ b/pkgs/by-name/cn/cnspec/package.nix @@ -6,18 +6,18 @@ buildGoModule rec { pname = "cnspec"; - version = "12.2.1"; + version = "12.4.0"; src = fetchFromGitHub { owner = "mondoohq"; repo = "cnspec"; tag = "v${version}"; - hash = "sha256-DmLA/JysdJT8/9Z6mmdAbZAkQZ1aAlzcvesdP5Qn1ik="; + hash = "sha256-BzLQPkgvARDzpauFezD5Q7RNrReLz9lSHEb6TIGkGQY="; }; proxyVendor = true; - vendorHash = "sha256-nqLHa6m8IeTg6Ac3vkRxyIRyO59WaN+Teaqm/qac53A="; + vendorHash = "sha256-DaEEBZXLN6BujB56P1082D143WnUdwZPSc+JeUEZCuk="; subPackages = [ "apps/cnspec" ]; diff --git a/pkgs/by-name/co/collada-dom/package.nix b/pkgs/by-name/co/collada-dom/package.nix index 12765e966f85..4b2c56122f12 100644 --- a/pkgs/by-name/co/collada-dom/package.nix +++ b/pkgs/by-name/co/collada-dom/package.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "collada-dom"; - version = "2.5.1"; + version = "2.5.2"; __structuredAttrs = true; strictDeps = true; @@ -20,7 +20,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "Gepetto"; repo = "collada-dom"; tag = "v${finalAttrs.version}"; - hash = "sha256-DYdqrwRIrVq0BQqZB0vtZzADteJGVaJtFC5kC/cD250="; + hash = "sha256-53Gf6OLwrflZcrWKPuNPS0k+jlj5yTzCkI/QYQFta48="; }; postInstall = '' @@ -36,11 +36,6 @@ stdenv.mkDerivation (finalAttrs: { readline ]; - cmakeFlags = [ - # See https://github.com/NixOS/nixpkgs/issues/445447 - "-DCMAKE_POLICY_VERSION_MINIMUM=3.10" - ]; - meta = { description = "API that provides a C++ object representation of a COLLADA XML instance document"; longDescription = "This is a fork of [rdiankov/collada-dom](https://github.com/rdiankov/collada-dom) which has been unmaintained for six years."; @@ -50,6 +45,7 @@ stdenv.mkDerivation (finalAttrs: { maintainers = with lib.maintainers; [ sigmasquadron marius851000 + nim65s ]; platforms = lib.platforms.all; diff --git a/pkgs/by-name/co/conan/package.nix b/pkgs/by-name/co/conan/package.nix index 537e8e76ce2a..8596a49c3735 100644 --- a/pkgs/by-name/co/conan/package.nix +++ b/pkgs/by-name/co/conan/package.nix @@ -1,27 +1,32 @@ { lib, stdenv, + cmake, fetchFromGitHub, git, pkg-config, - xcbuild, python3Packages, + xcbuild, zlib, - cmake, }: python3Packages.buildPythonApplication rec { pname = "conan"; - version = "2.16.1"; + version = "2.21.0"; pyproject = true; src = fetchFromGitHub { owner = "conan-io"; repo = "conan"; tag = version; - hash = "sha256-b+GVFy195wwQyWaiEMg1vVcWnkTB01IbQQsOHhQY6pY="; + hash = "sha256-D76K7s6zUy3hMOwkKXbsF4asrr7tGwC28MW5VaJvFBY="; }; + pythonRelaxDeps = [ + "distro" + "urllib3" + ]; + build-system = with python3Packages; [ setuptools ]; dependencies = @@ -49,11 +54,6 @@ python3Packages.buildPythonApplication rec { pyopenssl ]; - pythonRelaxDeps = [ - "urllib3" - "distro" - ]; - nativeCheckInputs = [ git pkg-config @@ -61,12 +61,12 @@ python3Packages.buildPythonApplication rec { ] ++ lib.optionals (stdenv.hostPlatform.isDarwin) [ xcbuild.xcrun ] ++ (with python3Packages; [ + cmake mock parameterized pytest-xdist pytestCheckHook webtest - cmake ]); dontUseCmakeConfigure = true; @@ -82,8 +82,10 @@ python3Packages.buildPythonApplication rec { "test_shared_windows_find_libraries" # 'cmake' tool version 'Any' is not available "test_build" + "test_conan_new_compiles" # 'cmake' tool version '3.27' is not available "test_metabuild" + "test_new_template_and_different_folder" ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ # Rejects paths containing nix @@ -115,15 +117,14 @@ python3Packages.buildPythonApplication rec { "test/functional/util/test_cmd_args_to_string.py" "test/performance/test_large_graph.py" "test/unittests/tools/env/test_env_files.py" - "test/integration/ui/exit_with_code_test.py" ]; meta = { description = "Decentralized and portable C/C++ package manager"; - mainProgram = "conan"; homepage = "https://conan.io"; changelog = "https://github.com/conan-io/conan/releases/tag/${src.tag}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ HaoZeke ]; + mainProgram = "conan"; }; } diff --git a/pkgs/by-name/co/copilot-language-server/package.nix b/pkgs/by-name/co/copilot-language-server/package.nix index a9f77f8eabc7..eeaf2bc3d543 100644 --- a/pkgs/by-name/co/copilot-language-server/package.nix +++ b/pkgs/by-name/co/copilot-language-server/package.nix @@ -10,11 +10,11 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "copilot-language-server"; - version = "1.377.0"; + version = "1.378.0"; src = fetchzip { url = "https://github.com/github/copilot-language-server-release/releases/download/${finalAttrs.version}/copilot-language-server-js-${finalAttrs.version}.zip"; - hash = "sha256-IWahEODv+3MM+9udhgoziP8ptZHHc09sVuBHrFf8msA="; + hash = "sha256-bue5z4bGv1m/OiCGX0VIEs4X8UNgKC1kOb7oouBDfcs="; stripRoot = false; }; diff --git a/pkgs/by-name/db/dbeaver-bin/package.nix b/pkgs/by-name/db/dbeaver-bin/package.nix index 4a0916701282..112917d6a74f 100644 --- a/pkgs/by-name/db/dbeaver-bin/package.nix +++ b/pkgs/by-name/db/dbeaver-bin/package.nix @@ -18,7 +18,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "dbeaver-bin"; - version = "25.2.0"; + version = "25.2.2"; src = let @@ -31,10 +31,10 @@ stdenvNoCC.mkDerivation (finalAttrs: { aarch64-darwin = "macos-aarch64.dmg"; }; hash = selectSystem { - x86_64-linux = "sha256-JGqzoqCkZjrV1SNrJSXNotd3YaOUtqXJYhHDy7/xZSU="; - aarch64-linux = "sha256-+byvDpqaijxt0LnGJuWg1ooVnb1bLdaFfvEmlaEmBCA="; - x86_64-darwin = "sha256-59mrDs00XxIjfiqm3OsoHqbuNQI3VdB1ff3l/51lzEg="; - aarch64-darwin = "sha256-jUWZr5DwUv6aFfGEox62r+PRoEqZIvdP6YHCsWshYJA="; + x86_64-linux = "sha256-e0xIFoDmhX1+VetCEJoDZqu6+wrFwTwgIzU8hQ/mXnI="; + aarch64-linux = "sha256-80HW2GGBAuCYo+fxz+XZG3sZm0/QW5krHLS4jSGgGvU="; + x86_64-darwin = "sha256-w1b22Uce2PmX3f6UMrrkVxSxT/E5rFhiSgb3PjYaYvY="; + aarch64-darwin = "sha256-oQ10VB4puNBxFcFRdOtFFF+FcN9I7CUbWMc56V1Z90E="; }; in fetchurl { diff --git a/pkgs/by-name/dd/ddate/package.nix b/pkgs/by-name/dd/ddate/package.nix index ad7f2752ee40..082059291c93 100644 --- a/pkgs/by-name/dd/ddate/package.nix +++ b/pkgs/by-name/dd/ddate/package.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchFromGitHub, + fetchpatch, cmake, }: @@ -16,6 +17,15 @@ stdenv.mkDerivation rec { sha256 = "1qchxnxvghbma6gp1g78wnjxsri0b72ha9axyk31cplssl7yn73f"; }; + patches = [ + # cmake-4 compatibility + (fetchpatch { + name = "cmake-4.patch"; + url = "https://github.com/bo0ts/ddate/commit/0fbae46cb004c0acc48982b8e3533556d7b2edcc.patch?full_index=1"; + hash = "sha256-EbOmZYhFN8t8E/GW9ctcvhYfQauGZnX+5ZQmrEl6F18="; + }) + ]; + nativeBuildInputs = [ cmake ]; meta = with lib; { diff --git a/pkgs/by-name/df/dfc/package.nix b/pkgs/by-name/df/dfc/package.nix index 53cf879438b9..481c59d61da9 100644 --- a/pkgs/by-name/df/dfc/package.nix +++ b/pkgs/by-name/df/dfc/package.nix @@ -1,31 +1,42 @@ { lib, stdenv, - fetchurl, + fetchFromGitHub, cmake, gettext, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "dfc"; version = "3.1.1"; - src = fetchurl { - url = "https://projects.gw-computing.net/attachments/download/615/${pname}-${version}.tar.gz"; - sha256 = "0m1fd7l85ckb7bq4c5c3g257bkjglm8gq7x42pkmpp87fkknc94n"; + src = fetchFromGitHub { + owner = "rolinh"; + repo = "dfc"; + tag = "v${finalAttrs.version}"; + hash = "sha256-k15q04dNWmHVeUabaCogkESQ+k63ZV7Xph2SMNpV/N8="; }; + # Fix for CMake v4 + # ref. https://github.com/rolinh/dfc/pull/35 + postPatch = '' + substituteInPlace CMakeLists.txt --replace-fail \ + "cmake_minimum_required(VERSION 2.8.4)" \ + "cmake_minimum_required(VERSION 3.10)" + ''; + nativeBuildInputs = [ cmake gettext ]; meta = { - homepage = "https://projects.gw-computing.net/projects/dfc"; + homepage = "https://github.com/rolinh/dfc"; + changelog = "https://github.com/rolinh/dfc/releases/tag/${finalAttrs.src.tag}"; description = "Displays file system space usage using graphs and colors"; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ qknight ]; platforms = lib.platforms.all; mainProgram = "dfc"; }; -} +}) diff --git a/pkgs/by-name/do/dosbox-x/package.nix b/pkgs/by-name/do/dosbox-x/package.nix index 2f9ef0c9f061..f737722deebb 100644 --- a/pkgs/by-name/do/dosbox-x/package.nix +++ b/pkgs/by-name/do/dosbox-x/package.nix @@ -27,13 +27,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "dosbox-x"; - version = "2025.05.03"; + version = "2025.10.07"; src = fetchFromGitHub { owner = "joncampbell123"; repo = "dosbox-x"; rev = "dosbox-x-v${finalAttrs.version}"; - hash = "sha256-VYJn1ddDkSHpWVsE7NunwRvuAVRqbvCNw/TzkWe8TLQ="; + hash = "sha256-6y41xAs2FyOL8v+c5ma3zVIw186PU48CcbM3T050jeI="; }; # sips is unavailable in sandbox, replacing with imagemagick breaks build due to wrong Foundation propagation(?) so don't generate resolution variants diff --git a/pkgs/by-name/ep/epsonscan2/package.nix b/pkgs/by-name/ep/epsonscan2/package.nix index 5c491a50f523..e153a8e76e9a 100644 --- a/pkgs/by-name/ep/epsonscan2/package.nix +++ b/pkgs/by-name/ep/epsonscan2/package.nix @@ -105,6 +105,9 @@ stdenv.mkDerivation { # The non-free (Debian) packages uses this directory structure so do the same when compiling # from source so we can easily merge them. "-DCMAKE_INSTALL_LIBDIR=lib/${system}-gnu" + # There are many CMakeLists.txt files with various minimum versions. It's much easier to set this + # here, instead of substituting those everywhere + "-DCMAKE_POLICY_VERSION_MINIMUM=3.10" ] ++ lib.optionals (!withGui) [ "-DNO_GUI=ON" diff --git a/pkgs/by-name/fa/favirecon/package.nix b/pkgs/by-name/fa/favirecon/package.nix index 1b7398048281..ff05e0b37081 100644 --- a/pkgs/by-name/fa/favirecon/package.nix +++ b/pkgs/by-name/fa/favirecon/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "favirecon"; - version = "1.0.1"; + version = "1.0.2"; src = fetchFromGitHub { owner = "edoardottt"; repo = "favirecon"; tag = "v${version}"; - hash = "sha256-fxUukhKbxxUUaOMcYxNR29H1nxRb0IWT0Qy5XJNOYjU="; + hash = "sha256-GpPqTtbSVLwNLKpxSb2YMZIOEHgfKn0U6K2f1ISrufc="; }; - vendorHash = "sha256-Xsi4EA6wBgF7jmel38csh1T3I/SQfkMI0g1pR54nwCM="; + vendorHash = "sha256-jjKDiow5sdwKpA1f+Dzkyb8wQuU26MHcafNYhk9H9MM="; ldflags = [ "-s" diff --git a/pkgs/by-name/fi/firefly-iii-data-importer/package.nix b/pkgs/by-name/fi/firefly-iii-data-importer/package.nix index 9f048d2803cb..50282d109aa5 100644 --- a/pkgs/by-name/fi/firefly-iii-data-importer/package.nix +++ b/pkgs/by-name/fi/firefly-iii-data-importer/package.nix @@ -13,13 +13,13 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "firefly-iii-data-importer"; - version = "1.8.0"; + version = "1.8.2"; src = fetchFromGitHub { owner = "firefly-iii"; repo = "data-importer"; tag = "v${finalAttrs.version}"; - hash = "sha256-MCHJ0rvFuUVdcmS0orrI/yvTBP4yZU467wSrUJT9asw="; + hash = "sha256-Bi1LwKC2LFs1AzrZflaKFk6/DiPiSQn5pHHrh9QkqVw="; }; buildInputs = [ php84 ]; @@ -38,12 +38,12 @@ stdenvNoCC.mkDerivation (finalAttrs: { composerStrictValidation = true; strictDeps = true; - vendorHash = "sha256-FiSnAsqRCWfugbmXEirLBUT6jyjr3OtlewTyv4oUfPc="; + vendorHash = "sha256-qSH1aA1FdN+LmtQcJdY0JWmpkF3txHojMfev+mFMBfk="; npmDeps = fetchNpmDeps { inherit (finalAttrs) src; name = "${finalAttrs.pname}-npm-deps"; - hash = "sha256-S5fGoXsbsV1aJsZuMV235GJiGrXgExJeZ2Q4K4/2D+g="; + hash = "sha256-n7puQeAAmyDNkAHQK3xlQvm43W1IIyKu47fVR1a2YrA="; }; composerRepository = php84.mkComposerRepository { diff --git a/pkgs/by-name/fi/fishnet/package.nix b/pkgs/by-name/fi/fishnet/package.nix index 26fe09dfc89d..7f0d006c6d32 100644 --- a/pkgs/by-name/fi/fishnet/package.nix +++ b/pkgs/by-name/fi/fishnet/package.nix @@ -28,13 +28,13 @@ let in rustPlatform.buildRustPackage (finalAttrs: { pname = "fishnet"; - version = "2.10.0"; + version = "2.11.0"; src = fetchFromGitHub { owner = "lichess-org"; repo = "fishnet"; tag = "v${finalAttrs.version}"; - hash = "sha256-BtOPLqfE6SjCr8/HS5oev1j3R26+wkWw051gZwDyCM0="; + hash = "sha256-hdeg8fqrzBwXgGteapFt0Aec5/yxmRRY2ZvKl2JoJV4="; fetchSubmodules = true; }; @@ -45,7 +45,7 @@ rustPlatform.buildRustPackage (finalAttrs: { cp -v '${nnueSmall}' 'Fairy-Stockfish/src/${nnueSmallFile}' ''; - cargoHash = "sha256-1Pk9vXo1ivE8H6ctS8PEsCEv/EKFxFtgnmrvik6Gwug="; + cargoHash = "sha256-zceH1Ctj4p5deMWQYpoSSvkbT9Y3bcaBw4Pti62ckqU="; nativeInstallCheckInputs = [ versionCheckHook diff --git a/pkgs/development/libraries/languagemachines/frog.nix b/pkgs/by-name/fr/frog/package.nix similarity index 73% rename from pkgs/development/libraries/languagemachines/frog.nix rename to pkgs/by-name/fr/frog/package.nix index d9864573c3b5..e2ef0647f8fb 100644 --- a/pkgs/development/libraries/languagemachines/frog.nix +++ b/pkgs/by-name/fr/frog/package.nix @@ -1,34 +1,39 @@ { lib, stdenv, - fetchurl, - automake, - autoconf, + fetchFromGitHub, + gitUpdater, + callPackage, + autoreconfHook, bzip2, libtar, libtool, pkg-config, autoconf-archive, libxml2, - icu, - languageMachines, + icu60, + ticcutils, + timbl, + mbt, + libfolia, + ucto, + frogdata, }: -let - release = lib.importJSON ./release-info/LanguageMachines-frog.json; -in - -stdenv.mkDerivation { +stdenv.mkDerivation (finalAttrs: { pname = "frog"; - version = release.version; - src = fetchurl { - inherit (release) url sha256; - name = "frog-v${release.version}.tar.gz"; + version = "0.13.7"; + + src = fetchFromGitHub { + owner = "LanguageMachines"; + repo = "frog"; + tag = "v${finalAttrs.version}"; + hash = "sha256-khc2uZ/dOtWPTnt/ZD6ILxD386MaZt6fsvNTWTCbs+c="; }; + nativeBuildInputs = [ pkg-config - automake - autoconf + autoreconfHook ]; buildInputs = [ bzip2 @@ -36,28 +41,30 @@ stdenv.mkDerivation { libtool autoconf-archive libxml2 - icu - languageMachines.ticcutils - languageMachines.timbl - languageMachines.mbt - languageMachines.libfolia - languageMachines.ucto - languageMachines.frogdata + icu60 + ticcutils + timbl + mbt + libfolia + ucto + frogdata ]; - preConfigure = '' - sh bootstrap.sh - ''; postInstall = '' # frog expects the data files installed in the same prefix mkdir -p $out/share/frog/; - for f in ${languageMachines.frogdata}/share/frog/*; do + for f in ${frogdata}/share/frog/*; do ln -s $f $out/share/frog/; done; make check ''; + passthru = { + updateScript = gitUpdater { rev-prefix = "v"; }; + tests.simple = callPackage ./test.nix { frog = finalAttrs.finalPackage; }; + }; + meta = with lib; { description = "Tagger-Lemmatizer-Morphological-Analyzer-Dependency-Parser for Dutch"; homepage = "https://languagemachines.github.io/frog"; @@ -72,4 +79,4 @@ stdenv.mkDerivation { ''; }; -} +}) diff --git a/pkgs/development/libraries/languagemachines/test.nix b/pkgs/by-name/fr/frog/test.nix similarity index 89% rename from pkgs/development/libraries/languagemachines/test.nix rename to pkgs/by-name/fr/frog/test.nix index 57965a758311..7b624e85f306 100644 --- a/pkgs/development/libraries/languagemachines/test.nix +++ b/pkgs/by-name/fr/frog/test.nix @@ -1,10 +1,10 @@ { runCommand, - languageMachines, + frog, }: runCommand "frog-test" { } '' - ${languageMachines.frog}/bin/frog >$out <$out < 1.9.2. - # https://github.com/HandBrake/HandBrake/pull/6657 - url = "https://github.com/HandBrake/HandBrake/commit/75f9c84c140c8841cfe1324ef59452025899ad8b.patch?full_index=1"; - hash = "sha256-glUyCttS2S/G+bSgIAB4nggECe0iEJIsUyr0RkAKEbE="; - }) - ]; - postPatch = '' install -Dm444 ${versionFile} ${versionFile.name} diff --git a/pkgs/by-name/hi/highfive/package.nix b/pkgs/by-name/hi/highfive/package.nix index 5551230ace59..45c02e608cd4 100644 --- a/pkgs/by-name/hi/highfive/package.nix +++ b/pkgs/by-name/hi/highfive/package.nix @@ -41,6 +41,7 @@ stdenv.mkDerivation rec { "-DHIGHFIVE_EXAMPLES=OFF" "-DHIGHFIVE_UNIT_TESTS=OFF" "-DHIGHFIVE_USE_INSTALL_DEPS=ON" + (lib.cmakeFeature "CMAKE_POLICY_VERSION_MINIMUM" "3.5") ] ++ (lib.optionals mpiSupport [ "-DHIGHFIVE_PARALLEL_HDF5=ON" ]); diff --git a/pkgs/by-name/hu/hullcaster/package.nix b/pkgs/by-name/hu/hullcaster/package.nix index 3a86468ff19f..7919a88a2630 100644 --- a/pkgs/by-name/hu/hullcaster/package.nix +++ b/pkgs/by-name/hu/hullcaster/package.nix @@ -1,21 +1,35 @@ { lib, + alsa-lib, + dbus, fetchFromGitHub, + openssl, + pkg-config, rustPlatform, }: rustPlatform.buildRustPackage rec { pname = "hullcaster"; - version = "0.1.2"; + version = "0.2.0"; src = fetchFromGitHub { owner = "gilcu3"; repo = "hullcaster"; tag = "v${version}"; - hash = "sha256-TaELX/xMxm7OTmVnvkgEmdhnVrIlxSNqlE73+I5qxCc="; + hash = "sha256-BR3klwy6vm6nJ38sgS/PGPQ19n0GJq6eQE97lHmg+kQ="; }; - cargoHash = "sha256-jso9ofchUjpsck0qJN3rfFVM1Y6C8APmhwNzapU7Mug="; + cargoHash = "sha256-TZmRObtkwrHRy/I6hhacbHUWiajKDLnHafLWIwVM15o="; + + buildInputs = [ + alsa-lib + dbus + openssl + ]; + + nativeBuildInputs = [ + pkg-config + ]; # work around error: Could not create filepath: /homeless-shelter/.local/share checkFlags = [ diff --git a/pkgs/by-name/hy/hyprshell/package.nix b/pkgs/by-name/hy/hyprshell/package.nix index 4f8324668b57..84ef7a83046f 100644 --- a/pkgs/by-name/hy/hyprshell/package.nix +++ b/pkgs/by-name/hy/hyprshell/package.nix @@ -13,16 +13,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "hyprshell"; - version = "4.6.4"; + version = "4.7.1"; src = fetchFromGitHub { owner = "H3rmt"; repo = "hyprshell"; tag = "v${finalAttrs.version}"; - hash = "sha256-+Uo7xbLlPrMG94eISub2l3Esj8l6IxwwKEfu8nZLWRg="; + hash = "sha256-SRw1X2oC7V/h2Tqo/wTXcu6d1kKVMPrW2HGsNGE4nCA="; }; - cargoHash = "sha256-jZiOLFI3VVrPvvb2YR92mvS8QELzIoQU6ER70rZ7o1E="; + cargoHash = "sha256-ULuztkKukOyfQkiGZY7HtWn5nSs2PWX8B86FQP/z7RU="; nativeBuildInputs = [ wrapGAppsHook4 diff --git a/pkgs/by-name/il/ilbc/package.nix b/pkgs/by-name/il/ilbc/package.nix index e529e9b4c6d8..b8e34d5d8f3d 100644 --- a/pkgs/by-name/il/ilbc/package.nix +++ b/pkgs/by-name/il/ilbc/package.nix @@ -25,6 +25,11 @@ stdenv.mkDerivation rec { cp -v ${./CMakeLists.txt} CMakeLists.txt ''; + # Fixes the build with CMake 4 + cmakeFlags = [ + "-DCMAKE_POLICY_VERSION_MINIMUM=3.5" + ]; + meta = { platforms = lib.platforms.unix; }; diff --git a/pkgs/by-name/ip/ipu6-camera-bins/package.nix b/pkgs/by-name/ip/ipu6-camera-bins/package.nix index c06ca49216c8..ca5dc2d11119 100644 --- a/pkgs/by-name/ip/ipu6-camera-bins/package.nix +++ b/pkgs/by-name/ip/ipu6-camera-bins/package.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "ipu6-camera-bins"; - version = "unstable-2024-09-27"; + version = "unstable-2025-06-27"; src = fetchFromGitHub { repo = "ipu6-camera-bins"; owner = "intel"; - rev = "98ca6f2a54d20f171628055938619972514f7a07"; - hash = "sha256-DAjAzHMqX41mrfQVpDUJLw4Zjb9pz6Uy3TJjTGIkd6o="; + rev = "30e87664829782811a765b0ca9eea3a878a7ff29"; + hash = "sha256-YPPzuK13o2jnRSB3ORoMUU5E9/IifKVSetAqZHRofhw="; }; nativeBuildInputs = [ @@ -41,6 +41,11 @@ stdenv.mkDerivation (finalAttrs: { ''; postFixup = '' + for lib in $out/lib/lib*.so.*; do \ + lib=''${lib##*/}; \ + ln -s $lib $out/lib/''${lib%.*}; \ + done + for pcfile in $out/lib/pkgconfig/*.pc; do substituteInPlace $pcfile \ --replace 'prefix=/usr' "prefix=$out" diff --git a/pkgs/by-name/jj/jj-pre-push/package.nix b/pkgs/by-name/jj/jj-pre-push/package.nix index 9b01ece64361..75055f7d62fc 100644 --- a/pkgs/by-name/jj/jj-pre-push/package.nix +++ b/pkgs/by-name/jj/jj-pre-push/package.nix @@ -6,14 +6,14 @@ python3Packages.buildPythonApplication rec { pname = "jj-pre-push"; - version = "0.2.1"; + version = "0.2.2"; pyproject = true; src = fetchFromGitHub { owner = "acarapetis"; repo = "jj-pre-push"; tag = "v${version}"; - hash = "sha256-9HyVWxYmemF/K3ttQ0L1lZF/XFkSeqwli/Mm+FFI8lQ="; + hash = "sha256-SdGnhHk8MelX6hqKQmZnQYXBJ5VpjPBe+PWUxaGsxC4="; }; build-system = [ diff --git a/pkgs/by-name/kn/knowsmore/package.nix b/pkgs/by-name/kn/knowsmore/package.nix index 732b093bdd8b..8b753b9e0f64 100644 --- a/pkgs/by-name/kn/knowsmore/package.nix +++ b/pkgs/by-name/kn/knowsmore/package.nix @@ -47,6 +47,11 @@ python3.pkgs.buildPythonApplication rec { enabledTestPaths = [ "tests/tests*" ]; + disabledTests = [ + # Issue with later neo4j versions + "test_create_db" + ]; + meta = with lib; { description = "Tool for pentesting Microsoft Active Directory"; homepage = "https://github.com/helviojunior/knowsmore"; diff --git a/pkgs/by-name/le/ledger-autosync/package.nix b/pkgs/by-name/le/ledger-autosync/package.nix index 4083a7cd6b46..6cc1bb122227 100644 --- a/pkgs/by-name/le/ledger-autosync/package.nix +++ b/pkgs/by-name/le/ledger-autosync/package.nix @@ -1,5 +1,6 @@ { lib, + stdenv, python3Packages, fetchFromGitHub, ledger, @@ -11,11 +12,10 @@ python3Packages.buildPythonApplication rec { version = "1.2.0"; pyproject = true; - # no tests included in PyPI tarball src = fetchFromGitHub { owner = "egh"; repo = "ledger-autosync"; - rev = "v${version}"; + tag = "v${version}"; hash = "sha256-bbFjDdxYr85OPjdvY3JYtCe/8Epwi+8JN60PKVKbqe0="; }; @@ -33,6 +33,13 @@ python3Packages.buildPythonApplication rec { python3Packages.pytestCheckHook ]; + disabledTestPaths = lib.optionals stdenv.hostPlatform.isDarwin [ + # keyring.errors.KeyringError: Can't get password from keychain: (-50, 'Unknown Error') + # keyring.backends.macOS.api.Error: (-50, 'Unknown Error') + "tests/test_cli.py" + "tests/test_weird_ofx.py" + ]; + meta = { homepage = "https://github.com/egh/ledger-autosync"; changelog = "https://github.com/egh/ledger-autosync/releases/tag/v${version}"; diff --git a/pkgs/by-name/le/ledger/package.nix b/pkgs/by-name/le/ledger/package.nix index 83968f43d1bd..94cd731c36ea 100644 --- a/pkgs/by-name/le/ledger/package.nix +++ b/pkgs/by-name/le/ledger/package.nix @@ -13,21 +13,30 @@ installShellFiles, texinfo, gnused, + versionCheckHook, + nix-update-script, usePython ? false, gpgmeSupport ? false, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "ledger"; version = "3.3.2"; src = fetchFromGitHub { owner = "ledger"; repo = "ledger"; - rev = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-Uym4s8EyzXHlISZqThcb6P1H5bdgD9vmdIOLkk5ikG0="; }; + # by default, it will query the python interpreter for it's sitepackages location + # however, that would write to a different nixstore path, pass our own sitePackages location + prePatch = lib.optionalString usePython '' + substituteInPlace src/CMakeLists.txt \ + --replace-fail 'DESTINATION ''${Python_SITEARCH}' 'DESTINATION "${placeholder "py"}/${python3.sitePackages}"' + ''; + patches = [ (fetchpatch2 { name = "ledger-boost-1.85-compat.patch"; @@ -86,18 +95,15 @@ stdenv.mkDerivation rec { ]; cmakeFlags = [ - "-DCMAKE_INSTALL_LIBDIR=lib" - "-DBUILD_DOCS:BOOL=ON" - "-DUSE_PYTHON:BOOL=${if usePython then "ON" else "OFF"}" - "-DUSE_GPGME:BOOL=${if gpgmeSupport then "ON" else "OFF"}" - ]; + (lib.cmakeFeature "CMAKE_INSTALL_LIBDIR" "lib") + (lib.cmakeBool "BUILD_DOCS" true) + (lib.cmakeBool "USE_PYTHON" usePython) + (lib.cmakeBool "USE_GPGME" gpgmeSupport) - # by default, it will query the python interpreter for it's sitepackages location - # however, that would write to a different nixstore path, pass our own sitePackages location - prePatch = lib.optionalString usePython '' - substituteInPlace src/CMakeLists.txt \ - --replace 'DESTINATION ''${Python_SITEARCH}' 'DESTINATION "${placeholder "py"}/${python3.sitePackages}"' - ''; + # CMake 4 dropped support of versions lower than 3.5, and versions + # lower than 3.10 are deprecated. + (lib.cmakeFeature "CMAKE_POLICY_VERSION_MINIMUM" "3.10") + ]; installTargets = [ "doc" @@ -108,11 +114,19 @@ stdenv.mkDerivation rec { installShellCompletion --cmd ledger --bash $src/contrib/ledger-completion.bash ''; + nativeInstallCheckInputs = [ + versionCheckHook + ]; + versionCheckProgramArg = "--version"; + doInstallCheck = true; + + passthru.updateScript = nix-update-script { }; + meta = { description = "Double-entry accounting system with a command-line reporting interface"; mainProgram = "ledger"; homepage = "https://www.ledger-cli.org/"; - changelog = "https://github.com/ledger/ledger/raw/v${version}/NEWS.md"; + changelog = "https://github.com/ledger/ledger/raw/v${finalAttrs.version}/NEWS.md"; license = lib.licenses.bsd3; longDescription = '' Ledger is a powerful, double-entry accounting system that is accessed @@ -123,4 +137,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.all; maintainers = with lib.maintainers; [ jwiegley ]; }; -} +}) diff --git a/pkgs/by-name/le/legends-of-equestria/package.nix b/pkgs/by-name/le/legends-of-equestria/package.nix index 12107ca9a2f6..0fbd11cb3700 100644 --- a/pkgs/by-name/le/legends-of-equestria/package.nix +++ b/pkgs/by-name/le/legends-of-equestria/package.nix @@ -33,21 +33,21 @@ let pname = "legends-of-equestria"; - version = "2025.02.001"; + version = "2025.04.001"; description = "Free-to-play MMORPG"; srcOptions = { x86_64-linux = { - url = "https://mega.nz/file/w6pxUQJS#5r_oxsCqLyIUya8fbIATPtKAbsacXkD-bVArjjOBu3w"; - outputHash = "k5kASgZwCoKVtHDEFjegAl31KZlrkNse4Baph1l/SUc="; + url = "https://mega.nz/file/w7BQTCAD#zW1atRLzSd1-V8GV7s7yj_HVZwB4v8zuX3aWIjA0ztc"; + outputHash = "YYPxS/qNl/DvNmiGZorRGoONbtAI3nJslqCRzctwoz8="; }; x86_64-darwin = { - url = "https://mega.nz/file/wyoHSZTK#ig1laiSWijTxnN_tS2m5di1Mdly8zDHP1euLVFqG_ug"; - outputHash = "pQpattmS9VmO3ZIQUFn66az8GSmB4IvYhTTCFn6SUmo="; + url = "https://mega.nz/file/IqgBEJTD#aUd6LgigncoQ8o3owSkadYRp7GkfIOWl4B1Hwzti1qk"; + outputHash = "XdcHM6zCDNFU5VJo3/QISuhtYnBKm1f6IEDfy6Fjnp8="; }; aarch64-darwin = { - url = "https://mega.nz/file/EihRWKgb#KDtmmzLWVKW5uxkKkBEVE0yJioYPkOqutWwwMLhbedA"; - outputHash = "pQpattmS9VmO3ZIQUFn66az8GSmB4IvYhTTCFn6SUmo="; + url = "https://mega.nz/file/QyZnkYYB#EtAZrVdHgqX10ag09M9nhJVEboG0J_5f_nVKxCHskYg"; + outputHash = "GA0Zin+vlgYfBFC1ZbkkgX1eSn/NVBYuxuv8fayXMLU="; }; }; diff --git a/pkgs/by-name/le/legends-of-equestria/update.sh b/pkgs/by-name/le/legends-of-equestria/update.sh index bcac4dbbd00b..1035b733a8da 100755 --- a/pkgs/by-name/le/legends-of-equestria/update.sh +++ b/pkgs/by-name/le/legends-of-equestria/update.sh @@ -4,8 +4,9 @@ set -eu -o pipefail ATTR=legends-of-equestria -DOWNLOADS_PAGE=https://www.legendsofequestria.com/downloads -OLD_VERSION=$(nix-instantiate --eval -A $ATTR.version | tr -d '"') +DOWNLOADS_PAGE="$(curl -s "$(nix-instantiate --eval -A "$ATTR.meta.downloadPage" | tr -d '"')")" +OLD_VERSION="$(nix-instantiate --eval -A "$ATTR.version" | tr -d '"')" +NIX_FILE="$(nix-instantiate --eval -A "$ATTR.meta.position" | sed -re 's/^"(.*):[0-9]+"$/\1/')" TMP=$(mktemp -d) findHash() { @@ -30,24 +31,32 @@ applyUpdate() { system=$1 echo "checking for updates for $system..." >&2 systemText="$2" - regex=''"$systemText"'.+v(([0-9]+\.)+[0-9]+)' + regex=''"$systemText"'.+v(([0-9]+\.)+[0-9]+)' - if [[ "$(curl -s $DOWNLOADS_PAGE | grep -Fi "$systemText")" =~ $regex ]]; then + mapfile -t matches < <(echo "$DOWNLOADS_PAGE" | grep -Fi "$systemText") + for ((i=${#matches[@]}-1; i>=0; i--)); do + if [[ ${matches[i]} =~ $regex ]]; then url="${BASH_REMATCH[1]}" version="${BASH_REMATCH[2]}" echo "$version $url" >&2 - else + break + fi + done + if [[ -z $url || -z $version ]]; then echo "cannot find the latest version for $system" >&2 exit 1 fi if [[ $OLD_VERSION == $version ]]; then echo "already up-to-date at version $version" >&2 - exit 1 + exit 0 fi hash="$(findHash $system "$url" | sed -E 's/sha256-(.+)/\1/')" echo "output hash: $hash" >&2 - update-source-version $ATTR $version "$hash" "$url" --system=$system --ignore-same-version --ignore-same-hash + + oldUrl="$(nix-instantiate --system $system --eval -A $ATTR.src.url | tr -d '"')" + oldHash="$(nix-instantiate --system $system --eval -A $ATTR.src.outputHash | tr -d '"')" + sed -i "s|$OLD_VERSION|$version|; s|$oldUrl|$url|; s|$oldHash|$hash|" "$NIX_FILE" } applyUpdate x86_64-linux Linux diff --git a/pkgs/by-name/le/lexical/package.nix b/pkgs/by-name/le/lexical/package.nix index b17a109e656f..5f3ebdeed22c 100644 --- a/pkgs/by-name/le/lexical/package.nix +++ b/pkgs/by-name/le/lexical/package.nix @@ -2,7 +2,6 @@ lib, beamPackages, fetchFromGitHub, - elixir, nix-update-script, versionCheckHook, }: @@ -34,7 +33,7 @@ beamPackages.mixRelease rec { postInstall = '' substituteInPlace "$out/bin/start_lexical.sh" \ - --replace-fail 'elixir_command=' 'elixir_command="${elixir}/bin/"' + --replace-fail 'elixir_command=' 'elixir_command="${beamPackages.elixir}/bin/"' mv "$out/bin" "$out/libexec" makeWrapper "$out/libexec/start_lexical.sh" "$out/bin/lexical" \ diff --git a/pkgs/development/libraries/languagemachines/libfolia.nix b/pkgs/by-name/li/libfolia/package.nix similarity index 63% rename from pkgs/development/libraries/languagemachines/libfolia.nix rename to pkgs/by-name/li/libfolia/package.nix index 33d71bef3beb..a428f7e1d232 100644 --- a/pkgs/development/libraries/languagemachines/libfolia.nix +++ b/pkgs/by-name/li/libfolia/package.nix @@ -1,34 +1,34 @@ { lib, stdenv, - fetchurl, - automake, - autoconf, + fetchFromGitHub, + gitUpdater, + autoreconfHook, libtool, pkg-config, autoconf-archive, libxml2, - icu, + icu60, bzip2, libtar, - languageMachines, + ticcutils, + frog, }: -let - release = lib.importJSON ./release-info/LanguageMachines-libfolia.json; -in - -stdenv.mkDerivation { +stdenv.mkDerivation (finalAttrs: { pname = "libfolia"; - version = release.version; - src = fetchurl { - inherit (release) url sha256; - name = "libfolia-${release.version}.tar.gz"; + version = "1.7"; + + src = fetchFromGitHub { + owner = "LanguageMachines"; + repo = "libfolia"; + tag = "v${finalAttrs.version}"; + hash = "sha256-fH+XqTaMf7/8ZA0lwWiD7s7fmGkjni83Q7lv5sh50H4="; }; + nativeBuildInputs = [ pkg-config - automake - autoconf + autoreconfHook ]; buildInputs = [ bzip2 @@ -36,14 +36,25 @@ stdenv.mkDerivation { autoconf-archive libtar libxml2 - icu - languageMachines.ticcutils + icu60 + ticcutils ]; - preConfigure = "sh bootstrap.sh"; # compat with icu61+ https://github.com/unicode-org/icu/blob/release-64-2/icu4c/readme.html#L554 CXXFLAGS = [ "-DU_USING_ICU_NAMESPACE=1" ]; + passthru = { + updateScript = gitUpdater { rev-prefix = "v"; }; + tests = { + /** + Reverse dependencies. Does not respect overrides. + */ + reverseDependencies = lib.recurseIntoAttrs { + inherit frog; + }; + }; + }; + meta = with lib; { description = "C++ API for FoLiA documents; an XML-based linguistic annotation format"; mainProgram = "folialint"; @@ -57,4 +68,4 @@ stdenv.mkDerivation { ''; }; -} +}) diff --git a/pkgs/by-name/li/liblinphone/backport-cpp17.patch b/pkgs/by-name/li/liblinphone/backport-cpp17.patch deleted file mode 100644 index d9eb75fa2768..000000000000 --- a/pkgs/by-name/li/liblinphone/backport-cpp17.patch +++ /dev/null @@ -1,98 +0,0 @@ -From 9ece6e77dcf6545c3b8104068302c6243e3a5e88 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Micka=C3=ABl=20Turnel?= - -Date: Wed, 1 Mar 2023 09:14:53 +0100 -Subject: [PATCH] Set c++ version 17 and fix compilation errors - -Backported-by: Lorenz Brun - ---- - CMakeLists.txt | 2 +- - daemon/daemon.cc | 2 +- - libxsd/xsd/cxx/config.hxx | 2 +- - src/conference/session/streams-group.cpp | 10 +++++----- - 4 files changed, 8 insertions(+), 8 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 475ff16a8..a771e4595 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -92,7 +92,7 @@ cmake_dependent_option(ENABLE_QRCODE "Enable QRCode support" YES "ENABLE_VIDEO" - # * DISABLE_BC_PACKAGE_SEARCH: skip find_package() for every BC package (bctoolbox, ortp, etc.) - # * DISABLE_SOCI_PACKAGE_SEARCH: skip find_package() for Soci. - --set(CMAKE_CXX_STANDARD 14) -+set(CMAKE_CXX_STANDARD 17) - set(CMAKE_CXX_EXTENSIONS NO) - - if(NOT CMAKE_BUILD_TYPE) -diff --git a/daemon/daemon.cc b/daemon/daemon.cc -index 197fc22ef..fd09edb26 100644 ---- a/daemon/daemon.cc -+++ b/daemon/daemon.cc -@@ -628,7 +628,7 @@ void Daemon::execCommand(const string &command) { - ist.get(argsbuf); - string args = argsbuf.str(); - if (!args.empty() && (args[0] == ' ')) args.erase(0, 1); -- list::iterator it = find_if(mCommands.begin(), mCommands.end(), bind2nd(mem_fun(&DaemonCommand::matches), name)); -+ list::iterator it = find_if(mCommands.begin(), mCommands.end(), [&name](const DaemonCommand *dc) { return dc->matches(name); }); - if (it != mCommands.end()) { - ms_mutex_lock(&mMutex); - (*it)->exec(this, args); -diff --git a/libxsd/xsd/cxx/config.hxx b/libxsd/xsd/cxx/config.hxx -index 076b107f5..385841731 100644 ---- a/libxsd/xsd/cxx/config.hxx -+++ b/libxsd/xsd/cxx/config.hxx -@@ -19,7 +19,7 @@ - # endif - #else - # if defined(__GXX_EXPERIMENTAL_CXX0X__) || __cplusplus >= 201103L --# ifdef __GNUC__ -+# if defined(__GNUC__) && !defined(__clang__) - # if (__GNUC__ == 4 && __GNUC_MINOR__ >= 6) || __GNUC__ > 4 - # define XSD_CXX11_NULLPTR - # endif -diff --git a/src/conference/session/streams-group.cpp b/src/conference/session/streams-group.cpp -index bff739dda..84277a6b7 100644 ---- a/src/conference/session/streams-group.cpp -+++ b/src/conference/session/streams-group.cpp -@@ -447,11 +447,11 @@ float StreamsGroup::computeOverallQuality(_functor func){ - } - - float StreamsGroup::getAverageQuality(){ -- return computeOverallQuality(mem_fun(&Stream::getAverageQuality)); -+ return computeOverallQuality(mem_fn(&Stream::getAverageQuality)); - } - - float StreamsGroup::getCurrentQuality(){ -- return computeOverallQuality(mem_fun(&Stream::getCurrentQuality)); -+ return computeOverallQuality(mem_fn(&Stream::getCurrentQuality)); - } - - int StreamsGroup::getAvpfRrInterval()const{ -@@ -481,11 +481,11 @@ bool StreamsGroup::avpfEnabled() const{ - } - - void StreamsGroup::refreshSockets(){ -- forEach(mem_fun(&Stream::refreshSockets)); -+ forEach(mem_fn(&Stream::refreshSockets)); - } - - void StreamsGroup::computeAndReportBandwidth(){ -- forEach(mem_fun(&Stream::updateBandwidthReports)); -+ forEach(mem_fn(&Stream::updateBandwidthReports)); - - if (!bctbx_log_level_enabled(BCTBX_LOG_DOMAIN, BCTBX_LOG_MESSAGE)) return; - -@@ -540,7 +540,7 @@ void StreamsGroup::finish(){ - mIceService->finish(); // finish ICE first, as it has actions on the streams. - for (auto & ss : mSharedServices) ss.second->checkDestroy(); - mSharedServices.clear(); -- forEach(mem_fun(&Stream::finish)); -+ forEach(mem_fn(&Stream::finish)); - mFinished = true; - } - --- -2.41.0 - diff --git a/pkgs/by-name/li/libosmoabis/package.nix b/pkgs/by-name/li/libosmoabis/package.nix index 0fb61587d710..ad13ba6ad468 100644 --- a/pkgs/by-name/li/libosmoabis/package.nix +++ b/pkgs/by-name/li/libosmoabis/package.nix @@ -6,8 +6,7 @@ pkg-config, libosmocore, libosmo-netif, - ortp, - bctoolbox, + linphonePackages, }: stdenv.mkDerivation rec { @@ -35,8 +34,8 @@ stdenv.mkDerivation rec { buildInputs = [ libosmocore libosmo-netif - ortp - bctoolbox + linphonePackages.ortp + linphonePackages.bctoolbox ]; enableParallelBuilding = true; diff --git a/pkgs/by-name/li/libresprite/package.nix b/pkgs/by-name/li/libresprite/package.nix index 12ccf0d7304d..c7038e432b5f 100644 --- a/pkgs/by-name/li/libresprite/package.nix +++ b/pkgs/by-name/li/libresprite/package.nix @@ -70,6 +70,7 @@ stdenv.mkDerivation (finalAttrs: { cmakeFlags = [ "-DWITH_DESKTOP_INTEGRATION=ON" "-DWITH_WEBP_SUPPORT=ON" + "-DCMAKE_POLICY_VERSION_MINIMUM=3.5" ]; hardeningDisable = lib.optional stdenv.hostPlatform.isDarwin "format"; diff --git a/pkgs/by-name/li/libtins/package.nix b/pkgs/by-name/li/libtins/package.nix index 3653b7671d78..f38cc3d7a55a 100644 --- a/pkgs/by-name/li/libtins/package.nix +++ b/pkgs/by-name/li/libtins/package.nix @@ -44,6 +44,12 @@ stdenv.mkDerivation rec { boost ]; + cmakeFlags = [ + # CMake 4 dropped support of versions lower than 3.5, + # versions lower than 3.10 are deprecated. + (lib.cmakeFeature "CMAKE_POLICY_VERSION_MINIMUM" "3.10") + ]; + configureFlags = [ "--with-boost-libdir=${boost.out}/lib" "--with-boost=${boost.dev}" diff --git a/pkgs/by-name/li/lime/package.nix b/pkgs/by-name/li/lime/package.nix deleted file mode 100644 index 8545552f2c4a..000000000000 --- a/pkgs/by-name/li/lime/package.nix +++ /dev/null @@ -1,49 +0,0 @@ -{ - bctoolbox, - belle-sip, - cmake, - fetchFromGitLab, - lib, - bc-soci, - sqlite, - stdenv, -}: - -stdenv.mkDerivation rec { - pname = "lime"; - version = "5.2.98"; - - src = fetchFromGitLab { - domain = "gitlab.linphone.org"; - owner = "public"; - group = "BC"; - repo = "lime"; - rev = version; - hash = "sha256-LdwXBJpwSA/PoCXL+c1pcX1V2Fq/eR6nNmwBKDM1Vr8="; - }; - - buildInputs = [ - # Made by BC - bctoolbox - belle-sip - - # Vendored by BC - bc-soci - - sqlite - ]; - nativeBuildInputs = [ cmake ]; - - cmakeFlags = [ - "-DENABLE_STATIC=NO" # Do not build static libraries - "-DENABLE_UNIT_TESTS=NO" # Do not build test executables - ]; - - meta = with lib; { - description = "End-to-end encryption library for instant messaging. Part of the Linphone project"; - homepage = "https://www.linphone.org/technical-corner/lime"; - license = licenses.gpl3Only; - platforms = platforms.all; - maintainers = with maintainers; [ jluttine ]; - }; -} diff --git a/pkgs/by-name/li/linyaps-web-store-installer/package.nix b/pkgs/by-name/li/linyaps-web-store-installer/package.nix index 649e9002c5f2..33884d80f6e2 100644 --- a/pkgs/by-name/li/linyaps-web-store-installer/package.nix +++ b/pkgs/by-name/li/linyaps-web-store-installer/package.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchFromGitHub, + fetchpatch2, cmake, qt6, }: @@ -22,6 +23,15 @@ stdenv.mkDerivation (finalAttrs: { --replace-fail "Exec=/usr/bin/ll-installer" "Exec=$out/bin/ll-installer" ''; + patches = [ + (fetchpatch2 { + # https://github.com/OpenAtom-Linyaps/linyaps-web-store-installer/pull/24 + url = "https://github.com/OpenAtom-Linyaps/linyaps-web-store-installer/commit/fc365dd06b17df38d9ae991775e51c5f1b547341.patch?full_index=1"; + hash = "sha256-BpFM3w8njRANvxH34PyP3Y2hLtZWOl18KZxzA+Ew3Zg="; + includes = [ "CMakeLists.txt" ]; + }) + ]; + nativeBuildInputs = [ cmake qt6.wrapQtAppsHook diff --git a/pkgs/by-name/ma/matrix-synapse-unwrapped/package.nix b/pkgs/by-name/ma/matrix-synapse-unwrapped/package.nix index 65730a6ec682..6120d8082447 100644 --- a/pkgs/by-name/ma/matrix-synapse-unwrapped/package.nix +++ b/pkgs/by-name/ma/matrix-synapse-unwrapped/package.nix @@ -14,14 +14,14 @@ python3Packages.buildPythonApplication rec { pname = "matrix-synapse"; - version = "1.139.0"; + version = "1.139.2"; format = "pyproject"; src = fetchFromGitHub { owner = "element-hq"; repo = "synapse"; rev = "v${version}"; - hash = "sha256-L9oTTdGF//srC3sDrI8aNMjc9lOkof+J2VLFy091HBo="; + hash = "sha256-lPVwJ+BkSQRkGrWlq4B4gbJlIly/hUW1jOMmbsK9R6M="; }; cargoDeps = rustPlatform.fetchCargoVendor { diff --git a/pkgs/development/libraries/languagemachines/mbt-add-libxml2-dep.patch b/pkgs/by-name/mb/mbt/mbt-add-libxml2-dep.patch similarity index 100% rename from pkgs/development/libraries/languagemachines/mbt-add-libxml2-dep.patch rename to pkgs/by-name/mb/mbt/mbt-add-libxml2-dep.patch diff --git a/pkgs/development/libraries/languagemachines/mbt.nix b/pkgs/by-name/mb/mbt/package.nix similarity index 63% rename from pkgs/development/libraries/languagemachines/mbt.nix rename to pkgs/by-name/mb/mbt/package.nix index 51238615f9e9..47ddf4d89956 100644 --- a/pkgs/development/libraries/languagemachines/mbt.nix +++ b/pkgs/by-name/mb/mbt/package.nix @@ -1,33 +1,34 @@ { lib, stdenv, - fetchurl, - automake, - autoconf, + fetchFromGitHub, + gitUpdater, + autoreconfHook, bzip2, libtar, libtool, pkg-config, autoconf-archive, libxml2, - languageMachines, + ticcutils, + timbl, + frog, }: -let - release = lib.importJSON ./release-info/LanguageMachines-mbt.json; -in - -stdenv.mkDerivation { +stdenv.mkDerivation (finalAttrs: { pname = "mbt"; - version = release.version; - src = fetchurl { - inherit (release) url sha256; - name = "mbt-${release.version}.tar.gz"; + version = "3.2.16"; + + src = fetchFromGitHub { + owner = "LanguageMachines"; + repo = "mbt"; + tag = "v${finalAttrs.version}"; + hash = "sha256-O/LhLWgLwDctkRYjds+AM9fGMIRX3eCnJhRIXyVrJ04="; }; + nativeBuildInputs = [ pkg-config - automake - autoconf + autoreconfHook ]; buildInputs = [ bzip2 @@ -35,13 +36,22 @@ stdenv.mkDerivation { libtool autoconf-archive libxml2 - languageMachines.ticcutils - languageMachines.timbl + ticcutils + timbl ]; patches = [ ./mbt-add-libxml2-dep.patch ]; - preConfigure = '' - sh bootstrap.sh - ''; + + passthru = { + updateScript = gitUpdater { rev-prefix = "v"; }; + tests = { + /** + Reverse dependencies. Does not respect overrides. + */ + reverseDependencies = lib.recurseIntoAttrs { + inherit frog; + }; + }; + }; meta = with lib; { description = "Memory Based Tagger"; @@ -57,4 +67,4 @@ stdenv.mkDerivation { ''; }; -} +}) diff --git a/pkgs/by-name/md/mdbook-pandoc/package.nix b/pkgs/by-name/md/mdbook-pandoc/package.nix new file mode 100644 index 000000000000..a5776acdf01e --- /dev/null +++ b/pkgs/by-name/md/mdbook-pandoc/package.nix @@ -0,0 +1,65 @@ +{ + lib, + callPackage, + fetchFromGitHub, + stdenv, + makeWrapper, + pandoc, + rustPlatform, + texliveSmall, +}: + +rustPlatform.buildRustPackage rec { + pname = "mdbook-pandoc"; + version = "0.10.5"; + + src = fetchFromGitHub { + owner = "max-heller"; + repo = "mdbook-pandoc"; + tag = "v${version}"; + hash = "sha256-ihKju9XXJy4JciuMLw4EcKhqSQjrBiUJDG0Rd5DbFdk="; + }; + + cargoHash = "sha256-SXXzGOBvfyLYhed5EMFUCzkFWoGEMM73PD3uWjkUcic="; + + nativeBuildInputs = [ makeWrapper ]; + + nativeCheckInputs = [ + pandoc + # some tests require pdflatex + texliveSmall + ]; + + checkFlags = + let + skippedTests = [ + # failing subtly + "tests::html::rust_reference_regression_nested_elements" + "tests::css::css" + "tests::definition_lists::dt_attributes" + "tests::html::attach_id_to_div_of_stripped_html_elements" + "tests::html::link_to_element_by_id" + "tests::images::images" + ] + ++ lib.optional stdenv.buildPlatform.isDarwin "pandoc::tests::five_item_deep_list"; + in + builtins.map (x: "--skip " + x) skippedTests; + + passthru = { + wrapper = callPackage ./wrapper.nix { }; + }; + + meta = { + homepage = "https://github.com/max-heller/mdbook-pandoc"; + description = "A mdbook backend powered by Pandoc"; + changelog = "https://github.com/max-heller/mdbook-pandoc/releases/tag/${src.tag}"; + license = with lib.licenses; [ + asl20 + # or + mit + ]; + maintainers = with lib.maintainers; [ + astro + ]; + }; +} diff --git a/pkgs/by-name/md/mdbook-pandoc/wrapper.nix b/pkgs/by-name/md/mdbook-pandoc/wrapper.nix new file mode 100644 index 000000000000..3d8d69a07398 --- /dev/null +++ b/pkgs/by-name/md/mdbook-pandoc/wrapper.nix @@ -0,0 +1,14 @@ +{ + mdbook-pandoc, + pandoc, + symlinkJoin, +}: + +symlinkJoin { + name = "mdbook-pandoc-wrapped-${mdbook-pandoc.version}"; + + paths = [ + mdbook-pandoc + pandoc + ]; +} diff --git a/pkgs/by-name/md/mdns/package.nix b/pkgs/by-name/md/mdns/package.nix index d2d47f574a8c..9bc9505c2366 100644 --- a/pkgs/by-name/md/mdns/package.nix +++ b/pkgs/by-name/md/mdns/package.nix @@ -20,6 +20,11 @@ stdenv.mkDerivation rec { cmake ]; + cmakeFlags = [ + # Fix configure with cmake4 + (lib.cmakeFeature "CMAKE_POLICY_VERSION_MINIMUM" "3.10") + ]; + meta = with lib; { description = "Public domain mDNS/DNS-SD library in C"; homepage = "https://github.com/mjansson/mdns"; diff --git a/pkgs/by-name/me/mediawiki/package.nix b/pkgs/by-name/me/mediawiki/package.nix index a8bacfe0ba9a..45ae748c9bf8 100644 --- a/pkgs/by-name/me/mediawiki/package.nix +++ b/pkgs/by-name/me/mediawiki/package.nix @@ -8,11 +8,11 @@ stdenvNoCC.mkDerivation rec { pname = "mediawiki"; - version = "1.44.0"; + version = "1.44.1"; src = fetchurl { url = "https://releases.wikimedia.org/mediawiki/${lib.versions.majorMinor version}/mediawiki-${version}.tar.gz"; - hash = "sha256-eSF3gIw+CDGsy+IF1XtBMzma0UHw0KglRQohskAnWI8="; + hash = "sha256-cMsjrJtGDsGZH6M4J6TbWPoIDmc36kIdQoHEkGWy3VA="; }; postPatch = '' diff --git a/pkgs/by-name/mi/mix2nix/package.nix b/pkgs/by-name/mi/mix2nix/package.nix index 145e0685c798..f3be5eedc4bc 100644 --- a/pkgs/by-name/mi/mix2nix/package.nix +++ b/pkgs/by-name/mi/mix2nix/package.nix @@ -2,8 +2,7 @@ stdenv, lib, fetchFromGitHub, - elixir, - erlang, + beamPackages, }: stdenv.mkDerivation rec { @@ -17,8 +16,8 @@ stdenv.mkDerivation rec { hash = "sha256-hD4lpP8GPkNXuMMDOOTEmy+rOwOSCxQwR0Mjq8i4oDM="; }; - nativeBuildInputs = [ elixir ]; - buildInputs = [ erlang ]; + nativeBuildInputs = [ beamPackages.elixir ]; + buildInputs = [ beamPackages.erlang ]; buildPhase = "mix escript.build"; installPhase = "install -Dt $out/bin mix2nix"; diff --git a/pkgs/by-name/ml/mlt/package.nix b/pkgs/by-name/ml/mlt/package.nix index d1ddccffe280..41e7af71554e 100644 --- a/pkgs/by-name/ml/mlt/package.nix +++ b/pkgs/by-name/ml/mlt/package.nix @@ -40,13 +40,13 @@ stdenv.mkDerivation rec { pname = "mlt"; - version = "7.30.0"; + version = "7.32.0"; src = fetchFromGitHub { owner = "mltframework"; repo = "mlt"; tag = "v${version}"; - hash = "sha256-z1bW+hcVeMeibC1PUS5XNpbkNB+75YLoOWZC2zuDol4="; + hash = "sha256-8T5FXXGs7SxL6nD+R1Q/0Forsdp5Xux4S3VLvgqXzw8="; # The submodule contains glaxnimate code, since MLT uses internally some functions defined in glaxnimate. # Since glaxnimate is not available as a library upstream, we cannot remove for now this dependency on # submodules until upstream exports glaxnimate as a library: https://gitlab.com/mattbas/glaxnimate/-/issues/545 diff --git a/pkgs/by-name/mo/monkeysAudio/package.nix b/pkgs/by-name/mo/monkeysAudio/package.nix index 928ceee0abcf..80889bb794ab 100644 --- a/pkgs/by-name/mo/monkeysAudio/package.nix +++ b/pkgs/by-name/mo/monkeysAudio/package.nix @@ -6,12 +6,12 @@ }: stdenv.mkDerivation (finalAttrs: { - version = "11.53"; + version = "11.54"; pname = "monkeys-audio"; src = fetchzip { url = "https://monkeysaudio.com/files/MAC_${builtins.concatStringsSep "" (lib.strings.splitString "." finalAttrs.version)}_SDK.zip"; - hash = "sha256-g1I63K67upEL0in1NceayLDTQgmx4LAHd0eA0MYEp44="; + hash = "sha256-6QYy0AKzh1dA2Myy3i2/0Dw/v6qrZFLLGS2WAiCOgRo="; stripRoot = false; }; diff --git a/pkgs/by-name/mo/movit/package.nix b/pkgs/by-name/mo/movit/package.nix index cbddbec7456b..7cb3d825862e 100644 --- a/pkgs/by-name/mo/movit/package.nix +++ b/pkgs/by-name/mo/movit/package.nix @@ -45,12 +45,13 @@ stdenv.mkDerivation rec { libepoxy ]; - env = { - NIX_CFLAGS_COMPILE = "-std=c++17"; # needed for latest gtest - } - // lib.optionalAttrs stdenv.hostPlatform.isDarwin { - NIX_LDFLAGS = "-framework OpenGL"; - }; + env = + lib.optionalAttrs stdenv.cc.isGNU { + NIX_CFLAGS_COMPILE = "-std=c++17"; # needed for latest gtest + } + // lib.optionalAttrs stdenv.hostPlatform.isDarwin { + NIX_LDFLAGS = "-framework OpenGL"; + }; enableParallelBuilding = true; diff --git a/pkgs/by-name/ms/msilbc/package.nix b/pkgs/by-name/ms/msilbc/package.nix index 8addbb00b026..8af8f031323d 100644 --- a/pkgs/by-name/ms/msilbc/package.nix +++ b/pkgs/by-name/ms/msilbc/package.nix @@ -3,7 +3,7 @@ stdenv, fetchurl, ilbc, - mediastreamer, + linphonePackages, pkg-config, }: @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ ilbc - mediastreamer + linphonePackages.mediastreamer2 ]; nativeBuildInputs = [ pkg-config ]; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { "ILBC_LIBS=ilbc" "ILBC_CFLAGS=-I${ilbc}/include" "MEDIASTREAMER_LIBS=mediastreamer" - "MEDIASTREAMER_CFLAGS=-I${mediastreamer}/include" + "MEDIASTREAMER_CFLAGS=-I${linphonePackages.mediastreamer2}/include" ]; meta = with lib; { diff --git a/pkgs/by-name/nb/nb/package.nix b/pkgs/by-name/nb/nb/package.nix index e61fbc94b9e5..b8ad06aba369 100644 --- a/pkgs/by-name/nb/nb/package.nix +++ b/pkgs/by-name/nb/nb/package.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "nb"; - version = "7.21.3"; + version = "7.22.1"; src = fetchFromGitHub { owner = "xwmx"; repo = "nb"; rev = version; - hash = "sha256-jvjAxXynLo19D5GdnEXtmcrxjXQRYQYOiZ6I1Wl47xA="; + hash = "sha256-WYOU4ybcuZa45P68r6NlhMYii1YUvCTmYicpVuGg7BM="; }; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/nu/nuclei-templates/package.nix b/pkgs/by-name/nu/nuclei-templates/package.nix index 6a59f2bcff03..2421f3b7a5d9 100644 --- a/pkgs/by-name/nu/nuclei-templates/package.nix +++ b/pkgs/by-name/nu/nuclei-templates/package.nix @@ -6,13 +6,13 @@ stdenvNoCC.mkDerivation rec { pname = "nuclei-templates"; - version = "10.2.9"; + version = "10.3.0"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = "nuclei-templates"; tag = "v${version}"; - hash = "sha256-ZncJFBWt+7NwK4zxPXr1wxtAuxjMuaGmcC1a5RAQ2Y8="; + hash = "sha256-WzPH3uyRAseN51gpmezfD0Mcbjh2K2mSkRbo3LFShG4="; }; installPhase = '' diff --git a/pkgs/by-name/nu/numbat/package.nix b/pkgs/by-name/nu/numbat/package.nix index 945b9d845d9c..74568d49b6ad 100644 --- a/pkgs/by-name/nu/numbat/package.nix +++ b/pkgs/by-name/nu/numbat/package.nix @@ -25,6 +25,19 @@ rustPlatform.buildRustPackage rec { postInstall = '' mkdir -p $out/share/numbat cp -r $src/numbat/modules $out/share/numbat/ + + mkdir -p $out/share/applications + cp $src/assets/numbat.desktop $out/share/applications + + for size in 16 22 24 32 48 64 128 256 512; do + dims="''${size}x''${size}" + dest=$out/share/icons/hicolor/''${dims}/apps + mkdir -p $dest + cp $src/assets/numbat-''${dims}.png ''${dest}/numbat.png + done + + mkdir -p $out/share/icons/hicolor/scalable/apps + cp $src/assets/numbat.svg $out/share/icons/hicolor/scalable/apps ''; preCheck = '' diff --git a/pkgs/by-name/oc/octoprint/plugins.nix b/pkgs/by-name/oc/octoprint/plugins.nix index 3bb06d182cfc..406612621e0a 100644 --- a/pkgs/by-name/oc/octoprint/plugins.nix +++ b/pkgs/by-name/oc/octoprint/plugins.nix @@ -647,54 +647,6 @@ in }; }; - octolapse = buildPlugin rec { - pname = "octolapse"; - version = "0.4.2"; - format = "setuptools"; - - src = fetchFromGitHub { - owner = "FormerLurker"; - repo = "Octolapse"; - rev = "v${version}"; - sha256 = "sha256-QP6PkKWKUv4uIaYdqTAsZmK7DVes94Q9K/DrBYrWxzY="; - }; - - patches = [ - # fix version constraint - # https://github.com/FormerLurker/Octolapse/pull/894 - (fetchpatch { - url = "https://github.com/FormerLurker/Octolapse/commit/0bd7db2430aef370f2665c6c7011fc3bb559122e.patch"; - hash = "sha256-z2aEq5sJGarGtIDbTRCvXdSj+kq8HIVvLRWpKutmJNY="; - }) - ]; - - # Test fails due to code executed on import, see #136513 - #pythonImportsCheck = [ "octoprint_octolapse" ]; - - propagatedBuildInputs = with super; [ - awesome-slugify - setuptools - pillow - sarge - six - pillow - psutil - file-read-backwards - ]; - - meta = with lib; { - description = "Stabilized timelapses for Octoprint"; - homepage = "https://github.com/FormerLurker/OctoLapse"; - license = licenses.agpl3Plus; - maintainers = with maintainers; [ - illustris - j0hax - ]; - # requires pillow >=6.2.0,<7.0.0 - broken = true; - }; - }; - dashboard = buildPlugin rec { pname = "dashboard"; version = "1.18.3"; @@ -716,5 +668,6 @@ in }; } // lib.optionalAttrs config.allowAliases { + octolapse = throw "octoprint.python.pkgs.octolapse has been removed because it has been marked as broken since at least November 2024."; # Added 2025-09-29 octoprint-dashboard = super.dashboard; } diff --git a/pkgs/by-name/on/onionprobe/package.nix b/pkgs/by-name/on/onionprobe/package.nix new file mode 100644 index 000000000000..9481ac247586 --- /dev/null +++ b/pkgs/by-name/on/onionprobe/package.nix @@ -0,0 +1,38 @@ +{ + lib, + python3Packages, + fetchPypi, +}: + +python3Packages.buildPythonApplication rec { + pname = "onionprobe"; + version = "1.4.0"; + pyproject = true; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-rjExMm1mkoeRiv+aNuC6Ieo0/X5sbsjuSiAHcnQxjFo="; + }; + + build-system = with python3Packages; [ + setuptools + ]; + + dependencies = with python3Packages; [ + requests + stem + prometheus-client + pyyaml + pysocks + cryptography + ]; + + meta = { + description = "Tooling for onion service monitoring"; + homepage = "https://onionservices.torproject.org/apps/web/onionprobe/"; + changelog = "https://gitlab.torproject.org/tpo/onion-services/onionprobe/-/blob/${version}/docs/changelog.md"; + license = lib.licenses.gpl3Plus; + maintainers = [ lib.maintainers.ForgottenBeast ]; + mainProgram = "onionprobe"; + }; +} diff --git a/pkgs/by-name/op/open-webui/package.nix b/pkgs/by-name/op/open-webui/package.nix index 26f859a4265b..999a50f820cf 100644 --- a/pkgs/by-name/op/open-webui/package.nix +++ b/pkgs/by-name/op/open-webui/package.nix @@ -9,13 +9,13 @@ }: let pname = "open-webui"; - version = "0.6.32"; + version = "0.6.33"; src = fetchFromGitHub { owner = "open-webui"; repo = "open-webui"; tag = "v${version}"; - hash = "sha256-+P/IjELE1G2Fm8OwS5l7k78f78s/o1/Dy945aw+lfQw="; + hash = "sha256-+dxE+rYqVzjuTgV/PYb9fOW0kE4o+uf+h1IB0b1SU1M="; }; frontend = buildNpmPackage rec { @@ -32,7 +32,7 @@ let url = "https://github.com/pyodide/pyodide/releases/download/${pyodideVersion}/pyodide-${pyodideVersion}.tar.bz2"; }; - npmDepsHash = "sha256-BcSDzLg2voHyUz4cnXQ0KRNSbLCsCwJ1itEJSbfAQhU="; + npmDepsHash = "sha256-ztoLi386RTJXTxt8PjRQtrqY4y7clSOc7UbxdtoXFaI="; # See https://github.com/open-webui/open-webui/issues/15880 npmFlags = [ @@ -115,7 +115,6 @@ python3Packages.buildPythonApplication rec { fake-useragent fastapi faster-whisper - firecrawl-py fpdf2 ftfy google-api-python-client @@ -152,7 +151,6 @@ python3Packages.buildPythonApplication rec { opentelemetry-instrumentation-logging opentelemetry-instrumentation-httpx opentelemetry-instrumentation-aiohttp-client - oracledb pandas passlib peewee @@ -185,7 +183,6 @@ python3Packages.buildPythonApplication rec { soundfile starlette-compress starsessions - tencentcloud-sdk-python tiktoken transformers unstructured @@ -206,14 +203,16 @@ python3Packages.buildPythonApplication rec { all = [ colbert-ai elasticsearch - moto + firecrawl-py gcp-storage-emulator - playwright + moto oracledb pinecone-client + playwright pymilvus pymongo qdrant-client + tencentcloud-sdk-python ] ++ moto.optional-dependencies.s3 ++ postgres; diff --git a/pkgs/by-name/op/opencode/package.nix b/pkgs/by-name/op/opencode/package.nix index db1b9b5b5c62..36a2d617ea68 100644 --- a/pkgs/by-name/op/opencode/package.nix +++ b/pkgs/by-name/op/opencode/package.nix @@ -22,12 +22,12 @@ let in stdenvNoCC.mkDerivation (finalAttrs: { pname = "opencode"; - version = "0.14.5"; + version = "0.14.6"; src = fetchFromGitHub { owner = "sst"; repo = "opencode"; tag = "v${finalAttrs.version}"; - hash = "sha256-B5usCIYji85jIDAnBL/zLhmm14aEchq2DRzHb5pGkUo="; + hash = "sha256-L1B5N3nTYe65CFpVWshhZEpEC1zhHYkJ1WMGcVtS9Ec="; }; tui = buildGoModule { @@ -36,7 +36,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { modRoot = "packages/tui"; - vendorHash = "sha256-H+TybeyyHTbhvTye0PCDcsWkcN8M34EJ2ddxyXEJkZI="; + vendorHash = "sha256-g3+2q7yRaM6BgIs5oIXz/u7B84ZMMjnxXpvFpqDePU4="; subPackages = [ "cmd/opencode" ]; diff --git a/pkgs/by-name/or/or-tools/package.nix b/pkgs/by-name/or/or-tools/package.nix index 638b77782166..3d13cdf0b797 100644 --- a/pkgs/by-name/or/or-tools/package.nix +++ b/pkgs/by-name/or/or-tools/package.nix @@ -20,6 +20,9 @@ swig, unzip, zlib, + + scipopt-scip, + withScip ? true, }: let @@ -87,9 +90,13 @@ stdenv.mkDerivation (finalAttrs: { (lib.cmakeFeature "CMAKE_INSTALL_LIBDIR" "lib") (lib.cmakeBool "FETCH_PYTHON_DEPS" false) (lib.cmakeBool "USE_GLPK" true) - (lib.cmakeBool "USE_SCIP" false) + (lib.cmakeBool "USE_SCIP" withScip) (lib.cmakeFeature "Python3_EXECUTABLE" "${python3.pythonOnBuildForHost.interpreter}") ] + ++ lib.optionals withScip [ + # scip code parts require setting this unfortunately… + (lib.cmakeFeature "CMAKE_CXX_FLAGS" "-Wno-error=format-security") + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ (lib.cmakeBool "CMAKE_MACOSX_RPATH" false) ]; @@ -137,7 +144,12 @@ stdenv.mkDerivation (finalAttrs: { python3.pkgs.immutabledict python3.pkgs.numpy python3.pkgs.pandas + ] + ++ lib.optionals withScip [ + # Needed for downstream cmake consumers to not need to set SCIP_ROOT explicitly + scipopt-scip ]; + nativeCheckInputs = [ python3.pkgs.matplotlib python3.pkgs.pandas diff --git a/pkgs/by-name/or/ortp/package.nix b/pkgs/by-name/or/ortp/package.nix deleted file mode 100644 index 958453e58784..000000000000 --- a/pkgs/by-name/or/ortp/package.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ - bctoolbox, - cmake, - fetchFromGitLab, - lib, - stdenv, -}: - -stdenv.mkDerivation rec { - pname = "ortp"; - version = "5.2.109"; - - src = fetchFromGitLab { - domain = "gitlab.linphone.org"; - owner = "public"; - group = "BC"; - repo = "ortp"; - rev = version; - hash = "sha256-EgUPICdKi8c/E6uonZB4DKyOZ3Od4JM5/bR2U6cq9ew="; - }; - - # Do not build static libraries - cmakeFlags = [ "-DENABLE_STATIC=NO" ]; - - env.NIX_CFLAGS_COMPILE = "-Wno-error=stringop-truncation"; - - buildInputs = [ bctoolbox ]; - nativeBuildInputs = [ cmake ]; - - meta = with lib; { - description = "Real-Time Transport Protocol (RFC3550) stack. Part of the Linphone project"; - mainProgram = "ortp_tester"; - homepage = "https://linphone.org/technical-corner/ortp"; - license = licenses.gpl3Plus; - platforms = platforms.all; - maintainers = with maintainers; [ jluttine ]; - }; -} diff --git a/pkgs/by-name/os/osgqt/package.nix b/pkgs/by-name/os/osgqt/package.nix index b672cf61cdb5..bb6277c1cb8e 100644 --- a/pkgs/by-name/os/osgqt/package.nix +++ b/pkgs/by-name/os/osgqt/package.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "osgQt"; - version = "3.5.7"; + version = "3.5.7-unstable-2025-10-08"; src = fetchFromGitHub { owner = "openscenegraph"; repo = "osgQt"; - rev = finalAttrs.version; - hash = "sha256-iUeIqRDlcAHdKXWAi4WhEaOCxa7ZivQw0K5E7ccEKnM="; + rev = "effd111b747d786d4937de93973188a48eee3412"; + hash = "sha256-+rjy2a266p755Mbfk6jRApiERpOL8axHklK0cYokX40="; }; buildInputs = [ libsForQt5.qtbase ]; @@ -32,13 +32,6 @@ stdenv.mkDerivation (finalAttrs: { "-DOpenGL_GL_PREFERENCE=GLVND" ]; - postPatch = '' - substituteInPlace CMakeLists.txt --replace-fail \ - "FIND_PACKAGE(Qt5Widgets REQUIRED)" \ - "FIND_PACKAGE(Qt5Widgets REQUIRED) - FIND_PACKAGE(Qt5OpenGL REQUIRED)" - ''; - meta = { description = "Qt bindings for OpenSceneGraph"; homepage = "https://github.com/openscenegraph/osgQt"; diff --git a/pkgs/by-name/pi/pixi/package.nix b/pkgs/by-name/pi/pixi/package.nix index b0a9cfb14f23..f6341f7f1bef 100644 --- a/pkgs/by-name/pi/pixi/package.nix +++ b/pkgs/by-name/pi/pixi/package.nix @@ -14,16 +14,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "pixi"; - version = "0.55.0"; + version = "0.56.0"; src = fetchFromGitHub { owner = "prefix-dev"; repo = "pixi"; tag = "v${finalAttrs.version}"; - hash = "sha256-hMHOhdy8J/LQsrA1EWDuOP2weXB0NbXB++vyjaU4bkI="; + hash = "sha256-3YVIJLzFNJ5PlgT7NnxOtyA363A+qMpQPTr1N1E2daI="; }; - cargoHash = "sha256-W/kjdqyMMs6ICzDgPeZyaOlS8fVfdS7bFcGcxlp6aQo="; + cargoHash = "sha256-z9lsxQ08ZJ1xjhIXSP6adO+sMJk3adUKrXqKJy4MA0g="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/pl/plausible/package.nix b/pkgs/by-name/pl/plausible/package.nix index 33ed6a68dd9b..9313ae32117a 100644 --- a/pkgs/by-name/pl/plausible/package.nix +++ b/pkgs/by-name/pl/plausible/package.nix @@ -12,7 +12,6 @@ brotli, tailwindcss_3, esbuild, - ... }: let diff --git a/pkgs/by-name/py/pywal16/package.nix b/pkgs/by-name/py/pywal16/package.nix index 7acf51d007d2..727a29407e14 100644 --- a/pkgs/by-name/py/pywal16/package.nix +++ b/pkgs/by-name/py/pywal16/package.nix @@ -9,14 +9,14 @@ python3.pkgs.buildPythonApplication rec { pname = "pywal16"; - version = "3.8.9"; + version = "3.8.10"; pyproject = true; src = fetchFromGitHub { owner = "eylles"; repo = "pywal16"; tag = version; - hash = "sha256-43nKFTkIqaG9UzAjvNbZAog3NLMRKdtnZHxiiiBuD/4="; + hash = "sha256-OSWv6Pxmd5U1xydL45dVT6m7gu4Rx6Yln3R4dTFZoVE="; }; build-system = [ python3.pkgs.setuptools ]; diff --git a/pkgs/by-name/qu/quarkus/package.nix b/pkgs/by-name/qu/quarkus/package.nix index 6880637e3bf7..fc557f4fa5e8 100644 --- a/pkgs/by-name/qu/quarkus/package.nix +++ b/pkgs/by-name/qu/quarkus/package.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "quarkus-cli"; - version = "3.28.1"; + version = "3.28.2"; src = fetchurl { url = "https://github.com/quarkusio/quarkus/releases/download/${finalAttrs.version}/quarkus-cli-${finalAttrs.version}.tar.gz"; - hash = "sha256-cJpAm4OOYHtWctY9JVHNz9Nh/YCWv9TaA2fU5QYFOTQ="; + hash = "sha256-d5OrUShc8TKJAcFd0Y3Cu1nkuj+dJBOg5uCrEbssNyw="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/by-name/ra/rabbitmq-server/package.nix b/pkgs/by-name/ra/rabbitmq-server/package.nix index 997478adf5e2..660d517bfe62 100644 --- a/pkgs/by-name/ra/rabbitmq-server/package.nix +++ b/pkgs/by-name/ra/rabbitmq-server/package.nix @@ -1,9 +1,8 @@ { lib, + beamPackages, stdenv, fetchurl, - erlang, - elixir, python3, libxml2, libxslt, @@ -27,7 +26,7 @@ let runtimePath = lib.makeBinPath ( [ - erlang + beamPackages.erlang getconf # for getting memory limits socat gnused @@ -62,8 +61,8 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - erlang - elixir + beamPackages.erlang + beamPackages.elixir libxml2 libxslt glibcLocales diff --git a/pkgs/by-name/re/reaction/package.nix b/pkgs/by-name/re/reaction/package.nix index 0aee38377c71..93ccd3182523 100644 --- a/pkgs/by-name/re/reaction/package.nix +++ b/pkgs/by-name/re/reaction/package.nix @@ -7,17 +7,17 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "reaction"; - version = "2.2.0"; + version = "2.2.1"; src = fetchFromGitLab { domain = "framagit.org"; owner = "ppom"; repo = "reaction"; tag = "v${finalAttrs.version}"; - hash = "sha256-TVxBW47GqnfP8K8ZcjSR0P84dnb8Z5c3o11Ql5wsvLg="; + hash = "sha256-81i0bkrf86adQWxeZgIoZp/zQQbRJwPqQqZci0ANRFw="; }; - cargoHash = "sha256-ACacxDbJjbv7sP1D0wO6vjCVhlPui1ogXZKxY5l+3JU="; + cargoHash = "sha256-Bf9XmlY0IMPY4Convftd0Hv8mQbYoiE8WrkkAeaS6Z8="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/by-name/ri/rigel-engine/package.nix b/pkgs/by-name/ri/rigel-engine/package.nix index cd753f95fcd2..7bf08c4574e3 100644 --- a/pkgs/by-name/ri/rigel-engine/package.nix +++ b/pkgs/by-name/ri/rigel-engine/package.nix @@ -33,6 +33,7 @@ stdenv.mkDerivation { cmakeFlags = [ "-Wno-dev" + (lib.cmakeFeature "CMAKE_POLICY_VERSION_MINIMUM" "3.10") ] ++ lib.optional buildOpenGLES "-DUSE_GL_ES=ON"; diff --git a/pkgs/by-name/sc/scipopt-scip/0001-check-fix-invalid-ctest-invocation.patch b/pkgs/by-name/sc/scipopt-scip/0001-check-fix-invalid-ctest-invocation.patch new file mode 100644 index 000000000000..d6b1f5cd2e18 --- /dev/null +++ b/pkgs/by-name/sc/scipopt-scip/0001-check-fix-invalid-ctest-invocation.patch @@ -0,0 +1,40 @@ +From 7772c64ee2face1c1099c23ecbfd20ff663cffc3 Mon Sep 17 00:00:00 2001 +From: Florian Klink +Date: Tue, 7 Oct 2025 16:19:31 +0300 +Subject: [PATCH] check: fix invalid ctest invocation + +ctest doesn't like `-R "-default"`. CMake 4.0 fails with the following +error message: + +> CMake Error: Invalid value used with -R + +`-R` normally specifies the regex that needs to match. If none is +specified, all are selected: + +https://cmake.org/cmake/help/latest/manual/ctest.1.html#cmdoption-ctest-R + +This maybe never worked, but got silently ignored until +https://cmake.org/cmake/help/latest/policy/CMP0175.html + +Removing that regex should only cause *more* tests to get selected, not +less - and the build now succeeds with it. +--- + check/CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/check/CMakeLists.txt b/check/CMakeLists.txt +index 0d667d5..c26b978 100644 +--- a/check/CMakeLists.txt ++++ b/check/CMakeLists.txt +@@ -4,7 +4,7 @@ include(CTest) + # add a custom SCIP check target 'scip_check' + # + add_custom_target(scip_check +- COMMAND ${CMAKE_CTEST_COMMAND} -R "-default" -E "applications" --output-on-failure ++ COMMAND ${CMAKE_CTEST_COMMAND} -E "applications" --output-on-failure + DEPENDS scip + ) + +-- +2.51.0 + diff --git a/pkgs/by-name/sc/scipopt-scip/package.nix b/pkgs/by-name/sc/scipopt-scip/package.nix index dd09c6713d75..901fcbb9a073 100644 --- a/pkgs/by-name/sc/scipopt-scip/package.nix +++ b/pkgs/by-name/sc/scipopt-scip/package.nix @@ -1,7 +1,6 @@ { lib, stdenv, - fetchzip, fetchFromGitHub, cmake, zlib, @@ -29,6 +28,11 @@ stdenv.mkDerivation rec { hash = "sha256-Zc1AXNpHQXXFO8jkMaJj6xYkmkQxAM8G+SiPiH9xCAw="; }; + patches = [ + # https://github.com/scipopt/scip/pull/169 + ./0001-check-fix-invalid-ctest-invocation.patch + ]; + nativeBuildInputs = [ cmake ]; buildInputs = [ @@ -46,8 +50,6 @@ stdenv.mkDerivation rec { mpfr # if not included, throws fatal error: mpfr.h not found ]; - cmakeFlags = [ ]; - doCheck = true; meta = { diff --git a/pkgs/by-name/se/securefs/package.nix b/pkgs/by-name/se/securefs/package.nix index 41785780aa88..ab4a8825d966 100644 --- a/pkgs/by-name/se/securefs/package.nix +++ b/pkgs/by-name/se/securefs/package.nix @@ -3,26 +3,118 @@ stdenv, fetchFromGitHub, cmake, + pkg-config, + abseil-cpp, + boost, + cryptopp, fuse, + libargon2, + protobuf, + sqlite, + tclap, + _experimental-update-script-combinators, + nix-update-script, }: -stdenv.mkDerivation rec { +let + fruit = stdenv.mkDerivation (finalAttrs: { + pname = "fruit"; + version = "3.7.1-unstable-2025-05-12"; + + src = fetchFromGitHub { + owner = "google"; + repo = "fruit"; + rev = "19f5c05466565ef507a196b33de08f1c96dd0e58"; + hash = "sha256-amBwZ/9GmW8kf70lXP0iN2G1iflJLaf3crn/Ped7Zz8="; + }; + + nativeBuildInputs = [ cmake ]; + + buildInputs = [ boost ]; + + cmakeFlags = [ + (lib.cmakeBool "BUILD_SHARED_LIBS" true) + (lib.cmakeBool "FRUIT_USES_BOOST" true) + ]; + + meta = { + description = "Dependency injection framework for C++"; + homepage = "https://github.com/google/fruit"; + license = lib.licenses.asl20; + platforms = lib.platforms.linux; + }; + }); + + uni-algo = stdenv.mkDerivation (finalAttrs: { + pname = "uni-algo"; + version = "1.2.0"; + + src = fetchFromGitHub { + owner = "uni-algo"; + repo = "uni-algo"; + tag = "v${finalAttrs.version}"; + hash = "sha256-IyQrL/DWDj87GplSGJC4iQJAzNURLh9TRko5l+EIfuU="; + }; + + nativeBuildInputs = [ cmake ]; + + meta = { + description = "Unicode Algorithms Implementation for C/C++"; + homepage = "https://github.com/uni-algo/uni-algo"; + license = lib.licenses.mit; + platforms = lib.platforms.unix; + }; + }); +in +stdenv.mkDerivation (finalAttrs: { pname = "securefs"; - version = "0.13.1"; + version = "2.0.0"; src = fetchFromGitHub { owner = "netheril96"; repo = "securefs"; - tag = version; + tag = "v${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-7xjGuN7jcLgfGkaBoSj+WsBpM806PPGzeBs7DnI+fwc="; + hash = "sha256-ZY6FE8DCLip8p5eWqBtkVNxhGQp8zAVhkhM6kUsBZXo="; }; - nativeBuildInputs = [ cmake ]; - buildInputs = [ fuse ]; + nativeBuildInputs = [ + cmake + pkg-config + ]; - meta = with lib; { - inherit (src.meta) homepage; + buildInputs = [ + abseil-cpp + cryptopp + fruit + fuse + libargon2 + protobuf + uni-algo + sqlite + tclap + ]; + + cmakeFlags = [ + (lib.cmakeBool "SECUREFS_ENABLE_INTEGRATION_TEST" false) + (lib.cmakeBool "SECUREFS_ENABLE_UNIT_TEST" false) + (lib.cmakeBool "SECUREFS_USE_VCPKG" false) + ]; + + passthru = { + inherit fruit uni-algo; + updateScript = _experimental-update-script-combinators.sequence [ + (nix-update-script { + attrPath = "securefs.fruit"; + extraArgs = [ "--version=branch" ]; + }) + (nix-update-script { attrPath = "securefs.uni-algo"; }) + (nix-update-script { }) + ]; + }; + + meta = { + homepage = "https://github.com/netheril96/securefs"; description = "Transparent encryption filesystem"; longDescription = '' Securefs is a filesystem in userspace (FUSE) that transparently encrypts @@ -34,11 +126,11 @@ stdenv.mkDerivation rec { automatically updated to contain the encrypted and authenticated contents. ''; - license = with licenses; [ + license = with lib.licenses; [ bsd2 mit ]; - platforms = platforms.unix; + platforms = lib.platforms.unix; mainProgram = "securefs"; }; -} +}) diff --git a/pkgs/by-name/sh/shotcut/package.nix b/pkgs/by-name/sh/shotcut/package.nix index 0e1d20f3e69e..2c79ba11180c 100644 --- a/pkgs/by-name/sh/shotcut/package.nix +++ b/pkgs/by-name/sh/shotcut/package.nix @@ -7,11 +7,11 @@ frei0r, ladspaPlugins, gettext, - mlt, jack1, pkg-config, fftw, qt6, + qt6Packages, cmake, gitUpdater, ffmpeg, @@ -19,13 +19,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "shotcut"; - version = "25.01.25"; + version = "25.08.16"; src = fetchFromGitHub { owner = "mltframework"; repo = "shotcut"; tag = "v${finalAttrs.version}"; - hash = "sha256-YrnmhxD7Yf2LgdEaBU4mmRdvZdO6VQ6IAb4s+V9QvLM="; + hash = "sha256-PpMfiqUwG11H+7sLkp3sLzDWjco1OxYqGyfMAFojSPU="; }; nativeBuildInputs = [ @@ -39,7 +39,7 @@ stdenv.mkDerivation (finalAttrs: { frei0r ladspaPlugins gettext - mlt + qt6Packages.mlt fftw qt6.qtbase qt6.qttools @@ -54,7 +54,8 @@ stdenv.mkDerivation (finalAttrs: { patches = [ (replaceVars ./fix-mlt-ffmpeg-path.patch { - inherit mlt ffmpeg; + inherit ffmpeg; + mlt = qt6Packages.mlt; }) ]; diff --git a/pkgs/by-name/sn/snipe-it/package.nix b/pkgs/by-name/sn/snipe-it/package.nix index 16209a071298..fe875de0d6a9 100644 --- a/pkgs/by-name/sn/snipe-it/package.nix +++ b/pkgs/by-name/sn/snipe-it/package.nix @@ -7,18 +7,21 @@ php84, }: -php84.buildComposerProject2 (finalAttrs: { +let + php = php84; +in +php.buildComposerProject2 (finalAttrs: { pname = "snipe-it"; - version = "8.3.2"; + version = "8.3.3"; src = fetchFromGitHub { owner = "grokability"; repo = "snipe-it"; tag = "v${finalAttrs.version}"; - hash = "sha256-ZmOij8oDaMtLKbNEbzufvXy5fmLrGqwiDXzIpDVQ93o="; + hash = "sha256-Ttvq5KXTLtl3ZCRQACtVj4jC2cVGfDd+hUdRO3CbQjU="; }; - vendorHash = "sha256-13Mw2sjeSk4AmELjuD6Z7SgxLBgIeqzolq+rR992sEs="; + vendorHash = "sha256-Y5Jf9x0YIFHkuRwMR9X2D0b5/ULr6sTjmPHnQRXbF/s="; postInstall = '' snipe_it_out="$out/share/php/snipe-it" @@ -42,7 +45,7 @@ php84.buildComposerProject2 (finalAttrs: { passthru = { tests = nixosTests.snipe-it; - phpPackage = php84; + phpPackage = php; }; meta = { diff --git a/pkgs/development/libraries/soci/default.nix b/pkgs/by-name/so/soci/package.nix similarity index 100% rename from pkgs/development/libraries/soci/default.nix rename to pkgs/by-name/so/soci/package.nix diff --git a/pkgs/by-name/sp/spectre-cli/package.nix b/pkgs/by-name/sp/spectre-cli/package.nix index bafb0a70f6ca..9999de9b1111 100644 --- a/pkgs/by-name/sp/spectre-cli/package.nix +++ b/pkgs/by-name/sp/spectre-cli/package.nix @@ -35,6 +35,7 @@ stdenv.mkDerivation rec { ]; cmakeFlags = [ + "-DCMAKE_POLICY_VERSION_MINIMUM=3.5" "-DBUILD_SPECTRE_TESTS=ON" ]; diff --git a/pkgs/by-name/st/stalwart-mail/spam-filter.nix b/pkgs/by-name/st/stalwart-mail/spam-filter.nix index d0ca6c60b5af..5bfe50f709dd 100644 --- a/pkgs/by-name/st/stalwart-mail/spam-filter.nix +++ b/pkgs/by-name/st/stalwart-mail/spam-filter.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "spam-filter"; - version = "2.0.3"; + version = "2.0.4"; src = fetchFromGitHub { owner = "stalwartlabs"; repo = "spam-filter"; tag = "v${finalAttrs.version}"; - hash = "sha256-NhD/qUiGhgESwR2IOzAHfDATRlgWMcCktlktvVfDONk="; + hash = "sha256-unSRgmXE5T1QfE41E29BjJKpEAnMtYiAefcL2p7Cjak="; }; buildPhase = '' diff --git a/pkgs/by-name/st/steel/package.nix b/pkgs/by-name/st/steel/package.nix index dee6c7a61e17..8fa36cceb4ab 100644 --- a/pkgs/by-name/st/steel/package.nix +++ b/pkgs/by-name/st/steel/package.nix @@ -19,13 +19,13 @@ }: rustPlatform.buildRustPackage { pname = "steel"; - version = "0-unstable-2025-09-25"; + version = "0-unstable-2025-10-07"; src = fetchFromGitHub { owner = "mattwparas"; repo = "steel"; - rev = "27532d855c71a4080f46f69fb9bae0eccfdaea7f"; - hash = "sha256-GxmpBsL/ktR/Sd4q3/5FXQBV0tpdfsnBfbQcUzPIXHw="; + rev = "f18298647e727f9f79f312511bbf4e8e397998bb"; + hash = "sha256-vXSwAfJVjMuz2O/FSF+ijzTK8TYVY4a0Zuzrnqhpja8="; }; cargoHash = "sha256-CrmQhOfh7SQ5GvBywmYkfU6wMlgZq2x61+T+mIeQ7z4="; diff --git a/pkgs/by-name/ta/taglib_extras/package.nix b/pkgs/by-name/ta/taglib_extras/package.nix index cd4590c09acb..96c8b22f1826 100644 --- a/pkgs/by-name/ta/taglib_extras/package.nix +++ b/pkgs/by-name/ta/taglib_extras/package.nix @@ -29,6 +29,8 @@ stdenv.mkDerivation rec { zlib ]; + cmakeFlags = [ (lib.strings.cmakeFeature "CMAKE_POLICY_VERSION_MINIMUM" "3.5") ]; + # Workaround for upstream bug https://bugs.kde.org/show_bug.cgi?id=357181 preConfigure = '' sed -i -e 's/STRLESS/VERSION_LESS/g' cmake/modules/FindTaglib.cmake diff --git a/pkgs/by-name/tb/tbls/package.nix b/pkgs/by-name/tb/tbls/package.nix index 069ed9c27927..3974f43ebe15 100644 --- a/pkgs/by-name/tb/tbls/package.nix +++ b/pkgs/by-name/tb/tbls/package.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "tbls"; - version = "1.88.0"; + version = "1.89.0"; src = fetchFromGitHub { owner = "k1LoW"; repo = "tbls"; tag = "v${version}"; - hash = "sha256-NrRsP/VVcyNbSP/kedDekQsOGtvxKap3CjpTz5dW1TU="; + hash = "sha256-zgn1/GEfF4K23JqoI6OjqzmvutnAVhmmt0sEp+1b2DE="; }; - vendorHash = "sha256-yfUCzTaZdjv5qNl71xc2+M2u1hrydDiFgaklk4CKPG0="; + vendorHash = "sha256-hupOff2cJ+UrJFgMyDu3XYvEjyE/XvvyqiQq408wJsw="; excludedPackages = [ "scripts/jsonschema" ]; diff --git a/pkgs/development/libraries/languagemachines/ticcutils.nix b/pkgs/by-name/ti/ticcutils/package.nix similarity index 51% rename from pkgs/development/libraries/languagemachines/ticcutils.nix rename to pkgs/by-name/ti/ticcutils/package.nix index 2c828e557d9d..341ea6fe6a4b 100644 --- a/pkgs/development/libraries/languagemachines/ticcutils.nix +++ b/pkgs/by-name/ti/ticcutils/package.nix @@ -1,34 +1,36 @@ { lib, stdenv, - fetchurl, - automake, - autoconf, + fetchFromGitHub, + gitUpdater, libtool, + autoreconfHook, pkg-config, autoconf-archive, libxml2, zlib, bzip2, libtar, + frog, + timblserver, }: -let - release = lib.importJSON ./release-info/LanguageMachines-ticcutils.json; -in - -stdenv.mkDerivation { +stdenv.mkDerivation (finalAttrs: { pname = "ticcutils"; - version = release.version; - src = fetchurl { - inherit (release) url sha256; - name = "ticcutils-${release.version}.tar.gz"; + version = "0.15"; + + src = fetchFromGitHub { + owner = "LanguageMachines"; + repo = "ticcutils"; + tag = "v${finalAttrs.version}"; + hash = "sha256-1+Plo2yZyDJWn/Yk4pawQGzwdx2UBfER9ZYAYLgYGh0="; }; + nativeBuildInputs = [ pkg-config - automake - autoconf + autoreconfHook ]; + buildInputs = [ libtool autoconf-archive @@ -39,7 +41,18 @@ stdenv.mkDerivation { libtar # broken but optional: boost ]; - preConfigure = "sh bootstrap.sh"; + + passthru = { + updateScript = gitUpdater { rev-prefix = "v"; }; + tests = { + /** + Reverse dependencies. Does not respect overrides. + */ + reverseDependencies = lib.recurseIntoAttrs { + inherit frog timblserver; + }; + }; + }; meta = with lib; { description = "This module contains useful functions for general use in the TiCC software stack and beyond"; @@ -49,4 +62,4 @@ stdenv.mkDerivation { maintainers = with maintainers; [ roberth ]; }; -} +}) diff --git a/pkgs/development/libraries/languagemachines/timbl.nix b/pkgs/by-name/ti/timbl/package.nix similarity index 70% rename from pkgs/development/libraries/languagemachines/timbl.nix rename to pkgs/by-name/ti/timbl/package.nix index 77b63ac818c6..5caf814cb190 100644 --- a/pkgs/development/libraries/languagemachines/timbl.nix +++ b/pkgs/by-name/ti/timbl/package.nix @@ -1,33 +1,34 @@ { lib, stdenv, - fetchurl, - automake, - autoconf, + fetchFromGitHub, + gitUpdater, + autoreconfHook, libtool, pkg-config, autoconf-archive, libxml2, bzip2, libtar, - languageMachines, + ticcutils, + frog, + timblserver, }: -let - release = lib.importJSON ./release-info/LanguageMachines-timbl.json; -in - -stdenv.mkDerivation { +stdenv.mkDerivation (finalAttrs: { pname = "timbl"; - version = release.version; - src = fetchurl { - inherit (release) url sha256; - name = "timbl-${release.version}.tar.gz"; + version = "6.4.9"; + + src = fetchFromGitHub { + owner = "LanguageMachines"; + repo = "timbl"; + tag = "v${finalAttrs.version}"; + hash = "sha256-6hg/NiA5c5txyB7xYSlxA2WzAyNTF6JpupLpmzfxOYg="; }; + nativeBuildInputs = [ pkg-config - automake - autoconf + autoreconfHook ]; buildInputs = [ bzip2 @@ -35,9 +36,20 @@ stdenv.mkDerivation { libtool autoconf-archive libxml2 - languageMachines.ticcutils + ticcutils ]; - preConfigure = "sh bootstrap.sh"; + + passthru = { + updateScript = gitUpdater { rev-prefix = "v"; }; + tests = { + /** + Reverse dependencies. Does not respect overrides. + */ + reverseDependencies = lib.recurseIntoAttrs { + inherit frog timblserver; + }; + }; + }; meta = with lib; { description = "TiMBL implements several memory-based learning algorithms"; @@ -54,4 +66,4 @@ stdenv.mkDerivation { ''; }; -} +}) diff --git a/pkgs/development/libraries/languagemachines/timblserver.nix b/pkgs/by-name/ti/timblserver/package.nix similarity index 77% rename from pkgs/development/libraries/languagemachines/timblserver.nix rename to pkgs/by-name/ti/timblserver/package.nix index 66c8388012cd..49dcd8ce6757 100644 --- a/pkgs/development/libraries/languagemachines/timblserver.nix +++ b/pkgs/by-name/ti/timblserver/package.nix @@ -1,33 +1,33 @@ { lib, stdenv, - fetchurl, - automake, - autoconf, + fetchFromGitHub, + gitUpdater, + autoreconfHook, bzip2, libtar, libtool, pkg-config, autoconf-archive, libxml2, - languageMachines, + ticcutils, + timbl, }: -let - release = lib.importJSON ./release-info/LanguageMachines-timblserver.json; -in - -stdenv.mkDerivation { +stdenv.mkDerivation (finalAttrs: { pname = "timblserver"; - version = release.version; - src = fetchurl { - inherit (release) url sha256; - name = "timblserver-${release.version}.tar.gz"; + version = "1.11"; + + src = fetchFromGitHub { + owner = "LanguageMachines"; + repo = "timblserver"; + tag = "v${finalAttrs.version}"; + hash = "sha256-TE6fsgr/L5GcBjFKlU6S1DiT8OKP6i7TVirxj/OfhlM="; }; + nativeBuildInputs = [ pkg-config - automake - autoconf + autoreconfHook ]; buildInputs = [ bzip2 @@ -35,10 +35,13 @@ stdenv.mkDerivation { libtool autoconf-archive libxml2 - languageMachines.ticcutils - languageMachines.timbl + ticcutils + timbl ]; - preConfigure = "sh bootstrap.sh"; + + passthru = { + updateScript = gitUpdater { rev-prefix = "v"; }; + }; meta = with lib; { description = "This server for TiMBL implements several memory-based learning algorithms"; @@ -54,4 +57,4 @@ stdenv.mkDerivation { ''; }; -} +}) diff --git a/pkgs/by-name/ti/tinyobjloader/package.nix b/pkgs/by-name/ti/tinyobjloader/package.nix index a48259172c45..2a14104854b9 100644 --- a/pkgs/by-name/ti/tinyobjloader/package.nix +++ b/pkgs/by-name/ti/tinyobjloader/package.nix @@ -18,6 +18,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; + cmakeFlags = [ (lib.cmakeFeature "CMAKE_POLICY_VERSION_MINIMUM" "3.5") ]; + # https://github.com/tinyobjloader/tinyobjloader/issues/336 postPatch = '' substituteInPlace tinyobjloader.pc.in \ diff --git a/pkgs/by-name/tr/trx/package.nix b/pkgs/by-name/tr/trx/package.nix index 726b8e7615e7..2dcde72a0f6b 100644 --- a/pkgs/by-name/tr/trx/package.nix +++ b/pkgs/by-name/tr/trx/package.nix @@ -4,8 +4,7 @@ fetchurl, alsa-lib, libopus, - ortp, - bctoolbox, + linphonePackages, }: stdenv.mkDerivation rec { @@ -26,8 +25,8 @@ stdenv.mkDerivation rec { buildInputs = [ alsa-lib libopus - ortp - bctoolbox + linphonePackages.ortp + linphonePackages.bctoolbox ]; makeFlags = [ "PREFIX=$(out)" ]; diff --git a/pkgs/development/libraries/languagemachines/ucto.nix b/pkgs/by-name/uc/ucto/package.nix similarity index 65% rename from pkgs/development/libraries/languagemachines/ucto.nix rename to pkgs/by-name/uc/ucto/package.nix index f9b70f835685..69582342d2b3 100644 --- a/pkgs/development/libraries/languagemachines/ucto.nix +++ b/pkgs/by-name/uc/ucto/package.nix @@ -1,58 +1,71 @@ { lib, stdenv, - fetchurl, - automake, - autoconf, + fetchFromGitHub, + gitUpdater, + autoreconfHook, libtool, pkg-config, autoconf-archive, libxml2, - icu, + icu60, bzip2, libtar, - languageMachines, + ticcutils, + libfolia, + uctodata, + frog, }: -let - release = lib.importJSON ./release-info/LanguageMachines-ucto.json; -in - -stdenv.mkDerivation { +stdenv.mkDerivation (finalAttrs: { pname = "ucto"; - version = release.version; - src = fetchurl { - inherit (release) url sha256; - name = "ucto-${release.version}.tar.gz"; + version = "0.9.6"; + + src = fetchFromGitHub { + owner = "LanguageMachines"; + repo = "ucto"; + tag = "v${finalAttrs.version}"; + hash = "sha256-DFQ4ePE3n3zg0mrqUNHzE3Hi81n1IurYjhh6YVAghEE="; }; + nativeBuildInputs = [ pkg-config - automake - autoconf + autoreconfHook ]; buildInputs = [ bzip2 libtool autoconf-archive - icu + icu60 libtar libxml2 - languageMachines.ticcutils - languageMachines.libfolia - languageMachines.uctodata + ticcutils + libfolia + uctodata # TODO textcat from libreoffice? Pulls in X11 dependencies? ]; - preConfigure = "sh bootstrap.sh;"; postInstall = '' # ucto expects the data files installed in the same prefix mkdir -p $out/share/ucto/; - for f in ${languageMachines.uctodata}/share/ucto/*; do + for f in ${uctodata}/share/ucto/*; do echo "Linking $f" ln -s $f $out/share/ucto/; done; ''; + passthru = { + updateScript = gitUpdater { rev-prefix = "v"; }; + tests = { + /** + Reverse dependencies. Does not respect overrides. + */ + reverseDependencies = lib.recurseIntoAttrs { + inherit frog; + }; + }; + }; + meta = with lib; { description = "Rule-based tokenizer for natural language"; mainProgram = "ucto"; @@ -68,4 +81,4 @@ stdenv.mkDerivation { ''; }; -} +}) diff --git a/pkgs/development/libraries/languagemachines/uctodata.nix b/pkgs/by-name/uc/uctodata/package.nix similarity index 63% rename from pkgs/development/libraries/languagemachines/uctodata.nix rename to pkgs/by-name/uc/uctodata/package.nix index 0d2043a6a10a..0824ec5b3bd7 100644 --- a/pkgs/development/libraries/languagemachines/uctodata.nix +++ b/pkgs/by-name/uc/uctodata/package.nix @@ -1,35 +1,47 @@ { lib, stdenv, - fetchurl, - automake, - autoconf, + fetchFromGitHub, + gitUpdater, + autoreconfHook, libtool, pkg-config, autoconf-archive, + frog, }: -let - release = lib.importJSON ./release-info/LanguageMachines-uctodata.json; -in - -stdenv.mkDerivation { +stdenv.mkDerivation (finalAttrs: { pname = "uctodata"; - version = release.version; - src = fetchurl { - inherit (release) url sha256; - name = "uctodata-${release.version}.tar.gz"; + version = "0.4"; + + src = fetchFromGitHub { + owner = "LanguageMachines"; + repo = "uctodata"; + tag = "v${finalAttrs.version}"; + hash = "sha256-4P9icZSm+DYGxGobSGzSExTv+ZQaLjkJ0gvOI27byRk="; }; + nativeBuildInputs = [ pkg-config - automake - autoconf + autoreconfHook ]; + buildInputs = [ libtool autoconf-archive ]; - preConfigure = "sh bootstrap.sh"; + + passthru = { + updateScript = gitUpdater { rev-prefix = "v"; }; + tests = { + /** + Reverse dependencies. Does not respect overrides. + */ + reverseDependencies = lib.recurseIntoAttrs { + inherit frog; + }; + }; + }; meta = with lib; { description = "Rule-based tokenizer for natural language"; @@ -45,4 +57,4 @@ stdenv.mkDerivation { ''; }; -} +}) diff --git a/pkgs/by-name/ui/uiua/stable.nix b/pkgs/by-name/ui/uiua/stable.nix index 7007821e28fa..19917703bed0 100644 --- a/pkgs/by-name/ui/uiua/stable.nix +++ b/pkgs/by-name/ui/uiua/stable.nix @@ -1,7 +1,7 @@ rec { - version = "0.17.2"; + version = "0.17.3"; tag = version; - hash = "sha256-Ceuow3BguxLoBQEX88cRZe8KGVnddIG3ojuJsm+4EJA="; - cargoHash = "sha256-zD3Wi1SZbYaV+KlVB3EBPzFDafqP/jGjKuhhQoPb/P8="; + hash = "sha256-TiJAj+wBVb8Z9pnoscF65tB7flbk/XWW+7XrHlvIHeo="; + cargoHash = "sha256-smonKftOpGXy0WxI8Qqr0rTeI/pW6f+G4TxzoaEMsuc="; updateScript = ./update-stable.sh; } diff --git a/pkgs/by-name/ui/uiua/unstable.nix b/pkgs/by-name/ui/uiua/unstable.nix index fa67fc295145..a9a37051bd47 100644 --- a/pkgs/by-name/ui/uiua/unstable.nix +++ b/pkgs/by-name/ui/uiua/unstable.nix @@ -1,7 +1,7 @@ rec { - version = "0.17.2"; + version = "0.17.3"; tag = version; - hash = "sha256-Ceuow3BguxLoBQEX88cRZe8KGVnddIG3ojuJsm+4EJA="; - cargoHash = "sha256-zD3Wi1SZbYaV+KlVB3EBPzFDafqP/jGjKuhhQoPb/P8="; + hash = "sha256-TiJAj+wBVb8Z9pnoscF65tB7flbk/XWW+7XrHlvIHeo="; + cargoHash = "sha256-smonKftOpGXy0WxI8Qqr0rTeI/pW6f+G4TxzoaEMsuc="; updateScript = ./update-unstable.sh; } diff --git a/pkgs/by-name/up/upsun/versions.json b/pkgs/by-name/up/upsun/versions.json index 164467be61cc..951898afac13 100644 --- a/pkgs/by-name/up/upsun/versions.json +++ b/pkgs/by-name/up/upsun/versions.json @@ -1,19 +1,19 @@ { - "version": "5.5.0", + "version": "5.6.0", "darwin-amd64": { - "hash": "sha256-aLBaRBahtAcf9KArjrfuhPHNnUTko+kxhoaY5QeKB5E=", - "url": "https://github.com/platformsh/cli/releases/download/5.5.0/upsun_5.5.0_darwin_all.tar.gz" + "hash": "sha256-y9DQkHLvD6bUz0tfptdyN1qcsR34RWr7YxYB7NWKH9s=", + "url": "https://github.com/platformsh/cli/releases/download/5.6.0/upsun_5.6.0_darwin_all.tar.gz" }, "darwin-arm64": { - "hash": "sha256-aLBaRBahtAcf9KArjrfuhPHNnUTko+kxhoaY5QeKB5E=", - "url": "https://github.com/platformsh/cli/releases/download/5.5.0/upsun_5.5.0_darwin_all.tar.gz" + "hash": "sha256-y9DQkHLvD6bUz0tfptdyN1qcsR34RWr7YxYB7NWKH9s=", + "url": "https://github.com/platformsh/cli/releases/download/5.6.0/upsun_5.6.0_darwin_all.tar.gz" }, "linux-amd64": { - "hash": "sha256-RJuOddfXtT3yyphDSJ8sN8ibX30ALL9kRohGaw9jaeg=", - "url": "https://github.com/platformsh/cli/releases/download/5.5.0/upsun_5.5.0_linux_amd64.tar.gz" + "hash": "sha256-6cxwFnOULBVGIJJ1dQQn302NDooIytibay8OksfZT4g=", + "url": "https://github.com/platformsh/cli/releases/download/5.6.0/upsun_5.6.0_linux_amd64.tar.gz" }, "linux-arm64": { - "hash": "sha256-GbfYckZ91ki1D8e50fF3HRJ6NtTXgqkZe2PrbODAfcw=", - "url": "https://github.com/platformsh/cli/releases/download/5.5.0/upsun_5.5.0_linux_arm64.tar.gz" + "hash": "sha256-RhJmC7rCY5VZOXUcQKHm98TxbMC/uej5YN5KlwHsm08=", + "url": "https://github.com/platformsh/cli/releases/download/5.6.0/upsun_5.6.0_linux_arm64.tar.gz" } } diff --git a/pkgs/by-name/va/vault/package.nix b/pkgs/by-name/va/vault/package.nix index 9d7aa9158597..020054b5b8b8 100644 --- a/pkgs/by-name/va/vault/package.nix +++ b/pkgs/by-name/va/vault/package.nix @@ -12,19 +12,25 @@ buildGoModule rec { pname = "vault"; - version = "1.20.3"; + version = "1.20.4"; src = fetchFromGitHub { owner = "hashicorp"; repo = "vault"; rev = "v${version}"; - hash = "sha256-q7Uz8gq092JU1v6sEQvraV6wxgBEGGnZFCBEw2f9GMw="; + hash = "sha256-GZ+/NzOjcKTYOq4HajKGD68RNxIdXxfLo/pAewaZ8F8="; }; - vendorHash = "sha256-504WH4KaL1ecsuwXlELKhpbHHK67IcaI+I4DvEQerwA="; + vendorHash = "sha256-mhT5s1nIdX/57TDEaWwbni0E7DX0W0WwwvrSr7L66hI="; proxyVendor = true; + postPatch = '' + # Remove defunct github.com/hashicorp/go-cmp dependency + sed -i '/github\.com\/hashicorp\/go-cmp/d' go.mod + sed -i '/github\.com\/hashicorp\/go-cmp/d' go.sum + ''; + subPackages = [ "." ]; nativeBuildInputs = [ diff --git a/pkgs/by-name/vi/victoriametrics/package.nix b/pkgs/by-name/vi/victoriametrics/package.nix index 692fcc486f16..2ceb5c9ace3c 100644 --- a/pkgs/by-name/vi/victoriametrics/package.nix +++ b/pkgs/by-name/vi/victoriametrics/package.nix @@ -13,13 +13,13 @@ buildGoModule (finalAttrs: { pname = "VictoriaMetrics"; - version = "1.126.0"; + version = "1.127.0"; src = fetchFromGitHub { owner = "VictoriaMetrics"; repo = "VictoriaMetrics"; tag = "v${finalAttrs.version}"; - hash = "sha256-QVeg/F7oPPgSRTi5jcfTj15bD/7fQoPopahpUP9b0UA="; + hash = "sha256-j0PikCV0VWSfp2rvwssXwvkRGQzFNd6hidZv3bufUuI="; }; vendorHash = null; @@ -53,7 +53,7 @@ buildGoModule (finalAttrs: { # Allow older go versions substituteInPlace go.mod \ - --replace-fail "go 1.25.0" "go ${finalAttrs.passthru.go.version}" + --replace-fail "go 1.25.1" "go ${finalAttrs.passthru.go.version}" # Increase timeouts in tests to prevent failure on heavily loaded builders substituteInPlace lib/storage/storage_test.go \ diff --git a/pkgs/by-name/vu/vuls/package.nix b/pkgs/by-name/vu/vuls/package.nix index 88455716e47e..04f5b615b985 100644 --- a/pkgs/by-name/vu/vuls/package.nix +++ b/pkgs/by-name/vu/vuls/package.nix @@ -6,17 +6,17 @@ buildGo124Module rec { pname = "vuls"; - version = "0.35.0"; + version = "0.35.1"; src = fetchFromGitHub { owner = "future-architect"; repo = "vuls"; tag = "v${version}"; - hash = "sha256-Vrfqn2hZiUyJX2bBw3skWfIxNgtWwFrmknE97gz91Q0="; + hash = "sha256-bgeg5y1wFYDXr2M4yNNWbgKJhtdoUZJRPxpniAXCyRU="; fetchSubmodules = true; }; - vendorHash = "sha256-vhbHHhtDtwyrXZ/mSNKXwSSEzVZ2nCu/7Qs+LJEww5o="; + vendorHash = "sha256-DUkF1iqofgO9o34owkvQRkV+e7fA0VmeUz1VOPMiZIs="; ldflags = [ "-s" diff --git a/pkgs/by-name/wa/walker/package.nix b/pkgs/by-name/wa/walker/package.nix index 9317933de3ab..f41ccb991a69 100644 --- a/pkgs/by-name/wa/walker/package.nix +++ b/pkgs/by-name/wa/walker/package.nix @@ -1,30 +1,34 @@ { lib, - buildGoModule, + rustPlatform, fetchFromGitHub, pkg-config, - vips, + protobuf, + glib, gobject-introspection, wrapGAppsHook4, gtk4, gtk4-layer-shell, + gdk-pixbuf, + graphene, + cairo, + pango, + poppler, nix-update-script, - libqalculate, }: -buildGoModule rec { +rustPlatform.buildRustPackage rec { pname = "walker"; - version = "0.13.26"; + version = "2.2.0"; src = fetchFromGitHub { owner = "abenz1267"; repo = "walker"; rev = "v${version}"; - hash = "sha256-LslpfHXj31Lvq+26ZDzCTaGBbxmp7yXlgKT+uwUEEts="; + hash = "sha256-cSRd4ncUWjB59nRqY0X0eXioOIL7q7PwgOQggE54lTI="; }; - vendorHash = "sha256-N7lNxO/l3E1BlSSbSiQjrDPy2sWwk4G4JYlUArmMJxs="; - subPackages = [ "cmd/walker.go" ]; + cargoHash = "sha256-Nm7KxZBvQOk4gOJCtMyMVASepJDrVmogHqv6Tc1r33Q="; passthru.updateScript = nix-update-script { }; @@ -32,21 +36,26 @@ buildGoModule rec { pkg-config gobject-introspection wrapGAppsHook4 + protobuf ]; buildInputs = [ + glib gtk4 - vips gtk4-layer-shell - libqalculate + gdk-pixbuf + graphene + cairo + pango + poppler ]; - meta = with lib; { + meta = { description = "Wayland-native application runner"; homepage = "https://github.com/abenz1267/walker"; - license = licenses.mit; - platforms = platforms.linux; - maintainers = with maintainers; [ donovanglover ]; + license = lib.licenses.mit; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ donovanglover ]; mainProgram = "walker"; }; } diff --git a/pkgs/by-name/ya/yaookctl/package.nix b/pkgs/by-name/ya/yaookctl/package.nix index 5b888664d7b0..111cd18135e7 100644 --- a/pkgs/by-name/ya/yaookctl/package.nix +++ b/pkgs/by-name/ya/yaookctl/package.nix @@ -6,13 +6,13 @@ }: python3.pkgs.buildPythonApplication { pname = "yaookctl"; - version = "0-unstable-2025-08-25"; + version = "0-unstable-2025-09-25"; src = fetchFromGitLab { owner = "yaook"; repo = "yaookctl"; - rev = "205fab35f6680d15d86ef3596fe8a12590e3916c"; - hash = "sha256-V30581TeBtk/IvqBebsyT2lJ8bp8UkCH4AIy+mnnzCc="; + rev = "255dc7db8d532937be5b49f326ffcb346507b1e7"; + hash = "sha256-Hf+vmH4FrSMlNhYWeImn7//7Lt9k3nJoHT9LJwma3Yw="; }; pyproject = true; diff --git a/pkgs/development/beam-modules/default.nix b/pkgs/development/beam-modules/default.nix index 2c6dd9cc15dc..07f3b56d2322 100644 --- a/pkgs/development/beam-modules/default.nix +++ b/pkgs/development/beam-modules/default.nix @@ -76,11 +76,6 @@ let debugInfo = true; }; - elixir_1_14 = lib'.callElixir ../interpreters/elixir/1.14.nix { - inherit erlang; - debugInfo = true; - }; - # Remove old versions of elixir, when the supports fades out: # https://hexdocs.pm/elixir/compatibility-and-deprecations.html @@ -90,8 +85,7 @@ let elixir-ls = callPackage ./elixir-ls { inherit elixir; }; - lfe = lfe_2_1; - lfe_2_1 = lib'.callLFE ../interpreters/lfe/2.1.nix { inherit erlang buildRebar3 buildHex; }; + lfe = callPackage ../interpreters/lfe { inherit erlang buildRebar3 buildHex; }; livebook = callPackage ./livebook { }; diff --git a/pkgs/development/beam-modules/lib.nix b/pkgs/development/beam-modules/lib.nix index 282d40170761..368e6163daa9 100644 --- a/pkgs/development/beam-modules/lib.nix +++ b/pkgs/development/beam-modules/lib.nix @@ -34,25 +34,21 @@ rec { callErlang = drv: args: let - builder = callPackage ../../development/interpreters/erlang/generic-builder.nix args; + genericBuilder = + versionArgs: import ../../development/interpreters/erlang/generic-builder.nix (versionArgs // args); in - callPackage drv { - mkDerivation = pkgs.makeOverridable builder; - }; + pkgs.callPackage (import drv genericBuilder) { }; /* Uses generic-builder to evaluate provided drv containing Elixir version specific data. - drv: package containing version-specific args; - builder: generic builder for all Erlang versions; + drv: file containing version-specific args; + genericBuilder: generic builder for all Erlang versions; args: arguments merged into version-specific args, used mostly to customize - dependencies; + high level options; Arguments passed to the generic-builder are overridable. - - Please note that "mkDerivation" defined here is the one called from 1.4.nix - and similar files. */ callElixir = drv: args: diff --git a/pkgs/development/compilers/go/1.24.nix b/pkgs/development/compilers/go/1.24.nix index 8ee9c0f16725..0f91c4ebe86a 100644 --- a/pkgs/development/compilers/go/1.24.nix +++ b/pkgs/development/compilers/go/1.24.nix @@ -27,11 +27,11 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "go"; - version = "1.24.7"; + version = "1.24.8"; src = fetchurl { url = "https://go.dev/dl/go${finalAttrs.version}.src.tar.gz"; - hash = "sha256-Ko9Q2w+IgDYHxQ1+qINNy3vUg8a0KKkeNg/fhiS0ZGQ="; + hash = "sha256-sf8yxcSlDd+hoct4tg3Vo2KushhLt48Ai0JbYglXVfs="; }; strictDeps = true; diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 1df2ba2b8d74..179d884b041d 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -659632,7 +659632,7 @@ self: { hydraPlatforms = lib.platforms.none; broken = true; } - ) { inherit (pkgs) libtcod; }; + ) { libtcod = null; }; tconfig = callPackage ( { diff --git a/pkgs/development/interpreters/elixir/1.14.nix b/pkgs/development/interpreters/elixir/1.14.nix deleted file mode 100644 index 173941779e40..000000000000 --- a/pkgs/development/interpreters/elixir/1.14.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ mkDerivation }: - -mkDerivation { - version = "1.14.5"; - sha256 = "sha256-bCCTjFT+FG1hz+0H6k/izbCmi0JgO3Kkqc3LWWCs5Po="; - # https://hexdocs.pm/elixir/1.14.5/compatibility-and-deprecations.html#compatibility-between-elixir-and-erlang-otp - minimumOTPVersion = "23"; - maximumOTPVersion = "26"; -} diff --git a/pkgs/development/interpreters/elixir/1.19.nix b/pkgs/development/interpreters/elixir/1.19.nix index a8d9a73b0499..05564ed7f5fa 100644 --- a/pkgs/development/interpreters/elixir/1.19.nix +++ b/pkgs/development/interpreters/elixir/1.19.nix @@ -1,7 +1,7 @@ { mkDerivation }: mkDerivation { - version = "1.19.0-rc.1"; - sha256 = "sha256-GqnIVktRWT7f73a1EolFbKi70fz0ncuyqh3gl/17Zh0="; + version = "1.19.0-rc.2"; + sha256 = "sha256-RtJcnXjIqUw5h8Dsl8IPEaUVif4cHpUylmpmJCZ5EpM="; # https://hexdocs.pm/elixir/1.19.0-rc.1/compatibility-and-deprecations.html#between-elixir-and-erlang-otp minimumOTPVersion = "26"; escriptPath = "lib/elixir/scripts/generate_app.escript"; diff --git a/pkgs/development/interpreters/erlang/26.nix b/pkgs/development/interpreters/erlang/26.nix index 30e891baba29..c5b66de84d69 100644 --- a/pkgs/development/interpreters/erlang/26.nix +++ b/pkgs/development/interpreters/erlang/26.nix @@ -1,6 +1,6 @@ -{ mkDerivation }: +genericBuilder: -mkDerivation { +genericBuilder { version = "26.2.5.15"; - sha256 = "sha256-D2JfB7D9mhbmYvJfjSMbcdNrlYNWa/BfqAeqsbjTZlE="; + hash = "sha256-D2JfB7D9mhbmYvJfjSMbcdNrlYNWa/BfqAeqsbjTZlE="; } diff --git a/pkgs/development/interpreters/erlang/27.nix b/pkgs/development/interpreters/erlang/27.nix index ee6baf22b471..d51bc6a76572 100644 --- a/pkgs/development/interpreters/erlang/27.nix +++ b/pkgs/development/interpreters/erlang/27.nix @@ -1,6 +1,6 @@ -{ mkDerivation }: +genericBuilder: -mkDerivation { +genericBuilder { version = "27.3.4.3"; - sha256 = "sha256-p4M1PPrbpNq6la4kgTTCOa2f5/oYxNwMaSi59mhlM4o="; + hash = "sha256-p4M1PPrbpNq6la4kgTTCOa2f5/oYxNwMaSi59mhlM4o="; } diff --git a/pkgs/development/interpreters/erlang/28.nix b/pkgs/development/interpreters/erlang/28.nix index 8770a72299b0..46e8455afea0 100644 --- a/pkgs/development/interpreters/erlang/28.nix +++ b/pkgs/development/interpreters/erlang/28.nix @@ -1,6 +1,6 @@ -{ mkDerivation }: +genericBuilder: -mkDerivation { +genericBuilder { version = "28.1"; - sha256 = "sha256-rR31Zj7c2eNf608HhLNlrGnVQN/Nymug6EcPfeNHfqk="; + hash = "sha256-rR31Zj7c2eNf608HhLNlrGnVQN/Nymug6EcPfeNHfqk="; } diff --git a/pkgs/development/interpreters/erlang/generic-builder.nix b/pkgs/development/interpreters/erlang/generic-builder.nix index 0ba459dd3178..4b38d0d1ed20 100644 --- a/pkgs/development/interpreters/erlang/generic-builder.nix +++ b/pkgs/development/interpreters/erlang/generic-builder.nix @@ -1,253 +1,181 @@ { - lib, - stdenv, + # options set through beam-packages + # systemd support for epmd only + systemdSupport ? null, + wxSupport ? true, + + # options set by version specific files, e.g. 28.nix + version, + hash ? null, + +}: +{ + # overridable options + enableDebugInfo ? false, + enableHipe ? true, + enableKernelPoll ? true, + enableSmpSupport ? true, + enableThreads ? true, + javacSupport ? false, + odbcSupport ? false, + parallelBuild ? true, + fetchFromGitHub, - makeWrapper, gawk, gnum4, gnused, + lib, + libGL, + libGLU, libxml2, libxslt, + makeWrapper, ncurses, nix-update-script, + openjdk11, openssl, perl, runtimeShell, - openjdk11 ? null, # javacSupport - unixODBC ? null, # odbcSupport - libGL ? null, - libGLU ? null, - wxGTK ? null, - xorg ? null, - parallelBuild ? false, + stdenv, systemd, - wxSupport ? true, - # systemd support for epmd - systemdSupport ? lib.meta.availableOn stdenv.hostPlatform systemd, + unixODBC, wrapGAppsHook3, + wxGTK32, + xorg, zlib, }: -{ - baseName ? "erlang", - version, - sha256 ? null, - rev ? "OTP-${version}", - src ? fetchFromGitHub { - inherit rev sha256; - owner = "erlang"; - repo = "otp"; - }, - enableHipe ? true, - enableDebugInfo ? false, - enableThreads ? true, - enableSmpSupport ? true, - enableKernelPoll ? true, - javacSupport ? false, - javacPackages ? [ openjdk11 ], - odbcSupport ? false, - odbcPackages ? [ unixODBC ], - opensslPackage ? openssl, - wxPackages ? [ - libGL - libGLU - wxGTK - xorg.libX11 - wrapGAppsHook3 - ], - preUnpack ? "", - postUnpack ? "", - patches ? [ ], - patchPhase ? "", - prePatch ? "", - postPatch ? "", - configureFlags ? [ ], - configurePhase ? "", - preConfigure ? "", - postConfigure ? "", - buildPhase ? "", - preBuild ? "", - postBuild ? "", - installPhase ? "", - preInstall ? "", - postInstall ? "", - checkPhase ? "", - preCheck ? "", - postCheck ? "", - fixupPhase ? "", - preFixup ? "", - postFixup ? "", - meta ? { }, -}: - -assert - wxSupport - -> ( - if stdenv.hostPlatform.isDarwin then - wxGTK != null - else - libGL != null && libGLU != null && wxGTK != null && xorg != null - ); - -assert odbcSupport -> unixODBC != null; -assert javacSupport -> openjdk11 != null; - let inherit (lib) optional optionals - optionalAttrs optionalString ; - wxPackages2 = if stdenv.hostPlatform.isDarwin then [ wxGTK ] else wxPackages; + + wxPackages2 = + if stdenv.hostPlatform.isDarwin then + [ wxGTK32 ] + else + [ + libGL + libGLU + wxGTK32 + xorg.libX11 + wrapGAppsHook3 + ]; major = builtins.head (builtins.splitVersion version); + + enableSystemd = + if (systemdSupport == null) then + lib.meta.availableOn stdenv.hostPlatform systemd + else + systemdSupport; + + runtimePath = lib.makeBinPath [ + gawk + gnused + ]; in -stdenv.mkDerivation ( - { - # name is used instead of pname to - # - not have to pass pnames as argument - # - have a separate pname for erlang (main module) - name = - "${baseName}" - + optionalString javacSupport "_javac" - + optionalString odbcSupport "_odbc" - + "-${version}"; +stdenv.mkDerivation { + pname = "erlang" + optionalString javacSupport "_javac" + optionalString odbcSupport "_odbc"; + inherit version; - inherit src version; + src = fetchFromGitHub { + owner = "erlang"; + repo = "otp"; + tag = "OTP-${version}"; + inherit hash; + }; + env = { + # only build man pages and shell/IDE docs + DOC_TARGETS = "man chunks"; LANG = "C.UTF-8"; + }; - nativeBuildInputs = [ - makeWrapper - perl - gnum4 - libxslt - libxml2 - ]; + nativeBuildInputs = [ + makeWrapper + perl + gnum4 + libxslt + libxml2 + ]; - env = { - # only build man pages and shell/IDE docs - DOC_TARGETS = "man chunks"; + buildInputs = [ + ncurses + openssl + zlib + ] + ++ optionals wxSupport wxPackages2 + ++ optionals odbcSupport [ unixODBC ] + ++ optionals javacSupport [ openjdk11 ] + ++ optionals enableSystemd [ systemd ]; + + # disksup requires a shell + postPatch = '' + substituteInPlace lib/os_mon/src/disksup.erl --replace-fail '"sh ' '"${runtimeShell} ' + ''; + + debugInfo = enableDebugInfo; + + # On some machines, parallel build reliably crashes on `GEN asn1ct_eval_ext.erl` step + enableParallelBuilding = parallelBuild; + + configureFlags = [ + "--with-ssl=${lib.getOutput "out" openssl}" + "--with-ssl-incl=${lib.getDev openssl}" + ] + ++ optional enableThreads "--enable-threads" + ++ optional enableSmpSupport "--enable-smp-support" + ++ optional enableKernelPoll "--enable-kernel-poll" + ++ optional enableHipe "--enable-hipe" + ++ optional javacSupport "--with-javac" + ++ optional odbcSupport "--with-odbc=${unixODBC}" + ++ optional wxSupport "--enable-wx" + ++ optional enableSystemd "--enable-systemd" + ++ optional stdenv.hostPlatform.isDarwin "--enable-darwin-64bit" + # make[3]: *** [yecc.beam] Segmentation fault: 11 + ++ optional (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) "--disable-jit"; + + installTargets = [ + "install" + "install-docs" + ]; + + postInstall = '' + ln -sv $out/lib/erlang/lib/erl_interface*/bin/erl_call $out/bin/erl_call + + wrapProgram $out/lib/erlang/bin/erl --prefix PATH ":" "${runtimePath}" + wrapProgram $out/lib/erlang/bin/start_erl --prefix PATH ":" "${runtimePath}" + ''; + + passthru = { + updateScript = nix-update-script { + extraArgs = [ + "--version-regex" + "OTP-(${major}.*)" + "--override-filename" + "pkgs/development/interpreters/erlang/${major}.nix" + ]; }; + }; - buildInputs = [ - ncurses - opensslPackage - zlib - ] - ++ optionals wxSupport wxPackages2 - ++ optionals odbcSupport odbcPackages - ++ optionals javacSupport javacPackages - ++ optional systemdSupport systemd; + meta = { + homepage = "https://www.erlang.org/"; + downloadPage = "https://www.erlang.org/download.html"; + description = "Programming language used for massively scalable soft real-time systems"; - debugInfo = enableDebugInfo; - - # On some machines, parallel build reliably crashes on `GEN asn1ct_eval_ext.erl` step - enableParallelBuilding = parallelBuild; - - postPatch = '' - patchShebangs make - - ${postPatch} - '' - + optionalString (lib.versionOlder "25" version) '' - substituteInPlace lib/os_mon/src/disksup.erl \ - --replace-fail '"sh ' '"${runtimeShell} ' + longDescription = '' + Erlang is a programming language used to build massively scalable + soft real-time systems with requirements on high availability. + Some of its uses are in telecoms, banking, e-commerce, computer + telephony and instant messaging. Erlang's runtime system has + built-in support for concurrency, distribution and fault + tolerance. ''; - configureFlags = [ - "--with-ssl=${lib.getOutput "out" opensslPackage}" - ] - ++ [ "--with-ssl-incl=${lib.getDev opensslPackage}" ] # This flag was introduced in R24 - ++ optional enableThreads "--enable-threads" - ++ optional enableSmpSupport "--enable-smp-support" - ++ optional enableKernelPoll "--enable-kernel-poll" - ++ optional enableHipe "--enable-hipe" - ++ optional javacSupport "--with-javac" - ++ optional odbcSupport "--with-odbc=${unixODBC}" - ++ optional wxSupport "--enable-wx" - ++ optional systemdSupport "--enable-systemd" - ++ optional stdenv.hostPlatform.isDarwin "--enable-darwin-64bit" - # make[3]: *** [yecc.beam] Segmentation fault: 11 - ++ optional (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) "--disable-jit" - ++ configureFlags; - - # install-docs will generate and install manpages and html docs - # (PDFs are generated only when fop is available). - installTargets = [ - "install" - "install-docs" - ]; - - postInstall = '' - ln -s $out/lib/erlang/lib/erl_interface*/bin/erl_call $out/bin/erl_call - - ${postInstall} - ''; - - # Some erlang bin/ scripts run sed and awk - postFixup = '' - wrapProgram $out/lib/erlang/bin/erl --prefix PATH ":" "${gnused}/bin/" - wrapProgram $out/lib/erlang/bin/start_erl --prefix PATH ":" "${ - lib.makeBinPath [ - gnused - gawk - ] - }" - ''; - - passthru = { - updateScript = nix-update-script { - extraArgs = [ - "--version-regex" - "OTP-(${major}.*)" - "--override-filename" - "pkgs/development/interpreters/erlang/${major}.nix" - ]; - }; - }; - - meta = - with lib; - ( - { - homepage = "https://www.erlang.org/"; - downloadPage = "https://www.erlang.org/download.html"; - description = "Programming language used for massively scalable soft real-time systems"; - - longDescription = '' - Erlang is a programming language used to build massively scalable - soft real-time systems with requirements on high availability. - Some of its uses are in telecoms, banking, e-commerce, computer - telephony and instant messaging. Erlang's runtime system has - built-in support for concurrency, distribution and fault - tolerance. - ''; - - platforms = platforms.unix; - teams = [ teams.beam ]; - license = licenses.asl20; - } - // meta - ); - } - // optionalAttrs (preUnpack != "") { inherit preUnpack; } - // optionalAttrs (postUnpack != "") { inherit postUnpack; } - // optionalAttrs (patches != [ ]) { inherit patches; } - // optionalAttrs (prePatch != "") { inherit prePatch; } - // optionalAttrs (patchPhase != "") { inherit patchPhase; } - // optionalAttrs (configurePhase != "") { inherit configurePhase; } - // optionalAttrs (preConfigure != "") { inherit preConfigure; } - // optionalAttrs (postConfigure != "") { inherit postConfigure; } - // optionalAttrs (buildPhase != "") { inherit buildPhase; } - // optionalAttrs (preBuild != "") { inherit preBuild; } - // optionalAttrs (postBuild != "") { inherit postBuild; } - // optionalAttrs (checkPhase != "") { inherit checkPhase; } - // optionalAttrs (preCheck != "") { inherit preCheck; } - // optionalAttrs (postCheck != "") { inherit postCheck; } - // optionalAttrs (installPhase != "") { inherit installPhase; } - // optionalAttrs (preInstall != "") { inherit preInstall; } - // optionalAttrs (fixupPhase != "") { inherit fixupPhase; } - // optionalAttrs (preFixup != "") { inherit preFixup; } - // optionalAttrs (postFixup != "") { inherit postFixup; } -) + platforms = lib.platforms.unix; + teams = [ lib.teams.beam ]; + license = lib.licenses.asl20; + }; +} diff --git a/pkgs/development/interpreters/lfe/2.1.nix b/pkgs/development/interpreters/lfe/2.1.nix deleted file mode 100644 index 7ac2d6eef2b5..000000000000 --- a/pkgs/development/interpreters/lfe/2.1.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ mkDerivation }: - -mkDerivation { - version = "2.1.4"; - hash = "sha256-mDavRI2it0SrSR0iBItm2MfjI+F/zCy38YSd2KpE0Hs="; - maximumOTPVersion = "27"; -} diff --git a/pkgs/development/interpreters/lfe/generic-builder.nix b/pkgs/development/interpreters/lfe/default.nix similarity index 66% rename from pkgs/development/interpreters/lfe/generic-builder.nix rename to pkgs/development/interpreters/lfe/default.nix index 46ce5daa801c..ba29c073353f 100644 --- a/pkgs/development/interpreters/lfe/generic-builder.nix +++ b/pkgs/development/interpreters/lfe/default.nix @@ -1,43 +1,29 @@ { - config, - lib, - fetchFromGitHub, - erlang, - makeWrapper, - coreutils, bash, - buildRebar3, buildHex, -}: - -{ - baseName ? "lfe", - version, - maximumOTPVersion, - sha256 ? "", - hash ? "", - rev ? version, - src ? fetchFromGitHub { - inherit hash rev sha256; - owner = "lfe"; - repo = "lfe"; - }, - patches ? [ ], + buildRebar3, + config, + coreutils, + erlang, + fetchFromGitHub, + lib, + makeWrapper, }: let inherit (lib) assertMsg makeBinPath - optionalString getVersion versionAtLeast - versionOlder versions ; - mainVersion = versions.major (getVersion erlang); + version = "2.2.0"; + hash = "sha256-47lEUVU9Api1Yj1q+Ch8aIV8kaALhst1ty8RHTwMVcI="; + maximumOTPVersion = "27"; + mainVersion = versions.major (getVersion erlang); maxAssert = versionAtLeast maximumOTPVersion mainVersion; proper = buildHex { @@ -56,22 +42,27 @@ else LFE ${version} is supported on OTP <=${maximumOTPVersion}, not ${mainVersion}. ''; buildRebar3 { - name = baseName; + name = "lfe"; + inherit version; - inherit src version; + src = fetchFromGitHub { + owner = "lfe"; + repo = "lfe"; + tag = "v${version}"; + inherit hash; + }; + + patches = [ + ./fix-rebar-config.patch + ./dedup-ebins.patch + ]; nativeBuildInputs = [ makeWrapper erlang ]; + beamDeps = [ proper ]; - patches = [ - ./fix-rebar-config.patch - ./dedup-ebins.patch - ] - ++ patches; - doCheck = true; - checkTarget = "travis"; makeFlags = [ "-e" @@ -79,26 +70,12 @@ else "PREFIX=$$out" ]; - # These installPhase tricks are based on Elixir's Makefile. - # TODO: Make, upload, and apply a patch. - installPhase = optionalString (versionOlder version "1.3") '' - local libdir=$out/lib/lfe - local ebindir=$libdir/ebin - local bindir=$libdir/bin + # override buildRebar3's install to let the builder use make install + installPhase = ""; - rm -Rf $ebindir - install -m755 -d $ebindir - install -m644 _build/default/lib/lfe/ebin/* $ebindir + doCheck = true; + checkTarget = "travis"; - install -m755 -d $bindir - - for bin in bin/lfe{,c,doc,script}; do install -m755 $bin $bindir; done - - install -m755 -d $out/bin - for file in $bindir/*; do ln -sf $file $out/bin/; done - ''; - - # Thanks again, Elixir. postFixup = '' # LFE binaries are shell scripts which run erl and lfe. # Add some stuff to PATH so the scripts can run without problems. @@ -124,7 +101,8 @@ else ''; homepage = "https://lfe.io"; - downloadPage = "https://github.com/rvirding/lfe/releases"; + downloadPage = "https://github.com/lfe/lfe/releases"; + changelog = "https://github.com/lfe/lfe/releases/tag/v${version}"; license = licenses.asl20; teams = [ teams.beam ]; diff --git a/pkgs/development/libraries/ipu6-camera-hal/default.nix b/pkgs/development/libraries/ipu6-camera-hal/default.nix index 79d40d205e32..03b81646ce25 100644 --- a/pkgs/development/libraries/ipu6-camera-hal/default.nix +++ b/pkgs/development/libraries/ipu6-camera-hal/default.nix @@ -31,13 +31,13 @@ let in stdenv.mkDerivation { pname = "${ipuVersion}-camera-hal"; - version = "unstable-2024-09-29"; + version = "unstable-2025-06-27"; src = fetchFromGitHub { owner = "intel"; repo = "ipu6-camera-hal"; - rev = "f98f72b156563fe8373e4f8d017a9f609676bb33"; - hash = "sha256-zVcgKW7/GHYd1oMvsaI77cPyj3G68dL+OXBJDz5+Td4="; + rev = "c933525a6efe8229a7129b7b0b66798f19d2bef7"; + hash = "sha256-ZWwszteRmUBn0wGgN5rmzw/onfzBoPGadcmpk+93kAM="; }; nativeBuildInputs = [ @@ -46,15 +46,14 @@ stdenv.mkDerivation { ]; cmakeFlags = [ - "-DIPU_VER=${ipuVersion}" - "-DTARGET_SUFFIX=-${ipuVersion}" - # missing libiacss - "-DUSE_PG_LITE_PIPE=ON" "-DCMAKE_BUILD_TYPE=Release" "-DCMAKE_INSTALL_PREFIX=${placeholder "out"}" - "-DCMAKE_INSTALL_SUB_PATH=${ipuTarget}" "-DCMAKE_INSTALL_LIBDIR=lib" "-DCMAKE_POLICY_VERSION_MINIMUM=3.5" + "-DBUILD_CAMHAL_ADAPTOR=ON" + "-DBUILD_CAMHAL_PLUGIN=ON" + "-DIPU_VERSIONS=${ipuVersion}" + "-DUSE_PG_LITE_PIPE=ON" ]; NIX_CFLAGS_COMPILE = [ diff --git a/pkgs/development/libraries/languagemachines/frogdata.nix b/pkgs/development/libraries/languagemachines/frogdata.nix deleted file mode 100644 index 76ff3c1f4f18..000000000000 --- a/pkgs/development/libraries/languagemachines/frogdata.nix +++ /dev/null @@ -1,45 +0,0 @@ -{ - lib, - stdenv, - fetchurl, - automake, - autoconf, - libtool, - pkg-config, - autoconf-archive, -}: - -let - release = lib.importJSON ./release-info/LanguageMachines-frogdata.json; -in - -stdenv.mkDerivation { - pname = "frogdata"; - version = release.version; - src = fetchurl { - inherit (release) url sha256; - name = "frogdata-${release.version}.tar.gz"; - }; - nativeBuildInputs = [ - pkg-config - automake - autoconf - ]; - buildInputs = [ - libtool - autoconf-archive - ]; - - preConfigure = '' - sh bootstrap.sh - ''; - - meta = with lib; { - description = "Data for Frog, a Tagger-Lemmatizer-Morphological-Analyzer-Dependency-Parser for Dutch"; - homepage = "https://languagemachines.github.io/frog"; - license = licenses.gpl3; - platforms = platforms.all; - maintainers = with maintainers; [ roberth ]; - }; - -} diff --git a/pkgs/development/libraries/languagemachines/packages.nix b/pkgs/development/libraries/languagemachines/packages.nix deleted file mode 100644 index 8a490bbc9867..000000000000 --- a/pkgs/development/libraries/languagemachines/packages.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ pkgs }: -let - inherit (pkgs) callPackage; - icu = pkgs.icu60; -in -{ - ticcutils = callPackage ./ticcutils.nix { }; - libfolia = callPackage ./libfolia.nix { inherit icu; }; - ucto = callPackage ./ucto.nix { inherit icu; }; - uctodata = callPackage ./uctodata.nix { }; - timbl = callPackage ./timbl.nix { }; - timblserver = callPackage ./timblserver.nix { }; - mbt = callPackage ./mbt.nix { }; - frog = callPackage ./frog.nix { inherit icu; }; - frogdata = callPackage ./frogdata.nix { }; - - test = callPackage ./test.nix { }; -} diff --git a/pkgs/development/libraries/languagemachines/release-info/LanguageMachines-frog.json b/pkgs/development/libraries/languagemachines/release-info/LanguageMachines-frog.json deleted file mode 100644 index 55c2ec20a312..000000000000 --- a/pkgs/development/libraries/languagemachines/release-info/LanguageMachines-frog.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "version": "v0.13.7", - "url": "https://api.github.com/repos/LanguageMachines/frog/tarball/v0.13.7", - "sha256": "0swyfi3g862n888qj8v8kd18745hasy0vnc70i9qlv0ji0321bnf" -} diff --git a/pkgs/development/libraries/languagemachines/release-info/LanguageMachines-frogdata.json b/pkgs/development/libraries/languagemachines/release-info/LanguageMachines-frogdata.json deleted file mode 100644 index 6ea449387172..000000000000 --- a/pkgs/development/libraries/languagemachines/release-info/LanguageMachines-frogdata.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "version": "0.13", - "url": "https://api.github.com/repos/LanguageMachines/frogdata/tarball/v0.13", - "sha256": "13mhv8qacl0n20ddl1ay49xi6h2m0a149ya3rrsmaah3x4adb4sg" -} diff --git a/pkgs/development/libraries/languagemachines/release-info/LanguageMachines-libfolia.json b/pkgs/development/libraries/languagemachines/release-info/LanguageMachines-libfolia.json deleted file mode 100644 index 792d958213fb..000000000000 --- a/pkgs/development/libraries/languagemachines/release-info/LanguageMachines-libfolia.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "version": "v1.7", - "url": "https://api.github.com/repos/LanguageMachines/libfolia/tarball/v1.7", - "sha256": "0hpxdry7n2887klryc587xv46p6z6jp6hz9x7k2pk5v7jb0z4s65" -} diff --git a/pkgs/development/libraries/languagemachines/release-info/LanguageMachines-mbt.json b/pkgs/development/libraries/languagemachines/release-info/LanguageMachines-mbt.json deleted file mode 100644 index f1bbff47a28e..000000000000 --- a/pkgs/development/libraries/languagemachines/release-info/LanguageMachines-mbt.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "version": "v3.2.16", - "url": "https://api.github.com/repos/LanguageMachines/mbt/tarball/v3.2.16", - "sha256": "0f9f5l84m0lmmv4km9myn3yhy67jbmk3qn2fi40dy025gx4l0x3x" -} diff --git a/pkgs/development/libraries/languagemachines/release-info/LanguageMachines-ticcutils.json b/pkgs/development/libraries/languagemachines/release-info/LanguageMachines-ticcutils.json deleted file mode 100644 index 11069c6b02c7..000000000000 --- a/pkgs/development/libraries/languagemachines/release-info/LanguageMachines-ticcutils.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "version": "v0.15", - "url": "https://api.github.com/repos/LanguageMachines/ticcutils/tarball/v0.15", - "sha256": "0lssb1klx2flmr6fy78j37i5lbq3gfhzjx24j6n72ndm2rvprvcn" -} diff --git a/pkgs/development/libraries/languagemachines/release-info/LanguageMachines-timbl.json b/pkgs/development/libraries/languagemachines/release-info/LanguageMachines-timbl.json deleted file mode 100644 index d35f2c8333aa..000000000000 --- a/pkgs/development/libraries/languagemachines/release-info/LanguageMachines-timbl.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "version": "v6.4.9", - "url": "https://api.github.com/repos/LanguageMachines/timbl/tarball/v6.4.9", - "sha256": "1279npc3xlq05hnkylpbkgg941gjhvl6sd5fw4vgwcx2rwmmlaay" -} diff --git a/pkgs/development/libraries/languagemachines/release-info/LanguageMachines-timblserver.json b/pkgs/development/libraries/languagemachines/release-info/LanguageMachines-timblserver.json deleted file mode 100644 index d588da3f8b6e..000000000000 --- a/pkgs/development/libraries/languagemachines/release-info/LanguageMachines-timblserver.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "version": "v1.11", - "url": "https://api.github.com/repos/LanguageMachines/timblserver/tarball/v1.11", - "sha256": "02k8c704wr5miy82w6zj0imm7sdfnxf3db34qiaa8l3myhn17qlw" -} diff --git a/pkgs/development/libraries/languagemachines/release-info/LanguageMachines-ucto.json b/pkgs/development/libraries/languagemachines/release-info/LanguageMachines-ucto.json deleted file mode 100644 index 9b05cf3e1393..000000000000 --- a/pkgs/development/libraries/languagemachines/release-info/LanguageMachines-ucto.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "version": "v0.9.6", - "url": "https://api.github.com/repos/LanguageMachines/ucto/tarball/v0.9.6", - "sha256": "0fxq4j32g7kp6789xz23651c4v2j7zlz87cshfv9g1xjs7jxns3f" -} diff --git a/pkgs/development/libraries/languagemachines/release-info/LanguageMachines-uctodata.json b/pkgs/development/libraries/languagemachines/release-info/LanguageMachines-uctodata.json deleted file mode 100644 index 08069bb333bc..000000000000 --- a/pkgs/development/libraries/languagemachines/release-info/LanguageMachines-uctodata.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "version": "v0.4", - "url": "https://api.github.com/repos/LanguageMachines/uctodata/tarball/v0.4", - "sha256": "02c78qmwi9ijpk5wila3p62fmfdy1rpmlvvzbxs3wg0rdb0nwvd2" -} diff --git a/pkgs/development/libraries/languagemachines/update b/pkgs/development/libraries/languagemachines/update deleted file mode 100755 index 3189637df746..000000000000 --- a/pkgs/development/libraries/languagemachines/update +++ /dev/null @@ -1,79 +0,0 @@ -#!/usr/bin/env nix-shell -#!nix-shell --packages curl -#!nix-shell --packages jq -#!nix-shell --packages parallel -#!nix-shell -i bash - -# Exit immediately if a command exits with a non-zero status. -# Exit when a producer fails in a pipe -# Treat undefined variable references as errors -set -e -o pipefail -u - -# Check if working directory is (probably) right -test "./update" = $0 || { - echo "The working directory ought to be the same is the update script location. Please invoke as ./update" 1>&2 - exit 1 -} - -# Create temporary directory with automatic cleanup -readonly MY_TMP="$(mktemp -d)" -cleanup () { - rm -rf "$MY_TMP" -} -trap cleanup EXIT - -# stdout: file containing release info and a convenient placeholder -# for the sha256 attribute -getRelease () { - local owner="$1" - local repo="$2" - local out="$MY_TMP/$owner--$repo-release" - curl -fSs https://api.github.com/repos/"$owner"/"$repo"/releases/latest \ - | jq '{ version: .name, url: .tarball_url, sha256: "__SHA256__" }' \ - > "$out" - echo "$out" -} - -# 'getters' for the release info file - -# stdout: unquoted tarball url -releaseUrl () { - local file="$1" - jq -r '.url' <"$file" -} - -# stdout: unquoted version -releaseVersion () { - local file="$1" - jq -r '.version' <"$file" -} - -# Fetch release tarball and compute hash -# stdout: base32 sha256 to be used in fetchurl -getReleaseHash () { - local file="$1" - local name="$2" - nix-prefetch-url "$(releaseUrl "$file")" --name "$name-$(releaseVersion "$file").tar.gz" -} - -# Write a release info file to release-info/$owner-$repo.json -updateRelease () { - local owner="$1" - local repo="$2" - local r="$(getRelease "$owner" "$repo")" - local hash="$(getReleaseHash "$r" "$repo")" - sed \ - -e s/__SHA256__/"$hash"/\ - <"$r" \ - >"release-info/$owner-$repo.json" -} - -updateRelease LanguageMachines frogdata -updateRelease LanguageMachines frog -updateRelease LanguageMachines libfolia -updateRelease LanguageMachines mbt -updateRelease LanguageMachines ticcutils -updateRelease LanguageMachines timbl -updateRelease LanguageMachines timblserver -updateRelease LanguageMachines ucto -updateRelease LanguageMachines uctodata diff --git a/pkgs/development/libraries/mediastreamer/msopenh264.nix b/pkgs/development/libraries/mediastreamer/msopenh264.nix deleted file mode 100644 index 0fb31d565b4b..000000000000 --- a/pkgs/development/libraries/mediastreamer/msopenh264.nix +++ /dev/null @@ -1,49 +0,0 @@ -{ - cmake, - fetchFromGitLab, - mediastreamer, - openh264, - lib, - stdenv, -}: - -stdenv.mkDerivation { - pname = "msopenh264"; - version = "linphone-4.4.1"; - - src = fetchFromGitLab { - domain = "gitlab.linphone.org"; - owner = "public"; - group = "BC"; - repo = "msopenh264"; - rev = "5603a432be2ed10f5d5a5ce068ef83ab2a996d6b"; - sha256 = "sha256-AqZ7tsNZw2Djgyo1JBJbT/c3eQVyEn6r3CT6DQLD/B8="; - }; - - nativeBuildInputs = [ cmake ]; - buildInputs = [ - mediastreamer - openh264 - ]; - - # Do not build static libraries - cmakeFlags = [ - "-DENABLE_STATIC=NO" - "-DCMAKE_SKIP_INSTALL_RPATH=ON" - ]; - - # CMAKE_INSTALL_PREFIX has no effect so let's install manually. See: - # https://gitlab.linphone.org/BC/public/msopenh264/issues/1 - installPhase = '' - mkdir -p $out/lib/mediastreamer/plugins - cp src/libmsopenh264.so $out/lib/mediastreamer/plugins/ - ''; - - meta = with lib; { - description = "H.264 encoder/decoder plugin for mediastreamer2. Part of the Linphone project"; - homepage = "https://www.linphone.org/technical-corner/mediastreamer2"; - license = licenses.gpl2; - platforms = platforms.linux; - maintainers = with maintainers; [ jluttine ]; - }; -} diff --git a/pkgs/development/python-modules/aioshelly/default.nix b/pkgs/development/python-modules/aioshelly/default.nix index 588291f38598..3ce0aea5b6c0 100644 --- a/pkgs/development/python-modules/aioshelly/default.nix +++ b/pkgs/development/python-modules/aioshelly/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "aioshelly"; - version = "13.11.0"; + version = "13.12.0"; pyproject = true; disabled = pythonOlder "3.11"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "home-assistant-libs"; repo = "aioshelly"; tag = version; - hash = "sha256-Nx7CFGCQ5lJO21fjkR5yis3Rh+TzqWKAiK52BaKBAts="; + hash = "sha256-ajo7Uu9U2Xowncb4hF95Gx6YbVjTxY4a52mlU4yOy/0="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/arelle/default.nix b/pkgs/development/python-modules/arelle/default.nix index b7d147c411a8..032d6b02b31e 100644 --- a/pkgs/development/python-modules/arelle/default.nix +++ b/pkgs/development/python-modules/arelle/default.nix @@ -1,5 +1,4 @@ { - callPackage, lib, buildPythonPackage, fetchFromGitHub, @@ -25,6 +24,7 @@ gui ? true, tkinter, + aniso8601, pycryptodome, pg8000, pymysql, @@ -48,131 +48,120 @@ boto3, }: -# ideally we'd use finalAttrs.finalPackage instead of lib.fix for self-reference, -# but buildPythonPackage doesn't support it yet -lib.fix ( - self: - buildPythonPackage rec { - pname = "arelle${lib.optionalString (!gui) "-headless"}"; - version = "2.37.59"; - pyproject = true; +buildPythonPackage rec { + pname = "arelle${lib.optionalString (!gui) "-headless"}"; + version = "2.37.61"; + pyproject = true; - src = fetchFromGitHub { - owner = "Arelle"; - repo = "Arelle"; - tag = version; - hash = "sha256-ao4OKe3e1V3Df7396gVn4nqmpKNAbs5ny2y/GsxQwcE="; - }; + src = fetchFromGitHub { + owner = "Arelle"; + repo = "Arelle"; + tag = version; + hash = "sha256-xz3sDAgE1Qpml8V+2y+q/tTda6uGZuMnNSEGdIjLlzI="; + }; - outputs = [ - "out" - "doc" + outputs = [ + "out" + "doc" + ]; + + postPatch = '' + substituteInPlace pyproject.toml --replace-fail \ + 'requires = ["setuptools>=80.9,<81", "wheel>=0.45,<1", "setuptools_scm[toml]>=9.2,<10"]' \ + 'requires = ["setuptools", "wheel", "setuptools_scm[toml]"]' + ''; + + build-system = [ + setuptools + setuptools-scm + ]; + + dependencies = [ + bottle + certifi + filelock + isodate + jsonschema + lxml + numpy + openpyxl + pillow + pyparsing + python-dateutil + regex + truststore + typing-extensions + ] + ++ lib.optionals gui [ tkinter ]; + + optional-dependencies = { + crypto = [ pycryptodome ]; + db = [ + pg8000 + pymysql + pyodbc + rdflib ]; + efm = [ + holidays + pytz + ]; + esef = [ tinycss2 ]; + objectmaker = [ graphviz ]; + webserver = [ + cheroot + cherrypy + tornado + ]; + xule = [ aniso8601 ]; + }; - postPatch = '' - substituteInPlace pyproject.toml --replace-fail \ - 'requires = ["setuptools>=80.9,<81", "wheel>=0.45,<1", "setuptools_scm[toml]>=9.2,<10"]' \ - 'requires = ["setuptools", "wheel", "setuptools_scm[toml]"]' + nativeBuildInputs = [ + # deps for docs + sphinxHook + sphinx-autodoc2 + myst-parser + sphinx-copybutton + furo + ]; + + # the arelleGUI executable doesn't work when the gui option is false + postInstall = lib.optionalString (!gui) '' + find $out/bin -name "*arelleGUI*" -delete + ''; + + nativeCheckInputs = [ + pytestCheckHook + boto3 + ] + ++ lib.flatten (lib.attrValues optional-dependencies); + + preCheck = '' + export HOME=$(mktemp -d) + ''; + + disabledTestPaths = [ + "tests/integration_tests" + ] + ++ lib.optionals (!gui) [ + # these tests import tkinter + "tests/unit_tests/arelle/test_updater.py" + "tests/unit_tests/arelle/test_import.py" + ]; + + meta = { + description = "Open source XBRL platform"; + longDescription = '' + An open source facility for XBRL, the eXtensible Business Reporting + Language supporting various standards, exposed through a Python or + REST API ${lib.optionalString gui " and a graphical user interface"}. ''; - - build-system = [ - setuptools - setuptools-scm + mainProgram = "arelle"; + homepage = "http://arelle.org/"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ + tomasajt + roberth ]; - - dependencies = [ - bottle - certifi - filelock - isodate - jsonschema - lxml - numpy - openpyxl - pillow - pyparsing - python-dateutil - regex - truststore - typing-extensions - ] - ++ lib.optionals gui [ tkinter ]; - - optional-dependencies = { - crypto = [ pycryptodome ]; - db = [ - pg8000 - pymysql - pyodbc - rdflib - ]; - efm = [ - holidays - pytz - ]; - esef = [ tinycss2 ]; - objectmaker = [ graphviz ]; - webserver = [ - cheroot - cherrypy - tornado - ]; - }; - - nativeBuildInputs = [ - # deps for docs - sphinxHook - sphinx-autodoc2 - myst-parser - sphinx-copybutton - furo - ]; - - # the arelleGUI executable doesn't work when the gui option is false - postInstall = lib.optionalString (!gui) '' - find $out/bin -name "*arelleGUI*" -delete - ''; - - nativeCheckInputs = [ - pytestCheckHook - boto3 - ] - ++ lib.flatten (lib.attrValues optional-dependencies); - - preCheck = '' - export HOME=$(mktemp -d) - ''; - - disabledTestPaths = [ - "tests/integration_tests" - ] - ++ lib.optionals (!gui) [ - # these tests import tkinter - "tests/unit_tests/arelle/test_updater.py" - "tests/unit_tests/arelle/test_import.py" - ]; - - passthru.hasGUI = gui; - - passthru.tests = { - cli = callPackage ./test-cli.nix { arelle = self; }; - }; - - meta = { - changelog = "https://github.com/Arelle/Arelle/releases/tag/${src.tag}"; - description = "Open source XBRL platform"; - longDescription = '' - An open source facility for XBRL, the eXtensible Business Reporting - Language supporting various standards, exposed through a Python or - REST API ${lib.optionalString gui " and a graphical user interface"}. - ''; - mainProgram = "arelle"; - homepage = "http://arelle.org/"; - license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ - tomasajt - roberth - ]; - }; - } -) + }; +} diff --git a/pkgs/development/python-modules/boto3-stubs/default.nix b/pkgs/development/python-modules/boto3-stubs/default.nix index ca59ca4ff5ea..fc4bd90aea22 100644 --- a/pkgs/development/python-modules/boto3-stubs/default.nix +++ b/pkgs/development/python-modules/boto3-stubs/default.nix @@ -359,7 +359,7 @@ buildPythonPackage rec { pname = "boto3-stubs"; - version = "1.40.46"; + version = "1.40.47"; pyproject = true; disabled = pythonOlder "3.7"; @@ -367,7 +367,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "boto3_stubs"; inherit version; - hash = "sha256-TMRvhoZ0vqFwCLF8vlMK2dO5zV77rETMrKRTvVmz7U0="; + hash = "sha256-ZD7iS/i3ZREw6Z4VI4BWa9NKs10QL1lPMza6Ycyeeuw="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/camel-converter/default.nix b/pkgs/development/python-modules/camel-converter/default.nix index 258786d90811..ffeddc47c06b 100644 --- a/pkgs/development/python-modules/camel-converter/default.nix +++ b/pkgs/development/python-modules/camel-converter/default.nix @@ -6,21 +6,18 @@ pydantic, pytestCheckHook, pytest-cov-stub, - pythonOlder, }: buildPythonPackage rec { pname = "camel-converter"; - version = "4.0.1"; + version = "5.0.0"; pyproject = true; - disabled = pythonOlder "3.9"; - src = fetchFromGitHub { owner = "sanders41"; repo = "camel-converter"; tag = "v${version}"; - hash = "sha256-cHrMaf5PyFWacoi4t+Clow9qFAxbdn71p8ckuYMt27w="; + hash = "sha256-ADjgs72+tzMUdg2OS2bs1sMb0kMgVqBlUfYo+RRtsvg="; }; build-system = [ hatchling ]; @@ -45,7 +42,7 @@ buildPythonPackage rec { meta = with lib; { description = "Module to convert strings from snake case to camel case or camel case to snake case"; homepage = "https://github.com/sanders41/camel-converter"; - changelog = "https://github.com/sanders41/camel-converter/releases/tag/v${version}"; + changelog = "https://github.com/sanders41/camel-converter/releases/tag/${src.tag}"; license = licenses.mit; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/debian-inspector/default.nix b/pkgs/development/python-modules/debian-inspector/default.nix index b5785b93132f..e94c6fe0f644 100644 --- a/pkgs/development/python-modules/debian-inspector/default.nix +++ b/pkgs/development/python-modules/debian-inspector/default.nix @@ -7,20 +7,17 @@ commoncode, pytestCheckHook, setuptools-scm, - pythonOlder, }: buildPythonPackage rec { pname = "debian-inspector"; - version = "31.1.0"; + version = "31.1.1"; pyproject = true; - disabled = pythonOlder "3.7"; - src = fetchPypi { pname = "debian_inspector"; inherit version; - hash = "sha256-68+8FwZPEL07bSEizbyXtxpJSvDruvr5qM6t/osWT5k="; + hash = "sha256-uyFsYrb7D9cM1OQzkIERX0oV711uI/TEKF6t67z8egU="; }; dontConfigure = true; @@ -42,6 +39,7 @@ buildPythonPackage rec { meta = with lib; { description = "Utilities to parse Debian package, copyright and control files"; homepage = "https://github.com/nexB/debian-inspector"; + changelog = "https://github.com/aboutcode-org/debian-inspector/blob/v${version}/CHANGELOG.rst"; license = with licenses; [ asl20 bsd3 diff --git a/pkgs/development/python-modules/deepface/default.nix b/pkgs/development/python-modules/deepface/default.nix index cc877c8d8ea9..08913d0bacc8 100644 --- a/pkgs/development/python-modules/deepface/default.nix +++ b/pkgs/development/python-modules/deepface/default.nix @@ -12,7 +12,6 @@ opencv4, pandas, pillow, - pythonOlder, requests, retinaface, setuptools, @@ -22,16 +21,14 @@ buildPythonPackage rec { pname = "deepface"; - version = "0.0.94"; + version = "0.0.95"; pyproject = true; - disabled = pythonOlder "3.7"; - src = fetchFromGitHub { owner = "serengil"; repo = "deepface"; tag = "v${version}"; - hash = "sha256-jtDj1j2STjoEW6MdQai6ZuRYVmLo0Ga+VPJ01105Byc="; + hash = "sha256-BLbDW/NBeLKFcijMSeYfYxSFmqfG8WYHbVQpFyvMEZY="; }; postPatch = '' diff --git a/pkgs/development/python-modules/dtw-python/default.nix b/pkgs/development/python-modules/dtw-python/default.nix index 6bdadfac010d..9a6640ddc396 100644 --- a/pkgs/development/python-modules/dtw-python/default.nix +++ b/pkgs/development/python-modules/dtw-python/default.nix @@ -9,31 +9,28 @@ scipy, numpy, pytestCheckHook, - pythonOlder, }: buildPythonPackage rec { pname = "dtw-python"; - version = "1.5.3"; - format = "pyproject"; - - disabled = pythonOlder "3.6"; + version = "1.7.2"; + pyproject = true; src = fetchFromGitHub { owner = "DynamicTimeWarping"; repo = "dtw-python"; tag = "v${version}"; - hash = "sha256-Q2TffroAGS6DeU5hUE/M2Luuxa5VfU+wxbGdfhcioSA="; + hash = "sha256-DaYqKvjbp2yjL0a5f+vkB4OFOCWqt+f1HUUfarbns3A="; }; - nativeBuildInputs = [ + build-system = [ cython oldest-supported-numpy setuptools wheel ]; - propagatedBuildInputs = [ + dependencies = [ scipy numpy ]; @@ -44,16 +41,17 @@ buildPythonPackage rec { appendToVar enabledTestPaths "$src/tests" cd $out ''; + nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "dtw" ]; meta = with lib; { description = "Python port of R's Comprehensive Dynamic Time Warp algorithms package"; - mainProgram = "dtw"; homepage = "https://github.com/DynamicTimeWarping/dtw-python"; - changelog = "https://github.com/DynamicTimeWarping/dtw-python/blob/${src.rev}/CHANGELOG.md"; + changelog = "https://github.com/DynamicTimeWarping/dtw-python/blob/${src.tag}/CHANGELOG.md"; license = licenses.gpl3Only; maintainers = with maintainers; [ mbalatsko ]; + mainProgram = "dtw"; }; } diff --git a/pkgs/development/python-modules/dvc-objects/default.nix b/pkgs/development/python-modules/dvc-objects/default.nix index 92f56107ebb9..a2a504e6be54 100644 --- a/pkgs/development/python-modules/dvc-objects/default.nix +++ b/pkgs/development/python-modules/dvc-objects/default.nix @@ -3,11 +3,9 @@ buildPythonPackage, fetchFromGitHub, fsspec, - funcy, pytest-asyncio, pytest-mock, pytestCheckHook, - pythonOlder, reflink, setuptools-scm, shortuuid, @@ -15,16 +13,14 @@ buildPythonPackage rec { pname = "dvc-objects"; - version = "5.1.1"; + version = "5.1.2"; pyproject = true; - disabled = pythonOlder "3.8"; - src = fetchFromGitHub { owner = "iterative"; repo = "dvc-objects"; tag = version; - hash = "sha256-NjpQJhpNkl+M+aFWG0AaPUc546F7L23PcduMKNtGDL4="; + hash = "sha256-Lq881EnszwS+o8vaiiVgerdXAcalLT0PIJoW98+rw7w="; }; postPatch = '' @@ -32,9 +28,9 @@ buildPythonPackage rec { --replace " --benchmark-skip" "" ''; - nativeBuildInputs = [ setuptools-scm ]; + build-system = [ setuptools-scm ]; - propagatedBuildInputs = [ fsspec ] ++ lib.optionals (pythonOlder "3.12") [ funcy ]; + dependencies = [ fsspec ]; nativeCheckInputs = [ pytest-asyncio diff --git a/pkgs/development/python-modules/env-canada/default.nix b/pkgs/development/python-modules/env-canada/default.nix index f35b840a63b1..217af3e76b97 100644 --- a/pkgs/development/python-modules/env-canada/default.nix +++ b/pkgs/development/python-modules/env-canada/default.nix @@ -13,7 +13,6 @@ pytest-asyncio, pytestCheckHook, python-dateutil, - pythonOlder, setuptools, syrupy, voluptuous, @@ -21,16 +20,14 @@ buildPythonPackage rec { pname = "env-canada"; - version = "0.11.2"; + version = "0.11.3"; pyproject = true; - disabled = pythonOlder "3.11"; - src = fetchFromGitHub { owner = "michaeldavie"; repo = "env_canada"; tag = "v${version}"; - hash = "sha256-r0a2bMgWY6dH88aOJoNpmcSyQi207XDI3Ehu37kU9hY="; + hash = "sha256-9sgdoHsYklszt1y63WQ4BkIGLxprILx2kh7+BmmUlqE="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/ffmpy/default.nix b/pkgs/development/python-modules/ffmpy/default.nix index a576b37cd48f..23bc6a0eca9e 100644 --- a/pkgs/development/python-modules/ffmpy/default.nix +++ b/pkgs/development/python-modules/ffmpy/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "ffmpy"; - version = "0.6.1"; + version = "0.6.2"; pyproject = true; disabled = pythonOlder "3.8.1"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "Ch00k"; repo = "ffmpy"; tag = version; - hash = "sha256-u//L2vxucFlWmk1+pdp+iCrpzzMZUonDAn1LELgX86E="; + hash = "sha256-XFC7f8wdIsySIn4qXqo61GmRcaF0QciLYN5lwhzlIuA="; }; postPatch = diff --git a/pkgs/development/python-modules/fhir-py/default.nix b/pkgs/development/python-modules/fhir-py/default.nix index bc2316f0f5ca..26e1d6a00b52 100644 --- a/pkgs/development/python-modules/fhir-py/default.nix +++ b/pkgs/development/python-modules/fhir-py/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "fhir-py"; - version = "2.1.0"; + version = "2.2.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "beda-software"; repo = "fhir-py"; tag = "v${version}"; - hash = "sha256-ffaDWo/6xQwpMjiOCx3JIGtSHUjwcEilInD/YN73ZMI="; + hash = "sha256-C6ttVEYsnOzA4PFtq0wHfXrGSvpXOj0/oTuVDtx19qc="; }; build-system = [ flit-core ]; diff --git a/pkgs/development/python-modules/githubkit/default.nix b/pkgs/development/python-modules/githubkit/default.nix index de3e186bba64..ef2f8aa953f5 100644 --- a/pkgs/development/python-modules/githubkit/default.nix +++ b/pkgs/development/python-modules/githubkit/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "githubkit"; - version = "0.13.3"; + version = "0.13.4"; pyproject = true; src = fetchFromGitHub { owner = "yanyongyu"; repo = "githubkit"; tag = "v${version}"; - hash = "sha256-4THc5BNQGSrpf3Y3OoFisywEdKp8ZgNjle4yvVLUy1A="; + hash = "sha256-67Y0r4Po3z4YmnbWC0HBLmsKD68HMIGvHKo5SLe+KRc="; }; pythonRelaxDeps = [ "hishel" ]; diff --git a/pkgs/development/python-modules/holidays/default.nix b/pkgs/development/python-modules/holidays/default.nix index 00496fcc251e..10e386867eca 100644 --- a/pkgs/development/python-modules/holidays/default.nix +++ b/pkgs/development/python-modules/holidays/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "holidays"; - version = "0.81"; + version = "0.82"; pyproject = true; disabled = pythonOlder "3.8"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "vacanza"; repo = "python-holidays"; tag = "v${version}"; - hash = "sha256-p1+/BRi/4QG524nT9lns1AGc6jeO9KTJNJ2rljkrmko="; + hash = "sha256-H+qG9GqSPFODn0kWSIY/XJ1wAPI/iArCWR3yG+pFZXE="; }; build-system = [ diff --git a/pkgs/development/python-modules/iamdata/default.nix b/pkgs/development/python-modules/iamdata/default.nix index 05ebbeb3f0df..4d2e22a359a7 100644 --- a/pkgs/development/python-modules/iamdata/default.nix +++ b/pkgs/development/python-modules/iamdata/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "iamdata"; - version = "0.1.202510071"; + version = "0.1.202510081"; pyproject = true; src = fetchFromGitHub { owner = "cloud-copilot"; repo = "iam-data-python"; tag = "v${version}"; - hash = "sha256-BFcJBRuVV7+x89MuLova58HMNDLAmI0GwWo0nHWYkEs="; + hash = "sha256-hN5gHYhylmrOYiMTW+FE8G0CXf2kxKbPGbtQmjd8X7A="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/identify/default.nix b/pkgs/development/python-modules/identify/default.nix index c2bf5a407abd..ca269f8b8665 100644 --- a/pkgs/development/python-modules/identify/default.nix +++ b/pkgs/development/python-modules/identify/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "identify"; - version = "2.6.14"; + version = "2.6.15"; pyproject = true; disabled = pythonOlder "3.9"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "pre-commit"; repo = "identify"; tag = "v${version}"; - hash = "sha256-l486vlvhDEm9f11z1FDB9AxAbQ+jgHvGppn4CTc/dLk="; + hash = "sha256-YA9DwtAFjFYkycCJjBDXgIE4FKTt3En7fvw5xe37GZU="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/kasa-crypt/default.nix b/pkgs/development/python-modules/kasa-crypt/default.nix index 3aac26418377..e48ed869bc95 100644 --- a/pkgs/development/python-modules/kasa-crypt/default.nix +++ b/pkgs/development/python-modules/kasa-crypt/default.nix @@ -7,21 +7,18 @@ pytestCheckHook, pytest-cov-stub, setuptools, - pythonOlder, }: buildPythonPackage rec { pname = "kasa-crypt"; - version = "0.6.3"; + version = "1.1.0"; pyproject = true; - disabled = pythonOlder "3.7"; - src = fetchFromGitHub { owner = "bdraco"; repo = "kasa-crypt"; tag = "v${version}"; - hash = "sha256-PQycv0JHXKIEzuKVnXoyuU/BfKG19r3eDE4rYDiYYaY="; + hash = "sha256-rSRLrlV3QLatI2G8sd2jDwd6U8k4MrJil62ki1kNEMc="; }; build-system = [ diff --git a/pkgs/development/python-modules/llama-index-graph-stores-neo4j/default.nix b/pkgs/development/python-modules/llama-index-graph-stores-neo4j/default.nix index 871e927b0fa0..08beab28e8b9 100644 --- a/pkgs/development/python-modules/llama-index-graph-stores-neo4j/default.nix +++ b/pkgs/development/python-modules/llama-index-graph-stores-neo4j/default.nix @@ -2,10 +2,9 @@ lib, buildPythonPackage, fetchPypi, - neo4j, - llama-index-core, hatchling, - pythonOlder, + llama-index-core, + neo4j, }: buildPythonPackage rec { @@ -13,14 +12,14 @@ buildPythonPackage rec { version = "0.5.1"; pyproject = true; - disabled = pythonOlder "3.8"; - src = fetchPypi { pname = "llama_index_graph_stores_neo4j"; inherit version; hash = "sha256-P3EzR6piD49dFQY26LuV4/gZpOsFe5Hfp87BFiwo1Xg="; }; + pythonRelaxDeps = [ "neo4j" ]; + build-system = [ hatchling ]; dependencies = [ @@ -28,6 +27,9 @@ buildPythonPackage rec { llama-index-core ]; + # Tests are not shipped with PyPI package + doCheck = false; + pythonImportsCheck = [ "llama_index.graph_stores.neo4j" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/meshcore/default.nix b/pkgs/development/python-modules/meshcore/default.nix index 5065957daf5a..dc7910ffd547 100644 --- a/pkgs/development/python-modules/meshcore/default.nix +++ b/pkgs/development/python-modules/meshcore/default.nix @@ -14,12 +14,12 @@ buildPythonPackage rec { pname = "meshcore"; - version = "2.1.7"; + version = "2.1.9"; pyproject = true; src = fetchPypi { inherit pname version; - sha256 = "sha256-VEkpS6FTs7mCjhqFRL6+AisR0IKYrOWbx6irGfsucEc="; + sha256 = "sha256-FhTOuVHhpYvmITgxfhXys8AJhRfYnMwCJ3fWJhMf53w="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/minio/default.nix b/pkgs/development/python-modules/minio/default.nix index 77141d5675fb..4f84eaea2641 100644 --- a/pkgs/development/python-modules/minio/default.nix +++ b/pkgs/development/python-modules/minio/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchFromGitHub, - pythonOlder, # build-system setuptools, @@ -22,16 +21,14 @@ buildPythonPackage rec { pname = "minio"; - version = "7.2.17"; + version = "7.2.18"; pyproject = true; - disabled = pythonOlder "3.8"; - src = fetchFromGitHub { owner = "minio"; repo = "minio-py"; tag = version; - hash = "sha256-SP681EBKSyLl9V1TaI/7jsQOLPKKI+XwkR6hpoaSG/Y="; + hash = "sha256-2SmqtCWOwmSxi9vsBvH2bhYiUwc2LyZ/zO2jJpnhPDw="; }; postPatch = '' diff --git a/pkgs/development/python-modules/mkdocs-material/default.nix b/pkgs/development/python-modules/mkdocs-material/default.nix index 2a03aa21651d..fa299fb8cc2a 100644 --- a/pkgs/development/python-modules/mkdocs-material/default.nix +++ b/pkgs/development/python-modules/mkdocs-material/default.nix @@ -28,24 +28,24 @@ buildPythonPackage rec { pname = "mkdocs-material"; - version = "9.6.20"; + version = "9.6.21"; pyproject = true; src = fetchFromGitHub { owner = "squidfunk"; repo = "mkdocs-material"; tag = version; - hash = "sha256-4VvMy3eAkITASX8qRu8Qdgj2n92dz0vfZJo4q8EFLuU="; + hash = "sha256-zd1KJQOH3uHrePJbBgLuq++GSoM1KYW9VwpYnCrZZQY="; }; - nativeBuildInputs = [ + build-system = [ hatch-requirements-txt hatch-nodejs-version hatchling trove-classifiers ]; - propagatedBuildInputs = [ + dependencies = [ babel backrefs colorama diff --git a/pkgs/development/python-modules/msgraph-sdk/default.nix b/pkgs/development/python-modules/msgraph-sdk/default.nix index 2699a75c721c..abc8d81b78a5 100644 --- a/pkgs/development/python-modules/msgraph-sdk/default.nix +++ b/pkgs/development/python-modules/msgraph-sdk/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "msgraph-sdk"; - version = "1.45.0"; + version = "1.46.0"; pyproject = true; src = fetchFromGitHub { owner = "microsoftgraph"; repo = "msgraph-sdk-python"; tag = "v${version}"; - hash = "sha256-F/XjBg0dWE3iBEcgBvI9PTjVMuReUSDNwEB9j6we3SY="; + hash = "sha256-PAFRK+PLHG87ilD7Nslmj33bif2vBD6/SWmWMkv8HIY="; }; build-system = [ flit-core ]; diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix index 67754b4738f8..4a4766ba79c4 100644 --- a/pkgs/development/python-modules/mypy-boto3/default.nix +++ b/pkgs/development/python-modules/mypy-boto3/default.nix @@ -1061,8 +1061,8 @@ in "sha256-T04icQC+XwQZhaAEBWRiqfCUaayXP1szpbLdAG/7t3k="; mypy-boto3-proton = - buildMypyBoto3Package "proton" "1.40.16" - "sha256-6HufCNGwO9QsEJofZEWhyFwuGe5rA0hunAqudPXLw4o="; + buildMypyBoto3Package "proton" "1.40.47" + "sha256-BEHP+U37pdHVP7UABWkS3zUYNg+xE6Z/A8mmmd0/LmE="; mypy-boto3-qldb = buildMypyBoto3Package "qldb" "1.40.16" diff --git a/pkgs/development/python-modules/neo4j/default.nix b/pkgs/development/python-modules/neo4j/default.nix index 36d64c317dd0..48ea82a7a9d6 100644 --- a/pkgs/development/python-modules/neo4j/default.nix +++ b/pkgs/development/python-modules/neo4j/default.nix @@ -8,38 +8,29 @@ pythonOlder, pytz, setuptools, - tomlkit, }: buildPythonPackage rec { pname = "neo4j"; - version = "5.28.2"; + version = "6.0.2"; pyproject = true; - disabled = pythonOlder "3.7"; - src = fetchFromGitHub { owner = "neo4j"; repo = "neo4j-python-driver"; tag = version; - hash = "sha256-dQvQO+Re+ki9w+itzE6/WdiiLdMlU4yePt01vAPe4+M="; + hash = "sha256-0Idfa7hFrLSD26PpA/lJcVtYpAPcX+AF3wab092Sbzw="; }; postPatch = '' - # The dynamic versioning adds a postfix (.dev0) to the version substituteInPlace pyproject.toml \ --replace-fail "setuptools ==" "setuptools >=" \ - --replace-fail "tomlkit ==" "tomlkit >=" \ - --replace-fail 'dynamic = ["version", "readme"]' 'dynamic = ["readme"]' \ - --replace-fail '#readme = "README.rst"' 'version = "${version}"' + --replace-fail 'dynamic = ["version"]' 'version = "${version}"' ''; build-system = [ setuptools ]; - dependencies = [ - pytz - tomlkit - ]; + dependencies = [ pytz ]; optional-dependencies = { numpy = [ numpy ]; diff --git a/pkgs/development/python-modules/nicegui-highcharts/default.nix b/pkgs/development/python-modules/nicegui-highcharts/default.nix index 7dfd05482796..68d006d7d095 100644 --- a/pkgs/development/python-modules/nicegui-highcharts/default.nix +++ b/pkgs/development/python-modules/nicegui-highcharts/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "nicegui-highcharts"; - version = "2.1.0"; + version = "2.2.0"; pyproject = true; src = fetchFromGitHub { owner = "zauberzeug"; repo = "nicegui-highcharts"; tag = "v${version}"; - hash = "sha256-9COui3gqLZqJSeZyzazxQcOc2oM9Li+dLBoy5VcEKBw="; + hash = "sha256-kP7wU0gZRmBtcMFPypkGowSK2s8B2UD8A2XyK87WqEU="; }; postPatch = '' diff --git a/pkgs/development/python-modules/optuna/default.nix b/pkgs/development/python-modules/optuna/default.nix index a7407fdec887..07ee8fa12d60 100644 --- a/pkgs/development/python-modules/optuna/default.nix +++ b/pkgs/development/python-modules/optuna/default.nix @@ -138,6 +138,18 @@ buildPythonPackage rec { "test_visualizations_with_single_objectives" ]; + disabledTestPaths = lib.optionals stdenv.hostPlatform.isDarwin [ + # PermissionError: [Errno 13] Permission denied: '/tmp/optuna_find_free_port.lock' + "tests/storages_tests/journal_tests/test_combination_with_grpc.py" + "tests/storages_tests/test_grpc.py" + "tests/storages_tests/test_storages.py" + "tests/study_tests/test_dataframe.py" + "tests/study_tests/test_optimize.py" + "tests/study_tests/test_study.py" + "tests/trial_tests/test_frozen.py" + "tests/trial_tests/test_trial.py" + ]; + __darwinAllowLocalNetworking = true; pythonImportsCheck = [ "optuna" ]; diff --git a/pkgs/development/python-modules/plopp/default.nix b/pkgs/development/python-modules/plopp/default.nix index e4482f35e79d..0b3b053f35fe 100644 --- a/pkgs/development/python-modules/plopp/default.nix +++ b/pkgs/development/python-modules/plopp/default.nix @@ -35,14 +35,14 @@ buildPythonPackage rec { pname = "plopp"; - version = "25.09.0"; + version = "25.10.0"; pyproject = true; src = fetchFromGitHub { owner = "scipp"; repo = "plopp"; tag = version; - hash = "sha256-4qC+2FlbnhlJkXX0aDaxIVKi9Cf47x8ml9o5pY0Kiv4="; + hash = "sha256-b9f08Wf6SGNb2rTnOqZhsSvRcfg1T+JXItZa67q2vtM="; }; build-system = [ diff --git a/pkgs/development/python-modules/pluginbase/default.nix b/pkgs/development/python-modules/pluginbase/default.nix index cc330ac93f9b..eb318545012f 100644 --- a/pkgs/development/python-modules/pluginbase/default.nix +++ b/pkgs/development/python-modules/pluginbase/default.nix @@ -2,30 +2,31 @@ lib, fetchPypi, buildPythonPackage, - pytest, + setuptools, }: buildPythonPackage rec { - version = "1.0.1"; - format = "setuptools"; pname = "pluginbase"; + version = "1.0.1"; + pyproject = true; src = fetchPypi { inherit pname version; - sha256 = "ff6c33a98fce232e9c73841d787a643de574937069f0d18147028d70d7dee287"; + hash = "sha256-/2wzqY/OIy6cc4QdeHpkPeV0k3Bp8NGBRwKNcNfe4oc="; }; - nativeCheckInputs = [ pytest ]; + build-system = [ setuptools ]; - checkPhase = '' - cd tests - PYTHONPATH=.. pytest - ''; + # https://github.com/mitsuhiko/pluginbase/issues/24 + doCheck = false; - meta = with lib; { + pythonImportsCheck = [ "pluginbase" ]; + + meta = { + description = "Support library for building plugins systems in Python"; homepage = "https://github.com/mitsuhiko/pluginbase"; - description = "Support library for building plugins sytems in Python"; - license = licenses.bsd3; - platforms = platforms.all; + changelog = "https://github.com/mitsuhiko/pluginbase/releases/tag/${version}"; + license = lib.licenses.bsd3; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/pydevccu/default.nix b/pkgs/development/python-modules/pydevccu/default.nix index 51a4f2fa69ba..5eb9b9fed943 100644 --- a/pkgs/development/python-modules/pydevccu/default.nix +++ b/pkgs/development/python-modules/pydevccu/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "pydevccu"; - version = "0.1.17"; + version = "0.1.18"; pyproject = true; disabled = pythonOlder "3.13"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "SukramJ"; repo = "pydevccu"; tag = version; - hash = "sha256-yBAnQVuLXcGY+hGVo0Oqes5puSF0VflpMvHRAZHndyo="; + hash = "sha256-+IUPj27+eU2e215LkF+Qqv5vtRqASPP7dEBTvfT/KEo="; }; postPatch = '' diff --git a/pkgs/development/python-modules/pyeconet/default.nix b/pkgs/development/python-modules/pyeconet/default.nix index 274ba160ee6b..847ee34eac19 100644 --- a/pkgs/development/python-modules/pyeconet/default.nix +++ b/pkgs/development/python-modules/pyeconet/default.nix @@ -4,22 +4,19 @@ buildPythonPackage, fetchFromGitHub, paho-mqtt, - pythonOlder, setuptools, }: buildPythonPackage rec { pname = "pyeconet"; - version = "0.1.28"; + version = "0.2.0"; pyproject = true; - disabled = pythonOlder "3.7"; - src = fetchFromGitHub { owner = "w1ll1am23"; repo = "pyeconet"; tag = "v${version}"; - hash = "sha256-xGjQlOiA2SzSuhdD/jUYYtL8EiYj4jaIp85JqcGiaUI="; + hash = "sha256-Q0J1UUvifdf1ePFz4G3Tk0bn1TnnWaHQRABgsohHvB0="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/pyexploitdb/default.nix b/pkgs/development/python-modules/pyexploitdb/default.nix index cc02c9efa926..a6c09d40b976 100644 --- a/pkgs/development/python-modules/pyexploitdb/default.nix +++ b/pkgs/development/python-modules/pyexploitdb/default.nix @@ -3,22 +3,19 @@ buildPythonPackage, fetchPypi, gitpython, - pythonOlder, requests, setuptools, }: buildPythonPackage rec { pname = "pyexploitdb"; - version = "0.2.100"; + version = "0.2.101"; pyproject = true; - disabled = pythonOlder "3.7"; - src = fetchPypi { pname = "pyExploitDb"; inherit version; - hash = "sha256-z98mrmfIM96rb+PT25HzwkfFDgZ50wRw9eQlsD4yqik="; + hash = "sha256-ZiNFLX3L4Fc6fJxd2sUlF+tU2PL544fOu36niFN+aoM="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/pyjson5/default.nix b/pkgs/development/python-modules/pyjson5/default.nix index 912f41364a76..0ad91ceedf48 100644 --- a/pkgs/development/python-modules/pyjson5/default.nix +++ b/pkgs/development/python-modules/pyjson5/default.nix @@ -3,23 +3,20 @@ buildPythonPackage, cython, fetchFromGitHub, - pythonOlder, setuptools, wheel, }: buildPythonPackage rec { pname = "pyjson5"; - version = "1.6.9"; + version = "2.0.0"; pyproject = true; - disabled = pythonOlder "3.7"; - src = fetchFromGitHub { owner = "Kijewski"; repo = "pyjson5"; tag = "v${version}"; - hash = "sha256-3uxuJvxTn6C3MWShXQlILPApgtumgGOeaaMlBvRaHiU="; + hash = "sha256-vHO354ZjaQirOWavfaDvenE+MLQLhWF3bCHa5Z1NNXg="; fetchSubmodules = true; }; diff --git a/pkgs/development/python-modules/pylacus/default.nix b/pkgs/development/python-modules/pylacus/default.nix index f06da4e6d370..e75298bb7a8c 100644 --- a/pkgs/development/python-modules/pylacus/default.nix +++ b/pkgs/development/python-modules/pylacus/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "pylacus"; - version = "1.16.1"; + version = "1.18.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "ail-project"; repo = "PyLacus"; tag = "v${version}"; - hash = "sha256-sGTr0M3cintyjXtdABtaw7tvbKz/reibYM3xDUL0kOk="; + hash = "sha256-N0FGjT/Jq5n2J2omk/W1tsjiAZY4WlsEs33ErKOuCl4="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/pylamarzocco/default.nix b/pkgs/development/python-modules/pylamarzocco/default.nix index 554536a48448..b8580c8e7ca6 100644 --- a/pkgs/development/python-modules/pylamarzocco/default.nix +++ b/pkgs/development/python-modules/pylamarzocco/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "pylamarzocco"; - version = "2.1.1"; + version = "2.1.2"; pyproject = true; src = fetchFromGitHub { owner = "zweckj"; repo = "pylamarzocco"; tag = "v${version}"; - hash = "sha256-ciOyz+d91zYP8XJF7HnDeZ0XmqDyQgP1DAOwJeQLnm0="; + hash = "sha256-gDIp7QcjXqJUlsr0xEIJEDQnmuOkD/BxATfv0fiGGpI="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/pylance/default.nix b/pkgs/development/python-modules/pylance/default.nix index 23189073c34a..1d27aa6a034b 100644 --- a/pkgs/development/python-modules/pylance/default.nix +++ b/pkgs/development/python-modules/pylance/default.nix @@ -32,14 +32,14 @@ buildPythonPackage rec { pname = "pylance"; - version = "0.38.1"; + version = "0.38.2"; pyproject = true; src = fetchFromGitHub { owner = "lancedb"; repo = "lance"; tag = "v${version}"; - hash = "sha256-0oFErLwyApLIgX4SqU0qi02NidL9iZQ2zBSwdUFfX7Q="; + hash = "sha256-H4HQzLmQdDS8aS/OMsIHjWEogmctkF+5N5ClozeuITU="; }; sourceRoot = "${src.name}/python"; @@ -51,7 +51,7 @@ buildPythonPackage rec { src sourceRoot ; - hash = "sha256-j2Wy8o9erM7c5eA6W+dr38uAODNhMMEqQa7limZ8Rmg="; + hash = "sha256-A4qZERrYm8FELuJNqy/fhbJxLxTp73oY7jc5bZavFFI="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pyporscheconnectapi/default.nix b/pkgs/development/python-modules/pyporscheconnectapi/default.nix index 73116e365fe6..f264fccdb906 100644 --- a/pkgs/development/python-modules/pyporscheconnectapi/default.nix +++ b/pkgs/development/python-modules/pyporscheconnectapi/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "pyporscheconnectapi"; - version = "0.2.4"; + version = "0.2.5"; pyproject = true; src = fetchFromGitHub { owner = "CJNE"; repo = "pyporscheconnectapi"; tag = version; - hash = "sha256-fU+P2M4TQzhyNk4CfcTBpaIOFC0sPaOLh/iGCjLIG5I="; + hash = "sha256-uB8dbAWoHUWuvWyUhPV1P2wPH/ZzVX22PJNEiDYoOA4="; }; postPatch = '' diff --git a/pkgs/development/python-modules/python-kadmin-rs/default.nix b/pkgs/development/python-modules/python-kadmin-rs/default.nix index 5c45c36cd4ef..7694ed48dc34 100644 --- a/pkgs/development/python-modules/python-kadmin-rs/default.nix +++ b/pkgs/development/python-modules/python-kadmin-rs/default.nix @@ -17,19 +17,19 @@ buildPythonPackage rec { pname = "python-kadmin-rs"; - version = "0.6.2"; + version = "0.6.3"; pyproject = true; src = fetchFromGitHub { owner = "authentik-community"; repo = "kadmin-rs"; rev = "kadmin/version/${version}"; - hash = "sha256-0YE9LGrc0qUhbNBEXqiaPZM5kwW1JkL+RHkDi16msog="; + hash = "sha256-ofoxgaTflem/QG/aQc6M5oxrUl/YoLHzDWlNyeVr0H8="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit src; - hash = "sha256-Cnn8C3Wdwl4ZS7mDKRxuK30lr2ympOcmqKPIL59RKxk="; + hash = "sha256-mSwuR8TCljPYgVhguZiu2fXprCl+IEyZxE7ML+FBI98="; }; buildInputs = [ diff --git a/pkgs/development/python-modules/pyzstd/default.nix b/pkgs/development/python-modules/pyzstd/default.nix index fac7f269a108..6f5393fa7a7b 100644 --- a/pkgs/development/python-modules/pyzstd/default.nix +++ b/pkgs/development/python-modules/pyzstd/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "pyzstd"; - version = "0.17.0"; + version = "0.18.0"; pyproject = true; src = fetchFromGitHub { owner = "Rogdham"; repo = "pyzstd"; tag = version; - hash = "sha256-PICYdB/xu/q2wjbkF2nziZt8z8PmzJ5eM+Yq0rpLfEU="; + hash = "sha256-15+GqJ/AMYs1R9ywo+muNVVbPkkzTMj//Zn/PPI+MCI="; }; postPatch = '' @@ -26,6 +26,9 @@ buildPythonPackage rec { # required for Python 3.9 under Windows substituteInPlace pyproject.toml \ --replace-fail '"setuptools>=64,<74"' '"setuptools"' + + # pyzst needs a copy of upstream zstd's license + ln -s ${zstd-c.src}/LICENSE zstd ''; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/qiling/default.nix b/pkgs/development/python-modules/qiling/default.nix index 34de987c8e4e..3e4cdc3d0d4e 100644 --- a/pkgs/development/python-modules/qiling/default.nix +++ b/pkgs/development/python-modules/qiling/default.nix @@ -55,6 +55,7 @@ buildPythonPackage rec { homepage = "https://qiling.io/"; changelog = "https://github.com/qilingframework/qiling/releases/tag/${version}"; license = licenses.gpl2Only; + broken = true; maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/qiskit/default.nix b/pkgs/development/python-modules/qiskit/default.nix index 7a54eb295059..b40d0c27b933 100644 --- a/pkgs/development/python-modules/qiskit/default.nix +++ b/pkgs/development/python-modules/qiskit/default.nix @@ -71,8 +71,6 @@ buildPythonPackage rec { downloadPage = "https://github.com/QISKit/qiskit/releases"; changelog = "https://qiskit.org/documentation/release_notes.html"; license = licenses.asl20; - maintainers = with maintainers; [ - pandaman - ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/reflex/default.nix b/pkgs/development/python-modules/reflex/default.nix index b36c223e5ae8..144f78733233 100644 --- a/pkgs/development/python-modules/reflex/default.nix +++ b/pkgs/development/python-modules/reflex/default.nix @@ -42,14 +42,14 @@ buildPythonPackage rec { pname = "reflex"; - version = "0.8.12"; + version = "0.8.14"; pyproject = true; src = fetchFromGitHub { owner = "reflex-dev"; repo = "reflex"; tag = "v${version}"; - hash = "sha256-NNjabOL5ls5aUaM+KiyLRwrkh2nAnwMYwDsd+jIsGLc="; + hash = "sha256-w3qikUqo61UBJHVjbzeNCf97AZyBHLI+PkkXrVQBNAk="; }; # 'rich' is also somehow checked when building the wheel, diff --git a/pkgs/development/python-modules/rigour/default.nix b/pkgs/development/python-modules/rigour/default.nix index 3e1816a95999..7a137a560772 100644 --- a/pkgs/development/python-modules/rigour/default.nix +++ b/pkgs/development/python-modules/rigour/default.nix @@ -21,14 +21,14 @@ buildPythonPackage rec { pname = "rigour"; - version = "1.3.7"; + version = "1.3.10"; pyproject = true; src = fetchFromGitHub { owner = "opensanctions"; repo = "rigour"; tag = "v${version}"; - hash = "sha256-XlKP5XHJGnDwaHS43enkGVPoSXDz7+oEyDSG3xghBXM="; + hash = "sha256-M3PfcfVz4oS3DloZB5Q78sIPDjinwZJJKketXcEp44o="; }; build-system = [ diff --git a/pkgs/development/python-modules/securityreporter/default.nix b/pkgs/development/python-modules/securityreporter/default.nix index 6397909880a1..a5148e072d78 100644 --- a/pkgs/development/python-modules/securityreporter/default.nix +++ b/pkgs/development/python-modules/securityreporter/default.nix @@ -5,23 +5,20 @@ fetchFromGitHub, poetry-core, pytestCheckHook, - pythonOlder, requests, responses, }: buildPythonPackage rec { pname = "securityreporter"; - version = "1.2.0"; + version = "1.3.0"; pyproject = true; - disabled = pythonOlder "3.10"; - src = fetchFromGitHub { owner = "dongit-org"; repo = "python-reporter"; tag = "v${version}"; - hash = "sha256-fpsvjbPE6iaOmLxykGSkCjkhFTmb8xhXa8pDrWN66KM="; + hash = "sha256-YvUDgsKM0JUajp8JAR2vj30QsNtcGvADGCZ791ZZD/8="; }; postPatch = '' diff --git a/pkgs/development/python-modules/sharkiq/default.nix b/pkgs/development/python-modules/sharkiq/default.nix index 14f17f42dfa0..f7976059511d 100644 --- a/pkgs/development/python-modules/sharkiq/default.nix +++ b/pkgs/development/python-modules/sharkiq/default.nix @@ -6,21 +6,30 @@ fetchFromGitHub, requests, setuptools, + setuptools-scm, }: buildPythonPackage rec { pname = "sharkiq"; - version = "1.4.0"; + version = "1.4.1"; pyproject = true; src = fetchFromGitHub { owner = "JeffResc"; repo = "sharkiq"; tag = "v${version}"; - hash = "sha256-XPqrEE/GwIn4sqbhETRPhBBPkH8Je+LKoDV+qDb3Ry8="; + hash = "sha256-AGulExhA+dmRbCjrLJngRee8yT+q/djyNe7toY1FeFg="; }; - build-system = [ setuptools ]; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail "setuptools-scm>=9.2.0" "setuptools-scm" + ''; + + build-system = [ + setuptools + setuptools-scm + ]; dependencies = [ aiohttp diff --git a/pkgs/development/python-modules/slack-bolt/default.nix b/pkgs/development/python-modules/slack-bolt/default.nix index 34b47d9bd157..8cae5fd6f945 100644 --- a/pkgs/development/python-modules/slack-bolt/default.nix +++ b/pkgs/development/python-modules/slack-bolt/default.nix @@ -34,27 +34,23 @@ # tests docker, - pytest-asyncio, + pytest-asyncio_0, pytestCheckHook, + writableTmpDirAsHomeHook, }: buildPythonPackage rec { pname = "slack-bolt"; - version = "1.23.0"; + version = "1.26.0"; pyproject = true; src = fetchFromGitHub { owner = "slackapi"; repo = "bolt-python"; tag = "v${version}"; - hash = "sha256-Aq7vLkrTeBVsY+xVwQhFmSqq8ik0yHEmPANtKyJZKTw="; + hash = "sha256-5VbljuIYuPNPVZ6OwK9GV0ZyCNtMH7aPogOoBaaVb5A="; }; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace-fail '"pytest-runner==6.0.1",' "" - ''; - build-system = [ setuptools ]; dependencies = [ slack-sdk ]; @@ -89,15 +85,12 @@ buildPythonPackage rec { nativeCheckInputs = [ docker - pytest-asyncio + pytest-asyncio_0 pytestCheckHook + writableTmpDirAsHomeHook ] ++ lib.flatten (builtins.attrValues optional-dependencies); - preCheck = '' - export HOME="$(mktemp -d)" - ''; - __darwinAllowLocalNetworking = true; disabledTestPaths = [ diff --git a/pkgs/development/python-modules/slack-sdk/default.nix b/pkgs/development/python-modules/slack-sdk/default.nix index e5c122f9eb2b..60809522f772 100644 --- a/pkgs/development/python-modules/slack-sdk/default.nix +++ b/pkgs/development/python-modules/slack-sdk/default.nix @@ -18,14 +18,14 @@ buildPythonPackage rec { pname = "slack-sdk"; - version = "3.36.0"; + version = "3.37.0"; pyproject = true; src = fetchFromGitHub { owner = "slackapi"; repo = "python-slack-sdk"; tag = "v${version}"; - hash = "sha256-Y6w4osSpirBjxPdZRlODwEAWd4Z+sPHrr7alVl/6mPA="; + hash = "sha256-yckw0qA/NhnqN9HvF06Q5IqDmUTsPuo4JSKMrKXUGuc="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/sphinx-prompt/default.nix b/pkgs/development/python-modules/sphinx-prompt/default.nix index 40bcd6d0603a..46c13eadfca1 100644 --- a/pkgs/development/python-modules/sphinx-prompt/default.nix +++ b/pkgs/development/python-modules/sphinx-prompt/default.nix @@ -28,6 +28,10 @@ buildPythonPackage rec { hash = "sha256-JKCTn2YkdyGLvchMT9C61PxjYxuQFzt3SjCE9JvgtVc="; }; + postPatch = '' + substituteInPlace pyproject.toml --replace-fail 'version = "0.0.0"' 'version = "${version}"' + ''; + build-system = [ poetry-core poetry-dynamic-versioning @@ -39,9 +43,15 @@ buildPythonPackage rec { sphinx ]; - nativeCheckInputs = [ pytestCheckHook ]; + # upstream pins these unnecessarily in their requirements.txt + pythonRelaxDeps = [ + "certifi" + "requests" + "urllib3" + "zipp" + ]; - pythonRelaxDeps = [ "requests" ]; + nativeCheckInputs = [ pytestCheckHook ]; meta = with lib; { description = "Sphinx extension for creating unselectable prompt"; diff --git a/pkgs/development/python-modules/sqlmap/default.nix b/pkgs/development/python-modules/sqlmap/default.nix index f4cb6dc7aad7..91da430181fb 100644 --- a/pkgs/development/python-modules/sqlmap/default.nix +++ b/pkgs/development/python-modules/sqlmap/default.nix @@ -4,20 +4,17 @@ buildPythonPackage, fetchPypi, file, - pythonOlder, setuptools, }: buildPythonPackage rec { pname = "sqlmap"; - version = "1.9.9"; + version = "1.9.10"; pyproject = true; - disabled = pythonOlder "3.7"; - src = fetchPypi { inherit pname version; - hash = "sha256-7h9683YdzKT+oDToy9GW1+k7LoaHqBBZeLlXiCDelFA="; + hash = "sha256-S5A/zjf5PpauzIU3BGiijgGEq7OrFoj13xkYAJgdnOA="; }; postPatch = '' diff --git a/pkgs/development/python-modules/svg-py/default.nix b/pkgs/development/python-modules/svg-py/default.nix index d9f06a3811c7..f596899bdf75 100644 --- a/pkgs/development/python-modules/svg-py/default.nix +++ b/pkgs/development/python-modules/svg-py/default.nix @@ -4,22 +4,19 @@ fetchFromGitHub, flit-core, pytestCheckHook, - pythonOlder, pyyaml, }: buildPythonPackage rec { pname = "svg-py"; - version = "1.8.0"; + version = "1.9.1"; pyproject = true; - disabled = pythonOlder "3.7"; - src = fetchFromGitHub { owner = "orsinium-labs"; repo = "svg.py"; tag = version; - hash = "sha256-wHbAsmFkJ3VGBuaKElB+qT8OaKleJ2DgGKr0LvojWws="; + hash = "sha256-ILnPviXUHJrdeT6VTUYAZog3zY0tVA+13ddf8yVRYqE="; }; build-system = [ flit-core ]; diff --git a/pkgs/development/python-modules/testcontainers/default.nix b/pkgs/development/python-modules/testcontainers/default.nix index 06449aa9e152..f2bc6d3e172c 100644 --- a/pkgs/development/python-modules/testcontainers/default.nix +++ b/pkgs/development/python-modules/testcontainers/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "testcontainers"; - version = "4.13.1"; + version = "4.13.2"; pyproject = true; src = fetchFromGitHub { owner = "testcontainers"; repo = "testcontainers-python"; tag = "testcontainers-v${version}"; - hash = "sha256-pDHSwVFrveCJAfSUZROUDZf6WZ+ZRIE+cCmPgKd52Jc="; + hash = "sha256-S2k+zRNxQJcgVdZcU4TM2JHFJ+UflpXt6r6ooYxyOXo="; }; postPatch = '' diff --git a/pkgs/development/python-modules/tiered-debug/default.nix b/pkgs/development/python-modules/tiered-debug/default.nix index b274b116473e..8a43026f5fcd 100644 --- a/pkgs/development/python-modules/tiered-debug/default.nix +++ b/pkgs/development/python-modules/tiered-debug/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "tiered-debug"; - version = "1.3.1"; + version = "1.4.0"; pyproject = true; src = fetchFromGitHub { owner = "untergeek"; repo = "tiered-debug"; tag = "v${version}"; - hash = "sha256-cvyqyyHAeRaCup4V2jbqT1Jx2/waQGtc+Sk3DJy5y8M="; + hash = "sha256-lGt2cnT5Pjb87msgnDawn2gg2VtWXwniHM1wTjHU/x4="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/trl/default.nix b/pkgs/development/python-modules/trl/default.nix index 65a6b4c0bfa4..186d5ea4eb66 100644 --- a/pkgs/development/python-modules/trl/default.nix +++ b/pkgs/development/python-modules/trl/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "trl"; - version = "0.23.0"; + version = "0.23.1"; pyproject = true; src = fetchFromGitHub { owner = "huggingface"; repo = "trl"; tag = "v${version}"; - hash = "sha256-LHBFcf1araJ9Eosrr2z87HrRt5en1jIZ9C9pjqi9Nik="; + hash = "sha256-Zqc9hdi0r4F5/e5SV8ZiY8/x/xHOEQDZ/Rv9G/Dh1zM="; }; build-system = [ diff --git a/pkgs/development/python-modules/tyro/default.nix b/pkgs/development/python-modules/tyro/default.nix index b59a5d1edf65..55aea03edbd9 100644 --- a/pkgs/development/python-modules/tyro/default.nix +++ b/pkgs/development/python-modules/tyro/default.nix @@ -27,14 +27,14 @@ buildPythonPackage rec { pname = "tyro"; - version = "0.9.28"; + version = "0.9.32"; pyproject = true; src = fetchFromGitHub { owner = "brentyi"; repo = "tyro"; tag = "v${version}"; - hash = "sha256-dxciOLNxOjTTIm7P1XTRMgW1a6Sdbnfnqc0EEfyq7IM="; + hash = "sha256-Tp94PSJmVgMnJjf1xBq8JUtHhSZPK135h9F3QzPyWa0="; }; build-system = [ hatchling ]; diff --git a/pkgs/games/openxcom/default.nix b/pkgs/games/openxcom/default.nix index 920786ab93a4..e17ea01a0e8d 100644 --- a/pkgs/games/openxcom/default.nix +++ b/pkgs/games/openxcom/default.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation { pname = "openxcom"; - version = "1.0.0.2024.02.28"; + version = "1.0.0-unstable-2025-09-28"; src = fetchFromGitHub { owner = "OpenXcom"; repo = "OpenXcom"; - rev = "e2c5a1b45c33957ce7e206207c5fb752c1e79ae1"; - hash = "sha256-2G2dSvoDdacdYsXS51h3aGLCCjbHwcvD4CNnQIH/J6A="; + rev = "0f262a10ff447d09571375cef6e646f70868dae2"; + hash = "sha256-q36Lx+PRFKhL87hZr2INcjlxNUX5Y5k8YkA9WDEjagQ="; }; nativeBuildInputs = [ diff --git a/pkgs/kde/gear/kdeconnect-kde/default.nix b/pkgs/kde/gear/kdeconnect-kde/default.nix index d81c487e452f..a9c95f7b6fb5 100644 --- a/pkgs/kde/gear/kdeconnect-kde/default.nix +++ b/pkgs/kde/gear/kdeconnect-kde/default.nix @@ -3,9 +3,9 @@ mkKdeDerivation, replaceVars, sshfs, + qtbase, qtconnectivity, qtmultimedia, - qtwayland, pkg-config, wayland, wayland-protocols, @@ -30,13 +30,12 @@ mkKdeDerivation { extraBuildInputs = [ qtconnectivity qtmultimedia - qtwayland wayland wayland-protocols libfakekey ]; extraCmakeFlags = [ - "-DQtWaylandScanner_EXECUTABLE=${qtwayland}/libexec/qtwaylandscanner" + "-DQtWaylandScanner_EXECUTABLE=${qtbase}/libexec/qtwaylandscanner" ]; } diff --git a/pkgs/kde/gear/krfb/default.nix b/pkgs/kde/gear/krfb/default.nix index 808067fb0000..d2be34808082 100644 --- a/pkgs/kde/gear/krfb/default.nix +++ b/pkgs/kde/gear/krfb/default.nix @@ -1,7 +1,7 @@ { mkKdeDerivation, pkg-config, - qtwayland, + qtbase, libvncserver, pipewire, xorg, @@ -10,12 +10,11 @@ mkKdeDerivation { pname = "krfb"; extraCmakeFlags = [ - "-DQtWaylandScanner_EXECUTABLE=${qtwayland}/libexec/qtwaylandscanner" + "-DQtWaylandScanner_EXECUTABLE=${qtbase}/libexec/qtwaylandscanner" ]; extraNativeBuildInputs = [ pkg-config ]; extraBuildInputs = [ - qtwayland libvncserver pipewire xorg.libXdamage diff --git a/pkgs/kde/plasma/plasma-dialer/default.nix b/pkgs/kde/plasma/plasma-dialer/default.nix index ca5a7cc22182..8a595c98a8f8 100644 --- a/pkgs/kde/plasma/plasma-dialer/default.nix +++ b/pkgs/kde/plasma/plasma-dialer/default.nix @@ -1,7 +1,7 @@ { mkKdeDerivation, pkg-config, - qtwayland, + qtbase, callaudiod, libphonenumber, protobuf, @@ -11,13 +11,12 @@ mkKdeDerivation { extraNativeBuildInputs = [ pkg-config ]; extraBuildInputs = [ - qtwayland callaudiod libphonenumber protobuf ]; extraCmakeFlags = [ - "-DQtWaylandScanner_EXECUTABLE=${qtwayland}/libexec/qtwaylandscanner" + "-DQtWaylandScanner_EXECUTABLE=${qtbase}/libexec/qtwaylandscanner" ]; } diff --git a/pkgs/os-specific/linux/ipu6-drivers/default.nix b/pkgs/os-specific/linux/ipu6-drivers/default.nix index 5d1ff0bed6af..3be4293ce018 100644 --- a/pkgs/os-specific/linux/ipu6-drivers/default.nix +++ b/pkgs/os-specific/linux/ipu6-drivers/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "ipu6-drivers"; - version = "unstable-2025-02-19"; + version = "unstable-2025-09-16"; src = fetchFromGitHub { owner = "intel"; repo = "ipu6-drivers"; - rev = "7af071481f3d2d3cef1e70113c10f62ac6351723"; - hash = "sha256-pe7lqK+CHpgNWpC8GEZ3FKfYcuVuRUaWlW18D9AsrSk="; + rev = "69b2fde9edcbc24128b91541fdf2791fbd4bf7a4"; + hash = "sha256-uiRbbSw7tQ3Fn297D1I7i7hyaNtpOWER4lvPMSTpwpk="; }; patches = [ diff --git a/pkgs/os-specific/linux/lenovo-legion/app.nix b/pkgs/os-specific/linux/lenovo-legion/app.nix index 6c109d1150e9..afc1e5c3760e 100644 --- a/pkgs/os-specific/linux/lenovo-legion/app.nix +++ b/pkgs/os-specific/linux/lenovo-legion/app.nix @@ -8,14 +8,14 @@ python3.pkgs.buildPythonApplication rec { pname = "lenovo-legion-app"; - version = "0.0.20-unstable-2025-04-01"; + version = "0.0.21-unstable-2025-07-11"; format = "setuptools"; src = fetchFromGitHub { owner = "johnfanv2"; repo = "LenovoLegionLinux"; - rev = "19fef88dbbb077d99052e06f3cd9a3675e7bf3aa"; - hash = "sha256-0lQ6LyfjZ1/dc6QjB4a1aBcfxY5lIJJEonwuy9a4V4I="; + rev = "f559df04cc0705b2b181dfd0404110a4d1d6e2a9"; + hash = "sha256-WXGDlykH6aBUVotmDcGZ8Y/zC8iBAv57u3hXRnfTaSo="; }; sourceRoot = "${src.name}/python/legion_linux"; @@ -25,6 +25,7 @@ python3.pkgs.buildPythonApplication rec { propagatedBuildInputs = with python3.pkgs; [ pyqt6 argcomplete + pillow pyyaml darkdetect xorg.libxcb diff --git a/pkgs/servers/home-assistant/custom-components/fellow/package.nix b/pkgs/servers/home-assistant/custom-components/fellow/package.nix index 4d5c99ccbee9..ba184bd05e9c 100644 --- a/pkgs/servers/home-assistant/custom-components/fellow/package.nix +++ b/pkgs/servers/home-assistant/custom-components/fellow/package.nix @@ -10,13 +10,13 @@ buildHomeAssistantComponent { owner = "NewsGuyTor"; domain = "fellow"; - version = "0-unstable-2025-08-06"; + version = "0-unstable-2025-10-06"; src = fetchFromGitHub { owner = "NewsGuyTor"; repo = "FellowAiden-HomeAssistant"; - rev = "bb0f3042e974a149a3597d06312e6be9b8d265ff"; - hash = "sha256-cplIiFt0CkeOXjypvG0MR/t7PWzeaa2G6uScWSLbEpo="; + rev = "c0b724e2ac3174b99fcb7d05a9c63a3ac6ce03b4"; + hash = "sha256-gK9lVFehqRWq7HQd+VPJB/iaIvLdHu51XxyfM14aY0s="; }; passthru.updateScript = unstableGitUpdater { }; diff --git a/pkgs/servers/http/couchdb/3.nix b/pkgs/servers/http/couchdb/3.nix index afddb8344784..4f3239c6cd84 100644 --- a/pkgs/servers/http/couchdb/3.nix +++ b/pkgs/servers/http/couchdb/3.nix @@ -65,5 +65,6 @@ stdenv.mkDerivation rec { license = licenses.asl20; platforms = platforms.all; maintainers = with maintainers; [ lostnet ]; + broken = stdenv.isDarwin && stdenv.isAarch64; }; } diff --git a/pkgs/servers/mobilizon/default.nix b/pkgs/servers/mobilizon/default.nix index 2ffcfc1bec52..2d0de84a77cf 100644 --- a/pkgs/servers/mobilizon/default.nix +++ b/pkgs/servers/mobilizon/default.nix @@ -10,7 +10,6 @@ nixosTests, nixfmt, mobilizon-frontend, - ... }: let diff --git a/pkgs/servers/pleroma/default.nix b/pkgs/servers/pleroma/default.nix index 067fb069e436..f6aa5e00338f 100644 --- a/pkgs/servers/pleroma/default.nix +++ b/pkgs/servers/pleroma/default.nix @@ -12,7 +12,6 @@ pkg-config, glib, fetchpatch, - ... }: beamPackages.mixRelease rec { diff --git a/pkgs/tools/admin/pulumi-bin/data.nix b/pkgs/tools/admin/pulumi-bin/data.nix index f627ca2f2571..dee565db4295 100644 --- a/pkgs/tools/admin/pulumi-bin/data.nix +++ b/pkgs/tools/admin/pulumi-bin/data.nix @@ -1,12 +1,12 @@ # DO NOT EDIT! This file is generated automatically by update.sh { }: { - version = "3.199.0"; + version = "3.201.0"; pulumiPkgs = { x86_64-linux = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.199.0-linux-x64.tar.gz"; - sha256 = "0fl8l4j5q4gpd02v0rfnb0dlg5rhvql58wfny6hccpbdlzaxjs18"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.201.0-linux-x64.tar.gz"; + sha256 = "02k0h1kkvc1yz2bm5zip24n00sp7nv7l7badh13m7mylkcflfvg8"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.43.1-linux-amd64.tar.gz"; @@ -21,16 +21,16 @@ sha256 = "10mz7gv2bm93hvkvqvhsvqhkcziyci2wbxmqj9ggplgv44k49w68"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v8.9.0-linux-amd64.tar.gz"; - sha256 = "07zkrskavhxaghnhdcmprhcpblvz5zvwsypr11vnq0vjjv1vy406"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v8.9.1-linux-amd64.tar.gz"; + sha256 = "02pgy8m9f32ky69vs7kw7fn8b41l0y4w2gg7s15nw5c069vvnpy4"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v3.29.0-linux-amd64.tar.gz"; sha256 = "0032ax8kazj8gxmxz6sgffv5r7y67vp92xwzlfpq4y6jlqiapwi9"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v7.7.0-linux-amd64.tar.gz"; - sha256 = "0f1vlzn3dagn78h2c07q573k1bshg47iz5x7bq1a44x1yjmkh3il"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v7.8.0-linux-amd64.tar.gz"; + sha256 = "1f1zj1m3alz9zvdab9fvqrlzjafzwx21wpnifi7fs3sf27p1vs2l"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v6.6.0-linux-amd64.tar.gz"; @@ -41,12 +41,12 @@ sha256 = "0r0s72v99wx2ggb45ifs0hjy76nq8aa6z66zlxjb8wgda3yrsldz"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v6.26.0-linux-amd64.tar.gz"; - sha256 = "0d0i764g4gcj6k5q94hi8pyd4822di1p2qz1kd1np9clhazghsc6"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v6.28.0-linux-amd64.tar.gz"; + sha256 = "0agh234zr757kx6b41k1q7p9rpzb3jv30nkyzs5xqhjnv44lky97"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v6.9.1-linux-amd64.tar.gz"; - sha256 = "1d346bnzp503zzmmw2pck6sdsf7y1l3f6lalahl00rz4v1dp04y9"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v6.10.0-linux-amd64.tar.gz"; + sha256 = "0gjhdf6ai64k3kkdfvprpszc93b6yim622kk4m76s15kpcnnlnzz"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.13.1-linux-amd64.tar.gz"; @@ -121,8 +121,8 @@ sha256 = "1n3ndir2n1pq4mmnbkiqvv0rf3w4dgz3a9b221vimsi2lks212kw"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v2.6.0-linux-amd64.tar.gz"; - sha256 = "04fv4ky6ffq04l1z6ck1hrjqmk618ibgxqxl2z6z2mv8mi72vmaj"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v2.7.0-linux-amd64.tar.gz"; + sha256 = "18iaybm8sqg468a8fan2dm1lsyybch3l1wiawvz5qyh6ap5x2fv7"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.124.0-linux-amd64.tar.gz"; @@ -145,8 +145,8 @@ sha256 = "0vdrh5ss7vlmyv0a0mvrj2w9mrsazqrl7hcvwn5riym4ba0daq03"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-venafi-v1.12.0-linux-amd64.tar.gz"; - sha256 = "04akqqyla391haixb4iasxd3a62y2hlpzv19vdd51w3xw76g687l"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-venafi-v1.12.1-linux-amd64.tar.gz"; + sha256 = "070kb73yix9aha55x9n4h6f4khp9a8wylqgvzdhsa7c7k35fx6q5"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v4.16.0-linux-amd64.tar.gz"; @@ -163,8 +163,8 @@ ]; x86_64-darwin = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.199.0-darwin-x64.tar.gz"; - sha256 = "0mm76lrdbb35m7h08zw85blrcn10jc2h8l0lb78izxnnsmr4sv48"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.201.0-darwin-x64.tar.gz"; + sha256 = "054kg9b2akpd6l9m4wwx3hci7ajl6j63i9wlxvl04q0y1qxw2q3s"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.43.1-darwin-amd64.tar.gz"; @@ -179,16 +179,16 @@ sha256 = "1b8lwjbvppj7ssncfwqync169ydz7m8wx3zkxdvc8yw4ggcl2kxs"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v8.9.0-darwin-amd64.tar.gz"; - sha256 = "0a0yv352abz9av6rkjpwz5k3q7jikhhvbkf8jd7pa387hfzqchrh"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v8.9.1-darwin-amd64.tar.gz"; + sha256 = "09c2kdhad10c6g1j955dxkvvfapk6qqc8wdd69qcl85lkpgzn3cz"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v3.29.0-darwin-amd64.tar.gz"; sha256 = "0xy3z460nw89i0zjj5bn0qwpqc18xcas4zk3wgvvrsk7v0jj1cin"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v7.7.0-darwin-amd64.tar.gz"; - sha256 = "1a2pqy80034xm7syg6hfswrgj1bbvh643bllc5gfc7270p7vx05i"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v7.8.0-darwin-amd64.tar.gz"; + sha256 = "0iq60sxszffaqv6anh4hi2bx963k462g6y0ylpwx0662wi7d6m5w"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v6.6.0-darwin-amd64.tar.gz"; @@ -199,12 +199,12 @@ sha256 = "124fk2mxxzc06dav25kk1wn8gqrys6607gg3nm53fk813wx76zg6"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v6.26.0-darwin-amd64.tar.gz"; - sha256 = "1fcy2ygwyd80kfrc45v51101gs79w0cphix4y7bmjrszg3aj695a"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v6.28.0-darwin-amd64.tar.gz"; + sha256 = "0b7ryynm4np70d4si2i9jwjjqd1nd3b6m23fgv9c2cwwnrg2xmiz"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v6.9.1-darwin-amd64.tar.gz"; - sha256 = "1rp4gvflvjznb9n7r5w1mgfy1vs6cby1irdprajvjaal9cxi044x"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v6.10.0-darwin-amd64.tar.gz"; + sha256 = "0l1r3qdmf90g0fpi0jvac0v4phksnwqjhihx6rcnrcpc9ihfr2pa"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.13.1-darwin-amd64.tar.gz"; @@ -279,8 +279,8 @@ sha256 = "1b3znzx5m20xlvmgj9njmip7q32fs6hm62zfckra73bqh2mc9492"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v2.6.0-darwin-amd64.tar.gz"; - sha256 = "0kc1p6xww4zwmqvp75ivjh4rl5r1ayaxy6r62ymdmzcbpicxmlkx"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v2.7.0-darwin-amd64.tar.gz"; + sha256 = "1cyh4zlaayyg4x6qzgc8pxm7kvc6b2xjm93v9rb25vbxb4yjv1nw"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.124.0-darwin-amd64.tar.gz"; @@ -303,8 +303,8 @@ sha256 = "097kjmmyqdwaa9ghn228d52sjj2ypr3kqbgkfxvjmq494b5mf74s"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-venafi-v1.12.0-darwin-amd64.tar.gz"; - sha256 = "0qpqhx7m5m8r3p3clddg0xkp1gm43pd3c7xcq1g3n02cbi44cimx"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-venafi-v1.12.1-darwin-amd64.tar.gz"; + sha256 = "1c38gqm2vk9fwxyqmzzf27p8xdis9pa8ikj9pgwyjaf208b63gir"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v4.16.0-darwin-amd64.tar.gz"; @@ -321,8 +321,8 @@ ]; aarch64-linux = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.199.0-linux-arm64.tar.gz"; - sha256 = "0c9d4kn0gjcnq8masglpyn32484m04j7bm0yly7dlgk9vqwfbiln"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.201.0-linux-arm64.tar.gz"; + sha256 = "0wp8f8sa3s414ixxrkh1p0hy7bgj7v2zm2lbj1nn1804k6pff8cn"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.43.1-linux-arm64.tar.gz"; @@ -337,16 +337,16 @@ sha256 = "11hbjq49a1znx38xk81q2gp2pdq99c8sz166xxb2cmrv84bm2xfi"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v8.9.0-linux-arm64.tar.gz"; - sha256 = "1qbd2hjbv202afcsm3kfjr50h3a2bnzips29l7a863k8vcd6bhmm"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v8.9.1-linux-arm64.tar.gz"; + sha256 = "03as3y5bflq1m8qfcx7h916vlxa7qn5xla2d1gi2q87gz4giki24"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v3.29.0-linux-arm64.tar.gz"; sha256 = "0v9a59cbzs5s9vylmbwfb5chydccdy1xkhp90ci2lz52yik45lg5"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v7.7.0-linux-arm64.tar.gz"; - sha256 = "1a21bl4h9xwdlajhmks8wqd8v7fbnc0i66vx515p6l6mx1shrshv"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v7.8.0-linux-arm64.tar.gz"; + sha256 = "1lwr5cbf3g3zkk8mvdd17b8bmsjkxbzjg15y2lzsxb294r677b3l"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v6.6.0-linux-arm64.tar.gz"; @@ -357,12 +357,12 @@ sha256 = "0mmkjim8q5wh0mikwjw3qzg87hm845777jyisz7256p211nrsmyx"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v6.26.0-linux-arm64.tar.gz"; - sha256 = "07zxxn4clplr90iamngk0xi6gkh88c8jvbipfly50xgv6s0s9b93"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v6.28.0-linux-arm64.tar.gz"; + sha256 = "0hg628ik9vvadxs249v4z53y36nzrw3bgjdh1fgjahx875z23m06"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v6.9.1-linux-arm64.tar.gz"; - sha256 = "1zl13k3ijb34jb0izm79jpqwwpj8g2r3f65sfc4yk6w2hjg8r90z"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v6.10.0-linux-arm64.tar.gz"; + sha256 = "1l2a54qjgh5blwx8mw2i52m5yhff3izqirlh17ws3l04xcldd4d9"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.13.1-linux-arm64.tar.gz"; @@ -437,8 +437,8 @@ sha256 = "02jix4w49n9mal8wg6ixgxvnd865ml7zx0lnz6prckfrzgrj36ih"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v2.6.0-linux-arm64.tar.gz"; - sha256 = "0saxy26lyxb57sbnyamqdkih5ipmzicz33zhy5676c9imwjnnlm6"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v2.7.0-linux-arm64.tar.gz"; + sha256 = "05fwkafsjv5gd23fzkb2hv3xah9vvqr4w2sc9sjrzcwzghiw0pbh"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.124.0-linux-arm64.tar.gz"; @@ -461,8 +461,8 @@ sha256 = "1csiv24nmg1c8vb0ay36lsw7dpfim5hr9b3rhdawpsyjdi5s4hsd"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-venafi-v1.12.0-linux-arm64.tar.gz"; - sha256 = "1zgfw9bc6dlr299lyyrgssawhmf1w344r2xdi46vah865ysdqs72"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-venafi-v1.12.1-linux-arm64.tar.gz"; + sha256 = "1rfzj89s7avim702aqvkrmsg4d1qzajw1k5pr24jzrs4xiyarkzb"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v4.16.0-linux-arm64.tar.gz"; @@ -479,8 +479,8 @@ ]; aarch64-darwin = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.199.0-darwin-arm64.tar.gz"; - sha256 = "1qbp6kmysq8a9pbyd7w876xa50hp225rhak7w493n3r0s72nklcn"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.201.0-darwin-arm64.tar.gz"; + sha256 = "1ri8cg89aw43hwsiql4gbbm1qqllqh5pjmhkhf9i19i3c6lfjxz7"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.43.1-darwin-arm64.tar.gz"; @@ -495,16 +495,16 @@ sha256 = "1cglc5a507fy973wkk062wd22yn1pwn1pdn2laqqlk0n6y1hp33y"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v8.9.0-darwin-arm64.tar.gz"; - sha256 = "063y0bhim02sydknk5ijsb0574f80rv3hsqv2h63iz6pj1si5sfd"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v8.9.1-darwin-arm64.tar.gz"; + sha256 = "0sqmpk1n98vs079qrs1nf9ifjmjz4s9s0f406c8r0cxpn3l08zvp"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v3.29.0-darwin-arm64.tar.gz"; sha256 = "1a13wviv678k1ls57vwvffkk6qa5fdc55zw2byid910m2bjs7bz0"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v7.7.0-darwin-arm64.tar.gz"; - sha256 = "03fms51zwzwgd8bzn56y7kagnznvx9ghsxp5k4l76lafb8sz148i"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v7.8.0-darwin-arm64.tar.gz"; + sha256 = "0k0kmjqc5iq3dhcvrxkz6d7kbj2q1s0cigqjqp7qpj5ppyss901g"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v6.6.0-darwin-arm64.tar.gz"; @@ -515,12 +515,12 @@ sha256 = "00gahf4jlihzywbsd7rmw73jrnjfdsqxhag4qm7ms90gwl5qspa4"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v6.26.0-darwin-arm64.tar.gz"; - sha256 = "19k6nz8idbc80x5fqp9vbc6rfd89m3aj52m33sw6x47fc98fim5b"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v6.28.0-darwin-arm64.tar.gz"; + sha256 = "0jidnrvvk2d6jdfx795yrnkpwmw1843nfylchhynlidf279z21vm"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v6.9.1-darwin-arm64.tar.gz"; - sha256 = "078cyrbvf5xpdvv5lmwfv22msj5a1ljbbqzvgf44c07ggg1m1gyg"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v6.10.0-darwin-arm64.tar.gz"; + sha256 = "1cr924w029hah14j9cq0rsy2k0arph8r7dcmhi6zimw3wm0168dd"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.13.1-darwin-arm64.tar.gz"; @@ -595,8 +595,8 @@ sha256 = "1bb3bzybmfi5blagh13bm6q1avjbp80lmjdv4q5yc2dbfbs653xi"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v2.6.0-darwin-arm64.tar.gz"; - sha256 = "0p23l7angigxgz3lcsvszlw3laphicx7gr7fpn701dajlhzlffln"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v2.7.0-darwin-arm64.tar.gz"; + sha256 = "1f409m7ls96vvx6x6lsfydp2vn809wy58s5cbh5p8s390s30q2zf"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.124.0-darwin-arm64.tar.gz"; @@ -619,8 +619,8 @@ sha256 = "1p3nb3aazr47kiprq7k3js6x8jk87dsql6d4qkn6c60mbrm9mlal"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-venafi-v1.12.0-darwin-arm64.tar.gz"; - sha256 = "1jxp2935998ddg68aiq2vzn5dv9pza66wg63ni7f2p1kq8ls8jji"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-venafi-v1.12.1-darwin-arm64.tar.gz"; + sha256 = "03qhd6p77d40dbcvr6ifw6ii37303jmcqhns63r8gmpbfkdg52a2"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v4.16.0-darwin-arm64.tar.gz"; diff --git a/pkgs/tools/inputmethods/interception-tools/default.nix b/pkgs/tools/inputmethods/interception-tools/default.nix index 84ed9eb6a8b0..6c5ee3a9ce93 100644 --- a/pkgs/tools/inputmethods/interception-tools/default.nix +++ b/pkgs/tools/inputmethods/interception-tools/default.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchFromGitLab, + fetchpatch, pkg-config, cmake, yaml-cpp, @@ -20,6 +21,14 @@ stdenv.mkDerivation rec { hash = "sha256-jhdgfCWbkF+jD/iXsJ+fYKOtPymxcC46Q4w0aqpvcek="; }; + patches = [ + (fetchpatch { + name = "Bump-CMake-minimum-version-to-3.10"; + url = "https://gitlab.com/interception/linux/tools/-/commit/110c9b39b54eae9acd16fa6d64539ce9886b5684.patch"; + hash = "sha256-vLm7LvXh/pGA12gUpt9vt2XTWFqkdjQFOyRzaDRghHI="; + }) + ]; + nativeBuildInputs = [ cmake pkg-config diff --git a/pkgs/tools/security/bitwarden-directory-connector/default.nix b/pkgs/tools/security/bitwarden-directory-connector/default.nix index c7d1b566170a..77b03e236090 100644 --- a/pkgs/tools/security/bitwarden-directory-connector/default.nix +++ b/pkgs/tools/security/bitwarden-directory-connector/default.nix @@ -19,14 +19,14 @@ let }: buildNpmPackage rec { pname = name; - version = "2025.8.0"; + version = "2025.9.0"; nodejs = nodejs_22; src = fetchFromGitHub { owner = "bitwarden"; repo = "directory-connector"; rev = "v${version}"; - hash = "sha256-+c6naHlcm05X+xiljbkBWaqCZpRn4GIl/Fg1jcXMcHo="; + hash = "sha256-owzOgaYSbtsnZ0AvSWWFdSx96agJyBUM2steGIeg2E4="; }; postPatch = '' @@ -38,7 +38,7 @@ let --replace-fail "AppImage" "dir" ''; - npmDepsHash = "sha256-0Q54LZVbeRkJFZ+WU5FeF23q3Ak43XDrXhZxqdrfA/I="; + npmDepsHash = "sha256-brO+GGwdZyCDYycur5QnLKCcFZc1J2pM+vQPLtjUD/I="; env.ELECTRON_SKIP_BINARY_DOWNLOAD = "1"; diff --git a/pkgs/tools/wayland/xwaylandvideobridge/default.nix b/pkgs/tools/wayland/xwaylandvideobridge/default.nix deleted file mode 100644 index fcc46987c74a..000000000000 --- a/pkgs/tools/wayland/xwaylandvideobridge/default.nix +++ /dev/null @@ -1,62 +0,0 @@ -{ - lib, - stdenv, - fetchurl, - cmake, - extra-cmake-modules, - pkg-config, - qtbase, - qtdeclarative, - qtx11extras ? null, # qt5 only - kcoreaddons, - ki18n, - knotifications, - kpipewire, - kstatusnotifieritem ? null, # qt6 only - kwindowsystem, - wrapQtAppsHook, -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "xwaylandvideobridge"; - version = "0.4.0"; - - src = fetchurl { - url = "mirror://kde/stable/xwaylandvideobridge/xwaylandvideobridge-${finalAttrs.version}.tar.xz"; - hash = "sha256-6nKseypnV46ZlNywYZYC6tMJekb7kzZmHaIA5jkn6+Y="; - }; - - nativeBuildInputs = [ - cmake - extra-cmake-modules - pkg-config - wrapQtAppsHook - ]; - - buildInputs = [ - qtbase - qtdeclarative - qtx11extras - kcoreaddons - ki18n - knotifications - kpipewire - kstatusnotifieritem - kwindowsystem - ]; - - cmakeFlags = [ "-DQT_MAJOR_VERSION=${lib.versions.major qtbase.version}" ]; - - meta = { - description = "Utility to allow streaming Wayland windows to X applications"; - homepage = "https://invent.kde.org/system/xwaylandvideobridge"; - license = with lib.licenses; [ - bsd3 - cc0 - gpl2Plus - ]; - maintainers = with lib.maintainers; [ stepbrobd ]; - platforms = lib.platforms.linux; - mainProgram = "xwaylandvideobridge"; - }; -}) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index baa3cf426e0a..d8b5cf88c708 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -518,10 +518,17 @@ mapAliases { bareboxTools = throw "bareboxTools has been removed due to lack of interest in maintaining it in nixpkgs"; # Added 2025-04-19 bazel_5 = throw "bazel_5 has been removed as it is EOL"; # Added 2025-08-09 bazel_6 = throw "bazel_6 has been removed as it will be EOL by the release of Nixpkgs 25.11"; # Added 2025-08-19 + bc-decaf = throw "'bc-decaf' has been moved to 'linphonePackages.bc-decaf'"; # Added 2025-09-20 + bc-soci = throw "'bc-soci' has been moved to 'linphonePackages.bc-soci'"; # Added 2025-09-20 + bctoolbox = throw "'bctoolbox' has been moved to 'linphonePackages.bctoolbox'"; # Added 2025-09-20 + bcunit = throw "'bcunit' has been moved to 'linphonePackages.bcunit'"; # Added 2025-09-20 BeatSaberModManager = beatsabermodmanager; # Added 2024-06-12 beam_nox = throw "beam_nox has been removed in favor of beam_minimal or beamMinimalPackages"; # Added 2025-04-01 beatsabermodmanager = throw "'beatsabermodmanager' has been removed due to lack of upstream maintainenance. Consider using 'bs-manager' instead"; # Added 2025-03-18 inherit (beetsPackages) beets-unstable; + belcard = throw "'belcard' has been moved to 'linphonePackages.belcard'"; # Added 2025-09-20 + belle-sip = throw "'belle-sip' has been moved to 'linphonePackages.belle-sip'"; # Added 2025-09-20 + belr = throw "'belr' has been moved to 'linphonePackages.belr'"; # Added 2025-09-20 betterbird = throw "betterbird has been removed as there were insufficient maintainer resources to keep up with security updates"; # Added 2024-10-25 betterbird-unwrapped = throw "betterbird has been removed as there were insufficient maintainer resources to keep up with security updates"; # Added 2024-10-25 bfc = throw "bfc has been removed, as it does not build with supported LLVM versions"; # Added 2025-08-10 @@ -580,6 +587,8 @@ mapAliases { bitwarden_rs-sqlite = vaultwarden-sqlite; # Added 2021-07-01 bitwarden_rs-vault = vaultwarden-vault; # Added 2021-07-01 + bzrtp = throw "'bzrtp' has been moved to 'linphonePackages.bzrtp'"; # Added 2025-09-20 + ### C ### caffeWithCuda = throw "caffeWithCuda has been removed, as it was broken and required CUDA 10"; # Added 2024-11-20 @@ -1307,6 +1316,18 @@ mapAliases { ### L ### l3afpad = throw "'l3afpad' has been removed due to lack of maintenance upstream. Consider using 'xfce.mousepad' instead"; # Added 2024-09-14 + languageMachines = { + ticcutils = ticcutils; + libfolia = libfolia; + ucto = ucto; + uctodata = uctodata; + timbl = timbl; + timblserver = timblserver; + mbt = mbt; + frog = frog; + frogdata = frogdata; + test = frog.tests.simple; + }; # Added 2025-10-07 larynx = piper-tts; # Added 2023-05-09 LASzip = laszip; # Added 2024-06-12 LASzip2 = laszip_2; # Added 2024-06-12 @@ -1358,6 +1379,7 @@ mapAliases { libixp_hg = libixp; # Added 2022-04-25 libjpeg_drop = throw "'libjpeg_drop' has been renamed to/replaced by 'libjpeg_original'"; # Converted to throw 2024-10-17 liblastfm = throw "'liblastfm' has been renamed to/replaced by 'libsForQt5.liblastfm'"; # Converted to throw 2024-10-17 + liblinphone = throw "'liblinphone' has been moved to 'linphonePackages.liblinphone'"; # Added 2025-09-20 libmp3splt = throw "'libmp3splt' has been removed due to lack of maintenance upstream."; # Added 2025-05-17 libmusicbrainz3 = throw "libmusicbrainz3 has been removed as it was obsolete and unused"; # Added 2025-09-16 libmusicbrainz5 = libmusicbrainz; # Added 2025-09-16 @@ -1408,8 +1430,10 @@ mapAliases { ligo = throw "ligo has been removed from nixpkgs for lack of maintainance"; # Added 2025-06-03 lima-bin = lib.warnOnInstantiate "lima-bin has been replaced by lima" lima; # Added 2025-05-13 lime3ds = throw "lime3ds is deprecated, use 'azahar' instead."; # Added 2025-03-22 + lime = throw "'lime' has been removed due to being unmaintained"; # Added 2025-03-20 limesctl = throw "limesctl has been removed because it is insignificant."; # Added 2024-11-25 linenoise-ng = throw "'linenoise-ng' has been removed as the upstream project was archived. Consider using 'linenoise' instead."; # Added 2025-05-05 + linphone = linphonePackages.linphone-desktop; # Added 2025-09-20 lispPackages_new = throw "Lisp packages have been redesigned. See 'lisp-modules' in the nixpkgs manual."; # Added 2024-05-07 lispPackages = throw "Lisp packages have been redesigned. See 'lisp-modules' in the nixpkgs manual."; # Added 2024-05-07 lispPackagesFor = throw "Lisp packages have been redesigned. See 'lisp-modules' in the nixpkgs manual."; # Added 2024-05-07 @@ -1701,6 +1725,8 @@ mapAliases { mcomix3 = mcomix; # Added 2022-06-05 mdt = md-tui; # Added 2024-09-03 meilisearch_1_11 = throw "'meilisearch_1_11' has been removed, as it is no longer supported"; # Added 2025-10-03 + mediastreamer = throw "'mediastreamer' has been moved to 'linphonePackages.mediastreamer2'"; # Added 2025-09-20 + mediastreamer-openh264 = throw "'mediastreamer-openh264' has been moved to 'linphonePackages.msopenh264'"; # Added 2025-09-20 meme = throw "'meme' has been renamed to/replaced by 'meme-image-generator'"; # Converted to throw 2024-10-17 memorymapping = throw "memorymapping has been removed, as it was only useful on old macOS versions that are no longer supported"; # Added 2024-10-05 memorymappingHook = throw "memorymapping has been removed, as it was only useful on old macOS versions that are no longer supported"; # Added 2024-10-05 @@ -2004,6 +2030,7 @@ mapAliases { openvdb_11 = throw "'openvdb_11' has been removed in favor of the latest version'"; # Added 2025-05-03 opera = throw "'opera' has been removed due to lack of maintenance in nixpkgs"; # Added 2025-05-19 orchis = throw "'orchis' has been renamed to/replaced by 'orchis-theme'"; # Converted to throw 2024-10-17 + ortp = throw "'ortp' has been moved to 'linphonePackages.ortp'"; # Added 2025-09-20 omping = throw "'omping' has been removed because its upstream has been archived"; # Added 2025-05-10 onlyoffice-bin = onlyoffice-desktopeditors; # Added 2024-09-20 onlyoffice-bin_latest = onlyoffice-bin; # Added 2024-07-03 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d90dfb89e075..5bcdec78aa4a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1703,7 +1703,6 @@ with pkgs; }; plausible = callPackage ../by-name/pl/plausible/package.nix { - elixir = elixir_1_18; beamPackages = beamPackages.extend (self: super: { elixir = elixir_1_18; }); }; @@ -2184,7 +2183,6 @@ with pkgs; mkspiffs-presets = recurseIntoAttrs (callPackages ../tools/filesystems/mkspiffs/presets.nix { }); mobilizon = callPackage ../servers/mobilizon { - elixir = beam.packages.erlang_26.elixir_1_15; beamPackages = beam.packages.erlang_26.extend (self: super: { elixir = self.elixir_1_15; }); mobilizon-frontend = callPackage ../servers/mobilizon/frontend.nix { }; }; @@ -3833,7 +3831,6 @@ with pkgs; tautulli = python3Packages.callPackage ../servers/tautulli { }; pleroma = callPackage ../servers/pleroma { - elixir = elixir_1_17; beamPackages = beam.packages.erlang_26.extend (self: super: { elixir = elixir_1_17; }); }; @@ -5748,7 +5745,6 @@ with pkgs; inherit (beam.packages.erlang_26.beamPackages) elixir_1_16 elixir_1_15 - elixir_1_14 ; inherit (beam.packages.erlang) @@ -5760,7 +5756,6 @@ with pkgs; rebar3WithPlugins fetchHex lfe - lfe_2_1 ; beamPackages = dontRecurseIntoAttrs beam27Packages; @@ -7046,8 +7041,6 @@ with pkgs; inherit (callPackages ../development/libraries/bashup-events { }) bashup-events32 bashup-events44; - bc-soci = callPackage ../development/libraries/soci/bc-soci.nix { }; - # TODO(@Ericson2314): Build bionic libc from source bionic = if stdenv.hostPlatform.useAndroidPrebuilt then @@ -7282,8 +7275,6 @@ with pkgs; }; }; - frog = res.languageMachines.frog; - fontconfig = callPackage ../development/libraries/fontconfig { }; makeFontsConf = callPackage ../development/libraries/fontconfig/make-fonts-conf.nix { }; @@ -7753,12 +7744,6 @@ with pkgs; stdenv = gccStdenv; }; - languageMachines = recurseIntoAttrs ( - import ../development/libraries/languagemachines/packages.nix { - inherit pkgs; - } - ); - lcms = lcms2; libagar = callPackage ../development/libraries/libagar { }; @@ -8130,10 +8115,6 @@ with pkgs; mbedtls_2 = callPackage ../development/libraries/mbedtls/2.nix { }; mbedtls = callPackage ../development/libraries/mbedtls/3.nix { }; - mediastreamer = libsForQt5.callPackage ../development/libraries/mediastreamer { }; - - mediastreamer-openh264 = callPackage ../development/libraries/mediastreamer/msopenh264.nix { }; - mergerfs = callPackage ../tools/filesystems/mergerfs { }; mergerfs-tools = callPackage ../tools/filesystems/mergerfs/tools.nix { }; @@ -9833,9 +9814,8 @@ with pkgs; qremotecontrol-server = libsForQt5.callPackage ../servers/misc/qremotecontrol-server { }; - rabbitmq-server = callPackage ../by-name/ra/rabbitmq-server/package.nix rec { - erlang = erlang_27; - elixir = elixir_1_17.override { inherit erlang; }; + rabbitmq-server = callPackage ../by-name/ra/rabbitmq-server/package.nix { + beamPackages = beam27Packages.extend (self: super: { elixir = elixir_1_17; }); }; rethinkdb = callPackage ../servers/nosql/rethinkdb { @@ -11811,8 +11791,6 @@ with pkgs; libutp = callPackage ../applications/networking/p2p/libutp { }; libutp_3_4 = callPackage ../applications/networking/p2p/libutp/3.4.nix { }; - linphone = libsForQt5.callPackage ../applications/networking/instant-messengers/linphone { }; - lmms = libsForQt5.callPackage ../applications/audio/lmms { lame = null; libsoundio = null; @@ -12542,8 +12520,6 @@ with pkgs; super-slicer-latest = super-slicer.latest; - soci = callPackage ../development/libraries/soci { }; - socialscan = with python3.pkgs; toPythonApplication socialscan; sonic-lineup = libsForQt5.callPackage ../applications/audio/sonic-lineup { }; @@ -12770,6 +12746,10 @@ with pkgs; twinkle = qt5.callPackage ../applications/networking/instant-messengers/twinkle { }; + linphonePackages = recurseIntoAttrs ( + callPackage ../applications/networking/instant-messengers/linphone { } + ); + buildTypstPackage = callPackage ../build-support/build-typst-package.nix { }; typstPackages = typst.packages; diff --git a/pkgs/top-level/beam-packages.nix b/pkgs/top-level/beam-packages.nix index 79dc9d8077cb..608a57e24a34 100644 --- a/pkgs/top-level/beam-packages.nix +++ b/pkgs/top-level/beam-packages.nix @@ -2,7 +2,6 @@ lib, beam, callPackage, - wxGTK32, stdenv, wxSupport ? true, systemd, @@ -29,20 +28,14 @@ in # Three versions are supported according to https://github.com/erlang/otp/security erlang_28 = self.beamLib.callErlang ../development/interpreters/erlang/28.nix { - wxGTK = wxGTK32; - parallelBuild = true; inherit wxSupport systemdSupport; }; erlang_27 = self.beamLib.callErlang ../development/interpreters/erlang/27.nix { - wxGTK = wxGTK32; - parallelBuild = true; inherit wxSupport systemdSupport; }; erlang_26 = self.beamLib.callErlang ../development/interpreters/erlang/26.nix { - wxGTK = wxGTK32; - parallelBuild = true; inherit wxSupport systemdSupport; }; @@ -56,10 +49,8 @@ in elixir_1_17 elixir_1_16 elixir_1_15 - elixir_1_14 elixir-ls lfe - lfe_2_1 ; }; diff --git a/pkgs/top-level/qt6-packages.nix b/pkgs/top-level/qt6-packages.nix index 6aae3abf5efd..1f47e74579e3 100644 --- a/pkgs/top-level/qt6-packages.nix +++ b/pkgs/top-level/qt6-packages.nix @@ -151,8 +151,6 @@ makeScopeWithSplicing' { waylib = callPackage ../development/libraries/waylib { }; wayqt = callPackage ../development/libraries/wayqt { }; - - xwaylandvideobridge = kdePackages.callPackage ../tools/wayland/xwaylandvideobridge { }; } ); }