diff options
Diffstat (limited to 'pkgs/applications/version-management')
19 files changed, 169 insertions, 77 deletions
diff --git a/pkgs/applications/version-management/cvs2svn/default.nix b/pkgs/applications/version-management/cvs2svn/default.nix index 9f1df695a1743..a5903b7266e46 100644 --- a/pkgs/applications/version-management/cvs2svn/default.nix +++ b/pkgs/applications/version-management/cvs2svn/default.nix @@ -1,6 +1,7 @@ { lib, fetchurl, makeWrapper , pypy2Packages , cvs, subversion, git, breezy +, installShellFiles }: pypy2Packages.buildPythonApplication rec { @@ -12,7 +13,7 @@ pypy2Packages.buildPythonApplication rec { sha256 = "1ska0z15sjhyfi860rjazz9ya1gxbf5c0h8dfqwz88h7fccd22b4"; }; - nativeBuildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper installShellFiles ]; checkInputs = [ subversion git breezy ]; @@ -24,13 +25,15 @@ pypy2Packages.buildPythonApplication rec { for i in bzr svn git; do wrapProgram $out/bin/cvs2$i \ --prefix PATH : "${lib.makeBinPath [ cvs ]}" + $out/bin/cvs2$i --man > csv2$i.1 + installManPage csv2$i.1 done ''; meta = with lib; { description = "A tool to convert CVS repositories to Subversion repositories"; homepage = "https://github.com/mhagger/cvs2svn"; - maintainers = [ maintainers.makefu ]; + maintainers = with maintainers; [ makefu viraptor ]; platforms = platforms.unix; license = licenses.asl20; }; diff --git a/pkgs/applications/version-management/fnc/default.nix b/pkgs/applications/version-management/fnc/default.nix index 1e234dea5e3e6..564bcdc5897bc 100644 --- a/pkgs/applications/version-management/fnc/default.nix +++ b/pkgs/applications/version-management/fnc/default.nix @@ -1,12 +1,12 @@ -{ lib, fetchurl, stdenv, zlib, ncurses, libiconv }: +{ lib, fetchurl, fetchpatch, stdenv, zlib, ncurses, libiconv }: stdenv.mkDerivation rec { pname = "fnc"; - version = "0.10"; + version = "0.12"; src = fetchurl { url = "https://fnc.bsdbox.org/tarball/${version}/fnc-${version}.tar.gz"; - sha256 = "1phqxh0afky7q2qmhgjlsq1awbv4254yd8wpzxlww4p7a57cp0lk"; + sha256 = "05cg8id4d1ia8y60y3x23167bl1rn2fdpkf1jfj3aklhlihvkbxd"; }; buildInputs = [ libiconv ncurses zlib ]; @@ -17,14 +17,6 @@ stdenv.mkDerivation rec { mkdir -p $out/bin ''; - doInstallCheck = true; - - installCheckPhase = '' - runHook preInstallCheck - test "$($out/bin/fnc --version)" = '${pname} ${version}' - runHook postInstallCheck - ''; - meta = with lib; { description = "Interactive ncurses browser for Fossil repositories"; longDescription = '' diff --git a/pkgs/applications/version-management/git-and-tools/delta/default.nix b/pkgs/applications/version-management/git-and-tools/delta/default.nix index c1f2c281c7a08..92914f4549681 100644 --- a/pkgs/applications/version-management/git-and-tools/delta/default.nix +++ b/pkgs/applications/version-management/git-and-tools/delta/default.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "delta"; - version = "0.12.1"; + version = "0.13.0"; src = fetchFromGitHub { owner = "dandavison"; repo = pname; rev = version; - sha256 = "sha256-khW+Ri+MZytMZcd2tRXhc/D6kOOhk+LP6MsS+GijjQM="; + sha256 = "sha256-5h4epV3RORZiynW1fkFLImqPunC3PZ/YzLiSrzescww="; }; - cargoSha256 = "sha256-SD1y+l86wqlJUUaG4ae4PXXSMS+4CPth3F4pLYbXMVc="; + cargoSha256 = "sha256-4dPTcrT8Gx3WfT0sauqnCSmcGE9LrgIqgHrY5l503ZA="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/applications/version-management/git-and-tools/gfold/default.nix b/pkgs/applications/version-management/git-and-tools/gfold/default.nix index ee280c6620c05..d3b960208fc92 100644 --- a/pkgs/applications/version-management/git-and-tools/gfold/default.nix +++ b/pkgs/applications/version-management/git-and-tools/gfold/default.nix @@ -1,28 +1,43 @@ -{ lib, fetchFromGitHub, gitMinimal, makeWrapper, rustPlatform }: +{ fetchFromGitHub +, gitMinimal +, gfold +, lib +, libiconv +, makeWrapper +, rustPlatform +, Security +, stdenv +, testVersion +}: -rustPlatform.buildRustPackage rec { +let pname = "gfold"; - version = "3.0.0"; + version = "4.0.0"; +in +rustPlatform.buildRustPackage { + inherit pname version; src = fetchFromGitHub { owner = "nickgerace"; repo = pname; rev = version; - sha256 = "0ss6vfrc6h3jlh5qilh82psd3vdnfawf1wl4cf64mfm4hm9dda63"; + sha256 = "1yh5173qhi9bd41zss9k21nm0xnr2sa918kvlyr5xvzhq47rrwz5"; }; - cargoSha256 = "09ywwgxm8l1p0jypp65zpqryjnb2g4gririf1dmqb9148dsj29x2"; + cargoSha256 = "sha256-o2fMIlj+veTmhfqi7BVpxr3520SOwWLmVS2UU83EVjo="; - nativeBuildInputs = [ makeWrapper ]; + buildInputs = lib.optionals stdenv.isDarwin [ libiconv Security ]; - postInstall = '' - wrapProgram "$out/bin/gfold" --prefix PATH : "${gitMinimal}/bin" - ''; + passthru.tests.version = testVersion { + package = gfold; + command = "gfold --version"; + inherit version; + }; meta = with lib; { - inherit (src.meta) homepage; description = - "A tool to help keep track of your Git repositories, written in Rust"; + "CLI tool to help keep track of your Git repositories, written in Rust"; + homepage = "https://github.com/nickgerace/gfold"; license = licenses.asl20; maintainers = [ maintainers.shanesveller ]; platforms = platforms.unix; 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 43311216e65f0..78ec57b9059ec 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.9.0"; + version = "2.10.1"; src = fetchFromGitHub { owner = "cli"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-k8td9YKtlkit3YzpAncocZE7+Cl8v9ZNyPD4ZysCFRI="; + sha256 = "sha256-2lIHEO4+oW9+C7VSulmVwZJ1l6RYBbV6wlKMvdOGqi8="; }; - vendorSha256 = "sha256-YLkNua0Pz0gVIYnWOzOlV5RuLBaoZ4l7l1Pf4QIfUVQ="; + vendorSha256 = "sha256-EFJfd6sUK5iquFW0kXaiH6tLiNqbZNe9awpIqmqhp7I="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/applications/version-management/git-and-tools/git-codereview/default.nix b/pkgs/applications/version-management/git-and-tools/git-codereview/default.nix index 9028140784859..43de62876858d 100644 --- a/pkgs/applications/version-management/git-and-tools/git-codereview/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-codereview/default.nix @@ -1,17 +1,22 @@ -{ lib, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub, git }: -buildGoPackage { +buildGoModule rec { pname = "git-codereview"; - version = "2020-01-15"; - goPackagePath = "golang.org/x/review"; + version = "1.0.3"; src = fetchFromGitHub { owner = "golang"; repo = "review"; - rev = "f51a73253c4da005cfdf18a036e11185c04c8ce3"; - sha256 = "0c4vsyy5zp7pngqn4q87xipndghxyw2x57dkv1kxnrffckx1s3pc"; + rev = "v${version}"; + sha256 = "sha256-Hyo2UWGlxxeSz3E73DeA0VoOnBJ1VedvpshnATJGbFo="; }; + vendorSha256 = "sha256-pQpattmS9VmO3ZIQUFn66az8GSmB4IvYhTTCFn6SUmo="; + + ldflags = [ "-s" "-w" ]; + + checkInputs = [ git ]; + meta = with lib; { description = "Manage the code review process for Git changes using a Gerrit server"; homepage = "https://golang.org/x/review/git-codereview"; 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 6b6da70bb942d..d5fc50ff3fd62 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 @@ -1,5 +1,7 @@ { lib , buildPythonApplication +, pytest-mock +, pytestCheckHook , fetchFromGitHub , installShellFiles , git @@ -10,18 +12,18 @@ buildPythonApplication rec { pname = "git-machete"; - version = "3.9.0"; + version = "3.9.1"; src = fetchFromGitHub { owner = "virtuslab"; repo = pname; rev = "v${version}"; - sha256 = "sha256-AuF4KUayMRQ2TsvjzpMHpppM+0e6igs7MrAXzGP9yp0="; + sha256 = "sha256-/oX3x5F5/gV8YuRLzAviE7RM+Gen0gIypHs34iUnVOM="; }; nativeBuildInputs = [ installShellFiles ]; - checkInputs = [ git ]; + checkInputs = [ git pytest-mock pytestCheckHook ]; postInstall = '' installShellCompletion --bash --name git-machete completion/git-machete.completion.bash diff --git a/pkgs/applications/version-management/git-and-tools/radicle-upstream/default.nix b/pkgs/applications/version-management/git-and-tools/radicle-upstream/default.nix index 87d92e72a8fec..d5791f6506cdf 100644 --- a/pkgs/applications/version-management/git-and-tools/radicle-upstream/default.nix +++ b/pkgs/applications/version-management/git-and-tools/radicle-upstream/default.nix @@ -2,17 +2,17 @@ let pname = "radicle-upstream"; - version = "0.2.12"; + version = "0.3.0"; name = "${pname}-${version}"; srcs = { x86_64-linux = fetchurl { url = "https://releases.radicle.xyz/radicle-upstream-${version}.AppImage"; - sha256 = "7520c7feb94234df6f8523689d098e0d19510e2ac0122e482d1e01086c9b02fe"; + sha256 = "sha256-Y7V89G+nXRtknOukvBN8Q+sNx91YNPDT0p5hrFYe/Sk="; }; x86_64-darwin = fetchurl { url = "https://releases.radicle.xyz/radicle-upstream-${version}.dmg"; - sha256 = "8bbff051f169f029044e4c4965cad88f48e939b945fd5c253f0c39665a19ce44"; + sha256 = "sha256-EuWGbn6qggi8/9Rci8iaXfuVKE+QXb1BHEYDvotR/q4="; }; }; src = srcs.${stdenv.hostPlatform.system}; diff --git a/pkgs/applications/version-management/gitlab/data.json b/pkgs/applications/version-management/gitlab/data.json index 4585eda494742..cc8cd00b7d14e 100644 --- a/pkgs/applications/version-management/gitlab/data.json +++ b/pkgs/applications/version-management/gitlab/data.json @@ -1,14 +1,14 @@ { - "version": "14.10.1", - "repo_hash": "13868wb0zr862xaxapp8nxh16gjsawklw66rlxx95bhhm3r81nrp", + "version": "14.10.2", + "repo_hash": "0f7cfc1wrzz4m5yhd6jnp3dqpdy7vbj8bf826zjsi2ss48430bk0", "yarn_hash": "17wxqvig34namf8kvh8bwci3y0f3k2nl4zs99jcvskdad9p45rlc", "owner": "gitlab-org", "repo": "gitlab", - "rev": "v14.10.1-ee", + "rev": "v14.10.2-ee", "passthru": { - "GITALY_SERVER_VERSION": "14.10.1", + "GITALY_SERVER_VERSION": "14.10.2", "GITLAB_PAGES_VERSION": "1.56.1", "GITLAB_SHELL_VERSION": "13.25.1", - "GITLAB_WORKHORSE_VERSION": "14.10.1" + "GITLAB_WORKHORSE_VERSION": "14.10.2" } } diff --git a/pkgs/applications/version-management/gitlab/gitaly/default.nix b/pkgs/applications/version-management/gitlab/gitaly/default.nix index 3126ce718e854..127a4ec461fc4 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 = "14.10.1"; + version = "14.10.2"; gitaly_package = "gitlab.com/gitlab-org/gitaly/v${lib.versions.major version}"; in @@ -23,7 +23,7 @@ buildGoModule { owner = "gitlab-org"; repo = "gitaly"; rev = "v${version}"; - sha256 = "sha256-4TbCfe41Nea1p0aDqGbF4SskUl5r9LRHKA16DH97jMI="; + sha256 = "sha256-hLTzkW5GDq1AgTwe1pVj6Tiyd0JpJ76ATFu3Q+m9MVg="; }; vendorSha256 = "sha256-ZL61t+Ii2Ns3TmitiF93exinod54+RCqrbdpU67HeY0="; diff --git a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix index 602d8650f3376..2613fe85f81bd 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 = "14.10.1"; + version = "14.10.2"; src = fetchFromGitLab { owner = data.owner; diff --git a/pkgs/applications/version-management/gitless/default.nix b/pkgs/applications/version-management/gitless/default.nix index a721834725889..31ab40d79478f 100644 --- a/pkgs/applications/version-management/gitless/default.nix +++ b/pkgs/applications/version-management/gitless/default.nix @@ -15,16 +15,15 @@ python3.pkgs.buildPythonApplication rec { hash = "sha256-xo5EWtP2aN8YzP8ro3bnxZwUGUp0PHD0g8hk+Y+gExE="; }; + nativeBuildInputs = [ python3.pkgs.pythonRelaxDepsHook ]; + propagatedBuildInputs = with python3.pkgs; [ sh pygit2 clint ]; - postPatch = '' - substituteInPlace setup.py \ - --replace "pygit2==0.28.2" "pygit2>=0.28.2" - ''; + pythonRelaxDeps = [ "pygit2" ]; doCheck = false; diff --git a/pkgs/applications/version-management/got/default.nix b/pkgs/applications/version-management/got/default.nix index 9e444fb3b39e0..f38bb042c435f 100644 --- a/pkgs/applications/version-management/got/default.nix +++ b/pkgs/applications/version-management/got/default.nix @@ -1,17 +1,17 @@ -{ lib, stdenv, fetchurl, pkg-config, openssl, libuuid, libmd, zlib, ncurses }: +{ lib, stdenv, fetchurl, pkg-config, openssl, libbsd, libuuid, libmd, zlib, ncurses }: stdenv.mkDerivation rec { pname = "got"; - version = "0.68.1"; + version = "0.69"; src = fetchurl { url = "https://gameoftrees.org/releases/portable/got-portable-${version}.tar.gz"; - sha256 = "122wignzrhsw00mfnh7mxcxvjyp9rk73yxzfyvmg7f5kmb0hng35"; + sha256 = "1cnl0yk866wzjwgas587kvb08njq7db71b5xqsdrwd1varp010vm"; }; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ openssl libuuid libmd zlib ncurses ]; + buildInputs = [ openssl libbsd libuuid libmd zlib ncurses ]; doInstallCheck = true; diff --git a/pkgs/applications/version-management/meld/default.nix b/pkgs/applications/version-management/meld/default.nix index 462744641e3b1..f8f58cdcaba29 100644 --- a/pkgs/applications/version-management/meld/default.nix +++ b/pkgs/applications/version-management/meld/default.nix @@ -36,6 +36,13 @@ python3.pkgs.buildPythonApplication rec { url = "https://gitlab.gnome.org/GNOME/meld/-/commit/cc7746c141d976a4779cf868774fae1fe7627a6d.patch"; sha256 = "sha256-4uJZyF00Z6svzrOebByZV1hutCZRkIQYC4rUxQr5fdQ="; }) + + # Fix view not rendering with adwaita-icon-theme 42 due to removed icons. + # https://gitlab.gnome.org/GNOME/meld/-/merge_requests/83 + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/meld/-/commit/f850cdf3eaf0f08abea003d5fae118a5e92a3d61.patch"; + sha256 = "PaK8Rpv79UwMUligm9pIY16JW/dm7eVXntAwTV4hnbE="; + }) ]; nativeBuildInputs = [ diff --git a/pkgs/applications/version-management/mercurial/default.nix b/pkgs/applications/version-management/mercurial/default.nix index 4898729159907..96dc830248857 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.1.1"; + version = "6.1.2"; src = fetchurl { url = "https://mercurial-scm.org/release/mercurial-${version}.tar.gz"; - sha256 = "sha256-V7ikYdDOE9muOBfYqL35Ay407fqsPbzLO2a4NdzpM4g="; + sha256 = "sha256-pSgQ/AFAmCjEl00Lwsu1yA6UjVtYTPsadpliPpJKLyo="; }; format = "other"; @@ -35,7 +35,7 @@ let cargoDeps = if rustSupport then rustPlatform.fetchCargoTarball { inherit src; name = "mercurial-${version}"; - sha256 = "sha256-HYH7+OD11kdZdxFrx1KVle1NesS3fAgwVXJpAeiXDTo="; + sha256 = "sha256-OSaeOp+SjQ5n61jV8UthtQQqkneBYJhESoQDCwRSTco="; sourceRoot = "mercurial-${version}/rust"; } else null; cargoRoot = if rustSupport then "rust" else null; @@ -151,6 +151,8 @@ let EOF export HGTEST_REAL_HG="${mercurial}/bin/hg" + # include tests for native components + export HGMODULEPOLICY="rust+c" # extended timeout necessary for tests to pass on the busy CI workers export HGTESTFLAGS="--blacklist blacklists/nix --timeout 1800 -j$NIX_BUILD_CORES ${flags}" make check diff --git a/pkgs/applications/version-management/p4v/default.nix b/pkgs/applications/version-management/p4v/default.nix index 476df99d2324e..2e0e01e5c9862 100644 --- a/pkgs/applications/version-management/p4v/default.nix +++ b/pkgs/applications/version-management/p4v/default.nix @@ -1,12 +1,38 @@ -{ stdenv, fetchurl, lib, qtbase, qtmultimedia, qtscript, qtsensors, qtwebengine, qtwebkit, openssl, xkeyboard_config, patchelfUnstable, wrapQtAppsHook }: +{ stdenv +, fetchurl +, lib +, qtbase +, qtwebengine +, qtdeclarative +, qtwebchannel +, syntax-highlighting +, openssl +, xkeyboard_config +, patchelfUnstable +, wrapQtAppsHook +, writeText +}: +let + # This abomination exists because p4v calls CRYPTO_set_mem_functions and + # expects it to succeed. The function will fail if CRYPTO_malloc has already + # been called, which happens at init time via qtwebengine -> ... -> libssh. I + # suspect it was meant to work with a version of Qt where openssl is + # statically linked or some other library is used. + crypto-hack = writeText "crypto-hack.c" '' + #include <stddef.h> + int CRYPTO_set_mem_functions( + void *(*m)(size_t, const char *, int), + void *(*r)(void *, size_t, const char *, int), + void (*f)(void *, const char *, int)) { return 1; } + ''; -stdenv.mkDerivation rec { +in stdenv.mkDerivation rec { pname = "p4v"; - version = "2020.1.1966006"; + version = "2021.3.2186916"; src = fetchurl { - url = "https://cdist2.perforce.com/perforce/r20.1/bin.linux26x86_64/p4v.tgz"; - sha256 = "0zc70d7jgdrd2jli338n1h05hgb7jmmv8hvq205wh78vvllrlv10"; + url = "http://web.archive.org/web/20211118024745/https://cdist2.perforce.com/perforce/r21.3/bin.linux26x86_64/p4v.tgz"; + sha256 = "1zldg21xq4srww9pcfbv3p8320ghjnh333pz5r70z1gwbq4vf3jq"; }; dontBuild = true; @@ -15,11 +41,10 @@ stdenv.mkDerivation rec { ldLibraryPath = lib.makeLibraryPath [ stdenv.cc.cc.lib qtbase - qtmultimedia - qtscript - qtsensors qtwebengine - qtwebkit + qtdeclarative + qtwebchannel + syntax-highlighting openssl ]; @@ -29,14 +54,17 @@ stdenv.mkDerivation rec { cp -r bin $out mkdir -p $out/lib cp -r lib/P4VResources $out/lib + $CC -fPIC -shared -o $out/lib/libcrypto-hack.so ${crypto-hack} for f in $out/bin/*.bin ; do patchelf --set-rpath $ldLibraryPath --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $f # combining this with above breaks rpath (patchelf bug?) - patchelf --add-needed libstdc++.so $f \ + patchelf --add-needed libstdc++.so \ + --add-needed $out/lib/libcrypto-hack.so \ --clear-symbol-version _ZNSt20bad_array_new_lengthD1Ev \ --clear-symbol-version _ZTVSt20bad_array_new_length \ --clear-symbol-version _ZTISt20bad_array_new_length \ + --clear-symbol-version _ZdlPvm \ $f wrapQtApp $f \ --suffix QT_XKB_CONFIG_ROOT : ${xkeyboard_config}/share/X11/xkb diff --git a/pkgs/applications/version-management/rapidsvn/default.nix b/pkgs/applications/version-management/rapidsvn/default.nix index 60d011b653d4e..bcb90c20698b7 100644 --- a/pkgs/applications/version-management/rapidsvn/default.nix +++ b/pkgs/applications/version-management/rapidsvn/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, wxGTK, subversion, apr, aprutil, python2 }: +{ lib, stdenv, fetchurl, wxGTK, subversion, apr, aprutil, python3, fetchpatch }: stdenv.mkDerivation rec { pname = "rapidsvn"; @@ -9,13 +9,28 @@ stdenv.mkDerivation rec { sha256 = "1bmcqjc12k5w0z40k7fkk8iysqv4fw33i80gvcmbakby3d4d4i4p"; }; - buildInputs = [ wxGTK subversion apr aprutil python2 ]; + buildInputs = [ wxGTK subversion apr aprutil python3 ]; + + NIX_CFLAGS_COMPILE = [ "-std=c++14" ]; configureFlags = [ "--with-svn-include=${subversion.dev}/include" "--with-svn-lib=${subversion.out}/lib" ]; patches = [ ./fix-build.patch + # Python 3 compatibility patches + (fetchpatch { + url = "https://github.com/RapidSVN/RapidSVN/pull/44/commits/2e26fd5d6a413d6c3a055c17ac4840b95d1537e9.patch"; + hash = "sha256-8acABzscgZh1bfAt35KHfU+nfaiO7P1b+lh34Bj0REI="; + }) + (fetchpatch { + url = "https://github.com/RapidSVN/RapidSVN/pull/44/commits/92927af764f92b3731333ed3dba637f98611167a.patch"; + hash = "sha256-4PdShGcfFwxjdI3ygbnKFAa8l9dGERq/xSl54WisgKM="; + }) + (fetchpatch { + url = "https://github.com/RapidSVN/RapidSVN/pull/44/commits/3e375f11d94cb8faddb8b7417354a9fb51f304ec.patch"; + hash = "sha256-BUpCMEH7jctOLtJktDUE52bxexfLemLItZ0IgdAnq9g="; + }) ]; meta = { @@ -23,5 +38,7 @@ stdenv.mkDerivation rec { homepage = "http://rapidsvn.tigris.org/"; license = lib.licenses.gpl3Plus; maintainers = [ lib.maintainers.viric ]; + platforms = lib.platforms.unix; + broken = stdenv.isDarwin; }; } diff --git a/pkgs/applications/version-management/rcshist/default.nix b/pkgs/applications/version-management/rcshist/default.nix new file mode 100644 index 0000000000000..a9c7bbefc1318 --- /dev/null +++ b/pkgs/applications/version-management/rcshist/default.nix @@ -0,0 +1,22 @@ +{ lib +, stdenv +, fetchurl +}: + +stdenv.mkDerivation { + pname = "rcshist"; + version = "1.04"; + + src = fetchurl { + url = "https://web.archive.org/web/20220508220019/https://invisible-island.net/datafiles/release/rcshist.tar.gz"; + sha256 = "01ab3xwgm934lxr8bm758am3vxwx4hxx7cc9prbgqj5nh30vdg1n"; + }; + + meta = { + description = "Utitity to display complete revision history of a set of RCS files"; + homepage = "https://invisible-island.net/rcshist/rcshist.html"; + license = lib.licenses.bsd2; + maintainers = [ lib.maintainers.kaction ]; + platforms = lib.platforms.unix; + }; +} diff --git a/pkgs/applications/version-management/sublime-merge/default.nix b/pkgs/applications/version-management/sublime-merge/default.nix index fc8e5d4e4b17f..6526fdb2d1bed 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 = "2068"; - sha256 = "sha256-CseZQgjqr8B66Slf/yFZZsnRFc3zqCGKFAzSdMRQdNI="; + buildVersion = "2071"; + sha256 = "xYVk5Fx6VdoHzf0cbmhwKyEr5HDEZgPgDoBWQg/tS0U="; } {}; sublime-merge-dev = common { - buildVersion = "2067"; - sha256 = "sha256-ViBBi9Ghh4dHg7Gmg4i/B+Q4OgDd4XiHNIs12qffZdg="; + buildVersion = "2070"; + sha256 = "2AA2HBF19g34ov6ytjL2caqS7Ro4eyj18vzwINm0CTw="; dev = true; } {}; } |