From b41beef827945f530111320b2fbc515871933c67 Mon Sep 17 00:00:00 2001 From: Jörg Thalheim Date: Tue, 4 Jan 2022 09:08:29 +0100 Subject: mediatomb: remove package --- nixos/modules/services/misc/mediatomb.nix | 1 - pkgs/servers/mediatomb/default.nix | 28 ---------------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 -- 4 files changed, 1 insertion(+), 31 deletions(-) delete mode 100644 pkgs/servers/mediatomb/default.nix diff --git a/nixos/modules/services/misc/mediatomb.nix b/nixos/modules/services/misc/mediatomb.nix index ea9ffbb8677..360cdbac2a1 100644 --- a/nixos/modules/services/misc/mediatomb.nix +++ b/nixos/modules/services/misc/mediatomb.nix @@ -217,7 +217,6 @@ in { package = mkOption { type = types.package; - example = literalExpression "pkgs.mediatomb"; default = pkgs.gerbera; defaultText = literalExpression "pkgs.gerbera"; description = '' diff --git a/pkgs/servers/mediatomb/default.nix b/pkgs/servers/mediatomb/default.nix deleted file mode 100644 index 3f5ac6530e1..00000000000 --- a/pkgs/servers/mediatomb/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ lib, stdenv, fetchgit -, sqlite, expat, mp4v2, flac, spidermonkey_68, taglib, libexif, curl, ffmpeg, file -, pkg-config, autoreconfHook, nixosTests }: - -stdenv.mkDerivation rec { - pname = "mediatomb"; - version = "0.12.1"; - - src = fetchgit { - url = meta.repositories.git; - rev = "7ab761696354868bd5d67ff4f2d849994e4c98e2"; - sha256 = "1mimslr4q6mky865y6561rr64cbn4gf0qc2dhgb31hxp4rc1kmzd"; - }; - - buildInputs = [ sqlite expat spidermonkey_68 taglib libexif curl ffmpeg file mp4v2 flac - pkg-config autoreconfHook ]; - - passthru.tests = { inherit (nixosTests) mediatomb; }; - - meta = with lib; { - homepage = "http://mediatomb.cc"; - repositories.git = "git://mediatomb.git.sourceforge.net/gitroot/mediatomb/mediatomb"; - description = "UPnP MediaServer with a web user interface"; - license = licenses.gpl2; - maintainers = [ ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index d5dd54b48f1..db465f7f0eb 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -604,6 +604,7 @@ mapAliases ({ mathics = throw "mathics has been removed from nixpkgs, as it's unmaintained"; # added 2020-08-15 matrique = spectral; # added 2020-01-27 mbedtls_1_3 = throw "mbedtls_1_3 is end of life, see https://tls.mbed.org/kb/how-to/upgrade-2.0"; # added 2019-12-08 + mediatomb = throw "mediatomb is no longer maintained upstream, use gerbera instead"; # added 2022-01-04 meme = meme-image-generator; # added 2021-04-21 mess = mame; # added 2019-10-30 metamorphose2 = throw "metamorphose2 has been removed from nixpkgs, as it was stuck on python2."; # added 2022-01-12 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 266a2c92a54..8f3f303f27f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21392,8 +21392,6 @@ with pkgs; mbtileserver = callPackage ../servers/mbtileserver { }; - mediatomb = callPackage ../servers/mediatomb { }; - memcached = callPackage ../servers/memcached {}; meteor = callPackage ../servers/meteor { }; -- cgit 1.4.1