diff options
Diffstat (limited to 'pkgs/applications/version-management')
9 files changed, 48 insertions, 33 deletions
diff --git a/pkgs/applications/version-management/cvs-fast-export/default.nix b/pkgs/applications/version-management/cvs-fast-export/default.nix index a45d76970664..a58cda543658 100644 --- a/pkgs/applications/version-management/cvs-fast-export/default.nix +++ b/pkgs/applications/version-management/cvs-fast-export/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "cvs-fast-export"; - version = "1.62"; + version = "1.63"; src = fetchurl { url = "http://www.catb.org/~esr/cvs-fast-export/cvs-fast-export-${version}.tar.gz"; - sha256 = "sha256-ix0fg2wn2yStrgEhAxsSXvLu+C7sb2V5oyVCfhAe/R8="; + sha256 = "sha256-YZF2QebWbvn/N9pLpccudZsFHzocJp/3M0Gx9p7fQ5Y="; }; strictDeps = true; diff --git a/pkgs/applications/version-management/gitkraken/default.nix b/pkgs/applications/version-management/gitkraken/default.nix index 0e25f63765e1..6b9ed9f25ccf 100644 --- a/pkgs/applications/version-management/gitkraken/default.nix +++ b/pkgs/applications/version-management/gitkraken/default.nix @@ -3,31 +3,32 @@ , libX11, libXi, libxcb, libXext, libXcursor, glib, libXScrnSaver, libxkbfile, libXtst , nss, nspr, cups, fetchzip, expat, gdk-pixbuf, libXdamage, libXrandr, dbus , makeDesktopItem, openssl, wrapGAppsHook, at-spi2-atk, at-spi2-core, libuuid -, e2fsprogs, krb5, libdrm, mesa, unzip, copyDesktopItems, libxshmfence, libxkbcommon +, e2fsprogs, krb5, libdrm, mesa, unzip, copyDesktopItems, libxshmfence, libxkbcommon, git +, libGL, zlib, cacert }: with lib; let pname = "gitkraken"; - version = "9.10.0"; + version = "9.11.1"; throwSystem = throw "Unsupported system: ${stdenv.hostPlatform.system}"; srcs = { x86_64-linux = fetchzip { url = "https://release.axocdn.com/linux/GitKraken-v${version}.tar.gz"; - hash = "sha256-JVeJY0VUNyIeR/IQcfoLBN0I1WQNFy7PpCjzk5bPv/Q="; + hash = "sha256-DTnVsVWOPAcG2O87dS6PwAB+VU0ijulELHe9CnOLYPU="; }; x86_64-darwin = fetchzip { url = "https://release.axocdn.com/darwin/GitKraken-v${version}.zip"; - hash = "sha256-npc+dwHH0tlVKkAZxmGwpoiHXeDn0VHkivqbwoJsI7M="; + hash = "sha256-JkmQYk+t4ACkK3V0IxrrIcheBWJEkxQzf9ZYRWs769c="; }; aarch64-darwin = fetchzip { url = "https://release.axocdn.com/darwin-arm64/GitKraken-v${version}.zip"; - hash = "sha256-fszsGdNKcVgKdv97gBBf+fSODzjKbOBB4MyCvWzm3CA="; + hash = "sha256-jWXvDSyM7A3+cer/yPvom9f0w2nGJmwOJ22qoQzRWGQ="; }; }; @@ -91,12 +92,14 @@ let mesa libxshmfence libxkbcommon + libGL + zlib ]; desktopItems = [ (makeDesktopItem { - name = pname; - exec = pname; - icon = pname; + name = "GitKraken"; + exec = "gitkraken"; + icon = "gitkraken"; desktopName = "GitKraken"; genericName = "Git Client"; categories = [ "Development" ]; @@ -112,25 +115,37 @@ let mkdir -p $out/share/${pname}/ cp -R $src/* $out/share/${pname} - mkdir -p $out/bin - ln -s $out/share/${pname}/${pname} $out/bin/ - mkdir -p $out/share/pixmaps - cp ${pname}.png $out/share/pixmaps/${pname}.png + cp gitkraken.png $out/share/pixmaps/ runHook postInstall ''; postFixup = '' pushd $out/share/${pname} - for file in ${pname} chrome-sandbox chrome_crashpad_handler; do + for file in gitkraken chrome-sandbox chrome_crashpad_handler; do patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $file done - for file in $(find . -type f \( -name \*.node -o -name ${pname} -o -name \*.so\* \) ); do + for file in $(find . -type f \( -name \*.node -o -name gitkraken -o -name git -o -name git-\* -o -name scalar -o -name \*.so\* \) ); do patchelf --set-rpath ${libPath}:$out/share/${pname} $file || true done popd + + # SSL and permissions fix for bundled nodegit + pushd $out/share/${pname}/resources/app.asar.unpacked/node_modules/@axosoft/nodegit/build/Release + mv nodegit-ubuntu-18.node nodegit-ubuntu-18-ssl-1.1.1.node + mv nodegit-ubuntu-18-ssl-static.node nodegit-ubuntu-18.node + chmod 755 nodegit-ubuntu-18.node + popd + + # Devendor bundled git + rm -rf $out/share/${pname}/resources/app.asar.unpacked/git + ln -s ${git} $out/share/${pname}/resources/app.asar.unpacked/git + + # GitKraken expects the CA bundle to be located in the bundled git directory. Since we replace it with + # the one from nixpkgs, which doesn't provide a CA bundle, we need to explicitly set its location at runtime + makeWrapper $out/share/${pname}/gitkraken $out/bin/gitkraken --set GIT_SSL_CAINFO "${cacert}/etc/ssl/certs/ca-bundle.crt" ''; }; diff --git a/pkgs/applications/version-management/gitlab/data.json b/pkgs/applications/version-management/gitlab/data.json index 461c83695d5c..7e84cf7c7c17 100644 --- a/pkgs/applications/version-management/gitlab/data.json +++ b/pkgs/applications/version-management/gitlab/data.json @@ -1,15 +1,15 @@ { - "version": "16.7.2", - "repo_hash": "sha256-YIwZkmTVmxXlZ07lCUco9VEbylMvE92LQdFOeZXWB2M=", + "version": "16.7.4", + "repo_hash": "sha256-rUEr9G/5T4yWnNY69I+IpjsVOSmfdL0j0u6et4jkIt8=", "yarn_hash": "1qxz2p969qg7kzyvhwxws5zwdw986gdq9gxllzi58c5c56jz49zf", "owner": "gitlab-org", "repo": "gitlab", - "rev": "v16.7.2-ee", + "rev": "v16.7.4-ee", "passthru": { - "GITALY_SERVER_VERSION": "16.7.2", - "GITLAB_PAGES_VERSION": "16.7.2", + "GITALY_SERVER_VERSION": "16.7.4", + "GITLAB_PAGES_VERSION": "16.7.4", "GITLAB_SHELL_VERSION": "14.32.0", "GITLAB_ELASTICSEARCH_INDEXER_VERSION": "4.5.0", - "GITLAB_WORKHORSE_VERSION": "16.7.2" + "GITLAB_WORKHORSE_VERSION": "16.7.4" } } diff --git a/pkgs/applications/version-management/gitlab/gitaly/default.nix b/pkgs/applications/version-management/gitlab/gitaly/default.nix index c2f295b3b589..754f8027100f 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/default.nix +++ b/pkgs/applications/version-management/gitlab/gitaly/default.nix @@ -6,7 +6,7 @@ }: let - version = "16.7.2"; + version = "16.7.4"; package_version = "v${lib.versions.major version}"; gitaly_package = "gitlab.com/gitlab-org/gitaly/${package_version}"; @@ -18,7 +18,7 @@ let owner = "gitlab-org"; repo = "gitaly"; rev = "v${version}"; - hash = "sha256-3R7x8eaUJqJ1mKlQ4kYThKyaSfSaow7lGx5EfNo+GNY="; + hash = "sha256-4wdMwLsJiQzaZ8PhQz7gYj+dzA+92NFPm0twMdr65qA="; }; vendorHash = "sha256-btWHZMy1aBSsUVs30IqrdBCO79XQvTMXxkxYURF2Nqs="; diff --git a/pkgs/applications/version-management/gitlab/gitlab-pages/default.nix b/pkgs/applications/version-management/gitlab/gitlab-pages/default.nix index c5a4065d4ccb..0e21984866f2 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-pages/default.nix +++ b/pkgs/applications/version-management/gitlab/gitlab-pages/default.nix @@ -2,14 +2,14 @@ buildGoModule rec { pname = "gitlab-pages"; - version = "16.7.2"; + version = "16.7.4"; # nixpkgs-update: no auto update src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-pages"; rev = "v${version}"; - hash = "sha256-rUSZDsQt6faNES3ibzo7fJqpzEmXRbbTXOkhOn7jggA="; + hash = "sha256-6OPpfn+nylTUp7rNI8NqipbHmLmaV0ezE1qrQqHcuqw="; }; vendorHash = "sha256-NMky8v0YmN2pSeKJ7G0+DWAZvUx2JlwFbqPHvciYroM="; diff --git a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix index b3dec6385c28..c05ced41045d 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix +++ b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix @@ -5,7 +5,7 @@ in buildGoModule rec { pname = "gitlab-workhorse"; - version = "16.7.2"; + version = "16.7.4"; # nixpkgs-update: no auto update src = fetchFromGitLab { diff --git a/pkgs/applications/version-management/gitsign/default.nix b/pkgs/applications/version-management/gitsign/default.nix index cf804ddfb54c..87b73391987e 100644 --- a/pkgs/applications/version-management/gitsign/default.nix +++ b/pkgs/applications/version-management/gitsign/default.nix @@ -19,7 +19,7 @@ buildGoModule rec { nativeBuildInputs = [ makeWrapper ]; - ldflags = [ "-s" "-w" "-buildid=" "-X github.com/sigstore/gitsign/pkg/version.gitVersion=${version}" ]; + ldflags = [ "-s" "-w" "-X github.com/sigstore/gitsign/pkg/version.gitVersion=${version}" ]; preCheck = '' # test all paths diff --git a/pkgs/applications/version-management/legit/default.nix b/pkgs/applications/version-management/legit/default.nix index c42f6eecfeea..93d274ecaf2f 100644 --- a/pkgs/applications/version-management/legit/default.nix +++ b/pkgs/applications/version-management/legit/default.nix @@ -5,11 +5,11 @@ python3Packages.buildPythonApplication rec { pname = "legit"; - version = "1.2.0"; + version = "1.2.0.post0"; src = fetchPypi { inherit pname version; - sha256 = "0ngh3ar6v15516f52j21k6qz7hykmxfjadhb2rakvl27b5xvjy1c"; + sha256 = "sha256-lJOWtoApqK9AWrIMkBkCNB72vVXH/sbatxFB1j1AaxE="; }; propagatedBuildInputs = with python3Packages; [ diff --git a/pkgs/applications/version-management/mercurial/default.nix b/pkgs/applications/version-management/mercurial/default.nix index 1051dc6da886..07cc4e7b8f58 100644 --- a/pkgs/applications/version-management/mercurial/default.nix +++ b/pkgs/applications/version-management/mercurial/default.nix @@ -23,11 +23,11 @@ let self = python3Packages.buildPythonApplication rec { pname = "mercurial${lib.optionalString fullBuild "-full"}"; - version = "6.6.1"; + version = "6.6.2"; src = fetchurl { url = "https://mercurial-scm.org/release/mercurial-${version}.tar.gz"; - sha256 = "sha256-opRlo/5Ao+jUm6g0MTSsKrooa2g//rg42gz25FIflpU="; + sha256 = "sha256-y0lNe+fdwvydMXHIiDCvnAKyHHU+PlET3vrJwDc7S2A="; }; format = "other"; @@ -37,7 +37,7 @@ let cargoDeps = if rustSupport then rustPlatform.fetchCargoTarball { inherit src; name = "mercurial-${version}"; - sha256 = "sha256-wLV0qdCfMgGpZRxnZik/lRwZHm/66p0sJn/mYVRvRkQ="; + sha256 = "sha256-yOysqMrTWDx/ENcJng8Rm338NI9vpuBGH6Yq8B7+MFg="; sourceRoot = "mercurial-${version}/rust"; } else null; cargoRoot = if rustSupport then "rust" else null; |