diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2017-03-24 21:07:55 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2017-03-24 21:07:55 +0100 |
| commit | 455ce3528c9caddf4aea774388707da13bf52ef3 (patch) | |
| tree | defbc9f4831074917cd93eb5ebe9ce225276c045 /pkgs/applications/version-management | |
| parent | 9a777013d1d34acc4ea217a7f09bfab96c6be50f (diff) | |
| parent | c1a9dc3d3753ee02eff4ffdcf6a0238554afd243 (diff) | |
| download | nixlib-455ce3528c9caddf4aea774388707da13bf52ef3.tar nixlib-455ce3528c9caddf4aea774388707da13bf52ef3.tar.gz nixlib-455ce3528c9caddf4aea774388707da13bf52ef3.tar.bz2 nixlib-455ce3528c9caddf4aea774388707da13bf52ef3.tar.lz nixlib-455ce3528c9caddf4aea774388707da13bf52ef3.tar.xz nixlib-455ce3528c9caddf4aea774388707da13bf52ef3.tar.zst nixlib-455ce3528c9caddf4aea774388707da13bf52ef3.zip | |
Merge branch 'staging'
Diffstat (limited to 'pkgs/applications/version-management')
3 files changed, 2 insertions, 13 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 af5fc8a8be46..d6cc205bbae4 100644 --- a/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -30,7 +30,6 @@ stdenv.mkDerivation { ./symlinks-in-bin.patch ./git-sh-i18n.patch ./ssh-path.patch - ./ssl-cert-file.patch ]; postPatch = '' diff --git a/pkgs/applications/version-management/git-and-tools/git/ssl-cert-file.patch b/pkgs/applications/version-management/git-and-tools/git/ssl-cert-file.patch deleted file mode 100644 index bafd65e8c93e..000000000000 --- a/pkgs/applications/version-management/git-and-tools/git/ssl-cert-file.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -ru git-2.7.4-orig/http.c git-2.7.4/http.c ---- git-2.7.4-orig/http.c 2016-03-17 21:47:59.000000000 +0100 -+++ git-2.7.4/http.c 2016-04-12 11:38:33.187070848 +0200 -@@ -544,6 +544,7 @@ - #if LIBCURL_VERSION_NUM >= 0x070908 - set_from_env(&ssl_capath, "GIT_SSL_CAPATH"); - #endif -+ set_from_env(&ssl_cainfo, "SSL_CERT_FILE"); - set_from_env(&ssl_cainfo, "GIT_SSL_CAINFO"); - - set_from_env(&user_agent, "GIT_HTTP_USER_AGENT"); diff --git a/pkgs/applications/version-management/mercurial/default.nix b/pkgs/applications/version-management/mercurial/default.nix index 034eb5344234..1c97f7252f56 100644 --- a/pkgs/applications/version-management/mercurial/default.nix +++ b/pkgs/applications/version-management/mercurial/default.nix @@ -7,8 +7,9 @@ let version = "3.9.2"; name = "mercurial-${version}"; inherit (python2Packages) docutils hg-git dulwich python; -in python2Packages.mkPythonDerivation { +in python2Packages.buildPythonApplication { inherit name; + format = "other"; src = fetchurl { url = "https://mercurial-scm.org/release/${name}.tar.gz"; |