From 85578d67a5c8f287b51db3904cfe4be0d30a0cf6 Mon Sep 17 00:00:00 2001
From: Sebastien Bourdeauducq <sb@m-labs.hk>
Date: Fri, 15 Feb 2019 22:47:13 +0800
Subject: [PATCH] git is no longer necessary in the conda installation

---
 artiq/conda-build.nix | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/artiq/conda-build.nix b/artiq/conda-build.nix
index 416beb2..4116f5f 100644
--- a/artiq/conda-build.nix
+++ b/artiq/conda-build.nix
@@ -20,20 +20,9 @@ let
     targetPkgs = pkgs: ([ condaSrcChmod ] ++ condaDeps);
   };
 
-  # Git depends on libiconv
-  condaIconv = fetchurl {
-    url = "https://anaconda.org/conda-forge/libiconv/1.15/download/linux-64/libiconv-1.15-h14c3975_1004.tar.bz2";
-    sha256 = "167j8jpr6mnyrzwp18dr52xr3xjsf39q452ag247ijlmp092v8ns";
-  };
-  condaGit = fetchurl {
-    url = "https://anaconda.org/conda-forge/git/2.20.1/download/linux-64/git-2.20.1-pl526hc122a05_1001.tar.bz2";
-    sha256 = "03s01xq2jj7zbx7jfzz6agy40jj7xkq6dwar3lw1z5j2rbmh8h0h";
-  };
   condaInstalled = runCommand "conda-installed" { }
     ''
     ${condaInstallerEnv}/bin/conda-installer-env -c "${condaSrcChmod}/conda-installer.sh -p $out -b"
-    ${condaInstallerEnv}/bin/conda-installer-env -c "$out/bin/conda install ${condaIconv}"
-    ${condaInstallerEnv}/bin/conda-installer-env -c "$out/bin/conda install ${condaGit}"
     '';
   condaBuilderEnv = buildFHSUserEnv {
     name = "conda-builder-env";