diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 33d791142d19..8e2bda71dc02 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -3911,6 +3911,11 @@ githubId = 13791; name = "Luke Gorrie"; }; + lumi = { + email = "lumi@pew.im"; + github = "lumi-me-not"; + name = "lumi"; + }; luz = { email = "luz666@daum.net"; github = "Luz"; diff --git a/nixos/modules/config/update-users-groups.pl b/nixos/modules/config/update-users-groups.pl index 59cea51c611b..15e448b787aa 100644 --- a/nixos/modules/config/update-users-groups.pl +++ b/nixos/modules/config/update-users-groups.pl @@ -56,12 +56,12 @@ sub allocGid { $gidsUsed{$prevGid} = 1; return $prevGid; } - return allocId(\%gidsUsed, \%gidsPrevUsed, 400, 499, 0, sub { my ($gid) = @_; getgrgid($gid) }); + return allocId(\%gidsUsed, \%gidsPrevUsed, 400, 999, 0, sub { my ($gid) = @_; getgrgid($gid) }); } sub allocUid { my ($name, $isSystemUser) = @_; - my ($min, $max, $up) = $isSystemUser ? (400, 499, 0) : (1000, 29999, 1); + my ($min, $max, $up) = $isSystemUser ? (400, 999, 0) : (1000, 29999, 1); my $prevUid = $uidMap->{$name}; if (defined $prevUid && $prevUid >= $min && $prevUid <= $max && !defined $uidsUsed{$prevUid}) { print STDERR "reviving user '$name' with UID $prevUid\n"; diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index d3739ae0960f..3ccdfe8e0c04 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -227,6 +227,7 @@ ./services/backup/rsnapshot.nix ./services/backup/tarsnap.nix ./services/backup/tsm.nix + ./services/backup/zfs-replication.nix ./services/backup/znapzend.nix ./services/cluster/hadoop/default.nix ./services/cluster/kubernetes/addons/dns.nix diff --git a/nixos/modules/programs/shadow.nix b/nixos/modules/programs/shadow.nix index 8ec4169207db..7eaf79d864e7 100644 --- a/nixos/modules/programs/shadow.nix +++ b/nixos/modules/programs/shadow.nix @@ -6,17 +6,27 @@ with lib; let + /* + There are three different sources for user/group id ranges, each of which gets + used by different programs: + - The login.defs file, used by the useradd, groupadd and newusers commands + - The update-users-groups.pl file, used by NixOS in the activation phase to + decide on which ids to use for declaratively defined users without a static + id + - Systemd compile time options -Dsystem-uid-max= and -Dsystem-gid-max=, used + by systemd for features like ConditionUser=@system and systemd-sysusers + */ loginDefs = '' DEFAULT_HOME yes SYS_UID_MIN 400 - SYS_UID_MAX 499 + SYS_UID_MAX 999 UID_MIN 1000 UID_MAX 29999 SYS_GID_MIN 400 - SYS_GID_MAX 499 + SYS_GID_MAX 999 GID_MIN 1000 GID_MAX 29999 diff --git a/nixos/modules/security/acme.nix b/nixos/modules/security/acme.nix index e08c7e965eef..cbeb99cfceff 100644 --- a/nixos/modules/security/acme.nix +++ b/nixos/modules/security/acme.nix @@ -198,7 +198,7 @@ in ++ optionals (data.email != null) [ "--email" data.email ] ++ concatMap (p: [ "-f" p ]) data.plugins ++ concatLists (mapAttrsToList (name: root: [ "-d" (if root == null then name else "${name}:${root}")]) data.extraDomains) - ++ optionals (!cfg.production) ["--server" "https://acme-staging.api.letsencrypt.org/directory"]; + ++ optionals (!cfg.production) ["--server" "https://acme-staging-v02.api.letsencrypt.org/directory"]; acmeService = { description = "Renew ACME Certificate for ${cert}"; after = [ "network.target" "network-online.target" ]; diff --git a/nixos/modules/services/backup/znapzend.nix b/nixos/modules/services/backup/znapzend.nix index f317078ddda2..203631a577f0 100644 --- a/nixos/modules/services/backup/znapzend.nix +++ b/nixos/modules/services/backup/znapzend.nix @@ -34,6 +34,8 @@ let description = "string of the form number{b|k|M|G}"; }; + enabledFeatures = concatLists (mapAttrsToList (name: enabled: optional enabled name) cfg.features); + # Type for a string that must contain certain other strings (the list parameter). # Note that these would need regex escaping. stringContainingStrings = list: let @@ -354,6 +356,22 @@ in ''; default = false; }; + + features.recvu = mkEnableOption '' + recvu feature which uses -u on the receiving end to keep the destination + filesystem unmounted. + ''; + features.compressed = mkEnableOption '' + compressed feature which adds the options -Lce to + the zfs send command. When this is enabled, make + sure that both the sending and receiving pool have the same relevant + features enabled. Using -c will skip unneccessary + decompress-compress stages, -L is for large block + support and -e is for embedded data support. see + znapzend1 + and zfs8 + for more info. + ''; }; }; @@ -381,12 +399,22 @@ in ''; serviceConfig = { + # znapzendzetup --import apparently tries to connect to the backup + # host 3 times with a timeout of 30 seconds, leading to a startup + # delay of >90s when the host is down, which is just above the default + # service timeout of 90 seconds. Increase the timeout so it doesn't + # make the service fail in that case. + TimeoutStartSec = 180; + # Needs to have write access to ZFS + User = "root"; ExecStart = let args = concatStringsSep " " [ "--logto=${cfg.logTo}" "--loglevel=${cfg.logLevel}" (optionalString cfg.noDestroy "--nodestroy") (optionalString cfg.autoCreation "--autoCreation") + (optionalString (enabledFeatures != []) + "--features=${concatStringsSep "," enabledFeatures}") ]; in "${pkgs.znapzend}/bin/znapzend ${args}"; ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; Restart = "on-failure"; diff --git a/nixos/modules/services/misc/gitlab.nix b/nixos/modules/services/misc/gitlab.nix index 6ee35aaca565..07ea9c458437 100644 --- a/nixos/modules/services/misc/gitlab.nix +++ b/nixos/modules/services/misc/gitlab.nix @@ -608,6 +608,8 @@ in { # objects owners and extensions; for now we tack on what's needed # here. systemd.services.postgresql.postStart = mkAfter (optionalString databaseActuallyCreateLocally '' + set -eu + $PSQL -tAc "SELECT 1 FROM pg_database WHERE datname = '${cfg.databaseName}'" | grep -q 1 || $PSQL -tAc 'CREATE DATABASE "${cfg.databaseName}" OWNER "${cfg.databaseUsername}"' current_owner=$($PSQL -tAc "SELECT pg_catalog.pg_get_userbyid(datdba) FROM pg_catalog.pg_database WHERE datname = '${cfg.databaseName}'") if [[ "$current_owner" != "${cfg.databaseUsername}" ]]; then @@ -739,7 +741,6 @@ in { gitlab-workhorse ]; serviceConfig = { - PermissionsStartOnly = true; # preStart must be run as root Type = "simple"; User = cfg.user; Group = cfg.group; @@ -781,13 +782,18 @@ in { ExecStartPre = let preStartFullPrivileges = '' shopt -s dotglob nullglob + set -eu + chown --no-dereference '${cfg.user}':'${cfg.group}' '${cfg.statePath}'/* chown --no-dereference '${cfg.user}':'${cfg.group}' '${cfg.statePath}'/config/* ''; preStart = '' + set -eu + cp -f ${cfg.packages.gitlab}/share/gitlab/VERSION ${cfg.statePath}/VERSION rm -rf ${cfg.statePath}/db/* rm -rf ${cfg.statePath}/config/initializers/* + rm -f ${cfg.statePath}/lib cp -rf --no-preserve=mode ${cfg.packages.gitlab}/share/gitlab/config.dist/* ${cfg.statePath}/config cp -rf --no-preserve=mode ${cfg.packages.gitlab}/share/gitlab/db/* ${cfg.statePath}/db diff --git a/pkgs/applications/audio/mpg123/default.nix b/pkgs/applications/audio/mpg123/default.nix index b201bd65caef..0d5445650a0a 100644 --- a/pkgs/applications/audio/mpg123/default.nix +++ b/pkgs/applications/audio/mpg123/default.nix @@ -3,11 +3,11 @@ }: stdenv.mkDerivation rec { - name = "mpg123-1.25.11"; + name = "mpg123-1.25.12"; src = fetchurl { url = "mirror://sourceforge/mpg123/${name}.tar.bz2"; - sha256 = "1cpal2zsm3zgi6f48vvwpg6wgkv42ndi7lk3zsg7sz52z83k61nz"; + sha256 = "1l9iwwgqzw6yg5zk9pqmlbfyq6d8dqysbmj0j3m8dyrxd34wgzhz"; }; buildInputs = stdenv.lib.optional (!stdenv.isDarwin) alsaLib; diff --git a/pkgs/applications/audio/openmpt123/default.nix b/pkgs/applications/audio/openmpt123/default.nix index c9d69b5c7f23..08c5c1a5c361 100644 --- a/pkgs/applications/audio/openmpt123/default.nix +++ b/pkgs/applications/audio/openmpt123/default.nix @@ -2,14 +2,14 @@ , usePulseAudio ? config.pulseaudio or false, libpulseaudio }: let - version = "0.4.1"; + version = "0.4.9"; in stdenv.mkDerivation { pname = "openmpt123"; inherit version; src = fetchurl { url = "https://lib.openmpt.org/files/libopenmpt/src/libopenmpt-${version}+release.autotools.tar.gz"; - sha256 = "1k1m1adjh4s2q9lxgkf836k5243akxrzq1hsdjhrkg4idd3pxzp4"; + sha256 = "02kjwwh9d9i4rnfzqzr18pvcklc46yrs9mvdmjqx7kxg3c28hkqm"; }; enableParallelBuilding = true; diff --git a/pkgs/applications/audio/tomahawk/default.nix b/pkgs/applications/audio/tomahawk/default.nix deleted file mode 100644 index c983123ca383..000000000000 --- a/pkgs/applications/audio/tomahawk/default.nix +++ /dev/null @@ -1,56 +0,0 @@ -{ stdenv, fetchurl, cmake, pkgconfig, attica, boost, gnutls, libechonest -, liblastfm, lucenepp, phonon, phonon-backend-vlc, qca2, qjson, qt4 -, qtkeychain, quazip, sparsehash, taglib, websocketpp, makeWrapper - -, enableXMPP ? true, libjreen ? null -, enableKDE ? false, kdelibs4 ? null -, enableTelepathy ? false, telepathy-qt ? null -}: - -assert enableXMPP -> libjreen != null; -assert enableKDE -> kdelibs4 != null; -assert enableTelepathy -> telepathy-qt != null; - -stdenv.mkDerivation rec { - pname = "tomahawk"; - version = "0.8.4"; - - src = fetchurl { - url = "http://download.tomahawk-player.org/${pname}-${version}.tar.bz2"; - sha256 = "0j84h36wkjfjbsd7ybyji7rcc9wpjdbl0f1xdcc1g7h0nz34pc0g"; - }; - - cmakeFlags = [ - "-DLUCENEPP_INCLUDE_DIR=${lucenepp}/include" - "-DLUCENEPP_LIBRARY_DIR=${lucenepp}/lib" - ]; - - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ - cmake attica boost gnutls libechonest liblastfm lucenepp phonon - qca2 qjson qt4 qtkeychain quazip sparsehash taglib websocketpp - makeWrapper - ] ++ stdenv.lib.optional enableXMPP libjreen - ++ stdenv.lib.optional enableKDE kdelibs4 - ++ stdenv.lib.optional enableTelepathy telepathy-qt; - - postInstall = let - pluginPath = stdenv.lib.concatStringsSep ":" [ - "${phonon-backend-vlc}/lib/kde4/plugins" - ]; - in '' - for i in "$out"/bin/*; do - wrapProgram "$i" --prefix QT_PLUGIN_PATH : "${pluginPath}" - done - ''; - - enableParallelBuilding = true; - - meta = with stdenv.lib; { - description = "A multi-source music player (unmaintained)"; - homepage = http://tomahawk-player.org/; - license = licenses.gpl3Plus; - platforms = platforms.all; - broken = true; # 2018-06-25 - }; -} diff --git a/pkgs/applications/blockchains/go-ethereum.nix b/pkgs/applications/blockchains/go-ethereum.nix index a59cffb4b1d2..07d16494646a 100644 --- a/pkgs/applications/blockchains/go-ethereum.nix +++ b/pkgs/applications/blockchains/go-ethereum.nix @@ -10,9 +10,6 @@ buildGoPackage rec { propagatedBuildInputs = stdenv.lib.optionals stdenv.isDarwin [ libobjc IOKit ]; - # Fixes Cgo related build failures (see https://github.com/NixOS/nixpkgs/issues/25959 ) - hardeningDisable = [ "fortify" ]; - src = fetchFromGitHub { owner = "ethereum"; repo = pname; diff --git a/pkgs/applications/blockchains/jormungandr/default.nix b/pkgs/applications/blockchains/jormungandr/default.nix index 6910bef7814a..7230a5d83f68 100644 --- a/pkgs/applications/blockchains/jormungandr/default.nix +++ b/pkgs/applications/blockchains/jormungandr/default.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "jormungandr"; - version = "0.7.0-alpha.dev.1"; + version = "0.7.0-rc1"; src = fetchgit { url = "https://github.com/input-output-hk/${pname}"; rev = "v${version}"; - sha256 = "0r3icx42glrpa68sjxz4gr0z5660gh4n79lncy720s04cmgjcjci"; + sha256 = "02ihnq7b32rwx7ychrj76rin1z3s9np5yjylppxm0qp5sjkik9ff"; fetchSubmodules = true; }; - cargoSha256 = "0f9b2lr2xxlcn9j33b5ahzbndz6sjm8ybhqm472bv5hzisqm4lg4"; + cargoSha256 = "1pp829azj6aw68ba637rm852sj61nxznxfzrlqs9ds6adk9h7abs"; nativeBuildInputs = [ pkgconfig protobuf ]; buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ]; diff --git a/pkgs/applications/editors/emacs-modes/melpa-packages.nix b/pkgs/applications/editors/emacs-modes/melpa-packages.nix index 374dfb411e77..0ad7b02befad 100644 --- a/pkgs/applications/editors/emacs-modes/melpa-packages.nix +++ b/pkgs/applications/editors/emacs-modes/melpa-packages.nix @@ -394,52 +394,22 @@ env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPac (attrs.nativeBuildInputs or []) ++ [ external.git ]; }); - vterm = let - emacsSources = pkgs.stdenv.mkDerivation { - name = self.emacs.name + "-sources"; - src = self.emacs.src; - - dontConfigure = true; - dontBuild = true; - doCheck = false; - fixupPhase = ":"; - - installPhase = '' - mkdir -p $out - cp -a * $out - ''; - - }; - - libvterm = pkgs.libvterm-neovim.overrideAttrs(old: rec { - pname = "libvterm-neovim"; - version = "2019-04-27"; - name = pname + "-" + version; - src = pkgs.fetchFromGitHub { - owner = "neovim"; - repo = "libvterm"; - rev = "89675ffdda615ffc3f29d1c47a933f4f44183364"; - sha256 = "0l9ixbj516vl41v78fi302ws655xawl7s94gmx1kb3fmfgamqisy"; - }; - }); - - in pkgs.stdenv.mkDerivation { - inherit (super.vterm) name version src; - - nativeBuildInputs = [ pkgs.cmake ]; - buildInputs = [ self.emacs libvterm ]; - + vterm = super.vterm.overrideAttrs(old: { + buildInputs = old.buildInputs ++ [ self.emacs pkgs.cmake pkgs.libvterm-neovim ]; cmakeFlags = [ - "-DEMACS_SOURCE=${emacsSources}" - "-DUSE_SYSTEM_LIBVTERM=True" + "-DEMACS_SOURCE=${self.emacs.src}" + "-DUSE_SYSTEM_LIBVTERM=ON" ]; - - installPhase = '' - install -d $out/share/emacs/site-lisp - install ../*.el $out/share/emacs/site-lisp - install ../*.so $out/share/emacs/site-lisp + # we need the proper out directory to exist, so we do this in the + # postInstall instead of postBuild + postInstall = '' + pushd source/build >/dev/null + make + install -m444 -t $out/share/emacs/site-lisp/elpa/vterm-** ../*.so + popd > /dev/null + rm -rf $out/share/emacs/site-lisp/elpa/vterm-**/{CMake*,build,*.c,*.h} ''; - }; + }); # Legacy alias emacs-libvterm = unstable.vterm; diff --git a/pkgs/applications/editors/music/tuxguitar/default.nix b/pkgs/applications/editors/music/tuxguitar/default.nix index 70f99fa749b7..8522ecf9c78f 100644 --- a/pkgs/applications/editors/music/tuxguitar/default.nix +++ b/pkgs/applications/editors/music/tuxguitar/default.nix @@ -1,12 +1,12 @@ -{ stdenv, fetchurl, swt, jdk, makeWrapper, alsaLib }: +{ stdenv, fetchurl, swt, jdk, makeWrapper, alsaLib, jack2, fluidsynth, libpulseaudio }: let metadata = assert stdenv.hostPlatform.system == "i686-linux" || stdenv.hostPlatform.system == "x86_64-linux"; if stdenv.hostPlatform.system == "i686-linux" then - { arch = "x86"; sha256 = "1qmb51k0538pn7gv4nsvhfv33xik4l4af0qmpllkzrikmj8wvzlb"; } + { arch = "x86"; sha256 = "27675c358db237df74d20e8676000c25a87b9de0bb0a6d1c325e8d6db807d296"; } else - { arch = "x86_64"; sha256 = "12af47jhlrh9aq5b3d13l7cdhlndgnfpy61gz002hajbq7i00ixh"; }; + { arch = "x86_64"; sha256 = "298555a249adb3ad72f3aef72a124e30bfa01cd069c7b5d152a738140e7903a2"; }; in stdenv.mkDerivation rec { - version = "1.2"; + version = "1.5.2"; pname = "tuxguitar"; src = fetchurl { @@ -18,15 +18,16 @@ in stdenv.mkDerivation rec { installPhase = '' mkdir -p $out/bin - cp -r lib share $out/ - cp tuxguitar $out/bin/tuxguitar - cp tuxguitar.jar $out/lib + cp -r dist lib share $out/ + cp tuxguitar.sh $out/bin/tuxguitar + ln -s $out/dist $out/bin/dist + ln -s $out/lib $out/bin/lib ln -s $out/share $out/bin/share wrapProgram $out/bin/tuxguitar \ --set JAVA "${jdk}/bin/java" \ - --prefix LD_LIBRARY_PATH : "$out/lib/:${stdenv.lib.makeLibraryPath [ swt alsaLib ]}" \ + --prefix LD_LIBRARY_PATH : "$out/lib/:${stdenv.lib.makeLibraryPath [ swt alsaLib jack2 fluidsynth libpulseaudio ]}" \ --prefix CLASSPATH : "${swt}/jars/swt.jar:$out/lib/tuxguitar.jar:$out/lib/itext.jar" ''; diff --git a/pkgs/applications/editors/vim/common.nix b/pkgs/applications/editors/vim/common.nix index 567da2a08f20..9d22cdbf4a86 100644 --- a/pkgs/applications/editors/vim/common.nix +++ b/pkgs/applications/editors/vim/common.nix @@ -1,12 +1,12 @@ { lib, fetchFromGitHub }: rec { - version = "8.1.1967"; + version = "8.1.2188"; src = fetchFromGitHub { owner = "vim"; repo = "vim"; rev = "v${version}"; - sha256 = "0cdfi67jwv8j982i1jxdfqv4aqglig8f0hzadgygk69i0wwkymwk"; + sha256 = "0ixq96l991b84sj66v63ds61yr75gx5zz411213yn6bz3s2fvlcv"; }; enableParallelBuilding = true; diff --git a/pkgs/applications/graphics/tev/default.nix b/pkgs/applications/graphics/tev/default.nix new file mode 100644 index 000000000000..47da0b749df3 --- /dev/null +++ b/pkgs/applications/graphics/tev/default.nix @@ -0,0 +1,53 @@ +{ stdenv, fetchFromGitHub +, cmake, wrapGAppsHook +, libX11, xorg, libzip, glfw, gnome3 +}: + +stdenv.mkDerivation rec { + pname = "tev"; + version = "1.13"; + + src = fetchFromGitHub { + owner = "Tom94"; + repo = pname; + rev = "v${version}"; + fetchSubmodules = true; + sha256 = "0c8md6yv1q449aszs05xfby6a2aiw8pac7x0zs169i5mpqrrbfa9"; + }; + + nativeBuildInputs = [ cmake wrapGAppsHook ]; + buildInputs = [ libX11 libzip glfw ] + ++ (with xorg; [ libXrandr libXinerama libXcursor libXi libXxf86vm ]); + + dontWrapGApps = true; # We also need zenity (see below) + + postPatch = '' + substituteInPlace CMakeLists.txt \ + --replace "/usr/" "''${out}/" + ''; + + postInstall = '' + wrapProgram $out/bin/tev \ + "''${gappsWrapperArgs[@]}" \ + --prefix PATH ":" "${gnome3.zenity}/bin" + ''; + + meta = with stdenv.lib; { + description = "A high dynamic range (HDR) image comparison tool"; + longDescription = '' + A high dynamic range (HDR) image comparison tool for graphics people. tev + allows viewing images through various tonemapping operators and inspecting + the values of individual pixels. Often, it is important to find exact + differences between pairs of images. For this purpose, tev allows rapidly + switching between opened images and visualizing various error metrics (L1, + L2, and relative versions thereof). To avoid clutter, opened images and + their layers can be filtered by keywords. + While the predominantly supported file format is OpenEXR certain other + types of images can also be loaded. + ''; + inherit (src.meta) homepage; + license = licenses.bsd3; + platforms = platforms.unix; + maintainers = with maintainers; [ primeos ]; + }; +} diff --git a/pkgs/applications/misc/buku/default.nix b/pkgs/applications/misc/buku/default.nix index 5db3e7d0c8c0..ac65341d4988 100644 --- a/pkgs/applications/misc/buku/default.nix +++ b/pkgs/applications/misc/buku/default.nix @@ -18,7 +18,7 @@ with python3.pkgs; buildPythonApplication rec { pylint flake8 pyyaml - mypy_extensions + mypy-extensions ]; propagatedBuildInputs = [ diff --git a/pkgs/applications/misc/hubstaff/revision.json b/pkgs/applications/misc/hubstaff/revision.json index 64cad5c02928..31d26559dd2d 100644 --- a/pkgs/applications/misc/hubstaff/revision.json +++ b/pkgs/applications/misc/hubstaff/revision.json @@ -1,5 +1,5 @@ { - "url": "https://hubstaff-production.s3.amazonaws.com/downloads/HubstaffClient/Builds/Release/1.4.11-a12e5bad/Hubstaff-1.4.11-a12e5bad.sh", - "version": "1.4.11-a12e5bad", - "sha256": "0nqmw02spplqppvz2jniq5p5y69l8n5xp9wji4032kn4qsba33jn" + "url": "https://hubstaff-production.s3.amazonaws.com/downloads/HubstaffClient/Builds/Release/1.5.0-4309ed45/Hubstaff-1.5.0-4309ed45.sh", + "version": "1.5.0-4309ed45", + "sha256": "1rfxizb28b8r344d18jh6shfcxz35vx8vh10c3j6zdcc998zkcr1" } diff --git a/pkgs/applications/misc/keepassx/community.nix b/pkgs/applications/misc/keepassx/community.nix index 22e6cd2f6667..8670371b0061 100644 --- a/pkgs/applications/misc/keepassx/community.nix +++ b/pkgs/applications/misc/keepassx/community.nix @@ -32,13 +32,13 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "keepassxc"; - version = "2.4.3"; + version = "2.5.0"; src = fetchFromGitHub { owner = "keepassxreboot"; repo = "keepassxc"; rev = version; - sha256 = "1r63bl0cam04rps1bjr107qvwsmay4254nv00gwhh9n45s6cslac"; + sha256 = "053z6mzcn22w3vkf09i7kdi5p0c6zcd9g62v3p5i3yhd14cgviqr"; }; NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isClang [ diff --git a/pkgs/applications/misc/mu-repo/default.nix b/pkgs/applications/misc/mu-repo/default.nix new file mode 100644 index 000000000000..ddee1939b02a --- /dev/null +++ b/pkgs/applications/misc/mu-repo/default.nix @@ -0,0 +1,26 @@ +{ lib, fetchFromGitHub, buildPythonApplication, pytest, git }: + +buildPythonApplication rec { + pname = "mu-repo"; + version = "1.8.0"; + + src = fetchFromGitHub { + owner = "fabioz"; + repo = pname; + rev = with lib; + "mu_repo_" + concatStringsSep "_" (splitVersion version); + sha256 = "1dxfggzbhiips0ww2s93yba9842ycp0i3x2i8vvcx0vgicv3rv6f"; + }; + + checkInputs = [ pytest git ]; + # disable test which assumes it's a git repo + checkPhase = "py.test mu_repo --ignore=mu_repo/tests/test_checkout.py"; + + meta = with lib; { + description = "Tool to help in dealing with multiple git repositories"; + homepage = "http://fabioz.github.io/mu-repo/"; + license = licenses.gpl3; + platforms = platforms.unix; + maintainers = with maintainers; [ sikmir ]; + }; +} diff --git a/pkgs/applications/networking/instant-messengers/profanity/default.nix b/pkgs/applications/networking/instant-messengers/profanity/default.nix index 02be3c24e512..8281e3b606a7 100644 --- a/pkgs/applications/networking/instant-messengers/profanity/default.nix +++ b/pkgs/applications/networking/instant-messengers/profanity/default.nix @@ -22,13 +22,13 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "profanity"; - version = "0.7.0"; + version = "0.7.1"; src = fetchFromGitHub { owner = "profanity-im"; repo = "profanity"; rev = version; - sha256 = "15adg7ndjkzy04lizjmnvv0pf0snhzp6a8x74mndcm0zma0dia0z"; + sha256 = "1mcgr86wqyzqx7mqxfkk2jwx6cgnvrky3zi4v1ww0lh6j05wj9gf"; }; patches = [ ./patches/packages-osx.patch ./patches/undefined-macros.patch ]; diff --git a/pkgs/applications/networking/instant-messengers/riot/riot-desktop-package.json b/pkgs/applications/networking/instant-messengers/riot/riot-desktop-package.json index f7a70bce61a0..30012970d789 100644 --- a/pkgs/applications/networking/instant-messengers/riot/riot-desktop-package.json +++ b/pkgs/applications/networking/instant-messengers/riot/riot-desktop-package.json @@ -2,7 +2,7 @@ "name": "riot-web", "productName": "Riot", "main": "src/electron-main.js", - "version": "1.4.2", + "version": "1.5.0", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", "dependencies": { diff --git a/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix b/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix index f03849a9cd6f..de941d94fc87 100644 --- a/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix +++ b/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix @@ -6,12 +6,12 @@ let executableName = "riot-desktop"; - version = "1.4.2"; + version = "1.5.0"; riot-web-src = fetchFromGitHub { owner = "vector-im"; repo = "riot-web"; rev = "v${version}"; - sha256 = "1s1m2jbcax92pql9yzw3kxdmn97a2xnas49rw3n1vldkla2wx4zx"; + sha256 = "1xi5zg3602d7gdjxskpk2q3anpn2drrkxyirfvi9mzcfp2r05557"; }; in yarn2nix-moretea.mkYarnPackage rec { diff --git a/pkgs/applications/networking/instant-messengers/riot/riot-web.nix b/pkgs/applications/networking/instant-messengers/riot/riot-web.nix index 05c5059a51f3..ccfad7259a5d 100644 --- a/pkgs/applications/networking/instant-messengers/riot/riot-web.nix +++ b/pkgs/applications/networking/instant-messengers/riot/riot-web.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "riot-web"; - version = "1.4.2"; + version = "1.5.0"; src = fetchurl { url = "https://github.com/vector-im/riot-web/releases/download/v${version}/riot-v${version}.tar.gz"; - sha256 = "0bbal3y4clgp7j703f3ll5zwhbpjz6zpw3qslwza6lik4g4k0vaj"; + sha256 = "08r9473ncfy3wzqhnds729s77fq82jjgz8w3yya07aahcxzasi94"; }; installPhase = let diff --git a/pkgs/applications/networking/remote/putty/default.nix b/pkgs/applications/networking/remote/putty/default.nix index d8dc33c944e2..8c2d9ac36e9e 100644 --- a/pkgs/applications/networking/remote/putty/default.nix +++ b/pkgs/applications/networking/remote/putty/default.nix @@ -1,9 +1,9 @@ { stdenv, lib, fetchurl, autoconf, automake, pkgconfig, libtool -, gtk2, halibut, ncurses, perl +, gtk2, halibut, ncurses, perl, darwin }: stdenv.mkDerivation rec { - version = "0.71"; + version = "0.73"; pname = "putty"; src = fetchurl { @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { "https://the.earth.li/~sgtatham/putty/${version}/${pname}-${version}.tar.gz" "ftp://ftp.wayne.edu/putty/putty-website-mirror/${version}/${pname}-${version}.tar.gz" ]; - sha256 = "1f66iss0kqk982azmxbk4xfm2i1csby91vdvly6cr04pz3i1r4rg"; + sha256 = "076z34jpik2dmlwxicvf1djjgnahcqv12rjhmb9yq6ml7x0bbc1x"; }; # glib-2.62 deprecations @@ -20,9 +20,6 @@ stdenv.mkDerivation rec { preConfigure = lib.optionalString stdenv.hostPlatform.isUnix '' perl mkfiles.pl ( cd doc ; make ); - sed -e '/AM_PATH_GTK(/d' \ - -e '/AC_OUTPUT/iAM_PROG_CC_C_O' \ - -e '/AC_OUTPUT/iAM_PROG_AR' -i configure.ac ./mkauto.sh cd unix '' + lib.optionalString stdenv.hostPlatform.isWindows '' @@ -41,7 +38,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoconf automake halibut libtool perl pkgconfig ]; buildInputs = lib.optionals stdenv.hostPlatform.isUnix [ gtk2 ncurses - ]; + ] ++ lib.optional stdenv.isDarwin darwin.apple_sdk.libs.utmp; enableParallelBuilding = true; meta = with lib; { diff --git a/pkgs/applications/networking/sync/rclone/default.nix b/pkgs/applications/networking/sync/rclone/default.nix index 7475692b962c..9625fec46fae 100644 --- a/pkgs/applications/networking/sync/rclone/default.nix +++ b/pkgs/applications/networking/sync/rclone/default.nix @@ -2,13 +2,13 @@ buildGoPackage rec { pname = "rclone"; - version = "1.49.5"; + version = "1.50.0"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "0firfb2300grfp5fnqaifhp346m4d0x8r1xshs9d8r6jxb160n03"; + sha256 = "0k4fybz4670cqg1rpx0c1ximf1x6yl1f788hx9raxkwp5wv703kw"; }; goPackagePath = "github.com/rclone/rclone"; diff --git a/pkgs/applications/version-management/bcompare/default.nix b/pkgs/applications/version-management/bcompare/default.nix index ef7c0cace8f7..8c82ed1d4510 100644 --- a/pkgs/applications/version-management/bcompare/default.nix +++ b/pkgs/applications/version-management/bcompare/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "bcompare"; - version = "4.3.0.24364"; + version = "4.3.1.24438"; src = fetchurl { url = "https://www.scootersoftware.com/${pname}-${version}_amd64.deb"; - sha256 = "14ff250nyqfqgm9qazg4la7ajci3bhqm376wy2j3za1vf09774kc"; + sha256 = "19rbcl0l49qbzn4bisdl9ibj0qm83kjkclva4qcy7jaqna9g7qrh"; }; unpackPhase = '' @@ -43,7 +43,6 @@ stdenv.mkDerivation rec { ki18n kcoreaddons gdk-pixbuf - qt4 bzip2 ]; diff --git a/pkgs/applications/version-management/gitlab/data.json b/pkgs/applications/version-management/gitlab/data.json index 94d5be62db56..e78643fecc98 100644 --- a/pkgs/applications/version-management/gitlab/data.json +++ b/pkgs/applications/version-management/gitlab/data.json @@ -1,13 +1,13 @@ { - "version": "12.3.5", - "repo_hash": "12ywspgnbwm232vmzbqhkqmwmcrb9pvihsayzmw0cxvhlfwq6995", + "version": "12.4.0", + "repo_hash": "0z2jykjv9sa4akq2qd4bl5ngqk3gpy2xfhxmcbd4d61w6l2jw00f", "owner": "gitlab-org", "repo": "gitlab", - "rev": "v12.3.5-ee", + "rev": "v12.4.0-ee", "passthru": { - "GITALY_SERVER_VERSION": "1.65.1", - "GITLAB_PAGES_VERSION": "1.9.0", - "GITLAB_SHELL_VERSION": "10.0.0", - "GITLAB_WORKHORSE_VERSION": "8.10.0" + "GITALY_SERVER_VERSION": "1.67.0", + "GITLAB_PAGES_VERSION": "1.11.0", + "GITLAB_SHELL_VERSION": "10.2.0", + "GITLAB_WORKHORSE_VERSION": "8.14.0" } } \ No newline at end of file diff --git a/pkgs/applications/version-management/gitlab/gitaly/default.nix b/pkgs/applications/version-management/gitlab/gitaly/default.nix index 500ae97faeef..b07c3590d3d8 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/default.nix +++ b/pkgs/applications/version-management/gitlab/gitaly/default.nix @@ -17,14 +17,14 @@ let }; }; in buildGoPackage rec { - version = "1.65.1"; + version = "1.67.0"; pname = "gitaly"; src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitaly"; rev = "v${version}"; - sha256 = "1a39i723na2xk4363a7v48ba23vi04qpg0119dw09g13m0k5hjc3"; + sha256 = "1mj2l15hnxwqmyc8xn79d6qpmpqbqw2ishalr8qvn83nzdsbk8l3"; }; goPackagePath = "gitlab.com/gitlab-org/gitaly"; diff --git a/pkgs/applications/version-management/gitlab/gitaly/deps.nix b/pkgs/applications/version-management/gitlab/gitaly/deps.nix index 3bca67fe3123..34c30f710540 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/deps.nix +++ b/pkgs/applications/version-management/gitlab/gitaly/deps.nix @@ -270,33 +270,6 @@ sha256 = "02ldzxgznrfdzvghfraslhgp19la1fczcbzh7wm2zdc6lmpd1qq9"; }; } - { - goPackagePath = "github.com/kr/pretty"; - fetch = { - type = "git"; - url = "https://github.com/kr/pretty"; - rev = "v0.1.0"; - sha256 = "18m4pwg2abd0j9cn5v3k2ksk9ig4vlwxmlw9rrglanziv9l967qp"; - }; - } - { - goPackagePath = "github.com/kr/pty"; - fetch = { - type = "git"; - url = "https://github.com/kr/pty"; - rev = "v1.1.1"; - sha256 = "0383f0mb9kqjvncqrfpidsf8y6ns5zlrc91c6a74xpyxjwvzl2y6"; - }; - } - { - goPackagePath = "github.com/kr/text"; - fetch = { - type = "git"; - url = "https://github.com/kr/text"; - rev = "v0.1.0"; - sha256 = "1gm5bsl01apvc84bw06hasawyqm4q84vx1pm32wr9jnd7a8vjgj1"; - }; - } { goPackagePath = "github.com/libgit2/git2go"; fetch = { @@ -644,8 +617,8 @@ fetch = { type = "git"; url = "https://gopkg.in/check.v1"; - rev = "788fd7840127"; - sha256 = "0v3bim0j375z81zrpr5qv42knqs0y2qv2vkjiqi5axvb78slki1a"; + rev = "20d25e280405"; + sha256 = "0k1m83ji9l1a7ng8a7v40psbymxasmssbrrhpdv2wl4rhs0nc3np"; }; } { diff --git a/pkgs/applications/version-management/gitlab/gitlab-shell/Gemfile b/pkgs/applications/version-management/gitlab/gitlab-shell/Gemfile deleted file mode 100644 index cabe4079df19..000000000000 --- a/pkgs/applications/version-management/gitlab/gitlab-shell/Gemfile +++ /dev/null @@ -1,12 +0,0 @@ -source 'https://rubygems.org' - -group :development, :test do - gem 'listen', '~> 0.5.0' - gem 'pry', '~> 0.12.2' - gem 'rspec', '~> 3.8.0' - gem 'rspec-parameterized', '~> 0.4.0' - gem 'rubocop', '0.49.1', require: false - gem 'simplecov', '~> 0.9.0', require: false - gem 'vcr', '~> 4.0.0' - gem 'webmock', '~> 3.4.0' -end diff --git a/pkgs/applications/version-management/gitlab/gitlab-shell/Gemfile.lock b/pkgs/applications/version-management/gitlab/gitlab-shell/Gemfile.lock deleted file mode 100644 index b178b2c07ad9..000000000000 --- a/pkgs/applications/version-management/gitlab/gitlab-shell/Gemfile.lock +++ /dev/null @@ -1,109 +0,0 @@ -GEM - remote: https://rubygems.org/ - specs: - abstract_type (0.0.7) - adamantium (0.2.0) - ice_nine (~> 0.11.0) - memoizable (~> 0.4.0) - addressable (2.5.2) - public_suffix (>= 2.0.2, < 4.0) - ast (2.4.0) - binding_of_caller (0.8.0) - debug_inspector (>= 0.0.1) - coderay (1.1.2) - concord (0.1.5) - adamantium (~> 0.2.0) - equalizer (~> 0.0.9) - crack (0.4.3) - safe_yaml (~> 1.0.0) - debug_inspector (0.0.3) - diff-lcs (1.3) - docile (1.1.5) - equalizer (0.0.11) - hashdiff (0.3.7) - ice_nine (0.11.2) - listen (0.5.3) - memoizable (0.4.2) - thread_safe (~> 0.3, >= 0.3.1) - method_source (0.9.2) - multi_json (1.13.1) - parallel (1.12.1) - parser (2.5.1.2) - ast (~> 2.4.0) - powerpack (0.1.2) - proc_to_ast (0.1.0) - coderay - parser - unparser - procto (0.0.3) - pry (0.12.2) - coderay (~> 1.1.0) - method_source (~> 0.9.0) - public_suffix (3.0.3) - rainbow (2.2.2) - rake - rake (12.3.3) - rspec (3.8.0) - rspec-core (~> 3.8.0) - rspec-expectations (~> 3.8.0) - rspec-mocks (~> 3.8.0) - rspec-core (3.8.0) - rspec-support (~> 3.8.0) - rspec-expectations (3.8.1) - diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.8.0) - rspec-mocks (3.8.0) - diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.8.0) - rspec-parameterized (0.4.0) - binding_of_caller - parser - proc_to_ast - rspec (>= 2.13, < 4) - unparser - rspec-support (3.8.0) - rubocop (0.49.1) - parallel (~> 1.10) - parser (>= 2.3.3.1, < 3.0) - powerpack (~> 0.1) - rainbow (>= 1.99.1, < 3.0) - ruby-progressbar (~> 1.7) - unicode-display_width (~> 1.0, >= 1.0.1) - ruby-progressbar (1.9.0) - safe_yaml (1.0.4) - simplecov (0.9.2) - docile (~> 1.1.0) - multi_json (~> 1.0) - simplecov-html (~> 0.9.0) - simplecov-html (0.9.0) - thread_safe (0.3.6) - unicode-display_width (1.4.0) - unparser (0.2.8) - abstract_type (~> 0.0.7) - adamantium (~> 0.2.0) - concord (~> 0.1.5) - diff-lcs (~> 1.3) - equalizer (~> 0.0.9) - parser (>= 2.3.1.2, < 2.6) - procto (~> 0.0.2) - vcr (4.0.0) - webmock (3.4.2) - addressable (>= 2.3.6) - crack (>= 0.3.2) - hashdiff - -PLATFORMS - ruby - -DEPENDENCIES - listen (~> 0.5.0) - pry (~> 0.12.2) - rspec (~> 3.8.0) - rspec-parameterized (~> 0.4.0) - rubocop (= 0.49.1) - simplecov (~> 0.9.0) - vcr (~> 4.0.0) - webmock (~> 3.4.0) - -BUNDLED WITH - 1.16.3 diff --git a/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix b/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix index cdc77024a60a..03aad8c02c32 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix +++ b/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix @@ -1,65 +1,25 @@ -{ stdenv, ruby, bundler, fetchFromGitLab, buildGoPackage, bundlerEnv }: +{ stdenv, fetchFromGitLab, buildGoPackage, ruby }: -let - version = "10.0.0"; +buildGoPackage rec { + pname = "gitlab-shell-go"; + version = "10.2.0"; src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-shell"; rev = "v${version}"; - sha256 = "0n1llkb0jrqxm10l9wqmqxjycydqphgz0chbbf395d8pywyz826x"; + sha256 = "1mpzsdqd8mlsh8wccz4s8415w080z55lnifn7l7vd5rflpnyfhcj"; }; - rubyEnv = bundlerEnv { - name = "gitlab-shell-env"; - inherit ruby; - gemdir = ./.; - }; - goPackage = buildGoPackage { - pname = "gitlab-shell-go"; - inherit src version; - patches = [ ./remove-hardcoded-locations-go.patch ]; + buildInputs = [ ruby ]; - goPackagePath = "gitlab.com/gitlab-org/gitlab-shell"; - goDeps = ./deps.nix; + patches = [ ./remove-hardcoded-locations.patch ]; - # gitlab-shell depends on an older version of gitaly which - # contains old, vendored versions of some packages; gitlab-shell - # also explicitly depends on newer versions of these libraries, - # but buildGoPackage exposes the vendored versions instead, - # leading to compilation errors. Since the vendored libraries - # aren't used here anyway, we'll just remove them. - postConfigure = '' - rm -r "$NIX_BUILD_TOP/go/src/gitlab.com/gitlab-org/gitaly/vendor/" - ''; - }; -in -stdenv.mkDerivation { - pname = "gitlab-shell"; - inherit src version; + goPackagePath = "gitlab.com/gitlab-org/gitlab-shell"; + goDeps = ./deps.nix; - patches = [ ./remove-hardcoded-locations-ruby.patch ]; - - # gitlab-shell will try to read its config relative to the source - # code by default which doesn't work in nixos because it's a - # read-only filesystem - postPatch = '' - substituteInPlace lib/gitlab_config.rb --replace \ - "File.join(ROOT_PATH, 'config.yml')" \ - "'/run/gitlab/shell-config.yml'" - ''; - - buildInputs = [ rubyEnv.wrappedRuby ]; - - dontBuild = true; - - installPhase = '' - runHook preInstall - - mkdir -p $out/ - cp -R . $out/ - cp ${goPackage.bin}/bin/* $out/bin/ - - runHook postInstall + postInstall = '' + cp -r "$NIX_BUILD_TOP/go/src/$goPackagePath"/bin/* $bin/bin + cp -r "$NIX_BUILD_TOP/go/src/$goPackagePath"/{support,VERSION} $bin/ ''; meta = with stdenv.lib; { diff --git a/pkgs/applications/version-management/gitlab/gitlab-shell/deps.nix b/pkgs/applications/version-management/gitlab/gitlab-shell/deps.nix index 55faacc41cd3..5b5d0b99bcfe 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-shell/deps.nix +++ b/pkgs/applications/version-management/gitlab/gitlab-shell/deps.nix @@ -18,6 +18,42 @@ sha256 = "149v3ci17g6wd2pm18mzcncq5qpl9hwdjnz3rlbn5rfidyn46la1"; }; } + { + goPackagePath = "github.com/BurntSushi/toml"; + fetch = { + type = "git"; + url = "https://github.com/BurntSushi/toml"; + rev = "v0.3.1"; + sha256 = "1fjdwwfzyzllgiwydknf1pwjvy49qxfsczqx5gz3y0izs7as99j6"; + }; + } + { + goPackagePath = "github.com/alecthomas/template"; + fetch = { + type = "git"; + url = "https://github.com/alecthomas/template"; + rev = "a0175ee3bccc"; + sha256 = "0qjgvvh26vk1cyfq9fadyhfgdj36f1iapbmr5xp6zqipldz8ffxj"; + }; + } + { + goPackagePath = "github.com/alecthomas/units"; + fetch = { + type = "git"; + url = "https://github.com/alecthomas/units"; + rev = "2efee857e7cf"; + sha256 = "1j65b91qb9sbrml9cpabfrcf07wmgzzghrl7809hjjhrmbzri5bl"; + }; + } + { + goPackagePath = "github.com/beorn7/perks"; + fetch = { + type = "git"; + url = "https://github.com/beorn7/perks"; + rev = "v1.0.0"; + sha256 = "1i1nz1f6g55xi2y3aiaz5kqfgvknarbfl4f0sx4nyyb4s7xb1z9x"; + }; + } { goPackagePath = "github.com/certifi/gocertifi"; fetch = { @@ -36,6 +72,15 @@ sha256 = "1vwf33wsc4la25zk9nylpbp9px3svlmldkm0bha4hp56jws4q9cs"; }; } + { + goPackagePath = "github.com/cloudflare/tableflip"; + fetch = { + type = "git"; + url = "https://github.com/cloudflare/tableflip"; + rev = "8392f1641731"; + sha256 = "0by5hk8s0bhhl3kiw658p5g53zvc61k4q2wxnh1w64p5ghd1rfn8"; + }; + } { goPackagePath = "github.com/codahale/hdrhistogram"; fetch = { @@ -68,10 +113,37 @@ fetch = { type = "git"; url = "https://github.com/getsentry/raven-go"; - rev = "v0.1.0"; + rev = "v0.1.2"; sha256 = "1dl80kar4lzdcfl3w6jssi1ld6bv0rmx6sp6bz6rzysfr9ilm02z"; }; } + { + goPackagePath = "github.com/go-kit/kit"; + fetch = { + type = "git"; + url = "https://github.com/go-kit/kit"; + rev = "v0.8.0"; + sha256 = "1rcywbc2pvab06qyf8pc2rdfjv7r6kxdv2v4wnpqnjhz225wqvc0"; + }; + } + { + goPackagePath = "github.com/go-logfmt/logfmt"; + fetch = { + type = "git"; + url = "https://github.com/go-logfmt/logfmt"; + rev = "v0.3.0"; + sha256 = "1gkgh3k5w1xwb2qbjq52p6azq3h1c1rr6pfwjlwj1zrijpzn2xb9"; + }; + } + { + goPackagePath = "github.com/go-stack/stack"; + fetch = { + type = "git"; + url = "https://github.com/go-stack/stack"; + rev = "v1.8.0"; + sha256 = "0wk25751ryyvxclyp8jdk5c3ar0cmfr8lrjb66qbg4808x66b96v"; + }; + } { goPackagePath = "github.com/gogo/protobuf"; fetch = { @@ -90,15 +162,6 @@ sha256 = "0jb2834rw5sykfr937fxi8hxi2zy80sj2bdn9b3jb4b26ksqng30"; }; } - { - goPackagePath = "github.com/golang/lint"; - fetch = { - type = "git"; - url = "https://github.com/golang/lint"; - rev = "06c8688daad7"; - sha256 = "0xi94dwvz50a66bq1hp9fyqkym5mcpdxdb1hrfvicldgjf37lc47"; - }; - } { goPackagePath = "github.com/golang/mock"; fetch = { @@ -113,8 +176,26 @@ fetch = { type = "git"; url = "https://github.com/golang/protobuf"; - rev = "v1.2.0"; - sha256 = "0kf4b59rcbb1cchfny2dm9jyznp8ri2hsb14n8iak1q8986xa0ab"; + rev = "v1.3.2"; + sha256 = "1k1wb4zr0qbwgpvz9q5ws9zhlal8hq7dmq62pwxxriksayl6hzym"; + }; + } + { + goPackagePath = "github.com/google/go-cmp"; + fetch = { + type = "git"; + url = "https://github.com/google/go-cmp"; + rev = "v0.2.0"; + sha256 = "1fbv0x27k9sn8svafc0hjwsnckk864lv4yi7bvzrxvmd3d5hskds"; + }; + } + { + goPackagePath = "github.com/google/uuid"; + fetch = { + type = "git"; + url = "https://github.com/google/uuid"; + rev = "v1.1.1"; + sha256 = "0hfxcf9frkb57k6q0rdkrmnfs78ms21r1qfk9fhlqga2yh5xg8zb"; }; } { @@ -126,6 +207,15 @@ sha256 = "0lwgxih021xfhfb1xb9la5f98bpgpaiz63sbllx77qwwl2rmhrsp"; }; } + { + goPackagePath = "github.com/grpc-ecosystem/go-grpc-prometheus"; + fetch = { + type = "git"; + url = "https://github.com/grpc-ecosystem/go-grpc-prometheus"; + rev = "v1.2.0"; + sha256 = "1lzk54h7np32b3acidg1ggbn8ppbnns0m71gcg9d1qkkdh8zrijl"; + }; + } { goPackagePath = "github.com/hpcloud/tail"; fetch = { @@ -136,12 +226,57 @@ }; } { - goPackagePath = "github.com/kisielk/gotool"; + goPackagePath = "github.com/json-iterator/go"; fetch = { type = "git"; - url = "https://github.com/kisielk/gotool"; - rev = "v1.0.0"; - sha256 = "14af2pa0ssyp8bp2mvdw184s5wcysk6akil3wzxmr05wwy951iwn"; + url = "https://github.com/json-iterator/go"; + rev = "v1.1.6"; + sha256 = "08caswxvdn7nvaqyj5kyny6ghpygandlbw9vxdj7l5vkp7q0s43r"; + }; + } + { + goPackagePath = "github.com/julienschmidt/httprouter"; + fetch = { + type = "git"; + url = "https://github.com/julienschmidt/httprouter"; + rev = "v1.2.0"; + sha256 = "1k8bylc9s4vpvf5xhqh9h246dl1snxrzzz0614zz88cdh8yzs666"; + }; + } + { + goPackagePath = "github.com/kelseyhightower/envconfig"; + fetch = { + type = "git"; + url = "https://github.com/kelseyhightower/envconfig"; + rev = "v1.3.0"; + sha256 = "1zcq480ig7wbg4378qcfxznp2gzqmk7x6rbxizflvg9v2f376vrw"; + }; + } + { + goPackagePath = "github.com/konsorten/go-windows-terminal-sequences"; + fetch = { + type = "git"; + url = "https://github.com/konsorten/go-windows-terminal-sequences"; + rev = "v1.0.1"; + sha256 = "1lchgf27n276vma6iyxa0v1xds68n2g8lih5lavqnx5x6q5pw2ip"; + }; + } + { + goPackagePath = "github.com/kr/logfmt"; + fetch = { + type = "git"; + url = "https://github.com/kr/logfmt"; + rev = "b84e30acd515"; + sha256 = "02ldzxgznrfdzvghfraslhgp19la1fczcbzh7wm2zdc6lmpd1qq9"; + }; + } + { + goPackagePath = "github.com/libgit2/git2go"; + fetch = { + type = "git"; + url = "https://github.com/libgit2/git2go"; + rev = "ecaeb7a21d47"; + sha256 = "14r7ryff93r49g94f6kg66xc0y6rwb31lj22s3qmzmlgywk0pgvr"; }; } { @@ -162,6 +297,42 @@ sha256 = "08zcgr1az1n8zaxzwdd205j86hczgyc52nxfnw5avpw7rrkf7v0d"; }; } + { + goPackagePath = "github.com/matttproud/golang_protobuf_extensions"; + fetch = { + type = "git"; + url = "https://github.com/matttproud/golang_protobuf_extensions"; + rev = "v1.0.1"; + sha256 = "1d0c1isd2lk9pnfq2nk0aih356j30k3h1gi2w0ixsivi5csl7jya"; + }; + } + { + goPackagePath = "github.com/modern-go/concurrent"; + fetch = { + type = "git"; + url = "https://github.com/modern-go/concurrent"; + rev = "bacd9c7ef1dd"; + sha256 = "0s0fxccsyb8icjmiym5k7prcqx36hvgdwl588y0491gi18k5i4zs"; + }; + } + { + goPackagePath = "github.com/modern-go/reflect2"; + fetch = { + type = "git"; + url = "https://github.com/modern-go/reflect2"; + rev = "v1.0.1"; + sha256 = "06a3sablw53n1dqqbr2f53jyksbxdmmk8axaas4yvnhyfi55k4lf"; + }; + } + { + goPackagePath = "github.com/mwitkow/go-conntrack"; + fetch = { + type = "git"; + url = "https://github.com/mwitkow/go-conntrack"; + rev = "cc309e4a2223"; + sha256 = "0nbrnpk7bkmqg9mzwsxlm0y8m7s9qd9phr1q30qlx2qmdmz7c1mf"; + }; + } { goPackagePath = "github.com/onsi/ginkgo"; fetch = { @@ -243,13 +414,58 @@ sha256 = "0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw"; }; } + { + goPackagePath = "github.com/prometheus/client_golang"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/client_golang"; + rev = "v1.0.0"; + sha256 = "1f03ndyi3jq7zdxinnvzimz3s4z2374r6dikkc8i42xzb6d1bli6"; + }; + } + { + goPackagePath = "github.com/prometheus/client_model"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/client_model"; + rev = "fd36f4220a90"; + sha256 = "1bs5d72k361llflgl94c22n0w53j30rsfh84smgk8mbjbcmjsaa5"; + }; + } + { + goPackagePath = "github.com/prometheus/common"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/common"; + rev = "v0.4.1"; + sha256 = "0sf4sjdckblz1hqdfvripk3zyp8xq89w7q75kbsyg4c078af896s"; + }; + } + { + goPackagePath = "github.com/prometheus/procfs"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/procfs"; + rev = "v0.0.2"; + sha256 = "0s7pvs7fgnfpmym3cd0k219av321h9sf3yvdlnn3qy0ps280lg7k"; + }; + } { goPackagePath = "github.com/sirupsen/logrus"; fetch = { type = "git"; url = "https://github.com/sirupsen/logrus"; - rev = "v1.0.5"; - sha256 = "0g5z7al7kky11ai2dhac6gkp3b5pxsvx72yj3xg4wg3265gbn7yz"; + rev = "v1.2.0"; + sha256 = "0r6334x2bls8ddznvzaldx4g88msjjns4mlks95rqrrg7h0ijigg"; + }; + } + { + goPackagePath = "github.com/stretchr/objx"; + fetch = { + type = "git"; + url = "https://github.com/stretchr/objx"; + rev = "v0.1.1"; + sha256 = "0iph0qmpyqg4kwv8jsx6a56a7hhqq8swrazv40ycxk9rzr0s8yls"; }; } { @@ -257,8 +473,8 @@ fetch = { type = "git"; url = "https://github.com/stretchr/testify"; - rev = "v1.2.2"; - sha256 = "0dlszlshlxbmmfxj5hlwgv3r22x0y1af45gn1vd198nvvs3pnvfs"; + rev = "v1.3.0"; + sha256 = "0wjchp2c8xbgcbbq32w3kvblk6q6yn533g78nxl6iskq6y95lxsy"; }; } { @@ -266,8 +482,8 @@ fetch = { type = "git"; url = "https://github.com/tinylib/msgp"; - rev = "v1.0.2"; - sha256 = "0pypfknghg1hcjjrqz3f1riaylk6hcxn9h0qyzynb74rp0qmlxjc"; + rev = "v1.1.0"; + sha256 = "08ha23sn14071ywrgxlyj7r523vzdwx1i83dcp1mqa830glgqaff"; }; } { @@ -302,17 +518,8 @@ fetch = { type = "git"; url = "https://gitlab.com/gitlab-org/gitaly.git"; - rev = "v1.7.0"; - sha256 = "1hhiyw1ag22mgn6chp8lf29y2fgj90xyb7wjd6s30hayqja7knh1"; - }; - } - { - goPackagePath = "gitlab.com/gitlab-org/gitaly-proto"; - fetch = { - type = "git"; - url = "https://gitlab.com/gitlab-org/gitaly-proto.git"; - rev = "v1.12.0"; - sha256 = "02aqw1q8n84v4f3rc0x7hsg0gkmbqkznp9cl6vrhjvsisv38v695"; + rev = "v1.68.0"; + sha256 = "06w2qx9r7wxhpk6a3icqa0l6hr7x2j2k11kni1ksdx1m1100myjb"; }; } { @@ -338,8 +545,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/crypto"; - rev = "182114d58262"; - sha256 = "0dhagsjpk3wn2f7w148v0h9i651jpk4c0mlsy5sihcnmqz8s764l"; + rev = "20be4c3c3ed5"; + sha256 = "1ph7y8v30hc95h1dwr7vrhg1nzs47a261qin6zg8mhf12g5k2lxb"; }; } { @@ -347,8 +554,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/lint"; - rev = "06c8688daad7"; - sha256 = "0xi94dwvz50a66bq1hp9fyqkym5mcpdxdb1hrfvicldgjf37lc47"; + rev = "d0100b6bd8b3"; + sha256 = "0b0amr9x4ji66iv9ayfx7zrfx52k1m5g66qfcxkgj80qrb1y2yn7"; }; } { @@ -356,8 +563,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/net"; - rev = "10aee1819953"; - sha256 = "1rd6y0fr2gqhx3bsy0ahnacqzbxijkx8wyfmamrb3wbzc01091rl"; + rev = "d28f0bde5980"; + sha256 = "18xj31h70m7xxb7gc86n9i21w6d7djbjz67zfaljm4jqskz6hxkf"; }; } { @@ -374,8 +581,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/sync"; - rev = "1d60e4601c6f"; - sha256 = "046jlanz2lkxq1r57x9bl6s4cvfqaic6p2xybsj8mq1120jv4rs6"; + rev = "112230192c58"; + sha256 = "05i2k43j2d0llq768hg5pf3hb2yhfzp9la1w5wp0rsnnzblr0lfn"; }; } { @@ -383,8 +590,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/sys"; - rev = "70b957f3b65e"; - sha256 = "146jwkr39asigqbsnsigxpkpb4vydld4k9q34xvvw0bp10qzjxxw"; + rev = "953cdadca894"; + sha256 = "0gkha4whk8xkcv3isigbs250akag99isxnd3v9xmy0kl3g88hxy1"; }; } { @@ -401,8 +608,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/tools"; - rev = "6cd1fcedba52"; - sha256 = "00hl0vkmy8impsnmc2dmm55sdhia95k0kqcrjbdpynryn1lamn5d"; + rev = "2c0ae7006135"; + sha256 = "1lsi2ssxajclj3bciz2a41v1vjv768ja3v6wnbyhxy8xphwkp4fk"; }; } { @@ -428,8 +635,8 @@ fetch = { type = "git"; url = "https://github.com/grpc/grpc-go"; - rev = "v1.16.0"; - sha256 = "0a9xl6c5j7lvsb4q6ry5p892rjm86p47d4f8xrf0r8lxblf79qbg"; + rev = "v1.24.0"; + sha256 = "0h8mwv74vzcfb7p4ai247x094skxca71vjp4wpj2wzmri0x9p4v6"; }; } { @@ -442,12 +649,12 @@ }; } { - goPackagePath = "gopkg.in/airbrake/gobrake.v2"; + goPackagePath = "gopkg.in/alecthomas/kingpin.v2"; fetch = { type = "git"; - url = "https://gopkg.in/airbrake/gobrake.v2"; - rev = "v2.0.9"; - sha256 = "1x06f7n7qlyzqgyz0sdfcidf3w4ldn6zs6qx2mhibggk2z4whcjw"; + url = "https://gopkg.in/alecthomas/kingpin.v2"; + rev = "v2.2.6"; + sha256 = "0mndnv3hdngr3bxp7yxfd47cas4prv98sqw534mx7vp38gd88n5r"; }; } { @@ -468,15 +675,6 @@ sha256 = "07va9crci0ijlivbb7q57d2rz9h27zgn2fsm60spjsqpdbvyrx4g"; }; } - { - goPackagePath = "gopkg.in/gemnasium/logrus-airbrake-hook.v2"; - fetch = { - type = "git"; - url = "https://gopkg.in/gemnasium/logrus-airbrake-hook.v2"; - rev = "v2.1.2"; - sha256 = "0sbg0dn6cysmf8f2bi209jwl4jnpiwp4rdghnxlzirw3c32ms5y5"; - }; - } { goPackagePath = "gopkg.in/tomb.v1"; fetch = { @@ -491,8 +689,8 @@ fetch = { type = "git"; url = "https://gopkg.in/yaml.v2"; - rev = "v2.2.1"; - sha256 = "0dwjrs2lp2gdlscs7bsrmyc5yf6mm4fvgw71bzr9mv2qrd2q73s1"; + rev = "v2.2.2"; + sha256 = "01wj12jzsdqlnidpyjssmj0r4yavlqy7dwrg7adqd8dicjc4ncsa"; }; } { @@ -500,8 +698,8 @@ fetch = { type = "git"; url = "https://github.com/dominikh/go-tools"; - rev = "88497007e858"; - sha256 = "0rinkyx3r2bq45mgcasnn5jb07cwbv3p3s2wwcrzxsarsj6wa5lc"; + rev = "ea95bdfd59fc"; + sha256 = "1763nw7pwpzkvzfnm63dgzcgbq9hwmq5l1nffchnhh77vgkaq4ic"; }; } ] diff --git a/pkgs/applications/version-management/gitlab/gitlab-shell/gemset.nix b/pkgs/applications/version-management/gitlab/gitlab-shell/gemset.nix deleted file mode 100644 index 665c21feb1bd..000000000000 --- a/pkgs/applications/version-management/gitlab/gitlab-shell/gemset.nix +++ /dev/null @@ -1,451 +0,0 @@ -{ - abstract_type = { - groups = ["default" "development" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "09330cmhrc2wmfhdj9zzg82sv6cdhm3qgdkva5ni5xfjril2pf14"; - type = "gem"; - }; - version = "0.0.7"; - }; - adamantium = { - dependencies = ["ice_nine" "memoizable"]; - groups = ["default" "development" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0165r2ikgfwv2rm8dzyijkp74fvg0ni72hpdx8ay2v7cj08dqyak"; - type = "gem"; - }; - version = "0.2.0"; - }; - addressable = { - dependencies = ["public_suffix"]; - groups = ["default" "development" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0viqszpkggqi8hq87pqp0xykhvz60g99nwmkwsb0v45kc2liwxvk"; - type = "gem"; - }; - version = "2.5.2"; - }; - ast = { - groups = ["default" "development" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "184ssy3w93nkajlz2c70ifm79jp3j737294kbc5fjw69v1w0n9x7"; - type = "gem"; - }; - version = "2.4.0"; - }; - binding_of_caller = { - dependencies = ["debug_inspector"]; - groups = ["default" "development" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "05syqlks7463zsy1jdfbbdravdhj9hpj5pv2m74blqpv8bq4vv5g"; - type = "gem"; - }; - version = "0.8.0"; - }; - coderay = { - groups = ["default" "development" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "15vav4bhcc2x3jmi3izb11l4d9f3xv8hp2fszb7iqmpsccv1pz4y"; - type = "gem"; - }; - version = "1.1.2"; - }; - concord = { - dependencies = ["adamantium" "equalizer"]; - groups = ["default" "development" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1b6cdn0fg4n9gzbdr7zyf4jq40y6h0c0g9cra7wk9hhmsylk91bg"; - type = "gem"; - }; - version = "0.1.5"; - }; - crack = { - dependencies = ["safe_yaml"]; - groups = ["default" "development" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0abb0fvgw00akyik1zxnq7yv391va148151qxdghnzngv66bl62k"; - type = "gem"; - }; - version = "0.4.3"; - }; - debug_inspector = { - groups = ["default" "development" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0vxr0xa1mfbkfcrn71n7c4f2dj7la5hvphn904vh20j3x4j5lrx0"; - type = "gem"; - }; - version = "0.0.3"; - }; - diff-lcs = { - groups = ["default" "development" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "18w22bjz424gzafv6nzv98h0aqkwz3d9xhm7cbr1wfbyas8zayza"; - type = "gem"; - }; - version = "1.3"; - }; - docile = { - groups = ["default" "development" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0m8j31whq7bm5ljgmsrlfkiqvacrw6iz9wq10r3gwrv5785y8gjx"; - type = "gem"; - }; - version = "1.1.5"; - }; - equalizer = { - groups = ["default" "development" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1kjmx3fygx8njxfrwcmn7clfhjhb6bvv3scy2lyyi0wqyi3brra4"; - type = "gem"; - }; - version = "0.0.11"; - }; - hashdiff = { - groups = ["default" "development" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0yj5l2rw8i8jc725hbcpc4wks0qlaaimr3dpaqamfjkjkxl0hjp9"; - type = "gem"; - }; - version = "0.3.7"; - }; - ice_nine = { - groups = ["default" "development" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1nv35qg1rps9fsis28hz2cq2fx1i96795f91q4nmkm934xynll2x"; - type = "gem"; - }; - version = "0.11.2"; - }; - listen = { - groups = ["development" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0inlw7vix61170vjr87h9izhjm5dbby8rbfrf1iryiv7b3kyvkxl"; - type = "gem"; - }; - version = "0.5.3"; - }; - memoizable = { - dependencies = ["thread_safe"]; - groups = ["default" "development" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0v42bvghsvfpzybfazl14qhkrjvx0xlmxz0wwqc960ga1wld5x5c"; - type = "gem"; - }; - version = "0.4.2"; - }; - method_source = { - groups = ["default" "development" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1pviwzvdqd90gn6y7illcdd9adapw8fczml933p5vl739dkvl3lq"; - type = "gem"; - }; - version = "0.9.2"; - }; - multi_json = { - groups = ["default" "development" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1rl0qy4inf1mp8mybfk56dfga0mvx97zwpmq5xmiwl5r770171nv"; - type = "gem"; - }; - version = "1.13.1"; - }; - parallel = { - groups = ["default" "development" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "01hj8v1qnyl5ndrs33g8ld8ibk0rbcqdpkpznr04gkbxd11pqn67"; - type = "gem"; - }; - version = "1.12.1"; - }; - parser = { - dependencies = ["ast"]; - groups = ["default" "development" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1zp89zg7iypncszxsjp8kiccrpbdf728jl449g6cnfkz990fyb5k"; - type = "gem"; - }; - version = "2.5.1.2"; - }; - powerpack = { - groups = ["default" "development" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1r51d67wd467rpdfl6x43y84vwm8f5ql9l9m85ak1s2sp3nc5hyv"; - type = "gem"; - }; - version = "0.1.2"; - }; - proc_to_ast = { - dependencies = ["coderay" "parser" "unparser"]; - groups = ["default" "development" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "14c65w48bbzp5lh1cngqd1y25kqvfnq1iy49hlzshl12dsk3z9wj"; - type = "gem"; - }; - version = "0.1.0"; - }; - procto = { - groups = ["default" "development" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "13imvg1x50rz3r0yyfbhxwv72lbf7q28qx9l9nfbb91h2n9ch58c"; - type = "gem"; - }; - version = "0.0.3"; - }; - pry = { - dependencies = ["coderay" "method_source"]; - groups = ["development" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "00rm71x0r1jdycwbs83lf9l6p494m99asakbvqxh8rz7zwnlzg69"; - type = "gem"; - }; - version = "0.12.2"; - }; - public_suffix = { - groups = ["default" "development" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "08q64b5br692dd3v0a9wq9q5dvycc6kmiqmjbdxkxbfizggsvx6l"; - type = "gem"; - }; - version = "3.0.3"; - }; - rainbow = { - dependencies = ["rake"]; - groups = ["default" "development" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "08w2ghc5nv0kcq5b257h7dwjzjz1pqcavajfdx2xjyxqsvh2y34w"; - type = "gem"; - }; - version = "2.2.2"; - }; - rake = { - groups = ["default" "development" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1cvaqarr1m84mhc006g3l1vw7sa5qpkcw0138lsxlf769zdllsgp"; - type = "gem"; - }; - version = "12.3.3"; - }; - rspec = { - dependencies = ["rspec-core" "rspec-expectations" "rspec-mocks"]; - groups = ["development" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "15ppasvb9qrscwlyjz67ppw1lnxiqnkzx5vkx1bd8x5n3dhikxc3"; - type = "gem"; - }; - version = "3.8.0"; - }; - rspec-core = { - dependencies = ["rspec-support"]; - groups = ["default" "development" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1p1s5bnbqp3sxk67y0fh0x884jjym527r0vgmhbm81w7aq6b7l4p"; - type = "gem"; - }; - version = "3.8.0"; - }; - rspec-expectations = { - dependencies = ["diff-lcs" "rspec-support"]; - groups = ["default" "development" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0vfqqcjmhdq25jrc8rd7nx4n8xid7s1ynv65ph06bk2xafn3rgll"; - type = "gem"; - }; - version = "3.8.1"; - }; - rspec-mocks = { - dependencies = ["diff-lcs" "rspec-support"]; - groups = ["default" "development" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "06y508cjqycb4yfhxmb3nxn0v9xqf17qbd46l1dh4xhncinr4fyp"; - type = "gem"; - }; - version = "3.8.0"; - }; - rspec-parameterized = { - dependencies = ["binding_of_caller" "parser" "proc_to_ast" "rspec" "unparser"]; - groups = ["development" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0arynbr6cfjhccwc8gy2xf87nybdnncsnmfwknnh8s7d4mj730p0"; - type = "gem"; - }; - version = "0.4.0"; - }; - rspec-support = { - groups = ["default" "development" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0p3m7drixrlhvj2zpc38b11x145bvm311x6f33jjcxmvcm0wq609"; - type = "gem"; - }; - version = "3.8.0"; - }; - rubocop = { - dependencies = ["parallel" "parser" "powerpack" "rainbow" "ruby-progressbar" "unicode-display_width"]; - groups = ["development" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1mqyylfzch0967w7nfnqza84sqhljijd9y4bnq8hcmrscch75cxw"; - type = "gem"; - }; - version = "0.49.1"; - }; - ruby-progressbar = { - groups = ["default" "development" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1igh1xivf5h5g3y5m9b4i4j2mhz2r43kngh4ww3q1r80ch21nbfk"; - type = "gem"; - }; - version = "1.9.0"; - }; - safe_yaml = { - groups = ["default" "development" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1hly915584hyi9q9vgd968x2nsi5yag9jyf5kq60lwzi5scr7094"; - type = "gem"; - }; - version = "1.0.4"; - }; - simplecov = { - dependencies = ["docile" "multi_json" "simplecov-html"]; - groups = ["development" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1a3wy9zlmfwl3f47cibnxyxrgfz16y6fmy0dj1vyidzyys4mvy12"; - type = "gem"; - }; - version = "0.9.2"; - }; - simplecov-html = { - groups = ["default" "development" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0jv9pmpaxihrcsgcf6mgl3qg7rhf9scl5l2k67d768w9cz63xgvc"; - type = "gem"; - }; - version = "0.9.0"; - }; - thread_safe = { - groups = ["default" "development" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0nmhcgq6cgz44srylra07bmaw99f5271l0dpsvl5f75m44l0gmwy"; - type = "gem"; - }; - version = "0.3.6"; - }; - unicode-display_width = { - groups = ["default" "development" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0040bsdpcmvp8w31lqi2s9s4p4h031zv52401qidmh25cgyh4a57"; - type = "gem"; - }; - version = "1.4.0"; - }; - unparser = { - dependencies = ["abstract_type" "adamantium" "concord" "diff-lcs" "equalizer" "parser" "procto"]; - groups = ["default" "development" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0rh1649846ac17av30x0b0v9l45v0x1j2y1i8m1a7xdd0v4sld0z"; - type = "gem"; - }; - version = "0.2.8"; - }; - vcr = { - groups = ["development" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0qh7lkj9b0shph84dw1wsrlaprl0jn1i4339fpsfy99402290zrr"; - type = "gem"; - }; - version = "4.0.0"; - }; - webmock = { - dependencies = ["addressable" "crack" "hashdiff"]; - groups = ["development" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "03994dxs4xayvkxqp01dd1ivhg4xxx7z35f7cxw7y2mwj3xn24ib"; - type = "gem"; - }; - version = "3.4.2"; - }; -} \ No newline at end of file diff --git a/pkgs/applications/version-management/gitlab/gitlab-shell/remove-hardcoded-locations-go.patch b/pkgs/applications/version-management/gitlab/gitlab-shell/remove-hardcoded-locations-go.patch deleted file mode 100644 index a4a1a979b248..000000000000 --- a/pkgs/applications/version-management/gitlab/gitlab-shell/remove-hardcoded-locations-go.patch +++ /dev/null @@ -1,42 +0,0 @@ -diff --git a/go/internal/config/config.go b/go/internal/config/config.go -index f951fe6..b422fe3 100644 ---- a/go/internal/config/config.go -+++ b/go/internal/config/config.go -@@ -3,7 +3,6 @@ package config - import ( - "io/ioutil" - "net/url" -- "os" - "path" - "strings" - -@@ -44,16 +43,13 @@ type Config struct { - } - - func New() (*Config, error) { -- dir, err := os.Getwd() -- if err != nil { -- return nil, err -- } -+ dir := "/run/gitlab" - - return NewFromDir(dir) - } - - func NewFromDir(dir string) (*Config, error) { -- return newFromFile(path.Join(dir, configFile)) -+ return newFromFile("/run/gitlab/shell-config.yml") - } - - func (c *Config) FeatureEnabled(featureName string) bool { -diff --git a/go/internal/command/fallback/fallback.go b/go/internal/command/fallback/fallback.go -index 2cb76a8..f59ad5e 100644 ---- a/go/internal/command/fallback/fallback.go -+++ b/go/internal/command/fallback/fallback.go -@@ -53,5 +53,5 @@ - func (c *Command) fallbackProgram() string { - fileName := fmt.Sprintf("%s-ruby", c.Executable.Name) - -- return filepath.Join(c.RootDir, "bin", fileName) -+ return filepath.Join("/run/current-system/sw/bin", fileName) - } diff --git a/pkgs/applications/version-management/gitlab/gitlab-shell/remove-hardcoded-locations-ruby.patch b/pkgs/applications/version-management/gitlab/gitlab-shell/remove-hardcoded-locations-ruby.patch deleted file mode 100644 index 64623ae310c0..000000000000 --- a/pkgs/applications/version-management/gitlab/gitlab-shell/remove-hardcoded-locations-ruby.patch +++ /dev/null @@ -1,27 +0,0 @@ -diff --git a/lib/gitlab_keys.rb b/lib/gitlab_keys.rb -index 0600a18..c46f2d7 100644 ---- a/lib/gitlab_keys.rb -+++ b/lib/gitlab_keys.rb -@@ -2,7 +2,7 @@ class GitlabKeys # rubocop:disable Metrics/ClassLength - attr_accessor :auth_file, :key - - def self.command(whatever) -- "#{ROOT_PATH}/bin/gitlab-shell #{whatever}" -+ "/run/current-system/sw/bin/gitlab-shell #{whatever}" - end - - def self.command_key(key_id) -diff --git a/lib/gitlab_shell.rb b/lib/gitlab_shell.rb -index 2cb76a8..f59ad5e 100644 ---- a/lib/gitlab_shell.rb -+++ b/lib/gitlab_shell.rb -@@ -195,7 +195,8 @@ class GitlabShell # rubocop:disable Metrics/ClassLength - - args = [executable, gitaly_address, json_args] - # We use 'chdir: ROOT_PATH' to let the next executable know where config.yml is. -- Kernel.exec(env, *args, unsetenv_others: true, chdir: ROOT_PATH) -+ # Except we don't, because we're already in the right directory on nixos! -+ Kernel.exec(env, *args, unsetenv_others: true) - end - - def api diff --git a/pkgs/applications/version-management/gitlab/gitlab-shell/remove-hardcoded-locations.patch b/pkgs/applications/version-management/gitlab/gitlab-shell/remove-hardcoded-locations.patch new file mode 100644 index 000000000000..515a41ad34eb --- /dev/null +++ b/pkgs/applications/version-management/gitlab/gitlab-shell/remove-hardcoded-locations.patch @@ -0,0 +1,57 @@ +diff --git a/go/internal/config/config.go b/go/internal/config/config.go +index 2231851..c869930 100644 +--- a/go/internal/config/config.go ++++ b/go/internal/config/config.go +@@ -3,7 +3,6 @@ package config + import ( + "io/ioutil" + "net/url" +- "os" + "path" + "path/filepath" + +@@ -38,16 +37,13 @@ type Config struct { + } + + func New() (*Config, error) { +- dir, err := os.Getwd() +- if err != nil { +- return nil, err +- } ++ dir := "/run/gitlab" + + return NewFromDir(dir) + } + + func NewFromDir(dir string) (*Config, error) { +- return newFromFile(path.Join(dir, configFile)) ++ return newFromFile("/run/gitlab/shell-config.yml") + } + + func newFromFile(filename string) (*Config, error) { +diff --git a/go/internal/keyline/key_line.go b/go/internal/keyline/key_line.go +index f92f50b..160e287 100644 +--- a/go/internal/keyline/key_line.go ++++ b/go/internal/keyline/key_line.go +@@ -36,7 +36,7 @@ func NewPrincipalKeyLine(keyId string, principal string, rootDir string) (*KeyLi + } + + func (k *KeyLine) ToString() string { +- command := fmt.Sprintf("%s %s-%s", path.Join(k.RootDir, executable.BinDir, executable.GitlabShell), k.Prefix, k.Id) ++ command := fmt.Sprintf("%s %s-%s", path.Join("/run/current-system/sw/bin", executable.GitlabShell), k.Prefix, k.Id) + + return fmt.Sprintf(`command="%s",%s %s`, command, SshOptions, k.Value) + } +diff --git a/support/gitlab_config.rb b/support/gitlab_config.rb +index 1416488..90a5f79 100644 +--- a/support/gitlab_config.rb ++++ b/support/gitlab_config.rb +@@ -4,7 +4,7 @@ class GitlabConfig + attr_reader :config + + def initialize +- @config = YAML.load_file(File.join(ROOT_PATH, 'config.yml')) ++ @config = YAML.load_file('/run/gitlab/shell-config.yml') + end + + def auth_file diff --git a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix index 09a3cee195dd..b8364c1efeba 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix +++ b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix @@ -3,20 +3,19 @@ buildGoPackage rec { pname = "gitlab-workhorse"; - version = "8.10.0"; + version = "8.14.0"; src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-workhorse"; rev = "v${version}"; - sha256 = "11cfhh48dga5ghfcijb68gbx0nfr5bs3vvp2j1gam9ac37fpvk0x"; + sha256 = "1cqx75h4x4chjvp72kzbln8qkm5p7p2w7x8bdd99g38kf21wxxaq"; }; goPackagePath = "gitlab.com/gitlab-org/gitlab-workhorse"; goDeps = ./deps.nix; buildInputs = [ git ]; - - makeFlags = [ "PREFIX=$(out)" "VERSION=${version}" "GOCACHE=$(TMPDIR)/go-cache" ]; + buildFlagsArray = "-ldflags=-X main.Version=${version}"; # gitlab-workhorse depends on an older version of labkit which # contains old, vendored versions of some packages; gitlab-workhorse diff --git a/pkgs/applications/version-management/gitlab/remove-hardcoded-locations.patch b/pkgs/applications/version-management/gitlab/remove-hardcoded-locations.patch index 7a2bfea0c109..846bdeff48d3 100644 --- a/pkgs/applications/version-management/gitlab/remove-hardcoded-locations.patch +++ b/pkgs/applications/version-management/gitlab/remove-hardcoded-locations.patch @@ -150,3 +150,14 @@ index b276a81eac..070e3ebd81 100644 end end end +--- a/lib/gitlab/authorized_keys.rb ++++ b/lib/gitlab/authorized_keys.rb +@@ -157,7 +157,7 @@ + raise KeyError, "Invalid ID: #{id.inspect}" + end + +- "#{File.join(Gitlab.config.gitlab_shell.path, 'bin', 'gitlab-shell')} #{id}" ++ "#{File.join('/run/current-system/sw/bin', 'gitlab-shell')} #{id}" + end + + def strip(key) diff --git a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile index 864e514ae0d4..920f778c053f 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile +++ b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile @@ -87,9 +87,9 @@ gem 'rack-cors', '~> 1.0.0', require: 'rack/cors' # GraphQL API gem 'graphql', '~> 1.9.11' -# NOTE: graphiql-rails v1.5+ doesn't work: https://gitlab.com/gitlab-org/gitlab-ce/issues/67293 +# NOTE: graphiql-rails v1.5+ doesn't work: https://gitlab.com/gitlab-org/gitlab/issues/31771 # TODO: remove app/views/graphiql/rails/editors/show.html.erb when https://github.com/rmosolgo/graphiql-rails/pull/71 is released: -# https://gitlab.com/gitlab-org/gitlab-ce/issues/67263 +# https://gitlab.com/gitlab-org/gitlab/issues/31747 gem 'graphiql-rails', '~> 1.4.10' gem 'apollo_upload_server', '~> 2.0.0.beta3' gem 'graphql-docs', '~> 1.6.0', group: [:development, :test] @@ -148,7 +148,7 @@ gem 'wikicloth', '0.8.1' gem 'asciidoctor', '~> 2.0.10' gem 'asciidoctor-include-ext', '~> 0.3.1', require: false gem 'asciidoctor-plantuml', '0.0.9' -gem 'rouge', '~> 3.7' +gem 'rouge', '~> 3.11.0' gem 'truncato', '~> 0.7.11' gem 'bootstrap_form', '~> 4.2.0' gem 'nokogiri', '~> 1.10.4' @@ -311,7 +311,7 @@ gem 'gettext', '~> 3.2.2', require: false, group: :development gem 'batch-loader', '~> 1.4.0' # Perf bar -# https://gitlab.com/gitlab-org/gitlab-ee/issues/13996 +# https://gitlab.com/gitlab-org/gitlab/issues/13996 gem 'gitlab-peek', '~> 0.0.1', require: 'peek' # Snowplow events tracking @@ -355,7 +355,7 @@ group :development, :test do gem 'fuubar', '~> 2.2.0' gem 'database_cleaner', '~> 1.7.0' - gem 'factory_bot_rails', '~> 4.8.2' + gem 'factory_bot_rails', '~> 5.1.0' gem 'rspec-rails', '~> 3.8.0' gem 'rspec-retry', '~> 0.6.1' gem 'rspec_profiling', '~> 0.0.5' @@ -405,7 +405,7 @@ group :test do gem 'webmock', '~> 3.5.1' gem 'rails-controller-testing' gem 'concurrent-ruby', '~> 1.1' - gem 'test-prof', '~> 0.2.5' + gem 'test-prof', '~> 0.10.0' gem 'rspec_junit_formatter' end @@ -446,7 +446,7 @@ group :ed25519 do end # Gitaly GRPC protocol definitions -gem 'gitaly', '~> 1.58.0' +gem 'gitaly', '~> 1.65.0' gem 'grpc', '~> 1.19.0' @@ -465,7 +465,7 @@ gem 'lograge', '~> 0.5' gem 'grape_logging', '~> 1.7' # DNS Lookup -gem 'net-dns', '~> 0.9.0' +gem 'gitlab-net-dns', '~> 0.9.1' # Countries list gem 'countries', '~> 3.0' diff --git a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock index fec34622be39..18160932c56f 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock +++ b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock @@ -108,7 +108,7 @@ GEM binding_ninja (0.2.3) binding_of_caller (0.8.0) debug_inspector (>= 0.0.1) - bootsnap (1.4.4) + bootsnap (1.4.5) msgpack (~> 1.0) bootstrap_form (4.2.0) actionpack (>= 5.0) @@ -209,10 +209,10 @@ GEM descendants_tracker (0.0.4) thread_safe (~> 0.3, >= 0.3.1) device_detector (1.0.0) - devise (4.6.2) + devise (4.7.1) bcrypt (~> 3.0) orm_adapter (~> 0.1) - railties (>= 4.1.0, < 6.0) + railties (>= 4.1.0) responders warden (~> 1.2.3) devise-two-factor (3.0.0) @@ -254,7 +254,7 @@ GEM mail (~> 2.7) encryptor (3.0.0) equalizer (0.0.11) - erubi (1.8.0) + erubi (1.9.0) escape_utils (1.2.1) et-orbi (1.2.1) tzinfo @@ -264,11 +264,11 @@ GEM expression_parser (0.9.0) extended-markdown-filter (0.6.0) html-pipeline (~> 2.0) - factory_bot (4.8.2) - activesupport (>= 3.0.0) - factory_bot_rails (4.8.2) - factory_bot (~> 4.8.2) - railties (>= 3.0.0) + factory_bot (5.1.0) + activesupport (>= 4.2.0) + factory_bot_rails (5.1.0) + factory_bot (~> 5.1.0) + railties (>= 4.2.0) faraday (0.12.2) multipart-post (>= 1.2, < 3) faraday-http-cache (2.0.0) @@ -358,7 +358,7 @@ GEM po_to_json (>= 1.0.0) rails (>= 3.2.0) git (1.5.0) - gitaly (1.58.0) + gitaly (1.65.0) grpc (~> 1.0) github-markup (1.7.0) gitlab-labkit (0.5.2) @@ -370,6 +370,7 @@ GEM redis (> 3.0.0, < 5.0.0) gitlab-license (1.0.0) gitlab-markup (1.7.0) + gitlab-net-dns (0.9.1) gitlab-peek (0.0.1) railties (>= 4.0.0) gitlab-sidekiq-fetcher (0.5.2) @@ -487,7 +488,7 @@ GEM mime-types (~> 3.0) multi_xml (>= 0.5.2) httpclient (2.8.3) - i18n (1.6.0) + i18n (1.7.0) concurrent-ruby (~> 1.0) i18n_data (0.8.0) icalendar (2.4.1) @@ -565,7 +566,7 @@ GEM activesupport (>= 4) railties (>= 4) request_store (~> 1.0) - loofah (2.2.3) + loofah (2.3.0) crass (~> 1.0.2) nokogiri (>= 1.5.9) mail (2.7.1) @@ -586,7 +587,7 @@ GEM mini_mime (1.0.1) mini_portile2 (2.4.0) minitest (5.11.3) - msgpack (1.3.0) + msgpack (1.3.1) multi_json (1.13.1) multi_xml (0.6.0) multipart-post (2.0.0) @@ -596,7 +597,6 @@ GEM mustermann (~> 1.0.0) nakayoshi_fork (0.0.4) nap (1.1.0) - net-dns (0.9.0) net-ldap (0.16.0) net-ntp (2.1.3) net-ssh (5.2.0) @@ -770,8 +770,8 @@ GEM rails-dom-testing (2.0.3) activesupport (>= 4.2.0) nokogiri (>= 1.6) - rails-html-sanitizer (1.2.0) - loofah (~> 2.2, >= 2.2.2) + rails-html-sanitizer (1.3.0) + loofah (~> 2.3) rails-i18n (5.1.1) i18n (>= 0.7, < 2) railties (>= 5.0, < 6) @@ -783,7 +783,7 @@ GEM thor (>= 0.19.0, < 2.0) rainbow (3.0.0) raindrops (0.19.0) - rake (12.3.2) + rake (12.3.3) rb-fsevent (0.10.2) rb-inotify (0.9.10) ffi (>= 0.5.0, < 2) @@ -824,9 +824,9 @@ GEM declarative-option (< 0.2.0) uber (< 0.2.0) request_store (1.3.1) - responders (2.4.0) - actionpack (>= 4.2.0, < 5.3) - railties (>= 4.2.0, < 5.3) + responders (2.4.1) + actionpack (>= 4.2.0, < 6.0) + railties (>= 4.2.0, < 6.0) rest-client (2.0.2) http-cookie (>= 1.0.2, < 2.0) mime-types (>= 1.16, < 4.0) @@ -834,7 +834,7 @@ GEM retriable (3.1.2) rinku (2.0.0) rotp (2.1.2) - rouge (3.7.0) + rouge (3.11.0) rqrcode (0.7.0) chunky_png rqrcode-rails3 (0.1.7) @@ -994,7 +994,7 @@ GEM temple (0.8.1) terminal-table (1.8.0) unicode-display_width (~> 1.1, >= 1.1.1) - test-prof (0.2.5) + test-prof (0.10.0) text (1.3.1) thin (1.7.2) daemons (~> 1.0, >= 1.0.9) @@ -1058,8 +1058,8 @@ GEM descendants_tracker (~> 0.0, >= 0.0.3) equalizer (~> 0.0, >= 0.0.9) vmstat (2.3.0) - warden (1.2.7) - rack (>= 1.0) + warden (1.2.8) + rack (>= 2.0.6) webfinger (1.1.0) activesupport httpclient (>= 2.4) @@ -1144,7 +1144,7 @@ DEPENDENCIES email_reply_trimmer (~> 0.1) email_spec (~> 2.2.0) escape_utils (~> 1.1) - factory_bot_rails (~> 4.8.2) + factory_bot_rails (~> 5.1.0) faraday (~> 0.12) faraday_middleware-aws-signers-v4 fast_blank @@ -1168,11 +1168,12 @@ DEPENDENCIES gettext (~> 3.2.2) gettext_i18n_rails (~> 1.8.0) gettext_i18n_rails_js (~> 1.3) - gitaly (~> 1.58.0) + gitaly (~> 1.65.0) github-markup (~> 1.7.0) gitlab-labkit (~> 0.5) gitlab-license (~> 1.0) gitlab-markup (~> 1.7.0) + gitlab-net-dns (~> 0.9.1) gitlab-peek (~> 0.0.1) gitlab-sidekiq-fetcher (= 0.5.2) gitlab-styles (~> 2.7) @@ -1222,7 +1223,6 @@ DEPENDENCIES mini_magick minitest (~> 5.11.0) nakayoshi_fork (~> 0.0.4) - net-dns (~> 0.9.0) net-ldap net-ntp net-ssh (~> 5.2) @@ -1276,7 +1276,7 @@ DEPENDENCIES redis-rails (~> 5.0.2) request_store (~> 1.3) responders (~> 2.0) - rouge (~> 3.7) + rouge (~> 3.11.0) rqrcode-rails3 (~> 0.1.7) rspec-parameterized rspec-rails (~> 3.8.0) @@ -1314,7 +1314,7 @@ DEPENDENCIES stackprof (~> 0.2.10) state_machines-activerecord (~> 0.5.1) sys-filesystem (~> 1.1.6) - test-prof (~> 0.2.5) + test-prof (~> 0.10.0) thin (~> 1.7.0) timecop (~> 0.8.0) toml-rb (~> 1.0.0) diff --git a/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix b/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix index 4e71ea72ed99..84a984ea2b35 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix +++ b/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix @@ -482,10 +482,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1jcc0x0l3jqap8r8l1j994ljh93c8hcppm59mjzpa0hdvprh23av"; + sha256 = "0dyjk2irr0d3d3am2dzipg1zyv2nz69a16g8xkprxfa0na07wvs0"; type = "gem"; }; - version = "1.4.4"; + version = "1.4.5"; }; bootstrap_form = { dependencies = ["actionpack" "activemodel"]; @@ -975,10 +975,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "04b2p61mqfb6ln8s2lhmvnkd45wjjinykbn9svmhs54kacrrjkcf"; + sha256 = "0a64xq0dj6p0firpg4mrrfmlakpv17hky5yfrjhchs2sybmymr9i"; type = "gem"; }; - version = "4.6.2"; + version = "4.7.1"; }; devise-two-factor = { dependencies = ["activesupport" "attr_encrypted" "devise" "railties" "rotp"]; @@ -1175,10 +1175,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1kagnf6ziahj0d781s6ryy6fwqwa3ad4xbzzj84p9m4nv4c2jir1"; + sha256 = "1nwzxnqhr31fn7nbqmffcysvxjdfl3bhxi0bld5qqhcnfc1xd13x"; type = "gem"; }; - version = "1.8.0"; + version = "1.9.0"; }; escape_utils = { groups = ["default" "development" "test"]; @@ -1258,10 +1258,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0r975ba6y0mcy3aya099gpnjn5gf1h6fbw8f3smmjay5zvin3nwx"; + sha256 = "04mvwcdh1056r79vq969vlncrcy53fkhw0iixpqvp8gnx5ajbsv6"; type = "gem"; }; - version = "4.8.2"; + version = "5.1.0"; }; factory_bot_rails = { dependencies = ["factory_bot" "railties"]; @@ -1269,10 +1269,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0cdbp12ih2w77l331frv8gv6bv9dinn1663dy1jn0gb9ss1hwvs2"; + sha256 = "02q7lwfdilwahza2jz0p0kc2rragv617q9r2yy72syv6lfy923sx"; type = "gem"; }; - version = "4.8.2"; + version = "5.1.0"; }; faraday = { dependencies = ["multipart-post"]; @@ -1645,10 +1645,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "00di7rl1171rvpncxnfdpnmqc32kx9xmi6nwrn52k8cyrxzz2ixf"; + sha256 = "0h8jzwifqgkrgh9d05g0vsdkyrnk75i53lmm3pfp9rj47gvn1z1j"; type = "gem"; }; - version = "1.58.0"; + version = "1.65.0"; }; github-markup = { groups = ["default"]; @@ -1691,6 +1691,16 @@ }; version = "1.7.0"; }; + gitlab-net-dns = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1jylfc47477imjmzc4jq7zsxklhrws6q4bb0zzl33drirf6s1ldw"; + type = "gem"; + }; + version = "0.9.1"; + }; gitlab-peek = { dependencies = ["railties"]; groups = ["default"]; @@ -2127,10 +2137,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1hfxnlyr618s25xpafw9mypa82qppjccbh292c4l3bj36az7f6wl"; + sha256 = "0hmypvx9iyc0b4hski7aic2xzm09cg1c7q1qlpnk3k8s5acxzyhl"; type = "gem"; }; - version = "1.6.0"; + version = "1.7.0"; }; i18n_data = { groups = ["default"]; @@ -2467,10 +2477,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1ccsid33xjajd0im2xv941aywi58z7ihwkvaf1w2bv89vn5bhsjg"; + sha256 = "06kfq90vi38gv6i128f4zg462kj32szs5vsgm25hxgw9zd12pj9x"; type = "gem"; }; - version = "2.2.3"; + version = "2.3.0"; }; mail = { dependencies = ["mini_mime"]; @@ -2625,10 +2635,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1186lhwnxiw5ryv6dbxrsfy0fajfll2l95kf9pmca50iyiqi86zn"; + sha256 = "1qr2mkm2i3m76zarvy7qgjl9596hmvjrg7x6w42vx8cfsbf5p0y1"; type = "gem"; }; - version = "1.3.0"; + version = "1.3.1"; }; multi_json = { groups = ["default"]; @@ -2711,16 +2721,6 @@ }; version = "1.1.0"; }; - net-dns = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "18d97xjphw21naaqfhgxp95ikr1d79rx708b2df3xm01j6isqy1d"; - type = "gem"; - }; - version = "0.9.0"; - }; net-ldap = { groups = ["default"]; platforms = []; @@ -3480,10 +3480,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ilwxzm3a7bql5c9q2n9g9nb1hax7vd8d65a5yp3d967ld97nvrq"; + sha256 = "1icpqmxbppl4ynzmn6dx7wdil5hhq6fz707m9ya6d86c7ys8sd4f"; type = "gem"; }; - version = "1.2.0"; + version = "1.3.0"; }; rails-i18n = { dependencies = ["i18n" "railties"]; @@ -3532,10 +3532,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1sy5a7nh6xjdc9yhcw31jji7ssrf9v5806hn95gbrzr998a2ydjn"; + sha256 = "1cvaqarr1m84mhc006g3l1vw7sa5qpkcw0138lsxlf769zdllsgp"; type = "gem"; }; - version = "12.3.2"; + version = "12.3.3"; }; rb-fsevent = { groups = ["default" "development" "test"]; @@ -3758,10 +3758,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1rhdyyvvm26f2l3fgwdp6xasfl2y0whwgy766bhdwz697mf78zfn"; + sha256 = "18lqbiyc7234vd6iwxia5yvvzg6bdvdwl2nm4a5y7ia5fxjl3kqm"; type = "gem"; }; - version = "2.4.0"; + version = "2.4.1"; }; rest-client = { dependencies = ["http-cookie" "mime-types" "netrc"]; @@ -3809,10 +3809,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0pv628bqalippv8vjs3003qpl3zab9g44vqzydgcwxd628r5k9sv"; + sha256 = "1zsyv6abqrk7lpql5f1ja4m88bfy9qndi8xykpss6cpvjdmi3ydb"; type = "gem"; }; - version = "3.7.0"; + version = "3.11.0"; }; rqrcode = { dependencies = ["chunky_png"]; @@ -4513,10 +4513,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "08nvn3c1mzgcjgk9lr3py0zjd8fjjrm3ncn9rpqkfbx429mgw2l3"; + sha256 = "0ag33hv8ky8nxpsra9jkam9npi1jjwb7f7zmvi2najci5mdr10nr"; type = "gem"; }; - version = "0.2.5"; + version = "0.10.0"; }; text = { groups = ["default" "development"]; @@ -4839,10 +4839,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0va966lhpylcwbqb9n151kkihx30agh0a57mwjwdxyanll4s1q12"; + sha256 = "1fr9n9i9r82xb6i61fdw4xgc7zjv7fsdrr4k0njchy87iw9fl454"; type = "gem"; }; - version = "1.2.7"; + version = "1.2.8"; }; webfinger = { dependencies = ["activesupport" "httpclient"]; diff --git a/pkgs/applications/version-management/gitlab/update.py b/pkgs/applications/version-management/gitlab/update.py index 38acf41c6f2f..1aeb459f64c9 100755 --- a/pkgs/applications/version-management/gitlab/update.py +++ b/pkgs/applications/version-management/gitlab/update.py @@ -193,15 +193,10 @@ def update_gitlab_shell(): repo = GitLabRepo(repo='gitlab-shell') gitlab_shell_dir = pathlib.Path(__file__).parent / 'gitlab-shell' - for fn in ['Gemfile.lock', 'Gemfile']: - with open(gitlab_shell_dir / fn, 'w') as f: - f.write(repo.get_file(fn, f"v{gitlab_shell_version}")) - for fn in ['go.mod', 'go.sum']: with open(gitlab_shell_dir / fn, 'w') as f: f.write(repo.get_file(f"go/{fn}", f"v{gitlab_shell_version}")) - subprocess.check_output(['bundix'], cwd=gitlab_shell_dir) subprocess.check_output(['vgo2nix'], cwd=gitlab_shell_dir) for fn in ['go.mod', 'go.sum']: diff --git a/pkgs/applications/version-management/gitlab/yarnPkgs.nix b/pkgs/applications/version-management/gitlab/yarnPkgs.nix index 350d8a1ab0df..cff2603129d5 100644 --- a/pkgs/applications/version-management/gitlab/yarnPkgs.nix +++ b/pkgs/applications/version-management/gitlab/yarnPkgs.nix @@ -10,19 +10,19 @@ }; } { - name = "_babel_core___core_7.5.5.tgz"; + name = "_babel_core___core_7.6.2.tgz"; path = fetchurl { - name = "_babel_core___core_7.5.5.tgz"; - url = "https://registry.yarnpkg.com/@babel/core/-/core-7.5.5.tgz"; - sha1 = "17b2686ef0d6bc58f963dddd68ab669755582c30"; + name = "_babel_core___core_7.6.2.tgz"; + url = "https://registry.yarnpkg.com/@babel/core/-/core-7.6.2.tgz"; + sha1 = "069a776e8d5e9eefff76236bc8845566bd31dd91"; }; } { - name = "_babel_generator___generator_7.5.5.tgz"; + name = "_babel_generator___generator_7.6.2.tgz"; path = fetchurl { - name = "_babel_generator___generator_7.5.5.tgz"; - url = "https://registry.yarnpkg.com/@babel/generator/-/generator-7.5.5.tgz"; - sha1 = "873a7f936a3c89491b43536d12245b626664e3cf"; + name = "_babel_generator___generator_7.6.2.tgz"; + url = "https://registry.yarnpkg.com/@babel/generator/-/generator-7.6.2.tgz"; + sha1 = "dac8a3c2df118334c2a29ff3446da1636a8f8c03"; }; } { @@ -58,11 +58,11 @@ }; } { - name = "_babel_helper_create_class_features_plugin___helper_create_class_features_plugin_7.5.5.tgz"; + name = "_babel_helper_create_class_features_plugin___helper_create_class_features_plugin_7.6.0.tgz"; path = fetchurl { - name = "_babel_helper_create_class_features_plugin___helper_create_class_features_plugin_7.5.5.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.5.5.tgz"; - sha1 = "401f302c8ddbc0edd36f7c6b2887d8fa1122e5a4"; + name = "_babel_helper_create_class_features_plugin___helper_create_class_features_plugin_7.6.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.6.0.tgz"; + sha1 = "769711acca889be371e9bc2eb68641d55218021f"; }; } { @@ -194,11 +194,11 @@ }; } { - name = "_babel_helpers___helpers_7.5.5.tgz"; + name = "_babel_helpers___helpers_7.6.2.tgz"; path = fetchurl { - name = "_babel_helpers___helpers_7.5.5.tgz"; - url = "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.5.5.tgz"; - sha1 = "63908d2a73942229d1e6685bc2a0e730dde3b75e"; + name = "_babel_helpers___helpers_7.6.2.tgz"; + url = "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.6.2.tgz"; + sha1 = "681ffe489ea4dcc55f23ce469e58e59c1c045153"; }; } { @@ -218,11 +218,11 @@ }; } { - name = "_babel_parser___parser_7.5.5.tgz"; + name = "_babel_parser___parser_7.6.2.tgz"; path = fetchurl { - name = "_babel_parser___parser_7.5.5.tgz"; - url = "https://registry.yarnpkg.com/@babel/parser/-/parser-7.5.5.tgz"; - sha1 = "02f077ac8817d3df4a832ef59de67565e71cca4b"; + name = "_babel_parser___parser_7.6.2.tgz"; + url = "https://registry.yarnpkg.com/@babel/parser/-/parser-7.6.2.tgz"; + sha1 = "205e9c95e16ba3b8b96090677a67c9d6075b70a1"; }; } { @@ -330,11 +330,11 @@ }; } { - name = "_babel_plugin_proposal_object_rest_spread___plugin_proposal_object_rest_spread_7.5.5.tgz"; + name = "_babel_plugin_proposal_object_rest_spread___plugin_proposal_object_rest_spread_7.6.2.tgz"; path = fetchurl { - name = "_babel_plugin_proposal_object_rest_spread___plugin_proposal_object_rest_spread_7.5.5.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.5.5.tgz"; - sha1 = "61939744f71ba76a3ae46b5eea18a54c16d22e58"; + name = "_babel_plugin_proposal_object_rest_spread___plugin_proposal_object_rest_spread_7.6.2.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.6.2.tgz"; + sha1 = "8ffccc8f3a6545e9f78988b6bf4fe881b88e8096"; }; } { @@ -362,11 +362,11 @@ }; } { - name = "_babel_plugin_proposal_private_methods___plugin_proposal_private_methods_7.4.4.tgz"; + name = "_babel_plugin_proposal_private_methods___plugin_proposal_private_methods_7.6.0.tgz"; path = fetchurl { - name = "_babel_plugin_proposal_private_methods___plugin_proposal_private_methods_7.4.4.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.4.4.tgz"; - sha1 = "307b7db29d8ae2d259e7c0e6e665b1922d7ac856"; + name = "_babel_plugin_proposal_private_methods___plugin_proposal_private_methods_7.6.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.6.0.tgz"; + sha1 = "19ddc493c7b5d47afdd4291e740c609a83c9fae4"; }; } { @@ -378,11 +378,11 @@ }; } { - name = "_babel_plugin_proposal_unicode_property_regex___plugin_proposal_unicode_property_regex_7.4.4.tgz"; + name = "_babel_plugin_proposal_unicode_property_regex___plugin_proposal_unicode_property_regex_7.6.2.tgz"; path = fetchurl { - name = "_babel_plugin_proposal_unicode_property_regex___plugin_proposal_unicode_property_regex_7.4.4.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.4.4.tgz"; - sha1 = "501ffd9826c0b91da22690720722ac7cb1ca9c78"; + name = "_babel_plugin_proposal_unicode_property_regex___plugin_proposal_unicode_property_regex_7.6.2.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.6.2.tgz"; + sha1 = "05413762894f41bfe42b9a5e80919bd575dcc802"; }; } { @@ -570,11 +570,11 @@ }; } { - name = "_babel_plugin_transform_block_scoping___plugin_transform_block_scoping_7.5.5.tgz"; + name = "_babel_plugin_transform_block_scoping___plugin_transform_block_scoping_7.6.2.tgz"; path = fetchurl { - name = "_babel_plugin_transform_block_scoping___plugin_transform_block_scoping_7.5.5.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.5.5.tgz"; - sha1 = "a35f395e5402822f10d2119f6f8e045e3639a2ce"; + name = "_babel_plugin_transform_block_scoping___plugin_transform_block_scoping_7.6.2.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.6.2.tgz"; + sha1 = "96c33ab97a9ae500cc6f5b19e04a7e6553360a79"; }; } { @@ -594,19 +594,19 @@ }; } { - name = "_babel_plugin_transform_destructuring___plugin_transform_destructuring_7.5.0.tgz"; + name = "_babel_plugin_transform_destructuring___plugin_transform_destructuring_7.6.0.tgz"; path = fetchurl { - name = "_babel_plugin_transform_destructuring___plugin_transform_destructuring_7.5.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.5.0.tgz"; - sha1 = "f6c09fdfe3f94516ff074fe877db7bc9ef05855a"; + name = "_babel_plugin_transform_destructuring___plugin_transform_destructuring_7.6.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.6.0.tgz"; + sha1 = "44bbe08b57f4480094d57d9ffbcd96d309075ba6"; }; } { - name = "_babel_plugin_transform_dotall_regex___plugin_transform_dotall_regex_7.4.4.tgz"; + name = "_babel_plugin_transform_dotall_regex___plugin_transform_dotall_regex_7.6.2.tgz"; path = fetchurl { - name = "_babel_plugin_transform_dotall_regex___plugin_transform_dotall_regex_7.4.4.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.4.4.tgz"; - sha1 = "361a148bc951444312c69446d76ed1ea8e4450c3"; + name = "_babel_plugin_transform_dotall_regex___plugin_transform_dotall_regex_7.6.2.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.6.2.tgz"; + sha1 = "44abb948b88f0199a627024e1508acaf8dc9b2f9"; }; } { @@ -674,11 +674,11 @@ }; } { - name = "_babel_plugin_transform_modules_commonjs___plugin_transform_modules_commonjs_7.5.0.tgz"; + name = "_babel_plugin_transform_modules_commonjs___plugin_transform_modules_commonjs_7.6.0.tgz"; path = fetchurl { - name = "_babel_plugin_transform_modules_commonjs___plugin_transform_modules_commonjs_7.5.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.5.0.tgz"; - sha1 = "425127e6045231360858eeaa47a71d75eded7a74"; + name = "_babel_plugin_transform_modules_commonjs___plugin_transform_modules_commonjs_7.6.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.6.0.tgz"; + sha1 = "39dfe957de4420445f1fcf88b68a2e4aa4515486"; }; } { @@ -698,11 +698,11 @@ }; } { - name = "_babel_plugin_transform_named_capturing_groups_regex___plugin_transform_named_capturing_groups_regex_7.4.5.tgz"; + name = "_babel_plugin_transform_named_capturing_groups_regex___plugin_transform_named_capturing_groups_regex_7.6.2.tgz"; path = fetchurl { - name = "_babel_plugin_transform_named_capturing_groups_regex___plugin_transform_named_capturing_groups_regex_7.4.5.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.4.5.tgz"; - sha1 = "9d269fd28a370258199b4294736813a60bbdd106"; + name = "_babel_plugin_transform_named_capturing_groups_regex___plugin_transform_named_capturing_groups_regex_7.6.2.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.6.2.tgz"; + sha1 = "c1ca0bb84b94f385ca302c3932e870b0fb0e522b"; }; } { @@ -794,11 +794,11 @@ }; } { - name = "_babel_plugin_transform_spread___plugin_transform_spread_7.2.2.tgz"; + name = "_babel_plugin_transform_spread___plugin_transform_spread_7.6.2.tgz"; path = fetchurl { - name = "_babel_plugin_transform_spread___plugin_transform_spread_7.2.2.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.2.2.tgz"; - sha1 = "3103a9abe22f742b6d406ecd3cd49b774919b406"; + name = "_babel_plugin_transform_spread___plugin_transform_spread_7.6.2.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.6.2.tgz"; + sha1 = "fc77cf798b24b10c46e1b51b1b88c2bf661bb8dd"; }; } { @@ -826,19 +826,19 @@ }; } { - name = "_babel_plugin_transform_unicode_regex___plugin_transform_unicode_regex_7.4.4.tgz"; + name = "_babel_plugin_transform_unicode_regex___plugin_transform_unicode_regex_7.6.2.tgz"; path = fetchurl { - name = "_babel_plugin_transform_unicode_regex___plugin_transform_unicode_regex_7.4.4.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.4.4.tgz"; - sha1 = "ab4634bb4f14d36728bf5978322b35587787970f"; + name = "_babel_plugin_transform_unicode_regex___plugin_transform_unicode_regex_7.6.2.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.6.2.tgz"; + sha1 = "b692aad888a7e8d8b1b214be6b9dc03d5031f698"; }; } { - name = "_babel_preset_env___preset_env_7.5.5.tgz"; + name = "_babel_preset_env___preset_env_7.6.2.tgz"; path = fetchurl { - name = "_babel_preset_env___preset_env_7.5.5.tgz"; - url = "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.5.5.tgz"; - sha1 = "bc470b53acaa48df4b8db24a570d6da1fef53c9a"; + name = "_babel_preset_env___preset_env_7.6.2.tgz"; + url = "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.6.2.tgz"; + sha1 = "abbb3ed785c7fe4220d4c82a53621d71fc0c75d3"; }; } { @@ -874,27 +874,27 @@ }; } { - name = "_babel_template___template_7.4.4.tgz"; + name = "_babel_template___template_7.6.0.tgz"; path = fetchurl { - name = "_babel_template___template_7.4.4.tgz"; - url = "https://registry.yarnpkg.com/@babel/template/-/template-7.4.4.tgz"; - sha1 = "f4b88d1225689a08f5bc3a17483545be9e4ed237"; + name = "_babel_template___template_7.6.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/template/-/template-7.6.0.tgz"; + sha1 = "7f0159c7f5012230dad64cca42ec9bdb5c9536e6"; }; } { - name = "_babel_traverse___traverse_7.5.5.tgz"; + name = "_babel_traverse___traverse_7.6.2.tgz"; path = fetchurl { - name = "_babel_traverse___traverse_7.5.5.tgz"; - url = "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.5.5.tgz"; - sha1 = "f664f8f368ed32988cd648da9f72d5ca70f165bb"; + name = "_babel_traverse___traverse_7.6.2.tgz"; + url = "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.6.2.tgz"; + sha1 = "b0e2bfd401d339ce0e6c05690206d1e11502ce2c"; }; } { - name = "_babel_types___types_7.5.5.tgz"; + name = "_babel_types___types_7.6.1.tgz"; path = fetchurl { - name = "_babel_types___types_7.5.5.tgz"; - url = "https://registry.yarnpkg.com/@babel/types/-/types-7.5.5.tgz"; - sha1 = "97b9f728e182785909aa4ab56264f090a028d18a"; + name = "_babel_types___types_7.6.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/types/-/types-7.6.1.tgz"; + sha1 = "53abf3308add3ac2a2884d539151c57c4b3ac648"; }; } { @@ -938,27 +938,27 @@ }; } { - name = "_gitlab_svgs___svgs_1.73.0.tgz"; + name = "_gitlab_svgs___svgs_1.78.0.tgz"; path = fetchurl { - name = "_gitlab_svgs___svgs_1.73.0.tgz"; - url = "https://registry.yarnpkg.com/@gitlab/svgs/-/svgs-1.73.0.tgz"; - sha1 = "e44b347e4be77b94474c80cf5c2ee26ca0325c2f"; + name = "_gitlab_svgs___svgs_1.78.0.tgz"; + url = "https://registry.yarnpkg.com/@gitlab/svgs/-/svgs-1.78.0.tgz"; + sha1 = "469493bd6cdd254eb5d1271edeab22bbbee2f4c4"; }; } { - name = "_gitlab_ui___ui_5.25.2.tgz"; + name = "_gitlab_ui___ui_5.36.0.tgz"; path = fetchurl { - name = "_gitlab_ui___ui_5.25.2.tgz"; - url = "https://registry.yarnpkg.com/@gitlab/ui/-/ui-5.25.2.tgz"; - sha1 = "599954fefcc228d31a398dbe3c1e2287a0fcdb3e"; + name = "_gitlab_ui___ui_5.36.0.tgz"; + url = "https://registry.yarnpkg.com/@gitlab/ui/-/ui-5.36.0.tgz"; + sha1 = "3087b23c138ad1c222f6b047e533f253371bc618"; }; } { - name = "_gitlab_visual_review_tools___visual_review_tools_1.0.1.tgz"; + name = "_gitlab_visual_review_tools___visual_review_tools_1.0.3.tgz"; path = fetchurl { - name = "_gitlab_visual_review_tools___visual_review_tools_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/@gitlab/visual-review-tools/-/visual-review-tools-1.0.1.tgz"; - sha1 = "7e588328ed018d91560633d56865d65b72c3a11b"; + name = "_gitlab_visual_review_tools___visual_review_tools_1.0.3.tgz"; + url = "https://registry.yarnpkg.com/@gitlab/visual-review-tools/-/visual-review-tools-1.0.3.tgz"; + sha1 = "b49c4a6fd8af3a1517d7e7d04096562f8bcb5d14"; }; } { @@ -1073,14 +1073,6 @@ sha1 = "17adc7d380457379cd14cbb64a435ea196cc4a6e"; }; } - { - name = "_sindresorhus_is___is_0.7.0.tgz"; - path = fetchurl { - name = "_sindresorhus_is___is_0.7.0.tgz"; - url = "https://registry.yarnpkg.com/@sindresorhus/is/-/is-0.7.0.tgz"; - sha1 = "9a06f4f137ee84d7df0460c1fdb1135ffa6c50fd"; - }; - } { name = "_types_anymatch___anymatch_1.3.0.tgz"; path = fetchurl { @@ -1281,6 +1273,14 @@ sha1 = "aa46d2a6f7647440b0b8932434d22f12371e543b"; }; } + { + name = "_vue_component_compiler_utils___component_compiler_utils_3.0.0.tgz"; + path = fetchurl { + name = "_vue_component_compiler_utils___component_compiler_utils_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/@vue/component-compiler-utils/-/component-compiler-utils-3.0.0.tgz"; + sha1 = "d16fa26b836c06df5baaeb45f3d80afc47e35634"; + }; + } { name = "_vue_test_utils___test_utils_1.0.0_beta.25.tgz"; path = fetchurl { @@ -1290,147 +1290,147 @@ }; } { - name = "_webassemblyjs_ast___ast_1.7.11.tgz"; + name = "_webassemblyjs_ast___ast_1.8.5.tgz"; path = fetchurl { - name = "_webassemblyjs_ast___ast_1.7.11.tgz"; - url = "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.7.11.tgz"; - sha1 = "b988582cafbb2b095e8b556526f30c90d057cace"; + name = "_webassemblyjs_ast___ast_1.8.5.tgz"; + url = "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.8.5.tgz"; + sha1 = "51b1c5fe6576a34953bf4b253df9f0d490d9e359"; }; } { - name = "_webassemblyjs_floating_point_hex_parser___floating_point_hex_parser_1.7.11.tgz"; + name = "_webassemblyjs_floating_point_hex_parser___floating_point_hex_parser_1.8.5.tgz"; path = fetchurl { - name = "_webassemblyjs_floating_point_hex_parser___floating_point_hex_parser_1.7.11.tgz"; - url = "https://registry.yarnpkg.com/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.7.11.tgz"; - sha1 = "a69f0af6502eb9a3c045555b1a6129d3d3f2e313"; + name = "_webassemblyjs_floating_point_hex_parser___floating_point_hex_parser_1.8.5.tgz"; + url = "https://registry.yarnpkg.com/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.8.5.tgz"; + sha1 = "1ba926a2923613edce496fd5b02e8ce8a5f49721"; }; } { - name = "_webassemblyjs_helper_api_error___helper_api_error_1.7.11.tgz"; + name = "_webassemblyjs_helper_api_error___helper_api_error_1.8.5.tgz"; path = fetchurl { - name = "_webassemblyjs_helper_api_error___helper_api_error_1.7.11.tgz"; - url = "https://registry.yarnpkg.com/@webassemblyjs/helper-api-error/-/helper-api-error-1.7.11.tgz"; - sha1 = "c7b6bb8105f84039511a2b39ce494f193818a32a"; + name = "_webassemblyjs_helper_api_error___helper_api_error_1.8.5.tgz"; + url = "https://registry.yarnpkg.com/@webassemblyjs/helper-api-error/-/helper-api-error-1.8.5.tgz"; + sha1 = "c49dad22f645227c5edb610bdb9697f1aab721f7"; }; } { - name = "_webassemblyjs_helper_buffer___helper_buffer_1.7.11.tgz"; + name = "_webassemblyjs_helper_buffer___helper_buffer_1.8.5.tgz"; path = fetchurl { - name = "_webassemblyjs_helper_buffer___helper_buffer_1.7.11.tgz"; - url = "https://registry.yarnpkg.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.7.11.tgz"; - sha1 = "3122d48dcc6c9456ed982debe16c8f37101df39b"; + name = "_webassemblyjs_helper_buffer___helper_buffer_1.8.5.tgz"; + url = "https://registry.yarnpkg.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.8.5.tgz"; + sha1 = "fea93e429863dd5e4338555f42292385a653f204"; }; } { - name = "_webassemblyjs_helper_code_frame___helper_code_frame_1.7.11.tgz"; + name = "_webassemblyjs_helper_code_frame___helper_code_frame_1.8.5.tgz"; path = fetchurl { - name = "_webassemblyjs_helper_code_frame___helper_code_frame_1.7.11.tgz"; - url = "https://registry.yarnpkg.com/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.7.11.tgz"; - sha1 = "cf8f106e746662a0da29bdef635fcd3d1248364b"; + name = "_webassemblyjs_helper_code_frame___helper_code_frame_1.8.5.tgz"; + url = "https://registry.yarnpkg.com/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.8.5.tgz"; + sha1 = "9a740ff48e3faa3022b1dff54423df9aa293c25e"; }; } { - name = "_webassemblyjs_helper_fsm___helper_fsm_1.7.11.tgz"; + name = "_webassemblyjs_helper_fsm___helper_fsm_1.8.5.tgz"; path = fetchurl { - name = "_webassemblyjs_helper_fsm___helper_fsm_1.7.11.tgz"; - url = "https://registry.yarnpkg.com/@webassemblyjs/helper-fsm/-/helper-fsm-1.7.11.tgz"; - sha1 = "df38882a624080d03f7503f93e3f17ac5ac01181"; + name = "_webassemblyjs_helper_fsm___helper_fsm_1.8.5.tgz"; + url = "https://registry.yarnpkg.com/@webassemblyjs/helper-fsm/-/helper-fsm-1.8.5.tgz"; + sha1 = "ba0b7d3b3f7e4733da6059c9332275d860702452"; }; } { - name = "_webassemblyjs_helper_module_context___helper_module_context_1.7.11.tgz"; + name = "_webassemblyjs_helper_module_context___helper_module_context_1.8.5.tgz"; path = fetchurl { - name = "_webassemblyjs_helper_module_context___helper_module_context_1.7.11.tgz"; - url = "https://registry.yarnpkg.com/@webassemblyjs/helper-module-context/-/helper-module-context-1.7.11.tgz"; - sha1 = "d874d722e51e62ac202476935d649c802fa0e209"; + name = "_webassemblyjs_helper_module_context___helper_module_context_1.8.5.tgz"; + url = "https://registry.yarnpkg.com/@webassemblyjs/helper-module-context/-/helper-module-context-1.8.5.tgz"; + sha1 = "def4b9927b0101dc8cbbd8d1edb5b7b9c82eb245"; }; } { - name = "_webassemblyjs_helper_wasm_bytecode___helper_wasm_bytecode_1.7.11.tgz"; + name = "_webassemblyjs_helper_wasm_bytecode___helper_wasm_bytecode_1.8.5.tgz"; path = fetchurl { - name = "_webassemblyjs_helper_wasm_bytecode___helper_wasm_bytecode_1.7.11.tgz"; - url = "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.7.11.tgz"; - sha1 = "dd9a1e817f1c2eb105b4cf1013093cb9f3c9cb06"; + name = "_webassemblyjs_helper_wasm_bytecode___helper_wasm_bytecode_1.8.5.tgz"; + url = "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.8.5.tgz"; + sha1 = "537a750eddf5c1e932f3744206551c91c1b93e61"; }; } { - name = "_webassemblyjs_helper_wasm_section___helper_wasm_section_1.7.11.tgz"; + name = "_webassemblyjs_helper_wasm_section___helper_wasm_section_1.8.5.tgz"; path = fetchurl { - name = "_webassemblyjs_helper_wasm_section___helper_wasm_section_1.7.11.tgz"; - url = "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.7.11.tgz"; - sha1 = "9c9ac41ecf9fbcfffc96f6d2675e2de33811e68a"; + name = "_webassemblyjs_helper_wasm_section___helper_wasm_section_1.8.5.tgz"; + url = "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.8.5.tgz"; + sha1 = "74ca6a6bcbe19e50a3b6b462847e69503e6bfcbf"; }; } { - name = "_webassemblyjs_ieee754___ieee754_1.7.11.tgz"; + name = "_webassemblyjs_ieee754___ieee754_1.8.5.tgz"; path = fetchurl { - name = "_webassemblyjs_ieee754___ieee754_1.7.11.tgz"; - url = "https://registry.yarnpkg.com/@webassemblyjs/ieee754/-/ieee754-1.7.11.tgz"; - sha1 = "c95839eb63757a31880aaec7b6512d4191ac640b"; + name = "_webassemblyjs_ieee754___ieee754_1.8.5.tgz"; + url = "https://registry.yarnpkg.com/@webassemblyjs/ieee754/-/ieee754-1.8.5.tgz"; + sha1 = "712329dbef240f36bf57bd2f7b8fb9bf4154421e"; }; } { - name = "_webassemblyjs_leb128___leb128_1.7.11.tgz"; + name = "_webassemblyjs_leb128___leb128_1.8.5.tgz"; path = fetchurl { - name = "_webassemblyjs_leb128___leb128_1.7.11.tgz"; - url = "https://registry.yarnpkg.com/@webassemblyjs/leb128/-/leb128-1.7.11.tgz"; - sha1 = "d7267a1ee9c4594fd3f7e37298818ec65687db63"; + name = "_webassemblyjs_leb128___leb128_1.8.5.tgz"; + url = "https://registry.yarnpkg.com/@webassemblyjs/leb128/-/leb128-1.8.5.tgz"; + sha1 = "044edeb34ea679f3e04cd4fd9824d5e35767ae10"; }; } { - name = "_webassemblyjs_utf8___utf8_1.7.11.tgz"; + name = "_webassemblyjs_utf8___utf8_1.8.5.tgz"; path = fetchurl { - name = "_webassemblyjs_utf8___utf8_1.7.11.tgz"; - url = "https://registry.yarnpkg.com/@webassemblyjs/utf8/-/utf8-1.7.11.tgz"; - sha1 = "06d7218ea9fdc94a6793aa92208160db3d26ee82"; + name = "_webassemblyjs_utf8___utf8_1.8.5.tgz"; + url = "https://registry.yarnpkg.com/@webassemblyjs/utf8/-/utf8-1.8.5.tgz"; + sha1 = "a8bf3b5d8ffe986c7c1e373ccbdc2a0915f0cedc"; }; } { - name = "_webassemblyjs_wasm_edit___wasm_edit_1.7.11.tgz"; + name = "_webassemblyjs_wasm_edit___wasm_edit_1.8.5.tgz"; path = fetchurl { - name = "_webassemblyjs_wasm_edit___wasm_edit_1.7.11.tgz"; - url = "https://registry.yarnpkg.com/@webassemblyjs/wasm-edit/-/wasm-edit-1.7.11.tgz"; - sha1 = "8c74ca474d4f951d01dbae9bd70814ee22a82005"; + name = "_webassemblyjs_wasm_edit___wasm_edit_1.8.5.tgz"; + url = "https://registry.yarnpkg.com/@webassemblyjs/wasm-edit/-/wasm-edit-1.8.5.tgz"; + sha1 = "962da12aa5acc1c131c81c4232991c82ce56e01a"; }; } { - name = "_webassemblyjs_wasm_gen___wasm_gen_1.7.11.tgz"; + name = "_webassemblyjs_wasm_gen___wasm_gen_1.8.5.tgz"; path = fetchurl { - name = "_webassemblyjs_wasm_gen___wasm_gen_1.7.11.tgz"; - url = "https://registry.yarnpkg.com/@webassemblyjs/wasm-gen/-/wasm-gen-1.7.11.tgz"; - sha1 = "9bbba942f22375686a6fb759afcd7ac9c45da1a8"; + name = "_webassemblyjs_wasm_gen___wasm_gen_1.8.5.tgz"; + url = "https://registry.yarnpkg.com/@webassemblyjs/wasm-gen/-/wasm-gen-1.8.5.tgz"; + sha1 = "54840766c2c1002eb64ed1abe720aded714f98bc"; }; } { - name = "_webassemblyjs_wasm_opt___wasm_opt_1.7.11.tgz"; + name = "_webassemblyjs_wasm_opt___wasm_opt_1.8.5.tgz"; path = fetchurl { - name = "_webassemblyjs_wasm_opt___wasm_opt_1.7.11.tgz"; - url = "https://registry.yarnpkg.com/@webassemblyjs/wasm-opt/-/wasm-opt-1.7.11.tgz"; - sha1 = "b331e8e7cef8f8e2f007d42c3a36a0580a7d6ca7"; + name = "_webassemblyjs_wasm_opt___wasm_opt_1.8.5.tgz"; + url = "https://registry.yarnpkg.com/@webassemblyjs/wasm-opt/-/wasm-opt-1.8.5.tgz"; + sha1 = "b24d9f6ba50394af1349f510afa8ffcb8a63d264"; }; } { - name = "_webassemblyjs_wasm_parser___wasm_parser_1.7.11.tgz"; + name = "_webassemblyjs_wasm_parser___wasm_parser_1.8.5.tgz"; path = fetchurl { - name = "_webassemblyjs_wasm_parser___wasm_parser_1.7.11.tgz"; - url = "https://registry.yarnpkg.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.7.11.tgz"; - sha1 = "6e3d20fa6a3519f6b084ef9391ad58211efb0a1a"; + name = "_webassemblyjs_wasm_parser___wasm_parser_1.8.5.tgz"; + url = "https://registry.yarnpkg.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.8.5.tgz"; + sha1 = "21576f0ec88b91427357b8536383668ef7c66b8d"; }; } { - name = "_webassemblyjs_wast_parser___wast_parser_1.7.11.tgz"; + name = "_webassemblyjs_wast_parser___wast_parser_1.8.5.tgz"; path = fetchurl { - name = "_webassemblyjs_wast_parser___wast_parser_1.7.11.tgz"; - url = "https://registry.yarnpkg.com/@webassemblyjs/wast-parser/-/wast-parser-1.7.11.tgz"; - sha1 = "25bd117562ca8c002720ff8116ef9072d9ca869c"; + name = "_webassemblyjs_wast_parser___wast_parser_1.8.5.tgz"; + url = "https://registry.yarnpkg.com/@webassemblyjs/wast-parser/-/wast-parser-1.8.5.tgz"; + sha1 = "e10eecd542d0e7bd394f6827c49f3df6d4eefb8c"; }; } { - name = "_webassemblyjs_wast_printer___wast_printer_1.7.11.tgz"; + name = "_webassemblyjs_wast_printer___wast_printer_1.8.5.tgz"; path = fetchurl { - name = "_webassemblyjs_wast_printer___wast_printer_1.7.11.tgz"; - url = "https://registry.yarnpkg.com/@webassemblyjs/wast-printer/-/wast-printer-1.7.11.tgz"; - sha1 = "c4245b6de242cb50a2cc950174fdbf65c78d7813"; + name = "_webassemblyjs_wast_printer___wast_printer_1.8.5.tgz"; + url = "https://registry.yarnpkg.com/@webassemblyjs/wast-printer/-/wast-printer-1.8.5.tgz"; + sha1 = "114bbc481fd10ca0e23b3560fa812748b0bae5bc"; }; } { @@ -1442,11 +1442,11 @@ }; } { - name = "_xtuc_long___long_4.2.1.tgz"; + name = "_xtuc_long___long_4.2.2.tgz"; path = fetchurl { - name = "_xtuc_long___long_4.2.1.tgz"; - url = "https://registry.yarnpkg.com/@xtuc/long/-/long-4.2.1.tgz"; - sha1 = "5c85d662f76fa1d34575766c5dcd6615abcd30d8"; + name = "_xtuc_long___long_4.2.2.tgz"; + url = "https://registry.yarnpkg.com/@xtuc/long/-/long-4.2.2.tgz"; + sha1 = "d291c6a4e97989b5c61d9acf396ae4fe133a718d"; }; } { @@ -1482,19 +1482,11 @@ }; } { - name = "accepts___accepts_1.3.5.tgz"; + name = "accepts___accepts_1.3.7.tgz"; path = fetchurl { - name = "accepts___accepts_1.3.5.tgz"; - url = "https://registry.yarnpkg.com/accepts/-/accepts-1.3.5.tgz"; - sha1 = "eb777df6011723a3b14e8a72c0805c8e86746bd2"; - }; - } - { - name = "acorn_dynamic_import___acorn_dynamic_import_4.0.0.tgz"; - path = fetchurl { - name = "acorn_dynamic_import___acorn_dynamic_import_4.0.0.tgz"; - url = "https://registry.yarnpkg.com/acorn-dynamic-import/-/acorn-dynamic-import-4.0.0.tgz"; - sha1 = "482210140582a36b83c3e342e1cfebcaa9240948"; + name = "accepts___accepts_1.3.7.tgz"; + url = "https://registry.yarnpkg.com/accepts/-/accepts-1.3.7.tgz"; + sha1 = "531bc726517a3b2b41f850021c6cc15eaab507cd"; }; } { @@ -1530,11 +1522,11 @@ }; } { - name = "acorn___acorn_6.2.1.tgz"; + name = "acorn___acorn_6.3.0.tgz"; path = fetchurl { - name = "acorn___acorn_6.2.1.tgz"; - url = "https://registry.yarnpkg.com/acorn/-/acorn-6.2.1.tgz"; - sha1 = "3ed8422d6dec09e6121cc7a843ca86a330a86b51"; + name = "acorn___acorn_6.3.0.tgz"; + url = "https://registry.yarnpkg.com/acorn/-/acorn-6.3.0.tgz"; + sha1 = "0087509119ffa4fc0a0041d1e93a417e68cb856e"; }; } { @@ -1554,11 +1546,11 @@ }; } { - name = "ajv_keywords___ajv_keywords_3.2.0.tgz"; + name = "ajv_keywords___ajv_keywords_3.4.1.tgz"; path = fetchurl { - name = "ajv_keywords___ajv_keywords_3.2.0.tgz"; - url = "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.2.0.tgz"; - sha1 = "e86b819c602cf8821ad637413698f1dec021847a"; + name = "ajv_keywords___ajv_keywords_3.4.1.tgz"; + url = "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.4.1.tgz"; + sha1 = "ef916e271c64ac12171fd8384eaae6b2345854da"; }; } { @@ -1938,11 +1930,11 @@ }; } { - name = "async_each___async_each_1.0.1.tgz"; + name = "async_each___async_each_1.0.3.tgz"; path = fetchurl { - name = "async_each___async_each_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/async-each/-/async-each-1.0.1.tgz"; - sha1 = "19d386a1d9edc6e7c1c85d388aedbcc56d33602d"; + name = "async_each___async_each_1.0.3.tgz"; + url = "https://registry.yarnpkg.com/async-each/-/async-each-1.0.3.tgz"; + sha1 = "b727dbf87d7651602f06f4d4ac387f47d91b0cbf"; }; } { @@ -2082,11 +2074,11 @@ }; } { - name = "babel_loader___babel_loader_8.0.5.tgz"; + name = "babel_loader___babel_loader_8.0.6.tgz"; path = fetchurl { - name = "babel_loader___babel_loader_8.0.5.tgz"; - url = "https://registry.yarnpkg.com/babel-loader/-/babel-loader-8.0.5.tgz"; - sha1 = "225322d7509c2157655840bba52e46b6c2f2fe33"; + name = "babel_loader___babel_loader_8.0.6.tgz"; + url = "https://registry.yarnpkg.com/babel-loader/-/babel-loader-8.0.6.tgz"; + sha1 = "e33bdb6f362b03f4bb141a0c21ab87c501b70dfb"; }; } { @@ -2298,11 +2290,11 @@ }; } { - name = "body_parser___body_parser_1.18.2.tgz"; + name = "body_parser___body_parser_1.19.0.tgz"; path = fetchurl { - name = "body_parser___body_parser_1.18.2.tgz"; - url = "https://registry.yarnpkg.com/body-parser/-/body-parser-1.18.2.tgz"; - sha1 = "87678a19d84b47d859b83199bd59bce222b10454"; + name = "body_parser___body_parser_1.19.0.tgz"; + url = "https://registry.yarnpkg.com/body-parser/-/body-parser-1.19.0.tgz"; + sha1 = "96b2709e57c9c4e09a6fd66a8fd979844f69f08a"; }; } { @@ -2489,6 +2481,14 @@ sha1 = "f54f647c4f4e25228baa656a2e57e43d5f270982"; }; } + { + name = "buffer_json___buffer_json_2.0.0.tgz"; + path = fetchurl { + name = "buffer_json___buffer_json_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/buffer-json/-/buffer-json-2.0.0.tgz"; + sha1 = "f73e13b1e42f196fe2fd67d001c7d7107edd7c23"; + }; + } { name = "buffer_shims___buffer_shims_1.0.0.tgz"; path = fetchurl { @@ -2537,6 +2537,14 @@ sha1 = "d32815404d689699f85a4ea4fa8755dd13a96048"; }; } + { + name = "bytes___bytes_3.1.0.tgz"; + path = fetchurl { + name = "bytes___bytes_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/bytes/-/bytes-3.1.0.tgz"; + sha1 = "f6cf7933a360e0588fa9fde85651cdc7f805d1f6"; + }; + } { name = "cacache___cacache_11.3.3.tgz"; path = fetchurl { @@ -2545,6 +2553,14 @@ sha1 = "8bd29df8c6a718a6ebd2d010da4d7972ae3bbadc"; }; } + { + name = "cacache___cacache_12.0.3.tgz"; + path = fetchurl { + name = "cacache___cacache_12.0.3.tgz"; + url = "https://registry.yarnpkg.com/cacache/-/cacache-12.0.3.tgz"; + sha1 = "be99abba4e1bf5df461cd5a2c1071fc432573390"; + }; + } { name = "cache_base___cache_base_1.0.1.tgz"; path = fetchurl { @@ -2554,19 +2570,11 @@ }; } { - name = "cache_loader___cache_loader_2.0.1.tgz"; + name = "cache_loader___cache_loader_4.1.0.tgz"; path = fetchurl { - name = "cache_loader___cache_loader_2.0.1.tgz"; - url = "https://registry.yarnpkg.com/cache-loader/-/cache-loader-2.0.1.tgz"; - sha1 = "5758f41a62d7c23941e3c3c7016e6faeb03acb07"; - }; - } - { - name = "cacheable_request___cacheable_request_2.1.4.tgz"; - path = fetchurl { - name = "cacheable_request___cacheable_request_2.1.4.tgz"; - url = "https://registry.yarnpkg.com/cacheable-request/-/cacheable-request-2.1.4.tgz"; - sha1 = "0d808801b6342ad33c91df9d0b44dc09b91e5c3d"; + name = "cache_loader___cache_loader_4.1.0.tgz"; + url = "https://registry.yarnpkg.com/cache-loader/-/cache-loader-4.1.0.tgz"; + sha1 = "9948cae353aec0a1fcb1eafda2300816ec85387e"; }; } { @@ -2745,14 +2753,6 @@ sha1 = "f1cec43f332e2ea5a569fd46f9f5bde4e6102aff"; }; } - { - name = "chalk___chalk_1.1.3.tgz"; - path = fetchurl { - name = "chalk___chalk_1.1.3.tgz"; - url = "https://registry.yarnpkg.com/chalk/-/chalk-1.1.3.tgz"; - sha1 = "a8115c55e4a702fe4d150abd3872822a7e09fc98"; - }; - } { name = "chalk___chalk_2.4.2.tgz"; path = fetchurl { @@ -2761,6 +2761,14 @@ sha1 = "cd42541677a54333cf541a49108c1432b44c9424"; }; } + { + name = "chalk___chalk_1.1.3.tgz"; + path = fetchurl { + name = "chalk___chalk_1.1.3.tgz"; + url = "https://registry.yarnpkg.com/chalk/-/chalk-1.1.3.tgz"; + sha1 = "a8115c55e4a702fe4d150abd3872822a7e09fc98"; + }; + } { name = "character_entities_html4___character_entities_html4_1.1.2.tgz"; path = fetchurl { @@ -2842,11 +2850,11 @@ }; } { - name = "chokidar___chokidar_2.0.4.tgz"; + name = "chokidar___chokidar_2.1.8.tgz"; path = fetchurl { - name = "chokidar___chokidar_2.0.4.tgz"; - url = "https://registry.yarnpkg.com/chokidar/-/chokidar-2.0.4.tgz"; - sha1 = "356ff4e2b0e8e43e322d18a372460bbcf3accd26"; + name = "chokidar___chokidar_2.1.8.tgz"; + url = "https://registry.yarnpkg.com/chokidar/-/chokidar-2.1.8.tgz"; + sha1 = "804b3a7b6a99358c3c5c61e71d8728f041cff917"; }; } { @@ -2866,11 +2874,11 @@ }; } { - name = "chrome_trace_event___chrome_trace_event_1.0.0.tgz"; + name = "chrome_trace_event___chrome_trace_event_1.0.2.tgz"; path = fetchurl { - name = "chrome_trace_event___chrome_trace_event_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/chrome-trace-event/-/chrome-trace-event-1.0.0.tgz"; - sha1 = "45a91bd2c20c9411f0963b5aaeb9a1b95e09cc48"; + name = "chrome_trace_event___chrome_trace_event_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/chrome-trace-event/-/chrome-trace-event-1.0.2.tgz"; + sha1 = "234090ee97c7d4ad1a2c4beae27505deffc608a4"; }; } { @@ -2977,6 +2985,14 @@ sha1 = "348422dbe82d800b3022eef4f6ac10bf2e4d1b49"; }; } + { + name = "cliui___cliui_5.0.0.tgz"; + path = fetchurl { + name = "cliui___cliui_5.0.0.tgz"; + url = "https://registry.yarnpkg.com/cliui/-/cliui-5.0.0.tgz"; + sha1 = "deefcfdb2e800784aa34f46fa08e06851c7bbbc5"; + }; + } { name = "clone_buffer___clone_buffer_1.0.0.tgz"; path = fetchurl { @@ -3001,14 +3017,6 @@ sha1 = "7d65e00885cd8796405c35a737e7a86b7429e36f"; }; } - { - name = "clone_response___clone_response_1.0.2.tgz"; - path = fetchurl { - name = "clone_response___clone_response_1.0.2.tgz"; - url = "https://registry.yarnpkg.com/clone-response/-/clone-response-1.0.2.tgz"; - sha1 = "d1dc973920314df67fbeb94223b4ee350239e96b"; - }; - } { name = "clone_stats___clone_stats_1.0.0.tgz"; path = fetchurl { @@ -3145,14 +3153,6 @@ sha1 = "d58bb2b5c1ee8f87b0d340027e9e94e222c5a422"; }; } - { - name = "commander___commander_2.17.1.tgz"; - path = fetchurl { - name = "commander___commander_2.17.1.tgz"; - url = "https://registry.yarnpkg.com/commander/-/commander-2.17.1.tgz"; - sha1 = "bd77ab7de6de94205ceacc72f1716d29f20a77bf"; - }; - } { name = "commander___commander_2.9.0.tgz"; path = fetchurl { @@ -3202,27 +3202,27 @@ }; } { - name = "compressible___compressible_2.0.15.tgz"; + name = "compressible___compressible_2.0.17.tgz"; path = fetchurl { - name = "compressible___compressible_2.0.15.tgz"; - url = "https://registry.yarnpkg.com/compressible/-/compressible-2.0.15.tgz"; - sha1 = "857a9ab0a7e5a07d8d837ed43fe2defff64fe212"; + name = "compressible___compressible_2.0.17.tgz"; + url = "https://registry.yarnpkg.com/compressible/-/compressible-2.0.17.tgz"; + sha1 = "6e8c108a16ad58384a977f3a482ca20bff2f38c1"; }; } { - name = "compression_webpack_plugin___compression_webpack_plugin_2.0.0.tgz"; + name = "compression_webpack_plugin___compression_webpack_plugin_3.0.0.tgz"; path = fetchurl { - name = "compression_webpack_plugin___compression_webpack_plugin_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/compression-webpack-plugin/-/compression-webpack-plugin-2.0.0.tgz"; - sha1 = "46476350c1eb27f783dccc79ac2f709baa2cffbc"; + name = "compression_webpack_plugin___compression_webpack_plugin_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/compression-webpack-plugin/-/compression-webpack-plugin-3.0.0.tgz"; + sha1 = "097d2e4d95c3a14cb5c8ed20899009ab5b9bbca0"; }; } { - name = "compression___compression_1.7.3.tgz"; + name = "compression___compression_1.7.4.tgz"; path = fetchurl { - name = "compression___compression_1.7.3.tgz"; - url = "https://registry.yarnpkg.com/compression/-/compression-1.7.3.tgz"; - sha1 = "27e0e176aaf260f7f2c2813c3e440adb9f1993db"; + name = "compression___compression_1.7.4.tgz"; + url = "https://registry.yarnpkg.com/compression/-/compression-1.7.4.tgz"; + sha1 = "95523eff170ca57c29a0ca41e6fe131f41e5bb8f"; }; } { @@ -3266,11 +3266,11 @@ }; } { - name = "connect_history_api_fallback___connect_history_api_fallback_1.3.0.tgz"; + name = "connect_history_api_fallback___connect_history_api_fallback_1.6.0.tgz"; path = fetchurl { - name = "connect_history_api_fallback___connect_history_api_fallback_1.3.0.tgz"; - url = "https://registry.yarnpkg.com/connect-history-api-fallback/-/connect-history-api-fallback-1.3.0.tgz"; - sha1 = "e51d17f8f0ef0db90a64fdb47de3051556e9f169"; + name = "connect_history_api_fallback___connect_history_api_fallback_1.6.0.tgz"; + url = "https://registry.yarnpkg.com/connect-history-api-fallback/-/connect-history-api-fallback-1.6.0.tgz"; + sha1 = "8b32089359308d111115d81cad3fceab888f97bc"; }; } { @@ -3330,11 +3330,11 @@ }; } { - name = "content_disposition___content_disposition_0.5.2.tgz"; + name = "content_disposition___content_disposition_0.5.3.tgz"; path = fetchurl { - name = "content_disposition___content_disposition_0.5.2.tgz"; - url = "https://registry.yarnpkg.com/content-disposition/-/content-disposition-0.5.2.tgz"; - sha1 = "0cf68bb9ddf5f2be7961c3a85178cb85dba78cb4"; + name = "content_disposition___content_disposition_0.5.3.tgz"; + url = "https://registry.yarnpkg.com/content-disposition/-/content-disposition-0.5.3.tgz"; + sha1 = "e130caf7e7279087c5616c2007d0485698984fbd"; }; } { @@ -3377,6 +3377,14 @@ sha1 = "e7e0a1f9ef43b4c8ba925c5c5a96e806d16873bb"; }; } + { + name = "cookie___cookie_0.4.0.tgz"; + path = fetchurl { + name = "cookie___cookie_0.4.0.tgz"; + url = "https://registry.yarnpkg.com/cookie/-/cookie-0.4.0.tgz"; + sha1 = "beb437e7022b3b6d49019d088665303ebe9c14ba"; + }; + } { name = "copy_concurrently___copy_concurrently_1.0.5.tgz"; path = fetchurl { @@ -3426,11 +3434,11 @@ }; } { - name = "core_js___core_js_3.1.3.tgz"; + name = "core_js___core_js_3.2.1.tgz"; path = fetchurl { - name = "core_js___core_js_3.1.3.tgz"; - url = "https://registry.yarnpkg.com/core-js/-/core-js-3.1.3.tgz"; - sha1 = "95700bca5f248f5f78c0ec63e784eca663ec4138"; + name = "core_js___core_js_3.2.1.tgz"; + url = "https://registry.yarnpkg.com/core-js/-/core-js-3.2.1.tgz"; + sha1 = "cd41f38534da6cc59f7db050fe67307de9868b09"; }; } { @@ -3497,6 +3505,14 @@ sha1 = "607461d4e7aa7a7fe15a26834b14b7f0c2801562"; }; } + { + name = "cross_spawn___cross_spawn_6.0.5.tgz"; + path = fetchurl { + name = "cross_spawn___cross_spawn_6.0.5.tgz"; + url = "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-6.0.5.tgz"; + sha1 = "4a5ec7c64dfae22c3a14124dbacdee846d80cbc4"; + }; + } { name = "cross_spawn___cross_spawn_3.0.1.tgz"; path = fetchurl { @@ -3513,14 +3529,6 @@ sha1 = "e8bd0efee58fcff6f8f94510a0a554bbfa235449"; }; } - { - name = "cross_spawn___cross_spawn_6.0.5.tgz"; - path = fetchurl { - name = "cross_spawn___cross_spawn_6.0.5.tgz"; - url = "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-6.0.5.tgz"; - sha1 = "4a5ec7c64dfae22c3a14124dbacdee846d80cbc4"; - }; - } { name = "crypt___crypt_0.0.2.tgz"; path = fetchurl { @@ -3570,11 +3578,11 @@ }; } { - name = "css_selector_tokenizer___css_selector_tokenizer_0.7.0.tgz"; + name = "css_selector_tokenizer___css_selector_tokenizer_0.7.1.tgz"; path = fetchurl { - name = "css_selector_tokenizer___css_selector_tokenizer_0.7.0.tgz"; - url = "https://registry.yarnpkg.com/css-selector-tokenizer/-/css-selector-tokenizer-0.7.0.tgz"; - sha1 = "e6988474ae8c953477bf5e7efecfceccd9cf4c86"; + name = "css_selector_tokenizer___css_selector_tokenizer_0.7.1.tgz"; + url = "https://registry.yarnpkg.com/css-selector-tokenizer/-/css-selector-tokenizer-0.7.1.tgz"; + sha1 = "a177271a8bca5019172f4f891fc6eed9cbf68d5d"; }; } { @@ -4057,14 +4065,6 @@ sha1 = "f6534d15148269b20352e7bee26f501f9a191290"; }; } - { - name = "decamelize___decamelize_2.0.0.tgz"; - path = fetchurl { - name = "decamelize___decamelize_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/decamelize/-/decamelize-2.0.0.tgz"; - sha1 = "656d7bbc8094c4c788ea53c5840908c9c7d063c7"; - }; - } { name = "deckar01_task_list___deckar01_task_list_2.2.0.tgz"; path = fetchurl { @@ -4081,14 +4081,6 @@ sha1 = "eb3913333458775cb84cd1a1fae062106bb87545"; }; } - { - name = "decompress_response___decompress_response_3.3.0.tgz"; - path = fetchurl { - name = "decompress_response___decompress_response_3.3.0.tgz"; - url = "https://registry.yarnpkg.com/decompress-response/-/decompress-response-3.3.0.tgz"; - sha1 = "80a4dd323748384bfa248083622aedec982adff3"; - }; - } { name = "deep_equal___deep_equal_1.0.1.tgz"; path = fetchurl { @@ -4122,11 +4114,11 @@ }; } { - name = "default_gateway___default_gateway_2.7.2.tgz"; + name = "default_gateway___default_gateway_4.2.0.tgz"; path = fetchurl { - name = "default_gateway___default_gateway_2.7.2.tgz"; - url = "https://registry.yarnpkg.com/default-gateway/-/default-gateway-2.7.2.tgz"; - sha1 = "b7ef339e5e024b045467af403d50348db4642d0f"; + name = "default_gateway___default_gateway_4.2.0.tgz"; + url = "https://registry.yarnpkg.com/default-gateway/-/default-gateway-4.2.0.tgz"; + sha1 = "167104c7500c2115f6dd69b0a536bb8ed720552b"; }; } { @@ -4186,11 +4178,11 @@ }; } { - name = "del___del_3.0.0.tgz"; + name = "del___del_4.1.1.tgz"; path = fetchurl { - name = "del___del_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/del/-/del-3.0.0.tgz"; - sha1 = "53ecf699ffcbcb39637691ab13baf160819766e5"; + name = "del___del_4.1.1.tgz"; + url = "https://registry.yarnpkg.com/del/-/del-4.1.1.tgz"; + sha1 = "9e8f117222ea44a31ff3a156c049b99052a9f0b4"; }; } { @@ -4865,6 +4857,14 @@ sha1 = "a10f10dedfc92def774ec9bb5bfbd2fb8e1c96d2"; }; } + { + name = "eslint_plugin_no_jquery___eslint_plugin_no_jquery_2.1.0.tgz"; + path = fetchurl { + name = "eslint_plugin_no_jquery___eslint_plugin_no_jquery_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/eslint-plugin-no-jquery/-/eslint-plugin-no-jquery-2.1.0.tgz"; + sha1 = "d03b74224c5cfbc7fc0bdd12ce4eb400d09e0c0b"; + }; + } { name = "eslint_plugin_promise___eslint_plugin_promise_4.1.1.tgz"; path = fetchurl { @@ -4898,11 +4898,11 @@ }; } { - name = "eslint_scope___eslint_scope_4.0.0.tgz"; + name = "eslint_scope___eslint_scope_4.0.3.tgz"; path = fetchurl { - name = "eslint_scope___eslint_scope_4.0.0.tgz"; - url = "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-4.0.0.tgz"; - sha1 = "50bf3071e9338bcdc43331794a0cb533f0136172"; + name = "eslint_scope___eslint_scope_4.0.3.tgz"; + url = "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-4.0.3.tgz"; + sha1 = "ca03833310f6889a3264781aa82e63eb9cfe7848"; }; } { @@ -5010,11 +5010,11 @@ }; } { - name = "eventemitter3___eventemitter3_1.2.0.tgz"; + name = "eventemitter3___eventemitter3_4.0.0.tgz"; path = fetchurl { - name = "eventemitter3___eventemitter3_1.2.0.tgz"; - url = "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-1.2.0.tgz"; - sha1 = "1c86991d816ad1e504750e73874224ecf3bec508"; + name = "eventemitter3___eventemitter3_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-4.0.0.tgz"; + sha1 = "d65176163887ee59f386d64c82610b696a4a74eb"; }; } { @@ -5025,6 +5025,14 @@ sha1 = "9ebdb7635ad099c70dcc4c2a1f5004288e8bd924"; }; } + { + name = "events___events_3.0.0.tgz"; + path = fetchurl { + name = "events___events_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/events/-/events-3.0.0.tgz"; + sha1 = "9a0a0dfaf62893d92b875b8f2698ca4114973e88"; + }; + } { name = "eventsource___eventsource_1.0.7.tgz"; path = fetchurl { @@ -5049,14 +5057,6 @@ sha1 = "6738de2eb7c8e671d0366aea0b0db8c6f7d7391b"; }; } - { - name = "execa___execa_0.10.0.tgz"; - path = fetchurl { - name = "execa___execa_0.10.0.tgz"; - url = "https://registry.yarnpkg.com/execa/-/execa-0.10.0.tgz"; - sha1 = "ff456a8f53f90f8eccc71a96d11bdfc7f082cb50"; - }; - } { name = "execa___execa_0.7.0.tgz"; path = fetchurl { @@ -5122,11 +5122,11 @@ }; } { - name = "https___registry.npmjs.org_express___express_4.16.3.tgz"; + name = "express___express_4.17.1.tgz"; path = fetchurl { - name = "https___registry.npmjs.org_express___express_4.16.3.tgz"; - url = "https://registry.npmjs.org/express/-/express-4.16.3.tgz"; - sha1 = "6af8a502350db3246ecc4becf6b5a34d22f7ed53"; + name = "express___express_4.17.1.tgz"; + url = "https://registry.yarnpkg.com/express/-/express-4.17.1.tgz"; + sha1 = "4491fc38605cf51f8629d39c2b5d026f98a4c134"; }; } { @@ -5226,11 +5226,11 @@ }; } { - name = "fastparse___fastparse_1.1.1.tgz"; + name = "fastparse___fastparse_1.1.2.tgz"; path = fetchurl { - name = "fastparse___fastparse_1.1.1.tgz"; - url = "https://registry.yarnpkg.com/fastparse/-/fastparse-1.1.1.tgz"; - sha1 = "d1e2643b38a94d7583b479060e6c4affc94071f8"; + name = "fastparse___fastparse_1.1.2.tgz"; + url = "https://registry.yarnpkg.com/fastparse/-/fastparse-1.1.2.tgz"; + sha1 = "91728c5a5942eced8531283c79441ee4122c35a9"; }; } { @@ -5298,11 +5298,11 @@ }; } { - name = "file_loader___file_loader_3.0.1.tgz"; + name = "file_loader___file_loader_4.2.0.tgz"; path = fetchurl { - name = "file_loader___file_loader_3.0.1.tgz"; - url = "https://registry.yarnpkg.com/file-loader/-/file-loader-3.0.1.tgz"; - sha1 = "f8e0ba0b599918b51adfe45d66d1e771ad560faa"; + name = "file_loader___file_loader_4.2.0.tgz"; + url = "https://registry.yarnpkg.com/file-loader/-/file-loader-4.2.0.tgz"; + sha1 = "5fb124d2369d7075d70a9a5abecd12e60a95215e"; }; } { @@ -5346,11 +5346,11 @@ }; } { - name = "finalhandler___finalhandler_1.1.1.tgz"; + name = "finalhandler___finalhandler_1.1.2.tgz"; path = fetchurl { - name = "finalhandler___finalhandler_1.1.1.tgz"; - url = "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.1.1.tgz"; - sha1 = "eebf4ed840079c83f4249038c9d703008301b105"; + name = "finalhandler___finalhandler_1.1.2.tgz"; + url = "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.1.2.tgz"; + sha1 = "b7e7d000ffd11938d0fdb053506f6ebabe9f587d"; }; } { @@ -5361,6 +5361,14 @@ sha1 = "8d0f94cd13fe43c6c7c261a0d86115ca918c05f7"; }; } + { + name = "find_cache_dir___find_cache_dir_3.0.0.tgz"; + path = fetchurl { + name = "find_cache_dir___find_cache_dir_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-3.0.0.tgz"; + sha1 = "cd4b7dd97b7185b7e17dbfe2d6e4115ee3eeb8fc"; + }; + } { name = "find_root___find_root_1.1.0.tgz"; path = fetchurl { @@ -5394,11 +5402,19 @@ }; } { - name = "findup_sync___findup_sync_2.0.0.tgz"; + name = "find_up___find_up_4.1.0.tgz"; path = fetchurl { - name = "findup_sync___findup_sync_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/findup-sync/-/findup-sync-2.0.0.tgz"; - sha1 = "9326b1488c22d1a6088650a86901b2d9a90a2cbc"; + name = "find_up___find_up_4.1.0.tgz"; + url = "https://registry.yarnpkg.com/find-up/-/find-up-4.1.0.tgz"; + sha1 = "97afe7d6cdc0bc5928584b7c8d7b16e8a9aa5d19"; + }; + } + { + name = "findup_sync___findup_sync_3.0.0.tgz"; + path = fetchurl { + name = "findup_sync___findup_sync_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/findup-sync/-/findup-sync-3.0.0.tgz"; + sha1 = "17b108f9ee512dfb7a5c7f3c8b27ea9e1a9c08d1"; }; } { @@ -5625,6 +5641,14 @@ sha1 = "f978fa4c90d1dfe7ff2d6beda2a515e713bdcf4a"; }; } + { + name = "get_caller_file___get_caller_file_2.0.5.tgz"; + path = fetchurl { + name = "get_caller_file___get_caller_file_2.0.5.tgz"; + url = "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz"; + sha1 = "4f94412a82db32f36e3b0b9741f8a97feb031f7e"; + }; + } { name = "get_port___get_port_4.2.0.tgz"; path = fetchurl { @@ -5802,11 +5826,11 @@ }; } { - name = "global_modules_path___global_modules_path_2.3.1.tgz"; + name = "global_modules___global_modules_2.0.0.tgz"; path = fetchurl { - name = "global_modules_path___global_modules_path_2.3.1.tgz"; - url = "https://registry.yarnpkg.com/global-modules-path/-/global-modules-path-2.3.1.tgz"; - sha1 = "e541f4c800a1a8514a990477b267ac67525b9931"; + name = "global_modules___global_modules_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/global-modules/-/global-modules-2.0.0.tgz"; + sha1 = "997605ad2345f27f51539bea26574421215c7780"; }; } { @@ -5817,14 +5841,6 @@ sha1 = "6d770f0eb523ac78164d72b5e71a8877265cc3ea"; }; } - { - name = "global_modules___global_modules_2.0.0.tgz"; - path = fetchurl { - name = "global_modules___global_modules_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/global-modules/-/global-modules-2.0.0.tgz"; - sha1 = "997605ad2345f27f51539bea26574421215c7780"; - }; - } { name = "global_prefix___global_prefix_1.0.2.tgz"; path = fetchurl { @@ -5929,14 +5945,6 @@ sha1 = "240cd05785a9a18e561dc1b44b41c763ef1e8db0"; }; } - { - name = "got___got_8.3.0.tgz"; - path = fetchurl { - name = "got___got_8.3.0.tgz"; - url = "https://registry.yarnpkg.com/got/-/got-8.3.0.tgz"; - sha1 = "6ba26e75f8a6cc4c6b3eb1fe7ce4fec7abac8533"; - }; - } { name = "graceful_fs___graceful_fs_4.2.0.tgz"; path = fetchurl { @@ -6057,14 +6065,6 @@ sha1 = "b5d454dc2199ae225699f3467e5a07f3b955bafd"; }; } - { - name = "has_symbol_support_x___has_symbol_support_x_1.3.0.tgz"; - path = fetchurl { - name = "has_symbol_support_x___has_symbol_support_x_1.3.0.tgz"; - url = "https://registry.yarnpkg.com/has-symbol-support-x/-/has-symbol-support-x-1.3.0.tgz"; - sha1 = "588bd6927eaa0e296afae24160659167fc2be4f8"; - }; - } { name = "has_symbols___has_symbols_1.0.0.tgz"; path = fetchurl { @@ -6073,14 +6073,6 @@ sha1 = "ba1a8f1af2a0fc39650f5c850367704122063b44"; }; } - { - name = "has_to_string_tag_x___has_to_string_tag_x_1.3.0.tgz"; - path = fetchurl { - name = "has_to_string_tag_x___has_to_string_tag_x_1.3.0.tgz"; - url = "https://registry.yarnpkg.com/has-to-string-tag-x/-/has-to-string-tag-x-1.3.0.tgz"; - sha1 = "78e3d98c3c0ec9413e970eb8d766249a1e13058f"; - }; - } { name = "has_unicode___has_unicode_2.0.1.tgz"; path = fetchurl { @@ -6266,11 +6258,11 @@ }; } { - name = "html_entities___html_entities_1.2.0.tgz"; + name = "html_entities___html_entities_1.2.1.tgz"; path = fetchurl { - name = "html_entities___html_entities_1.2.0.tgz"; - url = "https://registry.yarnpkg.com/html-entities/-/html-entities-1.2.0.tgz"; - sha1 = "41948caf85ce82fed36e4e6a0ed371a6664379e2"; + name = "html_entities___html_entities_1.2.1.tgz"; + url = "https://registry.yarnpkg.com/html-entities/-/html-entities-1.2.1.tgz"; + sha1 = "0df29351f0721163515dfb9e5543e5f6eed5162f"; }; } { @@ -6305,14 +6297,6 @@ sha1 = "5f5e422dcf6119c0d983ed36260ce9ded0bee464"; }; } - { - name = "http_cache_semantics___http_cache_semantics_3.8.1.tgz"; - path = fetchurl { - name = "http_cache_semantics___http_cache_semantics_3.8.1.tgz"; - url = "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-3.8.1.tgz"; - sha1 = "39b0e16add9b605bf0a9ef3d9daaf4843b4cacd2"; - }; - } { name = "http_deceiver___http_deceiver_1.2.7.tgz"; path = fetchurl { @@ -6321,6 +6305,14 @@ sha1 = "fa7168944ab9a519d337cb0bec7284dc3e723d87"; }; } + { + name = "http_errors___http_errors_1.7.2.tgz"; + path = fetchurl { + name = "http_errors___http_errors_1.7.2.tgz"; + url = "https://registry.yarnpkg.com/http-errors/-/http-errors-1.7.2.tgz"; + sha1 = "4f5029cf13239f31036e5b2e55292bcfbcc85c8f"; + }; + } { name = "http_errors___http_errors_1.6.2.tgz"; path = fetchurl { @@ -6330,19 +6322,19 @@ }; } { - name = "http_proxy_middleware___http_proxy_middleware_0.18.0.tgz"; + name = "http_proxy_middleware___http_proxy_middleware_0.19.1.tgz"; path = fetchurl { - name = "http_proxy_middleware___http_proxy_middleware_0.18.0.tgz"; - url = "https://registry.yarnpkg.com/http-proxy-middleware/-/http-proxy-middleware-0.18.0.tgz"; - sha1 = "0987e6bb5a5606e5a69168d8f967a87f15dd8aab"; + name = "http_proxy_middleware___http_proxy_middleware_0.19.1.tgz"; + url = "https://registry.yarnpkg.com/http-proxy-middleware/-/http-proxy-middleware-0.19.1.tgz"; + sha1 = "183c7dc4aa1479150306498c210cdaf96080a43a"; }; } { - name = "http_proxy___http_proxy_1.16.2.tgz"; + name = "http_proxy___http_proxy_1.18.0.tgz"; path = fetchurl { - name = "http_proxy___http_proxy_1.16.2.tgz"; - url = "https://registry.yarnpkg.com/http-proxy/-/http-proxy-1.16.2.tgz"; - sha1 = "06dff292952bf64dbe8471fa9df73066d4f37742"; + name = "http_proxy___http_proxy_1.18.0.tgz"; + url = "https://registry.yarnpkg.com/http-proxy/-/http-proxy-1.18.0.tgz"; + sha1 = "dbe55f63e75a347db7f3d99974f2692a314a6a3a"; }; } { @@ -6369,14 +6361,6 @@ sha1 = "2022b4b25fbddc21d2f524974a474aafe733908b"; }; } - { - name = "iconv_lite___iconv_lite_0.4.19.tgz"; - path = fetchurl { - name = "iconv_lite___iconv_lite_0.4.19.tgz"; - url = "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.19.tgz"; - sha1 = "f7468f60135f5e5dad3399c0a81be9a1603a082b"; - }; - } { name = "icss_replace_symbols___icss_replace_symbols_1.1.0.tgz"; path = fetchurl { @@ -6553,6 +6537,14 @@ sha1 = "82dc336d232b9062179d05ab3293a66059fd435d"; }; } + { + name = "infer_owner___infer_owner_1.0.4.tgz"; + path = fetchurl { + name = "infer_owner___infer_owner_1.0.4.tgz"; + url = "https://registry.yarnpkg.com/infer-owner/-/infer-owner-1.0.4.tgz"; + sha1 = "c4cefcaa8e51051c2a40ba2ce8a3d27295af9467"; + }; + } { name = "inflight___inflight_1.0.6.tgz"; path = fetchurl { @@ -6594,27 +6586,19 @@ }; } { - name = "internal_ip___internal_ip_3.0.1.tgz"; + name = "internal_ip___internal_ip_4.3.0.tgz"; path = fetchurl { - name = "internal_ip___internal_ip_3.0.1.tgz"; - url = "https://registry.yarnpkg.com/internal-ip/-/internal-ip-3.0.1.tgz"; - sha1 = "df5c99876e1d2eb2ea2d74f520e3f669a00ece27"; + name = "internal_ip___internal_ip_4.3.0.tgz"; + url = "https://registry.yarnpkg.com/internal-ip/-/internal-ip-4.3.0.tgz"; + sha1 = "845452baad9d2ca3b69c635a137acb9a0dad0907"; }; } { - name = "interpret___interpret_1.1.0.tgz"; + name = "interpret___interpret_1.2.0.tgz"; path = fetchurl { - name = "interpret___interpret_1.1.0.tgz"; - url = "https://registry.yarnpkg.com/interpret/-/interpret-1.1.0.tgz"; - sha1 = "7ed1b1410c6a0e0f78cf95d3b8440c63f78b8614"; - }; - } - { - name = "into_stream___into_stream_3.1.0.tgz"; - path = fetchurl { - name = "into_stream___into_stream_3.1.0.tgz"; - url = "https://registry.yarnpkg.com/into-stream/-/into-stream-3.1.0.tgz"; - sha1 = "96fb0a936c12babd6ff1752a17d05616abd094c6"; + name = "interpret___interpret_1.2.0.tgz"; + url = "https://registry.yarnpkg.com/interpret/-/interpret-1.2.0.tgz"; + sha1 = "d5061a6224be58e8083985f5014d844359576296"; }; } { @@ -6658,11 +6642,19 @@ }; } { - name = "ipaddr.js___ipaddr.js_1.8.0.tgz"; + name = "ipaddr.js___ipaddr.js_1.9.0.tgz"; path = fetchurl { - name = "ipaddr.js___ipaddr.js_1.8.0.tgz"; - url = "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.8.0.tgz"; - sha1 = "eaa33d6ddd7ace8f7f6fe0c9ca0440e706738b1e"; + name = "ipaddr.js___ipaddr.js_1.9.0.tgz"; + url = "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.9.0.tgz"; + sha1 = "37df74e430a0e47550fe54a2defe30d8acd95f65"; + }; + } + { + name = "is_absolute_url___is_absolute_url_3.0.2.tgz"; + path = fetchurl { + name = "is_absolute_url___is_absolute_url_3.0.2.tgz"; + url = "https://registry.yarnpkg.com/is-absolute-url/-/is-absolute-url-3.0.2.tgz"; + sha1 = "554f2933e7385cc46e94351977ca2081170a206e"; }; } { @@ -6969,14 +6961,6 @@ sha1 = "3e4729ac1f5fde025cd7d83a896dab9f4f67db0f"; }; } - { - name = "is_object___is_object_1.0.1.tgz"; - path = fetchurl { - name = "is_object___is_object_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/is-object/-/is-object-1.0.1.tgz"; - sha1 = "8952688c5ec2ffd6b03ecc85e769e02903083470"; - }; - } { name = "is_path_cwd___is_path_cwd_1.0.0.tgz"; path = fetchurl { @@ -6985,6 +6969,14 @@ sha1 = "d225ec23132e89edd38fda767472e62e65f1106d"; }; } + { + name = "is_path_cwd___is_path_cwd_2.2.0.tgz"; + path = fetchurl { + name = "is_path_cwd___is_path_cwd_2.2.0.tgz"; + url = "https://registry.yarnpkg.com/is-path-cwd/-/is-path-cwd-2.2.0.tgz"; + sha1 = "67d43b82664a7b5191fd9119127eb300048a9fdb"; + }; + } { name = "is_path_in_cwd___is_path_in_cwd_1.0.0.tgz"; path = fetchurl { @@ -6993,6 +6985,14 @@ sha1 = "6477582b8214d602346094567003be8a9eac04dc"; }; } + { + name = "is_path_in_cwd___is_path_in_cwd_2.1.0.tgz"; + path = fetchurl { + name = "is_path_in_cwd___is_path_in_cwd_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/is-path-in-cwd/-/is-path-in-cwd-2.1.0.tgz"; + sha1 = "bfe2dca26c69f397265a4009963602935a053acb"; + }; + } { name = "is_path_inside___is_path_inside_1.0.0.tgz"; path = fetchurl { @@ -7001,6 +7001,14 @@ sha1 = "fc06e5a1683fbda13de667aff717bbc10a48f37f"; }; } + { + name = "is_path_inside___is_path_inside_2.1.0.tgz"; + path = fetchurl { + name = "is_path_inside___is_path_inside_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-2.1.0.tgz"; + sha1 = "7c9810587d659a40d27bcdb4d5616eab059494b2"; + }; + } { name = "is_plain_obj___is_plain_obj_1.1.0.tgz"; path = fetchurl { @@ -7289,14 +7297,6 @@ sha1 = "a5231a08ef6dd22b268d0895084cf8d58b5bec53"; }; } - { - name = "isurl___isurl_1.0.0.tgz"; - path = fetchurl { - name = "isurl___isurl_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/isurl/-/isurl-1.0.0.tgz"; - sha1 = "b27f4f49f3cdaa3ea44a0a5b7f3462e6edc39d67"; - }; - } { name = "iterall___iterall_1.2.2.tgz"; path = fetchurl { @@ -7729,14 +7729,6 @@ sha1 = "e7dee66e35d6fc16f710fe91d5cf69f70f08911d"; }; } - { - name = "json_buffer___json_buffer_3.0.0.tgz"; - path = fetchurl { - name = "json_buffer___json_buffer_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/json-buffer/-/json-buffer-3.0.0.tgz"; - sha1 = "5b1f397afc75d677bde8bcfc0e47e1f9a3d9a898"; - }; - } { name = "json_parse_better_errors___json_parse_better_errors_1.0.2.tgz"; path = fetchurl { @@ -7914,19 +7906,11 @@ }; } { - name = "keyv___keyv_3.0.0.tgz"; + name = "killable___killable_1.0.1.tgz"; path = fetchurl { - name = "keyv___keyv_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/keyv/-/keyv-3.0.0.tgz"; - sha1 = "44923ba39e68b12a7cec7df6c3268c031f2ef373"; - }; - } - { - name = "killable___killable_1.0.0.tgz"; - path = fetchurl { - name = "killable___killable_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/killable/-/killable-1.0.0.tgz"; - sha1 = "da8b84bd47de5395878f95d64d02f2449fe05e6b"; + name = "killable___killable_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/killable/-/killable-1.0.1.tgz"; + sha1 = "4c8ce441187a061c7474fb87ca08e2a638194892"; }; } { @@ -8114,11 +8098,11 @@ }; } { - name = "loader_runner___loader_runner_2.3.0.tgz"; + name = "loader_runner___loader_runner_2.4.0.tgz"; path = fetchurl { - name = "loader_runner___loader_runner_2.3.0.tgz"; - url = "https://registry.yarnpkg.com/loader-runner/-/loader-runner-2.3.0.tgz"; - sha1 = "f482aea82d543e07921700d5a46ef26fdac6b8a2"; + name = "loader_runner___loader_runner_2.4.0.tgz"; + url = "https://registry.yarnpkg.com/loader-runner/-/loader-runner-2.4.0.tgz"; + sha1 = "ed47066bfe534d7e84c4c7b9998c2a75607d9357"; }; } { @@ -8145,6 +8129,14 @@ sha1 = "dbec3b3ab759758071b58fe59fc41871af21400e"; }; } + { + name = "locate_path___locate_path_5.0.0.tgz"; + path = fetchurl { + name = "locate_path___locate_path_5.0.0.tgz"; + url = "https://registry.yarnpkg.com/locate-path/-/locate-path-5.0.0.tgz"; + sha1 = "1afba396afd676a6d42504d0a67a3a7eb9f62aa0"; + }; + } { name = "lodash.camelcase___lodash.camelcase_4.3.0.tgz"; path = fetchurl { @@ -8161,14 +8153,6 @@ sha1 = "e23f3f9c4f8fbdde872529c1071857a086e5ccef"; }; } - { - name = "lodash.debounce___lodash.debounce_4.0.8.tgz"; - path = fetchurl { - name = "lodash.debounce___lodash.debounce_4.0.8.tgz"; - url = "https://registry.yarnpkg.com/lodash.debounce/-/lodash.debounce-4.0.8.tgz"; - sha1 = "82d79bff30a67c4005ffd5e2515300ad9ca4d7af"; - }; - } { name = "lodash.differencewith___lodash.differencewith_4.5.0.tgz"; path = fetchurl { @@ -8274,11 +8258,11 @@ }; } { - name = "loglevel___loglevel_1.4.1.tgz"; + name = "loglevel___loglevel_1.6.4.tgz"; path = fetchurl { - name = "loglevel___loglevel_1.4.1.tgz"; - url = "https://registry.yarnpkg.com/loglevel/-/loglevel-1.4.1.tgz"; - sha1 = "95b383f91a3c2756fd4ab093667e4309161f2bcd"; + name = "loglevel___loglevel_1.6.4.tgz"; + url = "https://registry.yarnpkg.com/loglevel/-/loglevel-1.6.4.tgz"; + sha1 = "f408f4f006db8354d0577dcf6d33485b3cb90d56"; }; } { @@ -8369,6 +8353,14 @@ sha1 = "5f0310e18b8be898cc07009295a30ae41e91e6f5"; }; } + { + name = "make_dir___make_dir_3.0.0.tgz"; + path = fetchurl { + name = "make_dir___make_dir_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/make-dir/-/make-dir-3.0.0.tgz"; + sha1 = "1b5f39f6b9270ed33f9f054c5c0f84304989f801"; + }; + } { name = "make_error___make_error_1.3.5.tgz"; path = fetchurl { @@ -8385,6 +8377,14 @@ sha1 = "e01a5c9109f2af79660e4e8b9587790184f5a96c"; }; } + { + name = "mamacro___mamacro_0.0.3.tgz"; + path = fetchurl { + name = "mamacro___mamacro_0.0.3.tgz"; + url = "https://registry.yarnpkg.com/mamacro/-/mamacro-0.0.3.tgz"; + sha1 = "ad2c9576197c9f1abf308d0787865bd975a3f3e4"; + }; + } { name = "map_age_cleaner___map_age_cleaner_0.1.3.tgz"; path = fetchurl { @@ -8682,27 +8682,27 @@ }; } { - name = "mime_db___mime_db_1.37.0.tgz"; + name = "mime_db___mime_db_1.40.0.tgz"; path = fetchurl { - name = "mime_db___mime_db_1.37.0.tgz"; - url = "https://registry.yarnpkg.com/mime-db/-/mime-db-1.37.0.tgz"; - sha1 = "0b6a0ce6fdbe9576e25f1f2d2fde8830dc0ad0d8"; + name = "mime_db___mime_db_1.40.0.tgz"; + url = "https://registry.yarnpkg.com/mime-db/-/mime-db-1.40.0.tgz"; + sha1 = "a65057e998db090f732a68f6c276d387d4126c32"; }; } { - name = "mime_types___mime_types_2.1.21.tgz"; + name = "mime_types___mime_types_2.1.24.tgz"; path = fetchurl { - name = "mime_types___mime_types_2.1.21.tgz"; - url = "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.21.tgz"; - sha1 = "28995aa1ecb770742fe6ae7e58f9181c744b3f96"; + name = "mime_types___mime_types_2.1.24.tgz"; + url = "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.24.tgz"; + sha1 = "b6f8d0b3e951efb77dedeca194cff6d16f676f81"; }; } { - name = "mime___mime_1.4.1.tgz"; + name = "mime___mime_1.6.0.tgz"; path = fetchurl { - name = "mime___mime_1.4.1.tgz"; - url = "https://registry.yarnpkg.com/mime/-/mime-1.4.1.tgz"; - sha1 = "121f9ebc49e3766f311a76e1fa1c8003c4b03aa6"; + name = "mime___mime_1.6.0.tgz"; + url = "https://registry.yarnpkg.com/mime/-/mime-1.6.0.tgz"; + sha1 = "32cd9e5c64553bd58d19a568af452acff04981b1"; }; } { @@ -8729,14 +8729,6 @@ sha1 = "7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b"; }; } - { - name = "mimic_response___mimic_response_1.0.0.tgz"; - path = fetchurl { - name = "mimic_response___mimic_response_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/mimic-response/-/mimic-response-1.0.0.tgz"; - sha1 = "df3d3652a73fded6b9b0b24146e6fd052353458e"; - }; - } { name = "minify___minify_4.1.2.tgz"; path = fetchurl { @@ -8970,11 +8962,11 @@ }; } { - name = "negotiator___negotiator_0.6.1.tgz"; + name = "negotiator___negotiator_0.6.2.tgz"; path = fetchurl { - name = "negotiator___negotiator_0.6.1.tgz"; - url = "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.1.tgz"; - sha1 = "2b327184e8992101177b28563fb5e7102acd0ca9"; + name = "negotiator___negotiator_0.6.2.tgz"; + url = "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.2.tgz"; + sha1 = "feacf7ccf525a77ae9634436a64883ffeca346fb"; }; } { @@ -9018,11 +9010,11 @@ }; } { - name = "node_forge___node_forge_0.6.33.tgz"; + name = "node_forge___node_forge_0.8.2.tgz"; path = fetchurl { - name = "node_forge___node_forge_0.6.33.tgz"; - url = "https://registry.yarnpkg.com/node-forge/-/node-forge-0.6.33.tgz"; - sha1 = "463811879f573d45155ad6a9f43dc296e8e85ebc"; + name = "node_forge___node_forge_0.8.2.tgz"; + url = "https://registry.yarnpkg.com/node-forge/-/node-forge-0.8.2.tgz"; + sha1 = "b4bcc59fb12ce77a8825fc6a783dfe3182499c5a"; }; } { @@ -9042,11 +9034,11 @@ }; } { - name = "node_libs_browser___node_libs_browser_2.1.0.tgz"; + name = "node_libs_browser___node_libs_browser_2.2.1.tgz"; path = fetchurl { - name = "node_libs_browser___node_libs_browser_2.1.0.tgz"; - url = "https://registry.yarnpkg.com/node-libs-browser/-/node-libs-browser-2.1.0.tgz"; - sha1 = "5f94263d404f6e44767d726901fff05478d600df"; + name = "node_libs_browser___node_libs_browser_2.2.1.tgz"; + url = "https://registry.yarnpkg.com/node-libs-browser/-/node-libs-browser-2.2.1.tgz"; + sha1 = "b64f513d18338625f90346d27b0d235e631f6425"; }; } { @@ -9161,14 +9153,6 @@ sha1 = "d0b145eb691189c63a78d201dc4fdb1293ef0c03"; }; } - { - name = "normalize_url___normalize_url_2.0.1.tgz"; - path = fetchurl { - name = "normalize_url___normalize_url_2.0.1.tgz"; - url = "https://registry.yarnpkg.com/normalize-url/-/normalize-url-2.0.1.tgz"; - sha1 = "835a9da1551fa26f70e92329069a23aa6574d7e6"; - }; - } { name = "normalize_url___normalize_url_1.9.1.tgz"; path = fetchurl { @@ -9338,11 +9322,11 @@ }; } { - name = "on_headers___on_headers_1.0.1.tgz"; + name = "on_headers___on_headers_1.0.2.tgz"; path = fetchurl { - name = "on_headers___on_headers_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/on-headers/-/on-headers-1.0.1.tgz"; - sha1 = "928f5d0f470d49342651ea6794b0857c100693f7"; + name = "on_headers___on_headers_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/on-headers/-/on-headers-1.0.2.tgz"; + sha1 = "772b0ae6aaa525c399e489adfad90c403eb3c28f"; }; } { @@ -9370,11 +9354,11 @@ }; } { - name = "opn___opn_5.2.0.tgz"; + name = "opn___opn_5.5.0.tgz"; path = fetchurl { - name = "opn___opn_5.2.0.tgz"; - url = "https://registry.yarnpkg.com/opn/-/opn-5.2.0.tgz"; - sha1 = "71fdf934d6827d676cecbea1531f95d354641225"; + name = "opn___opn_5.5.0.tgz"; + url = "https://registry.yarnpkg.com/opn/-/opn-5.5.0.tgz"; + sha1 = "fc7164fab56d235904c51c3b27da6758ca3b9bfc"; }; } { @@ -9473,14 +9457,6 @@ sha1 = "85cdfafaeb28e8677f416e287592b5f3f49ea410"; }; } - { - name = "p_cancelable___p_cancelable_0.4.1.tgz"; - path = fetchurl { - name = "p_cancelable___p_cancelable_0.4.1.tgz"; - url = "https://registry.yarnpkg.com/p-cancelable/-/p-cancelable-0.4.1.tgz"; - sha1 = "35f363d67d52081c8d9585e37bcceb7e0bbcb2a0"; - }; - } { name = "p_defer___p_defer_1.0.0.tgz"; path = fetchurl { @@ -9505,14 +9481,6 @@ sha1 = "3fbcfb15b899a44123b34b6dcc18b724336a2cae"; }; } - { - name = "p_is_promise___p_is_promise_1.1.0.tgz"; - path = fetchurl { - name = "p_is_promise___p_is_promise_1.1.0.tgz"; - url = "https://registry.yarnpkg.com/p-is-promise/-/p-is-promise-1.1.0.tgz"; - sha1 = "9c9456989e9f6588017b0434d56097675c3da05e"; - }; - } { name = "p_is_promise___p_is_promise_2.1.0.tgz"; path = fetchurl { @@ -9554,11 +9522,19 @@ }; } { - name = "p_map___p_map_1.1.1.tgz"; + name = "p_locate___p_locate_4.1.0.tgz"; path = fetchurl { - name = "p_map___p_map_1.1.1.tgz"; - url = "https://registry.yarnpkg.com/p-map/-/p-map-1.1.1.tgz"; - sha1 = "05f5e4ae97a068371bc2a5cc86bfbdbc19c4ae7a"; + name = "p_locate___p_locate_4.1.0.tgz"; + url = "https://registry.yarnpkg.com/p-locate/-/p-locate-4.1.0.tgz"; + sha1 = "a3428bb7088b3a60292f66919278b7c297ad4f07"; + }; + } + { + name = "p_map___p_map_2.1.0.tgz"; + path = fetchurl { + name = "p_map___p_map_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/p-map/-/p-map-2.1.0.tgz"; + sha1 = "310928feef9c9ecc65b68b17693018a665cea175"; }; } { @@ -9570,11 +9546,11 @@ }; } { - name = "p_timeout___p_timeout_2.0.1.tgz"; + name = "p_retry___p_retry_3.0.1.tgz"; path = fetchurl { - name = "p_timeout___p_timeout_2.0.1.tgz"; - url = "https://registry.yarnpkg.com/p-timeout/-/p-timeout-2.0.1.tgz"; - sha1 = "d8dd1979595d2dc0139e1fe46b8b646cb3cdf038"; + name = "p_retry___p_retry_3.0.1.tgz"; + url = "https://registry.yarnpkg.com/p-retry/-/p-retry-3.0.1.tgz"; + sha1 = "316b4c8893e2c8dc1cfa891f406c4b422bebf328"; }; } { @@ -9730,11 +9706,11 @@ }; } { - name = "parseurl___parseurl_1.3.2.tgz"; + name = "parseurl___parseurl_1.3.3.tgz"; path = fetchurl { - name = "parseurl___parseurl_1.3.2.tgz"; - url = "https://registry.yarnpkg.com/parseurl/-/parseurl-1.3.2.tgz"; - sha1 = "fc289d4ed8993119460c156253262cdc8de65bf3"; + name = "parseurl___parseurl_1.3.3.tgz"; + url = "https://registry.yarnpkg.com/parseurl/-/parseurl-1.3.3.tgz"; + sha1 = "9da19e7bee8d12dff0513ed5b76957793bc2e8d4"; }; } { @@ -9746,11 +9722,11 @@ }; } { - name = "path_browserify___path_browserify_0.0.0.tgz"; + name = "path_browserify___path_browserify_0.0.1.tgz"; path = fetchurl { - name = "path_browserify___path_browserify_0.0.0.tgz"; - url = "https://registry.yarnpkg.com/path-browserify/-/path-browserify-0.0.0.tgz"; - sha1 = "a0b870729aae214005b7d5032ec2cbbb0fb4451a"; + name = "path_browserify___path_browserify_0.0.1.tgz"; + url = "https://registry.yarnpkg.com/path-browserify/-/path-browserify-0.0.1.tgz"; + sha1 = "e6c4ddd7ed3aa27c68a20cc4e50e1a4ee83bbc4a"; }; } { @@ -9777,6 +9753,14 @@ sha1 = "ce0ebeaa5f78cb18925ea7d810d7b59b010fd515"; }; } + { + name = "path_exists___path_exists_4.0.0.tgz"; + path = fetchurl { + name = "path_exists___path_exists_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/path-exists/-/path-exists-4.0.0.tgz"; + sha1 = "513bdbe2d3b95d7762e8c1137efa195c6c61b5b3"; + }; + } { name = "path_is_absolute___path_is_absolute_1.0.1.tgz"; path = fetchurl { @@ -9969,6 +9953,14 @@ sha1 = "2749020f239ed990881b1f71210d51eb6523bea3"; }; } + { + name = "pkg_dir___pkg_dir_4.2.0.tgz"; + path = fetchurl { + name = "pkg_dir___pkg_dir_4.2.0.tgz"; + url = "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-4.2.0.tgz"; + sha1 = "f099133df7ede422e81d1d8448270eeb3e4261f3"; + }; + } { name = "pluralize___pluralize_7.0.0.tgz"; path = fetchurl { @@ -10018,11 +10010,11 @@ }; } { - name = "portfinder___portfinder_1.0.13.tgz"; + name = "portfinder___portfinder_1.0.24.tgz"; path = fetchurl { - name = "portfinder___portfinder_1.0.13.tgz"; - url = "https://registry.yarnpkg.com/portfinder/-/portfinder-1.0.13.tgz"; - sha1 = "bb32ecd87c27104ae6ee44b5a3ccbf0ebb1aede9"; + name = "portfinder___portfinder_1.0.24.tgz"; + url = "https://registry.yarnpkg.com/portfinder/-/portfinder-1.0.24.tgz"; + sha1 = "11efbc6865f12f37624b6531ead1d809ed965cfa"; }; } { @@ -10202,11 +10194,11 @@ }; } { - name = "postcss___postcss_7.0.17.tgz"; + name = "postcss___postcss_7.0.18.tgz"; path = fetchurl { - name = "postcss___postcss_7.0.17.tgz"; - url = "https://registry.yarnpkg.com/postcss/-/postcss-7.0.17.tgz"; - sha1 = "4da1bdff5322d4a0acaab4d87f3e782436bad31f"; + name = "postcss___postcss_7.0.18.tgz"; + url = "https://registry.yarnpkg.com/postcss/-/postcss-7.0.18.tgz"; + sha1 = "4b9cda95ae6c069c67a4d933029eddd4838ac233"; }; } { @@ -10225,14 +10217,6 @@ sha1 = "d4f4562b0ce3696e41ac52d0e002e57a635dc6dc"; }; } - { - name = "prepend_http___prepend_http_2.0.0.tgz"; - path = fetchurl { - name = "prepend_http___prepend_http_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/prepend-http/-/prepend-http-2.0.0.tgz"; - sha1 = "e92434bfa5ea8c19f41cdfd401d741a3c819d897"; - }; - } { name = "prettier___prettier_1.16.3.tgz"; path = fetchurl { @@ -10458,11 +10442,11 @@ }; } { - name = "proxy_addr___proxy_addr_2.0.4.tgz"; + name = "proxy_addr___proxy_addr_2.0.5.tgz"; path = fetchurl { - name = "proxy_addr___proxy_addr_2.0.4.tgz"; - url = "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-2.0.4.tgz"; - sha1 = "ecfc733bf22ff8c6f407fa275327b9ab67e48b93"; + name = "proxy_addr___proxy_addr_2.0.5.tgz"; + url = "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-2.0.5.tgz"; + sha1 = "34cbd64a2d81f4b1fd21e76f9f06c8a45299ee34"; }; } { @@ -10562,11 +10546,11 @@ }; } { - name = "qs___qs_6.5.1.tgz"; + name = "qs___qs_6.7.0.tgz"; path = fetchurl { - name = "qs___qs_6.5.1.tgz"; - url = "https://registry.yarnpkg.com/qs/-/qs-6.5.1.tgz"; - sha1 = "349cdf6eef89ec45c12d7d5eb3fc0c870343a6d8"; + name = "qs___qs_6.7.0.tgz"; + url = "https://registry.yarnpkg.com/qs/-/qs-6.7.0.tgz"; + sha1 = "41dc1a015e3d581f1621776be31afb2876a9b1bc"; }; } { @@ -10585,14 +10569,6 @@ sha1 = "bbb693b9ca915c232515b228b1a02b609043dbeb"; }; } - { - name = "query_string___query_string_5.1.1.tgz"; - path = fetchurl { - name = "query_string___query_string_5.1.1.tgz"; - url = "https://registry.yarnpkg.com/query-string/-/query-string-5.1.1.tgz"; - sha1 = "a78c012b71c17e05f2e3fa2319dd330682efb3cb"; - }; - } { name = "querystring_es3___querystring_es3_0.2.1.tgz"; path = fetchurl { @@ -10666,11 +10642,11 @@ }; } { - name = "raw_body___raw_body_2.3.2.tgz"; + name = "raw_body___raw_body_2.4.0.tgz"; path = fetchurl { - name = "raw_body___raw_body_2.3.2.tgz"; - url = "https://registry.yarnpkg.com/raw-body/-/raw-body-2.3.2.tgz"; - sha1 = "bcd60c77d3eb93cde0050295c3f379389bc88f89"; + name = "raw_body___raw_body_2.4.0.tgz"; + url = "https://registry.yarnpkg.com/raw-body/-/raw-body-2.4.0.tgz"; + sha1 = "a1ce6fb9c9bc356ca52e89256ab59059e13d0332"; }; } { @@ -10682,11 +10658,11 @@ }; } { - name = "raw_loader___raw_loader_1.0.0.tgz"; + name = "raw_loader___raw_loader_3.1.0.tgz"; path = fetchurl { - name = "raw_loader___raw_loader_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/raw-loader/-/raw-loader-1.0.0.tgz"; - sha1 = "3f9889e73dadbda9a424bce79809b4133ad46405"; + name = "raw_loader___raw_loader_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/raw-loader/-/raw-loader-3.1.0.tgz"; + sha1 = "5e9d399a5a222cc0de18f42c3bc5e49677532b3f"; }; } { @@ -10802,11 +10778,11 @@ }; } { - name = "readdirp___readdirp_2.1.0.tgz"; + name = "readdirp___readdirp_2.2.1.tgz"; path = fetchurl { - name = "readdirp___readdirp_2.1.0.tgz"; - url = "https://registry.yarnpkg.com/readdirp/-/readdirp-2.1.0.tgz"; - sha1 = "4ed0ad060df3073300c48440373f72d1cc642d78"; + name = "readdirp___readdirp_2.2.1.tgz"; + url = "https://registry.yarnpkg.com/readdirp/-/readdirp-2.2.1.tgz"; + sha1 = "0e87622a3325aa33e892285caf8b4e846529a525"; }; } { @@ -10873,14 +10849,6 @@ sha1 = "1f4ece27e00b0b65e0247a6810e6a85d83a5752c"; }; } - { - name = "regexp_tree___regexp_tree_0.1.11.tgz"; - path = fetchurl { - name = "regexp_tree___regexp_tree_0.1.11.tgz"; - url = "https://registry.yarnpkg.com/regexp-tree/-/regexp-tree-0.1.11.tgz"; - sha1 = "c9c7f00fcf722e0a56c7390983a7a63dd6c272f3"; - }; - } { name = "regexpp___regexpp_2.0.1.tgz"; path = fetchurl { @@ -10898,11 +10866,11 @@ }; } { - name = "regexpu_core___regexpu_core_4.5.4.tgz"; + name = "regexpu_core___regexpu_core_4.6.0.tgz"; path = fetchurl { - name = "regexpu_core___regexpu_core_4.5.4.tgz"; - url = "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-4.5.4.tgz"; - sha1 = "080d9d02289aa87fe1667a4f5136bc98a6aebaae"; + name = "regexpu_core___regexpu_core_4.6.0.tgz"; + url = "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-4.6.0.tgz"; + sha1 = "2037c18b327cfce8a6fea2a4ec441f2432afb8b6"; }; } { @@ -11145,6 +11113,14 @@ sha1 = "97f717b69d48784f5f526a6c5aa8ffdda055a4d1"; }; } + { + name = "require_main_filename___require_main_filename_2.0.0.tgz"; + path = fetchurl { + name = "require_main_filename___require_main_filename_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-2.0.0.tgz"; + sha1 = "d0b329ecc7cc0f61649f62215be69af54aa8989b"; + }; + } { name = "require_uncached___require_uncached_1.0.3.tgz"; path = fetchurl { @@ -11177,6 +11153,14 @@ sha1 = "6943c3530c4d9a7e46f1cddd51c158fc670cdbde"; }; } + { + name = "resize_observer_polyfill___resize_observer_polyfill_1.5.1.tgz"; + path = fetchurl { + name = "resize_observer_polyfill___resize_observer_polyfill_1.5.1.tgz"; + url = "https://registry.yarnpkg.com/resize-observer-polyfill/-/resize-observer-polyfill-1.5.1.tgz"; + sha1 = "0e9020dd3d21024458d4ebd27e23e40269810464"; + }; + } { name = "resolve_cwd___resolve_cwd_2.0.0.tgz"; path = fetchurl { @@ -11249,14 +11233,6 @@ sha1 = "ea10d8110376982fef578df8fc30b9ac30a07a3e"; }; } - { - name = "responselike___responselike_1.0.2.tgz"; - path = fetchurl { - name = "responselike___responselike_1.0.2.tgz"; - url = "https://registry.yarnpkg.com/responselike/-/responselike-1.0.2.tgz"; - sha1 = "918720ef3b631c5642be068f15ade5a46f4ba1e7"; - }; - } { name = "restore_cursor___restore_cursor_2.0.0.tgz"; path = fetchurl { @@ -11273,6 +11249,14 @@ sha1 = "b8a4825d5bdb1fc3f6f53c2bc33f81388681c7bc"; }; } + { + name = "retry___retry_0.12.0.tgz"; + path = fetchurl { + name = "retry___retry_0.12.0.tgz"; + url = "https://registry.yarnpkg.com/retry/-/retry-0.12.0.tgz"; + sha1 = "1b42a6266a21f07421d1b0b54b7dc167b01c013b"; + }; + } { name = "rfdc___rfdc_1.1.4.tgz"; path = fetchurl { @@ -11345,14 +11329,6 @@ sha1 = "246cebec189a6cbc143a3ef9f62d6f4c91813ca1"; }; } - { - name = "safe_buffer___safe_buffer_5.1.1.tgz"; - path = fetchurl { - name = "safe_buffer___safe_buffer_5.1.1.tgz"; - url = "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.1.tgz"; - sha1 = "893312af69b2123def71f57889001671eeb2c853"; - }; - } { name = "safe_buffer___safe_buffer_5.1.2.tgz"; path = fetchurl { @@ -11441,6 +11417,14 @@ sha1 = "0b79a93204d7b600d4b2850d1f66c2a34951c770"; }; } + { + name = "schema_utils___schema_utils_2.2.0.tgz"; + path = fetchurl { + name = "schema_utils___schema_utils_2.2.0.tgz"; + url = "https://registry.yarnpkg.com/schema-utils/-/schema-utils-2.2.0.tgz"; + sha1 = "48a065ce219e0cacf4631473159037b2c1ae82da"; + }; + } { name = "scope_css___scope_css_1.2.1.tgz"; path = fetchurl { @@ -11482,11 +11466,11 @@ }; } { - name = "selfsigned___selfsigned_1.10.1.tgz"; + name = "selfsigned___selfsigned_1.10.6.tgz"; path = fetchurl { - name = "selfsigned___selfsigned_1.10.1.tgz"; - url = "https://registry.yarnpkg.com/selfsigned/-/selfsigned-1.10.1.tgz"; - sha1 = "bf8cb7b83256c4551e31347c6311778db99eec52"; + name = "selfsigned___selfsigned_1.10.6.tgz"; + url = "https://registry.yarnpkg.com/selfsigned/-/selfsigned-1.10.6.tgz"; + sha1 = "7b3cd37ed9c2034261a173af1a1aae27d8169b67"; }; } { @@ -11506,11 +11490,11 @@ }; } { - name = "semver___semver_6.2.0.tgz"; + name = "semver___semver_6.3.0.tgz"; path = fetchurl { - name = "semver___semver_6.2.0.tgz"; - url = "https://registry.yarnpkg.com/semver/-/semver-6.2.0.tgz"; - sha1 = "4d813d9590aaf8a9192693d6c85b9344de5901db"; + name = "semver___semver_6.3.0.tgz"; + url = "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz"; + sha1 = "ee0a64c8af5e8ceea67687b133761e1becbd1d3d"; }; } { @@ -11522,11 +11506,11 @@ }; } { - name = "send___send_0.16.2.tgz"; + name = "send___send_0.17.1.tgz"; path = fetchurl { - name = "send___send_0.16.2.tgz"; - url = "https://registry.yarnpkg.com/send/-/send-0.16.2.tgz"; - sha1 = "6ecca1e0f8c156d141597559848df64730a6bbc1"; + name = "send___send_0.17.1.tgz"; + url = "https://registry.yarnpkg.com/send/-/send-0.17.1.tgz"; + sha1 = "c1d8b059f7900f7466dd4938bdc44e11ddb376c8"; }; } { @@ -11546,11 +11530,11 @@ }; } { - name = "serve_static___serve_static_1.13.2.tgz"; + name = "serve_static___serve_static_1.14.1.tgz"; path = fetchurl { - name = "serve_static___serve_static_1.13.2.tgz"; - url = "https://registry.yarnpkg.com/serve-static/-/serve-static-1.13.2.tgz"; - sha1 = "095e8472fd5b46237db50ce486a43f4b86c6cec1"; + name = "serve_static___serve_static_1.14.1.tgz"; + url = "https://registry.yarnpkg.com/serve-static/-/serve-static-1.14.1.tgz"; + sha1 = "666e636dc4f010f7ef29970a88a674320898b2f9"; }; } { @@ -11561,14 +11545,6 @@ sha1 = "045f9782d011ae9a6803ddd382b24392b3d890f7"; }; } - { - name = "set_immediate_shim___set_immediate_shim_1.0.1.tgz"; - path = fetchurl { - name = "set_immediate_shim___set_immediate_shim_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/set-immediate-shim/-/set-immediate-shim-1.0.1.tgz"; - sha1 = "4b2b1b27eb808a9f8dcc481a58e5e56f599f3f61"; - }; - } { name = "set_value___set_value_0.4.3.tgz"; path = fetchurl { @@ -11602,11 +11578,11 @@ }; } { - name = "setprototypeof___setprototypeof_1.1.0.tgz"; + name = "setprototypeof___setprototypeof_1.1.1.tgz"; path = fetchurl { - name = "setprototypeof___setprototypeof_1.1.0.tgz"; - url = "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.1.0.tgz"; - sha1 = "d0bd85536887b6fe7c0d818cb962d9d91c54e656"; + name = "setprototypeof___setprototypeof_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.1.1.tgz"; + sha1 = "7e95acb24aa92f5885e0abef5ba131330d4ae683"; }; } { @@ -11786,11 +11762,11 @@ }; } { - name = "sockjs_client___sockjs_client_1.3.0.tgz"; + name = "sockjs_client___sockjs_client_1.4.0.tgz"; path = fetchurl { - name = "sockjs_client___sockjs_client_1.3.0.tgz"; - url = "https://registry.yarnpkg.com/sockjs-client/-/sockjs-client-1.3.0.tgz"; - sha1 = "12fc9d6cb663da5739d3dc5fb6e8687da95cb177"; + name = "sockjs_client___sockjs_client_1.4.0.tgz"; + url = "https://registry.yarnpkg.com/sockjs-client/-/sockjs-client-1.4.0.tgz"; + sha1 = "c9f2568e19c8fd8173b4997ea3420e0bb306c7d5"; }; } { @@ -11809,14 +11785,6 @@ sha1 = "441b6d4d346798f1b4e49e8920adfba0e543f9ad"; }; } - { - name = "sort_keys___sort_keys_2.0.0.tgz"; - path = fetchurl { - name = "sort_keys___sort_keys_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/sort-keys/-/sort-keys-2.0.0.tgz"; - sha1 = "658535584861ec97d730d6cf41822e1f56684128"; - }; - } { name = "sortablejs___sortablejs_1.10.0.tgz"; path = fetchurl { @@ -11825,14 +11793,6 @@ sha1 = "0ebc054acff2486569194a2f975b2b145dd5e7d6"; }; } - { - name = "sortablejs___sortablejs_1.9.0.tgz"; - path = fetchurl { - name = "sortablejs___sortablejs_1.9.0.tgz"; - url = "https://registry.yarnpkg.com/sortablejs/-/sortablejs-1.9.0.tgz"; - sha1 = "2d1e74ae6bac2cb4ad0622908f340848969eb88d"; - }; - } { name = "source_list_map___source_list_map_2.0.0.tgz"; path = fetchurl { @@ -11850,11 +11810,11 @@ }; } { - name = "source_map_support___source_map_support_0.5.12.tgz"; + name = "source_map_support___source_map_support_0.5.13.tgz"; path = fetchurl { - name = "source_map_support___source_map_support_0.5.12.tgz"; - url = "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.12.tgz"; - sha1 = "b4f3b10d51857a5af0138d3ce8003b201613d599"; + name = "source_map_support___source_map_support_0.5.13.tgz"; + url = "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.13.tgz"; + sha1 = "31b24a9c2e73c2de85066c0feb7d44767ed52932"; }; } { @@ -11946,11 +11906,11 @@ }; } { - name = "spdy___spdy_4.0.0.tgz"; + name = "spdy___spdy_4.0.1.tgz"; path = fetchurl { - name = "spdy___spdy_4.0.0.tgz"; - url = "https://registry.yarnpkg.com/spdy/-/spdy-4.0.0.tgz"; - sha1 = "81f222b5a743a329aa12cea6a390e60e9b613c52"; + name = "spdy___spdy_4.0.1.tgz"; + url = "https://registry.yarnpkg.com/spdy/-/spdy-4.0.1.tgz"; + sha1 = "6f12ed1c5db7ea4f24ebb8b89ba58c87c08257f2"; }; } { @@ -12034,11 +11994,11 @@ }; } { - name = "statuses___statuses_1.4.0.tgz"; + name = "statuses___statuses_1.5.0.tgz"; path = fetchurl { - name = "statuses___statuses_1.4.0.tgz"; - url = "https://registry.yarnpkg.com/statuses/-/statuses-1.4.0.tgz"; - sha1 = "bb73d446da2796106efcc1b601a253d6c46bd087"; + name = "statuses___statuses_1.5.0.tgz"; + url = "https://registry.yarnpkg.com/statuses/-/statuses-1.5.0.tgz"; + sha1 = "161c7dac177659fd9811f43771fa99381478628c"; }; } { @@ -12170,11 +12130,11 @@ }; } { - name = "string_width___string_width_3.0.0.tgz"; + name = "string_width___string_width_3.1.0.tgz"; path = fetchurl { - name = "string_width___string_width_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/string-width/-/string-width-3.0.0.tgz"; - sha1 = "5a1690a57cc78211fffd9bf24bbe24d090604eb1"; + name = "string_width___string_width_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/string-width/-/string-width-3.1.0.tgz"; + sha1 = "22767be21b62af1081574306f69ac51b62203961"; }; } { @@ -12290,11 +12250,11 @@ }; } { - name = "style_loader___style_loader_0.23.1.tgz"; + name = "style_loader___style_loader_1.0.0.tgz"; path = fetchurl { - name = "style_loader___style_loader_0.23.1.tgz"; - url = "https://registry.yarnpkg.com/style-loader/-/style-loader-0.23.1.tgz"; - sha1 = "cb9154606f3e771ab6c4ab637026a1049174d925"; + name = "style_loader___style_loader_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/style-loader/-/style-loader-1.0.0.tgz"; + sha1 = "1d5296f9165e8e2c85d24eee0b7caf9ec8ca1f82"; }; } { @@ -12345,6 +12305,14 @@ sha1 = "ddd76e0124b297d40bf3cca31c8b22ecb43bc61d"; }; } + { + name = "supports_color___supports_color_6.1.0.tgz"; + path = fetchurl { + name = "supports_color___supports_color_6.1.0.tgz"; + url = "https://registry.yarnpkg.com/supports-color/-/supports-color-6.1.0.tgz"; + sha1 = "0764abc69c63d5ac842dd4867e8d025e880df8f3"; + }; + } { name = "supports_color___supports_color_2.0.0.tgz"; path = fetchurl { @@ -12361,14 +12329,6 @@ sha1 = "e2e69a44ac8772f78a1ec0b35b689df6530efc8f"; }; } - { - name = "supports_color___supports_color_6.1.0.tgz"; - path = fetchurl { - name = "supports_color___supports_color_6.1.0.tgz"; - url = "https://registry.yarnpkg.com/supports-color/-/supports-color-6.1.0.tgz"; - sha1 = "0764abc69c63d5ac842dd4867e8d025e880df8f3"; - }; - } { name = "svg_tags___svg_tags_1.0.0.tgz"; path = fetchurl { @@ -12426,11 +12386,11 @@ }; } { - name = "tapable___tapable_1.1.0.tgz"; + name = "tapable___tapable_1.1.3.tgz"; path = fetchurl { - name = "tapable___tapable_1.1.0.tgz"; - url = "https://registry.yarnpkg.com/tapable/-/tapable-1.1.0.tgz"; - sha1 = "0d076a172e3d9ba088fd2272b2668fb8d194b78c"; + name = "tapable___tapable_1.1.3.tgz"; + url = "https://registry.yarnpkg.com/tapable/-/tapable-1.1.3.tgz"; + sha1 = "a1fccc06b58db61fd7a45da2da44f5f3a3e67ba2"; }; } { @@ -12458,27 +12418,19 @@ }; } { - name = "terser_webpack_plugin___terser_webpack_plugin_1.2.1.tgz"; + name = "terser_webpack_plugin___terser_webpack_plugin_1.4.1.tgz"; path = fetchurl { - name = "terser_webpack_plugin___terser_webpack_plugin_1.2.1.tgz"; - url = "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-1.2.1.tgz"; - sha1 = "7545da9ae5f4f9ae6a0ac961eb46f5e7c845cc26"; + name = "terser_webpack_plugin___terser_webpack_plugin_1.4.1.tgz"; + url = "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-1.4.1.tgz"; + sha1 = "61b18e40eaee5be97e771cdbb10ed1280888c2b4"; }; } { - name = "terser___terser_3.14.1.tgz"; + name = "terser___terser_4.3.1.tgz"; path = fetchurl { - name = "terser___terser_3.14.1.tgz"; - url = "https://registry.yarnpkg.com/terser/-/terser-3.14.1.tgz"; - sha1 = "cc4764014af570bc79c79742358bd46926018a32"; - }; - } - { - name = "terser___terser_4.0.0.tgz"; - path = fetchurl { - name = "terser___terser_4.0.0.tgz"; - url = "https://registry.yarnpkg.com/terser/-/terser-4.0.0.tgz"; - sha1 = "ef356f6f359a963e2cc675517f21c1c382877374"; + name = "terser___terser_4.3.1.tgz"; + url = "https://registry.yarnpkg.com/terser/-/terser-4.3.1.tgz"; + sha1 = "09820bcb3398299c4b48d9a86aefc65127d0ed65"; }; } { @@ -12753,6 +12705,14 @@ sha1 = "6e45b1263f2017fa0acc7d89d78b15b8bf77da32"; }; } + { + name = "toidentifier___toidentifier_1.0.0.tgz"; + path = fetchurl { + name = "toidentifier___toidentifier_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/toidentifier/-/toidentifier-1.0.0.tgz"; + sha1 = "7e1be3470f1e77948bc43d94a3c8f4d7752ba553"; + }; + } { name = "touch___touch_3.1.0.tgz"; path = fetchurl { @@ -12801,14 +12761,6 @@ sha1 = "b403d0b91be50c331dfc4b82eeceb22c3de16d20"; }; } - { - name = "trim_right___trim_right_1.0.1.tgz"; - path = fetchurl { - name = "trim_right___trim_right_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/trim-right/-/trim-right-1.0.1.tgz"; - sha1 = "cb2e1203067e0c8de1f614094b9fe45704ea6003"; - }; - } { name = "trim_trailing_lines___trim_trailing_lines_1.1.1.tgz"; path = fetchurl { @@ -12930,11 +12882,11 @@ }; } { - name = "type_is___type_is_1.6.16.tgz"; + name = "type_is___type_is_1.6.18.tgz"; path = fetchurl { - name = "type_is___type_is_1.6.16.tgz"; - url = "https://registry.yarnpkg.com/type-is/-/type-is-1.6.16.tgz"; - sha1 = "f89ce341541c672b25ee7ae3c73dee3b2be50194"; + name = "type_is___type_is_1.6.18.tgz"; + url = "https://registry.yarnpkg.com/type-is/-/type-is-1.6.18.tgz"; + sha1 = "4e552cd05df09467dcbc4ef739de89f2cf37c131"; }; } { @@ -13242,11 +13194,11 @@ }; } { - name = "upath___upath_1.1.0.tgz"; + name = "upath___upath_1.2.0.tgz"; path = fetchurl { - name = "upath___upath_1.1.0.tgz"; - url = "https://registry.yarnpkg.com/upath/-/upath-1.1.0.tgz"; - sha1 = "35256597e46a581db4793d0ce47fa9aebfc9fabd"; + name = "upath___upath_1.2.0.tgz"; + url = "https://registry.yarnpkg.com/upath/-/upath-1.2.0.tgz"; + sha1 = "8f66dbcd55a883acdae4408af8b035a5044c1894"; }; } { @@ -13282,11 +13234,11 @@ }; } { - name = "url_loader___url_loader_1.1.2.tgz"; + name = "url_loader___url_loader_2.1.0.tgz"; path = fetchurl { - name = "url_loader___url_loader_1.1.2.tgz"; - url = "https://registry.yarnpkg.com/url-loader/-/url-loader-1.1.2.tgz"; - sha1 = "b971d191b83af693c5e3fea4064be9e1f2d7f8d8"; + name = "url_loader___url_loader_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/url-loader/-/url-loader-2.1.0.tgz"; + sha1 = "bcc1ecabbd197e913eca23f5e0378e24b4412961"; }; } { @@ -13297,14 +13249,6 @@ sha1 = "7af8f303645e9bd79a272e7a14ac68bc0609da73"; }; } - { - name = "url_parse_lax___url_parse_lax_3.0.0.tgz"; - path = fetchurl { - name = "url_parse_lax___url_parse_lax_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/url-parse-lax/-/url-parse-lax-3.0.0.tgz"; - sha1 = "16b5cafc07dbe3676c1b1999177823d6503acb0c"; - }; - } { name = "url_parse___url_parse_1.4.4.tgz"; path = fetchurl { @@ -13321,14 +13265,6 @@ sha1 = "09b98337c89dcf6c6a6a0bfeb096f6ba83b7526b"; }; } - { - name = "url_to_options___url_to_options_1.0.1.tgz"; - path = fetchurl { - name = "url_to_options___url_to_options_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/url-to-options/-/url-to-options-1.0.1.tgz"; - sha1 = "1505a03a289a48cbd7a434efbaeec5055f5633a9"; - }; - } { name = "url___url_0.10.3.tgz"; path = fetchurl { @@ -13385,6 +13321,14 @@ sha1 = "7afb1afe50805246489e3db7fe0ed379336ac0f9"; }; } + { + name = "util___util_0.11.1.tgz"; + path = fetchurl { + name = "util___util_0.11.1.tgz"; + url = "https://registry.yarnpkg.com/util/-/util-0.11.1.tgz"; + sha1 = "3236733720ec64bb27f6e26f421aaa2e1b588d61"; + }; + } { name = "utils_merge___utils_merge_1.0.1.tgz"; path = fetchurl { @@ -13402,11 +13346,11 @@ }; } { - name = "v8_compile_cache___v8_compile_cache_2.0.2.tgz"; + name = "v8_compile_cache___v8_compile_cache_2.0.3.tgz"; path = fetchurl { - name = "v8_compile_cache___v8_compile_cache_2.0.2.tgz"; - url = "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.0.2.tgz"; - sha1 = "a428b28bb26790734c4fc8bc9fa106fccebf6a6c"; + name = "v8_compile_cache___v8_compile_cache_2.0.3.tgz"; + url = "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.0.3.tgz"; + sha1 = "00f7494d2ae2b688cfe2899df6ed2c54bef91dbe"; }; } { @@ -13546,11 +13490,11 @@ }; } { - name = "vm_browserify___vm_browserify_0.0.4.tgz"; + name = "vm_browserify___vm_browserify_1.1.0.tgz"; path = fetchurl { - name = "vm_browserify___vm_browserify_0.0.4.tgz"; - url = "https://registry.yarnpkg.com/vm-browserify/-/vm-browserify-0.0.4.tgz"; - sha1 = "5d7ea45bbef9e4a6ff65f95438e0a87c357d5a73"; + name = "vm_browserify___vm_browserify_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/vm-browserify/-/vm-browserify-1.1.0.tgz"; + sha1 = "bd76d6a23323e2ca8ffa12028dc04559c75f9019"; }; } { @@ -13610,19 +13554,11 @@ }; } { - name = "vue_loader___vue_loader_15.7.0.tgz"; + name = "vue_loader___vue_loader_15.7.1.tgz"; path = fetchurl { - name = "vue_loader___vue_loader_15.7.0.tgz"; - url = "https://registry.yarnpkg.com/vue-loader/-/vue-loader-15.7.0.tgz"; - sha1 = "27275aa5a3ef4958c5379c006dd1436ad04b25b3"; - }; - } - { - name = "vue_resource___vue_resource_1.5.1.tgz"; - path = fetchurl { - name = "vue_resource___vue_resource_1.5.1.tgz"; - url = "https://registry.yarnpkg.com/vue-resource/-/vue-resource-1.5.1.tgz"; - sha1 = "0f3d685e3254d21800bebd966edcf56c34b3b6e4"; + name = "vue_loader___vue_loader_15.7.1.tgz"; + url = "https://registry.yarnpkg.com/vue-loader/-/vue-loader-15.7.1.tgz"; + sha1 = "6ccacd4122aa80f69baaac08ff295a62e3aefcfd"; }; } { @@ -13714,11 +13650,11 @@ }; } { - name = "watchpack___watchpack_1.5.0.tgz"; + name = "watchpack___watchpack_1.6.0.tgz"; path = fetchurl { - name = "watchpack___watchpack_1.5.0.tgz"; - url = "https://registry.yarnpkg.com/watchpack/-/watchpack-1.5.0.tgz"; - sha1 = "231e783af830a22f8966f65c4c4bacc814072eed"; + name = "watchpack___watchpack_1.6.0.tgz"; + url = "https://registry.yarnpkg.com/watchpack/-/watchpack-1.6.0.tgz"; + sha1 = "4bc12c2ebe8aa277a71f1d3f14d685c7b446cd00"; }; } { @@ -13738,43 +13674,35 @@ }; } { - name = "webpack_bundle_analyzer___webpack_bundle_analyzer_3.3.2.tgz"; + name = "webpack_bundle_analyzer___webpack_bundle_analyzer_3.5.1.tgz"; path = fetchurl { - name = "webpack_bundle_analyzer___webpack_bundle_analyzer_3.3.2.tgz"; - url = "https://registry.yarnpkg.com/webpack-bundle-analyzer/-/webpack-bundle-analyzer-3.3.2.tgz"; - sha1 = "3da733a900f515914e729fcebcd4c40dde71fc6f"; + name = "webpack_bundle_analyzer___webpack_bundle_analyzer_3.5.1.tgz"; + url = "https://registry.yarnpkg.com/webpack-bundle-analyzer/-/webpack-bundle-analyzer-3.5.1.tgz"; + sha1 = "84aabb1547178d842ebb4ccc7324084b6c3b0ea9"; }; } { - name = "webpack_cli___webpack_cli_3.2.1.tgz"; + name = "webpack_cli___webpack_cli_3.3.9.tgz"; path = fetchurl { - name = "webpack_cli___webpack_cli_3.2.1.tgz"; - url = "https://registry.yarnpkg.com/webpack-cli/-/webpack-cli-3.2.1.tgz"; - sha1 = "779c696c82482491f0803907508db2e276ed3b61"; + name = "webpack_cli___webpack_cli_3.3.9.tgz"; + url = "https://registry.yarnpkg.com/webpack-cli/-/webpack-cli-3.3.9.tgz"; + sha1 = "79c27e71f94b7fe324d594ab64a8e396b9daa91a"; }; } { - name = "webpack_dev_middleware___webpack_dev_middleware_3.4.0.tgz"; + name = "webpack_dev_middleware___webpack_dev_middleware_3.7.1.tgz"; path = fetchurl { - name = "webpack_dev_middleware___webpack_dev_middleware_3.4.0.tgz"; - url = "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-3.4.0.tgz"; - sha1 = "1132fecc9026fd90f0ecedac5cbff75d1fb45890"; + name = "webpack_dev_middleware___webpack_dev_middleware_3.7.1.tgz"; + url = "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-3.7.1.tgz"; + sha1 = "1167aea02afa034489869b8368fe9fed1aea7d09"; }; } { - name = "webpack_dev_middleware___webpack_dev_middleware_3.7.0.tgz"; + name = "webpack_dev_server___webpack_dev_server_3.8.1.tgz"; path = fetchurl { - name = "webpack_dev_middleware___webpack_dev_middleware_3.7.0.tgz"; - url = "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-3.7.0.tgz"; - sha1 = "ef751d25f4e9a5c8a35da600c5fda3582b5c6cff"; - }; - } - { - name = "webpack_dev_server___webpack_dev_server_3.1.14.tgz"; - path = fetchurl { - name = "webpack_dev_server___webpack_dev_server_3.1.14.tgz"; - url = "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-3.1.14.tgz"; - sha1 = "60fb229b997fc5a0a1fc6237421030180959d469"; + name = "webpack_dev_server___webpack_dev_server_3.8.1.tgz"; + url = "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-3.8.1.tgz"; + sha1 = "485b64c4aadc23f601e72114b40c1b1fea31d9f1"; }; } { @@ -13786,27 +13714,27 @@ }; } { - name = "webpack_sources___webpack_sources_1.3.0.tgz"; + name = "webpack_sources___webpack_sources_1.4.3.tgz"; path = fetchurl { - name = "webpack_sources___webpack_sources_1.3.0.tgz"; - url = "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-1.3.0.tgz"; - sha1 = "2a28dcb9f1f45fe960d8f1493252b5ee6530fa85"; + name = "webpack_sources___webpack_sources_1.4.3.tgz"; + url = "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-1.4.3.tgz"; + sha1 = "eedd8ec0b928fbf1cbfe994e22d2d890f330a933"; }; } { - name = "webpack_stats_plugin___webpack_stats_plugin_0.2.1.tgz"; + name = "webpack_stats_plugin___webpack_stats_plugin_0.3.0.tgz"; path = fetchurl { - name = "webpack_stats_plugin___webpack_stats_plugin_0.2.1.tgz"; - url = "https://registry.yarnpkg.com/webpack-stats-plugin/-/webpack-stats-plugin-0.2.1.tgz"; - sha1 = "1f5bac13fc25d62cbb5fd0ff646757dc802b8595"; + name = "webpack_stats_plugin___webpack_stats_plugin_0.3.0.tgz"; + url = "https://registry.yarnpkg.com/webpack-stats-plugin/-/webpack-stats-plugin-0.3.0.tgz"; + sha1 = "6952f63feb9a5393a328d774fb3eccac78d2f51b"; }; } { - name = "webpack___webpack_4.29.0.tgz"; + name = "webpack___webpack_4.40.2.tgz"; path = fetchurl { - name = "webpack___webpack_4.29.0.tgz"; - url = "https://registry.yarnpkg.com/webpack/-/webpack-4.29.0.tgz"; - sha1 = "f2cfef83f7ae404ba889ff5d43efd285ca26e750"; + name = "webpack___webpack_4.40.2.tgz"; + url = "https://registry.yarnpkg.com/webpack/-/webpack-4.40.2.tgz"; + sha1 = "d21433d250f900bf0facbabe8f50d585b2dc30a7"; }; } { @@ -13914,11 +13842,11 @@ }; } { - name = "worker_farm___worker_farm_1.5.2.tgz"; + name = "worker_farm___worker_farm_1.7.0.tgz"; path = fetchurl { - name = "worker_farm___worker_farm_1.5.2.tgz"; - url = "https://registry.yarnpkg.com/worker-farm/-/worker-farm-1.5.2.tgz"; - sha1 = "32b312e5dc3d5d45d79ef44acc2587491cd729ae"; + name = "worker_farm___worker_farm_1.7.0.tgz"; + url = "https://registry.yarnpkg.com/worker-farm/-/worker-farm-1.7.0.tgz"; + sha1 = "26a94c5391bbca926152002f69b84a4bf772e5a8"; }; } { @@ -13937,6 +13865,14 @@ sha1 = "d8fc3d284dd05794fe84973caecdd1cf824fdd85"; }; } + { + name = "wrap_ansi___wrap_ansi_5.1.0.tgz"; + path = fetchurl { + name = "wrap_ansi___wrap_ansi_5.1.0.tgz"; + url = "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-5.1.0.tgz"; + sha1 = "1fd1f67235d5b6d0fee781056001bfb694c03b09"; + }; + } { name = "wrappy___wrappy_1.0.2.tgz"; path = fetchurl { @@ -13978,11 +13914,11 @@ }; } { - name = "ws___ws_6.0.0.tgz"; + name = "ws___ws_6.2.1.tgz"; path = fetchurl { - name = "ws___ws_6.0.0.tgz"; - url = "https://registry.yarnpkg.com/ws/-/ws-6.0.0.tgz"; - sha1 = "eaa494aded00ac4289d455bac8d84c7c651cef35"; + name = "ws___ws_6.2.1.tgz"; + url = "https://registry.yarnpkg.com/ws/-/ws-6.2.1.tgz"; + sha1 = "442fdf0a47ed64f59b6a5d8ff130f4748ed524fb"; }; } { @@ -14073,14 +14009,6 @@ sha1 = "67fe075c5c24fef39f9d65f5f7b7fe75171968fc"; }; } - { - name = "xregexp___xregexp_4.0.0.tgz"; - path = fetchurl { - name = "xregexp___xregexp_4.0.0.tgz"; - url = "https://registry.yarnpkg.com/xregexp/-/xregexp-4.0.0.tgz"; - sha1 = "e698189de49dd2a18cc5687b05e17c8e43943020"; - }; - } { name = "xtend___xtend_4.0.2.tgz"; path = fetchurl { @@ -14145,6 +14073,14 @@ sha1 = "879a0865973bca9f6bab5cbdf3b1c67ec7d3bcf4"; }; } + { + name = "yargs_parser___yargs_parser_13.1.1.tgz"; + path = fetchurl { + name = "yargs_parser___yargs_parser_13.1.1.tgz"; + url = "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-13.1.1.tgz"; + sha1 = "d26058532aa06d365fe091f6a1fc06b2f7e5eca0"; + }; + } { name = "yargs_parser___yargs_parser_5.0.0.tgz"; path = fetchurl { @@ -14153,14 +14089,6 @@ sha1 = "275ecf0d7ffe05c77e64e7c86e4cd94bf0e1228a"; }; } - { - name = "yargs___yargs_12.0.2.tgz"; - path = fetchurl { - name = "yargs___yargs_12.0.2.tgz"; - url = "https://registry.yarnpkg.com/yargs/-/yargs-12.0.2.tgz"; - sha1 = "fe58234369392af33ecbef53819171eff0f5aadc"; - }; - } { name = "yargs___yargs_12.0.5.tgz"; path = fetchurl { @@ -14169,6 +14097,14 @@ sha1 = "05f5997b609647b64f66b81e3b4b10a368e7ad13"; }; } + { + name = "yargs___yargs_13.2.4.tgz"; + path = fetchurl { + name = "yargs___yargs_13.2.4.tgz"; + url = "https://registry.yarnpkg.com/yargs/-/yargs-13.2.4.tgz"; + sha1 = "0b562b794016eb9651b98bd37acf364aa5d6dc83"; + }; + } { name = "yargs___yargs_7.1.0.tgz"; path = fetchurl { diff --git a/pkgs/applications/video/mythtv/default.nix b/pkgs/applications/video/mythtv/default.nix index d5c46491cf41..7914bb84c428 100644 --- a/pkgs/applications/video/mythtv/default.nix +++ b/pkgs/applications/video/mythtv/default.nix @@ -1,40 +1,40 @@ -{ stdenv, fetchFromGitHub, which, qtbase, qtwebkit, qtscript, xlibsWrapper +{ stdenv, mkDerivation, fetchFromGitHub, which, qtbase, qtwebkit, qtscript, xlibsWrapper , libpulseaudio, fftwSinglePrec , lame, zlib, libGLU_combined, alsaLib, freetype -, perl, pkgconfig , libX11, libXv, libXrandr, libXvMC, libXinerama, libXxf86vm -, libXmu , yasm, libuuid, taglib, libtool, autoconf, automake, file, exiv2 -, linuxHeaders, fetchpatch +, perl, pkgconfig , libsamplerate, libbluray, lzo, libX11, libXv, libXrandr, libXvMC, libXinerama, libXxf86vm +, libXmu , yasm, libuuid, taglib, libtool, autoconf, automake, file, exiv2, linuxHeaders +, libXNVCtrl, enableXnvctrl ? false }: -stdenv.mkDerivation rec { +mkDerivation rec { pname = "mythtv"; - version = "29.1"; + version = "30.0"; src = fetchFromGitHub { owner = "MythTV"; repo = "mythtv"; rev = "v${version}"; - sha256 = "0pjxv4bmq8h285jsr02svgaa03614arsyk12fn9d4rndjsi2cc3x"; + sha256 = "1pfzjb07xwd3mfgmbr4kkiyfyvwy9fkl13ik7bvqds86m0ws5bw4"; }; patches = [ # Fixes build with exiv2 0.27.1. - (fetchpatch { - name = "004-exiv2.patch"; - url = "https://aur.archlinux.org/cgit/aur.git/plain/004-exiv2.patch?h=mythtv&id=76ea37f8556805b205878772ad7874e487c0d946"; - sha256 = "0mh542f53qgky0w3s2bv0gmcxzvmb10834z3cfff40fby2ffr6k8"; - }) + ./exiv2.patch + # Disables OS detection used while checking for xnvctrl support. + ./disable-os-detection.patch ]; setSourceRoot = ''sourceRoot=$(echo */mythtv)''; buildInputs = [ freetype qtbase qtwebkit qtscript lame zlib xlibsWrapper libGLU_combined - perl alsaLib libpulseaudio fftwSinglePrec libX11 libXv libXrandr libXvMC + perl libsamplerate libbluray lzo alsaLib libpulseaudio fftwSinglePrec libX11 libXv libXrandr libXvMC libXmu libXinerama libXxf86vm libXmu libuuid taglib exiv2 - ]; + ] ++ stdenv.lib.optional enableXnvctrl libXNVCtrl; nativeBuildInputs = [ pkgconfig which yasm libtool autoconf automake file ]; - configureFlags = [ "--dvb-path=${linuxHeaders}/include" ]; + configureFlags = + [ "--dvb-path=${linuxHeaders}/include" ] + ++ stdenv.lib.optionals (!enableXnvctrl) [ "--disable-xnvctrl" ]; meta = with stdenv.lib; { homepage = https://www.mythtv.org/; diff --git a/pkgs/applications/video/mythtv/disable-os-detection.patch b/pkgs/applications/video/mythtv/disable-os-detection.patch new file mode 100644 index 000000000000..5a35dc2d1ddf --- /dev/null +++ b/pkgs/applications/video/mythtv/disable-os-detection.patch @@ -0,0 +1,51 @@ +--- a/configure 1970-01-01 01:00:01.000000000 +0100 ++++ b/configure 2019-10-26 11:54:01.920776490 +0200 +@@ -6642,29 +6642,29 @@ + require libXinerama X11/extensions/Xinerama.h XineramaQueryExtension -lXinerama + require libXext "X11/Xdefs.h X11/Xlib.h X11/extensions/Xext.h" XMissingExtension -lXext + if enabled xnvctrl; then +- case $target_os in +- linux) ++# case $target_os in ++# linux) + # Bah. Suse linux doesn't have xnvctrl. +- . /etc/os-release +- case $ID in +- *suse*) ++# . /etc/os-release ++# case $ID in ++# *suse*) + # This is hopefully temporary. +- disable xnvctrl_external +- ;; +- *) +- require XNVctrl "X11/Xlib.h NVCtrl/NVCtrl.h NVCtrl/NVCtrlLib.h" XNVCTRLIsNvScreen -lXNVCtrl || disable xnvctrl +- ;; +- esac +- ;; +- freebsd) ++# disable xnvctrl_external ++# ;; ++# *) ++ require XNVctrl "X11/Xlib.h NVCtrl/NVCtrl.h NVCtrl/NVCtrlLib.h" XNVCTRLIsNvScreen -lXNVCtrl || disable xnvctrl ++# ;; ++# esac ++# ;; ++# freebsd) + # This is hopefully temporary, and will eventually + # check for a system library too. +- disable xnvctrl_external +- ;; +- *) +- disable xnvctrl +- ;; +- esac ++# disable xnvctrl_external ++# ;; ++# *) ++# disable xnvctrl ++# ;; ++# esac + fi + fi + diff --git a/pkgs/applications/video/mythtv/exiv2.patch b/pkgs/applications/video/mythtv/exiv2.patch new file mode 100644 index 000000000000..29bf1f5967bb --- /dev/null +++ b/pkgs/applications/video/mythtv/exiv2.patch @@ -0,0 +1,19 @@ +Patch source: https://aur.archlinux.org/cgit/aur.git/plain/004-exiv2.patch?h=mythtv&id=76ea37f8556805b205878772ad7874e487c0d946 +--- a/libs/libmythmetadata/imagemetadata.cpp ++++ b/libs/libmythmetadata/imagemetadata.cpp +@@ -7,14 +7,7 @@ + #include "exitcodes.h" // for ffprobe + + // libexiv2 for Exif metadata +-//#include +-// Note: Older versions of Exiv2 don't have the exiv2.hpp include +-// file. Using image.hpp instead seems to work. +-#ifdef _MSC_VER +-#include +-#else +-#include +-#endif ++#include + + // To read FFMPEG Metadata + extern "C" { diff --git a/pkgs/applications/virtualization/containerd/default.nix b/pkgs/applications/virtualization/containerd/default.nix index b770c6ed0a59..70865ea848b3 100644 --- a/pkgs/applications/virtualization/containerd/default.nix +++ b/pkgs/applications/virtualization/containerd/default.nix @@ -16,8 +16,6 @@ buildGoPackage rec { goPackagePath = "github.com/containerd/containerd"; outputs = [ "bin" "out" "man" ]; - hardeningDisable = [ "fortify" ]; - buildInputs = [ btrfs-progs go-md2man utillinux ]; buildFlags = "VERSION=v${version}"; diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix index 9902ae2140c4..7b4e7787985f 100644 --- a/pkgs/applications/virtualization/docker/default.nix +++ b/pkgs/applications/virtualization/docker/default.nix @@ -37,8 +37,6 @@ rec { rev = containerdRev; sha256 = containerdSha256; }; - - hardeningDisable = [ "fortify" ]; }); docker-tini = tini.overrideAttrs (oldAttrs: { @@ -82,9 +80,6 @@ rec { sha256 = sha256; }; - # Optimizations break compilation of libseccomp c bindings - hardeningDisable = [ "fortify" ]; - nativeBuildInputs = [ pkgconfig ]; buildInputs = [ makeWrapper removeReferencesTo go-md2man go libtool @@ -213,13 +208,13 @@ rec { }; docker_19_03 = makeOverridable dockerGen { - version = "19.03.2"; - rev = "6a30dfca03664a0b6bf0646a7d389ee7d0318e6e"; - sha256 = "0bghqwxlx4v06bwcv3c2wizbihhf983gvypx5sjcbgmiyd3bgb47"; + version = "19.03.4"; + rev = "9013bf583a215dc1488d941f9b6f7f11e1ea899f"; + sha256 = "094d6d93jd7g1vw362cqbv9qbyv8h6pb6dj750pgqvnf1bn1mffb"; runcRev = "3e425f80a8c931f88e6d94a8c831b9d5aa481657"; runcSha256 = "18psc830b2rkwml1x6vxngam5b5wi3pj14mw817rshpzy87prspj"; - containerdRev = "894b81a4b802e4eb2a91d1ce216b8817763c29fb"; - containerdSha256 = "0sp5mn5wd3xma4svm6hf67hyhiixzkzz6ijhyjkwdrc4alk81357"; + containerdRev = "b34a5c8af56e510852c35414db4c1f4fa6172339"; + containerdSha256 = "1kddhkd93wkrimk0yjcqiavdrqc818nd39rf3wrgxyilx1mfnrwb"; tiniRev = "fec3683b971d9c3ef73f284f176672c44b448662"; tiniSha256 = "1h20i3wwlbd8x4jr2gz68hgklh0lb0jj7y5xk1wvr8y58fip1rdn"; }; diff --git a/pkgs/applications/virtualization/firectl/default.nix b/pkgs/applications/virtualization/firectl/default.nix new file mode 100644 index 000000000000..1f74318f2dde --- /dev/null +++ b/pkgs/applications/virtualization/firectl/default.nix @@ -0,0 +1,23 @@ +{ stdenv, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "firectl"; + version = "0.1.0"; + + src = fetchFromGitHub { + owner = "firecracker-microvm"; + repo = pname; + rev = "v${version}"; + sha256 = "1ni3yx4rjhrkqk2038c6hkb2jwsdj2llx233wd5wgpvb6c57652p"; + }; + + modSha256 = "1nqjz1afklcxc3xcpmygjdh3lfxjk6zvmghr8z8fr3nw2wvw2ddr"; + + meta = with stdenv.lib; { + description = "A command-line tool to run Firecracker microVMs"; + homepage = https://github.com/firecracker-microvm/firectl; + license = licenses.asl20; + platforms = platforms.linux; + maintainers = with maintainers; [ xrelkd ]; + }; +} diff --git a/pkgs/applications/virtualization/podman/default.nix b/pkgs/applications/virtualization/podman/default.nix index 59a0f00e7c6f..fa48c8b5e5ed 100644 --- a/pkgs/applications/virtualization/podman/default.nix +++ b/pkgs/applications/virtualization/podman/default.nix @@ -18,8 +18,6 @@ buildGoPackage rec { outputs = [ "bin" "out" "man" ]; - # Optimizations break compilation of libseccomp c bindings - hardeningDisable = [ "fortify" ]; nativeBuildInputs = [ pkgconfig go-md2man ]; buildInputs = [ btrfs-progs libseccomp gpgme lvm2 systemd ]; diff --git a/pkgs/desktops/gnome-3/core/sushi/default.nix b/pkgs/desktops/gnome-3/core/sushi/default.nix index fc4034acf660..2d6d398fb459 100644 --- a/pkgs/desktops/gnome-3/core/sushi/default.nix +++ b/pkgs/desktops/gnome-3/core/sushi/default.nix @@ -1,7 +1,27 @@ -{ stdenv, fetchurl, pkgconfig, meson, gettext, gobject-introspection, glib -, clutter-gtk, clutter-gst, gnome3, gtksourceview4, gjs -, webkitgtk, libmusicbrainz5, icu, wrapGAppsHook, gst_all_1 -, gdk-pixbuf, librsvg, gtk3, harfbuzz, ninja, epoxy }: +{ stdenv +, fetchurl +, pkgconfig +, meson +, gettext +, gobject-introspection +, glib +, clutter-gtk +, clutter-gst +, gnome3 +, gtksourceview4 +, gjs +, webkitgtk +, libmusicbrainz5 +, icu +, wrapGAppsHook +, gst_all_1 +, gdk-pixbuf +, librsvg +, gtk3 +, harfbuzz +, ninja +, epoxy +}: stdenv.mkDerivation rec { pname = "sushi"; @@ -13,15 +33,42 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - pkgconfig meson ninja gettext gobject-introspection wrapGAppsHook + pkgconfig + meson + ninja + gettext + gobject-introspection + wrapGAppsHook ]; buildInputs = [ - glib gtk3 gnome3.evince icu harfbuzz - clutter-gtk clutter-gst gjs gtksourceview4 gdk-pixbuf - librsvg libmusicbrainz5 webkitgtk epoxy - gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good + glib + gtk3 + gnome3.evince + icu + harfbuzz + clutter-gtk + clutter-gst + gjs + gtksourceview4 + gdk-pixbuf + librsvg + libmusicbrainz5 + webkitgtk + epoxy + gst_all_1.gstreamer + gst_all_1.gst-plugins-base + gst_all_1.gst-plugins-good ]; + # See https://github.com/NixOS/nixpkgs/issues/31168 + postInstall = '' + for file in $out/libexec/org.gnome.NautilusPreviewer + do + sed -e $"2iimports.package._findEffectiveEntryPointName = () => \'$(basename $file)\' " \ + -i $file + done + ''; + passthru = { updateScript = gnome3.updateScript { packageName = "sushi"; diff --git a/pkgs/development/compilers/elm/default.nix b/pkgs/development/compilers/elm/default.nix index 321176ea514d..1d61b8331493 100644 --- a/pkgs/development/compilers/elm/default.nix +++ b/pkgs/development/compilers/elm/default.nix @@ -78,9 +78,7 @@ let elm-verify-examples = patchBinwrap [elmi-to-json] nodePkgs.elm-verify-examples; elm-language-server = nodePkgs."@elm-tooling/elm-language-server"; - # elm-analyse@0.16.4 build is not working - elm-analyse = nodePkgs."elm-analyse-0.16.3"; - inherit (nodePkgs) elm-doc-preview elm-live elm-upgrade elm-xref; + inherit (nodePkgs) elm-doc-preview elm-live elm-upgrade elm-xref elm-analyse; }; patchBinwrap = import ./packages/patch-binwrap.nix { inherit lib writeScriptBin stdenv; }; diff --git a/pkgs/development/compilers/elm/packages/node-packages.json b/pkgs/development/compilers/elm/packages/node-packages.json index 9faaaced709e..e129a0ffaec4 100644 --- a/pkgs/development/compilers/elm/packages/node-packages.json +++ b/pkgs/development/compilers/elm/packages/node-packages.json @@ -3,7 +3,7 @@ "elm-verify-examples", "elm-doc-preview", "elm-upgrade", - { "elm-analyse": "0.16.3" }, + "elm-analyse", "elm-live", "elm-xref", "@elm-tooling/elm-language-server" diff --git a/pkgs/development/compilers/elm/packages/node-packages.nix b/pkgs/development/compilers/elm/packages/node-packages.nix index 44afd4ca3cb1..c62599038534 100644 --- a/pkgs/development/compilers/elm/packages/node-packages.nix +++ b/pkgs/development/compilers/elm/packages/node-packages.nix @@ -76,13 +76,13 @@ let sha512 = "tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA=="; }; }; - "@types/node-12.11.1" = { + "@types/node-12.11.2" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "12.11.1"; + version = "12.11.2"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-12.11.1.tgz"; - sha512 = "TJtwsqZ39pqcljJpajeoofYRfeZ7/I/OMUQ5pR4q5wOKf2ocrUvBAZUMhWsOvKx3dVc/aaV5GluBivt0sWqA5A=="; + url = "https://registry.npmjs.org/@types/node/-/node-12.11.2.tgz"; + sha512 = "dsfE4BHJkLQW+reOS6b17xhZ/6FB1rB8eRRvO08nn5o+voxf3i74tuyFWNH6djdfgX7Sm5s6LD8t6mJug4dpDw=="; }; }; "accepts-1.3.7" = { @@ -436,13 +436,13 @@ let sha512 = "b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A=="; }; }; - "bser-2.1.0" = { + "bser-2.1.1" = { name = "bser"; packageName = "bser"; - version = "2.1.0"; + version = "2.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/bser/-/bser-2.1.0.tgz"; - sha512 = "8zsjWrQkkBoLK6uxASk1nJ2SKv97ltiGDo6A3wA0/yRPz+CwmEyDo0hUrhIuukG2JHpAl3bvFIixw2/3Hi0DOg=="; + url = "https://registry.npmjs.org/bser/-/bser-2.1.1.tgz"; + sha512 = "gQxTNE/GAfIIrmHLUE3oJyp5FO6HRBfhjnw4/wMmA63ZGDJnWBmgY/lyQBpnDUkGmAhbSe39tx2d/iTOAfglwQ=="; }; }; "buffers-0.1.1" = { @@ -598,6 +598,15 @@ let sha512 = "c4PR2egjNjI1um6bamCQ6bUNPDiyofNQruHvKgHQ4gDUP/ITSVSzNsiI5OWtHOsX323i5ha/kk4YmOZ1Ktg7KA=="; }; }; + "chokidar-3.2.1" = { + name = "chokidar"; + packageName = "chokidar"; + version = "3.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/chokidar/-/chokidar-3.2.1.tgz"; + sha512 = "/j5PPkb5Feyps9e+jo07jUZGvkB5Aj953NrI4s8xSVScrAo/RHeILrtdb4uzR7N6aaFFxxJ+gt8mA8HfNpw76w=="; + }; + }; "chownr-1.1.3" = { name = "chownr"; packageName = "chownr"; @@ -796,13 +805,13 @@ let sha512 = "I39t74+4t+zau64EN1fE5v2W31Adtc/REhzWN+gWRRXg6WH5qAsZm62DHpQ1+Yhe4047T55jvzz7MUqF/dBBlA=="; }; }; - "core-js-3.3.2" = { + "core-js-3.3.3" = { name = "core-js"; packageName = "core-js"; - version = "3.3.2"; + version = "3.3.3"; src = fetchurl { - url = "https://registry.npmjs.org/core-js/-/core-js-3.3.2.tgz"; - sha512 = "S1FfZpeBchkhyoY76YAdFzKS4zz9aOK7EeFaNA2aJlyXyA+sgqz6xdxmLPGXEAf0nF44MVN1kSjrA9Kt3ATDQg=="; + url = "https://registry.npmjs.org/core-js/-/core-js-3.3.3.tgz"; + sha512 = "0xmD4vUJRY8nfLyV9zcpC17FtSie5STXzw+HyYw2t8IIvmDnbq7RJUULECCo+NstpJtwK9kx8S+898iyqgeUow=="; }; }; "core-util-is-1.0.2" = { @@ -859,6 +868,15 @@ let sha512 = "eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ=="; }; }; + "cross-spawn-7.0.0" = { + name = "cross-spawn"; + packageName = "cross-spawn"; + version = "7.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.0.tgz"; + sha512 = "6U/8SMK2FBNnB21oQ4+6Nsodxanw1gTkntYA2zBdkFYFu3ZDx65P2ONEXGSvob/QS6REjVHQ9zxzdOafwFdstw=="; + }; + }; "cross-spawn-7.0.1" = { name = "cross-spawn"; packageName = "cross-spawn"; @@ -1094,6 +1112,15 @@ let sha512 = "O0Z3YsYU9OTb1hTDGORWxi69QjQFEIPfZVq/oc1D5lhL3swduHKY8vdKGuo+WlKVdTas99oNIsgL7yojWdYcsQ=="; }; }; + "elmi-to-json-1.2.0" = { + name = "elmi-to-json"; + packageName = "elmi-to-json"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/elmi-to-json/-/elmi-to-json-1.2.0.tgz"; + sha512 = "zNinzt6/YMr11HgeBlC9Z0UM3qHkYrGsWJTjrCmgBkKnaOLUzTP5K9N3z1RltyunItXtHAxb8DFPvMxlYRPv/Q=="; + }; + }; "emoji-regex-7.0.3" = { name = "emoji-regex"; packageName = "emoji-regex"; @@ -1427,6 +1454,15 @@ let sha512 = "KBxPjc7J1CLw90jVateMKvMYMROZRTR7/QT2I3MxT+7I6KuUQUMNUFuS/eQXQnMnyElGKQ1iyPbe7GnEuYnFXw=="; }; }; + "find-elm-dependencies-2.0.2" = { + name = "find-elm-dependencies"; + packageName = "find-elm-dependencies"; + version = "2.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/find-elm-dependencies/-/find-elm-dependencies-2.0.2.tgz"; + sha512 = "nM5UCbccD1G8CGK2GsM7ykG3ksOAl9E+34jiDfl07CAl2OPnLpBVWY2hlxEmIkSBfdJjSopEowWHrO0cI8RhxQ=="; + }; + }; "find-parent-dir-0.3.0" = { name = "find-parent-dir"; packageName = "find-parent-dir"; @@ -1463,6 +1499,15 @@ let sha1 = "b88673c42009f8821fac2926e99720acee924fae"; }; }; + "firstline-2.0.2" = { + name = "firstline"; + packageName = "firstline"; + version = "2.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/firstline/-/firstline-2.0.2.tgz"; + sha512 = "8KcmfI0jgSECnzdhucm0i7vrwef3BWwgjimW2YkRC5eSFwjb5DibVoA0YvgkYwwxuJi9c+7M7X3b3lX8o9B6wg=="; + }; + }; "follow-redirects-1.9.0" = { name = "follow-redirects"; packageName = "follow-redirects"; @@ -1571,6 +1616,15 @@ let sha512 = "GnyIkKhhzXZUWFCaJzvyDLEEgDkPfb4/TPvJCJVuS8MWZgoSsErf++QpiAlDnKFcqhRlm+tIOcencCjyJE6ZCA=="; }; }; + "fs-extra-8.1.0" = { + name = "fs-extra"; + packageName = "fs-extra"; + version = "8.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/fs-extra/-/fs-extra-8.1.0.tgz"; + sha512 = "yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g=="; + }; + }; "fs-minipass-1.2.7" = { name = "fs-minipass"; packageName = "fs-minipass"; @@ -1706,6 +1760,15 @@ let sha512 = "hkLPepehmnKk41pUGm3sYxoFs/umurYfYJCerbXEyFIWcAzvpipAgVkBqqT9RBKMGjnq6kMuyYwha6csxbiM1A=="; }; }; + "glob-7.1.5" = { + name = "glob"; + packageName = "glob"; + version = "7.1.5"; + src = fetchurl { + url = "https://registry.npmjs.org/glob/-/glob-7.1.5.tgz"; + sha512 = "J9dlskqUXK1OeTOYBEn5s8aMukWMwWfs+rPTn/jn50Ux4MNXVhubL1wu/j2t+H4NVI+cXEcCaYellqaPVGXNqQ=="; + }; + }; "glob-parent-3.1.0" = { name = "glob-parent"; packageName = "glob-parent"; @@ -1814,6 +1877,15 @@ let sha1 = "b5d454dc2199ae225699f3467e5a07f3b955bafd"; }; }; + "has-flag-4.0.0" = { + name = "has-flag"; + packageName = "has-flag"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz"; + sha512 = "EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ=="; + }; + }; "has-symbol-support-x-1.4.2" = { name = "has-symbol-support-x"; packageName = "has-symbol-support-x"; @@ -2930,6 +3002,15 @@ let sha512 = "I3CWm/ExYYQ/a9bjB0OL9VsGa3Lmgbb8QOs4y2kEiB/DTkTqkcTaCr/lVyOYjRpgR25TsmOBATscsg6H6aC9Hg=="; }; }; + "node-elm-compiler-5.0.4" = { + name = "node-elm-compiler"; + packageName = "node-elm-compiler"; + version = "5.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/node-elm-compiler/-/node-elm-compiler-5.0.4.tgz"; + sha512 = "VQsT8QSierYGkHzRed+b4MnccQVF1+qPHunE8jBoU7jD6YpuRqCDPzEoC2zfyEJS80qVnlMZrqobLnyjzX9lJg=="; + }; + }; "node-int64-0.4.0" = { name = "node-int64"; packageName = "node-int64"; @@ -3614,6 +3695,15 @@ let sha512 = "1JU/8q+VgFZyxwrJ+SVIOsh+KywWGpds3NTqikiKpDMZWScmAYyKIgqkO+ARvNWJfXeXR1zxz7aHF4u4CyH6vQ=="; }; }; + "readdirp-3.1.3" = { + name = "readdirp"; + packageName = "readdirp"; + version = "3.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/readdirp/-/readdirp-3.1.3.tgz"; + sha512 = "ZOsfTGkjO2kqeR5Mzr5RYDbTGYneSkdNKX2fOX2P5jF7vMrd/GNnIAUtDldeHHumHUCQ3V05YfWUdxMPAsRu9Q=="; + }; + }; "readdirp-3.2.0" = { name = "readdirp"; packageName = "readdirp"; @@ -3794,6 +3884,15 @@ let sha1 = "e439be2aaee327321952730f99a8929e4fc50582"; }; }; + "rimraf-2.6.3" = { + name = "rimraf"; + packageName = "rimraf"; + version = "2.6.3"; + src = fetchurl { + url = "https://registry.npmjs.org/rimraf/-/rimraf-2.6.3.tgz"; + sha512 = "mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA=="; + }; + }; "rimraf-2.7.1" = { name = "rimraf"; packageName = "rimraf"; @@ -4361,6 +4460,15 @@ let sha512 = "QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow=="; }; }; + "supports-color-7.1.0" = { + name = "supports-color"; + packageName = "supports-color"; + version = "7.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz"; + sha512 = "oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g=="; + }; + }; "syncprompt-2.0.0" = { name = "syncprompt"; packageName = "syncprompt"; @@ -4388,6 +4496,15 @@ let sha1 = "e0c6bc4d26b903124410e4fed81103014dfc1f59"; }; }; + "temp-0.9.0" = { + name = "temp"; + packageName = "temp"; + version = "0.9.0"; + src = fetchurl { + url = "https://registry.npmjs.org/temp/-/temp-0.9.0.tgz"; + sha512 = "YfUhPQCJoNQE5N+FJQcdPz63O3x3sdT4Xju69Gj4iZe0lBKOtnAMi0SLj9xKhGkcGhsxThvTJ/usxtFPo438zQ=="; + }; + }; "through-2.3.8" = { name = "through"; packageName = "through"; @@ -4937,6 +5054,15 @@ let sha512 = "+SqNqFbwTm/0DC18KYzIsMTnEWpLwJsiasW/O17la4iDRRIO9uaHbvKiAS3AHgTiuuWerK/brj4O6MYZkei9xg=="; }; }; + "xmlbuilder-13.0.2" = { + name = "xmlbuilder"; + packageName = "xmlbuilder"; + version = "13.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-13.0.2.tgz"; + sha512 = "Eux0i2QdDYKbdbA6AM6xE4m6ZTZr4G4xF9kahI2ukSEMCzwce2eX9WlTI5J3s+NU7hpasFsr8hWIONae7LluAQ=="; + }; + }; "xmlbuilder-8.2.2" = { name = "xmlbuilder"; packageName = "xmlbuilder"; @@ -5015,349 +5141,148 @@ in elm-test = nodeEnv.buildNodePackage { name = "elm-test"; packageName = "elm-test"; - version = "0.19.0-rev6"; + version = "0.19.1"; src = fetchurl { - url = "https://registry.npmjs.org/elm-test/-/elm-test-0.19.0-rev6.tgz"; - sha512 = "Qdy9QusZF+eT0203XBiT1Y/UhFeUjcSuyyzf3iyp32dsYpAfcoDTWHjlBVjia1CyvFauESQ4pc81nKaq6snClg=="; + url = "https://registry.npmjs.org/elm-test/-/elm-test-0.19.1.tgz"; + sha512 = "SyZgZ/hxq62budS3k0M1Qj1E8fIRvldSxFSm4XfzE6qRRuHAT2a82fxprZRZl1yG2GwnImGmhuKH5hSyjPpzjA=="; }; dependencies = [ sources."ajv-6.10.2" sources."ansi-styles-3.2.1" - (sources."anymatch-2.0.0" // { - dependencies = [ - sources."normalize-path-2.1.1" - ]; - }) - sources."arr-diff-4.0.0" - sources."arr-flatten-1.1.0" - sources."arr-union-3.1.0" - sources."array-unique-0.3.2" + sources."anymatch-3.1.1" sources."asn1-0.2.4" sources."assert-plus-1.0.0" - sources."assign-symbols-1.0.0" - sources."async-each-1.0.3" sources."asynckit-0.4.0" - sources."atob-2.1.2" sources."aws-sign2-0.7.0" sources."aws4-1.8.0" sources."balanced-match-1.0.0" - (sources."base-0.11.2" // { - dependencies = [ - sources."define-property-1.0.0" - ]; - }) sources."bcrypt-pbkdf-1.0.2" sources."binary-0.3.0" - sources."binary-extensions-1.13.1" + sources."binary-extensions-2.0.0" sources."binwrap-0.2.2" sources."bluebird-3.7.1" sources."brace-expansion-1.1.11" - (sources."braces-2.3.2" // { - dependencies = [ - sources."extend-shallow-2.0.1" - sources."is-extendable-0.1.1" - ]; - }) + sources."braces-3.0.2" sources."buffers-0.1.1" - sources."cache-base-1.0.1" sources."caseless-0.12.0" sources."chainsaw-0.1.0" - sources."chalk-2.1.0" - (sources."chokidar-2.1.2" // { + (sources."chalk-2.4.2" // { dependencies = [ - sources."fsevents-1.2.9" + sources."supports-color-5.5.0" ]; }) + sources."chokidar-3.2.1" sources."chownr-1.1.3" - (sources."class-utils-0.3.6" // { - dependencies = [ - sources."define-property-0.2.5" - (sources."is-accessor-descriptor-0.1.6" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - (sources."is-data-descriptor-0.1.4" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - sources."is-descriptor-0.1.6" - sources."kind-of-5.1.0" - ]; - }) - sources."collection-visit-1.0.0" sources."color-convert-1.9.3" sources."color-name-1.1.3" sources."combined-stream-1.0.8" - sources."component-emitter-1.3.0" sources."concat-map-0.0.1" - sources."copy-descriptor-0.1.1" sources."core-util-is-1.0.2" - sources."cross-spawn-4.0.0" + (sources."cross-spawn-7.0.0" // { + dependencies = [ + sources."which-1.3.1" + ]; + }) sources."dashdash-1.14.1" - sources."debug-2.6.9" - sources."decode-uri-component-0.2.0" - sources."define-property-2.0.2" sources."delayed-stream-1.0.0" sources."ecc-jsbn-0.1.2" - sources."elmi-to-json-0.19.1" + sources."elmi-to-json-1.2.0" sources."escape-string-regexp-1.0.5" - (sources."expand-brackets-2.1.4" // { - dependencies = [ - sources."define-property-0.2.5" - sources."extend-shallow-2.0.1" - (sources."is-accessor-descriptor-0.1.6" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - (sources."is-data-descriptor-0.1.4" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - sources."is-descriptor-0.1.6" - sources."is-extendable-0.1.1" - sources."kind-of-5.1.0" - ]; - }) sources."extend-3.0.2" - sources."extend-shallow-3.0.2" - (sources."extglob-2.0.4" // { - dependencies = [ - sources."define-property-1.0.0" - sources."extend-shallow-2.0.1" - sources."is-extendable-0.1.1" - ]; - }) sources."extsprintf-1.3.0" sources."fast-deep-equal-2.0.1" sources."fast-json-stable-stringify-2.0.0" - (sources."fill-range-4.0.0" // { - dependencies = [ - sources."extend-shallow-2.0.1" - sources."is-extendable-0.1.1" - ]; - }) - (sources."find-elm-dependencies-2.0.1" // { + sources."fill-range-7.0.1" + (sources."find-elm-dependencies-2.0.2" // { dependencies = [ sources."firstline-1.2.0" ]; }) sources."find-parent-dir-0.3.0" - sources."firstline-1.2.1" - sources."for-in-1.0.2" + sources."firstline-2.0.2" sources."forever-agent-0.6.1" sources."form-data-2.3.3" - sources."fragment-cache-0.2.1" - sources."fs-extra-0.30.0" + sources."fs-extra-8.1.0" sources."fs-minipass-1.2.7" sources."fs.realpath-1.0.0" - sources."fsevents-1.2.4" - sources."get-value-2.0.6" + sources."fsevents-2.1.1" sources."getpass-0.1.7" - sources."glob-7.1.1" - (sources."glob-parent-3.1.0" // { - dependencies = [ - sources."is-glob-3.1.0" - ]; - }) + sources."glob-7.1.4" + sources."glob-parent-5.1.0" sources."graceful-fs-4.2.2" sources."har-schema-2.0.0" sources."har-validator-5.1.3" - sources."has-flag-2.0.0" - sources."has-value-1.0.0" - (sources."has-values-1.0.0" // { - dependencies = [ - sources."kind-of-4.0.0" - ]; - }) + sources."has-flag-3.0.0" sources."http-signature-1.2.0" sources."inflight-1.0.6" sources."inherits-2.0.4" - sources."is-accessor-descriptor-1.0.0" - sources."is-binary-path-1.0.1" - sources."is-buffer-1.1.6" - sources."is-data-descriptor-1.0.0" - sources."is-descriptor-1.0.2" - sources."is-extendable-1.0.1" + sources."is-binary-path-2.1.0" sources."is-extglob-2.1.1" sources."is-glob-4.0.1" - (sources."is-number-3.0.0" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - sources."is-plain-object-2.0.4" + sources."is-number-7.0.0" sources."is-typedarray-1.0.0" - sources."is-windows-1.0.2" - sources."isarray-1.0.0" sources."isexe-2.0.0" - sources."isobject-3.0.1" sources."isstream-0.1.2" sources."jsbn-0.1.1" sources."json-schema-0.2.3" sources."json-schema-traverse-0.4.1" sources."json-stringify-safe-5.0.1" - sources."jsonfile-2.4.0" + sources."jsonfile-4.0.0" sources."jsprim-1.4.1" - sources."kind-of-6.0.2" - sources."klaw-1.3.1" - sources."lodash-4.17.11" - sources."lru-cache-4.1.5" - sources."map-cache-0.2.2" - sources."map-visit-1.0.0" - sources."micromatch-3.1.10" + sources."lodash-4.17.15" sources."mime-db-1.40.0" sources."mime-types-2.1.24" sources."minimatch-3.0.4" sources."minimist-1.2.0" - (sources."minipass-2.9.0" // { - dependencies = [ - sources."yallist-3.1.1" - ]; - }) + sources."minipass-2.9.0" sources."minizlib-1.3.3" - sources."mixin-deep-1.3.2" (sources."mkdirp-0.5.1" // { dependencies = [ sources."minimist-0.0.8" ]; }) - sources."ms-2.0.0" sources."murmur-hash-js-1.0.0" sources."mustache-3.1.0" - sources."nan-2.14.0" - sources."nanomatch-1.2.13" - sources."node-elm-compiler-5.0.3" - sources."normalize-path-3.0.0" - sources."oauth-sign-0.9.0" - (sources."object-copy-0.1.0" // { + sources."nice-try-1.0.5" + (sources."node-elm-compiler-5.0.4" // { dependencies = [ - sources."define-property-0.2.5" - sources."is-accessor-descriptor-0.1.6" - sources."is-data-descriptor-0.1.4" - (sources."is-descriptor-0.1.6" // { - dependencies = [ - sources."kind-of-5.1.0" - ]; - }) - sources."kind-of-3.2.2" + sources."cross-spawn-6.0.5" + sources."path-key-2.0.1" + sources."which-1.3.1" ]; }) - sources."object-visit-1.0.1" - sources."object.pick-1.3.0" + sources."normalize-path-3.0.0" + sources."oauth-sign-0.9.0" sources."once-1.4.0" - sources."os-tmpdir-1.0.2" - sources."pascalcase-0.1.1" - sources."path-dirname-1.0.2" sources."path-is-absolute-1.0.1" + sources."path-key-3.1.0" sources."performance-now-2.1.0" - sources."posix-character-classes-0.1.1" - sources."process-nextick-args-2.0.1" - sources."pseudomap-1.0.2" + sources."picomatch-2.0.7" sources."psl-1.4.0" sources."punycode-2.1.1" sources."qs-6.5.2" - sources."readable-stream-2.3.6" - sources."readdirp-2.2.1" - sources."regex-not-1.0.2" - sources."remove-trailing-separator-1.1.0" - sources."repeat-element-1.1.3" - sources."repeat-string-1.6.1" + sources."readdirp-3.1.3" sources."request-2.88.0" sources."request-promise-4.2.4" sources."request-promise-core-1.1.2" - sources."resolve-url-0.2.1" - sources."ret-0.1.15" - (sources."rimraf-2.7.1" // { - dependencies = [ - sources."glob-7.1.4" - ]; - }) - sources."safe-buffer-5.1.2" - sources."safe-regex-1.1.0" + sources."rimraf-2.6.3" + sources."safe-buffer-5.2.0" sources."safer-buffer-2.1.2" - (sources."set-value-2.0.1" // { - dependencies = [ - sources."extend-shallow-2.0.1" - sources."is-extendable-0.1.1" - ]; - }) - (sources."snapdragon-0.8.2" // { - dependencies = [ - sources."define-property-0.2.5" - sources."extend-shallow-2.0.1" - (sources."is-accessor-descriptor-0.1.6" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - (sources."is-data-descriptor-0.1.4" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - sources."is-descriptor-0.1.6" - sources."is-extendable-0.1.1" - sources."kind-of-5.1.0" - ]; - }) - (sources."snapdragon-node-2.1.1" // { - dependencies = [ - sources."define-property-1.0.0" - ]; - }) - (sources."snapdragon-util-3.0.1" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - sources."source-map-0.5.7" - sources."source-map-resolve-0.5.2" - sources."source-map-url-0.4.0" + sources."semver-5.7.1" + sources."shebang-command-1.2.0" + sources."shebang-regex-1.0.0" sources."split-1.0.1" - sources."split-string-3.1.0" sources."sshpk-1.16.1" - (sources."static-extend-0.1.2" // { - dependencies = [ - sources."define-property-0.2.5" - (sources."is-accessor-descriptor-0.1.6" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - (sources."is-data-descriptor-0.1.4" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - sources."is-descriptor-0.1.6" - sources."kind-of-5.1.0" - ]; - }) sources."stealthy-require-1.1.1" - sources."string_decoder-1.1.1" - sources."supports-color-4.2.0" - (sources."tar-4.4.13" // { + (sources."supports-color-7.1.0" // { dependencies = [ - sources."yallist-3.1.1" - ]; - }) - (sources."temp-0.8.3" // { - dependencies = [ - sources."rimraf-2.2.8" + sources."has-flag-4.0.0" ]; }) + sources."tar-4.4.13" + sources."temp-0.9.0" sources."through-2.3.8" - (sources."to-object-path-0.3.0" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - sources."to-regex-3.0.2" - sources."to-regex-range-2.1.1" + sources."to-regex-range-5.0.1" (sources."tough-cookie-2.4.3" // { dependencies = [ sources."punycode-1.4.1" @@ -5366,33 +5291,15 @@ in sources."traverse-0.3.9" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" - (sources."union-value-1.0.1" // { - dependencies = [ - sources."is-extendable-0.1.1" - ]; - }) - (sources."unset-value-1.0.0" // { - dependencies = [ - (sources."has-value-0.3.1" // { - dependencies = [ - sources."isobject-2.1.0" - ]; - }) - sources."has-values-0.1.4" - ]; - }) + sources."universalify-0.1.2" sources."unzip-stream-0.3.0" - sources."upath-1.2.0" sources."uri-js-4.2.2" - sources."urix-0.1.0" - sources."use-3.1.1" - sources."util-deprecate-1.0.2" sources."uuid-3.3.3" sources."verror-1.10.0" - sources."which-1.3.1" + sources."which-2.0.1" sources."wrappy-1.0.2" - sources."xmlbuilder-8.2.2" - sources."yallist-2.1.2" + sources."xmlbuilder-13.0.2" + sources."yallist-3.1.1" ]; buildInputs = globalBuildInputs; meta = { @@ -5692,7 +5599,7 @@ in sources."ret-0.1.15" (sources."rimraf-2.7.1" // { dependencies = [ - sources."glob-7.1.4" + sources."glob-7.1.5" ]; }) sources."safe-buffer-5.1.2" @@ -5867,7 +5774,7 @@ in sources."extend-shallow-2.0.1" ]; }) - sources."bser-2.1.0" + sources."bser-2.1.1" sources."bytes-3.1.0" sources."cache-base-1.0.1" (sources."cacheable-request-2.1.4" // { @@ -5906,7 +5813,7 @@ in sources."cookie-0.4.0" sources."cookie-signature-1.0.6" sources."copy-descriptor-0.1.1" - sources."core-js-3.3.2" + sources."core-js-3.3.3" sources."core-util-is-1.0.2" sources."cross-spawn-6.0.5" sources."debug-2.6.9" @@ -5983,7 +5890,7 @@ in sources."function-bind-1.1.1" sources."get-stream-3.0.0" sources."get-value-2.0.6" - sources."glob-7.1.4" + sources."glob-7.1.5" sources."got-8.3.2" sources."has-1.0.3" sources."has-flag-3.0.0" @@ -6270,7 +6177,7 @@ in sources."fs.realpath-1.0.0" sources."get-proxy-2.1.0" sources."get-stream-3.0.0" - sources."glob-7.1.4" + sources."glob-7.1.5" sources."got-6.7.1" sources."graceful-fs-4.2.2" sources."has-symbol-support-x-1.4.2" @@ -6319,13 +6226,13 @@ in bypassCache = true; reconstructLock = true; }; - "elm-analyse-0.16.3" = nodeEnv.buildNodePackage { + elm-analyse = nodeEnv.buildNodePackage { name = "elm-analyse"; packageName = "elm-analyse"; - version = "0.16.3"; + version = "0.16.4"; src = fetchurl { - url = "https://registry.npmjs.org/elm-analyse/-/elm-analyse-0.16.3.tgz"; - sha512 = "JFlGT0d6v3EPk1UnB5xb6VYWrKzwGD76wBwr2R0xwA3T6Rju7zEnzfs8LiBo+b3gSH5cmRDfnK9BLRFiosWEfQ=="; + url = "https://registry.npmjs.org/elm-analyse/-/elm-analyse-0.16.4.tgz"; + sha512 = "6F6JfcOfbRgTBJj7MF+CqGcatCep8ppZtfIAri+fpC76MsSohJAOfLgmbmd4BWOXcTiWCpvQaaFwUutm7cOlpA=="; }; dependencies = [ sources."accepts-1.3.7" @@ -6648,10 +6555,10 @@ in "@elm-tooling/elm-language-server" = nodeEnv.buildNodePackage { name = "_at_elm-tooling_slash_elm-language-server"; packageName = "@elm-tooling/elm-language-server"; - version = "1.4.2"; + version = "1.4.3"; src = fetchurl { - url = "https://registry.npmjs.org/@elm-tooling/elm-language-server/-/elm-language-server-1.4.2.tgz"; - sha512 = "66FzEfP1Pan3Hw417rRVTXFtYcKV6EB8HwEQ6uQcnP1ggpTqV/7D8Mp90Y3JzsDHyIwm7BlsksxY6K+dEOgXqg=="; + url = "https://registry.npmjs.org/@elm-tooling/elm-language-server/-/elm-language-server-1.4.3.tgz"; + sha512 = "UU8u3wHc1pDQUwupJyeKe34keE/m3SjWO22GCgM94pkFdHiGYuAsesQRX3olKycCsV1ZG7xwAD4eGvoUQmNTvQ=="; }; dependencies = [ sources."@nodelib/fs.scandir-2.1.3" @@ -6660,7 +6567,7 @@ in sources."@types/events-3.0.0" sources."@types/glob-7.1.1" sources."@types/minimatch-3.0.3" - sources."@types/node-12.11.1" + sources."@types/node-12.11.2" sources."accepts-1.3.7" sources."ajv-6.10.2" sources."array-flatten-1.1.1" @@ -6737,7 +6644,7 @@ in sources."fs.realpath-1.0.0" sources."get-stream-5.1.0" sources."getpass-0.1.7" - sources."glob-7.1.4" + sources."glob-7.1.5" sources."glob-parent-5.1.0" sources."globby-10.0.1" sources."graceful-fs-4.2.2" diff --git a/pkgs/development/libraries/apr/default.nix b/pkgs/development/libraries/apr/default.nix index ea84609868cf..d9409636bd0d 100644 --- a/pkgs/development/libraries/apr/default.nix +++ b/pkgs/development/libraries/apr/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "apr-1.6.5"; + name = "apr-1.7.0"; src = fetchurl { url = "mirror://apache/apr/${name}.tar.bz2"; - sha256 = "01d1n1ql66bxsjx0wyzazmkqdqdmr0is6a7lwyy5kzy4z7yajz56"; + sha256 = "1spp6r2a3xcl5yajm9safhzyilsdzgagc2dadif8x6z9nbq4iqg2"; }; patches = stdenv.lib.optionals stdenv.isDarwin [ ./is-this-a-compiler-bug.patch ]; diff --git a/pkgs/development/libraries/c-blosc/default.nix b/pkgs/development/libraries/c-blosc/default.nix index 396e419406ae..196dd9ca3f9b 100644 --- a/pkgs/development/libraries/c-blosc/default.nix +++ b/pkgs/development/libraries/c-blosc/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "c-blosc"; - version = "1.16.3"; + version = "1.17.0"; src = fetchFromGitHub { owner = "Blosc"; repo = "c-blosc"; rev = "v${version}"; - sha256 = "1c58wkf34rp5wh9qp09zdk7zcfn037sk56p4xq1g0vapbnglv603"; + sha256 = "0c4vh7kyxm57jclk8jlcnc11w7nd2m81qk454gav58aji85w16hg"; }; buildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/dbus/default.nix b/pkgs/development/libraries/dbus/default.nix index 804f0e7fc850..014ccb489710 100644 --- a/pkgs/development/libraries/dbus/default.nix +++ b/pkgs/development/libraries/dbus/default.nix @@ -3,6 +3,7 @@ , fetchurl , pkgconfig , expat +, enableSystemd ? stdenv.isLinux && !stdenv.hostPlatform.isMusl , systemd , libX11 ? null , libICE ? null @@ -15,6 +16,8 @@ assert x11Support -> libX11 != null && libICE != null && libSM != null; +assert enableSystemd -> systemd != null; + stdenv.mkDerivation rec { pname = "dbus"; version = "1.12.16"; @@ -50,11 +53,12 @@ stdenv.mkDerivation rec { expat ]; - buildInputs = lib.optionals x11Support [ - libX11 - libICE - libSM - ] ++ lib.optional stdenv.isLinux systemd; + buildInputs = + lib.optionals x11Support [ + libX11 + libICE + libSM + ] ++ lib.optional enableSystemd systemd; # ToDo: optional selinux? configureFlags = [ diff --git a/pkgs/development/libraries/gstreamer/legacy/gst-plugins-base/default.nix b/pkgs/development/libraries/gstreamer/legacy/gst-plugins-base/default.nix index db75705c825a..5a942b49cc03 100644 --- a/pkgs/development/libraries/gstreamer/legacy/gst-plugins-base/default.nix +++ b/pkgs/development/libraries/gstreamer/legacy/gst-plugins-base/default.nix @@ -18,11 +18,18 @@ stdenv.mkDerivation rec { sha256 = "0jp6hjlra98cnkal4n6bdmr577q8mcyp3c08s3a02c4hjhw5rr0z"; }; - patchPhase = '' + patches = [ + ./gcc-4.9.patch + (fetchurl { + url = "https://gitlab.freedesktop.org/gstreamer/gst-plugins-base/commit/f672277509705c4034bc92a141eefee4524d15aa.patch"; + name = "CVE-2019-9928.patch"; + sha256 = "0hz3lsq3ppmaf329sbyi05y1qniqfj9vlp2f3z918383pvrcms4i"; + }) + ]; + + postPatch = '' sed -i 's@/bin/echo@echo@g' configure sed -i -e 's/^ /\t/' docs/{libs,plugins}/Makefile.in - - patch -p1 < ${./gcc-4.9.patch} ''; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/libdrm/default.nix b/pkgs/development/libraries/libdrm/default.nix index d5cbbccba015..61ca98e2256c 100644 --- a/pkgs/development/libraries/libdrm/default.nix +++ b/pkgs/development/libraries/libdrm/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "libdrm"; - version = "2.4.99"; + version = "2.4.100"; src = fetchurl { url = "https://dri.freedesktop.org/${pname}/${pname}-${version}.tar.bz2"; - sha256 = "0pnsw4bmajzdbz8pk4wswdmw93shhympf2q9alhbnpfjgsf57gsd"; + sha256 = "0p8a1l3a3s40i81mawm8nhrbk7p97ss05qkawp1yx73c30lchz67"; }; outputs = [ "out" "dev" "bin" ]; diff --git a/pkgs/development/libraries/libmicrohttpd/default.nix b/pkgs/development/libraries/libmicrohttpd/default.nix index f8f4439a3dfe..866edcc437cf 100644 --- a/pkgs/development/libraries/libmicrohttpd/default.nix +++ b/pkgs/development/libraries/libmicrohttpd/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "libmicrohttpd"; - version = "0.9.66"; + version = "0.9.67"; src = fetchurl { url = "mirror://gnu/libmicrohttpd/${pname}-${version}.tar.gz"; - sha256 = "06xblz77bnn29y7sl43avxbcrjbw486x3416plpr3x3l2pdx8rjf"; + sha256 = "1584lv2miq7sp7yjd58lcbddh3yh5p8f9gbygn1d96fh4ckqa7vy"; }; outputs = [ "out" "dev" "devdoc" "info" ]; diff --git a/pkgs/development/libraries/libusb1/default.nix b/pkgs/development/libraries/libusb1/default.nix index 19a8025359a0..9a08a7756c84 100644 --- a/pkgs/development/libraries/libusb1/default.nix +++ b/pkgs/development/libraries/libusb1/default.nix @@ -1,4 +1,14 @@ -{ stdenv, fetchurl, pkgconfig, systemd ? null, libobjc, IOKit, withStatic ? false }: +{ stdenv +, fetchurl +, pkgconfig +, enableSystemd ? stdenv.isLinux && !stdenv.hostPlatform.isMusl +, systemd ? null +, libobjc +, IOKit +, withStatic ? false +}: + +assert enableSystemd -> systemd != null; stdenv.mkDerivation (rec { pname = "libusb"; @@ -13,12 +23,17 @@ stdenv.mkDerivation (rec { nativeBuildInputs = [ pkgconfig ]; propagatedBuildInputs = - stdenv.lib.optional stdenv.isLinux systemd ++ + stdenv.lib.optional enableSystemd systemd ++ stdenv.lib.optionals stdenv.isDarwin [ libobjc IOKit ]; NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isLinux "-lgcc_s"; - preFixup = stdenv.lib.optionalString stdenv.isLinux '' + configureFlags = + # We use `isLinux` here only to avoid mass rebuilds for Darwin, where + # disabling udev happens automatically. Remove `isLinux` at next big change! + stdenv.lib.optional (stdenv.isLinux && !enableSystemd) "--disable-udev"; + + preFixup = stdenv.lib.optionalString enableSystemd '' sed 's,-ludev,-L${systemd.lib}/lib -ludev,' -i $out/lib/libusb-1.0.la ''; diff --git a/pkgs/development/libraries/nvidia-texture-tools/default.nix b/pkgs/development/libraries/nvidia-texture-tools/default.nix index 73b5e3fe772e..70c48631981f 100644 --- a/pkgs/development/libraries/nvidia-texture-tools/default.nix +++ b/pkgs/development/libraries/nvidia-texture-tools/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "nvidia-texture-tools"; - version = "2.1.0"; + version = "unstable-2019-10-27"; src = fetchFromGitHub { owner = "castano"; repo = "nvidia-texture-tools"; - rev = version; - sha256 = "0p8ja0k323nkgm07z0qlslg6743vimy9rf3wad2968az0vwzjjyx"; + rev = "a131e4c6b0b7c9c73ccc3c9e6f1c7e165be86bcc"; + sha256 = "1qzyr3ib5dpxyq1y33lq02qv4cww075sm9bm4f651d34q5x38sk3"; }; nativeBuildInputs = [ cmake ]; @@ -37,5 +37,6 @@ stdenv.mkDerivation rec { homepage = https://github.com/castano/nvidia-texture-tools; license = licenses.mit; platforms = platforms.unix; + broken = stdenv.isAarch64; }; } diff --git a/pkgs/development/libraries/science/math/mkl/default.nix b/pkgs/development/libraries/science/math/mkl/default.nix index 5700b2118b97..c1a5ea2969e1 100644 --- a/pkgs/development/libraries/science/math/mkl/default.nix +++ b/pkgs/development/libraries/science/math/mkl/default.nix @@ -3,11 +3,25 @@ For details on using mkl as a blas provider for python packages such as numpy, numexpr, scipy, etc., see the Python section of the NixPkgs manual. */ -stdenvNoCC.mkDerivation rec { - name = "mkl-${version}"; - version = "${date}.${rel}"; - date = "2019.3"; - rel = "199"; +let + # Release notes and download URLs are here: + # https://registrationcenter.intel.com/en/products/ + version = "${year}.${spot}.${rel}"; + year = "2019"; + + # Darwin is pinned to 2019.3 because the DMG does not unpack; see here for details: + # https://github.com/matthewbauer/undmg/issues/4 + spot = if stdenvNoCC.isDarwin then "3" else "5"; + rel = if stdenvNoCC.isDarwin then "199" else "281"; + + rpm-ver = "${year}.${spot}-${rel}-${year}.${spot}-${rel}"; + + # Intel openmp uses its own versioning, but shares the spot release patch. + openmp-ver = "19.0.${spot}-${rel}-19.0.${spot}-${rel}"; + +in stdenvNoCC.mkDerivation { + pname = "mkl"; + inherit version; src = if stdenvNoCC.isDarwin then @@ -17,27 +31,25 @@ stdenvNoCC.mkDerivation rec { }) else (fetchurl { - url = "http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/15275/l_mkl_${version}.tgz"; - sha256 = "13rb2v2872jmvzcqm4fqsvhry0j2r5cn4lqql4wpqbl1yia2pph6"; + url = "https://registrationcenter-download.intel.com/akdlm/irc_nas/tec/15816/l_mkl_${version}.tgz"; + sha256 = "0zkk4rrq7g44acxaxhpd2053r66w169mww6917an0lxhd52fm5cr"; }); nativeBuildInputs = if stdenvNoCC.isDarwin then - [ undmg - darwin.cctools - ] + [ undmg darwin.cctools ] else [ rpmextract ]; buildPhase = if stdenvNoCC.isDarwin then '' - for f in Contents/Resources/pkg/*.tgz; do - tar xzvf $f - done + for f in Contents/Resources/pkg/*.tgz; do + tar xzvf $f + done '' else '' - rpmextract rpm/intel-mkl-common-c-${date}-${rel}-${date}-${rel}.noarch.rpm - rpmextract rpm/intel-mkl-core-${date}-${rel}-${date}-${rel}.x86_64.rpm - rpmextract rpm/intel-mkl-core-rt-${date}-${rel}-${date}-${rel}.x86_64.rpm - rpmextract rpm/intel-openmp-19.0.3-${rel}-19.0.3-${rel}.x86_64.rpm + rpmextract rpm/intel-mkl-common-c-${rpm-ver}.noarch.rpm + rpmextract rpm/intel-mkl-core-${rpm-ver}.x86_64.rpm + rpmextract rpm/intel-mkl-core-rt-${rpm-ver}.x86_64.rpm + rpmextract rpm/intel-openmp-${openmp-ver}.x86_64.rpm ''; installPhase = '' @@ -82,12 +94,12 @@ stdenvNoCC.mkDerivation rec { # larger updated load commands do not fit. Use install_name_tool # explicitly and ignore the error. postFixup = stdenvNoCC.lib.optionalString stdenvNoCC.isDarwin '' - for f in $out/lib/*.dylib; do - install_name_tool -id $out/lib/$(basename $f) $f || true - done - install_name_tool -change @rpath/libiomp5.dylib $out/lib/libiomp5.dylib $out/lib/libmkl_intel_thread.dylib - install_name_tool -change @rpath/libtbb.dylib $out/lib/libtbb.dylib $out/lib/libmkl_tbb_thread.dylib - install_name_tool -change @rpath/libtbbmalloc.dylib $out/lib/libtbbmalloc.dylib $out/lib/libtbbmalloc_proxy.dylib + for f in $out/lib/*.dylib; do + install_name_tool -id $out/lib/$(basename $f) $f || true + done + install_name_tool -change @rpath/libiomp5.dylib $out/lib/libiomp5.dylib $out/lib/libmkl_intel_thread.dylib + install_name_tool -change @rpath/libtbb.dylib $out/lib/libtbb.dylib $out/lib/libmkl_tbb_thread.dylib + install_name_tool -change @rpath/libtbbmalloc.dylib $out/lib/libtbbmalloc.dylib $out/lib/libtbbmalloc_proxy.dylib ''; # Per license agreement, do not modify the binary @@ -105,6 +117,6 @@ stdenvNoCC.mkDerivation rec { homepage = https://software.intel.com/en-us/mkl; license = licenses.issl; platforms = [ "x86_64-linux" "x86_64-darwin" ]; - maintainers = [ maintainers.bhipple ]; + maintainers = with maintainers; [ bhipple ]; }; } diff --git a/pkgs/development/libraries/taglib/1.9.nix b/pkgs/development/libraries/taglib/1.9.nix deleted file mode 100644 index 401c2562167f..000000000000 --- a/pkgs/development/libraries/taglib/1.9.nix +++ /dev/null @@ -1,22 +0,0 @@ -{stdenv, fetchurl, zlib, cmake}: - -stdenv.mkDerivation { - name = "taglib-1.9.1"; - - src = fetchurl { - url = https://taglib.github.io/releases/taglib-1.9.1.tar.gz; - sha256 = "06n7gnbcqa3r6c9gv00y0y1r48dyyazm6yj403i7ma0r2k6p3lvj"; - }; - - nativeBuildInputs = [ cmake ]; - - buildInputs = [ zlib ]; - - meta = { - homepage = https://taglib.org/; - repositories.git = git://github.com/taglib/taglib.git; - description = "A library for reading and editing the meta-data of several popular audio formats"; - inherit (cmake.meta) platforms; - license = with stdenv.lib.licenses; [ lgpl21 mpl11 ]; - }; -} diff --git a/pkgs/development/libraries/taglib/default.nix b/pkgs/development/libraries/taglib/default.nix index 6dcfa3068c11..c553405878f2 100644 --- a/pkgs/development/libraries/taglib/default.nix +++ b/pkgs/development/libraries/taglib/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" ]; meta = with stdenv.lib; { - homepage = "http://taglib.org/"; + homepage = "https://taglib.org/"; repositories.git = "git://github.com/taglib/taglib.git"; description = "A library for reading and editing audio file metadata."; longDescription = '' diff --git a/pkgs/development/libraries/xapian/default.nix b/pkgs/development/libraries/xapian/default.nix index bb14f3437ba5..dfec2197385c 100644 --- a/pkgs/development/libraries/xapian/default.nix +++ b/pkgs/development/libraries/xapian/default.nix @@ -37,5 +37,5 @@ let }; }; in { - xapian_1_4 = generic "1.4.12" "0z5c1y9vp519h2x2igjq39v6j615nppry0wasd0xn4hphgd3d2jg"; + xapian_1_4 = generic "1.4.13" "0z0k8902bz2ckdggikj5yz11ik2n8krmdwzvpqv60phcm3zzzy4k"; } diff --git a/pkgs/development/libraries/xapian/skip-flaky-darwin-test.patch b/pkgs/development/libraries/xapian/skip-flaky-darwin-test.patch index 72a7c3e721f4..cce96a2762bf 100644 --- a/pkgs/development/libraries/xapian/skip-flaky-darwin-test.patch +++ b/pkgs/development/libraries/xapian/skip-flaky-darwin-test.patch @@ -1,14 +1,14 @@ diff -Naur xapian-core.old/tests/api_db.cc xapian-core.new/tests/api_db.cc --- xapian-core.old/tests/api_db.cc +++ xapian-core.new/tests/api_db.cc -@@ -998,6 +998,7 @@ +@@ -1020,6 +1020,7 @@ // test for keepalives DEFINE_TESTCASE(keepalive1, remote) { + SKIP_TEST("Fails in darwin nix build environment"); - Xapian::Database db(get_remote_database("apitest_simpledata", 5000)); + XFAIL_FOR_BACKEND("multi_glass_remoteprog_glass", + "Multi remote databases are currently buggy"); - /* Test that keep-alives work */ diff -Naur xapian-core.old/tests/api_scalability.cc xapian-core.new/tests/api_scalability.cc --- xapian-core.old/tests/api_scalability.cc +++ xapian-core.new/tests/api_scalability.cc diff --git a/pkgs/development/ocaml-modules/checkseum/default.nix b/pkgs/development/ocaml-modules/checkseum/default.nix index 0e348dd65c38..18e06d260f4e 100644 --- a/pkgs/development/ocaml-modules/checkseum/default.nix +++ b/pkgs/development/ocaml-modules/checkseum/default.nix @@ -29,6 +29,8 @@ stdenv.mkDerivation rec { inherit (dune) installPhase; + passthru = { inherit hasC; }; + meta = { homepage = "https://github.com/mirage/checkseum"; description = "ADLER-32 and CRC32C Cyclic Redundancy Check"; diff --git a/pkgs/development/ocaml-modules/decompress/default.nix b/pkgs/development/ocaml-modules/decompress/default.nix index 70ec7fd34ae1..828d3a98f9de 100644 --- a/pkgs/development/ocaml-modules/decompress/default.nix +++ b/pkgs/development/ocaml-modules/decompress/default.nix @@ -1,30 +1,27 @@ -{ stdenv, fetchFromGitHub, ocaml, findlib, ocamlbuild, topkg +{ lib, fetchurl, buildDunePackage +, checkseum, cmdliner +, alcotest, bos, camlzip, mmap, re }: -if !stdenv.lib.versionAtLeast ocaml.version "4.03" -then throw "decompress is not available for OCaml ${ocaml.version}" -else +buildDunePackage rec { + version = "0.9.0"; + pname = "decompress"; -stdenv.mkDerivation rec { - version = "0.6"; - name = "ocaml${ocaml.version}-decompress-${version}"; - - src = fetchFromGitHub { - owner = "mirage"; - repo = "decompress"; - rev = "v${version}"; - sha256 = "0hfs5zrvimzvjwdg57vrxx9bb7irvlm07dk2yv3s5qhj30zimd08"; + src = fetchurl { + url = "https://github.com/mirage/decompress/releases/download/v${version}/decompress-v${version}.tbz"; + sha256 = "0fryhcvv96vfca51c7kqdn3n3canqsbbvfbi75ya6lca4lmpipbh"; }; - buildInputs = [ ocaml findlib ocamlbuild topkg ]; - - inherit (topkg) buildPhase installPhase; + buildInputs = [ cmdliner ]; + propagatedBuildInputs = [ checkseum ]; + checkInputs = lib.optionals doCheck [ alcotest bos camlzip mmap re ]; + doCheck = true; meta = { description = "Pure OCaml implementation of Zlib"; - license = stdenv.lib.licenses.mit; - maintainers = [ stdenv.lib.maintainers.vbgl ]; - inherit (src.meta) homepage; - inherit (ocaml.meta) platforms; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.vbgl ]; + homepage = "https://github.com/mirage/decompress"; + broken = !checkseum.hasC; }; } diff --git a/pkgs/development/ocaml-modules/encore/default.nix b/pkgs/development/ocaml-modules/encore/default.nix new file mode 100644 index 000000000000..ab91117ac082 --- /dev/null +++ b/pkgs/development/ocaml-modules/encore/default.nix @@ -0,0 +1,20 @@ +{ lib, buildDunePackage, fetchurl, ocaml, alcotest, angstrom, ke }: + +buildDunePackage rec { + pname = "encore"; + version = "0.3"; + src = fetchurl { + url = "https://github.com/mirage/encore/releases/download/v${version}/encore-v${version}.tbz"; + sha256 = "05nv6yms5axsmq9cspr7884rz5kirj50izx3vdm89q4yl186qykl"; + }; + propagatedBuildInputs = [ angstrom ke ]; + checkInputs = lib.optional doCheck alcotest; + doCheck = lib.versions.majorMinor ocaml.version != "4.07"; + + meta = { + homepage = "https://github.com/mirage/encore"; + description = "Library to generate encoder/decoder which ensure isomorphism"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.vbgl ]; + }; +} diff --git a/pkgs/development/ocaml-modules/git/default.nix b/pkgs/development/ocaml-modules/git/default.nix index 35f8f5d52e94..929382abe76b 100644 --- a/pkgs/development/ocaml-modules/git/default.nix +++ b/pkgs/development/ocaml-modules/git/default.nix @@ -1,27 +1,28 @@ -{ stdenv, fetchFromGitHub, buildDunePackage -, astring, decompress, fmt, hex, logs, mstruct, ocaml_lwt, ocamlgraph, ocplib-endian, uri -, alcotest, mtime, nocrypto +{ lib, fetchFromGitHub, buildDunePackage +, alcotest, git, mtime, nocrypto +, angstrom, astring, cstruct, decompress, digestif, encore, duff, fmt +, fpath, hex, ke, logs, lru, ocaml_lwt, ocamlgraph, ocplib-endian, uri, rresult }: buildDunePackage rec { pname = "git"; - version = "1.11.5"; + version = "2.1.0"; src = fetchFromGitHub { owner = "mirage"; repo = "ocaml-git"; rev = version; - sha256 = "0r1bxpxjjnl9hh8xbabsxl7svzvd19hfy73a2y1m4kljmw64dpfh"; + sha256 = "0v55zkwgml6i5hp0kzynbi58z6j15k3qgzg06b3h8pdbv5fwd1jp"; }; - buildInputs = [ alcotest mtime nocrypto ]; - propagatedBuildInputs = [ astring decompress fmt hex logs mstruct ocaml_lwt ocamlgraph ocplib-endian uri ]; + propagatedBuildInputs = [ angstrom astring cstruct decompress digestif encore duff fmt fpath hex ke logs lru ocaml_lwt ocamlgraph ocplib-endian uri rresult ]; + checkInputs = lib.optionals doCheck [ alcotest git mtime nocrypto ]; doCheck = true; meta = { description = "Git format and protocol in pure OCaml"; - license = stdenv.lib.licenses.isc; - maintainers = [ stdenv.lib.maintainers.vbgl ]; + license = lib.licenses.isc; + maintainers = [ lib.maintainers.vbgl ]; inherit (src.meta) homepage; }; } diff --git a/pkgs/development/ocaml-modules/imagelib/default.nix b/pkgs/development/ocaml-modules/imagelib/default.nix index 77b18f0ce3a9..12b8a757e16f 100644 --- a/pkgs/development/ocaml-modules/imagelib/default.nix +++ b/pkgs/development/ocaml-modules/imagelib/default.nix @@ -1,26 +1,27 @@ -{ stdenv, fetchFromGitHub, which, ocaml, findlib, ocamlbuild, decompress }: +{ lib, fetchFromGitHub, fetchpatch, buildDunePackage, decompress }: -stdenv.mkDerivation rec { - version = "20171028"; - name = "ocaml${ocaml.version}-imagelib-${version}"; +buildDunePackage rec { + minimumOCamlVersion = "4.07"; + version = "20191011"; + pname = "imagelib"; src = fetchFromGitHub { owner = "rlepigre"; repo = "ocaml-imagelib"; - rev = "ocaml-imagelib_${version}"; - sha256 = "1frkrgcrv4ybdmqcfxpfsywx0hm1arxgxp32n8kzky6qip1g0zxf"; + rev = "03fed7733825cef7e0465163f398f6af810e2e75"; + sha256 = "0h7vgyss42nhlfqpbdnb54nxq86rskqi2ilx8b87r0hi19hqx463"; }; - buildInputs = [ which ocaml findlib ocamlbuild ]; + patches = [ (fetchpatch { + url = "https://github.com/rlepigre/ocaml-imagelib/pull/24/commits/4704fd44adcda62e0d96ea5b1927071326aa6111.patch"; + sha256 = "0ipjab1hfa2v2pnd8g1k3q2ia0plgiw7crm3fa4w2aqpzdyabkb9"; + }) ]; propagatedBuildInputs = [ decompress ]; - createFindlibDestdir = true; - meta = { description = "Image formats such as PNG and PPM in OCaml"; - license = stdenv.lib.licenses.lgpl3; - maintainers = [ stdenv.lib.maintainers.vbgl ]; + license = lib.licenses.lgpl3; + maintainers = [ lib.maintainers.vbgl ]; inherit (src.meta) homepage; - inherit (ocaml.meta) platforms; }; } diff --git a/pkgs/development/ocaml-modules/imagelib/unix.nix b/pkgs/development/ocaml-modules/imagelib/unix.nix new file mode 100644 index 000000000000..48986b15a8f8 --- /dev/null +++ b/pkgs/development/ocaml-modules/imagelib/unix.nix @@ -0,0 +1,8 @@ +{ buildDunePackage, imagelib }: + +buildDunePackage { + pname = "imagelib-unix"; + inherit (imagelib) version src meta; + + propagatedBuildInputs = [ imagelib ]; +} diff --git a/pkgs/development/ocaml-modules/ke/default.nix b/pkgs/development/ocaml-modules/ke/default.nix new file mode 100644 index 000000000000..e1b68a1d2da4 --- /dev/null +++ b/pkgs/development/ocaml-modules/ke/default.nix @@ -0,0 +1,28 @@ +{ lib, buildDunePackage, fetchurl +, bigarray-compat, fmt +, alcotest, bigstringaf +}: + +buildDunePackage rec { + pname = "ke"; + version = "0.4"; + + src = fetchurl { + url = "https://github.com/mirage/ke/releases/download/v${version}/ke-v${version}.tbz"; + sha256 = "13c9xy60vmq29mnwpg3h3zgl6gjbjfwbx1s0crfc6xwvark0zxnx"; + }; + + propagatedBuildInputs = [ bigarray-compat fmt ]; + + checkInputs = lib.optionals doCheck [ alcotest bigstringaf ]; + doCheck = true; + + minimumOCamlVersion = "4.03"; + + meta = { + description = "Fast implementation of queue in OCaml"; + homepage = "https://github.com/mirage/ke"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.vbgl ]; + }; +} diff --git a/pkgs/development/python-modules/Babel/default.nix b/pkgs/development/python-modules/Babel/default.nix index 34ee532c1fee..96226518800a 100644 --- a/pkgs/development/python-modules/Babel/default.nix +++ b/pkgs/development/python-modules/Babel/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "Babel"; - version = "2.6.0"; + version = "2.7.0"; src = fetchPypi { inherit pname version; - sha256 = "8cba50f48c529ca3fa18cf81fa9403be176d374ac4d60738b839122dfaaa3d23"; + sha256 = "e86135ae101e31e2c8ec20a4e0c5220f4eed12487d5cf3f78be7e98d3a57fc28"; }; propagatedBuildInputs = [ pytz ]; diff --git a/pkgs/development/python-modules/GitPython/default.nix b/pkgs/development/python-modules/GitPython/default.nix index 78ef323255e4..d92100cc1419 100644 --- a/pkgs/development/python-modules/GitPython/default.nix +++ b/pkgs/development/python-modules/GitPython/default.nix @@ -1,12 +1,13 @@ { lib, buildPythonPackage, fetchPypi, isPy27, substituteAll, git, gitdb2, mock, nose, ddt }: buildPythonPackage rec { - version = "2.1.14"; + version = "3.0.4"; pname = "GitPython"; + disabled = isPy27; # no longer supported src = fetchPypi { inherit pname version; - sha256 = "392f31eaadc19db35a54e3ab7285577fb4a86d96ecee08cf22a573f06633baab"; + sha256 = "3237caca1139d0a7aa072f6735f5fd2520de52195e0fa1d8b83a9b212a2498b2"; }; patches = [ diff --git a/pkgs/development/python-modules/JPype1/default.nix b/pkgs/development/python-modules/JPype1/default.nix index 44ec253fbf78..3e3d90f09d25 100644 --- a/pkgs/development/python-modules/JPype1/default.nix +++ b/pkgs/development/python-modules/JPype1/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "JPype1"; - version = "0.6.3"; + version = "0.7.0"; src = fetchPypi { inherit pname version; - sha256 = "6841523631874a731e1f94e1b1f130686ad3772030eaa3b6946256eeb1d10dd1"; + sha256 = "1630439d5b0fb49e2878b43a1a1f074f9d4f46520f525569e14f1f0f9399f871"; }; patches = [ ./set-compiler-language.patch ]; diff --git a/pkgs/development/python-modules/Mako/default.nix b/pkgs/development/python-modules/Mako/default.nix index ef665639d398..2e7cb74a06ce 100644 --- a/pkgs/development/python-modules/Mako/default.nix +++ b/pkgs/development/python-modules/Mako/default.nix @@ -1,26 +1,29 @@ { lib , buildPythonPackage , fetchPypi +, python , markupsafe , nose , mock -, pytest , isPyPy }: buildPythonPackage rec { pname = "Mako"; - version = "1.0.14"; + version = "1.1.0"; src = fetchPypi { inherit pname version; - sha256 = "f5a642d8c5699269ab62a68b296ff990767eb120f51e2e8f3d6afb16bdb57f4b"; + sha256 = "a36919599a9b7dc5d86a7a8988f23a9a3a3d083070023bab23d64f7f1d1e0a4b"; }; - checkInputs = [ markupsafe nose mock pytest ]; + checkInputs = [ markupsafe nose mock ]; propagatedBuildInputs = [ markupsafe ]; doCheck = !isPyPy; # https://bitbucket.org/zzzeek/mako/issue/238/2-tests-failed-on-pypy-24-25 + checkPhase = '' + ${python.interpreter} -m unittest discover + ''; meta = { description = "Super-fast templating language"; diff --git a/pkgs/development/python-modules/WazeRouteCalculator/default.nix b/pkgs/development/python-modules/WazeRouteCalculator/default.nix index 6a44dc9a75f2..34757f0e29cb 100644 --- a/pkgs/development/python-modules/WazeRouteCalculator/default.nix +++ b/pkgs/development/python-modules/WazeRouteCalculator/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "WazeRouteCalculator"; - version = "0.9"; + version = "0.12"; src = fetchPypi { inherit pname version; - sha256 = "1kwr7r1cn9xxvf9asxqhsy4swx4v6hsgw5cr5wmn71qg11k1i5cx"; + sha256 = "889fe753a530b258bd23def65616666d32c48d93ad8ed211dadf2ed9afcec65b"; }; propagatedBuildInputs = [ requests ]; diff --git a/pkgs/development/python-modules/absl-py/default.nix b/pkgs/development/python-modules/absl-py/default.nix index 29cb06310432..5b0b9d19570b 100644 --- a/pkgs/development/python-modules/absl-py/default.nix +++ b/pkgs/development/python-modules/absl-py/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "absl-py"; - version = "0.7.1"; + version = "0.8.1"; src = fetchPypi { inherit pname version; - sha256 = "b943d1c567743ed0455878fcd60bc28ac9fae38d129d1ccfad58079da00b8951"; + sha256 = "d9129186431e150d7fe455f1cb1ecbb92bb5dba9da9bc3ef7b012d98c4db2526"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/accupy/default.nix b/pkgs/development/python-modules/accupy/default.nix index 9cc3403370f0..07c2bcfeb5e8 100644 --- a/pkgs/development/python-modules/accupy/default.nix +++ b/pkgs/development/python-modules/accupy/default.nix @@ -15,12 +15,12 @@ buildPythonPackage rec { pname = "accupy"; - version = "0.1.4"; + version = "0.2.0"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "2a67f2a778b824fb24eb338fed8e0b61c1af93369d57ff8132f5d602d60f0543"; + sha256 = "e27ca7eed8a1bde2e6e040f8f3ee94a5d7522f42c4360756c9ec8931cf13ca98"; }; buildInputs = [ diff --git a/pkgs/development/python-modules/aenum/default.nix b/pkgs/development/python-modules/aenum/default.nix index 3861c9a4cb43..051ae50e3a57 100644 --- a/pkgs/development/python-modules/aenum/default.nix +++ b/pkgs/development/python-modules/aenum/default.nix @@ -13,6 +13,8 @@ buildPythonPackage rec { # tests to pass checkInputs = if isPy3k then [ glibcLocales ] else []; + # py2 likes to reorder tests + doCheck = isPy3k; checkPhase = '' runHook preCheck ${if isPy3k then "export LC_ALL=en_US.UTF-8" else ""} diff --git a/pkgs/development/python-modules/aioamqp/default.nix b/pkgs/development/python-modules/aioamqp/default.nix index 8488278c934b..3cd6277a3faa 100644 --- a/pkgs/development/python-modules/aioamqp/default.nix +++ b/pkgs/development/python-modules/aioamqp/default.nix @@ -3,7 +3,7 @@ buildPythonPackage rec { pname = "aioamqp"; - version = "0.12.0"; + version = "0.13.0"; meta = { homepage = https://github.com/polyconseil/aioamqp; @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "17vrl6jajr81bql7kjgq0zkxy225px97z4g9wmbhbbnvzn1p92c0"; + sha256 = "ced0d2bb0054809b37b0636da34fc7cda23d66943fb5f9f0610555988cf347b2"; }; disabled = pythonOlder "3.3"; diff --git a/pkgs/development/python-modules/aioesphomeapi/default.nix b/pkgs/development/python-modules/aioesphomeapi/default.nix index 8d8467207ce1..ff88d86fa29b 100644 --- a/pkgs/development/python-modules/aioesphomeapi/default.nix +++ b/pkgs/development/python-modules/aioesphomeapi/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "aioesphomeapi"; - version = "2.2.0"; + version = "2.4.0"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "0znal1hi964acc8bl3z0ikscax7zziks838ld099rjsbffjwmwn5"; + sha256 = "bef494dd39a12e2e76cf4ea772a2746f1669ee243f03ad3579085ca9605beccb"; }; propagatedBuildInputs = [ attrs protobuf zeroconf ]; diff --git a/pkgs/development/python-modules/aiohttp-jinja2/default.nix b/pkgs/development/python-modules/aiohttp-jinja2/default.nix index d8e4c9f29437..58f62b9b0f3f 100644 --- a/pkgs/development/python-modules/aiohttp-jinja2/default.nix +++ b/pkgs/development/python-modules/aiohttp-jinja2/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "aiohttp-jinja2"; - version = "1.1.2"; + version = "1.2.0"; src = fetchPypi { inherit pname version; - sha256 = "0g4pqdm2kp2abam0nx0pgs5lk19f8lsfpcgwxpigdwmy1lvblsa5"; + sha256 = "2dfe29cfd278d07cd0a851afb98471bc8ce2a830968443e40d67636f3c035d79"; }; propagatedBuildInputs = [ aiohttp jinja2 ]; diff --git a/pkgs/development/python-modules/aioredis/default.nix b/pkgs/development/python-modules/aioredis/default.nix index 7b391a5b42f1..af089472d93b 100644 --- a/pkgs/development/python-modules/aioredis/default.nix +++ b/pkgs/development/python-modules/aioredis/default.nix @@ -4,13 +4,13 @@ buildPythonPackage rec { pname = "aioredis"; - version = "1.2.0"; + version = "1.3.0"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "06i53xpz4x6qrmdxqwvkpd17lbgmwfq20v0jrwc73f5y57kjpml4"; + sha256 = "86da2748fb0652625a8346f413167f078ec72bdc76e217db7e605a059cd56e86"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/aiounifi/default.nix b/pkgs/development/python-modules/aiounifi/default.nix index cee5c2606e08..e86fc222eea4 100644 --- a/pkgs/development/python-modules/aiounifi/default.nix +++ b/pkgs/development/python-modules/aiounifi/default.nix @@ -3,13 +3,13 @@ buildPythonPackage rec { pname = "aiounifi"; - version = "4"; + version = "11"; disabled = ! isPy3k; src = fetchPypi { inherit pname version; - sha256 = "0594nb8mpfhnnk9jadbdnbn9v7p4sh3430kcgfyhsh7ayw2mpb9m"; + sha256 = "e751cfd002f54dda76dfd498dcc53cb6fab6bff79773ca7d18c9c7b392046b12"; }; propagatedBuildInputs = [ aiohttp ]; diff --git a/pkgs/development/python-modules/alembic/default.nix b/pkgs/development/python-modules/alembic/default.nix index 334f0731c892..da958cd8d971 100644 --- a/pkgs/development/python-modules/alembic/default.nix +++ b/pkgs/development/python-modules/alembic/default.nix @@ -5,16 +5,19 @@ buildPythonPackage rec { pname = "alembic"; - version = "1.0.11"; + version = "1.2.1"; src = fetchPypi { inherit pname version; - sha256 = "cdb7d98bd5cbf65acd38d70b1c05573c432e6473a82f955cdea541b5c153b0cc"; + sha256 = "9f907d7e8b286a1cfb22db9084f9ce4fde7ad7956bb496dc7c952e10ac90e36a"; }; buildInputs = [ pytest pytestcov mock coverage ]; propagatedBuildInputs = [ Mako sqlalchemy python-editor dateutil setuptools ]; + # no traditional test suite + doCheck = false; + meta = with stdenv.lib; { homepage = https://bitbucket.org/zzzeek/alembic; description = "A database migration tool for SQLAlchemy"; diff --git a/pkgs/development/python-modules/alerta-server/default.nix b/pkgs/development/python-modules/alerta-server/default.nix index 9313a255fd05..55674b660c04 100644 --- a/pkgs/development/python-modules/alerta-server/default.nix +++ b/pkgs/development/python-modules/alerta-server/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "alerta-server"; - version = "6.7.5"; + version = "7.4.1"; src = fetchPypi { inherit pname version; - sha256 = "e8dc3428248a5b20c4fe8da76c2d353b715d515bd4879928c499671d4360a90f"; + sha256 = "a6f7740c97f2ae552a4b50bfb709596eabb01bf73715685c9b93ea9fec1821f3"; }; propagatedBuildInputs = [ python-dateutil requests pymongo raven bcrypt flask pyjwt flask-cors psycopg2 pytz flask-compress jinja2 pyyaml]; diff --git a/pkgs/development/python-modules/alerta/default.nix b/pkgs/development/python-modules/alerta/default.nix index 257e89790fa9..fe44b88bc8a1 100644 --- a/pkgs/development/python-modules/alerta/default.nix +++ b/pkgs/development/python-modules/alerta/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "alerta"; - version = "6.5.0"; + version = "7.4.0"; src = fetchPypi { inherit pname version; - sha256 = "f9f0f8f800798fae83c05dd52dc2f06bd77fb318c784c4b44e3acfba81338881"; + sha256 = "2c8d9cf174d7f66401a5deb104b96375f3877b6c768568705f700faf3adbf448"; }; propagatedBuildInputs = [ six click requests pytz tabulate ]; diff --git a/pkgs/development/python-modules/allpairspy/default.nix b/pkgs/development/python-modules/allpairspy/default.nix index e64a6004b789..0ab69aef71e7 100644 --- a/pkgs/development/python-modules/allpairspy/default.nix +++ b/pkgs/development/python-modules/allpairspy/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "allpairspy"; - version = "2.4.3"; + version = "2.5.0"; src = fetchPypi { inherit pname version; - sha256 = "8ce160db245375a5ccf0831be77cd98394f514c1b3501ddff5f8edb780ee1748"; + sha256 = "9358484c91abe74ba18daf9d6d6904c5be7cc8818397d05248c9d336023c28b1"; }; propagatedBuildInputs = [ six ]; diff --git a/pkgs/development/python-modules/aniso8601/default.nix b/pkgs/development/python-modules/aniso8601/default.nix index 1d5bf641f7cf..e5222b64e9bc 100644 --- a/pkgs/development/python-modules/aniso8601/default.nix +++ b/pkgs/development/python-modules/aniso8601/default.nix @@ -3,7 +3,7 @@ buildPythonPackage rec { pname = "aniso8601"; - version = "7.0.0"; + version = "8.0.0"; meta = with stdenv.lib; { description = "Parses ISO 8601 strings."; @@ -17,6 +17,6 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "07jgf55yq2j2q76gaj3hakflnxg8yfkarzvrmq33i1dp6xk2ngai"; + sha256 = "529dcb1f5f26ee0df6c0a1ee84b7b27197c3c50fc3a6321d66c544689237d072"; }; } diff --git a/pkgs/development/python-modules/arrow/default.nix b/pkgs/development/python-modules/arrow/default.nix index e357bef0dfdf..bf3dcb869f98 100644 --- a/pkgs/development/python-modules/arrow/default.nix +++ b/pkgs/development/python-modules/arrow/default.nix @@ -1,15 +1,15 @@ { stdenv, buildPythonPackage, fetchPypi , nose, chai, simplejson, backports_functools_lru_cache -, dateutil, pytz +, dateutil, pytz, mock, dateparser }: buildPythonPackage rec { pname = "arrow"; - version = "0.13.2"; + version = "0.15.2"; src = fetchPypi { inherit pname version; - sha256 = "82dd5e13b733787d4eb0fef42d1ee1a99136dc1d65178f70373b3678b3181bfc"; + sha256 = "10257c5daba1a88db34afa284823382f4963feca7733b9107956bed041aff24f"; }; checkPhase = '' @@ -17,7 +17,7 @@ buildPythonPackage rec { ''; checkInputs = [ nose chai simplejson pytz ]; - propagatedBuildInputs = [ dateutil backports_functools_lru_cache ]; + propagatedBuildInputs = [ dateutil backports_functools_lru_cache mock dateparser]; postPatch = '' substituteInPlace setup.py --replace "==1.2.1" "" diff --git a/pkgs/development/python-modules/ase/3.17.nix b/pkgs/development/python-modules/ase/3.17.nix index 3a466170c77c..dc251ac2ab22 100644 --- a/pkgs/development/python-modules/ase/3.17.nix +++ b/pkgs/development/python-modules/ase/3.17.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "ase"; - version = "3.17.0"; + version = "3.18.1"; src = fetchPypi { inherit pname version; - sha256 = "1d4gxypaahby45zcpl0rffcn2z7n55dg9lcd8sv6jjsmbbf9vr4g"; + sha256 = "e21948dbf79011cc796d772885a8aafb255a6f365d112fe6a3bd26198c6cac7f"; }; propagatedBuildInputs = [ numpy scipy matplotlib flask pillow psycopg2 ]; diff --git a/pkgs/development/python-modules/asn1crypto/default.nix b/pkgs/development/python-modules/asn1crypto/default.nix index 2b627fe80ff1..ead16f986cab 100644 --- a/pkgs/development/python-modules/asn1crypto/default.nix +++ b/pkgs/development/python-modules/asn1crypto/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "asn1crypto"; - version = "0.24.0"; + version = "1.2.0"; src = fetchPypi { inherit pname version; - sha256 = "9d5c20441baf0cb60a4ac34cc447c6c189024b6b4c6cd7877034f4965c464e49"; + sha256 = "87620880a477123e01177a1f73d0f327210b43a3cdbd714efcd2fa49a8d7b384"; }; # No tests included diff --git a/pkgs/development/python-modules/astor/default.nix b/pkgs/development/python-modules/astor/default.nix index 6343b9eb8e46..21eeead88ca7 100644 --- a/pkgs/development/python-modules/astor/default.nix +++ b/pkgs/development/python-modules/astor/default.nix @@ -12,15 +12,20 @@ buildPythonPackage rec { # fix packaging for setuptools>=41.4 patches = [ ( fetchpatch { - url = "https://github.com/berkerpeksag/astor/pull/163/commits/c908d1136cdfb058f5e9d81b4d3687931aa1ebfb.patch"; - sha256 = "06mrx3qxfjyx9v76kxsj2b7zyqwrwlyd5z1fh77jbb8yl6m0nacd"; + url = "https://github.com/berkerpeksag/astor/pull/163/commits/bd697678674aafcf3f7b1c06af67df181ed584e2.patch"; + sha256 = "1m4szdyzalngd5klanmpjx5smgpc7rl5klky0lc0yhwbx210mla6"; }) ]; # disable tests broken with python3.6: https://github.com/berkerpeksag/astor/issues/89 checkInputs = [ pytest ]; checkPhase = '' - py.test -k 'not check_expressions and not check_astunparse and not test_convert_stdlib and not test_codegen_as_submodule and not test_codegen_from_root' + py.test -k 'not check_expressions \ + and not check_astunparse \ + and not test_convert_stdlib \ + and not test_codegen_as_submodule \ + and not test_positional_only_arguments \ + and not test_codegen_from_root' ''; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/astroid/default.nix b/pkgs/development/python-modules/astroid/default.nix index 8f5a9175f65d..1899559b2a91 100644 --- a/pkgs/development/python-modules/astroid/default.nix +++ b/pkgs/development/python-modules/astroid/default.nix @@ -5,13 +5,13 @@ buildPythonPackage rec { pname = "astroid"; - version = "2.3.1"; + version = "2.3.2"; disabled = pythonOlder "3.4"; src = fetchPypi { inherit pname version; - sha256 = "b7546ffdedbf7abcfbff93cd1de9e9980b1ef744852689decc5aeada324238c6"; + sha256 = "09a3fba616519311f1af8a461f804b68f0370e100c9264a035aa7846d7852e33"; }; # From astroid/__pkginfo__.py diff --git a/pkgs/development/python-modules/audio-metadata/default.nix b/pkgs/development/python-modules/audio-metadata/default.nix index 9a6952c88f08..e21e04af6f5d 100644 --- a/pkgs/development/python-modules/audio-metadata/default.nix +++ b/pkgs/development/python-modules/audio-metadata/default.nix @@ -4,15 +4,16 @@ , bitstruct , more-itertools , pprintpp +, tbm-utils }: buildPythonPackage rec { pname = "audio-metadata"; - version = "0.4.0"; + version = "0.6.0"; src = fetchPypi { inherit pname version; - sha256 = "a881f0f3b82752d306ac0a7850ed0e31bad275a399f63097733b4890986084b2"; + sha256 = "7a0c060d05ac59a4ce841a485808fe8a6993fec554f96bee90e57e971c73a2a6"; }; postPatch = '' @@ -27,6 +28,7 @@ buildPythonPackage rec { bitstruct more-itertools pprintpp + tbm-utils ]; # No tests diff --git a/pkgs/development/python-modules/autobahn/default.nix b/pkgs/development/python-modules/autobahn/default.nix index 7d1e365b243c..bcda2b4b617e 100644 --- a/pkgs/development/python-modules/autobahn/default.nix +++ b/pkgs/development/python-modules/autobahn/default.nix @@ -4,11 +4,11 @@ }: buildPythonPackage rec { pname = "autobahn"; - version = "19.8.1"; + version = "19.10.1"; src = fetchPypi { inherit pname version; - sha256 = "294e7381dd54e73834354832604ae85567caf391c39363fed0ea2bfa86aa4304"; + sha256 = "734385b00547448b3f30a752cbfd2900d15924d77dc4a1699b8bce1ea8899f39"; }; propagatedBuildInputs = [ six txaio twisted zope_interface cffi cryptography pynacl ] ++ diff --git a/pkgs/development/python-modules/autologging/default.nix b/pkgs/development/python-modules/autologging/default.nix index 090eb68675bc..1d028eeb1870 100644 --- a/pkgs/development/python-modules/autologging/default.nix +++ b/pkgs/development/python-modules/autologging/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "Autologging"; - version = "1.2.1"; + version = "1.3.2"; src = fetchPypi { inherit pname version; - sha256 = "16v2k16m433fxlvl7f0081n67rpxhs2hyn1ivkx1xs5qjxpv5n3k"; + sha256 = "117659584d8aab8cf62046f682f8e57b54d958b8571c737fa8bf15c32937fbb6"; extension = "zip"; }; diff --git a/pkgs/development/python-modules/automat/default.nix b/pkgs/development/python-modules/automat/default.nix index 808eba12bb6f..fb6ac1daa1fa 100644 --- a/pkgs/development/python-modules/automat/default.nix +++ b/pkgs/development/python-modules/automat/default.nix @@ -2,12 +2,12 @@ m2r, setuptools_scm, six, attrs }: buildPythonPackage rec { - version = "0.7.0"; + version = "0.8.0"; pname = "Automat"; src = fetchPypi { inherit pname version; - sha256 = "cbd78b83fa2d81fe2a4d23d258e1661dd7493c9a50ee2f1a5b2cac61c1793b0e"; + sha256 = "269a09dfb063a3b078983f4976d83f0a0d3e6e7aaf8e27d8df1095e09dc4a484"; }; buildInputs = [ m2r setuptools_scm ]; diff --git a/pkgs/development/python-modules/awkward/default.nix b/pkgs/development/python-modules/awkward/default.nix index a4d8acec540c..16ebf4961585 100644 --- a/pkgs/development/python-modules/awkward/default.nix +++ b/pkgs/development/python-modules/awkward/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "awkward"; - version = "0.12.13"; + version = "0.12.14"; src = fetchPypi { inherit pname version; - sha256 = "0jciasfmayk3xs8lprrdjd6brvy614yd2ngpgyzlszis5sa6nr18"; + sha256 = "a76b0b76e4e843bfffc26771f6e1848be6f1c225e79f541c12215ae90503e489"; }; nativeBuildInputs = [ pytestrunner ]; diff --git a/pkgs/development/python-modules/aws-adfs/default.nix b/pkgs/development/python-modules/aws-adfs/default.nix index 4912e8f99943..5124077b1187 100644 --- a/pkgs/development/python-modules/aws-adfs/default.nix +++ b/pkgs/development/python-modules/aws-adfs/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "aws-adfs"; - version = "1.17.0"; + version = "1.19.0"; src = fetchPypi { inherit pname version; - sha256 = "0wnsmwjpfhxilmvrqvwilcf3h9p5m5ixi5gn9bgkr3gwd2laxf54"; + sha256 = "da20c682993d87d41534ffc2be0819d924aaf230b27abbc5d1fa8ad62410bf39"; }; # Relax version constraint diff --git a/pkgs/development/python-modules/aws-sam-translator/default.nix b/pkgs/development/python-modules/aws-sam-translator/default.nix index a9734745f21c..b43ec658f5e9 100644 --- a/pkgs/development/python-modules/aws-sam-translator/default.nix +++ b/pkgs/development/python-modules/aws-sam-translator/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "aws-sam-translator"; - version = "1.11.0"; + version = "1.15.1"; src = fetchPypi { inherit pname version; - sha256 = "db872c43bdfbbae9fc8c9201e6a7aeb9a661cda116a94708ab0577b46a38b962"; + sha256 = "11c62c00f37b57c39a55d7a29d93f4704a88549c29a6448ebc953147173fbe85"; }; # Tests are not included in the PyPI package diff --git a/pkgs/development/python-modules/aws-xray-sdk/default.nix b/pkgs/development/python-modules/aws-xray-sdk/default.nix index 1a17d2650b5c..8c4215322883 100644 --- a/pkgs/development/python-modules/aws-xray-sdk/default.nix +++ b/pkgs/development/python-modules/aws-xray-sdk/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "aws-xray-sdk"; - version = "2.3.0"; + version = "2.4.2"; src = fetchPypi { inherit pname version; - sha256 = "bb74e1cc2388bd29c45e2e3eb31d0416d0f53d83baafca7b72ca9c945a2e249a"; + sha256 = "ce4adb60fe67ebe91f2fc57d5067b4e44df6e233652987be4fb2e549688cf9fe"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-cosmos/default.nix b/pkgs/development/python-modules/azure-cosmos/default.nix index f5219e950f19..c1a001bb1eba 100644 --- a/pkgs/development/python-modules/azure-cosmos/default.nix +++ b/pkgs/development/python-modules/azure-cosmos/default.nix @@ -6,12 +6,12 @@ }: buildPythonPackage rec { - version = "3.1.1"; + version = "3.1.2"; pname = "azure-cosmos"; src = fetchPypi { inherit pname version; - sha256 = "0q8pl8wnadxhyawcrfzrm2k85xd4mdmdk2xwdial55zmpa8ji4pk"; + sha256 = "7f8ac99e4e40c398089fc383bfadcdc83376f72b88532b0cac0b420357cd08c7"; }; propagatedBuildInputs = [ six requests ]; diff --git a/pkgs/development/python-modules/azure-eventgrid/default.nix b/pkgs/development/python-modules/azure-eventgrid/default.nix index 35e291fd30f2..19a0210cc5eb 100644 --- a/pkgs/development/python-modules/azure-eventgrid/default.nix +++ b/pkgs/development/python-modules/azure-eventgrid/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "azure-eventgrid"; - version = "1.2.0"; + version = "1.3.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "7ebbe1c4266ba176aa4969d9755c08f10b89848ad50fb0bfd16fa82e29234f95"; + sha256 = "c82c4bf6ea59aeec69ce8f95f1b6a4edc6d733874aeb056669c9d2806168c86e"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-mgmt-advisor/default.nix b/pkgs/development/python-modules/azure-mgmt-advisor/default.nix index 66ee264ef455..83ca8809fc2a 100644 --- a/pkgs/development/python-modules/azure-mgmt-advisor/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-advisor/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "azure-mgmt-advisor"; - version = "2.0.1"; + version = "3.0.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "1929d6d5ba49d055fdc806e981b93cf75ea42ba35f78222aaf42d8dcf29d4ef3"; + sha256 = "c52a4cf91d736c0ecdcb4d555e3b7713ff892343f610e7d65c63549edb98c221"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-mgmt-compute/default.nix b/pkgs/development/python-modules/azure-mgmt-compute/default.nix index 13fe88b5f890..c13676dc6724 100644 --- a/pkgs/development/python-modules/azure-mgmt-compute/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-compute/default.nix @@ -7,13 +7,13 @@ }: buildPythonPackage rec { - version = "8.0.0"; + version = "9.0.0"; pname = "azure-mgmt-compute"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "06hmf9iq2yqpmmvw7pr9zm4v427q03i436lnin3aczizfndrk76i"; + sha256 = "06795ccb7377eaa3864819a1c63b9bfe9957a58814c65025aef89e9cd81190fc"; }; postInstall = if isPy3k then "" else '' diff --git a/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix b/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix index 5b78fa6b0396..2d98f57f1bad 100644 --- a/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "azure-mgmt-containerservice"; - version = "7.0.0"; + version = "8.0.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "104w7rxv7hy84yzddbbpkjqha04ghr0zz9qy788n3wl69cj4cv1a"; + sha256 = "8fa3d3ac8a88ad6fd25f87966c27049864780d88b7b946d06da310d945a8772a"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-mgmt-network/default.nix b/pkgs/development/python-modules/azure-mgmt-network/default.nix index 452d4e48cf45..236eb0cd8ce3 100644 --- a/pkgs/development/python-modules/azure-mgmt-network/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-network/default.nix @@ -7,13 +7,13 @@ }: buildPythonPackage rec { - version = "6.0.0"; + version = "7.0.0"; pname = "azure-mgmt-network"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "07ak0qqa0fw79mrwpf4isfirrsv1simggi5hfrn856vngrszcx84"; + sha256 = "32ce90691b96ecdaa974ecb4d35063377c8fd21fd05984164507b63113f3456b"; }; postInstall = if isPy3k then "" else '' diff --git a/pkgs/development/python-modules/azure-mgmt-resource/default.nix b/pkgs/development/python-modules/azure-mgmt-resource/default.nix index 9d5d124dbd87..4c02be90a09c 100644 --- a/pkgs/development/python-modules/azure-mgmt-resource/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-resource/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { - version = "2.2.0"; + version = "5.1.0"; pname = "azure-mgmt-resource"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "173pxgly95dwblp4nj4l70zb0gasibgcjmcynxwa5282plynhgdw"; + sha256 = "88db03ea5b9db1dfbf3de8c7be111ed41b121a374645e3ddf3fbba47584c32b1"; }; postInstall = if isPy3k then "" else '' diff --git a/pkgs/development/python-modules/azure-mgmt-storage/default.nix b/pkgs/development/python-modules/azure-mgmt-storage/default.nix index ad17f1bf5bdb..09641bb2056e 100644 --- a/pkgs/development/python-modules/azure-mgmt-storage/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-storage/default.nix @@ -7,13 +7,13 @@ }: buildPythonPackage rec { - version = "4.2.0"; + version = "5.0.0"; pname = "azure-mgmt-storage"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "02a7f5vpaypr2lrayay4i9m7sf7d6galqwjz5wj549vq85jdq5ny"; + sha256 = "dd27ffc8c763932100dff1cda3d5a72dc2348686093732747f68396b1dd3fabf"; }; postInstall = if isPy3k then "" else '' diff --git a/pkgs/development/python-modules/azure-mgmt-web/default.nix b/pkgs/development/python-modules/azure-mgmt-web/default.nix index 00d55f391d56..4a372139fdb5 100644 --- a/pkgs/development/python-modules/azure-mgmt-web/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-web/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "azure-mgmt-web"; - version = "0.43.0"; + version = "0.43.1"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "0yqxk2zr1ibm2vycyq4vy9hy0xhznma5x3kjl6qxhmb4kyyyljkh"; + sha256 = "e3ab5acc9f13746e1f4ce19ccbacc4522527dd1f75eff2826cd882b7ba54806a"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-storage-blob/default.nix b/pkgs/development/python-modules/azure-storage-blob/default.nix index 14bd182ea1b7..5ec0dc9f6eb1 100644 --- a/pkgs/development/python-modules/azure-storage-blob/default.nix +++ b/pkgs/development/python-modules/azure-storage-blob/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "azure-storage-blob"; - version = "1.5.0"; + version = "2.1.0"; src = fetchPypi { inherit pname version; - sha256 = "f187a878e7a191f4e098159904f72b4146cf70e1aabaf6484ab4ba72fc6f252c"; + sha256 = "b90323aad60f207f9f90a0c4cf94c10acc313c20b39403398dfba51f25f7b454"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-storage-common/default.nix b/pkgs/development/python-modules/azure-storage-common/default.nix index 55339acbac5a..50fb3450d84f 100644 --- a/pkgs/development/python-modules/azure-storage-common/default.nix +++ b/pkgs/development/python-modules/azure-storage-common/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "azure-storage-common"; - version = "1.4.2"; + version = "2.1.0"; src = fetchPypi { inherit pname version; - sha256 = "4ec87c7537d457ec95252e0e46477e2c1ccf33774ffefd05d8544682cb0ae401"; + sha256 = "ccedef5c67227bc4d6670ffd37cec18fb529a1b7c3a5e53e4096eb0cf23dc73f"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-storage-file/default.nix b/pkgs/development/python-modules/azure-storage-file/default.nix index c5f63fada2d7..088b5260e65b 100644 --- a/pkgs/development/python-modules/azure-storage-file/default.nix +++ b/pkgs/development/python-modules/azure-storage-file/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "azure-storage-file"; - version = "1.4.0"; + version = "2.1.0"; src = fetchPypi { inherit pname version; - sha256 = "5217b0441b671246a8d5f506a459fa3af084eeb9297c5be3bbe95d75d23bac2f"; + sha256 = "3559b9c7ab13450c66ea833eb82c28233bee24f1bd8ca19aa7d27f8c23d5bc53"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-storage-queue/default.nix b/pkgs/development/python-modules/azure-storage-queue/default.nix index 6e536a35e1bf..515b3f398dfd 100644 --- a/pkgs/development/python-modules/azure-storage-queue/default.nix +++ b/pkgs/development/python-modules/azure-storage-queue/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "azure-storage-queue"; - version = "1.4.0"; + version = "2.1.0"; src = fetchPypi { inherit pname version; - sha256 = "0bafe9e61c0ce7b3f3ecadea21e931dab3248bd4989dc327a8666c5deae7f7ed"; + sha256 = "14e82d3691f1bbd23f2aff143a6c17af3c297164f6e597d223b65a67051ba278"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/backports_unittest-mock/default.nix b/pkgs/development/python-modules/backports_unittest-mock/default.nix index 3baaa871adf5..57d2cad281ec 100644 --- a/pkgs/development/python-modules/backports_unittest-mock/default.nix +++ b/pkgs/development/python-modules/backports_unittest-mock/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "backports.unittest_mock"; - version = "1.4"; + version = "1.5"; src = fetchPypi { inherit pname version; - sha256 = "73df9093bc7a2cc8e7018d08d6983dc5bcb2a47d7e7e107b9e8d0711f1702ef8"; + sha256 = "eff58e53de8fdeb27a1c87a9d57e7b91d15d1bc3854e85344b1a2e69f31ecda7"; }; propagatedBuildInputs = [ mock ]; diff --git a/pkgs/development/python-modules/beautifulsoup4/default.nix b/pkgs/development/python-modules/beautifulsoup4/default.nix index 1b9ba31f0353..c8e8c100616c 100644 --- a/pkgs/development/python-modules/beautifulsoup4/default.nix +++ b/pkgs/development/python-modules/beautifulsoup4/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "beautifulsoup4"; - version = "4.7.1"; + version = "4.8.1"; src = fetchPypi { inherit pname version; - sha256 = "945065979fb8529dd2f37dbb58f00b661bdbcbebf954f93b32fdf5263ef35348"; + sha256 = "6135db2ba678168c07950f9a16c4031822c6f4aec75a65e0a97bc5ca09789931"; }; checkInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/billiard/default.nix b/pkgs/development/python-modules/billiard/default.nix index ca9bbc52cf10..e53aa40446eb 100644 --- a/pkgs/development/python-modules/billiard/default.nix +++ b/pkgs/development/python-modules/billiard/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, isPyPy, pytest, case, psutil }: +{ stdenv, buildPythonPackage, fetchPypi, isPyPy, pytest_4, case, psutil }: buildPythonPackage rec { pname = "billiard"; @@ -10,7 +10,7 @@ buildPythonPackage rec { sha256 = "b8809c74f648dfe69b973c8e660bcec00603758c9db8ba89d7719f88d5f01f26"; }; - checkInputs = [ pytest case psutil ]; + checkInputs = [ pytest_4 case psutil ]; meta = with stdenv.lib; { homepage = https://github.com/celery/billiard; diff --git a/pkgs/development/python-modules/bitarray/0001-Buffer-Protocol-Py3.patch b/pkgs/development/python-modules/bitarray/0001-Buffer-Protocol-Py3.patch deleted file mode 100644 index e1019115ac74..000000000000 --- a/pkgs/development/python-modules/bitarray/0001-Buffer-Protocol-Py3.patch +++ /dev/null @@ -1,106 +0,0 @@ -From c636f0cc386c9ded9f31947bbd74affccc93c21a Mon Sep 17 00:00:00 2001 -From: yoch -Date: Mon, 14 May 2018 21:55:00 +0300 -Subject: [PATCH] Adding buffer protocol support for Python 3 - ---- - bitarray/_bitarray.c | 12 ++++++++++-- - bitarray/test_bitarray.py | 14 +++++++------- - 2 files changed, 17 insertions(+), 9 deletions(-) - -diff --git a/bitarray/_bitarray.c b/bitarray/_bitarray.c -index d2c19cb..be6b379 100644 ---- a/bitarray/_bitarray.c -+++ b/bitarray/_bitarray.c -@@ -48,7 +48,7 @@ int PyIndex_Check(PyObject *o) - #define Py_SIZE(ob) (((PyVarObject *) (ob))->ob_size) - #endif - --#if PY_MAJOR_VERSION == 2 && PY_MINOR_VERSION == 7 -+#if PY_MAJOR_VERSION == 3 || (PY_MAJOR_VERSION == 2 && PY_MINOR_VERSION == 7) - /* (new) buffer protocol */ - #define WITH_BUFFER - #endif -@@ -2787,6 +2787,8 @@ static PyTypeObject BitarrayIter_Type = { - - /********************* Bitarray Buffer Interface ************************/ - #ifdef WITH_BUFFER -+ -+#if PY_MAJOR_VERSION == 2 - static Py_ssize_t - bitarray_buffer_getreadbuf(bitarrayobject *self, - Py_ssize_t index, const void **ptr) -@@ -2831,6 +2833,8 @@ bitarray_buffer_getcharbuf(bitarrayobject *self, - return Py_SIZE(self); - } - -+#endif -+ - static int - bitarray_getbuffer(bitarrayobject *self, Py_buffer *view, int flags) - { -@@ -2857,14 +2861,18 @@ bitarray_releasebuffer(bitarrayobject *self, Py_buffer *view) - } - - static PyBufferProcs bitarray_as_buffer = { -+#if PY_MAJOR_VERSION == 2 // old buffer protocol - (readbufferproc) bitarray_buffer_getreadbuf, - (writebufferproc) bitarray_buffer_getwritebuf, - (segcountproc) bitarray_buffer_getsegcount, - (charbufferproc) bitarray_buffer_getcharbuf, -+#endif - (getbufferproc) bitarray_getbuffer, - (releasebufferproc) bitarray_releasebuffer, - }; -+ - #endif /* WITH_BUFFER */ -+ - /************************** Bitarray Type *******************************/ - - static PyTypeObject Bitarraytype = { -@@ -2898,7 +2906,7 @@ static PyTypeObject Bitarraytype = { - 0, /* tp_as_buffer */ - #endif - Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE | Py_TPFLAGS_HAVE_WEAKREFS --#ifdef WITH_BUFFER -+#if defined(WITH_BUFFER) && PY_MAJOR_VERSION == 2 - | Py_TPFLAGS_HAVE_NEWBUFFER - #endif - , /* tp_flags */ -diff --git a/bitarray/test_bitarray.py b/bitarray/test_bitarray.py -index 44de2f0..b72b554 100644 ---- a/bitarray/test_bitarray.py -+++ b/bitarray/test_bitarray.py -@@ -2113,10 +2113,10 @@ def test_read1(self): - a = bitarray('01000001' '01000010' '01000011', endian='big') - v = memoryview(a) - self.assertEqual(len(v), 3) -- self.assertEqual(v[0], 'A') -- self.assertEqual(v[:].tobytes(), 'ABC') -+ #self.assertEqual(v[0], 'A') -+ self.assertEqual(v[:].tobytes(), b'ABC') - a[13] = 1 -- self.assertEqual(v[:].tobytes(), 'AFC') -+ self.assertEqual(v[:].tobytes(), b'AFC') - - def test_read2(self): - a = bitarray([randint(0, 1) for d in range(8000)]) -@@ -2131,14 +2131,14 @@ def test_write(self): - a.setall(0) - v = memoryview(a) - self.assertFalse(v.readonly) -- v[50000] = '\xff' -+ v[50000] = 255 if is_py3k else '\xff' - self.assertEqual(a[399999:400009], bitarray('0111111110')) - a[400003] = 0 - self.assertEqual(a[399999:400009], bitarray('0111011110')) -- v[30001:30004] = 'ABC' -- self.assertEqual(a[240000:240040].tobytes(), '\x00ABC\x00') -+ v[30001:30004] = b'ABC' -+ self.assertEqual(a[240000:240040].tobytes(), b'\x00ABC\x00') - --if sys.version_info[:2] == (2, 7): -+if sys.version_info[:2] >= (2, 7): - tests.append(BufferInterfaceTests) - - # --------------------------------------------------------------------------- diff --git a/pkgs/development/python-modules/bitarray/default.nix b/pkgs/development/python-modules/bitarray/default.nix index c413303dd21d..78372598096f 100644 --- a/pkgs/development/python-modules/bitarray/default.nix +++ b/pkgs/development/python-modules/bitarray/default.nix @@ -1,17 +1,14 @@ { lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { - version = "0.8.3"; + version = "1.0.1"; pname = "bitarray"; src = fetchPypi { inherit pname version; - sha256 = "0pl9p4j3dhlyffsqra6h28q7jph6v3hgppg786lkmnqdh45x6305"; + sha256 = "3eb500f8b9cde19e14472fcbee0195dbf0fbac006f8406a03f0cfb495dff20a0"; }; - # Delete once https://github.com/ilanschnell/bitarray/pull/55 is merged - patches = [ ./0001-Buffer-Protocol-Py3.patch ]; - meta = with lib; { description = "Efficient arrays of booleans"; homepage = https://github.com/ilanschnell/bitarray; diff --git a/pkgs/development/python-modules/bitstruct/default.nix b/pkgs/development/python-modules/bitstruct/default.nix index 2bc4a5bbb616..3e546d386978 100644 --- a/pkgs/development/python-modules/bitstruct/default.nix +++ b/pkgs/development/python-modules/bitstruct/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "bitstruct"; - version = "6.0.0"; + version = "8.8.1"; src = fetchPypi { inherit pname version; - sha256 = "1znqgy2ikdqn6n6mv1ccfbl0q7x65bh3i9ph0yjl4rihwvxyg9fg"; + sha256 = "84893f90eb78f8179af24a87622ef964ede5c7e785562022917033987d6ce198"; }; meta = with lib; { diff --git a/pkgs/development/python-modules/boto/default.nix b/pkgs/development/python-modules/boto/default.nix index e58f071589a6..8452e05beccf 100644 --- a/pkgs/development/python-modules/boto/default.nix +++ b/pkgs/development/python-modules/boto/default.nix @@ -1,6 +1,7 @@ { pkgs , buildPythonPackage , fetchPypi +, isPy38 , python , nose , mock @@ -21,6 +22,7 @@ buildPythonPackage rec { ${python.interpreter} tests/test.py default ''; + doCheck = (!isPy38); # hmac functionality has changed checkInputs = [ nose mock ]; propagatedBuildInputs = [ requests httpretty ]; diff --git a/pkgs/development/python-modules/boto3/default.nix b/pkgs/development/python-modules/boto3/default.nix index cdaabec50f3a..724fc80f141f 100644 --- a/pkgs/development/python-modules/boto3/default.nix +++ b/pkgs/development/python-modules/boto3/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "boto3"; - version = "1.9.250"; # N.B: if you change this, change botocore too + version = "1.10.1"; # N.B: if you change this, change botocore too src = fetchPypi { inherit pname version; - sha256 = "95f70eda4bd6756e297a7c89739571cbc5cd474620142e5cbe19810529d6ec1f"; + sha256 = "2904bfb928116fea3a83247de6c3687eb9bf942d764e361f5574d5ac11be2ad3"; }; propagatedBuildInputs = [ botocore jmespath s3transfer ] ++ lib.optionals (!isPy3k) [ futures ]; diff --git a/pkgs/development/python-modules/botocore/default.nix b/pkgs/development/python-modules/botocore/default.nix index 03a4308c23e5..50504257c64e 100644 --- a/pkgs/development/python-modules/botocore/default.nix +++ b/pkgs/development/python-modules/botocore/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "botocore"; - version = "1.12.251"; # N.B: if you change this, change boto3 and awscli to a matching version + version = "1.13.2"; # N.B: if you change this, change boto3 and awscli to a matching version src = fetchPypi { inherit pname version; - sha256 = "887a57b3dcfb1d29ae11e504a486cd8dbe1af4f5678980a804dbf02b36d1c4f8"; + sha256 = "8223485841ef4731a5d4943a733295ba69d0005c4ae64c468308cc07f6960d39"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/python-modules/bpython/default.nix b/pkgs/development/python-modules/bpython/default.nix index c1d9a1a8f82f..a828b00822cb 100644 --- a/pkgs/development/python-modules/bpython/default.nix +++ b/pkgs/development/python-modules/bpython/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "bpython"; - version = "0.17.1"; + version = "0.18"; src = fetchPypi { inherit pname version; - sha256 = "8907c510bca3c4d9bc0a157279bdc5e3b739cc68c0f247167279b6fe4becb02f"; + sha256 = "56cc20dbe568c98c81de4990fddf5862c0d8d3ab0ad1cf7057988abc5f7686c2"; }; propagatedBuildInputs = [ curtsies greenlet pygments requests urwid ]; diff --git a/pkgs/development/python-modules/broadlink/default.nix b/pkgs/development/python-modules/broadlink/default.nix index 4633cb1ecfbf..af03e1ad6658 100644 --- a/pkgs/development/python-modules/broadlink/default.nix +++ b/pkgs/development/python-modules/broadlink/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "broadlink"; - version = "0.9"; + version = "0.12.0"; src = fetchPypi { inherit pname version; - sha256 = "10dnd859yjh1h6qrxhvkslbsj5fh5g654xsq2yqblkkv3xd711rs"; + sha256 = "6448327f8f1cd0c103971a724a3e60629ccb5e8c302e7fdcbde6464e8edef2d8"; }; postPatch = '' diff --git a/pkgs/development/python-modules/buildbot/default.nix b/pkgs/development/python-modules/buildbot/default.nix index 763362f6bd07..4e21b077b360 100644 --- a/pkgs/development/python-modules/buildbot/default.nix +++ b/pkgs/development/python-modules/buildbot/default.nix @@ -25,11 +25,11 @@ let package = buildPythonPackage rec { pname = "buildbot"; - version = "2.4.1"; + version = "2.5.0"; src = fetchPypi { inherit pname version; - sha256 = "0sqsp7ikmg5v48n1sy7l4913g906hyi1g9sikxd07n8vysp0ncx8"; + sha256 = "e4e6b2861c4f29ed5d84ca497ca7053ae1cc9b9a5387389c457ff9f7e651bf19"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/buildbot/pkg.nix b/pkgs/development/python-modules/buildbot/pkg.nix index 31723b9537d3..e1e5ac140bac 100644 --- a/pkgs/development/python-modules/buildbot/pkg.nix +++ b/pkgs/development/python-modules/buildbot/pkg.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "buildbot-pkg"; - version = "2.4.1"; + version = "2.5.0"; src = fetchPypi { inherit pname version; - sha256 = "0dfx3b6w9b326a0jrgc42a5ki84ya7bvx10pm62bfcby0mixhd4y"; + sha256 = "7c5b508c8c0d2fef5cdf4001c9f1e848f06fe8d6c30d8dff571a1a1fd251c9d7"; }; postPatch = '' diff --git a/pkgs/development/python-modules/buildbot/worker.nix b/pkgs/development/python-modules/buildbot/worker.nix index ceeb365d1e34..028a4009d222 100644 --- a/pkgs/development/python-modules/buildbot/worker.nix +++ b/pkgs/development/python-modules/buildbot/worker.nix @@ -3,11 +3,11 @@ buildPythonPackage (rec { pname = "buildbot-worker"; - version = "2.4.1"; + version = "2.5.0"; src = fetchPypi { inherit pname version; - sha256 = "1l2ax9ywrhgrs9f9yyhiq5nhcf34w916ikx6bjcd6f201ixky1xg"; + sha256 = "8330cf314064516648e78d2685b2eaae14fc9481351eb229f1392b38bdc18815"; }; propagatedBuildInputs = [ twisted future ]; diff --git a/pkgs/development/python-modules/cerberus11/default.nix b/pkgs/development/python-modules/cerberus11/default.nix index 614e3ca81350..81f6ef1e8371 100644 --- a/pkgs/development/python-modules/cerberus11/default.nix +++ b/pkgs/development/python-modules/cerberus11/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "Cerberus"; - version = "1.1"; + version = "1.3.1"; src = fetchPypi { inherit pname version; - sha256 = "1pxzr8sfm2hc5s96m9k044i44nwkva70n0ypr6a35v73zn891cx5"; + sha256 = "0be48fc0dc84f83202a5309c0aa17cd5393e70731a1698a50d118b762fbe6875"; }; checkInputs = [ pytestrunner pytest ]; diff --git a/pkgs/development/python-modules/cffi/default.nix b/pkgs/development/python-modules/cffi/default.nix index cfabeb16b593..6d8051616417 100644 --- a/pkgs/development/python-modules/cffi/default.nix +++ b/pkgs/development/python-modules/cffi/default.nix @@ -2,11 +2,11 @@ if isPyPy then null else buildPythonPackage rec { pname = "cffi"; - version = "1.12.3"; + version = "1.13.1"; src = fetchPypi { inherit pname version; - sha256 = "041c81822e9f84b1d9c401182e174996f0bae9991f33725d059b771744290774"; + sha256 = "558b3afef987cf4b17abd849e7bedf64ee12b28175d564d05b628a0f9355599b"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/python-modules/cfn-lint/default.nix b/pkgs/development/python-modules/cfn-lint/default.nix index d6205b27687d..15133257738a 100644 --- a/pkgs/development/python-modules/cfn-lint/default.nix +++ b/pkgs/development/python-modules/cfn-lint/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "cfn-lint"; - version = "0.19.1"; + version = "0.24.5"; src = fetchPypi { inherit pname version; - sha256 = "5a723ff791fc23aced78e9cde28f18f9eeae9a24f91db2b7a20f7aa837a613b3"; + sha256 = "1268c9730ba869f0f630eaf5bac34795553a97385d38eb91b9f7f5c3f73c8982"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/cftime/default.nix b/pkgs/development/python-modules/cftime/default.nix index d4f59d417714..5046017a94d3 100644 --- a/pkgs/development/python-modules/cftime/default.nix +++ b/pkgs/development/python-modules/cftime/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "cftime"; - version = "1.0.3.4"; + version = "1.0.4.2"; src = fetchPypi { inherit pname version; - sha256 = "0362dhxbzk593walyjz30dll6y2y79wialik647cbwdsf3ad0x6x"; + sha256 = "1ac64f8f9066ea756ea27d67cedaf064e7c866275218fa7c84684066a5890f70"; }; checkInputs = [ pytest coveralls pytestcov ]; diff --git a/pkgs/development/python-modules/chainer/default.nix b/pkgs/development/python-modules/chainer/default.nix index 42e24dedba29..52ba03461591 100644 --- a/pkgs/development/python-modules/chainer/default.nix +++ b/pkgs/development/python-modules/chainer/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "chainer"; - version = "5.2.0"; + version = "6.4.0"; src = fetchPypi { inherit pname version; - sha256 = "cc8390a7f445a14a1bc71d54de348be247158fe2813a5ef11c5046265001c8c4"; + sha256 = "dacbcaa361cebdfbf6f212d138570333611b8f5de553093b1752c578b022a774"; }; checkInputs = [ diff --git a/pkgs/development/python-modules/chalice/default.nix b/pkgs/development/python-modules/chalice/default.nix index 19aaf3368e5d..d354c5239496 100644 --- a/pkgs/development/python-modules/chalice/default.nix +++ b/pkgs/development/python-modules/chalice/default.nix @@ -19,11 +19,11 @@ buildPythonPackage rec { pname = "chalice"; - version = "1.7.0"; + version = "1.12.0"; src = fetchPypi { inherit pname version; - sha256 = "98a1237bf77f18761d8f964cb3c3b794e2d377a261b5e1640268608ec94336fa"; + sha256 = "f8f929f26df77285a202fb93174400230f8912c5b9c1fb061c7836a78413e325"; }; checkInputs = [ watchdog pytest hypothesis mock ]; diff --git a/pkgs/development/python-modules/channels/default.nix b/pkgs/development/python-modules/channels/default.nix index 0b06516bb5ce..9cdbd0dac114 100644 --- a/pkgs/development/python-modules/channels/default.nix +++ b/pkgs/development/python-modules/channels/default.nix @@ -3,11 +3,11 @@ }: buildPythonPackage rec { pname = "channels"; - version = "2.3.0"; + version = "2.3.1"; src = fetchPypi { inherit pname version; - sha256 = "0vd2ci1w5r4bhmhk349wclnc289lx14lpwp5k4910m63kywb8nap"; + sha256 = "6b8ebd93fe0041a23e31c9f4130d92fadb9c0040c0eb377a004540631325a31d"; }; # Files are missing in the distribution diff --git a/pkgs/development/python-modules/check-manifest/default.nix b/pkgs/development/python-modules/check-manifest/default.nix index 1feec7ed828d..ad5b65225336 100644 --- a/pkgs/development/python-modules/check-manifest/default.nix +++ b/pkgs/development/python-modules/check-manifest/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "check-manifest"; - version = "0.37"; + version = "0.40"; src = fetchPypi { inherit pname version; - sha256 = "44e3cf4b0833a55460046bf7a3600eaadbcae5e9d13baf0c9d9789dd5c2c6452"; + sha256 = "42de6eaab4ed149e60c9b367ada54f01a3b1e4d6846784f9b9710e770ff5572c"; }; doCheck = false; diff --git a/pkgs/development/python-modules/cheroot/default.nix b/pkgs/development/python-modules/cheroot/default.nix index 680cc9322767..2f86abd728fe 100644 --- a/pkgs/development/python-modules/cheroot/default.nix +++ b/pkgs/development/python-modules/cheroot/default.nix @@ -8,15 +8,13 @@ let inherit (stdenv) lib; in buildPythonPackage rec { pname = "cheroot"; - version = "6.5.8"; + version = "8.2.1"; src = fetchPypi { inherit pname version; - sha256 = "427e7e3ce51ad5a6e5cf953252b5782d5dfbeb544c09910634971bc06df6621b"; + sha256 = "5b525b3e4a755adf78070ab54c1821fb860d4255a9317dba2b88eb2df2441cff"; }; - patches = [ ./tests.patch ]; - nativeBuildInputs = [ setuptools_scm setuptools-scm-git-archive ]; propagatedBuildInputs = [ more-itertools six backports_functools_lru_cache ]; diff --git a/pkgs/development/python-modules/cheroot/tests.patch b/pkgs/development/python-modules/cheroot/tests.patch deleted file mode 100644 index 3de48a5a4684..000000000000 --- a/pkgs/development/python-modules/cheroot/tests.patch +++ /dev/null @@ -1,45 +0,0 @@ -diff --git a/cheroot/test/test_ssl.py b/cheroot/test/test_ssl.py -index fe8a0a0..92a77c1 100644 ---- a/cheroot/test/test_ssl.py -+++ b/cheroot/test/test_ssl.py -@@ -316,11 +316,9 @@ def test_tls_client_auth( - expected_ssl_errors = ( - requests.exceptions.SSLError, - OpenSSL.SSL.Error, -- ) if PY34 else ( -- requests.exceptions.SSLError, -+ requests.exceptions.ConnectionError, - ) -- if IS_WINDOWS: -- expected_ssl_errors += requests.exceptions.ConnectionError, -+ - with pytest.raises(expected_ssl_errors) as ssl_err: - make_https_request() - -@@ -335,7 +333,7 @@ def test_tls_client_auth( - except AttributeError: - if PY34: - pytest.xfail('OpenSSL behaves wierdly under Python 3.4') -- elif six.PY3 and IS_WINDOWS: -+ elif six.PY3: - err_text = str(ssl_err.value) - else: - raise -@@ -348,8 +346,7 @@ def test_tls_client_auth( - if IS_MACOS and IS_PYPY and adapter_type == 'pyopenssl': - expected_substrings = ('tlsv1 alert unknown ca', ) - if ( -- IS_WINDOWS -- and tls_verify_mode in ( -+ tls_verify_mode in ( - ssl.CERT_REQUIRED, - ssl.CERT_OPTIONAL, - ) -@@ -361,6 +358,7 @@ def test_tls_client_auth( - "SysCallError(10054, 'WSAECONNRESET')", - "('Connection aborted.', " - 'OSError("(10054, \'WSAECONNRESET\')"))', -+ 'OSError("(104, \'ECONNRESET\')"))', - ) - assert any(e in err_text for e in expected_substrings) - diff --git a/pkgs/development/python-modules/click-plugins/default.nix b/pkgs/development/python-modules/click-plugins/default.nix index a5124ac86134..8039d0cb4c7b 100644 --- a/pkgs/development/python-modules/click-plugins/default.nix +++ b/pkgs/development/python-modules/click-plugins/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "click-plugins"; - version = "1.0.4"; + version = "1.1.1"; src = fetchPypi { inherit pname version; - sha256 = "dfed74b5063546a137de99baaaf742b4de4337ad2b3e1df5ec7c8a256adc0847"; + sha256 = "46ab999744a9d831159c3411bb0c79346d94a444df9a3a3742e9ed63645f264b"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/cliff/default.nix b/pkgs/development/python-modules/cliff/default.nix index 3ba442d0d869..d8ecd2553e8c 100644 --- a/pkgs/development/python-modules/cliff/default.nix +++ b/pkgs/development/python-modules/cliff/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "cliff"; - version = "2.15.0"; + version = "2.16.0"; src = fetchPypi { inherit pname version; - sha256 = "fe044273539250a99a5b9915843902e40e4e9b32ac5698c1fae89e31200d649f"; + sha256 = "622e777b8ac2eb479708fe53893c37b2fd5469ce2c6c5b794a658246f05c6b81"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/clize/default.nix b/pkgs/development/python-modules/clize/default.nix index ef7047afe7dd..ce1ad60a5321 100644 --- a/pkgs/development/python-modules/clize/default.nix +++ b/pkgs/development/python-modules/clize/default.nix @@ -14,11 +14,11 @@ buildPythonPackage rec { pname = "clize"; - version = "4.0.3"; + version = "4.1.1"; src = fetchPypi { inherit pname version; - sha256 = "dbcfba5571dc30aaf90dc98fc279e2aab69d0f8f3665fc0394fbc10a87a2be60"; + sha256 = "f54dedcf6fea90a3e75c30cb65e0ab1e832760121f393b8d68edd711dbaf7187"; }; checkInputs = [ diff --git a/pkgs/development/python-modules/cloudpickle/default.nix b/pkgs/development/python-modules/cloudpickle/default.nix index 33d036ad8d42..a24fc0744089 100644 --- a/pkgs/development/python-modules/cloudpickle/default.nix +++ b/pkgs/development/python-modules/cloudpickle/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "cloudpickle"; - version = "0.8.1"; + version = "1.2.2"; src = fetchPypi { inherit pname version; - sha256 = "3ea6fd33b7521855a97819b3d645f92d51c8763d3ab5df35197cd8e96c19ba6f"; + sha256 = "922401d7140e133253ff5fab4faa4a1166416066453a783b00b507dca93f8859"; }; buildInputs = [ pytest mock ]; diff --git a/pkgs/development/python-modules/cogapp/default.nix b/pkgs/development/python-modules/cogapp/default.nix index b660ed022577..f894380fa49d 100644 --- a/pkgs/development/python-modules/cogapp/default.nix +++ b/pkgs/development/python-modules/cogapp/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "cogapp"; - version = "2.5.1"; + version = "3.0.0"; src = fetchPypi { inherit pname version; - sha256 = "f8cf2288fb5a2087eb4a00d8b347ddc86e9058d4ab26b8c868433eb401adfe1c"; + sha256 = "5e5da2bcfc4e4750c66cecb80ea4eaed1ef4fddd3787c989d4f5bfffb1152d6a"; }; # there are no tests diff --git a/pkgs/development/python-modules/configargparse/default.nix b/pkgs/development/python-modules/configargparse/default.nix index 7d53f56a5a0a..e6959a3304b1 100644 --- a/pkgs/development/python-modules/configargparse/default.nix +++ b/pkgs/development/python-modules/configargparse/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "ConfigArgParse"; - version = "0.14.0"; + version = "0.15.1"; src = fetchPypi { inherit pname version; - sha256 = "149fy4zya0rsnlkvxbbq43cyr8lscb5k4pj1m6n7f1grwcmzwbif"; + sha256 = "baaf0fd2c1c108d007f402dab5481ac5f12d77d034825bf5a27f8224757bd0ac"; }; # no tests in tarball diff --git a/pkgs/development/python-modules/configparser/default.nix b/pkgs/development/python-modules/configparser/default.nix index 8f06951165b6..4c05ec29359a 100644 --- a/pkgs/development/python-modules/configparser/default.nix +++ b/pkgs/development/python-modules/configparser/default.nix @@ -1,17 +1,19 @@ -{ stdenv, buildPythonPackage, fetchPypi }: +{ stdenv, buildPythonPackage, fetchPypi, setuptools_scm }: buildPythonPackage rec { pname = "configparser"; - version = "3.7.5"; + version = "4.0.2"; src = fetchPypi { inherit pname version; - sha256 = "9395033080372df999e206387b295946928e2886dd64c5fee7db7ff36c6c6f8e"; + sha256 = "c7d282687a5308319bf3d2e7706e575c635b0a470342641c93bea0ea3b5331df"; }; # No tests available doCheck = false; + nativeBuildInputs = [ setuptools_scm ]; + preConfigure = '' export LC_ALL=${if stdenv.isDarwin then "en_US" else "C"}.UTF-8 ''; diff --git a/pkgs/development/python-modules/contextlib2/default.nix b/pkgs/development/python-modules/contextlib2/default.nix index 46fcc378be9d..e23964f1a2b0 100644 --- a/pkgs/development/python-modules/contextlib2/default.nix +++ b/pkgs/development/python-modules/contextlib2/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "contextlib2"; - version = "0.5.5"; + version = "0.6.0.post1"; src = fetchPypi { inherit pname version; - sha256 = "509f9419ee91cdd00ba34443217d5ca51f5a364a404e1dce9e8979cea969ca48"; + sha256 = "01f490098c18b19d2bd5bb5dc445b2054d2fa97f09a4280ba2c5f3c394c8162e"; }; checkInputs = [ unittest2 ]; diff --git a/pkgs/development/python-modules/cornice/default.nix b/pkgs/development/python-modules/cornice/default.nix index 2b0c0665fa3f..d4210ade06e2 100644 --- a/pkgs/development/python-modules/cornice/default.nix +++ b/pkgs/development/python-modules/cornice/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "cornice"; - version = "3.5.1"; + version = "3.6.0"; src = fetchPypi { inherit pname version; - sha256 = "e95dceaee9ce16a09564c1226977a0fe62f1399701581b59c4188f5c91a86687"; + sha256 = "4dab97fe52d7075ecc87b8cadf549ca2c2c628512741193fb81a0c0433b46715"; }; propagatedBuildInputs = [ pyramid simplejson six venusian ]; diff --git a/pkgs/development/python-modules/coveralls/default.nix b/pkgs/development/python-modules/coveralls/default.nix index cda30943b0e4..aaa6192f2d50 100644 --- a/pkgs/development/python-modules/coveralls/default.nix +++ b/pkgs/development/python-modules/coveralls/default.nix @@ -16,12 +16,12 @@ buildPythonPackage rec { pname = "coveralls"; name = "${pname}-python-${version}"; - version = "1.5.1"; + version = "1.8.2"; # wanted by tests src = fetchPypi { inherit pname version; - sha256 = "ab638e88d38916a6cedbf80a9cd8992d5fa55c77ab755e262e00b36792b7cd6d"; + sha256 = "fb51cddef4bc458de347274116df15d641a735d3f0a580a9472174e2e62f408c"; }; checkInputs = [ diff --git a/pkgs/development/python-modules/crayons/default.nix b/pkgs/development/python-modules/crayons/default.nix index 16b3998eb856..97c33821547e 100644 --- a/pkgs/development/python-modules/crayons/default.nix +++ b/pkgs/development/python-modules/crayons/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "crayons"; - version = "0.1.2"; + version = "0.3.0"; src = fetchPypi { inherit pname version; - sha256 = "17c0v0dkk8sn8kyyy2w7myxq9981glrbczh6h8sdcr750lb6j5sy"; + sha256 = "50e5fa729d313e2c607ae8bf7b53bb487652e10bd8e7a1e08c4bc8bf62755ffc"; }; propagatedBuildInputs = [ colorama ]; diff --git a/pkgs/development/python-modules/cryptacular/default.nix b/pkgs/development/python-modules/cryptacular/default.nix index 02c1c420bfda..5ec1ccacae99 100644 --- a/pkgs/development/python-modules/cryptacular/default.nix +++ b/pkgs/development/python-modules/cryptacular/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "cryptacular"; - version = "1.4.1"; + version = "1.5.5"; src = fetchPypi { inherit pname version; - sha256 = "18fl7phl6r9xiwz8f1jpkahkv21wimmiq72gmrqncccv7z806gr7"; + sha256 = "fb4d48716e88e4d050255ff0f065f6d437caa358ceef16ba5840c95cece224f9"; }; buildInputs = [ coverage nose ]; diff --git a/pkgs/development/python-modules/cssselect/default.nix b/pkgs/development/python-modules/cssselect/default.nix index d086360b7d7c..00e6c0f7a627 100644 --- a/pkgs/development/python-modules/cssselect/default.nix +++ b/pkgs/development/python-modules/cssselect/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "cssselect"; - version = "1.0.3"; + version = "1.1.0"; src = fetchPypi { inherit pname version; - sha256 = "066d8bc5229af09617e24b3ca4d52f1f9092d9e061931f4184cd572885c23204"; + sha256 = "f95f8dedd925fd8f54edb3d2dfb44c190d9d18512377d3c1e2388d16126879bc"; }; # AttributeError: 'module' object has no attribute 'tests' diff --git a/pkgs/development/python-modules/dask-jobqueue/default.nix b/pkgs/development/python-modules/dask-jobqueue/default.nix index 94ecd10f45f2..f9af247bc802 100644 --- a/pkgs/development/python-modules/dask-jobqueue/default.nix +++ b/pkgs/development/python-modules/dask-jobqueue/default.nix @@ -8,12 +8,12 @@ }: buildPythonPackage rec { - version = "0.4.1"; + version = "0.7.0"; pname = "dask-jobqueue"; src = fetchPypi { inherit pname version; - sha256 = "e559077fd27b68c325f06e3666e7072913f5282ad62347a233ca95ae00a4ced7"; + sha256 = "660cd4cd052ada872fd6413f224a2d9221026dd55a8a29a9a7d52b262bec67e7"; }; checkInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/dask-ml/default.nix b/pkgs/development/python-modules/dask-ml/default.nix index 48a545789db8..e7e40f7777b5 100644 --- a/pkgs/development/python-modules/dask-ml/default.nix +++ b/pkgs/development/python-modules/dask-ml/default.nix @@ -19,12 +19,12 @@ }: buildPythonPackage rec { - version = "0.11.0"; + version = "1.0.0"; pname = "dask-ml"; src = fetchPypi { inherit pname version; - sha256 = "a9e8e69494560dc23534adb236e88b3b21dc30a156648453c9c6e4b27ff2df96"; + sha256 = "dde926478653bd03a3fbc501d3873a1534836608217b94d04320d1e1c07e59dc"; }; checkInputs = [ pytest xgboost tensorflow joblib distributed ]; diff --git a/pkgs/development/python-modules/dask-mpi/default.nix b/pkgs/development/python-modules/dask-mpi/default.nix index 0ae783c9865c..cd538afa15a2 100644 --- a/pkgs/development/python-modules/dask-mpi/default.nix +++ b/pkgs/development/python-modules/dask-mpi/default.nix @@ -9,12 +9,12 @@ }: buildPythonPackage rec { - version = "1.0.3"; + version = "2.0.0"; pname = "dask-mpi"; src = fetchPypi { inherit pname version; - sha256 = "e81ca2269eb96f928b2c308aa5eb687e114e5b470924ca8d480fe3bc1b599c6b"; + sha256 = "774cd2d69e5f7154e1fa133c22498062edd31507ffa2ea19f4ab4d8975c27bc3"; }; checkInputs = [ pytest requests ]; diff --git a/pkgs/development/python-modules/dask-xgboost/default.nix b/pkgs/development/python-modules/dask-xgboost/default.nix index 50ebaf6be4d2..d5f4de4efaa1 100644 --- a/pkgs/development/python-modules/dask-xgboost/default.nix +++ b/pkgs/development/python-modules/dask-xgboost/default.nix @@ -9,12 +9,12 @@ }: buildPythonPackage rec { - version = "0.1.7"; + version = "0.1.9"; pname = "dask-xgboost"; src = fetchPypi { inherit pname version; - sha256 = "c4eb7989e0b4bcab956c5ab5f89c3419016615ad1ca8f6596ca471e402aae43b"; + sha256 = "6faeeed044112151e28770b69fb1ad06b026597726ce8dc185fd3ae45363d0c0"; }; checkInputs = [ pytest scikitlearn ]; diff --git a/pkgs/development/python-modules/dataclasses/default.nix b/pkgs/development/python-modules/dataclasses/default.nix index 44d4d3b57694..a1159d49b812 100644 --- a/pkgs/development/python-modules/dataclasses/default.nix +++ b/pkgs/development/python-modules/dataclasses/default.nix @@ -2,14 +2,14 @@ buildPythonPackage rec { pname = "dataclasses"; - version = "0.6"; + version = "0.7"; # backport only works on Python 3.6, and is in the standard library in Python 3.7 disabled = !isPy36; src = fetchPypi { inherit pname version; - sha256 = "6988bd2b895eef432d562370bb707d540f32f7360ab13da45340101bc2307d84"; + sha256 = "494a6dcae3b8bcf80848eea2ef64c0cc5cd307ffc263e17cdf42f3e5420808e6"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/datadog/default.nix b/pkgs/development/python-modules/datadog/default.nix index fa0ac9dd7b45..53a33037d165 100644 --- a/pkgs/development/python-modules/datadog/default.nix +++ b/pkgs/development/python-modules/datadog/default.nix @@ -1,23 +1,26 @@ { lib, buildPythonPackage, fetchPypi -, decorator, requests, simplejson -, nose, mock }: +, decorator, requests, simplejson, pillow +, nose, mock, pytest }: buildPythonPackage rec { pname = "datadog"; - version = "0.29.3"; + version = "0.30.0"; src = fetchPypi { inherit pname version; - sha256 = "0p47hy1p2hf233blalyz0yr6nf13iwk9ndkqdk428dmf8b8m2plr"; + sha256 = "07c053e39c6509023d69bc2f3b8e3d5d101b4e75baf2da2b9fc707391c3e773d"; }; postPatch = '' find . -name '*.pyc' -exec rm {} \; ''; - propagatedBuildInputs = [ decorator requests simplejson ]; + propagatedBuildInputs = [ decorator requests simplejson pillow ]; - checkInputs = [ nose mock ]; + checkInputs = [ nose mock pytest ]; + checkPhase = '' + pytest tests/unit + ''; meta = with lib; { description = "The Datadog Python library"; diff --git a/pkgs/development/python-modules/datashader/default.nix b/pkgs/development/python-modules/datashader/default.nix index 8ce3012513c4..2039283771e6 100644 --- a/pkgs/development/python-modules/datashader/default.nix +++ b/pkgs/development/python-modules/datashader/default.nix @@ -29,11 +29,11 @@ buildPythonPackage rec { pname = "datashader"; - version = "0.7.0"; + version = "0.8.0"; src = fetchPypi { inherit pname version; - sha256 = "5baf218713dc1ad4791f7bcf606ef8f618273945e788c59f9573aebd7cb851f8"; + sha256 = "59ac9e3830167d07b350992402a9f547f26eca45cd69a0fb04061a4047e7ff2a"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/diff_cover/default.nix b/pkgs/development/python-modules/diff_cover/default.nix index 120a59670f8e..86a124d23553 100644 --- a/pkgs/development/python-modules/diff_cover/default.nix +++ b/pkgs/development/python-modules/diff_cover/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "diff_cover"; - version = "2.3.0"; + version = "2.4.0"; preCheck = '' export LC_ALL=en_US.UTF-8; @@ -25,7 +25,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "1kfv5icvnljh9c97i3fykh0zlba1zjz0rb3p9x06hdwh25n81915"; + sha256 = "a78babbec1c3088a6c3a5b62cddccaeac4717236ea4f5d28b6af00f2d9b2e341"; }; propagatedBuildInputs = [ jinja2 jinja2_pluralize pygments six inflect ]; diff --git a/pkgs/development/python-modules/discordpy/default.nix b/pkgs/development/python-modules/discordpy/default.nix index 41188a0de6e5..b25f0b121567 100644 --- a/pkgs/development/python-modules/discordpy/default.nix +++ b/pkgs/development/python-modules/discordpy/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "discord.py"; - version = "0.16.12"; + version = "1.2.4"; src = fetchPypi { inherit pname version; - sha256 = "17fb8814100fbaf7a79468baa432184db6cef3bbea4ad194fe297c7407d50108"; + sha256 = "3e044d84f0bb275d173e2d958cb4a579e525707f90e3e8a15c59901f79e80663"; }; propagatedBuildInputs = [ aiohttp websockets pynacl ]; diff --git a/pkgs/development/python-modules/diskcache/default.nix b/pkgs/development/python-modules/diskcache/default.nix index a62393b7bafc..f51e3329aee8 100644 --- a/pkgs/development/python-modules/diskcache/default.nix +++ b/pkgs/development/python-modules/diskcache/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "diskcache"; - version = "4.0.0"; + version = "4.1.0"; src = fetchPypi { inherit pname version; - sha256 = "7c20b58ed07d03bbfba793f823d1fc27a61e590371fe6011fa1319a25c028cd1"; + sha256 = "bcee5a59f9c264e2809e58d01be6569a3bbb1e36a1e0fb83f7ef9b2075f95ce0"; }; checkInputs = [ diff --git a/pkgs/development/python-modules/distributed/default.nix b/pkgs/development/python-modules/distributed/default.nix index b8383ec3daf5..4179499eaf37 100644 --- a/pkgs/development/python-modules/distributed/default.nix +++ b/pkgs/development/python-modules/distributed/default.nix @@ -28,12 +28,12 @@ buildPythonPackage rec { pname = "distributed"; - version = "2.4.0"; + version = "2.6.0"; # get full repository need conftest.py to run tests src = fetchPypi { inherit pname version; - sha256 = "1cz7n84g8dgx3cs28qnrh1sd6lka9lx8llysxa6mxyz6wf3ngl9h"; + sha256 = "30b0ca195ace1e39bdd278bf1ad257f7674b3e2b8e7a2a37ce7e2ade4aecccf3"; }; checkInputs = [ pytest pytest-repeat pytest-faulthandler pytest-timeout mock joblib ]; diff --git a/pkgs/development/python-modules/dj-email-url/default.nix b/pkgs/development/python-modules/dj-email-url/default.nix index c9e56017447e..de052b67ecf1 100644 --- a/pkgs/development/python-modules/dj-email-url/default.nix +++ b/pkgs/development/python-modules/dj-email-url/default.nix @@ -5,12 +5,12 @@ }: buildPythonPackage rec { - version = "0.1.0"; + version = "0.2.0"; pname = "dj-email-url"; src = fetchPypi { inherit pname version; - sha256 = "84f32673156f58d740a14cab09f04ca92a65b2c8881b60e31e09e67d7853e544"; + sha256 = "0362e390c17cc377f03bcbf6daf3f671797c929c1bf78a9f439d78f215ebe3fd"; }; checkPhase = '' diff --git a/pkgs/development/python-modules/django-raster/default.nix b/pkgs/development/python-modules/django-raster/default.nix index b5cb017956c4..dca1942f9d21 100644 --- a/pkgs/development/python-modules/django-raster/default.nix +++ b/pkgs/development/python-modules/django-raster/default.nix @@ -6,14 +6,14 @@ if stdenv.lib.versionOlder django.version "2.0" then throw "django-raster requires Django >= 2.0. Consider overiding the python package set to use django_2." else buildPythonPackage rec { - version = "0.6"; + version = "0.7"; pname = "django-raster"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "9a0f8e71ebeeeb5380c6ca68e027e9de335f43bc15e89dd22e7a470c4eb7aeb8"; + sha256 = "d23089d56f5f435c01a001af6f8ff7905636f87085b13035b4c5b3ace203d98a"; }; # Tests require a postgresql + postgis server diff --git a/pkgs/development/python-modules/django-sesame/default.nix b/pkgs/development/python-modules/django-sesame/default.nix index 68fa0dce6159..e7de9c824a1f 100644 --- a/pkgs/development/python-modules/django-sesame/default.nix +++ b/pkgs/development/python-modules/django-sesame/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "django-sesame"; - version = "1.4"; + version = "1.7"; src = fetchPypi { inherit pname version; - sha256 = "081q3vd9waiajiipg99flw0vlzk920sz07067v3n5774gx0qhbaa"; + sha256 = "e68bad4a6ef44322380f1f01d009f9d3cb55d1ffef0b669574b511db5ab0c6c0"; }; checkInputs = [ django ]; diff --git a/pkgs/development/python-modules/django_guardian/default.nix b/pkgs/development/python-modules/django_guardian/default.nix index 007d70ca8106..db11817186e0 100644 --- a/pkgs/development/python-modules/django_guardian/default.nix +++ b/pkgs/development/python-modules/django_guardian/default.nix @@ -4,11 +4,11 @@ }: buildPythonPackage rec { pname = "django-guardian"; - version = "1.5.1"; + version = "2.1.0"; src = fetchPypi { inherit pname version; - sha256 = "0fixr2g5amdgqzh0rvfvd7hbxyfd5ra3y3s0fsmp8i1b68p97930"; + sha256 = "8cf4efd67a863eb32beafd4335a38ffb083630f8ab2045212d27f8f9c3abe5a6"; }; checkInputs = [ pytest pytestrunner pytest-django django_environ mock ]; diff --git a/pkgs/development/python-modules/dogpile.cache/default.nix b/pkgs/development/python-modules/dogpile.cache/default.nix index b44597b8d13f..4ecd0731ecb3 100644 --- a/pkgs/development/python-modules/dogpile.cache/default.nix +++ b/pkgs/development/python-modules/dogpile.cache/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "dogpile.cache"; - version = "0.7.1"; + version = "0.8.0"; src = fetchPypi { inherit pname version; - sha256 = "691b7f199561c4bd6e7e96f164a43cc3781b0c87bea29b7d59d859f873fd4a31"; + sha256 = "70f5eae4aec908f76188a2c287e07105f60c05d879bb9a4efcc5ba44563d8de6"; }; # Disable concurrency tests that often fail, diff --git a/pkgs/development/python-modules/elasticsearch-curator/default.nix b/pkgs/development/python-modules/elasticsearch-curator/default.nix index e95d1aaba022..5c5329656a90 100644 --- a/pkgs/development/python-modules/elasticsearch-curator/default.nix +++ b/pkgs/development/python-modules/elasticsearch-curator/default.nix @@ -17,11 +17,11 @@ buildPythonPackage rec { pname = "elasticsearch-curator"; - version = "5.7.6"; + version = "5.8.1"; src = fetchPypi { inherit pname version; - sha256 = "0a6q7jcqwcqf8cv76lzldf90hnj2x8gha754x515dq10zsi9sjms"; + sha256 = "f0eec9ad043a30bc2e2232637111960139a1bda38232241bdd2f0c253a3584df"; }; # The test hangs so we disable it. diff --git a/pkgs/development/python-modules/elasticsearch-dsl/default.nix b/pkgs/development/python-modules/elasticsearch-dsl/default.nix index b906f94b4272..382a9965293b 100644 --- a/pkgs/development/python-modules/elasticsearch-dsl/default.nix +++ b/pkgs/development/python-modules/elasticsearch-dsl/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "elasticsearch-dsl"; - version = "7.0.0"; + version = "7.1.0"; src = fetchPypi { inherit pname version; - sha256 = "08kgpcf6lp8gjan6dvdx35340i4yqa77klapk8j7165svfjc5v9a"; + sha256 = "3f860e0304d703f63b458fea3782f09a823ab07da7ee84ae4bff1aa63e22aedb"; }; propagatedBuildInputs = [ elasticsearch python-dateutil six ] diff --git a/pkgs/development/python-modules/emcee/default.nix b/pkgs/development/python-modules/emcee/default.nix index 382dd5089153..210159800847 100644 --- a/pkgs/development/python-modules/emcee/default.nix +++ b/pkgs/development/python-modules/emcee/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "emcee"; - version = "2.2.1"; + version = "3.0.0"; src = fetchPypi { inherit pname version; - sha256 = "b83551e342b37311897906b3b8acf32979f4c5542e0a25786ada862d26241172"; + sha256 = "353c26d8a8b09553532cd93662ddbedcd1a77feecefda5e46ea7e38829dede89"; }; propagatedBuildInputs = [ numpy ]; diff --git a/pkgs/development/python-modules/evdev/default.nix b/pkgs/development/python-modules/evdev/default.nix index f44a9f222794..1711131be2d9 100644 --- a/pkgs/development/python-modules/evdev/default.nix +++ b/pkgs/development/python-modules/evdev/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "evdev"; - version = "1.1.2"; + version = "1.2.0"; src = fetchPypi { inherit pname version; - sha256 = "0l837gm9cjdp3lybnam38ip0q3n1xy0j6vzgx11hdrr0ps8p5mid"; + sha256 = "b03f5e1be5b4a5327494a981b831d251a142b09e8778eda1a8b53eba91100166"; }; buildInputs = [ linuxHeaders ]; diff --git a/pkgs/development/python-modules/eventlet/default.nix b/pkgs/development/python-modules/eventlet/default.nix index a72184f2c1ea..0436f3cbdb15 100644 --- a/pkgs/development/python-modules/eventlet/default.nix +++ b/pkgs/development/python-modules/eventlet/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "eventlet"; - version = "0.24.1"; + version = "0.25.1"; src = fetchPypi { inherit pname version; - sha256 = "d9d31a3c8dbcedbcce5859a919956d934685b17323fc80e1077cb344a2ffa68d"; + sha256 = "6c9c625af48424c4680d89314dbe45a76cc990cf002489f9469ff214b044ffc1"; }; checkInputs = [ nose ]; diff --git a/pkgs/development/python-modules/face/default.nix b/pkgs/development/python-modules/face/default.nix index 107259854976..948236b3f013 100644 --- a/pkgs/development/python-modules/face/default.nix +++ b/pkgs/development/python-modules/face/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "face"; - version = "0.1.0"; + version = "19.1.2"; src = fetchPypi { inherit pname version; - sha256 = "0zdp5qlrhxf4dypvvd0zr7zxj2svkz9wblp37vgw01wvcy9b1ds7"; + sha256 = "38c94ec17a4d6f9628f094b697faca0f802f4028071ce8cbdb3116d4cde772a3"; }; propagatedBuildInputs = [ boltons ]; diff --git a/pkgs/development/python-modules/fastapi/default.nix b/pkgs/development/python-modules/fastapi/default.nix index 89431d8b52f8..c90b64dca811 100644 --- a/pkgs/development/python-modules/fastapi/default.nix +++ b/pkgs/development/python-modules/fastapi/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "fastapi"; - version = "0.33.0"; + version = "0.42.0"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "1mc8ljfk6xyn2cq725s8hgapp62z5mylzw9akvkhwwz3bh8m5a7f"; + sha256 = "48cb522c1c993e238bfe272fbb18049cbd4bf5b9d6c0d4a4fa113cc790e8196c"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/favicon/default.nix b/pkgs/development/python-modules/favicon/default.nix index 019f4be91c82..16eac939e1ee 100644 --- a/pkgs/development/python-modules/favicon/default.nix +++ b/pkgs/development/python-modules/favicon/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "favicon"; - version = "0.5.1"; + version = "0.7.0"; src = fetchPypi { inherit pname version; - sha256 = "01jhb66nrqbf22z6ybpi8ndw6zifgysdmnh547027g96nz51669y"; + sha256 = "6d6b5a78de2a0d0084589f687f384b2ecd6a6527093fec564403b1a30605d7a8"; }; buildInputs = [ pytestrunner ]; diff --git a/pkgs/development/python-modules/filebytes/default.nix b/pkgs/development/python-modules/filebytes/default.nix index 7102e5d73c41..e3f638276c26 100644 --- a/pkgs/development/python-modules/filebytes/default.nix +++ b/pkgs/development/python-modules/filebytes/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "filebytes"; - version = "0.9.21"; + version = "0.10.0"; src = fetchPypi { inherit pname version; - sha256 = "09e306feafd435e240b6ca22e6319ce51862dbe99e3481368fc9a2d15d2263d5"; + sha256 = "97d1f1f4ba660d8df6c51beea36ea7185704307d54b0b5d72ce57415c9ece082"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/fiona/default.nix b/pkgs/development/python-modules/fiona/default.nix index f5977bf367c5..0a3e17abacaa 100644 --- a/pkgs/development/python-modules/fiona/default.nix +++ b/pkgs/development/python-modules/fiona/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "Fiona"; - version = "1.8.8"; + version = "1.8.9.post2"; src = fetchPypi { inherit pname version; - sha256 = "10qym4anwh0mgfgkhrz6cimkv7af3rd49290k497icq36bkkn73i"; + sha256 = "210fb038b579fab38f35ddbdd31b9725f4d5099b3edfd4b87c983e5d47b79983"; }; CXXFLAGS = lib.optionalString stdenv.cc.isClang "-std=c++11"; diff --git a/pkgs/development/python-modules/flake8-debugger/default.nix b/pkgs/development/python-modules/flake8-debugger/default.nix index 3935092fdaae..3a9647348eff 100644 --- a/pkgs/development/python-modules/flake8-debugger/default.nix +++ b/pkgs/development/python-modules/flake8-debugger/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "flake8-debugger"; - version = "3.1.1"; + version = "3.2.0"; src = fetchPypi { inherit pname version; - sha256 = "103d86d2ecb95f8aab90f90603446f4e2bb60e01f1593e4fec410074dedabac6"; + sha256 = "6e662f7e75a3ed729d3be7c92e72bde385ab08ec26e7808bf3dfc63445c87857"; }; nativeBuildInputs = [ pytestrunner ]; diff --git a/pkgs/development/python-modules/flask-limiter/default.nix b/pkgs/development/python-modules/flask-limiter/default.nix index a60c5a993ea3..01b340a2847c 100644 --- a/pkgs/development/python-modules/flask-limiter/default.nix +++ b/pkgs/development/python-modules/flask-limiter/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "Flask-Limiter"; - version = "1.0.1"; + version = "1.1.0"; src = fetchPypi { inherit pname version; - sha256 = "1f0diannnc6rc0ngsh222lws3qf89wxm0aschaxxvwjvybf9iklc"; + sha256 = "905c35cd87bf60c92fd87922ae23fe27aa5fb31980bab31fc00807adee9f5a55"; }; propagatedBuildInputs = [ flask limits ]; diff --git a/pkgs/development/python-modules/flask-paginate/default.nix b/pkgs/development/python-modules/flask-paginate/default.nix index 52dd77c83916..ba1c0b10d15a 100644 --- a/pkgs/development/python-modules/flask-paginate/default.nix +++ b/pkgs/development/python-modules/flask-paginate/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "flask-paginate"; - version = "0.5.3"; + version = "0.5.4"; src = fetchPypi { inherit pname version; - sha256 = "15plwkmi6i7p85q2vgyvmn0l4c2h7pj4mmiziwghyyqbd1rc0dr2"; + sha256 = "60079a1c4c600cb4d4a9f7c386ea357b5ee02355ae6d6e8b41f769ae3f7af3ad"; }; propagatedBuildInputs = [ flask ]; diff --git a/pkgs/development/python-modules/flask-socketio/default.nix b/pkgs/development/python-modules/flask-socketio/default.nix index b97fc2430be7..5ec462a45e0c 100644 --- a/pkgs/development/python-modules/flask-socketio/default.nix +++ b/pkgs/development/python-modules/flask-socketio/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "Flask-SocketIO"; - version = "3.2.2"; + version = "4.2.1"; src = fetchPypi { inherit pname version; - sha256 = "ee8e2954ec3ae0abf19f50fce5ec8b7b9ff937c5353c0a72c7e1cfb86df1195d"; + sha256 = "2172dff1e42415ba480cee02c30c2fc833671ff326f1598ee3d69aa02cf768ec"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/flask/default.nix b/pkgs/development/python-modules/flask/default.nix index bc7962d41081..a330b9dd8a62 100644 --- a/pkgs/development/python-modules/flask/default.nix +++ b/pkgs/development/python-modules/flask/default.nix @@ -2,12 +2,12 @@ , itsdangerous, click, werkzeug, jinja2, pytest }: buildPythonPackage rec { - version = "1.0.4"; + version = "1.1.1"; pname = "Flask"; src = fetchPypi { inherit pname version; - sha256 = "ed1330220a321138de53ec7c534c3d90cf2f7af938c7880fc3da13aa46bf870f"; + sha256 = "13f9f196f330c7c2c5d7a5cf91af894110ca0215ac051b5844701f2bfd934d52"; }; checkInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/flowlogs_reader/default.nix b/pkgs/development/python-modules/flowlogs_reader/default.nix index 96073556ea43..4064fc494b12 100644 --- a/pkgs/development/python-modules/flowlogs_reader/default.nix +++ b/pkgs/development/python-modules/flowlogs_reader/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "flowlogs_reader"; - version = "1.1.1"; + version = "2.0.0"; src = fetchPypi { inherit pname version; - sha256 = "cd6344fdad097c38756772624922ee37452ef1e131213c7d0b5702bcf52a5b02"; + sha256 = "256c67afabc1783e8a378c7589877f76660c6a645aa6dfe1759e26f4a93a22d0"; }; propagatedBuildInputs = [ botocore boto3 docutils ]; diff --git a/pkgs/development/python-modules/fluent-logger/default.nix b/pkgs/development/python-modules/fluent-logger/default.nix index 8af0bce82f3c..dab4ce30f6f9 100644 --- a/pkgs/development/python-modules/fluent-logger/default.nix +++ b/pkgs/development/python-modules/fluent-logger/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "fluent-logger"; - version = "0.9.3"; + version = "0.9.4"; src = fetchPypi { inherit pname version; - sha256 = "09vii0iclfq6vhz37xyybksq9m3538hkr7z40sz2dlpf2rkg98mg"; + sha256 = "814cb51892c620a00c5a6129fffaa09eeeb0c8822c9bcb4f96232ae3cbc4d8b3"; }; propagatedBuildInputs = [ msgpack ]; diff --git a/pkgs/development/python-modules/fonttools/default.nix b/pkgs/development/python-modules/fonttools/default.nix index 4e83955db55c..eb59eaa0f1cd 100644 --- a/pkgs/development/python-modules/fonttools/default.nix +++ b/pkgs/development/python-modules/fonttools/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "fonttools"; - version = "3.42.0"; + version = "4.0.2"; src = fetchPypi { inherit pname version; - sha256 = "0w0ncs61821bnc2smfllnhfw5b8fwz972yqcgb64lr5qiwxkj2y0"; + sha256 = "bb9bf6b5b4ded33e0d9f823e5ae2e1fa643af4d614915660abe3853a9a6931cd"; extension = "zip"; }; diff --git a/pkgs/development/python-modules/fritzconnection/default.nix b/pkgs/development/python-modules/fritzconnection/default.nix index ced7d7bdcd4a..32e9e9393ce6 100644 --- a/pkgs/development/python-modules/fritzconnection/default.nix +++ b/pkgs/development/python-modules/fritzconnection/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "fritzconnection"; - version = "0.6.5"; + version = "0.8.4"; src = fetchPypi { inherit pname version; - sha256 = "14g3sxprq65lxbgkf3rjgb1bjqnj2jc5p1swlq9sk9gwnl6ca3ds"; + sha256 = "adc629a48b50700f5478f69436e4b78c8792a9260cc674cccef15ffe68eb0643"; }; prePatch = '' diff --git a/pkgs/development/python-modules/fs/default.nix b/pkgs/development/python-modules/fs/default.nix index 8cb35c23bb59..fee20021e1a4 100644 --- a/pkgs/development/python-modules/fs/default.nix +++ b/pkgs/development/python-modules/fs/default.nix @@ -15,6 +15,7 @@ , mock , pythonAtLeast , isPy3k +, pytest }: buildPythonPackage rec { @@ -27,7 +28,7 @@ buildPythonPackage rec { }; buildInputs = [ glibcLocales ]; - checkInputs = [ nose pyftpdlib mock psutil ]; + checkInputs = [ nose pyftpdlib mock psutil pytest ]; propagatedBuildInputs = [ six appdirs pytz ] ++ lib.optionals (!isPy3k) [ backports_os ] ++ lib.optionals (!pythonAtLeast "3.6") [ typing ] @@ -37,7 +38,7 @@ buildPythonPackage rec { LC_ALL="en_US.utf-8"; checkPhase = '' - HOME=$(mktemp -d) nosetests tests [] + HOME=$(mktemp -d) pytest -k 'not user_data_repr' --ignore=tests/test_opener.py ''; meta = with lib; { diff --git a/pkgs/development/python-modules/fsspec/default.nix b/pkgs/development/python-modules/fsspec/default.nix index 5592150eae63..a94f847fc908 100644 --- a/pkgs/development/python-modules/fsspec/default.nix +++ b/pkgs/development/python-modules/fsspec/default.nix @@ -6,13 +6,13 @@ buildPythonPackage rec { pname = "fsspec"; - version = "0.4.5"; + version = "0.5.2"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "824e406f5628cfde927ac945acf4ff70bc712b8bd204d7b99fe127993254db70"; + sha256 = "6531a5fa9ea6bf27a5180d225558a8a7aa5d7c3cbf7e8b146dd37ac699017937"; }; # no tests diff --git a/pkgs/development/python-modules/fuse-python/default.nix b/pkgs/development/python-modules/fuse-python/default.nix index cf965dd244fc..0ac33be3899d 100644 --- a/pkgs/development/python-modules/fuse-python/default.nix +++ b/pkgs/development/python-modules/fuse-python/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "fuse-python"; - version = "0.3.1"; + version = "1.0.0"; src = fetchPypi { inherit pname version; - sha256 = "0p1f01gah1y8skirrwsbxapz3g6drqihnkjh27b45ifg43h45g7x"; + sha256 = "cbaa21c8f0a440302d1ba9fd57a80cf9ff227e5a3820708a8ba8450db883cc05"; }; buildInputs = [ fuse ]; diff --git a/pkgs/development/python-modules/future/default.nix b/pkgs/development/python-modules/future/default.nix index ecaa1c08b2c2..b74d4cddf6da 100644 --- a/pkgs/development/python-modules/future/default.nix +++ b/pkgs/development/python-modules/future/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "future"; - version = "0.17.1"; + version = "0.18.1"; src = fetchPypi { inherit pname version; - sha256 = "67045236dcfd6816dc439556d009594abf643e5eb48992e36beac09c2ca659b8"; + sha256 = "858e38522e8fd0d3ce8f0c1feaf0603358e366d5403209674c7b617fa0c24093"; }; doCheck = false; diff --git a/pkgs/development/python-modules/futures/default.nix b/pkgs/development/python-modules/futures/default.nix index e7397950643f..bc19a31927af 100644 --- a/pkgs/development/python-modules/futures/default.nix +++ b/pkgs/development/python-modules/futures/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "futures"; - version = "3.2.0"; + version = "3.3.0"; src = fetchPypi { inherit pname version; - sha256 = "9ec02aa7d674acb8618afb127e27fde7fc68994c0437ad759fa094a574adb265"; + sha256 = "7e033af76a5e35f58e56da7a91e687706faf4e7bdfb2cbc3f2cca6b9bcda9794"; }; # This module is for backporting functionality to Python 2.x, it's builtin in py3k diff --git a/pkgs/development/python-modules/gast/default.nix b/pkgs/development/python-modules/gast/default.nix index a85f78dccb28..b0f90f7ce176 100644 --- a/pkgs/development/python-modules/gast/default.nix +++ b/pkgs/development/python-modules/gast/default.nix @@ -2,10 +2,10 @@ buildPythonPackage rec { pname = "gast"; - version = "0.2.2"; + version = "0.3.2"; src = fetchPypi { inherit pname version; - sha256 = "1w5dzdb3gpcfmd2s0b93d8gff40a1s41rv31458z14inb3s9v4zy"; + sha256 = "5c7617f1f6c8b8b426819642b16b9016727ddaecd16af9a07753e537eba8a3a5"; }; checkInputs = [ astunparse ] ; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/genanki/default.nix b/pkgs/development/python-modules/genanki/default.nix index a39d3e58733e..f4f3821afa31 100644 --- a/pkgs/development/python-modules/genanki/default.nix +++ b/pkgs/development/python-modules/genanki/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "genanki"; - version = "0.6.4"; + version = "0.7.0"; src = fetchPypi { inherit pname version; - sha256 = "6d17761e06aca2d9acb588acfdce33fd3d05571338825760622c99fc7210f15a"; + sha256 = "32ee8063b1d3b5cd95c117c5a4aa812940e3d3c0daa3d535cd6633c1025a59bc"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/gin-config/default.nix b/pkgs/development/python-modules/gin-config/default.nix index 8701751e3a0b..5e8343a4b0c3 100644 --- a/pkgs/development/python-modules/gin-config/default.nix +++ b/pkgs/development/python-modules/gin-config/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "gin-config"; - version = "0.1.3"; + version = "0.2.1"; src = fetchPypi { inherit pname version; - sha256 = "07843fde2917f1a44f808fceb3c0227bb02ff7c4ebba8de6642206c03e7e8ba2"; + sha256 = "6305325d5afe470fa5a7130883035e51950478b317750205a1532e5413d4ba4c"; }; diff --git a/pkgs/development/python-modules/glom/default.nix b/pkgs/development/python-modules/glom/default.nix index ac193e61dcbd..2a89fb262ff2 100644 --- a/pkgs/development/python-modules/glom/default.nix +++ b/pkgs/development/python-modules/glom/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "glom"; - version = "19.1.0"; + version = "19.2.0"; src = fetchPypi { inherit pname version; - sha256 = "5c47dc6dc97bb1c20e5607f3d58eac81e13b16880a284b52d503eea92d7b5fc2"; + sha256 = "c277f34e5e498834a63c2114a25a6c67b5cf0b92f96bb65cba063d861c3d1da6"; }; propagatedBuildInputs = [ boltons attrs face ]; diff --git a/pkgs/development/python-modules/goocalendar/default.nix b/pkgs/development/python-modules/goocalendar/default.nix index e746b304e8b5..644b68386fe2 100644 --- a/pkgs/development/python-modules/goocalendar/default.nix +++ b/pkgs/development/python-modules/goocalendar/default.nix @@ -14,13 +14,13 @@ with stdenv.lib; buildPythonPackage rec { pname = "GooCalendar"; - version = "0.4"; + version = "0.6"; disabled = isPy3k; src = fetchPypi { inherit pname version; - sha256 = "ca3950c2728916d9fb703c886f3940ac9b76739f99ec840b0e1c2c282510e1ab"; + sha256 = "4c22c93e19b933d10d8ea1c67a67f485267af82175ef59419427dd39d1e3af18"; }; nativeBuildInputs = [ pkgconfig gobject-introspection ]; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-music-proto/default.nix b/pkgs/development/python-modules/google-music-proto/default.nix index 6a882e29c194..d3f41880784d 100644 --- a/pkgs/development/python-modules/google-music-proto/default.nix +++ b/pkgs/development/python-modules/google-music-proto/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "google-music-proto"; - version = "2.4.0"; + version = "2.5.1"; src = fetchPypi { inherit pname version; - sha256 = "798ac14408593525d1865f608b30f71cce291b1a239f4d63f14bb4dcf79d7528"; + sha256 = "94cd205b3cb0d9e36f3724ace259d4c6de04db97e095577a26a5cfa5e35844c6"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-music/default.nix b/pkgs/development/python-modules/google-music/default.nix index 71aa37d00866..94fe6d5e0a14 100644 --- a/pkgs/development/python-modules/google-music/default.nix +++ b/pkgs/development/python-modules/google-music/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "google-music"; - version = "3.0.1"; + version = "3.1.0"; src = fetchPypi { inherit pname version; - sha256 = "13i9nd62wqfg0f5r7ykr15q83397vdpw0js50fy5nbgs33sbf6b7"; + sha256 = "5c6cb11d56dfe2cfb95f3083ed4c1347dafbf15a88fc9a7aab3ed5ee4c75cc40"; }; postPatch = '' diff --git a/pkgs/development/python-modules/google_api_core/default.nix b/pkgs/development/python-modules/google_api_core/default.nix index 091ab1c15e5b..3a6b49e4e9ff 100644 --- a/pkgs/development/python-modules/google_api_core/default.nix +++ b/pkgs/development/python-modules/google_api_core/default.nix @@ -1,25 +1,30 @@ { lib, buildPythonPackage, fetchPypi, pythonOlder, isPy27 -, google_auth, protobuf, googleapis_common_protos, requests, setuptools, grpcio, futures, mock, pytest }: +, google_auth, protobuf, googleapis_common_protos, requests, setuptools, grpcio, futures, mock }: buildPythonPackage rec { pname = "google-api-core"; - version = "1.7.0"; + version = "1.14.3"; disabled = isPy27; # google namespace no longer works on python2 src = fetchPypi { inherit pname version; - sha256 = "85693e163a1a6faea69a74f8feaf35d54dfa2559fbdbbe389c93ffb3bb4c9a79"; + sha256 = "df8adc4b97f5ab4328a0e745bee77877cf4a7d4601cb1cd5959d2bbf8fba57aa"; }; propagatedBuildInputs = [ googleapis_common_protos protobuf google_auth requests setuptools grpcio ] ++ lib.optional (pythonOlder "3.2") futures; - checkInputs = [ mock pytest ]; - checkPhase = '' - py.test - ''; + # requires nox + doCheck = false; + checkInputs = [ mock ]; + + pythonImportsCheck = [ + "google.auth" + "google.protobuf" + "google.api" + ]; meta = with lib; { description = "This library is not meant to stand-alone. Instead it defines common helpers used by all Google API clients."; diff --git a/pkgs/development/python-modules/google_cloud_asset/default.nix b/pkgs/development/python-modules/google_cloud_asset/default.nix index 90c8e752d412..e73f1e866133 100644 --- a/pkgs/development/python-modules/google_cloud_asset/default.nix +++ b/pkgs/development/python-modules/google_cloud_asset/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "google-cloud-asset"; - version = "0.1.2"; + version = "0.4.1"; src = fetchPypi { inherit pname version; - sha256 = "233157c5d902a084477fb5fe6ca1f946d6fe7911577d4a36aee0227777db61b7"; + sha256 = "e6c02a6709d13490c73450f3b1ac3436bd26795fa04d9711d7cad973a71eb118"; }; checkInputs = [ pytest mock ]; diff --git a/pkgs/development/python-modules/google_cloud_automl/default.nix b/pkgs/development/python-modules/google_cloud_automl/default.nix index 7f605d73c97a..b317d0cd1546 100644 --- a/pkgs/development/python-modules/google_cloud_automl/default.nix +++ b/pkgs/development/python-modules/google_cloud_automl/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "google-cloud-automl"; - version = "0.1.2"; + version = "0.7.0"; src = fetchPypi { inherit pname version; - sha256 = "32890d1e043eb09a86ff1839096dfb49051cd436bdf1a1708299484cfd06db1a"; + sha256 = "532cee03a976eedf308c178484b61f80bc4c68991b3bd8eb8f6abd000a217ef7"; }; checkInputs = [ pytest mock ]; diff --git a/pkgs/development/python-modules/google_cloud_bigquery/default.nix b/pkgs/development/python-modules/google_cloud_bigquery/default.nix index 21a6013ccf3e..f81663b407db 100644 --- a/pkgs/development/python-modules/google_cloud_bigquery/default.nix +++ b/pkgs/development/python-modules/google_cloud_bigquery/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "google-cloud-bigquery"; - version = "1.9.1"; + version = "1.21.0"; src = fetchPypi { inherit pname version; - sha256 = "aacba434c54b1ecc83527d6fa06ffc0938a7af109e292ed1f2cfd56d567a0a29"; + sha256 = "b38d5669235583ee4334d468b3719ea4a381da4b2abbedbf13cb926d893a11ab"; }; checkInputs = [ pytest mock ipython ]; diff --git a/pkgs/development/python-modules/google_cloud_bigquery_datatransfer/default.nix b/pkgs/development/python-modules/google_cloud_bigquery_datatransfer/default.nix index 23f08f3bbef0..3da3fbfdf855 100644 --- a/pkgs/development/python-modules/google_cloud_bigquery_datatransfer/default.nix +++ b/pkgs/development/python-modules/google_cloud_bigquery_datatransfer/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "google-cloud-bigquery-datatransfer"; - version = "0.3.0"; + version = "0.4.1"; src = fetchPypi { inherit pname version; - sha256 = "02bf1a508ffbc730904fd8a5e7d7c33946f0aa539127c1b1e235dfdedd7bc9a5"; + sha256 = "9ef431c0747d92dd5d5d4038aab96215dfd20c59235ece99a96d8329792cbcdb"; }; checkInputs = [ pytest mock ]; diff --git a/pkgs/development/python-modules/google_cloud_bigtable/default.nix b/pkgs/development/python-modules/google_cloud_bigtable/default.nix index 51782dce167a..3dae6bfdadcc 100644 --- a/pkgs/development/python-modules/google_cloud_bigtable/default.nix +++ b/pkgs/development/python-modules/google_cloud_bigtable/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "google-cloud-bigtable"; - version = "0.32.2"; + version = "1.1.0"; src = fetchPypi { inherit pname version; - sha256 = "40d1fc8009c228f70bd0e2176e73a3f101051ad73889b3d25a5df672c029a8bd"; + sha256 = "5bfa5db942ddb491a62198e690754dbed80228e5cb2c389d809be33464f6cb31"; }; checkInputs = [ pytest mock ]; diff --git a/pkgs/development/python-modules/google_cloud_container/default.nix b/pkgs/development/python-modules/google_cloud_container/default.nix index f0a47d7c30ff..d0994ce5e0bf 100644 --- a/pkgs/development/python-modules/google_cloud_container/default.nix +++ b/pkgs/development/python-modules/google_cloud_container/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "google-cloud-container"; - version = "0.2.1"; + version = "0.3.0"; src = fetchPypi { inherit pname version; - sha256 = "566834ef43e79917b112e3bd2848e84cfb0f4d7b565581607e2548f5c8e5d87a"; + sha256 = "90cceceb487f1f4f2336b3674d594bc5e492fadbe27a5f06ca056d7148fd90ba"; }; checkInputs = [ pytest mock ]; diff --git a/pkgs/development/python-modules/google_cloud_core/default.nix b/pkgs/development/python-modules/google_cloud_core/default.nix index 3aafa3e26876..0b0914b14806 100644 --- a/pkgs/development/python-modules/google_cloud_core/default.nix +++ b/pkgs/development/python-modules/google_cloud_core/default.nix @@ -1,20 +1,21 @@ -{ stdenv, buildPythonPackage, fetchPypi +{ stdenv, buildPythonPackage, fetchPypi, python , google_api_core, grpcio, pytest, mock, setuptools }: buildPythonPackage rec { pname = "google-cloud-core"; - version = "0.29.1"; + version = "1.0.3"; src = fetchPypi { inherit pname version; - sha256 = "d85b1aaaf3bad9415ad1d8ee5eadce96d7007a82f13ce0a0629a003a11e83f29"; + sha256 = "10750207c1a9ad6f6e082d91dbff3920443bdaf1c344a782730489a9efa802f1"; }; propagatedBuildInputs = [ google_api_core grpcio setuptools ]; checkInputs = [ pytest mock ]; checkPhase = '' - py.test + cd tests + ${python.interpreter} -m unittest discover ''; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/google_cloud_dataproc/default.nix b/pkgs/development/python-modules/google_cloud_dataproc/default.nix index 9475c792fb90..a08a1c4fd107 100644 --- a/pkgs/development/python-modules/google_cloud_dataproc/default.nix +++ b/pkgs/development/python-modules/google_cloud_dataproc/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "google-cloud-dataproc"; - version = "0.3.1"; + version = "0.5.0"; src = fetchPypi { inherit pname version; - sha256 = "e6a6c380757e22e9a45cf5b261be6d6a4262f87ee172a6c21f6f7ad6013827cd"; + sha256 = "24c28e9383e714b1447e5b4a2282beda2c94714e78cbb6cfc5f8ccbfcfdb3ffa"; }; checkInputs = [ pytest mock ]; diff --git a/pkgs/development/python-modules/google_cloud_datastore/default.nix b/pkgs/development/python-modules/google_cloud_datastore/default.nix index f514d22ef081..7f47725cde35 100644 --- a/pkgs/development/python-modules/google_cloud_datastore/default.nix +++ b/pkgs/development/python-modules/google_cloud_datastore/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "google-cloud-datastore"; - version = "1.7.4"; + version = "1.10.0"; src = fetchPypi { inherit pname version; - sha256 = "7a44d9b0263cbbe05963522f61ba177e64282043f30999e0bc3368fd79a3af12"; + sha256 = "cae213e3817f37fdc3ac27c3a162024de3319ad0faf87a536fce375c4a1c1dc9"; }; checkInputs = [ pytest mock ]; diff --git a/pkgs/development/python-modules/google_cloud_dlp/default.nix b/pkgs/development/python-modules/google_cloud_dlp/default.nix index 0f46ff36a39f..6c7388b4cf17 100644 --- a/pkgs/development/python-modules/google_cloud_dlp/default.nix +++ b/pkgs/development/python-modules/google_cloud_dlp/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "google-cloud-dlp"; - version = "0.10.0"; + version = "0.12.1"; src = fetchPypi { inherit pname version; - sha256 = "5cc7e40842b6c3dc586d04e3d2b2326b44afbe3896da6a30032d64650a7c6b00"; + sha256 = "acf2b1f8388b0baf3286bd2a67e3adad70a28d0fa768fd2196a96710637c4b72"; }; checkInputs = [ pytest mock ]; diff --git a/pkgs/development/python-modules/google_cloud_dns/default.nix b/pkgs/development/python-modules/google_cloud_dns/default.nix index 398c2b664677..3ed34303a727 100644 --- a/pkgs/development/python-modules/google_cloud_dns/default.nix +++ b/pkgs/development/python-modules/google_cloud_dns/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "google-cloud-dns"; - version = "0.29.3"; + version = "0.31.0"; src = fetchPypi { inherit pname version; - sha256 = "a876811e44554fb8a8db4df4a2be649f356e1d9d97eefccfaf5a8d5273819d22"; + sha256 = "0dc0244c96378615b19679ab001a85fe74b564233d4f3e185a0f8fe333530fe2"; }; checkInputs = [ pytest mock ]; diff --git a/pkgs/development/python-modules/google_cloud_error_reporting/default.nix b/pkgs/development/python-modules/google_cloud_error_reporting/default.nix index d6f89aefc5fa..ef07bf1a3cec 100644 --- a/pkgs/development/python-modules/google_cloud_error_reporting/default.nix +++ b/pkgs/development/python-modules/google_cloud_error_reporting/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "google-cloud-error-reporting"; - version = "0.30.1"; + version = "0.33.0"; src = fetchPypi { inherit pname version; - sha256 = "29d04cb6cc2053468addb78351b841df00cb56066e89b6aec0970cb003dd2fab"; + sha256 = "845c4d7252f21403a5634a4047c3d77a645df92f6724911a5faf6f5e1bba51fd"; }; checkInputs = [ pytest mock ]; diff --git a/pkgs/development/python-modules/google_cloud_firestore/default.nix b/pkgs/development/python-modules/google_cloud_firestore/default.nix index 98778ddf3215..697e2b2d7c92 100644 --- a/pkgs/development/python-modules/google_cloud_firestore/default.nix +++ b/pkgs/development/python-modules/google_cloud_firestore/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "google-cloud-firestore"; - version = "0.31.0"; + version = "1.5.0"; src = fetchPypi { inherit pname version; - sha256 = "5349d1a112dc8ff1b96d400a04ab18949503b542c72f526847e2066eef6cbc25"; + sha256 = "201fa86bbc76cf7ccbfac293bb7ed2dfba9bb9e5244b2785f619d083a8b2b51d"; }; checkInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/google_cloud_iot/default.nix b/pkgs/development/python-modules/google_cloud_iot/default.nix index 1e103ab14250..6f6cd3262f89 100644 --- a/pkgs/development/python-modules/google_cloud_iot/default.nix +++ b/pkgs/development/python-modules/google_cloud_iot/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "google-cloud-iot"; - version = "0.2.0"; + version = "0.3.0"; src = fetchPypi { inherit pname version; - sha256 = "b274fb5d38cfaa556a07943d9c9a23ca4aa3ecca51135a70325e1c95fa699474"; + sha256 = "6ead560b0701cf1fe11fe15fae68f09460f0d04fbafa0965fb6bd9e60775437c"; }; checkInputs = [ pytest mock ]; diff --git a/pkgs/development/python-modules/google_cloud_kms/default.nix b/pkgs/development/python-modules/google_cloud_kms/default.nix index 383ed1bdbb90..e3e9ed58eba6 100644 --- a/pkgs/development/python-modules/google_cloud_kms/default.nix +++ b/pkgs/development/python-modules/google_cloud_kms/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "google-cloud-kms"; - version = "1.1.0"; + version = "1.2.1"; src = fetchPypi { inherit pname version; - sha256 = "0ypn95swjj93kvdcrvmijmh3vzpr499a3krk923a86m8vlcwcvjm"; + sha256 = "bb2cf9bff554df05f32c9a51cc50cdd0d6fbabcdc20526460df5306ea28547ff"; }; checkInputs = [ pytest mock ]; diff --git a/pkgs/development/python-modules/google_cloud_language/default.nix b/pkgs/development/python-modules/google_cloud_language/default.nix index c48c0c7b16ce..44a3456607db 100644 --- a/pkgs/development/python-modules/google_cloud_language/default.nix +++ b/pkgs/development/python-modules/google_cloud_language/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "google-cloud-language"; - version = "1.1.1"; + version = "1.3.0"; src = fetchPypi { inherit pname version; - sha256 = "e4742b98e2d69ca21864e3218805a9db7e04e06f0672f2385cf6b5361ee35605"; + sha256 = "2772badf8fe8ac57cd7e7840a60764603b3e19e6dbd843460a5ae8915798b32f"; }; checkInputs = [ pytest mock ]; diff --git a/pkgs/development/python-modules/google_cloud_logging/default.nix b/pkgs/development/python-modules/google_cloud_logging/default.nix index 5dc45ad469db..c4d9a1cb8d55 100644 --- a/pkgs/development/python-modules/google_cloud_logging/default.nix +++ b/pkgs/development/python-modules/google_cloud_logging/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "google-cloud-logging"; - version = "1.10.1"; + version = "1.14.0"; src = fetchPypi { inherit pname version; - sha256 = "a70201ca9f3972ff0e3272c5628b22ed9227e10ac00e570c28087377733632df"; + sha256 = "3c12d4421df8e4e77b5e029b1341ae80d180cfda0f9cbef417f36438630cc35f"; }; checkInputs = [ pytest mock webapp2 django flask ]; diff --git a/pkgs/development/python-modules/google_cloud_monitoring/default.nix b/pkgs/development/python-modules/google_cloud_monitoring/default.nix index da5f06da82a5..5bc612ad188a 100644 --- a/pkgs/development/python-modules/google_cloud_monitoring/default.nix +++ b/pkgs/development/python-modules/google_cloud_monitoring/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "google-cloud-monitoring"; - version = "0.31.1"; + version = "0.33.0"; src = fetchPypi { inherit pname version; - sha256 = "ac0a7657a11459894abf35d3e35e804df0fb81ef35bc18f80199d4ce02440c2d"; + sha256 = "cba63744faeea3b0167a752268955df127736e453820f01cc24e97bf4ae83c24"; }; checkInputs = [ pytest mock ]; diff --git a/pkgs/development/python-modules/google_cloud_pubsub/default.nix b/pkgs/development/python-modules/google_cloud_pubsub/default.nix index 774d494e71aa..8860578b2072 100644 --- a/pkgs/development/python-modules/google_cloud_pubsub/default.nix +++ b/pkgs/development/python-modules/google_cloud_pubsub/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "google-cloud-pubsub"; - version = "0.39.1"; + version = "1.0.2"; src = fetchPypi { inherit pname version; - sha256 = "4186386aec02752e982eeb1e399d76f1cf70eed56312934df04bfa68d8cfabf0"; + sha256 = "afb08eb558f3e4d836e6f77443f81555d6921ffc888c7c3085acd1205fba6e8c"; }; checkInputs = [ pytest mock ]; diff --git a/pkgs/development/python-modules/google_cloud_redis/default.nix b/pkgs/development/python-modules/google_cloud_redis/default.nix index 4b574b859237..1eb2b9e08e97 100644 --- a/pkgs/development/python-modules/google_cloud_redis/default.nix +++ b/pkgs/development/python-modules/google_cloud_redis/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "google-cloud-redis"; - version = "0.2.1"; + version = "0.3.0"; src = fetchPypi { inherit pname version; - sha256 = "449fd11699f9ae23ec2ccf1b06681bb90b4c1788f82fbbf1ce1c1d2e77833eb1"; + sha256 = "e24a5eeb126a3e8fcf990806c7a853a27bb9b830c2f03fda42a499894b7614c6"; }; checkInputs = [ pytest mock ]; diff --git a/pkgs/development/python-modules/google_cloud_resource_manager/default.nix b/pkgs/development/python-modules/google_cloud_resource_manager/default.nix index 1bdd3635b210..70dd5475c216 100644 --- a/pkgs/development/python-modules/google_cloud_resource_manager/default.nix +++ b/pkgs/development/python-modules/google_cloud_resource_manager/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "google-cloud-resource-manager"; - version = "0.28.4"; + version = "0.30.0"; src = fetchPypi { inherit pname version; - sha256 = "ae43be426532b875c161625626ab759ecef633801e21f14b2ef8380884a2193b"; + sha256 = "6e4f1d618d8934ee9011e97db940bb177770b430fd29e58848599a416d9f6590"; }; checkInputs = [ pytest mock ]; diff --git a/pkgs/development/python-modules/google_cloud_runtimeconfig/default.nix b/pkgs/development/python-modules/google_cloud_runtimeconfig/default.nix index f347a1f2553c..a1628b991400 100644 --- a/pkgs/development/python-modules/google_cloud_runtimeconfig/default.nix +++ b/pkgs/development/python-modules/google_cloud_runtimeconfig/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "google-cloud-runtimeconfig"; - version = "0.28.4"; + version = "0.30.0"; src = fetchPypi { inherit pname version; - sha256 = "d5b097a15fa9bb50442ccaf25fdb4622fdf09b8a873abf549c432d8fdc16c2f1"; + sha256 = "02075724535b3d6e1d9a6df8a2340190e195faea2f9e91f48d6ae9006993d636"; }; checkInputs = [ pytest mock ]; diff --git a/pkgs/development/python-modules/google_cloud_securitycenter/default.nix b/pkgs/development/python-modules/google_cloud_securitycenter/default.nix index f9e4161d80d7..5ace3fad0113 100644 --- a/pkgs/development/python-modules/google_cloud_securitycenter/default.nix +++ b/pkgs/development/python-modules/google_cloud_securitycenter/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "google-cloud-securitycenter"; - version = "0.1.1"; + version = "0.3.0"; src = fetchPypi { inherit pname version; - sha256 = "11d19052c84dd8e5bc936f5276443e14c2a5ccaae031b2a39415a9f3832a1029"; + sha256 = "6a0a878db990d657b88ac34942b0a66df24da4643aa181274e602ac337de5d0c"; }; checkInputs = [ pytest mock ]; diff --git a/pkgs/development/python-modules/google_cloud_spanner/default.nix b/pkgs/development/python-modules/google_cloud_spanner/default.nix index 87f2915d6c50..0fad7cbdbfae 100644 --- a/pkgs/development/python-modules/google_cloud_spanner/default.nix +++ b/pkgs/development/python-modules/google_cloud_spanner/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "google-cloud-spanner"; - version = "1.7.1"; + version = "1.11.0"; src = fetchPypi { inherit pname version; - sha256 = "422a1bd5bded723151faeb4d1b1711f5776d2cc23d5c192cf53634eaf55c74aa"; + sha256 = "58b0c324296986d2f308d1b9917341d5c1e8e72253349e3ba5163b99bf7fc840"; }; checkInputs = [ pytest mock ]; diff --git a/pkgs/development/python-modules/google_cloud_speech/default.nix b/pkgs/development/python-modules/google_cloud_speech/default.nix index 5fb1cb653204..cf2dbe37fff7 100644 --- a/pkgs/development/python-modules/google_cloud_speech/default.nix +++ b/pkgs/development/python-modules/google_cloud_speech/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "google-cloud-speech"; - version = "1.0.0"; + version = "1.2.0"; src = fetchPypi { inherit pname version; - sha256 = "1d0ysapqrcwcyiil7nyh8vbj4i6hk9v23rrm4rdhgm0lwax7i0aj"; + sha256 = "f8a1f67b01b5b8bd22fa3ba95a4b99ae4a55b6299665d5ae1afa3db7f6706c32"; }; propagatedBuildInputs = [ google_api_core ]; diff --git a/pkgs/development/python-modules/google_cloud_storage/default.nix b/pkgs/development/python-modules/google_cloud_storage/default.nix index 5ff13d0dfaf8..1d68197364b9 100644 --- a/pkgs/development/python-modules/google_cloud_storage/default.nix +++ b/pkgs/development/python-modules/google_cloud_storage/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "google-cloud-storage"; - version = "1.15.2"; + version = "1.20.0"; src = fetchPypi { inherit pname version; - sha256 = "23e3d09f44f86128b754518c81492fac673ea39f7230356c126140f877c231c8"; + sha256 = "2e7e2435978bda1c209b70a9a00b8cbc53c3b00d6f09eb2c991ebba857babf24"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google_cloud_tasks/default.nix b/pkgs/development/python-modules/google_cloud_tasks/default.nix index 2036b9aea97a..9a139399ccd3 100644 --- a/pkgs/development/python-modules/google_cloud_tasks/default.nix +++ b/pkgs/development/python-modules/google_cloud_tasks/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "google-cloud-tasks"; - version = "0.4.0"; + version = "1.2.1"; src = fetchPypi { inherit pname version; - sha256 = "3c5f26dd3750f9b222a69c37e85ee1acf198456dfebe1e0058f366dd27729559"; + sha256 = "93f57f5ee273b4efcb3d7cc9d1c0b9a63dc9fd61d1fb47b861182364cfd51f94"; }; checkInputs = [ pytest mock ]; diff --git a/pkgs/development/python-modules/google_cloud_texttospeech/default.nix b/pkgs/development/python-modules/google_cloud_texttospeech/default.nix index 74c9370dad30..e8ed28ab2674 100644 --- a/pkgs/development/python-modules/google_cloud_texttospeech/default.nix +++ b/pkgs/development/python-modules/google_cloud_texttospeech/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "google-cloud-texttospeech"; - version = "0.4.0"; + version = "0.5.0"; src = fetchPypi { inherit pname version; - sha256 = "ec1d049cb54fc036887d946ce0391bde481a3da7263e55908eaf9694079ec46f"; + sha256 = "75562a8db2b0268f57c64e448d697fe82c0ffa889f09be8cbc6ba5369c9a0c59"; }; checkInputs = [ pytest mock ]; diff --git a/pkgs/development/python-modules/google_cloud_trace/default.nix b/pkgs/development/python-modules/google_cloud_trace/default.nix index 1422469784d1..8e79759dfff9 100644 --- a/pkgs/development/python-modules/google_cloud_trace/default.nix +++ b/pkgs/development/python-modules/google_cloud_trace/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "google-cloud-trace"; - version = "0.20.3"; + version = "0.23.0"; src = fetchPypi { inherit pname version; - sha256 = "438ac953248c93972a5b1a0be24ec9bf75c947cee4159dd731b585ce81911f87"; + sha256 = "1a3fad1ae2b780dd5e6d5ddc626db722749405b7b66f3c2e5e87a9d29a4819c8"; }; checkInputs = [ pytest mock ]; diff --git a/pkgs/development/python-modules/google_cloud_translate/default.nix b/pkgs/development/python-modules/google_cloud_translate/default.nix index 01caeed4866a..ebe39e72c055 100644 --- a/pkgs/development/python-modules/google_cloud_translate/default.nix +++ b/pkgs/development/python-modules/google_cloud_translate/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "google-cloud-translate"; - version = "1.3.3"; + version = "1.7.0"; src = fetchPypi { inherit pname version; - sha256 = "0f204a1cc95bcd708102ad86665da2dff53c1b9f47d490506e45cc96c93978ad"; + sha256 = "55b6563121883acce5d80afbf61a59e50d52c429e6ebbfe81a1c8f2734b75e8c"; }; checkInputs = [ pytest mock ]; diff --git a/pkgs/development/python-modules/google_cloud_videointelligence/default.nix b/pkgs/development/python-modules/google_cloud_videointelligence/default.nix index 2da82fc4933b..a60109694096 100644 --- a/pkgs/development/python-modules/google_cloud_videointelligence/default.nix +++ b/pkgs/development/python-modules/google_cloud_videointelligence/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "google-cloud-videointelligence"; - version = "1.6.1"; + version = "1.11.0"; src = fetchPypi { inherit pname version; - sha256 = "382ec37eab72b37571a2a76ad25c9dda51744dbff76ad9a85cc3791fee0c96ef"; + sha256 = "ef5c53772500bb30b546889ba8823a8d21217153544800f31a9bfd6f514643cb"; }; checkInputs = [ pytest mock ]; diff --git a/pkgs/development/python-modules/google_cloud_vision/default.nix b/pkgs/development/python-modules/google_cloud_vision/default.nix index aabc73f571c0..a8d748db126d 100644 --- a/pkgs/development/python-modules/google_cloud_vision/default.nix +++ b/pkgs/development/python-modules/google_cloud_vision/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "google-cloud-vision"; - version = "0.35.2"; + version = "0.39.0"; src = fetchPypi { inherit pname version; - sha256 = "25b537d4b76305e9758fe2f57fd5929a04bf3a46cb4e8d0f731e984f46405be8"; + sha256 = "f33aea6721d453901ded268dee61a01ab77d4cd215a76edc3cc61b6028299d3e"; }; checkInputs = [ pytest mock ]; diff --git a/pkgs/development/python-modules/google_cloud_websecurityscanner/default.nix b/pkgs/development/python-modules/google_cloud_websecurityscanner/default.nix index afe1f1db11ac..3318ab032387 100644 --- a/pkgs/development/python-modules/google_cloud_websecurityscanner/default.nix +++ b/pkgs/development/python-modules/google_cloud_websecurityscanner/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "google-cloud-websecurityscanner"; - version = "0.1.1"; + version = "0.3.0"; src = fetchPypi { inherit pname version; - sha256 = "d965d986053b49e4005b6b6cdf035d7dd4a3b64dcfb6325050b70c97831f8d6f"; + sha256 = "26a29657e20fda4302275b92c84c16228381998797e203f85d612f93d4c62358"; }; checkInputs = [ pytest mock ]; diff --git a/pkgs/development/python-modules/google_resumable_media/default.nix b/pkgs/development/python-modules/google_resumable_media/default.nix index 64b6990edcb7..a7fc28623fc5 100644 --- a/pkgs/development/python-modules/google_resumable_media/default.nix +++ b/pkgs/development/python-modules/google_resumable_media/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "google-resumable-media"; - version = "0.3.3"; + version = "0.4.1"; src = fetchPypi { inherit pname version; - sha256 = "49493999cf046b5a02f648e201f0c2fc718c5969c53326b4d2c0693b01bdc8bb"; + sha256 = "cdeb8fbb3551a665db921023603af2f0d6ac59ad8b48259cb510b8799505775f"; }; checkInputs = [ pytest mock ]; diff --git a/pkgs/development/python-modules/googleapis_common_protos/default.nix b/pkgs/development/python-modules/googleapis_common_protos/default.nix index 2ae649b7432b..5c8f1767dca7 100644 --- a/pkgs/development/python-modules/googleapis_common_protos/default.nix +++ b/pkgs/development/python-modules/googleapis_common_protos/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "googleapis-common-protos"; - version = "1.5.10"; + version = "1.6.0"; src = fetchPypi { inherit pname version; - sha256 = "d564872083af40bbcc7091340f17db778a316525c7c76497d58d11b98ca2aa74"; + sha256 = "e61b8ed5e36b976b487c6e7b15f31bb10c7a0ca7bd5c0e837f4afab64b53a0c6"; }; propagatedBuildInputs = [ protobuf setuptools ]; diff --git a/pkgs/development/python-modules/gpy/default.nix b/pkgs/development/python-modules/gpy/default.nix index 2a65df18fa54..a63902612047 100644 --- a/pkgs/development/python-modules/gpy/default.nix +++ b/pkgs/development/python-modules/gpy/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "GPy"; - version = "1.9.8"; + version = "1.9.9"; src = fetchPypi { inherit pname version; - sha256 = "33a55bb99fe5c7cdd8df4f8e220e3b87574afde49f5654b3ef7c0445018af4a0"; + sha256 = "04faf0c24eacc4dea60727c50a48a07ddf9b5751a3b73c382105e2a31657c7ed"; }; # running tests produces "ImportError: cannot import name 'linalg_cython'" diff --git a/pkgs/development/python-modules/grequests/default.nix b/pkgs/development/python-modules/grequests/default.nix index c42ace2e695b..0557fe787e8d 100644 --- a/pkgs/development/python-modules/grequests/default.nix +++ b/pkgs/development/python-modules/grequests/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "grequests"; - version = "0.3.0"; + version = "0.4.0"; src = fetchPypi { inherit pname version; - sha256 = "0lafzax5igbh8y4x0krizr573wjsxz7bhvwygiah6qwrzv83kv5c"; + sha256 = "8aeccc15e60ec65c7e67ee32e9c596ab2196979815497f85cf863465a1626490"; }; # No tests in archive diff --git a/pkgs/development/python-modules/grpc_google_iam_v1/default.nix b/pkgs/development/python-modules/grpc_google_iam_v1/default.nix index 68ca4b04c0e0..843c1b32f490 100644 --- a/pkgs/development/python-modules/grpc_google_iam_v1/default.nix +++ b/pkgs/development/python-modules/grpc_google_iam_v1/default.nix @@ -3,19 +3,25 @@ , fetchPypi , grpcio , googleapis_common_protos +, pytest }: buildPythonPackage rec { pname = "grpc-google-iam-v1"; - version = "0.11.4"; + version = "0.12.3"; src = fetchPypi { inherit pname version; - sha256 = "5009e831dcec22f3ff00e89405249d6a838d1449a46ac8224907aa5b0e0b1aec"; + sha256 = "0bfb5b56f648f457021a91c0df0db4934b6e0c300bd0f2de2333383fe958aa72"; }; propagatedBuildInputs = [ grpcio googleapis_common_protos ]; + # non-standard test format, and python3 will load local google folder first + # but tests cannot be ran if google folder is removed or moved + doCheck = false; + checkInputs = [ pytest ]; + meta = with stdenv.lib; { description = "GRPC library for the google-iam-v1 service"; homepage = https://github.com/googleapis/googleapis; diff --git a/pkgs/development/python-modules/gsd/1.7.nix b/pkgs/development/python-modules/gsd/1.7.nix index 567cc6f8930d..311c4aba732e 100644 --- a/pkgs/development/python-modules/gsd/1.7.nix +++ b/pkgs/development/python-modules/gsd/1.7.nix @@ -5,12 +5,12 @@ }: buildPythonPackage rec { - version = "1.7.0"; + version = "1.9.3"; pname = "gsd"; src = fetchPypi { inherit pname version; - sha256 = "0fpk69wachyydpk9cbs901m7hkwrrvq24ykxsrz62km9ql8lr2vp"; + sha256 = "c6b37344e69020f69fda2b8d97f894cb41fd720840abeda682edd680d1cff838"; }; propagatedBuildInputs = [ numpy ]; diff --git a/pkgs/development/python-modules/guessit/default.nix b/pkgs/development/python-modules/guessit/default.nix index d24fd20234ba..509488ebfa41 100644 --- a/pkgs/development/python-modules/guessit/default.nix +++ b/pkgs/development/python-modules/guessit/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "guessit"; - version = "3.0.5"; + version = "3.1.0"; src = fetchPypi { inherit pname version; - sha256 = "3559c2f37575b048c3d8723cc7a8eedb83b6c411d1be0d64e8b54f4b90138ca2"; + sha256 = "2dcd3f2acaf6c1a864f903f084ddd6a6b753f3107ae864355d7c8c1e9cb205b2"; }; # Tests require more packages. diff --git a/pkgs/development/python-modules/gym/default.nix b/pkgs/development/python-modules/gym/default.nix index fbe068fa44c0..52171470c271 100644 --- a/pkgs/development/python-modules/gym/default.nix +++ b/pkgs/development/python-modules/gym/default.nix @@ -1,19 +1,24 @@ { lib , buildPythonPackage, fetchPypi -, numpy, requests, six, pyglet, scipy +, numpy, requests, six, pyglet, scipy, cloudpickle }: buildPythonPackage rec { pname = "gym"; - version = "0.12.6"; + version = "0.15.3"; src = fetchPypi { inherit pname version; - sha256 = "90f53ec8291063abb4654eddeaac2a3a23152438a38c39830d3a3f3fc6a7ca59"; + sha256 = "18381e13bbd1e2f206a1b88a2af4fb87affd7d06ee7955a6e5e6a79478a9adfc"; }; + postPatch = '' + substituteInPlace setup.py \ + --replace "pyglet>=1.2.0,<=1.3.2" "pyglet" + ''; + propagatedBuildInputs = [ - numpy requests six pyglet scipy + numpy requests six pyglet scipy cloudpickle ]; # The test needs MuJoCo that is not free library. diff --git a/pkgs/development/python-modules/ha-ffmpeg/default.nix b/pkgs/development/python-modules/ha-ffmpeg/default.nix index 0b702901ae7f..717c8a954538 100644 --- a/pkgs/development/python-modules/ha-ffmpeg/default.nix +++ b/pkgs/development/python-modules/ha-ffmpeg/default.nix @@ -3,13 +3,13 @@ buildPythonPackage rec { pname = "ha-ffmpeg"; - version = "1.11"; + version = "2.0"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "386cc5bbec3a341d8bafec1c524bd8e64f41f9be8195808dec80f76661bf1cc3"; + sha256 = "230f2fa990c9caaff1c67c2227b64756062248083849651a9bec7d599e519a42"; }; buildInputs = [ ffmpeg ]; diff --git a/pkgs/development/python-modules/handout/default.nix b/pkgs/development/python-modules/handout/default.nix index 9a3980806095..eb6cca3e6ec6 100644 --- a/pkgs/development/python-modules/handout/default.nix +++ b/pkgs/development/python-modules/handout/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "handout"; - version = "1.0.0"; + version = "1.1.1"; src = fetchPypi { inherit pname version; - sha256 = "16y1wqx8j4kf6fa94x22njrkdfb2cfi0dvc7a4q2qsa8m3ri0b43"; + sha256 = "dbe5da9b422fa937b94a1a5221ce99387ebd75fe97ab4255e49b26d846b8614b"; }; propagatedBuildInputs = [ imageio imageio-ffmpeg ]; diff --git a/pkgs/development/python-modules/howdoi/default.nix b/pkgs/development/python-modules/howdoi/default.nix index 53e42027ba22..293ad51e302d 100644 --- a/pkgs/development/python-modules/howdoi/default.nix +++ b/pkgs/development/python-modules/howdoi/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "howdoi"; - version = "1.1.14"; + version = "1.2.1"; src = fetchPypi { inherit pname version; - sha256 = "b85b8e551bf47ff157392660f0fc5b9eb3eacb78516a5823f7b774ec61955db5"; + sha256 = "3b322668606d29d8a841c3b28c0574851f512b55c33a7ceb982b6a98d82fa3e3"; }; propagatedBuildInputs = [ six requests-cache pygments pyquery ]; diff --git a/pkgs/development/python-modules/html2text/default.nix b/pkgs/development/python-modules/html2text/default.nix index cac88c557946..3659d3368be3 100644 --- a/pkgs/development/python-modules/html2text/default.nix +++ b/pkgs/development/python-modules/html2text/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "html2text"; - version = "2018.1.9"; + version = "2019.9.26"; src = fetchPypi { inherit pname version; - sha256 = "627514fb30e7566b37be6900df26c2c78a030cc9e6211bda604d8181233bcdd4"; + sha256 = "6f56057c5c2993b5cc5b347cb099bdf6d095828fef1b53ef4e2a2bf2a1be9b4f"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/httplib2/default.nix b/pkgs/development/python-modules/httplib2/default.nix index 5a9e9f847471..0bbaece2c802 100644 --- a/pkgs/development/python-modules/httplib2/default.nix +++ b/pkgs/development/python-modules/httplib2/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "httplib2"; - version = "0.12.3"; + version = "0.14.0"; src = fetchPypi { inherit pname version; - sha256 = "a18121c7c72a56689efbf1aef990139ad940fee1e64c6f2458831736cd593600"; + sha256 = "34537dcdd5e0f2386d29e0e2c6d4a1703a3b982d34c198a5102e6e5d6194b107"; }; # Needs setting up diff --git a/pkgs/development/python-modules/hupper/default.nix b/pkgs/development/python-modules/hupper/default.nix index c6b0a2c64bc6..3d8f07793f9e 100644 --- a/pkgs/development/python-modules/hupper/default.nix +++ b/pkgs/development/python-modules/hupper/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "hupper"; - version = "1.6.1"; + version = "1.9"; src = fetchPypi { inherit pname version; - sha256 = "fe8febd68cec7fbed174fcbb0b42c427f96c8a7471c1cd4999fc698dd8dc6c34"; + sha256 = "afd4e7beedc7417fed12cb2e15a21610c73cb08821c7f09aa926be24d4038dae"; }; checkPhase = '' diff --git a/pkgs/development/python-modules/hvac/default.nix b/pkgs/development/python-modules/hvac/default.nix index 4eda2d864c83..ee7321ba6265 100644 --- a/pkgs/development/python-modules/hvac/default.nix +++ b/pkgs/development/python-modules/hvac/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "hvac"; - version = "0.7.2"; + version = "0.9.5"; src = fetchPypi { inherit pname version; - sha256 = "773775fa827c74299abd96079eeeeb0cefbb23b484195c03cff27d04716539ba"; + sha256 = "8b98be5868132a591ae5a3ca4b415231d4eac22d3fd77dbd69c3b1081d9ea26d"; }; propagatedBuildInputs = [ requests ]; diff --git a/pkgs/development/python-modules/hvplot/default.nix b/pkgs/development/python-modules/hvplot/default.nix index dfec9ffc2001..176258a10e01 100644 --- a/pkgs/development/python-modules/hvplot/default.nix +++ b/pkgs/development/python-modules/hvplot/default.nix @@ -16,11 +16,11 @@ buildPythonPackage rec { pname = "hvplot"; - version = "0.4.0"; + version = "0.5.2"; src = fetchPypi { inherit pname version; - sha256 = "bce169cf2d1b3ff9ce607d1787f608758e72a498434eaa2bece31eea1f51963a"; + sha256 = "408a7756b980df148d1f2fd59cd690ad4870d7e3c3c5e46c6b5c2e71fc6a097c"; }; checkInputs = [ pytest parameterized nbsmoke flake8 coveralls xarray networkx streamz ]; diff --git a/pkgs/development/python-modules/hyperlink/default.nix b/pkgs/development/python-modules/hyperlink/default.nix index d7950d3adb69..1fc490178215 100644 --- a/pkgs/development/python-modules/hyperlink/default.nix +++ b/pkgs/development/python-modules/hyperlink/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "hyperlink"; - version = "18.0.0"; + version = "19.0.0"; src = fetchPypi { inherit pname version; - sha256 = "f01b4ff744f14bc5d0a22a6b9f1525ab7d6312cb0ff967f59414bbac52f0a306"; + sha256 = "4288e34705da077fada1111a24a0aa08bb1e76699c9ce49876af722441845654"; }; propagatedBuildInputs = [ idna ]; diff --git a/pkgs/development/python-modules/ics/default.nix b/pkgs/development/python-modules/ics/default.nix new file mode 100644 index 000000000000..20fb38b187c0 --- /dev/null +++ b/pkgs/development/python-modules/ics/default.nix @@ -0,0 +1,33 @@ +{ stdenv, buildPythonPackage, fetchFromGitHub, pythonOlder +, tatsu, arrow +, pytest-sugar, pytestpep8, pytest-flakes, pytestcov +}: + +buildPythonPackage rec { + pname = "ics"; + version = "0.6"; + + src = fetchFromGitHub { + owner = "C4ptainCrunch"; + repo = "ics.py"; + rev = "v${version}"; + sha256 = "02bs9wlh40p1n33jchrl2cdpsnm5hq84070by3b6gm0vmgz6gn5v"; + }; + + propagatedBuildInputs = [ tatsu arrow ]; + checkInputs = [ pytest-sugar pytestpep8 pytest-flakes pytestcov ]; + + disabled = pythonOlder "3.6"; + + meta = with stdenv.lib; { + description = "Pythonic and easy iCalendar library (RFC 5545)"; + longDescription = '' + Ics.py is a pythonic and easy iCalendar library. Its goals are to read and + write ics data in a developer friendly way. + ''; + homepage = "http://icspy.readthedocs.org/en/stable/"; + license = licenses.asl20; + maintainers = with maintainers; [ primeos ]; + }; + +} diff --git a/pkgs/development/python-modules/imbalanced-learn/0.4.nix b/pkgs/development/python-modules/imbalanced-learn/0.4.nix index e7d2c2f37148..c1ff24711e80 100644 --- a/pkgs/development/python-modules/imbalanced-learn/0.4.nix +++ b/pkgs/development/python-modules/imbalanced-learn/0.4.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "imbalanced-learn"; - version = "0.4.3"; + version = "0.5.0"; src = fetchPypi { inherit pname version; - sha256 = "5bd9e86e40ce4001a57426541d7c79b18143cbd181e3330c1a3e5c5c43287083"; + sha256 = "5df760537886678ef9e25f5bad96d194c5fc66f62de84488069acf5d4b0119d5"; }; propagatedBuildInputs = [ scikitlearn ]; diff --git a/pkgs/development/python-modules/imgaug/default.nix b/pkgs/development/python-modules/imgaug/default.nix index 3946c0df6bc2..32dc23ddfce0 100644 --- a/pkgs/development/python-modules/imgaug/default.nix +++ b/pkgs/development/python-modules/imgaug/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "imgaug"; - version = "0.2.9"; + version = "0.3.0"; src = fetchPypi { inherit pname version; - sha256 = "42b0c4c8cbe197d4f5dbd33960a1140f8a0d9c22c0a8851306ecbbc032092de8"; + sha256 = "e1354d41921f1b306b50c5141b4870f17e81b531cae2f5c3093da9dc4dcb3cf4"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/immutables/default.nix b/pkgs/development/python-modules/immutables/default.nix index 5662f8896cc3..8ca0fe6df9fb 100644 --- a/pkgs/development/python-modules/immutables/default.nix +++ b/pkgs/development/python-modules/immutables/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "immutables"; - version = "0.9"; + version = "0.11"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "1h7i00x6sdbw62rdipp0kaw1mcrvfipxv0054x1n2r4q4j11q7fp"; + sha256 = "d6850578a0dc6530ac19113cfe4ddc13903df635212d498f176fe601a8a5a4a3"; }; meta = { diff --git a/pkgs/development/python-modules/ipaddress/default.nix b/pkgs/development/python-modules/ipaddress/default.nix index 0ce2abff5965..d5611959275e 100644 --- a/pkgs/development/python-modules/ipaddress/default.nix +++ b/pkgs/development/python-modules/ipaddress/default.nix @@ -7,11 +7,11 @@ if (pythonAtLeast "3.3") then null else buildPythonPackage rec { pname = "ipaddress"; - version = "1.0.22"; + version = "1.0.23"; src = fetchPypi { inherit pname version; - sha256 = "b146c751ea45cad6188dd6cf2d9b757f6f4f8d6ffb96a023e6f2e26eea02a72c"; + sha256 = "b7f8e0369580bb4a24d5ba1d7cc29660a4a6987763faf1d8a8046830e020e7e2"; }; checkPhase = '' diff --git a/pkgs/development/python-modules/ipython/5.nix b/pkgs/development/python-modules/ipython/5.nix deleted file mode 100644 index 15e7d00bcece..000000000000 --- a/pkgs/development/python-modules/ipython/5.nix +++ /dev/null @@ -1,62 +0,0 @@ -{ lib -, stdenv -, buildPythonPackage -, fetchPypi -# Build dependencies -, glibcLocales -# Test dependencies -, nose -, pygments -, testpath -, isPy27 -, mock -# Runtime dependencies -, backports_shutil_get_terminal_size -, decorator -, pathlib2 -, pickleshare -, requests -, simplegeneric -, traitlets -, prompt_toolkit -, pexpect -, appnope -}: - -buildPythonPackage rec { - pname = "ipython"; - version = "5.8.0"; - - src = fetchPypi { - inherit pname version; - sha256 = "4bac649857611baaaf76bc82c173aa542f7486446c335fe1a6c05d0d491c8906"; - }; - - prePatch = stdenv.lib.optionalString stdenv.isDarwin '' - substituteInPlace setup.py --replace "'gnureadline'" " " - ''; - - buildInputs = [ glibcLocales ]; - - checkInputs = [ nose pygments testpath ] ++ lib.optional isPy27 mock; - - propagatedBuildInputs = [ - backports_shutil_get_terminal_size decorator pickleshare prompt_toolkit - simplegeneric traitlets requests pathlib2 pexpect - ] ++ lib.optionals stdenv.isDarwin [ appnope ]; - - LC_ALL="en_US.UTF-8"; - - doCheck = false; # Circular dependency with ipykernel - - checkPhase = '' - nosetests - ''; - - meta = { - description = "IPython: Productive Interactive Computing"; - homepage = http://ipython.org/; - license = lib.licenses.bsd3; - maintainers = with lib.maintainers; [ bjornfor orivej lnl7 ]; - }; -} diff --git a/pkgs/development/python-modules/irc/default.nix b/pkgs/development/python-modules/irc/default.nix index b422b368ffb6..95dd5ba46178 100644 --- a/pkgs/development/python-modules/irc/default.nix +++ b/pkgs/development/python-modules/irc/default.nix @@ -1,17 +1,17 @@ { buildPythonPackage, fetchPypi, isPy3k , six, jaraco_logging, jaraco_text, jaraco_stream, pytz, jaraco_itertools -, setuptools_scm, jaraco_collections +, setuptools_scm, jaraco_collections, importlib-metadata }: buildPythonPackage rec { pname = "irc"; - version = "17.0"; + version = "17.1"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "f9c5fcb72dd230e1387fd4a0114a1935605e0f59ac09dec962313baed74e1365"; + sha256 = "0c19aeee800dbad792179d70dff1281c06fec220323f8ec34150cd94357f383b"; }; doCheck = false; @@ -19,6 +19,7 @@ buildPythonPackage rec { buildInputs = [ setuptools_scm ]; propagatedBuildInputs = [ six + importlib-metadata jaraco_logging jaraco_text jaraco_stream diff --git a/pkgs/development/python-modules/isbnlib/default.nix b/pkgs/development/python-modules/isbnlib/default.nix index 319bf7f24a2f..7ad81da27d23 100644 --- a/pkgs/development/python-modules/isbnlib/default.nix +++ b/pkgs/development/python-modules/isbnlib/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "isbnlib"; - version = "3.9.8"; + version = "3.9.9"; src = fetchPypi { inherit pname version; - sha256 = "ca27dc15763759d038a22f4e05d849acc121ffcb8ffe008768f09a0d844f7172"; + sha256 = "ba2d5a86a70db0f1951df479205e9144d9e55b8af4995b3857a79a30c6ff16ab"; }; checkInputs = [ diff --git a/pkgs/development/python-modules/islpy/default.nix b/pkgs/development/python-modules/islpy/default.nix index 6274da95b32f..6edf9a771867 100644 --- a/pkgs/development/python-modules/islpy/default.nix +++ b/pkgs/development/python-modules/islpy/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "islpy"; - version = "2018.2"; + version = "2019.1.2"; src = fetchPypi { inherit pname version; - sha256 = "be422a53b576210a0bb9775866abb6580b1e568222fc3e4e39d9e82f6d1d7253"; + sha256 = "834b6b946f33d578d5c6b2f863dd93f7ecc4c0a2bf73407c96ef9f95b6b71bbf"; }; postConfigure = '' diff --git a/pkgs/development/python-modules/jaraco_collections/default.nix b/pkgs/development/python-modules/jaraco_collections/default.nix index 8fde41e9b499..ceaa46a7847e 100644 --- a/pkgs/development/python-modules/jaraco_collections/default.nix +++ b/pkgs/development/python-modules/jaraco_collections/default.nix @@ -4,10 +4,10 @@ buildPythonPackage rec { pname = "jaraco.collections"; - version = "2.0"; + version = "2.1"; src = fetchPypi { inherit pname version; - sha256 = "eb43fb9a7b29cff20767caf838c14bdf80a89395aba67a97d61c8f16e0e22c97"; + sha256 = "0z1kmgf8jahx42bmflmj030wl8yrksw5b5ghcpayrqd5221jfk0f"; }; doCheck = false; diff --git a/pkgs/development/python-modules/jaraco_text/default.nix b/pkgs/development/python-modules/jaraco_text/default.nix index 8b6d6babb48c..1d6ce78b6859 100644 --- a/pkgs/development/python-modules/jaraco_text/default.nix +++ b/pkgs/development/python-modules/jaraco_text/default.nix @@ -4,10 +4,10 @@ buildPythonPackage rec { pname = "jaraco.text"; - version = "3.0.1"; + version = "3.1"; src = fetchPypi { inherit pname version; - sha256 = "08n14knfarc3v9jibkl1pbcq2fd95cmz61wc6n4y922ccnrqn9gc"; + sha256 = "0c7effed0f269e8bdae3374a7545763e84c1e7f9777cf2dd2d49eef92eb0d7b7"; }; doCheck = false; buildInputs =[ setuptools_scm ]; diff --git a/pkgs/development/python-modules/jdatetime/default.nix b/pkgs/development/python-modules/jdatetime/default.nix index 675dba0ea72f..0155cf665bd8 100644 --- a/pkgs/development/python-modules/jdatetime/default.nix +++ b/pkgs/development/python-modules/jdatetime/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "jdatetime"; - version = "3.2.0"; + version = "3.6.1"; src = fetchPypi { inherit pname version; - sha256 = "42d0d08c0d36dcf1c4e1ddb1d10338d0dffb94105a02d74b6ea655ee8dd93cc2"; + sha256 = "72f8c72873f9d3f536a696014e4ebffe431a644d7aa95db18c52e086d23b2939"; }; propagatedBuildInputs = [ six ]; diff --git a/pkgs/development/python-modules/jedi/default.nix b/pkgs/development/python-modules/jedi/default.nix index 2340d5142b5b..0df9404f1561 100644 --- a/pkgs/development/python-modules/jedi/default.nix +++ b/pkgs/development/python-modules/jedi/default.nix @@ -6,7 +6,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "0bp4pxhsynaarbvzblsn5x32lzp29svy3sxfy8i6m5iwz9s9r1ds"; + sha256 = "ba859c74fa3c966a22f2aeebe1b74ee27e2a462f56d3f5f7ca4a59af61bfe42e"; }; postPatch = '' diff --git a/pkgs/development/python-modules/jenkinsapi/default.nix b/pkgs/development/python-modules/jenkinsapi/default.nix index 1222b07fc99f..8d8f6b53ceb8 100644 --- a/pkgs/development/python-modules/jenkinsapi/default.nix +++ b/pkgs/development/python-modules/jenkinsapi/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "jenkinsapi"; - version = "0.3.9"; + version = "0.3.10"; src = fetchPypi { inherit pname version; - sha256 = "bf35b208fe05e65508f3b8bbb0f91d164b007632e27ebe5f54041174b681b696"; + sha256 = "fc2fcdf95d954d9bbbdb1303a2c3c32997935655c99aff300f1759dba3cebc6d"; }; propagatedBuildInputs = [ pytz requests ]; diff --git a/pkgs/development/python-modules/jsonmerge/default.nix b/pkgs/development/python-modules/jsonmerge/default.nix index 44944c03500b..9379abcc604f 100644 --- a/pkgs/development/python-modules/jsonmerge/default.nix +++ b/pkgs/development/python-modules/jsonmerge/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "jsonmerge"; - version = "1.6.1"; + version = "1.7.0"; src = fetchPypi { inherit pname version; - sha256 = "03l2j1lrcwcp7af4x8agxnkib0ndybfrbhn2gi7mnk6gbxfw1aw3"; + sha256 = "2004a421890311176136fb911c339c4bab45984808814feaed6a328c6e211ba2"; }; propagatedBuildInputs = [ jsonschema ]; diff --git a/pkgs/development/python-modules/jsonpatch/default.nix b/pkgs/development/python-modules/jsonpatch/default.nix index 52fc3bd5e043..7345c8f723a9 100644 --- a/pkgs/development/python-modules/jsonpatch/default.nix +++ b/pkgs/development/python-modules/jsonpatch/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "jsonpatch"; - version = "1.23"; + version = "1.24"; src = fetchPypi { inherit pname version; - sha256 = "49f29cab70e9068db3b1dc6b656cbe2ee4edf7dfe9bf5a0055f17a4b6804a4b9"; + sha256 = "cbb72f8bf35260628aea6b508a107245f757d1ec839a19c34349985e2c05645a"; }; # test files are missing diff --git a/pkgs/development/python-modules/jsonschema/default.nix b/pkgs/development/python-modules/jsonschema/default.nix index db6be9f99182..d94a7742f9e3 100644 --- a/pkgs/development/python-modules/jsonschema/default.nix +++ b/pkgs/development/python-modules/jsonschema/default.nix @@ -1,28 +1,36 @@ -{ stdenv, buildPythonPackage, fetchPypi, python -, nose, mock, vcversioner, functools32 }: +{ lib, buildPythonPackage, fetchPypi, python, isPy27 +, attrs +, functools32 +, importlib-metadata +, mock +, nose +, pyperf +, pyrsistent +, setuptools_scm +, twisted +, vcversioner +}: buildPythonPackage rec { pname = "jsonschema"; - version = "2.6.0"; + version = "3.1.1"; src = fetchPypi { inherit pname version; - sha256 = "00kf3zmpp9ya4sydffpifn0j0mzm342a2vzh82p6r0vh10cg7xbg"; + sha256 = "2fa0684276b6333ff3c0b1b27081f4b2305f0a36cf702a23db50edb141893c3f"; }; - checkInputs = [ nose mock vcversioner ]; - propagatedBuildInputs = [ functools32 ]; - - postPatch = '' - substituteInPlace jsonschema/tests/test_jsonschema_test_suite.py \ - --replace "python" "${python.pythonForBuild.interpreter}" - ''; + nativeBuildInputs = [ setuptools_scm ]; + propagatedBuildInputs = [ attrs importlib-metadata functools32 pyrsistent ]; + checkInputs = [ nose mock pyperf twisted vcversioner ]; + # zope namespace collides on py27 + doCheck = !isPy27; checkPhase = '' nosetests ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = https://github.com/Julian/jsonschema; description = "An implementation of JSON Schema validation for Python"; license = licenses.mit; diff --git a/pkgs/development/python-modules/junos-eznc/default.nix b/pkgs/development/python-modules/junos-eznc/default.nix index 6970efd0914a..7255ee538605 100644 --- a/pkgs/development/python-modules/junos-eznc/default.nix +++ b/pkgs/development/python-modules/junos-eznc/default.nix @@ -15,11 +15,11 @@ buildPythonPackage rec { pname = "junos-eznc"; - version = "2.2.1"; + version = "2.3.0"; src = fetchPypi { inherit pname version; - sha256 = "0133a10ba3d46ddf70f0ba6620aa3b92e5533f08c57edd000dbffd8fe60d586d"; + sha256 = "c0f853cdad12256ae8c33a80ff6c31a3ce867c481f805b085d554fbb5b5b084f"; }; diff --git a/pkgs/development/python-modules/jupyter-repo2docker/default.nix b/pkgs/development/python-modules/jupyter-repo2docker/default.nix index a400dd4d18ce..0ee4ea17bc78 100644 --- a/pkgs/development/python-modules/jupyter-repo2docker/default.nix +++ b/pkgs/development/python-modules/jupyter-repo2docker/default.nix @@ -16,13 +16,13 @@ }: buildPythonPackage rec { - version = "0.7.0"; + version = "0.10.0"; pname = "jupyter-repo2docker"; disabled = !(pythonAtLeast "3.4"); src = fetchPypi { inherit pname version; - sha256 = "cf93ddf283de8c6b8f4ad983f8bf9b7b2a2c37812e387c245f8ba229d4f180c4"; + sha256 = "7965262913be6be60e64c8016f5f3d4bf93701f2787209215859d73b2adbc05a"; }; checkInputs = [ pytest pyyaml wheel pytestcov ]; diff --git a/pkgs/development/python-modules/jupyter_console/5.nix b/pkgs/development/python-modules/jupyter_console/5.nix index 440f22b13321..abb162cd5185 100644 --- a/pkgs/development/python-modules/jupyter_console/5.nix +++ b/pkgs/development/python-modules/jupyter_console/5.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "jupyter_console"; - version = "5.2.0"; + version = "6.0.0"; src = fetchPypi { inherit pname version; - sha256 = "545dedd3aaaa355148093c5609f0229aeb121b4852995c2accfa64fe3e0e55cd"; + sha256 = "308ce876354924fb6c540b41d5d6d08acfc946984bf0c97777c1ddcb42e0b2f5"; }; checkInputs = [ nose ]; diff --git a/pkgs/development/python-modules/jupyter_core/default.nix b/pkgs/development/python-modules/jupyter_core/default.nix index e629e77aa32d..535afa31ee19 100644 --- a/pkgs/development/python-modules/jupyter_core/default.nix +++ b/pkgs/development/python-modules/jupyter_core/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "jupyter_core"; - version = "4.6.0"; + version = "4.6.1"; src = fetchPypi { inherit pname version; - sha256 = "85103cee6548992780912c1a0a9ec2583a4a18f1ef79a248ec0db4446500bce3"; + sha256 = "a183e0ec2e8f6adddf62b0a3fc6a2237e3e0056d381e536d3e7c7ecc3067e244"; }; checkInputs = [ pytest mock glibcLocales nose ]; diff --git a/pkgs/development/python-modules/jupyterlab_server/default.nix b/pkgs/development/python-modules/jupyterlab_server/default.nix index 57fa31533288..6d0da2925cc2 100644 --- a/pkgs/development/python-modules/jupyterlab_server/default.nix +++ b/pkgs/development/python-modules/jupyterlab_server/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "jupyterlab_server"; - version = "0.3.4"; + version = "1.0.6"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "ae0c8629b9f0196b314f017e374a70a702522739f4f08bece84963af5e8c8351"; + sha256 = "d0977527bfce6f47c782cb6bf79d2c949ebe3f22ac695fa000b730c671445dad"; }; checkInputs = [ requests pytest ]; diff --git a/pkgs/development/python-modules/kajiki/default.nix b/pkgs/development/python-modules/kajiki/default.nix index ba71e03ce991..b1b82f31d763 100644 --- a/pkgs/development/python-modules/kajiki/default.nix +++ b/pkgs/development/python-modules/kajiki/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "Kajiki"; - version = "0.7.2"; + version = "0.8.1"; src = fetchPypi { inherit pname version; - sha256 = "4e7aaf838f298958cf171f220e1d0dc4220338c76c97746a46d0cc389f90b10a"; + sha256 = "85202ff7c2ce2466e9da82f06b25d1d6753d411d0e1b3ab3b145ed1e04c46782"; }; propagatedBuildInputs = [ Babel pytz nine ]; diff --git a/pkgs/development/python-modules/kconfiglib/default.nix b/pkgs/development/python-modules/kconfiglib/default.nix index 26320cccd1e4..c6007bc0b425 100644 --- a/pkgs/development/python-modules/kconfiglib/default.nix +++ b/pkgs/development/python-modules/kconfiglib/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "kconfiglib"; - version = "12.12.1"; + version = "13.1.1"; src = fetchPypi { inherit pname version; - sha256 = "0afc0gidh0pjb0ll99xifzs5z14g365crfj935614zp9w8fcchp0"; + sha256 = "b44af5a6dc0c716926c926ba4c1f301ce286b3a3f292ae359a866eb01dc5260e"; }; # doesnt work out of the box but might be possible diff --git a/pkgs/development/python-modules/keras/default.nix b/pkgs/development/python-modules/keras/default.nix index a5b6cc6cda0b..0c1f6f35d549 100644 --- a/pkgs/development/python-modules/keras/default.nix +++ b/pkgs/development/python-modules/keras/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "Keras"; - version = "2.3.0"; + version = "2.3.1"; src = fetchPypi { inherit pname version; - sha256 = "0m5kj6jd1jkxv3npr2s6bczp5m592iryl9ysl5gbil0wszqyrmm0"; + sha256 = "321d43772006a25a1d58eea17401ef2a34d388b588c9f7646c34796151ebc8cc"; }; checkInputs = [ diff --git a/pkgs/development/python-modules/kiwisolver/default.nix b/pkgs/development/python-modules/kiwisolver/default.nix index c0c3b09e7b4b..e41c4bbeee05 100644 --- a/pkgs/development/python-modules/kiwisolver/default.nix +++ b/pkgs/development/python-modules/kiwisolver/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "kiwisolver"; - version = "1.0.1"; + version = "1.1.0"; src = fetchPypi { inherit pname version; - sha256 = "ce3be5d520b4d2c3e5eeb4cd2ef62b9b9ab8ac6b6fedbaa0e39cdb6f50644278"; + sha256 = "53eaed412477c836e1b9522c19858a8557d6e595077830146182225613b11a75"; }; NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-I${libcxx}/include/c++/v1"; diff --git a/pkgs/development/python-modules/kombu/default.nix b/pkgs/development/python-modules/kombu/default.nix index 759b9d2a440e..a159b6c7e082 100644 --- a/pkgs/development/python-modules/kombu/default.nix +++ b/pkgs/development/python-modules/kombu/default.nix @@ -1,4 +1,11 @@ -{ lib, buildPythonPackage, fetchPypi, pytest, case, pytz, Pyro4, amqp }: +{ lib, buildPythonPackage, fetchPypi +, amqp +, case +, Pyro4 +, pytest +, pytz +, sqlalchemy +}: buildPythonPackage rec { pname = "kombu"; @@ -10,13 +17,20 @@ buildPythonPackage rec { }; postPatch = '' - substituteInPlace requirements/test.txt --replace "pytest-sugar" "" + substituteInPlace requirements/test.txt \ + --replace "pytest-sugar" "" + substituteInPlace requirements/default.txt \ + --replace "amqp==2.5.1" "amqp~=2.5" ''; - checkInputs = [ pytest case pytz Pyro4 ]; - propagatedBuildInputs = [ amqp ]; + checkInputs = [ pytest case pytz Pyro4 sqlalchemy ]; + # test_redis requires fakeredis, which isn't trivial to package + checkPhase = '' + pytest --ignore t/unit/transport/test_redis.py + ''; + meta = with lib; { description = "Messaging library for Python"; homepage = https://github.com/celery/kombu; diff --git a/pkgs/development/python-modules/ldaptor/default.nix b/pkgs/development/python-modules/ldaptor/default.nix index 4eab700ff140..49dc9a9b25b3 100644 --- a/pkgs/development/python-modules/ldaptor/default.nix +++ b/pkgs/development/python-modules/ldaptor/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "ldaptor"; - version = "16.0.1"; + version = "19.1.0"; src = fetchPypi { inherit pname version; - sha256 = "6b9ebe5814e9e7091703c4e3bfeae73b46508b4678e2ff403cddaedf8213815d"; + sha256 = "64c7b870c77e34e4f5f9cfdf330b9702e89b4dd0f64275704f86c1468312c755"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/libarchive-c/default.nix b/pkgs/development/python-modules/libarchive-c/default.nix index 52cca5d36fb6..8488343362de 100644 --- a/pkgs/development/python-modules/libarchive-c/default.nix +++ b/pkgs/development/python-modules/libarchive-c/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "libarchive-c"; - version = "2.8"; + version = "2.9"; src = fetchPypi { inherit pname version; - sha256 = "06d44d5b9520bdac93048c72b7ed66d11a6626da16d2086f9aad079674d8e061"; + sha256 = "9919344cec203f5db6596a29b5bc26b07ba9662925a05e24980b84709232ef60"; }; checkInputs = [ mock pytest glibcLocales ]; diff --git a/pkgs/development/python-modules/librosa/default.nix b/pkgs/development/python-modules/librosa/default.nix index 258c2d6932d5..6e878a851bb3 100644 --- a/pkgs/development/python-modules/librosa/default.nix +++ b/pkgs/development/python-modules/librosa/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "librosa"; - version = "0.6.3"; + version = "0.7.1"; src = fetchPypi { inherit pname version; - sha256 = "b332225ac29bfae1ba386deca2b6566271576de3ab17617ad0a71892c799b118"; + sha256 = "cca58a2d9a47e35be63a3ce36482d241453bfe9b14bde2005430f969bd7d013a"; }; propagatedBuildInputs = [ joblib matplotlib six scikitlearn decorator audioread resampy ]; diff --git a/pkgs/development/python-modules/lightgbm/default.nix b/pkgs/development/python-modules/lightgbm/default.nix index f428e7dbfbac..2b9843e303d3 100644 --- a/pkgs/development/python-modules/lightgbm/default.nix +++ b/pkgs/development/python-modules/lightgbm/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "lightgbm"; - version = "2.2.3"; + version = "2.3.0"; src = fetchPypi { inherit pname version; - sha256 = "40354d21da6bfa73c7ada4d01b2e0b22eaae00f93e90bdaf3fc423020c273890"; + sha256 = "37225b9f816ea3365ff5988fc8a3717e46ac99a5f223986c86c86cec4f111b54"; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/magic-wormhole-mailbox-server/default.nix b/pkgs/development/python-modules/magic-wormhole-mailbox-server/default.nix index 4347f07d9c2c..0f3e793b1d53 100644 --- a/pkgs/development/python-modules/magic-wormhole-mailbox-server/default.nix +++ b/pkgs/development/python-modules/magic-wormhole-mailbox-server/default.nix @@ -1,12 +1,12 @@ { stdenv, buildPythonPackage, fetchPypi, six, attrs, twisted, pyopenssl, service-identity, autobahn, treq, mock }: buildPythonPackage rec { - version = "0.3.1"; + version = "0.4.1"; pname = "magic-wormhole-mailbox-server"; src = fetchPypi { inherit pname version; - sha256 = "1q6zhbx8fcpk7rchclm7yqcxdsc1x97hki2ji61sa544r5xvxv55"; + sha256 = "1af10592909caaf519c00e706eac842c5e77f8d4356215fe9c61c7b2258a88fb"; }; propagatedBuildInputs = [ six attrs twisted pyopenssl service-identity autobahn ]; diff --git a/pkgs/development/python-modules/mailmanclient/default.nix b/pkgs/development/python-modules/mailmanclient/default.nix index 95e9e4fdd3e0..9fe9adbe6cfd 100644 --- a/pkgs/development/python-modules/mailmanclient/default.nix +++ b/pkgs/development/python-modules/mailmanclient/default.nix @@ -1,15 +1,19 @@ -{ stdenv, buildPythonPackage, fetchPypi, six, httplib2 }: +{ stdenv, buildPythonPackage, fetchPypi, six, httplib2, requests }: buildPythonPackage rec { pname = "mailmanclient"; - version = "3.2.2"; + version = "3.3.0"; src = fetchPypi { inherit pname version; - sha256 = "0xsrzdrsmfhnxv68zwm1g6awk7in08k6yhkyd27ipn0mq1wjm5jd"; + sha256 = "c8736cbe152ae1bd58b46ccfbcafb6a1e301513530772e7fda89f91d1e5c1ae9"; }; - propagatedBuildInputs = [ six httplib2 ]; + propagatedBuildInputs = [ six httplib2 requests ]; + + # no tests with Pypi tar ball, checkPhase removes setup.py which invalidates import check + doCheck = false; + pythonImportsCheck = [ "mailmanclient" ]; meta = with stdenv.lib; { homepage = "http://www.gnu.org/software/mailman/"; diff --git a/pkgs/development/python-modules/mapsplotlib/default.nix b/pkgs/development/python-modules/mapsplotlib/default.nix index be21fb3e836c..eb02941c1a1b 100644 --- a/pkgs/development/python-modules/mapsplotlib/default.nix +++ b/pkgs/development/python-modules/mapsplotlib/default.nix @@ -11,13 +11,13 @@ buildPythonPackage rec { pname = "mapsplotlib"; - version = "1.1.3"; + version = "1.2.0"; disabled = isPy3k; src = fetchPypi { inherit pname version; - sha256 = "9214a2ddc5157fc6fef7659db7c1fa1c096b4d79f543cc2eeb2c5fc706b89c98"; + sha256 = "e0a18aa0d134407aab6130c314596732d129ff98f9a6084640a07a5b8656f836"; }; propagatedBuildInputs = [ matplotlib scipy pandas requests pillow ]; diff --git a/pkgs/development/python-modules/marionette-harness/default.nix b/pkgs/development/python-modules/marionette-harness/default.nix index ff1a6e49b013..4a9e0113c680 100644 --- a/pkgs/development/python-modules/marionette-harness/default.nix +++ b/pkgs/development/python-modules/marionette-harness/default.nix @@ -13,12 +13,12 @@ buildPythonPackage rec { pname = "marionette-harness"; - version = "4.5.0"; + version = "5.0.0"; disabled = isPy3k; src = fetchPypi { inherit pname version; - sha256 = "241c7f6032d01b0d78f5c0d13ea691935ddce9f8fce991319cc4fe860d61a7c4"; + sha256 = "041cd779ae383fb5c56f2bb44824f4e80ba895febd9a3f21570ac274221c82e0"; }; propagatedBuildInputs = [ mozprofile mozversion browsermob-proxy moztest diff --git a/pkgs/development/python-modules/marionette-harness/marionette_driver.nix b/pkgs/development/python-modules/marionette-harness/marionette_driver.nix index b6d761f077ce..4567d34932b3 100644 --- a/pkgs/development/python-modules/marionette-harness/marionette_driver.nix +++ b/pkgs/development/python-modules/marionette-harness/marionette_driver.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "marionette_driver"; - version = "2.7.0"; + version = "3.0.0"; disabled = isPy3k; src = fetchPypi { inherit pname version; - sha256 = "15c77ba548847dc05ce1b663a22c3324623f217dce5a859c3aaced31fd16707b"; + sha256 = "99ca2513d4e2ca29a08e550346f23947a50627a2b02f6ad36a4550e779fa0ce8"; }; propagatedBuildInputs = [ mozversion mozrunner ]; diff --git a/pkgs/development/python-modules/marionette-harness/mozcrash.nix b/pkgs/development/python-modules/marionette-harness/mozcrash.nix index 3f7710acb3c1..c5d91fbfef79 100644 --- a/pkgs/development/python-modules/marionette-harness/mozcrash.nix +++ b/pkgs/development/python-modules/marionette-harness/mozcrash.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "mozcrash"; - version = "1.0"; + version = "1.1.0"; src = fetchPypi { inherit pname version; - sha256 = "02101v6v2jqlv6cbrmmggj12asz9vz6m50b6mk9mq17b1dr1zik3"; + sha256 = "8c2d2f32bd6e0ba3644f5d16e427444d8cb51ec1e9baa340a33e10687307f8c4"; }; propagatedBuildInputs = [ mozfile mozlog ]; diff --git a/pkgs/development/python-modules/marionette-harness/mozdevice.nix b/pkgs/development/python-modules/marionette-harness/mozdevice.nix index 02da75bfd965..19ec1ddb5c5d 100644 --- a/pkgs/development/python-modules/marionette-harness/mozdevice.nix +++ b/pkgs/development/python-modules/marionette-harness/mozdevice.nix @@ -7,11 +7,13 @@ buildPythonPackage rec { pname = "mozdevice"; - version = "1.0.1"; + version = "3.0.5"; + format = "wheel"; src = fetchPypi { inherit pname version; - sha256 = "0026241bff3ad10a73fe24eb4f59c1313c94e5950f397b2f6b8cc4e4dfbfdd73"; + sha256 = "1gpz0y81407pk71p9yzf15kqqk10fcansw8a607488d11m1jn3yf"; + format = "wheel"; }; propagatedBuildInputs = [ moznetwork mozprocess ]; diff --git a/pkgs/development/python-modules/marionette-harness/mozfile.nix b/pkgs/development/python-modules/marionette-harness/mozfile.nix index 34350dd4821f..9ca8ea0b7891 100644 --- a/pkgs/development/python-modules/marionette-harness/mozfile.nix +++ b/pkgs/development/python-modules/marionette-harness/mozfile.nix @@ -1,18 +1,20 @@ { lib , buildPythonPackage , fetchPypi +, isPy27 +, six }: buildPythonPackage rec { pname = "mozfile"; - version = "1.2"; + version = "2.1.0"; src = fetchPypi { inherit pname version; - sha256 = "0mz941np62mg0zncy74d8fbq9fafsxjsxlwdsydl92badhrhzc6k"; + sha256 = "e5dc835582ea150e35ecd57e9d86cb707d3aa3b2505679db7332326dd49fd6b8"; }; - propagatedBuildInputs = [ ]; + propagatedBuildInputs = lib.optional isPy27 six; # mozhttpd -> moznetwork -> mozinfo -> mozfile doCheck = false; diff --git a/pkgs/development/python-modules/marionette-harness/mozinfo.nix b/pkgs/development/python-modules/marionette-harness/mozinfo.nix index d44dc108ff3d..080be7e04efe 100644 --- a/pkgs/development/python-modules/marionette-harness/mozinfo.nix +++ b/pkgs/development/python-modules/marionette-harness/mozinfo.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "mozinfo"; - version = "0.10"; + version = "1.1.0"; src = fetchPypi { inherit pname version; - sha256 = "dcd53a1b1793340418e1ae42bf300e3e56d8f12047972378c6f9318b220b1023"; + sha256 = "4525c26350fb85c26b38c5f853a19f47b17b49a74de363d285d54258972a4cbc"; }; disabled = isPy3k; diff --git a/pkgs/development/python-modules/marionette-harness/mozlog.nix b/pkgs/development/python-modules/marionette-harness/mozlog.nix index b8d0c077d664..0036ac3eb570 100644 --- a/pkgs/development/python-modules/marionette-harness/mozlog.nix +++ b/pkgs/development/python-modules/marionette-harness/mozlog.nix @@ -10,13 +10,13 @@ buildPythonPackage rec { pname = "mozlog"; - version = "3.8"; + version = "4.2.0"; disabled = isPy3k; src = fetchPypi { inherit pname version; - sha256 = "00x28z6diw06gakb5isbfha5z2n63yyncv4za303nsgzxvlihmx0"; + sha256 = "dc85cfb9d47af6811f2367f471de7028c36204340c5e68a928115409ea75d9a9"; }; propagatedBuildInputs = [ blessings mozterm six ]; diff --git a/pkgs/development/python-modules/marionette-harness/mozprocess.nix b/pkgs/development/python-modules/marionette-harness/mozprocess.nix index e8130e8038fd..cfa0f7666201 100644 --- a/pkgs/development/python-modules/marionette-harness/mozprocess.nix +++ b/pkgs/development/python-modules/marionette-harness/mozprocess.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "mozprocess"; - version = "0.26"; + version = "1.0.0"; src = fetchPypi { inherit pname version; - sha256 = "9f471c45bee9ff14e936c6ee216a6cc4941223659c01fa626bce628001d8485c"; + sha256 = "a0fd8367e663d3cac74ee46bffa789667bc8d52f242d81a14522205fa6650cb2"; }; propagatedBuildInputs = [ mozinfo ]; diff --git a/pkgs/development/python-modules/marionette-harness/mozprofile.nix b/pkgs/development/python-modules/marionette-harness/mozprofile.nix index 3620248904ce..fddb7d67daeb 100644 --- a/pkgs/development/python-modules/marionette-harness/mozprofile.nix +++ b/pkgs/development/python-modules/marionette-harness/mozprofile.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "mozprofile"; - version = "1.1.0"; + version = "2.3.0"; src = fetchPypi { inherit pname version; - sha256 = "aa7fe7248719a224dd63cdc0498c9971d07cfc62fee7a69f51d593316b6bc1d8"; + sha256 = "95e7410ff2a65775422936749b346da8abf09fe0aafa3bb5dd1651b17da137d1"; }; propagatedBuildInputs = [ mozlog mozfile mozhttpd ]; diff --git a/pkgs/development/python-modules/marionette-harness/mozrunner.nix b/pkgs/development/python-modules/marionette-harness/mozrunner.nix index ac8631362fb8..ba0fa476906f 100644 --- a/pkgs/development/python-modules/marionette-harness/mozrunner.nix +++ b/pkgs/development/python-modules/marionette-harness/mozrunner.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "mozrunner"; - version = "7.0.2"; + version = "7.6.0"; src = fetchPypi { inherit pname version; - sha256 = "8034898a36fece171b52e25792f64011e761e5aa694cd67fb6a19c12cb3fa978"; + sha256 = "0ae84147f0fd784daa32c1d74f94b6e384967831aaf0c635bb3d9d0af3c4b112"; }; propagatedBuildInputs = [ mozdevice mozfile mozinfo mozlog mozprocess diff --git a/pkgs/development/python-modules/marionette-harness/mozversion.nix b/pkgs/development/python-modules/marionette-harness/mozversion.nix index dbe3cb4bc2d8..f9e962bb77c9 100644 --- a/pkgs/development/python-modules/marionette-harness/mozversion.nix +++ b/pkgs/development/python-modules/marionette-harness/mozversion.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "mozversion"; - version = "1.5"; + version = "2.1.0"; src = fetchPypi { inherit pname version; - sha256 = "e9b11e4a46bf7a4a11469ea4589c75f3ba50b34b7801e7edf1a09147af8bf70f"; + sha256 = "65f41d7dc14002f83d8f147c82ca34f7213ad07065d250939daaeeb3787dc0fa"; }; propagatedBuildInputs = [ mozlog mozdevice ]; diff --git a/pkgs/development/python-modules/marshmallow/default.nix b/pkgs/development/python-modules/marshmallow/default.nix index 513c277bcacb..0ab947ec254f 100644 --- a/pkgs/development/python-modules/marshmallow/default.nix +++ b/pkgs/development/python-modules/marshmallow/default.nix @@ -4,7 +4,7 @@ buildPythonPackage rec { pname = "marshmallow"; - version = "2.18.1"; + version = "3.2.1"; meta = { homepage = "https://github.com/marshmallow-code/marshmallow"; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "6eeaf1301a5f5942bfe8ab2c2eaf03feb793072b56d5fae563638bddd7bb62e6"; + sha256 = "9a2f3e8ea5f530a9664e882d7d04b58650f46190178b2264c72b7d20399d28f0"; }; propagatedBuildInputs = [ dateutil simplejson ]; diff --git a/pkgs/development/python-modules/meinheld/default.nix b/pkgs/development/python-modules/meinheld/default.nix index 526cd3ed4eec..31892d12a1f7 100644 --- a/pkgs/development/python-modules/meinheld/default.nix +++ b/pkgs/development/python-modules/meinheld/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "meinheld"; - version = "0.6.1"; + version = "1.0.1"; src = fetchPypi { inherit pname version; - sha256 = "0rg5878njn66cc0x2fwrakikz24946r0cxxl6j8vvz5phd4zygi9"; + sha256 = "447de7189e4dc9c1f425aa1b9c8210aab492fda4d86f73a24059264e7d8b0134"; }; propagatedBuildInputs = [ greenlet ]; diff --git a/pkgs/development/python-modules/minio/default.nix b/pkgs/development/python-modules/minio/default.nix index 6aa5f46ed1f5..966255dade26 100644 --- a/pkgs/development/python-modules/minio/default.nix +++ b/pkgs/development/python-modules/minio/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "minio"; - version = "4.0.21"; + version = "5.0.1"; src = fetchPypi { inherit pname version; - sha256 = "35643f056b4d12e053fa7d8f40d98394ed7cc4d5d44ba53c9971e7428fd58e60"; + sha256 = "8f7ba1ca0750dfca3302cb03b14a92bf5f1c755ff84f9ba268079bf582e0f735"; }; disabled = !isPy3k; diff --git a/pkgs/development/python-modules/mnemonic/default.nix b/pkgs/development/python-modules/mnemonic/default.nix index 182bbf3f0758..ca41917744af 100644 --- a/pkgs/development/python-modules/mnemonic/default.nix +++ b/pkgs/development/python-modules/mnemonic/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "mnemonic"; - version = "0.18"; + version = "0.19"; src = fetchPypi { inherit pname version; - sha256 = "02a7306a792370f4a0c106c2cf1ce5a0c84b9dbd7e71c6792fdb9ad88a727f1d"; + sha256 = "4e37eb02b2cbd56a0079cabe58a6da93e60e3e4d6e757a586d9f23d96abea931"; }; propagatedBuildInputs = [ pbkdf2 ]; diff --git a/pkgs/development/python-modules/mock/default.nix b/pkgs/development/python-modules/mock/default.nix index 8ab724144f7f..87b6fbeabdc7 100644 --- a/pkgs/development/python-modules/mock/default.nix +++ b/pkgs/development/python-modules/mock/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "mock"; - version = "2.0.0"; + version = "3.0.5"; src = fetchPypi { inherit pname version; - sha256 = "1flbpksir5sqrvq2z0dp8sl4bzbadg21sj4d42w3klpdfvgvcn5i"; + sha256 = "83657d894c90d5681d62155c82bda9c1187827525880eda8ff5df4ec813437c3"; }; buildInputs = [ unittest2 ]; diff --git a/pkgs/development/python-modules/more-itertools/default.nix b/pkgs/development/python-modules/more-itertools/default.nix index 999708697a94..ad41043496a2 100644 --- a/pkgs/development/python-modules/more-itertools/default.nix +++ b/pkgs/development/python-modules/more-itertools/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "more-itertools"; - version = "6.0.0"; + version = "7.2.0"; src = fetchPypi { inherit pname version; - sha256 = "590044e3942351a1bdb1de960b739ff4ce277960f2425ad4509446dbace8d9d1"; + sha256 = "409cd48d4db7052af495b09dec721011634af3753ae1ef92d2b32f73a745f832"; }; checkInputs = [ nose ]; diff --git a/pkgs/development/python-modules/moto/default.nix b/pkgs/development/python-modules/moto/default.nix index 876b57dd01fa..500645b81e8f 100644 --- a/pkgs/development/python-modules/moto/default.nix +++ b/pkgs/development/python-modules/moto/default.nix @@ -22,6 +22,7 @@ , sure , werkzeug , xmltodict +, isPy38 }: buildPythonPackage rec { @@ -33,6 +34,10 @@ buildPythonPackage rec { sha256 = "0rhbjvqi1khp80gfnl3x632kwlpq3k7m8f13nidznixdpa78vm4m"; }; + # 3.8 is not yet support + # https://github.com/spulec/moto/pull/2519 + disabled = isPy38; + # Backported fix from 1.3.14.dev for compatibility with botocore >= 1.9.198. patches = [ (fetchpatch { diff --git a/pkgs/development/python-modules/mt-940/default.nix b/pkgs/development/python-modules/mt-940/default.nix index f3965b8a74ae..e7f382f8ac7c 100644 --- a/pkgs/development/python-modules/mt-940/default.nix +++ b/pkgs/development/python-modules/mt-940/default.nix @@ -3,12 +3,12 @@ }: buildPythonPackage rec { - version = "4.15.0"; + version = "4.18.0"; pname = "mt-940"; src = fetchPypi { inherit pname version; - sha256 = "4c1d5c23a9c3fec12a61ce3f61d8be107b4693be4a4b97381eca23f4a4dca8ed"; + sha256 = "e5b6469e9bc64522125efae1de0e557f76884c961f122028098533d6f2a98f23"; }; propagatedBuildInputs = lib.optional (!isPy3k) enum34; diff --git a/pkgs/development/python-modules/mypy-protobuf/default.nix b/pkgs/development/python-modules/mypy-protobuf/default.nix index a06a378a0768..954e913c9cf0 100644 --- a/pkgs/development/python-modules/mypy-protobuf/default.nix +++ b/pkgs/development/python-modules/mypy-protobuf/default.nix @@ -2,11 +2,11 @@ buildPythonApplication rec { pname = "mypy-protobuf"; - version = "1.9"; + version = "1.16"; src = fetchPypi { inherit pname version; - sha256 = "be1f14b0b841b49adb2f6018eaa1ce9529c8147eb561909baaa757e8cf9e821b"; + sha256 = "72ab724299aebd930b88476f6545587bff5bf480697c016097bd188841a56276"; }; propagatedBuildInputs = [ protobuf ]; diff --git a/pkgs/development/python-modules/mypy/default.nix b/pkgs/development/python-modules/mypy/default.nix index d4361baf903a..6c64580b2cf7 100644 --- a/pkgs/development/python-modules/mypy/default.nix +++ b/pkgs/development/python-modules/mypy/default.nix @@ -1,21 +1,23 @@ { stdenv, fetchPypi, buildPythonPackage, typed-ast, psutil, isPy3k -,mypy_extensions }: +, mypy-extensions +, typing-extensions +}: buildPythonPackage rec { pname = "mypy"; - version = "0.711"; + version = "0.740"; # Tests not included in pip package. doCheck = false; src = fetchPypi { inherit pname version; - sha256 = "0s1kwi1dhrv55v0c9w7c1g6mq5d2dpw7x1jj5mcnniw77mclmvdv"; + sha256 = "48c8bc99380575deb39f5d3400ebb6a8a1cb5cc669bbba4d3bb30f904e0a0e7d"; }; disabled = !isPy3k; - propagatedBuildInputs = [ typed-ast psutil mypy_extensions ]; + propagatedBuildInputs = [ typed-ast psutil mypy-extensions typing-extensions ]; meta = with stdenv.lib; { description = "Optional static typing for Python"; diff --git a/pkgs/development/python-modules/mypy/extensions.nix b/pkgs/development/python-modules/mypy/extensions.nix index f78b5e1bff4f..b3bb68a53b72 100644 --- a/pkgs/development/python-modules/mypy/extensions.nix +++ b/pkgs/development/python-modules/mypy/extensions.nix @@ -1,15 +1,16 @@ { stdenv, fetchPypi, buildPythonPackage, typing, pythonOlder }: buildPythonPackage rec { - pname = "mypy_extensions"; - version = "0.4.2"; + pname = "mypy-extensions"; + version = "0.4.3"; # Tests not included in pip package. doCheck = false; src = fetchPypi { - inherit pname version; - sha256 = "a161e3b917053de87dbe469987e173e49fb454eca10ef28b48b384538cc11458"; + inherit version; + pname = "mypy_extensions"; + sha256 = "2d82818f5bb3e369420cb3c4060a7970edba416647068eb4c5343488a6c604a8"; }; propagatedBuildInputs = if pythonOlder "3.5" then [ typing ] else [ ]; diff --git a/pkgs/development/python-modules/nest-asyncio/default.nix b/pkgs/development/python-modules/nest-asyncio/default.nix index 59c13bc0a633..3dec538c6d3c 100644 --- a/pkgs/development/python-modules/nest-asyncio/default.nix +++ b/pkgs/development/python-modules/nest-asyncio/default.nix @@ -5,13 +5,13 @@ }: buildPythonPackage rec { - version = "1.0.0"; + version = "1.2.0"; pname = "nest_asyncio"; disabled = !(pythonAtLeast "3.5"); src = fetchPypi { inherit pname version; - sha256 = "bd1cb7df2ea979e57d8ad02493ad85f9afbf1fcea3dfe34239da8c0dda98087e"; + sha256 = "f5b22dd23ee6195cea509c344d9ec34274f45bff078d8f18e9dc322dc74c6008"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/netcdf4/default.nix b/pkgs/development/python-modules/netcdf4/default.nix index fa1442a892a7..17d1cd596759 100644 --- a/pkgs/development/python-modules/netcdf4/default.nix +++ b/pkgs/development/python-modules/netcdf4/default.nix @@ -3,13 +3,13 @@ }: buildPythonPackage rec { pname = "netCDF4"; - version = "1.5.2"; + version = "1.5.3"; disabled = isPyPy; src = fetchPypi { inherit pname version; - sha256 = "08l92yzg2cy1zrkxjvwya2kpnmfzgwnvgb925hlrgcp5ga9y2xg0"; + sha256 = "2a3ca855848f4bbf07fac366da77a681fcead18c0a8813d91d46302f562dc3be"; }; checkInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/nimfa/default.nix b/pkgs/development/python-modules/nimfa/default.nix index 26f1ea3294bb..bd3e92e90dbc 100644 --- a/pkgs/development/python-modules/nimfa/default.nix +++ b/pkgs/development/python-modules/nimfa/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "nimfa"; - version = "1.3.4"; + version = "1.4.0"; src = fetchPypi { inherit pname version; - sha256 = "651376eba6b049fe270dc0d29d4b2abecb5e998c2013df6735a97875503e2ffe"; + sha256 = "39cff2b86856d03ca8a3d9c38598034ecf1a768c325fd3a728bb9eadb8c6b919"; }; propagatedBuildInputs = [ numpy scipy ]; diff --git a/pkgs/development/python-modules/notebook/2.nix b/pkgs/development/python-modules/notebook/2.nix index d081a5a92fbe..8a49f761ced2 100644 --- a/pkgs/development/python-modules/notebook/2.nix +++ b/pkgs/development/python-modules/notebook/2.nix @@ -25,11 +25,11 @@ buildPythonPackage rec { pname = "notebook"; - version = "5.7.8"; + version = "6.0.1"; src = fetchPypi { inherit pname version; - sha256 = "573e0ae650c5d76b18b6e564ba6d21bf321d00847de1d215b418acb64f056eb8"; + sha256 = "660976fe4fe45c7aa55e04bf4bccb9f9566749ff637e9020af3422f9921f9a5d"; }; LC_ALL = "en_US.utf8"; diff --git a/pkgs/development/python-modules/numexpr/default.nix b/pkgs/development/python-modules/numexpr/default.nix index 78203b3571bb..775d279b3177 100644 --- a/pkgs/development/python-modules/numexpr/default.nix +++ b/pkgs/development/python-modules/numexpr/default.nix @@ -7,16 +7,15 @@ buildPythonPackage rec { pname = "numexpr"; - version = "2.6.9"; + version = "2.7.0"; src = fetchPypi { inherit pname version; - sha256 = "fc218b777cdbb14fa8cff8f28175ee631bacabbdd41ca34e061325b6c44a6fa6"; + sha256 = "37324b5981b8962102bdc8640c4f05f5589da5d1df2702418783085cb78ca217"; }; # Remove existing site.cfg, use the one we built for numpy. preBuild = '' - rm site.cfg ln -s ${numpy.cfg} site.cfg ''; diff --git a/pkgs/development/python-modules/oauthenticator/default.nix b/pkgs/development/python-modules/oauthenticator/default.nix index 85dc80681aad..81c6daaf2de7 100644 --- a/pkgs/development/python-modules/oauthenticator/default.nix +++ b/pkgs/development/python-modules/oauthenticator/default.nix @@ -16,11 +16,11 @@ buildPythonPackage rec { pname = "oauthenticator"; - version = "0.8.2"; + version = "0.9.0"; src = fetchPypi { inherit pname version; - sha256 = "5195b5d66808787894590926b038381eb47495c9df4fd0d907c84d86cb35132f"; + sha256 = "0ce31c929bb456ad8734b9b8a7f539e44ab3afff07169e25e974ca576f4c836c"; }; checkPhase = '' diff --git a/pkgs/development/python-modules/oauthlib/default.nix b/pkgs/development/python-modules/oauthlib/default.nix index ed533253390d..b8b85f606a94 100644 --- a/pkgs/development/python-modules/oauthlib/default.nix +++ b/pkgs/development/python-modules/oauthlib/default.nix @@ -9,12 +9,12 @@ }: buildPythonPackage rec { - version = "3.0.2"; + version = "3.1.0"; pname = "oauthlib"; src = fetchPypi { inherit pname version; - sha256 = "b4d99ae8ccfb7d33ba9591b59355c64eef5241534aa3da2e4c0435346b84bc8e"; + sha256 = "bee41cc35fcca6e988463cacc3bcb8a96224f470ca547e697b604cc697b2f889"; }; checkInputs = [ mock pytest ]; diff --git a/pkgs/development/python-modules/ofxtools/default.nix b/pkgs/development/python-modules/ofxtools/default.nix index adcb640df139..1aa6b75e8bfa 100644 --- a/pkgs/development/python-modules/ofxtools/default.nix +++ b/pkgs/development/python-modules/ofxtools/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "ofxtools"; - version = "0.5.4"; + version = "0.8.20"; src = fetchPypi { inherit pname version; - sha256 = "83e1ca0a61463fca99d096a694466726a49979a5d2b8a36a65514c7a8617d3ea"; + sha256 = "87245679911c0c12429a476fd269611512d3e4b44cb8871159bb76ba70f8a46f"; }; checkPhase = '' diff --git a/pkgs/development/python-modules/openpyxl/default.nix b/pkgs/development/python-modules/openpyxl/default.nix index b7d39e08497d..c2075fe4f8e3 100644 --- a/pkgs/development/python-modules/openpyxl/default.nix +++ b/pkgs/development/python-modules/openpyxl/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchPypi +, isPy27 , pytest , jdcal , et_xmlfile @@ -9,11 +10,12 @@ buildPythonPackage rec { pname = "openpyxl"; - version = "2.6.4"; + version = "3.0.0"; + disabled = isPy27; # 2.6.4 was final python2 release src = fetchPypi { inherit pname version; - sha256 = "1d53801678e18d7fe38c116f1ad0c2383a654670c4c8806105b611c92d92f2e3"; + sha256 = "340a1ab2069764559b9d58027a43a24db18db0e25deb80f81ecb8ca7ee5253db"; }; checkInputs = [ pytest ]; @@ -35,4 +37,4 @@ buildPythonPackage rec { license = lib.licenses.mit; maintainers = with lib.maintainers; [ lihop sjourdois ]; }; -} \ No newline at end of file +} diff --git a/pkgs/development/python-modules/opt-einsum/default.nix b/pkgs/development/python-modules/opt-einsum/default.nix index f4e7d38ecb84..064c0adb1348 100644 --- a/pkgs/development/python-modules/opt-einsum/default.nix +++ b/pkgs/development/python-modules/opt-einsum/default.nix @@ -1,12 +1,12 @@ { buildPythonPackage, fetchPypi, lib, numpy, pytest_4 }: buildPythonPackage rec { - version = "3.0.1"; + version = "3.1.0"; pname = "opt_einsum"; src = fetchPypi { inherit version pname; - sha256 = "1agyvq26x0zd6j3wzgczl4apx8v7cb9w1z50azn8c3pq9jphgfla"; + sha256 = "edfada4b1d0b3b782ace8bc14e80618ff629abf53143e1e6bbf9bd00b11ece77"; }; propagatedBuildInputs = [ numpy ]; diff --git a/pkgs/development/python-modules/optuna/default.nix b/pkgs/development/python-modules/optuna/default.nix index fc62f67430f4..bc96c4a2d470 100644 --- a/pkgs/development/python-modules/optuna/default.nix +++ b/pkgs/development/python-modules/optuna/default.nix @@ -28,12 +28,12 @@ buildPythonPackage rec { pname = "optuna"; - version = "0.13.0"; + version = "0.17.1"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "915b9d7b28f7f7cdf015d8617c689ca90eda7a5bbd59c5fc232c9eccc9a91585"; + sha256 = "3d1d3547340c47f34f3a416a2e0761a0ff887ae8ce06474e84ebcc8600afd438"; }; checkInputs = [ diff --git a/pkgs/development/python-modules/outcome/default.nix b/pkgs/development/python-modules/outcome/default.nix index dc06ab63d2d9..ff97ca15a928 100644 --- a/pkgs/development/python-modules/outcome/default.nix +++ b/pkgs/development/python-modules/outcome/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "outcome"; - version = "1.0.0"; + version = "1.0.1"; disabled = pythonOlder "3.4"; src = fetchPypi { inherit pname version; - sha256 = "0wdcakx1r1317bx6139k9gv6k272fryid83d1kk0r43andfw0n4x"; + sha256 = "fc7822068ba7dd0fc2532743611e8a73246708d3564e29a39f93d6ab3701b66f"; }; checkInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/packaging/default.nix b/pkgs/development/python-modules/packaging/default.nix index 2d12b32b438c..cb1b4bb0a7d2 100644 --- a/pkgs/development/python-modules/packaging/default.nix +++ b/pkgs/development/python-modules/packaging/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "packaging"; - version = "19.0"; + version = "19.2"; src = fetchPypi { inherit pname version; - sha256 = "0c98a5d0be38ed775798ece1b9727178c4469d9c3b4ada66e8e6b7849f8732af"; + sha256 = "28b924174df7a2fa32c1953825ff29c61e2f5e082343165438812f00d3a7fc47"; }; propagatedBuildInputs = [ pyparsing six ]; diff --git a/pkgs/development/python-modules/packet-python/default.nix b/pkgs/development/python-modules/packet-python/default.nix index 61d387590480..2c56372c2faf 100644 --- a/pkgs/development/python-modules/packet-python/default.nix +++ b/pkgs/development/python-modules/packet-python/default.nix @@ -12,10 +12,10 @@ buildPythonPackage rec { pname = "packet-python"; - version = "1.38.2"; + version = "1.41.0"; src = fetchPypi { inherit pname version; - sha256 = "1lh97la51fa3nxjl4ngsanrxw6qq5jwwn0dxj2f0946m043200xl"; + sha256 = "685021502293f6b2e733376bcd0fef3f082c1a66c27072d92f483e27e387ad43"; }; nativeBuildInputs = [ pytestrunner ]; propagatedBuildInputs = [ requests ]; diff --git a/pkgs/development/python-modules/palettable/default.nix b/pkgs/development/python-modules/palettable/default.nix index a27ad2172e01..6313e759e6be 100644 --- a/pkgs/development/python-modules/palettable/default.nix +++ b/pkgs/development/python-modules/palettable/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "palettable"; - version = "3.2.0"; + version = "3.3.0"; src = fetchPypi { inherit pname version; - sha256 = "1qp83l4mnwa9rb06m1d45i4691nkbqi82895ck4j6pirb825mz4c"; + sha256 = "72feca71cf7d79830cd6d9181b02edf227b867d503bec953cf9fa91bf44896bd"; }; checkInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/pandas/2.nix b/pkgs/development/python-modules/pandas/2.nix index 6283addcb6eb..0ea27b04dcbe 100644 --- a/pkgs/development/python-modules/pandas/2.nix +++ b/pkgs/development/python-modules/pandas/2.nix @@ -32,11 +32,11 @@ let in buildPythonPackage rec { pname = "pandas"; - version = "0.24.2"; + version = "0.25.2"; src = fetchPypi { inherit pname version; - sha256 = "18imlm8xbhcbwy4wa957a1fkamrcb0z988z006jpfda3ki09z4ag"; + sha256 = "ca91a19d1f0a280874a24dca44aadce42da7f3a7edb7e9ab7c7baad8febee2be"; }; checkInputs = [ pytest glibcLocales moto hypothesis ]; diff --git a/pkgs/development/python-modules/pandas/default.nix b/pkgs/development/python-modules/pandas/default.nix index 8abe4d3bf24b..b3dcec637feb 100644 --- a/pkgs/development/python-modules/pandas/default.nix +++ b/pkgs/development/python-modules/pandas/default.nix @@ -30,11 +30,11 @@ let in buildPythonPackage rec { pname = "pandas"; - version = "0.25.1"; + version = "0.25.2"; src = fetchPypi { inherit pname version; - sha256 = "1xm9dmbngsq46vj836csnb5j0bs88b1d713b0b5vx1q6gdxijbnb"; + sha256 = "ca91a19d1f0a280874a24dca44aadce42da7f3a7edb7e9ab7c7baad8febee2be"; }; checkInputs = [ pytest glibcLocales moto hypothesis ]; diff --git a/pkgs/development/python-modules/paperspace/default.nix b/pkgs/development/python-modules/paperspace/default.nix index e3427add427f..7999ce03efe0 100644 --- a/pkgs/development/python-modules/paperspace/default.nix +++ b/pkgs/development/python-modules/paperspace/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "paperspace"; - version = "0.0.19"; + version = "0.2.0"; src = fetchPypi { inherit pname version; - sha256 = "2216fb31919595ba442077e8028cc05b0598421a74604daeae4d2baa5e8409d9"; + sha256 = "7959305128fea6da8ca0cdc528783a89859dacb9b54bf8eb89fd04a518872191"; }; propagatedBuildInputs = [ boto3 requests ]; diff --git a/pkgs/development/python-modules/parameterized/default.nix b/pkgs/development/python-modules/parameterized/default.nix index 8d13fcfb4d54..b930b8dcd179 100644 --- a/pkgs/development/python-modules/parameterized/default.nix +++ b/pkgs/development/python-modules/parameterized/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchPypi, buildPythonPackage, nose, mock, glibcLocales, isPy3k }: +{ stdenv, fetchPypi, buildPythonPackage, nose, mock, glibcLocales, isPy3k, isPy38 }: buildPythonPackage rec { pname = "parameterized"; @@ -10,7 +10,8 @@ buildPythonPackage rec { }; # Tests require some python3-isms but code works without. - doCheck = isPy3k; + # python38 is not fully supported yet + doCheck = isPy3k && (!isPy38); checkInputs = [ nose mock glibcLocales ]; diff --git a/pkgs/development/python-modules/parsy/default.nix b/pkgs/development/python-modules/parsy/default.nix index 4183f30caad9..c7ee17f8c8dc 100644 --- a/pkgs/development/python-modules/parsy/default.nix +++ b/pkgs/development/python-modules/parsy/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "parsy"; - version = "1.2.0"; + version = "1.3.0"; src = fetchPypi { inherit pname version; - sha256 = "0mdqg07x5ybmbmj55x75gyhfcjrn7ml0cf3z0jwbskx845j31m6x"; + sha256 = "bfc941ea5a69e6ac16bd4f7d9f807bbc17e35edd8b95bcd2499a25b059359012"; }; checkInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/partd/default.nix b/pkgs/development/python-modules/partd/default.nix index c7691df6b118..b400e8030f97 100644 --- a/pkgs/development/python-modules/partd/default.nix +++ b/pkgs/development/python-modules/partd/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "partd"; - version = "0.3.10"; + version = "1.0.0"; src = fetchPypi { inherit pname version; - sha256 = "33722a228ebcd1fa6f44b1631bdd4cff056376f89eb826d7d880b35b637bcfba"; + sha256 = "54fd91bc3b9c38159c790cd16950dbca6b019a2ead4c51dee4f9efc884f8ce0e"; }; checkInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/pastescript/default.nix b/pkgs/development/python-modules/pastescript/default.nix index fe89e6e5aeab..c7a863ea0f59 100644 --- a/pkgs/development/python-modules/pastescript/default.nix +++ b/pkgs/development/python-modules/pastescript/default.nix @@ -9,12 +9,12 @@ }: buildPythonPackage rec { - version = "3.0.0"; + version = "3.2.0"; pname = "PasteScript"; src = fetchPypi { inherit pname version; - sha256 = "d9d4d98df8606ad3bfa77be4722207d1a53a0fbcc714ee75d0fcd8a5c3f775c3"; + sha256 = "9b0f5c0f1c6a510a353fa7c3dc4fdaab9071462d60d24573de76a001fbc172ac"; }; buildInputs = [ nose ]; diff --git a/pkgs/development/python-modules/pbr/default.nix b/pkgs/development/python-modules/pbr/default.nix index c3d5ba170e3f..a03975e1b395 100644 --- a/pkgs/development/python-modules/pbr/default.nix +++ b/pkgs/development/python-modules/pbr/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pbr"; - version = "5.1.3"; + version = "5.4.3"; src = fetchPypi { inherit pname version; - sha256 = "8c361cc353d988e4f5b998555c88098b9d5964c2e11acf7b0d21925a66bb5824"; + sha256 = "2c8e420cd4ed4cec4e7999ee47409e876af575d4c35a45840d59e8b5f3155ab8"; }; # circular dependencies with fixtures diff --git a/pkgs/development/python-modules/pelican/default.nix b/pkgs/development/python-modules/pelican/default.nix index cbda650158b5..7066ecd3a527 100644 --- a/pkgs/development/python-modules/pelican/default.nix +++ b/pkgs/development/python-modules/pelican/default.nix @@ -6,13 +6,13 @@ buildPythonPackage rec { pname = "pelican"; - version = "4.1.1"; + version = "4.2.0"; src = fetchFromGitHub { owner = "getpelican"; repo = "pelican"; rev = version; - sha256 = "08lwbkgqdf6qx9vg17qj70k7nz2j34ymlnrc4cbz7xj98cw4ams1"; + sha256 = "0w9nqdw2jmqc6kqwg4rh6irr5k6j7hk8axg6vgd137rs50v62yv5"; # Remove unicode file names which leads to different checksums on HFS+ # vs. other filesystems because of unicode normalisation. extraPostFetch = '' @@ -31,7 +31,7 @@ buildPythonPackage rec { glibcLocales # Note: Pelican has to adapt to a changed CLI of pandoc before enabling this # again. Compare https://github.com/getpelican/pelican/pull/2252. - # Version 4.1.1 is incompatible with our current pandoc version. + # Version 4.2.0 is incompatible with our current pandoc version. # pandoc git mock diff --git a/pkgs/development/python-modules/persim/default.nix b/pkgs/development/python-modules/persim/default.nix index 8240b437ecd1..d5e656c7b8fc 100644 --- a/pkgs/development/python-modules/persim/default.nix +++ b/pkgs/development/python-modules/persim/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "persim"; - version = "0.0.10"; + version = "0.1.1"; src = fetchPypi { inherit pname version; - sha256 = "a644a932c5aaf6976bd59003d2823db9276779aa4f9d99dcccc99dc234c80c1f"; + sha256 = "932bb0489d4dc158e4f007ec609c61e4700003d882d8e7bdac218b70d14ce9cf"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pexpect/default.nix b/pkgs/development/python-modules/pexpect/default.nix index 0116212ad9ea..01b16d5bd639 100644 --- a/pkgs/development/python-modules/pexpect/default.nix +++ b/pkgs/development/python-modules/pexpect/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "pexpect"; - version = "4.6.0"; + version = "4.7.0"; src = fetchPypi { inherit pname version; - sha256 = "2a8e88259839571d1251d278476f3eec5db26deb73a70be5ed5dc5435e418aba"; + sha256 = "9e2c1fd0e6ee3a49b28f95d4b33bc389c89b20af6a1255906e90ff1262ce62eb"; }; # Wants to run pythonin a subprocess diff --git a/pkgs/development/python-modules/pg8000/1_12.nix b/pkgs/development/python-modules/pg8000/1_12.nix index efeee5e077fb..444da7adc232 100644 --- a/pkgs/development/python-modules/pg8000/1_12.nix +++ b/pkgs/development/python-modules/pg8000/1_12.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "pg8000"; - version = "1.12.5"; + version = "1.13.2"; src = fetchPypi { inherit pname version; - sha256 = "1yc3knh28cx3rjb2ifg5kmqqa78yyyw2gzzslbm9fj0mzh5aq1sx"; + sha256 = "eebcb4176a7e407987e525a07454882f611985e0becb2b73f76efb93bbdc0aab"; }; propagatedBuildInputs = [ pytz six ]; diff --git a/pkgs/development/python-modules/pglast/default.nix b/pkgs/development/python-modules/pglast/default.nix index bfa6c301a7ba..eef727937767 100644 --- a/pkgs/development/python-modules/pglast/default.nix +++ b/pkgs/development/python-modules/pglast/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "pglast"; - version = "1.4"; + version = "1.6"; src = fetchPypi { inherit pname version; - sha256 = "1442ae2cfc6427e9a8fcc2dc18d9ecfcaa1b16eba237fdcf0b2b13912eab9a86"; + sha256 = "dcbd8061c553b90440741b77fbb274beca84716641a50be8675a6afe6dfbcea2"; }; disabled = !isPy3k; diff --git a/pkgs/development/python-modules/phonenumbers/default.nix b/pkgs/development/python-modules/phonenumbers/default.nix index 03995647986f..288e33e05064 100644 --- a/pkgs/development/python-modules/phonenumbers/default.nix +++ b/pkgs/development/python-modules/phonenumbers/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "phonenumbers"; - version = "8.10.20"; + version = "8.10.21"; src = fetchPypi { inherit pname version; - sha256 = "f743940907118dacb552da39caf1839632a5cc510157fc468a1f497f36562e1c"; + sha256 = "162301aa2ce7c1a7196d7b5b084e3263a0a5f55e3129fe2429f2a115c3ef16c3"; }; meta = { diff --git a/pkgs/development/python-modules/phonopy/default.nix b/pkgs/development/python-modules/phonopy/default.nix index 026d466d2185..e8f92bd8d78f 100644 --- a/pkgs/development/python-modules/phonopy/default.nix +++ b/pkgs/development/python-modules/phonopy/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "phonopy"; - version = "2.0.0"; + version = "2.3.2.post11"; src = fetchPypi { inherit pname version; - sha256 = "46baf7c4571fe75374071674727c2beb0388cf57073e0623d8457f04b1c54495"; + sha256 = "4b4ef1c11bafa161a409ad018cbf8469aacd42fc77fd954442760161f63dd345"; }; propagatedBuildInputs = [ numpy pyyaml matplotlib h5py ]; diff --git a/pkgs/development/python-modules/pikepdf/default.nix b/pkgs/development/python-modules/pikepdf/default.nix index 5ae36f5fae23..ad2bae4a45e4 100644 --- a/pkgs/development/python-modules/pikepdf/default.nix +++ b/pkgs/development/python-modules/pikepdf/default.nix @@ -22,12 +22,12 @@ buildPythonPackage rec { pname = "pikepdf"; - version = "1.6.4"; + version = "1.6.5"; disabled = ! isPy3k; src = fetchPypi { inherit pname version; - sha256 = "50ad2f2903db21b9105c1092ef947b456134a77355b4386535492dc28a6a4e52"; + sha256 = "ee935eea84fa5fc1879355de38cd47216e5e922553303ee045c35917e13b2fcf"; }; buildInputs = [ diff --git a/pkgs/development/python-modules/pillow/default.nix b/pkgs/development/python-modules/pillow/default.nix index 7fea42f98079..7dc6ce9051b7 100644 --- a/pkgs/development/python-modules/pillow/default.nix +++ b/pkgs/development/python-modules/pillow/default.nix @@ -6,11 +6,11 @@ }: buildPythonPackage rec { pname = "Pillow"; - version = "6.2.0"; + version = "6.2.1"; src = fetchPypi { inherit pname version; - sha256 = "4548236844327a718ce3bb182ab32a16fa2050c61e334e959f554cac052fb0df"; + sha256 = "bf4e972a88f8841d8fdc6db1a75e0f8d763e66e3754b03006cbc3854d89f1cb1"; }; doCheck = !stdenv.isDarwin && !isPyPy; diff --git a/pkgs/development/python-modules/pip-tools/default.nix b/pkgs/development/python-modules/pip-tools/default.nix index 3358c27a29a7..2b00da73bf79 100644 --- a/pkgs/development/python-modules/pip-tools/default.nix +++ b/pkgs/development/python-modules/pip-tools/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "pip-tools"; - version = "3.8.0"; + version = "4.2.0"; src = fetchPypi { inherit pname version; - sha256 = "1vwh3hx4jrzf51yj9h31nk9ji53lqaq63mlqd7n84hcmfwy3rwz4"; + sha256 = "5427ea4dcc175649723985fbcace9b2d8f46f9adbcc63bc2d7b247d9bcc74917"; }; LC_ALL = "en_US.UTF-8"; diff --git a/pkgs/development/python-modules/pkgconfig/default.nix b/pkgs/development/python-modules/pkgconfig/default.nix index ab8c2f638b41..791905aef0f5 100644 --- a/pkgs/development/python-modules/pkgconfig/default.nix +++ b/pkgs/development/python-modules/pkgconfig/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "pkgconfig"; - version = "1.4.0"; + version = "1.5.1"; setupHook = pkgconfig.setupHook; src = fetchPypi { inherit pname version; - sha256 = "048c3b457da7b6f686b647ab10bf09e2250e4c50acfe6f215398a8b5e6fcdb52"; + sha256 = "97bfe3d981bab675d5ea3ef259045d7919c93897db7d3b59d4e8593cba8d354f"; }; checkInputs = [ nose ]; diff --git a/pkgs/development/python-modules/plac/default.nix b/pkgs/development/python-modules/plac/default.nix index a697258e697c..0622e41fa7e2 100644 --- a/pkgs/development/python-modules/plac/default.nix +++ b/pkgs/development/python-modules/plac/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { cd doc ${python.interpreter} -m unittest discover -p "*test_plac*" ''; - + meta = with stdenv.lib; { description = "Parsing the Command Line the Easy Way"; homepage = https://github.com/micheles/plac; diff --git a/pkgs/development/python-modules/plaid-python/default.nix b/pkgs/development/python-modules/plaid-python/default.nix index 8577441cf9d2..428d88d18313 100644 --- a/pkgs/development/python-modules/plaid-python/default.nix +++ b/pkgs/development/python-modules/plaid-python/default.nix @@ -1,12 +1,12 @@ { lib, buildPythonPackage, fetchPypi, requests, pytest }: buildPythonPackage rec { - version = "2.4.1"; + version = "3.4.0"; pname = "plaid-python"; src = fetchPypi { inherit pname version; - sha256 = "2b7832f9fe0c6cd23dfdb805bcfc52e2ff06fca6604e5782b7518904c1dad6bb"; + sha256 = "bbfad84b8c827a14bc5b0ab93e1e5c7117908e5fa4cdecaa44a037298a20b7de"; }; checkInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/plotly/default.nix b/pkgs/development/python-modules/plotly/default.nix index c12857759dd1..9bf22b939d1b 100644 --- a/pkgs/development/python-modules/plotly/default.nix +++ b/pkgs/development/python-modules/plotly/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "plotly"; - version = "4.1.1"; + version = "4.2.1"; src = fetchPypi { inherit pname version; - sha256 = "06gjvicl5k0qn8xz2gnqd4akxvd81n16gwssr7gwlnmdic5da30g"; + sha256 = "6650ddb4da3aa94dcaa32e0779e611c6b17f371b5250ffdbf5ece6d66ba4483b"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/poetry/default.nix b/pkgs/development/python-modules/poetry/default.nix index 52be2c3bafc7..d31fe236f82c 100644 --- a/pkgs/development/python-modules/poetry/default.nix +++ b/pkgs/development/python-modules/poetry/default.nix @@ -17,10 +17,11 @@ , virtualenv , functools32 , pytest +, jsonschema }: let - cleo6 = cleo.overrideAttrs (oldAttrs: rec { + cleo6 = cleo.overridePythonAttrs (oldAttrs: rec { version = "0.6.8"; src = fetchPypi { inherit (oldAttrs) pname; @@ -28,8 +29,6 @@ let sha256 = "06zp695hq835rkaq6irr1ds1dp2qfzyf32v60vxpd8rcnxv319l5"; }; }); - - jsonschema3 = callPackage ./jsonschema.nix { }; glob2 = callPackage ./glob2.nix { }; in buildPythonPackage rec { @@ -51,11 +50,12 @@ in buildPythonPackage rec { format = "pyproject"; propagatedBuildInputs = [ + cachy cleo6 requests cachy requests-toolbelt - jsonschema3 + jsonschema pyrsistent pyparsing cachecontrol diff --git a/pkgs/development/python-modules/poetry/jsonschema.nix b/pkgs/development/python-modules/poetry/jsonschema.nix deleted file mode 100644 index f85477d04fac..000000000000 --- a/pkgs/development/python-modules/poetry/jsonschema.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ lib, buildPythonPackage, fetchPypi, isPy27 -, attrs -, pyrsistent -, six -, functools32 -, lockfile -, setuptools_scm -}: - -buildPythonPackage rec { - pname = "jsonschema"; - version = "3.0.2"; - - src = fetchPypi { - inherit pname version; - sha256 = "8d4a2b7b6c2237e0199c8ea1a6d3e05bf118e289ae2b9d7ba444182a2959560d"; - }; - - nativeBuildInputs = [ setuptools_scm ]; - propagatedBuildInputs = [ - attrs - pyrsistent - six - lockfile - ] ++ lib.optional isPy27 functools32; - - # tests for latest version rely on custom version of betterpaths that is - # difficult to deal with and isn't used on master - doCheck = false; - - meta = with lib; { - homepage = https://github.com/Julian/jsonschema; - description = "An implementation of JSON Schema validation for Python"; - license = licenses.mit; - maintainers = with maintainers; [ jakewaksbaum ]; - }; -} diff --git a/pkgs/development/python-modules/portend/default.nix b/pkgs/development/python-modules/portend/default.nix index 7aa66c2a3093..b7d730d6ae00 100644 --- a/pkgs/development/python-modules/portend/default.nix +++ b/pkgs/development/python-modules/portend/default.nix @@ -1,13 +1,13 @@ { stdenv, buildPythonPackage, fetchPypi -, pytest, setuptools_scm, tempora }: +, pytest, setuptools_scm, tempora, pytest-black }: buildPythonPackage rec { pname = "portend"; - version = "2.3"; + version = "2.5"; src = fetchPypi { inherit pname version; - sha256 = "b7ce7d35ea262415297cbfea86226513e77b9ee5f631d3baa11992d663963719"; + sha256 = "19dc27bfb3c72471bd30a235a4d5fbefef8a7e31cab367744b5d87a205e7bfd9"; }; postPatch = '' @@ -18,7 +18,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ tempora ]; - checkInputs = [ pytest ]; + checkInputs = [ pytest pytest-black ]; checkPhase = '' py.test --deselect=test_portend.py::TestChecker::test_check_port_listening diff --git a/pkgs/development/python-modules/prawcore/default.nix b/pkgs/development/python-modules/prawcore/default.nix index 282e8bac069e..f16937692c20 100644 --- a/pkgs/development/python-modules/prawcore/default.nix +++ b/pkgs/development/python-modules/prawcore/default.nix @@ -1,7 +1,7 @@ { stdenv, buildPythonPackage, fetchPypi , requests , testfixtures, mock, requests_toolbelt -, betamax, betamax-serializers, betamax-matchers +, betamax, betamax-serializers, betamax-matchers, pytest }: buildPythonPackage rec { @@ -24,8 +24,13 @@ buildPythonPackage rec { betamax-serializers betamax-matchers requests_toolbelt + pytest ]; + checkPhase = '' + pytest + ''; + meta = with stdenv.lib; { description = "Low-level communication layer for PRAW"; homepage = https://praw.readthedocs.org/; diff --git a/pkgs/development/python-modules/progressbar2/default.nix b/pkgs/development/python-modules/progressbar2/default.nix index e348ace06b4f..b9e16f6e4577 100644 --- a/pkgs/development/python-modules/progressbar2/default.nix +++ b/pkgs/development/python-modules/progressbar2/default.nix @@ -16,11 +16,11 @@ buildPythonPackage rec { pname = "progressbar2"; - version = "3.42.0"; + version = "3.47.0"; src = fetchPypi { inherit pname version; - sha256 = "0a26r022lvz0vvwvhq2rfyl6h0hxbayvgbnajpnc0fc8f4gzr1n0"; + sha256 = "7538d02045a1fd3aa2b2834bfda463da8755bd3ff050edc6c5ddff3bc616215f"; }; postPatch = '' diff --git a/pkgs/development/python-modules/prometheus_client/default.nix b/pkgs/development/python-modules/prometheus_client/default.nix index 67b828387980..17c04df814fa 100644 --- a/pkgs/development/python-modules/prometheus_client/default.nix +++ b/pkgs/development/python-modules/prometheus_client/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "prometheus_client"; - version = "0.5.0"; + version = "0.7.1"; src = fetchPypi { inherit pname version; - sha256 = "e8c11ff5ca53de6c3d91e1510500611cafd1d247a937ec6c588a0a7cc3bef93c"; + sha256 = "71cd24a2b3eb335cb800c7159f423df1bd4dcd5171b234be15e3f31ec9f622da"; }; doCheck = false; diff --git a/pkgs/development/python-modules/psd-tools/default.nix b/pkgs/development/python-modules/psd-tools/default.nix index 5f6c23beb028..bdabdae2691c 100644 --- a/pkgs/development/python-modules/psd-tools/default.nix +++ b/pkgs/development/python-modules/psd-tools/default.nix @@ -4,7 +4,7 @@ buildPythonPackage rec { pname = "psd-tools"; - version = "1.4"; + version = "1.8.30"; meta = { description = "Python package for reading Adobe Photoshop PSD files"; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "0g2vss5hwlk96w0yj42n7ia56mly51n92f2rlbrifhn8hfbxd38s"; + sha256 = "101d7df09f9a745f7729c25a1621428e501910ed6436d639e1aded4b03c14e02"; }; propagatedBuildInputs = [ docopt pillow ]; diff --git a/pkgs/development/python-modules/psycopg2/default.nix b/pkgs/development/python-modules/psycopg2/default.nix index 7ce65aea2cac..2c78a66d86a3 100644 --- a/pkgs/development/python-modules/psycopg2/default.nix +++ b/pkgs/development/python-modules/psycopg2/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "psycopg2"; - version = "2.8.3"; + version = "2.8.4"; disabled = isPyPy; src = fetchPypi { inherit pname version; - sha256 = "0ms4kx0p5n281l89awccix4d05ybmdngnjjpi9jbzd0rhf1nwyl9"; + sha256 = "f898e5cc0a662a9e12bde6f931263a1bbd350cfb18e1d5336a12927851825bb6"; }; buildInputs = lib.optional stdenv.isDarwin openssl; diff --git a/pkgs/development/python-modules/py-vapid/default.nix b/pkgs/development/python-modules/py-vapid/default.nix index d5af1c1c33dd..b0ca5c262cfd 100644 --- a/pkgs/development/python-modules/py-vapid/default.nix +++ b/pkgs/development/python-modules/py-vapid/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "py-vapid"; - version = "1.5.0"; + version = "1.7.0"; src = fetchPypi { inherit pname version; - sha256 = "1b3g4ljkpi6ka5n63bl5y47r3qhxjmr6qfamqwxnmna2567b5las"; + sha256 = "03057a3270ddc7d53c31e2915083d01ba8a3169f4032cab3dd9f4ebe44e2564a"; }; propagatedBuildInputs = [ cryptography ]; diff --git a/pkgs/development/python-modules/py3buddy/default.nix b/pkgs/development/python-modules/py3buddy/default.nix new file mode 100644 index 000000000000..459922c9bafd --- /dev/null +++ b/pkgs/development/python-modules/py3buddy/default.nix @@ -0,0 +1,38 @@ +{ stdenv +, fetchFromGitHub +, python +, pyusb +}: + +stdenv.mkDerivation rec { + pname = "py3buddy"; + version = "unstable-2019-09-29"; + + src = fetchFromGitHub { + owner = "armijnhemel"; + repo = pname; + rev = "2b28908454645117368ca56df67548c93f4e0b03"; + sha256 = "12ar4kbplavndarkrbibxi5i607f5sfia5myscvalqy78lc33798"; + }; + + propagatedBuildInputs = [ pyusb ]; + + dontConfigure = true; + dontBuild = true; + dontCheck = true; + + installPhase = '' + install -D py3buddy.py $out/${python.sitePackages}/py3buddy.py + ''; + + postInstall = '' + install -D 99-ibuddy.rules $out/lib/udev/rules.d/99-ibuddy.rules + ''; + + meta = with stdenv.lib; { + description = "Code to work with the iBuddy MSN figurine"; + homepage = "https://github.com/armijnhemel/py3buddy"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ prusnak ]; + }; +} diff --git a/pkgs/development/python-modules/py3status/default.nix b/pkgs/development/python-modules/py3status/default.nix index 8db3278bc4c4..142c7cc22570 100644 --- a/pkgs/development/python-modules/py3status/default.nix +++ b/pkgs/development/python-modules/py3status/default.nix @@ -23,11 +23,11 @@ buildPythonPackage rec { pname = "py3status"; - version = "3.20"; + version = "3.21"; src = fetchPypi { inherit pname version; - sha256 = "14p0ikbgy1pgphy00gvi6zpkz2kf5mwmawbdqs0l57s0fzrz7xwz"; + sha256 = "c208c680d1511e8c1dc950a930d3ee1b83f2dbfaac1308cd43c4773810fee89b"; }; doCheck = false; diff --git a/pkgs/development/python-modules/pyaml/default.nix b/pkgs/development/python-modules/pyaml/default.nix index 927963cec8d2..8601488bcf4c 100644 --- a/pkgs/development/python-modules/pyaml/default.nix +++ b/pkgs/development/python-modules/pyaml/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "pyaml"; - version = "18.11.0"; + version = "19.4.1"; src = fetchPypi { inherit pname version; - sha256 = "b96292cc409e0f222b6fecff96afd2e19cfab5d1f2606344907751d42301263a"; + sha256 = "c79ae98ececda136a034115ca178ee8bf3aa7df236c488c2f55d12f177b88f1e"; }; propagatedBuildInputs = [ pyyaml ]; diff --git a/pkgs/development/python-modules/pyannotate/default.nix b/pkgs/development/python-modules/pyannotate/default.nix index a09463a76d35..06dcdf83bcca 100644 --- a/pkgs/development/python-modules/pyannotate/default.nix +++ b/pkgs/development/python-modules/pyannotate/default.nix @@ -3,7 +3,7 @@ , fetchPypi , pythonOlder , six -, mypy_extensions +, mypy-extensions , typing , pytest }: @@ -18,7 +18,7 @@ buildPythonPackage rec { }; checkInputs = [ pytest ]; - propagatedBuildInputs = [ six mypy_extensions ] + propagatedBuildInputs = [ six mypy-extensions ] ++ stdenv.lib.optionals (pythonOlder "3.5") [ typing ]; checkPhase = '' diff --git a/pkgs/development/python-modules/pyatmo/default.nix b/pkgs/development/python-modules/pyatmo/default.nix index 13f8efbb5813..bd1caba1d27b 100644 --- a/pkgs/development/python-modules/pyatmo/default.nix +++ b/pkgs/development/python-modules/pyatmo/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "pyatmo"; - version = "1.10"; + version = "2.3.2"; src = fetchPypi { inherit pname version; - sha256 = "13ca794416707b8cefcb7584bbfff65a4640fcc2510ad73e818fef94d424fca6"; + sha256 = "2c76740e5adbf8b14d8f41d4f84ce23c0e8e738b18b926dc60858c35bf2fa8f2"; }; # Upstream provides no unit tests. diff --git a/pkgs/development/python-modules/pybase64/default.nix b/pkgs/development/python-modules/pybase64/default.nix index afc353d182c4..544ce1826f34 100644 --- a/pkgs/development/python-modules/pybase64/default.nix +++ b/pkgs/development/python-modules/pybase64/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pybase64"; - version = "0.5.0"; + version = "1.0.0"; src = fetchPypi { inherit pname version; - sha256 = "b26263fb6aff11b1e62965c3bac205c4ebe147f37c213191384acafea7f8ab50"; + sha256 = "71a729b10232b38cba001e621dbaa6dbba2302dc44a93706295f1ff760f40876"; }; propagatedBuildInputs = [ six ]; diff --git a/pkgs/development/python-modules/pybotvac/default.nix b/pkgs/development/python-modules/pybotvac/default.nix index 7d6c7abf9b35..e7ad1ef2d351 100644 --- a/pkgs/development/python-modules/pybotvac/default.nix +++ b/pkgs/development/python-modules/pybotvac/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pybotvac"; - version = "0.0.16"; + version = "0.0.17"; src = fetchPypi { inherit pname version; - sha256 = "f75240520c918793510766d8b1f5ebc1feb0286f86eab971550f6580b0ea68f5"; + sha256 = "f212f0df8a946c0fa25f0c20c3c9decd9ddc4dbd9b48592a3283e7481112923e"; }; propagatedBuildInputs = [ requests ]; diff --git a/pkgs/development/python-modules/pybullet/default.nix b/pkgs/development/python-modules/pybullet/default.nix index 5a1d8d370c18..93be1fe4a035 100644 --- a/pkgs/development/python-modules/pybullet/default.nix +++ b/pkgs/development/python-modules/pybullet/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "pybullet"; - version = "2.4.9"; + version = "2.5.6"; src = fetchPypi { inherit pname version; - sha256 = "bcb5aaca2b8adf94a04fd5206eea113ddc1993c9f13ab39f4a37e98f92b6d7db"; + sha256 = "ffeb00f393dcddc11d195a72623e3b06767a37e4fdfa06ef88fbd74c8d326adb"; }; buildInputs = [ diff --git a/pkgs/development/python-modules/pychromecast/default.nix b/pkgs/development/python-modules/pychromecast/default.nix index 539c94910de7..e1c5df1c31c6 100644 --- a/pkgs/development/python-modules/pychromecast/default.nix +++ b/pkgs/development/python-modules/pychromecast/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "PyChromecast"; - version = "4.0.1"; + version = "4.1.0"; src = fetchPypi { inherit pname version; - sha256 = "06f83bv3sri1m4yw64hmb1k7n46pma6m2ik84c3lmc8b6j7z53fr"; + sha256 = "b6979f1ddce1ff8760586aa6b8828290964b38f34c01aa1380ab1740330eeee2"; }; disabled = !isPy3k; diff --git a/pkgs/development/python-modules/pycryptodome/default.nix b/pkgs/development/python-modules/pycryptodome/default.nix index e4b66b907cae..f07b33cf4777 100644 --- a/pkgs/development/python-modules/pycryptodome/default.nix +++ b/pkgs/development/python-modules/pycryptodome/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchPypi, buildPythonPackage }: buildPythonPackage rec { - version = "3.7.3"; + version = "3.9.0"; pname = "pycryptodome"; src = fetchPypi { inherit pname version; - sha256 = "1a222250e43f3c659b4ebd5df3e11c2f112aab6aef58e38af55ef5678b9f0636"; + sha256 = "dbeb08ad850056747aa7d5f33273b7ce0b9a77910604a1be7b7a6f2ef076213f"; }; meta = { diff --git a/pkgs/development/python-modules/pycryptodomex/default.nix b/pkgs/development/python-modules/pycryptodomex/default.nix index 62613c747654..1ec636f9f321 100644 --- a/pkgs/development/python-modules/pycryptodomex/default.nix +++ b/pkgs/development/python-modules/pycryptodomex/default.nix @@ -2,7 +2,7 @@ buildPythonPackage rec { pname = "pycryptodomex"; - version = "3.7.3"; + version = "3.9.0"; meta = { description = "A self-contained cryptographic library for Python"; @@ -12,6 +12,6 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "b70fe991564e178af02ccf89435a8f9e8d052707a7c4b95bf6027cb785da3175"; + sha256 = "8b604f4fa1de456d6d19771b01c2823675a75a2c60e51a6b738f71fdfe865370"; }; } diff --git a/pkgs/development/python-modules/pycuda/default.nix b/pkgs/development/python-modules/pycuda/default.nix index 5f58101a8b53..225c605a57ff 100644 --- a/pkgs/development/python-modules/pycuda/default.nix +++ b/pkgs/development/python-modules/pycuda/default.nix @@ -22,11 +22,11 @@ let in buildPythonPackage rec { pname = "pycuda"; - version = "2018.1.1"; + version = "2019.1.2"; src = fetchPypi { inherit pname version; - sha256 = "49d575fca3fd3c95467c3b0fb51967ad17d0c4cc18e078a6748309af4de36a8d"; + sha256 = "ada56ce98a41f9f95fe18809f38afbae473a5c62d346cfa126a2d5477f24cc8a"; }; preConfigure = '' diff --git a/pkgs/development/python-modules/pydantic/default.nix b/pkgs/development/python-modules/pydantic/default.nix index 42921ea64830..3e8e5086eadd 100644 --- a/pkgs/development/python-modules/pydantic/default.nix +++ b/pkgs/development/python-modules/pydantic/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "pydantic"; - version = "0.32.2"; + version = "1.0"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "0q565m7d2rapjy6ylbdpd00z9zk99pkqg110191racp1d34kb4va"; + sha256 = "bf474cebe007701806f5f8b076fb8508116606e5c721734bb855bfec4185263c"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pyfakefs/default.nix b/pkgs/development/python-modules/pyfakefs/default.nix index 7142b40ce0b0..b2dbfdba8198 100644 --- a/pkgs/development/python-modules/pyfakefs/default.nix +++ b/pkgs/development/python-modules/pyfakefs/default.nix @@ -1,12 +1,12 @@ { stdenv, buildPythonPackage, fetchPypi, python, pytest, glibcLocales }: buildPythonPackage rec { - version = "3.5.8"; + version = "3.6.1"; pname = "pyfakefs"; src = fetchPypi { inherit pname version; - sha256 = "8cd2270d65d3316dd4dc6bb83242df2e0990d27605209bc16e8041bcc0956961"; + sha256 = "2654c665500ea8117b55cab51d4683a83ec1c76ddfae13640e509e4aac64b308"; }; postPatch = '' diff --git a/pkgs/development/python-modules/pyfribidi/default.nix b/pkgs/development/python-modules/pyfribidi/default.nix index a5caca40650d..50a0bfa1e22f 100644 --- a/pkgs/development/python-modules/pyfribidi/default.nix +++ b/pkgs/development/python-modules/pyfribidi/default.nix @@ -6,14 +6,14 @@ }: buildPythonPackage rec { - version = "0.11.0"; + version = "0.12.0"; pname = "pyfribidi"; disabled = isPy3k || isPyPy; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "6f7d83c09eae0cb98a40b85ba3dedc31af4dbff8fc4425f244c1e9f44392fded"; + sha256 = "64726a4a56783acdc79c6b9b3a15f16e6071077c897a0b999f3b43f744bc621c"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/pyfxa/default.nix b/pkgs/development/python-modules/pyfxa/default.nix index 93a74114af19..be6502893a36 100644 --- a/pkgs/development/python-modules/pyfxa/default.nix +++ b/pkgs/development/python-modules/pyfxa/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "PyFxA"; - version = "0.6.0"; + version = "0.7.3"; src = fetchPypi { inherit pname version; - sha256 = "d511b6f43a9445587c609a138636d378de76661561116e1f4259fcec9d09b42b"; + sha256 = "f47f4285629fa6c033c79adc3fb90926c0818a42cfddb04d32818547362f1627"; }; postPatch = '' diff --git a/pkgs/development/python-modules/pyhocon/default.nix b/pkgs/development/python-modules/pyhocon/default.nix index 14db6b2be2bb..f0e50895d83e 100644 --- a/pkgs/development/python-modules/pyhocon/default.nix +++ b/pkgs/development/python-modules/pyhocon/default.nix @@ -1,6 +1,6 @@ { lib , buildPythonPackage -, fetchPypi +, fetchFromGitHub # Runtime inputs: , pyparsing # Check inputs: @@ -12,9 +12,11 @@ buildPythonPackage rec { pname = "pyhocon"; version = "0.3.53"; - src = fetchPypi { - inherit pname version; - sha256 = "29d9b64d0141d202b77c18665dc4fcafc05fd4c1a4b0fd95ca57c8b58c0e6c2d"; + src = fetchFromGitHub { + owner = "chimpler"; + repo = "pyhocon"; + rev = version; + sha256 = "1lr56piiasnq1aiwli8ldw2wc3xjfck8az991mr5rdbqqsrh9vkv"; }; propagatedBuildInputs = [ pyparsing ]; diff --git a/pkgs/development/python-modules/pyjet/default.nix b/pkgs/development/python-modules/pyjet/default.nix index efbced9f3b32..4a20b5142b68 100644 --- a/pkgs/development/python-modules/pyjet/default.nix +++ b/pkgs/development/python-modules/pyjet/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pyjet"; - version = "1.4.0"; + version = "1.5.0"; src = fetchPypi { inherit pname version; - sha256 = "89ce11cd4541fb573d68fd60a219e5e1bdeb94cfcfffc917b472fde2aa9a5a31"; + sha256 = "b334fb9a01854165629d49a2df43c81c880fc231a8a27c156beccf42f223fe47"; }; # fix for python37 diff --git a/pkgs/development/python-modules/pylint/1.9.nix b/pkgs/development/python-modules/pylint/1.9.nix index 571a9446e116..b1253c65b338 100644 --- a/pkgs/development/python-modules/pylint/1.9.nix +++ b/pkgs/development/python-modules/pylint/1.9.nix @@ -1,6 +1,6 @@ { stdenv, lib, buildPythonPackage, fetchPypi, astroid, six, isort, mccabe, configparser, backports_functools_lru_cache, singledispatch, - pytest, pytestrunner, pyenchant }: + pytest, pytestrunner, pyenchant, setuptools }: buildPythonPackage rec { pname = "pylint"; @@ -13,7 +13,7 @@ buildPythonPackage rec { checkInputs = [ pytest pytestrunner pyenchant ]; - propagatedBuildInputs = [ astroid six isort mccabe configparser backports_functools_lru_cache singledispatch ]; + propagatedBuildInputs = [ astroid six isort mccabe configparser backports_functools_lru_cache singledispatch setuptools ]; postPatch = lib.optionalString stdenv.isDarwin '' # Remove broken darwin test diff --git a/pkgs/development/python-modules/pylint/default.nix b/pkgs/development/python-modules/pylint/default.nix index 44614e82e2a2..8861a364b0fa 100644 --- a/pkgs/development/python-modules/pylint/default.nix +++ b/pkgs/development/python-modules/pylint/default.nix @@ -3,13 +3,13 @@ buildPythonPackage rec { pname = "pylint"; - version = "2.4.2"; + version = "2.4.3"; disabled = pythonOlder "3.4"; src = fetchPypi { inherit pname version; - sha256 = "7edbae11476c2182708063ac387a8f97c760d9cfe36a5ede0ca996f90cf346c8"; + sha256 = "856476331f3e26598017290fd65bebe81c960e806776f324093a46b76fb2d1c0"; }; nativeBuildInputs = [ pytestrunner ]; diff --git a/pkgs/development/python-modules/pymatgen/default.nix b/pkgs/development/python-modules/pymatgen/default.nix index 8403ec9add7d..b60aea364c66 100644 --- a/pkgs/development/python-modules/pymatgen/default.nix +++ b/pkgs/development/python-modules/pymatgen/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pymatgen"; - version = "2019.2.28"; + version = "2019.10.16"; src = fetchPypi { inherit pname version; - sha256 = "fe4c9b8b16d618fa531a09073d69db6ab02c0c379e672862a41163e39ac91e85"; + sha256 = "a8e8b169001737cdf16bb89b26c391963ba2bead54ea510530a52586e2072234"; }; nativeBuildInputs = [ glibcLocales ]; diff --git a/pkgs/development/python-modules/pymbolic/default.nix b/pkgs/development/python-modules/pymbolic/default.nix index 0d13b377b13e..2411abc5ac4a 100644 --- a/pkgs/development/python-modules/pymbolic/default.nix +++ b/pkgs/development/python-modules/pymbolic/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "pymbolic"; - version = "2018.1"; + version = "2019.2"; src = fetchPypi { inherit pname version; - sha256 = "a47d5524d6a3cdc8a028079ce632eeb45ceea7243272d234f250622087688207"; + sha256 = "a7507864a76574d72bf5732497b247661c6ad73bb277cd9c8aae09e90a62e05a"; }; postConfigure = '' diff --git a/pkgs/development/python-modules/pymongo/default.nix b/pkgs/development/python-modules/pymongo/default.nix index 792b8b1bd5b4..8748b0e559d5 100644 --- a/pkgs/development/python-modules/pymongo/default.nix +++ b/pkgs/development/python-modules/pymongo/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pymongo"; - version = "3.7.2"; + version = "3.9.0"; src = fetchPypi { inherit pname version; - sha256 = "8c74e2a9b594f7962c62cef7680a4cb92a96b4e6e3c2f970790da67cc0213a7e"; + sha256 = "4249c6ba45587b959292a727532826c5032d59171f923f7f823788f413c2a5a3"; }; # Tests call a running mongodb instance diff --git a/pkgs/development/python-modules/pynamodb/default.nix b/pkgs/development/python-modules/pynamodb/default.nix index 1e567a9935cb..74840d72a94d 100644 --- a/pkgs/development/python-modules/pynamodb/default.nix +++ b/pkgs/development/python-modules/pynamodb/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "pynamodb"; - version = "4.0.0"; + version = "4.1.0"; src = fetchPypi { inherit pname version; - sha256 = "196pab5whswy3bgi2s842asjhyka2f9mw98m84bvqjmfw0m7x4y0"; + sha256 = "d05d5e2b0f663679ad11421c6fc2cf2f89a2a5843e6ebc372706bf5a78d93762"; }; propagatedBuildInputs = [ python-dateutil botocore ]; diff --git a/pkgs/development/python-modules/pyobjc/default.nix b/pkgs/development/python-modules/pyobjc/default.nix index 8c7af06b7434..e71ab630b84c 100644 --- a/pkgs/development/python-modules/pyobjc/default.nix +++ b/pkgs/development/python-modules/pyobjc/default.nix @@ -2,7 +2,7 @@ buildPythonPackage rec { pname = "pyobjc"; - version = "5.1.2"; + version = "6.0.1"; # Gives "No matching distribution found for # pyobjc-framework-Collaboration==4.0b1 (from pyobjc==4.0b1)" @@ -10,7 +10,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "ccfc96382bf04977c68a06733f1d7499a7ddeb1f74760e3f8de483f9a542e691"; + sha256 = "f19dcd668473d61e500440569936b2272333ec385a603730c39f68a8d42b474b"; }; meta = { diff --git a/pkgs/development/python-modules/pyparsing/default.nix b/pkgs/development/python-modules/pyparsing/default.nix index a6e8d6201384..2fd3ca60ad82 100644 --- a/pkgs/development/python-modules/pyparsing/default.nix +++ b/pkgs/development/python-modules/pyparsing/default.nix @@ -1,11 +1,11 @@ { stdenv, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "pyparsing"; - version = "2.3.1"; + version = "2.4.2"; src = fetchPypi { inherit pname version; - sha256 = "66c9268862641abcac4a96ba74506e594c884e3f57690a696d21ad8210ed667a"; + sha256 = "6f98a7b9397e206d78cc01df10131398f1c8b8510a2f4d97d9abd82e1aacdd80"; }; # Not everything necessary to run the tests is included in the distribution diff --git a/pkgs/development/python-modules/pyramid_mako/default.nix b/pkgs/development/python-modules/pyramid_mako/default.nix index b4064e9f0f7e..80546ee768e4 100644 --- a/pkgs/development/python-modules/pyramid_mako/default.nix +++ b/pkgs/development/python-modules/pyramid_mako/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "pyramid_mako"; - version = "1.0.2"; + version = "1.1.0"; src = fetchPypi { inherit pname version; - sha256 = "6da0987b9874cf53e72139624665a73965bbd7fbde504d1753e4231ce916f3a1"; + sha256 = "0066c863441f1c3ddea60cee1ccc50d00a91a317a8052ca44131da1a12a840e2"; }; buildInputs = [ webtest ]; diff --git a/pkgs/development/python-modules/pyro-ppl/default.nix b/pkgs/development/python-modules/pyro-ppl/default.nix index f0d5b2ee32a5..daed808deb11 100644 --- a/pkgs/development/python-modules/pyro-ppl/default.nix +++ b/pkgs/development/python-modules/pyro-ppl/default.nix @@ -1,12 +1,12 @@ { buildPythonPackage, fetchPypi, lib, pytorch, contextlib2 , graphviz, networkx, six, opt-einsum, tqdm }: buildPythonPackage rec { - version = "0.3.4"; + version = "0.5.1"; pname = "pyro-ppl"; src = fetchPypi { inherit version pname; - sha256 = "42d8b8d2f992ad94cf7cf6d4b4dd2aa2ef85c0f83b9fffb0856db65f8225db73"; + sha256 = "cac2cb2a283c65d4187b7e19f0ff3b10a0ded1f377caba4f279c7898b206cd42"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pyro4/default.nix b/pkgs/development/python-modules/pyro4/default.nix index 8851b0464146..fdeed6656237 100644 --- a/pkgs/development/python-modules/pyro4/default.nix +++ b/pkgs/development/python-modules/pyro4/default.nix @@ -8,22 +8,22 @@ , cloudpickle , msgpack , isPy27 -, isPy33 , selectors34 +, pytest }: buildPythonPackage rec { pname = "Pyro4"; - version = "4.75"; + version = "4.77"; src = fetchPypi { inherit pname version; - sha256 = "1dfpp36imddx19yv0kd28gk1l71ckhpqy6jd590wpm2680jw15rq"; + sha256 = "2bfe12a22f396474b0e57c898c7e2c561a8f850bf2055d8cf0f7119f0c7a523f"; }; propagatedBuildInputs = [ serpent - ] ++ lib.optionals (isPy27 || isPy33) [ selectors34 ]; + ] ++ lib.optionals isPy27 [ selectors34 ]; buildInputs = [ dill @@ -31,8 +31,15 @@ buildPythonPackage rec { msgpack ]; + checkInputs = [ pytest ]; + # add testsupport.py to PATH + # ignore network related tests, which fail in sandbox checkPhase = '' - ${python.interpreter} setup.py test + PYTHONPATH=tests/PyroTests:$PYTHONPATH + pytest -k 'not StartNSfunc \ + and not Broadcast \ + and not GetIP' \ + --ignore=tests/PyroTests/test_naming.py ''; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/pysonos/default.nix b/pkgs/development/python-modules/pysonos/default.nix index 071231fd2de5..ddab28471a8c 100644 --- a/pkgs/development/python-modules/pysonos/default.nix +++ b/pkgs/development/python-modules/pysonos/default.nix @@ -13,13 +13,13 @@ buildPythonPackage rec { pname = "pysonos"; - version = "0.0.23"; + version = "0.0.24"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "0kc2j2wl1bblqzay9gd3frd3imvylxjkqrp6jxixc4kmiivbg8h8"; + sha256 = "294ffce5394a3e0da6a6f4e23f84031f06d9eb76eaa362507c0b1033ffbf69b4"; }; propagatedBuildInputs = [ xmltodict requests ifaddr ]; diff --git a/pkgs/development/python-modules/pytest-black/default.nix b/pkgs/development/python-modules/pytest-black/default.nix new file mode 100644 index 000000000000..508dbdf0863c --- /dev/null +++ b/pkgs/development/python-modules/pytest-black/default.nix @@ -0,0 +1,27 @@ +{ lib, buildPythonPackage, fetchPypi +, black +, pytest +, setuptools_scm +, toml +}: + +buildPythonPackage rec { + pname = "pytest-black"; + version = "0.3.7"; + + src = fetchPypi { + inherit pname version; + sha256 = "03gwwy1h3qnfh6vpfhgsa5ag53a9sw1g42sc2s8a2hilwb7yrfvm"; + }; + + nativeBuildInputs = [ setuptools_scm ]; + + propagatedBuildInputs = [ black pytest toml ]; + + meta = with lib; { + description = "A pytest plugin to enable format checking with black"; + homepage = "https://github.com/shopkeep/pytest-black"; + license = licenses.mit; + maintainers = with maintainers; [ jonringer ]; + }; +} diff --git a/pkgs/development/python-modules/pytest-cov/default.nix b/pkgs/development/python-modules/pytest-cov/default.nix index 9ddec4199d7f..e376abbc33a2 100644 --- a/pkgs/development/python-modules/pytest-cov/default.nix +++ b/pkgs/development/python-modules/pytest-cov/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "pytest-cov"; - version = "2.6.1"; + version = "2.8.1"; src = fetchPypi { inherit pname version; - sha256 = "0ab664b25c6aa9716cbf203b17ddb301932383046082c081b9848a0edf5add33"; + sha256 = "cc6742d8bac45070217169f5f72ceee1e0e55b0221f54bcf24845972d3a47f2b"; }; buildInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/pytest-django/default.nix b/pkgs/development/python-modules/pytest-django/default.nix index 794a1e8bf20f..4480cc1afcfd 100644 --- a/pkgs/development/python-modules/pytest-django/default.nix +++ b/pkgs/development/python-modules/pytest-django/default.nix @@ -10,11 +10,11 @@ }: buildPythonPackage rec { pname = "pytest-django"; - version = "3.5.1"; + version = "3.6.0"; src = fetchPypi { inherit pname version; - sha256 = "1fynkswykgnqn8wqibavf598md5p005ilcac6sk4hpfv0v2v8kr6"; + sha256 = "b6c900461a6a7c450dcf11736cabc289a90f5d6f28ef74c46e32e86ffd16a4bd"; }; nativeBuildInputs = [ pytest setuptools_scm ]; diff --git a/pkgs/development/python-modules/pytest-doctestplus/default.nix b/pkgs/development/python-modules/pytest-doctestplus/default.nix index a132fdd26f85..aa155e6b6ffa 100644 --- a/pkgs/development/python-modules/pytest-doctestplus/default.nix +++ b/pkgs/development/python-modules/pytest-doctestplus/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "pytest-doctestplus"; - version = "0.3.0"; + version = "0.4.0"; src = fetchPypi { inherit pname version; - sha256 = "4e641bc720661c08ec3afe44a7951660cdff5e187259c433aa66e9ec2d5ccea1"; + sha256 = "8872b9c236924af20c39c2813d7f1bde50a1edca7c4aba5a8bfbae3a32360e87"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pytest-faulthandler/default.nix b/pkgs/development/python-modules/pytest-faulthandler/default.nix index 9fddb743964c..b9ac354abfd7 100644 --- a/pkgs/development/python-modules/pytest-faulthandler/default.nix +++ b/pkgs/development/python-modules/pytest-faulthandler/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "pytest-faulthandler"; - version = "1.6.0"; + version = "2.0.1"; src = fetchPypi { inherit pname version; - sha256 = "1bvfy6yyh2zlsrkpfmxy17149752m9y6ji9d34qp44bnci83dkjq"; + sha256 = "ed72bbce87ac344da81eb7d882196a457d4a1026a3da4a57154dacd85cd71ae5"; }; nativeBuildInputs = [ setuptools_scm pytest ]; diff --git a/pkgs/development/python-modules/pytest-forked/default.nix b/pkgs/development/python-modules/pytest-forked/default.nix index b3ea60174a65..472e0b3559d0 100644 --- a/pkgs/development/python-modules/pytest-forked/default.nix +++ b/pkgs/development/python-modules/pytest-forked/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "pytest-forked"; - version = "1.0.2"; + version = "1.1.3"; src = fetchPypi { inherit pname version; - sha256 = "d352aaced2ebd54d42a65825722cb433004b4446ab5d2044851d9cc7a00c9e38"; + sha256 = "1805699ed9c9e60cb7a8179b8d4fa2b8898098e82d229b0825d8095f0f261100"; }; buildInputs = [ pytest setuptools_scm ]; diff --git a/pkgs/development/python-modules/pytest-mock/default.nix b/pkgs/development/python-modules/pytest-mock/default.nix index 58e032df4df0..c6c8b6f4f5c1 100644 --- a/pkgs/development/python-modules/pytest-mock/default.nix +++ b/pkgs/development/python-modules/pytest-mock/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "pytest-mock"; - version = "1.10.4"; + version = "1.11.2"; src = fetchPypi { inherit pname version; - sha256 = "5bf5771b1db93beac965a7347dc81c675ec4090cb841e49d9d34637a25c30568"; + sha256 = "04fgqm06vkg3k1ngha65g1k5a80x1g7pr11s78j2d72rj4w2ql7a"; }; propagatedBuildInputs = lib.optional (!isPy3k) mock; @@ -27,18 +27,8 @@ buildPythonPackage rec { pytest ]; - patches = [ - # Fix tests for pytest 4.6. Remove with the next release - (fetchpatch { - url = "https://github.com/pytest-dev/pytest-mock/commit/189cc599d3bfbe91a17c93211c04237b6c5849b1.patch"; - sha256 = "13nk75ldab3j8nfzyd9w4cgfk2fxq4if1aqkqy82ar7y7qh07a7m"; - }) - ]; - checkPhase = '' - # remove disabled test on next release - # https://github.com/pytest-dev/pytest-mock/pull/151 - pytest -k "not test_detailed_introspection" + pytest ''; meta = with lib; { diff --git a/pkgs/development/python-modules/pytest-mypy/default.nix b/pkgs/development/python-modules/pytest-mypy/default.nix index b3ee359f3cec..bca04ab7b36c 100644 --- a/pkgs/development/python-modules/pytest-mypy/default.nix +++ b/pkgs/development/python-modules/pytest-mypy/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "pytest-mypy"; - version = "0.3.3"; + version = "0.4.1"; src = fetchPypi { inherit pname version; - sha256 = "917438af835beb87f14c9f6261137f8e992b3bf87ebf73f836ac7ede03424a0f"; + sha256 = "f6348a3aa08d7b38b05c12ed0965415e1b60d402d7ceb353f5116f6eaf7dac28"; }; propagatedBuildInputs = [ pytest mypy ]; diff --git a/pkgs/development/python-modules/pytest-openfiles/default.nix b/pkgs/development/python-modules/pytest-openfiles/default.nix index dbce114d7bf8..0fb23f245fbe 100644 --- a/pkgs/development/python-modules/pytest-openfiles/default.nix +++ b/pkgs/development/python-modules/pytest-openfiles/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "pytest-openfiles"; - version = "0.3.2"; + version = "0.4.0"; src = fetchPypi { inherit pname version; - sha256 = "e51c91889eb9e4c75f47735efc57a1435f3f1182463600ba7bce7f2556a46884"; + sha256 = "af591422f2bfa95f7690d83aeb8d76bd5421cb8b1dcaf085d58cd92e8d92058d"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pytest-sanic/default.nix b/pkgs/development/python-modules/pytest-sanic/default.nix index c760b6a5542a..647d7abb07c4 100644 --- a/pkgs/development/python-modules/pytest-sanic/default.nix +++ b/pkgs/development/python-modules/pytest-sanic/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "pytest-sanic"; - version = "1.0.0"; + version = "1.1.2"; src = fetchPypi { inherit pname version; - sha256 = "0vlaq6p9g2p1xj9wshmin58p1faf5h9rcxvmjapx26zv8n23rnm1"; + sha256 = "61a60e1b0456b2ceaeeb7173783f3450332c3609017fb6b18176b307f7186d3a"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pytest-xdist/default.nix b/pkgs/development/python-modules/pytest-xdist/default.nix index a2796fba5d8f..c8e41fdaa35d 100644 --- a/pkgs/development/python-modules/pytest-xdist/default.nix +++ b/pkgs/development/python-modules/pytest-xdist/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "pytest-xdist"; - version = "1.28.0"; + version = "1.30.0"; src = fetchPypi { inherit pname version; - sha256 = "f83a485293e81fd57c8a5a85a3f12473a532c5ca7dec518857cbb72766bb526c"; + sha256 = "5d1b1d4461518a6023d56dab62fb63670d6f7537f23e2708459a557329accf48"; }; nativeBuildInputs = [ setuptools_scm pytest ]; diff --git a/pkgs/development/python-modules/pytestrunner/default.nix b/pkgs/development/python-modules/pytestrunner/default.nix index 78ad4d2abc8c..ebe1c588faa9 100644 --- a/pkgs/development/python-modules/pytestrunner/default.nix +++ b/pkgs/development/python-modules/pytestrunner/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pytest-runner"; - version = "4.2"; + version = "5.1"; src = fetchPypi { inherit pname version; - sha256 = "d23f117be39919f00dd91bffeb4f15e031ec797501b717a245e377aee0f577be"; + sha256 = "25a013c8d84f0ca60bb01bd11913a3bcab420f601f0f236de4423074af656e7a"; }; nativeBuildInputs = [ setuptools_scm pytest ]; diff --git a/pkgs/development/python-modules/python-gitlab/default.nix b/pkgs/development/python-modules/python-gitlab/default.nix index b6e6611ad451..def0a2c0adb0 100644 --- a/pkgs/development/python-modules/python-gitlab/default.nix +++ b/pkgs/development/python-modules/python-gitlab/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "python-gitlab"; - version = "1.11.0"; + version = "1.12.1"; src = fetchPypi { inherit pname version; - sha256 = "1icnf27wrndglhr7h3gbns6dn6a98y3i46cmyrxpnir79446sdgy"; + sha256 = "984e110c1f76fd939652c30ce3101267a7064e34417cbfc4687e6106d4db54ec"; }; propagatedBuildInputs = [ requests six ]; diff --git a/pkgs/development/python-modules/python-logstash/default.nix b/pkgs/development/python-modules/python-logstash/default.nix new file mode 100644 index 000000000000..f4ecccf06832 --- /dev/null +++ b/pkgs/development/python-modules/python-logstash/default.nix @@ -0,0 +1,21 @@ +{ lib, buildPythonPackage, fetchPypi }: + +buildPythonPackage rec { + pname = "python-logstash"; + version = "0.4.6"; + + src = fetchPypi { + inherit pname version; + sha256 = "13763yx0k655y0c8gxv7jj6cqp45zypx2fmnc56jnn9zz1fkx50h"; + }; + + # no tests + doCheck = false; + + meta = with lib; { + description = "Python logging handler for Logstash"; + homepage = https://github.com/vklochan/python-logstash; + maintainers = with maintainers; [ peterromfeldhk ]; + license = licenses.mit; + }; +} diff --git a/pkgs/development/python-modules/python-nomad/default.nix b/pkgs/development/python-modules/python-nomad/default.nix new file mode 100644 index 000000000000..c4ec84512a62 --- /dev/null +++ b/pkgs/development/python-modules/python-nomad/default.nix @@ -0,0 +1,23 @@ +{ stdenv, buildPythonPackage, fetchPypi, requests }: + +buildPythonPackage rec { + pname = "python-nomad"; + version = "1.1.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "1rf6ad35vg3yi1p4l383xwx0ammdvr1k71bxg93bgcvljypx4cyn"; + }; + + propagatedBuildInputs = [ requests ]; + + # Tests require nomad agent + doCheck = false; + + meta = with stdenv.lib; { + description = "Python client library for Hashicorp Nomad"; + homepage = "https://github.com/jrxFive/python-nomad"; + license = licenses.mit; + maintainers = with maintainers; [ xbreak ]; + }; +} diff --git a/pkgs/development/python-modules/python-slugify/default.nix b/pkgs/development/python-modules/python-slugify/default.nix index 5c4c0ad2f56b..008e5e25a480 100644 --- a/pkgs/development/python-modules/python-slugify/default.nix +++ b/pkgs/development/python-modules/python-slugify/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "python-slugify"; - version = "3.0.6"; + version = "4.0.0"; src = fetchPypi { inherit pname version; - sha256 = "8653d589308c91c67fe5c97a2afda0cfac9492061e69c0db90d1aef68fcd2332"; + sha256 = "a8fc3433821140e8f409a9831d13ae5deccd0b033d4744d94b31fea141bdd84c"; }; propagatedBuildInputs = [ text-unidecode ]; diff --git a/pkgs/development/python-modules/python-socketio/default.nix b/pkgs/development/python-modules/python-socketio/default.nix index 5dff7189e66c..a666a6428e77 100644 --- a/pkgs/development/python-modules/python-socketio/default.nix +++ b/pkgs/development/python-modules/python-socketio/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "python-socketio"; - version = "3.1.2"; + version = "4.3.1"; src = fetchPypi { inherit pname version; - sha256 = "aa702157694d55a743fb6f1cc0bd1af58fbfda8a7d71d747d4b12d6dac29cab3"; + sha256 = "506b2cf7a520b40ea0b3f25e1272eff8de134dce6f471c1f6bc0de8c90fe8c57"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/python-telegram-bot/default.nix b/pkgs/development/python-modules/python-telegram-bot/default.nix index 5af4383d44b3..52fe5209ade2 100644 --- a/pkgs/development/python-modules/python-telegram-bot/default.nix +++ b/pkgs/development/python-modules/python-telegram-bot/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "python-telegram-bot"; - version = "11.1.0"; + version = "12.2.0"; src = fetchPypi { inherit pname version; - sha256 = "cca4e32ebb8da7fdf35ab2fa2b3edd441211364819c5592fc253acdb7561ea5b"; + sha256 = "346d42771c2b23384c59f5f41e05bd7e801a0ce118d8dcb95209bb73d5f694c5"; }; prePatch = '' diff --git a/pkgs/development/python-modules/pytrends/default.nix b/pkgs/development/python-modules/pytrends/default.nix index b3ada6247e3c..db7f781c5bf4 100644 --- a/pkgs/development/python-modules/pytrends/default.nix +++ b/pkgs/development/python-modules/pytrends/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "pytrends"; - version = "4.6.0"; + version = "4.7.2"; src = fetchPypi { inherit pname version; - sha256 = "03gnn2mgjvpc7pbcijy7xilrhgjg7x2pp6ci96pdyqnhkqv02d3n"; + sha256 = "1cf80573276b3a93c4fb2ff296c260fa86e7ab43709473ce34f3bad3841f06df"; }; doCheck = false; diff --git a/pkgs/development/python-modules/pytzdata/default.nix b/pkgs/development/python-modules/pytzdata/default.nix index 6fa4eb6387d0..afda908113b4 100644 --- a/pkgs/development/python-modules/pytzdata/default.nix +++ b/pkgs/development/python-modules/pytzdata/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pytzdata"; - version = "2019.1"; + version = "2019.3"; src = fetchPypi { inherit pname version; - sha256 = "f0469062f799c66480fcc7eae69a8270dc83f0e6522c0e70db882d6bd708d378"; + sha256 = "fac06f7cdfa903188dc4848c655e4adaee67ee0f2fe08e7daf815cf2a761ee5e"; }; # No tests diff --git a/pkgs/development/python-modules/pyunifi/default.nix b/pkgs/development/python-modules/pyunifi/default.nix index 49b015507725..f2395605d3aa 100644 --- a/pkgs/development/python-modules/pyunifi/default.nix +++ b/pkgs/development/python-modules/pyunifi/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "pyunifi"; - version = "2.16"; + version = "2.18"; src = fetchPypi { inherit pname version; - sha256 = "1d28ec8204fe3b0eb1043f5ba9b646a2c38e5fd89a0419d760cff8f0df507c83"; + sha256 = "0875b830db93ed3270aee38ea24d3da9328672f0c499f0e432c895e0b02eadc9"; }; propagatedBuildInputs = [ requests ]; diff --git a/pkgs/development/python-modules/pyupdate/default.nix b/pkgs/development/python-modules/pyupdate/default.nix index d9ff4369c7a7..f4bf22854e74 100644 --- a/pkgs/development/python-modules/pyupdate/default.nix +++ b/pkgs/development/python-modules/pyupdate/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "pyupdate"; - version = "1.3.6"; + version = "1.4.0"; src = fetchPypi { inherit pname version; - sha256 = "151dxqvdpik4jy84sq6fhjyrq2qq5l70dccgxdbxxf9qyjxpywfl"; + sha256 = "016f50853b4d72e5ddb963b042caa45fb60fa4d3f13aee819d829af21e55ef07"; }; propagatedBuildInputs = [ requests ]; diff --git a/pkgs/development/python-modules/pyutil/default.nix b/pkgs/development/python-modules/pyutil/default.nix index ce0c514e3eca..2115374aa43b 100644 --- a/pkgs/development/python-modules/pyutil/default.nix +++ b/pkgs/development/python-modules/pyutil/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "pyutil"; - version = "3.1.0"; + version = "3.3.0"; src = fetchPypi { inherit pname version; - sha256 = "8e254aa0a3b59e90515f7bca7ebc467b20a8d3fd2e26b63d196655c075da8d38"; + sha256 = "8c4d4bf668c559186389bb9bce99e4b1b871c09ba252a756ccaacd2b8f401848"; }; buildInputs = [ setuptoolsDarcs setuptoolsTrial ] ++ (if doCheck then [ simplejson ] else []); diff --git a/pkgs/development/python-modules/pywavelets/default.nix b/pkgs/development/python-modules/pywavelets/default.nix index bbd02d8daafa..fbb226bb1f2e 100644 --- a/pkgs/development/python-modules/pywavelets/default.nix +++ b/pkgs/development/python-modules/pywavelets/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchPypi +, isPy27 , cython , nose , pytest @@ -9,11 +10,12 @@ buildPythonPackage rec { pname = "PyWavelets"; - version = "1.0.3"; + version = "1.1.1"; + disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "a12c7a6258c0015d2c75d88b87393ee015494551f049009e8b63eafed2d78efc"; + sha256 = "1a64b40f6acb4ffbaccce0545d7fc641744f95351f62e4c6aaa40549326008c9"; }; checkInputs = [ nose pytest ]; @@ -23,14 +25,24 @@ buildPythonPackage rec { propagatedBuildInputs = [ numpy ]; # Somehow nosetests doesn't run the tests, so let's use pytest instead + doCheck = false; # tests use relative paths, which fail to resolve checkPhase = '' py.test pywt/tests ''; - meta = { + # ensure compiled modules are present + pythonImportsCheck = [ + "pywt" + "pywt._extensions._cwt" + "pywt._extensions._dwt" + "pywt._extensions._pywt" + "pywt._extensions._swt" + ]; + + meta = with lib; { description = "Wavelet transform module"; homepage = https://github.com/PyWavelets/pywt; - license = lib.licenses.mit; + license = licenses.mit; }; -} \ No newline at end of file +} diff --git a/pkgs/development/python-modules/pywbem/default.nix b/pkgs/development/python-modules/pywbem/default.nix index 83403b3d1500..d87d772db146 100644 --- a/pkgs/development/python-modules/pywbem/default.nix +++ b/pkgs/development/python-modules/pywbem/default.nix @@ -5,14 +5,14 @@ buildPythonPackage rec { pname = "pywbem"; - version = "0.12.6"; + version = "0.14.6"; # Support added in master https://github.com/pywbem/pywbem/commit/b2f2f1a151a30355bbc6652dca69a7b30bfe941e awaiting release disabled = isPy37; src = fetchPypi { inherit pname version; - sha256 = "1dc6b745rrys600n05apdf6lb2vv5arlcwv7aiz9whgkbcd9qhki"; + sha256 = "5ed6ac486a0a363848f2091a49ddc1c4e0871c6feb71766cc0e266e9c6fd084f"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pywebpush/default.nix b/pkgs/development/python-modules/pywebpush/default.nix index c9077c7a17c4..e6bf9f3ba483 100644 --- a/pkgs/development/python-modules/pywebpush/default.nix +++ b/pkgs/development/python-modules/pywebpush/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "pywebpush"; - version = "1.9.4"; + version = "1.10.0"; src = fetchPypi { inherit pname version; - sha256 = "03qkijz56fx7p8405sknw2wji4pfj5knajk2lmj9y58mjxydbpp3"; + sha256 = "de8b7e638c6b595c6405f16fd5356e92d2feb8237ab4e50a89770e4ed93aebd6"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pyx/default.nix b/pkgs/development/python-modules/pyx/default.nix index a377845563aa..63e6e6321007 100644 --- a/pkgs/development/python-modules/pyx/default.nix +++ b/pkgs/development/python-modules/pyx/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "pyx"; - version = "0.14.1"; + version = "0.15"; src = fetchPypi { inherit pname version; - sha256 = "05d1b7fc813379d2c12fcb5bd0195cab522b5aabafac88f72913f1d47becd912"; + sha256 = "0fc3b00c5e7fb6f4aefbf63b95f624297dde47700a82b8b5ad6ebb346b5e4977"; }; disabled = !isPy3k; diff --git a/pkgs/development/python-modules/pyxl3/default.nix b/pkgs/development/python-modules/pyxl3/default.nix index 159645c425eb..2f73a85db7b7 100644 --- a/pkgs/development/python-modules/pyxl3/default.nix +++ b/pkgs/development/python-modules/pyxl3/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "pyxl3"; - version = "1.0"; + version = "1.2"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "df413d86664e2d261f67749beffff07eb830ab8c7bbe631d11d4c42f3a5e5fde"; + sha256 = "f1fc74d2ab59073ef6bf0ce01b4f2891366bbf89a8187de85433486b284df758"; }; checkInputs = [ unittest2 ]; diff --git a/pkgs/development/python-modules/qiskit/default.nix b/pkgs/development/python-modules/qiskit/default.nix index 285f50e3cb32..4d84ac07a041 100644 --- a/pkgs/development/python-modules/qiskit/default.nix +++ b/pkgs/development/python-modules/qiskit/default.nix @@ -21,13 +21,13 @@ buildPythonPackage rec { pname = "qiskit"; - version = "0.7.3"; + version = "0.13.0"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "63e7a7c3033fe955d715cc825b3fb61d27c25ad66e1761493ca2243b5dbfb4f9"; + sha256 = "e9c0f23dddb0af27e2bfb920f6ea8600516fa68ec9ae97639faf858ba5d28020"; }; buildInputs = [ cmake ] diff --git a/pkgs/development/python-modules/qscintilla-qt5/default.nix b/pkgs/development/python-modules/qscintilla-qt5/default.nix index 963ee82fedaa..96485bd1f062 100644 --- a/pkgs/development/python-modules/qscintilla-qt5/default.nix +++ b/pkgs/development/python-modules/qscintilla-qt5/default.nix @@ -27,6 +27,8 @@ buildPythonPackage { lndir ${pyqt5} $out rm -rf "$out/nix-support" cd Python + substituteInPlace configure.py \ + --replace "qmake = {'CONFIG': 'qscintilla2'}" "qmake = {'CONFIG': 'qscintilla2', 'QT': 'widgets printsupport'}" ${python.executable} ./configure.py \ --pyqt=PyQt5 \ --destdir=$out/${python.sitePackages}/PyQt5 \ @@ -45,6 +47,5 @@ buildPythonPackage { license = licenses.lgpl21Plus; maintainers = with maintainers; [ lsix ]; homepage = https://www.riverbankcomputing.com/software/qscintilla/; - broken = true; }; } diff --git a/pkgs/development/python-modules/r2pipe/default.nix b/pkgs/development/python-modules/r2pipe/default.nix index f51aed9462a0..920cc22fb391 100644 --- a/pkgs/development/python-modules/r2pipe/default.nix +++ b/pkgs/development/python-modules/r2pipe/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "r2pipe"; - version = "1.4.1"; + version = "1.4.2"; postPatch = let r2lib = "${lib.getOutput "lib" radare2}/lib"; @@ -27,7 +27,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "02r2xrnanzp7iskqbq8flzhc4d56hlzyf3qwqp3azys838y0kcyy"; + sha256 = "4020754e3263ef28d3e74288537847bd8ae5fc1ddd74f34fb262ef1282c4d23c"; }; # Tiny sanity check to make sure r2pipe finds radare2 (since r2pipe doesn't diff --git a/pkgs/development/python-modules/readthedocs-sphinx-ext/default.nix b/pkgs/development/python-modules/readthedocs-sphinx-ext/default.nix index baf26c2437bc..8b3487a98c60 100644 --- a/pkgs/development/python-modules/readthedocs-sphinx-ext/default.nix +++ b/pkgs/development/python-modules/readthedocs-sphinx-ext/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "readthedocs-sphinx-ext"; - version = "0.5.17"; + version = "1.0.0"; src = fetchPypi { inherit pname version; - sha256 = "21097cbb37c9a0590e2cb444b55bd87302fc8f69640fa2d4f2d113e98e9558ff"; + sha256 = "cc94753be6b2db997e3291046b39e49d578f6441fd75159db22a51a29d2cf1fc"; }; propagatedBuildInputs = [ requests ]; diff --git a/pkgs/development/python-modules/rebulk/default.nix b/pkgs/development/python-modules/rebulk/default.nix index 7042b42f7ed8..d1355560ac17 100644 --- a/pkgs/development/python-modules/rebulk/default.nix +++ b/pkgs/development/python-modules/rebulk/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "rebulk"; - version = "1.0.1"; + version = "2.0.0"; src = fetchPypi { inherit pname version; - sha256 = "11164sy9vwphf7iw60n4hmns2q6anazrkhc15lwi6sb2qmkjc541"; + sha256 = "1b0d526859ef3e8647f37c606d7ae7c32259e370b3f1519e4219a3ba72740aec"; }; # Some kind of trickery with imports that doesn't work. diff --git a/pkgs/development/python-modules/regex/default.nix b/pkgs/development/python-modules/regex/default.nix index bc16fffcef53..ec2b872c7f8c 100644 --- a/pkgs/development/python-modules/regex/default.nix +++ b/pkgs/development/python-modules/regex/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "regex"; - version = "2019.02.21"; + version = "2019.08.19"; src = fetchPypi { inherit pname version; - sha256 = "587bd4cad11c7294f89799c45778abca271d7c6668a0e85c41a6dbfa8096f9bb"; + sha256 = "587b62d48ca359d2d4f02d486f1f0aa9a20fbaf23a9d4198c4bed72ab2f6c849"; }; postCheck = '' diff --git a/pkgs/development/python-modules/reportlab/default.nix b/pkgs/development/python-modules/reportlab/default.nix index 879c5630aa41..eaa691a6b75c 100644 --- a/pkgs/development/python-modules/reportlab/default.nix +++ b/pkgs/development/python-modules/reportlab/default.nix @@ -11,11 +11,11 @@ let ft = freetype.overrideAttrs (oldArgs: { dontDisableStatic = true; }); in buildPythonPackage rec { pname = "reportlab"; - version = "3.5.28"; + version = "3.5.31"; src = fetchPypi { inherit pname version; - sha256 = "7195c6ea096d10c91cc470f9f0ced3ad74470d9c0fd97923b5e764597dd13671"; + sha256 = "3e2d2ea8ac3d63c918a2b40476c2745704d0364abe2b9c844c75992132a5eac7"; }; checkInputs = [ glibcLocales ]; diff --git a/pkgs/development/python-modules/requests-cache/default.nix b/pkgs/development/python-modules/requests-cache/default.nix index c8886b75d644..e2409ec598fb 100644 --- a/pkgs/development/python-modules/requests-cache/default.nix +++ b/pkgs/development/python-modules/requests-cache/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "requests-cache"; - version = "0.4.13"; + version = "0.5.2"; src = fetchPypi { inherit pname version; - sha256 = "18jpyivnq5pjbkymk3i473rihpj2bgikafpha7xvr6w736hiqmpy"; + sha256 = "813023269686045f8e01e2289cc1e7e9ae5ab22ddd1e2849a9093ab3ab7270eb"; }; buildInputs = [ mock ]; diff --git a/pkgs/development/python-modules/requests-unixsocket/default.nix b/pkgs/development/python-modules/requests-unixsocket/default.nix index 4eb3a33926ff..d0deaba92448 100644 --- a/pkgs/development/python-modules/requests-unixsocket/default.nix +++ b/pkgs/development/python-modules/requests-unixsocket/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "requests-unixsocket"; - version = "0.1.5"; + version = "0.2.0"; src = fetchPypi { inherit pname version; - sha256 = "0k19knydh0fzd7w12lfy18arl1ndwa0zln33vsb37yv1iw9w06x9"; + sha256 = "9e5c1a20afc3cf786197ae59c79bcdb0e7565f218f27df5f891307ee8817c1ea"; }; nativeBuildInputs = [ pbr ]; diff --git a/pkgs/development/python-modules/rethinkdb/default.nix b/pkgs/development/python-modules/rethinkdb/default.nix index f6d816d37c0e..a6087c9859cb 100644 --- a/pkgs/development/python-modules/rethinkdb/default.nix +++ b/pkgs/development/python-modules/rethinkdb/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "rethinkdb"; - version = "2.3.0.post6"; + version = "2.4.4"; src = fetchPypi { inherit pname version; - sha256 = "05qwkmq6kn437ywyjs02jxbry720gw39q4z4jdb0cnbbi76lwddm"; + sha256 = "d01b39c1921498e22e3c9cae1adb39c37b68e4438ef77218abc0166fdfd2ea7a"; }; doCheck = false; diff --git a/pkgs/development/python-modules/rfc-bibtex/default.nix b/pkgs/development/python-modules/rfc-bibtex/default.nix index a1626d6b65c3..db6fedd89a45 100644 --- a/pkgs/development/python-modules/rfc-bibtex/default.nix +++ b/pkgs/development/python-modules/rfc-bibtex/default.nix @@ -2,11 +2,11 @@ buildPythonApplication rec { pname = "rfc-bibtex"; - version = "0.2.1"; + version = "0.3.2"; src = fetchPypi { inherit pname version; - sha256 = "1p8xjgq4rig1jgqy5jqh34mbifxgxsyyxh8sizwz2wyixf8by8lq"; + sha256 = "60419a2043ef37ac2438f3eae7a3207d0a4cb2dd56ab21697f874a35ee52927f"; }; disabled = !isPy3k; diff --git a/pkgs/development/python-modules/ripser/default.nix b/pkgs/development/python-modules/ripser/default.nix index 7a0ae68993a0..258ad7cece10 100644 --- a/pkgs/development/python-modules/ripser/default.nix +++ b/pkgs/development/python-modules/ripser/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "ripser"; - version = "0.3.2"; + version = "0.4.1"; src = fetchPypi { inherit pname version; - sha256 = "ff9f50fba911f0e9212077b78014f83e30c97526194dd6bd1df3d81896e6cb58"; + sha256 = "a4015b413c24e3074f82f31771b1eb805e054b8cf444db51ce8ca5afa42cf130"; }; checkInputs = [ diff --git a/pkgs/development/python-modules/rl-coach/default.nix b/pkgs/development/python-modules/rl-coach/default.nix index 10bc1a70924a..bee588457ff2 100644 --- a/pkgs/development/python-modules/rl-coach/default.nix +++ b/pkgs/development/python-modules/rl-coach/default.nix @@ -23,12 +23,12 @@ }: buildPythonPackage rec { - version = "0.12.1"; + version = "1.0.1"; pname = "rl-coach"; src = fetchPypi { inherit pname version; - sha256 = "1zqlq61zxn732915nznj7pz8zh6kd6inl170fiavwhs32brmv84l"; + sha256 = "0c4f3a334ff55d534d2fc7f83d5e791f64b780391039e367f6cd9b4381838744"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/robomachine/default.nix b/pkgs/development/python-modules/robomachine/default.nix index 58a767432a22..c1695a25b456 100644 --- a/pkgs/development/python-modules/robomachine/default.nix +++ b/pkgs/development/python-modules/robomachine/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "RoboMachine"; - version = "0.8.0"; + version = "0.9.0"; src = fetchPypi { inherit pname version; - sha256 = "242cfd9be0f7591138eaeba03c9c190f894ce045e1767ab7b90eca330259fc45"; + sha256 = "4251d405759a38f1e665acc245dcbcdec319376718169a73c57560183370fe0e"; }; propagatedBuildInputs = [ pyparsing robotframework allpairspy ]; diff --git a/pkgs/development/python-modules/robotframework-requests/default.nix b/pkgs/development/python-modules/robotframework-requests/default.nix index 7233a82a395b..141353ee1d46 100644 --- a/pkgs/development/python-modules/robotframework-requests/default.nix +++ b/pkgs/development/python-modules/robotframework-requests/default.nix @@ -8,12 +8,12 @@ }: buildPythonPackage rec { - version = "0.5.0"; + version = "0.6.2"; pname = "robotframework-requests"; src = fetchPypi { inherit pname version; - sha256 = "1c253b8061c8a91251abf3ebadc33152b8621671621405dd343efd17bdc9e620"; + sha256 = "30669de238f7efd171ccab1c19c7f30ed6b77f43db534c173c1fa1568194d4cb"; }; buildInputs = [ unittest2 ]; diff --git a/pkgs/development/python-modules/ropper/default.nix b/pkgs/development/python-modules/ropper/default.nix index a6a2c33fefe5..9a0b91fdeb8a 100644 --- a/pkgs/development/python-modules/ropper/default.nix +++ b/pkgs/development/python-modules/ropper/default.nix @@ -8,11 +8,11 @@ buildPythonApplication rec { pname = "ropper"; - version = "1.12.5"; + version = "1.13.3"; src = fetchPypi { inherit pname version; - sha256 = "063lki438nsaylgqr5s785j6rbfqnyzb5bxnr8ixhmpk5irf3sqd"; + sha256 = "dfc87477c0f53d3d2836a384c106373d761cc435eafc477f299523e5404dda43"; }; # XXX tests rely on user-writeable /dev/shm to obtain process locks and return PermissionError otherwise # workaround: sudo chmod 777 /dev/shm diff --git a/pkgs/development/python-modules/rpyc/default.nix b/pkgs/development/python-modules/rpyc/default.nix index 374900f077c3..42d7b442ad6b 100644 --- a/pkgs/development/python-modules/rpyc/default.nix +++ b/pkgs/development/python-modules/rpyc/default.nix @@ -1,6 +1,6 @@ { stdenv , buildPythonPackage -, fetchPypi +, fetchFromGitHub , nose , plumbum }: @@ -9,12 +9,21 @@ buildPythonPackage rec { pname = "rpyc"; version = "4.1.2"; - src = fetchPypi { - inherit pname version; - sha256 = "0df276076891797bbaaff322cc6debb02e10817426bba00a9beca915053a8a91"; + src = fetchFromGitHub { + owner = "tomerfiliba"; + repo = pname; + rev = version; + sha256 = "1xvrcik1650r1412fg79va0kd0fgg1ml241y1ai429qwy87dil1k"; }; - propagatedBuildInputs = [ nose plumbum ]; + propagatedBuildInputs = [ plumbum ]; + + checkInputs = [ nose ]; + checkPhase = '' + cd tests + # some tests have added complexities and some tests attempt network use + nosetests -I test_deploy -I test_gevent_server -I test_ssh -I test_registry + ''; meta = with stdenv.lib; { description = "Remote Python Call (RPyC), a transparent and symmetric RPC library"; diff --git a/pkgs/development/python-modules/ruamel_yaml/default.nix b/pkgs/development/python-modules/ruamel_yaml/default.nix index 8b3530e88036..88b2de830b7e 100644 --- a/pkgs/development/python-modules/ruamel_yaml/default.nix +++ b/pkgs/development/python-modules/ruamel_yaml/default.nix @@ -1,27 +1,37 @@ -{ stdenv +{ lib , buildPythonPackage , fetchPypi , ruamel_base , ruamel_ordereddict +, ruamel_yaml_clib , isPy3k +, isPyPy }: buildPythonPackage rec { pname = "ruamel.yaml"; - version = "0.15.100"; + version = "0.16.5"; src = fetchPypi { inherit pname version; - sha256 = "8e42f3067a59e819935a2926e247170ed93c8f0b2ab64526f888e026854db2e4"; + sha256 = "412a6f5cfdc0525dee6a27c08f5415c7fd832a7afcb7a0ed7319628aed23d408"; }; - # Tests cannot load the module to test + # Tests use relative paths doCheck = false; propagatedBuildInputs = [ ruamel_base ] - ++ stdenv.lib.optional (!isPy3k) ruamel_ordereddict; + ++ lib.optional (!isPy3k) ruamel_ordereddict + ++ lib.optional (!isPyPy) ruamel_yaml_clib; - meta = with stdenv.lib; { + # causes namespace clash on py27 + dontUsePythonImportsCheck = !isPy3k; + pythonImportsCheck = [ + "ruamel.yaml" + "ruamel.base" + ]; + + meta = with lib; { description = "YAML parser/emitter that supports roundtrip preservation of comments, seq/map flow style, and map key order"; homepage = https://bitbucket.org/ruamel/yaml; license = licenses.mit; diff --git a/pkgs/development/python-modules/ruamel_yaml_clib/default.nix b/pkgs/development/python-modules/ruamel_yaml_clib/default.nix new file mode 100644 index 000000000000..19c208f27169 --- /dev/null +++ b/pkgs/development/python-modules/ruamel_yaml_clib/default.nix @@ -0,0 +1,29 @@ +{ stdenv +, buildPythonPackage +, fetchFromBitbucket +, ruamel_base +, ruamel_ordereddict +, isPy3k +}: + +buildPythonPackage rec { + pname = "ruamel.yaml.clib"; + version = "0.2.0"; + + src = fetchFromBitbucket { + owner = "ruamel"; + repo = "yaml.clib"; + rev = version; + sha256 = "0kq6zi96qlm72lzj90fc2rfk6nm5kqhk6qxdl8wl9s3a42b0v6wl"; + }; + + # outputs match wheel + doCheck = false; + + meta = with stdenv.lib; { + description = "YAML parser/emitter that supports roundtrip preservation of comments, seq/map flow style, and map key order"; + homepage = https://bitbucket.org/ruamel/yaml; + license = licenses.mit; + }; + +} diff --git a/pkgs/development/python-modules/runway-python/default.nix b/pkgs/development/python-modules/runway-python/default.nix index a90d88720e70..f46a35004ab9 100644 --- a/pkgs/development/python-modules/runway-python/default.nix +++ b/pkgs/development/python-modules/runway-python/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "runway-python"; - version = "0.4.3"; + version = "0.5.0"; src = fetchPypi { inherit pname version; - sha256 = "25e68f371f89815b0b7b21a9b8eb0229cd9634c09aedc1c2c5a307bc62239eec"; + sha256 = "d3573a003899eb33c0edbc1d59c16c8c19c092512da0c75ceb1f46063a18c7e9"; }; propagatedBuildInputs = [ flask flask-cors numpy pillow gevent wget six colorcet ]; diff --git a/pkgs/development/python-modules/s3fs/default.nix b/pkgs/development/python-modules/s3fs/default.nix index 157549a6f175..f04274d6b506 100644 --- a/pkgs/development/python-modules/s3fs/default.nix +++ b/pkgs/development/python-modules/s3fs/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "s3fs"; - version = "0.2.2"; + version = "0.3.5"; src = fetchPypi { inherit pname version; - sha256 = "1l3vdy3h6l03kjjzq1vq7h252749f8dg7kkz65s890y4xxvjxlyw"; + sha256 = "f1d8d80ae7789e6c95f8432e3ec12d1c28e624aecf8c84afed373fb182b505ab"; }; buildInputs = [ docutils ]; diff --git a/pkgs/development/python-modules/schema/default.nix b/pkgs/development/python-modules/schema/default.nix index d68f38aa4bb5..6afa59443721 100644 --- a/pkgs/development/python-modules/schema/default.nix +++ b/pkgs/development/python-modules/schema/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "schema"; - version = "0.6.8"; + version = "0.7.1"; src = fetchPypi { inherit pname version; - sha256 = "fa1a53fe5f3b6929725a4e81688c250f46838e25d8c1885a10a590c8c01a7b74"; + sha256 = "c9dc8f4624e287c7d1435f8fd758f6a0aabbb7eff442db9192cd46f0e2b6d959"; }; checkInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/scikit-build/default.nix b/pkgs/development/python-modules/scikit-build/default.nix index 3fe7b9ff4ef6..5132d32bfbad 100644 --- a/pkgs/development/python-modules/scikit-build/default.nix +++ b/pkgs/development/python-modules/scikit-build/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "scikit-build"; - version = "0.8.1"; + version = "0.10.0"; src = fetchPypi { inherit pname version; - sha256 = "1hh275lj98wgwi53mr9fqk8wh1dajjksch52xjax6a79gld4391a"; + sha256 = "7342017cc82dd6178e3b19377389b8a8d1f8b429d9cdb315cfb1094e34a0f526"; }; # Fixes incorrect specified requirement (part of next release) diff --git a/pkgs/development/python-modules/scikit-image/default.nix b/pkgs/development/python-modules/scikit-image/default.nix index 5200ffecb7de..eac6e1af05ce 100644 --- a/pkgs/development/python-modules/scikit-image/default.nix +++ b/pkgs/development/python-modules/scikit-image/default.nix @@ -16,11 +16,11 @@ buildPythonPackage rec { pname = "scikit-image"; - version = "0.14.5"; + version = "0.16.2"; src = fetchPypi { inherit pname version; - sha256 = "1f064315cd6fb048560ac6eb03e41969aab68f9df5c145fefaece3b6823e5919"; + sha256 = "dd7fbd32da74d4e9967dc15845f731f16e7966cee61f5dc0e12e2abb1305068c"; }; buildInputs = [ cython ]; diff --git a/pkgs/development/python-modules/scrapy/default.nix b/pkgs/development/python-modules/scrapy/default.nix index ee1445bef5c5..14ab6e51582d 100644 --- a/pkgs/development/python-modules/scrapy/default.nix +++ b/pkgs/development/python-modules/scrapy/default.nix @@ -2,7 +2,7 @@ testfixtures, pillow, six, twisted, w3lib, lxml, queuelib, pyopenssl, service-identity, parsel, pydispatcher, cssselect, lib }: buildPythonPackage rec { - version = "1.7.3"; + version = "1.7.4"; pname = "Scrapy"; checkInputs = [ glibcLocales mock pytest botocore testfixtures pillow ]; @@ -31,7 +31,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "fe5a40177960e97d42d1c752a73edb40f76a85a24076dec8535cffa499eb08c8"; + sha256 = "f0813d23a3f5659f403f469b11488ecd81e989e834205c4366cd231536496513"; }; postInstall = '' diff --git a/pkgs/development/python-modules/seekpath/default.nix b/pkgs/development/python-modules/seekpath/default.nix index 7578b0479405..fc2763be1f01 100644 --- a/pkgs/development/python-modules/seekpath/default.nix +++ b/pkgs/development/python-modules/seekpath/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "seekpath"; - version = "1.8.4"; + version = "1.9.3"; src = fetchPypi { inherit pname version; - sha256 = "b61dadba82acc0838402981b7944155adc092b114ca81f53f61b1d498a512e3a"; + sha256 = "abc806479f11e7f71c4475a292d849baf15dfa1cbc89ecc602d78415de322c83"; }; LC_ALL = "en_US.utf-8"; diff --git a/pkgs/development/python-modules/sentinel/default.nix b/pkgs/development/python-modules/sentinel/default.nix index e8ed047e03ff..6c69ea26b2a6 100644 --- a/pkgs/development/python-modules/sentinel/default.nix +++ b/pkgs/development/python-modules/sentinel/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "sentinel"; - version = "0.1.1"; + version = "0.1.2"; src = fetchPypi { inherit pname version; - sha256 = "c00ba2a4f240ea4c5414059a696d6e128730272cb2c631b2eff42e86da1f89b3"; + sha256 = "c7aeee3f57c56a8e52771fc64230345deecd62c48debbbe1f1aca453439741d0"; }; meta = with lib; { diff --git a/pkgs/development/python-modules/sentry-sdk/default.nix b/pkgs/development/python-modules/sentry-sdk/default.nix index 21fb2fd7571b..d8cf4d36a416 100644 --- a/pkgs/development/python-modules/sentry-sdk/default.nix +++ b/pkgs/development/python-modules/sentry-sdk/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "sentry-sdk"; - version = "0.8.1"; + version = "0.13.0"; src = fetchPypi { inherit pname version; - sha256 = "f137cfb8bf709f69fa4634a7debd13284a3a590c374846285875be41d1fe87a8"; + sha256 = "ff14935cc3053de0650128f124c36f34a4be120b8cc522c149f5cba342c1fd05"; }; checkInputs = [ django flask tornado sanic aiohttp bottle rq falcon pyramid celery ]; diff --git a/pkgs/development/python-modules/serpent/default.nix b/pkgs/development/python-modules/serpent/default.nix index 887d0c544245..f568ad6b0445 100644 --- a/pkgs/development/python-modules/serpent/default.nix +++ b/pkgs/development/python-modules/serpent/default.nix @@ -6,19 +6,22 @@ , isPy27 , isPy33 , enum34 +, attrs +, pytz }: buildPythonPackage rec { pname = "serpent"; - version = "1.27"; + version = "1.28"; src = fetchPypi { inherit pname version; - sha256 = "6f8dc4317fb5b5a9629b5e518846bc9fee374b8171533726dc68df52b36ee912"; + sha256 = "1arnckykpkvv2qrp49l1k7q5mr5pisswl0rvdx98x8wsl1n361pk"; }; propagatedBuildInputs = lib.optionals (isPy27 || isPy33) [ enum34 ]; + checkInputs = [ attrs pytz ]; checkPhase = '' ${python.interpreter} setup.py test ''; diff --git a/pkgs/development/python-modules/slicedimage/default.nix b/pkgs/development/python-modules/slicedimage/default.nix index 3b9aa19062be..e121013c150f 100644 --- a/pkgs/development/python-modules/slicedimage/default.nix +++ b/pkgs/development/python-modules/slicedimage/default.nix @@ -16,11 +16,11 @@ buildPythonPackage rec { pname = "slicedimage"; - version = "3.2.0"; + version = "4.0.5"; src = fetchPypi { inherit pname version; - sha256 = "adab09457e22465f05998fdcf8ea14179185f8e780a4021526ba163dd476cd02"; + sha256 = "c8e8759a013a0936ec9f7ffcd37fc64df69af913b4f26342c2501b8c3663d9bb"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/slicerator/default.nix b/pkgs/development/python-modules/slicerator/default.nix index af17780909e6..896ecbdd26b8 100644 --- a/pkgs/development/python-modules/slicerator/default.nix +++ b/pkgs/development/python-modules/slicerator/default.nix @@ -6,12 +6,12 @@ }: buildPythonPackage rec { - version = "0.9.8"; + version = "1.0.0"; pname = "slicerator"; src = fetchPypi { inherit pname version; - sha256 = "b91dd76a415fd8872185cbd6fbf1922fe174359053d4694983fc719e4a0f5667"; + sha256 = "18e60393e6765ca96986f801bbae62a617a1eba6ed57784e61b165ffc7dc1848"; }; propagatedBuildInputs = [ six ]; diff --git a/pkgs/development/python-modules/snowballstemmer/default.nix b/pkgs/development/python-modules/snowballstemmer/default.nix index 9b7481a62a64..61a12c2b298d 100644 --- a/pkgs/development/python-modules/snowballstemmer/default.nix +++ b/pkgs/development/python-modules/snowballstemmer/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "snowballstemmer"; - version = "1.2.1"; + version = "2.0.0"; src = fetchPypi { inherit pname version; - sha256 = "919f26a68b2c17a7634da993d91339e288964f93c274f1343e3bbbe2096e1128"; + sha256 = "df3bac3df4c2c01363f3dd2cfa78cce2840a79b9f1c2d2de9ce8d31683992f52"; }; # No tests included diff --git a/pkgs/development/python-modules/soco/default.nix b/pkgs/development/python-modules/soco/default.nix index cb38711ff91d..4a44b7d0b7aa 100644 --- a/pkgs/development/python-modules/soco/default.nix +++ b/pkgs/development/python-modules/soco/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "soco"; - version = "0.18"; + version = "0.18.1"; src = fetchPypi { inherit pname version; - sha256 = "0bf55mqnz3l3ii26dvx33d35fv7jn7p5kmfwnr0xbpj38sxvhfr4"; + sha256 = "de033ad69f86a655f50d407648b3aa2dd9647c69fd7bb317e9adfcd38a1adf4b"; }; postPatch = '' diff --git a/pkgs/development/python-modules/soupsieve/default.nix b/pkgs/development/python-modules/soupsieve/default.nix index 9f877ffb3554..737e9e0803a9 100644 --- a/pkgs/development/python-modules/soupsieve/default.nix +++ b/pkgs/development/python-modules/soupsieve/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "soupsieve"; - version = "1.7.3"; + version = "1.9.4"; src = fetchPypi { inherit pname version; - sha256 = "87db12ae79194f0ff9808d2b1641c4f031ae39ffa3cab6b907ea7c1e5e5ed445"; + sha256 = "605f89ad5fdbfefe30cdc293303665eff2d188865d4dbe4eb510bba1edfbfce3"; }; checkPhase = '' diff --git a/pkgs/development/python-modules/spacy/default.nix b/pkgs/development/python-modules/spacy/default.nix index 44a9e09181cf..89e720482e76 100644 --- a/pkgs/development/python-modules/spacy/default.nix +++ b/pkgs/development/python-modules/spacy/default.nix @@ -35,7 +35,8 @@ buildPythonPackage rec { prePatch = '' substituteInPlace setup.cfg \ - --replace "plac<1.0.0,>=0.9.6" "plac>=0.9.6" + --replace "plac<1.0.0,>=0.9.6" "plac>=0.9.6" \ + --replace "thinc>=7.1.1,<7.2.0" "thinc~=7.0" ''; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/sparse/default.nix b/pkgs/development/python-modules/sparse/default.nix index bbbcb2e06904..ec126e963b01 100644 --- a/pkgs/development/python-modules/sparse/default.nix +++ b/pkgs/development/python-modules/sparse/default.nix @@ -10,13 +10,13 @@ buildPythonPackage rec { pname = "sparse"; - version = "0.7.0"; + version = "0.8.0"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "0ija4pl8wg36ldsdv5jmqr5i75qi17vijcwwf2jdn1k15kqg35j4"; + sha256 = "a3dc14ee5314caa2e64331b0b50c8f92e8999d7d275179a804a114e6cb1f8b81"; }; checkInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/sphinxcontrib-applehelp/default.nix b/pkgs/development/python-modules/sphinxcontrib-applehelp/default.nix new file mode 100644 index 000000000000..60d7a20feb59 --- /dev/null +++ b/pkgs/development/python-modules/sphinxcontrib-applehelp/default.nix @@ -0,0 +1,25 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +}: + +buildPythonPackage rec { + pname = "sphinxcontrib-applehelp"; + version = "1.0.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "edaa0ab2b2bc74403149cb0209d6775c96de797dfd5b5e2a71981309efab3897"; + }; + + + # Check is disabled due to circular dependency of sphinx + doCheck = false; + + meta = with stdenv.lib; { + description = "sphinxcontrib-applehelp is a sphinx extension which outputs Apple help books"; + homepage = http://sphinx-doc.org/; + license = licenses.bsd0; + }; + +} diff --git a/pkgs/development/python-modules/sphinxcontrib-bibtex/default.nix b/pkgs/development/python-modules/sphinxcontrib-bibtex/default.nix index 2daa9766a3af..36fb29fde595 100644 --- a/pkgs/development/python-modules/sphinxcontrib-bibtex/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-bibtex/default.nix @@ -3,12 +3,12 @@ }: buildPythonPackage rec { - version = "0.4.2"; + version = "1.0.0"; pname = "sphinxcontrib-bibtex"; src = fetchPypi { inherit pname version; - sha256 = "0af7651hfjh4hv97xns4vpf8n3kqy7ghyjlkfda5wxw56hxgp6hn"; + sha256 = "629612b001f86784669d65e662377a482052decfd9a0a17c46860878eef7b9e0"; }; propagatedBuildInputs = [ oset pybtex pybtex-docutils sphinx ]; diff --git a/pkgs/development/python-modules/sphinxcontrib-devhelp/default.nix b/pkgs/development/python-modules/sphinxcontrib-devhelp/default.nix new file mode 100644 index 000000000000..dde8bfbb7dd2 --- /dev/null +++ b/pkgs/development/python-modules/sphinxcontrib-devhelp/default.nix @@ -0,0 +1,25 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +}: + +buildPythonPackage rec { + pname = "sphinxcontrib-devhelp"; + version = "1.0.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "6c64b077937330a9128a4da74586e8c2130262f014689b4b89e2d08ee7294a34"; + }; + + + # Check is disabled due to circular dependency of sphinx + doCheck = false; + + meta = with stdenv.lib; { + description = "sphinxcontrib-devhelp is a sphinx extension which outputs Devhelp document."; + homepage = http://sphinx-doc.org/; + license = licenses.bsd0; + }; + +} diff --git a/pkgs/development/python-modules/sphinxcontrib-htmlhelp/default.nix b/pkgs/development/python-modules/sphinxcontrib-htmlhelp/default.nix new file mode 100644 index 000000000000..88b54d8e94f7 --- /dev/null +++ b/pkgs/development/python-modules/sphinxcontrib-htmlhelp/default.nix @@ -0,0 +1,25 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +}: + +buildPythonPackage rec { + pname = "sphinxcontrib-htmlhelp"; + version = "1.0.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "4670f99f8951bd78cd4ad2ab962f798f5618b17675c35c5ac3b2132a14ea8422"; + }; + + + # Check is disabled due to circular dependency of sphinx + doCheck = false; + + meta = with stdenv.lib; { + description = "sphinxcontrib-htmlhelp is a sphinx extension which ..."; + homepage = http://sphinx-doc.org/; + license = licenses.bsd0; + }; + +} diff --git a/pkgs/development/python-modules/sphinxcontrib-jsmath/default.nix b/pkgs/development/python-modules/sphinxcontrib-jsmath/default.nix new file mode 100644 index 000000000000..ca2c8e99d41d --- /dev/null +++ b/pkgs/development/python-modules/sphinxcontrib-jsmath/default.nix @@ -0,0 +1,25 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +}: + +buildPythonPackage rec { + pname = "sphinxcontrib-jsmath"; + version = "1.0.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "a9925e4a4587247ed2191a22df5f6970656cb8ca2bd6284309578f2153e0c4b8"; + }; + + + # Check is disabled due to circular dependency of sphinx + doCheck = false; + + meta = with stdenv.lib; { + description = "sphinxcontrib-jsmath is a sphinx extension which renders display math in HTML via JavaScript."; + homepage = http://sphinx-doc.org/; + license = licenses.bsd0; + }; + +} diff --git a/pkgs/development/python-modules/sphinxcontrib-openapi/default.nix b/pkgs/development/python-modules/sphinxcontrib-openapi/default.nix index b8a4f25f5df0..58b24f0dd73e 100644 --- a/pkgs/development/python-modules/sphinxcontrib-openapi/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-openapi/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "sphinxcontrib-openapi"; - version = "0.4.0"; + version = "0.5.0"; src = fetchPypi { inherit pname version; - sha256 = "9d64c8a119bfc592e6316af3e5475ce2d4d8ed6e013dc016a3f2e7971e50d7f3"; + sha256 = "2a5883456c0caba0dad90f07968c75a50d5fc425a3aa06d1c538472ddf8c7e22"; }; propagatedBuildInputs = [setuptools_scm pyyaml jsonschema sphinxcontrib_httpdomain]; diff --git a/pkgs/development/python-modules/sphinxcontrib-qthelp/default.nix b/pkgs/development/python-modules/sphinxcontrib-qthelp/default.nix new file mode 100644 index 000000000000..92471c6c3d0f --- /dev/null +++ b/pkgs/development/python-modules/sphinxcontrib-qthelp/default.nix @@ -0,0 +1,25 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +}: + +buildPythonPackage rec { + pname = "sphinxcontrib-qthelp"; + version = "1.0.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "79465ce11ae5694ff165becda529a600c754f4bc459778778c7017374d4d406f"; + }; + + + # Check is disabled due to circular dependency of sphinx + doCheck = false; + + meta = with stdenv.lib; { + description = "sphinxcontrib-qthelp is a sphinx extension which outputs QtHelp document."; + homepage = http://sphinx-doc.org/; + license = licenses.bsd0; + }; + +} diff --git a/pkgs/development/python-modules/sphinxcontrib-serializinghtml/default.nix b/pkgs/development/python-modules/sphinxcontrib-serializinghtml/default.nix new file mode 100644 index 000000000000..76fba6e1b3a0 --- /dev/null +++ b/pkgs/development/python-modules/sphinxcontrib-serializinghtml/default.nix @@ -0,0 +1,25 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +}: + +buildPythonPackage rec { + pname = "sphinxcontrib-serializinghtml"; + version = "1.1.3"; + + src = fetchPypi { + inherit pname version; + sha256 = "c0efb33f8052c04fd7a26c0a07f1678e8512e0faec19f4aa8f2473a8b81d5227"; + }; + + + # Check is disabled due to circular dependency of sphinx + doCheck = false; + + meta = with stdenv.lib; { + description = "sphinxcontrib-serializinghtml is a sphinx extension which outputs \"serialized\" HTML files (json and pickle)."; + homepage = http://sphinx-doc.org/; + license = licenses.bsd0; + }; + +} diff --git a/pkgs/development/python-modules/sphinxcontrib-spelling/default.nix b/pkgs/development/python-modules/sphinxcontrib-spelling/default.nix index f528edb75ab3..b3e1ca01dba4 100644 --- a/pkgs/development/python-modules/sphinxcontrib-spelling/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-spelling/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "sphinxcontrib-spelling"; - version = "4.2.1"; + version = "4.3.0"; src = fetchPypi { inherit pname version; - sha256 = "7bcbaabef7aa9c176b81d960b20d0f67817ccea5e098968c366d2db4ad76d476"; + sha256 = "0304dac9286378f9c608af8d885a08fe03a9c62b3ebfa8802008018d92371c19"; }; propagatedBuildInputs = [ sphinx pyenchant pbr ]; diff --git a/pkgs/development/python-modules/spyder-kernels/default.nix b/pkgs/development/python-modules/spyder-kernels/default.nix index 86daec23d954..ee48da2f5b0f 100644 --- a/pkgs/development/python-modules/spyder-kernels/default.nix +++ b/pkgs/development/python-modules/spyder-kernels/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "spyder-kernels"; - version = "0.5.2"; + version = "1.6.0"; src = fetchPypi { inherit pname version; - sha256 = "01354b7fa180a87212cc005553b31a7300159b108d36828e301d3782291323f7"; + sha256 = "e374452af89f507b345431338c6655465b5c15d0b5e49f703be8c30bbe1d1202"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/starfish/default.nix b/pkgs/development/python-modules/starfish/default.nix index 5cb3c9a6db40..7cad8346a6fa 100644 --- a/pkgs/development/python-modules/starfish/default.nix +++ b/pkgs/development/python-modules/starfish/default.nix @@ -26,11 +26,11 @@ buildPythonPackage rec { pname = "starfish"; - version = "0.1.7"; + version = "0.1.8"; src = fetchPypi { inherit pname version; - sha256 = "a88ce43fb2999f1219a43b8104d49334d19b2b31fd28f8710696b16768544d37"; + sha256 = "6924404b9ce7c55b427bebc5712656b87d17b5114e9fb610f2821865bd8d70f4"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/stripe/default.nix b/pkgs/development/python-modules/stripe/default.nix index 68ed8dcf99f1..b60aa7666fb8 100644 --- a/pkgs/development/python-modules/stripe/default.nix +++ b/pkgs/development/python-modules/stripe/default.nix @@ -2,7 +2,7 @@ buildPythonPackage rec { pname = "stripe"; - version = "2.35.1"; + version = "2.37.2"; # Tests require network connectivity and there's no easy way to disable # them. ~ C. @@ -10,7 +10,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "0rmzba8yig426anf8fxiacyvwchlsws746757sgvw748n8lrarbw"; + sha256 = "7ad8ee6d9bdca86d6ed38c4eb48b1b67b9529ac4fee6c26d3f9aa4d5e98b50d6"; }; propagatedBuildInputs = [ requests ]; diff --git a/pkgs/development/python-modules/structlog/default.nix b/pkgs/development/python-modules/structlog/default.nix index f7e390bd6788..fece2f1b4434 100644 --- a/pkgs/development/python-modules/structlog/default.nix +++ b/pkgs/development/python-modules/structlog/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "structlog"; - version = "19.1.0"; + version = "19.2.0"; src = fetchPypi { inherit pname version; - sha256 = "5feae03167620824d3ae3e8915ea8589fc28d1ad6f3edf3cc90ed7c7cb33fab5"; + sha256 = "4287058cf4ce1a59bc5dea290d6386d37f29a37529c9a51cdf7387e51710152b"; }; checkInputs = [ pytest pretend freezegun simplejson twisted ] diff --git a/pkgs/development/python-modules/supervisor/default.nix b/pkgs/development/python-modules/supervisor/default.nix index 18ab5bca7ea9..4ae57add6e77 100644 --- a/pkgs/development/python-modules/supervisor/default.nix +++ b/pkgs/development/python-modules/supervisor/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "supervisor"; - version = "4.0.4"; + version = "4.1.0"; src = fetchPypi { inherit pname version; - sha256 = "02pindhq84hb9a7ykyaqw8i2iqb21h69lpmclyqh7fm1446rji4n"; + sha256 = "2dc86fe0476e945e61483d614ceb2cf4f93b95282eb243bdf792621994360383"; }; # wants to write to /tmp/foo which is likely already owned by another diff --git a/pkgs/development/python-modules/svgwrite/default.nix b/pkgs/development/python-modules/svgwrite/default.nix index 1772e8794ffd..7af7a16e7fa7 100644 --- a/pkgs/development/python-modules/svgwrite/default.nix +++ b/pkgs/development/python-modules/svgwrite/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "svgwrite"; - version = "1.2.1"; + version = "1.3.1"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "72ef66c9fe367989823cb237ab7f012ac809dd3ba76c1b5ebd9aa61580e2e75e"; + sha256 = "11e47749b159ed7004721e11d380b4642a26154b8cb2f7b0102fea9c71a3dfa1"; }; buildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/tables/3.5.nix b/pkgs/development/python-modules/tables/3.5.nix index 4cca72aa313a..1123d4626c95 100644 --- a/pkgs/development/python-modules/tables/3.5.nix +++ b/pkgs/development/python-modules/tables/3.5.nix @@ -4,12 +4,12 @@ with stdenv.lib; buildPythonPackage rec { - version = "3.5.2"; + version = "3.6.0"; pname = "tables"; src = fetchPypi { inherit pname version; - sha256 = "1hikrki0hx94ass31pn0jyz9iy0zhnkjacfk86m21cxsc8if685j"; + sha256 = "db3488214864fb313a611fca68bf1c9019afe4e7877be54d0e61c84416603d4d"; }; buildInputs = [ hdf5 cython bzip2 lzo c-blosc ]; diff --git a/pkgs/development/python-modules/tables/default.nix b/pkgs/development/python-modules/tables/default.nix index 444901d9aaf2..b664b882b28e 100644 --- a/pkgs/development/python-modules/tables/default.nix +++ b/pkgs/development/python-modules/tables/default.nix @@ -6,16 +6,27 @@ with stdenv.lib; buildPythonPackage rec { version = "3.6.0"; pname = "tables"; - disabled = isPy38; # unable to build, remove with next bump. src = fetchPypi { inherit pname version; sha256 = "0k9xc0b49j311r6yayw7wzjay6ch3jznijhzc4x33yv490hqhd6v"; }; - buildInputs = [ hdf5 cython bzip2 lzo c-blosc ]; + nativeBuildInputs = [ cython ]; + + buildInputs = [ hdf5 bzip2 lzo c-blosc ]; propagatedBuildInputs = [ numpy numexpr six mock ]; + # When doing `make distclean`, ignore docs + postPatch = '' + substituteInPlace Makefile --replace "src doc" "src" + ''; + + # Regenerate C code with Cython + preBuild = '' + make distclean + ''; + # The setup script complains about missing run-paths, but they are # actually set. setupPyBuildFlags = [ diff --git a/pkgs/development/python-modules/tatsu/default.nix b/pkgs/development/python-modules/tatsu/default.nix new file mode 100644 index 000000000000..539cbdca3ee1 --- /dev/null +++ b/pkgs/development/python-modules/tatsu/default.nix @@ -0,0 +1,40 @@ +{ stdenv, buildPythonPackage, fetchFromGitHub, pythonOlder +, colorama, mypy, pyyaml, regex +, dataclasses, typing +, pytestrunner, pytest-mypy +}: + +buildPythonPackage rec { + pname = "TatSu"; + version = "4.4.0"; + + src = fetchFromGitHub { + owner = "neogeny"; + repo = pname; + rev = "v${version}"; + sha256 = "1jjd73yr3x56ij2ggxf6s62mf90i9v7wn3i0h67zxys55hlp2yh4"; + }; + + nativeBuildInputs = [ pytestrunner ]; + propagatedBuildInputs = [ colorama mypy pyyaml regex ] + ++ stdenv.lib.optionals (pythonOlder "3.7") [ dataclasses ] + ++ stdenv.lib.optionals (pythonOlder "3.5") [ typing ]; + checkInputs = [ pytest-mypy ]; + + checkPhase = '' + pytest test/ + ''; + + meta = with stdenv.lib; { + description = "Generates Python parsers from grammars in a variation of EBNF"; + longDescription = '' + TatSu (the successor to Grako) is a tool that takes grammars in a + variation of EBNF as input, and outputs memoizing (Packrat) PEG parsers in + Python. + ''; + homepage = "https://tatsu.readthedocs.io/"; + license = licenses.bsd2; + maintainers = with maintainers; [ primeos ]; + }; + +} diff --git a/pkgs/development/python-modules/tblib/default.nix b/pkgs/development/python-modules/tblib/default.nix index 4b5ad014b973..62e7faa121ff 100644 --- a/pkgs/development/python-modules/tblib/default.nix +++ b/pkgs/development/python-modules/tblib/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "tblib"; - version = "1.4.0"; + version = "1.5.0"; src = fetchPypi { inherit pname version; - sha256 = "1k9vmw0kcbkij9lbz80imkwkhq24vgrqf1i95kv8y5aaarjda6mx"; + sha256 = "1735ff8fd6217446384b5afabead3b142cf1a52d242cfe6cab4240029d6d131a"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/tbm-utils/default.nix b/pkgs/development/python-modules/tbm-utils/default.nix new file mode 100644 index 000000000000..f0593ba1bcce --- /dev/null +++ b/pkgs/development/python-modules/tbm-utils/default.nix @@ -0,0 +1,37 @@ +{ lib +, buildPythonPackage +, fetchPypi +, attrs +, pendulum +, pprintpp +, wrapt +, pythonOlder +}: + +buildPythonPackage rec { + pname = "tbm-utils"; + version = "1.0.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "08fb86b5ab469bafdbef19751abb6dc1e08a3043c373ea915e1b6e20d023b529"; + }; + + postPatch = '' + substituteInPlace setup.py --replace ",<19.3" "" + ''; + + # No tests in archive. + doCheck = false; + + disabled = pythonOlder "3.6"; + + propagatedBuildInputs = [ attrs pendulum pprintpp wrapt ]; + + meta = { + homepage = https://github.com/thebigmunch/tbm-utils; + license = with lib.licenses; [ mit ]; + description = "A commonly-used set of utilities"; + }; + +} diff --git a/pkgs/development/python-modules/tenacity/default.nix b/pkgs/development/python-modules/tenacity/default.nix index 3540bebd1960..c03c2e1a30dd 100644 --- a/pkgs/development/python-modules/tenacity/default.nix +++ b/pkgs/development/python-modules/tenacity/default.nix @@ -1,28 +1,26 @@ { lib, buildPythonPackage, fetchPypi, isPy27 -, pbr, six, futures, monotonic +, pbr, six, futures, monotonic, setuptools_scm , pytest, sphinx, tornado }: buildPythonPackage rec { pname = "tenacity"; - version = "5.0.4"; + version = "5.1.1"; src = fetchPypi { inherit pname version; - sha256 = "06sp12cn8zcb7rqklq91f6mxhvrdq5cs0p3pdiazacqcmvvwbhx0"; + sha256 = "a4eb168dbf55ed2cae27e7c6b2bd48ab54dabaf294177d998330cf59f294c112"; }; - nativeBuildInputs = [ pbr ]; + nativeBuildInputs = [ pbr setuptools_scm ]; propagatedBuildInputs = [ six ] ++ lib.optionals isPy27 [ futures monotonic ]; checkInputs = [ pytest sphinx tornado ]; - checkPhase = (if isPy27 then '' + checkPhase = if isPy27 then '' pytest --ignore='tenacity/tests/test_asyncio.py' '' else '' pytest - '') + '' - sphinx-build -a -E -W -b doctest doc/source doc/build ''; meta = with lib; { diff --git a/pkgs/development/python-modules/testfixtures/default.nix b/pkgs/development/python-modules/testfixtures/default.nix index f9d35297306c..a08241332dcf 100644 --- a/pkgs/development/python-modules/testfixtures/default.nix +++ b/pkgs/development/python-modules/testfixtures/default.nix @@ -1,25 +1,18 @@ -{ stdenv, buildPythonPackage, fetchPypi, fetchpatch -, mock, pytest, sybil, zope_component }: +{ stdenv, buildPythonPackage, fetchPypi, fetchpatch, isPy27 +, mock, pytest, sybil, zope_component, twisted }: buildPythonPackage rec { pname = "testfixtures"; - version = "6.3.0"; + version = "6.10.0"; src = fetchPypi { inherit pname version; - sha256 = "1x16xkw483nb1ngv74s7lgaj514pb1ldklal7kb7iwqbxcgnrh2k"; + sha256 = "1kiv60i0s67v34x28j6cshby7n7mbhd7a7val639yvvlh1f0q8wx"; }; - checkInputs = [ pytest mock sybil zope_component ]; - - patches = [ - # Fix tests for Python 3.7. Remove with the next release - (fetchpatch { - url = https://github.com/Simplistix/testfixtures/commit/6e8807543b804946aba58e2c9e92f5bdc3656a57.patch; - sha256 = "1584jz2qz04arx8z8f6d1l1vab7gi38k3akzm223rmp7j4m7yrii"; - }) - ]; + checkInputs = [ pytest mock sybil zope_component twisted ]; + doCheck = !isPy27; checkPhase = '' # django is too much hasle to setup at the moment pytest -W ignore::DeprecationWarning --ignore=testfixtures/tests/test_django testfixtures/tests diff --git a/pkgs/development/python-modules/thinc/default.nix b/pkgs/development/python-modules/thinc/default.nix index a9d1cdee2579..a841001ca72d 100644 --- a/pkgs/development/python-modules/thinc/default.nix +++ b/pkgs/development/python-modules/thinc/default.nix @@ -28,11 +28,11 @@ buildPythonPackage rec { pname = "thinc"; - version = "7.1.1"; + version = "7.2.0"; src = fetchPypi { inherit pname version; - sha256 = "0gkz4q53ps3vzz0ww154y0dv6nri5sli8yflh7c26maawvz8wiv8"; + sha256 = "808caccafab95aa74c21695248b26279792cd7d07d94fd97f181020f318f024a"; }; buildInputs = lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ diff --git a/pkgs/development/python-modules/tifffile/default.nix b/pkgs/development/python-modules/tifffile/default.nix index 9a0876548e55..03ab35e9e196 100644 --- a/pkgs/development/python-modules/tifffile/default.nix +++ b/pkgs/development/python-modules/tifffile/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "tifffile"; - version = "2019.2.22"; + version = "2019.7.26"; src = fetchPypi { inherit pname version; - sha256 = "ed49d75b3eff711dbe74b35324dfd79e0db598b6e772a9096001545e81e95437"; + sha256 = "82c5c72de4dc19cc7011e4e8c45492e17121bd02cfa98c015ddd2a83e36f09bc"; }; patches = lib.optional isPy27 ./python2-regex-compat.patch; diff --git a/pkgs/development/python-modules/todoist/default.nix b/pkgs/development/python-modules/todoist/default.nix index 6f3eae60c635..0a32118338eb 100644 --- a/pkgs/development/python-modules/todoist/default.nix +++ b/pkgs/development/python-modules/todoist/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "todoist-python"; - version = "7.0.17"; + version = "8.1.0"; src = fetchPypi { inherit pname version; - sha256 = "0gs4vlvvmkz627ybswj0l6m3c8dyrqgfqjlawbc8d9rkx88srkr2"; + sha256 = "0f4d402137f02f415f99acaa9d7ab24016687202dec9a191aee4745a9ce67dc6"; }; propagatedBuildInputs = [ requests ]; diff --git a/pkgs/development/python-modules/tox/default.nix b/pkgs/development/python-modules/tox/default.nix index 772128c68608..fdc2c9167a34 100644 --- a/pkgs/development/python-modules/tox/default.nix +++ b/pkgs/development/python-modules/tox/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "tox"; - version = "3.7.0"; + version = "3.14.0"; buildInputs = [ setuptools_scm ]; propagatedBuildInputs = [ packaging pluggy py six virtualenv toml filelock ]; @@ -22,7 +22,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "25ef928babe88c71e3ed3af0c464d1160b01fca2dd1870a5bb26c2dea61a17fc"; + sha256 = "c4f6b319c20ba4913dbfe71ebfd14ff95d1853c4231493608182f66e566ecfe1"; }; meta = with lib; { diff --git a/pkgs/development/python-modules/transitions/default.nix b/pkgs/development/python-modules/transitions/default.nix index 059289ec4219..f4eb4fe5293b 100644 --- a/pkgs/development/python-modules/transitions/default.nix +++ b/pkgs/development/python-modules/transitions/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "transitions"; - version = "0.6.9"; + version = "0.7.1"; src = fetchPypi { inherit pname version; - sha256 = "afe0f498cf1f3f3b0fc13562011b8895a172df8f891dbb5118923d46e78a96d7"; + sha256 = "b73015080833b753cbb4a10f51f8234924ddfbdbaf33539fee4e4f3abfff454d"; }; postPatch = '' diff --git a/pkgs/development/python-modules/trio/default.nix b/pkgs/development/python-modules/trio/default.nix index b21157ec9486..458a580a170b 100644 --- a/pkgs/development/python-modules/trio/default.nix +++ b/pkgs/development/python-modules/trio/default.nix @@ -13,6 +13,7 @@ , jedi , pylint , astor +, yapf }: buildPythonPackage rec { @@ -25,11 +26,16 @@ buildPythonPackage rec { sha256 = "0wnnrs36arvimrfgrlbpjw3nx7lppx43yvk2b380ivv69h52i6hl"; }; - checkInputs = [ astor pytest pyopenssl trustme jedi pylint ]; + checkInputs = [ astor pytest pyopenssl trustme jedi pylint yapf ]; # It appears that the build sandbox doesn't include /etc/services, and these tests try to use it. checkPhase = '' - HOME="$(mktemp -d)" py.test -k 'not test_getnameinfo and not test_SocketType_resolve and not test_getprotobyname and not test_waitpid' + HOME=$TMPDIR py.test -k 'not getnameinfo \ + and not SocketType_resolve \ + and not getprotobyname \ + and not waitpid \ + and not static_tool_sees_all_symbols' ''; + propagatedBuildInputs = [ attrs sortedcontainers diff --git a/pkgs/development/python-modules/typeguard/default.nix b/pkgs/development/python-modules/typeguard/default.nix index 7fb6f8fef435..af9301571de4 100644 --- a/pkgs/development/python-modules/typeguard/default.nix +++ b/pkgs/development/python-modules/typeguard/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "typeguard"; - version = "2.2.2"; + version = "2.5.1"; src = fetchPypi { inherit pname version; - sha256 = "b8ddc6e2e60bd64b7003f9a685a09ba387b74adf2f6bea7534a76d61892f573e"; + sha256 = "5269435c8c98f4c4861dd69f3de755aaab5e163991b7ce1e0eff7ae6472957dd"; }; buildInputs = [ setuptools_scm ]; diff --git a/pkgs/development/python-modules/tzlocal/default.nix b/pkgs/development/python-modules/tzlocal/default.nix index 8320500fc141..9948dd1e84eb 100644 --- a/pkgs/development/python-modules/tzlocal/default.nix +++ b/pkgs/development/python-modules/tzlocal/default.nix @@ -3,13 +3,13 @@ buildPythonPackage rec { pname = "tzlocal"; - version = "1.5.1"; + version = "2.0.0"; propagatedBuildInputs = [ pytz ]; src = fetchPypi { inherit pname version; - sha256 = "4ebeb848845ac898da6519b9b31879cf13b6626f7184c496037b818e238f2c4e"; + sha256 = "949b9dd5ba4be17190a80c0268167d7e6c92c62b30026cf9764caf3e308e5590"; }; # test fail (timezone test fail) diff --git a/pkgs/development/python-modules/uncompyle6/default.nix b/pkgs/development/python-modules/uncompyle6/default.nix index 0c6cf05e93fd..abc072b19b7f 100644 --- a/pkgs/development/python-modules/uncompyle6/default.nix +++ b/pkgs/development/python-modules/uncompyle6/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "uncompyle6"; - version = "3.4.1"; + version = "3.5.0"; src = fetchPypi { inherit pname version; - sha256 = "fc856677f41843ed8577dad4d0cf95e8be017b11c2501fad1b39209eb26a41aa"; + sha256 = "4e6e86c05de588cbf5a2c35ddd080f23cd1770a1ad15c84dc1b2c78d65113af7"; }; checkInputs = [ nose pytest hypothesis six ]; diff --git a/pkgs/development/python-modules/unidecode/default.nix b/pkgs/development/python-modules/unidecode/default.nix index 13f0053f143c..8d3ecc543775 100644 --- a/pkgs/development/python-modules/unidecode/default.nix +++ b/pkgs/development/python-modules/unidecode/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "Unidecode"; - version = "1.0.23"; + version = "1.1.1"; src = fetchPypi { inherit pname version; - sha256 = "8b85354be8fd0c0e10adbf0675f6dc2310e56fda43fa8fe049123b6c475e52fb"; + sha256 = "2b6aab710c2a1647e928e36d69c21e76b453cd455f4e2621000e54b2a9b8cce8"; }; LC_ALL="en_US.UTF-8"; diff --git a/pkgs/development/python-modules/uproot/default.nix b/pkgs/development/python-modules/uproot/default.nix index 508b9014a212..ff0e5d614822 100644 --- a/pkgs/development/python-modules/uproot/default.nix +++ b/pkgs/development/python-modules/uproot/default.nix @@ -15,11 +15,11 @@ buildPythonPackage rec { pname = "uproot"; - version = "3.10.6"; + version = "3.10.8"; src = fetchPypi { inherit pname version; - sha256 = "bbebae0c8d8e22ca6cfcddf26a3e383841c865fc6e9b1cec38151a8cbab72d07"; + sha256 = "cf9b9a6824e82f2e45d44e2c9d8a230ce9f83972e74427543862fdff462fb121"; }; nativeBuildInputs = [ pytestrunner ]; diff --git a/pkgs/development/python-modules/urlgrabber/default.nix b/pkgs/development/python-modules/urlgrabber/default.nix index 31e6e6a066a7..f81a6d814e9f 100644 --- a/pkgs/development/python-modules/urlgrabber/default.nix +++ b/pkgs/development/python-modules/urlgrabber/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "urlgrabber"; - version = "4.0.0"; + version = "4.1.0"; src = fetchPypi { inherit pname version; - sha256 = "0fazs574fgixd525cn2dh027f4qf0c0gbwcfyfkhc6fkblfa1ibr"; + sha256 = "075af8afabae6362482d254e5ac3ffa595d1766117b684e53d9c25c2e937e139"; }; propagatedBuildInputs = [ pycurl six ]; diff --git a/pkgs/development/python-modules/vcrpy/default.nix b/pkgs/development/python-modules/vcrpy/default.nix index 13f7753831b4..507a082f9a0c 100644 --- a/pkgs/development/python-modules/vcrpy/default.nix +++ b/pkgs/development/python-modules/vcrpy/default.nix @@ -15,11 +15,11 @@ buildPythonPackage rec { pname = "vcrpy"; - version = "2.0.1"; + version = "2.1.0"; src = fetchPypi { inherit pname version; - sha256 = "0kws7l3hci1dvjv01nxw3805q9v2mwldw58bgl8s90wqism69gjp"; + sha256 = "0e79239441fb4c731da9f05aecbd062223ef1f4ab668d2400c63c347a7071414"; }; checkInputs = [ diff --git a/pkgs/development/python-modules/vega/default.nix b/pkgs/development/python-modules/vega/default.nix index f6a9f3153f14..2bfeccccc59f 100644 --- a/pkgs/development/python-modules/vega/default.nix +++ b/pkgs/development/python-modules/vega/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "vega"; - version = "2.3.2"; + version = "2.6.0"; src = fetchPypi { inherit pname version; - sha256 = "0f39kfinn297gjhms9jys3ixdlsn0dz3gndgacyimp77jhzir4v1"; + sha256 = "c66354d6d164cc3d7254bcd129d8d861daf4a9e9cb8738b1724791777f6c29f0"; }; buildInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/vidstab/default.nix b/pkgs/development/python-modules/vidstab/default.nix index 7003b9e1b043..55d618899fd7 100644 --- a/pkgs/development/python-modules/vidstab/default.nix +++ b/pkgs/development/python-modules/vidstab/default.nix @@ -10,12 +10,12 @@ }: buildPythonPackage rec { - version = "1.5.6"; + version = "1.7.2"; pname = "vidstab"; src = fetchPypi { inherit pname version; - sha256 = "6b488aed337855ac8b3730f7c6964c2ad41111a8f61ab0b457197696feefa593"; + sha256 = "24cb7a25a6ed9a474f4d23c9deecf9163691fcde2559de10897f593ba849266b"; }; checkInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/virtualenv/default.nix b/pkgs/development/python-modules/virtualenv/default.nix index bad23341df72..5d7e2c6b663e 100644 --- a/pkgs/development/python-modules/virtualenv/default.nix +++ b/pkgs/development/python-modules/virtualenv/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "virtualenv"; - version = "16.4.3"; + version = "16.7.7"; src = fetchPypi { inherit pname version; - sha256 = "984d7e607b0a5d1329425dd8845bd971b957424b5ba664729fab51ab8c11bc39"; + sha256 = "d257bb3773e48cac60e475a19b608996c73f4d333b3ba2e4e57d5ac6134e0136"; }; # Doubt this is needed - FRidh 2017-07-07 diff --git a/pkgs/development/python-modules/virtualenv/virtualenv-change-prefix.patch b/pkgs/development/python-modules/virtualenv/virtualenv-change-prefix.patch index 4378e00bb1fc..f3e8ea854f6a 100644 --- a/pkgs/development/python-modules/virtualenv/virtualenv-change-prefix.patch +++ b/pkgs/development/python-modules/virtualenv/virtualenv-change-prefix.patch @@ -26,13 +26,13 @@ index bcf3225..3530997 100755 - if IS_DARWIN: - prefixes.extend( - ( -- os.path.join("/Library/Python", sys.version[:3], "site-packages"), +- os.path.join("/Library/Python", VERSION, "site-packages"), - os.path.join(sys.prefix, "Extras", "lib", "python"), -- os.path.join("~", "Library", "Python", sys.version[:3], "site-packages"), +- os.path.join("~", "Library", "Python", VERSION, "site-packages"), - # Python 2.6 no-frameworks -- os.path.join("~", ".local", "lib", "python", sys.version[:3], "site-packages"), +- os.path.join("~", ".local", "lib", "python", VERSION, "site-packages"), - # System Python 2.7 on OSX Mountain Lion -- os.path.join("~", "Library", "Python", sys.version[:3], "lib", "python", "site-packages"), +- os.path.join("~", "Library", "Python", VERSION, "lib", "python", "site-packages"), - ) - ) + prefixes = ["/nix/store", sys.prefix] diff --git a/pkgs/development/python-modules/vowpalwabbit/default.nix b/pkgs/development/python-modules/vowpalwabbit/default.nix index a91de2d7eeed..b9fae7830748 100644 --- a/pkgs/development/python-modules/vowpalwabbit/default.nix +++ b/pkgs/development/python-modules/vowpalwabbit/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "vowpalwabbit"; - version = "8.5.0"; + version = "8.7.0.post1"; src = fetchPypi{ inherit pname version; - sha256 = "0b517371fc64f1c728a0af42a31fa93def27306e9b4d25d6e5fd01bcff1b7304"; + sha256 = "de9529660858b380127b2bea335b41a29e8f264551315042300022eb4e6524ea"; }; # Should be fixed in next Python release after 8.5.0: diff --git a/pkgs/development/python-modules/waitress/default.nix b/pkgs/development/python-modules/waitress/default.nix index fb39ae9fc7a8..acbe03793db3 100644 --- a/pkgs/development/python-modules/waitress/default.nix +++ b/pkgs/development/python-modules/waitress/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "waitress"; - version = "1.2.1"; + version = "1.3.1"; src = fetchPypi { inherit pname version; - sha256 = "c369e238bd81ef7d61f04825f06f107c42094de60d13d8de8e71952c7c683dfe"; + sha256 = "278e09d6849acc1365404bbf7d790d0423b159802e850c726e8cd0a126a2dac7"; }; doCheck = false; diff --git a/pkgs/development/python-modules/web/default.nix b/pkgs/development/python-modules/web/default.nix index fb777ad4129b..c6a25c7d1b77 100644 --- a/pkgs/development/python-modules/web/default.nix +++ b/pkgs/development/python-modules/web/default.nix @@ -5,13 +5,13 @@ }: buildPythonPackage rec { - version = "0.39"; + version = "0.40"; pname = "web.py"; disabled = isPy3k; src = fetchPypi { inherit pname version; - sha256 = "7e7224493a51f6fbf02f3ce7f2011bcd9e5ebdfce0ee25e5921fdf665ba07542"; + sha256 = "dc5e42ffbc42d77d07f75b7acca9975a3368ae609774e49ddebb497a784131f3"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/webcolors/default.nix b/pkgs/development/python-modules/webcolors/default.nix index d530eda39d97..3ca97c4556ce 100644 --- a/pkgs/development/python-modules/webcolors/default.nix +++ b/pkgs/development/python-modules/webcolors/default.nix @@ -2,17 +2,20 @@ , buildPythonPackage , fetchPypi , python +, six }: buildPythonPackage rec { pname = "webcolors"; - version = "1.8.1"; + version = "1.10"; src = fetchPypi { inherit pname version; - sha256 = "030562f624467a9901f0b455fef05486a88cfb5daa1e356bd4aacea043850b59"; + sha256 = "7b11194c414dcf4b9bd8fb5ceaafc9da183b27430883c62f620589eb79b91b6e"; }; + propagatedBuildInputs = [ six ]; + checkPhase = '' ${python.interpreter} -m unittest discover -s tests ''; @@ -22,4 +25,4 @@ buildPythonPackage rec { homepage = https://bitbucket.org/ubernostrum/webcolors/overview/; license = lib.licenses.bsd3; }; -} \ No newline at end of file +} diff --git a/pkgs/development/python-modules/werkzeug/default.nix b/pkgs/development/python-modules/werkzeug/default.nix index ab584bf19d26..7d9d55ec8846 100644 --- a/pkgs/development/python-modules/werkzeug/default.nix +++ b/pkgs/development/python-modules/werkzeug/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "Werkzeug"; - version = "0.15.6"; + version = "0.16.0"; src = fetchPypi { inherit pname version; - sha256 = "0a24d43be6a7dce81bae05292356176d6c46d63e42a0dd3f9504b210a9cfaa43"; + sha256 = "7280924747b5733b246fe23972186c6b348f9ae29724135a6dfc1e53cea433e7"; }; propagatedBuildInputs = [ itsdangerous ]; diff --git a/pkgs/development/python-modules/wsproto/0.14.nix b/pkgs/development/python-modules/wsproto/0.14.nix index 36aaf0ec8ceb..b2c3c527d828 100644 --- a/pkgs/development/python-modules/wsproto/0.14.nix +++ b/pkgs/development/python-modules/wsproto/0.14.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "wsproto"; - version = "0.14.1"; + version = "0.15.0"; src = fetchPypi { inherit pname version; - sha256 = "051s127qb5dladxa14n9nqajwq7xki1dz1was5r5v9df5a0jq8pd"; + sha256 = "614798c30e5dc2b3f65acc03d2d50842b97621487350ce79a80a711229edfa9d"; }; propagatedBuildInputs = [ h11 enum34 ]; diff --git a/pkgs/development/python-modules/xdis/default.nix b/pkgs/development/python-modules/xdis/default.nix index 9d43b66eca87..cec21c446570 100644 --- a/pkgs/development/python-modules/xdis/default.nix +++ b/pkgs/development/python-modules/xdis/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchFromGitHub +{ lib, buildPythonPackage, fetchFromGitHub, isPy27 , click , pytest , six @@ -7,6 +7,7 @@ buildPythonPackage rec { pname = "xdis"; version = "4.0.4"; + disabled = isPy27; src = fetchFromGitHub { owner = "rocky"; diff --git a/pkgs/development/python-modules/xml2rfc/default.nix b/pkgs/development/python-modules/xml2rfc/default.nix index 1a854845cc42..ccb4d879be9b 100644 --- a/pkgs/development/python-modules/xml2rfc/default.nix +++ b/pkgs/development/python-modules/xml2rfc/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "xml2rfc"; - version = "2.27.1"; + version = "2.34.0"; src = fetchPypi { inherit pname version; - sha256 = "00v5gsshy1rmjd334d2awh0mvri949lmyk8f02wfr20rq6fc3xqd"; + sha256 = "7b9543edacc2f4fa12cea8b64ae8144afb493d7b2a0135494642f29592b5d272"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/xstatic-bootstrap/default.nix b/pkgs/development/python-modules/xstatic-bootstrap/default.nix index a474bf84d0fd..a1e2c1a4e7b6 100644 --- a/pkgs/development/python-modules/xstatic-bootstrap/default.nix +++ b/pkgs/development/python-modules/xstatic-bootstrap/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "XStatic-Bootstrap"; - version = "3.3.7.1"; + version = "4.1.3.1"; src = fetchPypi { inherit version pname; - sha256 = "0c949e78e8cd77983fd803a68a98df0124e0c3a872fddb9ac8e6e5b4a487f131"; + sha256 = "1800e6bb5fc687604d8a893eee8c7882d800a6f3d6721799016f99a47d1dac0f"; }; # no tests implemented diff --git a/pkgs/development/python-modules/yubico-client/default.nix b/pkgs/development/python-modules/yubico-client/default.nix index ddd992a51447..e39b11f6200c 100644 --- a/pkgs/development/python-modules/yubico-client/default.nix +++ b/pkgs/development/python-modules/yubico-client/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "yubico-client"; - version = "1.10.0"; + version = "1.11.0"; src = fetchPypi { inherit pname version; - sha256 = "0skkmrpvpb1pwyqjf3lh9vq46xagvwdx9kagpdbba2v5dgrk34d1"; + sha256 = "c1d1c1f918c058932493c5a50341583e48487264129ed5b973c327ae48afed87"; }; propagatedBuildInputs = [ requests ]; diff --git a/pkgs/development/python-modules/zc_lockfile/default.nix b/pkgs/development/python-modules/zc_lockfile/default.nix index 110b7000e735..173a619197ce 100644 --- a/pkgs/development/python-modules/zc_lockfile/default.nix +++ b/pkgs/development/python-modules/zc_lockfile/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "zc.lockfile"; - version = "1.4"; + version = "2.0"; src = fetchPypi { inherit pname version; - sha256 = "0lrj2zdr06sff7i151710jbbnnhx4phdc0qpns8jkarpd62f7a4m"; + sha256 = "307ad78227e48be260e64896ec8886edc7eae22d8ec53e4d528ab5537a83203b"; }; buildInputs = [ mock ]; diff --git a/pkgs/development/python-modules/zipp/default.nix b/pkgs/development/python-modules/zipp/default.nix index e0593dcc21d7..3b9b1a12ccac 100644 --- a/pkgs/development/python-modules/zipp/default.nix +++ b/pkgs/development/python-modules/zipp/default.nix @@ -4,19 +4,22 @@ , setuptools_scm , pytest , pytest-flake8 +, more-itertools }: buildPythonPackage rec { pname = "zipp"; - version = "0.5.2"; + version = "0.6.0"; src = fetchPypi { inherit pname version; - sha256 = "4970c3758f4e89a7857a973b1e2a5d75bcdc47794442f2e2dd4fe8e0466e809a"; + sha256 = "3718b1cbcd963c7d4c5511a8240812904164b7f381b647143a89d3b98f9bcd8e"; }; nativeBuildInputs = [ setuptools_scm ]; + propagatedBuildInputs = [ more-itertools ]; + checkInputs = [ pytest pytest-flake8 ]; checkPhase = '' diff --git a/pkgs/development/ruby-modules/solargraph/Gemfile.lock b/pkgs/development/ruby-modules/solargraph/Gemfile.lock index 042c0366ffbf..edd946d92850 100644 --- a/pkgs/development/ruby-modules/solargraph/Gemfile.lock +++ b/pkgs/development/ruby-modules/solargraph/Gemfile.lock @@ -5,17 +5,16 @@ GEM backport (1.1.2) htmlentities (4.3.4) jaro_winkler (1.5.3) - kramdown (1.17.0) mini_portile2 (2.4.0) - nokogiri (1.10.3) + nokogiri (1.10.4) mini_portile2 (~> 2.4.0) - parallel (1.17.0) - parser (2.6.3.0) + parallel (1.18.0) + parser (2.6.5.0) ast (~> 2.4.0) rainbow (3.0.0) - reverse_markdown (1.1.0) + reverse_markdown (1.3.0) nokogiri - rubocop (0.74.0) + rubocop (0.75.1) jaro_winkler (~> 1.5.1) parallel (~> 1.10) parser (>= 2.6) @@ -23,12 +22,12 @@ GEM ruby-progressbar (~> 1.7) unicode-display_width (>= 1.4.0, < 1.7) ruby-progressbar (1.10.1) - solargraph (0.35.2) + solargraph (0.37.2) backport (~> 1.1) bundler (>= 1.17.2) htmlentities (~> 4.3, >= 4.3.4) jaro_winkler (~> 1.5) - kramdown (~> 1.16) + nokogiri (~> 1.9, >= 1.9.1) parser (~> 2.3) reverse_markdown (~> 1.0, >= 1.0.5) rubocop (~> 0.52) @@ -36,7 +35,7 @@ GEM tilt (~> 2.0) yard (~> 0.9) thor (0.20.3) - tilt (2.0.9) + tilt (2.0.10) unicode-display_width (1.6.0) yard (0.9.20) diff --git a/pkgs/development/ruby-modules/solargraph/gemset.nix b/pkgs/development/ruby-modules/solargraph/gemset.nix index 2f0c60404bc3..aa28f666e5ac 100644 --- a/pkgs/development/ruby-modules/solargraph/gemset.nix +++ b/pkgs/development/ruby-modules/solargraph/gemset.nix @@ -39,16 +39,6 @@ }; version = "1.5.3"; }; - kramdown = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1n1c4jmrh5ig8iv1rw81s4mw4xsp4v97hvf8zkigv4hn5h542qjq"; - type = "gem"; - }; - version = "1.17.0"; - }; mini_portile2 = { groups = ["default"]; platforms = []; @@ -65,20 +55,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "02bjydih0j515szfv9mls195cvpyidh6ixm7dwbl3s2sbaxxk5s4"; + sha256 = "0nmdrqqz1gs0fwkgzxjl4wr554gr8dc1fkrqjc2jpsvwgm41rygv"; type = "gem"; }; - version = "1.10.3"; + version = "1.10.4"; }; parallel = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1x1gzgjrdlkm1aw0hfpyphsxcx90qgs3y4gmp9km3dvf4hc4qm8r"; + sha256 = "091p5zrzzyg3fg48jhdz9lzjf2r9r3akra2cd46yd4nza3xgxshz"; type = "gem"; }; - version = "1.17.0"; + version = "1.18.0"; }; parser = { dependencies = ["ast"]; @@ -86,10 +76,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1pnks149x0fzgqiw53qlmvcd8bi746cxdw03sjljby5s97p1fskn"; + sha256 = "09davv4ld6caqlczw64vhwf8hr41apys3cj8v2h96yxs4qg1m2iw"; type = "gem"; }; - version = "2.6.3.0"; + version = "2.6.5.0"; }; rainbow = { groups = ["default"]; @@ -107,10 +97,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0w7y5n74daajvl9gixr91nh8670d7mkgspkk3ql71m8azq3nffbg"; + sha256 = "1zb9n227b5s4cg942sc0g3n1bdx9fpcvq5m6w7ap0yc116ivv5w2"; type = "gem"; }; - version = "1.1.0"; + version = "1.3.0"; }; rubocop = { dependencies = ["jaro_winkler" "parallel" "parser" "rainbow" "ruby-progressbar" "unicode-display_width"]; @@ -118,10 +108,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0wpyass9qb2wvq8zsc7wdzix5xy2ldiv66wnx8mwwprz2dcvzayk"; + sha256 = "0s5q1i7776yklkcwwx6ibm2mwnjky6wv7rpa3xhn8448854is31n"; type = "gem"; }; - version = "0.74.0"; + version = "0.75.1"; }; ruby-progressbar = { groups = ["default"]; @@ -134,15 +124,15 @@ version = "1.10.1"; }; solargraph = { - dependencies = ["backport" "htmlentities" "jaro_winkler" "kramdown" "parser" "reverse_markdown" "rubocop" "thor" "tilt" "yard"]; + dependencies = ["backport" "htmlentities" "jaro_winkler" "nokogiri" "parser" "reverse_markdown" "rubocop" "thor" "tilt" "yard"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1r0a7nfb0cwg2d7awbmvzk14594w7vkx844sshl9jpzkjx1asa9n"; + sha256 = "0w20g68i6djc2vyx3awzvn15brdfpcwbna27r0903h5djcmnr8a0"; type = "gem"; }; - version = "0.35.2"; + version = "0.37.2"; }; thor = { groups = ["default"]; @@ -159,10 +149,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ca4k0clwf0rkvy7726x4nxpjxkpv67w043i39saxgldxd97zmwz"; + sha256 = "0rn8z8hda4h41a64l0zhkiwz2vxw9b1nb70gl37h1dg2k874yrlv"; type = "gem"; }; - version = "2.0.9"; + version = "2.0.10"; }; unicode-display_width = { groups = ["default"]; @@ -184,4 +174,4 @@ }; version = "0.9.20"; }; -} \ No newline at end of file +} diff --git a/pkgs/games/minecraft/default.nix b/pkgs/games/minecraft/default.nix index 7abd6c162e0a..0de2268c1af3 100644 --- a/pkgs/games/minecraft/default.nix +++ b/pkgs/games/minecraft/default.nix @@ -15,6 +15,7 @@ , cups , dbus , atk +, gtk3-x11 , gtk2-x11 , gdk-pixbuf , glib @@ -58,6 +59,7 @@ let glib gnome2.GConf gnome2.pango + gtk3-x11 gtk2-x11 nspr nss @@ -82,11 +84,11 @@ in stdenv.mkDerivation rec { pname = "minecraft-launcher"; - version = "2.1.5965"; + version = "2.1.7658"; src = fetchurl { url = "https://launcher.mojang.com/download/linux/x86_64/minecraft-launcher_${version}.tar.gz"; - sha256 = "0wlc49s541li4cbxdmlw8fp34hp1q9m6ngr7l5hfdhv1i13s5845"; + sha256 = "10sng7l0q9r98zwifjmy50nyh65ny4djmacz8158hffcsfcx93px"; }; icon = fetchurl { diff --git a/pkgs/misc/sndio/default.nix b/pkgs/misc/sndio/default.nix index 1993b4bcce40..0f09483a8571 100644 --- a/pkgs/misc/sndio/default.nix +++ b/pkgs/misc/sndio/default.nix @@ -4,13 +4,19 @@ stdenv.mkDerivation rec { pname = "sndio"; version = "1.6.0"; enableParallelBuilding = true; - buildInputs = [ alsaLib ]; + buildInputs = stdenv.lib.optionals stdenv.isLinux [ alsaLib ]; src = fetchurl { url = "http://www.sndio.org/sndio-${version}.tar.gz"; sha256 = "1havdx3q4mipgddmd2bnygr1yh6y64567m1yqwjapkhsq550dq4r"; }; + postFixup = stdenv.lib.optionalString stdenv.isDarwin '' + for file in $out/bin/*; do + install_name_tool -change libsndio.7.0.dylib $out/lib/libsndio.dylib $file + done + ''; + meta = with stdenv.lib; { homepage = "http://www.sndio.org"; description = "Small audio and MIDI framework part of the OpenBSD project"; diff --git a/pkgs/os-specific/linux/fbterm/default.nix b/pkgs/os-specific/linux/fbterm/default.nix index c8fc633f8bd3..d56b254d3821 100644 --- a/pkgs/os-specific/linux/fbterm/default.nix +++ b/pkgs/os-specific/linux/fbterm/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation { inherit (s) url sha256; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ncurses ]; inherit buildInputs; preConfigure = '' @@ -31,6 +31,7 @@ stdenv.mkDerivation { preBuild = '' mkdir -p "$out/share/terminfo" tic -a -v2 -o"$out/share/terminfo" terminfo/fbterm + makeFlagsArray+=("AR=$AR") ''; patches = [ @@ -47,6 +48,7 @@ stdenv.mkDerivation { url = "https://raw.githubusercontent.com/glitsj16/fbterm-patched/d1fe03313be4654dd0a1c0bb5f51530732345134/miscoloring-fix.patch"; sha256 = "1mjszji0jgs2jsagjp671fv0d1983wmxv009ff1jfhi9pbay6jd0"; }) + ./select.patch ]; meta = with stdenv.lib; { diff --git a/pkgs/os-specific/linux/fbterm/select.patch b/pkgs/os-specific/linux/fbterm/select.patch new file mode 100644 index 000000000000..549674047a93 --- /dev/null +++ b/pkgs/os-specific/linux/fbterm/select.patch @@ -0,0 +1,12 @@ +diff --git a/src/fbio.cpp b/src/fbio.cpp +index e5afc44..2485227 100644 +--- a/src/fbio.cpp ++++ b/src/fbio.cpp +@@ -18,6 +18,7 @@ + * + */ + ++#include + #include + #include + #include "config.h" diff --git a/pkgs/os-specific/linux/sysstat/default.nix b/pkgs/os-specific/linux/sysstat/default.nix index b2b7e1d6195e..ba6aff4e8bcf 100644 --- a/pkgs/os-specific/linux/sysstat/default.nix +++ b/pkgs/os-specific/linux/sysstat/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, gettext, bzip2 }: stdenv.mkDerivation rec { - name = "sysstat-12.1.5"; + name = "sysstat-12.1.7"; src = fetchurl { url = "http://pagesperso-orange.fr/sebastien.godard/${name}.tar.xz"; - sha256 = "1i92jmrqcpzgy98r1f4fd0x7y2wvwc05ywsh19w3s2gmndmr75m4"; + sha256 = "1i0qy44krl1gj82izgmqa0zdw82f2gmqzlslvdg5v270vl7i24g7"; }; buildInputs = [ gettext ]; diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index 5a2c5dd504e0..a9fc0c6f4b54 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -84,8 +84,18 @@ stdenv.mkDerivation { "-Dldconfig=false" "-Dsmack=true" "-Db_pie=true" - "-Dsystem-uid-max=499" #TODO: debug why awking around in /etc/login.defs doesn't work - "-Dsystem-gid-max=499" + /* + As of now, systemd doesn't allow runtime configuration of these values. So + the settings in /etc/login.defs have no effect on it. Many people think this + should be supported however, see + - https://github.com/systemd/systemd/issues/3855 + - https://github.com/systemd/systemd/issues/4850 + - https://github.com/systemd/systemd/issues/9769 + - https://github.com/systemd/systemd/issues/9843 + - https://github.com/systemd/systemd/issues/10184 + */ + "-Dsystem-uid-max=999" + "-Dsystem-gid-max=999" # "-Dtime-epoch=1" (if !stdenv.hostPlatform.isEfi then "-Dgnu-efi=false" else "-Dgnu-efi=true") diff --git a/pkgs/servers/amqp/rabbitmq-server/default.nix b/pkgs/servers/amqp/rabbitmq-server/default.nix index da60a122a4ca..12211f496988 100644 --- a/pkgs/servers/amqp/rabbitmq-server/default.nix +++ b/pkgs/servers/amqp/rabbitmq-server/default.nix @@ -6,12 +6,12 @@ stdenv.mkDerivation rec { pname = "rabbitmq-server"; - version = "3.7.18"; + version = "3.8.0"; # when updating, consider bumping elixir version in all-packages.nix src = fetchurl { url = "https://github.com/rabbitmq/rabbitmq-server/releases/download/v${version}/${pname}-${version}.tar.xz"; - sha256 = "1vzx9g2k7ynbv2gz450cwjyxcn3vcxsmlpnvq1r5wzcf25giy9ky"; + sha256 = "174ai8ihk50gwbqinxxxx5is6izvgmfca7skvvp4yk6fl8nbwm15"; }; buildInputs = diff --git a/pkgs/servers/atlassian/jira.nix b/pkgs/servers/atlassian/jira.nix index 18c838a0b218..1d3e3e4f0270 100644 --- a/pkgs/servers/atlassian/jira.nix +++ b/pkgs/servers/atlassian/jira.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "atlassian-jira"; - version = "8.4.2"; + version = "8.5.0"; src = fetchurl { url = "https://product-downloads.atlassian.com/software/jira/downloads/atlassian-jira-software-${version}.tar.gz"; - sha256 = "0f0l9ss8jv06iidg8jw7yk5z42r1m0cbmlgj1wgli9a21ssp65sh"; + sha256 = "093706cpaw1a1vwvzpa85j7n338d748w372vsk8c9lvagaskiwh2"; }; buildPhase = '' diff --git a/pkgs/servers/caddy/default.nix b/pkgs/servers/caddy/default.nix index 56fa95391cc7..bb1f4ac85386 100644 --- a/pkgs/servers/caddy/default.nix +++ b/pkgs/servers/caddy/default.nix @@ -16,9 +16,15 @@ buildGoModule rec { }; modSha256 = "0np0mbs0mrn8scqa0dgvi7ya1707b3883prdaf1whsqrcr71ig8q"; - buildFlagsArray = '' - -ldflags= - -s -w -X github.com/caddyserver/caddy/caddy/caddymain.gitTag=v${version} + preBuild = '' + cat << EOF > caddy/main.go + package main + import "github.com/caddyserver/caddy/caddy/caddymain" + func main() { + caddymain.EnableTelemetry = false + caddymain.Run() + } + EOF ''; meta = with stdenv.lib; { diff --git a/pkgs/servers/clickhouse/default.nix b/pkgs/servers/clickhouse/default.nix index f07ab98bbc45..4c586efe1778 100644 --- a/pkgs/servers/clickhouse/default.nix +++ b/pkgs/servers/clickhouse/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "clickhouse"; - version = "19.13.5.44"; + version = "19.13.6.51"; src = fetchFromGitHub { owner = "yandex"; repo = "ClickHouse"; rev = "v${version}-stable"; - sha256 = "1h0jjpa1wrms5vcgx1vf8fmkc7jjrql1r70dvwr0nw8f7rfyi1l6"; + sha256 = "0mcwfam1nrs2g54syw7vvpfkjn3l4gfzvla7xbg92lr03fn6kbn2"; }; nativeBuildInputs = [ cmake libtool ninja ]; diff --git a/pkgs/servers/documize-community/default.nix b/pkgs/servers/documize-community/default.nix index 213566826f33..ce4669f3044d 100644 --- a/pkgs/servers/documize-community/default.nix +++ b/pkgs/servers/documize-community/default.nix @@ -2,13 +2,13 @@ buildGoPackage rec { pname = "documize-community"; - version = "3.3.2"; + version = "3.4.0"; src = fetchFromGitHub { owner = "documize"; repo = "community"; rev = "v${version}"; - sha256 = "172h3v9absfc0p79a1v9m197x4aprryig0hhyq6bfhjyqd5nq0fd"; + sha256 = "0gmr61ga8ik7awaqcq74bg7h7m8ijqvf4xvr5s6agkmzym83sjsz"; }; goPackagePath = "github.com/documize/community"; diff --git a/pkgs/servers/livepeer/default.nix b/pkgs/servers/livepeer/default.nix index 798bda8e306e..64edcb2ef4fa 100644 --- a/pkgs/servers/livepeer/default.nix +++ b/pkgs/servers/livepeer/default.nix @@ -18,11 +18,6 @@ buildGoPackage rec { buildInputs = [ pkgconfig ffmpeg ]; - # XXX This removes the -O2 flag, to avoid errors like: - # cgo-dwarf-inference:2:8: error: enumerator value for '__cgo_enum__0' is not an integer constant - # This is a workaround for nixpkgs+golang BUG https://github.com/NixOS/nixpkgs/issues/25959 - hardeningDisable = [ "fortify" ]; - enableParallelBuilding = true; meta = with stdenv.lib; { diff --git a/pkgs/servers/minio/default.nix b/pkgs/servers/minio/default.nix index b6a70864cc5c..e1f4d16b0b80 100644 --- a/pkgs/servers/minio/default.nix +++ b/pkgs/servers/minio/default.nix @@ -1,17 +1,17 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ stdenv, buildGoModule, fetchFromGitHub }: -buildGoPackage rec { +buildGoModule rec { pname = "minio"; - version = "2019-02-26T19-51-46Z"; + version = "2019-10-12T01-39-57Z"; src = fetchFromGitHub { owner = "minio"; repo = "minio"; rev = "RELEASE.${version}"; - sha256 = "1f2c7wzcb47msb0iqrcc0idz39wdm9fz61q835ks1nx4qs6hi2db"; + sha256 = "14rqwdhk2awdpcavkaqndf85c6aww5saarbfa2skc9z76ccq6114"; }; - goPackagePath = "github.com/minio/minio"; + modSha256 = "1cnccmmqb63l78rnjwh9bivyfr79ixjg106fbgcrn3pwghfag7ma"; subPackages = [ "." ]; diff --git a/pkgs/servers/sql/mariadb/connector-c/3_1.nix b/pkgs/servers/sql/mariadb/connector-c/3_1.nix index c8bc4858f719..cac300cf15a3 100644 --- a/pkgs/servers/sql/mariadb/connector-c/3_1.nix +++ b/pkgs/servers/sql/mariadb/connector-c/3_1.nix @@ -1,6 +1,6 @@ { callPackage, ... } @ args: callPackage ./. (args // { - version = "3.1.2"; - sha256 = "0pgz8m8d39mvj9wnjll6c83xvdl2h24273b3dkx0g5pxj7ga4shm"; + version = "3.1.4"; + sha256 = "05jkaq151a45rqpyh0vrn6xcpawayfxyzhwn1w32hk0fw3z746ks"; }) diff --git a/pkgs/servers/sql/mariadb/connector-c/default.nix b/pkgs/servers/sql/mariadb/connector-c/default.nix index cb873f4d5a02..af344d637217 100644 --- a/pkgs/servers/sql/mariadb/connector-c/default.nix +++ b/pkgs/servers/sql/mariadb/connector-c/default.nix @@ -19,9 +19,10 @@ stdenv.mkDerivation { }; cmakeFlags = [ - "-DWITH_EXTERNAL_ZLIB=ON" "-DMARIADB_UNIX_ADDR=/run/mysqld/mysqld.sock" "-DWITH_CURL=ON" + "-DWITH_EXTERNAL_ZLIB=ON" + "-DWITH_MYSQLCOMPAT=ON" ]; # The cmake setup-hook uses $out/lib by default, this is not the case here. @@ -39,10 +40,7 @@ stdenv.mkDerivation { ln -sv mariadb_config $out/bin/mysql_config ln -sv mariadb $out/lib/mysql ln -sv mariadb $out/include/mysql - ln -sv libmariadbclient.a $out/lib/mariadb/libmysqlclient.a - ln -sv libmariadbclient.a $out/lib/mariadb/libmysqlclient_r.a - ln -sv libmariadb.so $out/lib/mariadb/libmysqlclient.so - ln -sv libmariadb.so $out/lib/mariadb/libmysqlclient_r.so + ln -sv mariadb_version.h $out/include/mariadb/mysql_version.h ''; meta = { diff --git a/pkgs/servers/trezord/default.nix b/pkgs/servers/trezord/default.nix index 84b7b325b46f..38fefd041bdd 100644 --- a/pkgs/servers/trezord/default.nix +++ b/pkgs/servers/trezord/default.nix @@ -4,9 +4,6 @@ buildGoPackage rec { pname = "trezord-go"; version = "2.0.27"; - # Fixes Cgo related build failures (see https://github.com/NixOS/nixpkgs/issues/25959 ) - hardeningDisable = [ "fortify" ]; - goPackagePath = "github.com/trezor/trezord-go"; src = fetchFromGitHub { diff --git a/pkgs/shells/zsh/oh-my-zsh/default.nix b/pkgs/shells/zsh/oh-my-zsh/default.nix index 8c88522f7153..af22a1e1be24 100644 --- a/pkgs/shells/zsh/oh-my-zsh/default.nix +++ b/pkgs/shells/zsh/oh-my-zsh/default.nix @@ -4,13 +4,13 @@ { stdenv, fetchgit }: stdenv.mkDerivation rec { - version = "2019-10-25"; + version = "2019-10-27"; pname = "oh-my-zsh"; - rev = "9785d24172a8cc558e90dd266e37ef5ffa29aa80"; + rev = "e363109a6d3367d8be1dd66f05a38eb38b4257d7"; src = fetchgit { inherit rev; url = "https://github.com/robbyrussell/oh-my-zsh"; - sha256 = "0rjrswk4j3ga49s15z7fss64k0n3bz6z0j0sx7hai6ry58bh3m2v"; + sha256 = "05ald17kr9bqx106a4cc5i48w8sf67vlghd96k2lciiwjy9dcdki"; }; pathsToLink = [ "/share/oh-my-zsh" ]; diff --git a/pkgs/tools/admin/aws_shell/default.nix b/pkgs/tools/admin/aws_shell/default.nix index 53a39f500018..95f1df395765 100644 --- a/pkgs/tools/admin/aws_shell/default.nix +++ b/pkgs/tools/admin/aws_shell/default.nix @@ -6,11 +6,11 @@ with awscli.python.pkgs; buildPythonPackage rec { pname = "aws-shell"; - version = "0.2.0"; + version = "0.2.1"; src = fetchPypi { inherit pname version; - sha256 = "b46a673b81254e5e014297e08c9ecab535773aa651ca33dc3786a1fd612f9810"; + sha256 = "2044b0ef78c7542c392f2cee4b74a4439545c63dda0a3e28b712fff53e8e5823"; }; # Why does it propagate packages that are used for testing? diff --git a/pkgs/tools/admin/awscli/default.nix b/pkgs/tools/admin/awscli/default.nix index 4956767f091e..02a27b0fe481 100644 --- a/pkgs/tools/admin/awscli/default.nix +++ b/pkgs/tools/admin/awscli/default.nix @@ -1,12 +1,12 @@ { lib -, python +, python3 , groff , less , fetchpatch }: let - py = python.override { + py = python3.override { packageOverrides = self: super: { rsa = super.rsa.overridePythonAttrs (oldAttrs: rec { version = "3.4.2"; @@ -15,24 +15,17 @@ let sha256 = "25df4e10c263fb88b5ace923dd84bf9aa7f5019687b5e55382ffcdb8bede9db5"; }; }); - colorama = super.colorama.overridePythonAttrs (oldAttrs: rec { - version = "0.3.9"; - src = oldAttrs.src.override { - inherit version; - sha256 = "48eb22f4f8461b1df5734a074b57042430fb06e1d61bd1e11b078c0fe6d7a1f1"; - }; - }); - pyyaml = super.pyyaml_3; + prompt_toolkit = self.callPackage ../../../development/python-modules/prompt_toolkit/1.nix { }; }; }; in py.pkgs.buildPythonApplication rec { pname = "awscli"; - version = "1.16.261"; # N.B: if you change this, change botocore to a matching version too + version = "1.16.266"; # N.B: if you change this, change botocore to a matching version too src = py.pkgs.fetchPypi { inherit pname version; - sha256 = "1mg4xhz6cpc52hpflqvbhq7ldwvg8kzixv9aj9w6gv60xvarwnm5"; + sha256 = "9c59a5ca805f467669d471b29550ecafafb9b380a4a6926a9f8866f71cd4f7be"; }; # No tests included @@ -52,7 +45,6 @@ in py.pkgs.buildPythonApplication rec { urllib3 dateutil jmespath - futures ]; postInstall = '' diff --git a/pkgs/tools/filesystems/s3backer/default.nix b/pkgs/tools/filesystems/s3backer/default.nix index 73f88964f2c8..186da6255ebf 100644 --- a/pkgs/tools/filesystems/s3backer/default.nix +++ b/pkgs/tools/filesystems/s3backer/default.nix @@ -4,10 +4,10 @@ stdenv.mkDerivation rec { pname = "s3backer"; - version = "1.5.2"; + version = "1.5.4"; src = fetchFromGitHub { - sha256 = "1axxnhhf335xckwn43csqmvf1454izbk9dglc3r7isrk0lz1ricc"; + sha256 = "1228qlfgz48k9vv72hrz488zg73zls99cppb9vmikc0pzv1xndsx"; rev = version; repo = "s3backer"; owner = "archiecobbs"; diff --git a/pkgs/tools/graphics/shotgun/default.nix b/pkgs/tools/graphics/shotgun/default.nix new file mode 100644 index 000000000000..1ab47dfce2de --- /dev/null +++ b/pkgs/tools/graphics/shotgun/default.nix @@ -0,0 +1,28 @@ +{ lib, stdenv, fetchFromGitHub, rustPlatform, pkg-config, libXrandr, libX11 }: + +rustPlatform.buildRustPackage rec { + pname = "shotgun"; + version = "2.2.0"; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ libXrandr libX11 ]; + + src = fetchFromGitHub { + owner = "neXromancers"; + repo = pname; + rev = "v${version}"; + sha256 = "tJnF1X+NI1hP0J/n3rGy8TD/yIveqRPVlJvJvn0C7Do="; + }; + + cargoSha256 = "TL2WehcCwygLMVVrBHOX1HgVtDhgVsIgUeiadEjCj1o="; + + meta = with lib; { + description = "Minimal X screenshot utility"; + homepage = "https://github.com/neXromancers/shotgun"; + license = with licenses; [ mpl20 ]; + maintainers = with maintainers; [ lumi ]; + platforms = platforms.linux; + badPlatforms = [ "aarch64-linux" ]; + }; +} diff --git a/pkgs/tools/misc/calamares/default.nix b/pkgs/tools/misc/calamares/default.nix index 3a6585514ab0..4adadbf47071 100644 --- a/pkgs/tools/misc/calamares/default.nix +++ b/pkgs/tools/misc/calamares/default.nix @@ -1,10 +1,10 @@ -{ stdenv, fetchurl, boost, cmake, extra-cmake-modules, kparts, kpmcore +{ lib, fetchurl, boost, cmake, extra-cmake-modules, kparts, kpmcore , kservice, libatasmart, libxcb, libyamlcpp, parted, polkit-qt, python, qtbase , qtquickcontrols, qtsvg, qttools, qtwebengine, utillinux, glibc, tzdata -, ckbcomp, xkeyboard_config +, ckbcomp, xkeyboard_config, mkDerivation }: -stdenv.mkDerivation rec { +mkDerivation rec { pname = "calamares"; version = "3.2.15"; @@ -54,10 +54,10 @@ stdenv.mkDerivation rec { -i CMakeLists.txt ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Distribution-independent installer framework"; license = licenses.gpl3; - maintainers = with stdenv.lib.maintainers; [ manveru ]; + maintainers = with lib.maintainers; [ manveru ]; platforms = platforms.linux; }; } diff --git a/pkgs/tools/misc/clipman/default.nix b/pkgs/tools/misc/clipman/default.nix index 42db25f95734..861d384f1f82 100644 --- a/pkgs/tools/misc/clipman/default.nix +++ b/pkgs/tools/misc/clipman/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "clipman"; - version = "1.1.0"; + version = "1.2.0"; src = fetchFromGitHub { owner = "yory8"; repo = pname; rev = "v${version}"; - sha256 = "083wd9wqsvxsf3w72jqh36php3c85273n3c6j7j997w47k069m32"; + sha256 = "0266qb8p5l8j25nn51ajsbiij8bh5r7ywphf2x1l7wfhbzgxz12d"; }; - modSha256 = "0r7bx2vxnjqs4lx17w7q75spdjh3dz4560d62bj6fb5n71hc5mgv"; + modSha256 = "0aw0ng8pk8qzn1iv79iw0v9zr8xdc8p9xnigr3ij86038f7aqdhv"; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/misc/colord-gtk/default.nix b/pkgs/tools/misc/colord-gtk/default.nix index 38b4916e3942..b2113f8304cf 100644 --- a/pkgs/tools/misc/colord-gtk/default.nix +++ b/pkgs/tools/misc/colord-gtk/default.nix @@ -1,19 +1,58 @@ -{ stdenv, fetchurl, colord, intltool, glib, gtk3, pkgconfig, lcms2 }: +{ stdenv +, fetchurl +, colord +, gettext +, meson +, ninja +, gobject-introspection +, gtk-doc +, docbook-xsl-ns +, docbook_xsl +, docbook_xml_dtd_412 +, libxslt +, glib +, gtk3 +, pkgconfig +, lcms2 +}: stdenv.mkDerivation rec { - name = "colord-gtk-0.1.26"; + pname = "colord-gtk"; + version = "0.2.0"; + + outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { - url = "https://www.freedesktop.org/software/colord/releases/${name}.tar.xz"; - sha256 = "0i9y3bb5apj6a0f8cx36l6mjzs7xc0k7nf0magmf58vy2mzhpl18"; + url = "https://www.freedesktop.org/software/colord/releases/${pname}-${version}.tar.xz"; + sha256 = "05y78jbcbar22sgyhzffhv98dbpl4v6k8j9p807h17y6ighglk1a"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ intltool colord glib gtk3 lcms2 ]; + nativeBuildInputs = [ + pkgconfig + gettext + meson + ninja + gobject-introspection + gtk-doc + docbook-xsl-ns + docbook_xsl + docbook_xml_dtd_412 + libxslt + ]; - meta = { - homepage = http://www.freedesktop.org/software/colord/intro.html; - license = stdenv.lib.licenses.lgpl2Plus; - platforms = stdenv.lib.platforms.linux; + buildInputs = [ + glib + lcms2 + ]; + + propagatedBuildInputs = [ + colord + gtk3 + ]; + + meta = with stdenv.lib; { + homepage = "https://www.freedesktop.org/software/colord/intro.html"; + license = licenses.lgpl21Plus; + platforms = platforms.linux; }; } diff --git a/pkgs/tools/misc/eva/Cargo.lock.patch b/pkgs/tools/misc/eva/Cargo.lock.patch new file mode 100644 index 000000000000..c9fea04c75d5 --- /dev/null +++ b/pkgs/tools/misc/eva/Cargo.lock.patch @@ -0,0 +1,454 @@ +diff --git a/Cargo.lock b/Cargo.lock +new file mode 100644 +index 00000000000..630f81eae76 +--- /dev/null ++++ b/pkgs/tools/misc/eva/Cargo.lock +@@ -0,0 +1,448 @@ ++# This file is automatically @generated by Cargo. ++# It is not intended for manual editing. ++[[package]] ++name = "ansi_term" ++version = "0.11.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "arrayref" ++version = "0.3.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "arrayvec" ++version = "0.4.12" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "nodrop 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "atty" ++version = "0.2.13" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "backtrace" ++version = "0.3.40" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "backtrace-sys 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rustc-demangle 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "backtrace-sys" ++version = "0.1.32" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "cc 1.0.46 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "base64" ++version = "0.10.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "bitflags" ++version = "1.2.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "blake2b_simd" ++version = "0.5.8" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "arrayref 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "arrayvec 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)", ++ "constant_time_eq 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "byteorder" ++version = "1.3.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "cc" ++version = "1.0.46" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "cfg-if" ++version = "0.1.10" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "clap" ++version = "2.33.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "ansi_term 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "atty 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)", ++ "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "strsim 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "textwrap 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "unicode-width 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "vec_map 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "cloudabi" ++version = "0.0.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "constant_time_eq" ++version = "0.1.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "crossbeam-utils" ++version = "0.6.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", ++ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "dirs" ++version = "1.0.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", ++ "redox_users 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "eva" ++version = "0.2.4" ++dependencies = [ ++ "clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "radix_fmt 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rustyline 4.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "failure" ++version = "0.1.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "backtrace 0.3.40 (registry+https://github.com/rust-lang/crates.io-index)", ++ "failure_derive 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "failure_derive" ++version = "0.1.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "syn 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "synstructure 0.12.1 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "fuchsia-cprng" ++version = "0.1.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "lazy_static" ++version = "1.4.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "libc" ++version = "0.2.65" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "log" ++version = "0.4.8" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "memchr" ++version = "2.2.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "nix" ++version = "0.13.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cc 1.0.46 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", ++ "void 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "nodrop" ++version = "0.1.14" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "proc-macro2" ++version = "1.0.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "quote" ++version = "1.0.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "radix_fmt" ++version = "1.0.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "rand_core" ++version = "0.3.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "rand_core" ++version = "0.4.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "rand_os" ++version = "0.1.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "fuchsia-cprng 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rdrand 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "rdrand" ++version = "0.4.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "redox_syscall" ++version = "0.1.56" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "redox_users" ++version = "0.3.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "failure 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand_os 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rust-argon2 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "rust-argon2" ++version = "0.5.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "base64 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "blake2b_simd 0.5.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "crossbeam-utils 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "rustc-demangle" ++version = "0.1.16" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "rustyline" ++version = "4.1.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "dirs 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", ++ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "memchr 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "nix 0.13.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "unicode-segmentation 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "unicode-width 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "utf8parse 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "strsim" ++version = "0.8.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "syn" ++version = "1.0.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "synstructure" ++version = "0.12.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "syn 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "textwrap" ++version = "0.11.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "unicode-width 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "unicode-segmentation" ++version = "1.3.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "unicode-width" ++version = "0.1.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "unicode-xid" ++version = "0.2.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "utf8parse" ++version = "0.1.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "vec_map" ++version = "0.8.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "void" ++version = "1.0.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "winapi" ++version = "0.3.8" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "winapi-i686-pc-windows-gnu" ++version = "0.4.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "winapi-x86_64-pc-windows-gnu" ++version = "0.4.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[metadata] ++"checksum ansi_term 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b" ++"checksum arrayref 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)" = "0d382e583f07208808f6b1249e60848879ba3543f57c32277bf52d69c2f0f0ee" ++"checksum arrayvec 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)" = "cd9fd44efafa8690358b7408d253adf110036b88f55672a933f01d616ad9b1b9" ++"checksum atty 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)" = "1803c647a3ec87095e7ae7acfca019e98de5ec9a7d01343f611cf3152ed71a90" ++"checksum backtrace 0.3.40 (registry+https://github.com/rust-lang/crates.io-index)" = "924c76597f0d9ca25d762c25a4d369d51267536465dc5064bdf0eb073ed477ea" ++"checksum backtrace-sys 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)" = "5d6575f128516de27e3ce99689419835fce9643a9b215a14d2b5b685be018491" ++"checksum base64 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)" = "0b25d992356d2eb0ed82172f5248873db5560c4721f564b13cb5193bda5e668e" ++"checksum bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693" ++"checksum blake2b_simd 0.5.8 (registry+https://github.com/rust-lang/crates.io-index)" = "5850aeee1552f495dd0250014cf64b82b7c8879a89d83b33bbdace2cc4f63182" ++"checksum byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "a7c3dd8985a7111efc5c80b44e23ecdd8c007de8ade3b96595387e812b957cf5" ++"checksum cc 1.0.46 (registry+https://github.com/rust-lang/crates.io-index)" = "0213d356d3c4ea2c18c40b037c3be23cd639825c18f25ee670ac7813beeef99c" ++"checksum cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)" = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822" ++"checksum clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5067f5bb2d80ef5d68b4c87db81601f0b75bca627bc2ef76b141d7b846a3c6d9" ++"checksum cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f" ++"checksum constant_time_eq 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "995a44c877f9212528ccc74b21a232f66ad69001e40ede5bcee2ac9ef2657120" ++"checksum crossbeam-utils 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)" = "04973fa96e96579258a5091af6003abde64af786b860f18622b82e026cca60e6" ++"checksum dirs 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)" = "3fd78930633bd1c6e35c4b42b1df7b0cbc6bc191146e512bb3bedf243fcc3901" ++"checksum failure 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "f8273f13c977665c5db7eb2b99ae520952fe5ac831ae4cd09d80c4c7042b5ed9" ++"checksum failure_derive 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "0bc225b78e0391e4b8683440bf2e63c2deeeb2ce5189eab46e2b68c6d3725d08" ++"checksum fuchsia-cprng 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba" ++"checksum lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" ++"checksum libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)" = "1a31a0627fdf1f6a39ec0dd577e101440b7db22672c0901fe00a9a6fbb5c24e8" ++"checksum log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)" = "14b6052be84e6b71ab17edffc2eeabf5c2c3ae1fdb464aae35ac50c67a44e1f7" ++"checksum memchr 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "88579771288728879b57485cc7d6b07d648c9f0141eb955f8ab7f9d45394468e" ++"checksum nix 0.13.1 (registry+https://github.com/rust-lang/crates.io-index)" = "4dbdc256eaac2e3bd236d93ad999d3479ef775c863dbda3068c4006a92eec51b" ++"checksum nodrop 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)" = "72ef4a56884ca558e5ddb05a1d1e7e1bfd9a68d9ed024c21704cc98872dae1bb" ++"checksum proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)" = "9c9e470a8dc4aeae2dee2f335e8f533e2d4b347e1434e5671afc49b054592f27" ++"checksum quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "053a8c8bcc71fcce321828dc897a98ab9760bef03a4fc36693c231e5b3216cfe" ++"checksum radix_fmt 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ce082a9940a7ace2ad4a8b7d0b1eac6aa378895f18be598230c5f2284ac05426" ++"checksum rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7a6fdeb83b075e8266dcc8762c22776f6877a63111121f5f8c7411e5be7eed4b" ++"checksum rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "9c33a3c44ca05fa6f1807d8e6743f3824e8509beca625669633be0acbdf509dc" ++"checksum rand_os 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "7b75f676a1e053fc562eafbb47838d67c84801e38fc1ba459e8f180deabd5071" ++"checksum rdrand 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "678054eb77286b51581ba43620cc911abf02758c91f93f479767aed0f90458b2" ++"checksum redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)" = "2439c63f3f6139d1b57529d16bc3b8bb855230c8efcc5d3a896c8bea7c3b1e84" ++"checksum redox_users 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "4ecedbca3bf205f8d8f5c2b44d83cd0690e39ee84b951ed649e9f1841132b66d" ++"checksum rust-argon2 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "4ca4eaef519b494d1f2848fc602d18816fed808a981aedf4f1f00ceb7c9d32cf" ++"checksum rustc-demangle 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)" = "4c691c0e608126e00913e33f0ccf3727d5fc84573623b8d65b2df340b5201783" ++"checksum rustyline 4.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "0f47ea1ceb347d2deae482d655dc8eef4bd82363d3329baffa3818bd76fea48b" ++"checksum strsim 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" ++"checksum syn 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)" = "66850e97125af79138385e9b88339cbcd037e3f28ceab8c5ad98e64f0f1f80bf" ++"checksum synstructure 0.12.1 (registry+https://github.com/rust-lang/crates.io-index)" = "3f085a5855930c0441ca1288cf044ea4aecf4f43a91668abdb870b4ba546a203" ++"checksum textwrap 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060" ++"checksum unicode-segmentation 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1967f4cdfc355b37fd76d2a954fb2ed3871034eb4f26d60537d88795cfc332a9" ++"checksum unicode-width 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "7007dbd421b92cc6e28410fe7362e2e0a2503394908f417b68ec8d1c364c4e20" ++"checksum unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "826e7639553986605ec5979c7dd957c7895e93eabed50ab2ffa7f6128a75097c" ++"checksum utf8parse 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "8772a4ccbb4e89959023bc5b7cb8623a795caa7092d99f3aa9501b9484d4557d" ++"checksum vec_map 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "05c78687fb1a80548ae3250346c3db86a80a7cdd77bda190189f2d0a0987c81a" ++"checksum void 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d" ++"checksum winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)" = "8093091eeb260906a183e6ae1abdba2ef5ef2257a21801128899c3fc699229c6" ++"checksum winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" ++"checksum winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" diff --git a/pkgs/tools/misc/eva/default.nix b/pkgs/tools/misc/eva/default.nix new file mode 100644 index 000000000000..0efaf008d485 --- /dev/null +++ b/pkgs/tools/misc/eva/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchFromGitHub, rustPlatform }: + +rustPlatform.buildRustPackage rec { + pname = "eva"; + version = "0.2.5"; + + cargoSha256 = "1zns4xspw9w1f84sf8cz30mp2fl1jyjc2ca09gkqhzhgaj055y7k"; + + src = fetchFromGitHub { + owner = "NerdyPepper"; + repo = "${pname}"; + rev = "v${version}"; + sha256 = "1vqr6z4vicqx1lm5ll09za4jh8rki2qbav1pawz15hqqzps3y8h1"; + }; + + cargoPatches = [ ./Cargo.lock.patch ]; + + meta = with stdenv.lib; { + description = "A calculator REPL, similar to bc"; + homepage = https://github.com/NerdyPepper/eva; + license = licenses.mit; + maintainers = with maintainers; [ nrdxp ]; + }; +} diff --git a/pkgs/tools/misc/ffsend/default.nix b/pkgs/tools/misc/ffsend/default.nix index 511b4fb1c36a..2d84314f6b54 100644 --- a/pkgs/tools/misc/ffsend/default.nix +++ b/pkgs/tools/misc/ffsend/default.nix @@ -16,16 +16,16 @@ with rustPlatform; buildRustPackage rec { pname = "ffsend"; - version = "0.2.52"; + version = "0.2.54"; src = fetchFromGitLab { owner = "timvisee"; repo = "ffsend"; rev = "v${version}"; - sha256 = "0bz0pgv7vdcha6sx2csx3mhkj4ph90w32p7h1wjvcgg3wlk1cgsf"; + sha256 = "11g4gv6p37xpay8v0q6kv5fblsxixcm8l0wkdvzmbv7933318qz8"; }; - cargoSha256 = "01sgk4101ad0zk1k8zz89fsk2iq6j2vr8xd0wi6h88g2lgxvffzf"; + cargoSha256 = "0wri2shj5xxgjv8gl0fq776s20897zwsgglh8ghgd2z3zjwjachw"; nativeBuildInputs = [ cmake pkgconfig installShellFiles ]; buildInputs = [ openssl ] diff --git a/pkgs/tools/misc/qt5ct/default.nix b/pkgs/tools/misc/qt5ct/default.nix index 952268b26f01..d7598b0c6dd5 100644 --- a/pkgs/tools/misc/qt5ct/default.nix +++ b/pkgs/tools/misc/qt5ct/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, lib, fetchurl, qtbase, qttools, qmake }: +{ mkDerivation, lib, fetchurl, qtbase, qtsvg, qttools, qmake }: let inherit (lib) getDev; in @@ -13,16 +13,13 @@ mkDerivation rec { nativeBuildInputs = [ qmake qttools ]; - buildInputs = [ qtbase ]; + buildInputs = [ qtbase qtsvg ]; qmakeFlags = [ "LRELEASE_EXECUTABLE=${getDev qttools}/bin/lrelease" + "PLUGINDIR=${placeholder "out"}/${qtbase.qtPluginPrefix}" ]; - preConfigure = '' - qmakeFlags+=" PLUGINDIR=$out/$qtPluginPrefix" - ''; - enableParallelBuilding = true; meta = with lib; { diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix index 31aaa21d136b..b523a86bd567 100644 --- a/pkgs/tools/misc/youtube-dl/default.nix +++ b/pkgs/tools/misc/youtube-dl/default.nix @@ -18,11 +18,11 @@ buildPythonPackage rec { # The websites youtube-dl deals with are a very moving target. That means that # downloads break constantly. Because of that, updates should always be backported # to the latest stable release. - version = "2019.10.16"; + version = "2019.10.22"; src = fetchurl { url = "https://yt-dl.org/downloads/${version}/${pname}-${version}.tar.gz"; - sha256 = "089bm68255b8af9y1mf1bmsnci9b2vdcm2a9x4rnrvhrwhxb9b7j"; + sha256 = "06wg6wpyq0fawjxjrhd7zasfjr9b6w9wsk2amiqdl712zqlq2rwb"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/networking/croc/default.nix b/pkgs/tools/networking/croc/default.nix index db3c24398f7d..b23b5a17e1fc 100644 --- a/pkgs/tools/networking/croc/default.nix +++ b/pkgs/tools/networking/croc/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "croc"; - version = "6.1.4"; + version = "6.2.0"; goPackagePath = "github.com/schollz/croc"; @@ -10,10 +10,10 @@ buildGoModule rec { owner = "schollz"; repo = pname; rev = "v${version}"; - sha256 = "1qqmyqkzg8gcib6zzva9zqlv22zpg4lwc3dqi6yyaynmdgy9pk1m"; + sha256 = "0pav0l7akzqgwj7yqkgbpl96kndlb41kg1vmb3g6xp7ykmbdsbbc"; }; - modSha256 = "17vpfq3bsciq3vx5s2r3sv76aqsij3vvckqnk2w2sp346by5vavf"; + modSha256 = "02w4p877nvv7dril7l9nmj8xf3fnghxnj8kglxkv541vabvlpq03"; subPackages = [ "." ]; meta = with stdenv.lib; { diff --git a/pkgs/tools/networking/flannel/default.nix b/pkgs/tools/networking/flannel/default.nix index f16fcc7048c8..d2f0ec2ec634 100644 --- a/pkgs/tools/networking/flannel/default.nix +++ b/pkgs/tools/networking/flannel/default.nix @@ -9,8 +9,6 @@ buildGoPackage rec { goPackagePath = "github.com/coreos/flannel"; - hardeningDisable = [ "fortify" ]; - src = fetchFromGitHub { inherit rev; owner = "coreos"; diff --git a/pkgs/tools/security/opensc/default.nix b/pkgs/tools/security/opensc/default.nix index e5611f8b2671..4f220ee7717e 100644 --- a/pkgs/tools/security/opensc/default.nix +++ b/pkgs/tools/security/opensc/default.nix @@ -22,6 +22,16 @@ stdenv.mkDerivation rec { url = "https://github.com/OpenSC/OpenSC/commit/0d7967549751b7032f22b437106b41444aff0ba9.patch"; sha256 = "1y42lmz8i9w99hgpakdncnv8f94cqjfabz0v4xg6wfz9akl3ff7d"; }) + (fetchpatch { + name = "CVE-2019-15945.patch"; + url = "https://github.com/OpenSC/OpenSC/commit/412a6142c27a5973c61ba540e33cdc22d5608e68.patch"; + sha256 = "088i2i1fkvdxnywmb54bn4283vhbxx6i2632b34ss5dh7k080hp7"; + }) + (fetchpatch { + name = "CVE-2019-15946.patch"; + url = "https://github.com/OpenSC/OpenSC/commit/a3fc7693f3a035a8a7921cffb98432944bb42740.patch"; + sha256 = "1qr9n8cbarrdn4kr5z0ys7flq50hfmcbm8584mhw7r39p08qwmvq"; + }) ]; nativeBuildInputs = [ pkgconfig autoreconfHook ]; diff --git a/pkgs/tools/security/pass/extensions/import.nix b/pkgs/tools/security/pass/extensions/import.nix index 9d9d36fd0d90..90e3105bbd80 100644 --- a/pkgs/tools/security/pass/extensions/import.nix +++ b/pkgs/tools/security/pass/extensions/import.nix @@ -1,34 +1,51 @@ -{ stdenv, pass, fetchFromGitHub, pythonPackages, makeWrapper }: +{ stdenv, pass, fetchFromGitHub, pythonPackages, makeWrapper, fetchpatch }: let - pythonEnv = pythonPackages.python.withPackages (p: [ p.defusedxml ]); + pythonEnv = pythonPackages.python.withPackages (p: [ + p.defusedxml + p.setuptools + p.pyaml + ]); in stdenv.mkDerivation rec { pname = "pass-import"; - version = "2.3"; + version = "2.6"; src = fetchFromGitHub { owner = "roddhjav"; repo = "pass-import"; rev = "v${version}"; - sha256 = "1209aqkiqqbir5yzwk5jvyk8c1fyrsj9igr3n4banf347rlwmzfv"; + sha256 = "1q8rln4djh2z8j2ycm654df5y6anm5iv2r19spgy07c3fnisxlac"; }; nativeBuildInputs = [ makeWrapper ]; buildInputs = [ pythonEnv ]; - patchPhase = '' + patches = [ + # https://github.com/roddhjav/pass-import/pull/91 + (fetchpatch { + url = "https://github.com/roddhjav/pass-import/commit/6ccaf639e92df45bd400503757ae4aa2c5c030d7.patch"; + sha256 = "0lw9vqvbqcy96s7v7nz0i1bdx93x7qr13azymqypcdhjwmq9i63h"; + }) + ]; + + postPatch = '' sed -i -e 's|$0|${pass}/bin/pass|' import.bash ''; dontBuild = true; - installFlags = [ "PREFIX=$(out)" ]; + installFlags = [ + "PREFIX=$(out)" + "BASHCOMPDIR=$(out)/etc/bash_completion.d" + ]; postFixup = '' + install -D pass_import.py $out/${pythonPackages.python.sitePackages}/pass_import.py wrapProgram $out/lib/password-store/extensions/import.bash \ --prefix PATH : "${pythonEnv}/bin" \ + --prefix PYTHONPATH : "$out/${pythonPackages.python.sitePackages}" \ --run "export PREFIX" ''; diff --git a/pkgs/tools/security/verifpal/default.nix b/pkgs/tools/security/verifpal/default.nix index 3b72cf3bd53e..95afb580d4e1 100644 --- a/pkgs/tools/security/verifpal/default.nix +++ b/pkgs/tools/security/verifpal/default.nix @@ -1,24 +1,28 @@ -{ lib, fetchFromGitHub, buildGoPackage, pigeon }: +{ lib +, fetchgit +, buildGoPackage +, pigeon +}: + buildGoPackage rec { pname = "verifpal"; - version = "0.2"; + version = "0.7.5"; goPackagePath = "github.com/SymbolicSoft/verifpal"; goDeps = ./deps.nix; - src = fetchFromGitHub { - owner = "SymbolicSoft"; - repo = pname; + src = fetchgit { + url = "https://source.symbolic.software/verifpal/verifpal.git"; rev = version; - sha256 = "08a0xvgg94k6vq91ylvgi97kpkjbw0rw172v2dzwl2rfpzkigk1r"; + sha256 = "0njgn6j5qg5kgid6ddv23axhw5gwjbayhdjkj4ya08mnxndr284m"; }; + nativeBuildInputs = [ pigeon ]; + postPatch = '' sed -e 's|/bin/echo |echo |g' -i Makefile ''; - buildInputs = [ pigeon ]; - buildPhase = '' make -C go/src/$goPackagePath parser linux ''; @@ -33,6 +37,6 @@ buildGoPackage rec { description = "Cryptographic protocol analysis for students and engineers"; maintainers = with lib.maintainers; [ zimbatm ]; license = with lib.licenses; [ gpl3 ]; - platforms = ["x86_64-linux"]; + platforms = [ "x86_64-linux" ]; }; } diff --git a/pkgs/tools/text/gtranslator/default.nix b/pkgs/tools/text/gtranslator/default.nix index 69924bb234b5..b871ac6ffaa0 100644 --- a/pkgs/tools/text/gtranslator/default.nix +++ b/pkgs/tools/text/gtranslator/default.nix @@ -9,6 +9,8 @@ , wrapGAppsHook , libxml2 , libgda +, libsoup +, json-glib , gspell , glib , gtk3 @@ -19,11 +21,11 @@ stdenv.mkDerivation rec { pname = "gtranslator"; - version = "3.32.1"; + version = "3.34.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1nmlj41wm02lbgrxdlpqpcgdab5cxsvggvqnk43v6kk86q27pcz1"; + sha256 = "05zvpx330h9k7b12p07bhcy47vq66260fmiph2b6h97xpl15rwmj"; }; nativeBuildInputs = [ @@ -42,6 +44,8 @@ stdenv.mkDerivation rec { gtk3 gtksourceview4 libgda + libsoup + json-glib gettext gspell gsettings-desktop-schemas diff --git a/pkgs/tools/text/ripgrep-all/default.nix b/pkgs/tools/text/ripgrep-all/default.nix index a9253b02ddd9..521b123d8783 100644 --- a/pkgs/tools/text/ripgrep-all/default.nix +++ b/pkgs/tools/text/ripgrep-all/default.nix @@ -4,16 +4,16 @@ rustPlatform.buildRustPackage rec { pname = "ripgrep-all"; - version = "0.9.2"; + version = "0.9.3"; src = fetchFromGitHub { owner = "phiresky"; repo = pname; rev = version; - sha256 = "1knv0gpanrid9i9mxg7zwqh9igdksp1623wl9iwmysiyaajlbif2"; + sha256 = "0fxvnd8qflzvqz2181njdhpbr4wdvd1jc6lcw38c3pknk9h3ymq9"; }; - cargoSha256 = "0xwsx0x9n766bxamhnpzibrnvnqsxz3wh1f0rj29kbl32xl8yyfg"; + cargoSha256 = "1jcwipsb7sl65ky78cypl4qvjvxvv4sjlwcg1pirgmqikcyiiy2l"; nativeBuildInputs = [ makeWrapper ]; buildInputs = lib.optional stdenv.isDarwin Security; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b8bff39ae8f6..007253b9677d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1655,6 +1655,8 @@ in firecracker = callPackage ../applications/virtualization/firecracker { }; + firectl = callPackage ../applications/virtualization/firectl { }; + firestarter = callPackage ../applications/misc/firestarter { }; fsmon = callPackage ../tools/misc/fsmon { }; @@ -3008,6 +3010,8 @@ in evtest-qt = libsForQt5.callPackage ../applications/misc/evtest-qt { }; + eva = callPackage ../tools/misc/eva { }; + exa = callPackage ../tools/misc/exa { }; exempi = callPackage ../development/libraries/exempi { @@ -3824,7 +3828,6 @@ in }; hdf5 = callPackage ../tools/misc/hdf5 { - stdenv = gcc7Stdenv; gfortran = null; szip = null; mpi = null; @@ -13950,7 +13953,6 @@ in }; taglib = callPackage ../development/libraries/taglib { }; - taglib_1_9 = callPackage ../development/libraries/taglib/1.9.nix { }; taglib_extras = callPackage ../development/libraries/taglib-extras { }; @@ -16587,10 +16589,6 @@ in riscv-pk = callPackage ../misc/riscv-pk { }; - riscv-pk-with-kernel = riscv-pk.override { - payload = "${linux_riscv}/vmlinux"; - }; - roccat-tools = callPackage ../os-specific/linux/roccat-tools { }; rtkit = callPackage ../os-specific/linux/rtkit { }; @@ -19823,6 +19821,8 @@ in mtpaint = callPackage ../applications/graphics/mtpaint { }; + mu-repo = python3Packages.callPackage ../applications/misc/mu-repo { }; + mucommander = callPackage ../applications/misc/mucommander { }; multimarkdown = callPackage ../tools/typesetting/multimarkdown { }; @@ -20023,7 +20023,9 @@ in mypaint-brushes = callPackage ../development/libraries/mypaint-brushes { }; - mythtv = libsForQt5.callPackage ../applications/video/mythtv { }; + mythtv = libsForQt5.callPackage ../applications/video/mythtv { + libXNVCtrl = linuxPackages.nvidia_x11.settings.libXNVCtrl; + }; micro = callPackage ../applications/editors/micro { }; @@ -20712,6 +20714,8 @@ in shfmt = callPackage ../tools/text/shfmt { }; + shotgun = callPackage ../tools/graphics/shotgun {}; + shutter = callPackage ../applications/graphics/shutter { }; simple-scan = gnome3.simple-scan; @@ -21106,6 +21110,8 @@ in tetraproc = callPackage ../applications/audio/tetraproc { }; + tev = callPackage ../applications/graphics/tev { }; + thinkingRock = callPackage ../applications/misc/thinking-rock { }; thonny = callPackage ../applications/editors/thonny { }; @@ -21167,12 +21173,6 @@ in toggldesktop = libsForQt5.callPackage ../applications/misc/toggldesktop { }; - tomahawk = callPackage ../applications/audio/tomahawk ({ - taglib = taglib_1_9; - quazip = quazip_qt4; - boost = boost155; - } // (config.tomahawk or {})); - topydo = callPackage ../applications/misc/topydo {}; torchPackages = recurseIntoAttrs ( callPackage ../applications/science/machine-learning/torch { diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index d463a4046498..f2baa2b2a9ee 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -233,6 +233,8 @@ let elpi = callPackage ../development/ocaml-modules/elpi { }; + encore = callPackage ../development/ocaml-modules/encore { }; + enumerate = callPackage ../development/ocaml-modules/enumerate { }; eqaf = callPackage ../development/ocaml-modules/eqaf { }; @@ -287,6 +289,8 @@ let imagelib = callPackage ../development/ocaml-modules/imagelib { }; + imagelib-unix = callPackage ../development/ocaml-modules/imagelib/unix.nix { }; + inotify = callPackage ../development/ocaml-modules/inotify { }; integers = callPackage ../development/ocaml-modules/integers { }; @@ -314,7 +318,7 @@ let gg = callPackage ../development/ocaml-modules/gg { }; - git = callPackage ../development/ocaml-modules/git { }; + git = callPackage ../development/ocaml-modules/git { inherit (pkgs) git; }; git-http = callPackage ../development/ocaml-modules/git-http { }; @@ -362,6 +366,8 @@ let jsonm = callPackage ../development/ocaml-modules/jsonm { }; + ke = callPackage ../development/ocaml-modules/ke { }; + lablgl = callPackage ../development/ocaml-modules/lablgl { }; lablgtk3 = callPackage ../development/ocaml-modules/lablgtk3 { }; diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 4c7661ea2d06..06fe3aa2cfe9 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -701,6 +701,7 @@ let url = mirror://cpan/authors/id/Z/ZE/ZEFRAM/Authen-DecHpwd-2.007.tar.gz; sha256 = "f43a93bb02b41f7327d92f9e963b69505f67350a52e8f50796f98afc4fb3f177"; }; + perlPreHook = stdenv.lib.optionalString stdenv.isi686 "export LD=$CC"; # fix undefined reference to `__stack_chk_fail_local' propagatedBuildInputs = [ DataInteger DigestCRC ScalarString ]; meta = { description = "DEC VMS password hashing"; @@ -3377,6 +3378,7 @@ let sha256 = "3cc7126d5841107237a9be2dc5c7fbc167cf3c4b4ce34678a8448b850757014c"; }; propagatedBuildInputs = [ ClassMix ]; + perlPreHook = stdenv.lib.optionalString stdenv.isi686 "export LD=$CC"; # fix undefined reference to `__stack_chk_fail_local' }; CryptIDEA = buildPerlPackage { @@ -3466,6 +3468,7 @@ let sha256 = "93ebdfaaefcfe9ab683f0121c85f24475d8197f0bcec46018219e4111434dde3"; }; propagatedBuildInputs = [ DigestSHA1 ]; + perlPreHook = stdenv.lib.optionalString stdenv.isi686 "export LD=$CC"; # fix undefined reference to `__stack_chk_fail_local' }; CryptRijndael = buildPerlPackage { @@ -3641,6 +3644,7 @@ let url = mirror://cpan/authors/id/G/GT/GTERMARS/CSS-Minifier-XS-0.09.tar.gz; sha256 = "1myswrmh0sqp5xjpp03x45z8arfmgkjx0srl3r6kjsyzl1zrk9l8"; }; + perlPreHook = stdenv.lib.optionalString stdenv.isi686 "export LD=$CC"; # fix undefined reference to `__stack_chk_fail_local' meta = { description = "XS based CSS minifier"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; @@ -4110,6 +4114,7 @@ let sha256 = "1x662pqjg9p0wcigi7pwf969b2ymk66ncm2vd5dfm5i08pdkjpf3"; }; buildInputs = [ HashUtilFieldHashCompat ModuleBuildXSUtil ScopeGuard TestException ]; + perlPreHook = stdenv.lib.optionalString stdenv.isi686 "export LD=$CC"; # fix undefined reference to `__stack_chk_fail_local' meta = { description = "A selection of utilities for data and data types"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; @@ -6877,6 +6882,7 @@ let sha256 = "a02fbf285406a8a4d9399284f032f2d55c56975154c2e1674bd109837b8096ec"; }; buildInputs = [ ExtUtilsCChecker ]; + perlPreHook = stdenv.lib.optionalString stdenv.isi686 "export LD=$CC"; # fix undefined reference to `__stack_chk_fail_local' meta = { description = "Modify attributes of symlinks without dereferencing them"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; @@ -8079,6 +8085,7 @@ let sha256 = "b1cbac4157ad8dedac6914e1628855e05b8dc885a4007d2e4df8177c6a9b70fb"; }; buildInputs = [ ModuleBuildPluggablePPPort TestRequires ]; + perlPreHook = stdenv.lib.optionalString stdenv.isi686 "export LD=$CC"; # fix undefined reference to `__stack_chk_fail_local' meta = { homepage = https://github.com/tokuhirom/HTML-Escape; description = "Extremely fast HTML escaping"; @@ -8509,6 +8516,7 @@ let url = mirror://cpan/authors/id/M/MA/MARKSMITH/HTTP-HeaderParser-XS-0.20.tar.gz; sha256 = "1vs6sw431nnlnbdy6jii9vqlz30ndlfwdpdgm8a1m6fqngzhzq59"; }; + meta.broken = stdenv.isi686; # loadable library and perl binaries are mismatched (got handshake key 0x7d40080, needed 0x7dc0080) }; HTTPHeadersFast = buildPerlModule { @@ -9312,6 +9320,7 @@ let url = mirror://cpan/authors/id/G/GT/GTERMARS/JavaScript-Minifier-XS-0.11.tar.gz; sha256 = "1vlyhckpjbrg2v4dy9szsxxl0q44n0y1xl763mg2y2ym9g5144hm"; }; + perlPreHook = stdenv.lib.optionalString stdenv.isi686 "export LD=$CC"; # fix undefined reference to `__stack_chk_fail_local' meta = { description = "XS based JavaScript minifier"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; @@ -9814,6 +9823,7 @@ let }; buildInputs = [ TestException ]; propagatedBuildInputs = [ SubExporter ]; + perlPreHook = stdenv.lib.optionalString stdenv.isi686 "export LD=$CC"; # fix undefined reference to `__stack_chk_fail_local' meta = { description = "Linux specific special filehandles"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; @@ -10777,6 +10787,7 @@ let meta = { description = "Manipulate 128 bits integers in Perl"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + broken = stdenv.is32bit; # compiler doesn't support a 128-bit integer type }; }; @@ -12693,6 +12704,7 @@ let url = mirror://cpan/authors/id/N/NJ/NJH/MusicBrainz-DiscID-0.03.tar.gz; sha256 = "0fjph2q3yp0aa87gckv3391s47m13wbyylj7jb7vqx7hv0pzj0jh"; }; + perlPreHook = stdenv.lib.optionalString stdenv.isi686 "export LD=$CC"; # fix undefined reference to `__stack_chk_fail_local' # Build.PL in this package uses which to find pkg-config -- make it use path instead patchPhase = ''sed -ie 's/`which pkg-config`/"pkg-config"/' Build.PL''; doCheck = false; # The main test performs network access @@ -13703,6 +13715,7 @@ let url = mirror://cpan/authors/id/Z/ZE/ZEFRAM/Params-Classify-0.015.tar.gz; sha256 = "052r198xyrsv8wz21gijdigz2cgnidsa37nvyfzdiz4rv1fc33ir"; }; + perlPreHook = stdenv.lib.optionalString stdenv.isi686 "export LD=$CC"; # fix undefined reference to `__stack_chk_fail_local' }; ParamsUtil = buildPerlPackage { @@ -16525,6 +16538,7 @@ let }; nativeBuildInputs = [ pkgs.pkgconfig ]; buildInputs = [ pkgs.libvirt CPANChanges TestPod TestPodCoverage XMLXPath ]; + perlPreHook = stdenv.lib.optionalString stdenv.isi686 "export LD=$CC"; # fix undefined reference to `__stack_chk_fail_local' }; TAPParserSourceHandlerpgTAP = buildPerlModule { @@ -19383,6 +19397,7 @@ let url = mirror://cpan/authors/id/A/AR/ARODLAND/Unicode-CaseFold-1.01.tar.gz; sha256 = "418a212808f9d0b8bb330ac905096d2dd364976753d4c71534dab9836a63194d"; }; + perlPreHook = stdenv.lib.optionalString stdenv.isi686 "export LD=$CC"; # fix undefined reference to `__stack_chk_fail_local' meta = { description = "Unicode case-folding for case-insensitive lookups"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index e106c6a05f66..70d3fd06fb4c 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -245,6 +245,15 @@ let ''; }; + pcov = buildPecl { + version = "1.0.6"; + pname = "pcov"; + + sha256 = "1psfwscrc025z8mziq69pcx60k4fbkqa5g2ia8lplb94mmarj0v1"; + + buildInputs = [ (if isPhp73 then pkgs.pcre2 else pkgs.pcre) ]; + }; + pcs = buildPecl { version = "1.3.3"; pname = "pcs"; @@ -392,12 +401,12 @@ let }; phpstan = mkDerivation rec { - version = "0.11.16"; + version = "0.11.19"; pname = "phpstan"; src = pkgs.fetchurl { url = "https://github.com/phpstan/phpstan/releases/download/${version}/phpstan.phar"; - sha256 = "0c2417kwkj3nf1zya1flw7g1mz0dwhh27hjs3wz04b0kgnv4syzs"; + sha256 = "0b04d2x07vipx1850v3d2hga3s6ssv7g21x58dhcjrg35i1bvq71"; }; phases = [ "installPhase" ]; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 9ba179fcad04..f97de31c64d3 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -906,6 +906,8 @@ in { pybind11 = callPackage ../development/python-modules/pybind11 { }; + py3buddy = toPythonModule (callPackage ../development/python-modules/py3buddy { }); + pybullet = callPackage ../development/python-modules/pybullet { }; pycairo = callPackage ../development/python-modules/pycairo { @@ -1081,6 +1083,8 @@ in { pytesseract = callPackage ../development/python-modules/pytesseract { }; + pytest-black = callPackage ../development/python-modules/pytest-black { }; + pytest-click = callPackage ../development/python-modules/pytest-click { }; pytest-check = callPackage ../development/python-modules/pytest-check { }; @@ -3490,6 +3494,8 @@ in { icalendar = callPackage ../development/python-modules/icalendar { }; + ics = callPackage ../development/python-modules/ics { }; + ifaddr = callPackage ../development/python-modules/ifaddr { }; imageio = callPackage ../development/python-modules/imageio { }; @@ -3521,10 +3527,7 @@ in { ipyparallel = callPackage ../development/python-modules/ipyparallel { }; - ipython = if pythonOlder "3.5" then - callPackage ../development/python-modules/ipython/5.nix { } - else - callPackage ../development/python-modules/ipython { }; + ipython = callPackage ../development/python-modules/ipython { }; ipython_genutils = callPackage ../development/python-modules/ipython_genutils { }; @@ -3911,7 +3914,7 @@ in { mypy = callPackage ../development/python-modules/mypy { }; - mypy_extensions = callPackage ../development/python-modules/mypy/extensions.nix { }; + mypy-extensions = callPackage ../development/python-modules/mypy/extensions.nix { }; mypy-protobuf = callPackage ../development/python-modules/mypy-protobuf { }; @@ -5009,6 +5012,18 @@ in { sphinx-testing = callPackage ../development/python-modules/sphinx-testing { }; + sphinxcontrib-applehelp = callPackage ../development/python-modules/sphinxcontrib-applehelp {}; + + sphinxcontrib-devhelp = callPackage ../development/python-modules/sphinxcontrib-devhelp {}; + + sphinxcontrib-htmlhelp = callPackage ../development/python-modules/sphinxcontrib-htmlhelp {}; + + sphinxcontrib-jsmath = callPackage ../development/python-modules/sphinxcontrib-jsmath {}; + + sphinxcontrib-qthelp = callPackage ../development/python-modules/sphinxcontrib-qthelp {}; + + sphinxcontrib-serializinghtml = callPackage ../development/python-modules/sphinxcontrib-serializinghtml {}; + sphinxcontrib-bibtex = callPackage ../development/python-modules/sphinxcontrib-bibtex {}; sphinx-navtree = callPackage ../development/python-modules/sphinx-navtree {}; @@ -5052,6 +5067,10 @@ in { tasklib = callPackage ../development/python-modules/tasklib { }; + tatsu = callPackage ../development/python-modules/tatsu { }; + + tbm-utils = callPackage ../development/python-modules/tbm-utils { }; + tempita = callPackage ../development/python-modules/tempita { }; terminado = callPackage ../development/python-modules/terminado { }; @@ -5245,6 +5264,8 @@ in { ruamel_yaml = callPackage ../development/python-modules/ruamel_yaml { }; + ruamel_yaml_clib = callPackage ../development/python-modules/ruamel_yaml_clib { }; + ruffus = callPackage ../development/python-modules/ruffus { }; runsnakerun = callPackage ../development/python-modules/runsnakerun { }; @@ -5613,6 +5634,8 @@ in { python-libarchive = callPackage ../development/python-modules/python-libarchive { }; + python-logstash = callPackage ../development/python-modules/python-logstash { }; + libarchive-c = callPackage ../development/python-modules/libarchive-c { inherit (pkgs) libarchive; }; @@ -5837,6 +5860,8 @@ in { pyregion = callPackage ../development/python-modules/pyregion {}; + python-nomad = callPackage ../development/python-modules/python-nomad { }; + python-u2flib-host = callPackage ../development/python-modules/python-u2flib-host { }; python-xmp-toolkit = callPackage ../development/python-modules/python-xmp-toolkit { };