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

Merge commit older staging

Browse Source 
No new failures on Hydra.
This commit is contained in:
Vladimír Čunát 2017-03-05 08:00:42 +01:00
commit 2839b101f9
No known key found for this signature in database
GPG Key ID: E747DF1F9575A3AA
3 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/development/interpreters/python/cpython/3.4/default.nix
View File

@ -34,7 +34,7 @@ let
sitePackages = "lib/${libPrefix}/site-packages"; sitePackages = "lib/${libPrefix}/site-packages";
buildInputs = filter (p: p != null) [ 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 x11Support [ tcl tk libX11 xproto ]
++ optionals stdenv.isDarwin [ CF configd ]; ++ optionals stdenv.isDarwin [ CF configd ];

2
pkgs/development/interpreters/python/cpython/3.6/default.nix
View File

@ -34,7 +34,7 @@ let
sitePackages = "lib/${libPrefix}/site-packages"; sitePackages = "lib/${libPrefix}/site-packages";
buildInputs = filter (p: p != null) [ 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 x11Support [ tcl tk libX11 xproto ]
++ optionals stdenv.isDarwin [ CF configd ]; ++ optionals stdenv.isDarwin [ CF configd ];

17
pkgs/development/libraries/snappy/default.nix
View File

@ -1,17 +1,18 @@
{ stdenv, fetchFromGitHub, pkgconfig, autoreconfHook }: { stdenv, fetchurl, pkgconfig }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "snappy-${version}"; name = "snappy-${version}";
version = "1.1.3"; version = "1.1.4";
src = fetchFromGitHub { src = fetchurl {
owner = "google"; url = "http://github.com/google/snappy/releases/download/${version}/"
repo = "snappy"; + "snappy-${version}.tar.gz";
rev = version; sha256 = "0mq0nz8gbi1sp3y6xcg0a6wbvnd6gc717f3vh2xrjmfj5w9gwjqk";
sha256 = "1w9pq8vag8c6m4ib0qbdbqzsnpwjvw01jbp15lgwg1rzwhvflm10";
}; };
nativeBuildInputs = [ pkgconfig autoreconfHook ]; outputs = [ "out" "dev" "doc" ];
nativeBuildInputs = [ pkgconfig ];
# -DNDEBUG for speed # -DNDEBUG for speed
configureFlags = [ "CXXFLAGS=-DNDEBUG" ]; configureFlags = [ "CXXFLAGS=-DNDEBUG" ];