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

Commits on Sep 20, 2017

  1. gitlab module: fix shell hook path 

    (cherry picked from commit 370ac62)
    @globin @fpletz
    globin authored and fpletz committed Sep 20, 2017

    Verified

    This commit was signed with the committer’s verified signature.
    makenowjust Hiroya Fujinami
    GPG key ID: 9F4CB6A0CB6B6BE9
    Verified
    Learn about vigilant mode
    Copy the full SHA
    0fccf29 View commit details

  2. atlassian-confluence: 6.3.1 -> 6.4.0 

    (cherry picked from commit c95e158)
    @ciil @fpletz
    ciil authored and fpletz committed Sep 20, 2017
    Copy the full SHA
    7d0fe7b View commit details

  3. atlassian-jira: 7.4.1 -> 7.5.0 

    (cherry picked from commit 27ed570)
    @ciil @fpletz
    ciil authored and fpletz committed Sep 20, 2017
    Copy the full SHA
    a4754a5 View commit details

  4. unifi: 5.5.20 -> 5.6.16 

    (cherry picked from commit 94a5de6)
    @fpletz
    fpletz committed Sep 20, 2017
    Copy the full SHA
    883ea76 View commit details
Showing with 10 additions and 10 deletions.
  1. +3 −3 nixos/modules/services/misc/gitlab.nix
  2. +2 −2 pkgs/servers/atlassian/confluence.nix
  3. +2 −2 pkgs/servers/atlassian/jira.nix
  4. +3 −3 pkgs/servers/unifi/default.nix
6 changes: 3 additions & 3 deletions nixos/modules/services/misc/gitlab.nix
View file
Original file line number Diff line number Diff line change
@@ -142,9 +142,9 @@ let
GITLAB_UPLOADS_PATH = "${cfg.statePath}/uploads";
GITLAB_LOG_PATH = "${cfg.statePath}/log";
GITLAB_SHELL_PATH = "${cfg.packages.gitlab-shell}";
GITLAB_SHELL_CONFIG_PATH = "${cfg.statePath}/home/config.yml";
GITLAB_SHELL_CONFIG_PATH = "${cfg.statePath}/shell/config.yml";
GITLAB_SHELL_SECRET_PATH = "${cfg.statePath}/config/gitlab_shell_secret";
GITLAB_SHELL_HOOKS_PATH = "${cfg.statePath}/home/hooks";
GITLAB_SHELL_HOOKS_PATH = "${cfg.statePath}/shell/hooks";
GITLAB_REDIS_CONFIG_FILE = pkgs.writeText "gitlab-redis.yml" redisYml;
prometheus_multiproc_dir = "/run/gitlab";
RAILS_ENV = "production";
@@ -567,7 +567,7 @@ in {
mkdir -p ${cfg.statePath}/tmp/pids
mkdir -p ${cfg.statePath}/tmp/sockets
rm -rf ${cfg.statePath}/config ${cfg.statePath}/home/hooks
rm -rf ${cfg.statePath}/config ${cfg.statePath}/shell/hooks
mkdir -p ${cfg.statePath}/config
tr -dc A-Za-z0-9 < /dev/urandom | head -c 32 > ${cfg.statePath}/config/gitlab_shell_secret
4 changes: 2 additions & 2 deletions pkgs/servers/atlassian/confluence.nix
View file
Original file line number Diff line number Diff line change
@@ -5,11 +5,11 @@

stdenv.mkDerivation rec {
name = "atlassian-confluence-${version}";
version = "6.3.1";
version = "6.4.0";

src = fetchurl {
url = "https://www.atlassian.com/software/confluence/downloads/binary/${name}.tar.gz";
sha256 = "0f7hc8q4sigvr9bdxx8phnp6bkfkz9bccwkrx0xqyrvvdc5x5690";
sha256 = "1ba8zpcywnnanzqxjaqiyfc6j5qr6jk6laryz8npiqz4grv3qk61";
};

phases = [ "unpackPhase" "buildPhase" "installPhase" ];
4 changes: 2 additions & 2 deletions pkgs/servers/atlassian/jira.nix
View file
Original file line number Diff line number Diff line change
@@ -5,11 +5,11 @@

stdenv.mkDerivation rec {
name = "atlassian-jira-${version}";
version = "7.4.1";
version = "7.5.0";

src = fetchurl {
url = "https://downloads.atlassian.com/software/jira/downloads/atlassian-jira-software-${version}.tar.gz";
sha256 = "1ixkhc206z3zpiaj46v8z2gxmix24sxqs2d17fb64gkyml9s5gqb";
sha256 = "12pf0q1ixsf9ld0569mbwvjz5v9bhh7ad3bd8x9qx188vq5cz381";
};

phases = [ "unpackPhase" "buildPhase" "installPhase" "fixupPhase" ];
6 changes: 3 additions & 3 deletions pkgs/servers/unifi/default.nix
View file
Original file line number Diff line number Diff line change
@@ -6,11 +6,11 @@

stdenv.mkDerivation rec {
name = "unifi-controller-${version}";
version = "5.5.20";
version = "5.6.16";

src = fetchurl {
url = "https://www.ubnt.com/downloads/unifi/${version}/unifi_sysvinit_all.deb";
sha256 = "14v38x46vgwm3wg28lzv4sz6kjgp6r1xkwxnxn6pzq2r7v6xkaz0";
url = "https://www.ubnt.com/downloads/unifi/${version}-86cdeea491/unifi_sysvinit_all.deb";
sha256 = "1kfrawf48q9rx48hcnmiqndbg84v340yfykh23af7xpcxmzl5jy7";
};

buildInputs = [ dpkg ];