diff --git a/pkgs/applications/audio/soundux/default.nix b/pkgs/applications/audio/soundux/default.nix deleted file mode 100644 index ea9ea3322b55..000000000000 --- a/pkgs/applications/audio/soundux/default.nix +++ /dev/null @@ -1,144 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, cmake -, pkg-config -, makeBinaryWrapper -, pipewire -, libpulseaudio -, libappindicator -, libstartup_notification -, openssl -, libwnck -, pcre -, util-linux -, libselinux -, libsepol -, libthai -, libdatrie -, xorg -, libxkbcommon -, libepoxy -, dbus -, at-spi2-core -, nlohmann_json -, fancypp -, httplib -, semver-cpp -, webkitgtk -, yt-dlp -, ffmpeg -, lsb-release -}: - -stdenv.mkDerivation rec { - pname = "soundux"; - version = "0.2.7"; - - src = fetchFromGitHub { - owner = "Soundux"; - repo = "Soundux"; - rev = version; - sha256 = "sha256-aSCsg6nJt6F+6O7UeXnvYva0vllTfsxK/cjaeOhObZY="; - fetchSubmodules = true; - }; - - nativeBuildInputs = [ - cmake - pkg-config - makeBinaryWrapper - ]; - - buildInputs = [ - pipewire - libpulseaudio - libappindicator - openssl - libwnck - pcre - util-linux - libselinux - libsepol - libthai - libdatrie - xorg.libXdmcp - xorg.libXtst - xorg.libXres - libxkbcommon - libepoxy - dbus - at-spi2-core - nlohmann_json - fancypp - httplib - semver-cpp - libstartup_notification - webkitgtk - yt-dlp - ffmpeg - ]; - - postPatch = '' - # cannot be overwritten with variables - substituteInPlace CMakeLists.txt \ - --replace "set(CMAKE_INSTALL_PREFIX \"/opt/soundux\" CACHE PATH \"Install path prefix, prepended onto install directories.\" FORCE)" "" \ - --replace "/usr/share" "$out/usr/share" - substituteInPlace src/ui/impl/webview/webview.cpp \ - --replace "/usr/share/pixmaps/soundux.png" "$out/share/pixmaps/soundux.png" - ''; - - # We need to append /opt to our CMAKE_INSTALL_PREFIX - dontAddPrefix = true; - - preConfigure = '' - # This needs to be set in preConfigure to access the $prefix variable - export cmakeFlags="-DCMAKE_INSTALL_PREFIX=$prefix/opt $cmakeFlags" - - # Replace some fetched submodules with symlinks nix packages. - rm -rf \ - lib/json \ - lib/fancypp \ - lib/lib-httplib \ - lib/semver - - ln -s ${nlohmann_json} lib/json - ln -s ${fancypp} lib/fancypp - ln -s ${httplib} lib/lib-httplib - ln -s ${semver-cpp} lib/semver - ''; - - NIX_CFLAGS_COMPILE = [ "-Wno-error=deprecated-declarations" ]; - - # Somehow some of the install destination paths in the build system still - # gets transformed to point to /var/empty/share, even though they are at least - # relative to the nix output directory with our earlier patching. - postInstall = '' - mv "$out/var/empty/share" "$out" - rm -rf "$out/var" - mkdir "$out/bin" - ln -s "$out/opt/soundux" "$out/bin" - substituteInPlace "$out/share/applications/soundux.desktop" \ - --replace "/opt/soundux/soundux" "soundux" - ''; - - postFixup = let - rpaths = lib.makeLibraryPath [libwnck pipewire libpulseaudio]; - in '' - # Wnck, PipeWire, and PulseAudio are dlopen-ed by Soundux, so they do - # not end up on the RPATH during the build process. - patchelf --add-rpath "${rpaths}" "$out/opt/soundux-${version}" - - # Work around upstream bug https://github.com/Soundux/Soundux/issues/435 - wrapProgram "$out/bin/soundux" \ - --set WEBKIT_DISABLE_COMPOSITING_MODE 1 \ - --prefix PATH : ${lib.makeBinPath [ yt-dlp ffmpeg lsb-release ]} \ - ''; - - meta = with lib; { - description = "A cross-platform soundboard."; - homepage = "https://soundux.rocks/"; - license = licenses.gpl3Plus; - platforms = platforms.linux; - maintainers = with maintainers; [ aidalgol ]; - }; -} diff --git a/pkgs/development/libraries/fancypp/default.nix b/pkgs/development/libraries/fancypp/default.nix deleted file mode 100644 index f93ab77c63de..000000000000 --- a/pkgs/development/libraries/fancypp/default.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ lib -, stdenvNoCC -, fetchFromGitHub -}: - -stdenvNoCC.mkDerivation rec { - pname = "fancypp"; - version = "unstable-2021-04-08"; - - src = fetchFromGitHub { - owner = "Curve"; - repo = "fancypp"; - rev = "ede7f712a08f7c66ff4a5590ad94a477c48850a5"; - sha256 = "sha256-E2JsQnvrqrZFYo+xBJr7xDCoPnRQftqUjjBpZzFvIic="; - }; - - # Header-only library. - dontBuild = true; - - installPhase = '' - mkdir "$out" - cp -r include "$out" - ''; - - meta = with lib; { - description = "Tiny C++ Library for terminal colors and more!"; - homepage = "https://github.com/Curve/fancypp"; - maintainers = with maintainers; [ aidalgol ]; - license = licenses.mit; - }; -} diff --git a/pkgs/development/libraries/semver-cpp/default.nix b/pkgs/development/libraries/semver-cpp/default.nix deleted file mode 100644 index 966f170eaad0..000000000000 --- a/pkgs/development/libraries/semver-cpp/default.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ lib -, stdenvNoCC -, fetchFromGitHub -}: - -stdenvNoCC.mkDerivation rec { - pname = "semver-cpp"; - version = "0.3.0"; - - src = fetchFromGitHub { - owner = "Neargye"; - repo = "semver"; - rev = "v${version}"; - sha256 = "sha256-nRWmY/GJtSkPJIW7i7/eIr/YtfyvYhJVZBRIDXUC7xg="; - }; - - # Header-only library. - dontBuild = true; - - installPhase = '' - mkdir "$out" - cp -r include "$out" - ''; - - meta = with lib; { - description = "Semantic Versioning for modern C++"; - homepage = "https://github.com/Neargye/semver"; - maintainers = with maintainers; [ aidalgol ]; - license = licenses.mit; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index eeaf485a951f..4238169e980d 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -279,6 +279,7 @@ mapAliases ({ ### F ### + fancypp = throw "'fancypp' was removed because it and its dependants are unmaintained"; # Added 2024-02-14 faustStk = faustPhysicalModeling; # Added 2023-05-16 fastnlo = fastnlo-toolkit; # Added 2021-04-24 fastnlo_toolkit = fastnlo-toolkit; # Added 2024-01-03 @@ -981,6 +982,7 @@ mapAliases ({ scitoken-cpp = scitokens-cpp; # Added 2024-02-12 sdlmame = throw "'sdlmame' has been renamed to/replaced by 'mame'"; # Converted to throw 2023-09-10 searx = throw "'searx' has been removed as it is unmaintained. Please switch to searxng"; # Added 2023-10-03 + semver-cpp = throw "'semver-cpp' was removed because no packages in nixpkgs use it anymore"; # Added 2024-02-14 session-desktop-appimage = session-desktop; setupcfg2nix = throw "'setupcfg2nix' has been removed. Please switch to buildPythonPackage"; # Added 2023-12-12 sequoia = sequoia-sq; # Added 2023-06-26 @@ -1001,6 +1003,7 @@ mapAliases ({ solr_8 = throw "'solr' has been removed from nixpkgs, as it was broken and unmaintained"; # Added 2023-03-16 solr = throw "'solr' has been removed from nixpkgs, as it was broken and unmaintained"; # Added 2023-03-16 soundOfSorting = sound-of-sorting; # Added 2023-07-07 + soundux = throw "'soundux' has been removed, as it is unmaintained."; # Added on 2024-02-14 spark2 = throw "'spark2' is no longer supported nixpkgs, please use 'spark'"; # Added 2023-05-08 spark_2_4 = throw "'spark_2_4' is no longer supported nixpkgs, please use 'spark'"; # Added 2023-05-08 spark_3_1 = throw "'spark_3_1' is no longer supported nixpkgs, please use 'spark'"; # Added 2023-05-08 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 47d842460f08..a7b70a38b99c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21048,8 +21048,6 @@ with pkgs; factor-lang-scope = callPackage ../development/compilers/factor-lang/scope.nix { }; factor-lang = factor-lang-scope.interpreter; - fancypp = callPackage ../development/libraries/fancypp { }; - far2l = callPackage ../applications/misc/far2l { inherit (darwin.apple_sdk.frameworks) IOKit Carbon Cocoa AudioToolbox OpenGL System; }; @@ -24832,8 +24830,6 @@ with pkgs; seasocks = callPackage ../development/libraries/seasocks { }; - semver-cpp = callPackage ../development/libraries/semver-cpp { }; - serd = callPackage ../development/libraries/serd { }; serf = callPackage ../development/libraries/serf { }; @@ -26763,10 +26759,6 @@ with pkgs; pulseeffects-legacy = callPackage ../applications/audio/pulseeffects-legacy { }; - soundux = callPackage ../applications/audio/soundux { - yt-dlp = yt-dlp.override { withAlias = true; }; - }; - tomcat_connectors = callPackage ../servers/http/apache-modules/tomcat-connectors { }; tomcat-native = callPackage ../servers/http/tomcat/tomcat-native.nix { };