diff options
Diffstat (limited to 'pkgs/applications/version-management')
35 files changed, 179 insertions, 145 deletions
diff --git a/pkgs/applications/version-management/bcompare/default.nix b/pkgs/applications/version-management/bcompare/default.nix index fab2780d9644..409652888caf 100644 --- a/pkgs/applications/version-management/bcompare/default.nix +++ b/pkgs/applications/version-management/bcompare/default.nix @@ -4,19 +4,19 @@ let pname = "bcompare"; - version = "4.4.2.26348"; + version = "4.4.4.27058"; throwSystem = throw "Unsupported system: ${stdenv.hostPlatform.system}"; srcs = { x86_64-linux = fetchurl { url = "https://www.scootersoftware.com/${pname}-${version}_amd64.deb"; - sha256 = "sha256-GotORErgPs7IPXATbBfIisDCNwp8csl7pDSwV77FylA="; + sha256 = "sha256-8wJzCCfekr/mrDJCDgoIqMRz21wWjfp5c5sPavZma3g="; }; x86_64-darwin = fetchurl { url = "https://www.scootersoftware.com/BCompareOSX-${version}.zip"; - sha256 = "sha256-XqmtW2EGyFmOzCooXczP3mtMN5UVQCCx7DJnVDlzAko="; + sha256 = "sha256-UopkyKHvbIZb9rNAJ+l3dEmOX33lQwakNypWCgYDT04="; }; aarch64-darwin = srcs.x86_64-darwin; diff --git a/pkgs/applications/version-management/commitizen/default.nix b/pkgs/applications/version-management/commitizen/default.nix index bd5e22dc3c6f..274eb3a0070f 100644 --- a/pkgs/applications/version-management/commitizen/default.nix +++ b/pkgs/applications/version-management/commitizen/default.nix @@ -17,17 +17,18 @@ , tomlkit , typing-extensions , argcomplete +, nix-update-script }: buildPythonApplication rec { pname = "commitizen"; - version = "2.35.0"; + version = "2.37.0"; src = fetchFromGitHub { owner = "commitizen-tools"; repo = pname; rev = "v${version}"; - hash = "sha256-9ek6m5k01sGVHwqWXjWYDsPmIeAgK+H23D9sF5hjrf0="; + hash = "sha256-wo1I6QDWLxByHISmkPdass+BcKh0oxR5hD31UN/5+WQ="; deepClone = true; }; @@ -80,9 +81,14 @@ buildPythonApplication rec { "test_get_commits_with_signature" ]; + passthru.updateScript = nix-update-script { + attrPath = pname; + }; + meta = with lib; { description = "Tool to create committing rules for projects, auto bump versions, and generate changelogs"; homepage = "https://github.com/commitizen-tools/commitizen"; + changelog = "https://github.com/commitizen-tools/commitizen/blob/v${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ lovesegfault anthonyroussel ]; }; diff --git a/pkgs/applications/version-management/git-and-tools/gh/default.nix b/pkgs/applications/version-management/git-and-tools/gh/default.nix index 15b164284bfb..7d5a9cc6d608 100644 --- a/pkgs/applications/version-management/git-and-tools/gh/default.nix +++ b/pkgs/applications/version-management/git-and-tools/gh/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "gh"; - version = "2.18.1"; + version = "2.20.2"; src = fetchFromGitHub { owner = "cli"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-igtbMrm4cgaBWxjvv8UjqvPNFSi1UxNgplWYArqRRi0="; + sha256 = "sha256-atUC6vb/tOO2GapMjTqFi4qjDAdSf2F8v3gZuzyt+9Q="; }; - vendorSha256 = "sha256-XWquL/+47t467kOYpDgMmT7t3hbdCiPQnatRW+VtaYc="; + vendorSha256 = "sha256-FSniCYr3emV9W/BuEkWe0a4aZ5RCoZJc7+K+f2q49ys="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/applications/version-management/git-and-tools/ghorg/default.nix b/pkgs/applications/version-management/git-and-tools/ghorg/default.nix index a9bf9229e024..2c8d36a4df6b 100644 --- a/pkgs/applications/version-management/git-and-tools/ghorg/default.nix +++ b/pkgs/applications/version-management/git-and-tools/ghorg/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "ghorg"; - version = "1.8.8"; + version = "1.9.0"; src = fetchFromGitHub { owner = "gabrie30"; repo = "ghorg"; rev = "v${version}"; - sha256 = "sha256-xB/TdeXC0V8dZs6N6Uq1+gzG84j9uhSrwkSbIMwUWSk="; + sha256 = "sha256-P9LwgEUz8QgUVQYISIx3Sa8ibFxNTGNNO5Vn014UB88="; }; doCheck = false; diff --git a/pkgs/applications/version-management/git-and-tools/git-cola/default.nix b/pkgs/applications/version-management/git-and-tools/git-cola/default.nix index 19171c580461..fdfd722e8fb0 100644 --- a/pkgs/applications/version-management/git-and-tools/git-cola/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-cola/default.nix @@ -5,13 +5,13 @@ let in buildPythonApplication rec { pname = "git-cola"; - version = "4.0.2"; + version = "4.0.3"; src = fetchFromGitHub { owner = "git-cola"; repo = "git-cola"; rev = "refs/tags/v${version}"; - hash = "sha256-5PE2Ey9IwNzxl4mk7tzaSWXiTmRFlxDO5MhoIYAwEag="; + hash = "sha256-w3SbuquHuWTYg1N3kcix4S5vrsmclVSrHf6uv8CYU6w="; }; buildInputs = [ git gettext ]; diff --git a/pkgs/applications/version-management/git-and-tools/git-machete/default.nix b/pkgs/applications/version-management/git-and-tools/git-machete/default.nix index 3eb432840f86..a41380380bcc 100644 --- a/pkgs/applications/version-management/git-and-tools/git-machete/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-machete/default.nix @@ -12,13 +12,13 @@ buildPythonApplication rec { pname = "git-machete"; - version = "3.12.5"; + version = "3.13.0"; src = fetchFromGitHub { owner = "virtuslab"; repo = pname; rev = "v${version}"; - sha256 = "sha256-EC4uI9q/iwX9U/xvyCZ3HAmfGEbKoADLKMx5f30Q9Ys="; + sha256 = "sha256-Ku142NjiDTxiZ50Sm6vZs5ZHJ25oALnLQw8ThWqQ2rE="; }; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/applications/version-management/git-and-tools/git-subrepo/default.nix b/pkgs/applications/version-management/git-and-tools/git-subrepo/default.nix index 7fe9883c556d..23b8fd95cfd6 100644 --- a/pkgs/applications/version-management/git-and-tools/git-subrepo/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-subrepo/default.nix @@ -1,19 +1,20 @@ -{ lib, stdenv, fetchFromGitHub, git, makeWrapper, which }: +{ lib, stdenv, fetchFromGitHub, git, makeWrapper, which, installShellFiles }: stdenv.mkDerivation rec { pname = "git-subrepo"; - version = "0.4.1"; + version = "0.4.5"; src = fetchFromGitHub { owner = "ingydotnet"; repo = "git-subrepo"; rev = version; - sha256 = "0n10qnc8kyms6cv65k1n5xa9nnwpwbjn9h2cq47llxplawzqgrvp"; + sha256 = "sha256-ZU5yYaiear5AjlBqtzabmMJNUa2ypeJKW3sQPIcyskM="; }; nativeBuildInputs = [ makeWrapper which + installShellFiles ]; buildInputs = [ @@ -26,21 +27,9 @@ stdenv.mkDerivation rec { "INSTALL_MAN=${placeholder "out"}/share/man/man1" ]; - patches = [ - # Allow zsh completion to work even though we aren't installing from a git - # clone. Also submitted upstream as - # https://github.com/ingydotnet/git-subrepo/pull/420 - ./zsh-completion.patch - ]; - postInstall = '' - ZSH_COMP_DIR="$out/share/zsh/vendor-completions" - mkdir -p "$ZSH_COMP_DIR" - cp share/zsh-completion/_git-subrepo "$ZSH_COMP_DIR/" - - BASH_COMP_DIR="$out/share/bash-completion/completions" - mkdir -p "$BASH_COMP_DIR" - cp share/completion.bash "$BASH_COMP_DIR/git-subrepo" + installShellCompletion --bash --name git-subrepo.bash share/completion.bash + installShellCompletion --zsh share/zsh-completion/_git-subrepo ''; postFixup = '' @@ -52,7 +41,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/ingydotnet/git-subrepo"; description = "Git submodule alternative"; license = licenses.mit; - platforms = platforms.unix ++ platforms.darwin; - maintainers = [ maintainers.ryantrinkle ]; + platforms = platforms.unix; + maintainers = with maintainers; [ ryantrinkle ]; }; } diff --git a/pkgs/applications/version-management/git-and-tools/git-subrepo/zsh-completion.patch b/pkgs/applications/version-management/git-and-tools/git-subrepo/zsh-completion.patch deleted file mode 100644 index dcba5ba6eea1..000000000000 --- a/pkgs/applications/version-management/git-and-tools/git-subrepo/zsh-completion.patch +++ /dev/null @@ -1,32 +0,0 @@ -diff --git a/pkg/bin/generate-completion.pl b/pkg/bin/generate-completion.pl -index 85ae3b8..d3e423c 100644 ---- a/pkg/bin/generate-completion.pl -+++ b/pkg/bin/generate-completion.pl -@@ -82,11 +82,6 @@ sub generate_zsh { - - # DO NOT EDIT. This file generated by pkg/bin/generate-completion.pl. - --if [[ -z $GIT_SUBREPO_ROOT ]]; then -- echo 'GIT_SUBREPO_ROOT is null; has `/path/to/git-subrepo/.rc` been sourced?' -- return 3 --fi -- - _git-subrepo() { - typeset -A opt_args - local curcontext="$curcontext" state line context -diff --git a/share/zsh-completion/_git-subrepo b/share/zsh-completion/_git-subrepo -index fc82be2..a8069d9 100644 ---- a/share/zsh-completion/_git-subrepo -+++ b/share/zsh-completion/_git-subrepo -@@ -3,11 +3,6 @@ - - # DO NOT EDIT. This file generated by pkg/bin/generate-completion.pl. - --if [[ -z $GIT_SUBREPO_ROOT ]]; then -- echo 'GIT_SUBREPO_ROOT is null; has `/path/to/git-subrepo/.rc` been sourced?' -- return 3 --fi -- - _git-subrepo() { - typeset -A opt_args - local curcontext="$curcontext" state line context diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix index dd244b3687c1..2d63ae403791 100644 --- a/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -28,7 +28,7 @@ assert sendEmailSupport -> perlSupport; assert svnSupport -> perlSupport; let - version = "2.38.0"; + version = "2.38.1"; svn = subversionClient.override { perlBindings = perlSupport; }; gitwebPerlLibs = with perlPackages; [ CGI HTMLParser CGIFast FCGI FCGIProcManager HTMLTagCloud ]; in @@ -41,7 +41,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz"; - sha256 = "sha256-kj6t4msYFN540GvajgqfXai3xLMEs/kFD/tGTwMQMgo="; + sha256 = "sha256-l9346liiueD7wlCOJFAoynWRG9ONFVFhaxSMGqV0Ctk="; }; outputs = [ "out" ] ++ lib.optional withManual "doc"; @@ -207,6 +207,7 @@ stdenv.mkDerivation (finalAttrs: { # Also put git-http-backend into $PATH, so that we can use smart # HTTP(s) transports for pushing ln -s $out/libexec/git-core/git-http-backend $out/bin/git-http-backend + ln -s $out/share/git/contrib/git-jump/git-jump $out/bin/git-jump '' + lib.optionalString perlSupport '' # wrap perl commands makeWrapper "$out/share/git/contrib/credential/netrc/git-credential-netrc.perl" $out/bin/git-credential-netrc \ diff --git a/pkgs/applications/version-management/git-and-tools/gitnuro/default.nix b/pkgs/applications/version-management/git-and-tools/gitnuro/default.nix new file mode 100644 index 000000000000..7c0dbefc5069 --- /dev/null +++ b/pkgs/applications/version-management/git-and-tools/gitnuro/default.nix @@ -0,0 +1,56 @@ +{ lib +, stdenv +, fetchurl +, makeWrapper +, copyDesktopItems +, makeDesktopItem +, jre +}: + +stdenv.mkDerivation rec { + pname = "gitnuro"; + version = "1.1.0"; + + src = fetchurl { + url = "https://github.com/JetpackDuba/Gitnuro/releases/download/v${version}/Gitnuro-linux-${version}.jar"; + hash = "sha256-tAFFl14mmXhLr6V/vTDe9lwX7trsaTWgIqkwxD3mBUw="; + }; + + icon = fetchurl { + url = "https://raw.githubusercontent.com/JetpackDuba/Gitnuro/4cfc45069c176f807d9bfb1a7cba410257078d3c/icons/logo.svg"; + hash = "sha256-QGJcWTSJesIpDArOWiS3Kn1iznzeMFzvqS+CuNXh3as="; + }; + + dontUnpack = true; + + nativeBuildInputs = [ + makeWrapper + copyDesktopItems + ]; + + installPhase = '' + runHook preInstall + makeWrapper ${jre}/bin/java $out/bin/gitnuro --add-flags "-jar $src" + install -Dm444 $icon $out/share/icons/hicolor/scalable/apps/com.jetpackduba.Gitnuro.svg + runHook postInstall + ''; + + desktopItems = [ + (makeDesktopItem { + name = "Gitnuro"; + exec = "gitnuro"; + icon = "com.jetpackduba.Gitnuro"; + desktopName = "Gitnuro"; + categories = [ "Development" ]; + comment = meta.description; + }) + ]; + + meta = with lib; { + description = "A FOSS Git multiplatform client based on Compose and JGit"; + homepage = "https://gitnuro.jetpackduba.com"; + license = licenses.gpl3Plus; + platforms = platforms.unix; + maintainers = with maintainers; [ zendo ]; + }; +} diff --git a/pkgs/applications/version-management/git-and-tools/lefthook/default.nix b/pkgs/applications/version-management/git-and-tools/lefthook/default.nix index 7e84a9815d16..f5cf94629e62 100644 --- a/pkgs/applications/version-management/git-and-tools/lefthook/default.nix +++ b/pkgs/applications/version-management/git-and-tools/lefthook/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "lefthook"; - version = "1.1.3"; + version = "1.2.0"; src = fetchFromGitHub { rev = "v${version}"; owner = "evilmartians"; repo = "lefthook"; - sha256 = "sha256-TV7ogO7mfRMpLekRAedJsdRJUBbPyxPO9MCoGg6uCno="; + sha256 = "sha256-mkGyY50WBmVbZ9FEfZRWoGLeZy0HkBzYACbF2u8EN1o="; }; vendorSha256 = "sha256-NTZz0EDIjGdh8dD9jxbNVdWb7NFJsdtnMp7H6Ni0EbQ="; diff --git a/pkgs/applications/version-management/git-repo/default.nix b/pkgs/applications/version-management/git-repo/default.nix index 809ca5eaae51..ddbbc1d1e4f3 100644 --- a/pkgs/applications/version-management/git-repo/default.nix +++ b/pkgs/applications/version-management/git-repo/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "git-repo"; - version = "2.29.5"; + version = "2.29.9"; src = fetchFromGitHub { owner = "android"; repo = "tools_repo"; rev = "v${version}"; - sha256 = "sha256-eMuQ0cVVbLvpDsGCob8s7D1Q+52Q2gOHTg7anP5KVAc="; + sha256 = "sha256-MJMVKdftA4PZ5vmrekcKAKX+0khHl3e83SXsn+P7VT8="; }; # Fix 'NameError: name 'ssl' is not defined' diff --git a/pkgs/applications/version-management/gitlab/data.json b/pkgs/applications/version-management/gitlab/data.json index a5eb46d834af..693b7adf46b8 100644 --- a/pkgs/applications/version-management/gitlab/data.json +++ b/pkgs/applications/version-management/gitlab/data.json @@ -1,15 +1,15 @@ { - "version": "15.4.2", - "repo_hash": "sha256-KGVZrfrzfIn2ZQJ42FisLvjIGg0+QOnzfjCR6mQHjlM=", + "version": "15.4.4", + "repo_hash": "sha256-iIgN1j02Lr/RtNeopqs6ndFqw8YIU2F6c49RGWvpmgc=", "yarn_hash": "1r33qrvwf2wmq5c1d2awk9qhk9nzvafqn3drdvnczfv43sda4lg8", "owner": "gitlab-org", "repo": "gitlab", - "rev": "v15.4.2-ee", + "rev": "v15.4.4-ee", "passthru": { - "GITALY_SERVER_VERSION": "15.4.2", + "GITALY_SERVER_VERSION": "15.4.4", "GITLAB_PAGES_VERSION": "1.62.0", "GITLAB_SHELL_VERSION": "14.10.0", - "GITLAB_WORKHORSE_VERSION": "15.4.2" + "GITLAB_WORKHORSE_VERSION": "15.4.4" }, "vendored_gems": [ "bundler-checksum", diff --git a/pkgs/applications/version-management/gitlab/gitaly/default.nix b/pkgs/applications/version-management/gitlab/gitaly/default.nix index 32786117c213..44a8218e1fbc 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/default.nix +++ b/pkgs/applications/version-management/gitlab/gitaly/default.nix @@ -11,7 +11,7 @@ let gemdir = ./.; }; - version = "15.4.2"; + version = "15.4.4"; package_version = "v${lib.versions.major version}"; gitaly_package = "gitlab.com/gitlab-org/gitaly/${package_version}"; @@ -22,7 +22,7 @@ let owner = "gitlab-org"; repo = "gitaly"; rev = "v${version}"; - sha256 = "sha256-DBAQ1dJLQ+Xno4e/n1jvgKiHAol/uTMjx6RtZIBwM3w="; + sha256 = "sha256-b8ChQYaj+7snlrLP4P9FIUSIq/SNMh9hFlFajOPcBEU="; }; vendorSha256 = "sha256-CUFYHjmOfosM3mfw0qEY+AQcR8U3J/1lU2Ml6wSZ/QM="; diff --git a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix index 5b6617e0ab70..2042b6c2bcef 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 = "15.4.2"; + version = "15.4.4"; src = fetchFromGitLab { owner = data.owner; diff --git a/pkgs/applications/version-management/gitoxide/default.nix b/pkgs/applications/version-management/gitoxide/default.nix index b4182927b7d8..9e513fd9676a 100644 --- a/pkgs/applications/version-management/gitoxide/default.nix +++ b/pkgs/applications/version-management/gitoxide/default.nix @@ -12,16 +12,16 @@ rustPlatform.buildRustPackage rec { pname = "gitoxide"; - version = "0.16.0"; + version = "0.17.0"; src = fetchFromGitHub { owner = "Byron"; repo = "gitoxide"; rev = "v${version}"; - sha256 = "sha256-4Yk3WXkm8jdabEisGKqVQlzjFrrf3pskRmuPa5K4vw4="; + sha256 = "sha256-UtQ9LcGE9mLowttAAwR1ujD+BSCosFk+GHQvDwG/CAQ="; }; - cargoSha256 = "sha256-mX58cb1Ywr7npmxgynDQ1x1PmO/62Bd+bONdv/Y1I2Q="; + cargoSha256 = "sha256-0cZy7hOaREtdFB0Ww1VSV4ILpB0utSBcKlC3t9fhum8="; nativeBuildInputs = [ cmake pkg-config ]; buildInputs = if stdenv.isDarwin diff --git a/pkgs/applications/version-management/got/default.nix b/pkgs/applications/version-management/got/default.nix index b70fe634cb1e..00b49f2957ad 100644 --- a/pkgs/applications/version-management/got/default.nix +++ b/pkgs/applications/version-management/got/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "got"; - version = "0.77"; + version = "0.79"; src = fetchurl { url = "https://gameoftrees.org/releases/portable/got-portable-${version}.tar.gz"; - sha256 = "sha256-/O9u7Ei6f0rGr7LRWcG9FUQd7Z+qpq2/6H01jNR1C7o="; + sha256 = "sha256-eL4cCpBRhO0ctQZGg1n6+H5O6GhRKRsWcEOcRr+z2Hw="; }; nativeBuildInputs = [ pkg-config bison ]; diff --git a/pkgs/applications/version-management/mercurial/default.nix b/pkgs/applications/version-management/mercurial/default.nix index feb1063503ff..b3af90c2a38e 100644 --- a/pkgs/applications/version-management/mercurial/default.nix +++ b/pkgs/applications/version-management/mercurial/default.nix @@ -21,11 +21,11 @@ let self = python3Packages.buildPythonApplication rec { pname = "mercurial${lib.optionalString fullBuild "-full"}"; - version = "6.2.3"; + version = "6.3.0"; src = fetchurl { url = "https://mercurial-scm.org/release/mercurial-${version}.tar.gz"; - sha256 = "sha256-mNGuAC9orfU9ZcWUf+i3o3n5jPBdm46h9Ad9LKXc6ds="; + sha256 = "sha256-iAOZtVSh3mQQFs5fNbiEDXXxjWh7mrHDWNrAWK1m5pg="; }; format = "other"; @@ -35,7 +35,7 @@ let cargoDeps = if rustSupport then rustPlatform.fetchCargoTarball { inherit src; name = "mercurial-${version}"; - sha256 = "sha256-UWYXVPdEMITLNdBjnoo8IuLOGZiwUJL+dqSl26nf5qs="; + sha256 = "sha256-VfIZ1bV8bhjjBL4KNjToPuu8gg9TkChziH2rRKhdRXE="; sourceRoot = "mercurial-${version}/rust"; } else null; cargoRoot = if rustSupport then "rust" else null; @@ -149,9 +149,6 @@ let # doesn't like the extra setlocale warnings emitted by our bash wrappers test-locale.t - # Python 3.10 error message change https://bz.mercurial-scm.org/show_bug.cgi?id=6643 - test-http-bad-server.t - # Python 3.10-3.12 deprecation warning: distutils # https://bz.mercurial-scm.org/show_bug.cgi?id=6729 test-hghave.t @@ -159,6 +156,10 @@ let # Python 3.10-3.12 deprecation warning: asyncore # https://bz.mercurial-scm.org/show_bug.cgi?id=6727 test-patchbomb-tls.t + + # Test broken with recent versions of git due to default policy change + # https://foss.heptapod.net/mercurial/mercurial-devel/-/merge_requests/302 + test-convert-git.t EOF export HGTEST_REAL_HG="${mercurial}/bin/hg" diff --git a/pkgs/applications/version-management/sourcehut/builds.nix b/pkgs/applications/version-management/sourcehut/builds.nix index 1655ad28aaf9..20d4d463a093 100644 --- a/pkgs/applications/version-management/sourcehut/builds.nix +++ b/pkgs/applications/version-management/sourcehut/builds.nix @@ -1,6 +1,5 @@ { lib , fetchFromSourcehut -, fetchpatch , buildGoModule , buildPythonPackage , srht @@ -13,36 +12,27 @@ , unzip }: let - version = "0.82.8"; + version = "0.83.0"; src = fetchFromSourcehut { owner = "~sircmpwn"; repo = "builds.sr.ht"; rev = version; - hash = "sha256-M94zkEUJU8EwksN34sd5IkASDCQ0hHb98G5wzZsCrpg="; + hash = "sha256-u/y+sYu/09LypWI/ngghbge5SvkuLQpray10j0SjlOo="; }; buildsrht-api = buildGoModule ({ inherit src version; pname = "buildsrht-api"; modRoot = "api"; - vendorHash = "sha256-8z5m4bMwLeYg4i91MMjLMqbciWvqS0icCHFUJTUHBgk="; - } // import ./fix-gqlgen-trimpath.nix { inherit unzip; }); + vendorHash = "sha256-DfVWr/4J4ZrhHpy9CXPaAQcbag/9FmDgiexcNo0lEsk="; + } // import ./fix-gqlgen-trimpath.nix { inherit unzip; gqlgenVersion= "0.17.20"; }); buildsrht-worker = buildGoModule { inherit src version; sourceRoot = "source/worker"; pname = "buildsrht-worker"; vendorHash = "sha256-y5RFPbtaGmgPpiV2Q3njeWORGZF1TJRjAbY6VgC1hek="; - - patches = [ - (fetchpatch { - name = "update-x-sys-for-go-1.18-on-aarch64-darwin.patch"; - url = "https://git.sr.ht/~sircmpwn/builds.sr.ht/commit/f58bbde6bfed7d2321a3b17e991c91fc83d4c230.patch"; - stripLen = 1; - hash = "sha256-vQR/T5G5Gz5tY+SEZZabsbnFKW44b+Bs+GDdydyeCDs="; - }) - ]; }; in buildPythonPackage rec { @@ -54,8 +44,6 @@ buildPythonPackage rec { --replace "all: api worker" "" ''; - nativeBuildInputs = srht.nativeBuildInputs; - propagatedBuildInputs = [ srht redis diff --git a/pkgs/applications/version-management/sourcehut/core.nix b/pkgs/applications/version-management/sourcehut/core.nix index ff56c62c62e9..e31bc13c82ae 100644 --- a/pkgs/applications/version-management/sourcehut/core.nix +++ b/pkgs/applications/version-management/sourcehut/core.nix @@ -52,7 +52,7 @@ buildPythonPackage rec { patches/redis-socket/core/0001-Fix-Unix-socket-support-in-RedisQueueCollector.patch ]; - nativeBuildInputs = [ + propagatedNativeBuildInputs = [ sassc nodejs ]; diff --git a/pkgs/applications/version-management/sourcehut/default.nix b/pkgs/applications/version-management/sourcehut/default.nix index d5c8a97a5f89..2189e54ce3ca 100644 --- a/pkgs/applications/version-management/sourcehut/default.nix +++ b/pkgs/applications/version-management/sourcehut/default.nix @@ -22,7 +22,6 @@ let listssrht = self.callPackage ./lists.nix { }; mansrht = self.callPackage ./man.nix { }; metasrht = self.callPackage ./meta.nix { }; - pagessrht = self.callPackage ./pages.nix { }; pastesrht = self.callPackage ./paste.nix { }; todosrht = self.callPackage ./todo.nix { }; @@ -41,7 +40,7 @@ with python.pkgs; recurseIntoAttrs { listssrht = toPythonApplication listssrht; mansrht = toPythonApplication mansrht; metasrht = toPythonApplication metasrht; - pagessrht = pagessrht; + pagessrht = callPackage ./pages.nix { }; pastesrht = toPythonApplication pastesrht; todosrht = toPythonApplication todosrht; passthru.tests = { diff --git a/pkgs/applications/version-management/sourcehut/dispatch.nix b/pkgs/applications/version-management/sourcehut/dispatch.nix index a2da28404ac9..05ed0450e000 100644 --- a/pkgs/applications/version-management/sourcehut/dispatch.nix +++ b/pkgs/applications/version-management/sourcehut/dispatch.nix @@ -18,8 +18,6 @@ buildPythonPackage rec { sha256 = "sha256-bZ4ZKohMozZIyP0TUgxETOECib4XGUv29+Mg8ZsoMf8="; }; - nativeBuildInputs = srht.nativeBuildInputs; - propagatedBuildInputs = [ srht pyyaml diff --git a/pkgs/applications/version-management/sourcehut/git.nix b/pkgs/applications/version-management/sourcehut/git.nix index 1f76e5cb65f8..5d7478b9440b 100644 --- a/pkgs/applications/version-management/sourcehut/git.nix +++ b/pkgs/applications/version-management/sourcehut/git.nix @@ -63,8 +63,6 @@ buildPythonPackage rec { --replace "all: api gitsrht-dispatch gitsrht-keys gitsrht-shell gitsrht-update-hook" "" ''; - nativeBuildInputs = srht.nativeBuildInputs; - propagatedBuildInputs = [ srht pygit2 diff --git a/pkgs/applications/version-management/sourcehut/hg.nix b/pkgs/applications/version-management/sourcehut/hg.nix index c1470c3fc5c6..eb8fa966242a 100644 --- a/pkgs/applications/version-management/sourcehut/hg.nix +++ b/pkgs/applications/version-management/sourcehut/hg.nix @@ -41,8 +41,6 @@ buildPythonPackage rec { vendorSha256 = "sha256-7ti8xCjSrxsslF7/1X/GY4FDl+69hPL4UwCDfjxmJLU="; }; - nativeBuildInputs = srht.nativeBuildInputs; - propagatedBuildInputs = [ srht hglib diff --git a/pkgs/applications/version-management/sourcehut/hub.nix b/pkgs/applications/version-management/sourcehut/hub.nix index 75d9efe5bd93..c3a9c509f893 100644 --- a/pkgs/applications/version-management/sourcehut/hub.nix +++ b/pkgs/applications/version-management/sourcehut/hub.nix @@ -2,6 +2,7 @@ , fetchFromSourcehut , buildPythonPackage , srht +, pyyaml }: buildPythonPackage rec { @@ -15,10 +16,9 @@ buildPythonPackage rec { sha256 = "sha256-4n6oQ+AAvdJY/5KflxAp62chjyrlSUkmt319DKZk33w="; }; - nativeBuildInputs = srht.nativeBuildInputs; - propagatedBuildInputs = [ srht + pyyaml ]; preBuild = '' diff --git a/pkgs/applications/version-management/sourcehut/lists.nix b/pkgs/applications/version-management/sourcehut/lists.nix index d981598a7b19..e4b366b01ed6 100644 --- a/pkgs/applications/version-management/sourcehut/lists.nix +++ b/pkgs/applications/version-management/sourcehut/lists.nix @@ -28,15 +28,13 @@ buildPythonPackage rec { pname = "listssrht-api"; modRoot = "api"; vendorSha256 = "sha256-xnmMkRSokbhWD+kz0XQ9AinYdm6/50FRBISURPvlzD0="; - } // import ./fix-gqlgen-trimpath.nix { inherit unzip;}); + } // import ./fix-gqlgen-trimpath.nix { inherit unzip; }); postPatch = '' substituteInPlace Makefile \ --replace "all: api" "" ''; - nativeBuildInputs = srht.nativeBuildInputs; - propagatedBuildInputs = [ srht pygit2 diff --git a/pkgs/applications/version-management/sourcehut/man.nix b/pkgs/applications/version-management/sourcehut/man.nix index 530101d57352..dadc508edd86 100644 --- a/pkgs/applications/version-management/sourcehut/man.nix +++ b/pkgs/applications/version-management/sourcehut/man.nix @@ -17,8 +17,6 @@ buildPythonPackage rec { sha256 = "sha256-5xZH6DrTXMdWd26OGICp7lZ/QDjACIa7zNUJHB7jzGo="; }; - nativeBuildInputs = srht.nativeBuildInputs; - propagatedBuildInputs = [ srht pygit2 diff --git a/pkgs/applications/version-management/sourcehut/meta.nix b/pkgs/applications/version-management/sourcehut/meta.nix index 4572fc81b288..205409bb4d94 100644 --- a/pkgs/applications/version-management/sourcehut/meta.nix +++ b/pkgs/applications/version-management/sourcehut/meta.nix @@ -19,21 +19,21 @@ , unzip }: let - version = "0.58.18"; + version = "0.61.3"; src = fetchFromSourcehut { owner = "~sircmpwn"; repo = "meta.sr.ht"; rev = version; - sha256 = "sha256-OjbQHAzG2nZwpJUIvhKaCJWZbhZDC2R6C+SkbKUpk8o="; + hash = "sha256-wMcpdRSRvxYEV163mdTGOemk62gljua89SOtwe6qGXU="; }; metasrht-api = buildGoModule ({ inherit src version; pname = "metasrht-api"; modRoot = "api"; - vendorSha256 = "sha256-kiEuEYZFbwJ6SbKFtxH4SiRaZmqYriRHPoHdTX28+d0="; - } // import ./fix-gqlgen-trimpath.nix { inherit unzip; }); + vendorHash = "sha256-ZoDRGmGe9o5pn89gJ60wjSp5Cc0yxRfvdhNnbwAhmSI="; + } // import ./fix-gqlgen-trimpath.nix { inherit unzip; gqlgenVersion = "0.17.20"; }); in buildPythonPackage rec { @@ -45,8 +45,6 @@ buildPythonPackage rec { --replace "all: api" "" ''; - nativeBuildInputs = srht.nativeBuildInputs; - propagatedBuildInputs = [ pgpy srht diff --git a/pkgs/applications/version-management/sourcehut/paste.nix b/pkgs/applications/version-management/sourcehut/paste.nix index e31473bd3436..253ea8c0b9d6 100644 --- a/pkgs/applications/version-management/sourcehut/paste.nix +++ b/pkgs/applications/version-management/sourcehut/paste.nix @@ -22,8 +22,6 @@ buildPythonPackage rec { --replace "all: api" "" ''; - nativeBuildInputs = srht.nativeBuildInputs; - propagatedBuildInputs = [ srht pyyaml diff --git a/pkgs/applications/version-management/sourcehut/scm.nix b/pkgs/applications/version-management/sourcehut/scm.nix index 49eea05a7a7a..1edc951cbed8 100644 --- a/pkgs/applications/version-management/sourcehut/scm.nix +++ b/pkgs/applications/version-management/sourcehut/scm.nix @@ -18,8 +18,6 @@ buildPythonPackage rec { sha256 = "sha256-iSzzyI8HZOpOb4dyt520MV/wds14fNag2+UOF09KS7w="; }; - nativeBuildInputs = srht.nativeBuildInputs; - propagatedBuildInputs = [ srht redis diff --git a/pkgs/applications/version-management/sourcehut/todo.nix b/pkgs/applications/version-management/sourcehut/todo.nix index 0278fb6bd173..b6e4f8c33110 100644 --- a/pkgs/applications/version-management/sourcehut/todo.nix +++ b/pkgs/applications/version-management/sourcehut/todo.nix @@ -33,9 +33,7 @@ buildPythonPackage rec { pname = "todosrht-api"; modRoot = "api"; vendorSha256 = "sha256-LB1H4jwnvoEyaaYJ09NI/M6IkgZwRet/fkso6b9EPV0="; - } // import ./fix-gqlgen-trimpath.nix {inherit unzip;}); - - nativeBuildInputs = srht.nativeBuildInputs; + } // import ./fix-gqlgen-trimpath.nix { inherit unzip; }); propagatedBuildInputs = [ srht diff --git a/pkgs/applications/version-management/srvc/default.nix b/pkgs/applications/version-management/srvc/default.nix index 8e32b42912c0..7547d6d4051e 100644 --- a/pkgs/applications/version-management/srvc/default.nix +++ b/pkgs/applications/version-management/srvc/default.nix @@ -1,22 +1,30 @@ -{ lib, fetchFromGitHub, rustPlatform }: +{ lib, rustPlatform, fetchFromGitHub, stdenv, Security }: rustPlatform.buildRustPackage rec { pname = "srvc"; - version = "0.6.0"; + version = "0.8.0"; src = fetchFromGitHub { owner = "insilica"; repo = "rs-srvc"; rev = "v${version}"; - sha256 = "sha256-PBs86cvEacvCt/2JnURL4qKvXGXRZHWaGYrPUSsnt0I="; + sha256 = "sha256-2eEuKAMxxTwjDInpYcOlFJha5DTe0IrxT5rI6ymN0hc="; }; - cargoSha256 = "sha256-5CUbfI67gsINdHcxN8KbIN10Mu90rAU53DbmQ5QotWg="; + cargoSha256 = "sha256-nJM7/w4awbCZQysUOSTO6bfsBXO3agJRdp1RyRZhtUY="; + + # remove timeouts in tests to make them less flaky + patches = [ ./tests-no-timeout.patch ]; + + buildInputs = lib.optionals stdenv.isDarwin [ + Security + ]; meta = with lib; { description = "Sysrev version control"; homepage = "https://github.com/insilica/rs-srvc"; license = licenses.asl20; maintainers = with maintainers; [ john-shaffer ]; + mainProgram = "sr"; }; } diff --git a/pkgs/applications/version-management/srvc/tests-no-timeout.patch b/pkgs/applications/version-management/srvc/tests-no-timeout.patch new file mode 100644 index 000000000000..d353b9e5f44b --- /dev/null +++ b/pkgs/applications/version-management/srvc/tests-no-timeout.patch @@ -0,0 +1,36 @@ +--- a/tests/common/mod.rs ++++ b/tests/common/mod.rs +@@ -1,15 +1,13 @@ + #![allow(dead_code)] + + use std::path::PathBuf; +-use std::time::Duration; + + use assert_cmd::Command; + #[cfg(unix)] + use rexpect::session::PtySession; + +-pub fn cmd(timeout_millis: u64) -> Command { ++pub fn cmd(_: u64) -> Command { + let mut cmd = Command::cargo_bin(env!("CARGO_PKG_NAME")).unwrap(); +- cmd.timeout(Duration::from_millis(timeout_millis)); + cmd.env_remove("RUST_BACKTRACE"); + cmd + } +@@ -19,14 +17,14 @@ pub fn spawn( + dir: &str, + args: Vec<&str>, + timestamp_override: u64, +- timeout_millis: u64, ++ _: u64, + ) -> Result<PtySession, rexpect::errors::Error> { + let mut cmd = std::process::Command::new(env!("CARGO_BIN_EXE_sr")); + cmd.args(args); + cmd.current_dir(dir); + cmd.env("SR_TIMESTAMP_OVERRIDE", timestamp_override.to_string()); + cmd.env_remove("RUST_BACKTRACE"); +- Ok(rexpect::session::spawn_command(cmd, Some(timeout_millis))?) ++ rexpect::session::spawn_command(cmd, None) + } + + pub fn remove_sink(dir: &str) -> Result<(), std::io::Error> { diff --git a/pkgs/applications/version-management/sublime-merge/default.nix b/pkgs/applications/version-management/sublime-merge/default.nix index 5cbb4fe1ba9f..87ad6a287667 100644 --- a/pkgs/applications/version-management/sublime-merge/default.nix +++ b/pkgs/applications/version-management/sublime-merge/default.nix @@ -4,13 +4,13 @@ let common = opts: callPackage (import ./common.nix opts); in { sublime-merge = common { - buildVersion = "2077"; - x64sha256 = "6xgh/oSatTYHCnQEXiZAoHs3yI1iimLMtzCosBKBVp8="; + buildVersion = "2079"; + x64sha256 = "y4ocLXxxEkGaw9O/vhX9MJnc56QgK37YPJkUwK2YS0U="; } {}; sublime-merge-dev = common { - buildVersion = "2076"; - x64sha256 = "k43D+TqS1DImpJKzYuf3LqmsxF3XF9Fwqn2txL13xAA="; + buildVersion = "2078"; + x64sha256 = "33oJOnsOUr9W+OGMetafaGtXUa+CHxxLjmtDoZliw0k="; dev = true; } {}; } diff --git a/pkgs/applications/version-management/vcsh/default.nix b/pkgs/applications/version-management/vcsh/default.nix index 3f33edc95387..1fa100591832 100644 --- a/pkgs/applications/version-management/vcsh/default.nix +++ b/pkgs/applications/version-management/vcsh/default.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { pname = "vcsh"; - version = "2.0.4"; + version = "2.0.5"; src = fetchurl { url = "https://github.com/RichiH/vcsh/releases/download/v${version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-W/Ql2J9HTDQPu0el34mHVzqe85KGWLPph2sHyuEzPPI="; + sha256 = "0bf3gacbyxw75ksd8y6528kgk7mqx6grz40gfiffxa2ghsz1xl01"; }; nativeBuildInputs = [ |