public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into x-updates

Browse Source 
Conflicts (just different styles, same semantics):
	pkgs/development/libraries/libusb1/default.nix
This commit is contained in:
Vladimír Čunát
2013-12-07 14:17:16 +01:00
parent 7e9b24c8f1 50493458bd
commit 6690c97569
141 changed files with 3022 additions and 990 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/python-modules/pycrypto/default.nix
View File

@@ -1,12 +1,12 @@
{ stdenv, fetchurl, python, buildPythonPackage, gmp }:
buildPythonPackage rec {
name = "pycrypto-2.6";
name = "pycrypto-2.6.1";
namePrefix = "";
src = fetchurl {
url = "http://pypi.python.org/packages/source/p/pycrypto/${name}.tar.gz";
md5 = "88dad0a270d1fe83a39e0467a66a22bb";
sha256 = "0g0ayql5b9mkjam8hym6zyg6bv77lbh66rv1fyvgqb17kfc1xkpj";
};
buildInputs = [ python gmp ];

4
pkgs/development/python-modules/pyopenssl/default.nix
View File

@@ -2,7 +2,7 @@ a :
let
fetchurl = a.fetchurl;
version = a.lib.attrByPath ["version"] "0.13" a;
version = a.lib.attrByPath ["version"] "0.13.1" a;
propagatedBuildInputs = with a; [
openssl python
];
@@ -10,7 +10,7 @@ in
rec {
src = fetchurl {
url = "http://pypi.python.org/packages/source/p/pyOpenSSL/pyOpenSSL-${version}.tar.gz";
sha256 = "21e12b03abaa0e04ecc8cd9c251598f71bae11c9f385304234e4ea5618c6163b";
sha256 = "1nrg2kas0wsv65j8sia8zkkc6ir5i20lrhkfavjxzxhl0iqyq1ms";
};
inherit propagatedBuildInputs;