From 65748e762197483fce6c84542d793d56b62feedb Mon Sep 17 00:00:00 2001 From: Benjamin Sparks Date: Tue, 25 Mar 2025 17:01:56 +0100 Subject: [PATCH] fdr: drop Archive does not contain source code, only binaries except for one python file. Said Python file contains auto-generated swig code that accounts for Python 2.6 and Python 2.2. --- .../science/programming/fdr/default.nix | 80 ------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 - 3 files changed, 1 insertion(+), 82 deletions(-) delete mode 100644 pkgs/applications/science/programming/fdr/default.nix diff --git a/pkgs/applications/science/programming/fdr/default.nix b/pkgs/applications/science/programming/fdr/default.nix deleted file mode 100644 index 899a7ca3f137..000000000000 --- a/pkgs/applications/science/programming/fdr/default.nix +++ /dev/null @@ -1,80 +0,0 @@ -{ - lib, - stdenv, - fetchurl, - qtbase, - qtx11extras, - ncurses5, - xorg, - zlib, - python27Packages, -}: -stdenv.mkDerivation { - pname = "fdr"; - version = "4.2.7"; - src = fetchurl { - url = "https://dl.cocotec.io/fdr/fdr-3814-linux-x86_64.tar.gz"; - sha256 = "0cajz1gz4slq9nfhm8dqdgxl0kc950838n0lrf8jw4vl54gv6chh"; - }; - - libPath = lib.makeLibraryPath [ - stdenv.cc.cc - python27Packages.python - qtbase - qtx11extras - ncurses5 - xorg.libX11 - xorg.libXft - zlib - ]; - - dontConfigure = true; - installPhase = '' - mkdir -p "$out" - - # shipped Qt is buggy - rm lib/libQt* - rm -r lib/qt_plugins - - cp -r * "$out" - ln -s ${ncurses5.out}/lib/libtinfo.so.5 $out/lib/libtinfo.so.5 - ln -s ${qtbase.bin}/${qtbase.qtPluginPrefix} $out/lib/qt_plugins - ln -s ${zlib.out}/lib/libz.so.1 $out/lib/libz.so.1 - - for b in fdr4 _fdr4 refines _refines cspmprofiler cspmexplorerprof - do - patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ - --set-rpath "$libPath:$out/lib" \ - "$out/bin/$b" - done - - for l in corei7/librefines.so \ - libcspm_process_compiler.so \ - libcsp_operators.so \ - _fdr.so \ - libfdr.so \ - libfdr_java.so \ - libprocess_compiler.so \ - librefines_gui.so \ - librefines_licensing.so \ - libboost_date_time.so.1.60.0 \ - libboost_filesystem.so.1.60.0 \ - libboost_iostreams.so.1.60.0 \ - libboost_program_options.so.1.60.0 \ - libboost_serialization.so.1.60.0 \ - libboost_system.so.1.60.0 - do - patchelf --set-rpath "$libPath:$out/lib" \ - "$out/lib/$l" - done - ''; - - meta = with lib; { - homepage = "https://cocotec.io/fdr/"; - description = "CSP refinement checker"; - license = licenses.unfreeRedistributable; - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - platforms = platforms.linux; - maintainers = with maintainers; [ nickhu ]; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 741dca6e8c2b..df71bc431c9c 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -469,6 +469,7 @@ mapAliases { fastnlo = throw "'fastnlo' has been renamed to/replaced by 'fastnlo-toolkit'"; # Converted to throw 2024-10-17 fastnlo_toolkit = fastnlo-toolkit; # Added 2024-01-03 fcitx5-catppuccin = catppuccin-fcitx5; # Added 2024-06-19 + fdr = throw "fdr has been removed, as it cannot be built from source and depends on Python 2.x"; # Added 2025-03-19 inherit (luaPackages) fennel; # Added 2022-09-24 ferdi = throw "'ferdi' has been removed, upstream does not exist anymore and the package is insecure"; # Added 2024-08-22 fetchFromGithub = throw "You meant fetchFromGitHub, with a capital H"; # preserve diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index db392a2b84ea..c54d96816dd3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13186,8 +13186,6 @@ with pkgs; evolution = callPackage ../applications/networking/mailreaders/evolution/evolution { }; evolutionWithPlugins = callPackage ../applications/networking/mailreaders/evolution/evolution/wrapper.nix { plugins = [ evolution evolution-ews ]; }; - fdr = libsForQt5.callPackage ../applications/science/programming/fdr { }; - fetchmail = callPackage ../applications/misc/fetchmail { }; fetchmail_7 = callPackage ../applications/misc/fetchmail/v7.nix { };