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

Commits on Jun 13, 2019

  1. gitlab: add link to nixos test in passthru.tests

    @Ekleog
    Ekleog committed Jun 13, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    jtojnar Jan Tojnar
    GPG key ID: 7FAB2A15F7A607A4
    Verified
    Learn about vigilant mode
    Copy the full SHA
    42170cb View commit details

Commits on Jun 17, 2019

  1. Merge branch 'add-nixos-test-to-gitlab' 

    * add-nixos-test-to-gitlab:
  gitlab: add link to nixos test in passthru.tests
    @Ekleog
    Ekleog committed Jun 17, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    jtojnar Jan Tojnar
    GPG key ID: 7FAB2A15F7A607A4
    Verified
    Learn about vigilant mode
    Copy the full SHA
    b7d2f37 View commit details
Showing with 4 additions and 1 deletion.
  1. +4 −1 pkgs/applications/version-management/gitlab/default.nix
5 changes: 4 additions & 1 deletion pkgs/applications/version-management/gitlab/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{ stdenv, lib, fetchurl, fetchFromGitLab, bundlerEnv
, ruby, tzdata, git, procps, nettools
, ruby, tzdata, git, procps, nettools, nixosTests
, gitlabEnterprise ? false
}:

@@ -95,6 +95,9 @@ stdenv.mkDerivation rec {
GITLAB_PAGES_VERSION = data.passthru.GITLAB_PAGES_VERSION;
GITLAB_SHELL_VERSION = data.passthru.GITLAB_SHELL_VERSION;
GITLAB_WORKHORSE_VERSION = data.passthru.GITLAB_WORKHORSE_VERSION;
tests = {
nixos-test-passes = nixosTests.gitlab;
};
};

meta = with lib; {