summary refs log tree commit diff
path: root/pkgs/applications/version-management/gitlab
diff options
context:
space:
mode:
authorFlorian Klink <flokli@flokli.de>2019-11-25 20:41:26 +0100
committerGitHub <noreply@github.com>2019-11-25 20:41:26 +0100
commite0734891f891ea7c59655d668eea1d4bd20acbac (patch)
tree6ef72f03f4abbf8381e4fb6dd5d94316ab1911d8 /pkgs/applications/version-management/gitlab
parentbbeed8b9e7e1ccd96a1a6bc8c307a31b0b742d48 (diff)
parentf53fe02ff062fbabe5a57cf58483e2a983c16842 (diff)
downloadnixpkgs-e0734891f891ea7c59655d668eea1d4bd20acbac.tar
nixpkgs-e0734891f891ea7c59655d668eea1d4bd20acbac.tar.gz
nixpkgs-e0734891f891ea7c59655d668eea1d4bd20acbac.tar.bz2
nixpkgs-e0734891f891ea7c59655d668eea1d4bd20acbac.tar.lz
nixpkgs-e0734891f891ea7c59655d668eea1d4bd20acbac.tar.xz
nixpkgs-e0734891f891ea7c59655d668eea1d4bd20acbac.tar.zst
nixpkgs-e0734891f891ea7c59655d668eea1d4bd20acbac.zip
Merge pull request #73857 from petabyteboy/feature/gitlab-12-4-3
gitlab: 12.4.2 -> 12.4.3
Diffstat (limited to 'pkgs/applications/version-management/gitlab')
-rw-r--r--pkgs/applications/version-management/gitlab/data.json6
-rw-r--r--pkgs/applications/version-management/gitlab/gitlab-shell/deps.nix18
2 files changed, 21 insertions, 3 deletions
diff --git a/pkgs/applications/version-management/gitlab/data.json b/pkgs/applications/version-management/gitlab/data.json
index 42cc127e40d..722bbc11b30 100644
--- a/pkgs/applications/version-management/gitlab/data.json
+++ b/pkgs/applications/version-management/gitlab/data.json
@@ -1,9 +1,9 @@
 {
-  "version": "12.4.2",
-  "repo_hash": "00y8n0y7wydwxq62fyf7hcpx90zz5sw458m2773lz7pdgnpnrdc2",
+  "version": "12.4.3",
+  "repo_hash": "1qsd3qxvvb3rbyrlyrqvrday4c9s2krgics99ch7v74hprj3xfq9",
   "owner": "gitlab-org",
   "repo": "gitlab",
-  "rev": "v12.4.2-ee",
+  "rev": "v12.4.3-ee",
   "passthru": {
     "GITALY_SERVER_VERSION": "1.67.0",
     "GITLAB_PAGES_VERSION": "1.11.0",
diff --git a/pkgs/applications/version-management/gitlab/gitlab-shell/deps.nix b/pkgs/applications/version-management/gitlab/gitlab-shell/deps.nix
index 5b5d0b99bcf..d5ea22f960b 100644
--- a/pkgs/applications/version-management/gitlab/gitlab-shell/deps.nix
+++ b/pkgs/applications/version-management/gitlab/gitlab-shell/deps.nix
@@ -163,6 +163,15 @@
     };
   }
   {
+    goPackagePath = "github.com/golang/lint";
+    fetch = {
+      type = "git";
+      url = "https://github.com/golang/lint";
+      rev = "06c8688daad7";
+      sha256 = "0xi94dwvz50a66bq1hp9fyqkym5mcpdxdb1hrfvicldgjf37lc47";
+    };
+  }
+  {
     goPackagePath = "github.com/golang/mock";
     fetch = {
       type = "git";
@@ -253,6 +262,15 @@
     };
   }
   {
+    goPackagePath = "github.com/kisielk/gotool";
+    fetch = {
+      type = "git";
+      url = "https://github.com/kisielk/gotool";
+      rev = "v1.0.0";
+      sha256 = "14af2pa0ssyp8bp2mvdw184s5wcysk6akil3wzxmr05wwy951iwn";
+    };
+  }
+  {
     goPackagePath = "github.com/konsorten/go-windows-terminal-sequences";
     fetch = {
       type = "git";