diff options
| -rw-r--r-- | pkgs/applications/science/electronics/qucs/cmakelists.patch | 34 | ||||
| -rw-r--r-- | pkgs/applications/science/electronics/qucs/default.nix | 30 | ||||
| -rw-r--r-- | pkgs/top-level/aliases.nix | 1 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
4 files changed, 1 insertions, 66 deletions
diff --git a/pkgs/applications/science/electronics/qucs/cmakelists.patch b/pkgs/applications/science/electronics/qucs/cmakelists.patch deleted file mode 100644 index 27066f09c84..00000000000 --- a/pkgs/applications/science/electronics/qucs/cmakelists.patch +++ /dev/null @@ -1,34 +0,0 @@ -diff --git i/qucs-core/CMakeLists.txt w/qucs-core/CMakeLists.txt -index 2dbbd41..d174b50 100644 ---- i/qucs-core/CMakeLists.txt -+++ w/qucs-core/CMakeLists.txt -@@ -158,26 +158,9 @@ ENDIF() - - # - # Need Bison --# --# This is a HACK to get arround a PATH issue with Qt Creator on OSX. --# It seams impossible to pass a custom PATH to Qt Creator on OSX, ie, cannot prepend `/usr/local/bin/` for intance. --# The FIND_PACKAGE fails. For now we provide a fallback with a custom FIND_PROGRAM. The variable BISON_DIR is also available. --IF(WIN32) -- FIND_PACKAGE(BISON 2.4 REQUIRED) -- IF(BISON_FOUND) -- #MESSAGE(STATUS "Found bison: ${BISON_EXECUTABLE} / Version: ${BISON_VERSION}" ) -- ENDIF() --ELSE() # Linux, OSX -- # use -DBISON_DIR=/path/ to provide the path to bison -- FIND_PROGRAM( BISON_EXECUTABLE bison -- PATHS /usr/local/bin/ /opt/local/bin/ /usr/bin ${BISON_DIR} -- DOC "bison path" -- NO_DEFAULT_PATH ) -- IF(BISON_EXECUTABLE ) -- MESSAGE(STATUS "Found bison: " ${BISON_EXECUTABLE}) -- ELSE() -- MESSAGE(FATAL_ERROR "Unable to find bison. Try to provide -DBISON_DIR=[path]") -- ENDIF() -+FIND_PACKAGE(BISON 2.4 REQUIRED) -+IF(BISON_FOUND) -+ #MESSAGE(STATUS "Found bison: ${BISON_EXECUTABLE} / Version: ${BISON_VERSION}" ) - ENDIF() - - # diff --git a/pkgs/applications/science/electronics/qucs/default.nix b/pkgs/applications/science/electronics/qucs/default.nix deleted file mode 100644 index eeb10b3a5a1..00000000000 --- a/pkgs/applications/science/electronics/qucs/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{lib, stdenv, fetchFromGitHub, flex, bison, qt4, libX11, cmake, gperf, adms }: - -stdenv.mkDerivation rec { - version = "0.0.19"; - pname = "qucs"; - - src = fetchFromGitHub { - owner = "Qucs"; - repo = "qucs"; - rev = "qucs-${version}"; - sha256 = "106h3kjyg7c0hkmzkin7h8fcl32n60835121b2qqih8ixi6r5id6"; - }; - - QTDIR=qt4; - - patches = [ - ./cmakelists.patch - ]; - - nativeBuildInputs = [ cmake flex bison ]; - buildInputs = [ qt4 libX11 gperf adms ]; - - meta = { - description = "Integrated circuit simulator"; - homepage = "https://qucs.sourceforge.net"; - license = lib.licenses.gpl2Plus; - maintainers = with lib.maintainers; [viric]; - platforms = with lib.platforms; linux; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index b95d47c749f..ae9f5d54bec 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1517,6 +1517,7 @@ mapAliases ({ quagga = throw "quagga is no longer maintained upstream"; # Added 2021-04-22 quake3game = throw "'quake3game' has been renamed to/replaced by 'ioquake3'"; # Converted to throw 2022-02-22 quaternion-git = throw "quaternion-git has been removed in favor of the stable version 'quaternion'"; # Added 2020-04-09 + qucs = throw "qucs has been removed, because it depended on qt4. try using qucs-s"; # Added 2022-05-12 quilter = throw "quilter has been removed from nixpkgs, as it was unmaintained"; # Added 2021-08-03 qutebrowser-qt6 = throw "'qutebrowser-qt6' has been replaced by 'qutebrowser', since the the qt5 version has been removed"; # Added 2023-08-19 qvim = throw "qvim has been removed"; # Added 2020-08-31 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cd954b64dcc..dd11e6f7ff7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -39932,8 +39932,6 @@ with pkgs; pcb = callPackage ../applications/science/electronics/pcb { }; - qucs = callPackage ../applications/science/electronics/qucs { }; - qucs-s = qt6Packages.callPackage ../applications/science/electronics/qucs-s { }; xcircuit = callPackage ../applications/science/electronics/xcircuit { }; |