summary refs log tree commit diff
path: root/pkgs/applications/version-management
diff options
context:
space:
mode:
authorJörg Thalheim <Mic92@users.noreply.github.com>2018-07-21 15:41:22 +0100
committerGitHub <noreply@github.com>2018-07-21 15:41:22 +0100
commit218298b30fe79be30716438a1906d1abd61b9377 (patch)
tree65e0041ee5468689142d669c4c4fc4f73f3618ba /pkgs/applications/version-management
parentcd6e2c9642b8e608c905f350cece21141435deef (diff)
parente85db6863a546cfdde0150f03ed0d2db28992575 (diff)
downloadnixpkgs-218298b30fe79be30716438a1906d1abd61b9377.tar
nixpkgs-218298b30fe79be30716438a1906d1abd61b9377.tar.gz
nixpkgs-218298b30fe79be30716438a1906d1abd61b9377.tar.bz2
nixpkgs-218298b30fe79be30716438a1906d1abd61b9377.tar.lz
nixpkgs-218298b30fe79be30716438a1906d1abd61b9377.tar.xz
nixpkgs-218298b30fe79be30716438a1906d1abd61b9377.tar.zst
nixpkgs-218298b30fe79be30716438a1906d1abd61b9377.zip
Merge branch 'master' into unused5
Diffstat (limited to 'pkgs/applications/version-management')
-rw-r--r--pkgs/applications/version-management/git-and-tools/git-cola/default.nix2
-rw-r--r--pkgs/applications/version-management/gitkraken/default.nix4
-rw-r--r--pkgs/applications/version-management/mercurial/default.nix4
3 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/applications/version-management/git-and-tools/git-cola/default.nix b/pkgs/applications/version-management/git-and-tools/git-cola/default.nix
index 9bccbdb5049..63894cc3dcd 100644
--- a/pkgs/applications/version-management/git-and-tools/git-cola/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-cola/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, pythonPackages, gettext, git }:
 
 let
-  inherit (pythonPackages) buildPythonApplication pyqt5 sip pyinotify python mock;
+  inherit (pythonPackages) buildPythonApplication pyqt5 sip pyinotify;
 in buildPythonApplication rec {
   name = "git-cola-${version}";
   version = "3.1";
diff --git a/pkgs/applications/version-management/gitkraken/default.nix b/pkgs/applications/version-management/gitkraken/default.nix
index 3fb9b9492af..9a7609684b5 100644
--- a/pkgs/applications/version-management/gitkraken/default.nix
+++ b/pkgs/applications/version-management/gitkraken/default.nix
@@ -12,11 +12,11 @@ let
 in
 stdenv.mkDerivation rec {
   name = "gitkraken-${version}";
-  version = "3.6.4";
+  version = "3.6.6";
 
   src = fetchurl {
     url = "https://release.gitkraken.com/linux/v${version}.deb";
-    sha256 = "0n14lwmga0hhi4m4pwgpzpxmsmfy6an7b2pk59afsydhxjj88z4x";
+    sha256 = "01ir325ls1fb6ml79c02c7dyi910lxw0avlwc0nzv8fy4aqavl6p";
   };
 
   libPath = makeLibraryPath [
diff --git a/pkgs/applications/version-management/mercurial/default.nix b/pkgs/applications/version-management/mercurial/default.nix
index d786e939675..a4cb1f5b63b 100644
--- a/pkgs/applications/version-management/mercurial/default.nix
+++ b/pkgs/applications/version-management/mercurial/default.nix
@@ -56,8 +56,8 @@ in python2Packages.buildPythonApplication {
   meta = {
     inherit version;
     description = "A fast, lightweight SCM system for very large distributed projects";
-    homepage = http://mercurial.selenic.com/;
-    downloadPage = "http://mercurial.selenic.com/release/";
+    homepage = https://www.mercurial-scm.org;
+    downloadPage = https://www.mercurial-scm.org/release/;
     license = stdenv.lib.licenses.gpl2;
     maintainers = [ stdenv.lib.maintainers.eelco ];
     updateWalker = true;