Merge staging into staging-next
commita8dd165dc3c14aeae0d593cd23e286ed6283a072
authorFrederik Rietdijk <fridh@fridh.nl>
dateWed 11 Nov 2020, 16:01 (6 years ago)
parentf70be9a4076ffe
228 files changed+935−524
lib/systems/doubles.nix+2
@@ -35,6 +35,7 @@ let
3535 "msp430-none"
3636 "riscv64-none" "riscv32-none"
3737 "vc4-none"
38+ "or1k-none"
3839
3940 "js-ghcjs"
4041
@@ -58,6 +59,7 @@ in {
5859 mips = filterDoubles predicates.isMips;
5960 riscv = filterDoubles predicates.isRiscV;
6061 vc4 = filterDoubles predicates.isVc4;
62+ or1k = filterDoubles predicates.isOr1k;
6163 js = filterDoubles predicates.isJavaScript;
6264
6365 bigEndian = filterDoubles predicates.isBigEndian;
lib/systems/examples.nix+6
@@ -124,6 +124,12 @@ rec {
124124 platform = {};
125125 };
126126
127+ or1k = {
128+ config = "or1k-elf";
129+ libc = "newlib";
130+ platform = {};
131+ };
132+
127133 arm-embedded = {
128134 config = "arm-none-eabi";
129135 libc = "newlib";
lib/systems/inspect.nix+1
@@ -24,6 +24,7 @@ rec {
2424 isVc4 = { cpu = { family = "vc4"; }; };
2525 isAvr = { cpu = { family = "avr"; }; };
2626 isAlpha = { cpu = { family = "alpha"; }; };
27+ isOr1k = { cpu = { family = "or1k"; }; };
2728 isJavaScript = { cpu = cpuTypes.js; };
2829
2930 is32bit = { cpu = { bits = 32; }; };
lib/systems/parse.nix+2
@@ -114,6 +114,8 @@ rec {
114114
115115 vc4 = { bits = 32; significantByte = littleEndian; family = "vc4"; };
116116
117+ or1k = { bits = 32; significantByte = bigEndian; family = "or1k"; };
118+
117119 js = { bits = 32; significantByte = littleEndian; family = "js"; };
118120 };
119121
nixos/doc/manual/release-notes/rl-2103.xml+12
@@ -89,6 +89,18 @@
8989 user D-Bus session available also for non-graphical logins.
9090 </para>
9191 </listitem>
92+ <listitem>
93+ <para>
94+ <literal>rubyMinimal</literal> was removed due to being unused and
95+ unusable. The default ruby interpreter includes JIT support, which makes
96+ it reference it's compiler. Since JIT support is probably needed by some
97+ Gems, it was decided to enable this feature with all cc references by
98+ default, and allow to build a Ruby derivation without references to cc,
99+ by setting <literal>jitSupport = false;</literal> in an overlay. See
100+ <link xlink:href="https://github.com/NixOS/nixpkgs/pull/90151">#90151</link>
101+ for more info.
102+ </para>
103+ </listitem>
92104 <listitem>
93105 <para>
94106 The option <option>fonts.enableFontDir</option> has been renamed to
pkgs/applications/audio/ocenaudio/default.nix+2−2
@@ -11,11 +11,11 @@
1111
1212stdenv.mkDerivation rec {
1313 pname = "ocenaudio";
14− version = "3.9.2";
14+ version = "3.9.5";
1515
1616 src = fetchurl {
1717 url = "https://www.ocenaudio.com/downloads/index.php/ocenaudio_debian9_64.deb?version=${version}";
18− sha256 = "1fvpba3dnzb7sm6gp0znbrima02ckfiy2zwb66x1gr05y9a56inv";
18+ sha256 = "13hvdfydlgp2qf49ddhdzghz5jkyx1rhnsj8sf8khfxf9k8phkjd";
1919 };
2020
2121
pkgs/build-support/bintools-wrapper/default.nix+1
@@ -185,6 +185,7 @@ stdenv.mkDerivation {
185185 else if targetPlatform.isAvr then "avr"
186186 else if targetPlatform.isAlpha then "alpha"
187187 else if targetPlatform.isVc4 then "vc4"
188+ else if targetPlatform.isOr1k then "or1k"
188189 else throw "unknown emulation for platform: ${targetPlatform.config}";
189190 in if targetPlatform.useLLVM or false then ""
190191 else targetPlatform.platform.bfdEmulation or (fmt + sep + arch);
pkgs/data/misc/poppler-data/default.nix+2−2
@@ -1,11 +1,11 @@
11{ fetchurl, stdenv, cmake, ninja }:
22
33stdenv.mkDerivation rec {
4− name = "poppler-data-0.4.9";
4+ name = "poppler-data-0.4.10";
55
66 src = fetchurl {
77 url = "https://poppler.freedesktop.org/${name}.tar.gz";
8− sha256 = "04i0wgdkn5lhda8cyxd1ll4a2p41pwqrwd47n9mdpl7cx5ypx70z";
8+ sha256 = "0c3vjs3p7rjc4yfacnhd865r27czmzwcr4j2z4jldi68dvvcwbvf";
99 };
1010
1111 nativeBuildInputs = [ cmake ninja ];
pkgs/development/compilers/ghc/8.10.2-binary.nix+9−14
@@ -7,8 +7,6 @@
77 # regular builds and GHC bootstrapping.
88 # This is "useful" for staying within hydra's output limits for at least the
99 # aarch64-linux architecture.
10− # Examples of unnecessary files are the bundled documentation and files that
11− # are only needed for profiling builds.
1210, minimal ? false
1311}:
1412
@@ -182,11 +180,15 @@ stdenv.mkDerivation rec {
182180 done
183181 '' +
184182 stdenv.lib.optionalString minimal ''
185− # Remove profiling objects
183+ # Remove profiling files
186184 find $out -type f -name '*.p_o' -delete
185+ find $out -type f -name '*.p_hi' -delete
186+ find $out -type f -name '*_p.a' -delete
187187 rm $out/lib/ghc-*/bin/ghc-iserv-prof
188− # Remove docs
189− rm -r $out/share/{doc,man}
188+ # Hydra will redistribute this derivation, so we have to keep the docs for
189+ # legal reasons (retaining the legal notices etc)
190+ # As a last resort we could unpack the docs separately and symlink them in.
191+ # They're in $out/share/{doc,man}.
190192 '';
191193
192194 doInstallCheck = true;
@@ -210,18 +212,11 @@ stdenv.mkDerivation rec {
210212 enableShared = true;
211213 };
212214
213− meta = let
214− platforms = ["x86_64-linux" "armv7l-linux" "aarch64-linux" "i686-linux" "x86_64-darwin"];
215− in {
215+ meta = {
216216 homepage = "http://haskell.org/ghc";
217217 description = "The Glasgow Haskell Compiler";
218218 license = stdenv.lib.licenses.bsd3;
219−
220− # The minimal variation can not be distributed because it removes the
221− # documentation, including licensing information that is required for
222− # distribution.
223− inherit platforms;
224− hydraPlatforms = stdenv.lib.optionals (!minimal) platforms;
219+ platforms = ["x86_64-linux" "armv7l-linux" "aarch64-linux" "i686-linux" "x86_64-darwin"];
225220 maintainers = with stdenv.lib.maintainers; [ lostnet ];
226221 };
227222}
pkgs/development/interpreters/ruby/default.nix+21−6
@@ -44,11 +44,22 @@ let
4444 , groff, docSupport ? true
4545 , libyaml, yamlSupport ? true
4646 , libffi, fiddleSupport ? true
47− # ruby -e "puts RbConfig::CONFIG['configure_args']"
48− # puts a reference to the C compiler in the binary.
49− # This might be required by some gems at runtime,
50− # but we allow to strip it out for smaller closure size.
51− , removeReferencesTo, removeReferenceToCC ? true
47+ # By default, ruby has 3 observed references to stdenv.cc:
48+ #
49+ # - If you run:
50+ # ruby -e "puts RbConfig::CONFIG['configure_args']"
51+ # - In:
52+ # $out/${passthru.libPath}/${stdenv.targetPlatform.system}/rbconfig.rb
53+ # Or (usually):
54+ # $(nix-build -A ruby)/lib/ruby/2.6.0/x86_64-linux/rbconfig.rb
55+ # - In $out/lib/libruby.so and/or $out/lib/libruby.dylib
56+ #
57+ # Since some Gems require JIT support, there's probably no
58+ # escape from this reference. Hence, it was decided to enable this
59+ # feature by default, as it's enabled by default by ruby's ./configure
60+ # script. If you'd like to have a ruby without reference to cc, setting
61+ # jitSupport to false should remove all known references mentioned above.
62+ , removeReferencesTo, jitSupport ? true
5263 , autoreconfHook, bison, autoconf
5364 , buildEnv, bundler, bundix
5465 , libiconv, libobjc, libunwind, Foundation
@@ -121,6 +132,7 @@ let
121132
122133 configureFlags = ["--enable-shared" "--enable-pthread" "--with-soname=ruby-${version}"]
123134 ++ op useRailsExpress "--with-baseruby=${baseruby}/bin/ruby"
135+ ++ op (!jitSupport) "--disable-jit-support"
124136 ++ op (!docSupport) "--disable-install-doc"
125137 ++ ops stdenv.isDarwin [
126138 # on darwin, we have /usr/include/tk.h -- so the configure script detects
@@ -157,11 +169,14 @@ let
157169 # Remove unnecessary groff reference from runtime closure, since it's big
158170 sed -i '/NROFF/d' $out/lib/ruby/*/*/rbconfig.rb
159171 ${
160− lib.optionalString removeReferenceToCC ''
172+ lib.optionalString (!jitSupport) ''
161173 # Get rid of the CC runtime dependency
162174 ${removeReferencesTo}/bin/remove-references-to \
163175 -t ${stdenv.cc} \
164176 $out/lib/libruby*
177+ ${removeReferencesTo}/bin/remove-references-to \
178+ -t ${stdenv.cc} \
179+ $out/${passthru.libPath}/${stdenv.targetPlatform.system}/rbconfig.rb
165180 ''
166181 }
167182 # Bundler tries to create this directory
pkgs/development/libraries/audio/lilv/default.nix+2−2
@@ -2,11 +2,11 @@
22
33stdenv.mkDerivation rec {
44 pname = "lilv";
5− version = "0.24.8";
5+ version = "0.24.10";
66
77 src = fetchurl {
88 url = "https://download.drobilla.net/${pname}-${version}.tar.bz2";
9− sha256 = "0063i5zgf3d3accwmyx651hw0wh5ik7kji2hvfkcdbl1qia3dp6a";
9+ sha256 = "1565zy0yz46cf2f25pi46msdnzkj6bbhml9gfigdpjnsdlyskfyi";
1010 };
1111
1212 patches = [ ./lilv-pkgconfig.patch ];
pkgs/development/libraries/dbus/default.nix+7−1
@@ -30,7 +30,13 @@ stdenv.mkDerivation rec {
3030 sha256 = "1zp5gpx61v1cpqf2zwb1cidhp9xylvw49d3zydkxqk6b1qa20xpp";
3131 };
3232
33− patches = lib.optional stdenv.isSunOS ./implement-getgrouplist.patch;
33+ patches = [
34+ # 'generate.consistent.ids=1' ensures reproducible docs, for further details see
35+ # http://docbook.sourceforge.net/release/xsl/current/doc/html/generate.consistent.ids.html
36+ # Also applied upstream in https://gitlab.freedesktop.org/dbus/dbus/-/merge_requests/189,
37+ # expected in version 1.14
38+ ./docs-reproducible-ids.patch
39+ ] ++ (lib.optional stdenv.isSunOS ./implement-getgrouplist.patch);
3440
3541 postPatch = ''
3642 substituteInPlace tools/Makefile.in \
pkgs/development/libraries/dbus/docs-reproducible-ids.patchnew file+15
@@ -0,0 +1,15 @@
1+diff --color -Naur dbus-1.12.20-original/doc/Makefile.in dbus-1.12.20-hacked2/doc/Makefile.in
2+--- dbus-1.12.20-original/doc/Makefile.in 2020-07-02 12:10:41.000000000 +0200
3++++ dbus-1.12.20-hacked2/doc/Makefile.in 2020-11-07 09:57:15.297694773 +0100
4+@@ -870,8 +870,10 @@
5+ .PRECIOUS: Makefile
6+
7+
8++# 'generate.consistent.ids=1' ensures reproducible docs, for further details see
9++# http://docbook.sourceforge.net/release/xsl/current/doc/html/generate.consistent.ids.html
10+ @DBUS_XML_DOCS_ENABLED_TRUE@%.html: %.xml
11+-@DBUS_XML_DOCS_ENABLED_TRUE@ $(XMLTO) html-nochunks $<
12++@DBUS_XML_DOCS_ENABLED_TRUE@ $(XMLTO) --stringparam generate.consistent.ids=1 html-nochunks $<
13+
14+ @DBUS_XML_DOCS_ENABLED_TRUE@%.1: %.1.xml
15+ @DBUS_XML_DOCS_ENABLED_TRUE@ $(XMLTO) man $<
pkgs/development/libraries/enchant/2.x.nix+2−2
@@ -10,13 +10,13 @@
1010
1111stdenv.mkDerivation rec {
1212 pname = "enchant";
13− version = "2.2.12";
13+ version = "2.2.13";
1414
1515 outputs = [ "out" "dev" ];
1616
1717 src = fetchurl {
1818 url = "https://github.com/AbiWord/${pname}/releases/download/v${version}/${pname}-${version}.tar.gz";
19− sha256 = "0zi20s62gax9rkhwj318kqrxa62pmks6dsdd6m9pzvhlwy5cb6vb";
19+ sha256 = "084aqsrkzz2c1ls47p759d9bsi26d0m6wq9901k37483g46zkfga";
2020 };
2121
2222 nativeBuildInputs = [
pkgs/development/libraries/gtk/2.x.nix+2−7
@@ -12,12 +12,9 @@ assert cupsSupport -> cups != null;
1212
1313with stdenv.lib;
1414
15−let
16− pname = "gtk+";
17− version = "2.24.32"; # remove passthru on next update
18−in
1915stdenv.mkDerivation rec {
20− name = "${pname}-${version}";
16+ pname = "gtk+";
17+ version = "2.24.32";
2118
2219 src = fetchurl {
2320 url = "mirror://gnome/sources/gtk+/2.24/${pname}-${version}.tar.xz";
@@ -75,8 +72,6 @@ stdenv.mkDerivation rec {
7572 '';
7673
7774 passthru = {
78− # passthru to prevent rebuild but allow pname and version
79− inherit pname version;
8075 gtkExeEnvPostBuild = ''
8176 rm $out/lib/gtk-2.0/2.10.0/immodules.cache
8277 $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
pkgs/development/libraries/json-c/default.nix+6−13
@@ -1,21 +1,14 @@
1−{ stdenv, fetchurl, fetchpatch, cmake }:
1+{ stdenv, fetchurl, cmake }:
22
33stdenv.mkDerivation rec {
4− name = "json-c-0.14";
4+ pname = "json-c";
5+ version = "0.15";
6+
57 src = fetchurl {
6− url = "https://s3.amazonaws.com/json-c_releases/releases/${name}-nodoc.tar.gz";
7− sha256 = "1yia8417qljmczs9w3rn4c4i2p2iywq098pgrj11s81599j4x4cr";
8+ url = "https://s3.amazonaws.com/json-c_releases/releases/${pname}-${version}.tar.gz";
9+ sha256 = "1im484iz08j3gmzpw07v16brwq46pxxj65i996kkp2vivcfhmn5q";
810 };
911
10− patches = [
11− # https://nvd.nist.gov/vuln/detail/CVE-2020-12762
12− (fetchpatch {
13− name = "CVE-2020-12762.patch";
14− url = "https://github.com/json-c/json-c/commit/5d6fa331418d49f1bd488553fd1cfa9ab023fabb.patch";
15− sha256 = "0aar7kgbycqxnhh0lrr61adfbb903nbapalhs5i6h8anxwy1ylcm";
16− })
17− ];
18−
1912 outputs = [ "out" "dev" ];
2013
2114 nativeBuildInputs = [ cmake ];
pkgs/development/libraries/libass/default.nix+4−8
@@ -1,8 +1,7 @@
11{ stdenv, fetchurl, pkgconfig, yasm
2−, freetype, fribidi
2+, freetype, fribidi, harfbuzz
33, encaSupport ? true, enca ? null # enca support
44, fontconfigSupport ? true, fontconfig ? null # fontconfig support
5−, harfbuzzSupport ? true, harfbuzz ? null # harfbuzz support
65, rasterizerSupport ? false # Internal rasterizer
76, largeTilesSupport ? false # Use larger tiles in the rasterizer
87, libiconv
@@ -10,7 +9,6 @@
109
1110assert encaSupport -> enca != null;
1211assert fontconfigSupport -> fontconfig != null;
13−assert harfbuzzSupport -> harfbuzz != null;
1412
1513let
1614 mkFlag = optSet: flag: if optSet then "--enable-${flag}" else "--disable-${flag}";
@@ -19,27 +17,25 @@ in
1917with stdenv.lib;
2018stdenv.mkDerivation rec {
2119 pname = "libass";
22− version = "0.14.0";
20+ version = "0.15.0";
2321
2422 src = fetchurl {
2523 url = "https://github.com/libass/libass/releases/download/${version}/${pname}-${version}.tar.xz";
26− sha256 = "18iqznl4mabhj9ywfsz4kwvbsplcv1jjxq50nxssvbj8my1267w8";
24+ sha256 = "0cz8v6kh3f2j5rdjrra2z0h715fa16vjm7kambvqx9hak86262cz";
2725 };
2826
2927 configureFlags = [
3028 (mkFlag encaSupport "enca")
3129 (mkFlag fontconfigSupport "fontconfig")
32− (mkFlag harfbuzzSupport "harfbuzz")
3330 (mkFlag rasterizerSupport "rasterizer")
3431 (mkFlag largeTilesSupport "large-tiles")
3532 ];
3633
3734 nativeBuildInputs = [ pkgconfig yasm ];
3835
39− buildInputs = [ freetype fribidi ]
36+ buildInputs = [ freetype fribidi harfbuzz ]
4037 ++ optional encaSupport enca
4138 ++ optional fontconfigSupport fontconfig
42− ++ optional harfbuzzSupport harfbuzz
4339 ++ optional stdenv.isDarwin libiconv;
4440
4541 meta = {
pkgs/development/libraries/libbfd/default.nix+1−1
@@ -10,7 +10,7 @@ stdenv.mkDerivation {
1010 outputs = [ "out" "dev" ];
1111
1212 patches = binutils-unwrapped.patches ++ [
13− ../../tools/misc/binutils/build-components-separately.patch
13+ (binutils-unwrapped.patchesDir + "/build-components-separately.patch")
1414 (fetchpatch {
1515 url = "https://raw.githubusercontent.com/mxe/mxe/e1d4c144ee1994f70f86cf7fd8168fe69bd629c6/src/bfd-1-disable-subdir-doc.patch";
1616 sha256 = "0pzb3i74d1r7lhjan376h59a7kirw15j7swwm8pz3zy9lkdqkj6q";
pkgs/development/libraries/libbluray/default.nix+2−2
@@ -19,11 +19,11 @@ assert withFonts -> freetype != null;
1919
2020stdenv.mkDerivation rec {
2121 pname = "libbluray";
22− version = "1.2.0";
22+ version = "1.2.1";
2323
2424 src = fetchurl {
2525 url = "http://get.videolan.org/libbluray/${version}/${pname}-${version}.tar.bz2";
26− sha256 = "04bcd53ml0zn8b4f9r1grs0yy20rcirji1v3pxzaf4i5zl3flhfd";
26+ sha256 = "1v1nmq631j0prih7pjl01ixhhwgrkjpxrjmmc342rsl8g4zyh8sj";
2727 };
2828
2929 patches = optional withJava ./BDJ-JARFILE-path.patch;
pkgs/development/libraries/libde265/default.nix+2−2
@@ -1,14 +1,14 @@
11{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig }:
22
33stdenv.mkDerivation rec {
4− version = "1.0.7";
4+ version = "1.0.8";
55 pname = "libde265";
66
77 src = fetchFromGitHub {
88 owner = "strukturag";
99 repo = "libde265";
1010 rev = "v${version}";
11− sha256 = "0x7g9771457z49qvzpk4iswfhq018i0mzsflv9gg8if5hjqhfdp0";
11+ sha256 = "1dzflqbk248lz5ws0ni5acmf32b3rmnq5gsfaz7691qqjxkl1zml";
1212 };
1313
1414 nativeBuildInputs = [ autoreconfHook pkgconfig ];
pkgs/development/libraries/libgcrypt/default.nix+2−2
@@ -6,11 +6,11 @@ assert enableCapabilities -> stdenv.isLinux;
66
77stdenv.mkDerivation rec {
88 pname = "libgcrypt";
9− version = "1.8.6";
9+ version = "1.8.7";
1010
1111 src = fetchurl {
1212 url = "mirror://gnupg/libgcrypt/${pname}-${version}.tar.bz2";
13− sha256 = "0xdrsxgqw5v7szshjdgdv60rgpvzzaqic32ahqrzr6bvc402gfhc";
13+ sha256 = "0j27jxhjay78by940d64778nxwbysxynv5mq6iq1nmlrh810zdq3";
1414 };
1515
1616 outputs = [ "out" "dev" "info" ];
pkgs/development/libraries/libhandy/default.nix+10−8
@@ -17,18 +17,20 @@
1717, gdk-pixbuf
1818, librsvg
1919, hicolor-icon-theme
20+, at-spi2-atk
21+, at-spi2-core
2022}:
2123
2224stdenv.mkDerivation rec {
2325 pname = "libhandy";
24− version = "1.0.0";
26+ version = "1.0.1";
2527
2628 outputs = [ "out" "dev" "devdoc" "glade" ];
2729 outputBin = "dev";
2830
2931 src = fetchurl {
3032 url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
31− hash = "sha256-qTmFgvR7fXKSBdbqwMBo/vNarySf3Vfuo3JPhRjSZpk=";
33+ sha256 = "106qa4d2rcbvd3g3avbgkd59aq0bjvwpx8vfz1cikvwrarnfvql4";
3234 };
3335
3436 nativeBuildInputs = [
@@ -52,8 +54,11 @@ stdenv.mkDerivation rec {
5254
5355 checkInputs = [
5456 dbus
55− hicolor-icon-theme
5657 xvfb_run
58+ at-spi2-atk
59+ at-spi2-core
60+ librsvg
61+ hicolor-icon-theme
5762 ];
5863
5964 mesonFlags = [
@@ -64,14 +69,11 @@ stdenv.mkDerivation rec {
6469 PKG_CONFIG_GLADEUI_2_0_MODULEDIR = "${placeholder "glade"}/lib/glade/modules";
6570 PKG_CONFIG_GLADEUI_2_0_CATALOGDIR = "${placeholder "glade"}/share/glade/catalogs";
6671
67− # Bail out! dbind-FATAL-WARNING:
68− # AT-SPI: Error retrieving accessibility bus address: org.freedesktop.DBus.Error.ServiceUnknown:
69− # The name org.a11y.Bus was not provided by any .service files
70− doCheck = false;
72+ doCheck = true;
7173
7274 checkPhase = ''
7375 NO_AT_BRIDGE=1 \
74− XDG_DATA_DIRS="$XDG_DATA_DIRS:${hicolor-icon-theme}/share"
76+ XDG_DATA_DIRS="$XDG_DATA_DIRS:${hicolor-icon-theme}/share" \
7577 GDK_PIXBUF_MODULE_FILE="${librsvg.out}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache" \
7678 xvfb-run -s '-screen 0 800x600x24' dbus-run-session \
7779 --config-file=${dbus.daemon}/share/dbus-1/session.conf \
pkgs/development/libraries/libipt/default.nix+2−2
@@ -2,13 +2,13 @@
22
33stdenv.mkDerivation rec {
44 pname = "libipt";
5− version = "2.0.2";
5+ version = "2.0.3";
66
77 src = fetchFromGitHub {
88 owner = "intel";
99 repo = "libipt";
1010 rev = "v${version}";
11− sha256 = "095agnk7r2sq5yas6c1ri8fmsl55n4l5hkl6j5l397p9nxvxvrkc";
11+ sha256 = "1i6jmv345rqd88qmap6iqbaph4pkd6wbjgkixf22a80pj7cfm1s4";
1212 };
1313
1414 nativeBuildInputs = [ cmake ];
pkgs/development/libraries/libmbim/default.nix+2−2
@@ -10,11 +10,11 @@
1010
1111stdenv.mkDerivation rec {
1212 pname = "libmbim";
13− version = "1.24.2";
13+ version = "1.24.4";
1414
1515 src = fetchurl {
1616 url = "https://www.freedesktop.org/software/libmbim/${pname}-${version}.tar.xz";
17− sha256 = "1r41d4yddp8rgccxrkz9vg5lbrj3dr5vy71d8igrr147k44qq69j";
17+ sha256 = "11djb1d8w9ms07aklfm3pskjw9rnff4p4n3snanschv22zk8wj6x";
1818 };
1919
2020 outputs = [ "out" "dev" "man" ];
pkgs/development/libraries/libmtp/default.nix+2−2
@@ -1,11 +1,11 @@
11{ stdenv, fetchurl, pkgconfig, libusb1, libiconv }:
22
33stdenv.mkDerivation rec {
4− name = "libmtp-1.1.17";
4+ name = "libmtp-1.1.18";
55
66 src = fetchurl {
77 url = "mirror://sourceforge/libmtp/${name}.tar.gz";
8− sha256 = "1p3r38nvdip40ab1h4scj3mzfjkx6kd14szjqyw9r6wz5pslr8zq";
8+ sha256 = "1w41l93yi0dmw218daiw36rylkc8rammxx37csh1ij24q18gx03j";
99 };
1010
1111 outputs = [ "bin" "dev" "out" ];
pkgs/development/libraries/libnftnl/default.nix+2−2
@@ -1,12 +1,12 @@
11{ stdenv, fetchurl, pkgconfig, libmnl }:
22
33stdenv.mkDerivation rec {
4− version = "1.1.7";
4+ version = "1.1.8";
55 pname = "libnftnl";
66
77 src = fetchurl {
88 url = "https://netfilter.org/projects/${pname}/files/${pname}-${version}.tar.bz2";
9− sha256 = "13zd90bfrr0q3j0l0cbc8kiizccw6n8gp727kqnfljh024zw3nr0";
9+ sha256 = "04dp797llg3cqzivwrql30wg9mfr0ngnp0v5gs7jcdmp11dzm8q4";
1010 };
1111
1212 nativeBuildInputs = [ pkgconfig ];
pkgs/development/libraries/libopcodes/default.nix+1−1
@@ -10,7 +10,7 @@ stdenv.mkDerivation {
1010 outputs = [ "out" "dev" ];
1111
1212 patches = binutils-unwrapped.patches ++ [
13− ../../tools/misc/binutils/build-components-separately.patch
13+ (binutils-unwrapped.patchesDir + "/build-components-separately.patch")
1414 ];
1515
1616 # We just want to build libopcodes
pkgs/development/libraries/libqmi/default.nix+2−2
@@ -2,11 +2,11 @@
22
33stdenv.mkDerivation rec {
44 pname = "libqmi";
5− version = "1.26.2";
5+ version = "1.26.6";
66
77 src = fetchurl {
88 url = "https://www.freedesktop.org/software/libqmi/${pname}-${version}.tar.xz";
9− sha256 = "00vvvfq74awg6mk0si1cdv79f6z6wqx11h47nl78a1h7zsr6fd0k";
9+ sha256 = "1fbwz6534q6n4bgabdx4svbgkf4mdyisjh3y51jjd94p22xn66d7";
1010 };
1111
1212 outputs = [ "out" "dev" "devdoc" ];
pkgs/development/libraries/libshout/default.nix+2−2
@@ -4,11 +4,11 @@
44# need pkgconfig so that libshout installs ${out}/lib/pkgconfig/shout.pc
55
66stdenv.mkDerivation rec {
7− name = "libshout-2.4.3";
7+ name = "libshout-2.4.4";
88
99 src = fetchurl {
1010 url = "http://downloads.xiph.org/releases/libshout/${name}.tar.gz";
11− sha256 = "1zhdshas539cs8fsz8022ljxnnncr5lafhfd1dqr1gs125fzb2hd";
11+ sha256 = "1hz670a4pfpsb89b0mymy8nw4rx8x0vmh61gq6j1vbg70mfhrscc";
1212 };
1313
1414 outputs = [ "out" "dev" "doc" ];
pkgs/development/libraries/libsoup/default.nix+3
@@ -22,6 +22,7 @@ stdenv.mkDerivation rec {
2222 python3
2323 sqlite
2424 libpsl
25+ glib.out
2526 brotli
2627 ] ++ lib.optionals stdenv.isLinux [
2728 libsysprof-capture
@@ -29,6 +30,8 @@ stdenv.mkDerivation rec {
2930 nativeBuildInputs = [ meson ninja pkgconfig gobject-introspection vala glib ];
3031 propagatedBuildInputs = [ glib libxml2 ];
3132
33+ NIX_CFLAGS_COMPILE = [ "-lpthread" ];
34+
3235 mesonFlags = [
3336 "-Dtls_check=false" # glib-networking is a runtime dependency, not a compile-time dependency
3437 "-Dgssapi=disabled"
pkgs/development/libraries/mesa/default.nix+2−2
@@ -31,7 +31,7 @@ with stdenv.lib;
3131let
3232 # Release calendar: https://www.mesa3d.org/release-calendar.html
3333 # Release frequency: https://www.mesa3d.org/releasing.html#schedule
34− version = "20.2.1";
34+ version = "20.2.2";
3535 branch = versions.major version;
3636in
3737
@@ -46,7 +46,7 @@ stdenv.mkDerivation {
4646 "ftp://ftp.freedesktop.org/pub/mesa/${version}/mesa-${version}.tar.xz"
4747 "ftp://ftp.freedesktop.org/pub/mesa/older-versions/${branch}.x/${version}/mesa-${version}.tar.xz"
4848 ];
49− sha256 = "0ji4s1gwcvx3fbj9h0x5zbma6kw4b75vs0266zhc06r97yd6v96i";
49+ sha256 = "0qdqi767vshclnfg9drlsmp2pa17hi7y0172s064jwfgj08fp4qz";
5050 };
5151
5252 prePatch = "patchShebangs .";
pkgs/development/misc/or1k/newlib.nixnew file+36
@@ -0,0 +1,36 @@
1+{ stdenv, texinfo, flex, bison, fetchFromGitHub, crossLibcStdenv, buildPackages }:
2+
3+crossLibcStdenv.mkDerivation {
4+ name = "newlib";
5+ src = fetchFromGitHub {
6+ owner = "openrisc";
7+ repo = "newlib";
8+ rev = "8ac94ca7bbe4ceddafe6583ee4766d3c15b18ac8";
9+ sha256 = "0hzhijmry5slpp6x12pgng8v7jil3mn18ahrhnw431lqrs1cma0s";
10+ };
11+
12+ depsBuildBuild = [ buildPackages.stdenv.cc ];
13+
14+ # newlib expects CC to build for build platform, not host platform
15+ preConfigure = ''
16+ export CC=cc
17+ '';
18+
19+ configurePlatforms = [ "build" "target" ];
20+ configureFlags = [
21+ "--host=${stdenv.buildPlatform.config}"
22+
23+ "--disable-newlib-supplied-syscalls"
24+ "--disable-nls"
25+ "--enable-newlib-io-long-long"
26+ "--enable-newlib-register-fini"
27+ "--enable-newlib-retargetable-locking"
28+ ];
29+
30+ dontDisableStatic = true;
31+
32+ passthru = {
33+ incdir = "/${stdenv.targetPlatform.config}/include";
34+ libdir = "/${stdenv.targetPlatform.config}/lib";
35+ };
36+}
pkgs/development/python-modules/GitPython/default.nix+2−2
@@ -1,13 +1,13 @@
11{ lib, buildPythonPackage, fetchPypi, isPy27, substituteAll, git, gitdb, mock, nose, ddt }:
22
33buildPythonPackage rec {
4− version = "3.1.7";
4+ version = "3.1.11";
55 pname = "GitPython";
66 disabled = isPy27; # no longer supported
77
88 src = fetchPypi {
99 inherit pname version;
10− sha256 = "2db287d71a284e22e5c2846042d0602465c7434d910406990d5b74df4afb0858";
10+ sha256 = "befa4d101f91bad1b632df4308ec64555db684c360bd7d2130b4807d49ce86b8";
1111 };
1212
1313 patches = [
pkgs/development/python-modules/adal/default.nix+2−2
@@ -3,11 +3,11 @@
33
44buildPythonPackage rec {
55 pname = "adal";
6− version = "1.2.4";
6+ version = "1.2.5";
77
88 src = fetchPypi {
99 inherit pname version;
10− sha256 = "7a15d22b1ee7ce1be92441199958748982feba6b7dec35fbf60f9b607bad1bc0";
10+ sha256 = "8003ba03ef04170195b3eddda8a5ab43649ef2c5f0287023d515affb1ccfcfc3";
1111 };
1212
1313 propagatedBuildInputs = [ requests pyjwt dateutil ];
pkgs/development/python-modules/aiohttp/default.nix+2−2
@@ -25,13 +25,13 @@
2525
2626buildPythonPackage rec {
2727 pname = "aiohttp";
28− version = "3.6.2";
28+ version = "3.6.3";
2929 # https://github.com/aio-libs/aiohttp/issues/4525 python3.8 failures
3030 disabled = pythonOlder "3.5";
3131
3232 src = fetchPypi {
3333 inherit pname version;
34− sha256 = "09pkw6f1790prnrq0k8cqgnf1qy57ll8lpmc6kld09q7zw4vi6i5";
34+ sha256 = "698cd7bc3c7d1b82bb728bae835724a486a8c376647aec336aa21a60113c3645";
3535 };
3636
3737 checkInputs = [
pkgs/development/python-modules/alembic/default.nix+2−2
@@ -5,11 +5,11 @@
55
66buildPythonPackage rec {
77 pname = "alembic";
8− version = "1.4.2";
8+ version = "1.4.3";
99
1010 src = fetchPypi {
1111 inherit pname version;
12− sha256 = "035ab00497217628bf5d0be82d664d8713ab13d37b630084da8e1f98facf4dbf";
12+ sha256 = "5334f32314fb2a56d86b4c4dd1ae34b08c03cae4cb888bc699942104d66bc245";
1313 };
1414
1515 buildInputs = [ pytest pytestcov mock coverage ];
pkgs/development/python-modules/amazon_kclpy/default.nix+2−2
@@ -2,13 +2,13 @@
22
33buildPythonPackage rec {
44 pname = "amazon_kclpy";
5− version = "1.5.0";
5+ version = "1.5.1";
66
77 src = fetchFromGitHub {
88 owner = "awslabs";
99 repo = "amazon-kinesis-client-python";
1010 rev = "v${version}";
11− sha256 = "1qg86y9172gm5592ja7lr6w7kfnx668j99bf3ijklpk5yshxwr9m";
11+ sha256 = "0jjqh9hq0hx2wr7wlqjr6cixpygragwlk4pz7rkqg2gkbhazmnq3";
1212 };
1313
1414 # argparse is just required for python2.6
pkgs/development/python-modules/amply/default.nix+5−6
@@ -4,26 +4,25 @@
44, setuptools_scm
55, docutils
66, pyparsing
7+, pytestCheckHook
78}:
89
910buildPythonPackage rec {
1011 pname = "amply";
11− version = "0.1.2";
12+ version = "0.1.4";
1213
1314 src = fetchPypi {
1415 inherit pname version;
15− sha256 = "1j2dqdz1y1nbyw33qq89v0f5rkmqfbga72d9hax909vpcapm6pbf";
16+ sha256 = "cb12dcb49d16b168c02be128a1527ecde50211e4bd94af76ff4e67707f5a2d38";
1617 };
1718
18− buildInputs = [ setuptools_scm ];
19+ nativeBuildInputs = [ setuptools_scm ];
1920 propagatedBuildInputs = [
2021 docutils
2122 pyparsing
2223 ];
24+ checkInputs = [ pytestCheckHook ];
2325
24− checkPhase = ''
25− python tests/test_amply.py
26− '';
2726 pythonImportsCheck = [ "amply" ];
2827
2928 meta = with stdenv.lib; {
pkgs/development/python-modules/apispec/default.nix+2−2
@@ -11,11 +11,11 @@
1111
1212buildPythonPackage rec {
1313 pname = "apispec";
14− version = "3.3.1";
14+ version = "3.3.2";
1515
1616 src = fetchPypi {
1717 inherit pname version;
18− sha256 = "f5244ccca33f7a81309f6b3c9d458e33e869050c2d861b9f8cee24b3ad739d2b";
18+ sha256 = "d23ebd5b71e541e031b02a19db10b5e6d5ef8452c552833e3e1afc836b40b1ad";
1919 };
2020
2121 checkInputs = [
pkgs/development/python-modules/astropy/default.nix+2−2
@@ -10,13 +10,13 @@
1010
1111buildPythonPackage rec {
1212 pname = "astropy";
13− version = "4.0.1.post1";
13+ version = "4.0.3";
1414
1515 disabled = !isPy3k; # according to setup.py
1616
1717 src = fetchPypi {
1818 inherit pname version;
19− sha256 = "1da4xj793ldck29aajyb514wpz330cml26f3gdp45jj531n4lc2w";
19+ sha256 = "cf69d1a3f140ca8fe1664202072201395495a73c334a69fc965fab6a6e1d281a";
2020 };
2121
2222 nativeBuildInputs = [ astropy-helpers ];
pkgs/development/python-modules/atlassian-python-api/default.nix+2−2
@@ -16,11 +16,11 @@
1616
1717buildPythonPackage rec {
1818 pname = "atlassian-python-api";
19− version = "1.17.5";
19+ version = "1.17.7";
2020
2121 src = fetchPypi {
2222 inherit pname version;
23− sha256 = "cbd7941fa7e1eb6f63e12724277894350298745480297658da912e07234314cc";
23+ sha256 = "456e9873fa5ab5cc91c6ae76a70b662f0993d32e4dff6d8febd866a53d86041e";
2424 };
2525
2626 checkInputs = [ pytestrunner pytest ];
pkgs/development/python-modules/awkward1/default.nix+2−2
@@ -10,11 +10,11 @@
1010
1111buildPythonPackage rec {
1212 pname = "awkward1";
13− version = "0.2.35";
13+ version = "0.2.38";
1414
1515 src = fetchPypi {
1616 inherit pname version;
17− sha256 = "563868f0f2d0cb398ce3616ee3f9734cc68cee9a612d35cab830ec5c728f1474";
17+ sha256 = "f25db4920677029a92e92b994f1056902724b6a947549254c1446bdc6e388671";
1818 };
1919
2020 nativeBuildInputs = [ cmake ];
pkgs/development/python-modules/aws-adfs/default.nix+2−2
@@ -4,12 +4,12 @@
44
55buildPythonPackage rec {
66 pname = "aws-adfs";
7− version = "1.24.4";
7+ version = "1.24.5";
88 disabled = isPy27;
99
1010 src = fetchPypi {
1111 inherit pname version;
12− sha256 = "601b056fa8ba4b615289def3b1aa49aa58f1f4aa6b89f3cf7cf1e0aee9f2291c";
12+ sha256 = "6a78bd31477ea9988166215ae86abcbfe1413bee20373ecdf0dd170b7290db55";
1313 };
1414
1515 # Relax version constraint
pkgs/development/python-modules/bayespy/default.nix+2−2
@@ -4,7 +4,7 @@
44
55buildPythonPackage rec {
66 pname = "bayespy";
7− version = "0.5.19";
7+ version = "0.5.20";
88
99 # Python 2 not supported and not some old Python 3 because MPL doesn't support
1010 # them properly.
@@ -12,7 +12,7 @@ buildPythonPackage rec {
1212
1313 src = fetchPypi {
1414 inherit pname version;
15− sha256 = "24e1327ce241a0113abf217fbaf41ac25e04f5a01f9ed606610f2f1f2d82d34f";
15+ sha256 = "8c16cdc73bbcd9a1124a0495056065b7ce938dbe6c2c780dc330c83fb4d2640a";
1616 };
1717
1818 checkInputs = [ pytest nose glibcLocales ];
pkgs/development/python-modules/beautifulsoup4/default.nix+2−2
@@ -2,11 +2,11 @@
22
33buildPythonPackage rec {
44 pname = "beautifulsoup4";
5− version = "4.9.1";
5+ version = "4.9.3";
66
77 src = fetchPypi {
88 inherit pname version;
9− sha256 = "73cc4d115b96f79c7d77c1c7f7a0a8d4c57860d1041df407dd1aae7f07a77fd7";
9+ sha256 = "84729e322ad1d5b4d25f805bfa05b902dd96450f43842c4e99067d5e1369eb25";
1010 };
1111
1212 checkInputs = [ pytest ];
pkgs/development/python-modules/bokeh/default.nix+2−2
@@ -33,11 +33,11 @@
3333
3434buildPythonPackage rec {
3535 pname = "bokeh";
36− version = "2.2.1";
36+ version = "2.2.3";
3737
3838 src = fetchPypi {
3939 inherit pname version;
40− sha256 = "qC6e69eh4uu3+PwerYAv79EKhNrvjsS/yYYSEyOUhVU=";
40+ sha256 = "c4a3f97afe5f525019dd58ee8c4e3d43f53fe1b1ac264ccaae9b02c07b2abc17";
4141 };
4242
4343 patches = [
pkgs/development/python-modules/boto3/default.nix+2−2
@@ -13,11 +13,11 @@
1313
1414buildPythonPackage rec {
1515 pname = "boto3";
16− version = "1.15.9"; # N.B: if you change this, change botocore too
16+ version = "1.15.18"; # N.B: if you change this, change botocore too
1717
1818 src = fetchPypi {
1919 inherit pname version;
20− sha256 = "0zrsrz7c8aqj3n06piybwf7vy026rflr0ky362q615rln6iggx82";
20+ sha256 = "f56148e2c6b9a2d704218da42f07d72f00270bfddb13bc1bdea20d3327daa51e";
2121 };
2222
2323 propagatedBuildInputs = [ botocore jmespath s3transfer ] ++ lib.optionals (!isPy3k) [ futures ];
pkgs/development/python-modules/botocore/default.nix+2−2
@@ -12,11 +12,11 @@
1212
1313buildPythonPackage rec {
1414 pname = "botocore";
15− version = "1.18.9"; # N.B: if you change this, change boto3 and awscli to a matching version
15+ version = "1.18.18"; # N.B: if you change this, change boto3 and awscli to a matching version
1616
1717 src = fetchPypi {
1818 inherit pname version;
19− sha256 = "0rb3in7n9hdhp3sklkw78l378103khgmhdfy13kxfbgb0646pc1m";
19+ sha256 = "e224754230e7e015836ba20037cac6321e8e2ce9b8627c14d579fcb37249decd";
2020 };
2121
2222 propagatedBuildInputs = [
pkgs/development/python-modules/browser-cookie3/default.nix+5−4
@@ -1,16 +1,17 @@
1−{ lib, fetchPypi, buildPythonPackage, isPy3k, keyring, pbkdf2, pyaes}:
1+{ lib, fetchPypi, buildPythonPackage, isPy3k, lz4, keyring, pbkdf2, pycryptodome, pyaes}:
2+
23buildPythonPackage rec {
34 pname = "browser-cookie3";
4− version = "0.11.1";
5+ version = "0.11.4";
56
67 src = fetchPypi {
78 inherit pname version;
8− sha256 = "5d1f825fc9cc6f98fe0ee3f97cdb4947c22d59ac8a11643da5837ebd8c873f05";
9+ sha256 = "3d140c6b651dbd8b8555aca6472557fcfda4dd93afc26ea3a200be922a843e2c";
910 };
1011
1112 disabled = !isPy3k;
1213
13− propagatedBuildInputs = [ keyring pbkdf2 pyaes ];
14+ propagatedBuildInputs = [ lz4 keyring pbkdf2 pyaes pycryptodome ];
1415
1516 # No tests implemented
1617 doCheck = false;
pkgs/development/python-modules/cffi/default.nix+2−2
@@ -2,11 +2,11 @@
22
33if isPyPy then null else buildPythonPackage rec {
44 pname = "cffi";
5− version = "1.14.2";
5+ version = "1.14.3";
66
77 src = fetchPypi {
88 inherit pname version;
9− sha256 = "ae8f34d50af2c2154035984b8b5fc5d9ed63f32fe615646ab435b05b132ca91b";
9+ sha256 = "f92f789e4f9241cd262ad7a555ca2c648a98178a953af117ef7fad46aa1d5591";
1010 };
1111
1212 outputs = [ "out" "dev" ];
pkgs/development/python-modules/codecov/default.nix+2−2
@@ -2,11 +2,11 @@
22
33buildPythonPackage rec {
44 pname = "codecov";
5− version = "2.1.9";
5+ version = "2.1.10";
66
77 src = fetchPypi {
88 inherit pname version;
9− sha256 = "355fc7e0c0b8a133045f0d6089bde351c845e7b52b99fec5903b4ea3ab5f6aab";
9+ sha256 = "d30ad6084501224b1ba699cbf018a340bb9553eb2701301c14133995fdd84f33";
1010 };
1111
1212 checkInputs = [ unittest2 ]; # Tests only
pkgs/development/python-modules/colorama/default.nix+2−2
@@ -2,11 +2,11 @@
22
33buildPythonPackage rec {
44 pname = "colorama";
5− version = "0.4.3";
5+ version = "0.4.4";
66
77 src = fetchPypi {
88 inherit pname version;
9− sha256 = "e96da0d330793e2cb9485e9ddfd918d456036c7149416295932478192f4436a1";
9+ sha256 = "5941b2b48a20143d2267e95b1c2a7603ce057ee39fd88e7329b0c292aa16869b";
1010 };
1111
1212 # No tests in archive
pkgs/development/python-modules/configparser/default.nix+2−2
@@ -4,11 +4,11 @@
44
55buildPythonPackage rec {
66 pname = "configparser";
7− version = "5.0.0";
7+ version = "5.0.1";
88
99 src = fetchPypi {
1010 inherit pname version;
11− sha256 = "2ca44140ee259b5e3d8aaf47c79c36a7ab0d5e94d70bd4105c03ede7a20ea5a1";
11+ sha256 = "005c3b102c96f4be9b8f40dafbd4997db003d07d1caa19f37808be8031475f2a";
1212 };
1313
1414 # No tests available
pkgs/development/python-modules/cornice/default.nix+2−2
@@ -9,11 +9,11 @@
99
1010buildPythonPackage rec {
1111 pname = "cornice";
12− version = "5.0.2";
12+ version = "5.0.3";
1313
1414 src = fetchPypi {
1515 inherit pname version;
16− sha256 = "4fcf3be295514e7e20fdd602fea8d204127bb02da2ff6bdbc8b6fba859ac9fd0";
16+ sha256 = "f971831e90343374b21c0c97d523e23eb09cec41a2a8fc2e85bb5c2585348576";
1717 };
1818
1919 propagatedBuildInputs = [ pyramid simplejson six venusian ];
pkgs/development/python-modules/croniter/default.nix+2−2
@@ -10,11 +10,11 @@
1010
1111buildPythonPackage rec {
1212 pname = "croniter";
13− version = "0.3.34";
13+ version = "0.3.36";
1414
1515 src = fetchPypi {
1616 inherit pname version;
17− sha256 = "7186b9b464f45cf3d3c83a18bc2344cc101d7b9fd35a05f2878437b14967e964";
17+ sha256 = "9d3098e50f7edc7480470455d42f09c501fa1bb7e2fc113526ec6e90b068f32c";
1818 };
1919
2020 propagatedBuildInputs = [
pkgs/development/python-modules/cvxpy/default.nix+2−2
@@ -17,13 +17,13 @@
1717
1818buildPythonPackage rec {
1919 pname = "cvxpy";
20− version = "1.1.6";
20+ version = "1.1.7";
2121
2222 disabled = pythonOlder "3.5";
2323
2424 src = fetchPypi {
2525 inherit pname version;
26− sha256 = "36527573c937cedd270f46c77b50bb5e16b96ca7b05a7a480bdc8c9052595723";
26+ sha256 = "330eb76e8369c360b68d9231c6eb350848e373b5952134f9bfebaed1a4c4211f";
2727 };
2828
2929 propagatedBuildInputs = [
pkgs/development/python-modules/dash-core-components/default.nix+2−2
@@ -5,11 +5,11 @@
55
66buildPythonPackage rec {
77 pname = "dash_core_components";
8− version = "1.12.1";
8+ version = "1.13.0";
99
1010 src = fetchPypi {
1111 inherit pname version;
12− sha256 = "27f2ac612f5574dcd0d645f9302ceca5975bbdac6791865692e3ac51d0aec7f4";
12+ sha256 = "f92025b12931539cdda2173f2b4cd077119cbabbf3ddf62333f6302fd0d8a3ac";
1313 };
1414
1515 # No tests in archive
pkgs/development/python-modules/dash-renderer/default.nix+2−2
@@ -5,11 +5,11 @@
55
66buildPythonPackage rec {
77 pname = "dash_renderer";
8− version = "1.8.2";
8+ version = "1.8.3";
99
1010 src = fetchPypi {
1111 inherit pname version;
12− sha256 = "84cbb22019299a5a3c268ec1143c6f241c3f136e95753edac83a81673b7fa04e";
12+ sha256 = "f7ab2b922f4f0850bae0e9793cec99f8a1a241e5f7f5786e367ddd9e41d2b170";
1313 };
1414
1515 # No tests in archive
pkgs/development/python-modules/dash-table/default.nix+2−2
@@ -5,11 +5,11 @@
55
66buildPythonPackage rec {
77 pname = "dash_table";
8− version = "4.10.1";
8+ version = "4.11.0";
99
1010 src = fetchPypi {
1111 inherit pname version;
12− sha256 = "1aa02180faef13434364286b60404d26164d1ce2779c765c9c52e6935991a4e9";
12+ sha256 = "3170504a8626a9676b016c5ab456ab8c1fb1ea0206dcc2eddb8c4c6589216304";
1313 };
1414
1515 # No tests in archive
pkgs/development/python-modules/dash/default.nix+2−2
@@ -16,13 +16,13 @@
1616
1717buildPythonPackage rec {
1818 pname = "dash";
19− version = "1.16.2";
19+ version = "1.17.0";
2020
2121 src = fetchFromGitHub {
2222 owner = "plotly";
2323 repo = pname;
2424 rev = "v${version}";
25− sha256 = "1krhwxlz8kpaklf5ii3h339id6c3139xzxxkq7mvvag330j6nbgg";
25+ sha256 = "1fbnhpmkxavv6yirmhx7659q1y9bqynwjd1g6cscv1mfv9m59l60";
2626 };
2727
2828 propagatedBuildInputs = [
pkgs/development/python-modules/deepmerge/default.nix+1−1
@@ -8,7 +8,7 @@ buildPythonPackage rec {
88
99 src = fetchPypi {
1010 inherit pname version;
11− sha256 = "07rcz699fr0jgx6i6fvh8dxa72j7745inix760nw3g46jwk487gs";
11+ sha256 = "fa1d44269786bcc12d30a7471b0b39478aa37a43703b134d7f12649792f92c1f";
1212 };
1313
1414 propagatedBuildInputs = [
pkgs/development/python-modules/deform/default.nix+5−3
@@ -1,14 +1,14 @@
11{ lib, buildPythonPackage, fetchPypi
22, chameleon, colander, iso8601, peppercorn, translationstring, zope_deprecation
3−, nose, coverage, beautifulsoup4, flaky }:
3+, nose, coverage, beautifulsoup4, flaky, pyramid, pytestCheckHook }:
44
55buildPythonPackage rec {
66 pname = "deform";
7− version = "2.0.10";
7+ version = "2.0.14";
88
99 src = fetchPypi {
1010 inherit pname version;
11− sha256 = "2f4e98a5b5bdcdfff9a62f88bd17c7ee378b7c8be61738797442eed5b961d3d2";
11+ sha256 = "35d9acf144245772a70d05bd24b8263e8cd284f0d564011e8bf331d6150acfc7";
1212 };
1313
1414 postPatch = ''
@@ -30,6 +30,8 @@ buildPythonPackage rec {
3030 coverage
3131 beautifulsoup4
3232 flaky
33+ pyramid
34+ pytestCheckHook
3335 ];
3436
3537 meta = with lib; {
pkgs/development/python-modules/distributed/default.nix+2−2
@@ -28,12 +28,12 @@
2828
2929buildPythonPackage rec {
3030 pname = "distributed";
31− version = "2.30.0";
31+ version = "2.30.1";
3232
3333 # get full repository need conftest.py to run tests
3434 src = fetchPypi {
3535 inherit pname version;
36− sha256 = "3eb8e4173625cea6ebda2f0a079b813eeabbffd1b24584855cf063ed1cca60b3";
36+ sha256 = "1421d3b84a0885aeb2c4bdc9e8896729c0f053a9375596c9de8864e055e2ac8e";
3737 };
3838
3939 disabled = pythonOlder "3.6";
pkgs/development/python-modules/django-simple-captcha/default.nix+2−2
@@ -13,11 +13,11 @@
1313
1414buildPythonPackage rec {
1515 pname = "django-simple-captcha";
16− version = "0.5.12";
16+ version = "0.5.13";
1717
1818 src = fetchPypi {
1919 inherit pname version;
20− sha256 = "1g92sdgcb81r3il34pg0z210cz6wm14k00b558nshai8br1g09gw";
20+ sha256 = "5e43ba3b61daf690ac0319157837bb57e31df8bddbdc9a59ef42ef1a99e21fa2";
2121 extension = "zip";
2222 };
2323
pkgs/development/python-modules/django/2.nix+2−2
@@ -6,13 +6,13 @@
66
77buildPythonPackage rec {
88 pname = "Django";
9− version = "2.2.16";
9+ version = "2.2.17";
1010
1111 disabled = !isPy3k;
1212
1313 src = fetchPypi {
1414 inherit pname version;
15− sha256 = "1535g2r322cl4x52fb0dmzlbg23539j2wx6027j54p22xvjlbkv2";
15+ sha256 = "cf5370a4d7765a9dd6d42a7b96b53c74f9446cd38209211304b210fe0404b861";
1616 };
1717
1818 patches = stdenv.lib.optional withGdal
pkgs/development/python-modules/django/3.nix+2−2
@@ -13,13 +13,13 @@
1313
1414buildPythonPackage rec {
1515 pname = "Django";
16− version = "3.1.2";
16+ version = "3.1.3";
1717
1818 disabled = pythonOlder "3.7";
1919
2020 src = fetchPypi {
2121 inherit pname version;
22− sha256 = "a2127ad0150ec6966655bedf15dbbff9697cc86d61653db2da1afa506c0b04cc";
22+ sha256 = "14b87775ffedab2ef6299b73343d1b4b41e5d4e2aa58c6581f114dbec01e3f8f";
2323 };
2424
2525 patches = stdenv.lib.optional withGdal
pkgs/development/python-modules/django_reversion/default.nix+2−2
@@ -6,11 +6,11 @@
66
77buildPythonPackage rec {
88 pname = "django-reversion";
9− version = "3.0.7";
9+ version = "3.0.8";
1010
1111 src = fetchPypi {
1212 inherit pname version;
13− sha256 = "72fc53580a6b538f0cfff10f27f42333f67d79c406399289c94ec5a193cfb3e1";
13+ sha256 = "49e9930f90322dc6a2754dd26144285cfcc1c5bd0c1c39ca95d5602c5054ae32";
1414 };
1515
1616 # tests assume the availability of a mysql/postgresql database
pkgs/development/python-modules/djangoql/default.nix+2−2
@@ -3,11 +3,11 @@
33
44buildPythonPackage rec {
55 pname = "djangoql";
6− version = "0.14.0";
6+ version = "0.14.2";
77
88 src = fetchPypi {
99 inherit pname version;
10− sha256 = "1b1f80940bb15982e06208b97d7b3d08e1d5f8fb62aa07e5e33599c7ce4c0334";
10+ sha256 = "91fd65d9ee4b09092602ff05aca8a21c5a18062faf56f269a011b8e8e41483c6";
1111 };
1212
1313 propagatedBuildInputs = [ ply ];
pkgs/development/python-modules/djangorestframework/default.nix+2−2
@@ -1,13 +1,13 @@
11{ stdenv, buildPythonPackage, fetchPypi, django, isPy27 }:
22
33buildPythonPackage rec {
4− version = "3.11.1";
4+ version = "3.11.2";
55 pname = "djangorestframework";
66 disabled = isPy27;
77
88 src = fetchPypi {
99 inherit pname version;
10− sha256 = "6dd02d5a4bd2516fb93f80360673bf540c3b6641fec8766b1da2870a5aa00b32";
10+ sha256 = "a5967b68a04e0d97d10f4df228e30f5a2d82ba63b9d03e1759f84993b7bf1b53";
1111 };
1212
1313 # Test settings are missing
pkgs/development/python-modules/dulwich/default.nix+2−2
@@ -4,12 +4,12 @@
44, git, glibcLocales }:
55
66buildPythonPackage rec {
7− version = "0.20.5";
7+ version = "0.20.11";
88 pname = "dulwich";
99
1010 src = fetchPypi {
1111 inherit pname version;
12− sha256 = "98484ede022da663c96b54bc8dcdb4407072cb50efd5d20d58ca4e7779931305";
12+ sha256 = "0b142794fb72647673173b80ed8b75e1f56b42a0972c5b3c752d88766a659d53";
1313 };
1414
1515 LC_ALL = "en_US.UTF-8";
pkgs/development/python-modules/ecpy/default.nix+2−2
@@ -2,11 +2,11 @@
22
33buildPythonPackage rec {
44 pname = "ECPy";
5− version = "1.2.3";
5+ version = "1.2.5";
66
77 src = fetchPypi {
88 inherit pname version;
9− sha256 = "6dd09f8cda5a1d673228ff9ef41aea8f036ee5ef3183198de83c14957d68c3e0";
9+ sha256 = "9635cffb9b6ecf7fd7f72aea1665829ac74a1d272006d0057d45a621aae20228";
1010 };
1111
1212 propagatedBuildInputs = lib.optional (!isPy3k) future;
pkgs/development/python-modules/eventlet/default.nix+2−2
@@ -12,11 +12,11 @@
1212
1313buildPythonPackage rec {
1414 pname = "eventlet";
15− version = "0.28.0";
15+ version = "0.28.1";
1616
1717 src = fetchPypi {
1818 inherit pname version;
19− sha256 = "9c7c63e8a80c7d02d692b2cf308312402fa4777335fd3de5da45097383301ff3";
19+ sha256 = "55eef68e39473d6a58d28c4cf388cb8b7d29bab76568e7124d7df98d9365ab35";
2020 };
2121
2222 propagatedBuildInputs = [ dnspython greenlet monotonic six ]
pkgs/development/python-modules/faker/default.nix+2−2
@@ -17,11 +17,11 @@ assert pythonOlder "3.3" -> ipaddress != null;
1717
1818buildPythonPackage rec {
1919 pname = "Faker";
20− version = "4.1.2";
20+ version = "4.1.8";
2121
2222 src = fetchPypi {
2323 inherit pname version;
24− sha256 = "ff188c416864e3f7d8becd8f9ee683a4b4101a2a2d2bcdcb3e84bb1bdd06eaae";
24+ sha256 = "179418909da04b04000eab5463c403895faed2849d36ef8d9cbda72cc44797a0";
2525 };
2626
2727 nativeBuildInputs = [ pytestrunner ];
pkgs/development/python-modules/fiona/default.nix+4−3
@@ -1,16 +1,16 @@
11{ stdenv, lib, buildPythonPackage, fetchPypi, isPy3k, pythonOlder
22, attrs, click, cligj, click-plugins, six, munch, enum34
3−, pytest, boto3, mock, giflib
3+, pytest, boto3, mock, giflib, pytz
44, gdal_2 # can't bump to 3 yet, https://github.com/Toblerity/Fiona/issues/745
55}:
66
77buildPythonPackage rec {
88 pname = "Fiona";
9− version = "1.8.13.post1";
9+ version = "1.8.17";
1010
1111 src = fetchPypi {
1212 inherit pname version;
13− sha256 = "00366f2j21b5r4r8310sadf7jjhdr44s0381dhjqkw2nzpwjnhqs";
13+ sha256 = "716201c21246587f374785bec6d6a20a984fe1f6c2b0e83bf15127eb8f724d0c";
1414 };
1515
1616 CXXFLAGS = lib.optionalString stdenv.cc.isClang "-std=c++11";
@@ -30,6 +30,7 @@ buildPythonPackage rec {
3030 click-plugins
3131 six
3232 munch
33+ pytz
3334 ] ++ lib.optional (!isPy3k) enum34;
3435
3536 checkInputs = [
pkgs/development/python-modules/flake8/default.nix+2−2
@@ -5,11 +5,11 @@
55
66buildPythonPackage rec {
77 pname = "flake8";
8− version = "3.8.3";
8+ version = "3.8.4";
99
1010 src = fetchPypi {
1111 inherit pname version;
12− sha256 = "f04b9fcbac03b0a3e58c0ab3a0ecc462e023a9faf046d57794184028123aa208";
12+ sha256 = "aadae8761ec651813c24be05c6f7b4680857ef6afaae4651a4eccaef97ce6c3b";
1313 };
1414
1515 checkInputs = [ pytest mock pytestrunner ];
pkgs/development/python-modules/flask-cors/default.nix+4−4
@@ -1,16 +1,16 @@
11{ stdenv, fetchPypi, buildPythonPackage
2−, nose, flask, six }:
2+, nose, flask, six, packaging }:
33
44buildPythonPackage rec {
55 pname = "Flask-Cors";
6− version = "3.0.8";
6+ version = "3.0.9";
77
88 src = fetchPypi {
99 inherit pname version;
10− sha256 = "05id72xwvhni23yasdvpdd8vsf3v4j6gzbqqff2g04j6xcih85vj";
10+ sha256 = "6bcfc100288c5d1bcb1dbb854babd59beee622ffd321e444b05f24d6d58466b8";
1111 };
1212
13− checkInputs = [ nose ];
13+ checkInputs = [ nose packaging ];
1414 propagatedBuildInputs = [ flask six ];
1515
1616 # Exclude test_acl_uncaught_exception_500 test case because is not compatible
pkgs/development/python-modules/genshi/default.nix+6−3
@@ -2,22 +2,25 @@
22, buildPythonPackage
33, fetchPypi
44, setuptools
5+, six
56}:
67
78buildPythonPackage rec {
89 pname = "Genshi";
9− version = "0.7.3";
10+ version = "0.7.4";
1011
1112 src = fetchPypi {
1213 inherit pname version;
13− sha256 = "7933c95151d7dd2124a2b4c8dd85bb6aec881ca17c0556da0b40e56434b313a0";
14+ sha256 = "d92ef3bb34474a38566f7e44e570ff3067c7f7c126670c79f660661badf8eddb";
1415 };
1516
1617 # FAIL: test_sanitize_remove_script_elem (genshi.filters.tests.html.HTMLSanitizerTestCase)
1718 # FAIL: test_sanitize_remove_src_javascript (genshi.filters.tests.html.HTMLSanitizerTestCase)
1819 doCheck = false;
1920
20− buildInputs = [ setuptools ];
21+ propagatedBuildInputs = [
22+ setuptools six
23+ ];
2124
2225 meta = with stdenv.lib; {
2326 description = "Python components for parsing HTML, XML and other textual content";
pkgs/development/python-modules/google-auth-oauthlib/default.nix+4−2
@@ -1,6 +1,7 @@
11{ lib
22, buildPythonPackage
33, fetchPypi
4+, pythonOlder
45, isPy3k
56, click
67, mock
@@ -12,11 +13,12 @@
1213
1314buildPythonPackage rec {
1415 pname = "google-auth-oauthlib";
15− version = "0.4.1";
16+ version = "0.4.2";
17+ disabled = pythonOlder "3.6";
1618
1719 src = fetchPypi {
1820 inherit pname version;
19− sha256 = "88d2cd115e3391eb85e1243ac6902e76e77c5fe438b7276b297fbe68015458dd";
21+ sha256 = "65b65bc39ad8cab15039b35e5898455d3d66296d0584d96fe0e79d67d04c51d9";
2022 };
2123
2224 checkInputs = [
pkgs/development/python-modules/google_api_core/default.nix+1−1
@@ -8,7 +8,7 @@ buildPythonPackage rec {
88
99 src = fetchPypi {
1010 inherit pname version;
11− sha256 = "06pck3hwl1pks26q843hv6pxchby9viab05mxf72k7ksab17m7aa";
11+ sha256 = "4a9d7ac2527a9e298eebb580a5e24e7e41d6afd97010848dd0f306cae198ec1a";
1212 };
1313
1414 propagatedBuildInputs =
pkgs/development/python-modules/google_auth/default.nix+2−2
@@ -5,11 +5,11 @@
55
66buildPythonPackage rec {
77 pname = "google-auth";
8− version = "1.22.1";
8+ version = "1.23.0";
99
1010 src = fetchPypi {
1111 inherit pname version;
12− sha256 = "1fs448jcx2cbpk0nq3picndfryjsakmd9allggvh7mrqjiw723ww";
12+ sha256 = "5176db85f1e7e837a646cd9cede72c3c404ccf2e3373d9ee14b2db88febad440";
1313 };
1414
1515 disabled = pythonOlder "3.5";
pkgs/development/python-modules/google_cloud_bigquery_datatransfer/default.nix+2−2
@@ -8,11 +8,11 @@
88
99buildPythonPackage rec {
1010 pname = "google-cloud-bigquery-datatransfer";
11− version = "1.1.0";
11+ version = "1.1.1";
1212
1313 src = fetchPypi {
1414 inherit pname version;
15− sha256 = "71791a38a0ec535fdd4970d3403aa4cb2d9ca5c2729f80730858be2776b3c518";
15+ sha256 = "8536e8656658d349db3bd5a763ce795fe79a5bfdbd1544f406957cc42e34690b";
1616 };
1717
1818 checkInputs = [ pytest mock ];
pkgs/development/python-modules/google_cloud_core/default.nix+1−1
@@ -7,7 +7,7 @@ buildPythonPackage rec {
77
88 src = fetchPypi {
99 inherit pname version;
10− sha256 = "103bgv9d6fw01vbbdx0qxa5gqdzxqmiwlpdvibmqxkhb3c6bgbr1";
10+ sha256 = "21afb70c1b0bce8eeb8abb5dca63c5fd37fc8aea18f4b6d60e803bd3d27e6b80";
1111 };
1212
1313 disabled = pythonOlder "3.5";
pkgs/development/python-modules/google_cloud_dataproc/default.nix+2−2
@@ -10,11 +10,11 @@
1010
1111buildPythonPackage rec {
1212 pname = "google-cloud-dataproc";
13− version = "2.0.0";
13+ version = "2.0.2";
1414
1515 src = fetchPypi {
1616 inherit pname version;
17− sha256 = "d6d94af6c0d5aee0bb88d058a180f4d3341209e112f85a1c7ce0df7887cbf867";
17+ sha256 = "1ab0128be96a01c6ba3d10db21b8018583b15995ad9a088cb3e4c3df90a62e46";
1818 };
1919
2020 checkInputs = [ pytest mock ];
pkgs/development/python-modules/google_cloud_datastore/default.nix+2−2
@@ -9,11 +9,11 @@
99
1010buildPythonPackage rec {
1111 pname = "google-cloud-datastore";
12− version = "1.15.0";
12+ version = "1.15.3";
1313
1414 src = fetchPypi {
1515 inherit pname version;
16− sha256 = "c94bc357e975ce7bd5e5636497316c1bf4d015891e0ed96df9e7ce901415b94a";
16+ sha256 = "3da44b4c8230a83e69dd9429324cca9d3000ee8a8bb11f3b005c7837fcd844b3";
1717 };
1818
1919 checkInputs = [ pytest mock ];
pkgs/development/python-modules/green/default.nix+2−2
@@ -8,13 +8,13 @@
88
99buildPythonPackage rec {
1010 pname = "green";
11− version = "3.2.1";
11+ version = "3.2.4";
1212
1313 disabled = !isPy3k;
1414
1515 src = fetchPypi {
1616 inherit pname version;
17− sha256 = "c5a90e247237ac7e320120961608cf65191134fa400d327cbd4d09864c880935";
17+ sha256 = "3473abb4629c8c1af9f6b59a4f9c757315736580053a64bbfd91ff21ccad57a8";
1818 };
1919
2020 propagatedBuildInputs = [
pkgs/development/python-modules/greenlet/default.nix+2−2
@@ -8,12 +8,12 @@
88
99buildPythonPackage rec {
1010 pname = "greenlet";
11− version = "0.4.16";
11+ version = "0.4.17";
1212 disabled = isPyPy; # builtin for pypy
1313
1414 src = fetchPypi {
1515 inherit pname version;
16− sha256 = "6e06eac722676797e8fce4adb8ad3dc57a1bb3adfb0dd3fdf8306c055a38456c";
16+ sha256 = "41d8835c69a78de718e466dd0e6bfd4b46125f21a67c3ff6d76d8d8059868d6b";
1717 };
1818
1919 propagatedBuildInputs = [ six ];
pkgs/development/python-modules/gym/default.nix+2−2
@@ -5,11 +5,11 @@
55
66buildPythonPackage rec {
77 pname = "gym";
8− version = "0.17.2";
8+ version = "0.17.3";
99
1010 src = fetchPypi {
1111 inherit pname version;
12− sha256 = "bb495aa56995b01274a2213423bf5ba05b8f4fd51c6dc61e9d4abddd1189718e";
12+ sha256 = "96a7dd4e9cdb39e30c7a79e5773570fd9408f7fdb58c714c293cfbb314818eb6";
1313 };
1414
1515 postPatch = ''
pkgs/development/python-modules/hidapi/default.nix+2−2
@@ -2,11 +2,11 @@
22
33buildPythonPackage rec {
44 pname = "hidapi";
5− version = "0.10.0";
5+ version = "0.10.0.post1";
66
77 src = fetchPypi {
88 inherit pname version;
9− sha256 = "2560ad8db212f54cf40ea8d78715adad7df803011cfdce9dabbac0e76acf31ef";
9+ sha256 = "27c04d42a7187becf7a8309d4846aa4f235ac8b7dafd758335b109f5cbd3b962";
1010 };
1111
1212 propagatedBuildInputs =
pkgs/development/python-modules/hmmlearn/default.nix+2−2
@@ -2,11 +2,11 @@
22
33buildPythonPackage rec {
44 pname = "hmmlearn";
5− version = "0.2.3";
5+ version = "0.2.4";
66
77 src = fetchurl {
88 url = "mirror://pypi/h/hmmlearn/${pname}-${version}.tar.gz";
9− sha256 = "8003d5dc55612de8016156abdc7aa1dd995abc2431adb1ef33dd84a6d29e56bf";
9+ sha256 = "0f5cb598a7494b9703c6188246dc89e529d46cbb6700eca70cc895085f0b3cc3";
1010 };
1111
1212 buildInputs = [ setuptools_scm cython ];
pkgs/development/python-modules/identify/default.nix+2−2
@@ -2,11 +2,11 @@
22
33buildPythonPackage rec {
44 pname = "identify";
5− version = "1.5.6";
5+ version = "1.5.9";
66
77 src = fetchPypi {
88 inherit pname version;
9− sha256 = "969d844b7a85d32a5f9ac4e163df6e846d73c87c8b75847494ee8f4bd2186421";
9+ sha256 = "c9504ba6a043ee2db0a9d69e43246bc138034895f6338d5aed1b41e4a73b1513";
1010 };
1111
1212 # Tests not included in PyPI tarball
pkgs/development/python-modules/ipdb/default.nix+6−3
@@ -3,19 +3,22 @@
33, fetchPypi
44, ipython
55, isPyPy
6+, isPy27
7+, mock
68}:
79
810buildPythonPackage rec {
911 pname = "ipdb";
10− version = "0.13.3";
11− disabled = isPyPy; # setupterm: could not find terminfo database
12+ version = "0.13.4";
13+ disabled = isPyPy || isPy27; # setupterm: could not find terminfo database
1214
1315 src = fetchPypi {
1416 inherit pname version;
15− sha256 = "0y3yk5k2yszcwxsjinvf40b1wl8wi8l6kv7pl9jmx9j53hk6vx6n";
17+ sha256 = "c85398b5fb82f82399fc38c44fe3532c0dde1754abee727d8f5cfcc74547b334";
1618 };
1719
1820 propagatedBuildInputs = [ ipython ];
21+ checkInputs = [ mock ];
1922
2023 preCheck = ''
2124 export HOME=$(mktemp -d)
pkgs/development/python-modules/ipyvue/default.nix+2−2
@@ -8,13 +8,13 @@
88
99buildPythonPackage rec {
1010 pname = "ipyvue";
11− version = "1.4.0";
11+ version = "1.4.1";
1212
1313 disabled = isPy27;
1414
1515 src = fetchPypi {
1616 inherit pname version;
17− sha256 = "3253727e8e12e3c157550e3e8d6986edf61ad0d68299992fbf3fa6acec41a12e";
17+ sha256 = "5b59cf92a1eb7fbef4f2d02be49ac562a721a6cf34f991ac963222cf4c8885a1";
1818 };
1919
2020 propagatedBuildInputs = [ ipywidgets ];
pkgs/development/python-modules/iso8601/default.nix+2−2
@@ -6,11 +6,11 @@
66
77buildPythonPackage rec {
88 pname = "iso8601";
9− version = "0.1.12";
9+ version = "0.1.13";
1010
1111 src = fetchPypi {
1212 inherit pname version;
13− sha256 = "49c4b20e1f38aa5cf109ddcd39647ac419f928512c869dc01d5c7098eddede82";
13+ sha256 = "f7dec22af52025d4526be94cc1303c7d8f5379b746a3f54a8c8446384392eeb1";
1414 };
1515
1616 checkInputs = [ pytest ];
pkgs/development/python-modules/iterm2/default.nix+1
@@ -26,6 +26,7 @@ buildPythonPackage rec {
2626 description = "Python interface to iTerm2's scripting API";
2727 homepage = "https://github.com/gnachman/iTerm2";
2828 license = licenses.gpl2;
29+ platforms = platforms.darwin;
2930 maintainers = with maintainers; [ jeremyschlatter ];
3031 };
3132}
pkgs/development/python-modules/junos-eznc/default.nix+2−2
@@ -18,11 +18,11 @@
1818
1919buildPythonPackage rec {
2020 pname = "junos-eznc";
21− version = "2.5.3";
21+ version = "2.5.4";
2222
2323 src = fetchPypi {
2424 inherit pname version;
25− sha256 = "521659fe94da796897abc16773c3d84fa44d3e1f5386c71fbaef44cb80159855";
25+ sha256 = "bf036d0af9ee5c5e4f517cb5fc902fe891fa120e18f459805862c53d4a97193a";
2626 };
2727
2828 checkInputs = [ nose ];
pkgs/development/python-modules/jupyterlab-git/default.nix+2−2
@@ -10,12 +10,12 @@
1010
1111buildPythonPackage rec {
1212 pname = "jupyterlab_git";
13− version = "0.22.2";
13+ version = "0.22.3";
1414 disabled = pythonOlder "3.5";
1515
1616 src = fetchPypi {
1717 inherit pname version;
18− sha256 = "9966a569428e67cc1688fbc2e05f51b0ceeefd8dfe30737e78a501ce3105103d";
18+ sha256 = "434ff9edd1190809e02e0cbf50090c28de48a51e151a1f904ac66e902244398d";
1919 };
2020
2121 propagatedBuildInputs = [ notebook nbdime git ];
pkgs/development/python-modules/jupyterlab/default.nix+2−2
@@ -8,12 +8,12 @@
88
99buildPythonPackage rec {
1010 pname = "jupyterlab";
11− version = "2.2.8";
11+ version = "2.2.9";
1212 disabled = pythonOlder "3.5";
1313
1414 src = fetchPypi {
1515 inherit pname version;
16− sha256 = "c8377bee30504919c1e79949f9fe35443ab7f5c4be622c95307e8108410c8b8c";
16+ sha256 = "3be8f8edea173753dd838c1b6d3bbcb6f5c801121f824a477025c1b6a1d33dc6";
1717 };
1818
1919 propagatedBuildInputs = [ jupyterlab_server notebook ];
pkgs/development/python-modules/jupytext/default.nix+2
@@ -3,6 +3,7 @@
33, nbformat
44, pytest
55, pyyaml
6+, toml
67}:
78
89buildPythonPackage rec {
@@ -17,6 +18,7 @@ buildPythonPackage rec {
1718 propagatedBuildInputs = [
1819 pyyaml
1920 nbformat
21+ toml
2022 ] ++ lib.optionals isPy27 [ mock ]; # why they put it in install_requires, who knows
2123
2224 checkInputs = [
pkgs/development/python-modules/kaggle/default.nix+2−2
@@ -12,11 +12,11 @@
1212
1313buildPythonPackage rec {
1414 pname = "kaggle";
15− version = "1.5.6";
15+ version = "1.5.9";
1616
1717 src = fetchPypi {
1818 inherit pname version;
19− sha256 = "0f5qrkgklcpgbwncrif7aw4f86dychqplh7k3f4rljwnr9yhjb1w";
19+ sha256 = "444aeecfb646dbb889c767ee2ab071f63fe3a2b85f72f08f2bd772353d3e3b93";
2020 };
2121
2222 # The version bounds in the setup.py file are unnecessarily restrictive.
pkgs/development/python-modules/labelbox/default.nix+2−2
@@ -10,11 +10,11 @@
1010
1111buildPythonPackage rec {
1212 pname = "labelbox";
13− version = "2.4.4";
13+ version = "2.4.6";
1414
1515 src = fetchPypi {
1616 inherit pname version;
17− sha256 = "a455ae30ccb9328731fca7f7f4cefaa7da69a2fe3e43d1b742bae5ff4693c695";
17+ sha256 = "2be6c03dafce0a786cfab5d120196efccaf300cab5aee4d2fdad644b7bee1aef";
1818 };
1919
2020 propagatedBuildInputs = [ jinja2 requests pillow rasterio shapely ];
pkgs/development/python-modules/ledgerblue/default.nix+2−2
@@ -5,11 +5,11 @@
55
66buildPythonPackage rec {
77 pname = "ledgerblue";
8− version = "0.1.31";
8+ version = "0.1.34";
99
1010 src = fetchPypi {
1111 inherit pname version;
12− sha256 = "f1fc7ab685780309a7220c6ee517d88072cc594a9615bcc18e68ed5f149fa432";
12+ sha256 = "f9553d496fbc6b612d98cc9db2f1648c1bcb63939c988ee1520e8fcb9bd77b24";
1313 };
1414
1515 propagatedBuildInputs = [
pkgs/development/python-modules/matplotlib/default.nix+2−2
@@ -20,14 +20,14 @@ assert enableTk -> (tcl != null)
2020assert enableQt -> pyqt5 != null;
2121
2222buildPythonPackage rec {
23− version = "3.3.1";
23+ version = "3.3.2";
2424 pname = "matplotlib";
2525
2626 disabled = !isPy3k;
2727
2828 src = fetchPypi {
2929 inherit pname version;
30− sha256 = "87f53bcce90772f942c2db56736788b39332d552461a5cb13f05ff45c1680f0e";
30+ sha256 = "3d2edbf59367f03cd9daf42939ca06383a7d7803e3993eb5ff1bee8e8a3fbb6b";
3131 };
3232
3333 XDG_RUNTIME_DIR = "/tmp";
pkgs/development/python-modules/maxminddb/default.nix+2−2
@@ -7,13 +7,13 @@
77}:
88
99buildPythonPackage rec {
10− version = "2.0.2";
10+ version = "2.0.3";
1111 pname = "maxminddb";
1212 disabled = pythonOlder "3.6";
1313
1414 src = fetchPypi {
1515 inherit pname version;
16− sha256 = "b95d8ed21799e6604683669c7ed3c6a184fcd92434d5762dccdb139b4f29e597";
16+ sha256 = "47e86a084dd814fac88c99ea34ba3278a74bc9de5a25f4b815b608798747c7dc";
1717 };
1818
1919 buildInputs = [ libmaxminddb ];
pkgs/development/python-modules/mecab-python3/default.nix+2−2
@@ -8,11 +8,11 @@
88
99buildPythonPackage rec {
1010 pname = "mecab-python3";
11− version = "1.0.1";
11+ version = "1.0.2";
1212
1313 src = fetchPypi {
1414 inherit pname version;
15− sha256 = "0246wxfk8v1js75nv8jl15cwpf4rvv4xndi4gbzjrrqbsgj2fvfm";
15+ sha256 = "eefdff160ba231acb21afab5c775bc2e024b3164c637a23b599b270d45feb32d";
1616 };
1717
1818 nativeBuildInputs = [
pkgs/development/python-modules/msal/default.nix+2−2
@@ -9,11 +9,11 @@
99
1010buildPythonPackage rec {
1111 pname = "msal";
12− version = "1.5.0";
12+ version = "1.5.1";
1313
1414 src = fetchPypi {
1515 inherit pname version;
16− sha256 = "cc67d3a14850ba7e533ec5d05a4c23a34dd74a7fa5e0210daebef397b2009b0e";
16+ sha256 = "7efb0256c96a7b2eadab49ce29ecdb91352a91440c12a40bed44303724b62fda";
1717 };
1818
1919 propagatedBuildInputs = [
pkgs/development/python-modules/munkres/default.nix+4−6
@@ -2,23 +2,21 @@
22, buildPythonPackage
33, fetchPypi
44, isPy3k
5−, nose
5+, pytestCheckHook
66}:
77
88buildPythonPackage rec {
99 pname = "munkres";
10− version = "1.1.2";
10+ version = "1.1.4";
1111
1212 disabled = !isPy3k;
1313
1414 src = fetchPypi {
1515 inherit pname version;
16− sha256 = "81e9ced40c3d0ffc48be4b6da5cfdfaa49041faaaba8075b159974ec47926aea";
16+ sha256 = "fc44bf3c3979dada4b6b633ddeeb8ffbe8388ee9409e4d4e8310c2da1792db03";
1717 };
1818
19− checkInputs = [ nose ];
20−
21− checkPhase = "nosetests";
19+ checkInputs = [ pytestCheckHook ];
2220
2321 meta = with stdenv.lib; {
2422 homepage = "http://bmc.github.com/munkres/";
pkgs/development/python-modules/murmurhash/default.nix+2−2
@@ -6,11 +6,11 @@
66
77buildPythonPackage rec {
88 pname = "murmurhash";
9− version = "1.0.2";
9+ version = "1.0.4";
1010
1111 src = fetchPypi {
1212 inherit pname version;
13− sha256 = "c7a646f6b07b033642b4f52ae2e45efd8b80780b3b90e8092a0cec935fbf81e2";
13+ sha256 = "422084ac1fe994cb7c893689c600923dee4e2c3fc74e832f7d9a8d6fdcc362d5";
1414 };
1515
1616 postPatch = ''
pkgs/development/python-modules/nbconflux/default.nix+2−1
@@ -1,8 +1,9 @@
1−{ lib, buildPythonPackage, fetchFromGitHub, nbconvert, pytest, requests, responses }:
1+{ lib, buildPythonPackage, fetchFromGitHub, isPy27, nbconvert, pytest, requests, responses }:
22
33buildPythonPackage rec {
44 pname = "nbconflux";
55 version = "0.7.0";
6+ disabled = isPy27; # no longer compatible with python 2 urllib
67
78 src = fetchFromGitHub {
89 owner = "Valassis-Digital-Media";
pkgs/development/python-modules/nbformat/default.nix+2−2
@@ -12,11 +12,11 @@
1212
1313buildPythonPackage rec {
1414 pname = "nbformat";
15− version = "5.0.7";
15+ version = "5.0.8";
1616
1717 src = fetchPypi {
1818 inherit pname version;
19− sha256 = "54d4d6354835a936bad7e8182dcd003ca3dc0cedfee5a306090e04854343b340";
19+ sha256 = "f545b22138865bfbcc6b1ffe89ed5a2b8e2dc5d4fe876f2ca60d8e6f702a30f8";
2020 };
2121
2222 LC_ALL="en_US.utf8";
pkgs/development/python-modules/nest-asyncio/default.nix+2−2
@@ -5,13 +5,13 @@
55}:
66
77buildPythonPackage rec {
8− version = "1.4.0";
8+ version = "1.4.2";
99 pname = "nest_asyncio";
1010 disabled = !(pythonAtLeast "3.5");
1111
1212 src = fetchPypi {
1313 inherit pname version;
14− sha256 = "1j2rbb31wdq9k15cmj2y0kypzvfc3v05py1n0809nmqlpi5hawsp";
14+ sha256 = "c614fcfaca72b1f04778bc0e73f49c84500b3d045c49d149fc46f1566643c175";
1515 };
1616
1717 # tests not packaged with source dist as of 1.3.2/1.3.2, and
pkgs/development/python-modules/notify-py/default.nix+2−2
@@ -2,13 +2,13 @@
22
33buildPythonPackage rec {
44 pname = "notify_py";
5− version = "0.2.3";
5+ version = "0.2.4";
66
77 disabled = !isPy3k;
88
99 src = fetchPypi {
1010 inherit pname version;
11− sha256 = "1i209xsff54hipdk9cg6va60fl33swg126yfgkg3wsgjmi6s07ca";
11+ sha256 = "2a19273a476c8b003baa96650d00a81c5981c3a17ada748bc0a73aefad46d977";
1212 };
1313
1414 postPatch = ''
pkgs/development/python-modules/numba/default.nix+2−2
@@ -13,14 +13,14 @@
1313}:
1414
1515buildPythonPackage rec {
16− version = "0.51.1";
16+ version = "0.51.2";
1717 pname = "numba";
1818 # uses f-strings
1919 disabled = pythonOlder "3.6";
2020
2121 src = fetchPypi {
2222 inherit pname version;
23− sha256 = "1e765b1a41535684bf3b0465c1d0a24dcbbff6af325270c8f4dad924c0940160";
23+ sha256 = "16bd59572114adbf5f600ea383880d7b2071ae45477e84a24994e089ea390768";
2424 };
2525
2626 NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-I${libcxx}/include/c++/v1";
pkgs/development/python-modules/numpy/1.16.nix+1
@@ -92,6 +92,7 @@ in buildPythonPackage rec {
9292 meta = {
9393 description = "Scientific tools for Python";
9494 homepage = "https://numpy.org/";
95+ license = lib.licenses.bsd3;
9596 maintainers = with lib.maintainers; [ fridh ];
9697 };
9798}
pkgs/development/python-modules/numpy/default.nix+3−2
@@ -39,13 +39,13 @@ let
3939 };
4040in buildPythonPackage rec {
4141 pname = "numpy";
42− version = "1.19.1";
42+ version = "1.19.4";
4343 format = "pyproject.toml";
4444
4545 src = fetchPypi {
4646 inherit pname version;
4747 extension = "zip";
48− sha256 = "b8456987b637232602ceb4d663cb34106f7eb780e247d51a260b84760fd8f491";
48+ sha256 = "141ec3a3300ab89c7f2b0775289954d193cc8edb621ea05f99db9cb181530512";
4949 };
5050
5151 nativeBuildInputs = [ gfortran pytest cython setuptoolsBuildHook ];
@@ -95,6 +95,7 @@ in buildPythonPackage rec {
9595 meta = {
9696 description = "Scientific tools for Python";
9797 homepage = "https://numpy.org/";
98+ license = lib.licenses.bsd3;
9899 maintainers = with lib.maintainers; [ fridh ];
99100 };
100101}
pkgs/development/python-modules/nunavut/default.nix+2−2
@@ -2,12 +2,12 @@
22
33 buildPythonPackage rec {
44 pname = "nunavut";
5− version = "0.3.6";
5+ version = "0.3.9";
66 disabled = pythonOlder "3.5"; # only python>=3.5 is supported
77
88 src = fetchPypi {
99 inherit pname version;
10− sha256 = "434edabdc431b9af719896e0de4bd0deead657777d1d8aa4e3cd0dcdff6298bc";
10+ sha256 = "1f2f42f058afd30456e47b6b92a6b7b15100f6bca0a29108ace95bd5147a8e86";
1111 };
1212
1313 propagatedBuildInputs = [
pkgs/development/python-modules/openwrt-luci-rpc/default.nix+2−2
@@ -10,11 +10,11 @@ with lib;
1010
1111buildPythonPackage rec {
1212 pname = "openwrt-luci-rpc";
13− version = "1.1.3";
13+ version = "1.1.6";
1414
1515 src = fetchPypi {
1616 inherit pname version;
17− sha256 = "c8c27c98c0a1deac2d32d417c4ca536b08be2655a9a6de8a7897e8bc6431858c";
17+ sha256 = "841c7fc956ad42825a2f2cd0cb2aa02005c3482b200ff7aaccd390345c9f3e18";
1818 };
1919
2020 postPatch = ''
pkgs/development/python-modules/packet-python/default.nix+2−2
@@ -12,10 +12,10 @@
1212
1313buildPythonPackage rec {
1414 pname = "packet-python";
15− version = "1.43.0";
15+ version = "1.43.1";
1616 src = fetchPypi {
1717 inherit pname version;
18− sha256 = "48fcc5ca6e7f3d84ef91016585d1894bb9deb3dae6591ffab90fdf05006c3e48";
18+ sha256 = "e333fb5ce45a3f283ddeb6261d061b39328b82eb440a89233fa08ce3fec2fcf0";
1919 };
2020 nativeBuildInputs = [ pytestrunner ];
2121 propagatedBuildInputs = [ requests ];
pkgs/development/python-modules/pandas/default.nix+45−38
@@ -1,27 +1,29 @@
1−{ buildPythonPackage
1+{ stdenv
2+, buildPythonPackage
23, fetchPypi
34, python
4−, stdenv
5−, pytest
6−, glibcLocales
5+, isPy38
6+, beautifulsoup4
7+, bottleneck
78, cython
89, dateutil
9−, scipy
10−, moto
10+, html5lib
11+, lxml
1112, numexpr
13+, openpyxl
1214, pytz
13−, xlrd
14−, bottleneck
1515, sqlalchemy
16−, lxml
17−, html5lib
18−, beautifulsoup4
19−, hypothesis
20−, openpyxl
16+, scipy
2117, tables
18+, xlrd
2219, xlwt
20+# Test Inputs
21+, glibcLocales
22+, hypothesis
23+, moto
24+, pytestCheckHook
25+# Darwin inputs
2326, runtimeShell
24−, isPy38
2527, libcxx ? null
2628}:
2729
@@ -31,33 +33,33 @@ let
3133
3234in buildPythonPackage rec {
3335 pname = "pandas";
34− version = "1.1.1";
36+ version = "1.1.4";
3537
3638 src = fetchPypi {
3739 inherit pname version;
38− sha256 = "53328284a7bb046e2e885fd1b8c078bd896d7fc4575b915d4936f54984a2ba67";
40+ sha256 = "a979d0404b135c63954dea79e6246c45dd45371a88631cdbb4877d844e6de3b6";
3941 };
4042
41− checkInputs = [ pytest glibcLocales moto hypothesis ];
42−
4343 nativeBuildInputs = [ cython ];
4444 buildInputs = optional isDarwin libcxx;
4545 propagatedBuildInputs = [
46+ beautifulsoup4
47+ bottleneck
4648 dateutil
47− scipy
49+ html5lib
4850 numexpr
49− pytz
50− xlrd
51− bottleneck
52− sqlalchemy
5351 lxml
54− html5lib
55− beautifulsoup4
5652 openpyxl
53+ pytz
54+ scipy
55+ sqlalchemy
5756 tables
57+ xlrd
5858 xlwt
5959 ];
6060
61+ checkInputs = [ pytestCheckHook glibcLocales moto hypothesis ];
62+
6163 # doesn't work with -Werror,-Wunused-command-line-argument
6264 # https://github.com/NixOS/nixpkgs/issues/39687
6365 hardeningDisable = optional stdenv.cc.isClang "strictoverflow";
@@ -80,8 +82,14 @@ in buildPythonPackage rec {
8082 "--parallel=$NIX_BUILD_CORES"
8183 ];
8284
85+ doCheck = !stdenv.isAarch64; # upstream doesn't test this architecture
8386
84− disabledTests = stdenv.lib.concatMapStringsSep " and " (s: "not " + s) ([
87+ pytestFlagsArray = [
88+ "$out/${python.sitePackages}/pandas"
89+ "--skip-slow"
90+ "--skip-network"
91+ ];
92+ disabledTests = [
8593 # since dateutil 0.6.0 the following fails: test_fallback_plural, test_ambiguous_flags, test_ambiguous_compat
8694 # was supposed to be solved by https://github.com/dateutil/dateutil/issues/321, but is not the case
8795 "test_fallback_plural"
@@ -105,15 +113,16 @@ in buildPythonPackage rec {
105113 # Fails with 1.0.5
106114 "test_constructor_list_frames"
107115 "test_constructor_with_embedded_frames"
116+ # tries to import compiled C extension locally
117+ "test_missing_required_dependency"
108118 ] ++ optionals isDarwin [
109119 "test_locale"
110120 "test_clipboard"
111− ]);
112−
113− doCheck = !stdenv.isAarch64; # upstream doesn't test this architecture
121+ ];
114122
115− checkPhase = ''
116− runHook preCheck
123+ preCheck = ''
124+ export LC_ALL="en_US.UTF-8"
125+ PYTHONPATH=$out/${python.sitePackages}:$PYTHONPATH
117126 ''
118127 # TODO: Get locale and clipboard support working on darwin.
119128 # Until then we disable the tests.
@@ -123,19 +132,17 @@ in buildPythonPackage rec {
123132 echo "#!${runtimeShell}" > pbpaste
124133 chmod a+x pbcopy pbpaste
125134 export PATH=$(pwd):$PATH
126− '' + ''
127− LC_ALL="en_US.UTF-8" py.test $out/${python.sitePackages}/pandas --skip-slow --skip-network -k "$disabledTests"
128− runHook postCheck
129135 '';
130136
131− meta = {
137+ meta = with stdenv.lib; {
132138 # https://github.com/pandas-dev/pandas/issues/14866
133139 # pandas devs are no longer testing i686 so safer to assume it's broken
134140 broken = stdenv.isi686;
135141 homepage = "https://pandas.pydata.org/";
142+ changelog = "https://pandas.pydata.org/docs/whatsnew/index.html";
136143 description = "Python Data Analysis Library";
137− license = stdenv.lib.licenses.bsd3;
138− maintainers = with stdenv.lib.maintainers; [ raskin fridh knedlsepp ];
139− platforms = stdenv.lib.platforms.unix;
144+ license = licenses.bsd3;
145+ maintainers = with maintainers; [ raskin fridh knedlsepp ];
146+ platforms = platforms.unix;
140147 };
141148}
pkgs/development/python-modules/pandocfilters/default.nix+2−2
@@ -4,12 +4,12 @@
44}:
55
66buildPythonPackage rec {
7− version = "1.4.2";
7+ version = "1.4.3";
88 pname = "pandocfilters";
99
1010 src = fetchPypi {
1111 inherit pname version;
12− sha256 = "b3dd70e169bb5449e6bc6ff96aea89c5eea8c5f6ab5e207fc2f521a2cf4a0da9";
12+ sha256 = "bc63fbb50534b4b1f8ebe1860889289e8af94a23bff7445259592df25a3906eb";
1313 };
1414
1515 # No tests available
pkgs/development/python-modules/parver/default.nix+2−2
@@ -11,11 +11,11 @@
1111
1212buildPythonPackage rec {
1313 pname = "parver";
14− version = "0.3.0";
14+ version = "0.3.1";
1515
1616 src = fetchPypi {
1717 inherit pname version;
18− sha256 = "0a6jp17c1ag6b9yp5xgy9wvznk3g0v2f8gpwkcwxpyc9ygk98zdm";
18+ sha256 = "c902e0653bcce927cc156a7fd9b3a51924cbce3bf3d0bfd49fc282bfd0c5dfd3";
1919 };
2020
2121 propagatedBuildInputs = [ six attrs arpeggio ];
pkgs/development/python-modules/passlib/default.nix+2−2
@@ -7,11 +7,11 @@
77
88buildPythonPackage rec {
99 pname = "passlib";
10− version = "1.7.2";
10+ version = "1.7.4";
1111
1212 src = fetchPypi {
1313 inherit pname version;
14− sha256 = "8d666cef936198bc2ab47ee9b0410c94adf2ba798e5a84bf220be079ae7ab6a8";
14+ sha256 = "defd50f72b65c5402ab2c573830a6978e5f202ad0d984793c8dde2c4152ebe04";
1515 };
1616
1717 checkInputs = [ nose ];
pkgs/development/python-modules/pastedeploy/default.nix+2−2
@@ -6,12 +6,12 @@
66}:
77
88buildPythonPackage rec {
9− version = "2.1.0";
9+ version = "2.1.1";
1010 pname = "PasteDeploy";
1111
1212 src = fetchPypi {
1313 inherit pname version;
14− sha256 = "e7559878b6e92023041484be9bcb6d767cf4492fc3de7257a5dae76a7cc11a9b";
14+ sha256 = "6dead6ab9823a85d585ef27f878bc647f787edb9ca8da0716aa9f1261b464817";
1515 };
1616
1717 buildInputs = [ pytestrunner ];
pkgs/development/python-modules/patator/default.nix+2−2
@@ -5,12 +5,12 @@
55
66buildPythonPackage rec {
77 pname = "patator";
8− version = "0.9";
8+ version = "0.7";
99 disabled = !(isPy3k);
1010
1111 src = fetchPypi {
1212 inherit pname version;
13− sha256 = "68cb24bdc3042ee0d47a288b19a8b99a6c54bdbd4ddf0c5817d9b9ac0a0d8a15";
13+ sha256 = "335e432e6cc591437e316ba8c1da935484ca39fc79e595ccf60ccd9166e965f1";
1414 };
1515
1616 propagatedBuildInputs = [
pkgs/development/python-modules/periodictable/default.nix+5−3
@@ -1,16 +1,18 @@
1−{lib, fetchPypi, buildPythonPackage, numpy, pyparsing}:
1+{lib, fetchPypi, buildPythonPackage, numpy, pyparsing, pytestcov, pytestCheckHook }:
22
33buildPythonPackage rec {
44 pname = "periodictable";
5− version = "1.5.2";
5+ version = "1.5.3";
66
77 propagatedBuildInputs = [numpy pyparsing];
88
99 src = fetchPypi {
1010 inherit pname version;
11− sha256 = "1lx03xirh3hcrzkwrz91dmdzcj01bykq59hccd83ai901jzqmshz";
11+ sha256 = "1d09c359468e2de74b43fc3a7dcb0d3d71e0ff53adb85995215d8d7796451af6";
1212 };
1313
14+ checkInputs = [ pytestcov pytestCheckHook ];
15+
1416 meta = {
1517 homepage = "https://www.reflectometry.org/danse/software.html";
1618 description = "an extensible periodic table of the elements prepopulated with data important to neutron and x-ray scattering experiments";
pkgs/development/python-modules/pg8000/default.nix+4−3
@@ -1,22 +1,23 @@
11{ stdenv
22, buildPythonPackage
33, fetchPypi
4+, scramp
45, isPy3k
56, passlib
67}:
78
89buildPythonPackage rec {
910 pname = "pg8000";
10− version = "1.16.5";
11+ version = "1.16.6";
1112
1213 disabled = !isPy3k;
1314
1415 src = fetchPypi {
1516 inherit pname version;
16− sha256 = "8af70cdfcc1fadafa32468a6af563e1c0b5271c4dcc99a4490030a128cb295a3";
17+ sha256 = "8fc1e6a62ccb7c9830f1e7e9288e2d20eaf373cc8875b5c55b7d5d9b7717be91";
1718 };
1819
19− propagatedBuildInputs = [ passlib ];
20+ propagatedBuildInputs = [ passlib scramp ];
2021
2122 meta = with stdenv.lib; {
2223 homepage = "https://github.com/tlocke/pg8000";
pkgs/development/python-modules/phonenumbers/default.nix+2−2
@@ -2,11 +2,11 @@
22
33buildPythonPackage rec {
44 pname = "phonenumbers";
5− version = "8.12.11";
5+ version = "8.12.12";
66
77 src = fetchPypi {
88 inherit pname version;
9− sha256 = "17f39f06c1e0e20eabe69ff735b1c08e4547d12a12595da3d835fd3256a9ee0c";
9+ sha256 = "70aa98a50ba7bc7f6bf17851f806c927107e7c44e7d21eb46bdbec07b99d23ae";
1010 };
1111
1212 meta = {
pkgs/development/python-modules/premailer/default.nix+2−1
@@ -1,10 +1,11 @@
1−{ lib, buildPythonPackage, fetchPypi,
1+{ lib, buildPythonPackage, fetchPypi, isPy27,
22 cssselect, cssutils, lxml, mock, nose, requests, cachetools
33}:
44
55buildPythonPackage rec {
66 pname = "premailer";
77 version = "3.7.0";
8+ disabled = isPy27; # no longer compatible with urllib
89
910 src = fetchPypi {
1011 inherit pname version;
pkgs/development/python-modules/preshed/default.nix+2−2
@@ -9,11 +9,11 @@
99}:
1010buildPythonPackage rec {
1111 pname = "preshed";
12− version = "3.0.2";
12+ version = "3.0.3";
1313
1414 src = fetchPypi {
1515 inherit pname version;
16− sha256 = "1jrnci1pw9yv7j1a9b2q6c955l3gb8fv1q4d0id6s7bwr5l39mv1";
16+ sha256 = "8ad47d5d2688fabc66850f32c7b6d3b4a97e6b653726309fe09603edd6fceb23";
1717 };
1818
1919 propagatedBuildInputs = [
pkgs/development/python-modules/prompt_toolkit/default.nix+2−2
@@ -8,11 +8,11 @@
88
99buildPythonPackage rec {
1010 pname = "prompt_toolkit";
11− version = "3.0.6";
11+ version = "3.0.8";
1212
1313 src = fetchPypi {
1414 inherit pname version;
15− sha256 = "7630ab85a23302839a0f26b31cc24f518e6155dea1ed395ea61b42c45941b6a6";
15+ sha256 = "25c95d2ac813909f813c93fde734b6e44406d1477a9faef7c915ff37d39c0a8c";
1616 };
1717 checkPhase = ''
1818 py.test -k 'not test_pathcompleter_can_expanduser'
pkgs/development/python-modules/psd-tools/default.nix+2−2
@@ -6,11 +6,11 @@
66
77buildPythonPackage rec {
88 pname = "psd-tools";
9− version = "1.9.15";
9+ version = "1.9.16";
1010
1111 src = fetchPypi {
1212 inherit pname version;
13− sha256 = "23b545d91c784fcaf27fbf4c69abe21ac1ea10d25b5b8c61dcd8f0e03ccff786";
13+ sha256 = "dece6327b5aa03b53163c63e2bf90b4a7b0ff6872ef743adab140a59cb2318ff";
1414 };
1515
1616 propagatedBuildInputs = [
pkgs/development/python-modules/psutil/default.nix+2−2
@@ -8,11 +8,11 @@
88
99buildPythonPackage rec {
1010 pname = "psutil";
11− version = "5.7.2";
11+ version = "5.7.3";
1212
1313 src = fetchPypi {
1414 inherit pname version;
15− sha256 = "90990af1c3c67195c44c9a889184f84f5b2320dce3ee3acbd054e3ba0b4a7beb";
15+ sha256 = "af73f7bcebdc538eda9cc81d19db1db7bf26f103f91081d780bbacfcb620dee2";
1616 };
1717
1818 # arch doesn't report frequency is the same way
pkgs/development/python-modules/psycopg2/default.nix+2−2
@@ -2,13 +2,13 @@
22
33buildPythonPackage rec {
44 pname = "psycopg2";
5− version = "2.8.5";
5+ version = "2.8.6";
66
77 disabled = isPyPy;
88
99 src = fetchPypi {
1010 inherit pname version;
11− sha256 = "f7d46240f7a1ae1dd95aab38bd74f7428d46531f69219954266d669da60c0818";
11+ sha256 = "fb23f6c71107c37fd667cb4ea363ddeb936b348bbd6449278eb92c189699f543";
1212 };
1313
1414 buildInputs = lib.optional stdenv.isDarwin openssl;
pkgs/development/python-modules/pushover-complete/default.nix+2
@@ -1,6 +1,7 @@
11{ lib
22, buildPythonPackage
33, fetchPypi
4+, isPy27
45, requests
56, six
67, tox
@@ -11,6 +12,7 @@
1112buildPythonPackage rec {
1213 pname = "pushover-complete";
1314 version = "1.1.1";
15+ disabled = isPy27;
1416
1517 src = fetchPypi {
1618 pname = "pushover_complete";
pkgs/development/python-modules/py-multihash/default.nix+1
@@ -45,5 +45,6 @@ buildPythonPackage rec {
4545 homepage = "https://github.com/multiformats/py-multihash";
4646 license = licenses.mit;
4747 maintainers = with maintainers; [ rakesh4g ];
48+ broken = true; # no longer compatible with base58, no updates in 5 years. Added 2020-11-05
4849 };
4950}
pkgs/development/python-modules/py4j/default.nix+2−2
@@ -3,11 +3,11 @@
33buildPythonPackage rec {
44 pname = "py4j";
55
6− version = "0.10.9";
6+ version = "0.10.9.1";
77
88 src = fetchPypi {
99 inherit pname version;
10− sha256 = "36ec57f43ff8ced260a18aa9a4e46c3500a730cac8860e259cbaa546c2b9db2f";
10+ sha256 = "7605e512bf9b002245f5a9121a8c2df9bfd1a6004fe6dd3ff29d46f901719d53";
1111 };
1212
1313 # No tests in archive
pkgs/development/python-modules/pybase64/default.nix+2−2
@@ -2,13 +2,13 @@
22
33buildPythonPackage rec {
44 pname = "pybase64";
5− version = "1.0.1";
5+ version = "1.0.2";
66
77 disabled = !isPy3k;
88
99 src = fetchPypi {
1010 inherit pname version;
11− sha256 = "6ced40531bffc81bafc790d5c0d2f752e281b3b00fd6ff4e79385c625e5dbab1";
11+ sha256 = "c430b36751dd89820c867aadd0130bbe8ce007ee570cbe91bb23012fb6f52e87";
1212 };
1313
1414 propagatedBuildInputs = [ six ];
pkgs/development/python-modules/pybids/default.nix+2−2
@@ -16,12 +16,12 @@
1616}:
1717
1818buildPythonPackage rec {
19− version = "0.12.1";
19+ version = "0.12.3";
2020 pname = "pybids";
2121
2222 src = fetchPypi {
2323 inherit pname version;
24− sha256 = "08smd4frl8hf0n6bi20ayd5wcf51g3g488bpakjciz7ghdvky1h6";
24+ sha256 = "a084172ae5b26a5f26b17186ade98400cda52d9244d9f0b329041741ea82b5db";
2525 };
2626
2727 propagatedBuildInputs = [
pkgs/development/python-modules/pybotvac/default.nix+2−2
@@ -2,11 +2,11 @@
22
33buildPythonPackage rec {
44 pname = "pybotvac";
5− version = "0.0.17";
5+ version = "0.0.18";
66
77 src = fetchPypi {
88 inherit pname version;
9− sha256 = "f212f0df8a946c0fa25f0c20c3c9decd9ddc4dbd9b48592a3283e7481112923e";
9+ sha256 = "e983c9ffc0734c2e5a7c2adf5d0d0dfe399d94157c590ef70fad765f882c341f";
1010 };
1111
1212 propagatedBuildInputs = [ requests ];
pkgs/development/python-modules/pychromecast/default.nix+2−2
@@ -2,11 +2,11 @@
22
33buildPythonPackage rec {
44 pname = "PyChromecast";
5− version = "7.5.0";
5+ version = "7.5.1";
66
77 src = fetchPypi {
88 inherit pname version;
9− sha256 = "2f346a88ddc27a19cc68bc2d3e8929d89276298cb1c11871b82a87fbdafb95a8";
9+ sha256 = "cf2e9fa795ea1e9d0d180adfbdccefd6b4f532eae56f41f15d1a75b323096f51";
1010 };
1111
1212 disabled = !isPy3k;
pkgs/development/python-modules/pycoin/default.nix+2−2
@@ -8,11 +8,11 @@
88
99buildPythonPackage rec {
1010 pname = "pycoin";
11− version = "0.90.20200809";
11+ version = "0.90.20201031";
1212
1313 src = fetchPypi {
1414 inherit pname version;
15− sha256 = "301dd6df9d9d580701d7325c4d1c341233ba1a94cb805305ea3a43c31bdaaa4c";
15+ sha256 = "65c19204cb7aece4aae30c44b5e08beecb9c118370a9f9994d6cddaee17c351d";
1616 };
1717
1818 propagatedBuildInputs = [ setuptools ];
pkgs/development/python-modules/pycryptodome/default.nix+2−2
@@ -1,12 +1,12 @@
11{ stdenv, fetchPypi, buildPythonPackage }:
22
33buildPythonPackage rec {
4− version = "3.9.8";
4+ version = "3.9.9";
55 pname = "pycryptodome";
66
77 src = fetchPypi {
88 inherit pname version;
9− sha256 = "0e24171cf01021bc5dc17d6a9d4f33a048f09d62cc3f62541e95ef104588bda4";
9+ sha256 = "910e202a557e1131b1c1b3f17a63914d57aac55cf9fb9b51644962841c3995c4";
1010 };
1111
1212 meta = {
pkgs/development/python-modules/pycryptodomex/default.nix+2−2
@@ -2,7 +2,7 @@
22
33buildPythonPackage rec {
44 pname = "pycryptodomex";
5− version = "3.9.8";
5+ version = "3.9.9";
66
77 meta = {
88 description = "A self-contained cryptographic library for Python";
@@ -12,6 +12,6 @@ buildPythonPackage rec {
1212
1313 src = fetchPypi {
1414 inherit pname version;
15− sha256 = "48cc2cfc251f04a6142badeb666d1ff49ca6fdfc303fd72579f62b768aaa52b9";
15+ sha256 = "7b5b7c5896f8172ea0beb283f7f9428e0ab88ec248ce0a5b8c98d73e26267d51";
1616 };
1717}
pkgs/development/python-modules/pyct/default.nix+4−2
@@ -1,6 +1,7 @@
11{ lib
22, buildPythonPackage
33, fetchPypi
4+, isPy27
45, param
56, pyyaml
67, requests
@@ -9,13 +10,14 @@
910
1011buildPythonPackage rec {
1112 pname = "pyct";
12− version = "0.4.6";
13+ version = "0.4.8";
1314
1415 src = fetchPypi {
1516 inherit pname version;
16− sha256 = "df7b2d29f874cabdbc22e4f8cba2ceb895c48aa33da4e0fe679e89873e0a4c6e";
17+ sha256 = "23d7525b5a1567535c093aea4b9c33809415aa5f018dd77f6eb738b1226df6f7";
1718 };
1819
20+ doCheck = !isPy27;
1921 checkInputs = [ pytest ];
2022 propagatedBuildInputs = [
2123 param
pkgs/development/python-modules/pycurl/default.nix+4−3
@@ -1,6 +1,7 @@
11{ buildPythonPackage
22, isPyPy
33, fetchPypi
4+, pythonOlder
45, curl
56, openssl
67, bottle
@@ -11,12 +12,12 @@
1112
1213buildPythonPackage rec {
1314 pname = "pycurl";
14− version = "7.43.0.5";
15− disabled = isPyPy; # https://github.com/pycurl/pycurl/issues/208
15+ version = "7.43.0.6";
16+ disabled = isPyPy || (pythonOlder "3.5"); # https://github.com/pycurl/pycurl/issues/208
1617
1718 src = fetchPypi {
1819 inherit pname version;
19− sha256 = "ec7dd291545842295b7b56c12c90ffad2976cc7070c98d7b1517b7b6cd5994b3";
20+ sha256 = "8301518689daefa53726b59ded6b48f33751c383cf987b0ccfbbc4ed40281325";
2021 };
2122
2223 buildInputs = [
pkgs/development/python-modules/pyexcel-io/default.nix+2−2
@@ -7,13 +7,13 @@
77
88buildPythonPackage rec {
99 pname = "pyexcel-io";
10− version = "0.6.3";
10+ version = "0.6.4";
1111
1212 disabled = !isPy3k;
1313
1414 src = fetchPypi {
1515 inherit pname version;
16− sha256 = "8fb7a201eb3e5763bb8f9d6e096ceed9e5f1baecd784c9fadbe0fb3d59174c0e";
16+ sha256 = "00f15f4bae2947de49b3206f2600f78780008e044380f7aafe0ce52969cda4ca";
1717 };
1818
1919 propagatedBuildInputs = [
pkgs/development/python-modules/pyexcel-xls/default.nix+2−2
@@ -11,11 +11,11 @@
1111
1212buildPythonPackage rec {
1313 pname = "pyexcel-xls";
14− version = "0.6.0";
14+ version = "0.6.1";
1515
1616 src = fetchPypi {
1717 inherit pname version;
18− sha256 = "64bac180274c52efe970c664d3e8bb12402c9d10e0734d9fe87655646a876c45";
18+ sha256 = "c4cc1fb4ac5d1682a44d9a368a43ec2e089ad6fc46884648ccfad46863e3da0a";
1919 };
2020
2121 propagatedBuildInputs = [
pkgs/development/python-modules/pyhomematic/default.nix+2−2
@@ -2,13 +2,13 @@
22
33buildPythonPackage rec {
44 pname = "pyhomematic";
5− version = "0.1.68";
5+ version = "0.1.70";
66
77 disabled = !isPy3k;
88
99 src = fetchPypi {
1010 inherit pname version;
11− sha256 = "7f8ec68238a441cfe593fa9028509fd0c3dc67400b4dd520c8c02088f177302e";
11+ sha256 = "1c9ae61c870e37348483966f6aa46f650f339f5f1169e5beb19d681c6434c247";
1212 };
1313
1414 # PyPI tarball does not include tests/ directory
pkgs/development/python-modules/pymupdf/default.nix+3−2
@@ -1,10 +1,11 @@
11{ stdenv, buildPythonPackage, fetchPypi, mupdf, swig }:
22buildPythonPackage rec {
3− pname = "PyMuPDF";
3+ pname = "pymupdf";
44 version = "1.18.0";
55
66 src = fetchPypi {
7− inherit pname version;
7+ pname = "PyMuPDF";
8+ inherit version;
89 sha256 = "64ce58f92d9edd2631e447175fa13b4024ac3b6dce6e718e0b003c41de6f7952";
910 };
1011
pkgs/development/python-modules/pyopencl/default.nix+2−2
@@ -16,7 +16,7 @@
1616
1717buildPythonPackage rec {
1818 pname = "pyopencl";
19− version = "2020.2.1";
19+ version = "2020.2.2";
2020
2121 checkInputs = [ pytest ];
2222 buildInputs = [ opencl-headers ocl-icd pybind11 ];
@@ -25,7 +25,7 @@ buildPythonPackage rec {
2525
2626 src = fetchPypi {
2727 inherit pname version;
28− sha256 = "deb6c50f37f8f88960a943b379eca8c0a9a80634cf60e09aee691a7453ae202e";
28+ sha256 = "31fcc79fb6862998e98d91a624c0bd4f0ab4c5d418d199912d4d312c64e437ec";
2929 };
3030
3131 # py.test is not needed during runtime, so remove it from `install_requires`
pkgs/development/python-modules/pyotp/default.nix+2−2
@@ -2,12 +2,12 @@
22
33buildPythonPackage rec {
44 pname = "pyotp";
5− version = "2.4.0";
5+ version = "2.4.1";
66 disabled = isPy27;
77
88 src = fetchPypi {
99 inherit pname version;
10− sha256 = "01eceab573181188fe038d001e42777884a7f5367203080ef5bda0e30fe82d28";
10+ sha256 = "038a3f70b34eaad3f72459e8b411662ef8dfcdd95f7d9203fa489e987a75584b";
1111 };
1212
1313 pythonImportsCheck = [ "pyotp" ];
pkgs/development/python-modules/pyperclip/default.nix+2−2
@@ -1,12 +1,12 @@
11{ lib, buildPythonPackage, fetchPypi }:
22
33buildPythonPackage rec {
4− version = "1.8.0";
4+ version = "1.8.1";
55 pname = "pyperclip";
66
77 src = fetchPypi {
88 inherit pname version;
9− sha256 = "b75b975160428d84608c26edba2dec146e7799566aea42c1fe1b32e72b6028f2";
9+ sha256 = "9abef1e79ce635eb62309ecae02dfb5a3eb952fa7d6dce09c1aef063f81424d3";
1010 };
1111
1212 doCheck = false;
pkgs/development/python-modules/pyrsistent/default.nix+2−2
@@ -9,11 +9,11 @@
99
1010buildPythonPackage rec {
1111 pname = "pyrsistent";
12− version = "0.16.0";
12+ version = "0.16.1";
1313
1414 src = fetchPypi {
1515 inherit pname version;
16− sha256 = "28669905fe725965daa16184933676547c5bb40a5153055a8dee2a4bd7933ad3";
16+ sha256 = "aa2ae1c2e496f4d6777f869ea5de7166a8ccb9c2e06ebcf6c7ff1b670c98c5ef";
1717 };
1818
1919 propagatedBuildInputs = [ six ];
pkgs/development/python-modules/pyspread/default.nix+2−2
@@ -18,11 +18,11 @@
1818
1919buildPythonPackage rec {
2020 pname = "pyspread";
21− version = "1.99.2";
21+ version = "1.99.4";
2222
2323 src = fetchPypi {
2424 inherit pname version;
25− sha256 = "117268cbeb225e0aca4c59381b7bdf5333bf95ca85c1db410a326a887a74f3da";
25+ sha256 = "69edad3e4a3bcfb728beb3ad32e308096c29234cc0f7398ecd26a51e10b75978";
2626 };
2727
2828 propagatedBuildInputs = [ numpy wxPython matplotlib pycairo python-gnupg xlrd xlwt jedi pyenchant basemap pygtk ];
pkgs/development/python-modules/pytest-black/default.nix+2−2
@@ -7,11 +7,11 @@
77
88buildPythonPackage rec {
99 pname = "pytest-black";
10− version = "0.3.11";
10+ version = "0.3.12";
1111
1212 src = fetchPypi {
1313 inherit pname version;
14− sha256 = "1mjxqvzadpyfvypv5isfda9c6lz8xbqci9b4hn58b2lbj3kv0pjr";
14+ sha256 = "1d339b004f764d6cd0f06e690f6dd748df3d62e6fe1a692d6a5500ac2c5b75a5";
1515 };
1616
1717 nativeBuildInputs = [ setuptools_scm ];
pkgs/development/python-modules/pytest-flakes/default.nix+8−4
@@ -1,15 +1,19 @@
1−{ stdenv, buildPythonPackage, fetchPypi
2−, pytestpep8, pytest, pyflakes }:
1+{ stdenv, buildPythonPackage, fetchPypi, pythonOlder
2+, pytestpep8
3+, pytest
4+, pyflakes
5+}:
36
47buildPythonPackage rec {
58 # upstream has abandoned project in favor of pytest-flake8
69 # retaining package to not break other packages
710 pname = "pytest-flakes";
8− version = "4.0.1";
11+ version = "4.0.2";
12+ disabled = pythonOlder "3.5";
913
1014 src = fetchPypi {
1115 inherit pname version;
12− sha256 = "37113ac6c7ea5e0b648abf73937955a45f8b9214fe49413297c2ce6ce1808500";
16+ sha256 = "6733db47937d9689032876359e5ee0ee6926e3638546c09220e2f86b3581d4c1";
1317 };
1418
1519 checkInputs = [ pytestpep8 pytest ];
pkgs/development/python-modules/pytest-quickcheck/default.nix+2−2
@@ -1,11 +1,11 @@
11{ stdenv, buildPythonPackage, fetchPypi, pytest, pytest-flakes, pytestpep8, tox }:
22buildPythonPackage rec {
33 pname = "pytest-quickcheck";
4− version = "0.8.4";
4+ version = "0.8.5";
55
66 src = fetchPypi {
77 inherit pname version;
8− sha256 = "e368390c9e3fd48eb3edec0c4eef08d7332f1143ad7b7190d32376b2fd2e62ff";
8+ sha256 = "2427808b54ccdec26a40cdba934a6c042fab9ebadb60d563a01f367bef87fe58";
99 };
1010
1111 buildInputs = [ pytest ];
pkgs/development/python-modules/pytest-sanic/default.nix+2−2
@@ -8,11 +8,11 @@
88
99buildPythonPackage rec {
1010 pname = "pytest-sanic";
11− version = "1.6.1";
11+ version = "1.6.2";
1212
1313 src = fetchPypi {
1414 inherit pname version;
15− sha256 = "99e02c28cfa18a0a9af0cd151dddf0eca373279b9bac808733746f7ed7030ecc";
15+ sha256 = "6428ed8cc2e6cfa05b92689a8589149aacdc1f0640fcf9673211aa733e6a5209";
1616 };
1717
1818 propagatedBuildInputs = [
pkgs/development/python-modules/pytest-testmon/default.nix+2−2
@@ -8,12 +8,12 @@
88
99buildPythonPackage rec {
1010 pname = "pytest-testmon";
11− version = "1.0.2";
11+ version = "1.0.3";
1212 disabled = pythonOlder "3.6";
1313
1414 src = fetchPypi {
1515 inherit pname version;
16− sha256 = "fdb016d953036051d1ef0e36569b7168cefa4914014789a65a4ffefc87f85ac5";
16+ sha256 = "927a73dd510b90a2e4a48ea4d37e82c4490b56caa745663262024ea0cd278169";
1717 };
1818
1919 propagatedBuildInputs = [ coverage ];
pkgs/development/python-modules/python-hosts/default.nix+2−2
@@ -2,11 +2,11 @@
22
33buildPythonPackage rec {
44 pname = "python-hosts";
5− version = "1.0.0";
5+ version = "1.0.1";
66
77 src = fetchPypi {
88 inherit pname version;
9− sha256 = "850998704ba9025ce4c8ffd45dc4fbea2b5e30247bf3b574872ac5df90426b4d";
9+ sha256 = "5b9749ce807170fb340d044d3f971e1da4dac0ae6af8ce8db00b6758a920a2bc";
1010 };
1111
1212 # win_inet_pton is required for windows support
pkgs/development/python-modules/python-rapidjson/default.nix+2−2
@@ -8,13 +8,13 @@
88}:
99
1010buildPythonPackage rec {
11− version = "0.9.1";
11+ version = "0.9.3";
1212 pname = "python-rapidjson";
1313 disabled = pythonOlder "3.4";
1414
1515 src = fetchPypi {
1616 inherit pname version;
17− sha256 = "ad80bd7e4bb15d9705227630037a433e2e2a7982b54b51de2ebabdd1611394a1";
17+ sha256 = "4e339edfbba9e5feed0cf44043b6befba0c780b34cdf446888dbce44de362a8a";
1818 };
1919
2020 LC_ALL="en_US.utf-8";
pkgs/development/python-modules/pytools/default.nix+2−2
@@ -11,12 +11,12 @@
1111
1212buildPythonPackage rec {
1313 pname = "pytools";
14− version = "2020.4";
14+ version = "2020.4.3";
1515 disabled = pythonOlder "3.6";
1616
1717 src = fetchPypi {
1818 inherit pname version;
19− sha256 = "37db39ff11a1b5fc8aec875ae4ddb3d6c21aa0e95bddc9c841aa98e1631ae460";
19+ sha256 = "21aa1fd942bc3bc54c8ae3b5e60c1f771e6db0817b7402fd802aa5964f20e629";
2020 };
2121
2222 checkInputs = [ pytest ];
pkgs/development/python-modules/pywbem/default.nix+2−2
@@ -5,14 +5,14 @@
55
66buildPythonPackage rec {
77 pname = "pywbem";
8− version = "1.0.2";
8+ version = "1.0.3";
99
1010 # Support added in master https://github.com/pywbem/pywbem/commit/b2f2f1a151a30355bbc6652dca69a7b30bfe941e awaiting release
1111 disabled = isPy37;
1212
1313 src = fetchPypi {
1414 inherit pname version;
15− sha256 = "66d8ec82d30f2b95d8b4bd51659429066c2879d3f46292561f5fdbc7fed10f3d";
15+ sha256 = "a6c53d9426326e0e722a5b1af3a1d55810259cb3afa92ca5e4029a6d533cab37";
1616 };
1717
1818 propagatedBuildInputs = [
pkgs/development/python-modules/reportlab/default.nix+2−2
@@ -11,11 +11,11 @@ let
1111 ft = freetype.overrideAttrs (oldArgs: { dontDisableStatic = true; });
1212in buildPythonPackage rec {
1313 pname = "reportlab";
14− version = "3.5.48";
14+ version = "3.5.55";
1515
1616 src = fetchPypi {
1717 inherit pname version;
18− sha256 = "0bfe3fe6e1bd1d922f83683eae2ba1d2d29de94e25fb115eacca9530b4b02f76";
18+ sha256 = "4f307accda32c9f17015ed77c7424f904514e349dff063f78d2462d715963e53";
1919 };
2020
2121 checkInputs = [ glibcLocales ];
pkgs/development/python-modules/requests-aws4auth/default.nix+6−2
@@ -2,20 +2,24 @@
22with lib;
33buildPythonPackage rec {
44 pname = "requests-aws4auth";
5− version = "1.0";
5+ version = "1.0.1";
66
77 src = fetchPypi {
88 inherit pname version;
9− sha256 = "2950f6ff686b5a452a269076d990e4821d959b61cfac319c3d3c6daaa5db55ce";
9+ sha256 = "9a4a5f4a61c49f098f5f669410308ac5b0ea2682fd511ee3a4f9ff73b5bb275a";
1010 };
1111
1212 propagatedBuildInputs = [ requests ];
1313
14+ # pypi package no longer contains tests
15+ doCheck = false;
1416 checkPhase = ''
1517 cd requests_aws4auth
1618 ${python.interpreter} test/requests_aws4auth_test.py
1719 '';
1820
21+ pythonImportsCheck = [ "requests_aws4auth" ];
22+
1923 meta = {
2024 description = "Amazon Web Services version 4 authentication for the Python Requests library.";
2125 homepage = "https://github.com/sam-washington/requests-aws4auth";
pkgs/development/python-modules/robotframework/default.nix+2−2
@@ -2,11 +2,11 @@
22
33buildPythonPackage rec {
44 pname = "robotframework";
5− version = "3.2.1";
5+ version = "3.2.2";
66
77 src = fetchPypi {
88 inherit pname version;
9− sha256 = "d693e6d06b17f48669e2a8c4cb6c1f0d56e5f1a74835d18b8ea2118da7bf2d79";
9+ sha256 = "a0786a916d0572bd9d6afe26e95c6021e3df5dcafa0ece6b302e36366e58c24e";
1010 extension = "zip";
1111 };
1212
pkgs/development/python-modules/ruamel_ordereddict/default.nix+2−2
@@ -7,12 +7,12 @@
77
88buildPythonPackage rec {
99 pname = "ruamel.ordereddict";
10− version = "0.4.14";
10+ version = "0.4.15";
1111 disabled = isPy3k || isPyPy;
1212
1313 src = fetchPypi {
1414 inherit pname version;
15− sha256 = "281051d26eb2b18ef3d920e1e260716a52bd058a6b1a2f324102fc6a15cb8d4a";
15+ sha256 = "d7d9cf8b11e7662deb460260cf062980cd84b87a1d0457132060ab9d44e0a5f4";
1616 };
1717
1818 meta = with stdenv.lib; {
pkgs/development/python-modules/ruamel_yaml/default.nix+2−2
@@ -10,11 +10,11 @@
1010
1111buildPythonPackage rec {
1212 pname = "ruamel.yaml";
13− version = "0.16.10";
13+ version = "0.16.12";
1414
1515 src = fetchPypi {
1616 inherit pname version;
17− sha256 = "099c644a778bf72ffa00524f78dd0b6476bca94a1da344130f4bf3381ce5b954";
17+ sha256 = "076cc0bc34f1966d920a49f18b52b6ad559fbe656a0748e3535cf7b3f29ebf9e";
1818 };
1919
2020 # Tests use relative paths
pkgs/development/python-modules/rubymarshal/default.nix+5
@@ -12,6 +12,11 @@ buildPythonPackage rec {
1212
1313 propagatedBuildInputs = [ hypothesis ];
1414
15+ # pypi doesn't distribute tests
16+ doCheck = false;
17+
18+ pythonImportsCheck = [ "rubymarshal" ];
19+
1520 meta = with stdenv.lib; {
1621 homepage = "https://github.com/d9pouces/RubyMarshal/";
1722 description = "Read and write Ruby-marshalled data";
pkgs/development/python-modules/scipy/default.nix+2−2
@@ -9,11 +9,11 @@ let
99 });
1010in buildPythonPackage rec {
1111 pname = "scipy";
12− version = "1.5.2";
12+ version = "1.5.4";
1313
1414 src = fetchPypi {
1515 inherit pname version;
16− sha256 = "066c513d90eb3fd7567a9e150828d39111ebd88d3e924cdfc9f8ce19ab6f90c9";
16+ sha256 = "4a453d5e5689de62e5d38edf40af3f17560bfd63c9c5bd228c18c1f99afa155b";
1717 };
1818
1919 checkInputs = [ nose pytest ];
pkgs/development/python-modules/scour/default.nix+2−2
@@ -2,11 +2,11 @@
22
33buildPythonPackage rec {
44 pname = "scour";
5− version = "0.38";
5+ version = "0.38.1.post1";
66
77 src = fetchPypi {
88 inherit pname version;
9− sha256 = "cf50a13dcdf8cfe1861f0ce334f413604e376a7681c5b181e15322f43c3befcd";
9+ sha256 = "81b93dcfc57338f1260db4fb62697b653770a8a8bd756dcba3640c9b558a7145";
1010 };
1111
1212 propagatedBuildInputs = [ six ];
pkgs/development/python-modules/scp/default.nix+2−2
@@ -7,11 +7,11 @@
77
88buildPythonPackage rec {
99 pname = "scp";
10− version = "0.13.2";
10+ version = "0.13.3";
1111
1212 src = fetchPypi {
1313 inherit pname version;
14− sha256 = "1crlpw9lnn58fs1c1rmh7s7s9y5gkgpgjsqlvg9qa51kq1knx7gg";
14+ sha256 = "8bd748293d7362073169b96ce4b8c4f93bcc62cfc5f7e1d949e01e406a025bd4";
1515 };
1616
1717 propagatedBuildInputs = [
pkgs/development/python-modules/scramp/default.nixnew file+24
@@ -0,0 +1,24 @@
1+{ lib, buildPythonPackage, fetchFromGitHub, pytestCheckHook }:
2+
3+buildPythonPackage rec {
4+ pname = "scramp";
5+ version = "1.2.0";
6+
7+ src = fetchFromGitHub {
8+ owner = "tlocke";
9+ repo = "scramp";
10+ rev = version;
11+ sha256 = "15jb7z5l2lijxr60fb9v55i3f81h6d83c0b7fv5q0fv5q259nv0a";
12+ };
13+
14+ checkInputs = [ pytestCheckHook ];
15+
16+ pythonImportsCheck = [ "scramp" ];
17+
18+ meta = with lib; {
19+ description = "Implementation of the SCRAM authentication protocol";
20+ homepage = "https://github.com/tlocke/scramp";
21+ license = licenses.mit;
22+ maintainers = with maintainers; [ jonringer ];
23+ };
24+}
pkgs/development/python-modules/screeninfo/default.nix+4−3
@@ -1,12 +1,13 @@
1−{ stdenv, buildPythonApplication, fetchPypi, isPy36, dataclasses, libX11, libXinerama, libXrandr }:
1+{ stdenv, buildPythonApplication, fetchPypi, isPy27, isPy36, dataclasses, libX11, libXinerama, libXrandr }:
22
33buildPythonApplication rec {
44 pname = "screeninfo";
5− version = "0.6.5";
5+ version = "0.6.6";
6+ disabled = isPy27; # dataclasses isn't available for python2
67
78 src = fetchPypi {
89 inherit pname version;
9− sha256 = "0vcw54crdgmbzwlrfg80kd1a8p9i10yks8k0szzi0k5q80zhp8xz";
10+ sha256 = "c93fcc3c9421cc2046e57468241c4c08c0c6cffd0e05a85cb0b18de8fe8b026f";
1011 };
1112
1213 # dataclasses is a compatibility shim for python 3.6 ONLY
pkgs/development/python-modules/slither-analyzer/default.nix+2−2
@@ -4,7 +4,7 @@
44
55buildPythonPackage rec {
66 pname = "slither-analyzer";
7− version = "0.6.12";
7+ version = "0.6.13";
88
99 disabled = pythonOlder "3.6";
1010
@@ -13,7 +13,7 @@ buildPythonPackage rec {
1313
1414 src = fetchPypi {
1515 inherit pname version;
16− sha256 = "9773cf48754341d03bb2e65c07897fc9c00a8727487ab2820ed89eb85f546506";
16+ sha256 = "2b0fe48f07971f4104e2b66d70a7924a550b477405b8feed9c0d4db14bb2c87c";
1717 };
1818
1919 nativeBuildInputs = [ makeWrapper ];
pkgs/development/python-modules/sounddevice/default.nix+2−2
@@ -10,12 +10,12 @@
1010
1111buildPythonPackage rec {
1212 pname = "sounddevice";
13− version = "0.4.0";
13+ version = "0.4.1";
1414 disabled = isPy27;
1515
1616 src = fetchPypi {
1717 inherit pname version;
18− sha256 = "007cfef077c447eebbdbca3d510ca4365c211c2c6c4d2912d6eec43c8cbcbc02";
18+ sha256 = "f21978921186c0c7183af032fab77b735d824f3e926d76adb3fd0912e289ce0b";
1919 };
2020
2121 propagatedBuildInputs = [ cffi numpy portaudio ];
pkgs/development/python-modules/sphinxcontrib-openapi/default.nix+2
@@ -1,6 +1,7 @@
11{ stdenv
22, buildPythonPackage
33, fetchPypi
4+, isPy27
45, setuptools_scm
56, m2r
67, pyyaml
@@ -11,6 +12,7 @@
1112buildPythonPackage rec {
1213 pname = "sphinxcontrib-openapi";
1314 version = "0.7.0";
15+ disabled = isPy27;
1416
1517 src = fetchPypi {
1618 inherit pname version;
pkgs/development/python-modules/sphinxcontrib-spelling/default.nix+5−1
@@ -1,6 +1,9 @@
11{ stdenv
2+, lib
23, buildPythonPackage
34, fetchPypi
5+, pythonOlder
6+, importlib-metadata
47, sphinx
58, pyenchant
69, pbr
@@ -15,7 +18,8 @@ buildPythonPackage rec {
1518 sha256 = "c8250ff02e6033c3aeabc41e91dc185168fecefb0c5722aaa3e2055a829e1e4c";
1619 };
1720
18− propagatedBuildInputs = [ sphinx pyenchant pbr ];
21+ propagatedBuildInputs = [ sphinx pyenchant pbr ]
22+ ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ];
1923
2024 # No tests included
2125 doCheck = false;
pkgs/development/python-modules/sphinxcontrib_plantuml/default.nix+2−2
@@ -7,11 +7,11 @@
77
88buildPythonPackage rec {
99 pname = "sphinxcontrib-plantuml";
10− version = "0.18";
10+ version = "0.18.1";
1111
1212 src = fetchPypi {
1313 inherit pname version;
14− sha256 = "08555dndvp12g261wag3qklybdbfnjcmagh4gpl79k2kz5bqrk5c";
14+ sha256 = "c69662d39e4ae214943d8c141dbfb1cf0a5f125d3b45d2c90849c5f37d0c5fb7";
1515 };
1616
1717 # No tests included.
pkgs/development/python-modules/sqlalchemy/default.nix+2−2
@@ -6,11 +6,11 @@
66
77buildPythonPackage rec {
88 pname = "SQLAlchemy";
9− version = "1.3.19";
9+ version = "1.3.20";
1010
1111 src = fetchPypi {
1212 inherit pname version;
13− sha256 = "3bba2e9fbedb0511769780fe1d63007081008c5c2d7d715e91858c94dbaa260e";
13+ sha256 = "d2f25c7f410338d31666d7ddedfa67570900e248b940d186b48461bd4e5569a1";
1414 };
1515
1616 checkInputs = [
pkgs/development/python-modules/sqlmap/default.nix+2−2
@@ -7,11 +7,11 @@
77
88buildPythonPackage rec {
99 pname = "sqlmap";
10− version = "1.4.9";
10+ version = "1.4.11";
1111
1212 src = fetchPypi {
1313 inherit pname version;
14− sha256 = "8f1f84799184a2d3b0433ece09fa0e2ff90a8286c562957667fe0f40dad28287";
14+ sha256 = "5c91d13f090c8e891201c7b924cc2b2feccf12042b42075a5623b4986b9c9ee7";
1515 };
1616
1717 postPatch = ''
pkgs/development/python-modules/srptools/default.nix+2−2
@@ -2,11 +2,11 @@
22
33buildPythonPackage rec {
44 pname = "srptools";
5− version = "1.0.0";
5+ version = "1.0.1";
66
77 src = fetchPypi {
88 inherit pname version;
9− sha256 = "5754f639ed1888f47c1185d74e8907ff9af4c0ccc1c8be2ef19339d0a1327f4d";
9+ sha256 = "7fa4337256a1542e8f5bb4bed19e1d9aea98fe5ff9baf76693342a1dd6ac7c96";
1010 };
1111
1212 propagatedBuildInputs = [ six ];
pkgs/development/python-modules/sshtunnel/default.nix+2−2
@@ -5,12 +5,12 @@
55}:
66
77buildPythonPackage rec {
8− version = "0.2.1";
8+ version = "0.2.2";
99 pname = "sshtunnel";
1010
1111 src = fetchPypi {
1212 inherit pname version;
13− sha256 = "ce28bf9abe6c6b00c5d10343a68c1325f8409ebfb9bf1c1d863a31afa3983cd7";
13+ sha256 = "1801b144b42b9bdb2f931923e85837f9193b877f3d490cd5776e1d4062c62fb4";
1414 };
1515
1616 propagatedBuildInputs = [ paramiko ];
pkgs/development/python-modules/statsmodels/default.nix+2−2
@@ -13,12 +13,12 @@
1313
1414buildPythonPackage rec {
1515 pname = "statsmodels";
16− version = "0.12.0";
16+ version = "0.12.1";
1717 disabled = isPy27;
1818
1919 src = fetchPypi {
2020 inherit pname version;
21− sha256 = "5c7d6707ad3112b67f564abaf1845d3c02ecc7174c2d990d539f45c37e98ad35";
21+ sha256 = "a271b4ccec190148dccda25f0cbdcbf871f408fc1394a10a7dc1af4a62b91c8e";
2222 };
2323
2424 nativeBuildInputs = [ cython ];
pkgs/development/python-modules/tasklib/default.nix+2−2
@@ -8,11 +8,11 @@ wsl_stub = writeShellScriptBin "wsl" "true";
88
99in buildPythonPackage rec {
1010 pname = "tasklib";
11− version = "2.2.0";
11+ version = "2.2.1";
1212
1313 src = fetchPypi {
1414 inherit pname version;
15− sha256 = "da66e84614b09443aa67c4dc2922213417329c39511dc5b384d8a5671e29115e";
15+ sha256 = "21525a34469928876b64edf8abf79cf788bb3fa796d4554ba22a68bc1f0693f5";
1616 };
1717
1818 propagatedBuildInputs = [
pkgs/development/python-modules/tempora/default.nix+2−2
@@ -6,11 +6,11 @@
66
77buildPythonPackage rec {
88 pname = "tempora";
9− version = "4.0.0";
9+ version = "4.0.1";
1010
1111 src = fetchPypi {
1212 inherit pname version;
13− sha256 = "599a3a910b377f2b544c7b221582ecf4cb049b017c994b37f2b1a9ed1099716e";
13+ sha256 = "9af06854fafb26d3d40d3dd6402e8baefaf57f90e48fdc9a94f6b22827a60fb3";
1414 };
1515
1616 disabled = pythonOlder "3.2";
pkgs/development/python-modules/testfixtures/default.nix+2−2
@@ -3,11 +3,11 @@
33
44buildPythonPackage rec {
55 pname = "testfixtures";
6− version = "6.14.1";
6+ version = "6.14.2";
77
88 src = fetchPypi {
99 inherit pname version;
10− sha256 = "0rh38zj8wywgqlsi5j75c7drpqhkrg50qknj1kdmvg4kdlab7ljq";
10+ sha256 = "14d9907390f5f9c7189b3d511b64f34f1072d07cc13b604a57e1bb79029376e3";
1111 };
1212
1313 checkInputs = [ pytest mock sybil zope_component twisted ];
pkgs/development/python-modules/textacy/default.nix+2−2
@@ -17,12 +17,12 @@
1717
1818buildPythonPackage rec {
1919 pname = "textacy";
20− version = "0.10.0";
20+ version = "0.10.1";
2121 disabled = isPy27;
2222
2323 src = fetchPypi {
2424 inherit pname version;
25− sha256 = "0a824333f53d19d24ca864c92da52f3fecd412f4ef3e1448864c45f06189fd6d";
25+ sha256 = "ff72adc6dbb85db6981324e226fff77830da57d7fe7e4adb2cafd9dc2a8bfa7d";
2626 };
2727
2828 propagatedBuildInputs = [
pkgs/development/python-modules/toml/default.nix+2−2
@@ -2,11 +2,11 @@
22
33buildPythonPackage rec {
44 pname = "toml";
5− version = "0.10.1";
5+ version = "0.10.2";
66
77 src = fetchPypi {
88 inherit pname version;
9− sha256 = "926b612be1e5ce0634a2ca03470f95169cf16f939018233a670519cb4ac58b0f";
9+ sha256 = "b3bda1d108d5dd99f4a20d24d9c348e91c4db7ab1b749200bded2f839ccbe68f";
1010 };
1111
1212 # This package has a test script (built for Travis) that involves a)
pkgs/development/python-modules/transitions/default.nix+2−2
@@ -3,11 +3,11 @@
33
44buildPythonPackage rec {
55 pname = "transitions";
6− version = "0.8.2";
6+ version = "0.8.4";
77
88 src = fetchPypi {
99 inherit pname version;
10− sha256 = "0j3pswbckrhd6plblb0bwzsbvk50nqmxq6dvjclvcr5cljzs7xvg";
10+ sha256 = "9a2841b24789dfd345267cb92e26b79da75fd03f6021d1a5222c71b5c9ae3c16";
1111 };
1212
1313 postPatch = ''
pkgs/development/python-modules/tubeup/default.nix+2−2
@@ -9,13 +9,13 @@
99
1010buildPythonPackage rec {
1111 pname = "tubeup";
12− version = "0.0.19";
12+ version = "0.0.20";
1313
1414 disabled = isPy27;
1515
1616 src = fetchPypi {
1717 inherit pname version;
18− sha256 = "6e3ebbf677a43018bfd71070919187bd57120010b0d708c0494c0f17bb72e84e";
18+ sha256 = "8bf4004629b8427173c8259e1a09065db99135d6cc390b70a8a67b52a34a3f67";
1919 };
2020
2121 postPatch = ''
pkgs/development/python-modules/txdbus/default.nix+2−2
@@ -2,11 +2,11 @@
22
33buildPythonPackage rec {
44 pname = "txdbus";
5− version = "1.1.1";
5+ version = "1.1.2";
66
77 src = fetchPypi {
88 inherit pname version;
9− sha256 = "eefcffa4efbf82ba11222f17f5989fe1b2b6ef57226ef896c4a7084c990ba217";
9+ sha256 = "8375a5fb68a12054f0def91af800c821fb2232949337756ed975f88d8ea2bc97";
1010 };
1111
1212 propagatedBuildInputs = [ six twisted ];
pkgs/development/python-modules/u-msgpack-python/default.nix+2−2
@@ -7,11 +7,11 @@
77
88buildPythonPackage rec {
99 pname = "u-msgpack-python";
10− version = "2.7.0";
10+ version = "2.7.1";
1111
1212 src = fetchPypi {
1313 inherit pname version;
14− sha256 = "996e4c4454771f0ff0fd2a7566b1a159d305d3611cd755addf444e3533e2bc54";
14+ sha256 = "b7e7d433cab77171a4c752875d91836f3040306bab5063fb6dbe11f64ea69551";
1515 };
1616
1717 LC_ALL="en_US.UTF-8";
pkgs/development/python-modules/update_checker/default.nix+3−1
@@ -1,8 +1,10 @@
1−{ stdenv, buildPythonPackage, fetchPypi, requests}:
1+{ stdenv, buildPythonPackage, fetchPypi, requests, isPy27
2+}:
23
34buildPythonPackage rec {
45 pname = "update_checker";
56 version = "0.18.0";
7+ disabled = isPy27;
68
79 src = fetchPypi {
810 inherit pname version;
pkgs/development/python-modules/urllib3/default.nix+2−2
@@ -4,11 +4,11 @@
44
55buildPythonPackage rec {
66 pname = "urllib3";
7− version = "1.25.10";
7+ version = "1.25.11";
88
99 src = fetchPypi {
1010 inherit pname version;
11− sha256 = "91056c15fa70756691db97756772bb1eb9678fa585d9184f24534b100dc60f4a";
11+ sha256 = "8d7eaa5a82a1cac232164990f04874c594c9453ec55eef02eab885aa02fc17a2";
1212 };
1313
1414 NOSE_EXCLUDE = stdenv.lib.concatStringsSep "," [
pkgs/development/python-modules/urwid/default.nix+2−2
@@ -2,12 +2,12 @@
22
33buildPythonPackage rec {
44 pname = "urwid";
5− version = "2.1.1";
5+ version = "2.1.2";
66 disabled = isPy27;
77
88 src = fetchPypi {
99 inherit pname version;
10− sha256 = "09nmi2nmvpcmbh3w3fb0dn0c7yp7r20i5pfcr6q722xh6mp8cw3q";
10+ sha256 = "588bee9c1cb208d0906a9f73c613d2bd32c3ed3702012f51efe318a3f2127eae";
1111 };
1212
1313 # tests need to be able to set locale
pkgs/development/python-modules/vcrpy/default.nix+2−2
@@ -15,11 +15,11 @@
1515
1616buildPythonPackage rec {
1717 pname = "vcrpy";
18− version = "4.1.0";
18+ version = "4.1.1";
1919
2020 src = fetchPypi {
2121 inherit pname version;
22− sha256 = "4138e79eb35981ad391406cbb7227bce7eba8bad788dcf1a89c2e4a8b740debe";
22+ sha256 = "57095bf22fc0a2d99ee9674cdafebed0f3ba763018582450706f7d3a74fff599";
2323 };
2424
2525 checkInputs = [
pkgs/development/python-modules/virtualenv/default.nix+2−2
@@ -17,11 +17,11 @@
1717
1818buildPythonPackage rec {
1919 pname = "virtualenv";
20− version = "20.0.31";
20+ version = "20.0.35";
2121
2222 src = fetchPypi {
2323 inherit pname version;
24− sha256 = "43add625c53c596d38f971a465553f6318decc39d98512bc100fa1b1e839c8dc";
24+ sha256 = "2a72c80fa2ad8f4e2985c06e6fc12c3d60d060e410572f553c90619b0f6efaf3";
2525 };
2626
2727 nativeBuildInputs = [
pkgs/development/python-modules/xdis/default.nix+2−2
@@ -6,14 +6,14 @@
66
77buildPythonPackage rec {
88 pname = "xdis";
9− version = "5.0.4";
9+ version = "5.0.5";
1010 disabled = isPy27;
1111
1212 src = fetchFromGitHub {
1313 owner = "rocky";
1414 repo = "python-xdis";
1515 rev = version;
16− sha256 = "0hh5pam8dabvh0w1bks0rqfq85gjy3h6ljrzmjg0nqsaapp1g4dd";
16+ sha256 = "01248nh8y5szin6ymd3hrl8qnsg4xijsk3lxyks8zk9cjh008lmq";
1717 };
1818
1919 checkInputs = [ pytest ];
pkgs/development/python-modules/xhtml2pdf/default.nix+2−2
@@ -10,13 +10,13 @@
1010
1111buildPythonPackage rec {
1212 pname = "xhtml2pdf";
13− version = "0.2.4";
13+ version = "0.2.5";
1414
1515 propagatedBuildInputs = [pillow html5lib pypdf2 reportlab six];
1616
1717 src = fetchPypi {
1818 inherit pname version;
19− sha256 = "6793fbbdcb6bb8a4a70132966d8d95e95ea3498cdf0e82252d2b8e9aae34fcb5";
19+ sha256 = "6797e974fac66f0efbe927c1539a2756ca4fe8777eaa5882bac132fc76b39421";
2020 };
2121
2222 meta = with stdenv.lib; {
pkgs/development/python-modules/zeroconf/default.nix+2−2
@@ -10,12 +10,12 @@
1010
1111buildPythonPackage rec {
1212 pname = "zeroconf";
13− version = "0.28.5";
13+ version = "0.28.6";
1414 disabled = isPy27;
1515
1616 src = fetchPypi {
1717 inherit pname version;
18− sha256 = "c08dbb90c116626cb6c5f19ebd14cd4846cffe7151f338c19215e6938d334980";
18+ sha256 = "70f10f0f16e3a8c4eb5e1a106b812b8d052253041cf1ee1195933df706f5261c";
1919 };
2020
2121 propagatedBuildInputs = [ ifaddr ]
pkgs/development/python-modules/zfec/default.nix+2−2
@@ -7,11 +7,11 @@
77
88buildPythonPackage rec {
99 pname = "zfec";
10− version = "1.5.3";
10+ version = "1.5.4";
1111
1212 src = fetchPypi {
1313 inherit pname version;
14− sha256 = "b41bd4b0af9c6b3a78bd6734e1e4511475944164375e6241b53df518a366922b";
14+ sha256 = "222a2d84898db792b28f993cb663e940668bfbd844992a82351fd40dc1680883";
1515 };
1616
1717 buildInputs = [ setuptoolsDarcs ];
pkgs/development/python-modules/zha-quirks/default.nix+2−2
@@ -4,14 +4,14 @@
44
55buildPythonPackage rec {
66 pname = "zha-quirks";
7− version = "0.0.43";
7+ version = "0.0.45";
88
99 nativeBuildInputs = [ pytest ];
1010 buildInputs = [ aiohttp zigpy ];
1111
1212 src = fetchPypi {
1313 inherit pname version;
14− sha256 = "16f62dddce73bb27408b13a0d6526a250b588ca020405b2369e72d5dc9fa7607";
14+ sha256 = "9f0640d2844939118c631d88df18d78adfa17d01cac3e04d7156e5f99e41bc7d";
1515 };
1616
1717 meta = with stdenv.lib; {
pkgs/development/python-modules/zope_copy/default.nix+2
@@ -1,6 +1,7 @@
11{ lib
22, buildPythonPackage
33, fetchPypi
4+, isPy27
45, zope_interface
56, zope_location
67, zope_schema
@@ -18,6 +19,7 @@ buildPythonPackage rec {
1819
1920 propagatedBuildInputs = [ zope_interface ];
2021
22+ doCheck = !isPy27; # namespace conflicts
2123 checkInputs = [ zope_location zope_schema ];
2224
2325 checkPhase = ''
pkgs/development/python-modules/zope_interface/default.nix+2−2
@@ -6,11 +6,11 @@
66
77buildPythonPackage rec {
88 pname = "zope.interface";
9− version = "5.1.0";
9+ version = "5.1.2";
1010
1111 src = fetchPypi {
1212 inherit pname version;
13− sha256 = "03nrl6b8cb600dnnh46y149awvrm0gxyqgwq5hdw3lvys8mw9r20";
13+ sha256 = "c9c8e53a5472b77f6a391b515c771105011f4b40740ce53af8428d1c8ca20004";
1414 };
1515
1616 propagatedBuildInputs = [ zope_event ];
pkgs/development/python-modules/zopfli/default.nix+2−2
@@ -2,11 +2,11 @@
22
33buildPythonPackage rec {
44 pname = "zopfli";
5− version = "0.1.6";
5+ version = "0.1.7";
66
77 src = fetchPypi {
88 inherit pname version;
9− sha256 = "0smaxh7iihjr9mwxw1ifc9vnlh3ra8l060dd1gbvp1963k0r68pd";
9+ sha256 = "512892714f0e3dcc9a77222cb509ed519f41ce2b92467e47a4b406a23b48561a";
1010 extension = "zip";
1111 };
1212
pkgs/development/tools/build-managers/cmake/default.nix+2−2
@@ -20,12 +20,12 @@ stdenv.mkDerivation rec {
2020 + lib.optionalString useNcurses "-cursesUI"
2121 + lib.optionalString withQt5 "-qt5UI"
2222 + lib.optionalString useQt4 "-qt4UI";
23− version = "3.18.2";
23+ version = "3.18.4";
2424
2525 src = fetchurl {
2626 url = "${meta.homepage}files/v${lib.versions.majorMinor version}/cmake-${version}.tar.gz";
2727 # compare with https://cmake.org/files/v${lib.versions.majorMinor version}/cmake-${version}-SHA-256.txt
28− sha256 = "0zhxsnxm5d8wdarz2gs3r41r1dfrnh35ki75fa684gaxfzy40kjx";
28+ sha256 = "0xsg5lw3i4bw610q987cwz3iz06x3lrbbaa2mnzyr4kaiqsn2z2r";
2929 };
3030
3131 patches = [
pkgs/development/tools/build-managers/meson/default.nix+2−2
@@ -9,11 +9,11 @@
99
1010python3.pkgs.buildPythonApplication rec {
1111 pname = "meson";
12− version = "0.55.3";
12+ version = "0.56.0";
1313
1414 src = python3.pkgs.fetchPypi {
1515 inherit pname version;
16− sha256 = "19cjy24mfaswxyvqmns6rd7hx05ybqb663zlgklspfr8l4jjmvbb";
16+ sha256 = "04vj250bwrzq7c0z1r96b0z0vgirvn0m367wm3ygqmfdy67x6799";
1717 };
1818
1919 patches = [
pkgs/development/tools/documentation/doxygen/default.nix+13−15
@@ -1,15 +1,14 @@
1−{ stdenv, cmake, fetchurl, python3, flex, bison, qt4, CoreServices, libiconv }:
1+{ stdenv, cmake, fetchFromGitHub, python3, flex, bison, qt5, CoreServices, libiconv }:
22
33stdenv.mkDerivation rec {
4−
5− name = "doxygen-1.8.19";
6−
7− src = fetchurl {
8− urls = [
9− "mirror://sourceforge/doxygen/${name}.src.tar.gz" # faster, with https, etc.
10− "http://doxygen.nl/files/${name}.src.tar.gz"
11− ];
12− sha256 = "1lvqfw2yzba588c5ggl8yhw7aw4xkk44mrghsd9yqlajc48x25dc";
4+ pname = "doxygen";
5+ version = "1.8.20";
6+
7+ src = fetchFromGitHub {
8+ owner = "doxygen";
9+ repo = "doxygen";
10+ rev = "Release_${stdenv.lib.replaceStrings [ "." ] [ "_" ] version}";
11+ sha256 = "17chvi3i80rj4750smpizf562xjzd2xcv5rfyh997pyvc1zbq5rh";
1312 };
1413
1514 nativeBuildInputs = [
@@ -20,19 +19,18 @@ stdenv.mkDerivation rec {
2019 ];
2120
2221 buildInputs =
23− stdenv.lib.optional (qt4 != null) qt4
22+ stdenv.lib.optionals (qt5 != null) (with qt5; [ qtbase wrapQtAppsHook ])
2423 ++ stdenv.lib.optional stdenv.isSunOS libiconv
2524 ++ stdenv.lib.optionals stdenv.isDarwin [ CoreServices libiconv ];
2625
2726 cmakeFlags =
2827 [ "-DICONV_INCLUDE_DIR=${libiconv}/include" ] ++
29− stdenv.lib.optional (qt4 != null) "-Dbuild_wizard=YES";
28+ stdenv.lib.optional (qt5 != null) "-Dbuild_wizard=YES";
3029
3130 NIX_CFLAGS_COMPILE =
3231 stdenv.lib.optionalString stdenv.isDarwin "-mmacosx-version-min=10.9";
3332
34− enableParallelBuilding = true;
35− doCheck = false; # fails
33+ enableParallelBuilding = false;
3634
3735 meta = {
3836 license = stdenv.lib.licenses.gpl2Plus;
@@ -47,6 +45,6 @@ stdenv.mkDerivation rec {
4745 manual (in LaTeX) from a set of documented source files.
4846 '';
4947
50− platforms = if qt4 != null then stdenv.lib.platforms.linux else stdenv.lib.platforms.unix;
48+ platforms = if qt5 != null then stdenv.lib.platforms.linux else stdenv.lib.platforms.unix;
5149 };
5250}
pkgs/development/tools/misc/binutils/default.nix+45−20
@@ -8,6 +8,7 @@
88, bison ? null
99, flex
1010, texinfo
11+, perl
1112}:
1213
1314# Note: this package is used for bootstrapping fetchurl, and thus
@@ -21,7 +22,10 @@ let
2122 # Remove gold-symbol-visibility patch when updating, the proper fix
2223 # is now upstream.
2324 # https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;a=commitdiff;h=330b90b5ffbbc20c5de6ae6c7f60c40fab2e7a4f;hp=99181ccac0fc7d82e7dabb05dc7466e91f1645d3
24− version = "2.31.1";
25+ version = "${minorVersion}${patchVersion}";
26+ minorVersion = if stdenv.targetPlatform.isOr1k then "2.34" else "2.31";
27+ patchVersion = if stdenv.targetPlatform.isOr1k then "" else ".1";
28+
2529 basename = "binutils";
2630 # The targetPrefix prepended to binary names to allow multiple binuntils on the
2731 # PATH to both be usable.
@@ -33,33 +37,49 @@ let
3337 rev = "708acc851880dbeda1dd18aca4fd0a95b2573b36";
3438 sha256 = "1kdrz6fki55lm15rwwamn74fnqpy0zlafsida2zymk76n3656c63";
3539 };
36− # HACK to ensure that we preserve source from bootstrap binutils to not rebuild LLVM
37− normal-src = stdenv.__bootPackages.binutils-unwrapped.src or (fetchurl {
40+
41+ # binutils sources not part of the bootstrap.
42+ non-boot-src = (fetchurl {
3843 url = "mirror://gnu/binutils/${basename}-${version}.tar.bz2";
39− sha256 = "1l34hn1zkmhr1wcrgf0d4z7r3najxnw3cx2y2fk7v55zjlk3ik7z";
44+ sha256 = {
45+ "2.31.1" = "1l34hn1zkmhr1wcrgf0d4z7r3najxnw3cx2y2fk7v55zjlk3ik7z";
46+ "2.34" = "1rin1f5c7wm4n3piky6xilcrpf2s0n3dd5vqq8irrxkcic3i1w49";
47+ }.${version};
4048 });
49+
50+ # HACK to ensure that we preserve source from bootstrap binutils to not rebuild LLVM
51+ normal-src = stdenv.__bootPackages.binutils-unwrapped.src or non-boot-src;
52+
53+ # Platforms where we directly use the final source.
54+ # Generally for cross-compiled platforms, where the boot source won't compile.
55+ skipBootSrc = stdenv.targetPlatform.isOr1k;
56+
57+ # Select the specific source according to the platform in use.
58+ src = if stdenv.targetPlatform.isVc4 then vc4-binutils-src
59+ else if skipBootSrc then non-boot-src
60+ else normal-src;
61+
62+ patchesDir = ./patches + "/${minorVersion}";
4163in
4264
4365stdenv.mkDerivation {
4466 pname = targetPrefix + basename;
45− inherit version;
46−
47− src = if stdenv.targetPlatform.isVc4 then vc4-binutils-src else normal-src;
67+ inherit src version;
4868
4969 patches = [
5070 # Make binutils output deterministic by default.
51− ./deterministic.patch
71+ "${patchesDir}/deterministic.patch"
5272
5373 # Bfd looks in BINDIR/../lib for some plugins that don't
5474 # exist. This is pointless (since users can't install plugins
5575 # there) and causes a cycle between the lib and bin outputs, so
5676 # get rid of it.
57− ./no-plugins.patch
77+ "${patchesDir}/no-plugins.patch"
5878
5979 # Help bfd choose between elf32-littlearm, elf32-littlearm-symbian, and
6080 # elf32-littlearm-vxworks in favor of the first.
6181 # https://github.com/NixOS/nixpkgs/pull/30484#issuecomment-345472766
62− ./disambiguate-arm-targets.patch
82+ "${patchesDir}/disambiguate-arm-targets.patch"
6383
6484 # For some reason bfd ld doesn't search DT_RPATH when cross-compiling. It's
6585 # not clear why this behavior was decided upon but it has the unfortunate
@@ -67,25 +87,30 @@ stdenv.mkDerivation {
6787 # shared objects when cross-compiling. Consequently, we are forced to
6888 # override this behavior, forcing ld to search DT_RPATH even when
6989 # cross-compiling.
70− ./always-search-rpath.patch
71−
72− ] ++ lib.optionals (!stdenv.targetPlatform.isVc4)
73− [
90+ "${patchesDir}/always-search-rpath.patch"
91+ ]
92+ # For version 2.31 exclusively
93+ ++ lib.optionals (!stdenv.targetPlatform.isVc4 && minorVersion == "2.31") [
7494 # https://sourceware.org/bugzilla/show_bug.cgi?id=22868
75− ./gold-symbol-visibility.patch
95+ ./patches/2.31/gold-symbol-visibility.patch
7696
7797 # https://sourceware.org/bugzilla/show_bug.cgi?id=23428
7898 # un-break features so linking against musl doesn't produce crash-only binaries
79− ./0001-x86-Add-a-GNU_PROPERTY_X86_ISA_1_USED-note-if-needed.patch
80− ./0001-x86-Properly-merge-GNU_PROPERTY_X86_ISA_1_USED.patch
81− ./0001-x86-Properly-add-X86_ISA_1_NEEDED-property.patch
82− ] ++ lib.optional stdenv.targetPlatform.isiOS ./support-ios.patch;
99+ ./patches/2.31/0001-x86-Add-a-GNU_PROPERTY_X86_ISA_1_USED-note-if-needed.patch
100+ ./patches/2.31/0001-x86-Properly-merge-GNU_PROPERTY_X86_ISA_1_USED.patch
101+ ./patches/2.31/0001-x86-Properly-add-X86_ISA_1_NEEDED-property.patch
102+ ]
103+ ++ lib.optional stdenv.targetPlatform.isiOS ./support-ios.patch
104+ ;
83105
84106 outputs = [ "out" "info" "man" ];
85107
86108 depsBuildBuild = [ buildPackages.stdenv.cc ];
87109 nativeBuildInputs = [
88110 bison
111+ ] ++ lib.optionals (lib.versionAtLeast version "2.34") [
112+ perl
113+ texinfo
89114 ] ++ (lib.optionals stdenv.targetPlatform.isiOS [
90115 autoreconfHook
91116 ]) ++ lib.optionals stdenv.targetPlatform.isVc4 [ texinfo flex ];
@@ -149,7 +174,7 @@ stdenv.mkDerivation {
149174 enableParallelBuilding = true;
150175
151176 passthru = {
152− inherit targetPrefix;
177+ inherit targetPrefix patchesDir;
153178 };
154179
155180 meta = with lib; {
pkgs/development/tools/misc/binutils/0001-x86-Add-a-GNU_PROPERTY_X86_ISA_1_USED-note-if-needed.patch → pkgs/development/tools/misc/binutils/patches/2.31/0001-x86-Add-a-GNU_PROPERTY_X86_ISA_1_USED-note-if-needed.patchrenamed
The content is the same.
pkgs/development/tools/misc/binutils/0001-x86-Properly-add-X86_ISA_1_NEEDED-property.patch → pkgs/development/tools/misc/binutils/patches/2.31/0001-x86-Properly-add-X86_ISA_1_NEEDED-property.patchrenamed
The content is the same.
pkgs/development/tools/misc/binutils/0001-x86-Properly-merge-GNU_PROPERTY_X86_ISA_1_USED.patch → pkgs/development/tools/misc/binutils/patches/2.31/0001-x86-Properly-merge-GNU_PROPERTY_X86_ISA_1_USED.patchrenamed
The content is the same.
pkgs/development/tools/misc/binutils/always-search-rpath.patch → pkgs/development/tools/misc/binutils/patches/2.31/always-search-rpath.patchrenamed
The content is the same.
pkgs/development/tools/misc/binutils/build-components-separately.patch → pkgs/development/tools/misc/binutils/patches/2.31/build-components-separately.patchrenamed
The content is the same.
pkgs/development/tools/misc/binutils/deterministic.patch → pkgs/development/tools/misc/binutils/patches/2.31/deterministic.patchrenamed
The content is the same.
pkgs/development/tools/misc/binutils/disambiguate-arm-targets.patch → pkgs/development/tools/misc/binutils/patches/2.31/disambiguate-arm-targets.patchrenamed
The content is the same.
pkgs/development/tools/misc/binutils/gold-symbol-visibility.patch → pkgs/development/tools/misc/binutils/patches/2.31/gold-symbol-visibility.patchrenamed
The content is the same.
pkgs/development/tools/misc/binutils/no-plugins.patch → pkgs/development/tools/misc/binutils/patches/2.31/no-plugins.patchrenamed
The content is the same.
pkgs/development/tools/misc/binutils/patches/2.34/always-search-rpath.patchnew file+14
@@ -0,0 +1,14 @@
1+diff --git a/ld/genscripts.sh b/ld/genscripts.sh
2+index b6940d376d..0feb1adfd0 100755
3+--- a/ld/genscripts.sh
4++++ b/ld/genscripts.sh
5+@@ -125,6 +125,9 @@ if test "x$NATIVE" = "xyes" ; then
6+ USE_LIBPATH=yes
7+ fi
8+
9++# TODO: why is this needed?
10++USE_LIBPATH=yes
11++
12+ # Set the library search path, for libraries named by -lfoo.
13+ # If LIB_PATH is defined (e.g., by Makefile) and non-empty, it is used.
14+ # Otherwise, the default is set here.
pkgs/development/tools/misc/binutils/patches/2.34/build-components-separately.patchnew file+164
@@ -0,0 +1,164 @@
1+diff --git a/bfd/configure.ac b/bfd/configure.ac
2+index c5bfbd5d..45ad4c26 100644
3+--- a/bfd/configure.ac
4++++ b/bfd/configure.ac
5+@@ -278,31 +278,19 @@ AC_CACHE_CHECK(linker --as-needed support, bfd_cv_ld_as_needed,
6+
7+ LT_LIB_M
8+
9+-# When building a shared libbfd, link against the pic version of libiberty
10+-# so that apps that use libbfd won't need libiberty just to satisfy any
11+-# libbfd references.
12+-# We can't do that if a pic libiberty is unavailable since including non-pic
13+-# code would insert text relocations into libbfd.
14+ SHARED_LIBADD=
15+-SHARED_LDFLAGS=
16++SHARED_LDFLAGS=-liberty
17+ if test "$enable_shared" = "yes"; then
18+-changequote(,)dnl
19+- x=`sed -n -e 's/^[ ]*PICFLAG[ ]*=[ ]*//p' < ../libiberty/Makefile | sed -n '$p'`
20+-changequote([,])dnl
21+- if test -n "$x"; then
22+- SHARED_LIBADD="-L`pwd`/../libiberty/pic -liberty"
23+- fi
24+-
25+ case "${host}" in
26+ # More hacks to build DLLs on Windows.
27+ *-*-cygwin*)
28+ SHARED_LDFLAGS="-no-undefined"
29+- SHARED_LIBADD="-L`pwd`/../libiberty -liberty -L`pwd`/../intl -lintl -lcygwin -lkernel32"
30++ SHARED_LIBADD="-liberty -lintl -lcygwin -lkernel32"
31+ ;;
32+
33+ # Use built-in libintl on macOS, since it is not provided by libc.
34+ *-*-darwin*)
35+- SHARED_LIBADD="-L`pwd`/../libiberty/pic -L`pwd`/../intl -liberty -lintl"
36++ SHARED_LIBADD="-liberty -lintl"
37+ ;;
38+ esac
39+
40+diff --git a/opcodes/Makefile.am b/opcodes/Makefile.am
41+index 4f06074a..6836c589 100644
42+--- a/opcodes/Makefile.am
43++++ b/opcodes/Makefile.am
44+@@ -51,7 +51,7 @@ libopcodes_la_LDFLAGS += -rpath $(rpath_bfdlibdir)
45+ endif
46+
47+ # This is where bfd.h lives.
48+-BFD_H = ../bfd/bfd.h
49++BFD_H = $(BFDDIR)/bfd.h
50+
51+ BUILD_LIBS = @BUILD_LIBS@
52+ BUILD_LIB_DEPS = @BUILD_LIB_DEPS@
53+@@ -301,7 +301,7 @@ OFILES = @BFD_MACHINES@
54+ # development.sh is used to determine -Werror default.
55+ CONFIG_STATUS_DEPENDENCIES = $(BFDDIR)/development.sh
56+
57+-AM_CPPFLAGS = -I. -I$(srcdir) -I../bfd -I$(INCDIR) -I$(BFDDIR) @HDEFINES@ @INCINTL@
58++AM_CPPFLAGS = -I. -I$(srcdir) -I$(INCDIR) -I$(BFDDIR) @HDEFINES@ @INCINTL@
59+
60+ disassemble.lo: disassemble.c
61+ if am__fastdepCC
62+@@ -322,12 +322,21 @@ libopcodes_la_SOURCES = dis-buf.c disassemble.c dis-init.c
63+ # old version of libbfd, or to pick up libbfd for the wrong architecture
64+ # if host != build. So for building with shared libraries we use a
65+ # hardcoded path to libbfd.so instead of relying on the entries in libbfd.la.
66+-libopcodes_la_DEPENDENCIES = $(OFILES) @SHARED_DEPENDENCIES@
67++libopcodes_la_DEPENDENCIES = $(OFILES) @SHARED_DEPENDENCIES@ libtool-soversion
68+ libopcodes_la_LIBADD = $(OFILES) @SHARED_LIBADD@
69+-libopcodes_la_LDFLAGS += -release `cat ../bfd/libtool-soversion` @SHARED_LDFLAGS@
70++libopcodes_la_LDFLAGS += -release `cat libtool-soversion` @SHARED_LDFLAGS@
71+ # Allow dependency tracking to work on all the source files.
72+ EXTRA_libopcodes_la_SOURCES = $(LIBOPCODES_CFILES)
73+
74++libtool-soversion:
75++ @echo "creating $@"
76++ bfd_soversion="$(VERSION)" ;\
77++ . $(BFDDIR)/development.sh ;\
78++ if test "$$development" = true ; then \
79++ bfd_soversion="$(VERSION).$${bfd_version_date}" ;\
80++ fi ;\
81++ echo "$${bfd_soversion}" > $@
82++
83+ # libtool will build .libs/libopcodes.a. We create libopcodes.a in
84+ # the build directory so that we don't have to convert all the
85+ # programs that use libopcodes.a simultaneously. This is a hack which
86+diff --git a/opcodes/configure.ac b/opcodes/configure.ac
87+index 00be9c88..6e589ae4 100644
88+--- a/opcodes/configure.ac
89++++ b/opcodes/configure.ac
90+@@ -86,6 +86,7 @@ AC_PROG_INSTALL
91+
92+ AC_CHECK_HEADERS(string.h strings.h stdlib.h limits.h)
93+ ACX_HEADER_STRING
94++GCC_HEADER_STDINT(bfd_stdint.h)
95+
96+ AC_CHECK_DECLS([basename, stpcpy])
97+
98+@@ -137,61 +138,27 @@ AC_CACHE_CHECK(linker --as-needed support, bfd_cv_ld_as_needed,
99+
100+ LT_LIB_M
101+
102+-#Libs for generator progs
103+-if test "x$cross_compiling" = "xno"; then
104+- BUILD_LIBS=../libiberty/libiberty.a
105+- BUILD_LIB_DEPS=$BUILD_LIBS
106+-else
107+- # if cross-compiling, assume that the system provides -liberty
108+- # and that the version is compatible with new headers.
109+- BUILD_LIBS=-liberty
110+- BUILD_LIB_DEPS=
111+-fi
112+-BUILD_LIBS="$BUILD_LIBS $LIBINTL"
113+-BUILD_LIB_DEPS="$BUILD_LIB_DEPS $LIBINTL_DEP"
114++BUILD_LIBS="-liberty $LIBINTL"
115++BUILD_LIB_DEPS="$LIBINTL_DEP"
116+
117+ AC_SUBST(BUILD_LIBS)
118+ AC_SUBST(BUILD_LIB_DEPS)
119+
120+ # Horrible hacks to build DLLs on Windows and a shared library elsewhere.
121+ SHARED_LDFLAGS=
122+-SHARED_LIBADD=
123++SHARED_LIBADD=-liberty
124+ SHARED_DEPENDENCIES=
125+ if test "$enable_shared" = "yes"; then
126+-# When building a shared libopcodes, link against the pic version of libiberty
127+-# so that apps that use libopcodes won't need libiberty just to satisfy any
128+-# libopcodes references.
129+-# We can't do that if a pic libiberty is unavailable since including non-pic
130+-# code would insert text relocations into libopcodes.
131+ # Note that linking against libbfd as we do here, which is itself linked
132+ # against libiberty, may not satisfy all the libopcodes libiberty references
133+ # since libbfd may not pull in the entirety of libiberty.
134+-changequote(,)dnl
135+- x=`sed -n -e 's/^[ ]*PICFLAG[ ]*=[ ]*//p' < ../libiberty/Makefile | sed -n '$p'`
136+-changequote([,])dnl
137+- if test -n "$x"; then
138+- SHARED_LIBADD="-L`pwd`/../libiberty/pic -liberty"
139+- fi
140+-
141+ case "${host}" in
142+ *-*-cygwin*)
143+ SHARED_LDFLAGS="-no-undefined"
144+- SHARED_LIBADD="-L`pwd`/../bfd -lbfd -L`pwd`/../libiberty -liberty -L`pwd`/../intl -lintl -lcygwin"
145++ SHARED_LIBADD="-lbfd -liberty -lintl -lcygwin"
146+ ;;
147+- *-*-darwin*)
148+- SHARED_LIBADD="-Wl,`pwd`/../bfd/.libs/libbfd.dylib ${SHARED_LIBADD}"
149+- SHARED_DEPENDENCIES="../bfd/libbfd.la"
150+- ;;
151+ *)
152+- case "$host_vendor" in
153+- hp)
154+- SHARED_LIBADD="-Wl,`pwd`/../bfd/.libs/libbfd.sl ${SHARED_LIBADD}"
155+- ;;
156+- *)
157+- SHARED_LIBADD="-Wl,`pwd`/../bfd/.libs/libbfd.so ${SHARED_LIBADD}"
158+- ;;
159+- esac
160+- SHARED_DEPENDENCIES="../bfd/libbfd.la"
161++ SHARED_LIBADD="-lbfd ${SHARED_LIBADD}"
162+ ;;
163+ esac
164+
pkgs/development/tools/misc/binutils/patches/2.34/deterministic.patchnew file+12
@@ -0,0 +1,12 @@
1+diff -ur orig/binutils-2.23.1/ld/ldlang.c binutils-2.23.1/ld/ldlang.c
2+--- orig/ld/ldlang.c
3++++ new/ld/ldlang.c
4+@@ -3095,6 +3095,8 @@
5+ ldfile_output_machine))
6+ einfo (_("%P%F:%s: can not set architecture: %E\n"), name);
7+
8++ link_info.output_bfd->flags |= BFD_DETERMINISTIC_OUTPUT;
9++
10+ link_info.hash = bfd_link_hash_table_create (link_info.output_bfd);
11+ if (link_info.hash == NULL)
12+ einfo (_("%P%F: can not create hash table: %E\n"));
pkgs/development/tools/misc/binutils/patches/2.34/disambiguate-arm-targets.patchnew file+23
@@ -0,0 +1,23 @@
1+diff --git a/bfd/elf32-arm.c b/bfd/elf32-arm.c
2+index 9f956d3..f5b61f1 100644
3+--- a/bfd/elf32-arm.c
4++++ b/bfd/elf32-arm.c
5+@@ -19585,7 +19585,10 @@ elf32_arm_vxworks_final_write_processing (bfd *abfd, bfd_boolean linker)
6+ #undef ELF_MAXPAGESIZE
7+ #define ELF_MAXPAGESIZE 0x1000
8+
9++/* Prioritize elf32-*arm (priority 1) over elf32-*arm-vxworks (priority 2) */
10++#define elf_match_priority 2
11+ #include "elf32-target.h"
12++#undef elf_match_priority
13+
14+
15+ /* Merge backend specific data from an object file to the output
16+@@ -19974,4 +19977,7 @@ elf32_arm_symbian_plt_sym_val (bfd_vma i, const asection *plt,
17+ #undef ELF_MAXPAGESIZE
18+ #define ELF_MAXPAGESIZE 0x8000
19+
20++/* Prioritize elf32-*arm (priority 1) over elf32-*arm-symbian (priority 2) */
21++#define elf_match_priority 2
22+ #include "elf32-target.h"
23++#undef elf_match_priority
pkgs/development/tools/misc/binutils/patches/2.34/no-plugins.patchnew file+21
@@ -0,0 +1,21 @@
1+diff --git a/bfd/plugin.c b/bfd/plugin.c
2+index 537ab60311..bfe7957f96 100644
3+--- a/bfd/plugin.c
4++++ b/bfd/plugin.c
5+@@ -386,6 +386,7 @@ load_plugin (bfd *abfd)
6+ if (plugin_program_name == NULL)
7+ return found;
8+
9++#if 0
10+ /* Try not to search the same dir twice, by looking at st_dev and
11+ st_ino for the dir. If we are on a file system that always sets
12+ st_ino to zero or the actual st_ino is zero we might waste some
13+@@ -437,7 +438,7 @@ load_plugin (bfd *abfd)
14+ if (found)
15+ break;
16+ }
17+-
18++#endif
19+ return found;
20+ }
21+
pkgs/os-specific/linux/iptables/default.nix+2−2
@@ -6,12 +6,12 @@
66with stdenv.lib;
77
88stdenv.mkDerivation rec {
9− version = "1.8.5";
9+ version = "1.8.6";
1010 pname = "iptables";
1111
1212 src = fetchurl {
1313 url = "https://www.netfilter.org/projects/${pname}/files/${pname}-${version}.tar.bz2";
14− sha256 = "02a3575ypdpg6a2x752mhk3f7h1381ymkq1n0gss6fp6292xfmyl";
14+ sha256 = "0rvp0k8a72h2snrdx48cfn75bfa0ycrd2xl3kjysbymq7q6gxx50";
1515 };
1616
1717 nativeBuildInputs = [ pkgconfig pruneLibtoolFiles flex bison ];
pkgs/stdenv/generic/setup.sh+2−2
@@ -1037,7 +1037,7 @@ checkPhase() {
10371037 runHook preCheck
10381038
10391039 if [[ -z "${foundMakefile:-}" ]]; then
1040− echo "no Makefile or custom buildPhase, doing nothing"
1040+ echo "no Makefile or custom checkPhase, doing nothing"
10411041 runHook postCheck
10421042 return
10431043 fi
@@ -1182,7 +1182,7 @@ installCheckPhase() {
11821182 runHook preInstallCheck
11831183
11841184 if [[ -z "${foundMakefile:-}" ]]; then
1185− echo "no Makefile or custom buildPhase, doing nothing"
1185+ echo "no Makefile or custom installCheckPhase, doing nothing"
11861186 #TODO(@oxij): should flagsArray influence make -n?
11871187 elif [[ -z "${installCheckTarget:-}" ]] \
11881188 && ! make -n ${makefile:+-f $makefile} ${installCheckTarget:-installcheck} >/dev/null 2>&1; then
pkgs/top-level/aliases.nix+1
@@ -501,6 +501,7 @@ mapAliases ({
501501 ruby_2_5_0 = throw "ruby_2_5_0 was deprecated on 2018-02-13: use a newer version of ruby";
502502 rubyPackages_2_4 = throw "rubyPackages_2_4 was deprecated in 2019-12: use a newer version of rubyPackages instead";
503503 rubygems = throw "rubygems was deprecated on 2016-03-02: rubygems is now bundled with ruby";
504+ rubyMinimal = throw "rubyMinimal was removed due to being unused";
504505 rxvt_unicode-with-plugins = rxvt-unicode; # added 2020-02-02
505506 rxvt_unicode = rxvt-unicode-unwrapped; # added 2020-02-02
506507 urxvt_autocomplete_all_the_things = rxvt-unicode-plugins.autocomplete-all-the-things; # added 2020-02-02
pkgs/top-level/all-packages.nix+5−15
@@ -10561,19 +10561,6 @@ in
1056110561 ruby_2_6
1056210562 ruby_2_7;
1056310563
10564− rubyMinimal = ruby.override {
10565− # gem support is minimal overhead
10566− rubygemsSupport = true;
10567− useRailsExpress = false;
10568− zlibSupport = false;
10569− opensslSupport = false;
10570− gdbmSupport = false;
10571− cursesSupport = false;
10572− docSupport = false;
10573− yamlSupport = false;
10574− fiddleSupport = false;
10575− };
10576−
1057710564 ruby = ruby_2_6;
1057810565 rubyPackages = rubyPackages_2_6;
1057910566
@@ -10693,6 +10680,8 @@ in
1069310680 vc4-newlib = callPackage ../development/misc/vc4/newlib.nix {};
1069410681 resim = callPackage ../misc/emulators/resim {};
1069510682
10683+ or1k-newlib = callPackage ../development/misc/or1k/newlib.nix {};
10684+
1069610685 rappel = callPackage ../development/misc/rappel/default.nix { };
1069710686
1069810687 pharo-vms = callPackage ../development/pharo/vm { };
@@ -11194,11 +11183,11 @@ in
1119411183 dot2tex = with python3.pkgs; toPythonApplication dot2tex;
1119511184
1119611185 doxygen = callPackage ../development/tools/documentation/doxygen {
11197− qt4 = null;
11186+ qt5 = null;
1119811187 inherit (darwin.apple_sdk.frameworks) CoreServices;
1119911188 };
1120011189
11201− doxygen_gui = lowPrio (doxygen.override { inherit qt4; });
11190+ doxygen_gui = lowPrio (doxygen.override { inherit qt5; });
1120211191
1120311192 drake = callPackage ../development/tools/build-managers/drake { };
1120411193
@@ -12870,6 +12859,7 @@ in
1287012859 else if name == "avrlibc" then targetPackages.avrlibcCross or avrlibcCross
1287112860 else if name == "newlib" && stdenv.targetPlatform.isMsp430 then targetPackages.msp430NewlibCross or msp430NewlibCross
1287212861 else if name == "newlib" && stdenv.targetPlatform.isVc4 then targetPackages.vc4-newlib or vc4-newlib
12862+ else if name == "newlib" && stdenv.targetPlatform.isOr1k then targetPackages.or1k-newlib or or1k-newlib
1287312863 else if name == "newlib" then targetPackages.newlibCross or newlibCross
1287412864 else if name == "musl" then targetPackages.muslCross or muslCross
1287512865 else if name == "msvcrt" then targetPackages.windows.mingw_w64 or windows.mingw_w64
pkgs/top-level/python-packages.nix+2
@@ -6476,6 +6476,8 @@ in {
64766476
64776477 scp = callPackage ../development/python-modules/scp { };
64786478
6479+ scramp = callPackage ../development/python-modules/scramp { };
6480+
64796481 scrapy = callPackage ../development/python-modules/scrapy { };
64806482
64816483 scrapy-deltafetch = callPackage ../development/python-modules/scrapy-deltafetch { };