diff --git a/pkgs/development/libraries/spice-gtk/default.nix b/pkgs/development/libraries/spice-gtk/default.nix index 2111b23a6f75..d54ffa3bd19b 100644 --- a/pkgs/development/libraries/spice-gtk/default.nix +++ b/pkgs/development/libraries/spice-gtk/default.nix @@ -17,8 +17,6 @@ , libdrm , libjpeg_turbo , libopus -, withLibsoup2 ? false -, libsoup , libsoup_3 , libusb1 , lz4 @@ -27,7 +25,6 @@ , ninja , openssl , perl -, phodav_2_0 , phodav , pixman , pkg-config @@ -120,11 +117,11 @@ stdenv.mkDerivation rec { libcacard libjpeg_turbo libopus - (if withLibsoup2 then libsoup else libsoup_3) + libsoup_3 libusb1 lz4 openssl - (if withLibsoup2 then phodav_2_0 else phodav) + phodav pixman spice-protocol usbredir diff --git a/pkgs/tools/networking/phodav/2.0.nix b/pkgs/tools/networking/phodav/2.0.nix deleted file mode 100644 index fa809d059591..000000000000 --- a/pkgs/tools/networking/phodav/2.0.nix +++ /dev/null @@ -1,59 +0,0 @@ -{ lib -, stdenv -, fetchurl -, fetchpatch -, pkg-config -, libsoup -, meson -, ninja -}: - -stdenv.mkDerivation rec { - pname = "phodav"; - version = "2.5"; - - outputs = [ "out" "dev" "lib" ]; - - src = fetchurl { - url = "http://ftp.gnome.org/pub/GNOME/sources/phodav/${version}/${pname}-${version}.tar.xz"; - sha256 = "045rdzf8isqmzix12lkz6z073b5qvcqq6ad028advm5gf36skw3i"; - }; - - patches = [ - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/phodav/-/commit/ae9ac98c1b3db26070111661aba02594c62d2cef.patch"; - sha256 = "sha256-jIHG6aRqG00Q6aIQsn4tyQdy/b6juW6QiUPXLmIc3TE="; - }) - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/phodav/-/commit/560ab5ca4f836d82bddbbe66ea0f7c6b4cab6b3b.patch"; - sha256 = "sha256-2gP579qhEkp7fQ8DBGYbZcjb2Tr+WpJs30Z7lsQaz2g="; - }) - ]; - - mesonFlags = [ - "-Davahi=disabled" - "-Dsystemd=disabled" - "-Dgtk_doc=disabled" - "-Dudev=disabled" - ]; - - NIX_LDFLAGS = lib.optionalString stdenv.isDarwin "-lintl"; - - nativeBuildInputs = [ - pkg-config - meson - ninja - ]; - - buildInputs = [ - libsoup - ]; - - meta = with lib; { - description = "WebDav server implementation and library using libsoup 2"; - homepage = "https://wiki.gnome.org/phodav"; - license = licenses.lgpl21Plus; - maintainers = with maintainers; [ wegank ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 5a4d2fbb189c..180db96ab8ac 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1149,6 +1149,7 @@ mapAliases ({ phantomjs = throw "phantomjs 1.9.8 has been dropped due to lack of maintenance and security issues"; # Added 2022-02-20 phantomjs2 = throw "phantomjs2 has been dropped due to lack of maintenance"; # Added 2022-04-22 philter = throw "philter has been removed: abandoned by upstream"; # Added 2022-04-26 + phodav_2_0 = throw "'phodav_2_0' has been renamed to/replaced by 'phodav'"; # Added 2023-02-21 phraseapp-client = throw "phraseapp-client is archived by upstream. Use phrase-cli instead"; # Added 2022-05-15 phwmon = throw "phwmon has been removed: abandoned by upstream"; # Added 2022-04-24 @@ -1462,6 +1463,7 @@ mapAliases ({ speedometer = throw "speedometer has been removed: abandoned by upstream"; # Added 2022-04-24 speedtest_cli = throw "'speedtest_cli' has been renamed to/replaced by 'speedtest-cli'"; # Converted to throw 2022-02-22 sphinxbase = throw "sphinxbase has been removed: unmaintained"; # Added 2022-04-24 + spice-gtk_libsoup2 = throw "'spice-gtk_libsoup2' has been renamed to/replaced by 'spice-gtk'"; # Added 2023-02-21 spice_gtk = throw "'spice_gtk' has been renamed to/replaced by 'spice-gtk'"; # Converted to throw 2022-02-22 spice_protocol = throw "'spice_protocol' has been renamed to/replaced by 'spice-protocol'"; # Converted to throw 2022-02-22 spidermonkey_1_8_5 = throw "spidermonkey_1_8_5 has been removed, because it is based on Firefox 4.0 from 2011"; # added 2021-05-03 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0a959411c650..ebc8418f09b2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10916,8 +10916,6 @@ with pkgs; phodav = callPackage ../tools/networking/phodav { }; - phodav_2_0 = callPackage ../tools/networking/phodav/2.0.nix { }; - photon-rss = callPackage ../applications/networking/feedreaders/photon { }; pim6sd = callPackage ../servers/pim6sd { }; @@ -23418,8 +23416,6 @@ with pkgs; spice-gtk = callPackage ../development/libraries/spice-gtk { }; - spice-gtk_libsoup2 = spice-gtk.override { withLibsoup2 = true; }; - spice-protocol = callPackage ../development/libraries/spice-protocol { }; spice-up = callPackage ../applications/office/spice-up { };