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

Commits on Jan 1, 2021

  1. mindustry: 122 -> 122.1

    @fgaz
    fgaz committed Jan 1, 2021

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    lukekarrys Luke Karrys
    GPG key ID: 586238713720A638
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    35cbd22 View commit details

Commits on Jan 3, 2021

  1. Merge pull request #108143 from fgaz/mindustry/122.1 

    mindustry: 122 -> 122.1
    @SuperSandro2000
    SuperSandro2000 authored Jan 3, 2021
    Copy the full SHA
    40e65eb View commit details
Showing with 3 additions and 3 deletions.
  1. +3 −3 pkgs/games/mindustry/default.nix
6 changes: 3 additions & 3 deletions pkgs/games/mindustry/default.nix
View file
Original file line number Diff line number Diff line change
@@ -22,14 +22,14 @@ let
# Note: when raising the version, ensure that all SNAPSHOT versions in
# build.gradle are replaced by a fixed version
# (the current one at the time of release) (see postPatch).
version = "122";
version = "122.1";
buildVersion = makeBuildVersion version;

src = fetchFromGitHub {
owner = "Anuken";
repo = "Mindustry";
rev = "v${version}";
sha256 = "19dxqscnny0c5w3pyg88hflrkhsqgd7zx19240kh4h69y3wwaz0m";
sha256 = "18m4s81cfb2cr2fj61nf6spiln7cbvx25g42w6fypfikflv3qd8y";
};

desktopItem = makeDesktopItem {
@@ -81,7 +81,7 @@ let
'';
outputHashAlgo = "sha256";
outputHashMode = "recursive";
outputHash = "1kymfrd2vd23y1rmx19q47wc212r6qx03x6g58pxbqyylxmcw5zq";
outputHash = "0vzck6hsrvs438s3ikk66qmpak88bmqcb8inqbbjwy7x87d2qsvj";
};

# Separate commands for building and installing the server and the client