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
base: d25517ab51d2
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 40e7d5526247
Choose a head ref
  • 3 commits
  • 10 files changed
  • 2 contributors

Commits on Dec 5, 2018

  1. gitlab: 11.5.0 -> 11.5.1 

    (cherry picked from commit 88b63b2)
    @globin
    globin committed Dec 5, 2018
    Copy the full SHA
    b9ba657 View commit details
    Browse the repository at this point in the history

  2. gitlab-shell: fix hard-coded path 

    (cherry picked from commit c2b54dc)
    @globin
    globin committed Dec 5, 2018
    Copy the full SHA
    7b3336b View commit details
    Browse the repository at this point in the history

  3. pkgsi686Linux.nixosTests.gitlab: fix 32 bit tests 

    GitLab 11.5.1 dropped the dependency to posix_spawn, which is broken on
32bit. (See https://gitlab.com/gitlab-org/gitlab-ce/issues/53525)

The only part missing is decreasing virtualisation.memorySize to
something that a 32 bit qemu still executes.

The maximum seems to be 2047, and tests passed with that value for me.

(cherry picked from commit 5c82aa8)
    @flokli @globin
    flokli authored and globin committed Dec 5, 2018
    Copy the full SHA
    40e7d55 View commit details
    Browse the repository at this point in the history