diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2017-03-05 08:00:42 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2017-03-05 08:00:42 +0100 |
| commit | 2839b101f927be5daab7948421de00a6f6c084ae (patch) | |
| tree | 985ced930cdb274ef303a2a2674f3868477ff58c /pkgs | |
| parent | e6150d8be9811b72449aad0d106b9417b6036813 (diff) | |
| parent | da3467003341d400985ba0a7f809c866dbffbb11 (diff) | |
| download | nixlib-2839b101f927be5daab7948421de00a6f6c084ae.tar nixlib-2839b101f927be5daab7948421de00a6f6c084ae.tar.gz nixlib-2839b101f927be5daab7948421de00a6f6c084ae.tar.bz2 nixlib-2839b101f927be5daab7948421de00a6f6c084ae.tar.lz nixlib-2839b101f927be5daab7948421de00a6f6c084ae.tar.xz nixlib-2839b101f927be5daab7948421de00a6f6c084ae.tar.zst nixlib-2839b101f927be5daab7948421de00a6f6c084ae.zip | |
Merge commit older staging
No new failures on Hydra.
Diffstat (limited to 'pkgs')
3 files changed, 11 insertions, 10 deletions
diff --git a/pkgs/development/interpreters/python/cpython/3.4/default.nix b/pkgs/development/interpreters/python/cpython/3.4/default.nix index 143dbcd5686e..58e4f21bb4a1 100644 --- a/pkgs/development/interpreters/python/cpython/3.4/default.nix +++ b/pkgs/development/interpreters/python/cpython/3.4/default.nix @@ -34,7 +34,7 @@ let sitePackages = "lib/${libPrefix}/site-packages"; buildInputs = filter (p: p != null) [ - zlib bzip2 lzma gdbm sqlite readline ncurses openssl ] + zlib bzip2 expat lzma libffi gdbm sqlite readline ncurses openssl ] ++ optionals x11Support [ tcl tk libX11 xproto ] ++ optionals stdenv.isDarwin [ CF configd ]; diff --git a/pkgs/development/interpreters/python/cpython/3.6/default.nix b/pkgs/development/interpreters/python/cpython/3.6/default.nix index ebf621d50576..2acca2b8a3cf 100644 --- a/pkgs/development/interpreters/python/cpython/3.6/default.nix +++ b/pkgs/development/interpreters/python/cpython/3.6/default.nix @@ -34,7 +34,7 @@ let sitePackages = "lib/${libPrefix}/site-packages"; buildInputs = filter (p: p != null) [ - zlib bzip2 lzma gdbm sqlite readline ncurses openssl ] + zlib bzip2 expat lzma libffi gdbm sqlite readline ncurses openssl ] ++ optionals x11Support [ tcl tk libX11 xproto ] ++ optionals stdenv.isDarwin [ CF configd ]; diff --git a/pkgs/development/libraries/snappy/default.nix b/pkgs/development/libraries/snappy/default.nix index 50e4534f162c..a31fa1f0516d 100644 --- a/pkgs/development/libraries/snappy/default.nix +++ b/pkgs/development/libraries/snappy/default.nix @@ -1,17 +1,18 @@ -{ stdenv, fetchFromGitHub, pkgconfig, autoreconfHook }: +{ stdenv, fetchurl, pkgconfig }: stdenv.mkDerivation rec { name = "snappy-${version}"; - version = "1.1.3"; + version = "1.1.4"; - src = fetchFromGitHub { - owner = "google"; - repo = "snappy"; - rev = version; - sha256 = "1w9pq8vag8c6m4ib0qbdbqzsnpwjvw01jbp15lgwg1rzwhvflm10"; + src = fetchurl { + url = "http://github.com/google/snappy/releases/download/${version}/" + + "snappy-${version}.tar.gz"; + sha256 = "0mq0nz8gbi1sp3y6xcg0a6wbvnd6gc717f3vh2xrjmfj5w9gwjqk"; }; - nativeBuildInputs = [ pkgconfig autoreconfHook ]; + outputs = [ "out" "dev" "doc" ]; + + nativeBuildInputs = [ pkgconfig ]; # -DNDEBUG for speed configureFlags = [ "CXXFLAGS=-DNDEBUG" ]; |