Merge pull request #103462 from NixOS/staging-next

Staging next
This commit is contained in:
Frederik Rietdijk 2020-11-16 15:23:47 +01:00 committed by GitHub
commit 36b27ccf77
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
254 changed files with 1604 additions and 797 deletions

View File

@ -35,6 +35,7 @@ let
"msp430-none" "msp430-none"
"riscv64-none" "riscv32-none" "riscv64-none" "riscv32-none"
"vc4-none" "vc4-none"
"or1k-none"
"mmix-mmixware" "mmix-mmixware"
@ -61,6 +62,7 @@ in {
mmix = filterDoubles predicates.isMmix; mmix = filterDoubles predicates.isMmix;
riscv = filterDoubles predicates.isRiscV; riscv = filterDoubles predicates.isRiscV;
vc4 = filterDoubles predicates.isVc4; vc4 = filterDoubles predicates.isVc4;
or1k = filterDoubles predicates.isOr1k;
js = filterDoubles predicates.isJavaScript; js = filterDoubles predicates.isJavaScript;
bigEndian = filterDoubles predicates.isBigEndian; bigEndian = filterDoubles predicates.isBigEndian;

View File

@ -129,6 +129,12 @@ rec {
platform = {}; platform = {};
}; };
or1k = {
config = "or1k-elf";
libc = "newlib";
platform = {};
};
arm-embedded = { arm-embedded = {
config = "arm-none-eabi"; config = "arm-none-eabi";
libc = "newlib"; libc = "newlib";

View File

@ -25,6 +25,7 @@ rec {
isVc4 = { cpu = { family = "vc4"; }; }; isVc4 = { cpu = { family = "vc4"; }; };
isAvr = { cpu = { family = "avr"; }; }; isAvr = { cpu = { family = "avr"; }; };
isAlpha = { cpu = { family = "alpha"; }; }; isAlpha = { cpu = { family = "alpha"; }; };
isOr1k = { cpu = { family = "or1k"; }; };
isJavaScript = { cpu = cpuTypes.js; }; isJavaScript = { cpu = cpuTypes.js; };
is32bit = { cpu = { bits = 32; }; }; is32bit = { cpu = { bits = 32; }; };

View File

@ -116,6 +116,8 @@ rec {
vc4 = { bits = 32; significantByte = littleEndian; family = "vc4"; }; vc4 = { bits = 32; significantByte = littleEndian; family = "vc4"; };
or1k = { bits = 32; significantByte = bigEndian; family = "or1k"; };
js = { bits = 32; significantByte = littleEndian; family = "js"; }; js = { bits = 32; significantByte = littleEndian; family = "js"; };
}; };

View File

@ -89,6 +89,18 @@
user D-Bus session available also for non-graphical logins. user D-Bus session available also for non-graphical logins.
</para> </para>
</listitem> </listitem>
<listitem>
<para>
<literal>rubyMinimal</literal> was removed due to being unused and
unusable. The default ruby interpreter includes JIT support, which makes
it reference it's compiler. Since JIT support is probably needed by some
Gems, it was decided to enable this feature with all cc references by
default, and allow to build a Ruby derivation without references to cc,
by setting <literal>jitSupport = false;</literal> in an overlay. See
<link xlink:href="https://github.com/NixOS/nixpkgs/pull/90151">#90151</link>
for more info.
</para>
</listitem>
<listitem> <listitem>
<para> <para>
The option <option>fonts.enableFontDir</option> has been renamed to The option <option>fonts.enableFontDir</option> has been renamed to

View File

@ -11,11 +11,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "ocenaudio"; pname = "ocenaudio";
version = "3.9.2"; version = "3.9.5";
src = fetchurl { src = fetchurl {
url = "https://www.ocenaudio.com/downloads/index.php/ocenaudio_debian9_64.deb?version=${version}"; url = "https://www.ocenaudio.com/downloads/index.php/ocenaudio_debian9_64.deb?version=${version}";
sha256 = "1fvpba3dnzb7sm6gp0znbrima02ckfiy2zwb66x1gr05y9a56inv"; sha256 = "13hvdfydlgp2qf49ddhdzghz5jkyx1rhnsj8sf8khfxf9k8phkjd";
}; };

View File

@ -186,6 +186,7 @@ stdenv.mkDerivation {
else if targetPlatform.isAvr then "avr" else if targetPlatform.isAvr then "avr"
else if targetPlatform.isAlpha then "alpha" else if targetPlatform.isAlpha then "alpha"
else if targetPlatform.isVc4 then "vc4" else if targetPlatform.isVc4 then "vc4"
else if targetPlatform.isOr1k then "or1k"
else throw "unknown emulation for platform: ${targetPlatform.config}"; else throw "unknown emulation for platform: ${targetPlatform.config}";
in if targetPlatform.useLLVM or false then "" in if targetPlatform.useLLVM or false then ""
else targetPlatform.platform.bfdEmulation or (fmt + sep + arch); else targetPlatform.platform.bfdEmulation or (fmt + sep + arch);

View File

@ -1,11 +1,11 @@
{ fetchurl, stdenv, cmake, ninja }: { fetchurl, stdenv, cmake, ninja }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "poppler-data-0.4.9"; name = "poppler-data-0.4.10";
src = fetchurl { src = fetchurl {
url = "https://poppler.freedesktop.org/${name}.tar.gz"; url = "https://poppler.freedesktop.org/${name}.tar.gz";
sha256 = "04i0wgdkn5lhda8cyxd1ll4a2p41pwqrwd47n9mdpl7cx5ypx70z"; sha256 = "0c3vjs3p7rjc4yfacnhd865r27czmzwcr4j2z4jldi68dvvcwbvf";
}; };
nativeBuildInputs = [ cmake ninja ]; nativeBuildInputs = [ cmake ninja ];

View File

@ -7,8 +7,6 @@
# regular builds and GHC bootstrapping. # regular builds and GHC bootstrapping.
# This is "useful" for staying within hydra's output limits for at least the # This is "useful" for staying within hydra's output limits for at least the
# aarch64-linux architecture. # aarch64-linux architecture.
# Examples of unnecessary files are the bundled documentation and files that
# are only needed for profiling builds.
, minimal ? false , minimal ? false
}: }:
@ -182,11 +180,15 @@ stdenv.mkDerivation rec {
done done
'' + '' +
stdenv.lib.optionalString minimal '' stdenv.lib.optionalString minimal ''
# Remove profiling objects # Remove profiling files
find $out -type f -name '*.p_o' -delete find $out -type f -name '*.p_o' -delete
find $out -type f -name '*.p_hi' -delete
find $out -type f -name '*_p.a' -delete
rm $out/lib/ghc-*/bin/ghc-iserv-prof rm $out/lib/ghc-*/bin/ghc-iserv-prof
# Remove docs # Hydra will redistribute this derivation, so we have to keep the docs for
rm -r $out/share/{doc,man} # legal reasons (retaining the legal notices etc)
# As a last resort we could unpack the docs separately and symlink them in.
# They're in $out/share/{doc,man}.
''; '';
doInstallCheck = true; doInstallCheck = true;
@ -210,18 +212,11 @@ stdenv.mkDerivation rec {
enableShared = true; enableShared = true;
}; };
meta = let meta = {
platforms = ["x86_64-linux" "armv7l-linux" "aarch64-linux" "i686-linux" "x86_64-darwin"];
in {
homepage = "http://haskell.org/ghc"; homepage = "http://haskell.org/ghc";
description = "The Glasgow Haskell Compiler"; description = "The Glasgow Haskell Compiler";
license = stdenv.lib.licenses.bsd3; license = stdenv.lib.licenses.bsd3;
platforms = ["x86_64-linux" "armv7l-linux" "aarch64-linux" "i686-linux" "x86_64-darwin"];
# The minimal variation can not be distributed because it removes the
# documentation, including licensing information that is required for
# distribution.
inherit platforms;
hydraPlatforms = stdenv.lib.optionals (!minimal) platforms;
maintainers = with stdenv.lib.maintainers; [ lostnet ]; maintainers = with stdenv.lib.maintainers; [ lostnet ];
}; };
} }

View File

@ -41,6 +41,11 @@ stdenv.mkDerivation rec {
"-DCMAKE_TRY_COMPILE_TARGET_TYPE=STATIC_LIBRARY" "-DCMAKE_TRY_COMPILE_TARGET_TYPE=STATIC_LIBRARY"
] ++ stdenv.lib.optionals (bareMetal) [ ] ++ stdenv.lib.optionals (bareMetal) [
"-DCOMPILER_RT_OS_DIR=baremetal" "-DCOMPILER_RT_OS_DIR=baremetal"
] ++ stdenv.lib.optionals (stdenv.hostPlatform.isDarwin) [
# The compiler-rt build infrastructure sniffs supported platforms on Darwin
# and finds i386;x86_64;x86_64h. We only build for x86_64, so linking fails
# when it tries to use libc++ and libc++api for i386.
"-DDARWIN_osx_ARCHS=${stdenv.hostPlatform.parsed.cpu.name}"
]; ];
outputs = [ "out" "dev" ]; outputs = [ "out" "dev" ];

View File

@ -41,6 +41,11 @@ stdenv.mkDerivation {
"-DCMAKE_TRY_COMPILE_TARGET_TYPE=STATIC_LIBRARY" "-DCMAKE_TRY_COMPILE_TARGET_TYPE=STATIC_LIBRARY"
] ++ stdenv.lib.optionals (bareMetal) [ ] ++ stdenv.lib.optionals (bareMetal) [
"-DCOMPILER_RT_OS_DIR=baremetal" "-DCOMPILER_RT_OS_DIR=baremetal"
] ++ stdenv.lib.optionals (stdenv.hostPlatform.isDarwin) [
# The compiler-rt build infrastructure sniffs supported platforms on Darwin
# and finds i386;x86_64;x86_64h. We only build for x86_64, so linking fails
# when it tries to use libc++ and libc++api for i386.
"-DDARWIN_osx_ARCHS=${stdenv.hostPlatform.parsed.cpu.name}"
]; ];
outputs = [ "out" "dev" ]; outputs = [ "out" "dev" ];

