Unverified Commit 3f992f34 authored by Leona Maroni's avatar Leona Maroni Committed by GitHub
Browse files

gitlab: 17.10.1 -> 17.10.4 (#398548)

parents 0f712772 1e28b01f

pkgs/applications/version-management/gitlab/data.json

+6 −6
Original line number Diff line number Diff line 
{

  "version": "17.10.1",

  "repo_hash": "1bxkfn49dih3i3z6z1l5xx5hrvrxwwr1ag66aw4vmncw4vyxl2wj",

  "version": "17.10.4",

  "repo_hash": "1ppfg904q1ikl21k21iyzknpd7l51zxpi144416myr5m1a6a3kza",

  "yarn_hash": "0fw84hf9qswajmjhds59fn6l6xmyha6vja13dvb5slfw9cmbq9pi",

  "owner": "gitlab-org",

  "repo": "gitlab",

  "rev": "v17.10.1-ee",

  "rev": "v17.10.4-ee",

  "passthru": {

    "GITALY_SERVER_VERSION": "17.10.1",

    "GITLAB_PAGES_VERSION": "17.10.1",

    "GITALY_SERVER_VERSION": "17.10.4",

    "GITLAB_PAGES_VERSION": "17.10.4",

    "GITLAB_SHELL_VERSION": "14.41.0",

    "GITLAB_ELASTICSEARCH_INDEXER_VERSION": "5.4.0",

    "GITLAB_WORKHORSE_VERSION": "17.10.1"

    "GITLAB_WORKHORSE_VERSION": "17.10.4"

  }

}

pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ in 
buildGoModule rec {

  pname = "gitlab-workhorse";



  version = "17.10.1";

  version = "17.10.4";



  # nixpkgs-update: no auto update

  src = fetchFromGitLab {
@@ -22,7 +22,7 @@ buildGoModule rec { 


  sourceRoot = "${src.name}/workhorse";



  vendorHash = "sha256-b8HLad4oK5x7uzlr1SQAZt20+OhB3iswhpIQnk4VF/o=";

  vendorHash = "sha256-rPTFHQ7b3l9wPURu50sur+PsxKYI4xiRs5uHNab9YUg=";

  buildInputs = [ git ];

  ldflags = [ "-X main.Version=${version}" ];

  doCheck = false;

pkgs/applications/version-management/gitlab/update.py

+5 −2
Original line number Diff line number Diff line
@@ -216,7 +216,10 @@ def update_rubyenv(): 


    # Undo our gemset.nix patches so that bundix runs through

    subprocess.check_output(

        ["sed", "-i", "-e", "1d", "-e", "s:\\${src}/::g", "gemset.nix"], cwd=rubyenv_dir

        ["sed", "-i", "-e", "s|\\${src}/||g", "gemset.nix"], cwd=rubyenv_dir

    )

    subprocess.check_output(

        ["sed", "-i", "-e", "s|^src:[[:space:]]||g", "gemset.nix"], cwd=rubyenv_dir

    )



    subprocess.check_output(["bundle", "lock"], cwd=rubyenv_dir)
@@ -227,7 +230,7 @@ def update_rubyenv(): 
            "sed",

            "-i",

            "-e",

            "1i\\src:",

            "1c\\src: {",

            "-e",

            's:path = \\(vendor/[^;]*\\);:path = "${src}/\\1";:g',

            "-e",

pkgs/by-name/gi/gitaly/package.nix

+2 −2
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ 
}:



let

  version = "17.10.1";

  version = "17.10.4";

  package_version = "v${lib.versions.major version}";

  gitaly_package = "gitlab.com/gitlab-org/gitaly/${package_version}";
@@ -21,7 +21,7 @@ let 
      owner = "gitlab-org";

      repo = "gitaly";

      rev = "v${version}";

      hash = "sha256-uyXxNuHQUlXCNQcrEIoaJXpatfM5fcIk5MCNYt8QW9A=";

      hash = "sha256-NUTo5JVolc4WUinyCn4BKDqJPn3KWXOnBs6MRj7178o=";

    };



    vendorHash = "sha256-umtSuLQiohSarzZDU7tHEYI6t8B7MlkaDu8//fnr1Ms=";

pkgs/by-name/gi/gitlab-pages/package.nix

+2 −2
Original line number Diff line number Diff line
@@ -6,14 +6,14 @@ 


buildGoModule rec {

  pname = "gitlab-pages";

  version = "17.10.1";

  version = "17.10.4";



  # nixpkgs-update: no auto update

  src = fetchFromGitLab {

    owner = "gitlab-org";

    repo = "gitlab-pages";

    rev = "v${version}";

    hash = "sha256-B/v0jj5hoNmF9cygvi9eLQ4pLuZ1+wIyNnJN2uCAXdE=";

    hash = "sha256-kvmM8cWAAlDT+FJBVUiZD9h/qT6iAaz+gOncvyCsvtY=";

  };



  vendorHash = "sha256-o2DgP2YP2aejtuQ4NC90kysvwDy0XvSb4CW5oE2x2qQ=";