Merge a subset of staging (security)
In particular, this contains Firefox-related and libgcrypt updates. Other larger rebuilds would apparently need lots of time to catch up on Hydra, due to nontrivial rebuilds in other branches than staging.
This commit is contained in:
Vladimír Čunát
commit
31530c185e
@ -4,7 +4,6 @@
|
||||
pythonPackages.buildPythonApplication rec {
|
||||
pname = "pithos";
|
||||
version = "1.1.2";
|
||||
name = "${pname}-${version}";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = pname;
|
||||
|
||||
@ -1,7 +1,6 @@
|
||||
{ stdenv, pythonPackages, fetchFromGitHub }:
|
||||
|
||||
pythonPackages.buildPythonApplication rec {
|
||||
name = "${pname}-${version}";
|
||||
pname = "dosage";
|
||||
version = "2018.04.08";
|
||||
PBR_VERSION = version;
|
||||
|
||||
@ -7,7 +7,6 @@ with python.pkgs;
|
||||
buildPythonApplication rec {
|
||||
pname = "jrnl";
|
||||
version = "1.9.8";
|
||||
name = "${pname}-${version}";
|
||||
disabled = isPy3k;
|
||||
|
||||
src = fetchPypi {
|
||||
|
||||
@ -3,7 +3,6 @@
|
||||
with python3Packages;
|
||||
|
||||
buildPythonApplication rec {
|
||||
name = "${pname}-${version}";
|
||||
pname = "khal";
|
||||
version = "0.9.9";
|
||||
|
||||
|
||||
@ -4,7 +4,6 @@ let
|
||||
inherit (python.pkgs) buildPythonApplication fetchPypi requests;
|
||||
in
|
||||
buildPythonApplication rec {
|
||||
name = "${pname}-${version}";
|
||||
pname = "tzupdate";
|
||||
version = "1.2.0";
|
||||
|
||||
|
||||
@ -24,10 +24,10 @@ rec {
|
||||
|
||||
firefox = common rec {
|
||||
pname = "firefox";
|
||||
version = "60.0.1";
|
||||
version = "60.0.2";
|
||||
src = fetchurl {
|
||||
url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
|
||||
sha512 = "083bhfh32dy1cz4c4wn92i2lnl9mqikkd9dlkwd5i6clyjb9pc6d5g87kvb8si0n6jll4alyhw792j56a7gmzny3d93068hr4zyh3qn";
|
||||
sha512 = "2my4v8al3swwbiqcp3a5y89imly6apc2p9q0cbkhbiz0sqylc0l02jh0qp95migmik56m4prwqdi81kgqs7cw5r2np3mm6sc1b45mkg";
|
||||
};
|
||||
|
||||
patches = nixpkgsPatches ++ [
|
||||
@ -47,10 +47,10 @@ rec {
|
||||
|
||||
firefox-esr-52 = common rec {
|
||||
pname = "firefox-esr";
|
||||
version = "52.8.0esr";
|
||||
version = "52.8.1esr";
|
||||
src = fetchurl {
|
||||
url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
|
||||
sha512 = "4136fa582e4ffd754d46a79bdb562bd12da4d013d87dfe40fa92addf377e95f5f642993c8b783edd5290089619beeb5a907a0810b68b8808884f087986977df1";
|
||||
sha512 = "a4883550fdf62e66b10f1de7416d3614a2cb0ce3a004d9a79ecc37a726794d7bbdb0a6767faab4ea97278d2192462597551fc13b7e9a9c38d043c2879d51095a";
|
||||
};
|
||||
|
||||
patches = nixpkgsPatches;
|
||||
@ -66,10 +66,10 @@ rec {
|
||||
|
||||
firefox-esr-60 = common rec {
|
||||
pname = "firefox-esr";
|
||||
version = "60.0.1esr";
|
||||
version = "60.0.2esr";
|
||||
src = fetchurl {
|
||||
url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
|
||||
sha512 = "2kswaf2d8qbhx1ry4ai7y2hr8cprpm00wwdr9qwpdr31m7w0jzndh0fn7jn1f57s42j6jk0jg78d34x10p2rvdii8hrbbr9q9sw8v4b";
|
||||
sha512 = "0vbilh4iwqfzkj598zbgkmwbkxh4bia8gn7p9x6xd7yvhb6708p4dfkkbg61hdh3bddyaxx1zd0wi8qxfxbrx19mc6k9dpc6xz52iy1";
|
||||
};
|
||||
|
||||
patches = nixpkgsPatches ++ [
|
||||
|
||||
@ -6,7 +6,6 @@ in
|
||||
buildPythonApplication rec {
|
||||
pname = "fava";
|
||||
version = "1.7";
|
||||
name = "${pname}-${version}";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
@ -26,4 +25,3 @@ buildPythonApplication rec {
|
||||
maintainers = with stdenv.lib.maintainers; [ ];
|
||||
};
|
||||
}
|
||||
|
||||
|
||||
@ -13,7 +13,7 @@ set -u
|
||||
bintoolsWrapper_addLDVars () {
|
||||
# See ../setup-hooks/role.bash
|
||||
local role_post role_pre
|
||||
getTargetRoleEnvHook
|
||||
getHostRoleEnvHook
|
||||
|
||||
if [[ -d "$1/lib64" && ! -L "$1/lib64" ]]; then
|
||||
export NIX_${role_pre}LDFLAGS+=" -L$1/lib64"
|
||||
|
||||
@ -68,7 +68,7 @@ set -u
|
||||
ccWrapper_addCVars () {
|
||||
# See ../setup-hooks/role.bash
|
||||
local role_post role_pre
|
||||
getTargetRoleEnvHook
|
||||
getHostRoleEnvHook
|
||||
|
||||
if [[ -d "$1/include" ]]; then
|
||||
export NIX_${role_pre}CFLAGS_COMPILE+=" ${ccIncludeFlag:--isystem} $1/include"
|
||||
|
||||
@ -58,6 +58,24 @@ let
|
||||
# if DETERMINISTIC_BUILD env var is set
|
||||
./deterministic-build.patch
|
||||
|
||||
# Fix python bug #27177 (https://bugs.python.org/issue27177)
|
||||
# The issue is that `match.group` only recognizes python integers
|
||||
# instead of everything that has `__index__`.
|
||||
# This bug was fixed upstream, but not backported to 2.7
|
||||
(fetchpatch {
|
||||
name = "re_match_index.patch";
|
||||
url = "https://bugs.python.org/file43084/re_match_index.patch";
|
||||
sha256 = "0l9rw6r5r90iybdkp3hhl2pf0h0s1izc68h5d3ywrm92pq32wz57";
|
||||
})
|
||||
|
||||
# "`type_getattro()` calls `tp_descr_get(self, obj, type)` without actually owning a reference to "self".
|
||||
# In very rare cases, this can cause a segmentation fault if "self" is deleted by the descriptor."
|
||||
# https://github.com/python/cpython/pull/6118
|
||||
(fetchpatch {
|
||||
name = "type_getattro.patch";
|
||||
url = "https://github.com/python/cpython/pull/6118/commits/8c6da2d7e7e719c40fb539b7f7cb7583cccc5527.patch";
|
||||
sha256 = "11v9yx20hs3jmw0wggzvmw39qs4mxay4kb8iq2qjydwy9ya61nrd";
|
||||
})
|
||||
] ++ optionals (x11Support && stdenv.isDarwin) [
|
||||
./use-correct-tcl-tk-on-darwin.patch
|
||||
] ++ optionals stdenv.isLinux [
|
||||
|
||||
@ -1,24 +1,43 @@
|
||||
{ stdenv, fetchurl, python, pkgconfig, popt, atk, libX11, libICE, xorg, libXi
|
||||
, intltool, dbus-glib, at-spi2-core, libSM }:
|
||||
{ stdenv
|
||||
, fetchurl
|
||||
|
||||
, meson
|
||||
, ninja
|
||||
, pkgconfig
|
||||
|
||||
, at-spi2-core
|
||||
, atk
|
||||
, dbus
|
||||
, glib
|
||||
, libxml2
|
||||
|
||||
, gnome3 # To pass updateScript
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
versionMajor = "2.26";
|
||||
versionMinor = "1";
|
||||
moduleName = "at-spi2-atk";
|
||||
name = "${moduleName}-${versionMajor}.${versionMinor}";
|
||||
name = "${pname}-${version}";
|
||||
pname = "at-spi2-atk";
|
||||
version = "2.26.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${moduleName}/${versionMajor}/${name}.tar.xz";
|
||||
sha256 = "0x9vc99ni46fg5dzlx67vbw0zqffr24gz8jvbdxbmzyvc5xw5w5l";
|
||||
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
|
||||
sha256 = "0vkan52ab9vrkknnv8y4f1cspk8x7xd10qx92xk9ys71p851z2b1";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkgconfig intltool ];
|
||||
buildInputs = [ python popt atk libX11 libICE xorg.libXtst libXi
|
||||
dbus-glib at-spi2-core libSM ];
|
||||
nativeBuildInputs = [ meson ninja pkgconfig ];
|
||||
buildInputs = [ at-spi2-core atk dbus glib libxml2 ];
|
||||
|
||||
doCheck = false; # needs dbus daemon
|
||||
passthru = {
|
||||
updateScript = gnome3.updateScript {
|
||||
packageName = pname;
|
||||
};
|
||||
};
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "D-Bus bridge for Assistive Technology Service Provider Interface (AT-SPI) and Accessibility Toolkit (ATK)";
|
||||
homepage = https://gitlab.gnome.org/GNOME/at-spi2-atk;
|
||||
license = licenses.lgpl2Plus; # NOTE: 2018-06-06: Please check the license when upstream sorts-out licensing: https://gitlab.gnome.org/GNOME/at-spi2-atk/issues/2
|
||||
maintainers = with maintainers; [ jtojnar gnome3.maintainers ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
||||
@ -1,31 +1,46 @@
|
||||
{ stdenv, fetchurl, python, pkgconfig, popt, gettext, dbus-glib
|
||||
, libX11, xextproto, libSM, libICE, libXtst, libXi, gobjectIntrospection }:
|
||||
{ stdenv
|
||||
, fetchurl
|
||||
|
||||
, meson
|
||||
, ninja
|
||||
, pkgconfig
|
||||
, gobjectIntrospection
|
||||
|
||||
, dbus
|
||||
, glib
|
||||
, libX11
|
||||
, libXtst # at-spi2-core can be build without X support, but due it is a client-side library, GUI-less usage is a very rare case
|
||||
, libXi
|
||||
|
||||
, gnome3 # To pass updateScript
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
versionMajor = "2.26";
|
||||
versionMinor = "2";
|
||||
moduleName = "at-spi2-core";
|
||||
name = "${moduleName}-${versionMajor}.${versionMinor}";
|
||||
name = "${pname}-${version}";
|
||||
pname = "at-spi2-core";
|
||||
version = "2.28.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${moduleName}/${versionMajor}/${name}.tar.xz";
|
||||
sha256 = "0596ghkamkxgv08r4a1pdhm06qd5zzgcfqsv64038w9xbvghq3n8";
|
||||
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
|
||||
sha256 = "11qwdxxx4jm0zj04xydlwah41axiz276dckkiql3rr0wn5x4i8j2";
|
||||
};
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
nativeBuildInputs = [ pkgconfig gettext gobjectIntrospection ];
|
||||
buildInputs = [
|
||||
python popt dbus-glib
|
||||
libX11 xextproto libSM libICE libXtst libXi
|
||||
];
|
||||
nativeBuildInputs = [ meson ninja pkgconfig gobjectIntrospection ];
|
||||
buildInputs = [ dbus glib libX11 libXtst libXi ];
|
||||
|
||||
# ToDo: on non-NixOS we create a symlink from there?
|
||||
configureFlags = "--with-dbus-daemondir=/run/current-system/sw/bin/";
|
||||
|
||||
doCheck = false; # needs dbus daemon
|
||||
passthru = {
|
||||
updateScript = gnome3.updateScript {
|
||||
packageName = pname;
|
||||
};
|
||||
};
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Assistive Technology Service Provider Interface protocol definitions and daemon for D-Bus";
|
||||
homepage = https://gitlab.gnome.org/GNOME/at-spi2-core;
|
||||
license = licenses.lgpl2Plus; # NOTE: 2018-06-06: Please check the license when upstream sorts-out licensing: https://gitlab.gnome.org/GNOME/at-spi2-core/issues/2
|
||||
maintainers = with maintainers; [ jtojnar gnome3.maintainers ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
||||
13
pkgs/development/libraries/boost/1.67.nix
Normal file
13
pkgs/development/libraries/boost/1.67.nix
Normal file
@ -0,0 +1,13 @@
|
||||
{ stdenv, callPackage, fetchurl, hostPlatform, buildPlatform, ... } @ args:
|
||||
|
||||
callPackage ./generic.nix (args // rec {
|
||||
version = "1.67_0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/boost/boost_1_67_0.tar.bz2";
|
||||
# SHA256 from http://www.boost.org/users/history/version_1_66_0.html
|
||||
sha256 = "2684c972994ee57fc5632e03bf044746f6eb45d4920c343937a465fd67a5adba";
|
||||
};
|
||||
|
||||
toolset = if stdenv.cc.isClang then "clang" else null;
|
||||
})
|
||||
@ -1,8 +1,11 @@
|
||||
{ fetchurl, stdenv, pkgconfig, gobjectIntrospection, clutter, gtk3, gnome3 }:
|
||||
{ fetchurl, stdenv, pkgconfig, meson, ninja
|
||||
, gobjectIntrospection, clutter, gtk3, gnome3 }:
|
||||
|
||||
let
|
||||
pname = "clutter-gtk";
|
||||
version = "1.8.4";
|
||||
in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "${pname}-${version}";
|
||||
|
||||
@ -12,7 +15,7 @@ stdenv.mkDerivation rec {
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ clutter gtk3 ];
|
||||
nativeBuildInputs = [ pkgconfig gobjectIntrospection ];
|
||||
nativeBuildInputs = [ meson ninja pkgconfig gobjectIntrospection ];
|
||||
|
||||
postBuild = "rm -rf $out/share/gtk-doc";
|
||||
|
||||
|
||||
@ -1,19 +1,23 @@
|
||||
{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig }:
|
||||
{ stdenv
|
||||
, fetchurl
|
||||
|
||||
, meson
|
||||
, ninja
|
||||
, pkgconfig
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "fribidi-${version}";
|
||||
version = "0.19.7";
|
||||
name = "${pname}-${version}";
|
||||
pname = "fribidi";
|
||||
version = "1.0.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fribidi";
|
||||
repo = "fribidi";
|
||||
rev = version;
|
||||
sha256 = "10q5jfch5qzrj2w4fbkr086ank66plx8hp7ra9a01irj80pbk96d";
|
||||
# NOTE: 2018-06-06 v1.0.4: Only URL tarball has "Have pre-generated man pages: true", which works-around upstream usage of some rare ancient `c2man` fossil application.
|
||||
src = fetchurl {
|
||||
url = "https://github.com/${pname}/${pname}/releases/download/v${version}/${name}.tar.bz2";
|
||||
sha256 = "1gipy8fjyn6i4qrhima02x8xs493d21f22dijp88nk807razxgcl";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook pkgconfig ];
|
||||
|
||||
# Configure script checks for glib, but it is only used for tests.
|
||||
nativeBuildInputs = [ meson ninja pkgconfig ];
|
||||
|
||||
outputs = [ "out" "devdoc" ];
|
||||
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "gettext-${version}";
|
||||
version = "0.19.8";
|
||||
version = "0.19.8.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnu/gettext/${name}.tar.gz";
|
||||
sha256 = "13ylc6n3hsk919c7xl0yyibc3pfddzb53avdykn4hmk8g6yzd91x";
|
||||
sha256 = "0hsw28f9q9xaggjlsdp2qmbp2rbd1mp0njzan2ld9kiqwkq2m57z";
|
||||
};
|
||||
patches = [ ./absolute-paths.diff ];
|
||||
|
||||
|
||||
@ -12,14 +12,14 @@ assert cupsSupport -> cups != null;
|
||||
with stdenv.lib;
|
||||
|
||||
let
|
||||
version = "3.22.29";
|
||||
version = "3.22.30";
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
name = "gtk+3-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/gtk+/${gnome3.versionBranch version}/gtk+-${version}.tar.xz";
|
||||
sha256 = "1y5vzdbgww9l7xcrg13azff2rs94kggkywmpcsh39h7w76wn8zd0";
|
||||
sha256 = "0rv5k8fyi2i19k4zncai6vf429s6zy3kncr8vb6f3m034z0sb951";
|
||||
};
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
{
|
||||
fetchurl, stdenv, pkgconfig,
|
||||
fetchurl, fetchpatch, stdenv, pkgconfig,
|
||||
acl, attr, bzip2, e2fsprogs, libxml2, lzo, openssl, sharutils, xz, zlib,
|
||||
|
||||
# Optional but increases closure only negligibly.
|
||||
@ -20,6 +20,12 @@ stdenv.mkDerivation rec {
|
||||
patches = [
|
||||
./CVE-2017-14166.patch
|
||||
./CVE-2017-14502.patch
|
||||
|
||||
# LibreSSL patch; this is from upstream, and can be removed when the next release is made.
|
||||
(fetchpatch {
|
||||
url = "https://github.com/libarchive/libarchive/commit/5da00ad75b09e262774ec3675bbe4d5a4502a852.patch";
|
||||
sha256 = "0np1i9r6mfxmbksj7mmf5abpnmlmg63704p9z3ihjh2rnq596c1v";
|
||||
})
|
||||
];
|
||||
|
||||
outputs = [ "out" "lib" "dev" ];
|
||||
@ -46,6 +52,8 @@ stdenv.mkDerivation rec {
|
||||
-e 's|-llzo2|-L${lzo}/lib -llzo2|'
|
||||
'';
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
meta = {
|
||||
description = "Multi-format archive and compression library";
|
||||
longDescription = ''
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ stdenv, fetchurl, findutils, fixDarwinDylibNames
|
||||
{ stdenv, fetchurl, fetchpatch, findutils, fixDarwinDylibNames
|
||||
, sslSupport? true, openssl
|
||||
}:
|
||||
|
||||
@ -13,6 +13,18 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "1hhxnxlr0fsdv7bdmzsnhdz16fxf3jg2r6vyljcl3kj6pflcap4n";
|
||||
};
|
||||
|
||||
#NOTE: Patches to support libressl-2.7. These are taken from libevent upstream, and can both be dropped with the next release.
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
url = "https://github.com/libevent/libevent/commit/22dd14945c25600de3cf8b91000c66703b551e4f.patch";
|
||||
sha256 = "0fzcb241cp9mm7j6baw22blcglbc083ryigzyjaij8r530av10kd";
|
||||
})
|
||||
(fetchpatch {
|
||||
url = "https://github.com/libevent/libevent/commit/28b8075400c70b2d2da2ce07e590c2ec6d11783d.patch";
|
||||
sha256 = "0dkzlk44033xksg2iq5w90r3lnziwl1mgz291nzqq906zrya0sdb";
|
||||
})
|
||||
];
|
||||
|
||||
# libevent_openssl is moved into its own output, so that openssl isn't present
|
||||
# in the default closure.
|
||||
outputs = [ "out" "dev" ]
|
||||
@ -38,6 +50,8 @@ stdenv.mkDerivation rec {
|
||||
sed "/^libdir=/s|$out|$openssl|" -i "$openssl"/lib/libevent_openssl.la
|
||||
'';
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Event notification library";
|
||||
longDescription = ''
|
||||
|
||||
@ -6,11 +6,11 @@ assert enableCapabilities -> stdenv.isLinux;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "libgcrypt-${version}";
|
||||
version = "1.8.2";
|
||||
version = "1.8.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnupg/libgcrypt/${name}.tar.bz2";
|
||||
sha256 = "01sca9m8hm6b5v8hmqsfdjhyz013869p1f0fxw9ln52qfnp4q1n8";
|
||||
sha256 = "0z5gs1khzyknyfjr19k8gk4q148s6q987ya85cpn0iv70fz91v36";
|
||||
};
|
||||
|
||||
outputs = [ "out" "dev" "info" ];
|
||||
|
||||
@ -5,14 +5,14 @@
|
||||
|
||||
let
|
||||
pname = "libsoup";
|
||||
version = "2.62.0";
|
||||
version = "2.62.2";
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
name = "${pname}-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
|
||||
sha256 = "1b5aff1igbsx1h4v3wmkffvzgiy8rscibqka7fmjf2lxs7l7lz5b";
|
||||
sha256 = "1dkrz1iwsswscayfmjxqv2q00b87snlq9nxdccn5vck0vbinylwy";
|
||||
};
|
||||
|
||||
prePatch = ''
|
||||
|
||||
@ -8,11 +8,11 @@ let
|
||||
|
||||
in stdenv.mkDerivation rec {
|
||||
name = "nss-${version}";
|
||||
version = "3.36.1";
|
||||
version = "3.36.4";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://mozilla/security/nss/releases/NSS_3_36_1_RTM/src/${name}.tar.gz";
|
||||
sha256 = "1zrb49mp7cy3snnday1zv8d76h1mgppbcwxnlkqsgxlga8fl89b0";
|
||||
url = "mirror://mozilla/security/nss/releases/NSS_3_36_4_RTM/src/${name}.tar.gz";
|
||||
sha256 = "0si4g5bnhzkxy2f7rnaw86jfdzni5gvc7svxcf7ms8n97nrrdpik";
|
||||
};
|
||||
|
||||
buildInputs = [ perl zlib sqlite ]
|
||||
|
||||
@ -77,13 +77,13 @@ let
|
||||
then blas64_
|
||||
else hasPrefix "x86_64" stdenv.system;
|
||||
|
||||
version = "0.2.20";
|
||||
version = "0.3.0";
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
name = "openblas-${version}";
|
||||
src = fetchurl {
|
||||
url = "https://github.com/xianyi/OpenBLAS/archive/v${version}.tar.gz";
|
||||
sha256 = "157kpkbpwlr57dkmqiwr3qp9fglfidagv7l6fibrhln6v4aqpwsy";
|
||||
sha256 = "18giv3lsh8cva01z4rhsx8jvgliknni0jp7vxkc69qxb14vm8lfg";
|
||||
name = "openblas-${version}.tar.gz";
|
||||
};
|
||||
|
||||
@ -118,12 +118,7 @@ stdenv.mkDerivation {
|
||||
] ++ stdenv.lib.optional (stdenv.hostPlatform.libc == "musl") "NO_AFFINITY=1"
|
||||
++ mapAttrsToList (var: val: var + "=" + val) config;
|
||||
|
||||
patches = stdenv.lib.optional (stdenv.hostPlatform.libc != "glibc")
|
||||
# https://github.com/xianyi/OpenBLAS/pull/1247
|
||||
(fetchpatch {
|
||||
url = "https://github.com/xianyi/OpenBLAS/commit/88a35ff457f55e527e0e8a503a0dc61976c1846d.patch";
|
||||
sha256 = "1a3qrhvl5hp06c53fjqghq4zgf6ls7narm06l0shcvs57hznh09n";
|
||||
});
|
||||
patches = []; # TODO: Remove on next mass-rebuild
|
||||
|
||||
doCheck = true;
|
||||
checkTarget = "tests";
|
||||
|
||||
@ -25,11 +25,11 @@ let
|
||||
|
||||
in buildPythonPackage rec {
|
||||
pname = "Cython";
|
||||
version = "0.28.2";
|
||||
version = "0.28.3";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "634e2f10fc8d026c633cffacb45cd8f4582149fa68e1428124e762dbc566e68a";
|
||||
sha256 = "1aae6d6e9858888144cea147eb5e677830f45faaff3d305d77378c3cba55f526";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -9,11 +9,11 @@
|
||||
buildPythonPackage rec {
|
||||
pname = "Flask-PyMongo";
|
||||
name = "${pname}-${version}";
|
||||
version = "0.5.1";
|
||||
version = "0.5.2";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "2baaa2ba5107d72b3a8bd4b5c0c8881316e35340ad1ae979cc13f1f3c8843b3d";
|
||||
sha256 = "aab5ddab8f443e8a011e024f618bb89e078bdcc2274597079469fdf5ddc032b5";
|
||||
};
|
||||
|
||||
checkInputs = [ pytest ];
|
||||
|
||||
@ -42,13 +42,13 @@ let
|
||||
in buildPythonPackage rec {
|
||||
name = "${pname}-${version}";
|
||||
pname = "Theano";
|
||||
version = "1.0.1";
|
||||
version = "1.0.2";
|
||||
|
||||
disabled = isPyPy || pythonOlder "2.6" || (isPy3k && pythonOlder "3.3");
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "88d8aba1fe2b6b75eacf455d01bc7e31e838c5a0fb8c13dde2d9472495ff4662";
|
||||
sha256 = "6768e003d328a17011e6fca9126fbb8a6ffd3bb13cb21c450f3e724cca29abde";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@ -3,11 +3,11 @@
|
||||
buildPythonPackage rec {
|
||||
name = "${pname}-${version}";
|
||||
pname = "XlsxWriter";
|
||||
version = "1.0.4";
|
||||
version = "1.0.5";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "ad947fd9e8edfb64f25e0ccfb161e109f279e5a5520b3dd22ddc03b7f8220887";
|
||||
sha256 = "bd4661c04a68621cb2ebc07c38b8b2e98e30bf213a16e1cf3675b61e26ca9bf2";
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
||||
@ -10,11 +10,11 @@
|
||||
# wrapped to be able to find aioconsole and any other packages.
|
||||
buildPythonPackage rec {
|
||||
pname = "aioconsole";
|
||||
version = "0.1.7";
|
||||
version = "0.1.8";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "17bnfcp0gacnmpdam6byb7rwhqibw57f736bbgk45w4cy2lglj3y";
|
||||
sha256 = "5d2c60c0cbf87c663ef3a0b394980ff86f56ebd3c47cc87df6c410e774216c50";
|
||||
};
|
||||
|
||||
# hardcodes a test dependency on an old version of pytest-asyncio
|
||||
|
||||
@ -6,11 +6,11 @@
|
||||
buildPythonPackage rec {
|
||||
name = "${pname}-${version}";
|
||||
pname = "astroid";
|
||||
version = "1.6.3";
|
||||
version = "1.6.4";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "35cfae47aac19c7b407b7095410e895e836f2285ccf1220336afba744cc4c5f2";
|
||||
sha256 = "dea42ae6e0b789b543f728ddae7ddb6740ba33a49fb52c4a4d9cb7bb4aa6ec09";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ logilab_common six lazy-object-proxy wrapt ]
|
||||
|
||||
@ -3,12 +3,12 @@
|
||||
buildPythonPackage rec {
|
||||
|
||||
pname = "backports.csv";
|
||||
version = "1.0.5";
|
||||
version = "1.0.6";
|
||||
name = "${pname}-${version}";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "1imzbrradkfn8s2m1qcimyn74dn1mz2p3j381jljn166rf2i6hlc";
|
||||
sha256 = "bed884eeb967c8d6f517dfcf672914324180f1e9ceeb0376fde2c4c32fd7008d";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ future ];
|
||||
|
||||
@ -33,11 +33,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "bokeh";
|
||||
version = "0.12.15";
|
||||
version = "0.12.16";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "2891b883b30107dc610a7e963a21222f1fd096844d157c09db115179cfab6513";
|
||||
sha256 = "de14151c7ef768f858f46168546c1d492cb04ab3c58bc118329a78ebf35b4688";
|
||||
};
|
||||
|
||||
disabled = isPyPy;
|
||||
|
||||
@ -3,15 +3,15 @@
|
||||
let
|
||||
wheel_source = fetchPypi {
|
||||
pname = "wheel";
|
||||
version = "0.31.0";
|
||||
version = "0.31.1";
|
||||
format = "wheel";
|
||||
sha256 = "9cdc8ab2cc9c3c2e2727a4b67c22881dbb0e1c503d592992594c5e131c867107";
|
||||
sha256 = "80044e51ec5bbf6c894ba0bc48d26a8c20a9ba629f4ca19ea26ecfcf87685f5f";
|
||||
};
|
||||
setuptools_source = fetchPypi {
|
||||
pname = "setuptools";
|
||||
version = "39.0.1";
|
||||
version = "39.2.0";
|
||||
format = "wheel";
|
||||
sha256 = "8010754433e3211b9cdbbf784b50f30e80bf40fc6b05eb5f865fab83300599b8";
|
||||
sha256 = "8fca9275c89964f13da985c3656cb00ba029d7f3916b37990927ffdf264e7926";
|
||||
};
|
||||
|
||||
in stdenv.mkDerivation rec {
|
||||
|
||||
@ -2,12 +2,12 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "zc.buildout";
|
||||
version = "2.11.3";
|
||||
version = "2.11.4";
|
||||
name = "${pname}-nix-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${pname}-${version}.tar.gz";
|
||||
sha256 = "f7fde2cde7b937f67e52a3e94b76f9294b73c1e9bb698430e96778f3f735544c";
|
||||
sha256 = "20b22d9c99c99909b6b2dc679e8acd9e1fcf9f58e23f336d8b2c5be70617fbb2";
|
||||
};
|
||||
|
||||
patches = [ ./nix.patch ];
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "bumps";
|
||||
version = "0.7.6";
|
||||
version = "0.7.8";
|
||||
|
||||
propagatedBuildInputs = [six];
|
||||
|
||||
@ -12,7 +12,7 @@ buildPythonPackage rec {
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "1ahzw8ls9wsz2ks668s15zskyykib52fhi07mg50hp7lw9avqb5k";
|
||||
sha256 = "57b71855b7659e9c8dc21722a3ed0b33efb2ead2916b22ced3b83339bcdff1a2";
|
||||
};
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
|
||||
@ -4,11 +4,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "canonicaljson";
|
||||
version = "1.1.3";
|
||||
version = "1.1.4";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "1q50zk9a0r7kd56rdf9cgyxxj7vy54j96sgh8vc8jhmsvdv8dzh6";
|
||||
sha256 = "45bce530ff5fd0ca93703f71bfb66de740a894a3b5dd6122398c6d8f18539725";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -4,11 +4,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "celery";
|
||||
version = "4.1.0";
|
||||
version = "4.1.1";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "0dcb0s6kdcd3vc9pwvazngppkdbhwpmpjmghq6rifsld34q3gzvp";
|
||||
sha256 = "d1f2a3359bdbdfb344edce98b8e891f5fe64f8a11c5a45538ec20ac237c971f5";
|
||||
};
|
||||
|
||||
# make /etc/protocols accessible to fix socket.getprotobyname('tcp') in sandbox
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "cloudpickle";
|
||||
version = "0.5.2";
|
||||
version = "0.5.3";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "b0e63dd89ed5285171a570186751bc9b84493675e99e12789e9a5dc5490ef554";
|
||||
sha256 = "54858c7b7dc763ed894ff91059c1d0b017d593fe23850d3d8d75f47d98398197";
|
||||
};
|
||||
|
||||
buildInputs = [ pytest mock ];
|
||||
|
||||
@ -12,12 +12,12 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "dask";
|
||||
version = "0.17.4";
|
||||
version = "0.17.5";
|
||||
name = "${pname}-${version}";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "c111475a3d1f8cba41c8094e1fb1831c65015390dcef0308042a11a9606a2f6d";
|
||||
sha256 = "ea8ad7735048a6e8a9e389186f840a0a9e5c5eeb55379c8b3c9d4883be863c5c";
|
||||
};
|
||||
|
||||
checkInputs = [ pytest ];
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "dbf";
|
||||
version = "0.97.2";
|
||||
version = "0.97.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "b4c5165d29f6ca893797974aa9f228d2ad39aa864c166ce5bcb89c636489c8e6";
|
||||
sha256 = "855800d12df87855096eeafc58f34c9092407e8faf197f48073e7bc2b1938de0";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ aenum ] ++ stdenv.lib.optional (pythonOlder "3.4") [ enum34 ];
|
||||
|
||||
@ -15,11 +15,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "elasticsearch-curator";
|
||||
version = "5.5.1";
|
||||
version = "5.5.4";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "2d2762fa55613855b0a04f22e1c6c2c5b53d60301b437205d0e2533e4185671a";
|
||||
sha256 = "e75abeb7f7be939b1c64c071898760dc10ab5f08307c253fc074abf8a41a76f0";
|
||||
};
|
||||
|
||||
# The integration tests require a running elasticsearch cluster.
|
||||
|
||||
@ -3,12 +3,12 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "Eve";
|
||||
version = "0.7.8";
|
||||
version = "0.7.9";
|
||||
name = "${pname}-${version}";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "af373ab7b9611990d39b090eed372a0860d4e12a1c8a6ef49fdee29e4626053f";
|
||||
sha256 = "e4ffa43be977997a4c6b62f5ab7996df3acf54c68824875fecd896da5af341a3";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@ -8,11 +8,11 @@ assert pythonOlder "3.3" -> ipaddress != null;
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "Faker";
|
||||
version = "0.8.13";
|
||||
version = "0.8.15";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "48fed4b4a191e2b42ad20c14115f1c6d36d338b80192075d7573f0f42d7fb321";
|
||||
sha256 = "a77a1a2223a8e0d32618878350bbd2171040f32b526ba2cddfab8864704bb370";
|
||||
};
|
||||
|
||||
checkInputs = [
|
||||
|
||||
@ -4,7 +4,6 @@ nose, shouldbe, gss, krb5Full, which, darwin }:
|
||||
buildPythonPackage rec {
|
||||
pname = "gssapi";
|
||||
version = "1.4.1";
|
||||
name = "${pname}-${version}";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
|
||||
@ -1,11 +1,11 @@
|
||||
{ stdenv, buildPythonPackage, fetchPypi, six, mock }:
|
||||
buildPythonPackage rec {
|
||||
pname = "hiro";
|
||||
version = "0.1.4";
|
||||
version = "0.1.9";
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
|
||||
sha256 = "1340lhg7k522bqpz5iakl51qb47mjw804mfwwzm77i7qcm5cwiz8";
|
||||
sha256 = "3b19abd8873880ad59575788279731c07838e803c4f31d62410920fa6b1f95d5";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ six mock ];
|
||||
|
||||
@ -3,7 +3,6 @@
|
||||
buildPythonPackage rec {
|
||||
pname = "html5-parser";
|
||||
version = "0.4.5";
|
||||
name = "${pname}-${version}";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
|
||||
@ -2,12 +2,12 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
name = "${pname}-${version}";
|
||||
version = "1.4.2";
|
||||
version = "1.4.3";
|
||||
pname = "kafka-python";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "6a5c516f540f4b13b78c64a85dd42dc38fe29257e2fae6393fc5daff9106389b";
|
||||
sha256 = "078acdcd1fc6eddacc46d437c664998b4cf7613b7e79ced66a460965f2648f88";
|
||||
};
|
||||
|
||||
checkInputs = [ pytest six mock ];
|
||||
|
||||
@ -3,7 +3,6 @@
|
||||
buildPythonPackage rec {
|
||||
pname = "MarkdownSuperscript";
|
||||
version = "2.0.0";
|
||||
name = "${pname}-${version}";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
|
||||
@ -5,7 +5,7 @@
|
||||
buildPythonPackage rec {
|
||||
pname = "marshmallow";
|
||||
name = "${pname}-${version}";
|
||||
version = "2.15.1";
|
||||
version = "2.15.3";
|
||||
|
||||
meta = {
|
||||
homepage = "https://github.com/marshmallow-code/marshmallow";
|
||||
@ -18,7 +18,7 @@ buildPythonPackage rec {
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "b73361eab812af97eaf8e8691333a1096787968450051d132c8b9fb90aa1db5a";
|
||||
sha256 = "171f409d48b44786b7df2793cbd7f1a9062f0fe2c14d547da536b5010f671ade";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ dateutil simplejson ];
|
||||
|
||||
@ -3,12 +3,12 @@
|
||||
}:
|
||||
buildPythonPackage rec {
|
||||
pname = "parse";
|
||||
version = "1.8.2";
|
||||
version = "1.8.4";
|
||||
name = "${pname}-${version}";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "1lj9v1q4imszyhvipb6drsm3xdl35nan011mqxxas1yaypixsj40";
|
||||
sha256 = "c3cdf6206f22aeebfa00e5b954fcfea13d1b2dc271c75806b6025b94fb490939";
|
||||
};
|
||||
|
||||
checkPhase = ''
|
||||
|
||||
@ -6,12 +6,12 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "parso";
|
||||
version = "0.2.0";
|
||||
version = "0.2.1";
|
||||
name = "${pname}-${version}";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "0lamywk6dm5xshlkdvxxf5j6fa2k2zpi7xagf0bwidaay3vnpgb2";
|
||||
sha256 = "f0604a40b96e062b0fd99cf134cc2d5cdf66939d0902f8267d938b0d5b26707f";
|
||||
};
|
||||
|
||||
checkInputs = [ pytest ];
|
||||
|
||||
@ -2,12 +2,12 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pbr";
|
||||
version = "4.0.2";
|
||||
version = "4.0.3";
|
||||
name = "${pname}-${version}";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "dae4aaa78eafcad10ce2581fc34d694faa616727837fd8e55c1a00951ad6744f";
|
||||
sha256 = "6874feb22334a1e9a515193cba797664e940b763440c88115009ec323a7f2df5";
|
||||
};
|
||||
|
||||
# circular dependencies with fixtures
|
||||
|
||||
@ -6,7 +6,6 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pelican";
|
||||
name = "${pname}-${version}";
|
||||
version = "3.7.1";
|
||||
disabled = isPy26;
|
||||
|
||||
|
||||
@ -7,7 +7,6 @@
|
||||
buildPythonPackage rec {
|
||||
pname = "persistent";
|
||||
version = "4.2.4.2";
|
||||
name = "${pname}-${version}";
|
||||
|
||||
propagatedBuildInputs = [ zope_interface ];
|
||||
|
||||
|
||||
@ -2,12 +2,12 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "phonenumbers";
|
||||
version = "8.9.5";
|
||||
version = "8.9.6";
|
||||
name = "${pname}-${version}";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "09swdf3f9sdvqyyzkap93012m9fnhamizf42d5kzpdjwikvsfx8x";
|
||||
sha256 = "eec334a7908746b675a0ba296b3a11322ed970614b62f2a6e5f086de4f3e2a84";
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
||||
@ -3,11 +3,11 @@
|
||||
buildPythonPackage rec {
|
||||
name = "${pname}-${version}";
|
||||
pname = "pyasn1";
|
||||
version = "0.4.2";
|
||||
version = "0.4.3";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "d258b0a71994f7770599835249cece1caef3c70def868c4915e6e5ca49b67d15";
|
||||
sha256 = "fb81622d8f3509f0026b0683fe90fea27be7284d3826a5f2edf97f69151ab0fc";
|
||||
};
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
|
||||
@ -6,7 +6,6 @@
|
||||
buildPythonPackage rec {
|
||||
version = pycryptodome.version;
|
||||
pname = "pycrypto";
|
||||
name = "${pname}-${version}";
|
||||
|
||||
# Cannot build wheel otherwise (zip 1980 issue)
|
||||
SOURCE_DATE_EPOCH=315532800;
|
||||
|
||||
@ -4,7 +4,6 @@
|
||||
buildPythonPackage rec {
|
||||
version = "0.10.4";
|
||||
pname = "pyFFTW";
|
||||
name = "${pname}-${version}";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
|
||||
@ -1,12 +1,12 @@
|
||||
{ lib, buildPythonPackage, fetchPypi }:
|
||||
|
||||
buildPythonPackage rec {
|
||||
version = "1.6.0";
|
||||
version = "1.6.1";
|
||||
pname = "pyperclip";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "ce829433a9af640e08ee89b20f7c62132714bcc5d77df114044d0fccb8c3b3b8";
|
||||
sha256 = "03ce3e66e2a26a085f0e043236dedd78aaabf53a64dab9a216671f74ee272845";
|
||||
};
|
||||
|
||||
doCheck = false;
|
||||
|
||||
@ -2,12 +2,12 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyroute2";
|
||||
version = "0.5.0";
|
||||
version = "0.5.1";
|
||||
name = "${pname}-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://pypi/p/pyroute2/${name}.tar.gz";
|
||||
sha256 = "bb02fe5a02fb4e8baad4d7ccf7ba5e748044ee0a1ad7d2fa4927f68f396863c4";
|
||||
sha256 = "e69dc81dc3f10ccb33186ddcce910e116b4e77304e93af4092567130bcd6df5c";
|
||||
};
|
||||
|
||||
# requires root priviledges
|
||||
|
||||
@ -2,12 +2,12 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pytimeparse";
|
||||
version = "1.1.7";
|
||||
version = "1.1.8";
|
||||
name = "${pname}-${version}";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "51b641bcd435e0cb6b9701ed79cf7ee97fa6bf2dbb5d41baa16e5486e5d9b17a";
|
||||
sha256 = "e86136477be924d7e670646a98561957e8ca7308d44841e21f5ddea757556a0a";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ nose ];
|
||||
|
||||
@ -7,7 +7,6 @@
|
||||
buildPythonPackage rec {
|
||||
pname = "requests_download";
|
||||
version = "0.1.1";
|
||||
name = "${pname}-${version}";
|
||||
|
||||
format = "wheel";
|
||||
|
||||
|
||||
@ -7,7 +7,6 @@
|
||||
buildPythonPackage rec {
|
||||
pname = "scikit-learn";
|
||||
version = "0.19.1";
|
||||
name = "${pname}-${version}";
|
||||
disabled = stdenv.isi686; # https://github.com/scikit-learn/scikit-learn/issues/5534
|
||||
|
||||
src = fetchPypi {
|
||||
|
||||
@ -13,7 +13,6 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "smart_open";
|
||||
name = "${pname}-${version}";
|
||||
version = "1.5.7";
|
||||
|
||||
src = fetchPypi {
|
||||
|
||||
@ -25,7 +25,6 @@
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
name = "${pname}-${version}";
|
||||
pname = "Sphinx";
|
||||
version = "1.7.4";
|
||||
src = fetchPypi {
|
||||
@ -70,4 +69,4 @@ buildPythonPackage rec {
|
||||
license = lib.licenses.bsd3;
|
||||
maintainers = with lib.maintainers; [ nand0p ];
|
||||
};
|
||||
}
|
||||
}
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "uproot";
|
||||
version = "2.8.23";
|
||||
version = "2.8.25";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "121ggyl5s0q66yrbdfznvzrc793zq1w2xnr3baadlzfvqdlkhgj7";
|
||||
sha256 = "8f790cb8a704b44ffd5efe5a9cb46204a042b55a9cddeb61434193cfd534275c";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -2,12 +2,12 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "uritools";
|
||||
version = "2.1.0";
|
||||
version = "2.1.1";
|
||||
name = pname + "-" + version;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "a7b58a249a851ef5fff1bc513b940653f0d4841a6668e02431c1297f05efeec3";
|
||||
sha256 = "64369ece6f5c6ab18cba2cd0b199da40ffb9390493da1ff5c1d94b6ed107b401";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ ipaddress ];
|
||||
|
||||
@ -9,12 +9,12 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "wheel";
|
||||
version = "0.31.0";
|
||||
version = "0.31.1";
|
||||
name = "${pname}-${version}";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "1ae8153bed701cb062913b72429bcf854ba824f973735427681882a688cb55ce";
|
||||
sha256 = "0a2e54558a0628f2145d2fc822137e322412115173e8a2ddbe1c9024338ae83c";
|
||||
};
|
||||
|
||||
checkInputs = [ pytest pytestcov coverage ];
|
||||
|
||||
@ -10,11 +10,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "xarray";
|
||||
version = "0.10.3";
|
||||
version = "0.10.4";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "72fafe29ba00633483aed39e405442226ef66d2ddc1021a39527ae1522b7067a";
|
||||
sha256 = "64c2d07b75b8ea1320cba521818a2f09107f5f46514d50ff5ef1c4d5da90aaf1";
|
||||
};
|
||||
|
||||
checkInputs = [ pytest ];
|
||||
|
||||
@ -5,13 +5,13 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "zodbpickle";
|
||||
version = "1.0";
|
||||
version = "1.0.1";
|
||||
name = "${pname}-${version}";
|
||||
disabled = isPyPy; # https://github.com/zopefoundation/zodbpickle/issues/10
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "3af9169fb1d5901cf6693ab356b0dfda20ad2cacc5673fad59b4449ed50d5399";
|
||||
sha256 = "5fdfa84f05b25511a4e1190ec98728aa487e2eb6db016a951fdbb79bcc7307e0";
|
||||
};
|
||||
|
||||
# fails..
|
||||
|
||||
@ -3,11 +3,11 @@
|
||||
buildPythonPackage rec {
|
||||
name = "${pname}-${version}";
|
||||
pname = "buildbot-pkg";
|
||||
version = "1.1.1";
|
||||
version = "1.1.2";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "7b255f5ec97946c3d32e822b8fcbff0459cfe4f94fb26ee4813ffd80440c93e8";
|
||||
sha256 = "0f14453e2f2f357f44edd79df2d3b3901b4e03f4746693c209b71e226ed238cd";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ setuptools ];
|
||||
|
||||
@ -22,7 +22,7 @@ cmakeConfigurePhase() {
|
||||
if [ -z "$dontUseCmakeBuildDir" ]; then
|
||||
mkdir -p build
|
||||
cd build
|
||||
cmakeDir=..
|
||||
cmakeDir=${cmakeDir:-..}
|
||||
fi
|
||||
|
||||
if [ -z "$dontAddPrefix" ]; then
|
||||
|
||||
@ -4,7 +4,6 @@
|
||||
in python3Packages.buildPythonApplication rec {
|
||||
version = "0.46.1";
|
||||
pname = "meson";
|
||||
name = "${pname}-${version}";
|
||||
|
||||
src = python3Packages.fetchPypi {
|
||||
inherit pname version;
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ stdenv, fetchFromGitHub, python, asciidoc, re2c }:
|
||||
{ stdenv, fetchFromGitHub, python, asciidoc, docbook_xml_dtd_45, docbook_xsl, libxslt, re2c }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "ninja-${version}";
|
||||
@ -11,11 +11,13 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "16scq9hcq6c5ap6sy8j4qi75qps1zvrf3p79j1vbrvnqzp928i5f";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ python asciidoc re2c ];
|
||||
nativeBuildInputs = [ python asciidoc docbook_xml_dtd_45 docbook_xsl libxslt.bin re2c ];
|
||||
|
||||
buildPhase = ''
|
||||
python configure.py --bootstrap
|
||||
asciidoc doc/manual.asciidoc
|
||||
# "./ninja -vn manual" output copied here to support cross compilation.
|
||||
asciidoc -b docbook -d book -o build/manual.xml doc/manual.asciidoc
|
||||
xsltproc --nonet doc/docbook.xsl build/manual.xml > doc/manual.html
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
|
||||
@ -7,7 +7,6 @@ in
|
||||
buildPythonApplication rec {
|
||||
pname = "Flootty";
|
||||
version = "3.2.1";
|
||||
name = "${pname}-${version}";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
|
||||
@ -3,7 +3,6 @@ let
|
||||
deps = import ./requirements.nix { inherit pkgs; };
|
||||
in
|
||||
python27Packages.buildPythonApplication rec {
|
||||
name = "${pname}-${version}";
|
||||
pname = "gdbgui";
|
||||
version = "0.11.1.2";
|
||||
|
||||
|
||||
@ -3,7 +3,6 @@
|
||||
python2.pkgs.buildPythonApplication rec {
|
||||
pname = "lit";
|
||||
version = "0.5.1";
|
||||
name = "${pname}-${version}";
|
||||
|
||||
src = python2.pkgs.fetchPypi {
|
||||
inherit pname version;
|
||||
|
||||
@ -6,11 +6,11 @@ with python3Packages;
|
||||
buildPythonApplication rec {
|
||||
name = "${pname}-${version}";
|
||||
pname = "vcstool";
|
||||
version = "0.1.35";
|
||||
version = "0.1.36";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "c52ef4bae424deb284d042005db22844dae290758af77d76cac37d26bed9ad1c";
|
||||
sha256 = "3c3d347f46cda641344ec5d613896499981b0540e2bfa299baf6026dab7649ca";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ pyyaml ];
|
||||
|
||||
@ -3,11 +3,11 @@
|
||||
systemd, enableWiimote ? false, enableMidi ? false }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "bluez-5.49";
|
||||
name = "bluez-5.50";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://kernel/linux/bluetooth/${name}.tar.xz";
|
||||
sha256 = "15ffsaz7l3fgdg03l7g1xx9jw7xgs6pc548zxqsxawsca5x1sc1k";
|
||||
sha256 = "048r91vx9gs5nwwbah2s0xig04nwk14c5s0vb7qmaqdvighsmz2z";
|
||||
};
|
||||
|
||||
pythonPath = with pythonPackages; [
|
||||
|
||||
@ -1,5 +1,6 @@
|
||||
{ stdenv, fetchurl, cmake, bison, ncurses, openssl, readline, zlib, perl
|
||||
, boost, cctools, CoreServices, developer_cmds }:
|
||||
{ stdenv, fetchurl, cmake, bison
|
||||
, boost, libedit, libevent, lz4, ncurses, openssl, protobuf, readline, zlib, perl
|
||||
, cctools, CoreServices, developer_cmds }:
|
||||
|
||||
# Note: zlib is not required; MySQL can use an internal zlib.
|
||||
|
||||
@ -18,7 +19,9 @@ self = stdenv.mkDerivation rec {
|
||||
export PATH=$PATH:$TMPDIR
|
||||
'';
|
||||
|
||||
buildInputs = [ cmake bison ncurses openssl readline zlib boost ]
|
||||
nativeBuildInputs = [ cmake bison ];
|
||||
|
||||
buildInputs = [ boost libedit libevent lz4 ncurses openssl protobuf readline zlib ]
|
||||
++ stdenv.lib.optionals stdenv.isDarwin [ perl cctools CoreServices developer_cmds ];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
@ -30,7 +33,11 @@ self = stdenv.mkDerivation rec {
|
||||
"-DWITH_SSL=yes"
|
||||
"-DWITH_EMBEDDED_SERVER=yes"
|
||||
"-DWITH_UNIT_TESTS=no"
|
||||
"-DWITH_ZLIB=yes"
|
||||
"-DWITH_EDITLINE=system"
|
||||
"-DWITH_LIBEVENT=system"
|
||||
"-DWITH_LZ4=system"
|
||||
"-DWITH_PROTOBUF=system"
|
||||
"-DWITH_ZLIB=system"
|
||||
"-DWITH_ARCHIVE_STORAGE_ENGINE=yes"
|
||||
"-DWITH_BLACKHOLE_STORAGE_ENGINE=yes"
|
||||
"-DWITH_FEDERATED_STORAGE_ENGINE=yes"
|
||||
|
||||
@ -7,7 +7,6 @@ with python.pkgs;
|
||||
buildPythonApplication rec {
|
||||
pname = "mycli";
|
||||
version = "1.6.0";
|
||||
name = "${pname}-${version}";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "lz4-${version}";
|
||||
version = "131";
|
||||
version = "1.8.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
sha256 = "1bhvcq8fxxsqnpg5qa6k3nsyhq0nl0iarh08sqzclww27hlpyay2";
|
||||
rev = "r${version}";
|
||||
sha256 = "0xbjbjrvgzypk8dnldakir06gb8m946d064lxx0qc4ky6m8n9hn2";
|
||||
rev = "v${version}";
|
||||
repo = "lz4";
|
||||
owner = "Cyan4973";
|
||||
owner = "lz4";
|
||||
};
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
@ -22,8 +22,6 @@ stdenv.mkDerivation rec {
|
||||
doCheck = false; # tests take a very long time
|
||||
checkTarget = "test";
|
||||
|
||||
patches = [ ./install-on-freebsd.patch ] ;
|
||||
|
||||
postInstall = "rm $out/lib/*.a";
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
|
||||
@ -1,54 +0,0 @@
|
||||
diff --git a/Makefile b/Makefile
|
||||
index d1b0d0c..f8d6a2d 100644
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -80,8 +80,6 @@ clean:
|
||||
|
||||
|
||||
#------------------------------------------------------------------------
|
||||
-#make install is validated only for Linux, OSX, kFreeBSD and Hurd targets
|
||||
-ifneq (,$(filter $(shell uname),Linux Darwin GNU/kFreeBSD GNU))
|
||||
|
||||
install:
|
||||
@cd $(LZ4DIR); $(MAKE) -e install
|
||||
@@ -129,4 +127,3 @@ examples:
|
||||
prg-travis:
|
||||
@cd $(PRGDIR); $(MAKE) -e test-travis
|
||||
|
||||
-endif
|
||||
diff --git a/lib/Makefile b/lib/Makefile
|
||||
index 02ddd3b..26ed18f 100644
|
||||
--- a/lib/Makefile
|
||||
+++ b/lib/Makefile
|
||||
@@ -80,8 +80,6 @@ clean:
|
||||
|
||||
|
||||
#------------------------------------------------------------------------
|
||||
-#make install is validated only for Linux, OSX, kFreeBSD and Hurd targets
|
||||
-ifneq (,$(filter $(shell uname),Linux Darwin GNU/kFreeBSD GNU))
|
||||
|
||||
liblz4.pc: liblz4.pc.in Makefile
|
||||
@echo creating pkgconfig
|
||||
@@ -114,4 +112,3 @@ uninstall:
|
||||
@[ -f $(DESTDIR)$(INCLUDEDIR)/lz4frame.h ] && rm -f $(DESTDIR)$(INCLUDEDIR)/lz4frame.h
|
||||
@echo lz4 libraries successfully uninstalled
|
||||
|
||||
-endif
|
||||
diff --git a/programs/Makefile b/programs/Makefile
|
||||
index f422902..6943363 100644
|
||||
--- a/programs/Makefile
|
||||
+++ b/programs/Makefile
|
||||
@@ -113,8 +113,6 @@ clean:
|
||||
|
||||
|
||||
#------------------------------------------------------------------------
|
||||
-#make install is validated only for Linux, OSX, kFreeBSD and Hurd targets
|
||||
-ifneq (,$(filter $(shell uname),Linux Darwin GNU/kFreeBSD GNU))
|
||||
|
||||
install: lz4 lz4c
|
||||
@echo Installing binaries
|
||||
@@ -307,4 +305,3 @@ test-mem: lz4 datagen fuzzer frametest fullbench
|
||||
test-mem32: lz4c32 datagen
|
||||
# unfortunately, valgrind doesn't seem to work with non-native binary. If someone knows how to do a valgrind-test on a 32-bits exe with a 64-bits system...
|
||||
|
||||
-endif
|
||||
@ -10,7 +10,6 @@ with python.pkgs;
|
||||
buildPythonPackage rec {
|
||||
pname = "bepasty";
|
||||
version = "0.4.0";
|
||||
name = "${pname}-${version}";
|
||||
|
||||
propagatedBuildInputs = [
|
||||
flask
|
||||
@ -39,4 +38,4 @@ buildPythonPackage rec {
|
||||
license = lib.licenses.mit;
|
||||
maintainers = [ lib.maintainers.makefu ];
|
||||
};
|
||||
}
|
||||
}
|
||||
|
||||
@ -5,13 +5,13 @@ with python3Packages;
|
||||
buildPythonApplication rec {
|
||||
name = "${pname}-${version}";
|
||||
pname = "pirate-get";
|
||||
version = "0.2.12";
|
||||
version = "0.2.13";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "1q6hvavj0gswgw3x756h18nmmpnxlgg08qvxphpbzlwd43xrnza3";
|
||||
sha256 = "c5b159e02067136d3157d56061958a50e997a078510e4403bb7de40217833f3f";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ colorama veryprettytable beautifulsoup4 ];
|
||||
|
||||
@ -8697,7 +8697,8 @@ with pkgs;
|
||||
boost164 = callPackage ../development/libraries/boost/1.64.nix { };
|
||||
boost165 = callPackage ../development/libraries/boost/1.65.nix { };
|
||||
boost166 = callPackage ../development/libraries/boost/1.66.nix { };
|
||||
boost16x = boost166;
|
||||
boost167 = callPackage ../development/libraries/boost/1.67.nix { };
|
||||
boost16x = boost167;
|
||||
boost = boost16x;
|
||||
|
||||
boost_process = callPackage ../development/libraries/boost-process { };
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue
Block a user