diff options
Diffstat (limited to 'pkgs/applications/version-management')
4 files changed, 34 insertions, 27 deletions
diff --git a/pkgs/applications/version-management/git-and-tools/pre-commit/default.nix b/pkgs/applications/version-management/git-and-tools/pre-commit/default.nix index ed44043eb9a9e..98608b20b575f 100644 --- a/pkgs/applications/version-management/git-and-tools/pre-commit/default.nix +++ b/pkgs/applications/version-management/git-and-tools/pre-commit/default.nix @@ -1,12 +1,12 @@ { stdenv, python3Packages }: with python3Packages; buildPythonApplication rec { pname = "pre-commit"; - version = "1.17.0"; + version = "1.18.1"; src = fetchPypi { inherit version; pname = "pre_commit"; - sha256 = "1qswk30w2cq8xvj16mhszsi3npp0z08s8lki1w67nif23c2kkk6c"; + sha256 = "0d9ja186g41kw3gmhbi6xjvaslz6z4xis4qn1q6jabkka6jz4qhp"; }; propagatedBuildInputs = [ diff --git a/pkgs/applications/version-management/git-and-tools/topgit/default.nix b/pkgs/applications/version-management/git-and-tools/topgit/default.nix index c183bbde7e6b9..0da0cfa02b630 100644 --- a/pkgs/applications/version-management/git-and-tools/topgit/default.nix +++ b/pkgs/applications/version-management/git-and-tools/topgit/default.nix @@ -1,26 +1,30 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchFromGitHub, git, perl }: stdenv.mkDerivation rec { - name = "topgit-0.9"; + pname = "topgit"; + version = "0.19.12"; - src = fetchurl { - url = "https://github.com/greenrd/topgit/archive/${name}.tar.gz"; - sha256 = "1z9x42a0cmn8n2n961qcfl522nd6j9a3dpx1jbqfp24ddrk5zd94"; + src = fetchFromGitHub { + owner = "mackyle"; + repo = "topgit"; + rev = "${pname}-${version}"; + sha256 = "1wvf8hmwwl7a2fr17cfs3pbxjccdsjw9ngzivxlgja0gvfz4hjd5"; }; - configurePhase = "makeFlags=prefix=$out"; + makeFlags = [ "prefix=${placeholder "out"}" ]; + + nativeBuildInputs = [ perl git ]; postInstall = '' - mkdir -p "$out/share/doc/${name}" "$out/etc/bash_completion.d/" - mv README "$out/share/doc/${name}/" - mv contrib/tg-completion.bash "$out/etc/bash_completion.d/" + install -Dm644 README -t"$out/share/doc/${pname}-${version}/" + install -Dm755 contrib/tg-completion.bash -t "$out/etc/bash_completion.d/" ''; - meta = { - homepage = https://github.com/greenrd/topgit; + meta = with stdenv.lib; { description = "TopGit manages large amount of interdependent topic branches"; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.unix; - maintainers = with stdenv.lib.maintainers; [ marcweber ]; + homepage = "https://github.com/mackyle/topgit"; + license = licenses.gpl2; + platforms = platforms.unix; + maintainers = with maintainers; [ marcweber ]; }; } diff --git a/pkgs/applications/version-management/gitkraken/default.nix b/pkgs/applications/version-management/gitkraken/default.nix index ffca24ab27d15..5b7fc119b5b36 100644 --- a/pkgs/applications/version-management/gitkraken/default.nix +++ b/pkgs/applications/version-management/gitkraken/default.nix @@ -3,6 +3,7 @@ , libX11, libXi, libxcb, libXext, libXcursor, glib, libXScrnSaver, libxkbfile, libXtst , nss, nspr, cups, fetchurl, expat, gdk-pixbuf, libXdamage, libXrandr, dbus , dpkg, makeDesktopItem, openssl, wrapGAppsHook, hicolor-icon-theme, at-spi2-atk, libuuid +, e2fsprogs, krb5 }: with stdenv.lib; @@ -12,11 +13,11 @@ let in stdenv.mkDerivation rec { name = "gitkraken-${version}"; - version = "6.0.0"; + version = "6.1.1"; src = fetchurl { url = "https://release.axocdn.com/linux/GitKraken-v${version}.deb"; - sha256 = "1ykjdnzl34pqr6dhfnswix44i412c7gcba1pk95a8670wmc29a1f"; + sha256 = "1ks8dscidqzmxy650xda6gvqg04iwidanidlsmgsi8365iqxvb1k"; }; libPath = makeLibraryPath [ @@ -55,6 +56,8 @@ stdenv.mkDerivation rec { openssl at-spi2-atk libuuid + e2fsprogs + krb5 ]; desktopItem = makeDesktopItem { diff --git a/pkgs/applications/version-management/subversion/default.nix b/pkgs/applications/version-management/subversion/default.nix index 81949f9510695..dffe3fadd74b0 100644 --- a/pkgs/applications/version-management/subversion/default.nix +++ b/pkgs/applications/version-management/subversion/default.nix @@ -19,10 +19,10 @@ let common = { version, sha256, extraBuildInputs ? [ ] }: stdenv.mkDerivation (rec { inherit version; - name = "subversion-${version}"; + pname = "subversion"; src = fetchurl { - url = "mirror://apache/subversion/${name}.tar.bz2"; + url = "mirror://apache/subversion/${pname}-${version}.tar.bz2"; inherit sha256; }; @@ -98,7 +98,7 @@ let meta = with stdenv.lib; { description = "A version control system intended to be a compelling replacement for CVS in the open source community"; license = licenses.asl20; - homepage = http://subversion.apache.org/; + homepage = "http://subversion.apache.org/"; maintainers = with maintainers; [ eelco lovek323 ]; platforms = platforms.linux ++ platforms.darwin; }; @@ -112,19 +112,19 @@ let in { subversion19 = common { - version = "1.9.10"; - sha256 = "1mwwbjs8nqr8qyc0xzy7chnylh4q3saycvly8rzq32swadbcca5f"; + version = "1.9.12"; + sha256 = "15z33gdnfiqblm5515020wfdwnp2837r3hnparava6m2fgyiafiw"; }; subversion_1_10 = common { - version = "1.10.4"; - sha256 = "18c1vdq32nil76w678lxmp73jsbqha3dmzgmfrj76nc0xjmywql2"; + version = "1.10.6"; + sha256 = "19zc215mhpnm92mlyl5jbv57r5zqp6cavr3s2g9yglp6j4kfgj0q"; extraBuildInputs = [ lz4 utf8proc ]; }; subversion = common { - version = "1.12.0"; - sha256 = "1prfbrd1jnndb5fcsvwnzvdi7c0bpirb6pmfq03w21x0v1rprbkz"; + version = "1.12.2"; + sha256 = "0wgpw3kzsiawzqk4y0xgh1z93kllxydgv4lsviim45y5wk4bbl1v"; extraBuildInputs = [ lz4 utf8proc ]; }; } |