diff options
Diffstat (limited to 'nixpkgs/pkgs/applications/version-management')
20 files changed, 100 insertions, 165 deletions
diff --git a/nixpkgs/pkgs/applications/version-management/dvc/default.nix b/nixpkgs/pkgs/applications/version-management/dvc/default.nix deleted file mode 100644 index 1cfa62ea6d47..000000000000 --- a/nixpkgs/pkgs/applications/version-management/dvc/default.nix +++ /dev/null @@ -1,102 +0,0 @@ -{ lib -, python3 -, fetchFromGitHub -, fetchpatch -, enableGoogle ? false -, enableAWS ? false -, enableAzure ? false -, enableSSH ? false -}: - -python3.pkgs.buildPythonApplication rec { - pname = "dvc"; - version = "3.8.1"; - format = "pyproject"; - - src = fetchFromGitHub { - owner = "iterative"; - repo = pname; - rev = "refs/tags/${version}"; - hash = "sha256-ZHB2XAYjPwhCWHqq2Kro4CzDW34YBaknv9xBotCDkOw="; - }; - - pythonRelaxDeps = [ - "dvc-data" - "platformdirs" - ]; - - postPatch = '' - substituteInPlace dvc/analytics.py --replace 'enabled = not os.getenv(DVC_NO_ANALYTICS)' 'enabled = False' - substituteInPlace dvc/daemon.py \ - --subst-var-by dvc "$out/bin/dcv" - ''; - - nativeBuildInputs = with python3.pkgs; [ - pythonRelaxDepsHook - setuptools-scm - ]; - - propagatedBuildInputs = with python3.pkgs; [ - appdirs - colorama - configobj - distro - dpath - dvc-data - dvc-http - dvc-render - dvc-studio-client - dvc-task - flatten-dict - flufl_lock - funcy - grandalf - hydra-core - iterative-telemetry - networkx - packaging - pathspec - platformdirs - psutil - pydot - pygtrie - pyparsing - requests - rich - ruamel-yaml - scmrepo - shortuuid - shtab - tabulate - tomlkit - tqdm - typing-extensions - voluptuous - zc_lockfile - ] ++ lib.optionals enableGoogle [ - dvc-gs - ] ++ lib.optionals enableAWS [ - dvc-s3 - ] ++ lib.optionals enableAzure [ - dvc-azure - ] ++ lib.optionals enableSSH [ - dvc-ssh - ] ++ lib.optionals (pythonOlder "3.8") [ - importlib-metadata - ] ++ lib.optionals (pythonOlder "3.9") [ - importlib-resources - ]; - - # Tests require access to real cloud services - doCheck = false; - - pythonImportsCheck = [ "dvc" "dvc.api" ]; - - meta = with lib; { - description = "Version Control System for Machine Learning Projects"; - homepage = "https://dvc.org"; - changelog = "https://github.com/iterative/dvc/releases/tag/${version}"; - license = licenses.asl20; - maintainers = with maintainers; [ cmcdragonkai fab ]; - }; -} diff --git a/nixpkgs/pkgs/applications/version-management/dvc/dvc-daemon.patch b/nixpkgs/pkgs/applications/version-management/dvc/dvc-daemon.patch deleted file mode 100644 index 65ba630f3b80..000000000000 --- a/nixpkgs/pkgs/applications/version-management/dvc/dvc-daemon.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff --git a/dvc/daemon.py b/dvc/daemon.py -index 9854a0e1..fefdd613 100644 ---- a/dvc/daemon.py -+++ b/dvc/daemon.py -@@ -103,11 +103,8 @@ def daemon(args): - logger.debug("skipping launching a new daemon.") - return - -- cmd = ["daemon", "-q"] + args -- -- env = fix_env() -- file_path = os.path.abspath(inspect.stack()[0][1]) -- env["PYTHONPATH"] = os.path.dirname(os.path.dirname(file_path)) -+ cmd = [ "@dvc@" , "daemon", "-q"] + args -+ env = os.environ.copy() - env[DVC_DAEMON] = "1" - - _spawn(cmd, env) diff --git a/nixpkgs/pkgs/applications/version-management/gex/default.nix b/nixpkgs/pkgs/applications/version-management/gex/default.nix index 051b7dfdc924..31ea25cabb8c 100644 --- a/nixpkgs/pkgs/applications/version-management/gex/default.nix +++ b/nixpkgs/pkgs/applications/version-management/gex/default.nix @@ -1,26 +1,28 @@ { lib -, stdenv , rustPlatform , fetchFromGitHub , pkg-config -, libgit2 +, libgit2_1_6 }: rustPlatform.buildRustPackage rec { pname = "gex"; - version = "0.6.1"; + version = "0.6.2"; src = fetchFromGitHub { owner = "Piturnah"; repo = pname; rev = "v${version}"; - hash = "sha256-OCC2kHPHWFwqdE0THNZbH7d3gxTBD5MUMWY6PO5GuHU"; + hash = "sha256-iCK3fiVchbfQh5JPHzBN/b24dkoXKW5dJdCsyoG0Kvw="; }; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ libgit2 ]; - cargoHash = "sha256-28sMY47LAdaGmPNmxeu/w1Pn6AV3JlWbxFcit5pLkI0"; + buildInputs = [ + libgit2_1_6 + ]; + + cargoHash = "sha256-5w8VzYoevWesMGQJe4rDbugCFQrE1LDNb69CaJ2bQ0w="; meta = with lib; { description = "Git Explorer: cross-platform git workflow improvement tool inspired by Magit"; diff --git a/nixpkgs/pkgs/applications/version-management/git-bars/default.nix b/nixpkgs/pkgs/applications/version-management/git-bars/default.nix new file mode 100644 index 000000000000..de396a0f7d01 --- /dev/null +++ b/nixpkgs/pkgs/applications/version-management/git-bars/default.nix @@ -0,0 +1,25 @@ +{ stdenv, lib, fetchFromGitHub, python3Packages, git }: + +python3Packages.buildPythonApplication { + pname = "git-bars"; + version = "unstable-2023-08-08"; + + src = fetchFromGitHub { + owner = "knadh"; + repo = "git-bars"; + rev = "f15fbc15345d9ef021e5a9b278e352bb532dcee8"; + hash = "sha256-jHP6LqhUQv6hh97tSXAdOruWdtp2FXM6ANlpWoA+fHQ="; + }; + + propagatedBuildInputs = [ + git + python3Packages.setuptools + ]; + + meta = with lib; { + homepage = "https://github.com/knadh/git-bars"; + description = "A utility for visualising git commit activity as bars on the terminal"; + license = licenses.mit; + maintainers = [ maintainers.matthiasbeyer ]; + }; +} diff --git a/nixpkgs/pkgs/applications/version-management/git-codereview/default.nix b/nixpkgs/pkgs/applications/version-management/git-codereview/default.nix index e2d5c0e005a7..26c34e583027 100644 --- a/nixpkgs/pkgs/applications/version-management/git-codereview/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-codereview/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "git-codereview"; - version = "1.4.0"; + version = "1.5.0"; src = fetchFromGitHub { owner = "golang"; repo = "review"; rev = "v${version}"; - hash = "sha256-N6L+TlPU/lStMPTFYKFH2GiwyGkEJJuKtkH7wKLuM00="; + hash = "sha256-Dy7gHT6WmZ1TjA5s+VmOUkaRvrA9v7mWQSLPscgBHgY="; }; vendorHash = null; diff --git a/nixpkgs/pkgs/applications/version-management/git-credential-oauth/default.nix b/nixpkgs/pkgs/applications/version-management/git-credential-oauth/default.nix index 3f776e29dc9c..96277c4047a7 100644 --- a/nixpkgs/pkgs/applications/version-management/git-credential-oauth/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-credential-oauth/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "git-credential-oauth"; - version = "0.8.0"; + version = "0.10.0"; src = fetchFromGitHub { owner = "hickford"; repo = pname; rev = "v${version}"; - hash = "sha256-t1P20BDNQ0aJRgQhOgYP2Md44+I8xs6884ktBO4nGjY="; + hash = "sha256-dsJ2h0hnqAwqNZv2Wod6XvPR5za8YNYAhtv4pMICfO8="; }; ldflags = [ @@ -17,7 +17,7 @@ buildGoModule rec { "-X main.version=${version}" ]; - vendorHash = "sha256-oHusgU5SMkFDY2dhFRdDonyYkyOBGOp+zqx2nFmOWXk="; + vendorHash = "sha256-STwBiqdUwiyhTySPENqfJLUTMwxaq5nYtrAX6+pcKoc="; meta = { description = "Git credential helper that securely authenticates to GitHub, GitLab and BitBucket using OAuth"; diff --git a/nixpkgs/pkgs/applications/version-management/git-gone/default.nix b/nixpkgs/pkgs/applications/version-management/git-gone/default.nix index fb97bf9467cf..dc80052fe62a 100644 --- a/nixpkgs/pkgs/applications/version-management/git-gone/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-gone/default.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "git-gone"; - version = "0.5.0"; + version = "1.0.0"; src = fetchFromGitHub { owner = "swsnr"; repo = "git-gone"; rev = "v${version}"; - hash = "sha256-bb7xeLxo/qk2yKctaX1JXzru1+tGTt8DmDVH6ZaARkU="; + hash = "sha256-cEMFbG7L48s1SigLD/HfQ2NplGZPpO+KIgs3oV3rgQQ="; }; - cargoHash = "sha256-tngsqAnQ2Um0UCSqBvrnpbDygF6CvL2fi0o9MVY0f4g="; + cargoHash = "sha256-CCPVjOWM59ELd4AyT968v6kvGdVwkMxxLZGDiJlLkzA="; nativeBuildInputs = [ installShellFiles ]; diff --git a/nixpkgs/pkgs/applications/version-management/git-machete/default.nix b/nixpkgs/pkgs/applications/version-management/git-machete/default.nix index f571cee0fa45..a4d1ffb090f0 100644 --- a/nixpkgs/pkgs/applications/version-management/git-machete/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-machete/default.nix @@ -12,13 +12,13 @@ buildPythonApplication rec { pname = "git-machete"; - version = "3.17.8"; + version = "3.17.9"; src = fetchFromGitHub { owner = "virtuslab"; repo = pname; rev = "v${version}"; - hash = "sha256-d1vbLlGKln/zcuuKZgNOcu/z15co3p8ecrwL5lucIEk="; + hash = "sha256-oU4c57XU/DLGjOl/CyCt6oG3QaB2xnrOEg+sUAd7sww="; }; nativeBuildInputs = [ installShellFiles ]; diff --git a/nixpkgs/pkgs/applications/version-management/git-stack/default.nix b/nixpkgs/pkgs/applications/version-management/git-stack/default.nix index c22245956781..fe81f0b41ef0 100644 --- a/nixpkgs/pkgs/applications/version-management/git-stack/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-stack/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "git-stack"; - version = "0.10.16"; + version = "0.10.17"; src = fetchFromGitHub { owner = "gitext-rs"; repo = "git-stack"; rev = "v${version}"; - hash = "sha256-QpRgAcbaZP5pgqMCoYAUybp8NkSkfGqNsZYXZp3Zdtc="; + hash = "sha256-foItJSZ6jsLuWkO/c1Ejb45dSdzZ/ripieyVIYsEyy0="; }; - cargoHash = "sha256-L+GtqbPQCgw0n1aW/2rU8ba+acC5n0sdEl9C6lveb1I="; + cargoHash = "sha256-MEhUmy4ijR/zHm/qMt4PqNGYnCfIgjNaL9SlMmXCMmc="; buildInputs = lib.optionals stdenv.isDarwin [ Security diff --git a/nixpkgs/pkgs/applications/version-management/git-town/default.nix b/nixpkgs/pkgs/applications/version-management/git-town/default.nix index 782918108e86..bc5f7f3b0854 100644 --- a/nixpkgs/pkgs/applications/version-management/git-town/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-town/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "git-town"; - version = "9.0.0"; + version = "9.0.1"; src = fetchFromGitHub { owner = "git-town"; repo = "git-town"; rev = "v${version}"; - hash = "sha256-huo0PRqc2iBBYXGBVdgtPJhbPoIqqjN2loXQ3CqVaOA="; + hash = "sha256-JvN7te59uRMC0TOWsBUYNEPLIn4nLlIvXI5gOQfQaCU="; }; vendorHash = null; diff --git a/nixpkgs/pkgs/applications/version-management/git-vanity-hash/default.nix b/nixpkgs/pkgs/applications/version-management/git-vanity-hash/default.nix index a77bdd493300..48fee5c578ed 100644 --- a/nixpkgs/pkgs/applications/version-management/git-vanity-hash/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-vanity-hash/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "git-vanity-hash"; - version = "2020-02-26-unstable"; + version = "1.0.0"; src = fetchFromGitHub { owner = "prasmussen"; repo = "git-vanity-hash"; - rev = "000004122124005af8d118a3f379bfc6ecc1e7c7"; - sha256 = "1wf342zawbphlzvji0yba0qg4f6v67h81nhxqcsir132jv397ma7"; + rev = "v${version}"; + hash = "sha256-jD8cSFXf9UNBZ9d8JTnuwhs6nPHY/xGd5RyqF+mQOlo="; }; - cargoSha256 = "1frdw9bs7y6ch5rrbsgvhrs0wxw4hbwm2n3crslp12w55m7k39fc"; + cargoHash = "sha256-8oW6gRtdQdmSmdwKlcU2EhHsyhk9hFhKl7RtsYwC7Ps="; postInstall = '' mkdir -p $out/share/doc/git-vanity-hash diff --git a/nixpkgs/pkgs/applications/version-management/git/default.nix b/nixpkgs/pkgs/applications/version-management/git/default.nix index 41d8e8a8691d..59afb979acf6 100644 --- a/nixpkgs/pkgs/applications/version-management/git/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git/default.nix @@ -397,5 +397,6 @@ stdenv.mkDerivation (finalAttrs: { platforms = lib.platforms.all; maintainers = with lib.maintainers; [ primeos wmertens globin ]; + mainProgram = "git"; }; }) diff --git a/nixpkgs/pkgs/applications/version-management/gitea/default.nix b/nixpkgs/pkgs/applications/version-management/gitea/default.nix index 89cae801ec29..c017b360c36e 100644 --- a/nixpkgs/pkgs/applications/version-management/gitea/default.nix +++ b/nixpkgs/pkgs/applications/version-management/gitea/default.nix @@ -20,12 +20,12 @@ buildGoModule rec { pname = "gitea"; - version = "1.20.1"; + version = "1.20.2"; # not fetching directly from the git repo, because that lacks several vendor files for the web UI src = fetchurl { url = "https://dl.gitea.com/gitea/${version}/gitea-src-${version}.tar.gz"; - hash = "sha256-LYOCNZJiGuMM1ly1Sp+0F8Us8LtAXzH5NzJf2CLcHck="; + hash = "sha256-a88ltflOcZQVWcEjC3r6rbPSk6LRtATcEQecYt/wg04="; }; vendorHash = null; diff --git a/nixpkgs/pkgs/applications/version-management/gitless/default.nix b/nixpkgs/pkgs/applications/version-management/gitless/default.nix index 31ab40d79478..0f6a59ac641e 100644 --- a/nixpkgs/pkgs/applications/version-management/gitless/default.nix +++ b/nixpkgs/pkgs/applications/version-management/gitless/default.nix @@ -5,22 +5,21 @@ python3.pkgs.buildPythonApplication rec { pname = "gitless"; - version = "0.8.8"; + version = "0.9.17"; format = "setuptools"; src = fetchFromGitHub { - owner = "gitless-vcs"; + owner = "goldstar611"; repo = pname; - rev = "v${version}"; - hash = "sha256-xo5EWtP2aN8YzP8ro3bnxZwUGUp0PHD0g8hk+Y+gExE="; + rev = version; + hash = "sha256-XDB1i2b1reMCM6i1uK3IzTnsoLXO7jldYtNlYUo1AoQ="; }; nativeBuildInputs = [ python3.pkgs.pythonRelaxDepsHook ]; propagatedBuildInputs = with python3.pkgs; [ - sh pygit2 - clint + argcomplete ]; pythonRelaxDeps = [ "pygit2" ]; diff --git a/nixpkgs/pkgs/applications/version-management/gitqlient/default.nix b/nixpkgs/pkgs/applications/version-management/gitqlient/default.nix index 622c0f045135..d7c1e46577e5 100644 --- a/nixpkgs/pkgs/applications/version-management/gitqlient/default.nix +++ b/nixpkgs/pkgs/applications/version-management/gitqlient/default.nix @@ -63,8 +63,8 @@ mkDerivation rec { postUnpack = '' for dep in AuxiliarCustomWidgets QPinnableTabWidget QLogger git; do - rmdir "source/src/$dep" - ln -sf "../../$dep" "source/src/$dep" + rmdir "${main_src.name}/src/$dep" + ln -sf "../../$dep" "${main_src.name}/src/$dep" done ''; diff --git a/nixpkgs/pkgs/applications/version-management/gql/default.nix b/nixpkgs/pkgs/applications/version-management/gql/default.nix index 80cb28a09e5b..b5682ad4bafa 100644 --- a/nixpkgs/pkgs/applications/version-management/gql/default.nix +++ b/nixpkgs/pkgs/applications/version-management/gql/default.nix @@ -2,7 +2,7 @@ , rustPlatform , fetchFromGitHub , pkg-config -, libgit2 +, libgit2_1_6 , zlib }: @@ -24,7 +24,7 @@ rustPlatform.buildRustPackage rec { ]; buildInputs = [ - libgit2 + libgit2_1_6 zlib ]; diff --git a/nixpkgs/pkgs/applications/version-management/lefthook/default.nix b/nixpkgs/pkgs/applications/version-management/lefthook/default.nix index 6d91b00baab1..b5cb93e71ea6 100644 --- a/nixpkgs/pkgs/applications/version-management/lefthook/default.nix +++ b/nixpkgs/pkgs/applications/version-management/lefthook/default.nix @@ -6,7 +6,7 @@ let pname = "lefthook"; - version = "1.4.7"; + version = "1.4.8"; in buildGoModule rec { inherit pname version; @@ -15,7 +15,7 @@ buildGoModule rec { owner = "evilmartians"; repo = "lefthook"; rev = "v${version}"; - hash = "sha256-zpey+2j0pLpE+wvqPcjVS5Mp+eQJiYtRsFAC8lPh4ck="; + hash = "sha256-lK2JGENCqfNXXzZBHirEoOB5+ktea38ypb2VD7GWxhg="; }; vendorHash = "sha256-/VLS7+nPERjIU7V2CzqXH69Z3/y+GKZbAFn+KcRKRuA="; diff --git a/nixpkgs/pkgs/applications/version-management/mercurial/default.nix b/nixpkgs/pkgs/applications/version-management/mercurial/default.nix index 258bc5d71ddc..f347ed884eff 100644 --- a/nixpkgs/pkgs/applications/version-management/mercurial/default.nix +++ b/nixpkgs/pkgs/applications/version-management/mercurial/default.nix @@ -21,11 +21,11 @@ let self = python3Packages.buildPythonApplication rec { pname = "mercurial${lib.optionalString fullBuild "-full"}"; - version = "6.5"; + version = "6.5.1"; src = fetchurl { url = "https://mercurial-scm.org/release/mercurial-${version}.tar.gz"; - sha256 = "sha256-pWA9DTlev2f+XSeruzvTf8wBhx7POUx5NnLSweaL5+c="; + sha256 = "sha256-M/fejYs2B/orQIzeS4cl4RfrCtQZJqeH6qtAnKik/C8="; }; format = "other"; @@ -35,7 +35,7 @@ let cargoDeps = if rustSupport then rustPlatform.fetchCargoTarball { inherit src; name = "mercurial-${version}"; - sha256 = "sha256-umjOU3OmTdPmLS4IWncqmKxSa6J4KXwTlGhylFt6TQo="; + sha256 = "sha256-tPv0UeZOsHDGKzXWeA/fFio7d3EN+KGioDu/1WH1drc="; sourceRoot = "mercurial-${version}/rust"; } else null; cargoRoot = if rustSupport then "rust" else null; diff --git a/nixpkgs/pkgs/applications/version-management/merge-fmt/default.nix b/nixpkgs/pkgs/applications/version-management/merge-fmt/default.nix new file mode 100644 index 000000000000..2f1ec571b162 --- /dev/null +++ b/nixpkgs/pkgs/applications/version-management/merge-fmt/default.nix @@ -0,0 +1,28 @@ +{ lib, fetchurl, buildDunePackage, cmdliner, base, stdio }: + +buildDunePackage rec { + pname = "merge-fmt"; + version = "0.3"; + + src = fetchurl { + url = + "https://github.com/hhugo/merge-fmt/releases/download/${version}/merge-fmt-${version}.tbz"; + hash = "sha256-F+ds0ToWcKD4NJU3yYSVW4B3m2LBnhR+4QVTDO79q14="; + }; + + minimalOCamlVersion = "4.06"; + duneVersion = "3"; + + buildInputs = [ cmdliner base stdio ]; + + meta = with lib; { + description = "Git mergetool leveraging code formatters"; + homepage = "https://github.com/hhugo/merge-fmt"; + license = licenses.mit; + longDescription = '' + `merge-fmt` is a small wrapper on top git commands to help resolve + conflicts by leveraging code formatters. + ''; + maintainers = [ maintainers.alizter ]; + }; +} diff --git a/nixpkgs/pkgs/applications/version-management/pijul/default.nix b/nixpkgs/pkgs/applications/version-management/pijul/default.nix index ea7458025725..4d3cea9c00c9 100644 --- a/nixpkgs/pkgs/applications/version-management/pijul/default.nix +++ b/nixpkgs/pkgs/applications/version-management/pijul/default.nix @@ -12,14 +12,14 @@ rustPlatform.buildRustPackage rec { pname = "pijul"; - version = "1.0.0-beta.5"; + version = "1.0.0-beta.6"; src = fetchCrate { inherit version pname; - hash = "sha256-hFNNi5xzH1wQnmy4XkXg07ZbZMlyWR4/GLe/PyJpb20="; + hash = "sha256-1cIb4QsDYlOCGrQrLgEwIjjHZ3WwD2o0o0bF+OOqEtI="; }; - cargoHash = "sha256-gOREd5Z1j+UUJ2NNryoDDsFtP6XYlWQlR/llgqKgy+g="; + cargoHash = "sha256-mRi0NUETTdYE/oM+Jo7gW/zNby8dPAKl6XhzP0Qzsf0="; doCheck = false; nativeBuildInputs = [ pkg-config ]; |