Merge staging into closure-size

The most complex problems were from dealing with switches reverted in
the meantime (gcc5, gmp6, ncurses6).
It's likely that darwin is (still) broken nontrivially.

7 files changed, 75 insertions, 9 deletions

diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix
index 6a365dc69a51..6d832f9778f0 100644
--- a/pkgs/applications/version-management/git-and-tools/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/default.nix
@@ -71,6 +71,8 @@ rec {
 
   tig = callPackage ./tig { };
 
+  transcrypt = callPackage ./transcrypt { };
+
   hub = import ./hub {
     inherit go;
     inherit stdenv fetchgit;
diff --git a/pkgs/applications/version-management/git-and-tools/git-crypt/default.nix b/pkgs/applications/version-management/git-and-tools/git-crypt/default.nix
index c13c5e070011..c0acb13740a8 100644
--- a/pkgs/applications/version-management/git-and-tools/git-crypt/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-crypt/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
     make install PREFIX=$out
   '';
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = "https://www.agwa.name/projects/git-crypt";
     description = "transparent file encryption in git";
     longDescription = ''
@@ -33,9 +33,9 @@ stdenv.mkDerivation rec {
       entire repository.
     '';
     downloadPage = "https://github.com/AGWA/git-crypt/releases";
-    license = stdenv.lib.licenses.gpl3;
+    license = licenses.gpl3;
     version = "0.5.0";
-    maintainers = [ "Desmond O. Chang <dochang@gmail.com>" ];
+    maintainers = [ maintainers.dochang ];
   };
 
 }
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 0710e38c9414..0f0793149594 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.5.3";
+  version = "2.6.3";
   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 = "06is8pq8gsia3dav8mgl2zlvms2ny4hs1x0w2792ya51azc2jk8j";
+    sha256 = "18vxb5fmwmrps504m23a4xdl29m7ibca3hmz0mn9jc38sz9y95yn";
   };
 
   patches = [
diff --git a/pkgs/applications/version-management/git-and-tools/tig/default.nix b/pkgs/applications/version-management/git-and-tools/tig/default.nix
index 4c8430ed5c5f..362897d0e720 100644
--- a/pkgs/applications/version-management/git-and-tools/tig/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/tig/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, ncurses, asciidoc, xmlto, docbook_xsl, docbook_xml_dtd_45
-, readline, makeWrapper, git
+, readline, makeWrapper, git, libiconv
 }:
 
 stdenv.mkDerivation rec {
@@ -10,7 +10,8 @@ stdenv.mkDerivation rec {
     sha256 = "0bw5wivswwh7vx897q8xc2cqgkqhdzk8gh6fnav2kf34sngigiah";
   };
 
-  buildInputs = [ ncurses asciidoc xmlto docbook_xsl readline git makeWrapper ];
+  buildInputs = [ ncurses asciidoc xmlto docbook_xsl readline git makeWrapper ]
+    ++ stdenv.lib.optionals stdenv.isDarwin [ libiconv ];
 
   preConfigure = ''
     export XML_CATALOG_FILES='${docbook_xsl}/xml/xsl/docbook/catalog.xml ${docbook_xml_dtd_45}/xml/dtd/docbook/catalog.xml'
diff --git a/pkgs/applications/version-management/git-and-tools/transcrypt/default.nix b/pkgs/applications/version-management/git-and-tools/transcrypt/default.nix
new file mode 100644
index 000000000000..2f42705c2b86
--- /dev/null
+++ b/pkgs/applications/version-management/git-and-tools/transcrypt/default.nix
@@ -0,0 +1,35 @@
+{ stdenv, fetchurl, git, openssl }:
+
+stdenv.mkDerivation rec {
+  name = "transcrypt-0.9.7";
+
+  src = fetchurl {
+    url = https://github.com/elasticdog/transcrypt/archive/v0.9.7.tar.gz;
+    sha256 = "0pgrf74wdc7whvwz7lkkq6qfk38n37dc5668baq7czgckibvjqdh";
+  };
+
+  buildInputs = [ git openssl ];
+
+  installPhase = ''
+    install -m 755 -D transcrypt $out/bin/transcrypt
+    install -m 644 -D man/transcrypt.1 $out/share/man/man1/transcrypt.1
+    install -m 644 -D contrib/bash/transcrypt $out/share/bash-completion/completions/transcrypt
+    install -m 644 -D contrib/zsh/_transcrypt $out/share/zsh/site-functions/_transcrypt
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Transparently encrypt files within a Git repository";
+    longDescription = ''
+      A script to configure transparent encryption of sensitive files stored in
+      a Git repository. Files that you choose will be automatically encrypted
+      when you commit them, and automatically decrypted when you check them
+      out. The process will degrade gracefully, so even people without your
+      encryption password can safely commit changes to the repository's
+      non-encrypted files.
+    '';
+    homepage = https://github.com/elasticdog/transcrypt;
+    license = licenses.mit;
+    maintainers = [ maintainers.elasticdog ];
+    platforms = platforms.all;
+  };
+}
diff --git a/pkgs/applications/version-management/mercurial/default.nix b/pkgs/applications/version-management/mercurial/default.nix
index 5a44240fa769..0557b8a2c55e 100644
--- a/pkgs/applications/version-management/mercurial/default.nix
+++ b/pkgs/applications/version-management/mercurial/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, python, makeWrapper, docutils, unzip, hg-git, dulwich
 , guiSupport ? false, tk ? null, hg-crecord ? null, curses
-, ApplicationServices }:
+, ApplicationServices, cf-private }:
 
 let
   version = "3.5.1";
@@ -20,7 +20,8 @@ stdenv.mkDerivation {
 
   buildInputs = [ python makeWrapper docutils unzip ];
 
-  propagatedBuildInputs = stdenv.lib.optional stdenv.isDarwin ApplicationServices;
+  propagatedBuildInputs = stdenv.lib.optionals stdenv.isDarwin
+    [ ApplicationServices cf-private ];
 
   makeFlags = "PREFIX=$(out)";
 
diff --git a/pkgs/applications/version-management/pijul/default.nix b/pkgs/applications/version-management/pijul/default.nix
new file mode 100644
index 000000000000..f00e22bb385c
--- /dev/null
+++ b/pkgs/applications/version-management/pijul/default.nix
@@ -0,0 +1,27 @@
+{ stdenv, fetchdarcs, ocaml, findlib, cryptokit, yojson, lmdb, zlib }:
+
+stdenv.mkDerivation rec {
+  name = "pijul-${version}";
+  version = "0.1";
+
+  src = fetchdarcs {
+    url = "http://pijul.org/";
+    rev = version;
+    sha256 = "0r189xx900w4smq6nyy1wnrjf9sgqrqw5as0l7k6gq0ra36szzff";
+  };
+
+  buildInputs = [ ocaml findlib cryptokit yojson lmdb zlib ];
+
+  installPhase = ''
+    mkdir -p $out/bin
+    cp pijul $out/bin/
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = https://pijul.org/;
+    description = "Fast DVCS based on a categorical theory of patches";
+    license = licenses.gpl3;
+    platforms = stdenv.lib.platforms.unix;
+    maintainers = with maintainers; [ puffnfresh ];
+  };
+}