From 244be72e19e96bdfb1e268d002af2e9c0036fbea Mon Sep 17 00:00:00 2001 From: Sandro Jäckel Date: Sun, 1 Oct 2023 18:50:27 +0200 Subject: atom*: drop --- pkgs/applications/editors/atom/default.nix | 96 ------------------------------ pkgs/applications/editors/atom/env.nix | 23 ------- pkgs/top-level/aliases.nix | 4 ++ pkgs/top-level/all-packages.nix | 6 -- pkgs/top-level/packages-config.nix | 1 - 5 files changed, 4 insertions(+), 126 deletions(-) delete mode 100644 pkgs/applications/editors/atom/default.nix delete mode 100644 pkgs/applications/editors/atom/env.nix diff --git a/pkgs/applications/editors/atom/default.nix b/pkgs/applications/editors/atom/default.nix deleted file mode 100644 index 29c4bb6c884c9..0000000000000 --- a/pkgs/applications/editors/atom/default.nix +++ /dev/null @@ -1,96 +0,0 @@ -{ lib, stdenv, pkgs, fetchurl, wrapGAppsHook, glib, gtk3, atomEnv }: - -let - versions = { - atom = { - version = "1.60.0"; - sha256 = "sha256-XHwCWQYrnUkR0lN7/Or/Uxb53hEWmIQKkNfNSX34kaY="; - }; - - atom-beta = { - version = "1.61.0"; - beta = 0; - sha256 = "sha256-viY/is7Nh3tlIkHhUBWtgMAjD6HDiC0pyJpUjsP5pRY="; - broken = true; - }; - }; - - common = pname: {version, sha256, beta ? null, broken ? false}: - let fullVersion = version + lib.optionalString (beta != null) "-beta${toString beta}"; - name = "${pname}-${fullVersion}"; - in stdenv.mkDerivation { - inherit name; - version = fullVersion; - - src = fetchurl { - url = "https://github.com/atom/atom/releases/download/v${fullVersion}/atom-amd64.deb"; - name = "${name}.deb"; - inherit sha256; - }; - - nativeBuildInputs = [ - wrapGAppsHook # Fix error: GLib-GIO-ERROR **: No GSettings schemas are installed on the system - ]; - - buildInputs = [ - gtk3 # Fix error: GLib-GIO-ERROR **: Settings schema 'org.gtk.Settings.FileChooser' is not installed - ]; - - dontBuild = true; - dontConfigure = true; - - unpackPhase = '' - ar p $src data.tar.xz | tar xJ ./usr/ - ''; - - installPhase = '' - runHook preInstall - - mkdir -p $out - mv usr/bin usr/share $out - rm -rf $out/share/lintian - - runHook postInstall - ''; - - preFixup = '' - gappsWrapperArgs+=( - # needed for gio executable to be able to delete files - --prefix "PATH" : "${glib.bin}/bin" - ) - ''; - - postFixup = '' - share=$out/share/${pname} - - patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath "${atomEnv.libPath}:$share" \ - $share/atom - patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath "${atomEnv.libPath}" \ - $share/resources/app/apm/bin/node - patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - $share/resources/app.asar.unpacked/node_modules/symbols-view/vendor/ctags-linux - - dugite=$share/resources/app.asar.unpacked/node_modules/dugite - rm -f $dugite/git/bin/git - ln -s ${pkgs.git}/bin/git $dugite/git/bin/git - rm -f $dugite/git/libexec/git-core/git - ln -s ${pkgs.git}/bin/git $dugite/git/libexec/git-core/git - - find $share -name "*.node" -exec patchelf --set-rpath "${atomEnv.libPath}:$share" {} \; - - sed -i -e "s|Exec=.*$|Exec=$out/bin/${pname}|" $out/share/applications/${pname}.desktop - ''; - - meta = with lib; { - description = "A hackable text editor for the 21st Century"; - homepage = "https://atom.io/"; - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - license = licenses.mit; - maintainers = with maintainers; [ offline ysndr ]; - platforms = platforms.x86_64; - inherit broken; - }; - }; -in lib.mapAttrs common versions diff --git a/pkgs/applications/editors/atom/env.nix b/pkgs/applications/editors/atom/env.nix deleted file mode 100644 index a5ca5775aae3f..0000000000000 --- a/pkgs/applications/editors/atom/env.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ stdenv, lib, zlib, glib, alsa-lib, dbus, gtk3, atk, pango, freetype, fontconfig -, gdk-pixbuf, cairo, cups, expat, libgpg-error, nspr -, nss, xorg, libcap, systemd, libnotify, libsecret, libuuid, at-spi2-atk -, at-spi2-core, libdbusmenu, libdrm, mesa -}: - -let - packages = [ - stdenv.cc.cc zlib glib dbus gtk3 atk pango freetype - fontconfig gdk-pixbuf cairo cups expat libgpg-error alsa-lib nspr nss - xorg.libXrender xorg.libX11 xorg.libXext xorg.libXdamage xorg.libXtst - xorg.libXcomposite xorg.libXi xorg.libXfixes xorg.libXrandr - xorg.libXcursor xorg.libxkbfile xorg.libXScrnSaver libcap systemd libnotify - xorg.libxcb libsecret libuuid at-spi2-atk at-spi2-core libdbusmenu - libdrm - mesa # required for libgbm - ]; - - libPathNative = lib.makeLibraryPath packages; - libPath64 = lib.makeSearchPathOutput "lib" "lib64" packages; - libPath = "${libPathNative}:${libPath64}"; - -in { inherit packages libPath; } diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 7b6f8aa04ad7e..608e7f5b29a47 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -109,6 +109,10 @@ mapAliases ({ asterisk_19 = throw "asterisk_19: Asterisk 19 is end of life and has been removed"; # Added 2023-04-19 at_spi2_atk = throw "'at_spi2_atk' has been renamed to/replaced by 'at-spi2-atk'"; # Converted to throw 2022-02-22 at_spi2_core = throw "'at_spi2_core' has been renamed to/replaced by 'at-spi2-core'"; # Converted to throw 2022-02-22 + atom = throw "'atom' has been removed because discontinued and deprecated. Consider using 'pulsar', a maintained fork"; # Added 2023-10-01 + atom-beta = throw "'atom-beta' has been removed because discontinued and deprecated. Consider using 'pulsar', a maintained fork"; # Added 2023-10-01 + atomEnv = throw "'atomEnv' has been removed because 'atom' is discontinued and deprecated. Consider using 'pulsar', a maintained fork"; # Added 2023-10-01 + atomPackages = throw "'atomPackages' has been removed because 'atom' is discontinued and deprecated. Consider using 'pulsar', a maintained fork"; # Added 2023-10-01 aucdtect = throw "aucdtect: Upstream no longer provides download urls"; # Added 2020-12-26 audacity-gtk2 = throw "'audacity-gtk2' has been removed to/replaced by 'audacity'"; # Added 2022-10-09 audacity-gtk3 = throw "'audacity-gtk3' has been removed to/replaced by 'audacity'"; # Added 2022-10-09 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8a6e84c60c5ee..e5eff46406bc2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -30629,12 +30629,6 @@ with pkgs; atlassian-cli = callPackage ../applications/office/atlassian-cli { }; - atomEnv = callPackage ../applications/editors/atom/env.nix { }; - - atomPackages = dontRecurseIntoAttrs (callPackage ../applications/editors/atom { }); - - inherit (atomPackages) atom atom-beta; - pulsar = callPackage ../applications/editors/pulsar { }; asap = callPackage ../tools/audio/asap { }; diff --git a/pkgs/top-level/packages-config.nix b/pkgs/top-level/packages-config.nix index 223e31b3b72fb..889ddccb0e1b5 100644 --- a/pkgs/top-level/packages-config.nix +++ b/pkgs/top-level/packages-config.nix @@ -9,7 +9,6 @@ packageOverrides = super: with super; lib.mapAttrs (_: set: recurseIntoAttrs set) { inherit (super) apacheHttpdPackages - atomPackages fdbPackages fusePackages gns3Packages -- cgit 1.4.1