diff --git a/pkgs/applications/science/misc/foldingathome/control.nix b/pkgs/applications/science/misc/foldingathome/control.nix deleted file mode 100644 index a64c973914c6..000000000000 --- a/pkgs/applications/science/misc/foldingathome/control.nix +++ /dev/null @@ -1,57 +0,0 @@ -{ lib, stdenv -, dpkg -, fahviewer -, fetchurl -, makeWrapper -, python2 -}: -let - majMin = lib.versions.majorMinor version; - version = "7.6.21"; - - python = python2.withPackages - ( - ps: [ - ps.pycairo - ps.pygobject2 - ps.pygtk - ] - ); -in -stdenv.mkDerivation rec { - inherit version; - pname = "fahcontrol"; - - src = fetchurl { - url = "https://download.foldingathome.org/releases/public/release/fahcontrol/debian-stable-64bit/v${majMin}/fahcontrol_${version}-1_all.deb"; - sha256 = "1vfrdqkrvdlyxaw3f6z92w5dllrv6810lmf8yhcmjcwmphipvf71"; - }; - - nativeBuildInputs = [ - dpkg - makeWrapper - ]; - - buildInputs = [ fahviewer python ]; - - unpackPhase = '' - dpkg-deb -x ${src} ./ - ''; - - installPhase = "cp -ar usr $out"; - - postFixup = '' - sed -e "s|/usr/bin|$out/bin|g" -i $out/share/applications/FAHControl.desktop - wrapProgram "$out/bin/FAHControl" \ - --suffix PATH : "${fahviewer.outPath}/bin" \ - --set PYTHONPATH "$out/lib/python2.7/dist-packages" - ''; - - meta = { - description = "Folding@home control"; - homepage = "https://foldingathome.org/"; - license = lib.licenses.unfree; - maintainers = [ lib.maintainers.zimbatm ]; - platforms = [ "x86_64-linux" ]; - }; -} diff --git a/pkgs/applications/science/misc/foldingathome/viewer.nix b/pkgs/applications/science/misc/foldingathome/viewer.nix deleted file mode 100644 index bb2c3c0abe30..000000000000 --- a/pkgs/applications/science/misc/foldingathome/viewer.nix +++ /dev/null @@ -1,56 +0,0 @@ -{ lib, stdenv -, autoPatchelfHook -, dpkg -, fetchurl -, libglut -, gcc-unwrapped -, libGL -, libGLU -, makeWrapper -, zlib -}: -let - majMin = lib.versions.majorMinor version; - version = "7.6.21"; -in -stdenv.mkDerivation rec { - inherit version; - pname = "fahviewer"; - - src = fetchurl { - url = "https://download.foldingathome.org/releases/public/release/fahviewer/debian-stable-64bit/v${majMin}/fahviewer_${version}_amd64.deb"; - sha256 = "00fd00pf6fcpplcaahvy9ir60mk69d9rcmwsyq3jrv9mxqm9aq7p"; - }; - - nativeBuildInputs = [ - autoPatchelfHook - dpkg - makeWrapper - ]; - - buildInputs = [ - libglut - gcc-unwrapped.lib - libGL - libGLU - zlib - ]; - - unpackPhase = '' - dpkg-deb -x ${src} ./ - sed -e "s|/usr/bin|$out/bin|g" -i usr/share/applications/FAHViewer.desktop - ''; - - installPhase = '' - cp -ar usr $out - ''; - - meta = { - description = "Folding@home viewer"; - homepage = "https://foldingathome.org/"; - sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; - license = lib.licenses.unfree; - maintainers = [ lib.maintainers.zimbatm ]; - platforms = [ "x86_64-linux" ]; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 3df3d70f44c7..9661a24a7225 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -454,6 +454,8 @@ mapAliases { ### F ### + fahcontrol = throw "fahcontrol has been removed because the download is no longer available"; # added 2024-09-24 + fahviewer = throw "fahviewer has been removed because the download is no longer available"; # added 2024-09-24 fam = throw "'fam' (aliased to 'gamin') has been removed as it is unmaintained upstream"; # Added 2024-04-19 fancypp = throw "'fancypp' was removed because it and its dependants are unmaintained"; # Added 2024-02-14 faustStk = faustPhysicalModeling; # Added 2023-05-16 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c4691ddaae60..a745e3008c04 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -37554,8 +37554,6 @@ with pkgs; flockit = callPackage ../tools/backup/flockit { }; fahclient = callPackage ../applications/science/misc/foldingathome/client.nix { }; - fahcontrol = callPackage ../applications/science/misc/foldingathome/control.nix { }; - fahviewer = callPackage ../applications/science/misc/foldingathome/viewer.nix { }; fbmark = callPackage ../tools/misc/fbmark { };