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

Commits on May 14, 2021

  1. nixos/tests/minecraft-server: fix build on i686 

    "at most 2047 MB RAM can be simulated"
    Milan Pässler committed May 14, 2021

    Verified

    This commit was signed with the committer’s verified signature.
    ljharb Jordan Harband
    GPG key ID: 9F6A681E35EF8B56
    Verified
    Learn about vigilant mode
    Copy the full SHA
    827f69c View commit details

Commits on May 16, 2021

  1. Merge #123049: nixos/tests/minecraft-server: fix on i686

    @vcunat
    vcunat committed May 16, 2021
    Copy the full SHA
    843fcf6 View commit details
Showing with 1 addition and 1 deletion.
  1. +1 −1 nixos/tests/minecraft-server.nix
2 changes: 1 addition & 1 deletion nixos/tests/minecraft-server.nix
View file
Original file line number Diff line number Diff line change
@@ -24,7 +24,7 @@ in import ./make-test-python.nix ({ pkgs, ... }: {
};
};

virtualisation.memorySize = 2048;
virtualisation.memorySize = 2047;
};

testScript = ''