diff options
author | Vladimír Čunát <v@cunat.cz> | 2022-10-08 10:20:07 +0200 |
---|---|---|
committer | Vladimír Čunát <v@cunat.cz> | 2022-10-08 10:20:07 +0200 |
commit | 6565abc264549742c9cddcb547506a2c245d6b2b (patch) | |
tree | 5e770f59e8665e8de346bcf41c41a353cd4e0f44 /pkgs/applications/version-management | |
parent | bc2ce9630aa6d0dc28105becb260988136cd9ef6 (diff) | |
parent | b078ae79375573c7af1f7952db3eae5e337e6572 (diff) |
Merge branch 'master' into staging-next
Diffstat (limited to 'pkgs/applications/version-management')
3 files changed, 8 insertions, 16 deletions
diff --git a/pkgs/applications/version-management/dvc/default.nix b/pkgs/applications/version-management/dvc/default.nix index b8361d8bd7035..6f1c4fe185773 100644 --- a/pkgs/applications/version-management/dvc/default.nix +++ b/pkgs/applications/version-management/dvc/default.nix @@ -23,7 +23,8 @@ python3.pkgs.buildPythonApplication rec { postPatch = '' substituteInPlace setup.cfg \ --replace "grandalf==0.6" "grandalf" \ - --replace "scmrepo==0.0.25" "scmrepo" + --replace "scmrepo==0.0.25" "scmrepo" \ + --replace "pathspec>=0.9.0,<0.10.0" "pathspec" substituteInPlace dvc/daemon.py \ --subst-var-by dvc "$out/bin/dcv" ''; diff --git a/pkgs/applications/version-management/git-and-tools/git-branchless/default.nix b/pkgs/applications/version-management/git-and-tools/git-branchless/default.nix index c6cd7079191d4..640be8547c02a 100644 --- a/pkgs/applications/version-management/git-and-tools/git-branchless/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-branchless/default.nix @@ -1,6 +1,5 @@ { lib , fetchFromGitHub -, fetchpatch , git , libiconv , ncurses @@ -15,24 +14,16 @@ rustPlatform.buildRustPackage rec { pname = "git-branchless"; - version = "0.5.0"; + version = "0.5.1"; src = fetchFromGitHub { owner = "arxanas"; repo = "git-branchless"; rev = "v${version}"; - sha256 = "sha256-jAc17poNTld3eptN1Vd1MOKS5iloMWkq3oZgpWBkGTY="; + sha256 = "sha256-xh+G9bKEL2ho1YrNVTLbCTxSWZtjEuEWutvYEFr2G/g="; }; - cargoPatches = [ - (fetchpatch { - name = "build-run-cargo-update"; - url = "https://github.com/arxanas/git-branchless/commit/0ac3f325520f79d15368aa9d14893ebc17313ab6.patch"; - sha256 = "sha256-S1kazUzvz3FzFpphSRhWiv/l2b/+zC9HtAl7ndq5aJA="; - }) - ]; - - cargoSha256 = "sha256-Lo/Q6OSIzWrRNiTGsOWRX+6FEcj4fk1kn7V9tw67UVo="; + cargoSha256 = "sha256-Zz1RQ/mhdIbPiw2StGtTiORXiJ2nVLyZakt1072ha6U="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/applications/version-management/mercurial/default.nix b/pkgs/applications/version-management/mercurial/default.nix index 261368272b3f3..a5c6dc8c27466 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.2"; + version = "6.2.3"; src = fetchurl { url = "https://mercurial-scm.org/release/mercurial-${version}.tar.gz"; - sha256 = "sha256-nvqdpfSXqHUKycSPpDHEq3IgnxNgGAxdSSDRMRsEIN8="; + sha256 = "sha256-mNGuAC9orfU9ZcWUf+i3o3n5jPBdm46h9Ad9LKXc6ds="; }; format = "other"; @@ -35,7 +35,7 @@ let cargoDeps = if rustSupport then rustPlatform.fetchCargoTarball { inherit src; name = "mercurial-${version}"; - sha256 = "sha256-hvjp45Iv+fjs8R5Q+k96chY5j0S2Vs6+VrXzMuc2Cwg="; + sha256 = "sha256-UWYXVPdEMITLNdBjnoo8IuLOGZiwUJL+dqSl26nf5qs="; sourceRoot = "mercurial-${version}/rust"; } else null; cargoRoot = if rustSupport then "rust" else null; |