commit 266531b5b0a20f55d6618438b313311268a926a0 · pyrox.dev/nixpkgs

+1

lib/maintainers.nix

···

       229
       229
        
         thoughtpolice = "Austin Seipp <aseipp@pobox.com>";

     

       230
       230
        
         titanous = "Jonathan Rudenberg <jonathan@titanous.com>";

     

       231
       231
        
         tomberek = "Thomas Bereknyei <tomberek@gmail.com>";

     

       232
       232
       +
         travisbhartwell = "Travis B. Hartwell <nafai@travishartwell.net>";

     

       232
       233
        
         trino = "Hubert Mühlhans <muehlhans.hubert@ekodia.de>";

     

       233
       234
        
         tstrobel = "Thomas Strobel <ts468@cam.ac.uk>";

     

       234
       235
        
         ttuegel = "Thomas Tuegel <ttuegel@gmail.com>";

+4

nixos/doc/manual/release-notes/rl-unstable.xml

···

       59
       59
        
       was accordingly renamed to <literal>bomi</literal>

     

       60
       60
        
       </para></listitem>

     

       61
       61
        
       

     

       62
       62
       +
       <listitem><para>Atom Shell has been renamed to Electron upstream.  Package <literal>atom-shell</literal>

     

       63
       63
       +
       was accordingly renamed to <literal>electron</literal>

     

       64
       64
       +
       </para></listitem>

     

       65
       65
       +
       

     

       62
       66
        
       <listitem>

     

       63
       67
        
           <para>

     

       64
       68
        
               The default <literal>NIX_PATH</literal> for NixOS now includes

+10 -10

pkgs/development/tools/atom-shell/default.nix pkgs/development/tools/electron/default.nix

···

       1
       1
        
       { stdenv, fetchurl, buildEnv, makeDesktopItem, makeWrapper, zlib, glib, alsaLib

     

       2
       2
        
       , dbus, gtk, atk, pango, freetype, fontconfig, libgnome_keyring3, gdk_pixbuf

     

       3
       3
        
       , cairo, cups, expat, libgpgerror, nspr, gconf, nss, xlibs, libcap, unzip

     

       4
       4
       +
       , systemd

     

       4
       5
        
       }:

     

       5
       6
        
       let

     

       6
       7
        
         atomEnv = buildEnv {

     
···

       10
       11
        
             fontconfig gdk_pixbuf cairo cups expat libgpgerror alsaLib nspr gconf nss

     

       11
       12
        
             xlibs.libXrender xlibs.libX11 xlibs.libXext xlibs.libXdamage xlibs.libXtst

     

       12
       13
        
             xlibs.libXcomposite xlibs.libXi xlibs.libXfixes xlibs.libXrandr

     

       13
       13
       -
             xlibs.libXcursor libcap

     

       14
       14
       +
             xlibs.libXcursor libcap systemd

     

       14
       15
        
           ];

     

       15
       16
        
         };

     

       16
       17
        
       in stdenv.mkDerivation rec {

     

       17
       17
       -
         name = "atom-shell-${version}";

     

       18
       18
       -
         version = "0.19.1";

     

       18
       18
       +
         name = "electron-${version}";

     

       19
       19
       +
         version = "0.28.2";

     

       19
       20
        
       

     

       20
       21
        
         src = fetchurl {

     

       21
       21
       -
           url = "https://github.com/atom/atom-shell/releases/download/v0.19.1/atom-shell-v0.19.1-linux-x64.zip";

     

       22
       22
       -
           sha256 = "10q1slwv2lkiqqxpv0m5a1k0gj2yp8bi9a7ilb05zz1wg7j3yw4y";

     

       22
       22
       +
           url = "https://github.com/atom/electron/releases/download/v${version}/electron-v${version}-linux-x64.zip";

     

       23
       23
       +
           sha256 = "55b0880e2f78a60d95a58e83cd75006c34cb6ed90836e1f34e3359c3e5d0b8f0";

     

       23
       24
        
           name = "${name}.zip";

     

       24
       25
        
         };

     

       25
       26
        
       

     
···

       33
       34
        
           mkdir -p $out/bin

     

       34
       35
        
           unzip -d $out/bin $src

     

       35
       36
        
           patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \

     

       36
       36
       -
           $out/bin/atom

     

       37
       37
       -
           mv $out/bin/atom $out/bin/atom-shell

     

       38
       38
       -
           wrapProgram $out/bin/atom-shell \

     

       37
       37
       +
           $out/bin/electron

     

       38
       38
       +
           wrapProgram $out/bin/electron \

     

       39
       39
        
           --prefix "LD_LIBRARY_PATH" : "${atomEnv}/lib:${atomEnv}/lib64"

     

       40
       40
        
         '';

     

       41
       41
        
       

     

       42
       42
        
         meta = with stdenv.lib; {

     

       43
       43
        
           description = "Cross platform desktop application shell";

     

       44
       44
       -
           homepage = https://github.com/atom/atom-shell;

     

       44
       44
       +
           homepage = https://github.com/atom/electron;

     

       45
       45
        
           license = licenses.mit;

     

       46
       46
       -
           maintainers = [ maintainers.fluffynukeit ];

     

       46
       46
       +
           maintainers = [ maintainers.travisbhartwell ];

     

       47
       47
        
           platforms = [ "x86_64-linux" ];

     

       48
       48
        
         };

     

       49
       49
        
       }

+1 -1

pkgs/top-level/all-packages.nix

···

       5165
       5165
        
       

     

       5166
       5166
        
         astyle = callPackage ../development/tools/misc/astyle { };

     

       5167
       5167
        
       

     

       5168
       5168
       -
         atom-shell = callPackage ../development/tools/atom-shell {

     

       5168
       5168
       +
         electron = callPackage ../development/tools/electron {

     

       5169
       5169
        
           gconf = pkgs.gnome.GConf;

     

       5170
       5170
        
         };

     

       5171
       5171