diff options
author | Alyssa Ross <hi@alyssa.is> | 2020-05-12 14:45:39 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2020-05-12 14:56:01 +0000 |
commit | eb7dadee9c0f903f1152f8dd4165453bfa48ccf4 (patch) | |
tree | a6bd66dcbec895aae167465672af08a1ca70f089 /nixpkgs/pkgs/applications/version-management | |
parent | 3879b925f5dae3a0eb5c98b10c1ac5a0e4d729a3 (diff) | |
parent | 683c68232e91f76386db979c461d8fbe2a018782 (diff) | |
download | nixlib-eb7dadee9c0f903f1152f8dd4165453bfa48ccf4.tar nixlib-eb7dadee9c0f903f1152f8dd4165453bfa48ccf4.tar.gz nixlib-eb7dadee9c0f903f1152f8dd4165453bfa48ccf4.tar.bz2 nixlib-eb7dadee9c0f903f1152f8dd4165453bfa48ccf4.tar.lz nixlib-eb7dadee9c0f903f1152f8dd4165453bfa48ccf4.tar.xz nixlib-eb7dadee9c0f903f1152f8dd4165453bfa48ccf4.tar.zst nixlib-eb7dadee9c0f903f1152f8dd4165453bfa48ccf4.zip |
Merge commit '683c68232e91f76386db979c461d8fbe2a018782'
Diffstat (limited to 'nixpkgs/pkgs/applications/version-management')
36 files changed, 183 insertions, 121 deletions
diff --git a/nixpkgs/pkgs/applications/version-management/arch/default.nix b/nixpkgs/pkgs/applications/version-management/arch/default.nix index 2108afc51062..c161d8446acf 100644 --- a/nixpkgs/pkgs/applications/version-management/arch/default.nix +++ b/nixpkgs/pkgs/applications/version-management/arch/default.nix @@ -1,18 +1,19 @@ { stdenv, fetchurl, which, diffutils, gnupatch, gnutar }: stdenv.mkDerivation rec { - name = "tla-1.3.5"; - + pname = "tla"; + version = "1.3.5"; + src = fetchurl { - url = "ftp://ftp.gnu.org/old-gnu/gnu-arch/" + name + ".tar.gz"; + url = "https://ftp.gnu.org/old-gnu/gnu-arch/tla-${version}.tar.gz"; sha256 = "01mfzj1i6p4s8191cgd5850hds1zls88hkf9rb6qx1vqjv585aj0"; }; patches = [ ./configure-tmpdir.patch ]; - buildInputs = [which]; - - propagatedBuildInputs = [diffutils gnupatch gnutar]; + buildInputs = [ which ]; + + propagatedBuildInputs = [ diffutils gnupatch gnutar ]; # Instead of GNU Autoconf, tla uses Tom Lord's now # defunct `package-framework'. diff --git a/nixpkgs/pkgs/applications/version-management/git-and-tools/default.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/default.nix index 4d6b0511a2ab..c591ef554ee4 100644 --- a/nixpkgs/pkgs/applications/version-management/git-and-tools/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/default.nix @@ -173,6 +173,10 @@ let gitstatus = callPackage ./gitstatus { }; + gitui = callPackage ./gitui { + inherit (darwin.apple_sdk.frameworks) Security; + }; + grv = callPackage ./grv { }; hub = callPackage ./hub { }; diff --git a/nixpkgs/pkgs/applications/version-management/git-and-tools/delta/default.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/delta/default.nix index 7bdeae65899c..60950dc0465c 100644 --- a/nixpkgs/pkgs/applications/version-management/git-and-tools/delta/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/delta/default.nix @@ -1,20 +1,26 @@ -{ lib, fetchFromGitHub, rustPlatform, llvmPackages }: +{ lib, fetchFromGitHub, rustPlatform, llvmPackages, installShellFiles }: rustPlatform.buildRustPackage rec { pname = "delta"; - version = "0.0.18"; + version = "0.1.1"; src = fetchFromGitHub { owner = "dandavison"; repo = pname; rev = version; - sha256 = "0cpd60861k9nd2gbzyb2hg5npnkgvsnyrvv7mlm30vb1833gz94z"; + sha256 = "1b5ap468d0gvgwkx6wqxvayzda2xw95lymd0kl38nq1fc0ica6hk"; }; LLVM_CONFIG_PATH = "${llvmPackages.llvm}/bin/llvm-config"; LIBCLANG_PATH = "${llvmPackages.libclang.lib}/lib"; - cargoSha256 = "12gl50q5hf6nq571fqxfv61z4mwfjyw4jb2yqyqbsinwj2frwaxn"; + cargoSha256 = "07mjl751r9d88fnmnan0ip0m3vxqf51vq2y7k3g3yywcgasj9jgr"; + + nativeBuildInputs = [ installShellFiles ]; + + postInstall = '' + installShellCompletion --bash --name delta.bash completion/bash/completion.sh + ''; meta = with lib; { homepage = "https://github.com/dandavison/delta"; diff --git a/nixpkgs/pkgs/applications/version-management/git-and-tools/diff-so-fancy/default.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/diff-so-fancy/default.nix index ae064cb7b5ed..c073edaee7d8 100644 --- a/nixpkgs/pkgs/applications/version-management/git-and-tools/diff-so-fancy/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/diff-so-fancy/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "diff-so-fancy"; - version = "1.2.7"; + version = "1.3.0"; src = fetchFromGitHub { owner = "so-fancy"; repo = "diff-so-fancy"; rev = "v${version}"; - sha256 = "0y5cp236gi6h7llzai5d27086l4zz58mz1zs01r97xnnmjs9vw21"; + sha256 = "0aavxahzha2mms4vdwysk79pa6wzswpfwgsq2hwaxnaf66maahfl"; }; # Perl is needed here for patchShebangs diff --git a/nixpkgs/pkgs/applications/version-management/git-and-tools/gh/default.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/gh/default.nix index acd09f0d0c0d..597e0672073b 100644 --- a/nixpkgs/pkgs/applications/version-management/git-and-tools/gh/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/gh/default.nix @@ -2,19 +2,19 @@ buildGoModule rec { pname = "gh"; - version = "0.6.4"; + version = "0.7.0"; src = fetchFromGitHub { owner = "cli"; repo = "cli"; rev = "v${version}"; - sha256 = "0na8zfvcmdy968i47x6qd1jwfaphy5h18ff7ym5sxyia9a27yhf8"; + sha256 = "054mag8jgxkvx2f95ha10n45v4xv5lms69w76g95z18m62qhjcyl"; }; - modSha256 = "102v30wr9wmd6n20qdvgs5mp2s639pwbqqd71r8q52f42p694bi1"; + modSha256 = "0v33x9bnwjfg4425vralnsb4i22c0g1rcmaga9911v0i7d51k0fn"; buildFlagsArray = [ - "-ldflags=-X github.com/cli/cli/command.Version=${version}" + "-ldflags=-s -w -X github.com/cli/cli/command.Version=${version}" ]; subPackages = [ "cmd/gh" ]; diff --git a/nixpkgs/pkgs/applications/version-management/git-and-tools/git-gone/default.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/git-gone/default.nix index aaf22c940cb1..32350fa538db 100644 --- a/nixpkgs/pkgs/applications/version-management/git-and-tools/git-gone/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/git-gone/default.nix @@ -1,23 +1,27 @@ -{ stdenv, fetchFromGitHub, rustPlatform, pkgconfig, makeWrapper, openssl, git, libiconv, Security }: +{ stdenv, fetchFromGitHub, rustPlatform, pkgconfig, makeWrapper, openssl, git, libiconv, Security, installShellFiles }: rustPlatform.buildRustPackage rec { pname = "git-gone"; - version = "0.3.0"; + version = "0.3.2"; src = fetchFromGitHub { owner = "lunaryorn"; repo = pname; rev = "v${version}"; - sha256 = "05wlng563p9iy0ky3z23a4jakcix887fb45r7j2mk0fp5ykdjmzh"; + sha256 = "0zc4cb1dg30np5yc4ymkr894qs2bk0r123i302md00niayk4njyd"; }; - cargoSha256 = "1scp9rzn59akxsf9p48j1zq6clbwdyasnyi4j28nj03ghvdv2i33"; + cargoSha256 = "1d892889ml7sqyxzmjipq5fvizb4abqhmmn450qm7yam9fn5q5wf"; - nativeBuildInputs = [ pkgconfig makeWrapper ]; + nativeBuildInputs = [ pkgconfig makeWrapper installShellFiles ]; buildInputs = [ openssl ] ++ stdenv.lib.optionals stdenv.isDarwin [ libiconv Security ]; + postInstall = '' + installManPage git-gone.1 + ''; + postFixup = '' wrapProgram $out/bin/git-gone --prefix PATH : "${stdenv.lib.makeBinPath [ git ]}" ''; diff --git a/nixpkgs/pkgs/applications/version-management/git-and-tools/git-ignore/default.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/git-ignore/default.nix index 5c3b27ad614c..93d152baa003 100644 --- a/nixpkgs/pkgs/applications/version-management/git-and-tools/git-ignore/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/git-ignore/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, rustPlatform, pkgconfig, openssl, darwin }: +{ stdenv, fetchFromGitHub, installShellFiles, rustPlatform, pkgconfig, openssl, darwin }: with rustPlatform; @@ -15,7 +15,7 @@ buildRustPackage rec { cargoSha256 = "0vcg2pl0s329fr8p23pwdx2jy7qahbr7n337ib61f69aaxi1xmq0"; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig installShellFiles ]; buildInputs = [ openssl ] ++ stdenv.lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security @@ -23,8 +23,7 @@ buildRustPackage rec { outputs = [ "out" "man" ]; preFixup = '' - mkdir -p "$man/man/man1" - cp target/release/build/git-ignore-*/out/git-ignore.1 "$man/man/man1/" + installManPage $releaseDir/build/git-ignore-*/out/git-ignore.1 ''; meta = with stdenv.lib; { diff --git a/nixpkgs/pkgs/applications/version-management/git-and-tools/git-subtrac/default.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/git-subtrac/default.nix index 07c63ea0119b..a5097697a867 100644 --- a/nixpkgs/pkgs/applications/version-management/git-and-tools/git-subtrac/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/git-subtrac/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "git-subtrac"; - version = "0.01"; + version = "0.02"; src = fetchFromGitHub { owner = "apenwarr"; repo = pname; rev = "v${version}"; - sha256 = "1w6gd0x1902lzpqr74gsdrnxq36f6v14bv8h0vhlrfhbwbsih7n6"; + sha256 = "1nj950r38sxzrgw69m1xphm7a4km2g29iw2897gfx4wx57jl957k"; }; modSha256 = "147vzllp1gydk2156hif313vwykagrj35vaiqy1swqczxs7p9hhs"; diff --git a/nixpkgs/pkgs/applications/version-management/git-and-tools/git-trim/default.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/git-trim/default.nix index 0a3360b33b0d..d843cdc307c0 100644 --- a/nixpkgs/pkgs/applications/version-management/git-and-tools/git-trim/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/git-trim/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "git-trim"; - version = "0.3.1"; + version = "0.3.2"; src = fetchFromGitHub { owner = "foriequal0"; repo = pname; rev = "v${version}"; - sha256 = "06wni47s8yq274bh5f7bcy0sah23938kjiw5pdxnma5kwwnrccrr"; + sha256 = "079kavm3n776wvmy25jq1g4qdvmhh3d3x1vdpb1f6pw5rkky8lyw"; }; - cargoSha256 = "06ndja8212xy4rybh1117wijsyj70w4z8h6km538a7598s49vzdk"; + cargoSha256 = "1ii5l7z9avg0gzlaav2gnfbr8wkbp008i5rz6k6bs2sfqnpnn5k6"; nativeBuildInputs = [ pkg-config ]; diff --git a/nixpkgs/pkgs/applications/version-management/git-and-tools/git-workspace/default.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/git-workspace/default.nix index b93163e239ad..8894c4f0f7ad 100644 --- a/nixpkgs/pkgs/applications/version-management/git-and-tools/git-workspace/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/git-workspace/default.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "git-workspace"; - version = "0.5.0"; + version = "0.6.0"; src = fetchFromGitHub { owner = "orf"; repo = pname; rev = "v${version}"; - sha256 = "0pl5z0gx2ypkrgq7vj1cxj5iwj06vcd06x3b3nh0g7w7q7nl8pr4"; + sha256 = "0n025bnisg724d9pjcindxagj1ry63sxr0pplpkh2f2qffzm78pi"; }; - cargoSha256 = "1z4cb7rcb7ldj16xxynrjh4hg872rj39rbbp0vy15kdp3ifyi466"; + cargoSha256 = "0ikyp6pdlw2c1gr1n1snjbdmblm0fs5swx5awy36jskii99q6kr1"; buildInputs = with stdenv; lib.optional isDarwin Security; diff --git a/nixpkgs/pkgs/applications/version-management/git-and-tools/git/default.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/git/default.nix index ef6ebbe6813b..9c1a01f42ae8 100644 --- a/nixpkgs/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -21,7 +21,7 @@ assert sendEmailSupport -> perlSupport; assert svnSupport -> perlSupport; let - version = "2.26.1"; + version = "2.26.2"; svn = subversionClient.override { perlBindings = perlSupport; }; gitwebPerlLibs = with perlPackages; [ CGI HTMLParser CGIFast FCGI FCGIProcManager HTMLTagCloud ]; @@ -33,7 +33,7 @@ stdenv.mkDerivation { src = fetchurl { url = "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz"; - sha256 = "0s03ix9j1h0yychkh1l1cgpr1l9lwzn3rprl08rk8ii5ix02i0l8"; + sha256 = "0j685w6pzkn926z5nf5r8fij4ziipvw4c9yb0wc577nzf4j16rbd"; }; outputs = [ "out" ]; @@ -80,6 +80,8 @@ stdenv.mkDerivation { configureFlags = stdenv.lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ "ac_cv_fread_reads_directories=yes" "ac_cv_snprintf_returns_bogus=no" + "ac_cv_iconv_omits_bom=no" + "ac_cv_prog_CURL_CONFIG=${curl.dev}/bin/curl-config" ]; preBuild = '' @@ -333,6 +335,7 @@ stdenv.mkDerivation { homepage = "https://git-scm.com/"; description = "Distributed version control system"; license = stdenv.lib.licenses.gpl2; + changelog = "https://raw.githubusercontent.com/git/git/${version}/Documentation/RelNotes/${version}.txt"; longDescription = '' Git, a popular distributed version control system designed to @@ -340,6 +343,6 @@ stdenv.mkDerivation { ''; platforms = stdenv.lib.platforms.all; - maintainers = with stdenv.lib.maintainers; [ peti the-kenny wmertens globin ]; + maintainers = with stdenv.lib.maintainers; [ peti wmertens globin ]; }; } diff --git a/nixpkgs/pkgs/applications/version-management/git-and-tools/git/update.sh b/nixpkgs/pkgs/applications/version-management/git-and-tools/git/update.sh index d0bc413fb893..54574722b02b 100755 --- a/nixpkgs/pkgs/applications/version-management/git-and-tools/git/update.sh +++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/git/update.sh @@ -4,8 +4,8 @@ set -eu -o pipefail oldVersion="$(nix-instantiate --eval -E "with import ./. {}; lib.getVersion git" | tr -d '"')" -latestTag="$(git ls-remote --tags --sort="v:refname" git://github.com/git/git.git | grep -v '\{\}' | grep -v '\-rc' | tail -1 | sed 's|^.*/v\(.*\)|\1|')" -targetVersion="${1:-latestTag}" +latestTag="$(git ls-remote --tags --sort="v:refname" https://github.com/git/git.git | grep -v '\{\}' | grep -v '\-rc' | tail -1 | sed 's|^.*/v\(.*\)|\1|')" +targetVersion="${1:-$latestTag}" if [ ! "${oldVersion}" = "${targetVersion}" ]; then update-source-version git "${targetVersion}" diff --git a/nixpkgs/pkgs/applications/version-management/git-and-tools/gitstatus/default.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/gitstatus/default.nix index 26b736b8b6fa..eab382386ef6 100644 --- a/nixpkgs/pkgs/applications/version-management/git-and-tools/gitstatus/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/gitstatus/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation { pname = "gitstatus"; - version = "unstable-2020-03-15"; + version = "unstable-2020-04-21"; src = fetchFromGitHub { owner = "romkatv"; repo = "gitstatus"; - rev = "c07996bc3ea1912652f52a816b830a5a3ee9b49c"; - sha256 = "07s8hwx3i5mnafi2xfim44z3q2nsvlcibfdxj17w8mkjhfpywi00"; + rev = "3494f25b0b3b2eac241cf669d1fea2b49ea42fb3"; + sha256 = "0b4g14dkkgih6zps2w1krl9xf44ysj02617zj1k51z127v2lpm1f"; }; buildInputs = [ (callPackage ./romkatv_libgit2.nix {}) ]; diff --git a/nixpkgs/pkgs/applications/version-management/git-and-tools/gitui/default.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/gitui/default.nix new file mode 100644 index 000000000000..aebff6a07ab6 --- /dev/null +++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/gitui/default.nix @@ -0,0 +1,24 @@ +{ stdenv, rustPlatform, fetchFromGitHub, libiconv, Security }: + +rustPlatform.buildRustPackage rec { + pname = "gitui"; + version = "0.2.1"; + + src = fetchFromGitHub { + owner = "extrawurst"; + repo = pname; + rev = "v${version}"; + sha256 = "0ln959zsdn0w15kfyp5i4524hzzk23l31n9smi1md4jfj7jycbh1"; + }; + + cargoSha256 = "128g23pcccy07jcb4phlfag9ixh5fkwkaiyd7mxjh3wmhppjcx0i"; + + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ libiconv Security ]; + + meta = with stdenv.lib; { + description = "Blazing fast terminal-ui for git written in rust"; + homepage = "https://github.com/extrawurst/gitui"; + license = licenses.mit; + maintainers = with maintainers; [ filalex77 ]; + }; +} diff --git a/nixpkgs/pkgs/applications/version-management/git-and-tools/grv/default.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/grv/default.nix index 8c915762b6ef..64a4f8a823ce 100644 --- a/nixpkgs/pkgs/applications/version-management/git-and-tools/grv/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/grv/default.nix @@ -36,7 +36,7 @@ buildGoPackage { installPhase = '' runHook preInstall - install -D grv $bin/bin/grv + install -D grv $out/bin/grv runHook postInstall ''; diff --git a/nixpkgs/pkgs/applications/version-management/git-and-tools/hub/default.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/hub/default.nix index 8890cd5eb238..22ffd442fdc9 100644 --- a/nixpkgs/pkgs/applications/version-management/git-and-tools/hub/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/hub/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchFromGitHub, groff, utillinux }: +{ stdenv, buildGoPackage, fetchFromGitHub, groff, installShellFiles, utillinux }: buildGoPackage rec { pname = "hub"; @@ -16,7 +16,7 @@ buildGoPackage rec { sha256 = "1qjab3dpia1jdlszz3xxix76lqrm4zbmqzd9ymld7h06awzsg2vh"; }; - nativeBuildInputs = [ groff utillinux ]; + nativeBuildInputs = [ groff installShellFiles utillinux ]; postPatch = '' patchShebangs . @@ -24,20 +24,20 @@ buildGoPackage rec { postInstall = '' cd go/src/${goPackagePath} - install -D etc/hub.zsh_completion "$bin/share/zsh/site-functions/_hub" - install -D etc/hub.bash_completion.sh "$bin/share/bash-completion/completions/hub" - install -D etc/hub.fish_completion "$bin/share/fish/vendor_completions.d/hub.fish" + installShellCompletion --zsh --name _hub etc/hub.zsh_completion + installShellCompletion --bash --name hub etc/hub.bash_completion.sh + installShellCompletion --fish --name hub.fish etc/hub.fish_completion LC_ALL=C.UTF8 \ make man-pages - cp -vr --parents share/man/man[1-9]/*.[1-9] $bin/ + installManPage share/man/man[1-9]/*.[1-9] ''; meta = with stdenv.lib; { description = "Command-line wrapper for git that makes you better at GitHub"; license = licenses.mit; homepage = "https://hub.github.com/"; - maintainers = with maintainers; [ the-kenny globin ]; + maintainers = with maintainers; [ globin ]; platforms = with platforms; unix; }; } diff --git a/nixpkgs/pkgs/applications/version-management/git-and-tools/stgit/default.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/stgit/default.nix index d356991815e7..2cd4adce9397 100644 --- a/nixpkgs/pkgs/applications/version-management/git-and-tools/stgit/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/stgit/default.nix @@ -30,7 +30,6 @@ stdenv.mkDerivation { description = "A patch manager implemented on top of Git"; homepage = "http://procode.org/stgit/"; license = licenses.gpl2; - maintainers = with maintainers; [ the-kenny ]; platforms = platforms.unix; }; } diff --git a/nixpkgs/pkgs/applications/version-management/git-and-tools/svn-all-fast-export/default.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/svn-all-fast-export/default.nix index fc33478964f6..75f6a9608412 100644 --- a/nixpkgs/pkgs/applications/version-management/git-and-tools/svn-all-fast-export/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/svn-all-fast-export/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, qmake, qtbase, qttools, subversion, apr }: let - version = "1.0.17"; + version = "1.0.18"; in stdenv.mkDerivation { pname = "svn-all-fast-export"; @@ -11,7 +11,7 @@ stdenv.mkDerivation { owner = "svn-all-fast-export"; repo = "svn2git"; rev = version; - sha256 = "13gmrxh4i34scv51h9x38v8jqfjykbbd9w7zzqjnxzvzpzsczg9a"; + sha256 = "1b5yx2316hbyvw3v30vn1ljma9yd21nd59wis1gi34g92lgvqcd6"; }; nativeBuildInputs = [ qmake qttools ]; diff --git a/nixpkgs/pkgs/applications/version-management/git-and-tools/svn2git/default.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/svn2git/default.nix index 1683a9bea137..b61ae80bbee1 100644 --- a/nixpkgs/pkgs/applications/version-management/git-and-tools/svn2git/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/svn2git/default.nix @@ -34,8 +34,6 @@ stdenv.mkDerivation { homepage = "https://github.com/nirvdrum/svn2git"; description = "Tool for importing Subversion repositories into git"; license = stdenv.lib.licenses.mit; - - maintainers = [ stdenv.lib.maintainers.the-kenny ]; platforms = stdenv.lib.platforms.unix; }; } diff --git a/nixpkgs/pkgs/applications/version-management/git-and-tools/thicket/default.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/thicket/default.nix index 42819043d58b..4a02baa465c6 100644 --- a/nixpkgs/pkgs/applications/version-management/git-and-tools/thicket/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/thicket/default.nix @@ -1,9 +1,12 @@ { lib , fetchFromGitHub -, crystal +, crystal_0_33 }: -crystal.buildCrystalPackage rec { +let + crystal = crystal_0_33; + +in crystal.buildCrystalPackage rec { pname = "thicket"; version = "0.1.3"; @@ -14,13 +17,18 @@ crystal.buildCrystalPackage rec { sha256 = "0hkmmssiwipx373d0zw9a2yn72gqzqzcvwkqbs522m5adz6qmkzw"; }; + format = "shards"; + shardsFile = ./shards.nix; crystalBinaries.thicket.src = "src/thicket.cr"; + # there is one test that tries to clone a repo + doCheck = false; + meta = with lib; { description = "A better one-line git log"; homepage = "https://github.com/taylorthurlow/thicket"; license = licenses.mit; maintainers = with maintainers; [ filalex77 ]; }; -} \ No newline at end of file +} diff --git a/nixpkgs/pkgs/applications/version-management/git-lfs/1.nix b/nixpkgs/pkgs/applications/version-management/git-lfs/1.nix index 0e0d75b0919c..5b2a9906a4f8 100644 --- a/nixpkgs/pkgs/applications/version-management/git-lfs/1.nix +++ b/nixpkgs/pkgs/applications/version-management/git-lfs/1.nix @@ -4,7 +4,7 @@ buildGoPackage rec { pname = "git-lfs"; version = "1.5.6"; rev = "0d02fb7d9a1c599bbf8c55e146e2845a908e04e0"; - + goPackagePath = "github.com/git-lfs/git-lfs"; src = fetchFromGitHub { @@ -14,8 +14,7 @@ buildGoPackage rec { sha256 = "0wddry1lqjccf4522fvhx6grx8h57xsz17lkaf5aybnrgw677w3d"; }; - # Tests fail with 'lfstest-gitserver.go:46: main redeclared in this block' - excludedPackages = [ "test" ]; + subPackages = [ "." ]; preBuild = '' pushd go/src/github.com/git-lfs/git-lfs @@ -23,9 +22,6 @@ buildGoPackage rec { popd ''; - postInstall = '' - rm -v $bin/bin/{man,script} - ''; meta = with stdenv.lib; { description = "Git extension for versioning large files"; homepage = "https://git-lfs.github.com/"; diff --git a/nixpkgs/pkgs/applications/version-management/git-lfs/default.nix b/nixpkgs/pkgs/applications/version-management/git-lfs/default.nix index eca841350deb..80f236559f9e 100644 --- a/nixpkgs/pkgs/applications/version-management/git-lfs/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-lfs/default.nix @@ -1,24 +1,36 @@ -{ stdenv, buildGoModule, fetchFromGitHub }: +{ stdenv, buildGoPackage, fetchFromGitHub, ronn, installShellFiles }: -buildGoModule rec { +buildGoPackage rec { pname = "git-lfs"; - version = "2.10.0"; + version = "2.11.0"; src = fetchFromGitHub { rev = "v${version}"; owner = "git-lfs"; repo = "git-lfs"; - sha256 = "1y5ryk0iz5g5sqaw79ml6fr5kvjgzcah481pk5qmnb2ipb1xlng9"; + sha256 = "05qd96bn2cl7gn5qarbcv6scdpj28qiwdfzalamqk5jjiidpmng5"; }; - modSha256 = "1rvvgyg4gqbli4pwfnmyz59gf14k7925mdqj6ykp542gwnsjgjp2"; + goPackagePath = "github.com/git-lfs/git-lfs"; + + nativeBuildInputs = [ ronn installShellFiles ]; + + buildFlagsArray = [ "-ldflags=-s -w -X ${goPackagePath}/config.Vendor=${version} -X ${goPackagePath}/config.GitCommit=${src.rev}" ]; subPackages = [ "." ]; + postBuild = '' + make -C go/src/${goPackagePath} man + ''; + + postInstall = '' + installManPage go/src/${goPackagePath}/man/*.{1,5} + ''; + meta = with stdenv.lib; { description = "Git extension for versioning large files"; homepage = "https://git-lfs.github.com/"; license = [ licenses.mit ]; - maintainers = [ maintainers.twey ]; + maintainers = [ maintainers.twey maintainers.marsam ]; }; } diff --git a/nixpkgs/pkgs/applications/version-management/git-repo/default.nix b/nixpkgs/pkgs/applications/version-management/git-repo/default.nix index e85d1f037d77..9488bb8ff78a 100644 --- a/nixpkgs/pkgs/applications/version-management/git-repo/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-repo/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "git-repo"; - version = "2.6"; + version = "2.7"; src = fetchFromGitHub { owner = "android"; repo = "tools_repo"; rev = "v${version}"; - sha256 = "16c30nwlgm0xcma9q34ygjsk6m33izmfgn7a0mzhfzyakymdi45g"; + sha256 = "19wn16m9sy8fv31zl90av5la60l5hsf5fvvfpgiy0470rkagvz6j"; }; patches = [ ./import-ssl-module.patch ]; diff --git a/nixpkgs/pkgs/applications/version-management/gitea/default.nix b/nixpkgs/pkgs/applications/version-management/gitea/default.nix index 570fb2ce56f4..34a3d804707e 100644 --- a/nixpkgs/pkgs/applications/version-management/gitea/default.nix +++ b/nixpkgs/pkgs/applications/version-management/gitea/default.nix @@ -1,5 +1,6 @@ { stdenv, buildGoPackage, fetchurl, makeWrapper , git, bash, gzip, openssh, pam +, fetchpatch , sqliteSupport ? true , pamSupport ? true }: @@ -8,11 +9,11 @@ with stdenv.lib; buildGoPackage rec { pname = "gitea"; - version = "1.11.4"; + version = "1.11.5"; src = fetchurl { url = "https://github.com/go-gitea/gitea/releases/download/v${version}/gitea-src-${version}.tar.gz"; - sha256 = "18k6kcdq0ijpzgay2aq1w95qkgfvrn1dgh4cxyj9c4i0pwb3ar7f"; + sha256 = "0iqxwg53wjwi4vpq2h6fwmniazsi4cf68fcjrs459qbz4d6x8xa9"; }; unpackPhase = '' @@ -22,7 +23,13 @@ buildGoPackage rec { sourceRoot = "source"; - patches = [ ./static-root-path.patch ]; + patches = [ + ./static-root-path.patch + (fetchpatch { + url = "https://github.com/go-gitea/gitea/commit/1830d0ed5f4a67e3360ecbb55933b5540b6affce.patch"; + sha256 = "163531pcki28qfs56l64vv4xxaavxgksf038da1sn21j5l2jm81i"; + }) + ]; postPatch = '' patchShebangs . @@ -44,7 +51,7 @@ buildGoPackage rec { ) ''; - outputs = [ "bin" "out" "data" ]; + outputs = [ "out" "data" ]; postInstall = '' mkdir $data @@ -52,7 +59,7 @@ buildGoPackage rec { mkdir -p $out cp -R ./go/src/${goPackagePath}/options/locale $out/locale - wrapProgram $bin/bin/gitea \ + wrapProgram $out/bin/gitea \ --prefix PATH : ${makeBinPath [ bash git gzip openssh ]} ''; diff --git a/nixpkgs/pkgs/applications/version-management/gitlab/data.json b/nixpkgs/pkgs/applications/version-management/gitlab/data.json index 8da56229a02c..d3f2db5e5ad2 100644 --- a/nixpkgs/pkgs/applications/version-management/gitlab/data.json +++ b/nixpkgs/pkgs/applications/version-management/gitlab/data.json @@ -1,13 +1,13 @@ { - "version": "12.8.8", - "repo_hash": "1y8flmssz8bp07v7x9gxazqn5889hvkxk0k6py773gdnna5fd5fb", + "version": "12.8.10", + "repo_hash": "1njkihj66d8fnk1l0r5pys38akf5srqlrgj2hzc68l5m8d51dk15", "owner": "gitlab-org", "repo": "gitlab", - "rev": "v12.8.8-ee", + "rev": "v12.8.10-ee", "passthru": { - "GITALY_SERVER_VERSION": "12.8.8", + "GITALY_SERVER_VERSION": "12.8.10", "GITLAB_PAGES_VERSION": "1.16.0", "GITLAB_SHELL_VERSION": "11.0.0", - "GITLAB_WORKHORSE_VERSION": "8.21.1" + "GITLAB_WORKHORSE_VERSION": "8.21.2" } } \ No newline at end of file diff --git a/nixpkgs/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock b/nixpkgs/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock index b41c78f3a3dc..0c125f5a0bf9 100644 --- a/nixpkgs/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock +++ b/nixpkgs/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock @@ -114,7 +114,7 @@ GEM minitest (5.14.0) msgpack (1.3.1) multipart-post (2.0.0) - nokogiri (1.10.7) + nokogiri (1.10.9) mini_portile2 (~> 2.4.0) nokogumbo (1.5.0) nokogiri diff --git a/nixpkgs/pkgs/applications/version-management/gitlab/gitaly/default.nix b/nixpkgs/pkgs/applications/version-management/gitlab/gitaly/default.nix index 45e7db5be8e3..7c84acc8f05f 100644 --- a/nixpkgs/pkgs/applications/version-management/gitlab/gitaly/default.nix +++ b/nixpkgs/pkgs/applications/version-management/gitlab/gitaly/default.nix @@ -28,14 +28,14 @@ let }; }); in buildGoPackage rec { - version = "12.8.8"; + version = "12.8.10"; pname = "gitaly"; src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitaly"; rev = "v${version}"; - sha256 = "182jqglzbzq8jnlq6l634125jkvi67pfr1xck68n4k09gyzqllxv"; + sha256 = "1vhnpyggh2ch93i75np11rjzvq8d6pwv2kzvwh7ak3fa02w9qdfs"; }; # Fix a check which assumes that hook files are writeable by their @@ -65,7 +65,7 @@ in buildGoPackage rec { "'/run/gitlab/shell-config.yml'" ''; - outputs = [ "bin" "out" "ruby" ]; + outputs = [ "out" "ruby" ]; meta = with stdenv.lib; { homepage = "https://gitlab.com/gitlab-org/gitaly"; diff --git a/nixpkgs/pkgs/applications/version-management/gitlab/gitaly/gemset.nix b/nixpkgs/pkgs/applications/version-management/gitlab/gitaly/gemset.nix index d91c84b1fa29..7719a90abb5d 100644 --- a/nixpkgs/pkgs/applications/version-management/gitlab/gitaly/gemset.nix +++ b/nixpkgs/pkgs/applications/version-management/gitlab/gitaly/gemset.nix @@ -515,10 +515,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0r0qpgf80h764k176yr63gqbs2z0xbsp8vlvs2a79d5r9vs83kln"; + sha256 = "12j76d0bp608932xkzmfi638c7aqah57l437q8494znzbj610qnm"; type = "gem"; }; - version = "1.10.7"; + version = "1.10.9"; }; nokogumbo = { dependencies = ["nokogiri"]; diff --git a/nixpkgs/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix b/nixpkgs/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix index 40860b13e4dc..2b4fddaa9c84 100644 --- a/nixpkgs/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix +++ b/nixpkgs/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix @@ -18,8 +18,8 @@ buildGoPackage rec { goDeps = ./deps.nix; postInstall = '' - cp -r "$NIX_BUILD_TOP/go/src/$goPackagePath"/bin/* $bin/bin - cp -r "$NIX_BUILD_TOP/go/src/$goPackagePath"/{support,VERSION} $bin/ + cp -r "$NIX_BUILD_TOP/go/src/$goPackagePath"/bin/* $out/bin + cp -r "$NIX_BUILD_TOP/go/src/$goPackagePath"/{support,VERSION} $out/ ''; meta = with stdenv.lib; { diff --git a/nixpkgs/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix b/nixpkgs/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix index 491dd868dd93..dda678335675 100644 --- a/nixpkgs/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix +++ b/nixpkgs/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix @@ -3,13 +3,13 @@ buildGoPackage rec { pname = "gitlab-workhorse"; - version = "8.21.1"; + version = "8.21.2"; src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-workhorse"; rev = "v${version}"; - sha256 = "1d384xw7hfrph4i61z9z315sik7ja9hgrvmhljirwxrch1fyx3m4"; + sha256 = "065yy8zfxahpybk3mbvc492by1lvssqcbqm8i4yp09m669rk239w"; }; goPackagePath = "gitlab.com/gitlab-org/gitlab-workhorse"; diff --git a/nixpkgs/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile b/nixpkgs/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile index 20c713e8c39d..e8a58a6d59bb 100644 --- a/nixpkgs/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile +++ b/nixpkgs/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile @@ -163,7 +163,7 @@ gem 'diffy', '~> 3.1.0' gem 'diff_match_patch', '~> 0.1.0' # Application server -gem 'rack', '~> 2.0.7' +gem 'rack', '~> 2.0.9' group :unicorn do gem 'unicorn', '~> 5.4.1' diff --git a/nixpkgs/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock b/nixpkgs/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock index a808e85e4337..4d7b3d32a6b8 100644 --- a/nixpkgs/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock +++ b/nixpkgs/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock @@ -173,7 +173,7 @@ GEM concord (0.1.5) adamantium (~> 0.2.0) equalizer (~> 0.0.9) - concurrent-ruby (1.1.5) + concurrent-ruby (1.1.6) connection_pool (2.2.2) contracts (0.11.0) cork (0.3.0) @@ -783,7 +783,7 @@ GEM public_suffix (4.0.3) pyu-ruby-sasl (0.0.3.3) raabro (1.1.6) - rack (2.0.7) + rack (2.0.9) rack-accept (0.4.5) rack (>= 0.4) rack-attack (6.2.0) @@ -854,17 +854,17 @@ GEM json recursive-open-struct (1.1.0) redis (4.1.3) - redis-actionpack (5.1.0) - actionpack (>= 4.0, < 7) - redis-rack (>= 1, < 3) + redis-actionpack (5.2.0) + actionpack (>= 5, < 7) + redis-rack (>= 2.1.0, < 3) redis-store (>= 1.1.0, < 2) redis-activesupport (5.2.0) activesupport (>= 3, < 7) redis-store (>= 1.3, < 2) redis-namespace (1.6.0) redis (>= 3.0.4) - redis-rack (2.0.6) - rack (>= 1.5, < 3) + redis-rack (2.1.2) + rack (>= 2.0.8, < 3) redis-store (>= 1.2, < 2) redis-rails (5.0.2) redis-actionpack (>= 5.0, < 6) @@ -1325,7 +1325,7 @@ DEPENDENCIES prometheus-client-mmap (~> 0.10.0) pry-byebug (~> 3.5.1) pry-rails (~> 0.3.9) - rack (~> 2.0.7) + rack (~> 2.0.9) rack-attack (~> 6.2.0) rack-cors (~> 1.0.6) rack-oauth2 (~> 1.9.3) diff --git a/nixpkgs/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix b/nixpkgs/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix index f92b72361df5..dec89c43a824 100644 --- a/nixpkgs/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix +++ b/nixpkgs/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix @@ -763,10 +763,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1x07r23s7836cpp5z9yrlbpljcxpax14yw4fy4bnp6crhr6x24an"; + sha256 = "094387x4yasb797mv07cs3g6f08y56virc2rjcpb1k79rzaj3nhl"; type = "gem"; }; - version = "1.1.5"; + version = "1.1.6"; }; connection_pool = { groups = ["default"]; @@ -3501,10 +3501,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0z90vflxbgjy2n84r7mbyax3i2vyvvrxxrf86ljzn5rw65jgnn2i"; + sha256 = "1mxzk12xylrz6d4n9jj5jasfscbf1pbk4idrb0nlf327lx9rwfkk"; type = "gem"; }; - version = "2.0.7"; + version = "2.0.9"; }; rack-accept = { dependencies = ["rack"]; @@ -3803,10 +3803,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1hvai5ygkyii9wq8h98wim8shgrm7vkv0js62zpm85vdl1xzvphz"; + sha256 = "0c2276zzc0044zh37a8frx1v7hnra7z7k126154ps7njbqngfdv3"; type = "gem"; }; - version = "5.1.0"; + version = "5.2.0"; }; redis-activesupport = { dependencies = ["activesupport" "redis-store"]; @@ -3836,10 +3836,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1pa19ydbk0l6wilwbxcjn6knfs4ffgj0rhaaldrlhf76pjgkaiqb"; + sha256 = "0ldw5sxyd80pv0gr89kvn6ziszlbs8lv1a573fkm6d0f11fps413"; type = "gem"; }; - version = "2.0.6"; + version = "2.1.2"; }; redis-rails = { dependencies = ["redis-actionpack" "redis-activesupport" "redis-store"]; diff --git a/nixpkgs/pkgs/applications/version-management/gitlab/update.py b/nixpkgs/pkgs/applications/version-management/gitlab/update.py index a2a3a6d05b7e..4c7bcefacb0d 100755 --- a/nixpkgs/pkgs/applications/version-management/gitlab/update.py +++ b/nixpkgs/pkgs/applications/version-management/gitlab/update.py @@ -1,5 +1,5 @@ #!/usr/bin/env nix-shell -#! nix-shell -i python3 -p bundix common-updater-scripts nix nix-prefetch-git python3 python3Packages.requests python3Packages.lxml python3Packages.click python3Packages.click-log vgo2nix yarn2nix +#! nix-shell -i python3 -p bundix bundler common-updater-scripts nix nix-prefetch-git python3 python3Packages.requests python3Packages.click python3Packages.click-log vgo2nix yarn2nix import click import click_log @@ -13,7 +13,6 @@ from distutils.version import LooseVersion from typing import Iterable import requests -from xml.etree import ElementTree logger = logging.getLogger(__name__) @@ -30,12 +29,11 @@ class GitLabRepo: @property def tags(self) -> Iterable[str]: - r = requests.get(self.url + "/tags?format=atom", stream=True) + r = requests.get(self.url + "/refs?sort=updated_desc&ref=master").json() + tags = r.get("Tags", []) - tree = ElementTree.fromstring(r.content) - versions = [e.text for e in tree.findall('{http://www.w3.org/2005/Atom}entry/{http://www.w3.org/2005/Atom}title')] # filter out versions not matching version_regex - versions = list(filter(self.version_regex.match, versions)) + versions = list(filter(self.version_regex.match, tags)) # sort, but ignore v and -ee for sorting comparisons versions.sort(key=lambda x: LooseVersion(x.replace("v", "").replace("-ee", "")), reverse=True) @@ -100,7 +98,7 @@ def cli(): @cli.command('update-data') -@click.option('--rev', default='latest', help='The rev to use, \'latest\' points to the latest (stable) tag') +@click.option('--rev', default='latest', help='The rev to use (vX.Y.Z-ee), or \'latest\'') def update_data(rev: str): """Update data.nix""" repo = GitLabRepo() @@ -135,6 +133,7 @@ def update_rubyenv(): with open(rubyenv_dir / fn, 'w') as f: f.write(repo.get_file(fn, rev)) + subprocess.check_output(['bundle', 'lock'], cwd=rubyenv_dir) subprocess.check_output(['bundix'], cwd=rubyenv_dir) @@ -174,6 +173,7 @@ def update_gitaly(): with open(gitaly_dir / fn, 'w') as f: f.write(repo.get_file(fn, f"v{gitaly_server_version}")) + subprocess.check_output(['bundle', 'lock'], cwd=gitaly_dir) subprocess.check_output(['bundix'], cwd=gitaly_dir) os.environ['GOROOT'] = "" @@ -227,10 +227,11 @@ def update_gitlab_workhorse(): os.unlink(gitlab_workhorse_dir / fn) @cli.command('update-all') +@click.option('--rev', default='latest', help='The rev to use (vX.Y.Z-ee), or \'latest\'') @click.pass_context -def update_all(ctx): +def update_all(ctx, rev: str): """Update all gitlab components to the latest stable release""" - ctx.invoke(update_data, rev='latest') + ctx.invoke(update_data, rev=rev) ctx.invoke(update_rubyenv) ctx.invoke(update_yarnpkgs) ctx.invoke(update_gitaly) diff --git a/nixpkgs/pkgs/applications/version-management/gogs/default.nix b/nixpkgs/pkgs/applications/version-management/gogs/default.nix index a35778ac023f..48667ad8be39 100644 --- a/nixpkgs/pkgs/applications/version-management/gogs/default.nix +++ b/nixpkgs/pkgs/applications/version-management/gogs/default.nix @@ -34,13 +34,13 @@ buildGoPackage rec { ( optional sqliteSupport "sqlite" ++ optional pamSupport "pam"); - outputs = [ "bin" "out" "data" ]; + outputs = [ "out" "data" ]; postInstall = '' mkdir $data cp -R $src/{public,templates} $data - wrapProgram $bin/bin/gogs \ + wrapProgram $out/bin/gogs \ --prefix PATH : ${makeBinPath [ bash git gzip openssh ]} ''; diff --git a/nixpkgs/pkgs/applications/version-management/mercurial/default.nix b/nixpkgs/pkgs/applications/version-management/mercurial/default.nix index 85c546147482..ffbd98791358 100644 --- a/nixpkgs/pkgs/applications/version-management/mercurial/default.nix +++ b/nixpkgs/pkgs/applications/version-management/mercurial/default.nix @@ -8,11 +8,11 @@ let in python3Packages.buildPythonApplication rec { pname = "mercurial"; - version = "5.3"; + version = "5.3.1"; src = fetchurl { url = "https://mercurial-scm.org/release/mercurial-${version}.tar.gz"; - sha256 = "1fgr8k2ra7hs2dm8048pw01anmd41as246a5vm4m2sb7dcfzczz5"; + sha256 = "1nbjpzjrzgql4hrvslpxwbcgn885ikq6ba1yb4w6p78rw9nzkhgp"; }; format = "other"; |