Merge pull request #1 from avieth/avieth/misc-patches

Bring `avieth/misc-patches` into `MercuryTechnologies/ours`

Author: parsonsmatt

lib/cabal-project-parser.nix

@@ -84,6 +84,8 @@ let
     subdirs = if repo ? subdir
       then pkgs.lib.filter (x: x != "") (pkgs.lib.splitString " " repo.subdir)
       else ["."];
+    # All repos served via ssh or git protocols are usually private
+    is-private = pkgs.lib.substring 0 4 repo.location != "http";
   };
 
   # Parse a source-repository-package and return data of `type: git` repositories

lib/call-cabal-project-to-nix.nix

@@ -227,13 +227,21 @@ let
                 (if inputMap.${repoData.url}.rev != repoData.ref
                   then throw "${inputMap.${repoData.url}.rev} may not match ${repoData.ref} for ${repoData.url} use \"${repoData.url}/${repoData.ref}\" as the inputMap key if ${repoData.ref} is a branch or tag that points to ${inputMap.${repoData.url}.rev}."
                   else inputMap.${repoData.url})
-            else if repoData.sha256 != null
+            else if repoData.sha256 != null && !repoData.is-private
               then fetchgit { inherit (repoData) url sha256; rev = repoData.ref; }
             else
-              let drv = builtins.fetchGit { inherit (repoData) url ref; };
-              in __trace "WARNING: No sha256 found for source-repository-package ${repoData.url} ${repoData.ref} download may fail in restricted mode (hydra)"
-                (__trace "Consider adding `--sha256: ${hashPath drv}` to the ${cabalProjectFileName} file or passing in a sha256map argument"
-                 drv);
+              let
+                # If the "tag" is a hash, we'll use 'rev', otherwise we'll use
+                # 'ref'. Using a commit hash as a 'ref' doesn't do what we want.
+                refOrRev = if builtins.match "[0-9a-f]*" (repoData.ref) != null
+                  then { rev = repoData.ref; }
+                  else { inherit (repoData) ref; };
+                drv = builtins.fetchGit ({ inherit (repoData) url; } // refOrRev);
+                maybeTrace = x: if repoData.sha256 != null then x else
+                  __trace "WARNING: No sha256 found for source-repository-package ${repoData.url} ${repoData.ref} download may fail in restricted mode (hydra)"
+                  (__trace "Consider adding `--sha256: ${hashPath drv}` to the ${cabalProjectFileName} file or passing in a sha256map argument"
+                   x);
+              in maybeTrace drv;
         in {
           # Download the source-repository-package commit and add it to a minimal git
           # repository that `cabal` will be able to access from a non fixed output derivation.

lib/pkgconf-nixpkgs-map.nix

@@ -45,6 +45,7 @@ pkgs:
     "gstreamer-plugins-base-0.10"        = [ "gst-plugins-base" ];
     "gstreamer-video-1.0"                = [ "gst-plugins-base" ];
     "gtk-x11-2.0"                        = [ "gtk_x11" ];
+    "ical"                               = [ "libical" ];
     "icudata"                            = [ "icu" ];
     "icui18n"                            = [ "icu" ];
     "icuuc"                              = [ "icu" ];
@@ -5742,4 +5743,4 @@ pkgs:
       else if pkgs ? gdk_pixbuf
         then [ pkgs.gdk_pixbuf ]
       else [];
-}
+}

lib/system-nixpkgs-map.nix

@@ -95,6 +95,7 @@ in
   # compile C sources (https://github.com/fpco/odbc/blob/master/cbits/odbc.c)
   odbc = [ unixODBC ];
   opencv = [ opencv3 ];
+  ical = [ libical ];
   icuuc = [ icu ];
   icui18n = [ icu ];
   icu-i18n = [ icu ];
@@ -114,6 +115,7 @@ in
   GeoIP = [ geoip ];
   pulse-simple = [ libpulseaudio ];
   oath = [ liboauth ];
+  mcrypt = [ libmcrypt ];
 }
 # -- windows
 // { advapi32 = null; gdi32 = null; imm32 = null; msimg32 = null;