From 06239c45f072d7a650d082e9b8dcbec9c22db01c Mon Sep 17 00:00:00 2001 From: ajs124 Date: Mon, 13 Jun 2022 02:47:47 +0200 Subject: [PATCH] qfsm: remove there seems to be an active fork. see https://github.com/AaronErhardt/qfsm/issues/1 for their progress on qt5 support --- .../science/electronics/qfsm/default.nix | 28 ------------------- .../qfsm/drop-hardcoded-prefix.patch | 20 ------------- .../science/electronics/qfsm/gcc6-fixes.patch | 20 ------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 -- 5 files changed, 1 insertion(+), 70 deletions(-) delete mode 100644 pkgs/applications/science/electronics/qfsm/default.nix delete mode 100644 pkgs/applications/science/electronics/qfsm/drop-hardcoded-prefix.patch delete mode 100644 pkgs/applications/science/electronics/qfsm/gcc6-fixes.patch diff --git a/pkgs/applications/science/electronics/qfsm/default.nix b/pkgs/applications/science/electronics/qfsm/default.nix deleted file mode 100644 index e22138997beaf76..000000000000000 --- a/pkgs/applications/science/electronics/qfsm/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ lib, stdenv, fetchurl, qt4, cmake, graphviz, pkg-config }: - -stdenv.mkDerivation rec { - pname = "qfsm"; - version = "0.54.0"; - - src = fetchurl { - url = "mirror://sourceforge/qfsm/qfsm-${version}-Source.tar.bz2"; - sha256 = "0rl7bc5cr29ng67yij4akciyid9z7npal812ys4c3m229vjvflrb"; - }; - - nativeBuildInputs = [ cmake pkg-config ]; - buildInputs = [ qt4 graphviz ]; - - patches = [ - ./drop-hardcoded-prefix.patch - ./gcc6-fixes.patch - ]; - - hardeningDisable = [ "format" ]; - - meta = { - description = "Graphical editor for finite state machines"; - homepage = "https://qfsm.sourceforge.net/"; - license = lib.licenses.gpl3Plus; - platforms = lib.platforms.unix; - }; -} diff --git a/pkgs/applications/science/electronics/qfsm/drop-hardcoded-prefix.patch b/pkgs/applications/science/electronics/qfsm/drop-hardcoded-prefix.patch deleted file mode 100644 index 965d67ac5526b5d..000000000000000 --- a/pkgs/applications/science/electronics/qfsm/drop-hardcoded-prefix.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff -ubrw qfsm-0.53.0-Source-orig/CMakeLists.txt qfsm-0.53.0-Source-new/CMakeLists.txt ---- qfsm-0.53.0-Source-orig/CMakeLists.txt 2012-11-11 20:13:01.935856229 +0100 -+++ qfsm-0.53.0-Source-new/CMakeLists.txt 2012-11-11 20:13:24.962930007 +0100 -@@ -406,10 +406,6 @@ - - - IF(UNIX AND NOT WIN32) -- SET(CMAKE_INSTALL_PREFIX "/usr") --ENDIF(UNIX AND NOT WIN32) -- --IF(UNIX AND NOT WIN32) - ADD_DEFINITIONS(-DQFSM_LANGUAGE_DIR="${CMAKE_INSTALL_PREFIX}/share/qfsm/") - ADD_DEFINITIONS(-DQFSM_HELP_DIR="${CMAKE_INSTALL_PREFIX}/share/doc/qfsm/") - ELSE(UNIX AND NOT WIN32) -@@ -472,5 +468,3 @@ - ) - - ENDIF(UNIX AND NOT WIN32) -- -- diff --git a/pkgs/applications/science/electronics/qfsm/gcc6-fixes.patch b/pkgs/applications/science/electronics/qfsm/gcc6-fixes.patch deleted file mode 100644 index 5cedc647639764a..000000000000000 --- a/pkgs/applications/science/electronics/qfsm/gcc6-fixes.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- qfsm-0.54.0-Source-orig/src/FileIO.cpp 2015-01-02 19:01:46.000000000 +0100 -+++ qfsm-0.54.0-Source/src/FileIO.cpp 2017-09-11 19:53:30.579488402 +0200 -@@ -1617,7 +1617,7 @@ - QString ext; - - if (!imp) -- return FALSE; -+ return NULL; - - Project* p=NULL; - importdlg->setAcceptMode(QFileDialog::AcceptOpen); -@@ -1641,7 +1641,7 @@ - ifstream fin(act_importfile); - - if (!fin) -- return FALSE; -+ return NULL; - - emit setWaitCursor(); - diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index c36ee0b7635e31a..ba1031f6250e2d3 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1308,6 +1308,7 @@ mapAliases ({ qca2 = throw "qca2 has been removed, because it depended on qt4"; # Added 2022-05-26 qcsxcad = libsForQt5.qcsxcad; # Added 2020-11-05 qflipper = qFlipper; # Added 2022-02-11 + qfsm = throw "qfsm has been removed, because it depended on qt4"; # Added 2022-06-12 qimageblitz = throw "qimageblitz has been removed from nixpkgs, because it depended on qt4 and was last updated upstream in 2007"; # Added 2022-06-12 qmetro = throw "qmetro has been removed, because it does not support qt5 (well)"; # Added 2022-05-26 qmidiroute = throw "qmidiroute has been removed, because it was unmaintained upstream"; # Added 2022-05-26 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 35e20f575a0c379..fe49a5b3a39a393 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13163,8 +13163,6 @@ with pkgs; tweeny = callPackage ../development/libraries/tweeny { }; - qfsm = callPackage ../applications/science/electronics/qfsm { }; - tkgate = callPackage ../applications/science/electronics/tkgate/1.x.nix { }; tm = callPackage ../tools/system/tm { };