Commit d56b54cb authored by Frederik Rietdijk's avatar Frederik Rietdijk
Browse files

Merge master into staging

parents 73959b68 94cbb8e3

nixos/modules/services/databases/foundationdb.nix

+3 −3
Original line number Diff line number Diff line
@@ -320,9 +320,6 @@ in 
  };



  config = mkIf cfg.enable {

    meta.doc         = ./foundationdb.xml;

    meta.maintainers = with lib.maintainers; [ thoughtpolice ];



    environment.systemPackages = [ pkg ];



    users.users = optionalAttrs (cfg.user == "foundationdb") (singleton
@@ -413,4 +410,7 @@ in 
      '';

    };

  };



  meta.doc         = ./foundationdb.xml;

  meta.maintainers = with lib.maintainers; [ thoughtpolice ];

}

nixos/modules/services/databases/foundationdb.xml

+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
         xmlns:xlink="http://www.w3.org/1999/xlink"

         xmlns:xi="http://www.w3.org/2001/XInclude"

         version="5.0"

         xml:id="module-foundationdb">

         xml:id="module-services-foundationdb">



<title>FoundationDB</title>

nixos/modules/services/misc/gitlab.nix

+8 −3
Original line number Diff line number Diff line
@@ -560,6 +560,7 @@ in { 
        mkdir -p ${cfg.statePath}/tmp/sockets

        mkdir -p ${cfg.statePath}/shell

        mkdir -p ${cfg.statePath}/db

        mkdir -p ${cfg.statePath}/uploads



        rm -rf ${cfg.statePath}/config ${cfg.statePath}/shell/hooks

        mkdir -p ${cfg.statePath}/config
@@ -570,6 +571,7 @@ in { 
        mkdir -p ${cfg.statePath}/log

        ln -sf ${cfg.statePath}/log /run/gitlab/log

        ln -sf ${cfg.statePath}/tmp /run/gitlab/tmp

        ln -sf ${cfg.statePath}/uploads /run/gitlab/uploads

        ln -sf $GITLAB_SHELL_CONFIG_PATH /run/gitlab/shell-config.yml

        chown -R ${cfg.user}:${cfg.group} /run/gitlab
@@ -584,7 +586,9 @@ in { 
          ln -sf ${smtpSettings} ${cfg.statePath}/config/initializers/smtp_settings.rb

        ''}

        ln -sf ${cfg.statePath}/config /run/gitlab/config

        if [ -e ${cfg.statePath}/lib ]; then

          rm ${cfg.statePath}/lib

        fi

        ln -sf ${pkgs.gitlab}/share/gitlab/lib ${cfg.statePath}/lib

        cp ${cfg.packages.gitlab}/share/gitlab/VERSION ${cfg.statePath}/VERSION
@@ -608,10 +612,11 @@ in { 
            ${pkgs.sudo}/bin/sudo -u ${pgSuperUser} ${config.services.postgresql.package}/bin/createdb --owner ${cfg.databaseUsername} ${cfg.databaseName}

            touch "${cfg.statePath}/db-created"

          fi

        fi



          # enable required pg_trgm extension for gitlab

          ${pkgs.sudo}/bin/sudo -u ${pgSuperUser} psql ${cfg.databaseName} -c "CREATE EXTENSION IF NOT EXISTS pg_trgm"

        fi



        # Always do the db migrations just to be sure the database is up-to-date

        ${gitlab-rake}/bin/gitlab-rake db:migrate RAILS_ENV=production

nixos/release.nix

+3 −3
Original line number Diff line number Diff line
@@ -117,9 +117,9 @@ let 
        ];

        postBuild = ''

          mkdir -p $out/nix-support

          echo "file ${kernelTarget} $out/${kernelTarget}" >> $out/nix-support/hydra-build-products

          echo "file initrd $out/initrd" >> $out/nix-support/hydra-build-products

          echo "file ipxe $out/netboot.ipxe" >> $out/nix-support/hydra-build-products

          echo "file ${kernelTarget} ${build.kernel}/${kernelTarget}" >> $out/nix-support/hydra-build-products

          echo "file initrd ${build.netbootRamdisk}/initrd" >> $out/nix-support/hydra-build-products

          echo "file ipxe ${build.netbootIpxeScript}/netboot.ipxe" >> $out/nix-support/hydra-build-products

        '';

        preferLocalBuild = true;

      };

pkgs/applications/audio/mopidy/gmusic.nix

+2 −2
Original line number Diff line number Diff line
@@ -2,11 +2,11 @@ 


pythonPackages.buildPythonApplication rec {

  pname = "mopidy-gmusic";

  version = "2.0.0";

  version = "3.0.0";



  src = fetchurl {

    url = "https://github.com/mopidy/mopidy-gmusic/archive/v${version}.tar.gz";

    sha256 = "1xryw2aixfza3brxlgjdlg0lghlb17g7kay9zy56mlzp0jr7m87j";

    sha256 = "0a2s4xrrhnkv85rx4w5bj6ih9xm34jy0q71fdvbzmi827g9dw5sz";

  };



  propagatedBuildInputs = [