Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 616cfefc27b4
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 5e34b41afa49
Choose a head ref
  • 3 commits
  • 1 file changed
  • 2 contributors

Commits on Oct 24, 2018

  1. atom, atom-beta: move versions to top of file

    @Synthetica9
    Synthetica9 committed Oct 24, 2018

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    Synthetica9 Patrick Hilhorst
    GPG key ID: 589BB0A8DAFEF2B2
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    26441bc View commit details

  2. atom, atom-beta: 1.31.2 -> 1.32.0, 1.32.0-beta0 -> 1.33.0-beta0

    @Synthetica9
    Synthetica9 committed Oct 24, 2018

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    Synthetica9 Patrick Hilhorst
    GPG key ID: 589BB0A8DAFEF2B2
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    f13f482 View commit details

  3. Merge pull request #48979 from Synthetica9/atom-1.32.0 

    atom, atom-beta: 1.31.2 -> 1.32.0, 1.32.0-beta0 -> 1.33.0-beta0
    @xeji
    xeji authored Oct 24, 2018

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    5e34b41 View commit details
Showing with 14 additions and 12 deletions.
  1. +14 −12 pkgs/applications/editors/atom/default.nix
26 changes: 14 additions & 12 deletions pkgs/applications/editors/atom/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,19 @@
{ stdenv, pkgs, fetchurl, makeWrapper, wrapGAppsHook, gvfs, gtk3, atomEnv }:

let
versions = {
atom = {
version = "1.32.0";
sha256 = "0dha8zi4gshxj993ns7ybi7q86pfqwzsasrk3a7b5xrdqbrcm5md";
};

atom-beta = {
version = "1.33.0";
beta = 0;
sha256 = "1x4s12zvfd2gjy7mimndbhs6x9k37jq4dyy6r1mzhwfysix74val";
};
};

common = pname: {version, sha256, beta ? null}:
let fullVersion = version + stdenv.lib.optionalString (beta != null) "-beta${toString beta}";
name = "${pname}-${fullVersion}";
@@ -71,15 +84,4 @@ let
platforms = platforms.x86_64;
};
};
in stdenv.lib.mapAttrs common {
atom = {
version = "1.31.2";
sha256 = "1szx9p2nz1qzjpig0l8h4hj5mqwpjvkcynn8crh21drply4bpfr0";
};

atom-beta = {
version = "1.32.0";
beta = 0;
sha256 = "12k5cn70a0diyaqbmq6s6l2sbi9i3d9p7i38qnm97lnw0y1kh0jm";
};
}
in stdenv.lib.mapAttrs common versions