public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #8422 from travisbhartwell/update/atom-shell-to-electron

Browse Source 
atom-shell: renamed to electron and updated 0.19.1 -> 0.28.2
This commit is contained in:
Arseniy Seroka 2015-06-23 18:54:22 +03:00
commit 266531b5b0
4 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib/maintainers.nix
View File

@ -229,6 +229,7 @@
thoughtpolice = "Austin Seipp <aseipp@pobox.com>"; thoughtpolice = "Austin Seipp <aseipp@pobox.com>";
titanous = "Jonathan Rudenberg <jonathan@titanous.com>"; titanous = "Jonathan Rudenberg <jonathan@titanous.com>";
tomberek = "Thomas Bereknyei <tomberek@gmail.com>"; tomberek = "Thomas Bereknyei <tomberek@gmail.com>";
travisbhartwell = "Travis B. Hartwell <nafai@travishartwell.net>";
trino = "Hubert Mühlhans <muehlhans.hubert@ekodia.de>"; trino = "Hubert Mühlhans <muehlhans.hubert@ekodia.de>";
tstrobel = "Thomas Strobel <ts468@cam.ac.uk>"; tstrobel = "Thomas Strobel <ts468@cam.ac.uk>";
ttuegel = "Thomas Tuegel <ttuegel@gmail.com>"; ttuegel = "Thomas Tuegel <ttuegel@gmail.com>";

4
nixos/doc/manual/release-notes/rl-unstable.xml
View File

@ -59,6 +59,10 @@ and old <literal>steam</literal> package -- to <literal>steamOriginal</literal>.
was accordingly renamed to <literal>bomi</literal> was accordingly renamed to <literal>bomi</literal>
</para></listitem> </para></listitem>
<listitem><para>Atom Shell has been renamed to Electron upstream. Package <literal>atom-shell</literal>
was accordingly renamed to <literal>electron</literal>
</para></listitem>
<listitem> <listitem>
<para> <para>
The default <literal>NIX_PATH</literal> for NixOS now includes The default <literal>NIX_PATH</literal> for NixOS now includes

20
pkgs/development/tools/atom-shell/default.nix → pkgs/development/tools/electron/default.nix
View File

@ -1,6 +1,7 @@
{ stdenv, fetchurl, buildEnv, makeDesktopItem, makeWrapper, zlib, glib, alsaLib { stdenv, fetchurl, buildEnv, makeDesktopItem, makeWrapper, zlib, glib, alsaLib
, dbus, gtk, atk, pango, freetype, fontconfig, libgnome_keyring3, gdk_pixbuf , dbus, gtk, atk, pango, freetype, fontconfig, libgnome_keyring3, gdk_pixbuf
, cairo, cups, expat, libgpgerror, nspr, gconf, nss, xlibs, libcap, unzip , cairo, cups, expat, libgpgerror, nspr, gconf, nss, xlibs, libcap, unzip
, systemd
}: }:
let let
atomEnv = buildEnv { atomEnv = buildEnv {
@ -10,16 +11,16 @@ let
fontconfig gdk_pixbuf cairo cups expat libgpgerror alsaLib nspr gconf nss fontconfig gdk_pixbuf cairo cups expat libgpgerror alsaLib nspr gconf nss
xlibs.libXrender xlibs.libX11 xlibs.libXext xlibs.libXdamage xlibs.libXtst xlibs.libXrender xlibs.libX11 xlibs.libXext xlibs.libXdamage xlibs.libXtst
xlibs.libXcomposite xlibs.libXi xlibs.libXfixes xlibs.libXrandr xlibs.libXcomposite xlibs.libXi xlibs.libXfixes xlibs.libXrandr
xlibs.libXcursor libcap xlibs.libXcursor libcap systemd
]; ];
}; };
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {
name = "atom-shell-${version}"; name = "electron-${version}";
version = "0.19.1"; version = "0.28.2";
src = fetchurl { src = fetchurl {
url = "https://github.com/atom/atom-shell/releases/download/v0.19.1/atom-shell-v0.19.1-linux-x64.zip"; url = "https://github.com/atom/electron/releases/download/v${version}/electron-v${version}-linux-x64.zip";
sha256 = "10q1slwv2lkiqqxpv0m5a1k0gj2yp8bi9a7ilb05zz1wg7j3yw4y"; sha256 = "55b0880e2f78a60d95a58e83cd75006c34cb6ed90836e1f34e3359c3e5d0b8f0";
name = "${name}.zip"; name = "${name}.zip";
}; };
@ -33,17 +34,16 @@ in stdenv.mkDerivation rec {
mkdir -p $out/bin mkdir -p $out/bin
unzip -d $out/bin $src unzip -d $out/bin $src
patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
$out/bin/atom $out/bin/electron
mv $out/bin/atom $out/bin/atom-shell wrapProgram $out/bin/electron \
wrapProgram $out/bin/atom-shell \
--prefix "LD_LIBRARY_PATH" : "${atomEnv}/lib:${atomEnv}/lib64" --prefix "LD_LIBRARY_PATH" : "${atomEnv}/lib:${atomEnv}/lib64"
''; '';
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Cross platform desktop application shell"; description = "Cross platform desktop application shell";
homepage = https://github.com/atom/atom-shell; homepage = https://github.com/atom/electron;
license = licenses.mit; license = licenses.mit;
maintainers = [ maintainers.fluffynukeit ]; maintainers = [ maintainers.travisbhartwell ];
platforms = [ "x86_64-linux" ]; platforms = [ "x86_64-linux" ];
}; };
} }

2
pkgs/top-level/all-packages.nix
View File

@ -5165,7 +5165,7 @@ let
astyle = callPackage ../development/tools/misc/astyle { }; astyle = callPackage ../development/tools/misc/astyle { };
atom-shell = callPackage ../development/tools/atom-shell { electron = callPackage ../development/tools/electron {
gconf = pkgs.gnome.GConf; gconf = pkgs.gnome.GConf;
}; };