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: 481cff2a693d
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: e402ed1666fc
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Oct 28, 2019

  1. minecraft: 2.1.5965 -> 2.1.7658

    Jonathan Ringer committed Oct 28, 2019
    Copy the full SHA
    c4ad7d3 View commit details

  2. Merge pull request #72176 from jonringer/backport-minecraft 

    [19.09] minecraft: 2.1.5965 -> 2.1.7658
    @mmahut
    mmahut authored Oct 28, 2019

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    GPG key ID: B5690EEEBB952194
    Verified
    Learn about vigilant mode
    Copy the full SHA
    e402ed1 View commit details
Showing with 4 additions and 2 deletions.
  1. +4 −2 pkgs/games/minecraft/default.nix
6 changes: 4 additions & 2 deletions pkgs/games/minecraft/default.nix
View file
Original file line number Diff line number Diff line change
@@ -15,6 +15,7 @@
, cups
, dbus
, atk
, gtk3-x11
, gtk2-x11
, gdk-pixbuf
, glib
@@ -58,6 +59,7 @@ let
glib
gnome2.GConf
gnome2.pango
gtk3-x11
gtk2-x11
nspr
nss
@@ -82,11 +84,11 @@ in
stdenv.mkDerivation rec {
pname = "minecraft-launcher";

version = "2.1.5965";
version = "2.1.7658";

src = fetchurl {
url = "https://launcher.mojang.com/download/linux/x86_64/minecraft-launcher_${version}.tar.gz";
sha256 = "0wlc49s541li4cbxdmlw8fp34hp1q9m6ngr7l5hfdhv1i13s5845";
sha256 = "10sng7l0q9r98zwifjmy50nyh65ny4djmacz8158hffcsfcx93px";
};

icon = fetchurl {