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

atom, atom-beta: 1.28.2 -> 1.29.0, refactored build script (#44297)

Browse Source 
atom-beta: 1.29.0-beta1 -> 1.30.0-beta1

The beta version jump seems like an irregular update, but 1.30.0-beta0
was retired rougly 3 hours after release due to an macOS error:

> Fixed an error about a missing string_decoder module when the Git pane
> is displayed on macOS.

This shouldn't affect the Linux x86_64 version, but latest versions are
always nice.

Also refactored the build script, it now takes the version number as
an extra (optional) argument and creates the version number from that.

Also removed `rec` from the main set because it was no longer needed.
This commit is contained in:
Patrick Hilhorst 2018-08-01 11:30:10 +02:00 committed by xeji
parent 26210f556a
commit e616563433
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
pkgs/applications/editors/atom/default.nix
View File

@ -1,12 +1,15 @@
{ stdenv, pkgs, fetchurl, makeWrapper, gvfs, atomEnv}: { stdenv, pkgs, fetchurl, makeWrapper, gvfs, atomEnv}:
let let
common = pname: {version, sha256}: stdenv.mkDerivation rec { common = pname: {version, sha256, beta ? null}:
name = "${pname}-${version}"; let fullVersion = version + stdenv.lib.optionalString (beta != null) "-beta${toString beta}";
inherit version; name = "${pname}-${fullVersion}";
in stdenv.mkDerivation {
inherit name;
version = fullVersion;
src = fetchurl { src = fetchurl {
url = "https://github.com/atom/atom/releases/download/v${version}/atom-amd64.deb"; url = "https://github.com/atom/atom/releases/download/v${fullVersion}/atom-amd64.deb";
name = "${name}.deb"; name = "${name}.deb";
inherit sha256; inherit sha256;
}; };
@ -61,12 +64,13 @@ let
}; };
in stdenv.lib.mapAttrs common { in stdenv.lib.mapAttrs common {
atom = { atom = {
version = "1.28.2"; version = "1.29.0";
sha256 = "07lz4lj07dbfz952l3q9vplvg41pxl1cx89gzy8bzzr3ay7kn6za"; sha256 = "0f0qpn8aw2qlqk8ah71xvk4vcmwsnsf2f3g4hz0rvaqnhb9ri9fz";
}; };
atom-beta = { atom-beta = {
version = "1.29.0-beta1"; version = "1.30.0";
sha256 = "121y716pnq4vpjrymr505prskvi5a2lnn8hw79q8b4hf7yz0j6rb"; beta = 1;
sha256 = "0ygqj81xlwhzmmci0d0rd2q7xfskxd1k7h6db3zvvjdxjcnyqp1z";
}; };
} }