View File

@ -41,6 +41,11 @@ stdenv.mkDerivation {
"-DCMAKE_TRY_COMPILE_TARGET_TYPE=STATIC_LIBRARY" "-DCMAKE_TRY_COMPILE_TARGET_TYPE=STATIC_LIBRARY"
] ++ stdenv.lib.optionals (bareMetal) [ ] ++ stdenv.lib.optionals (bareMetal) [
"-DCOMPILER_RT_OS_DIR=baremetal" "-DCOMPILER_RT_OS_DIR=baremetal"
] ++ stdenv.lib.optionals (stdenv.hostPlatform.isDarwin) [
# The compiler-rt build infrastructure sniffs supported platforms on Darwin
# and finds i386;x86_64;x86_64h. We only build for x86_64, so linking fails
# when it tries to use libc++ and libc++api for i386.
"-DDARWIN_osx_ARCHS=${stdenv.hostPlatform.parsed.cpu.name}"
]; ];
outputs = [ "out" "dev" ]; outputs = [ "out" "dev" ];

View File

@ -41,6 +41,11 @@ stdenv.mkDerivation {
"-DCMAKE_TRY_COMPILE_TARGET_TYPE=STATIC_LIBRARY" "-DCMAKE_TRY_COMPILE_TARGET_TYPE=STATIC_LIBRARY"
] ++ stdenv.lib.optionals (bareMetal) [ ] ++ stdenv.lib.optionals (bareMetal) [
"-DCOMPILER_RT_OS_DIR=baremetal" "-DCOMPILER_RT_OS_DIR=baremetal"
] ++ stdenv.lib.optionals (stdenv.hostPlatform.isDarwin) [
# The compiler-rt build infrastructure sniffs supported platforms on Darwin
# and finds i386;x86_64;x86_64h. We only build for x86_64, so linking fails
# when it tries to use libc++ and libc++api for i386.
"-DDARWIN_osx_ARCHS=${stdenv.hostPlatform.parsed.cpu.name}"
]; ];
outputs = [ "out" "dev" ]; outputs = [ "out" "dev" ];

View File

@ -1,4 +1,5 @@
{ stdenv, cmake, fetch, libcxx, llvm, version { stdenv, cmake, fetch, libcxx, llvm, version
, standalone ? false
# on musl the shared objects don't build # on musl the shared objects don't build
, enableShared ? ! stdenv.hostPlatform.isMusl }: , enableShared ? ! stdenv.hostPlatform.isMusl }:
@ -20,7 +21,9 @@ stdenv.mkDerivation {
patch -p1 -d $(ls -d libcxx-*) -i ${../libcxx-0001-musl-hacks.patch} patch -p1 -d $(ls -d libcxx-*) -i ${../libcxx-0001-musl-hacks.patch}
''; '';
cmakeFlags = stdenv.lib.optional (!enableShared) "-DLIBCXXABI_ENABLE_SHARED=OFF"; cmakeFlags =
stdenv.lib.optional standalone "-DLLVM_ENABLE_LIBCXX=ON" ++
stdenv.lib.optional (!enableShared) "-DLIBCXXABI_ENABLE_SHARED=OFF";
installPhase = if stdenv.isDarwin installPhase = if stdenv.isDarwin
then '' then ''

View File

@ -41,6 +41,11 @@ stdenv.mkDerivation {
"-DCMAKE_TRY_COMPILE_TARGET_TYPE=STATIC_LIBRARY" "-DCMAKE_TRY_COMPILE_TARGET_TYPE=STATIC_LIBRARY"
] ++ stdenv.lib.optionals (bareMetal) [ ] ++ stdenv.lib.optionals (bareMetal) [
"-DCOMPILER_RT_OS_DIR=baremetal" "-DCOMPILER_RT_OS_DIR=baremetal"
] ++ stdenv.lib.optionals (stdenv.hostPlatform.isDarwin) [
# The compiler-rt build infrastructure sniffs supported platforms on Darwin
# and finds i386;x86_64;x86_64h. We only build for x86_64, so linking fails
# when it tries to use libc++ and libc++api for i386.
"-DDARWIN_osx_ARCHS=${stdenv.hostPlatform.parsed.cpu.name}"
]; ];
outputs = [ "out" "dev" ]; outputs = [ "out" "dev" ];

View File

@ -41,6 +41,11 @@ stdenv.mkDerivation rec {
"-DCMAKE_TRY_COMPILE_TARGET_TYPE=STATIC_LIBRARY" "-DCMAKE_TRY_COMPILE_TARGET_TYPE=STATIC_LIBRARY"
] ++ stdenv.lib.optionals (bareMetal) [ ] ++ stdenv.lib.optionals (bareMetal) [
"-DCOMPILER_RT_OS_DIR=baremetal" "-DCOMPILER_RT_OS_DIR=baremetal"
] ++ stdenv.lib.optionals (stdenv.hostPlatform.isDarwin) [
# The compiler-rt build infrastructure sniffs supported platforms on Darwin
# and finds i386;x86_64;x86_64h. We only build for x86_64, so linking fails
# when it tries to use libc++ and libc++api for i386.
"-DDARWIN_osx_ARCHS=${stdenv.hostPlatform.parsed.cpu.name}"
]; ];
outputs = [ "out" "dev" ]; outputs = [ "out" "dev" ];

View File

