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: 4ddaf40a7dc0
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 27a5ddcf747f
Choose a head ref
  • 4 commits
  • 4 files changed
  • 3 contributors

Commits on Oct 23, 2019

  1. gitlab: Get rid of most 'already initialized constant'-warnings 

    On start, unicorn, sidekiq and other parts running ruby code emits
quite a few warnings similar to

/var/gitlab/state/config/application.rb:202: warning: already initialized constant Gitlab::Application::LOOSE_EE_APP_ASSETS
/nix/store/ysb0lgbzxp7a9y4yl8d4f9wrrzy9kafc-gitlab-ee-12.3.5/share/gitlab/config/application.rb:202: warning: previous definition of LOOSE_EE_APP_ASSETS was here
/var/gitlab/state/lib/gitlab.rb:38: warning: already initialized constant Gitlab::COM_URL
/nix/store/ysb0lgbzxp7a9y4yl8d4f9wrrzy9kafc-gitlab-ee-12.3.5/share/gitlab/lib/gitlab.rb:38: warning: previous definition of COM_URL was here

This seems to be caused by the same ruby files being evaluated
multiple times due to the paths being different - sometimes they're
loaded using the direct path and sometimes through a symlink, due to
our split between config and package data. To fix this, we make sure
that the offending files in the state directory always reference the
store path, regardless of that being the real file or a symlink.

(cherry picked from commit ed4a09c)
    @talyz
    talyz committed Oct 23, 2019
    Copy the full SHA
    3e29737 View commit details

  2. Merge pull request #71816 from talyz/gitlab-already-initialized-const… 

    …ant-release-19.09

gitlab: Get rid of most 'already initialized constant'-warnings
    @flokli
    flokli authored Oct 23, 2019
    Copy the full SHA
    12abbe5 View commit details

  3. nixos/smokeping: replace smokeping.fcgi with a symlink 

    This fixes a regression from bb649d9.
There were permission problems, when the preStart script tried to copy
the smokeping.fcgi file over the old file.

(cherry picked from commit 9eb067b)
    @erictapen @wizeman
    erictapen authored and wizeman committed Oct 23, 2019
    Copy the full SHA
    990f5f4 View commit details

  4. smokeping: add erictapen as maintainer 

    (cherry picked from commit b8cd11f)
    @erictapen @wizeman
    erictapen authored and wizeman committed Oct 23, 2019

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    GPG key ID: B5690EEEBB952194
    Verified
    Learn about vigilant mode
    Copy the full SHA
    27a5ddc View commit details
1 change: 0 additions & 1 deletion nixos/modules/services/misc/gitlab.nix
View file
Original file line number Diff line number Diff line change
@@ -668,7 +668,6 @@ in {
"d ${gitlabConfig.production.shared.path}/artifacts 0750 ${cfg.user} ${cfg.group} -"
"d ${gitlabConfig.production.shared.path}/lfs-objects 0750 ${cfg.user} ${cfg.group} -"
"d ${gitlabConfig.production.shared.path}/pages 0750 ${cfg.user} ${cfg.group} -"
"L+ ${cfg.statePath}/lib - - - - ${cfg.packages.gitlab}/share/gitlab/lib"
"L+ /run/gitlab/config - - - - ${cfg.statePath}/config"
"L+ /run/gitlab/log - - - - ${cfg.statePath}/log"
"L+ /run/gitlab/tmp - - - - ${cfg.statePath}/tmp"
5 changes: 4 additions & 1 deletion nixos/modules/services/networking/smokeping.nix
View file
Original file line number Diff line number Diff line change
@@ -299,7 +299,8 @@ in
mkdir -m 0755 -p ${smokepingHome}/cache ${smokepingHome}/data
rm -f ${smokepingHome}/cropper
ln -s ${cfg.package}/htdocs/cropper ${smokepingHome}/cropper
cp ${cgiHome} ${smokepingHome}/smokeping.fcgi
rm -f ${smokepingHome}/smokeping.fcgi
ln -s ${cgiHome} ${smokepingHome}/smokeping.fcgi
${cfg.package}/bin/smokeping --check --config=${configPath}
${cfg.package}/bin/smokeping --static --config=${configPath}
'';
@@ -314,5 +315,7 @@ in
serviceConfig.Restart = "always";
};
};

meta.maintainers = with lib.maintainers; [ erictapen ];
}

9 changes: 8 additions & 1 deletion pkgs/applications/version-management/gitlab/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{ stdenv, lib, fetchurl, fetchFromGitLab, bundlerEnv
, ruby, tzdata, git, nettools, nixosTests, nodejs
, gitlabEnterprise ? false, callPackage, yarn
, yarn2nix-moretea
, yarn2nix-moretea, replace
}:

let
@@ -118,6 +118,13 @@ stdenv.mkDerivation {
sed -i '/ask_to_continue/d' lib/tasks/gitlab/two_factor.rake
sed -ri -e '/log_level/a config.logger = Logger.new(STDERR)' config/environments/production.rb
# Always require lib-files and application.rb through their store
# path, not their relative state directory path. This gets rid of
# warnings and means we don't have to link back to lib from the
# state directory.
${replace}/bin/replace-literal -f -r -e '../lib' "$out/share/gitlab/lib" config
${replace}/bin/replace-literal -f -r -e "require_relative 'application'" "require_relative '$out/share/gitlab/config/application'" config
'';

buildPhase = ''
1 change: 1 addition & 0 deletions pkgs/tools/networking/smokeping/default.nix
View file
Original file line number Diff line number Diff line change
@@ -19,5 +19,6 @@ stdenv.mkDerivation rec {
homepage = http://oss.oetiker.ch/smokeping;
license = stdenv.lib.licenses.gpl2Plus;
platforms = stdenv.lib.platforms.all;
maintainers = [ stdenv.lib.maintainers.erictapen ];
};
}