diff --git a/pkgs/applications/version-management/gitlab/data.json b/pkgs/applications/version-management/gitlab/data.json index 8927a5e9773a..f042ae24b080 100644 --- a/pkgs/applications/version-management/gitlab/data.json +++ b/pkgs/applications/version-management/gitlab/data.json @@ -1,11 +1,11 @@ { - "version": "12.10.11", - "repo_hash": "058xnmmz4fnan85x0mw0s2i2lr9y7yx2hqxfcil1frj2rz7ralds", + "version": "12.10.13", + "repo_hash": "0smhx2v5l9ya4j3xq66w9m4jbd72k74f6j67k6nrw7862pl251gc", "owner": "gitlab-org", "repo": "gitlab", - "rev": "v12.10.11-ee", + "rev": "v12.10.13-ee", "passthru": { - "GITALY_SERVER_VERSION": "12.10.11", + "GITALY_SERVER_VERSION": "12.10.13", "GITLAB_PAGES_VERSION": "1.17.0", "GITLAB_SHELL_VERSION": "12.2.0", "GITLAB_WORKHORSE_VERSION": "8.30.3" diff --git a/pkgs/applications/version-management/gitlab/gitaly/default.nix b/pkgs/applications/version-management/gitlab/gitaly/default.nix index 781aebf00add..719bd6ee8777 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/default.nix +++ b/pkgs/applications/version-management/gitlab/gitaly/default.nix @@ -19,14 +19,14 @@ let }; }; in buildGoPackage rec { - version = "12.10.11"; + version = "12.10.13"; pname = "gitaly"; src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitaly"; rev = "v${version}"; - sha256 = "1qzrfnihcx8ysy40z2sq5rgdgpp2gy5db8snlx7si2l9h6pjg7hz"; + sha256 = "0x6zlj468l5fmq1r7hb2sr2z9dy8pr0apnpmbf28ivap942a10dx"; }; # Fix a check which assumes that hook files are writeable by their diff --git a/pkgs/applications/version-management/gitlab/gitaly/deps.nix b/pkgs/applications/version-management/gitlab/gitaly/deps.nix index e23c5e08254e..47b270dc83d2 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/deps.nix +++ b/pkgs/applications/version-management/gitlab/gitaly/deps.nix @@ -9,6 +9,15 @@ sha256 = "0pbz5migljd5whxh6z1w79cwx93n85mcs3x1bckl27yzaa4lvqsl"; }; } + { + goPackagePath = "dmitri.shuralyov.com/gpu/mtl"; + fetch = { + type = "git"; + url = "https://dmitri.shuralyov.com/gpu/mtl"; + rev = "666a987793e9"; + sha256 = "1isd03hgiwcf2ld1rlp0plrnfz7r4i7c5q4kb6hkcd22axnmrv0z"; + }; + } { goPackagePath = "github.com/BurntSushi/toml"; fetch = { @@ -1427,8 +1436,8 @@ fetch = { type = "git"; url = "https://github.com/ugorji/go"; - rev = "v1.1.4"; - sha256 = "0ma2qvn5wqvjidpdz74x832a813qnr1cxbx6n6n125ak9b3wbn5w"; + rev = "d75b2dcb6bc8"; + sha256 = "0di1k35gpq9bp958ywranpbskx2vdwlb38s22vl9rybm3wa5g3ps"; }; } { diff --git a/pkgs/applications/version-management/gitlab/gitlab-workhorse/deps.nix b/pkgs/applications/version-management/gitlab/gitlab-workhorse/deps.nix index 63b52b1c85f2..530eb073c7b5 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-workhorse/deps.nix +++ b/pkgs/applications/version-management/gitlab/gitlab-workhorse/deps.nix @@ -9,6 +9,15 @@ sha256 = "0pbz5migljd5whxh6z1w79cwx93n85mcs3x1bckl27yzaa4lvqsl"; }; } + { + goPackagePath = "dmitri.shuralyov.com/gpu/mtl"; + fetch = { + type = "git"; + url = "https://dmitri.shuralyov.com/gpu/mtl"; + rev = "666a987793e9"; + sha256 = "1isd03hgiwcf2ld1rlp0plrnfz7r4i7c5q4kb6hkcd22axnmrv0z"; + }; + } { goPackagePath = "github.com/BurntSushi/toml"; fetch = { diff --git a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock index efe1ecca4678..412d0d5f277e 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock +++ b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock @@ -563,19 +563,19 @@ GEM json-schema (2.8.0) addressable (>= 2.4) jwt (2.1.0) - kaminari (1.0.1) + kaminari (1.2.1) activesupport (>= 4.1.0) - kaminari-actionview (= 1.0.1) - kaminari-activerecord (= 1.0.1) - kaminari-core (= 1.0.1) - kaminari-actionview (1.0.1) + kaminari-actionview (= 1.2.1) + kaminari-activerecord (= 1.2.1) + kaminari-core (= 1.2.1) + kaminari-actionview (1.2.1) actionview - kaminari-core (= 1.0.1) - kaminari-activerecord (1.0.1) + kaminari-core (= 1.2.1) + kaminari-activerecord (1.2.1) activerecord - kaminari-core (= 1.0.1) - kaminari-core (1.0.1) - kgio (2.11.2) + kaminari-core (= 1.2.1) + kaminari-core (1.2.1) + kgio (2.11.3) knapsack (1.17.0) rake kramdown (2.1.0) diff --git a/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix b/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix index 2544cd0ac898..6057586da005 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix +++ b/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix @@ -2403,10 +2403,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0invfvfb252ihsdr65rylkvd1x2wy004jval52v3i8ybb0jhc5hi"; + sha256 = "1vxkqciny5v4jgmjxl8qrgbmig2cij2iskqbwh4bfcmpxf467ch3"; type = "gem"; }; - version = "1.0.1"; + version = "1.2.1"; }; kaminari-actionview = { dependencies = ["actionview" "kaminari-core"]; @@ -2414,10 +2414,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0mhhsm6xhmwqc7hfw7xnk1kdbfg468bqs5awcqm5j6j8b9zyjvdi"; + sha256 = "0w0p1hyv6lgf6h036cmn2kbkdv4x7g0g9q9kc5gzkpz7amlxr8ri"; type = "gem"; }; - version = "1.0.1"; + version = "1.2.1"; }; kaminari-activerecord = { dependencies = ["activerecord" "kaminari-core"]; @@ -2425,30 +2425,30 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1kb5aj6iy1cwcq5548jd3w1ipxicnzmnx2ay1s4hvad2gvrd4g93"; + sha256 = "02n5xxv6ilh39q2m6vcz7qrdai7ghk3s178dw6f0b3lavwyq49w3"; type = "gem"; }; - version = "1.0.1"; + version = "1.2.1"; }; kaminari-core = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0r2n293ad1xr9wgn8cr53nfzwls4w3p1xi4kjfjgl1z0yf05mpwr"; + sha256 = "0h04cr4y1jfn81gxy439vmczifghc2cvsyw47aa32is5bbxg1wlz"; type = "gem"; }; - version = "1.0.1"; + version = "1.2.1"; }; kgio = { groups = ["default" "unicorn"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1528pyj1szzzp3pgj05fzjd36qjrxm9yj2x5radc9p1z7vl67y50"; + sha256 = "0ai6bzlvxbzpdl466p1qi4dlhx8ri2wcrp6x1l19y3yfs3a29rng"; type = "gem"; }; - version = "2.11.2"; + version = "2.11.3"; }; knapsack = { dependencies = ["rake"]; diff --git a/pkgs/applications/version-management/gitlab/yarnPkgs.nix b/pkgs/applications/version-management/gitlab/yarnPkgs.nix index f85ee249029f..ca577f0e2d66 100644 --- a/pkgs/applications/version-management/gitlab/yarnPkgs.nix +++ b/pkgs/applications/version-management/gitlab/yarnPkgs.nix @@ -11642,11 +11642,11 @@ }; } { - name = "swagger_ui_dist___swagger_ui_dist_3.24.3.tgz"; + name = "swagger_ui_dist___swagger_ui_dist_3.26.2.tgz"; path = fetchurl { - name = "swagger_ui_dist___swagger_ui_dist_3.24.3.tgz"; - url = "https://registry.yarnpkg.com/swagger-ui-dist/-/swagger-ui-dist-3.24.3.tgz"; - sha1 = "99754d11b0ddd314a1a50db850acb415e4b0a0c6"; + name = "swagger_ui_dist___swagger_ui_dist_3.26.2.tgz"; + url = "https://registry.yarnpkg.com/swagger-ui-dist/-/swagger-ui-dist-3.26.2.tgz"; + sha1 = "22c700906c8911b1c9956da6c3fca371dba6219f"; }; } {