diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2019-07-16 11:15:46 +0200 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2019-07-16 11:15:46 +0200 |
commit | a28a9ac156b921f394882be3c282e906f4662af5 (patch) | |
tree | d673d7f563445d1d7493734d3cbdfefecb4734bd /pkgs/applications/version-management | |
parent | e29cf290867c6781896bb191df057a6065fdf57b (diff) | |
parent | 0ddb9e04957e372eacfd7aedd8135cd605bc7517 (diff) |
Merge master into staging-next
Diffstat (limited to 'pkgs/applications/version-management')
-rw-r--r-- | pkgs/applications/version-management/fossil/default.nix | 4 | ||||
-rw-r--r-- | pkgs/applications/version-management/git-and-tools/git-absorb/default.nix | 10 |
2 files changed, 7 insertions, 7 deletions
diff --git a/pkgs/applications/version-management/fossil/default.nix b/pkgs/applications/version-management/fossil/default.nix index d0f79600e8ce9..d4b60a4f5386c 100644 --- a/pkgs/applications/version-management/fossil/default.nix +++ b/pkgs/applications/version-management/fossil/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { name = "fossil-${version}"; - version = "2.8"; + version = "2.9"; src = fetchurl { urls = @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { "https://www.fossil-scm.org/index.html/uv/fossil-src-${version}.tar.gz" ]; name = "${name}.tar.gz"; - sha256 = "0pbinf8d2kj1j7niblhzjd2l2khg6r2pn2xvig6gavz27p3vwcka"; + sha256 = "0kwb7pkp7y2my916rhyl6kmcf0fk8gkzaxzy13hfgqs35nlsvchw"; }; buildInputs = [ zlib openssl readline sqlite which ed ] diff --git a/pkgs/applications/version-management/git-and-tools/git-absorb/default.nix b/pkgs/applications/version-management/git-and-tools/git-absorb/default.nix index 82414befa912c..509fc73a3f35d 100644 --- a/pkgs/applications/version-management/git-and-tools/git-absorb/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-absorb/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, rustPlatform, libiconv, Security }: rustPlatform.buildRustPackage rec { - name = "git-absorb-${version}"; - version = "0.3.0"; + pname = "git-absorb"; + version = "0.4.0"; src = fetchFromGitHub { owner = "tummychow"; - repo = "git-absorb"; + repo = pname; rev = "refs/tags/${version}"; - sha256 = "1dm442lyk7f44bshm2ajync5pzdwvdc5xfpw2lkvjzxflmh5572z"; + sha256 = "1clmd1b90vppbzng1kq0vzfh7964m3fk64q6h1vfcd1cfqj63r5v"; }; buildInputs = stdenv.lib.optionals stdenv.isDarwin [ libiconv Security ]; @@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "0q40qcki49dw23n3brgdz5plvigmsf61jm0kfy48j89mijih8zy7"; meta = with stdenv.lib; { - inherit (src.meta) homepage; + homepage = "https://github.com/tummychow/git-absorb"; description = "git commit --fixup, but automatic"; license = [ licenses.bsd3 ]; maintainers = [ maintainers.marsam ]; |