Unverified Commit 390553bd authored by Weijia Wang's avatar Weijia Wang Committed by GitHub
Browse files

Merge pull request #258556 from maxhille/remove-aether 

aether: remove
parents 6bcc293d 6af2ce35

maintainers/maintainer-list.nix

+0 −6
Original line number Diff line number Diff line
@@ -11035,12 +11035,6 @@ 
    githubId = 4708337;

    name = "Marcelo A. de L. Santos";

  };

  maxhille = {

    email = "mh@lambdasoup.com";

    github = "maxhille";

    githubId = 693447;

    name = "Max Hille";

  };

  maximsmol = {

    email = "maximsmol@gmail.com";

    github = "maximsmol";

pkgs/applications/networking/aether/default.nix

deleted100644 → 0
+0 −112
Original line number Diff line number Diff line 
{ autoPatchelfHook, makeDesktopItem, lib, stdenv, wrapGAppsHook

, alsa-lib, at-spi2-atk, at-spi2-core, atk, cairo, cups, dbus, expat, fontconfig

, freetype, gdk-pixbuf, glib, gtk3, libcxx, libdrm, libnotify, libpulseaudio, libuuid

, libX11, libXScrnSaver, libXcomposite, libXcursor, libXdamage, libXext

, libXfixes, libXi, libXrandr, libXrender, libXtst, libxcb, libxshmfence

, mesa, nspr, nss, pango, systemd, libappindicator-gtk3, libdbusmenu

, fetchurl, fetchFromGitHub, imagemagick, copyDesktopItems

}:



let

  binaryName = "AetherP2P";

  aether-app-git = fetchFromGitHub {

    owner = "aethereans";

    repo = "aether-app";

    rev = "53b6c8b2a9253cbf056ea3ebb077e0e08cbc5b1d";

    sha256 = "1kgkzh7ih2q9dsckdkinh5dbzvr7gdykf8yz6h8pyhvzyjhk1v0r";

  };

in

stdenv.mkDerivation rec {

  pname = "aether";

  version = "2.0.0-dev.15";



  src = fetchurl {

    url = "https://static.getaether.net/Releases/Aether-${version}/2011262249.19338c93/linux/Aether-${version}%2B2011262249.19338c93.tar.gz";

    sha256 = "1hi8w83zal3ciyzg2m62shkbyh6hj7gwsidg3dn88mhfy68himf7";

    # % in the url / canonical filename causes an error

    name = "aether-tarball.tar.gz";

  };



  # there is no logo in the tarball so we grab it from github and convert it in the build phase

  buildPhase = ''

    convert ${aether-app-git}/aether-core/aether/client/src/app/ext_dep/images/Linux-Windows-App-Icon.png -resize 512x512 aether.png

  '';



  dontWrapGApps = true;



  buildInputs = [

    alsa-lib

    cups

    libdrm

    libuuid

    libXdamage

    libX11

    libXScrnSaver

    libXtst

    libxcb

    libxshmfence

    mesa

    nss

  ];



  nativeBuildInputs = [

    imagemagick

    autoPatchelfHook

    wrapGAppsHook

    copyDesktopItems

  ];



  desktopItems = [

    (makeDesktopItem {

      name = pname;

      exec = binaryName;

      icon = pname;

      desktopName = "Aether";

      genericName = meta.description;

      categories = [ "Network" ];

      mimeTypes = [ "x-scheme-handler/aether" ];

    })

  ];



  installPhase =

  let

    libPath = lib.makeLibraryPath [

      libcxx systemd libpulseaudio libdrm mesa

      stdenv.cc.cc alsa-lib atk at-spi2-atk at-spi2-core cairo cups dbus expat fontconfig freetype

      gdk-pixbuf glib gtk3 libnotify libX11 libXcomposite libuuid

      libXcursor libXdamage libXext libXfixes libXi libXrandr libXrender

      libXtst nspr nss libxcb pango systemd libXScrnSaver

      libappindicator-gtk3 libdbusmenu

    ];

  in

  ''

    mkdir -p $out/{bin,opt/${binaryName},share/icons/hicolor/512x512/apps}

    mv * $out/opt/${binaryName}



    chmod +x $out/opt/${binaryName}/${binaryName}

    patchelf --set-interpreter ${stdenv.cc.bintools.dynamicLinker} \

        $out/opt/${binaryName}/${binaryName}



    wrapProgram $out/opt/${binaryName}/${binaryName} \

        "''${gappsWrapperArgs[@]}" \

        --prefix XDG_DATA_DIRS : "${gtk3}/share/gsettings-schemas/${gtk3.name}" \

        --prefix LD_LIBRARY_PATH : ${libPath}



    ln -s $out/opt/${binaryName}/${binaryName} $out/bin/



    ln -s $out/opt/${binaryName}/aether.png $out/share/icons/hicolor/512x512/apps/



    runHook postInstall

  '';



  meta = with lib; {

    description = "Peer-to-peer ephemeral public communities";

    homepage = "https://getaether.net/";

    downloadPage = "https://getaether.net/download/";

    sourceProvenance = with sourceTypes; [ binaryNativeCode ];

    license = licenses.agpl3Only;

    maintainers = with maintainers; [ maxhille ];

    # other platforms could be supported by building from source

    platforms = [ "x86_64-linux" ];

  };

}

pkgs/top-level/aliases.nix

+1 −0
Original line number Diff line number Diff line
@@ -56,6 +56,7 @@ mapAliases ({ 
  ### A ###



  a4term = a4; # Added 2023-10-06

  aether = throw "aether has been removed from nixpkgs; upstream unmaintained, security issues"; # Added 2023-10-03

  airfield = throw "airfield has been removed due to being unmaintained"; # Added 2023-05-19

  alertmanager-bot = throw "alertmanager-bot is broken and has been archived by upstream" ; # Added 2023-07-28

  alsaLib = alsa-lib; # Added 2021-06-09

pkgs/top-level/all-packages.nix

+0 −2
Original line number Diff line number Diff line
@@ -234,8 +234,6 @@ with pkgs; 














  adcli = callPackage ../os-specific/linux/adcli { };



























  aether = callPackage ../applications/networking/aether { };



























  alda = callPackage ../development/interpreters/alda { };





























  align = callPackage ../tools/text/align { };