diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2015-07-17 06:37:13 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2015-07-17 06:38:04 +0200 |
| commit | 9f37e91ec502b68e7a8ebc71b7bf37ad02092a0c (patch) | |
| tree | 946e5c7626f668079bcf35caf203a52c5d33f3c7 /pkgs/applications/version-management | |
| parent | cf8309ef34b9ec18bc9aeca9e63f984e1be19b56 (diff) | |
| parent | 967abfc78660d0e49a32eac8fe19cec4b6b79d5c (diff) | |
| download | nixpkgs-9f37e91ec502b68e7a8ebc71b7bf37ad02092a0c.tar nixpkgs-9f37e91ec502b68e7a8ebc71b7bf37ad02092a0c.tar.gz nixpkgs-9f37e91ec502b68e7a8ebc71b7bf37ad02092a0c.tar.bz2 nixpkgs-9f37e91ec502b68e7a8ebc71b7bf37ad02092a0c.tar.lz nixpkgs-9f37e91ec502b68e7a8ebc71b7bf37ad02092a0c.tar.xz nixpkgs-9f37e91ec502b68e7a8ebc71b7bf37ad02092a0c.tar.zst nixpkgs-9f37e91ec502b68e7a8ebc71b7bf37ad02092a0c.zip | |
Merge master into staging
There are larger-rebuild changes: gnutls and samba.
Diffstat (limited to 'pkgs/applications/version-management')
| -rw-r--r-- | pkgs/applications/version-management/git-and-tools/git/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/applications/version-management/smartgithg/default.nix | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix index 68fd7405ee4..9702a95133c 100644 --- a/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -9,7 +9,7 @@ }: let - version = "2.4.5"; + version = "2.4.6"; svn = subversionClient.override { perlBindings = true; }; in @@ -18,7 +18,7 @@ stdenv.mkDerivation { src = fetchurl { url = "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz"; - sha256 = "15045v9ds1jn7csw4dijlz0ybiw3csh34l444vzgh9g0f9gmy6n3"; + sha256 = "1djkjjv491nk6g8rzrb4n75yqdfp3xpiv569nqblaiq33ibl9ndx"; }; patches = [ diff --git a/pkgs/applications/version-management/smartgithg/default.nix b/pkgs/applications/version-management/smartgithg/default.nix index f2a2fadae8c..ccea8ffb3f2 100644 --- a/pkgs/applications/version-management/smartgithg/default.nix +++ b/pkgs/applications/version-management/smartgithg/default.nix @@ -7,7 +7,7 @@ }: let - the_version = "6_5_7"; + the_version = "6_5_9"; in @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://www.syntevo.com/downloads/smartgit/" + "smartgit-generic-${the_version}.tar.gz"; - sha256 = "0db4dxp0dl173z9r8n25zdl1il240p751d2f77cw0nmyibik7q4l"; + sha256 = "09bvx1jgaqfxg8qv9f306bgh3k057shsi2xllxv1vw3xf0pvkbwa"; }; buildInputs = [ |