From 965c6422fcc8fd77cf8dddccf7ab3cc1498d7adb Mon Sep 17 00:00:00 2001 From: ajs124 Date: Sun, 29 May 2022 02:17:23 +0200 Subject: [PATCH 1/2] kid3: remove unused automoc4 input --- pkgs/applications/audio/kid3/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/applications/audio/kid3/default.nix b/pkgs/applications/audio/kid3/default.nix index a29ddbb81508..37bb05d90387 100644 --- a/pkgs/applications/audio/kid3/default.nix +++ b/pkgs/applications/audio/kid3/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchurl -, automoc4 , chromaprint , cmake , docbook_xml_dtd_45 @@ -44,7 +43,6 @@ stdenv.mkDerivation rec { wrapQtAppsHook ]; buildInputs = [ - automoc4 chromaprint ffmpeg flac From 06f08e974977cf2a5a5ce17e5ac9bb7e44ef23bb Mon Sep 17 00:00:00 2001 From: ajs124 Date: Sun, 29 May 2022 02:17:50 +0200 Subject: [PATCH 2/2] automoc4: remove --- .../tools/misc/automoc4/default.nix | 22 ------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 -- 3 files changed, 1 insertion(+), 24 deletions(-) delete mode 100644 pkgs/development/tools/misc/automoc4/default.nix diff --git a/pkgs/development/tools/misc/automoc4/default.nix b/pkgs/development/tools/misc/automoc4/default.nix deleted file mode 100644 index ac027ec45301..000000000000 --- a/pkgs/development/tools/misc/automoc4/default.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ lib, stdenv, fetchurl, cmake, qt4 }: - -stdenv.mkDerivation rec { - pname = "automoc4"; - version = "0.9.88"; - - src = fetchurl { - url = "mirror://kde/stable/automoc4/0.9.88/${pname}.tar.bz2"; - sha256 = "0jackvg0bdjg797qlbbyf9syylm0qjs55mllhn11vqjsq3s1ch93"; - }; - - nativeBuildInputs = [ cmake ]; - buildInputs = [ qt4 ]; - - meta = with lib; { - homepage = "https://techbase.kde.org/Development/Tools/Automoc4"; - description = "KDE Meta Object Compiler"; - license = licenses.bsd2; - maintainers = [ maintainers.sander ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 6ad3af02118b..b11fd10d1846 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -90,6 +90,7 @@ mapAliases ({ at_spi2_atk = throw "'at_spi2_atk' has been renamed to/replaced by 'at-spi2-atk'"; # Converted to throw 2022-02-22 at_spi2_core = throw "'at_spi2_core' has been renamed to/replaced by 'at-spi2-core'"; # Converted to throw 2022-02-22 aucdtect = throw "aucdtect: Upstream no longer provides download urls"; # Added 2020-12-26 + automoc4 = throw "automoc4 has been removed from nixpkgs"; # Added 2022-05-30 avldrums-lv2 = x42-avldrums; # Added 2020-03-29 avxsynth = throw "avxsynth was removed because it was broken"; # Added 2021-05-18 awesome-4-0 = awesome; # Added 2022-05-05 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 74169cac397b..64c9263b232d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14916,8 +14916,6 @@ with pkgs; automake116x = callPackage ../development/tools/misc/automake/automake-1.16.x.nix { }; - automoc4 = callPackage ../development/tools/misc/automoc4 { }; - avrdude = callPackage ../development/embedded/avrdude { }; b4 = callPackage ../development/tools/b4 { };