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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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 274538661ad4..5bcdec78aa4a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5745,7 +5745,6 @@ with pkgs; inherit (beam.packages.erlang_26.beamPackages) elixir_1_16 elixir_1_15 - elixir_1_14 ; inherit (beam.packages.erlang) @@ -5757,7 +5756,6 @@ with pkgs; rebar3WithPlugins fetchHex lfe - lfe_2_1 ; beamPackages = dontRecurseIntoAttrs beam27Packages; @@ -7043,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 @@ -7279,8 +7275,6 @@ with pkgs; }; }; - frog = res.languageMachines.frog; - fontconfig = callPackage ../development/libraries/fontconfig { }; makeFontsConf = callPackage ../development/libraries/fontconfig/make-fonts-conf.nix { }; @@ -7750,12 +7744,6 @@ with pkgs; stdenv = gccStdenv; }; - languageMachines = recurseIntoAttrs ( - import ../development/libraries/languagemachines/packages.nix { - inherit pkgs; - } - ); - lcms = lcms2; libagar = callPackage ../development/libraries/libagar { }; @@ -8127,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 { }; @@ -11807,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; @@ -12538,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 { }; @@ -12766,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 e61045c98bcd..608a57e24a34 100644 --- a/pkgs/top-level/beam-packages.nix +++ b/pkgs/top-level/beam-packages.nix @@ -49,10 +49,8 @@ in elixir_1_17 elixir_1_16 elixir_1_15 - elixir_1_14 elixir-ls lfe - lfe_2_1 ; };