From 608ed10f046f97525a843da65f3306c4eec3b23c Mon Sep 17 00:00:00 2001 From: ajs124 Date: Mon, 9 May 2022 23:25:52 +0100 Subject: [PATCH] omapd: remove --- pkgs/tools/security/omapd/default.nix | 36 --------------------------- pkgs/tools/security/omapd/zlib.patch | 9 ------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 -- 4 files changed, 1 insertion(+), 47 deletions(-) delete mode 100644 pkgs/tools/security/omapd/default.nix delete mode 100644 pkgs/tools/security/omapd/zlib.patch diff --git a/pkgs/tools/security/omapd/default.nix b/pkgs/tools/security/omapd/default.nix deleted file mode 100644 index c2d911372eb0..000000000000 --- a/pkgs/tools/security/omapd/default.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ lib, stdenv, fetchurl, qt4, gdb, zlib }: - -stdenv.mkDerivation rec { - pname = "omapd"; - version = "0.9.2"; - - src = fetchurl { - url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/omapd/${pname}-${version}.tgz"; - sha256 = "0d7lgv957jhbsav60j50jhdy3rpcqgql74qsniwnnpm3yqj9p0xc"; - }; - - patches = [ ./zlib.patch ]; - - buildInputs = [ qt4 zlib gdb ]; - - buildPhase = '' - (cd plugins/RAMHashTables; qmake; make) - qmake - make - ''; - - installPhase = '' - install -vD omapd $out/bin/omapd - install -vD omapd.conf $out/etc/omapd.conf - install -vD plugins/libRAMHashTables.so $out/usr/lib/omapd/plugins/libRAMHashTables.so - ln -s $out/usr/lib/omapd/plugins $out/bin/plugins - ''; - - meta = with lib; { - homepage = "https://code.google.com/archive/p/omapd/"; - description = "IF-MAP Server that implements the IF-MAP v1.1 and v2.0 specifications published by the Trusted Computing Group (TCG)"; - license = licenses.gpl3; - maintainers = [ ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/tools/security/omapd/zlib.patch b/pkgs/tools/security/omapd/zlib.patch deleted file mode 100644 index dc0644f2a016..000000000000 --- a/pkgs/tools/security/omapd/zlib.patch +++ /dev/null @@ -1,9 +0,0 @@ -diff -uNr omapd-0.9.2-old/omapd.pro omapd-0.9.2/omapd.pro ---- omapd-0.9.2-old/omapd.pro 2015-08-03 09:46:47.463420480 +0200 -+++ omapd-0.9.2/omapd.pro 2015-08-03 09:48:32.238657105 +0200 -@@ -37,4 +37,4 @@ - clientconfiguration.h \ - managementserver.h \ - json.h --INCLUDEPATH += $$[QT_INSTALL_PREFIX]/src/3rdparty/zlib -+LIBS += -lz diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 10557d5d74ac..b1938d3628cd 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1232,6 +1232,7 @@ mapAliases ({ ogre1_9 = throw "ogre1_9 has been removed, use ogre instead"; # Added 2023-03-22 ogre1_10 = throw "ogre1_10 has been removed, use ogre instead"; # Added 2023-07-20 olifant = throw "olifant has been removed from nixpkgs, as it was unmaintained"; # Added 2021-08-05 + omapd = throw "omapd has been removed from nixpkgs, as it was unmaintained"; # Added 2022-05-09 opa = throw "opa has been removed from nixpkgs as upstream has abandoned the project"; # Added 2023-03-21 opam_1_2 = throw "'opam_1_2' has been renamed to/replaced by 'opam'"; # Added 2023-03-08 openafs_1_8 = openafs; # Added 2022-08-22 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 438f6cbbe268..4a3b42255082 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14075,8 +14075,6 @@ with pkgs; tunwg = callPackage ../tools/networking/tunwg { }; - omapd = callPackage ../tools/security/omapd { }; - ttf2pt1 = callPackage ../tools/misc/ttf2pt1 { }; ttfautohint = libsForQt5.callPackage ../tools/misc/ttfautohint {