@ -44,11 +44,22 @@ let
, groff, docSupport ? true , groff, docSupport ? true
, libyaml, yamlSupport ? true , libyaml, yamlSupport ? true
, libffi, fiddleSupport ? true , libffi, fiddleSupport ? true
# By default, ruby has 3 observed references to stdenv.cc:
#
# - If you run:
# ruby -e "puts RbConfig::CONFIG['configure_args']" # ruby -e "puts RbConfig::CONFIG['configure_args']"
# puts a reference to the C compiler in the binary. # - In:
# This might be required by some gems at runtime, # $out/${passthru.libPath}/${stdenv.targetPlatform.system}/rbconfig.rb
# but we allow to strip it out for smaller closure size. # Or (usually):
, removeReferencesTo, removeReferenceToCC ? true # $(nix-build -A ruby)/lib/ruby/2.6.0/x86_64-linux/rbconfig.rb
# - In $out/lib/libruby.so and/or $out/lib/libruby.dylib
#
# Since some Gems require JIT support, there's probably no
# escape from this reference. Hence, it was decided to enable this
# feature by default, as it's enabled by default by ruby's ./configure
# script. If you'd like to have a ruby without reference to cc, setting
# jitSupport to false should remove all known references mentioned above.
, removeReferencesTo, jitSupport ? true
, autoreconfHook, bison, autoconf , autoreconfHook, bison, autoconf
, buildEnv, bundler, bundix , buildEnv, bundler, bundix
, libiconv, libobjc, libunwind, Foundation , libiconv, libobjc, libunwind, Foundation
@ -121,6 +132,7 @@ let
configureFlags = ["--enable-shared" "--enable-pthread" "--with-soname=ruby-${version}"] configureFlags = ["--enable-shared" "--enable-pthread" "--with-soname=ruby-${version}"]
++ op useRailsExpress "--with-baseruby=${baseruby}/bin/ruby" ++ op useRailsExpress "--with-baseruby=${baseruby}/bin/ruby"
++ op (!jitSupport) "--disable-jit-support"
++ op (!docSupport) "--disable-install-doc" ++ op (!docSupport) "--disable-install-doc"
++ ops stdenv.isDarwin [ ++ ops stdenv.isDarwin [
# on darwin, we have /usr/include/tk.h -- so the configure script detects # on darwin, we have /usr/include/tk.h -- so the configure script detects
@ -157,11 +169,14 @@ let
# Remove unnecessary groff reference from runtime closure, since it's big # Remove unnecessary groff reference from runtime closure, since it's big
sed -i '/NROFF/d' $out/lib/ruby/*/*/rbconfig.rb sed -i '/NROFF/d' $out/lib/ruby/*/*/rbconfig.rb
${ ${
lib.optionalString removeReferenceToCC '' lib.optionalString (!jitSupport) ''
# Get rid of the CC runtime dependency # Get rid of the CC runtime dependency
${removeReferencesTo}/bin/remove-references-to \ ${removeReferencesTo}/bin/remove-references-to \
-t ${stdenv.cc} \ -t ${stdenv.cc} \
$out/lib/libruby* $out/lib/libruby*
${removeReferencesTo}/bin/remove-references-to \
-t ${stdenv.cc} \
$out/${passthru.libPath}/${stdenv.targetPlatform.system}/rbconfig.rb
'' ''
} }
# Bundler tries to create this directory # Bundler tries to create this directory

View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "lilv"; pname = "lilv";
version = "0.24.8"; version = "0.24.10";
src = fetchurl { src = fetchurl {
url = "https://download.drobilla.net/${pname}-${version}.tar.bz2"; url = "https://download.drobilla.net/${pname}-${version}.tar.bz2";
sha256 = "0063i5zgf3d3accwmyx651hw0wh5ik7kji2hvfkcdbl1qia3dp6a"; sha256 = "1565zy0yz46cf2f25pi46msdnzkj6bbhml9gfigdpjnsdlyskfyi";
}; };
patches = [ ./lilv-pkgconfig.patch ]; patches = [ ./lilv-pkgconfig.patch ];

View File

@ -30,7 +30,13 @@ stdenv.mkDerivation rec {
sha256 = "1zp5gpx61v1cpqf2zwb1cidhp9xylvw49d3zydkxqk6b1qa20xpp"; sha256 = "1zp5gpx61v1cpqf2zwb1cidhp9xylvw49d3zydkxqk6b1qa20xpp";
}; };
patches = lib.optional stdenv.isSunOS ./implement-getgrouplist.patch; patches = [
# 'generate.consistent.ids=1' ensures reproducible docs, for further details see
# http://docbook.sourceforge.net/release/xsl/current/doc/html/generate.consistent.ids.html
# Also applied upstream in https://gitlab.freedesktop.org/dbus/dbus/-/merge_requests/189,
# expected in version 1.14
./docs-reproducible-ids.patch
] ++ (lib.optional stdenv.isSunOS ./implement-getgrouplist.patch);
postPatch = '' postPatch = ''
substituteInPlace tools/Makefile.in \ substituteInPlace tools/Makefile.in \

View File

@ -0,0 +1,15 @@
diff --color -Naur dbus-1.12.20-original/doc/Makefile.in dbus-1.12.20-hacked2/doc/Makefile.in
--- dbus-1.12.20-original/doc/Makefile.in 2020-07-02 12:10:41.000000000 +0200
+++ dbus-1.12.20-hacked2/doc/Makefile.in 2020-11-07 09:57:15.297694773 +0100
@@ -870,8 +870,10 @@
.PRECIOUS: Makefile
+# 'generate.consistent.ids=1' ensures reproducible docs, for further details see
+# http://docbook.sourceforge.net/release/xsl/current/doc/html/generate.consistent.ids.html
@DBUS_XML_DOCS_ENABLED_TRUE@%.html: %.xml
-@DBUS_XML_DOCS_ENABLED_TRUE@ $(XMLTO) html-nochunks $<
+@DBUS_XML_DOCS_ENABLED_TRUE@ $(XMLTO) --stringparam generate.consistent.ids=1 html-nochunks $<
@DBUS_XML_DOCS_ENABLED_TRUE@%.1: %.1.xml
@DBUS_XML_DOCS_ENABLED_TRUE@ $(XMLTO) man $<

View File

@ -10,13 +10,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "enchant"; pname = "enchant";
version = "2.2.12"; version = "2.2.13";
outputs = [ "out" "dev" ]; outputs = [ "out" "dev" ];
src = fetchurl { src = fetchurl {
url = "https://github.com/AbiWord/${pname}/releases/download/v${version}/${pname}-${version}.tar.gz"; url = "https://github.com/AbiWord/${pname}/releases/download/v${version}/${pname}-${version}.tar.gz";
sha256 = "0zi20s62gax9rkhwj318kqrxa62pmks6dsdd6m9pzvhlwy5cb6vb"; sha256 = "084aqsrkzz2c1ls47p759d9bsi26d0m6wq9901k37483g46zkfga";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

View File

@ -12,12 +12,9 @@ assert cupsSupport -> cups != null;
with stdenv.lib; with stdenv.lib;
let
pname = "gtk+";
version = "2.24.32"; # remove passthru on next update
in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "${pname}-${version}"; pname = "gtk+";
version = "2.24.32";
src = fetchurl { src = fetchurl {
url = "mirror://gnome/sources/gtk+/2.24/${pname}-${version}.tar.xz"; url = "mirror://gnome/sources/gtk+/2.24/${pname}-${version}.tar.xz";
@ -75,8 +72,6 @@ stdenv.mkDerivation rec {
''; '';
passthru = { passthru = {
# passthru to prevent rebuild but allow pname and version
inherit pname version;
gtkExeEnvPostBuild = '' gtkExeEnvPostBuild = ''
rm $out/lib/gtk-2.0/2.10.0/immodules.cache rm $out/lib/gtk-2.0/2.10.0/immodules.cache
$out/bin/gtk-query-immodules-2.0 $out/lib/gtk-2.0/2.10.0/immodules/*.so > $out/lib/gtk-2.0/2.10.0/immodules.cache $out/bin/gtk-query-immodules-2.0 $out/lib/gtk-2.0/2.10.0/immodules/*.so > $out/lib/gtk-2.0/2.10.0/immodules.cache

View File

@ -1,20 +1,13 @@
{ stdenv, fetchurl, fetchpatch, cmake }: { stdenv, fetchurl, cmake }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "json-c-0.14"; pname = "json-c";
src = fetchurl { version = "0.15";
url = "https://s3.amazonaws.com/json-c_releases/releases/${name}-nodoc.tar.gz";
sha256 = "1yia8417qljmczs9w3rn4c4i2p2iywq098pgrj11s81599j4x4cr";
};
patches = [ src = fetchurl {
# https://nvd.nist.gov/vuln/detail/CVE-2020-12762 url = "https://s3.amazonaws.com/json-c_releases/releases/${pname}-${version}.tar.gz";
(fetchpatch { sha256 = "1im484iz08j3gmzpw07v16brwq46pxxj65i996kkp2vivcfhmn5q";
name = "CVE-2020-12762.patch"; };
url = "https://github.com/json-c/json-c/commit/5d6fa331418d49f1bd488553fd1cfa9ab023fabb.patch";
sha256 = "0aar7kgbycqxnhh0lrr61adfbb903nbapalhs5i6h8anxwy1ylcm";
})
];
outputs = [ "out" "dev" ]; outputs = [ "out" "dev" ];

View File

@ -1,8 +1,7 @@
{ stdenv, fetchurl, pkgconfig, yasm { stdenv, fetchurl, pkgconfig, yasm
, freetype, fribidi , freetype, fribidi, harfbuzz
, encaSupport ? true, enca ? null # enca support , encaSupport ? true, enca ? null # enca support
, fontconfigSupport ? true, fontconfig ? null # fontconfig support , fontconfigSupport ? true, fontconfig ? null # fontconfig support
, harfbuzzSupport ? true, harfbuzz ? null # harfbuzz support
, rasterizerSupport ? false # Internal rasterizer , rasterizerSupport ? false # Internal rasterizer
, largeTilesSupport ? false # Use larger tiles in the rasterizer , largeTilesSupport ? false # Use larger tiles in the rasterizer
, libiconv , libiconv
@ -10,7 +9,6 @@
assert encaSupport -> enca != null; assert encaSupport -> enca != null;
assert fontconfigSupport -> fontconfig != null; assert fontconfigSupport -> fontconfig != null;
assert harfbuzzSupport -> harfbuzz != null;
let let
mkFlag = optSet: flag: if optSet then "--enable-${flag}" else "--disable-${flag}"; mkFlag = optSet: flag: if optSet then "--enable-${flag}" else "--disable-${flag}";
@ -19,27 +17,25 @@ in
with stdenv.lib; with stdenv.lib;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "libass"; pname = "libass";
version = "0.14.0"; version = "0.15.0";
src = fetchurl { src = fetchurl {
url = "https://github.com/libass/libass/releases/download/${version}/${pname}-${version}.tar.xz"; url = "https://github.com/libass/libass/releases/download/${version}/${pname}-${version}.tar.xz";
sha256 = "18iqznl4mabhj9ywfsz4kwvbsplcv1jjxq50nxssvbj8my1267w8"; sha256 = "0cz8v6kh3f2j5rdjrra2z0h715fa16vjm7kambvqx9hak86262cz";
}; };
configureFlags = [ configureFlags = [
(mkFlag encaSupport "enca") (mkFlag encaSupport "enca")
(mkFlag fontconfigSupport "fontconfig") (mkFlag fontconfigSupport "fontconfig")
(mkFlag harfbuzzSupport "harfbuzz")
(mkFlag rasterizerSupport "rasterizer") (mkFlag rasterizerSupport "rasterizer")
(mkFlag largeTilesSupport "large-tiles") (mkFlag largeTilesSupport "large-tiles")
]; ];
nativeBuildInputs = [ pkgconfig yasm ]; nativeBuildInputs = [ pkgconfig yasm ];
buildInputs = [ freetype fribidi ] buildInputs = [ freetype fribidi harfbuzz ]
++ optional encaSupport enca ++ optional encaSupport enca
++ optional fontconfigSupport fontconfig ++ optional fontconfigSupport fontconfig
++ optional harfbuzzSupport harfbuzz
++ optional stdenv.isDarwin libiconv; ++ optional stdenv.isDarwin libiconv;
meta = { meta = {

View File

@ -10,7 +10,7 @@ stdenv.mkDerivation {
outputs = [ "out" "dev" ]; outputs = [ "out" "dev" ];
patches = binutils-unwrapped.patches ++ [ patches = binutils-unwrapped.patches ++ [
../../tools/misc/binutils/build-components-separately.patch (binutils-unwrapped.patchesDir + "/build-components-separately.patch")
(fetchpatch { (fetchpatch {
url = "https://raw.githubusercontent.com/mxe/mxe/e1d4c144ee1994f70f86cf7fd8168fe69bd629c6/src/bfd-1-disable-subdir-doc.patch"; url = "https://raw.githubusercontent.com/mxe/mxe/e1d4c144ee1994f70f86cf7fd8168fe69bd629c6/src/bfd-1-disable-subdir-doc.patch";
sha256 = "0pzb3i74d1r7lhjan376h59a7kirw15j7swwm8pz3zy9lkdqkj6q"; sha256 = "0pzb3i74d1r7lhjan376h59a7kirw15j7swwm8pz3zy9lkdqkj6q";

View File

@ -19,11 +19,11 @@ assert withFonts -> freetype != null;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "libbluray"; pname = "libbluray";
version = "1.2.0"; version = "1.2.1";
src = fetchurl { src = fetchurl {
url = "http://get.videolan.org/libbluray/${version}/${pname}-${version}.tar.bz2"; url = "http://get.videolan.org/libbluray/${version}/${pname}-${version}.tar.bz2";
sha256 = "04bcd53ml0zn8b4f9r1grs0yy20rcirji1v3pxzaf4i5zl3flhfd"; sha256 = "1v1nmq631j0prih7pjl01ixhhwgrkjpxrjmmc342rsl8g4zyh8sj";
}; };
patches = optional withJava ./BDJ-JARFILE-path.patch; patches = optional withJava ./BDJ-JARFILE-path.patch;

View File

@ -1,14 +1,14 @@
{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig }: { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "1.0.7"; version = "1.0.8";
pname = "libde265"; pname = "libde265";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "strukturag"; owner = "strukturag";
repo = "libde265"; repo = "libde265";
rev = "v${version}"; rev = "v${version}";
sha256 = "0x7g9771457z49qvzpk4iswfhq018i0mzsflv9gg8if5hjqhfdp0"; sha256 = "1dzflqbk248lz5ws0ni5acmf32b3rmnq5gsfaz7691qqjxkl1zml";
}; };
nativeBuildInputs = [ autoreconfHook pkgconfig ]; nativeBuildInputs = [ autoreconfHook pkgconfig ];

View File

@ -6,11 +6,11 @@ assert enableCapabilities -> stdenv.isLinux;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "libgcrypt"; pname = "libgcrypt";
version = "1.8.6"; version = "1.8.7";
src = fetchurl { src = fetchurl {
url = "mirror://gnupg/libgcrypt/${pname}-${version}.tar.bz2"; url = "mirror://gnupg/libgcrypt/${pname}-${version}.tar.bz2";
sha256 = "0xdrsxgqw5v7szshjdgdv60rgpvzzaqic32ahqrzr6bvc402gfhc"; sha256 = "0j27jxhjay78by940d64778nxwbysxynv5mq6iq1nmlrh810zdq3";
}; };
outputs = [ "out" "dev" "info" ]; outputs = [ "out" "dev" "info" ];

View File

@ -17,18 +17,20 @@
, gdk-pixbuf , gdk-pixbuf
, librsvg , librsvg
, hicolor-icon-theme , hicolor-icon-theme
, at-spi2-atk
, at-spi2-core
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "libhandy"; pname = "libhandy";
version = "1.0.0"; version = "1.0.1";
outputs = [ "out" "dev" "devdoc" "glade" ]; outputs = [ "out" "dev" "devdoc" "glade" ];
outputBin = "dev"; outputBin = "dev";
src = fetchurl { src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
hash = "sha256-qTmFgvR7fXKSBdbqwMBo/vNarySf3Vfuo3JPhRjSZpk="; sha256 = "106qa4d2rcbvd3g3avbgkd59aq0bjvwpx8vfz1cikvwrarnfvql4";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
@ -52,8 +54,11 @@ stdenv.mkDerivation rec {
checkInputs = [ checkInputs = [
dbus dbus
hicolor-icon-theme
xvfb_run xvfb_run
at-spi2-atk
at-spi2-core
librsvg
hicolor-icon-theme
]; ];
mesonFlags = [ mesonFlags = [
@ -64,14 +69,11 @@ stdenv.mkDerivation rec {
PKG_CONFIG_GLADEUI_2_0_MODULEDIR = "${placeholder "glade"}/lib/glade/modules"; PKG_CONFIG_GLADEUI_2_0_MODULEDIR = "${placeholder "glade"}/lib/glade/modules";
PKG_CONFIG_GLADEUI_2_0_CATALOGDIR = "${placeholder "glade"}/share/glade/catalogs"; PKG_CONFIG_GLADEUI_2_0_CATALOGDIR = "${placeholder "glade"}/share/glade/catalogs";
# Bail out! dbind-FATAL-WARNING: doCheck = true;
# AT-SPI: Error retrieving accessibility bus address: org.freedesktop.DBus.Error.ServiceUnknown:
# The name org.a11y.Bus was not provided by any .service files
doCheck = false;
checkPhase = '' checkPhase = ''
NO_AT_BRIDGE=1 \ NO_AT_BRIDGE=1 \
XDG_DATA_DIRS="$XDG_DATA_DIRS:${hicolor-icon-theme}/share" XDG_DATA_DIRS="$XDG_DATA_DIRS:${hicolor-icon-theme}/share" \
GDK_PIXBUF_MODULE_FILE="${librsvg.out}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache" \ GDK_PIXBUF_MODULE_FILE="${librsvg.out}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache" \
xvfb-run -s '-screen 0 800x600x24' dbus-run-session \ xvfb-run -s '-screen 0 800x600x24' dbus-run-session \
--config-file=${dbus.daemon}/share/dbus-1/session.conf \ --config-file=${dbus.daemon}/share/dbus-1/session.conf \

View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "libipt"; pname = "libipt";
version = "2.0.2"; version = "2.0.3";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "intel"; owner = "intel";
repo = "libipt"; repo = "libipt";
rev = "v${version}"; rev = "v${version}";
sha256 = "095agnk7r2sq5yas6c1ri8fmsl55n4l5hkl6j5l397p9nxvxvrkc"; sha256 = "1i6jmv345rqd88qmap6iqbaph4pkd6wbjgkixf22a80pj7cfm1s4";
}; };
nativeBuildInputs = [ cmake ]; nativeBuildInputs = [ cmake ];

View File

@ -10,11 +10,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "libmbim"; pname = "libmbim";
version = "1.24.2"; version = "1.24.4";
src = fetchurl { src = fetchurl {
url = "https://www.freedesktop.org/software/libmbim/${pname}-${version}.tar.xz"; url = "https://www.freedesktop.org/software/libmbim/${pname}-${version}.tar.xz";
sha256 = "1r41d4yddp8rgccxrkz9vg5lbrj3dr5vy71d8igrr147k44qq69j"; sha256 = "11djb1d8w9ms07aklfm3pskjw9rnff4p4n3snanschv22zk8wj6x";
}; };
outputs = [ "out" "dev" "man" ]; outputs = [ "out" "dev" "man" ];

View File

@ -1,11 +1,11 @@
{ stdenv, fetchurl, pkgconfig, libusb1, libiconv }: { stdenv, fetchurl, pkgconfig, libusb1, libiconv }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "libmtp-1.1.17"; name = "libmtp-1.1.18";
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/libmtp/${name}.tar.gz"; url = "mirror://sourceforge/libmtp/${name}.tar.gz";
sha256 = "1p3r38nvdip40ab1h4scj3mzfjkx6kd14szjqyw9r6wz5pslr8zq"; sha256 = "1w41l93yi0dmw218daiw36rylkc8rammxx37csh1ij24q18gx03j";
}; };
outputs = [ "bin" "dev" "out" ]; outputs = [ "bin" "dev" "out" ];

View File

@ -1,12 +1,12 @@
{ stdenv, fetchurl, pkgconfig, libmnl }: { stdenv, fetchurl, pkgconfig, libmnl }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "1.1.7"; version = "1.1.8";
pname = "libnftnl"; pname = "libnftnl";
src = fetchurl { src = fetchurl {
url = "https://netfilter.org/projects/${pname}/files/${pname}-${version}.tar.bz2"; url = "https://netfilter.org/projects/${pname}/files/${pname}-${version}.tar.bz2";
sha256 = "13zd90bfrr0q3j0l0cbc8kiizccw6n8gp727kqnfljh024zw3nr0"; sha256 = "04dp797llg3cqzivwrql30wg9mfr0ngnp0v5gs7jcdmp11dzm8q4";
}; };
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];

View File

@ -10,7 +10,7 @@ stdenv.mkDerivation {
outputs = [ "out" "dev" ]; outputs = [ "out" "dev" ];
patches = binutils-unwrapped.patches ++ [ patches = binutils-unwrapped.patches ++ [
../../tools/misc/binutils/build-components-separately.patch (binutils-unwrapped.patchesDir + "/build-components-separately.patch")
]; ];
# We just want to build libopcodes # We just want to build libopcodes

View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "libqmi"; pname = "libqmi";
version = "1.26.2"; version = "1.26.6";
src = fetchurl { src = fetchurl {
url = "https://www.freedesktop.org/software/libqmi/${pname}-${version}.tar.xz"; url = "https://www.freedesktop.org/software/libqmi/${pname}-${version}.tar.xz";
sha256 = "00vvvfq74awg6mk0si1cdv79f6z6wqx11h47nl78a1h7zsr6fd0k"; sha256 = "1fbwz6534q6n4bgabdx4svbgkf4mdyisjh3y51jjd94p22xn66d7";
}; };
outputs = [ "out" "dev" "devdoc" ]; outputs = [ "out" "dev" "devdoc" ];

View File

@ -4,11 +4,11 @@
# need pkgconfig so that libshout installs ${out}/lib/pkgconfig/shout.pc # need pkgconfig so that libshout installs ${out}/lib/pkgconfig/shout.pc
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "libshout-2.4.3"; name = "libshout-2.4.4";
src = fetchurl { src = fetchurl {
url = "http://downloads.xiph.org/releases/libshout/${name}.tar.gz"; url = "http://downloads.xiph.org/releases/libshout/${name}.tar.gz";
sha256 = "1zhdshas539cs8fsz8022ljxnnncr5lafhfd1dqr1gs125fzb2hd"; sha256 = "1hz670a4pfpsb89b0mymy8nw4rx8x0vmh61gq6j1vbg70mfhrscc";
}; };
outputs = [ "out" "dev" "doc" ]; outputs = [ "out" "dev" "doc" ];

View File

@ -22,6 +22,7 @@ stdenv.mkDerivation rec {
python3 python3
sqlite sqlite
libpsl libpsl
glib.out
brotli brotli
] ++ lib.optionals stdenv.isLinux [ ] ++ lib.optionals stdenv.isLinux [
libsysprof-capture libsysprof-capture
@ -29,6 +30,8 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ meson ninja pkgconfig gobject-introspection vala glib ]; nativeBuildInputs = [ meson ninja pkgconfig gobject-introspection vala glib ];
propagatedBuildInputs = [ glib libxml2 ]; propagatedBuildInputs = [ glib libxml2 ];
NIX_CFLAGS_COMPILE = [ "-lpthread" ];
mesonFlags = [ mesonFlags = [
"-Dtls_check=false" # glib-networking is a runtime dependency, not a compile-time dependency "-Dtls_check=false" # glib-networking is a runtime dependency, not a compile-time dependency
"-Dgssapi=disabled" "-Dgssapi=disabled"

View File

@ -31,7 +31,7 @@ with stdenv.lib;
let let
# Release calendar: https://www.mesa3d.org/release-calendar.html # Release calendar: https://www.mesa3d.org/release-calendar.html
# Release frequency: https://www.mesa3d.org/releasing.html#schedule # Release frequency: https://www.mesa3d.org/releasing.html#schedule
version = "20.2.1"; version = "20.2.2";
branch = versions.major version; branch = versions.major version;
in in
@ -46,7 +46,7 @@ stdenv.mkDerivation {
"ftp://ftp.freedesktop.org/pub/mesa/${version}/mesa-${version}.tar.xz" "ftp://ftp.freedesktop.org/pub/mesa/${version}/mesa-${version}.tar.xz"
"ftp://ftp.freedesktop.org/pub/mesa/older-versions/${branch}.x/${version}/mesa-${version}.tar.xz" "ftp://ftp.freedesktop.org/pub/mesa/older-versions/${branch}.x/${version}/mesa-${version}.tar.xz"
]; ];
sha256 = "0ji4s1gwcvx3fbj9h0x5zbma6kw4b75vs0266zhc06r97yd6v96i"; sha256 = "0qdqi767vshclnfg9drlsmp2pa17hi7y0172s064jwfgj08fp4qz";
}; };
prePatch = "patchShebangs ."; prePatch = "patchShebangs .";

View File

@ -55,6 +55,10 @@ let
./qtbase.patch.d/0001-qtbase-mkspecs-mac.patch ./qtbase.patch.d/0001-qtbase-mkspecs-mac.patch
./qtbase.patch.d/0002-qtbase-mac.patch ./qtbase.patch.d/0002-qtbase-mac.patch
./qtbase.patch.d/0013-define-kiosurfacesuccess.patch ./qtbase.patch.d/0013-define-kiosurfacesuccess.patch
# Patch framework detection to support X.framework/X.tbd,
# extending the current support for X.framework/X.
./qtbase.patch.d/0015-qtbase-tbd-frameworks.patch
] ]
++ [ ++ [
./qtbase.patch.d/0003-qtbase-mkspecs.patch ./qtbase.patch.d/0003-qtbase-mkspecs.patch

View File

@ -0,0 +1,15 @@
diff --git a/src/gui/Qt5GuiConfigExtras.cmake.in b/src/gui/Qt5GuiConfigExtras.cmake.in
index 84dbbfebd4..615bfed124 100644
--- a/src/gui/Qt5GuiConfigExtras.cmake.in
+++ b/src/gui/Qt5GuiConfigExtras.cmake.in
@@ -119,6 +119,10 @@ macro(_qt5gui_find_extra_libs Name Libs LibDir IncDirs)
if (NOT EXISTS "${Qt5Gui_${_cmake_lib_name}_LIBRARY}")
set(Qt5Gui_${_cmake_lib_name}_LIBRARY)
endif()
+ set(Qt5Gui_${_cmake_lib_name}_LIBRARY "${Qt5Gui_${_cmake_lib_name}_LIBRARY}/${_lib}.tbd")
+ if (NOT EXISTS "${Qt5Gui_${_cmake_lib_name}_LIBRARY}")
+ set(Qt5Gui_${_cmake_lib_name}_LIBRARY)
+ endif()
!!ENDIF
if (NOT Qt5Gui_${_cmake_lib_name}_LIBRARY)
# The above find_library call doesn\'t work for finding

View File

@ -55,6 +55,10 @@ let
optionals stdenv.isDarwin [ optionals stdenv.isDarwin [
./qtbase.patch.d/0001-qtbase-mkspecs-mac.patch ./qtbase.patch.d/0001-qtbase-mkspecs-mac.patch
./qtbase.patch.d/0002-qtbase-mac.patch ./qtbase.patch.d/0002-qtbase-mac.patch
# Patch framework detection to support X.framework/X.tbd,
# extending the current support for X.framework/X.
./qtbase.patch.d/0012-qtbase-tbd-frameworks.patch
] ]
++ [ ++ [
./qtbase.patch.d/0003-qtbase-mkspecs.patch ./qtbase.patch.d/0003-qtbase-mkspecs.patch

View File

@ -0,0 +1,15 @@
diff --git a/src/gui/Qt5GuiConfigExtras.cmake.in b/src/gui/Qt5GuiConfigExtras.cmake.in
index 84dbbfebd4..615bfed124 100644
--- a/src/gui/Qt5GuiConfigExtras.cmake.in
+++ b/src/gui/Qt5GuiConfigExtras.cmake.in
@@ -119,6 +119,10 @@ macro(_qt5gui_find_extra_libs Name Libs LibDir IncDirs)
if (NOT EXISTS "${Qt5Gui_${_cmake_lib_name}_LIBRARY}")
set(Qt5Gui_${_cmake_lib_name}_LIBRARY)
endif()
+ set(Qt5Gui_${_cmake_lib_name}_LIBRARY "${Qt5Gui_${_cmake_lib_name}_LIBRARY}/${_lib}.tbd")
+ if (NOT EXISTS "${Qt5Gui_${_cmake_lib_name}_LIBRARY}")
+ set(Qt5Gui_${_cmake_lib_name}_LIBRARY)
+ endif()
!!ENDIF
if (NOT Qt5Gui_${_cmake_lib_name}_LIBRARY)
# The above find_library call doesn\'t work for finding

View File

@ -55,6 +55,10 @@ let
optionals stdenv.isDarwin [ optionals stdenv.isDarwin [
./qtbase.patch.d/0001-qtbase-mkspecs-mac.patch ./qtbase.patch.d/0001-qtbase-mkspecs-mac.patch
./qtbase.patch.d/0002-qtbase-mac.patch ./qtbase.patch.d/0002-qtbase-mac.patch
# Patch framework detection to support X.framework/X.tbd,
# extending the current support for X.framework/X.
./qtbase.patch.d/0012-qtbase-tbd-frameworks.patch
] ]
++ [ ++ [
./qtbase.patch.d/0003-qtbase-mkspecs.patch ./qtbase.patch.d/0003-qtbase-mkspecs.patch

View File

@ -0,0 +1,15 @@
diff --git a/src/gui/Qt5GuiConfigExtras.cmake.in b/src/gui/Qt5GuiConfigExtras.cmake.in
index 84dbbfebd4..615bfed124 100644
--- a/src/gui/Qt5GuiConfigExtras.cmake.in
+++ b/src/gui/Qt5GuiConfigExtras.cmake.in
@@ -119,6 +119,10 @@ macro(_qt5gui_find_extra_libs Name Libs LibDir IncDirs)
if (NOT EXISTS "${Qt5Gui_${_cmake_lib_name}_LIBRARY}")
set(Qt5Gui_${_cmake_lib_name}_LIBRARY)
endif()
+ set(Qt5Gui_${_cmake_lib_name}_LIBRARY "${Qt5Gui_${_cmake_lib_name}_LIBRARY}/${_lib}.tbd")
+ if (NOT EXISTS "${Qt5Gui_${_cmake_lib_name}_LIBRARY}")
+ set(Qt5Gui_${_cmake_lib_name}_LIBRARY)
+ endif()
!!ENDIF
if (NOT Qt5Gui_${_cmake_lib_name}_LIBRARY)
# The above find_library call doesn\'t work for finding

View File

@ -59,7 +59,7 @@ with stdenv.lib;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "webkitgtk"; pname = "webkitgtk";
version = "2.30.1"; version = "2.30.2";
outputs = [ "out" "dev" ]; outputs = [ "out" "dev" ];
@ -67,7 +67,7 @@ stdenv.mkDerivation rec {
src = fetchurl { src = fetchurl {
url = "https://webkitgtk.org/releases/${pname}-${version}.tar.xz"; url = "https://webkitgtk.org/releases/${pname}-${version}.tar.xz";
sha256 = "1cfnsl5kvwrbclmp7v9q9ynrz702i9ncb6xmx6972dxpmpyrvi8p"; sha256 = "0ak8slddg7gpk6m096xzkiqw9bfsrrizvqr815bw44665fyf0ry4";
}; };
patches = optionals stdenv.isLinux [ patches = optionals stdenv.isLinux [

View File

@ -0,0 +1,36 @@
{ stdenv, texinfo, flex, bison, fetchFromGitHub, crossLibcStdenv, buildPackages }:
crossLibcStdenv.mkDerivation {
name = "newlib";
src = fetchFromGitHub {
owner = "openrisc";
repo = "newlib";
rev = "8ac94ca7bbe4ceddafe6583ee4766d3c15b18ac8";
sha256 = "0hzhijmry5slpp6x12pgng8v7jil3mn18ahrhnw431lqrs1cma0s";
};
depsBuildBuild = [ buildPackages.stdenv.cc ];
# newlib expects CC to build for build platform, not host platform
preConfigure = ''
export CC=cc
'';
configurePlatforms = [ "build" "target" ];
configureFlags = [
"--host=${stdenv.buildPlatform.config}"
"--disable-newlib-supplied-syscalls"
"--disable-nls"
"--enable-newlib-io-long-long"
"--enable-newlib-register-fini"
"--enable-newlib-retargetable-locking"
];
dontDisableStatic = true;
passthru = {
incdir = "/${stdenv.targetPlatform.config}/include";
libdir = "/${stdenv.targetPlatform.config}/lib";
};
}

View File

@ -1,13 +1,13 @@
{ lib, buildPythonPackage, fetchPypi, isPy27, substituteAll, git, gitdb, mock, nose, ddt }: { lib, buildPythonPackage, fetchPypi, isPy27, substituteAll, git, gitdb, mock, nose, ddt }:
buildPythonPackage rec { buildPythonPackage rec {
version = "3.1.7"; version = "3.1.11";
pname = "GitPython"; pname = "GitPython";
disabled = isPy27; # no longer supported disabled = isPy27; # no longer supported
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "2db287d71a284e22e5c2846042d0602465c7434d910406990d5b74df4afb0858"; sha256 = "befa4d101f91bad1b632df4308ec64555db684c360bd7d2130b4807d49ce86b8";
}; };
patches = [ patches = [

View File

@ -3,11 +3,11 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "adal"; pname = "adal";
version = "1.2.4"; version = "1.2.5";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "7a15d22b1ee7ce1be92441199958748982feba6b7dec35fbf60f9b607bad1bc0"; sha256 = "8003ba03ef04170195b3eddda8a5ab43649ef2c5f0287023d515affb1ccfcfc3";
}; };
propagatedBuildInputs = [ requests pyjwt dateutil ]; propagatedBuildInputs = [ requests pyjwt dateutil ];

View File

@ -25,13 +25,13 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "aiohttp"; pname = "aiohttp";
version = "3.6.2"; version = "3.6.3";
# https://github.com/aio-libs/aiohttp/issues/4525 python3.8 failures # https://github.com/aio-libs/aiohttp/issues/4525 python3.8 failures
disabled = pythonOlder "3.5"; disabled = pythonOlder "3.5";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "09pkw6f1790prnrq0k8cqgnf1qy57ll8lpmc6kld09q7zw4vi6i5"; sha256 = "698cd7bc3c7d1b82bb728bae835724a486a8c376647aec336aa21a60113c3645";
}; };
checkInputs = [ checkInputs = [

View File

@ -5,11 +5,11 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "alembic"; pname = "alembic";
version = "1.4.2"; version = "1.4.3";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "035ab00497217628bf5d0be82d664d8713ab13d37b630084da8e1f98facf4dbf"; sha256 = "5334f32314fb2a56d86b4c4dd1ae34b08c03cae4cb888bc699942104d66bc245";
}; };
buildInputs = [ pytest pytestcov mock coverage ]; buildInputs = [ pytest pytestcov mock coverage ];

View File

@ -2,13 +2,13 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "amazon_kclpy"; pname = "amazon_kclpy";
version = "1.5.0"; version = "1.5.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "awslabs"; owner = "awslabs";
repo = "amazon-kinesis-client-python"; repo = "amazon-kinesis-client-python";
rev = "v${version}"; rev = "v${version}";
sha256 = "1qg86y9172gm5592ja7lr6w7kfnx668j99bf3ijklpk5yshxwr9m"; sha256 = "0jjqh9hq0hx2wr7wlqjr6cixpygragwlk4pz7rkqg2gkbhazmnq3";
}; };
# argparse is just required for python2.6 # argparse is just required for python2.6

View File

@ -4,26 +4,25 @@
, setuptools_scm , setuptools_scm
, docutils , docutils
, pyparsing , pyparsing
, pytestCheckHook
}: }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "amply"; pname = "amply";
version = "0.1.2"; version = "0.1.4";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "1j2dqdz1y1nbyw33qq89v0f5rkmqfbga72d9hax909vpcapm6pbf"; sha256 = "cb12dcb49d16b168c02be128a1527ecde50211e4bd94af76ff4e67707f5a2d38";
}; };
buildInputs = [ setuptools_scm ]; nativeBuildInputs = [ setuptools_scm ];
propagatedBuildInputs = [ propagatedBuildInputs = [
docutils docutils
pyparsing pyparsing
]; ];
checkInputs = [ pytestCheckHook ];
checkPhase = ''
python tests/test_amply.py
'';
pythonImportsCheck = [ "amply" ]; pythonImportsCheck = [ "amply" ];
meta = with stdenv.lib; { meta = with stdenv.lib; {

View File

@ -11,11 +11,11 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "apispec"; pname = "apispec";
version = "3.3.1"; version = "3.3.2";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "f5244ccca33f7a81309f6b3c9d458e33e869050c2d861b9f8cee24b3ad739d2b"; sha256 = "d23ebd5b71e541e031b02a19db10b5e6d5ef8452c552833e3e1afc836b40b1ad";
}; };
checkInputs = [ checkInputs = [

View File

@ -10,13 +10,13 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "astropy"; pname = "astropy";
version = "4.0.1.post1"; version = "4.0.3";
disabled = !isPy3k; # according to setup.py disabled = !isPy3k; # according to setup.py
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "1da4xj793ldck29aajyb514wpz330cml26f3gdp45jj531n4lc2w"; sha256 = "cf69d1a3f140ca8fe1664202072201395495a73c334a69fc965fab6a6e1d281a";
}; };
nativeBuildInputs = [ astropy-helpers ]; nativeBuildInputs = [ astropy-helpers ];

View File

@ -16,11 +16,11 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "atlassian-python-api"; pname = "atlassian-python-api";
version = "1.17.5"; version = "1.17.7";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "cbd7941fa7e1eb6f63e12724277894350298745480297658da912e07234314cc"; sha256 = "456e9873fa5ab5cc91c6ae76a70b662f0993d32e4dff6d8febd866a53d86041e";
}; };
checkInputs = [ pytestrunner pytest ]; checkInputs = [ pytestrunner pytest ];

View File

@ -10,11 +10,11 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "awkward1"; pname = "awkward1";
version = "0.2.35"; version = "0.2.38";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "563868f0f2d0cb398ce3616ee3f9734cc68cee9a612d35cab830ec5c728f1474"; sha256 = "f25db4920677029a92e92b994f1056902724b6a947549254c1446bdc6e388671";
}; };
nativeBuildInputs = [ cmake ]; nativeBuildInputs = [ cmake ];

View File

@ -4,12 +4,12 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "aws-adfs"; pname = "aws-adfs";
version = "1.24.4"; version = "1.24.5";
disabled = isPy27; disabled = isPy27;
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "601b056fa8ba4b615289def3b1aa49aa58f1f4aa6b89f3cf7cf1e0aee9f2291c"; sha256 = "6a78bd31477ea9988166215ae86abcbfe1413bee20373ecdf0dd170b7290db55";
}; };
# Relax version constraint # Relax version constraint

View File

@ -4,7 +4,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "bayespy"; pname = "bayespy";
version = "0.5.19"; version = "0.5.20";
# Python 2 not supported and not some old Python 3 because MPL doesn't support # Python 2 not supported and not some old Python 3 because MPL doesn't support
# them properly. # them properly.
@ -12,7 +12,7 @@ buildPythonPackage rec {
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "24e1327ce241a0113abf217fbaf41ac25e04f5a01f9ed606610f2f1f2d82d34f"; sha256 = "8c16cdc73bbcd9a1124a0495056065b7ce938dbe6c2c780dc330c83fb4d2640a";
}; };
checkInputs = [ pytest nose glibcLocales ]; checkInputs = [ pytest nose glibcLocales ];

View File

@ -2,11 +2,11 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "beautifulsoup4"; pname = "beautifulsoup4";
version = "4.9.1"; version = "4.9.3";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "73cc4d115b96f79c7d77c1c7f7a0a8d4c57860d1041df407dd1aae7f07a77fd7"; sha256 = "84729e322ad1d5b4d25f805bfa05b902dd96450f43842c4e99067d5e1369eb25";
}; };
checkInputs = [ pytest ]; checkInputs = [ pytest ];

View File

@ -33,11 +33,11 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "bokeh"; pname = "bokeh";
version = "2.2.1"; version = "2.2.3";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "qC6e69eh4uu3+PwerYAv79EKhNrvjsS/yYYSEyOUhVU="; sha256 = "c4a3f97afe5f525019dd58ee8c4e3d43f53fe1b1ac264ccaae9b02c07b2abc17";
}; };
patches = [ patches = [

View File

@ -13,11 +13,11 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "boto3"; pname = "boto3";
version = "1.15.9"; # N.B: if you change this, change botocore too version = "1.15.18"; # N.B: if you change this, change botocore too
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "0zrsrz7c8aqj3n06piybwf7vy026rflr0ky362q615rln6iggx82"; sha256 = "f56148e2c6b9a2d704218da42f07d72f00270bfddb13bc1bdea20d3327daa51e";
}; };
propagatedBuildInputs = [ botocore jmespath s3transfer ] ++ lib.optionals (!isPy3k) [ futures ]; propagatedBuildInputs = [ botocore jmespath s3transfer ] ++ lib.optionals (!isPy3k) [ futures ];

View File

@ -12,11 +12,11 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "botocore"; pname = "botocore";
version = "1.18.9"; # N.B: if you change this, change boto3 and awscli to a matching version version = "1.18.18"; # N.B: if you change this, change boto3 and awscli to a matching version
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "0rb3in7n9hdhp3sklkw78l378103khgmhdfy13kxfbgb0646pc1m"; sha256 = "e224754230e7e015836ba20037cac6321e8e2ce9b8627c14d579fcb37249decd";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

View File

@ -1,16 +1,17 @@
{ lib, fetchPypi, buildPythonPackage, isPy3k, keyring, pbkdf2, pyaes}: { lib, fetchPypi, buildPythonPackage, isPy3k, lz4, keyring, pbkdf2, pycryptodome, pyaes}:
buildPythonPackage rec { buildPythonPackage rec {
pname = "browser-cookie3"; pname = "browser-cookie3";
version = "0.11.1"; version = "0.11.4";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "5d1f825fc9cc6f98fe0ee3f97cdb4947c22d59ac8a11643da5837ebd8c873f05"; sha256 = "3d140c6b651dbd8b8555aca6472557fcfda4dd93afc26ea3a200be922a843e2c";
}; };
disabled = !isPy3k; disabled = !isPy3k;
propagatedBuildInputs = [ keyring pbkdf2 pyaes ]; propagatedBuildInputs = [ lz4 keyring pbkdf2 pyaes pycryptodome ];
# No tests implemented # No tests implemented
doCheck = false; doCheck = false;

View File

@ -2,11 +2,11 @@
if isPyPy then null else buildPythonPackage rec { if isPyPy then null else buildPythonPackage rec {
pname = "cffi"; pname = "cffi";
version = "1.14.2"; version = "1.14.3";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "ae8f34d50af2c2154035984b8b5fc5d9ed63f32fe615646ab435b05b132ca91b"; sha256 = "f92f789e4f9241cd262ad7a555ca2c648a98178a953af117ef7fad46aa1d5591";
}; };
outputs = [ "out" "dev" ]; outputs = [ "out" "dev" ];

View File

@ -2,11 +2,11 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "codecov"; pname = "codecov";
version = "2.1.9"; version = "2.1.10";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "355fc7e0c0b8a133045f0d6089bde351c845e7b52b99fec5903b4ea3ab5f6aab"; sha256 = "d30ad6084501224b1ba699cbf018a340bb9553eb2701301c14133995fdd84f33";
}; };
checkInputs = [ unittest2 ]; # Tests only checkInputs = [ unittest2 ]; # Tests only

View File

@ -2,11 +2,11 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "colorama"; pname = "colorama";
version = "0.4.3"; version = "0.4.4";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "e96da0d330793e2cb9485e9ddfd918d456036c7149416295932478192f4436a1"; sha256 = "5941b2b48a20143d2267e95b1c2a7603ce057ee39fd88e7329b0c292aa16869b";
}; };
# No tests in archive # No tests in archive

View File

@ -4,11 +4,11 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "configparser"; pname = "configparser";
version = "5.0.0"; version = "5.0.1";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "2ca44140ee259b5e3d8aaf47c79c36a7ab0d5e94d70bd4105c03ede7a20ea5a1"; sha256 = "005c3b102c96f4be9b8f40dafbd4997db003d07d1caa19f37808be8031475f2a";
}; };
# No tests available # No tests available

View File

@ -9,11 +9,11 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "cornice"; pname = "cornice";
version = "5.0.2"; version = "5.0.3";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "4fcf3be295514e7e20fdd602fea8d204127bb02da2ff6bdbc8b6fba859ac9fd0"; sha256 = "f971831e90343374b21c0c97d523e23eb09cec41a2a8fc2e85bb5c2585348576";
}; };
propagatedBuildInputs = [ pyramid simplejson six venusian ]; propagatedBuildInputs = [ pyramid simplejson six venusian ];

View File

@ -10,11 +10,11 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "croniter"; pname = "croniter";
version = "0.3.34"; version = "0.3.36";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "7186b9b464f45cf3d3c83a18bc2344cc101d7b9fd35a05f2878437b14967e964"; sha256 = "9d3098e50f7edc7480470455d42f09c501fa1bb7e2fc113526ec6e90b068f32c";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

View File

@ -17,13 +17,13 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "cvxpy"; pname = "cvxpy";
version = "1.1.6"; version = "1.1.7";
disabled = pythonOlder "3.5"; disabled = pythonOlder "3.5";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "36527573c937cedd270f46c77b50bb5e16b96ca7b05a7a480bdc8c9052595723"; sha256 = "330eb76e8369c360b68d9231c6eb350848e373b5952134f9bfebaed1a4c4211f";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

View File

@ -5,11 +5,11 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "dash_core_components"; pname = "dash_core_components";
version = "1.12.1"; version = "1.13.0";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "27f2ac612f5574dcd0d645f9302ceca5975bbdac6791865692e3ac51d0aec7f4"; sha256 = "f92025b12931539cdda2173f2b4cd077119cbabbf3ddf62333f6302fd0d8a3ac";
}; };
# No tests in archive # No tests in archive

View File

@ -5,11 +5,11 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "dash_renderer"; pname = "dash_renderer";
version = "1.8.2"; version = "1.8.3";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "84cbb22019299a5a3c268ec1143c6f241c3f136e95753edac83a81673b7fa04e"; sha256 = "f7ab2b922f4f0850bae0e9793cec99f8a1a241e5f7f5786e367ddd9e41d2b170";
}; };
# No tests in archive # No tests in archive

View File

@ -5,11 +5,11 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "dash_table"; pname = "dash_table";
version = "4.10.1"; version = "4.11.0";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "1aa02180faef13434364286b60404d26164d1ce2779c765c9c52e6935991a4e9"; sha256 = "3170504a8626a9676b016c5ab456ab8c1fb1ea0206dcc2eddb8c4c6589216304";
}; };
# No tests in archive # No tests in archive

View File

@ -16,13 +16,13 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "dash"; pname = "dash";
version = "1.16.2"; version = "1.17.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "plotly"; owner = "plotly";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "1krhwxlz8kpaklf5ii3h339id6c3139xzxxkq7mvvag330j6nbgg"; sha256 = "1fbnhpmkxavv6yirmhx7659q1y9bqynwjd1g6cscv1mfv9m59l60";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

View File

@ -8,7 +8,7 @@ buildPythonPackage rec {
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "07rcz699fr0jgx6i6fvh8dxa72j7745inix760nw3g46jwk487gs"; sha256 = "fa1d44269786bcc12d30a7471b0b39478aa37a43703b134d7f12649792f92c1f";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

View File

@ -1,14 +1,14 @@
{ lib, buildPythonPackage, fetchPypi { lib, buildPythonPackage, fetchPypi
, chameleon, colander, iso8601, peppercorn, translationstring, zope_deprecation , chameleon, colander, iso8601, peppercorn, translationstring, zope_deprecation
, nose, coverage, beautifulsoup4, flaky }: , nose, coverage, beautifulsoup4, flaky, pyramid, pytestCheckHook }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "deform"; pname = "deform";
version = "2.0.10"; version = "2.0.14";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "2f4e98a5b5bdcdfff9a62f88bd17c7ee378b7c8be61738797442eed5b961d3d2"; sha256 = "35d9acf144245772a70d05bd24b8263e8cd284f0d564011e8bf331d6150acfc7";
}; };
postPatch = '' postPatch = ''
@ -30,6 +30,8 @@ buildPythonPackage rec {
coverage coverage
beautifulsoup4 beautifulsoup4
flaky flaky
pyramid
pytestCheckHook
]; ];
meta = with lib; { meta = with lib; {

View File

@ -13,11 +13,11 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "django-simple-captcha"; pname = "django-simple-captcha";
version = "0.5.12"; version = "0.5.13";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "1g92sdgcb81r3il34pg0z210cz6wm14k00b558nshai8br1g09gw"; sha256 = "5e43ba3b61daf690ac0319157837bb57e31df8bddbdc9a59ef42ef1a99e21fa2";
extension = "zip"; extension = "zip";
}; };

View File

@ -6,13 +6,13 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "Django"; pname = "Django";
version = "2.2.16"; version = "2.2.17";
disabled = !isPy3k; disabled = !isPy3k;
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "1535g2r322cl4x52fb0dmzlbg23539j2wx6027j54p22xvjlbkv2"; sha256 = "cf5370a4d7765a9dd6d42a7b96b53c74f9446cd38209211304b210fe0404b861";
}; };
patches = stdenv.lib.optional withGdal patches = stdenv.lib.optional withGdal

View File

@ -13,13 +13,13 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "Django"; pname = "Django";
version = "3.1.2"; version = "3.1.3";
disabled = pythonOlder "3.7"; disabled = pythonOlder "3.7";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "a2127ad0150ec6966655bedf15dbbff9697cc86d61653db2da1afa506c0b04cc"; sha256 = "14b87775ffedab2ef6299b73343d1b4b41e5d4e2aa58c6581f114dbec01e3f8f";
}; };
patches = stdenv.lib.optional withGdal patches = stdenv.lib.optional withGdal

View File

@ -6,11 +6,11 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "django-reversion"; pname = "django-reversion";
version = "3.0.7"; version = "3.0.8";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "72fc53580a6b538f0cfff10f27f42333f67d79c406399289c94ec5a193cfb3e1"; sha256 = "49e9930f90322dc6a2754dd26144285cfcc1c5bd0c1c39ca95d5602c5054ae32";
}; };
# tests assume the availability of a mysql/postgresql database # tests assume the availability of a mysql/postgresql database

View File

@ -3,11 +3,11 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "djangoql"; pname = "djangoql";
version = "0.14.0"; version = "0.14.2";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "1b1f80940bb15982e06208b97d7b3d08e1d5f8fb62aa07e5e33599c7ce4c0334"; sha256 = "91fd65d9ee4b09092602ff05aca8a21c5a18062faf56f269a011b8e8e41483c6";
}; };
propagatedBuildInputs = [ ply ]; propagatedBuildInputs = [ ply ];

View File

@ -1,13 +1,13 @@
{ stdenv, buildPythonPackage, fetchPypi, django, isPy27 }: { stdenv, buildPythonPackage, fetchPypi, django, isPy27 }:
buildPythonPackage rec { buildPythonPackage rec {
version = "3.11.1"; version = "3.11.2";
pname = "djangorestframework"; pname = "djangorestframework";
disabled = isPy27; disabled = isPy27;
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "6dd02d5a4bd2516fb93f80360673bf540c3b6641fec8766b1da2870a5aa00b32"; sha256 = "a5967b68a04e0d97d10f4df228e30f5a2d82ba63b9d03e1759f84993b7bf1b53";
}; };
# Test settings are missing # Test settings are missing

View File

@ -4,12 +4,12 @@
, git, glibcLocales }: , git, glibcLocales }:
buildPythonPackage rec { buildPythonPackage rec {
version = "0.20.5"; version = "0.20.11";
pname = "dulwich"; pname = "dulwich";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "98484ede022da663c96b54bc8dcdb4407072cb50efd5d20d58ca4e7779931305"; sha256 = "0b142794fb72647673173b80ed8b75e1f56b42a0972c5b3c752d88766a659d53";
}; };
LC_ALL = "en_US.UTF-8"; LC_ALL = "en_US.UTF-8";

View File

@ -2,11 +2,11 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "ECPy"; pname = "ECPy";
version = "1.2.3"; version = "1.2.5";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "6dd09f8cda5a1d673228ff9ef41aea8f036ee5ef3183198de83c14957d68c3e0"; sha256 = "9635cffb9b6ecf7fd7f72aea1665829ac74a1d272006d0057d45a621aae20228";
}; };
propagatedBuildInputs = lib.optional (!isPy3k) future; propagatedBuildInputs = lib.optional (!isPy3k) future;

View File

@ -12,11 +12,11 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "eventlet"; pname = "eventlet";
version = "0.28.0"; version = "0.28.1";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "9c7c63e8a80c7d02d692b2cf308312402fa4777335fd3de5da45097383301ff3"; sha256 = "55eef68e39473d6a58d28c4cf388cb8b7d29bab76568e7124d7df98d9365ab35";
}; };
propagatedBuildInputs = [ dnspython greenlet monotonic six ] propagatedBuildInputs = [ dnspython greenlet monotonic six ]

View File

@ -17,11 +17,11 @@ assert pythonOlder "3.3" -> ipaddress != null;
buildPythonPackage rec { buildPythonPackage rec {
pname = "Faker"; pname = "Faker";
version = "4.1.2"; version = "4.1.8";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "ff188c416864e3f7d8becd8f9ee683a4b4101a2a2d2bcdcb3e84bb1bdd06eaae"; sha256 = "179418909da04b04000eab5463c403895faed2849d36ef8d9cbda72cc44797a0";
}; };
nativeBuildInputs = [ pytestrunner ]; nativeBuildInputs = [ pytestrunner ];

View File

@ -1,16 +1,16 @@
{ stdenv, lib, buildPythonPackage, fetchPypi, isPy3k, pythonOlder { stdenv, lib, buildPythonPackage, fetchPypi, isPy3k, pythonOlder
, attrs, click, cligj, click-plugins, six, munch, enum34 , attrs, click, cligj, click-plugins, six, munch, enum34
, pytest, boto3, mock, giflib , pytest, boto3, mock, giflib, pytz
, gdal_2 # can't bump to 3 yet, https://github.com/Toblerity/Fiona/issues/745 , gdal_2 # can't bump to 3 yet, https://github.com/Toblerity/Fiona/issues/745
}: }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "Fiona"; pname = "Fiona";
version = "1.8.13.post1"; version = "1.8.17";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "00366f2j21b5r4r8310sadf7jjhdr44s0381dhjqkw2nzpwjnhqs"; sha256 = "716201c21246587f374785bec6d6a20a984fe1f6c2b0e83bf15127eb8f724d0c";
}; };
CXXFLAGS = lib.optionalString stdenv.cc.isClang "-std=c++11"; CXXFLAGS = lib.optionalString stdenv.cc.isClang "-std=c++11";
@ -30,6 +30,7 @@ buildPythonPackage rec {
click-plugins click-plugins
six six
munch munch
pytz
] ++ lib.optional (!isPy3k) enum34; ] ++ lib.optional (!isPy3k) enum34;
checkInputs = [ checkInputs = [

View File

@ -5,11 +5,11 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "flake8"; pname = "flake8";
version = "3.8.3"; version = "3.8.4";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "f04b9fcbac03b0a3e58c0ab3a0ecc462e023a9faf046d57794184028123aa208"; sha256 = "aadae8761ec651813c24be05c6f7b4680857ef6afaae4651a4eccaef97ce6c3b";
}; };
checkInputs = [ pytest mock pytestrunner ]; checkInputs = [ pytest mock pytestrunner ];

View File

@ -1,16 +1,16 @@
{ stdenv, fetchPypi, buildPythonPackage { stdenv, fetchPypi, buildPythonPackage
, nose, flask, six }: , nose, flask, six, packaging }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "Flask-Cors"; pname = "Flask-Cors";
version = "3.0.8"; version = "3.0.9";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "05id72xwvhni23yasdvpdd8vsf3v4j6gzbqqff2g04j6xcih85vj"; sha256 = "6bcfc100288c5d1bcb1dbb854babd59beee622ffd321e444b05f24d6d58466b8";
}; };
checkInputs = [ nose ]; checkInputs = [ nose packaging ];
propagatedBuildInputs = [ flask six ]; propagatedBuildInputs = [ flask six ];
# Exclude test_acl_uncaught_exception_500 test case because is not compatible # Exclude test_acl_uncaught_exception_500 test case because is not compatible

View File

@ -2,22 +2,25 @@
, buildPythonPackage , buildPythonPackage
, fetchPypi , fetchPypi
, setuptools , setuptools
, six
}: }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "Genshi"; pname = "Genshi";
version = "0.7.3"; version = "0.7.4";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "7933c95151d7dd2124a2b4c8dd85bb6aec881ca17c0556da0b40e56434b313a0"; sha256 = "d92ef3bb34474a38566f7e44e570ff3067c7f7c126670c79f660661badf8eddb";
}; };
# FAIL: test_sanitize_remove_script_elem (genshi.filters.tests.html.HTMLSanitizerTestCase) # FAIL: test_sanitize_remove_script_elem (genshi.filters.tests.html.HTMLSanitizerTestCase)
# FAIL: test_sanitize_remove_src_javascript (genshi.filters.tests.html.HTMLSanitizerTestCase) # FAIL: test_sanitize_remove_src_javascript (genshi.filters.tests.html.HTMLSanitizerTestCase)
doCheck = false; doCheck = false;
buildInputs = [ setuptools ]; propagatedBuildInputs = [
setuptools six
];
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Python components for parsing HTML, XML and other textual content"; description = "Python components for parsing HTML, XML and other textual content";

View File

@ -1,6 +1,7 @@
{ lib { lib
, buildPythonPackage , buildPythonPackage
, fetchPypi , fetchPypi
, pythonOlder
, isPy3k , isPy3k
, click , click
, mock , mock
@ -12,11 +13,12 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "google-auth-oauthlib"; pname = "google-auth-oauthlib";
version = "0.4.1"; version = "0.4.2";
disabled = pythonOlder "3.6";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "88d2cd115e3391eb85e1243ac6902e76e77c5fe438b7276b297fbe68015458dd"; sha256 = "65b65bc39ad8cab15039b35e5898455d3d66296d0584d96fe0e79d67d04c51d9";
}; };
checkInputs = [ checkInputs = [

View File

@ -8,7 +8,7 @@ buildPythonPackage rec {
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "06pck3hwl1pks26q843hv6pxchby9viab05mxf72k7ksab17m7aa"; sha256 = "4a9d7ac2527a9e298eebb580a5e24e7e41d6afd97010848dd0f306cae198ec1a";
}; };
propagatedBuildInputs = propagatedBuildInputs =

View File

@ -5,11 +5,11 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "google-auth"; pname = "google-auth";
version = "1.22.1"; version = "1.23.0";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "1fs448jcx2cbpk0nq3picndfryjsakmd9allggvh7mrqjiw723ww"; sha256 = "5176db85f1e7e837a646cd9cede72c3c404ccf2e3373d9ee14b2db88febad440";
}; };
disabled = pythonOlder "3.5"; disabled = pythonOlder "3.5";

View File

@ -8,11 +8,11 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "google-cloud-bigquery-datatransfer"; pname = "google-cloud-bigquery-datatransfer";
version = "1.1.0"; version = "1.1.1";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "71791a38a0ec535fdd4970d3403aa4cb2d9ca5c2729f80730858be2776b3c518"; sha256 = "8536e8656658d349db3bd5a763ce795fe79a5bfdbd1544f406957cc42e34690b";
}; };
checkInputs = [ pytest mock ]; checkInputs = [ pytest mock ];

View File

@ -7,7 +7,7 @@ buildPythonPackage rec {
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "103bgv9d6fw01vbbdx0qxa5gqdzxqmiwlpdvibmqxkhb3c6bgbr1"; sha256 = "21afb70c1b0bce8eeb8abb5dca63c5fd37fc8aea18f4b6d60e803bd3d27e6b80";
}; };
disabled = pythonOlder "3.5"; disabled = pythonOlder "3.5";

View File

@ -10,11 +10,11 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "google-cloud-dataproc"; pname = "google-cloud-dataproc";
version = "2.0.0"; version = "2.0.2";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "d6d94af6c0d5aee0bb88d058a180f4d3341209e112f85a1c7ce0df7887cbf867"; sha256 = "1ab0128be96a01c6ba3d10db21b8018583b15995ad9a088cb3e4c3df90a62e46";
}; };
checkInputs = [ pytest mock ]; checkInputs = [ pytest mock ];

View File

@ -9,11 +9,11 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "google-cloud-datastore"; pname = "google-cloud-datastore";
version = "1.15.0"; version = "1.15.3";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "c94bc357e975ce7bd5e5636497316c1bf4d015891e0ed96df9e7ce901415b94a"; sha256 = "3da44b4c8230a83e69dd9429324cca9d3000ee8a8bb11f3b005c7837fcd844b3";
}; };
checkInputs = [ pytest mock ]; checkInputs = [ pytest mock ];

View File

@ -8,13 +8,13 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "green"; pname = "green";
version = "3.2.1"; version = "3.2.4";
disabled = !isPy3k; disabled = !isPy3k;
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "c5a90e247237ac7e320120961608cf65191134fa400d327cbd4d09864c880935"; sha256 = "3473abb4629c8c1af9f6b59a4f9c757315736580053a64bbfd91ff21ccad57a8";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

View File

@ -8,12 +8,12 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "greenlet"; pname = "greenlet";
version = "0.4.16"; version = "0.4.17";
disabled = isPyPy; # builtin for pypy disabled = isPyPy; # builtin for pypy
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "6e06eac722676797e8fce4adb8ad3dc57a1bb3adfb0dd3fdf8306c055a38456c"; sha256 = "41d8835c69a78de718e466dd0e6bfd4b46125f21a67c3ff6d76d8d8059868d6b";
}; };
propagatedBuildInputs = [ six ]; propagatedBuildInputs = [ six ];

View File

@ -5,11 +5,11 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "gym"; pname = "gym";
version = "0.17.2"; version = "0.17.3";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "bb495aa56995b01274a2213423bf5ba05b8f4fd51c6dc61e9d4abddd1189718e"; sha256 = "96a7dd4e9cdb39e30c7a79e5773570fd9408f7fdb58c714c293cfbb314818eb6";
}; };
postPatch = '' postPatch = ''

Some files were not shown because too many files have changed in this diff Show More