Comparing changes
Open a pull request
base repository: NixOS/nixpkgs-channels
base: 724dbda1e0ca
head repository: NixOS/nixpkgs-channels
compare: 25757b66e183
- 11 commits
- 27 files changed
- 2 contributors
Commits on Oct 8, 2019
-
xfce4-12.xfce4-vala-panel-appmenu-plugin: fix eval
(cherry picked from commit 9acb145)
Commits on Oct 9, 2019
-
- Update GitLab to 12.3.4 - Update update.py to cope with the new upstream repository structure - Refactor gitlab-shell to use buildGoPackage and bundlerEnv for dependencies - Refactor gitlab-workhorse to use buildGoPackage for dependencies - Make update.py able to update gitlab-shell and gitlab-workhorse dependencies - Various fixes necessary for update to work (cherry picked from commit f3eb063)
-
gitlab-shell: Split patch into ruby and go parts
Split the remove-hardcoded-locations patch into two separate patches, one for the ruby package and one for the go package. This is clearer and results in fewer rebuilds. (cherry picked from commit 09e657e)
-
gitlab: Build frontend assets from source
Instead of extracting prebuilt assets from the debian build, build them from the source. This should give faster package updates and reduces the amount of data needed to be downloaded by more than 500MB. (cherry picked from commit 59324d1)
-
gitlab: Refactor for new repo structure
GitLab recently restructured their repos; whereas previously they had one gitlab-ce and one gitlab-ee repo, they're now one and the same. All proprietary components are put into the ee subdirectory - removing it gives us the foss / community version of GitLab. For more info, see https://about.gitlab.com/2019/02/21/merging-ce-and-ee-codebases/ This gives us the opportunity to simplify things quite a bit, since we don't have to keep track of two separate versions of either the base data or rubyEnv. (cherry picked from commit afa3abf)
-
(cherry picked from commit 9be76d0)
-
gitlab: Add myself to list of maintainers
(cherry picked from commit c115d4d)
-
nixos/gitlab: Fix state directory permissions
Since the preStart script is no longer running in privileged mode, we reassign the files in the state directory and its config subdirectory to the user we're running as. This is done by splitting the preStart script into a privileged and an unprivileged part where the privileged part does the reassignment. Also, delete the database.yml symlink if it exists, since we want to create a real file in its place. Fixes #68696. (cherry picked from commit 0f8133d)
-
nixos/gitlab: Clean up the initializers on start
The initializers directory is populated with files from the gitlab distribution on start, but old files will be left in the state folder even if they're removed from the distribution, which can lead to startup failures. Fix this by always purging the directory on start before populating it. (cherry picked from commit c6efa9f)
-
nixos/gitlab: Fix evaluation failure when postgresql is disabled
config.services.postgresql.package is only defined when the postgresql service is activated, which means we fail to evaluate when databaseCreateLocally == false. Fix this by using the default postgresql package when the postgresql service is disabled. (cherry picked from commit ec958d4)
-
nixos/gitlab: Only create the database when databaseHost is unset
Make sure that we don't create a database if we're not going to connect to it. Also, fix the assertion that usernames be equal to only trig when peer authentication is used (databaseHost == ""). (cherry picked from commit 58a7502)
This comparison is taking too long to generate.
Unfortunately it looks like we can’t render this comparison for you right now. It might be too big, or there might be something weird with your repository.
You can try running this command locally to see the comparison on your machine:
git diff 724dbda1e0ca...25757b66e183