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: a2f62bc8fea1
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: a2429cffa345
Choose a head ref
  • 4 commits
  • 5 files changed
  • 2 contributors

Commits on Nov 6, 2019

  1. gitlab: Don't build any gitlab component outside linux 

    For some reason hydra seems to have issues downloading the
gitlab-workhorse source on macOS. Since we don't build the rails app
for macOS, the other components seem a bit useless there, so we
limit them to linux for now.
    @talyz
    talyz committed Nov 6, 2019
    Copy the full SHA
    a30facc View commit details
    Browse the repository at this point in the history

  2. gitlab: Limit node memory consumption to 2048MB 

    Hydra fails to build the assets on i686 - it runs out of memory. If we
limit the max consumption to 2048MB the assets still build, and will
hopefully also build on hydra.
    @talyz
    talyz committed Nov 6, 2019
    Copy the full SHA
    22302ce View commit details
    Browse the repository at this point in the history

  3. gitlab: 12.4.1 -> 12.4.2

    @talyz
    talyz committed Nov 6, 2019
    Copy the full SHA
    a779d77 View commit details
    Browse the repository at this point in the history

Commits on Nov 8, 2019

  1. Merge pull request #72894 from talyz/gitlab-12.4.2 

    gitlab: 12.4.1 -> 12.4.2
    @flokli
    flokli committed Nov 8, 2019
    Copy the full SHA
    a2429cf View commit details
    Browse the repository at this point in the history