Merge remote-tracking branch 'upstream/master' into HEAD

3 files changed, 58 insertions, 3 deletions

diff --git a/pkgs/development/python-modules/conda/default.nix b/pkgs/development/python-modules/conda/default.nix
new file mode 100644
index 000000000000..a240ea21e3e4
--- /dev/null
+++ b/pkgs/development/python-modules/conda/default.nix
@@ -0,0 +1,34 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, pycosat
+, requests
+, ruamel_yaml
+, isPy3k
+, enum34
+}:
+
+# Note: this installs conda as a library. The application cannot be used.
+# This is likely therefore NOT what you're looking for.
+
+buildPythonPackage rec {
+  pname = "conda";
+  version = "4.3.16";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "a91ef821343dea3ba9670f3d10b36c1ace4f4c36d70c175d8fc8886e94285953";
+  };
+
+  propagatedBuildInputs = [ pycosat requests ruamel_yaml ] ++ lib.optional (!isPy3k) enum34;
+
+  # No tests
+  doCheck = false;
+
+  meta = {
+    description = "OS-agnostic, system-level binary package manager";
+    homepage = https://github.com/conda/conda;
+    license = lib.licenses.bsd3;
+  };
+
+}
\ No newline at end of file
diff --git a/pkgs/development/python-modules/pybfd/default.nix b/pkgs/development/python-modules/pybfd/default.nix
index ee1a79955740..0ac437bfb293 100644
--- a/pkgs/development/python-modules/pybfd/default.nix
+++ b/pkgs/development/python-modules/pybfd/default.nix
@@ -1,15 +1,15 @@
 { lib, fetchFromGitHub, buildPythonPackage, isPyPy, isPy3k, libbfd, libopcodes }:
 
 buildPythonPackage rec {
-  name = "pybfd-0.1.1";
+  name = "pybfd-0.1.1.2017-12-31";
 
   disabled = isPyPy || isPy3k;
 
   src = fetchFromGitHub {
     owner = "orivej";
     repo = "pybfd";
-    rev = "a2c3a7b94a3c9f7a353b863f69a79174c6a41ebe";
-    sha256 = "0wrz234dz25hs0ajzcz5w8lzc1yzf64wqa8fj01hhr4yy23vjkcr";
+    rev = "a10ada53f2a79de7f62f209567806ef1e91794c7";
+    sha256 = "0sxzhlqjyvvx1zr3qrkb57z6s3g6k3ksyn65fdm9lvl0k4dv2k9w";
   };
 
   LIBBFD_INCLUDE_DIR = "${libbfd.dev}/include";
diff --git a/pkgs/development/python-modules/pycosat/default.nix b/pkgs/development/python-modules/pycosat/default.nix
new file mode 100644
index 000000000000..ad49e38d0658
--- /dev/null
+++ b/pkgs/development/python-modules/pycosat/default.nix
@@ -0,0 +1,21 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+}:
+
+buildPythonPackage rec {
+  pname = "pycosat";
+  version = "0.6.3";
+
+  src = fetchPypi {
+    inherit pname version;
+    extension = "zip";
+    sha256 = "4c99874946a7e939bb941bbb019dd2c20e6068e3107c91366e7779c69d70e0ed";
+  };
+
+  meta = {
+    description = "Bindings to picosat SAT solver";
+    homepage = https://github.com/ContinuumIO/pycosat;
+    license = lib.licenses.mit;
+  };
+}
\ No newline at end of file