diff --git a/doc/release-notes/rl-2605.section.md b/doc/release-notes/rl-2605.section.md index 3b4c274609f8..13451b77d66c 100644 --- a/doc/release-notes/rl-2605.section.md +++ b/doc/release-notes/rl-2605.section.md @@ -197,6 +197,8 @@ - `python3Packages.pikepdf` no longer builds with mupdf support by default, which may be nice in Jupyter and iPython. Build with `withMupdf = true` if this is required. +- `olive-editor` has been dropped as upstream development ceased and no longer builds. + - `python3Packages.django-mdeditor` has been removed, as it was unmaintained upstream and the latest release was vulnerable to a [critical security vulnerability](https://github.com/NixOS/nixpkgs/issues/515462). - `vicinae` has been updated to v0.20. This includes, among several other breaking changes, a complete overhaul of the configuration system. For update instructions, see the [upstream configuration documentation](https://docs.vicinae.com/config#migration-from-v0-16-x-to-v0-17-x). diff --git a/pkgs/by-name/ol/olive-editor/olive-editor-kddockwidgets-fix-build-with-qt-6_10.patch b/pkgs/by-name/ol/olive-editor/olive-editor-kddockwidgets-fix-build-with-qt-6_10.patch deleted file mode 100644 index 3ab25e679764..000000000000 --- a/pkgs/by-name/ol/olive-editor/olive-editor-kddockwidgets-fix-build-with-qt-6_10.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff --git a/ext/KDDockWidgets/CMakeLists.txt b/ext/KDDockWidgets/CMakeLists.txt -index 608a2491..d0edc399 100644 ---- a/ext/KDDockWidgets/CMakeLists.txt -+++ b/ext/KDDockWidgets/CMakeLists.txt -@@ -160,8 +160,16 @@ - include(KDQtInstallPaths) #to set QT_INSTALL_FOO variables - - set(${PROJECT_NAME}_DEPS "widgets") -+if(Qt6Core_VERSION VERSION_GREATER_EQUAL "6.10.0") -+ set(QT_NO_PRIVATE_MODULE_WARNING ON) -+ find_package(Qt6 ${QT_MIN_VERSION} NO_MODULE REQUIRED COMPONENTS WidgetsPrivate) -+endif() - if(${PROJECT_NAME}_QTQUICK) - find_package(Qt${Qt_VERSION_MAJOR} NO_MODULE REQUIRED COMPONENTS Quick QuickControls2) -+ if(Qt6Core_VERSION VERSION_GREATER_EQUAL "6.10.0") -+ set(QT_NO_PRIVATE_MODULE_WARNING ON) -+ find_package(Qt6 ${QT_MIN_VERSION} NO_MODULE REQUIRED COMPONENTS QuickPrivate) -+ endif() - add_definitions(-DKDDOCKWIDGETS_QTQUICK) - set(${PROJECT_NAME}_DEPS "${${PROJECT_NAME}_DEPS} quick quickcontrols2") - else() diff --git a/pkgs/by-name/ol/olive-editor/package.nix b/pkgs/by-name/ol/olive-editor/package.nix deleted file mode 100644 index 09d1b26ac1df..000000000000 --- a/pkgs/by-name/ol/olive-editor/package.nix +++ /dev/null @@ -1,104 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - fetchpatch, - pkg-config, - which, - frei0r, - opencolorio, - ffmpeg_6, - cmake, - openimageio, - openexr, - portaudio, - imath, - qt6, - fmt_10, -}: - -let - # https://github.com/olive-editor/olive/issues/2284 - # we patch support for 2.3+, but 2.5 fails - openimageio' = (openimageio.override { fmt = fmt_10; }).overrideAttrs (old: rec { - version = "2.4.15.0"; - src = ( - old.src.override { - tag = "v${version}"; - hash = "sha256-I2/JPmUBDb0bw7qbSZcAkYHB2q2Uo7En7ZurMwWhg/M="; - } - ); - - # robin-map headers require c++17 - cmakeFlags = (old.cmakeFlags or [ ]) ++ [ (lib.cmakeFeature "CMAKE_CXX_STANDARD" "17") ]; - }); -in - -stdenv.mkDerivation { - pname = "olive-editor"; - version = "0.1.2-unstable-2023-06-12"; - - src = fetchFromGitHub { - fetchSubmodules = true; - owner = "olive-editor"; - repo = "olive"; - rev = "2036fffffd0e24b7458e724b9084ae99c9507c64"; - hash = "sha256-qee9/WTvTy5jWLowvZJOwAjrqznRhJR+u9dYsnCN/Qs="; - }; - - cmakeFlags = [ - "-DBUILD_QT6=1" - ]; - - patches = [ - (fetchpatch { - # Taken from https://github.com/olive-editor/olive/pull/2294. - name = "olive-editor-openimageio-2.3-compat.patch"; - url = "https://github.com/olive-editor/olive/commit/311eeb72944f93f873d1cd1784ee2bf423e1e7c2.patch"; - hash = "sha256-lswWn4DbXGH1qPvPla0jSgUJQXuqU7LQGHIPoXAE8ag="; - }) - - # Fix build of `kddockwidgets` with qt6-6.10, adapted from: - # https://github.com/KDAB/KDDockWidgets/pull/615 - # https://github.com/KDAB/KDDockWidgets/commit/f2b50fff29bd4b49acdfed3ed8fc42eb0a502032 - ./olive-editor-kddockwidgets-fix-build-with-qt-6_10.patch - ]; - - # https://github.com/olive-editor/olive/issues/2200 - postPatch = '' - substituteInPlace ./app/node/project/serializer/serializer230220.cpp \ - --replace 'QStringRef' 'QStringView' - ''; - - nativeBuildInputs = [ - pkg-config - which - cmake - qt6.wrapQtAppsHook - ]; - - buildInputs = [ - ffmpeg_6 - frei0r - opencolorio - openimageio' - imath - openexr - portaudio - qt6.qtwayland - qt6.qtmultimedia - qt6.qttools - ]; - - meta = { - description = "Professional open-source NLE video editor"; - homepage = "https://www.olivevideoeditor.org/"; - downloadPage = "https://www.olivevideoeditor.org/download.php"; - license = lib.licenses.gpl3; - maintainers = with lib.maintainers; [ balsoft ]; - platforms = lib.platforms.unix; - # never built on aarch64-darwin since first introduction in nixpkgs - broken = stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64; - mainProgram = "olive-editor"; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index c498269dad82..9888380d2515 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1595,6 +1595,7 @@ mapAliases { oguri = throw "'oguri' has been removed from nixpkgs because the upstream repository was archived. Please see https://github.com/vilhalmer/oguri#notice-unmaintained for upstream's suggested replacements."; # Added 2026-05-04 oil = throw "'oil' has been renamed to/replaced by 'oils-for-unix'"; # Converted to throw 2025-10-27 olaris-server = throw "'olaris-server' has been removed as it failed to build since 2024"; # Added 2026-01-15 + olive-editor = throw "'olive-editor' has been removed as it is unmaintained upstream and broken"; # Added 2026-05-22 oneDNN = onednn; # Added 2026-02-08 oneDNN_2 = onednn_2; # Added 2026-02-08 onevpl-intel-gpu = throw "'onevpl-intel-gpu' has been renamed to/replaced by 'vpl-gpu-rt'"; # Converted to throw 2025-10-27