diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2021-03-04 22:16:45 +0100 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2021-03-04 22:16:45 +0100 |
| commit | 6d1958ad2dda67aa4f667d2283781949c8d18303 (patch) | |
| tree | 56cb000fe8a66aaa690a61dae410a86bebde2b56 /pkgs | |
| parent | 9f7ce23482602164afe4f0a339f20879bf7df6cc (diff) | |
| parent | a992d6867108fa317f461becc92a7f36a59bac61 (diff) | |
Merge branch 'staging-next' into staging
Diffstat (limited to 'pkgs')
303 files changed, 3336 insertions, 1176 deletions
diff --git a/pkgs/applications/audio/ft2-clone/default.nix b/pkgs/applications/audio/ft2-clone/default.nix index d9d2570d0a872..2ebff030b4e3e 100644 --- a/pkgs/applications/audio/ft2-clone/default.nix +++ b/pkgs/applications/audio/ft2-clone/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "ft2-clone"; - version = "1.43"; + version = "1.44_fix"; src = fetchFromGitHub { owner = "8bitbubsy"; repo = "ft2-clone"; rev = "v${version}"; - sha256 = "sha256-OIQk7ngg1wsB6DFcxhrviPGlhzdaAWBi9C2roSNg1eI="; + sha256 = "sha256-2HhG2cDzAvpSm655M1KQnjbfVvqqOZDz2ty7xnttskA="; }; # Adapt the linux-only CMakeLists to darwin (more reliable than make-macos.sh) diff --git a/pkgs/applications/audio/magnetophonDSP/CharacterCompressor/default.nix b/pkgs/applications/audio/magnetophonDSP/CharacterCompressor/default.nix index d7f0a7fb20e99..400f268d439e9 100644 --- a/pkgs/applications/audio/magnetophonDSP/CharacterCompressor/default.nix +++ b/pkgs/applications/audio/magnetophonDSP/CharacterCompressor/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, faust2jaqt, faust2lv2 }: +{ lib, stdenv, fetchFromGitHub, faust2jaqt, faust2lv2 }: stdenv.mkDerivation rec { pname = "CharacterCompressor"; version = "0.3.3"; diff --git a/pkgs/applications/audio/magnetophonDSP/CompBus/default.nix b/pkgs/applications/audio/magnetophonDSP/CompBus/default.nix index 7a917d79c57f9..0b80aef170a01 100644 --- a/pkgs/applications/audio/magnetophonDSP/CompBus/default.nix +++ b/pkgs/applications/audio/magnetophonDSP/CompBus/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, faust2jaqt, faust2lv2 }: +{ lib, stdenv, fetchFromGitHub, faust2jaqt, faust2lv2 }: stdenv.mkDerivation rec { pname = "CompBus"; version = "1.1.1"; diff --git a/pkgs/applications/audio/magnetophonDSP/ConstantDetuneChorus/default.nix b/pkgs/applications/audio/magnetophonDSP/ConstantDetuneChorus/default.nix index 5ac711723253a..56534309733d7 100644 --- a/pkgs/applications/audio/magnetophonDSP/ConstantDetuneChorus/default.nix +++ b/pkgs/applications/audio/magnetophonDSP/ConstantDetuneChorus/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, faust2jaqt, faust2lv2 }: +{ lib, stdenv, fetchFromGitHub, faust2jaqt, faust2lv2 }: stdenv.mkDerivation rec { pname = "constant-detune-chorus"; version = "0.1.3"; diff --git a/pkgs/applications/audio/magnetophonDSP/LazyLimiter/default.nix b/pkgs/applications/audio/magnetophonDSP/LazyLimiter/default.nix index 277b186fd4ab5..4b1157de0b083 100644 --- a/pkgs/applications/audio/magnetophonDSP/LazyLimiter/default.nix +++ b/pkgs/applications/audio/magnetophonDSP/LazyLimiter/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, faust2jaqt, faust2lv2 }: +{ lib, stdenv, fetchFromGitHub, faust2jaqt, faust2lv2 }: stdenv.mkDerivation rec { pname = "LazyLimiter"; version = "0.3.2"; diff --git a/pkgs/applications/audio/magnetophonDSP/MBdistortion/default.nix b/pkgs/applications/audio/magnetophonDSP/MBdistortion/default.nix index de7e573cbeeef..f951486e3fa34 100644 --- a/pkgs/applications/audio/magnetophonDSP/MBdistortion/default.nix +++ b/pkgs/applications/audio/magnetophonDSP/MBdistortion/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, faust2jaqt, faust2lv2 }: +{ lib, stdenv, fetchFromGitHub, faust2jaqt, faust2lv2 }: stdenv.mkDerivation rec { pname = "MBdistortion"; version = "1.1.1"; diff --git a/pkgs/applications/audio/magnetophonDSP/RhythmDelay/default.nix b/pkgs/applications/audio/magnetophonDSP/RhythmDelay/default.nix index 80c5bb89eeea1..fff4292cd761d 100644 --- a/pkgs/applications/audio/magnetophonDSP/RhythmDelay/default.nix +++ b/pkgs/applications/audio/magnetophonDSP/RhythmDelay/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, faust2jaqt, faust2lv2 }: +{ lib, stdenv, fetchFromGitHub, faust2jaqt, faust2lv2 }: stdenv.mkDerivation rec { pname = "RhythmDelay"; version = "2.1"; diff --git a/pkgs/applications/audio/magnetophonDSP/VoiceOfFaust/default.nix b/pkgs/applications/audio/magnetophonDSP/VoiceOfFaust/default.nix index 9bd4076f130a9..6bc8cff226151 100644 --- a/pkgs/applications/audio/magnetophonDSP/VoiceOfFaust/default.nix +++ b/pkgs/applications/audio/magnetophonDSP/VoiceOfFaust/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, faust2jack, faust2lv2, helmholtz, mrpeach, puredata-with-plugins }: +{ lib, stdenv, fetchFromGitHub, faust2jack, faust2lv2, helmholtz, mrpeach, puredata-with-plugins }: stdenv.mkDerivation rec { pname = "VoiceOfFaust"; version = "1.1.4"; diff --git a/pkgs/applications/audio/magnetophonDSP/faustCompressors/default.nix b/pkgs/applications/audio/magnetophonDSP/faustCompressors/default.nix index a90492f4235f9..7ea5fa753c811 100644 --- a/pkgs/applications/audio/magnetophonDSP/faustCompressors/default.nix +++ b/pkgs/applications/audio/magnetophonDSP/faustCompressors/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, faust2jaqt, faust2lv2 }: +{ lib, stdenv, fetchFromGitHub, faust2jaqt, faust2lv2 }: stdenv.mkDerivation rec { name = "faustCompressors-v${version}"; version = "1.2"; diff --git a/pkgs/applications/audio/magnetophonDSP/pluginUtils/default.nix b/pkgs/applications/audio/magnetophonDSP/pluginUtils/default.nix index 414e350caa035..fd807dd424555 100644 --- a/pkgs/applications/audio/magnetophonDSP/pluginUtils/default.nix +++ b/pkgs/applications/audio/magnetophonDSP/pluginUtils/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, faust2jaqt, faust2lv2 }: +{ lib, stdenv, fetchFromGitHub, faust2jaqt, faust2lv2 }: stdenv.mkDerivation rec { pname = "pluginUtils"; version = "1.1"; diff --git a/pkgs/applications/audio/magnetophonDSP/shelfMultiBand/default.nix b/pkgs/applications/audio/magnetophonDSP/shelfMultiBand/default.nix index 7dcdf985c8249..07d4402578caa 100644 --- a/pkgs/applications/audio/magnetophonDSP/shelfMultiBand/default.nix +++ b/pkgs/applications/audio/magnetophonDSP/shelfMultiBand/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, faust2jaqt, faust2lv2 }: +{ lib, stdenv, fetchFromGitHub, faust2jaqt, faust2lv2 }: stdenv.mkDerivation rec { pname = "shelfMultiBand"; version = "0.6.1"; diff --git a/pkgs/applications/audio/musescore/default.nix b/pkgs/applications/audio/musescore/default.nix index 0c1ad144a4afc..6a5dbebeca010 100644 --- a/pkgs/applications/audio/musescore/default.nix +++ b/pkgs/applications/audio/musescore/default.nix @@ -8,13 +8,13 @@ mkDerivation rec { pname = "musescore"; - version = "3.6"; + version = "3.6.1"; src = fetchFromGitHub { owner = "musescore"; repo = "MuseScore"; rev = "v${version}"; - sha256 = "sha256-0M+idYnrgXyH6WLp+2jIYRnFzTB93v+dG1XHmSNyPjE="; + sha256 = "sha256-21ZI5rsc05ZWEyM0LeFr+212YViLYveZZBvVpskh8iA="; }; patches = [ diff --git a/pkgs/applications/backup/vorta/default.nix b/pkgs/applications/backup/vorta/default.nix index 1809777ed542a..c37bf0f20f79c 100644 --- a/pkgs/applications/backup/vorta/default.nix +++ b/pkgs/applications/backup/vorta/default.nix @@ -6,13 +6,13 @@ python3.pkgs.buildPythonApplication rec { pname = "vorta"; - version = "0.7.4"; + version = "0.7.5"; src = fetchFromGitHub { owner = "borgbase"; repo = "vorta"; rev = "v${version}"; - sha256 = "sha256-+WQ3p2ddyQpJqCLc1HqFZlKK85VkX2Iv2eXEcVkBs6g="; + sha256 = "sha256-qPO8qmXYDDFwV+8hAUyfF4Ins0vkwEJbw4JPguUSYOw="; }; postPatch = '' diff --git a/pkgs/applications/blockchains/go-ethereum.nix b/pkgs/applications/blockchains/go-ethereum.nix index dd3904b27cb86..4dab912cf1559 100644 --- a/pkgs/applications/blockchains/go-ethereum.nix +++ b/pkgs/applications/blockchains/go-ethereum.nix @@ -8,17 +8,17 @@ let in buildGoModule rec { pname = "go-ethereum"; - version = "1.9.25"; + version = "1.10.0"; src = fetchFromGitHub { owner = "ethereum"; repo = pname; rev = "v${version}"; - sha256 = "0cbgqs17agwdap4g37sb2g6mhyn7qkqbjk7kwb5jvj8nbi5n3kbd"; + sha256 = "sha256-pEzaEpqr+Ird8d5zmoXMyAoS0aEGBYFmpgdPcH4OsMI="; }; runVend = true; - vendorSha256 = "08wgah8gxb5bscm5ca6zkfgssnmw2y2l6k9gfw7gbxyflsx74lya"; + vendorSha256 = "sha256-DgyOvplk1JWn6D/z4zbXHLNLuAVQ5beEHi0NuSv236A="; doCheck = false; diff --git a/pkgs/applications/blockchains/mycrypto/default.nix b/pkgs/applications/blockchains/mycrypto/default.nix index b884f044efe02..17e884c5794ea 100644 --- a/pkgs/applications/blockchains/mycrypto/default.nix +++ b/pkgs/applications/blockchains/mycrypto/default.nix @@ -1,5 +1,5 @@ { lib, appimageTools, fetchurl, makeDesktopItem -, gsettings-desktop-schemas, gtk2 +, gsettings-desktop-schemas, gtk3 }: let @@ -30,7 +30,7 @@ in appimageTools.wrapType2 rec { inherit name src; profile = '' - export XDG_DATA_DIRS=${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}:${gtk2}/share/gsettings-schemas/${gtk2.name}:$XDG_DATA_DIRS + export XDG_DATA_DIRS=${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}:${gtk3}/share/gsettings-schemas/${gtk3.name}:$XDG_DATA_DIRS ''; multiPkgs = null; # no p32bit needed diff --git a/pkgs/applications/editors/apostrophe/default.nix b/pkgs/applications/editors/apostrophe/default.nix index 4265e0ef10465..dd8757d0c17bb 100644 --- a/pkgs/applications/editors/apostrophe/default.nix +++ b/pkgs/applications/editors/apostrophe/default.nix @@ -2,37 +2,37 @@ , wrapGAppsHook, pkg-config, desktop-file-utils , appstream-glib, pythonPackages, glib, gobject-introspection , gtk3, webkitgtk, glib-networking, gnome3, gspell, texlive -, shared-mime-info, haskellPackages}: +, shared-mime-info, haskellPackages, libhandy +}: let - pythonEnv = pythonPackages.python.withPackages(p: with p; - [ regex setuptools python-Levenshtein pyenchant pygobject3 pycairo pypandoc ]); - texliveDist = texlive.combined.scheme-medium; + pythonEnv = pythonPackages.python.withPackages(p: with p; [ + regex setuptools python-Levenshtein pyenchant + pygobject3 pycairo pypandoc chardet + ]); in stdenv.mkDerivation rec { pname = "apostrophe"; - version = "2.2.0.3"; + version = "2.3"; src = fetchFromGitLab { owner = "somas"; repo = pname; domain = "gitlab.gnome.org"; rev = "v${version}"; - sha256 = "06bl1hc69ixk2vcb2ig74mwid14sl5zq6rfna7lx9na6j3l04879"; + sha256 = "1ggrbbnhbnf6p3hs72dww3c9m1rvr4znggmvwcpj6i8v1a3kycnb"; }; nativeBuildInputs = [ meson ninja cmake pkg-config desktop-file-utils appstream-glib wrapGAppsHook ]; buildInputs = [ glib pythonEnv gobject-introspection gtk3 - gnome3.adwaita-icon-theme webkitgtk gspell texliveDist - glib-networking ]; + gnome3.adwaita-icon-theme webkitgtk gspell texlive + glib-networking libhandy ]; postPatch = '' patchShebangs --build build-aux/meson_post_install.py - substituteInPlace ${pname}/config.py --replace "/usr/share/${pname}" "$out/share/${pname}" - # get rid of unused distributed dependencies rm -r ${pname}/pylocales ''; @@ -40,7 +40,7 @@ in stdenv.mkDerivation rec { preFixup = '' gappsWrapperArgs+=( --prefix PYTHONPATH : "$out/lib/python${pythonEnv.pythonVersion}/site-packages/" - --prefix PATH : "${texliveDist}/bin" + --prefix PATH : "${texlive}/bin" --prefix PATH : "${haskellPackages.pandoc-citeproc}/bin" --prefix XDG_DATA_DIRS : "${shared-mime-info}/share" ) diff --git a/pkgs/applications/editors/emacs-modes/melpa-packages.nix b/pkgs/applications/editors/emacs-modes/melpa-packages.nix index 6a099639d5915..e5e2bac964f37 100644 --- a/pkgs/applications/editors/emacs-modes/melpa-packages.nix +++ b/pkgs/applications/editors/emacs-modes/melpa-packages.nix @@ -141,14 +141,18 @@ let buildInputs = old.buildInputs ++ [ pkgs.libpng pkgs.zlib pkgs.poppler ]; preBuild = '' make server/epdfinfo - remove-references-to \ - -t ${pkgs.stdenv.cc.libc.dev} \ - -t ${pkgs.glib.dev} \ - -t ${pkgs.libpng.dev} \ - -t ${pkgs.poppler.dev} \ - -t ${pkgs.zlib.dev} \ - -t ${pkgs.cairo.dev} \ - server/epdfinfo + remove-references-to ${lib.concatStringsSep " " ( + map (output: "-t " + output) ( + [ + pkgs.glib.dev + pkgs.libpng.dev + pkgs.poppler.dev + pkgs.zlib.dev + pkgs.cairo.dev + ] + ++ lib.optional pkgs.stdenv.isLinux pkgs.stdenv.cc.libc.dev + ) + )} server/epdfinfo ''; recipe = pkgs.writeText "recipe" '' (pdf-tools diff --git a/pkgs/applications/editors/nano/default.nix b/pkgs/applications/editors/nano/default.nix index 30d1e5b75787d..b55252855662b 100644 --- a/pkgs/applications/editors/nano/default.nix +++ b/pkgs/applications/editors/nano/default.nix @@ -16,11 +16,11 @@ let in stdenv.mkDerivation rec { pname = "nano"; - version = "5.6"; + version = "5.6.1"; src = fetchurl { url = "mirror://gnu/nano/${pname}-${version}.tar.xz"; - sha256 = "0ckscf3klm2k1zjvcv8mkza1yp80g7ss56n73790fk83lzj87qgw"; + sha256 = "02cbxqizbdlfwnz8dpq4fbzmdi4yk6fv0cragvpa0748w1cp03bn"; }; nativeBuildInputs = [ texinfo ] ++ optional enableNls gettext; diff --git a/pkgs/applications/graphics/shotwell/default.nix b/pkgs/applications/graphics/shotwell/default.nix index bd9ad301d3493..204d87a59c4e7 100644 --- a/pkgs/applications/graphics/shotwell/default.nix +++ b/pkgs/applications/graphics/shotwell/default.nix @@ -106,7 +106,7 @@ stdenv.mkDerivation rec { description = "Popular photo organizer for the GNOME desktop"; homepage = "https://wiki.gnome.org/Apps/Shotwell"; license = licenses.lgpl21Plus; - maintainers = with maintainers; [domenkozar]; + maintainers = with maintainers; []; platforms = platforms.linux; }; } diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix index b312a566a700f..f8719c353b0ab 100644 --- a/pkgs/applications/kde/default.nix +++ b/pkgs/applications/kde/default.nix @@ -91,6 +91,7 @@ let kalarm = callPackage ./kalarm.nix {}; kalarmcal = callPackage ./kalarmcal.nix {}; kalzium = callPackage ./kalzium.nix {}; + kamoso = callPackage ./kamoso.nix {}; kapman = callPackage ./kapman.nix {}; kapptemplate = callPackage ./kapptemplate.nix { }; kate = callPackage ./kate.nix {}; diff --git a/pkgs/applications/kde/kamoso.nix b/pkgs/applications/kde/kamoso.nix new file mode 100644 index 0000000000000..3e5eb53858f1b --- /dev/null +++ b/pkgs/applications/kde/kamoso.nix @@ -0,0 +1,41 @@ +{ mkDerivation +, lib +, extra-cmake-modules +, kdoctools +, wrapQtAppsHook +, qtdeclarative +, qtgraphicaleffects +, qtquickcontrols2 +, kirigami2 +, kpurpose +, gst_all_1 +, pcre +}: + +let + gst = with gst_all_1; [ gstreamer gst-libav gst-plugins-base gst-plugins-good gst-plugins-bad ]; + +in +mkDerivation { + pname = "kamoso"; + nativeBuildInputs = [ extra-cmake-modules kdoctools wrapQtAppsHook ]; + buildInputs = [ pcre ] ++ gst; + propagatedBuildInputs = [ + qtdeclarative + qtgraphicaleffects + qtquickcontrols2 + kirigami2 + kpurpose + ]; + + cmakeFlags = [ + "-DOpenGL_GL_PREFERENCE=GLVND" + "-DGSTREAMER_VIDEO_INCLUDE_DIR=${gst_all_1.gst-plugins-base.dev}/include/gstreamer-1.0" + ]; + + qtWrapperArgs = [ + "--prefix GST_PLUGIN_PATH : ${lib.makeSearchPath "lib/gstreamer-1.0" gst}" + ]; + + meta.license = with lib.licenses; [ lgpl21Only gpl3Only ]; +} diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix index 1471af254f14f..16541eaaa2106 100644 --- a/pkgs/applications/misc/calibre/default.nix +++ b/pkgs/applications/misc/calibre/default.nix @@ -179,7 +179,7 @@ mkDerivation rec { free and open source and great for both casual users and computer experts. ''; license = with licenses; if unrarSupport then unfreeRedistributable else gpl3Plus; - maintainers = with maintainers; [ domenkozar pSub AndersonTorres ]; + maintainers = with maintainers; [ pSub AndersonTorres ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/misc/flavours/default.nix b/pkgs/applications/misc/flavours/default.nix index 6ee546fa7c557..0e072aa649c84 100644 --- a/pkgs/applications/misc/flavours/default.nix +++ b/pkgs/applications/misc/flavours/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "flavours"; - version = "0.3.5"; + version = "0.3.6"; src = fetchFromGitHub { owner = "Misterio77"; repo = pname; rev = "v${version}"; - sha256 = "1lvbq026ap02f22mv45s904a0f81dr2f07j6bq0wnwl5wd5w0wpj"; + sha256 = "0nys1sh4qwda1ql6aq07bhyvhjp5zf0qm98kr4kf2fmr87ddc12q"; }; - cargoSha256 = "0wgi65k180mq1q6j4nma0wpfdvl67im5v5gmhzv1ap6xg3bicdg1"; + cargoSha256 = "0bmmxiv8bd09kgxmhmynslfscsx2aml1m1glvid3inaipylcq45h"; meta = with lib; { description = "An easy to use base16 scheme manager/builder that integrates with any workflow"; diff --git a/pkgs/applications/misc/gpxsee/default.nix b/pkgs/applications/misc/gpxsee/default.nix index e5e1995548cee..cebbcfe59ba71 100644 --- a/pkgs/applications/misc/gpxsee/default.nix +++ b/pkgs/applications/misc/gpxsee/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "gpxsee"; - version = "8.7"; + version = "8.8"; src = fetchFromGitHub { owner = "tumic0"; repo = "GPXSee"; rev = version; - sha256 = "sha256-pBNG9lDdqvxh2hGmOcL21mkkyFD7id1mWCUSgkTG71M="; + sha256 = "sha256-eAXMmjPcfnJA5w6w/SRc6T5KHss77t0JijTB6+ctjzo="; }; patches = (substituteAll { diff --git a/pkgs/applications/misc/jekyll/basic/Gemfile.lock b/pkgs/applications/misc/jekyll/basic/Gemfile.lock index 65c747c40a504..161aeb7720bf4 100644 --- a/pkgs/applications/misc/jekyll/basic/Gemfile.lock +++ b/pkgs/applications/misc/jekyll/basic/Gemfile.lock @@ -1,7 +1,7 @@ GEM remote: https://rubygems.org/ specs: - activesupport (6.1.0) + activesupport (6.1.3) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 1.6, < 2) minitest (>= 5.1) @@ -10,19 +10,19 @@ GEM addressable (2.7.0) public_suffix (>= 2.0.2, < 5.0) colorator (1.1.0) - concurrent-ruby (1.1.7) + concurrent-ruby (1.1.8) em-websocket (0.5.2) eventmachine (>= 0.12.9) http_parser.rb (~> 0.6.0) eventmachine (1.2.7) - ffi (1.13.1) + ffi (1.14.2) forwardable-extended (2.6.0) gemoji (3.0.1) html-pipeline (2.14.0) activesupport (>= 2) nokogiri (>= 1.4) http_parser.rb (0.6.0) - i18n (1.8.5) + i18n (1.8.9) concurrent-ruby (~> 1.0) jekyll (4.2.0) addressable (~> 2.4) @@ -61,17 +61,19 @@ GEM kramdown-parser-gfm (1.1.0) kramdown (~> 2.0) liquid (4.0.3) - listen (3.3.3) + listen (3.4.1) rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) mercenary (0.4.0) - mini_portile2 (2.4.0) - minitest (5.14.2) - nokogiri (1.10.10) - mini_portile2 (~> 2.4.0) + mini_portile2 (2.5.0) + minitest (5.14.4) + nokogiri (1.11.1) + mini_portile2 (~> 2.5.0) + racc (~> 1.4) pathutil (0.16.2) forwardable-extended (~> 2.6) public_suffix (4.0.6) + racc (1.5.2) rb-fsevent (0.10.4) rb-inotify (0.10.1) ffi (~> 1.0) @@ -82,7 +84,7 @@ GEM ffi (~> 1.9) terminal-table (2.0.0) unicode-display_width (~> 1.1, >= 1.1.1) - tzinfo (2.0.3) + tzinfo (2.0.4) concurrent-ruby (~> 1.0) unicode-display_width (1.7.0) zeitwerk (2.4.2) diff --git a/pkgs/applications/misc/jekyll/basic/gemset.nix b/pkgs/applications/misc/jekyll/basic/gemset.nix index cc7be93510c6b..bda211e6f7aa0 100644 --- a/pkgs/applications/misc/jekyll/basic/gemset.nix +++ b/pkgs/applications/misc/jekyll/basic/gemset.nix @@ -5,10 +5,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1pflc2fch1bbgzk1rqgj21l6mgx025l92kd9arxjls98nf5am44v"; + sha256 = "00a4db64g8w5yyk6hzak2nqrmdfvyh5zc9cvnm9gglwbi87ss28h"; type = "gem"; }; - version = "6.1.0"; + version = "6.1.3"; }; addressable = { dependencies = ["public_suffix"]; @@ -36,10 +36,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1vnxrbhi7cq3p4y2v9iwd10v1c7l15is4var14hwnb2jip4fyjzz"; + sha256 = "0mr23wq0szj52xnj0zcn1k0c7j4v79wlwbijkpfcscqww3l6jlg3"; type = "gem"; }; - version = "1.1.7"; + version = "1.1.8"; }; em-websocket = { dependencies = ["eventmachine" "http_parser.rb"]; @@ -67,10 +67,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "12lpwaw82bb0rm9f52v1498bpba8aj2l2q359mkwbxsswhpga5af"; + sha256 = "15hgiy09i8ywjihyzyvjvk42ivi3kmy6dm21s5sgg9j7y3h3zkkx"; type = "gem"; }; - version = "1.13.1"; + version = "1.14.2"; }; forwardable-extended = { groups = ["default"]; @@ -119,10 +119,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "153sx77p16vawrs4qpkv7qlzf9v5fks4g7xqcj1dwk40i6g7rfzk"; + sha256 = "08p6b13p99j1rrcrw1l3v0kb9mxbsvy6nk31r8h4rnszdgzpga32"; type = "gem"; }; - version = "1.8.5"; + version = "1.8.9"; }; jekyll = { dependencies = ["addressable" "colorator" "em-websocket" "i18n" "jekyll-sass-converter" "jekyll-watch" "kramdown" "kramdown-parser-gfm" "liquid" "mercenary" "pathutil" "rouge" "safe_yaml" "terminal-table"]; @@ -250,10 +250,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1zpcgha7g33wvy2xbbc663cbjyvg9l1325lg3gzgcn3baydr9rha"; + sha256 = "0imzd0cb9vlkc3yggl4rph1v1wm4z9psgs4z6aqsqa5hgf8gr9hj"; type = "gem"; }; - version = "3.3.3"; + version = "3.4.1"; }; mercenary = { groups = ["default"]; @@ -270,31 +270,31 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "15zplpfw3knqifj9bpf604rb3wc1vhq6363pd6lvhayng8wql5vy"; + sha256 = "1hdbpmamx8js53yk3h8cqy12kgv6ca06k0c9n3pxh6b6cjfs19x7"; type = "gem"; }; - version = "2.4.0"; + version = "2.5.0"; }; minitest = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "170y2cvx51gm3cm3nhdf7j36sxnkh6vv8ls36p90ric7w8w16h4v"; + sha256 = "19z7wkhg59y8abginfrm2wzplz7py3va8fyngiigngqvsws6cwgl"; type = "gem"; }; - version = "5.14.2"; + version = "5.14.4"; }; nokogiri = { - dependencies = ["mini_portile2"]; + dependencies = ["mini_portile2" "racc"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0xmf60nj5kg9vaj5bysy308687sgmkasgx06vbbnf94p52ih7si2"; + sha256 = "1ajwkqr28hwqbyl1l3czx4a34c88acxywyqp8cjyy0zgsd6sbhj2"; type = "gem"; }; - version = "1.10.10"; + version = "1.11.1"; }; pathutil = { dependencies = ["forwardable-extended"]; @@ -317,6 +317,16 @@ }; version = "4.0.6"; }; + racc = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "178k7r0xn689spviqzhvazzvxfq6fyjldxb3ywjbgipbfi4s8j1g"; + type = "gem"; + }; + version = "1.5.2"; + }; rb-fsevent = { groups = ["default"]; platforms = []; @@ -396,10 +406,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1av5jzdij6vriwmf8crfvwaz2kik721ymg8svpxj3kx47kfha5vg"; + sha256 = "10qp5x7f9hvlc0psv9gsfbxg4a7s0485wsbq1kljkxq94in91l4z"; type = "gem"; }; - version = "2.0.3"; + version = "2.0.4"; }; unicode-display_width = { groups = ["default"]; diff --git a/pkgs/applications/misc/jekyll/full/Gemfile.lock b/pkgs/applications/misc/jekyll/full/Gemfile.lock index 969909ca6d0a7..e93f78e83c020 100644 --- a/pkgs/applications/misc/jekyll/full/Gemfile.lock +++ b/pkgs/applications/misc/jekyll/full/Gemfile.lock @@ -1,7 +1,7 @@ GEM remote: https://rubygems.org/ specs: - activesupport (6.1.0) + activesupport (6.1.3) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 1.6, < 2) minitest (>= 5.1) @@ -17,24 +17,26 @@ GEM execjs coffee-script-source (1.12.2) colorator (1.1.0) - concurrent-ruby (1.1.7) + concurrent-ruby (1.1.8) em-websocket (0.5.2) eventmachine (>= 0.12.9) http_parser.rb (~> 0.6.0) eventmachine (1.2.7) execjs (2.7.0) - faraday (1.1.0) + faraday (1.3.0) + faraday-net_http (~> 1.0) multipart-post (>= 1.2, < 3) ruby2_keywords + faraday-net_http (1.0.1) fast-stemmer (1.0.2) - ffi (1.13.1) + ffi (1.14.2) forwardable-extended (2.6.0) gemoji (3.0.1) html-pipeline (2.14.0) activesupport (>= 2) nokogiri (>= 1.4) http_parser.rb (0.6.0) - i18n (1.8.5) + i18n (1.8.9) concurrent-ruby (~> 1.0) jekyll (4.2.0) addressable (~> 2.4) @@ -64,7 +66,7 @@ GEM html-pipeline (~> 2.3) jekyll (>= 3.7, < 5.0) jekyll-paginate (1.1.0) - jekyll-polyglot (1.3.3) + jekyll-polyglot (1.4.0) jekyll (>= 3.0) jekyll-redirect-from (0.16.0) jekyll (>= 3.3, < 5.0) @@ -90,31 +92,33 @@ GEM liquid (4.0.3) liquid-c (4.0.0) liquid (>= 3.0.0) - listen (3.3.3) + listen (3.4.1) rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) mercenary (0.4.0) mime-types (3.3.1) mime-types-data (~> 3.2015) - mime-types-data (3.2020.1104) - mini_portile2 (2.4.0) - minitest (5.14.2) + mime-types-data (3.2021.0225) + mini_portile2 (2.5.0) + minitest (5.14.4) multipart-post (2.1.1) - nokogiri (1.10.10) - mini_portile2 (~> 2.4.0) - octokit (4.19.0) + nokogiri (1.11.1) + mini_portile2 (~> 2.5.0) + racc (~> 1.4) + octokit (4.20.0) faraday (>= 0.9) sawyer (~> 0.8.0, >= 0.5.3) pathutil (0.16.2) forwardable-extended (~> 2.6) public_suffix (4.0.6) + racc (1.5.2) rb-fsevent (0.10.4) rb-inotify (0.10.1) ffi (~> 1.0) - rdoc (6.2.1) + rdoc (6.3.0) rexml (3.2.4) rouge (3.26.0) - ruby2_keywords (0.0.2) + ruby2_keywords (0.0.4) safe_yaml (1.0.5) sassc (2.4.0) ffi (~> 1.9) @@ -124,7 +128,7 @@ GEM terminal-table (2.0.0) unicode-display_width (~> 1.1, >= 1.1.1) tomlrb (1.3.0) - tzinfo (2.0.3) + tzinfo (2.0.4) concurrent-ruby (~> 1.0) unicode-display_width (1.7.0) yajl-ruby (1.4.1) diff --git a/pkgs/applications/misc/jekyll/full/gemset.nix b/pkgs/applications/misc/jekyll/full/gemset.nix index bfbe428c861de..ee348a80c4a13 100644 --- a/pkgs/applications/misc/jekyll/full/gemset.nix +++ b/pkgs/applications/misc/jekyll/full/gemset.nix @@ -5,10 +5,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1pflc2fch1bbgzk1rqgj21l6mgx025l92kd9arxjls98nf5am44v"; + sha256 = "00a4db64g8w5yyk6hzak2nqrmdfvyh5zc9cvnm9gglwbi87ss28h"; type = "gem"; }; - version = "6.1.0"; + version = "6.1.3"; }; addressable = { dependencies = ["public_suffix"]; @@ -90,10 +90,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1vnxrbhi7cq3p4y2v9iwd10v1c7l15is4var14hwnb2jip4fyjzz"; + sha256 = "0mr23wq0szj52xnj0zcn1k0c7j4v79wlwbijkpfcscqww3l6jlg3"; type = "gem"; }; - version = "1.1.7"; + version = "1.1.8"; }; em-websocket = { dependencies = ["eventmachine" "http_parser.rb"]; @@ -127,15 +127,25 @@ version = "2.7.0"; }; faraday = { - dependencies = ["multipart-post" "ruby2_keywords"]; + dependencies = ["faraday-net_http" "multipart-post" "ruby2_keywords"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "16dapwi5pivrl25r4lkr1mxjrzkznj4wlcb08fzkmxnj4g5c6y35"; + sha256 = "1hmssd8pj4n7yq4kz834ylkla8ryyvhaap6q9nzymp93m1xq21kz"; type = "gem"; }; - version = "1.1.0"; + version = "1.3.0"; + }; + faraday-net_http = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1fi8sda5hc54v1w3mqfl5yz09nhx35kglyx72w7b8xxvdr0cwi9j"; + type = "gem"; + }; + version = "1.0.1"; }; fast-stemmer = { groups = ["default"]; @@ -164,10 +174,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "12lpwaw82bb0rm9f52v1498bpba8aj2l2q359mkwbxsswhpga5af"; + sha256 = "15hgiy09i8ywjihyzyvjvk42ivi3kmy6dm21s5sgg9j7y3h3zkkx"; type = "gem"; }; - version = "1.13.1"; + version = "1.14.2"; }; forwardable-extended = { groups = ["default"]; @@ -216,10 +226,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "153sx77p16vawrs4qpkv7qlzf9v5fks4g7xqcj1dwk40i6g7rfzk"; + sha256 = "08p6b13p99j1rrcrw1l3v0kb9mxbsvy6nk31r8h4rnszdgzpga32"; type = "gem"; }; - version = "1.8.5"; + version = "1.8.9"; }; jekyll = { dependencies = ["addressable" "colorator" "em-websocket" "i18n" "jekyll-sass-converter" "jekyll-watch" "kramdown" "kramdown-parser-gfm" "liquid" "mercenary" "pathutil" "rouge" "safe_yaml" "terminal-table"]; @@ -303,10 +313,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "4ad9140733250b65bc1ffab84650c588d036d23129e82f0349d31e56f1fe10a8"; + sha256 = "0klf363dsdsi90rsnc9047b3hbg88gagkq2sqzmmg5r1nhy7hyyr"; type = "gem"; }; - version = "1.3.3"; + version = "1.4.0"; }; jekyll-redirect-from = { dependencies = ["jekyll"]; @@ -458,10 +468,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1zpcgha7g33wvy2xbbc663cbjyvg9l1325lg3gzgcn3baydr9rha"; + sha256 = "0imzd0cb9vlkc3yggl4rph1v1wm4z9psgs4z6aqsqa5hgf8gr9hj"; type = "gem"; }; - version = "3.3.3"; + version = "3.4.1"; }; mercenary = { groups = ["default"]; @@ -489,30 +499,30 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ipjyfwn9nlvpcl8knq3jk4g5f12cflwdbaiqxcq1s7vwfwfxcag"; + sha256 = "1phcq7z0zpipwd7y4fbqmlaqghv07fjjgrx99mwq3z3n0yvy7fmi"; type = "gem"; }; - version = "3.2020.1104"; + version = "3.2021.0225"; }; mini_portile2 = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "15zplpfw3knqifj9bpf604rb3wc1vhq6363pd6lvhayng8wql5vy"; + sha256 = "1hdbpmamx8js53yk3h8cqy12kgv6ca06k0c9n3pxh6b6cjfs19x7"; type = "gem"; }; - version = "2.4.0"; + version = "2.5.0"; }; minitest = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "170y2cvx51gm3cm3nhdf7j36sxnkh6vv8ls36p90ric7w8w16h4v"; + sha256 = "19z7wkhg59y8abginfrm2wzplz7py3va8fyngiigngqvsws6cwgl"; type = "gem"; }; - version = "5.14.2"; + version = "5.14.4"; }; multipart-post = { groups = ["default"]; @@ -525,15 +535,15 @@ version = "2.1.1"; }; nokogiri = { - dependencies = ["mini_portile2"]; + dependencies = ["mini_portile2" "racc"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0xmf60nj5kg9vaj5bysy308687sgmkasgx06vbbnf94p52ih7si2"; + sha256 = "1ajwkqr28hwqbyl1l3czx4a34c88acxywyqp8cjyy0zgsd6sbhj2"; type = "gem"; }; - version = "1.10.10"; + version = "1.11.1"; }; octokit = { dependencies = ["faraday" "sawyer"]; @@ -541,10 +551,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1dz8na8fk445yqrwpkl31fimnap7p4xf9m9qm9i7cpvaxxgk2n24"; + sha256 = "1fl517ld5vj0llyshp3f9kb7xyl9iqy28cbz3k999fkbwcxzhlyq"; type = "gem"; }; - version = "4.19.0"; + version = "4.20.0"; }; pathutil = { dependencies = ["forwardable-extended"]; @@ -567,6 +577,16 @@ }; version = "4.0.6"; }; + racc = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "178k7r0xn689spviqzhvazzvxfq6fyjldxb3ywjbgipbfi4s8j1g"; + type = "gem"; + }; + version = "1.5.2"; + }; rb-fsevent = { groups = ["default"]; platforms = []; @@ -593,10 +613,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "08862mr1575j8g32wma4pv2qwj4xpllk29i5j61hgf9nwn64afhc"; + sha256 = "1rz1492df18161qwzswm86gav0dnqz715kxzw5yfnv0ka43d4zc4"; type = "gem"; }; - version = "6.2.1"; + version = "6.3.0"; }; rexml = { groups = ["default"]; @@ -623,10 +643,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "17pcc0wgvh3ikrkr7bm3nx0qhyiqwidd13ij0fa50k7gsbnr2p0l"; + sha256 = "15wfcqxyfgka05v2a7kpg64x57gl1y4xzvnc9lh60bqx5sf1iqrs"; type = "gem"; }; - version = "0.0.2"; + version = "0.0.4"; }; safe_yaml = { groups = ["default"]; @@ -687,10 +707,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1av5jzdij6vriwmf8crfvwaz2kik721ymg8svpxj3kx47kfha5vg"; + sha256 = "10qp5x7f9hvlc0psv9gsfbxg4a7s0485wsbq1kljkxq94in91l4z"; type = "gem"; }; - version = "2.0.3"; + version = "2.0.4"; }; unicode-display_width = { groups = ["default"]; diff --git a/pkgs/applications/misc/obsidian/default.nix b/pkgs/applications/misc/obsidian/default.nix index 76009b96a3320..3f898a1324749 100644 --- a/pkgs/applications/misc/obsidian/default.nix +++ b/pkgs/applications/misc/obsidian/default.nix @@ -34,23 +34,20 @@ in stdenv.mkDerivation rec { src = fetchurl { url = - "https://github.com/obsidianmd/obsidian-releases/releases/download/v${version}/obsidian-${version}.asar.gz"; - sha256 = "AkPx7X00kEds7B1syXJPSV1+TJlqQ7NnR6w9wSG2BRw="; + "https://github.com/obsidianmd/obsidian-releases/releases/download/v${version}/obsidian-${version}.tar.gz"; + sha256 = "1acy0dny04c8rdxqvsq70aa7vd8rgyjarcrf57mhh26ai5wiw81s"; }; nativeBuildInputs = [ makeWrapper graphicsmagick ]; - unpackPhase = '' - gzip -dc $src > obsidian.asar - ''; - installPhase = '' mkdir -p $out/bin makeWrapper ${electron}/bin/electron $out/bin/obsidian \ - --add-flags $out/share/electron/obsidian.asar + --add-flags $out/share/obsidian/app.asar - install -m 444 -D obsidian.asar $out/share/electron/obsidian.asar + install -m 444 -D resources/app.asar $out/share/obsidian/app.asar + install -m 444 -D resources/obsidian.asar $out/share/obsidian/obsidian.asar install -m 444 -D "${desktopItem}/share/applications/"* \ -t $out/share/applications/ diff --git a/pkgs/applications/misc/prusa-slicer/super-slicer.nix b/pkgs/applications/misc/prusa-slicer/super-slicer.nix index 14894159843b2..6b9b619f40f98 100644 --- a/pkgs/applications/misc/prusa-slicer/super-slicer.nix +++ b/pkgs/applications/misc/prusa-slicer/super-slicer.nix @@ -1,5 +1,5 @@ { - stdenv, lib, fetchFromGitHub, makeDesktopItem, prusa-slicer + lib, fetchFromGitHub, makeDesktopItem, prusa-slicer }: let appname = "SuperSlicer"; diff --git a/pkgs/applications/misc/pure-maps/default.nix b/pkgs/applications/misc/pure-maps/default.nix new file mode 100644 index 0000000000000..3ee87d58c0838 --- /dev/null +++ b/pkgs/applications/misc/pure-maps/default.nix @@ -0,0 +1,46 @@ +{ lib, mkDerivation, fetchFromGitHub, wrapQtAppsHook +, qmake, qttools, kirigami2, qtquickcontrols2, qtlocation, qtsensors +, nemo-qml-plugin-dbus, mapbox-gl-qml, s2geometry +, python3, pyotherside, python3Packages +}: + +mkDerivation rec { + pname = "pure-maps"; + version = "2.6.0"; + + src = fetchFromGitHub { + owner = "rinigus"; + repo = "pure-maps"; + rev = version; + sha256 = "1nviq2pavyxwh9k4kyzqpbzmx1wybwdax4pyd017izh9h6gqnjhs"; + fetchSubmodules = true; + }; + + nativeBuildInputs = [ qmake python3 qttools wrapQtAppsHook ]; + buildInputs = [ + kirigami2 qtquickcontrols2 qtlocation qtsensors + nemo-qml-plugin-dbus pyotherside mapbox-gl-qml s2geometry + ]; + propagatedBuildInputs = with python3Packages; [ gpxpy pyxdg ]; + + postPatch = '' + substituteInPlace pure-maps.pro \ + --replace '$$[QT_HOST_BINS]/lconvert' 'lconvert' + ''; + + qmakeFlags = [ "FLAVOR=kirigami" ]; + + dontWrapQtApps = true; + postInstall = '' + wrapQtApp $out/bin/pure-maps \ + --prefix PYTHONPATH : "$out/share" + ''; + + meta = with lib; { + description = "Display vector and raster maps, places, routes, and provide navigation instructions with a flexible selection of data and service providers"; + homepage = "https://github.com/rinigus/pure-maps"; + license = licenses.gpl3Only; + maintainers = [ maintainers.Thra11 ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/misc/robomongo/default.nix b/pkgs/applications/misc/robomongo/default.nix index e8bba1f7a340a..af5285909c6ce 100644 --- a/pkgs/applications/misc/robomongo/default.nix +++ b/pkgs/applications/misc/robomongo/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, zlib, glib, xorg, dbus, fontconfig, +{ lib, stdenv, fetchurl, zlib, glib, xorg, dbus, fontconfig, freetype, xkeyboard_config, makeDesktopItem, makeWrapper }: stdenv.mkDerivation rec { diff --git a/pkgs/applications/misc/senv/default.nix b/pkgs/applications/misc/senv/default.nix new file mode 100644 index 0000000000000..6df8dc781e70c --- /dev/null +++ b/pkgs/applications/misc/senv/default.nix @@ -0,0 +1,24 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "senv"; + version = "0.5.0"; + + src = fetchFromGitHub { + owner = "SpectralOps"; + repo = pname; + rev = "v${version}"; + sha256 = "014422sdks2xlpsgvynwibz25jg1fj5s8dcf8b1j6djgq5glhfaf"; + }; + + vendorSha256 = "05n55yf75r7i9kl56kw9x6hgmyf5bva5dzp9ni2ws0lb1389grfc"; + + subPackages = [ "." ]; + + meta = with lib; { + description = "Friends don't let friends leak secrets on their terminal window"; + homepage = "https://github.com/SpectralOps/senv"; + license = licenses.mit; + maintainers = with maintainers; [ SuperSandro2000 ]; + }; +} diff --git a/pkgs/applications/misc/stork/default.nix b/pkgs/applications/misc/stork/default.nix new file mode 100644 index 0000000000000..16d56eeaa95f4 --- /dev/null +++ b/pkgs/applications/misc/stork/default.nix @@ -0,0 +1,25 @@ +{ lib +, rustPlatform +, fetchFromGitHub +}: + +rustPlatform.buildRustPackage rec { + pname = "stork"; + version = "1.1.0"; + + src = fetchFromGitHub { + owner = "jameslittle230"; + repo = "stork"; + rev = "v${version}"; + sha256 = "sha256-pBJ9n1pQafXagQt9bnj4N1jriczr47QLtKiv+UjWgTg="; + }; + + cargoSha256 = "sha256-u8L4ZeST4ExYB2y8E+I49HCy41dOfhR1fgPpcVMVDuk="; + + meta = with lib; { + description = "Impossibly fast web search, made for static sites"; + homepage = "https://github.com/jameslittle230/stork"; + license = with licenses; [ asl20 ]; + maintainers = with maintainers; [ chuahou ]; + }; +} diff --git a/pkgs/applications/misc/taskwarrior/default.nix b/pkgs/applications/misc/taskwarrior/default.nix index b3f26c87c50e0..ee781c75e6935 100644 --- a/pkgs/applications/misc/taskwarrior/default.nix +++ b/pkgs/applications/misc/taskwarrior/default.nix @@ -1,19 +1,37 @@ -{ lib, stdenv, fetchFromGitHub, cmake, libuuid, gnutls }: +{ lib, stdenv, fetchurl, cmake, libuuid, gnutls, python3, bash }: stdenv.mkDerivation rec { pname = "taskwarrior"; - version = "2.5.2"; - - src = fetchFromGitHub { - owner = "GothenburgBitFactory"; - repo = "taskwarrior"; - rev = "v${version}"; - sha256 = "0jv5b56v75qhdqbrfsddfwizmbizcsv3mn8gp92nckwlx9hrk5id"; - fetchSubmodules = true; - }; + version = "2.5.3"; + + srcs = [ + (fetchurl { + url = " https://github.com/GothenburgBitFactory/taskwarrior/releases/download/v${version}/${sourceRoot}.tar.gz"; + sha256 = "0fwnxshhlha21hlgg5z1ad01w13zm1hlmncs274y5n8i15gdfhvj"; + }) + (fetchurl { + url = "https://github.com/GothenburgBitFactory/taskwarrior/releases/download/v${version}/tests-${version}.tar.gz"; + sha256 = "165xmf9h6rb7l6l9nlyygj0mx9bi1zyd78z0lrl3nadhmgzggv0b"; + }) + ]; + + sourceRoot = "task-${version}"; + + postUnpack = '' + mv test ${sourceRoot} + ''; nativeBuildInputs = [ cmake libuuid gnutls ]; + doCheck = true; + preCheck = '' + find test -type f -exec sed -i \ + -e "s|/usr/bin/env python3|${python3.interpreter}|" \ + -e "s|/usr/bin/env bash|${bash}/bin/bash|" \ + {} + + ''; + checkTarget = "test"; + postInstall = '' mkdir -p "$out/share/bash-completion/completions" ln -s "../../doc/task/scripts/bash/task.sh" "$out/share/bash-completion/completions/task.bash" @@ -28,6 +46,6 @@ stdenv.mkDerivation rec { homepage = "https://taskwarrior.org"; license = licenses.mit; maintainers = with maintainers; [ marcweber ]; - platforms = platforms.linux ++ platforms.darwin; + platforms = platforms.unix; }; } diff --git a/pkgs/applications/networking/bee/bee.nix b/pkgs/applications/networking/bee/bee.nix index 988a322e9f933..b0d05d928c050 100644 --- a/pkgs/applications/networking/bee/bee.nix +++ b/pkgs/applications/networking/bee/bee.nix @@ -1,4 +1,4 @@ -{ version ? "release", stdenv, lib, fetchFromGitHub, buildGoModule, coreutils }: +{ version ? "release", lib, fetchFromGitHub, buildGoModule, coreutils }: let diff --git a/pkgs/applications/networking/browsers/chromium/get-commit-message.py b/pkgs/applications/networking/browsers/chromium/get-commit-message.py new file mode 100755 index 0000000000000..bbadb3153ee99 --- /dev/null +++ b/pkgs/applications/networking/browsers/chromium/get-commit-message.py @@ -0,0 +1,35 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i python3 -p python3Packages.feedparser python3Packages.requests + +# This script prints the Git commit message for stable channel updates. + +import re +import textwrap + +import feedparser +import requests + +feed = feedparser.parse('https://chromereleases.googleblog.com/feeds/posts/default') +html_tags = re.compile(r'<[^>]+>') + +for entry in feed.entries: + if entry.title != 'Stable Channel Update for Desktop': + continue + url = requests.get(entry.link).url.split('?')[0] + content = entry.content[0].value + if re.search(r'Linux', content) is None: + continue + #print(url) # For debugging purposes + version = re.search(r'\d+(\.\d+){3}', content).group(0) + fixes = re.search(r'This update includes .+ security fixes\.', content).group(0) + fixes = html_tags.sub('', fixes) + zero_days = re.search(r'Google is aware of reports that .+ in the wild\.', content) + if zero_days: + fixes += " " + zero_days.group(0) + cve_list = re.findall(r'CVE-[^: ]+', content) + cve_string = ' '.join(cve_list) + print('chromium: TODO -> ' + version + '\n') + print(url + '\n') + print('\n'.join(textwrap.wrap(fixes, width=72)) + '\n') + print("CVEs:\n" + '\n'.join(textwrap.wrap(cve_string, width=72))) + break # We only care about the most recent stable channel update diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index 89647f477577e..5a67aed08967f 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -1,20 +1,20 @@ { "stable": { - "version": "88.0.4324.182", - "sha256": "10av060ix6lgsvv99lyvyy03r0m3zwdg4hddbi6dycrdxk1iyh9h", - "sha256bin64": "1rjg23xiybpnis93yb5zkvglm3r4fds9ip5mgl6f682z5x0yj05b", + "version": "89.0.4389.72", + "sha256": "0kxwq1m6zdsq3ns2agvk1hqkhwlv1693h41rlmvhy3nim9jhnsll", + "sha256bin64": "1h2dxgr660xy1rv52ck8ps6av0l5jdhj2k29lvs190ccpxaycglb", "deps": { "gn": { - "version": "2020-11-05", + "version": "2021-01-07", "url": "https://gn.googlesource.com/gn", - "rev": "53d92014bf94c3893886470a1c7c1289f8818db0", - "sha256": "1xcm07qjk6m2czi150fiqqxql067i832adck6zxrishm70c9jbr9" + "rev": "595e3be7c8381d4eeefce62a63ec12bae9ce5140", + "sha256": "08y7cjlgjdbzja5ij31wxc9i191845m01v1hc7y176svk9y0hj1d" } }, "chromedriver": { - "version": "88.0.4324.96", - "sha256_linux": "0hhy3c50hlnic6kz19565s8wv2yn7k45hxnkxbvb46zhcc5s2z41", - "sha256_darwin": "11mzcmp6dr8wzyv7v2jic7l44lr77phi4y3z1ghszhfdz5dil5xp" + "version": "89.0.4389.23", + "sha256_linux": "169inx1xl7750mdd1g7yji72m33kvpk7h1dy4hyj0qignrifdm0r", + "sha256_darwin": "1a84nn4rnd215h4sjghmw03mdr49wyab8j4vlnv3xp516yn07gr3" } }, "beta": { @@ -31,9 +31,9 @@ } }, "dev": { - "version": "90.0.4427.5", - "sha256": "034czg6q84lpycgfqbcg3rrdhja3bp1akvsnyddimwxy83r2cqyg", - "sha256bin64": "0ijvsjfwmssvl14wg9cbp4h2rfdack6f89pmx2fggbnfm26m2vap", + "version": "90.0.4430.11", + "sha256": "0rzg1yji1rxddxcy03lwqv9rdqnk3c25v2g57mq9n37c6jqisyq4", + "sha256bin64": "015a1agwwf5g7x70rzfb129h6r7hfd86593853nqgy1m9yprxqab", "deps": { "gn": { "version": "2021-02-09", diff --git a/pkgs/applications/networking/browsers/luakit/default.nix b/pkgs/applications/networking/browsers/luakit/default.nix index 917da034c3046..8656b4aaa2763 100644 --- a/pkgs/applications/networking/browsers/luakit/default.nix +++ b/pkgs/applications/networking/browsers/luakit/default.nix @@ -1,34 +1,56 @@ -{ lib, stdenv, fetchFromGitHub, pkg-config, wrapGAppsHook -, help2man, luafilesystem, luajit, sqlite -, webkitgtk, gtk3, gst_all_1, glib-networking +{ lib +, stdenv +, fetchFromGitHub +, pkg-config +, wrapGAppsHook +, help2man +, glib-networking +, gst_all_1 +, gtk3 +, luafilesystem +, luajit +, sqlite +, webkitgtk }: stdenv.mkDerivation rec { pname = "luakit"; - version = "2.2.1"; + version = "2.3"; src = fetchFromGitHub { owner = "luakit"; repo = pname; rev = version; - sha256 = "sha256-78B8vXkWsFMJIHA72Qrk2SWubrY6YuArqcM0UAPjpzc="; + hash = "sha256-5YeJkbWk1wHxWXqWOvhEDeScWPU/aRVhuOWRHLSHVZM="; }; nativeBuildInputs = [ - pkg-config help2man wrapGAppsHook + pkg-config + help2man + wrapGAppsHook ]; - buildInputs = [ - webkitgtk luafilesystem luajit sqlite gtk3 + gtk3 glib-networking # TLS support - ] ++ ( with gst_all_1; [ gstreamer gst-plugins-base gst-plugins-good - gst-plugins-bad gst-plugins-ugly gst-libav ]); + luafilesystem + luajit + sqlite + webkitgtk + ] ++ ( with gst_all_1; [ + gstreamer + gst-plugins-base + gst-plugins-good + gst-plugins-bad + gst-plugins-ugly + gst-libav + ]); + + # build-utils/docgen/gen.lua:2: module 'lib.lousy.util' not found + # TODO: why is not this the default? The test runner adds + # ';./lib/?.lua;./lib/?/init.lua' to package.path, but the build-utils + # scripts don't add an equivalent preBuild = '' - # build-utils/docgen/gen.lua:2: module 'lib.lousy.util' not found - # TODO: why is not this the default? The test runner adds - # ';./lib/?.lua;./lib/?/init.lua' to package.path, but the build-utils - # scripts don't add an equivalent export LUA_PATH="$LUA_PATH;./?.lua;./?/init.lua" ''; @@ -52,6 +74,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { + homepage = "https://luakit.github.io/"; description = "Fast, small, webkit-based browser framework extensible in Lua"; longDescription = '' Luakit is a highly configurable browser framework based on the WebKit web @@ -60,9 +83,8 @@ stdenv.mkDerivation rec { power users, developers and anyone who wants to have fine-grained control over their web browser’s behaviour and interface. ''; - homepage = "https://luakit.github.io/"; license = licenses.gpl3Only; - platforms = platforms.unix; maintainers = [ maintainers.AndersonTorres ]; + platforms = platforms.unix; }; } diff --git a/pkgs/applications/networking/cluster/cloudfoundry-cli/default.nix b/pkgs/applications/networking/cluster/cloudfoundry-cli/default.nix index de032cc60e991..a251886ebdd76 100644 --- a/pkgs/applications/networking/cluster/cloudfoundry-cli/default.nix +++ b/pkgs/applications/networking/cluster/cloudfoundry-cli/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub, fetchurl, installShellFiles }: +{ lib, buildGoModule, fetchFromGitHub, fetchurl, installShellFiles }: buildGoModule rec { pname = "cloudfoundry-cli"; diff --git a/pkgs/applications/networking/cluster/helm/plugins/default.nix b/pkgs/applications/networking/cluster/helm/plugins/default.nix new file mode 100644 index 0000000000000..edd19a25f9ba6 --- /dev/null +++ b/pkgs/applications/networking/cluster/helm/plugins/default.nix @@ -0,0 +1,11 @@ +{ callPackage }: + +{ + + helm-diff = callPackage ./helm-diff.nix {}; + + helm-s3 = callPackage ./helm-s3.nix {}; + + helm-secrets = callPackage ./helm-secrets.nix {}; + +} diff --git a/pkgs/applications/networking/cluster/helm/plugins/helm-diff.nix b/pkgs/applications/networking/cluster/helm/plugins/helm-diff.nix new file mode 100644 index 0000000000000..ce6491bfba47b --- /dev/null +++ b/pkgs/applications/networking/cluster/helm/plugins/helm-diff.nix @@ -0,0 +1,35 @@ +{ buildGoModule, fetchFromGitHub, lib }: + +buildGoModule rec { + pname = "helm-diff"; + version = "3.1.3"; + + src = fetchFromGitHub { + owner = "databus23"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-h26EOjKNrlcrs2DAYj0NmDRgNRKozjfw5DtxUgHNTa4="; + }; + + vendorSha256 = "sha256-+n/QBuZqtdgUkaBG7iqSuBfljn+AdEzDoIo5SI8ErQA="; + + # NOTE: Remove the install and upgrade hooks. + postPatch = '' + sed -i '/^hooks:/,+2 d' plugin.yaml + ''; + + postInstall = '' + install -dm755 $out/${pname} + mv $out/bin $out/${pname}/ + mv $out/${pname}/bin/{helm-,}diff + install -m644 -Dt $out/${pname} plugin.yaml + ''; + + meta = with lib; { + description = "A Helm plugin that shows a diff"; + inherit (src.meta) homepage; + license = licenses.apsl20; + maintainers = with maintainers; [ yurrriq ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/applications/networking/cluster/helm/plugins/helm-s3.nix b/pkgs/applications/networking/cluster/helm/plugins/helm-s3.nix new file mode 100644 index 0000000000000..661048a0c72c8 --- /dev/null +++ b/pkgs/applications/networking/cluster/helm/plugins/helm-s3.nix @@ -0,0 +1,38 @@ +{ buildGoModule, fetchFromGitHub, lib }: + +buildGoModule rec { + pname = "helm-s3"; + version = "0.10.0"; + + src = fetchFromGitHub { + owner = "hypnoglow"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-2BQ/qtoL+iFbuLvrJGUuxWFKg9u1sVDRcRm2/S0mgyc="; + }; + + vendorSha256 = "sha256-/9TiY0XdkiNxW5JYeC5WD9hqySCyYYU8lB+Ft5Vm96I="; + + # NOTE: Remove the install and upgrade hooks. + postPatch = '' + sed -i '/^hooks:/,+2 d' plugin.yaml + ''; + + checkPhase = '' + make test-unit + ''; + + postInstall = '' + install -dm755 $out/${pname} + mv $out/bin $out/${pname}/ + install -m644 -Dt $out/${pname} plugin.yaml + ''; + + meta = with lib; { + description = "A Helm plugin that shows a diff"; + inherit (src.meta) homepage; + license = licenses.apsl20; + maintainers = with maintainers; [ yurrriq ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/applications/networking/cluster/helm/plugins/helm-secrets.nix b/pkgs/applications/networking/cluster/helm/plugins/helm-secrets.nix new file mode 100644 index 0000000000000..d53abe3569c53 --- /dev/null +++ b/pkgs/applications/networking/cluster/helm/plugins/helm-secrets.nix @@ -0,0 +1,44 @@ +{ lib, stdenv, fetchFromGitHub, makeWrapper, coreutils, findutils, getopt, gnugrep, gnused, sops, vault }: + +stdenv.mkDerivation rec { + pname = "helm-secrets"; + version = "3.4.1"; + + src = fetchFromGitHub { + owner = "jkroepke"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-EXCr0QjupsBBKTm6Opw5bcNwAD4FGGyOiqaa8L91/OI="; + }; + + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ getopt sops ]; + + # NOTE: helm-secrets is comprised of shell scripts. + dontBuild = true; + + # NOTE: Remove the install and upgrade hooks. + postPatch = '' + sed -i '/^hooks:/,+2 d' plugin.yaml + ''; + + installPhase = '' + runHook preInstall + + install -dm755 $out/${pname} $out/${pname}/scripts + install -m644 -Dt $out/${pname} plugin.yaml + cp -r scripts/* $out/${pname}/scripts + wrapProgram $out/${pname}/scripts/run.sh \ + --prefix PATH : ${lib.makeBinPath [ coreutils findutils getopt gnugrep gnused sops vault ]} + + runHook postInstall + ''; + + meta = with lib; { + description = "A Helm plugin that helps manage secrets"; + inherit (src.meta) homepage; + license = licenses.apsl20; + maintainers = with maintainers; [ yurrriq ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/applications/networking/cluster/helm/wrapper.nix b/pkgs/applications/networking/cluster/helm/wrapper.nix new file mode 100644 index 0000000000000..edad7fa1bc990 --- /dev/null +++ b/pkgs/applications/networking/cluster/helm/wrapper.nix @@ -0,0 +1,48 @@ +{ stdenv, symlinkJoin, lib, makeWrapper +, writeText +}: + +helm: + +let + wrapper = { + plugins ? [], + extraMakeWrapperArgs ? "" + }: + let + + initialMakeWrapperArgs = [ + "${helm}/bin/helm" "${placeholder "out"}/bin/helm" + "--argv0" "$0" "--set" "HELM_PLUGINS" "${pluginsDir}" + ]; + + pluginsDir = symlinkJoin { + name = "helm-plugins"; + paths = plugins; + }; +in + symlinkJoin { + name = "helm-${lib.getVersion helm}"; + + # Remove the symlinks created by symlinkJoin which we need to perform + # extra actions upon + postBuild = '' + rm $out/bin/helm + makeWrapper ${lib.escapeShellArgs initialMakeWrapperArgs} ${extraMakeWrapperArgs} + ''; + paths = [ helm pluginsDir ]; + + preferLocalBuild = true; + + nativeBuildInputs = [ makeWrapper ]; + passthru = { unwrapped = helm; }; + + meta = helm.meta // { + # To prevent builds on hydra + hydraPlatforms = []; + # prefer wrapper over the package + priority = (helm.meta.priority or 0) - 1; + }; + }; +in + lib.makeOverridable wrapper diff --git a/pkgs/applications/networking/cluster/helmfile/default.nix b/pkgs/applications/networking/cluster/helmfile/default.nix index 72fcc2f9c35f4..5ac152c849b53 100644 --- a/pkgs/applications/networking/cluster/helmfile/default.nix +++ b/pkgs/applications/networking/cluster/helmfile/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "helmfile"; - version = "0.138.4"; + version = "0.138.6"; src = fetchFromGitHub { owner = "roboll"; repo = "helmfile"; rev = "v${version}"; - sha256 = "sha256-Y0/0wC00s7QY7/B6igOoPKXv5TE2P8NoGd9UhfVmLOk="; + sha256 = "sha256-slqHG4uD0sbCNNr5Ve9eemyylUs4w1JizfoIMbrbVeg="; }; vendorSha256 = "sha256-WlV6moJymQ7VyZXXuViCNN1WP4NzBUszavxpKjQR8to="; diff --git a/pkgs/applications/networking/cluster/kube-capacity/default.nix b/pkgs/applications/networking/cluster/kube-capacity/default.nix index 08dfa8bcdf085..78cbaca80ab10 100644 --- a/pkgs/applications/networking/cluster/kube-capacity/default.nix +++ b/pkgs/applications/networking/cluster/kube-capacity/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "kube-capacity"; diff --git a/pkgs/applications/networking/cluster/minikube/default.nix b/pkgs/applications/networking/cluster/minikube/default.nix index 81ca2283d204d..66ff583e8c901 100644 --- a/pkgs/applications/networking/cluster/minikube/default.nix +++ b/pkgs/applications/networking/cluster/minikube/default.nix @@ -11,9 +11,9 @@ buildGoModule rec { pname = "minikube"; - version = "1.17.1"; + version = "1.18.0"; - vendorSha256 = "1flny2f7n3vqhl9vkwsqxvzl8q3fv8v0h1p0d0qaqp9lgn02q3bh"; + vendorSha256 = "0fy9x9zlmwpncyj55scvriv4vr4kjvqss85b0a1zs2srvlnf8gz2"; doCheck = false; @@ -21,7 +21,7 @@ buildGoModule rec { owner = "kubernetes"; repo = "minikube"; rev = "v${version}"; - sha256 = "1m4kw77j4swwg3vqwmwrys7cq790w4g6y4gvdg33z9n1y9xzqys3"; + sha256 = "1yjcaq0lg5a7ip2qxjmnzq3pa1gjhdfdq9a4xk2zxyqcam4dh6v2"; }; nativeBuildInputs = [ go-bindata installShellFiles pkg-config which ]; diff --git a/pkgs/applications/networking/cluster/terraform-docs/default.nix b/pkgs/applications/networking/cluster/terraform-docs/default.nix index a5b6e7d2f5e71..804659e084ac7 100644 --- a/pkgs/applications/networking/cluster/terraform-docs/default.nix +++ b/pkgs/applications/networking/cluster/terraform-docs/default.nix @@ -1,24 +1,26 @@ -{ lib, buildGoPackage, fetchFromGitHub }: -buildGoPackage rec { +{ lib, buildGoModule, fetchFromGitHub }: +buildGoModule rec { pname = "terraform-docs"; - version = "0.9.1"; - - goPackagePath = "github.com/segmentio/${pname}"; + version = "0.11.2"; src = fetchFromGitHub { - owner = "segmentio"; - repo = pname; - rev = "v${version}"; - sha256 = "00sfzdqhf8g85m03r6mbzfas5vvc67iq7syb8ljcgxg8l1knxnjx"; + owner = "terraform-docs"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-x2YTd4ZnimTRkFWbwFp4qz6BymD6ESVxBy6YE+QqQ6k="; }; + vendorSha256 = "sha256-drfhfY03Ao0fqleBdzbAnPsE4kVrJMcUbec0txaEIP0="; + + subPackages = [ "." ]; + preBuild = '' buildFlagsArray+=("-ldflags" "-X main.version=${version}") ''; meta = with lib; { description = "A utility to generate documentation from Terraform modules in various output formats"; - homepage = "https://github.com/segmentio/terraform-docs/"; + homepage = "https://github.com/terraform-docs/terraform-docs/"; license = licenses.mit; maintainers = with maintainers; [ zimbatm ]; }; diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 91b900db34779..4ec886a34fcdb 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -398,10 +398,10 @@ "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/helm", "repo": "terraform-provider-helm", - "rev": "v1.3.2", - "sha256": "0mpbf03483jqrwd9cx4pdn2pcv4swfs5nbp021gaqr0jf1w970x6", + "rev": "v2.0.2", + "sha256": "119zvlkwa7ygwsjxxdl7z8cqb0c4m6gy21356jnsasf4c3557rrb", "vendorSha256": null, - "version": "1.3.2" + "version": "2.0.2" }, "heroku": { "owner": "terraform-providers", @@ -504,9 +504,10 @@ "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/kubernetes", "repo": "terraform-provider-kubernetes", - "rev": "v1.13.3", - "sha256": "01hkbb81r3k630s3ww6379p66h1fsd5cd1dz14jm833nsr142c0i", - "version": "1.13.3" + "rev": "v2.0.2", + "sha256": "129aylw6hxa44syfnb0kkkihwvlaa6d1jnxrcbwkql6xxhn9zizf", + "vendorSha256": null, + "version": "2.0.2" }, "kubernetes-alpha": { "owner": "hashicorp", diff --git a/pkgs/applications/networking/cluster/terraform-providers/update-provider b/pkgs/applications/networking/cluster/terraform-providers/update-provider index e1f1a0ef38a57..f97bbce83faac 100755 --- a/pkgs/applications/networking/cluster/terraform-providers/update-provider +++ b/pkgs/applications/networking/cluster/terraform-providers/update-provider @@ -1,5 +1,5 @@ #!/usr/bin/env nix-shell -#! nix-shell -i bash -p coreutils curl jq moreutils +#! nix-shell -I nixpkgs=../../../../.. -i bash -p coreutils curl jq moreutils nix # shellcheck shell=bash # vim: ft=sh # @@ -161,7 +161,8 @@ if [[ -z "$vendorSha256" ]]; then exit 1 fi rm -f vendor_log.txt - vendorSha256=${BASH_REMATCH[1]} + # trim the results in case it they have a sha256: prefix or contain more than one line + vendorSha256=$(echo "${BASH_REMATCH[1]#sha256:}" | head -n 1) # Deal with nix unstable if [[ $vendorSha256 = sha256-* ]]; then vendorSha256=$(nix to-base32 "$vendorSha256") diff --git a/pkgs/applications/networking/dyndns/cfdyndns/default.nix b/pkgs/applications/networking/dyndns/cfdyndns/default.nix index dae9ad3bc33c6..51f62529e9c9b 100644 --- a/pkgs/applications/networking/dyndns/cfdyndns/default.nix +++ b/pkgs/applications/networking/dyndns/cfdyndns/default.nix @@ -17,11 +17,6 @@ buildRustPackage rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ]; - installPhase = '' - mkdir -p $out/bin - cp -p $releaseDir/cfdyndns $out/bin/ - ''; - meta = with lib; { description = "CloudFlare Dynamic DNS Client"; homepage = "https://github.com/colemickens/cfdyndns"; diff --git a/pkgs/applications/networking/ike/default.nix b/pkgs/applications/networking/ike/default.nix index 7a8c3d395f649..5ed87334c4755 100644 --- a/pkgs/applications/networking/ike/default.nix +++ b/pkgs/applications/networking/ike/default.nix @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { homepage = "https://www.shrew.net/software"; description = "IPsec Client for FreeBSD, NetBSD and many Linux based operating systems"; platforms = platforms.unix; - maintainers = [ maintainers.domenkozar ]; + maintainers = [ ]; license = licenses.sleepycat; }; } diff --git a/pkgs/applications/networking/instant-messengers/utox/default.nix b/pkgs/applications/networking/instant-messengers/utox/default.nix index 668e614c47468..e5a2c201d873d 100644 --- a/pkgs/applications/networking/instant-messengers/utox/default.nix +++ b/pkgs/applications/networking/instant-messengers/utox/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { description = "Lightweight Tox client"; homepage = "https://github.com/uTox/uTox"; license = licenses.gpl3; - maintainers = with maintainers; [ domenkozar ]; + maintainers = with maintainers; [ ]; platforms = platforms.all; }; } diff --git a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix index c431b5d0ce666..efb913fca730e 100644 --- a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix +++ b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix @@ -2,7 +2,6 @@ , lib , fetchurl , makeWrapper -, fetchFromGitHub # Dynamic libraries , alsaLib , atk @@ -31,14 +30,13 @@ assert pulseaudioSupport -> libpulseaudio != null; let - version = "5.5.7011.0206"; + version = "5.5.7938.0228"; srcs = { x86_64-linux = fetchurl { url = "https://zoom.us/client/${version}/zoom_x86_64.pkg.tar.xz"; - sha256 = "00ahly3kjjznn73vcxgm5wj2pxgw6wdk6vzgd8svfmnl5kqq6c02"; + sha256 = "KM8o2tgIn0lecOM4gKdTOdk/zsohlFqtNX+ca/S6FGY="; }; }; - dontUnpack = true; libs = lib.makeLibraryPath ([ # $ LD_LIBRARY_PATH=$NIX_LD_LIBRARY_PATH:$PWD ldd zoom | grep 'not found' @@ -68,8 +66,10 @@ let xorg.libXtst ] ++ lib.optional (pulseaudioSupport) libpulseaudio); -in stdenv.mkDerivation { - name = "zoom-${version}"; +in stdenv.mkDerivation rec { + pname = "zoom"; + inherit version; + src = srcs.${stdenv.hostPlatform.system}; dontUnpack = true; @@ -80,7 +80,7 @@ in stdenv.mkDerivation { installPhase = '' runHook preInstall mkdir $out - tar -C $out -xf ${srcs.${stdenv.hostPlatform.system}} + tar -C $out -xf ${src} mv $out/usr/* $out/ runHook postInstall ''; diff --git a/pkgs/applications/networking/mailreaders/mailpile/default.nix b/pkgs/applications/networking/mailreaders/mailpile/default.nix index 1d1dc030c3147..cab43750a56ef 100644 --- a/pkgs/applications/networking/mailreaders/mailpile/default.nix +++ b/pkgs/applications/networking/mailreaders/mailpile/default.nix @@ -44,7 +44,7 @@ python2Packages.buildPythonApplication rec { homepage = "https://www.mailpile.is/"; license = [ licenses.asl20 licenses.agpl3 ]; platforms = platforms.linux; - maintainers = [ maintainers.domenkozar ]; + maintainers = [ ]; knownVulnerabilities = [ "Numerous and uncounted, upstream has requested we not package it. See more: https://github.com/NixOS/nixpkgs/pull/23058#issuecomment-283515104" ]; diff --git a/pkgs/applications/networking/p2p/retroshare/default.nix b/pkgs/applications/networking/p2p/retroshare/default.nix index 85a5217ff69c9..a39b4aab8371d 100644 --- a/pkgs/applications/networking/p2p/retroshare/default.nix +++ b/pkgs/applications/networking/p2p/retroshare/default.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { homepage = "http://retroshare.sourceforge.net/"; license = licenses.gpl2Plus; platforms = platforms.linux; - maintainers = [ maintainers.domenkozar ]; + maintainers = [ ]; broken = true; # broken by libupnp: 1.6.21 -> 1.8.3 (#41684) }; } diff --git a/pkgs/applications/networking/remote/citrix-workspace/generic.nix b/pkgs/applications/networking/remote/citrix-workspace/generic.nix index 0437a108d893e..35faeb20b7518 100644 --- a/pkgs/applications/networking/remote/citrix-workspace/generic.nix +++ b/pkgs/applications/networking/remote/citrix-workspace/generic.nix @@ -202,7 +202,7 @@ stdenv.mkDerivation rec { license = licenses.unfree; description = "Citrix Workspace"; platforms = platforms.linux; - maintainers = with maintainers; [ ma27 ]; + maintainers = with maintainers; [ pmenke ]; inherit homepage; }; } diff --git a/pkgs/applications/office/calligra/default.nix b/pkgs/applications/office/calligra/default.nix index a8ca37df36ad8..e54a3cbad4cd6 100644 --- a/pkgs/applications/office/calligra/default.nix +++ b/pkgs/applications/office/calligra/default.nix @@ -1,15 +1,14 @@ -{ - mkDerivation, lib, fetchurl, extra-cmake-modules, kdoctools, makeWrapper, - boost, qtwebkit, qtx11extras, shared-mime-info, - breeze-icons, kactivities, karchive, kcodecs, kcompletion, kconfig, kconfigwidgets, - kcoreaddons, kdbusaddons, kdiagram, kguiaddons, khtml, ki18n, - kiconthemes, kitemviews, kjobwidgets, kcmutils, kdelibs4support, kio, kross, - knotifications, knotifyconfig, kparts, ktextwidgets, kwallet, kwidgetsaddons, - kwindowsystem, kxmlgui, sonnet, threadweaver, - kcontacts, akonadi, akonadi-calendar, akonadi-contacts, - eigen, git, gsl, ilmbase, kproperty, kreport, lcms2, marble, pcre, libgit2, libodfgen, - librevenge, libvisio, libwpd, libwpg, libwps, okular, openexr, openjpeg, phonon, - poppler, pstoedit, qca-qt5, vc +{ mkDerivation, lib, fetchurl, extra-cmake-modules, kdoctools +, boost, qtwebkit, qtx11extras, shared-mime-info +, breeze-icons, kactivities, karchive, kcodecs, kcompletion, kconfig, kconfigwidgets +, kcoreaddons, kdbusaddons, kdiagram, kguiaddons, khtml, ki18n +, kiconthemes, kitemviews, kjobwidgets, kcmutils, kdelibs4support, kio, kross +, knotifications, knotifyconfig, kparts, ktextwidgets, kwallet, kwidgetsaddons +, kwindowsystem, kxmlgui, sonnet, threadweaver +, kcontacts, akonadi, akonadi-calendar, akonadi-contacts +, eigen, git, gsl, ilmbase, kproperty, kreport, lcms2, marble, pcre, libgit2, libodfgen +, librevenge, libvisio, libwpd, libwpg, libwps, okular, openexr, openjpeg, phonon +, poppler, pstoedit, qca-qt5, vc # TODO: package Spnav, m2mml LibEtonyek, Libqgit2 }: diff --git a/pkgs/applications/radio/pothos/default.nix b/pkgs/applications/radio/pothos/default.nix new file mode 100644 index 0000000000000..64f5093c4b980 --- /dev/null +++ b/pkgs/applications/radio/pothos/default.nix @@ -0,0 +1,74 @@ +{ lib +, mkDerivation +, fetchFromGitHub +, cmake +, pkg-config +, doxygen +, wrapQtAppsHook +, pcre +, poco +, qtbase +, qtsvg +, libsForQt5 +, nlohmann_json +, soapysdr-with-plugins +, portaudio +, alsaLib +, muparserx +, python3 +}: + +mkDerivation rec { + pname = "pothos"; + version = "0.7.1"; + + src = fetchFromGitHub { + owner = "pothosware"; + repo = "PothosCore"; + rev = "pothos-${version}"; + sha256 = "038c3ipvf4sgj0zhm3vcj07ymsva4ds6v89y43f5d3p4n8zc2rsg"; + fetchSubmodules = true; + }; + + patches = [ + # spuce's CMakeLists.txt uses QT5_USE_Modules, which does not seem to work on Nix + ./spuce.patch + ]; + + nativeBuildInputs = [ cmake pkg-config doxygen wrapQtAppsHook ]; + + buildInputs = [ + pcre poco qtbase qtsvg libsForQt5.qwt nlohmann_json + soapysdr-with-plugins portaudio alsaLib muparserx python3 + ]; + + postInstall = '' + install -Dm644 $out/share/Pothos/Desktop/pothos-flow.desktop $out/share/applications/pothos-flow.desktop + install -Dm644 $out/share/Pothos/Desktop/pothos-flow-16.png $out/share/icons/hicolor/16x16/apps/pothos-flow.png + install -Dm644 $out/share/Pothos/Desktop/pothos-flow-22.png $out/share/icons/hicolor/22x22/apps/pothos-flow.png + install -Dm644 $out/share/Pothos/Desktop/pothos-flow-32.png $out/share/icons/hicolor/32x32/apps/pothos-flow.png + install -Dm644 $out/share/Pothos/Desktop/pothos-flow-48.png $out/share/icons/hicolor/48x48/apps/pothos-flow.png + install -Dm644 $out/share/Pothos/Desktop/pothos-flow-64.png $out/share/icons/hicolor/64x64/apps/pothos-flow.png + install -Dm644 $out/share/Pothos/Desktop/pothos-flow-128.png $out/share/icons/hicolor/128x128/apps/pothos-flow.png + install -Dm644 $out/share/Pothos/Desktop/pothos-flow.xml $out/share/mime/application/pothos-flow.xml + rm -r $out/share/Pothos/Desktop + ''; + + dontWrapQtApps = true; + preFixup = '' + # PothosUtil does not need to be wrapped + wrapQtApp $out/bin/PothosFlow + wrapQtApp $out/bin/spuce_fir_plot + wrapQtApp $out/bin/spuce_iir_plot + wrapQtApp $out/bin/spuce_other_plot + wrapQtApp $out/bin/spuce_window_plot + ''; + + meta = with lib; { + description = "The Pothos data-flow framework"; + homepage = "https://github.com/pothosware/PothosCore/wiki"; + license = licenses.boost; + platforms = platforms.linux; + maintainers = with maintainers; [ eduardosm ]; + }; +} diff --git a/pkgs/applications/radio/pothos/spuce.patch b/pkgs/applications/radio/pothos/spuce.patch new file mode 100644 index 0000000000000..ed0377540a8af --- /dev/null +++ b/pkgs/applications/radio/pothos/spuce.patch @@ -0,0 +1,101 @@ +diff --git a/spuce/qt_fir/CMakeLists.txt b/spuce/qt_fir/CMakeLists.txt +index fa2e580..e32113c 100644 +--- a/spuce/qt_fir/CMakeLists.txt ++++ b/spuce/qt_fir/CMakeLists.txt +@@ -6,7 +6,7 @@ Message("Project spuce fir_plot") + set(CMAKE_INCLUDE_CURRENT_DIR ON) + set(CMAKE_AUTOMOC ON) + +-FIND_PACKAGE(Qt5 REQUIRED Gui Core Widgets) ++FIND_PACKAGE(Qt5 REQUIRED Gui Core Widgets PrintSupport) + + set(SOURCES + make_filter.cpp +@@ -27,11 +27,7 @@ set_property(TARGET spuce_fir PROPERTY POSITION_INDEPENDENT_CODE TRUE) + set_property(TARGET spuce_fir_plot PROPERTY POSITION_INDEPENDENT_CODE TRUE) + set_property(TARGET spuce_fir_plot PROPERTY CXX_STANDARD 11) + +-TARGET_LINK_LIBRARIES(spuce_fir_plot spuce_fir ${QT_LIBRARIES} spuce) +-QT5_USE_Modules(spuce_fir_plot Gui) +-QT5_USE_Modules(spuce_fir_plot Core) +-QT5_USE_Modules(spuce_fir_plot Widgets) +-QT5_USE_Modules(spuce_fir_plot PrintSupport) ++TARGET_LINK_LIBRARIES(spuce_fir_plot spuce_fir ${QT_LIBRARIES} spuce Qt::Gui Qt::Core Qt::Widgets Qt::PrintSupport) + + INSTALL(TARGETS spuce_fir_plot DESTINATION bin) + +diff --git a/spuce/qt_iir/CMakeLists.txt b/spuce/qt_iir/CMakeLists.txt +index 4717226..debb5f9 100644 +--- a/spuce/qt_iir/CMakeLists.txt ++++ b/spuce/qt_iir/CMakeLists.txt +@@ -6,7 +6,7 @@ Message("Project spuce iir_plot") + set(CMAKE_INCLUDE_CURRENT_DIR ON) + set(CMAKE_AUTOMOC ON) + +-FIND_PACKAGE(Qt5 REQUIRED Gui Core Widgets) ++FIND_PACKAGE(Qt5 REQUIRED Gui Core Widgets PrintSupport) + + set(SOURCES + make_filter.cpp +@@ -27,10 +27,6 @@ set_property(TARGET spuce_iir PROPERTY POSITION_INDEPENDENT_CODE TRUE) + set_property(TARGET spuce_iir_plot PROPERTY CXX_STANDARD 11) + set_property(TARGET spuce_iir_plot PROPERTY POSITION_INDEPENDENT_CODE TRUE) + +-TARGET_LINK_LIBRARIES(spuce_iir_plot spuce_iir ${QT_LIBRARIES} spuce) +-QT5_USE_Modules(spuce_iir_plot Gui) +-QT5_USE_Modules(spuce_iir_plot Core) +-QT5_USE_Modules(spuce_iir_plot Widgets) +-QT5_USE_Modules(spuce_iir_plot PrintSupport) ++TARGET_LINK_LIBRARIES(spuce_iir_plot spuce_iir ${QT_LIBRARIES} spuce Qt::Gui Qt::Core Qt::Widgets Qt::PrintSupport) + + INSTALL(TARGETS spuce_iir_plot DESTINATION bin) +diff --git a/spuce/qt_other/CMakeLists.txt b/spuce/qt_other/CMakeLists.txt +index 29c270d..e1ed778 100644 +--- a/spuce/qt_other/CMakeLists.txt ++++ b/spuce/qt_other/CMakeLists.txt +@@ -6,7 +6,7 @@ Message("Project spuce window_plot") + set(CMAKE_INCLUDE_CURRENT_DIR ON) + set(CMAKE_AUTOMOC ON) + +-FIND_PACKAGE(Qt5 REQUIRED Gui Core Widgets) ++FIND_PACKAGE(Qt5 REQUIRED Gui Core Widgets PrintSupport) + + set(SOURCES make_filter.cpp) + ADD_LIBRARY(spuce_other STATIC ${SOURCES}) +@@ -23,10 +23,6 @@ ADD_EXECUTABLE(spuce_other_plot ${other_plot_SOURCES} ${other_plot_HEADERS_MOC}) + set_property(TARGET spuce_other_plot PROPERTY CXX_STANDARD 11) + set_property(TARGET spuce_other_plot PROPERTY POSITION_INDEPENDENT_CODE TRUE) + +-TARGET_LINK_LIBRARIES(spuce_other_plot spuce_other ${QT_LIBRARIES} spuce) +-QT5_USE_Modules(spuce_other_plot Gui) +-QT5_USE_Modules(spuce_other_plot Core) +-QT5_USE_Modules(spuce_other_plot Widgets) +-QT5_USE_Modules(spuce_other_plot PrintSupport) ++TARGET_LINK_LIBRARIES(spuce_other_plot spuce_other ${QT_LIBRARIES} spuce Qt::Gui Qt::Core Qt::Widgets Qt::PrintSupport) + + INSTALL(TARGETS spuce_other_plot DESTINATION bin) +diff --git a/spuce/qt_window/CMakeLists.txt b/spuce/qt_window/CMakeLists.txt +index e95c85b..4a77ab8 100644 +--- a/spuce/qt_window/CMakeLists.txt ++++ b/spuce/qt_window/CMakeLists.txt +@@ -6,7 +6,7 @@ Message("Project spuce window_plot") + set(CMAKE_INCLUDE_CURRENT_DIR ON) + set(CMAKE_AUTOMOC ON) + +-FIND_PACKAGE(Qt5 REQUIRED Gui Core Widgets) ++FIND_PACKAGE(Qt5 REQUIRED Gui Core Widgets PrintSupport) + + set(SOURCES make_filter.cpp) + +@@ -25,10 +25,6 @@ set_property(TARGET spuce_window_plot PROPERTY CXX_STANDARD 11) + set_property(TARGET spuce_win PROPERTY POSITION_INDEPENDENT_CODE TRUE) + set_property(TARGET spuce_window_plot PROPERTY POSITION_INDEPENDENT_CODE TRUE) + +-TARGET_LINK_LIBRARIES(spuce_window_plot spuce_win ${QT_LIBRARIES} spuce) +-QT5_USE_Modules(spuce_window_plot Gui) +-QT5_USE_Modules(spuce_window_plot Core) +-QT5_USE_Modules(spuce_window_plot Widgets) +-QT5_USE_Modules(spuce_window_plot PrintSupport) ++TARGET_LINK_LIBRARIES(spuce_window_plot spuce_win ${QT_LIBRARIES} spuce Qt::Gui Qt::Core Qt::Widgets Qt::PrintSupport) + + INSTALL(TARGETS spuce_window_plot DESTINATION bin) diff --git a/pkgs/applications/science/chemistry/quantum-espresso/default.nix b/pkgs/applications/science/chemistry/quantum-espresso/default.nix index 6d70e9f984f64..a348c51c28156 100644 --- a/pkgs/applications/science/chemistry/quantum-espresso/default.nix +++ b/pkgs/applications/science/chemistry/quantum-espresso/default.nix @@ -38,7 +38,7 @@ configureFlags = if useMpi then [ "LD=${mpi}/bin/mpif90" ] else [ "LD=${gfortran ''; homepage = "https://www.quantum-espresso.org/"; license = licenses.gpl2; - platforms = [ "x86_64-linux" ]; + platforms = [ "x86_64-linux" "x86_64-darwin" ]; maintainers = [ maintainers.costrouc ]; }; } diff --git a/pkgs/applications/science/logic/sad/default.nix b/pkgs/applications/science/logic/sad/default.nix index 8e4d19973ef79..fe0ca1b3017ba 100644 --- a/pkgs/applications/science/logic/sad/default.nix +++ b/pkgs/applications/science/logic/sad/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, haskell, spass }: +{ lib, stdenv, fetchurl, haskell, spass }: stdenv.mkDerivation { name = "system-for-automated-deduction-2.3.25"; diff --git a/pkgs/applications/science/math/R/default.nix b/pkgs/applications/science/math/R/default.nix index 34ad499ecb93d..331faa6b14799 100644 --- a/pkgs/applications/science/math/R/default.nix +++ b/pkgs/applications/science/math/R/default.nix @@ -12,10 +12,11 @@ assert (!blas.isILP64) && (!lapack.isILP64); stdenv.mkDerivation rec { - name = "R-4.0.4"; + pname = "R"; + version = "4.0.4"; src = fetchurl { - url = "https://cran.r-project.org/src/base/R-4/${name}.tar.gz"; + url = "https://cran.r-project.org/src/base/R-${lib.versions.major version}/${pname}-${version}.tar.gz"; sha256 = "0bl098xcv8v316kqnf43v6gb4kcsv31ydqfm1f7qr824jzb2fgsj"; }; diff --git a/pkgs/applications/terminal-emulators/hyper/default.nix b/pkgs/applications/terminal-emulators/hyper/default.nix index 092d4a0e09e0d..7dd495f977ae6 100644 --- a/pkgs/applications/terminal-emulators/hyper/default.nix +++ b/pkgs/applications/terminal-emulators/hyper/default.nix @@ -1,13 +1,14 @@ -{ stdenv, lib, fetchurl, dpkg, atk, glib, pango, gdk-pixbuf, gnome2, gtk2, cairo +{ stdenv, lib, fetchurl, dpkg, atk, glib, pango, gdk-pixbuf, gnome2, gtk3, cairo , freetype, fontconfig, dbus, libXi, libXcursor, libXdamage, libXrandr , libXcomposite, libXext, libXfixes, libXrender, libX11, libXtst, libXScrnSaver -, libxcb, nss, nspr, alsaLib, cups, expat, udev, libpulseaudio }: +, libxcb, nss, nspr, alsaLib, cups, expat, udev, libpulseaudio, at-spi2-atk }: let libPath = lib.makeLibraryPath [ - stdenv.cc.cc gtk2 gnome2.GConf atk glib pango gdk-pixbuf cairo freetype fontconfig dbus + stdenv.cc.cc gtk3 gnome2.GConf atk glib pango gdk-pixbuf cairo freetype fontconfig dbus libXi libXcursor libXdamage libXrandr libXcomposite libXext libXfixes libxcb libXrender libX11 libXtst libXScrnSaver nss nspr alsaLib cups expat udev libpulseaudio + at-spi2-atk ]; in stdenv.mkDerivation rec { @@ -27,7 +28,7 @@ stdenv.mkDerivation rec { mkdir -p "$out/bin" mv opt "$out/" ln -s "$out/opt/Hyper/hyper" "$out/bin/hyper" - patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" --set-rpath "${libPath}:\$ORIGIN" "$out/opt/Hyper/hyper" + patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" --set-rpath "${libPath}:$out/opt/Hyper:\$ORIGIN" "$out/opt/Hyper/hyper" mv usr/* "$out/" ''; dontPatchELF = true; diff --git a/pkgs/applications/version-management/git-and-tools/gh/default.nix b/pkgs/applications/version-management/git-and-tools/gh/default.nix index a52b11bff92b0..153a948d8ed44 100644 --- a/pkgs/applications/version-management/git-and-tools/gh/default.nix +++ b/pkgs/applications/version-management/git-and-tools/gh/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "gh"; - version = "1.6.2"; + version = "1.7.0"; src = fetchFromGitHub { owner = "cli"; repo = "cli"; rev = "v${version}"; - sha256 = "1wq8k626w3w2cnqp9gqdk7g4pjnqjjybkjgbfq5cvqsql3jdjg65"; + sha256 = "0ndi264rrssqin03qmv7n0fpzs3kasfqykidrlcyizw1ngyfgc1a"; }; - vendorSha256 = "0nk5axyr3nd9cbk8wswfhqf25dks22mky3rdn6ba9s0fpxhhkr5g"; + vendorSha256 = "0ywh5d41b1c5ivwngsgn46d6yb7s1wqyzl5b0j1x4mcvydi5yi98"; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/applications/version-management/git-repo/default.nix b/pkgs/applications/version-management/git-repo/default.nix index f0d4ef664c0a4..72f6d67c2f1d5 100644 --- a/pkgs/applications/version-management/git-repo/default.nix +++ b/pkgs/applications/version-management/git-repo/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { ''; homepage = "https://android.googlesource.com/tools/repo"; license = licenses.asl20; - maintainers = [ maintainers.primeos ]; + maintainers = [ ]; platforms = platforms.unix; }; } diff --git a/pkgs/applications/version-management/gitea/default.nix b/pkgs/applications/version-management/gitea/default.nix index 566459afa18da..00bc73c8541f2 100644 --- a/pkgs/applications/version-management/gitea/default.nix +++ b/pkgs/applications/version-management/gitea/default.nix @@ -9,11 +9,11 @@ with lib; buildGoPackage rec { pname = "gitea"; - version = "1.13.2"; + version = "1.13.3"; src = fetchurl { url = "https://github.com/go-gitea/gitea/releases/download/v${version}/gitea-src-${version}.tar.gz"; - sha256 = "sha256-uezg8GdNqgKVHgJj9rTqHFLWuLdyDp63fzr7DMslOII="; + sha256 = "sha256-+uuadtpDC4br+DUHpoY2aOwklpD9LxvkSqcBMC0+UHE="; }; unpackPhase = '' diff --git a/pkgs/applications/version-management/pijul/default.nix b/pkgs/applications/version-management/pijul/default.nix index eaad772f73496..776a794d649dc 100644 --- a/pkgs/applications/version-management/pijul/default.nix +++ b/pkgs/applications/version-management/pijul/default.nix @@ -13,14 +13,14 @@ rustPlatform.buildRustPackage rec { pname = "pijul"; - version = "1.0.0-alpha.38"; + version = "1.0.0-alpha.46"; src = fetchCrate { inherit version pname; - sha256 = "0f14jkr1yswwyqz0l47b0287vpyz0g1qmksr3hkskhbmwlkf1q2b"; + sha256 = "0x095g26qdch1m3izkn8ynwk1xg1qyz9ia8di23j61k7z2rqk0j5"; }; - cargoSha256 = "08p2dq48d1islk02xz1j39402fqxfh4isf8qi219aivl0yciwjn3"; + cargoSha256 = "0cw1y4vmhn70a94512mppk0kfh9xdfm0v4rp3zm00y06jzq1a1fp"; cargoBuildFlags = lib.optional gitImportSupport "--features=git"; diff --git a/pkgs/applications/video/kodi/default.nix b/pkgs/applications/video/kodi/default.nix index 2de5899aa3e5f..f461838fdf195 100644 --- a/pkgs/applications/video/kodi/default.nix +++ b/pkgs/applications/video/kodi/default.nix @@ -231,7 +231,6 @@ in stdenv.mkDerivation { cmakeFlags = [ "-DAPP_RENDER_SYSTEM=${if useGbm then "gles" else "gl"}" - "-DCORE_PLATFORM_NAME=${lib.concatStringsSep " " kodi_platforms}" "-Dlibdvdcss_URL=${libdvdcss.src}" "-Dlibdvdnav_URL=${libdvdnav.src}" "-Dlibdvdread_URL=${libdvdread.src}" @@ -251,9 +250,11 @@ in stdenv.mkDerivation { # I'm guessing there is a thing waiting to time out doCheck = false; - # Need these tools on the build system when cross compiling, - # hacky, but have found no other way. - preConfigure = lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) '' + preConfigure = '' + cmakeFlagsArray+=("-DCORE_PLATFORM_NAME=${lib.concatStringsSep " " kodi_platforms}") + '' + lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) '' + # Need these tools on the build system when cross compiling, + # hacky, but have found no other way. CXX=${stdenv.cc.targetPrefix}c++ LD=ld make -C tools/depends/native/JsonSchemaBuilder cmakeFlags+=" -DWITH_JSONSCHEMABUILDER=$PWD/tools/depends/native/JsonSchemaBuilder/bin" @@ -293,6 +294,6 @@ in stdenv.mkDerivation { homepage = "https://kodi.tv/"; license = licenses.gpl2; platforms = platforms.linux; - maintainers = with maintainers; [ domenkozar titanous edwtjo peterhoeg sephalon ]; + maintainers = with maintainers; [ titanous edwtjo peterhoeg sephalon ]; }; } diff --git a/pkgs/applications/virtualization/aqemu/default.nix b/pkgs/applications/virtualization/aqemu/default.nix index 2d865f4181874..13b27c7d6cc19 100644 --- a/pkgs/applications/virtualization/aqemu/default.nix +++ b/pkgs/applications/virtualization/aqemu/default.nix @@ -22,5 +22,6 @@ mkDerivation rec { license = licenses.gpl2; maintainers = with maintainers; [ hrdinka ]; platforms = with platforms; linux; + broken = true; }; } diff --git a/pkgs/applications/virtualization/crun/default.nix b/pkgs/applications/virtualization/crun/default.nix index 59e07530fbc0c..15ca7c9667f29 100644 --- a/pkgs/applications/virtualization/crun/default.nix +++ b/pkgs/applications/virtualization/crun/default.nix @@ -12,6 +12,7 @@ , nixosTests , criu , system +, fetchpatch }: let @@ -37,16 +38,24 @@ let in stdenv.mkDerivation rec { pname = "crun"; - version = "0.17"; + version = "0.18"; src = fetchFromGitHub { owner = "containers"; repo = pname; rev = version; - sha256 = "sha256-OdB7UXLG99ErbfSCvq87LxBy5EYkUvTfyQNG70RFbl4="; + sha256 = "sha256-VjMpfj2qUQdhqdnLpZsYigfo2sM7gNl0GrE4nitp13g="; fetchSubmodules = true; }; + patches = [ + # For 0.18 some tests switched to static builds, this was reverted after 0.18 was released + (fetchpatch { + url = "https://github.com/containers/crun/commit/d26579bfe56aa36dd522745d47a661ce8c70d4e7.patch"; + sha256 = "1xmc0wj0j2xcg0915vxn0pplc4s94rpmw0s5g8cyf8dshfl283f9"; + }) + ]; + nativeBuildInputs = [ autoreconfHook go-md2man pkg-config python3 ]; buildInputs = [ libcap libseccomp systemd yajl ] diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix index 207ebdf2211f8..73f4812ee59f9 100644 --- a/pkgs/applications/virtualization/docker/default.nix +++ b/pkgs/applications/virtualization/docker/default.nix @@ -1,11 +1,11 @@ -{ lib, callPackage }: +{ lib, callPackage, fetchFromGitHub }: with lib; rec { dockerGen = { version, rev, sha256 - , mobyRev, mobySha256 + , moby-src , runcRev, runcSha256 , containerdRev, containerdSha256 , tiniRev, tiniSha256, buildxSupport ? false @@ -65,12 +65,7 @@ rec { inherit version; inherit docker-runc docker-containerd docker-proxy docker-tini; - src = fetchFromGitHub { - owner = "moby"; - repo = "moby"; - rev = mobyRev; - sha256 = mobySha256; - }; + src = moby-src; goPackagePath = "github.com/docker/docker"; @@ -211,6 +206,9 @@ rec { maintainers = with maintainers; [ offline tailhook vdemeester periklis ]; platforms = with platforms; linux ++ darwin; }; + + # Exposed for tarsum build on non-linux systems (build-support/docker/default.nix) + inherit moby-src; }); # Get revisions from @@ -219,8 +217,12 @@ rec { version = "20.10.2"; rev = "v${version}"; sha256 = "0z0hpm5hrqh7p8my8lmiwpym2shs48my6p0zv2cc34wym0hcly51"; - mobyRev = "v${version}"; - mobySha256 = "0c2zycpnwj4kh8m8xckv1raj3fx07q9bfaj46rr85jihm4p2dp5w"; + moby-src = fetchFromGitHub { + owner = "moby"; + repo = "moby"; + rev = "v${version}"; + sha256 = "0c2zycpnwj4kh8m8xckv1raj3fx07q9bfaj46rr85jihm4p2dp5w"; + }; runcRev = "ff819c7e9184c13b7c2607fe6c30ae19403a7aff"; # v1.0.0-rc92 runcSha256 = "0r4zbxbs03xr639r7848282j1ybhibfdhnxyap9p76j5w8ixms94"; containerdRev = "269548fa27e0089a8b8278fc4fc781d7f65a939b"; # v1.4.3 diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix index b4b16e2168938..4124b8e111fde 100644 --- a/pkgs/applications/virtualization/qemu/default.nix +++ b/pkgs/applications/virtualization/qemu/default.nix @@ -77,7 +77,6 @@ stdenv.mkDerivation rec { ++ optionals libiscsiSupport [ libiscsi ] ++ optionals smbdSupport [ samba ]; - enableParallelBuilding = true; dontUseMesonConfigure = true; # meson's configurePhase isn't compatible with qemu build outputs = [ "out" "ga" ]; diff --git a/pkgs/applications/virtualization/qtemu/default.nix b/pkgs/applications/virtualization/qtemu/default.nix index 3a5f26bfcc8d3..9568a0bb695c2 100644 --- a/pkgs/applications/virtualization/qtemu/default.nix +++ b/pkgs/applications/virtualization/qtemu/default.nix @@ -1,4 +1,4 @@ -{ lib, mkDerivation, fetchFromGitLab, pkg-config, qmake, qtbase, qemu, makeWrapper }: +{ lib, mkDerivation, fetchFromGitLab, pkg-config, qmake, qtbase, qemu }: mkDerivation rec { pname = "qtemu"; diff --git a/pkgs/build-support/bintools-wrapper/default.nix b/pkgs/build-support/bintools-wrapper/default.nix index c255f43dfcd86..dac1f3bd7c109 100644 --- a/pkgs/build-support/bintools-wrapper/default.nix +++ b/pkgs/build-support/bintools-wrapper/default.nix @@ -53,7 +53,8 @@ let dynamicLinker = /**/ if libc == null then null else if targetPlatform.libc == "musl" then "${libc_lib}/lib/ld-musl-*" - else if targetPlatform.libc == "bionic" then "/system/bin/linker" + else if (targetPlatform.libc == "bionic" && targetPlatform.is32bit) then "/system/bin/linker" + else if (targetPlatform.libc == "bionic" && targetPlatform.is64bit) then "/system/bin/linker64" else if targetPlatform.libc == "nblibc" then "${libc_lib}/libexec/ld.elf_so" else if targetPlatform.system == "i686-linux" then "${libc_lib}/lib/ld-linux.so.2" else if targetPlatform.system == "x86_64-linux" then "${libc_lib}/lib/ld-linux-x86-64.so.2" diff --git a/pkgs/build-support/build-bazel-package/default.nix b/pkgs/build-support/build-bazel-package/default.nix index 3be72bd22c3f7..988298ac72bfe 100644 --- a/pkgs/build-support/build-bazel-package/default.nix +++ b/pkgs/build-support/build-bazel-package/default.nix @@ -108,8 +108,8 @@ in stdenv.mkDerivation (fBuildAttrs // { rm -rf $bazelOut/external/{bazel_tools,\@bazel_tools.marker} ${if removeRulesCC then "rm -rf $bazelOut/external/{rules_cc,\\@rules_cc.marker}" else ""} rm -rf $bazelOut/external/{embedded_jdk,\@embedded_jdk.marker} - ${if removeLocalConfigCc then "rm -rf $bazelOut/external/{local_config_cc,\@local_config_cc.marker}" else ""} - ${if removeLocal then "rm -rf $bazelOut/external/{local_*,\@local_*.marker}" else ""} + ${if removeLocalConfigCc then "rm -rf $bazelOut/external/{local_config_cc,\\@local_config_cc.marker}" else ""} + ${if removeLocal then "rm -rf $bazelOut/external/{local_*,\\@local_*.marker}" else ""} # Clear markers find $bazelOut/external -name '@*\.marker' -exec sh -c 'echo > {}' \; diff --git a/pkgs/build-support/build-pecl.nix b/pkgs/build-support/build-pecl.nix index bc905ee84a06a..d75d3cf943a0a 100644 --- a/pkgs/build-support/build-pecl.nix +++ b/pkgs/build-support/build-pecl.nix @@ -16,10 +16,10 @@ }@args: stdenv.mkDerivation (args // { - pname = "php-${php.version}-${pname}"; + name = "php-${pname}-${version}"; extensionName = pname; - inherit version src; + inherit src; nativeBuildInputs = [ autoreconfHook re2c ] ++ nativeBuildInputs; buildInputs = [ php ] ++ peclDeps ++ buildInputs; diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix index 06e43b6ea5f1f..8f20abc560a20 100644 --- a/pkgs/build-support/cc-wrapper/default.nix +++ b/pkgs/build-support/cc-wrapper/default.nix @@ -298,7 +298,10 @@ stdenv.mkDerivation { # vs libstdc++, etc.) since Darwin isn't `useLLVM` on all counts. (See # https://clang.llvm.org/docs/Toolchain.html for all the axes one might # break `useLLVM` into.) - + optionalString (isClang && gccForLibs != null && targetPlatform.isLinux && !(stdenv.targetPlatform.useLLVM or false)) '' + + optionalString (isClang && gccForLibs != null + && targetPlatform.isLinux + && !(stdenv.targetPlatform.useAndroidPrebuilt or false) + && !(stdenv.targetPlatform.useLLVM or false)) '' echo "--gcc-toolchain=${gccForLibs}" >> $out/nix-support/cc-cflags '' diff --git a/pkgs/build-support/docker/default.nix b/pkgs/build-support/docker/default.nix index c4e266d6c5d13..4d57b3991998d 100644 --- a/pkgs/build-support/docker/default.nix +++ b/pkgs/build-support/docker/default.nix @@ -21,7 +21,6 @@ runtimeShell, shadow, skopeo, - stdenv, storeDir ? builtins.storeDir, substituteAll, symlinkJoin, @@ -120,7 +119,7 @@ rec { export GOPATH=$(pwd) export GOCACHE="$TMPDIR/go-cache" mkdir -p src/github.com/docker/docker/pkg - ln -sT ${docker.moby.src}/pkg/tarsum src/github.com/docker/docker/pkg/tarsum + ln -sT ${docker.moby-src}/pkg/tarsum src/github.com/docker/docker/pkg/tarsum go build mkdir -p $out/bin diff --git a/pkgs/build-support/fetchs3/default.nix b/pkgs/build-support/fetchs3/default.nix index 8c551c20aa046..acad0749b6634 100644 --- a/pkgs/build-support/fetchs3/default.nix +++ b/pkgs/build-support/fetchs3/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenvNoCC, runCommand, awscli }: +{ lib, runCommand, awscli }: { s3url , name ? builtins.baseNameOf s3url diff --git a/pkgs/build-support/writers/test.nix b/pkgs/build-support/writers/test.nix index 7b7a698376a11..a3f15ffe366cc 100644 --- a/pkgs/build-support/writers/test.nix +++ b/pkgs/build-support/writers/test.nix @@ -7,7 +7,6 @@ python2Packages, python3Packages, runCommand, - stdenv, writers, writeText }: diff --git a/pkgs/data/fonts/noto-fonts/default.nix b/pkgs/data/fonts/noto-fonts/default.nix index d93e58854014b..530cfca742496 100644 --- a/pkgs/data/fonts/noto-fonts/default.nix +++ b/pkgs/data/fonts/noto-fonts/default.nix @@ -4,7 +4,6 @@ , fetchFromGitHub , fetchurl , fetchzip -, optipng , cairo , python3 , pkg-config diff --git a/pkgs/data/fonts/noto-fonts/tools.nix b/pkgs/data/fonts/noto-fonts/tools.nix index f5bd6335dfbb6..c43ff3a313f2a 100644 --- a/pkgs/data/fonts/noto-fonts/tools.nix +++ b/pkgs/data/fonts/noto-fonts/tools.nix @@ -1,6 +1,6 @@ { fetchFromGitHub, lib, buildPythonPackage, pythonOlder , afdko, appdirs, attrs, black, booleanoperations, brotlipy, click -, defcon, fontmath, fontparts, fontpens, fonttools, fs, lxml +, defcon, fontmath, fontparts, fontpens, fonttools, lxml , mutatormath, pathspec, psautohint, pyclipper, pytz, regex, scour , toml, typed-ast, ufonormalizer, ufoprocessor, unicodedata2, zopfli , pillow, six, bash, setuptools_scm }: diff --git a/pkgs/data/icons/papirus-icon-theme/default.nix b/pkgs/data/icons/papirus-icon-theme/default.nix index b18354910e444..1d4c3866b4e39 100644 --- a/pkgs/data/icons/papirus-icon-theme/default.nix +++ b/pkgs/data/icons/papirus-icon-theme/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "papirus-icon-theme"; - version = "20210201"; + version = "20210302"; src = fetchFromGitHub { owner = "PapirusDevelopmentTeam"; repo = pname; rev = version; - sha256 = "sha256-TQEpNFmsloq1jIg6QsuY8kllINpmwJCY+Anwker6Z5M="; + sha256 = "0h1cja8qqlnddm92hkyhkyj5rqfj494v0pss2mg95qqkjijpcgd0"; }; nativeBuildInputs = [ @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Papirus icon theme"; homepage = "https://github.com/PapirusDevelopmentTeam/papirus-icon-theme"; - license = licenses.lgpl3; + license = licenses.gpl3Only; # darwin gives hash mismatch in source, probably because of file names differing only in case platforms = platforms.linux; maintainers = with maintainers; [ romildo ]; diff --git a/pkgs/development/compilers/4th/default.nix b/pkgs/development/compilers/4th/default.nix index 7205a979e2796..a8923879c06a0 100644 --- a/pkgs/development/compilers/4th/default.nix +++ b/pkgs/development/compilers/4th/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { makeFlags = [ "-C sources" - "CC=${stdenv.cc}/bin/cc" + "CC=${stdenv.cc.targetPrefix}cc" ]; preInstall = '' @@ -34,6 +34,6 @@ stdenv.mkDerivation rec { description = "A portable Forth compiler"; homepage = "https://thebeez.home.xs4all.nl/4tH/index.html"; license = licenses.lgpl3; - platforms = platforms.linux; + platforms = platforms.all; }; } diff --git a/pkgs/development/compilers/arachne-pnr/default.nix b/pkgs/development/compilers/arachne-pnr/default.nix index 030da03add84b..f537eb14d34ca 100644 --- a/pkgs/development/compilers/arachne-pnr/default.nix +++ b/pkgs/development/compilers/arachne-pnr/default.nix @@ -39,6 +39,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/cseed/arachne-pnr"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ shell thoughtpolice ]; - platforms = lib.platforms.linux; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/compilers/chicken/4/default.nix b/pkgs/development/compilers/chicken/4/default.nix index 8d29c7c9a2b50..5445469b776ee 100644 --- a/pkgs/development/compilers/chicken/4/default.nix +++ b/pkgs/development/compilers/chicken/4/default.nix @@ -1,4 +1,4 @@ -{ newScope } : +{ lib, newScope } : let callPackage = newScope self; @@ -18,4 +18,4 @@ let egg2nix = callPackage ./egg2nix.nix { }; }; -in self +in lib.recurseIntoAttrs self diff --git a/pkgs/development/compilers/chicken/4/egg2nix.nix b/pkgs/development/compilers/chicken/4/egg2nix.nix index d2f2805ed7ff4..422053ea9d811 100644 --- a/pkgs/development/compilers/chicken/4/egg2nix.nix +++ b/pkgs/development/compilers/chicken/4/egg2nix.nix @@ -1,4 +1,4 @@ -{ eggDerivation, fetchurl, chickenEggs }: +{ lib, eggDerivation, fetchurl, chickenEggs }: # Note: This mostly reimplements the default.nix already contained in # the tarball. Is there a nicer way than duplicating code? diff --git a/pkgs/development/compilers/chicken/5/default.nix b/pkgs/development/compilers/chicken/5/default.nix index 8d29c7c9a2b50..5445469b776ee 100644 --- a/pkgs/development/compilers/chicken/5/default.nix +++ b/pkgs/development/compilers/chicken/5/default.nix @@ -1,4 +1,4 @@ -{ newScope } : +{ lib, newScope } : let callPackage = newScope self; @@ -18,4 +18,4 @@ let egg2nix = callPackage ./egg2nix.nix { }; }; -in self +in lib.recurseIntoAttrs self diff --git a/pkgs/development/compilers/crystal2nix/default.nix b/pkgs/development/compilers/crystal2nix/default.nix index 25cbbd4d01aab..0f4909f5e15e1 100644 --- a/pkgs/development/compilers/crystal2nix/default.nix +++ b/pkgs/development/compilers/crystal2nix/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, fetchgit, crystal, makeWrapper, nix-prefetch-git }: +{ lib, fetchFromGitHub, crystal, makeWrapper, nix-prefetch-git }: crystal.buildCrystalPackage rec { pname = "crystal2nix"; diff --git a/pkgs/development/compilers/gleam/default.nix b/pkgs/development/compilers/gleam/default.nix index 5e6621dbe7171..b371cadb1dbf4 100644 --- a/pkgs/development/compilers/gleam/default.nix +++ b/pkgs/development/compilers/gleam/default.nix @@ -2,13 +2,13 @@ rustPlatform.buildRustPackage rec { pname = "gleam"; - version = "0.14.1"; + version = "0.14.2"; src = fetchFromGitHub { owner = "gleam-lang"; repo = pname; rev = "v${version}"; - sha256 = "sha256-KAcb+YNfdNc5LJIApuzjXKnPTFOK0C5Jui32nij4O4U="; + sha256 = "sha256-C56aM3FFnjtTQawQOnITVGXK5XSA/Pk7surt8MJHZK0="; }; nativeBuildInputs = [ pkg-config ]; @@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security ]; - cargoSha256 = "sha256-Hxat6UZziIxHGLPydnnmgzdwtvjaeeqOgD+ZC823uJU="; + cargoSha256 = "sha256-AkkXV1cOM5YFvG5dUt7VarSzWyBZmvFMW08n1KqSAxY="; meta = with lib; { description = "A statically typed language for the Erlang VM"; diff --git a/pkgs/development/compilers/gprolog/default.nix b/pkgs/development/compilers/gprolog/default.nix index 59f33db68cbda..87bf767f5bdc2 100644 --- a/pkgs/development/compilers/gprolog/default.nix +++ b/pkgs/development/compilers/gprolog/default.nix @@ -63,6 +63,6 @@ stdenv.mkDerivation rec { ''; maintainers = [ lib.maintainers.peti ]; - platforms = lib.platforms.gnu ++ lib.platforms.linux; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/compilers/llvm/11/compiler-rt.nix b/pkgs/development/compilers/llvm/11/compiler-rt.nix index 5e9e436768511..c42e07eac4ca5 100644 --- a/pkgs/development/compilers/llvm/11/compiler-rt.nix +++ b/pkgs/development/compilers/llvm/11/compiler-rt.nix @@ -26,6 +26,7 @@ stdenv.mkDerivation rec { "-DCMAKE_ASM_COMPILER_TARGET=${stdenv.hostPlatform.config}" ] ++ lib.optionals (stdenv.isDarwin) [ "-DDARWIN_macosx_OVERRIDE_SDK_VERSION=ON" + "-DDARWIN_osx_ARCHS=${stdenv.hostPlatform.parsed.cpu.name}" ] ++ lib.optionals (useLLVM || bareMetal || isMusl) [ "-DCOMPILER_RT_BUILD_SANITIZERS=OFF" "-DCOMPILER_RT_BUILD_XRAY=OFF" diff --git a/pkgs/development/compilers/llvm/11/libc++/default.nix b/pkgs/development/compilers/llvm/11/libc++/default.nix index 0bb1ae33acd96..6adb824f539d5 100644 --- a/pkgs/development/compilers/llvm/11/libc++/default.nix +++ b/pkgs/development/compilers/llvm/11/libc++/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetch, cmake, python3, libcxxabi, llvm, fixDarwinDylibNames, version +{ lib, stdenv, fetch, fetchpatch, cmake, python3, libcxxabi, llvm, fixDarwinDylibNames, version , enableShared ? !stdenv.hostPlatform.isStatic }: @@ -15,7 +15,14 @@ stdenv.mkDerivation { mv llvm-* llvm ''; - patches = lib.optional stdenv.hostPlatform.isMusl ../../libcxx-0001-musl-hacks.patch; + patches = [ + (fetchpatch { + # Backported from LLVM 12, avoids clashes with commonly used "block.h" header. + url = "https://github.com/llvm/llvm-project/commit/19bc9ea480b60b607a3e303f20c7a3a2ea553369.patch"; + sha256 = "sha256-aWa66ogmPkG0xHzSfcpD0qZyZQcNKwLV44js4eiun78="; + stripLen = 1; + }) + ] ++ lib.optional stdenv.hostPlatform.isMusl ../../libcxx-0001-musl-hacks.patch; preConfigure = lib.optionalString stdenv.hostPlatform.isMusl '' patchShebangs utils/cat_files.py diff --git a/pkgs/development/compilers/llvm/rocm/default.nix b/pkgs/development/compilers/llvm/rocm/default.nix index 54a7733f4baef..5f9dba0fc3cc6 100644 --- a/pkgs/development/compilers/llvm/rocm/default.nix +++ b/pkgs/development/compilers/llvm/rocm/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, callPackage, wrapCCWith }: +{ lib, fetchFromGitHub, callPackage, wrapCCWith }: let version = "4.0.1"; diff --git a/pkgs/development/compilers/miranda/default.nix b/pkgs/development/compilers/miranda/default.nix index ab34f833d75ed..5de16633ed7d6 100644 --- a/pkgs/development/compilers/miranda/default.nix +++ b/pkgs/development/compilers/miranda/default.nix @@ -70,5 +70,6 @@ stdenv.mkDerivation rec { homepage = "https://www.cs.kent.ac.uk/people/staff/dat/miranda/"; license = licenses.bsd2; maintainers = with maintainers; [ siraben ]; + platforms = platforms.all; }; } diff --git a/pkgs/development/compilers/muon/default.nix b/pkgs/development/compilers/muon/default.nix index 2e178f775b6e9..aef02bca970de 100644 --- a/pkgs/development/compilers/muon/default.nix +++ b/pkgs/development/compilers/muon/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { buildPhase = '' mkdir -p $out/bin $out/share/mu cp -r lib $out/share/mu - gcc -O3 -o $out/bin/mu-unwrapped bootstrap/mu64.c + ${stdenv.cc.targetPrefix}cc -o $out/bin/mu-unwrapped bootstrap/mu64.c ''; installPhase = '' @@ -29,6 +29,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/nickmqb/muon"; license = licenses.mit; maintainers = with maintainers; [ Br1ght0ne ]; - platforms = [ "x86_64-linux" ]; + platforms = platforms.all; }; } diff --git a/pkgs/development/compilers/ocaml/4.11.nix b/pkgs/development/compilers/ocaml/4.11.nix index afda8592818f6..3e5aefc11f1ce 100644 --- a/pkgs/development/compilers/ocaml/4.11.nix +++ b/pkgs/development/compilers/ocaml/4.11.nix @@ -1,6 +1,6 @@ import ./generic.nix { major_version = "4"; minor_version = "11"; - patch_version = "1"; - sha256 = "0k4521c0p10c5ams6vjv5qkkjhmpkb0bfn04llcz46ah0f3r2jpa"; + patch_version = "2"; + sha256 = "1m3wrgkkv3f77wvcymjm0i2srxzmx62y6jln3i0a2px07ng08l9z"; } diff --git a/pkgs/development/compilers/openjdk/openjfx/15.nix b/pkgs/development/compilers/openjdk/openjfx/15.nix index f9059ae2fc434..655b29f6535df 100644 --- a/pkgs/development/compilers/openjdk/openjfx/15.nix +++ b/pkgs/development/compilers/openjdk/openjfx/15.nix @@ -1,6 +1,6 @@ { stdenv, lib, fetchFromGitHub, writeText, openjdk11_headless, gradleGen , pkg-config, perl, cmake, gperf, gtk2, gtk3, libXtst, libXxf86vm, glib, alsaLib -, ffmpeg_3, python, ruby }: +, ffmpeg, python3, ruby }: let major = "15"; @@ -21,8 +21,8 @@ let sha256 = "019glq8rhn6amy3n5jc17vi2wpf1pxpmmywvyz1ga8n09w7xscq1"; }; - buildInputs = [ gtk2 gtk3 libXtst libXxf86vm glib alsaLib ffmpeg_3 ]; - nativeBuildInputs = [ gradle_ perl pkg-config cmake gperf python ruby ]; + buildInputs = [ gtk2 gtk3 libXtst libXxf86vm glib alsaLib ffmpeg ]; + nativeBuildInputs = [ gradle_ perl pkg-config cmake gperf python3 ruby ]; dontUseCmakeConfigure = true; diff --git a/pkgs/development/compilers/rasm/default.nix b/pkgs/development/compilers/rasm/default.nix index c2415899f6b45..0feaabc92e624 100644 --- a/pkgs/development/compilers/rasm/default.nix +++ b/pkgs/development/compilers/rasm/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { buildPhase = '' # according to official documentation - cc rasm_v*.c -O2 -lm -lrt -o rasm + ${stdenv.cc.targetPrefix}cc rasm_v*.c -O2 -lm -o rasm ''; installPhase = '' @@ -28,6 +28,6 @@ stdenv.mkDerivation rec { # use -n option to display all licenses license = licenses.mit; # expat version maintainers = [ ]; - platforms = platforms.linux; + platforms = platforms.all; }; } diff --git a/pkgs/development/compilers/serpent/default.nix b/pkgs/development/compilers/serpent/default.nix index 775a78a97341e..fbcbf4485a470 100644 --- a/pkgs/development/compilers/serpent/default.nix +++ b/pkgs/development/compilers/serpent/default.nix @@ -14,6 +14,10 @@ stdenv.mkDerivation { sha256 = "1bns9wgn5i1ahj19qx7v1wwdy8ca3q3pigxwznm5nywsw7s7lqxs"; }; + postPatch = '' + substituteInPlace Makefile --replace 'g++' '${stdenv.cc.targetPrefix}c++' + ''; + installPhase = '' mkdir -p $out/bin mv serpent $out/bin @@ -33,6 +37,6 @@ stdenv.mkDerivation { homepage = "https://github.com/ethereum/wiki/wiki/Serpent"; license = with licenses; [ wtfpl ]; maintainers = with maintainers; [ chris-martin ]; - platforms = with platforms; linux; + platforms = platforms.all; }; } diff --git a/pkgs/development/interpreters/erlang/R21.nix b/pkgs/development/interpreters/erlang/R21.nix index fdd034fc6075d..e1145090c8643 100644 --- a/pkgs/development/interpreters/erlang/R21.nix +++ b/pkgs/development/interpreters/erlang/R21.nix @@ -1,10 +1,6 @@ { mkDerivation }: mkDerivation { - version = "21.3.8.3"; - sha256 = "1szybirrcpqsl2nmlmpbkxjqnm6i7l7bma87m5cpwi0kpvlxwmcw"; - - prePatch = '' - substituteInPlace configure.in --replace '`sw_vers -productVersion`' "''${MACOSX_DEPLOYMENT_TARGET:-10.12}" - ''; + version = "21.3.8.21"; + sha256 = "sha256-zQCs2hOA66jxAaxl/B42EKCejAktIav2rpVQCNyKCh4="; } diff --git a/pkgs/development/interpreters/erlang/R22.nix b/pkgs/development/interpreters/erlang/R22.nix index 7596ad9e2f109..8bfe111f065ec 100644 --- a/pkgs/development/interpreters/erlang/R22.nix +++ b/pkgs/development/interpreters/erlang/R22.nix @@ -3,11 +3,6 @@ # How to obtain `sha256`: # nix-prefetch-url --unpack https://github.com/erlang/otp/archive/OTP-${version}.tar.gz mkDerivation { - version = "22.3"; - sha256 = "0srbyncgnr1kp0rrviq14ia3h795b3gk0iws5ishv6rphcq1rs27"; - - prePatch = '' - substituteInPlace make/configure.in --replace '`sw_vers -productVersion`' "''${MACOSX_DEPLOYMENT_TARGET:-10.12}" - substituteInPlace erts/configure.in --replace '-Wl,-no_weak_imports' "" - ''; + version = "22.3.4.16"; + sha256 = "sha256-V0RwEPfjnHtEzShNh6Q49yGC5fbt2mNR4xy6f6iWvck="; } diff --git a/pkgs/development/interpreters/erlang/R23.nix b/pkgs/development/interpreters/erlang/R23.nix index 53d1b49c37565..8c07c09f22106 100644 --- a/pkgs/development/interpreters/erlang/R23.nix +++ b/pkgs/development/interpreters/erlang/R23.nix @@ -3,11 +3,6 @@ # How to obtain `sha256`: # nix-prefetch-url --unpack https://github.com/erlang/otp/archive/OTP-${version}.tar.gz mkDerivation { - version = "23.1.4"; - sha256 = "16ssxmrgjgvzg06aa1l4wz9rrdjfy39k22amgabxwb5if1g8bg8z"; - - prePatch = '' - substituteInPlace make/configure.in --replace '`sw_vers -productVersion`' "''${MACOSX_DEPLOYMENT_TARGET:-10.12}" - substituteInPlace erts/configure.in --replace '-Wl,-no_weak_imports' "" - ''; + version = "23.2.6"; + sha256 = "sha256-G930sNbr8h5ryI/IE+J6OKhR5ij68ZhGo1YIEjSOwGU="; } diff --git a/pkgs/development/interpreters/erlang/generic-builder.nix b/pkgs/development/interpreters/erlang/generic-builder.nix index 110a93a3ba5a1..325d8e87e4a94 100644 --- a/pkgs/development/interpreters/erlang/generic-builder.nix +++ b/pkgs/development/interpreters/erlang/generic-builder.nix @@ -57,20 +57,13 @@ in stdenv.mkDerivation ({ ++ optionals odbcSupport odbcPackages ++ optionals javacSupport javacPackages ++ optional withSystemd systemd - ++ optionals stdenv.isDarwin (with pkgs.darwin.apple_sdk.frameworks; [ Carbon Cocoa ]); + ++ optionals stdenv.isDarwin (with pkgs.darwin.apple_sdk.frameworks; [ AGL Carbon Cocoa WebKit ]); debugInfo = enableDebugInfo; # On some machines, parallel build reliably crashes on `GEN asn1ct_eval_ext.erl` step enableParallelBuilding = parallelBuild; - # Clang 4 (rightfully) thinks signed comparisons of pointers with NULL are nonsense - prePatch = '' - substituteInPlace lib/wx/c_src/wxe_impl.cpp --replace 'temp > NULL' 'temp != NULL' - - ${prePatch} - ''; - postPatch = '' patchShebangs make @@ -132,6 +125,7 @@ in stdenv.mkDerivation ({ // optionalAttrs (preUnpack != "") { inherit preUnpack; } // optionalAttrs (postUnpack != "") { inherit postUnpack; } // optionalAttrs (patches != []) { inherit patches; } +// optionalAttrs (prePatch != "") { inherit prePatch; } // optionalAttrs (patchPhase != "") { inherit patchPhase; } // optionalAttrs (configurePhase != "") { inherit configurePhase; } // optionalAttrs (preConfigure != "") { inherit preConfigure; } diff --git a/pkgs/development/interpreters/lua-5/filesystem.nix b/pkgs/development/interpreters/lua-5/filesystem.nix deleted file mode 100644 index d4e68b5cb7624..0000000000000 --- a/pkgs/development/interpreters/lua-5/filesystem.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ stdenv, fetchurl, lua5 }: - -stdenv.mkDerivation { - version = "1.6.2"; - pname = "lua-filesystem"; - isLibrary = true; - src = fetchurl { - url = "https://github.com/keplerproject/luafilesystem/archive/v1_6_2.tar.gz"; - sha256 = "1n8qdwa20ypbrny99vhkmx8q04zd2jjycdb5196xdhgvqzk10abz"; - }; - - buildInputs = [ lua5 ]; - - preBuild = '' - makeFlagsArray=( - PREFIX=$out - LUA_LIBDIR="$out/lib/lua/${lua5.luaversion}" - LUA_INC="-I${lua5}/include"); - ''; - - meta = { - homepage = "https://github.com/keplerproject/luafilesystem"; - hydraPlatforms = lib.platforms.linux; - maintainers = [ ]; - }; -} diff --git a/pkgs/development/interpreters/lua-5/sockets.nix b/pkgs/development/interpreters/lua-5/sockets.nix deleted file mode 100644 index d16f068883ac7..0000000000000 --- a/pkgs/development/interpreters/lua-5/sockets.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ stdenv, fetchurl, lua5 }: - -stdenv.mkDerivation rec { - pname = "lua-sockets"; - version = "2.0.2"; - src = fetchurl { - url = "http://files.luaforge.net/releases/luasocket/luasocket/luasocket-${version}/luasocket-${version}.tar.gz"; - sha256 = "19ichkbc4rxv00ggz8gyf29jibvc2wq9pqjik0ll326rrxswgnag"; - }; - - luaver = lua5.luaversion; - patchPhase = '' - sed -e "s,^INSTALL_TOP_SHARE.*,INSTALL_TOP_SHARE=$out/share/lua/${lua5.luaversion}," \ - -e "s,^INSTALL_TOP_LIB.*,INSTALL_TOP_LIB=$out/lib/lua/${lua5.luaversion}," \ - -i config - ''; - - buildInputs = [ lua5 ]; - - meta = { - homepage = "http://w3.impa.br/~diego/software/luasocket/"; - hydraPlatforms = lib.platforms.linux; - maintainers = [ ]; - }; -} diff --git a/pkgs/development/libraries/audio/libinstpatch/default.nix b/pkgs/development/libraries/audio/libinstpatch/default.nix index 29781446c8fe6..670dee26b2bf7 100644 --- a/pkgs/development/libraries/audio/libinstpatch/default.nix +++ b/pkgs/development/libraries/audio/libinstpatch/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libinstpatch"; - version = "1.1.5"; + version = "1.1.6"; src = fetchFromGitHub { owner = "swami"; repo = pname; rev = "v${version}"; - sha256 = "0psx4hc5yksfd3k2xqsc7c8lbz2d4yybikyddyd9hlkhq979cmjb"; + sha256 = "sha256-OU6/slrPDgzn9tvXZJKSWbcFbpS/EAsOi52FtjeYdvA="; }; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/pkgs/development/libraries/audio/libmysofa/default.nix b/pkgs/development/libraries/audio/libmysofa/default.nix index 9c636e0205dff..821a9ea9226a7 100644 --- a/pkgs/development/libraries/audio/libmysofa/default.nix +++ b/pkgs/development/libraries/audio/libmysofa/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libmysofa"; - version = "1.1"; + version = "1.2"; src = fetchFromGitHub { owner = "hoene"; repo = "libmysofa"; rev = "v${version}"; - sha256 = "12jzap5fh0a1fmfy4z8z4kjjlwi0qzdb9z59ijdlyqdzwxnzkccx"; + sha256 = "sha256-f+1CIVSxyScyNF92cPIiZwfnnCVrWfCZlbrIXtduIdY="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/aws-c-event-stream/default.nix b/pkgs/development/libraries/aws-c-event-stream/default.nix index 4cfabc77bb2cf..18dddee6bde8f 100644 --- a/pkgs/development/libraries/aws-c-event-stream/default.nix +++ b/pkgs/development/libraries/aws-c-event-stream/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, aws-c-cal, aws-c-common, aws-c-io, aws-checksums, s2n, libexecinfo }: +{ lib, stdenv, fetchFromGitHub, cmake, aws-c-cal, aws-c-common, aws-c-io, aws-checksums, s2n-tls, libexecinfo }: stdenv.mkDerivation rec { pname = "aws-c-event-stream"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; - buildInputs = [ aws-c-cal aws-c-common aws-c-io aws-checksums s2n ] + buildInputs = [ aws-c-cal aws-c-common aws-c-io aws-checksums s2n-tls ] ++ lib.optional stdenv.hostPlatform.isMusl libexecinfo; cmakeFlags = [ diff --git a/pkgs/development/libraries/aws-c-io/default.nix b/pkgs/development/libraries/aws-c-io/default.nix index 9c7fcf11af834..373ea66a4b632 100644 --- a/pkgs/development/libraries/aws-c-io/default.nix +++ b/pkgs/development/libraries/aws-c-io/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, aws-c-cal, aws-c-common, s2n, Security }: +{ lib, stdenv, fetchFromGitHub, cmake, aws-c-cal, aws-c-common, s2n-tls, Security }: stdenv.mkDerivation rec { pname = "aws-c-io"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; - buildInputs = [ aws-c-cal aws-c-common s2n] ++ lib.optionals stdenv.isDarwin [ Security ]; + buildInputs = [ aws-c-cal aws-c-common s2n-tls] ++ lib.optionals stdenv.isDarwin [ Security ]; cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" diff --git a/pkgs/development/libraries/aws-sdk-cpp/default.nix b/pkgs/development/libraries/aws-sdk-cpp/default.nix index 7b10fc463dd12..d6fbb97014d78 100644 --- a/pkgs/development/libraries/aws-sdk-cpp/default.nix +++ b/pkgs/development/libraries/aws-sdk-cpp/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, curl, openssl, s2n, zlib +{ lib, stdenv, fetchFromGitHub, cmake, curl, openssl, s2n-tls, zlib , aws-c-cal, aws-c-common, aws-c-event-stream, aws-c-io, aws-checksums , CoreAudio, AudioToolbox , # Allow building a limited set of APIs, e.g. ["s3" "ec2"]. @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake curl ]; buildInputs = [ - curl openssl s2n zlib + curl openssl s2n-tls zlib aws-c-cal aws-c-common aws-c-event-stream aws-c-io aws-checksums ] ++ lib.optionals (stdenv.isDarwin && ((builtins.elem "text-to-speech" apis) || diff --git a/pkgs/development/libraries/boost/generic.nix b/pkgs/development/libraries/boost/generic.nix index abff1268bfae4..6158eb8751173 100644 --- a/pkgs/development/libraries/boost/generic.nix +++ b/pkgs/development/libraries/boost/generic.nix @@ -132,7 +132,8 @@ stdenv.mkDerivation { license = licenses.boost; platforms = platforms.unix ++ platforms.windows; badPlatforms = optional (versionOlder version "1.59") "aarch64-linux" - ++ optional ((versionOlder version "1.57") || version == "1.58") "x86_64-darwin"; + ++ optional ((versionOlder version "1.57") || version == "1.58") "x86_64-darwin" + ++ optionals (versionOlder version "1.73") lib.platforms.riscv; maintainers = with maintainers; [ peti ]; }; @@ -149,6 +150,9 @@ stdenv.mkDerivation { cat << EOF >> user-config.jam using gcc : cross : ${stdenv.cc.targetPrefix}c++ ; EOF + # Build b2 with buildPlatform CC/CXX. + sed '2i export CC=$CC_FOR_BUILD; export CXX=$CXX_FOR_BUILD' \ + -i ./tools/build/src/engine/build.sh ''; NIX_CFLAGS_LINK = lib.optionalString stdenv.isDarwin diff --git a/pkgs/development/libraries/caf/default.nix b/pkgs/development/libraries/caf/default.nix index fdc06df948d75..944b5276c5a94 100644 --- a/pkgs/development/libraries/caf/default.nix +++ b/pkgs/development/libraries/caf/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "actor-framework"; - version = "0.17.6"; + version = "0.18.0"; src = fetchFromGitHub { owner = "actor-framework"; repo = "actor-framework"; rev = version; - sha256 = "03pi2jcdvdxncvv3hmzlamask0db1fc5l79k9rgq9agl0swd0mnz"; + sha256 = "1c3spd6vm1h9qhlk5c4fdwi6nbqx5vwz2zvv6qp0rj1hx6xpq3cx"; }; nativeBuildInputs = [ cmake ]; @@ -16,14 +16,14 @@ stdenv.mkDerivation rec { buildInputs = [ openssl ]; cmakeFlags = [ - "-DCAF_NO_EXAMPLES:BOOL=TRUE" + "-DCAF_ENABLE_EXAMPLES:BOOL=OFF" ]; doCheck = true; checkTarget = "test"; preCheck = '' - export LD_LIBRARY_PATH=$LD_LIBRARY_PATH''${LD_LIBRARY_PATH:+:}$PWD/lib - export DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH''${DYLD_LIBRARY_PATH:+:}$PWD/lib + export LD_LIBRARY_PATH=$PWD/libcaf_core:$PWD/libcaf_io + export DYLD_LIBRARY_PATH=$PWD/libcaf_core:$PWD/libcaf_io ''; meta = with lib; { diff --git a/pkgs/development/libraries/freetype/default.nix b/pkgs/development/libraries/freetype/default.nix index 7b5fff29a2864..adda15696e8a3 100644 --- a/pkgs/development/libraries/freetype/default.nix +++ b/pkgs/development/libraries/freetype/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl -, buildPackages +, buildPackages, pkgsHostHost , pkg-config, which, makeWrapper , zlib, bzip2, libpng, gnumake, glib @@ -64,7 +64,7 @@ in stdenv.mkDerivation rec { postInstall = glib.flattenInclude + '' substituteInPlace $dev/bin/freetype-config \ - --replace ${buildPackages.pkg-config} ${pkg-config} + --replace ${buildPackages.pkg-config} ${pkgsHostHost.pkg-config} wrapProgram "$dev/bin/freetype-config" \ --set PKG_CONFIG_PATH "$PKG_CONFIG_PATH:$dev/lib/pkgconfig" diff --git a/pkgs/development/libraries/gstreamer/bad/default.nix b/pkgs/development/libraries/gstreamer/bad/default.nix index 178bf64f5c296..89011b9230f1d 100644 --- a/pkgs/development/libraries/gstreamer/bad/default.nix +++ b/pkgs/development/libraries/gstreamer/bad/default.nix @@ -79,6 +79,7 @@ , x265 , libxml2 , srt +, vo-aacenc }: assert faacSupport -> faac != null; @@ -97,6 +98,7 @@ in stdenv.mkDerivation rec { }; patches = [ + # Use pkgconfig to inject the includedirs ./fix_pkgconfig_includedir.patch ]; @@ -115,6 +117,8 @@ in stdenv.mkDerivation rec { buildInputs = [ gst-plugins-base orc + # gobject-introspection has to be in both nativeBuildInputs and + # buildInputs. The build tries to link against libgirepository-1.0.so gobject-introspection faad2 libass @@ -161,6 +165,7 @@ in stdenv.mkDerivation rec { libxml2 libintl srt + vo-aacenc ] ++ optionals enableZbar [ zbar ] ++ optionals faacSupport [ @@ -239,7 +244,6 @@ in stdenv.mkDerivation rec { "-Dsvthevcenc=disabled" # required `SvtHevcEnc` library not packaged in nixpkgs as of writing "-Dteletext=disabled" # required `zvbi` library not packaged in nixpkgs as of writing "-Dtinyalsa=disabled" # not packaged in nixpkgs as of writing - "-Dvoaacenc=disabled" # required `vo-aacenc` library not packaged in nixpkgs as of writing "-Dvoamrwbenc=disabled" # required `vo-amrwbenc` library not packaged in nixpkgs as of writing "-Dvulkan=disabled" # Linux-only, and we haven't figured out yet which of the vulkan nixpkgs it needs "-Dwasapi=disabled" # not packaged in nixpkgs as of writing / no Windows support diff --git a/pkgs/development/libraries/libayatana-appindicator/default.nix b/pkgs/development/libraries/libayatana-appindicator/default.nix index 186e8c42f4ba1..c7d48468336cf 100644 --- a/pkgs/development/libraries/libayatana-appindicator/default.nix +++ b/pkgs/development/libraries/libayatana-appindicator/default.nix @@ -11,6 +11,8 @@ stdenv.mkDerivation rec { pname = "libayatana-appindicator-gtk${gtkVersion}"; version = "0.5.5"; + outputs = [ "out" "dev" ]; + src = fetchFromGitHub { owner = "AyatanaIndicators"; repo = "libayatana-appindicator"; diff --git a/pkgs/development/libraries/libcec/default.nix b/pkgs/development/libraries/libcec/default.nix index 341754376aae3..cb494f69fd119 100644 --- a/pkgs/development/libraries/libcec/default.nix +++ b/pkgs/development/libraries/libcec/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchurl, cmake, pkg-config, udev, libcec_platform, libraspberrypi ? null }: -let version = "4.0.7"; in +let version = "6.0.2"; in stdenv.mkDerivation { pname = "libcec"; @@ -8,7 +8,7 @@ stdenv.mkDerivation { src = fetchurl { url = "https://github.com/Pulse-Eight/libcec/archive/libcec-${version}.tar.gz"; - sha256 = "0nii8qh3qrn92g8x3canj4glb2bjn6gc1p3f6hfp59ckd4vjrndw"; + sha256 = "0xrkrcgfgr5r8r0854bw3i9jbq4jmf8nzc5vrrx2sxzvlkbrc1h9"; }; nativeBuildInputs = [ pkg-config cmake ]; diff --git a/pkgs/development/libraries/libcutl/default.nix b/pkgs/development/libraries/libcutl/default.nix index 7a5c39849291d..ed6aae0f30832 100644 --- a/pkgs/development/libraries/libcutl/default.nix +++ b/pkgs/development/libraries/libcutl/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { license = licenses.mit; }; - majmin = builtins.head ( builtins.match "([[:digit:]]\.[[:digit:]]+)\.*" "${version}" ); + majmin = builtins.head ( builtins.match "([[:digit:]]\\.[[:digit:]]+).*" "${version}" ); src = fetchurl { url = "https://codesynthesis.com/download/${pname}/${majmin}/${pname}-${version}.tar.bz2"; sha256 = "070j2x02m4gm1fn7gnymrkbdxflgzxwl7m96aryv8wp3f3366l8j"; diff --git a/pkgs/development/libraries/libelf-freebsd/default.nix b/pkgs/development/libraries/libelf-freebsd/default.nix index c3a4986c83214..d4a8b8f6f2194 100644 --- a/pkgs/development/libraries/libelf-freebsd/default.nix +++ b/pkgs/development/libraries/libelf-freebsd/default.nix @@ -1,4 +1,4 @@ -{ fetchsvn, stdenv, gnum4, tet }: +{ lib, fetchsvn, stdenv, gnum4, tet }: stdenv.mkDerivation (rec { version = "3258"; @@ -8,6 +8,7 @@ stdenv.mkDerivation (rec { url = "svn://svn.code.sf.net/p/elftoolchain/code/trunk"; rev = (lib.strings.toInt version); name = "elftoolchain-${version}"; + sha256 = "1rcmddjanlsik0b055x8k914r9rxs8yjsvslia2nh1bhzf1lxmqz"; }; buildInputs = [ gnum4 tet ]; diff --git a/pkgs/development/libraries/libjwt/default.nix b/pkgs/development/libraries/libjwt/default.nix new file mode 100644 index 0000000000000..9c7d624e7f6e4 --- /dev/null +++ b/pkgs/development/libraries/libjwt/default.nix @@ -0,0 +1,24 @@ +{ stdenv, lib, fetchFromGitHub, autoreconfHook, pkg-config, jansson, openssl }: + +stdenv.mkDerivation rec { + pname = "libjwt"; + version = "1.12.1"; + + src = fetchFromGitHub { + owner = "benmcollins"; + repo = "libjwt"; + rev = "v${version}"; + sha256 = "1c69slf9k56gh0xcg6269v712ysm6wckracms4grdsc72xg6x7h2"; + }; + + buildInputs = [ jansson openssl ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; + + meta = with lib; { + homepage = "https://github.com/benmcollins/libjwt"; + description = "JWT C Library"; + license = licenses.mpl20; + maintainers = with maintainers; [ pnotequalnp ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/development/libraries/libnixxml/default.nix b/pkgs/development/libraries/libnixxml/default.nix index abbffcf0f942c..40459dbca22a6 100644 --- a/pkgs/development/libraries/libnixxml/default.nix +++ b/pkgs/development/libraries/libnixxml/default.nix @@ -1,25 +1,31 @@ { fetchFromGitHub, lib, stdenv, autoreconfHook, pkg-config, libxml2, gd, glib, getopt, libxslt, nix }: stdenv.mkDerivation { - name = "libnixxml"; + pname = "libnixxml"; + version = "unstable-2020-06-25"; + src = fetchFromGitHub { owner = "svanderburg"; repo = "libnixxml"; rev = "54c04a5fdbc8661b2445a7527f499e0a77753a1a"; sha256 = "sha256-HKQnCkO1TDs1e0MDil0Roq4YRembqRHQvb7lK3GAftQ="; }; + + preConfigure = '' + ./bootstrap + ''; + configureFlags = [ "--with-gd" "--with-glib" ]; CFLAGS = "-Wall"; - nativeBuildInputs = [ autoreconfHook ]; - buildInputs = [ pkg-config libxml2 gd.dev glib getopt libxslt nix ]; + + nativeBuildInputs = [ autoreconfHook pkg-config ]; + buildInputs = [ libxml2 gd.dev glib getopt libxslt nix ]; + doCheck = false; - postPatch = '' - ./bootstrap - ''; meta = with lib; { description = "XML-based Nix-friendly data integration library"; - homepage = https://github.com/svanderburg/libnixxml; + homepage = "https://github.com/svanderburg/libnixxml"; license = licenses.mit; maintainers = with maintainers; [ tomberek ]; platforms = platforms.unix; diff --git a/pkgs/development/libraries/libosmpbf/default.nix b/pkgs/development/libraries/libosmpbf/default.nix deleted file mode 100644 index 572b5710fa9a3..0000000000000 --- a/pkgs/development/libraries/libosmpbf/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{lib, stdenv, fetchurl, protobuf}: - -stdenv.mkDerivation { - name = "libosmpbf-1.5.0"; - - src = fetchurl { - url = "https://github.com/scrosby/OSM-binary/archive/v1.5.0.tar.gz"; - sha256 = "sha256-Kr8xJnKXk3MsM4B2OZnMNl5Rv/2jaaAIITh5o82QR2w="; - }; - - buildInputs = [ protobuf ]; - - sourceRoot = "OSM-binary-1.5.0/src"; - - installFlags = [ "PREFIX=$(out)" ]; - - meta = { - homepage = "https://github.com/scrosby/OSM-binary"; - description = "C library to read and write OpenStreetMap PBF files"; - license = lib.licenses.lgpl3; - platforms = lib.platforms.unix; - }; -} diff --git a/pkgs/development/libraries/libowlevelzs/default.nix b/pkgs/development/libraries/libowlevelzs/default.nix new file mode 100644 index 0000000000000..e024874eabe84 --- /dev/null +++ b/pkgs/development/libraries/libowlevelzs/default.nix @@ -0,0 +1,27 @@ +{ cmake +, fetchFromGitHub +, lib +, stdenv +}: + +stdenv.mkDerivation rec { + pname = "libowlevelzs"; + version = "0.1.1"; + + src = fetchFromGitHub { + owner = "zseri"; + repo = "libowlevelzs"; + rev = "v${version}"; + sha256 = "y/EaMMsmJEmnptfjwiat4FC2+iIKlndC2Wdpop3t7vY="; + }; + + nativeBuildInputs = [ cmake ]; + + meta = with lib; { + description = "Zscheile Lowlevel (utility) library"; + homepage = "https://github.com/zseri/libowlevelzs"; + license = licenses.mit; + maintainers = with maintainers; [ zseri ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/development/libraries/mapbox-gl-native/default.nix b/pkgs/development/libraries/mapbox-gl-native/default.nix new file mode 100644 index 0000000000000..e98903e3a83e0 --- /dev/null +++ b/pkgs/development/libraries/mapbox-gl-native/default.nix @@ -0,0 +1,33 @@ +{ lib, mkDerivation, fetchFromGitHub, cmake, pkg-config +, qtbase, curl, libuv, glfw3 }: + +mkDerivation rec { + pname = "mapbox-gl-native"; + version = "2020.06.07"; + + src = fetchFromGitHub { + owner = "mapbox"; + repo = "mapbox-gl-native"; + rev = "e18467d755f470b26f61f6893eddd76ecf0816e6"; + sha256 = "1x271gg9h81jpi70pv63i6lsa1zg6bzja9mbz7bsa4s02fpqy7wh"; + fetchSubmodules = true; + }; + + nativeBuildInputs = [ cmake pkg-config ]; + buildInputs = [ curl libuv glfw3 qtbase ]; + + cmakeFlags = [ + "-DMBGL_WITH_QT=ON" + "-DMBGL_WITH_QT_LIB_ONLY=ON" + "-DMBGL_WITH_QT_HEADLESS=OFF" + ]; + NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations -Wno-error=type-limits"; + + meta = with lib; { + description = "Interactive, thoroughly customizable maps in native Android, iOS, macOS, Node.js, and Qt applications, powered by vector tiles and OpenGL"; + homepage = "https://mapbox.com/mobile"; + license = licenses.bsd2; + maintainers = [ maintainers.Thra11 ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/libraries/mapbox-gl-qml/default.nix b/pkgs/development/libraries/mapbox-gl-qml/default.nix new file mode 100644 index 0000000000000..1740b9ae580de --- /dev/null +++ b/pkgs/development/libraries/mapbox-gl-qml/default.nix @@ -0,0 +1,32 @@ +{ lib, mkDerivation, fetchFromGitHub, qmake, qtbase, qtlocation, mapbox-gl-native }: + +mkDerivation rec { + pname = "mapbox-gl-qml"; + version = "1.7.5"; + + src = fetchFromGitHub { + owner = "rinigus"; + repo = "mapbox-gl-qml"; + rev = version; + sha256 = "1izwkfqn8jl83vihcxl2b159sqmkn1amxf92zw0h6psls2g9xhwx"; + }; + + nativeBuildInputs = [ qmake ]; + buildInputs = [ qtlocation mapbox-gl-native ]; + + postPatch = '' + substituteInPlace mapbox-gl-qml.pro \ + --replace '$$[QT_INSTALL_QML]' $out'/${qtbase.qtQmlPrefix}' + ''; + + # Package expects qt5 subdirectory of mapbox-gl-native to be in the include path + NIX_CFLAGS_COMPILE = "-I${mapbox-gl-native}/include/qt5"; + + meta = with lib; { + description = "Unofficial Mapbox GL Native bindings for Qt QML"; + homepage = "https://github.com/rinigus/mapbox-gl-qml"; + license = licenses.lgpl3Only; + maintainers = [ maintainers.Thra11 ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/libraries/nemo-qml-plugin-dbus/default.nix b/pkgs/development/libraries/nemo-qml-plugin-dbus/default.nix new file mode 100644 index 0000000000000..5a680b9da9a5e --- /dev/null +++ b/pkgs/development/libraries/nemo-qml-plugin-dbus/default.nix @@ -0,0 +1,33 @@ +{ mkDerivation, lib, fetchFromGitLab, qmake, qtbase }: + +mkDerivation rec { + pname = "nemo-qml-plugin-dbus"; + version = "2.1.23"; + + src = fetchFromGitLab { + domain = "git.sailfishos.org"; + owner = "mer-core"; + repo = "nemo-qml-plugin-dbus"; + rev = version; + sha256 = "0ww478ds7a6h4naa7vslj6ckn9cpsgcml0q7qardkzmdmxsrv1ag"; + }; + + nativeBuildInputs = [ qmake ]; + + postPatch = '' + substituteInPlace dbus.pro --replace ' tests' "" + substituteInPlace src/nemo-dbus/nemo-dbus.pro \ + --replace /usr $out \ + --replace '$$[QT_INSTALL_LIBS]' $out'/lib' + substituteInPlace src/plugin/plugin.pro \ + --replace '$$[QT_INSTALL_QML]' $out'/${qtbase.qtQmlPrefix}' + ''; + + meta = with lib; { + description = "Nemo DBus plugin for qml"; + homepage = "https://git.sailfishos.org/mer-core/nemo-qml-plugin-dbus/"; + license = licenses.lgpl2Only; + maintainers = [ maintainers.Thra11 ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/libraries/polkit-qt-1/default.nix b/pkgs/development/libraries/polkit-qt-1/default.nix new file mode 100644 index 0000000000000..86ef2af96e7c8 --- /dev/null +++ b/pkgs/development/libraries/polkit-qt-1/default.nix @@ -0,0 +1,37 @@ +{ stdenv +, lib +, mkDerivation +, fetchurl +, cmake +, pkg-config +, polkit +, glib +, pcre +, libselinux +, libsepol +, util-linux +}: + +mkDerivation rec { + pname = "polkit-qt-1"; + version = "0.113.0"; + + src = fetchurl { + url = "mirror://kde/stable/${pname}/${pname}-${version}.tar.xz"; + sha256 = "sha256-W4ZqKVTvEP+2YVbi/orQMhtVKKjfLkqRsC9QQc5VY6c="; + }; + + nativeBuildInputs = [ cmake pkg-config ]; + + buildInputs = [ + glib + pcre + polkit + ] ++ lib.optionals stdenv.isLinux [ libselinux libsepol util-linux ]; + + meta = with lib; { + description = "A Qt wrapper around PolKit"; + maintainers = with maintainers; [ ttuegel ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/libraries/polkit-qt-1/qt-4.nix b/pkgs/development/libraries/polkit-qt-1/qt-4.nix deleted file mode 100644 index 0da6e15eb274c..0000000000000 --- a/pkgs/development/libraries/polkit-qt-1/qt-4.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ lib, stdenv, fetchurl, cmake, pkg-config, polkit, automoc4, glib, qt4 }: - -with lib; - -stdenv.mkDerivation { - name = "polkit-qt-1-qt4-0.112.0"; - - src = fetchurl { - url = "mirror://kde/stable/apps/KDE4.x/admin/polkit-qt-1-0.112.0.tar.bz2"; - sha256 = "1ip78x20hjqvm08kxhp6gb8hf6k5n6sxyx6kk2yvvq53djzh7yv7"; - }; - - outputs = [ "out" "dev" ]; - - nativeBuildInputs = [ cmake pkg-config automoc4 ]; - - propagatedBuildInputs = [ polkit glib qt4 ]; - - postFixup = - '' - for i in $dev/lib/cmake/*/*.cmake; do - echo "fixing $i" - substituteInPlace $i \ - --replace "\''${PACKAGE_PREFIX_DIR}/lib" $out/lib - done - ''; - - meta = with lib; { - description = "A Qt wrapper around PolKit"; - maintainers = [ maintainers.ttuegel ]; - platforms = platforms.linux; - license = licenses.lgpl21; - }; -} diff --git a/pkgs/development/libraries/polkit-qt-1/qt-5.nix b/pkgs/development/libraries/polkit-qt-1/qt-5.nix deleted file mode 100644 index c4918d9d8e97e..0000000000000 --- a/pkgs/development/libraries/polkit-qt-1/qt-5.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ lib, stdenv, fetchurl, cmake, pkg-config, polkit, glib, qtbase }: - -with lib; - -stdenv.mkDerivation { - name = "polkit-qt-1-qt5-0.112.0"; - - outputs = [ "out" "dev" ]; - - src = fetchurl { - url = "mirror://kde/stable/apps/KDE4.x/admin/polkit-qt-1-0.112.0.tar.bz2"; - sha256 = "1ip78x20hjqvm08kxhp6gb8hf6k5n6sxyx6kk2yvvq53djzh7yv7"; - }; - - nativeBuildInputs = [ cmake pkg-config ]; - - propagatedBuildInputs = [ polkit glib qtbase ]; - - dontWrapQtApps = true; - - postFixup = '' - # Fix library location in CMake module - sed -i "$dev/lib/cmake/PolkitQt5-1/PolkitQt5-1Config.cmake" \ - -e "s,\\(set_and_check.POLKITQT-1_LIB_DIR\\).*$,\\1 \"''${!outputLib}/lib\")," - ''; - - meta = { - description = "A Qt wrapper around PolKit"; - maintainers = with lib.maintainers; [ ttuegel ]; - platforms = with lib.platforms; linux; - }; -} diff --git a/pkgs/development/libraries/s2geometry/default.nix b/pkgs/development/libraries/s2geometry/default.nix new file mode 100644 index 0000000000000..afd5ffa0a0a2d --- /dev/null +++ b/pkgs/development/libraries/s2geometry/default.nix @@ -0,0 +1,32 @@ +{ stdenv, lib, fetchFromGitHub, fetchpatch, cmake, pkg-config, openssl, gtest }: + +stdenv.mkDerivation rec { + pname = "s2geometry"; + version = "0.9.0"; + + src = fetchFromGitHub { + owner = "google"; + repo = "s2geometry"; + rev = "v${version}"; + sha256 = "1mx61bnn2f6bd281qlhn667q6yfg1pxzd2js88l5wpkqlfzzhfaz"; + }; + + patches = [ + # Fix build https://github.com/google/s2geometry/issues/165 + (fetchpatch { + url = "https://github.com/google/s2geometry/commit/a4dddf40647c68cd0104eafc31e9c8fb247a6308.patch"; + sha256 = "0fp3w4bg7pgf5vv4vacp9g06rbqzhxc2fg6i5appp93q6phiinvi"; + }) + ]; + + nativeBuildInputs = [ cmake pkg-config ]; + buildInputs = [ openssl gtest ]; + + meta = with lib; { + description = "Computational geometry and spatial indexing on the sphere"; + homepage = "http://s2geometry.io/"; + license = licenses.asl20; + maintainers = [ maintainers.Thra11 ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/libraries/s2n/default.nix b/pkgs/development/libraries/s2n-tls/default.nix index 3ec66ebf52d16..2d3ebc6cb4143 100644 --- a/pkgs/development/libraries/s2n/default.nix +++ b/pkgs/development/libraries/s2n-tls/default.nix @@ -1,14 +1,14 @@ { lib, stdenv, fetchFromGitHub, cmake, openssl }: stdenv.mkDerivation rec { - pname = "s2n"; - version = "0.10.23"; + pname = "s2n-tls"; + version = "1.0.0"; src = fetchFromGitHub { - owner = "awslabs"; + owner = "aws"; repo = pname; rev = "v${version}"; - sha256 = "063wqpszhfcbxm7a7s6d6kinqd6b6dxij85lk9jjkrslg5fgqbki"; + sha256 = "1q6kmgwb8jxmc4ijzk9pkqzz8lsbfsv9hyzqvy944w7306zx1r5h"; }; nativeBuildInputs = [ cmake ]; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "C99 implementation of the TLS/SSL protocols"; - homepage = "https://github.com/awslabs/s2n"; + homepage = "https://github.com/aws/s2n-tls"; license = licenses.asl20; platforms = platforms.unix; maintainers = with maintainers; [ orivej ]; diff --git a/pkgs/development/libraries/science/math/QuadProgpp/default.nix b/pkgs/development/libraries/science/math/QuadProgpp/default.nix index 254ce08dc60f6..703a7f2e34417 100644 --- a/pkgs/development/libraries/science/math/QuadProgpp/default.nix +++ b/pkgs/development/libraries/science/math/QuadProgpp/default.nix @@ -12,7 +12,6 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ cmake ]; - buildInputs = [ ]; meta = with lib; { homepage = "https://github.com/liuq/QuadProgpp"; @@ -22,6 +21,6 @@ stdenv.mkDerivation rec { Goldfarb-Idnani active-set dual method. ''; maintainers = with maintainers; [ ]; - platforms = with platforms; linux; + platforms = platforms.all; }; } diff --git a/pkgs/development/libraries/serf/default.nix b/pkgs/development/libraries/serf/default.nix index 092ab62ed7c89..5b603e6a0c7f1 100644 --- a/pkgs/development/libraries/serf/default.nix +++ b/pkgs/development/libraries/serf/default.nix @@ -2,10 +2,11 @@ , pkg-config, libiconv }: stdenv.mkDerivation rec { - name = "serf-1.3.9"; + pname = "serf"; + version = "1.3.9"; src = fetchurl { - url = "https://www.apache.org/dist/serf/${name}.tar.bz2"; + url = "https://www.apache.org/dist/serf/${pname}-${version}.tar.bz2"; sha256 = "1k47gbgpp52049andr28y28nbwh9m36bbb0g8p0aka3pqlhjv72l"; }; diff --git a/pkgs/development/libraries/spdlog/default.nix b/pkgs/development/libraries/spdlog/default.nix index 7b6c98bebe808..0fe1ce442fdc3 100644 --- a/pkgs/development/libraries/spdlog/default.nix +++ b/pkgs/development/libraries/spdlog/default.nix @@ -49,8 +49,8 @@ let in { spdlog_1 = generic { - version = "1.8.1"; - sha256 = "sha256-EyZhYgcdtZC+vsOUKShheY57L0tpXltduHWwaoy6G9k="; + version = "1.8.2"; + sha256 = "sha256-vYled5Z9fmxuO9193lefpFzIHAiSgvYn2iOfneLidQ8="; }; spdlog_0 = generic { diff --git a/pkgs/development/libraries/vapoursynth/editor.nix b/pkgs/development/libraries/vapoursynth/editor.nix index 26a1a6d680807..5cd4b4608ecbb 100644 --- a/pkgs/development/libraries/vapoursynth/editor.nix +++ b/pkgs/development/libraries/vapoursynth/editor.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, mkDerivation, fetchFromBitbucket, makeWrapper, runCommand +{ lib, mkDerivation, fetchFromBitbucket, makeWrapper, runCommand , python3, vapoursynth , qmake, qtbase, qtwebsockets }: diff --git a/pkgs/development/libraries/vo-aacenc/default.nix b/pkgs/development/libraries/vo-aacenc/default.nix new file mode 100644 index 0000000000000..fb8dd43fe0324 --- /dev/null +++ b/pkgs/development/libraries/vo-aacenc/default.nix @@ -0,0 +1,19 @@ +{ lib, stdenv, fetchurl }: + +stdenv.mkDerivation rec { + pname = "vo-aacenc"; + version = "0.1.3"; + + src = fetchurl { + url = "mirror://sourceforge/opencore-amr/fdk-aac/${pname}-${version}.tar.gz"; + sha256 = "sha256-5Rp0d6NZ8Y33xPgtGV2rThTnQUy9SM95zBlfxEaFDzY="; + }; + + meta = with lib; { + description = "VisualOn AAC encoder library"; + homepage = "https://sourceforge.net/projects/opencore-amr/"; + license = licenses.asl20; + maintainers = [ maintainers.baloo ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/development/misc/umr/default.nix b/pkgs/development/misc/umr/default.nix new file mode 100644 index 0000000000000..158cef2eed1e8 --- /dev/null +++ b/pkgs/development/misc/umr/default.nix @@ -0,0 +1,37 @@ +{ lib, stdenv, fetchgit, bash-completion, cmake, pkg-config +, libdrm, libpciaccess, llvmPackages, ncurses +}: + +stdenv.mkDerivation rec { + pname = "umr"; + version = "unstable-2021-02-18"; + + src = fetchgit { + url = "https://gitlab.freedesktop.org/tomstdenis/umr"; + rev = "79e17f8f2807ed707fc1be369d0aad536f6dbc97"; + sha256 = "IwTkHEuJ82hngPjFVIihU2rSolLBqHxQTNsP8puYPaY="; + }; + + nativeBuildInputs = [ cmake pkg-config ]; + + buildInputs = [ + bash-completion + libdrm + libpciaccess + llvmPackages.llvm + ncurses + ]; + + # Remove static libraries (there are no dynamic libraries in there) + postInstall = '' + rm -r $out/lib + ''; + + meta = with lib; { + description = "A userspace debugging and diagnostic tool for AMD GPUs"; + homepage = "https://gitlab.freedesktop.org/tomstdenis/umr"; + license = licenses.mit; + maintainers = with maintainers; [ Flakebi ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/mobile/androidenv/compose-android-packages.nix b/pkgs/development/mobile/androidenv/compose-android-packages.nix index fd78fa9ac0f89..5db3538563f91 100644 --- a/pkgs/development/mobile/androidenv/compose-android-packages.nix +++ b/pkgs/development/mobile/androidenv/compose-android-packages.nix @@ -24,7 +24,8 @@ }: let - inherit (pkgs) stdenv lib fetchurl makeWrapper unzip; + inherit (pkgs) stdenv lib fetchurl; + inherit (pkgs.buildPackages) makeWrapper unzip; # Determine the Android os identifier from Nix's system identifier os = if stdenv.system == "x86_64-linux" then "linux" diff --git a/pkgs/development/ocaml-modules/bigarray-compat/default.nix b/pkgs/development/ocaml-modules/bigarray-compat/default.nix index 6d833b48f2696..487249ce5ae58 100644 --- a/pkgs/development/ocaml-modules/bigarray-compat/default.nix +++ b/pkgs/development/ocaml-modules/bigarray-compat/default.nix @@ -4,6 +4,8 @@ buildDunePackage rec { pname = "bigarray-compat"; version = "1.0.0"; + useDune2 = true; + src = fetchFromGitHub { owner = "mirage"; repo = pname; diff --git a/pkgs/development/ocaml-modules/biniou/default.nix b/pkgs/development/ocaml-modules/biniou/default.nix index 8e0780ae6c5cd..535b34b03dcd2 100644 --- a/pkgs/development/ocaml-modules/biniou/default.nix +++ b/pkgs/development/ocaml-modules/biniou/default.nix @@ -4,6 +4,8 @@ buildDunePackage rec { pname = "biniou"; version = "1.2.1"; + useDune2 = true; + src = fetchFromGitHub { owner = "ocaml-community"; repo = pname; diff --git a/pkgs/development/ocaml-modules/digestif/default.nix b/pkgs/development/ocaml-modules/digestif/default.nix index dd8a0f571649b..e2501c60f5a14 100644 --- a/pkgs/development/ocaml-modules/digestif/default.nix +++ b/pkgs/development/ocaml-modules/digestif/default.nix @@ -5,13 +5,13 @@ buildDunePackage rec { pname = "digestif"; - version = "0.9.0"; + version = "1.0.0"; useDune2 = true; src = fetchurl { url = "https://github.com/mirage/digestif/releases/download/v${version}/digestif-v${version}.tbz"; - sha256 = "0vk9prgjp46xs8qizq7szkj6mqjj2ymncs2016bc8zswcdc1a3q4"; + sha256 = "11188ya6ksb0p0zvs6saz3qxv4a8pyy8m3sq35f3qfxrxhghqi99"; }; propagatedBuildInputs = [ bigarray-compat eqaf stdlib-shims ]; diff --git a/pkgs/development/ocaml-modules/directories/default.nix b/pkgs/development/ocaml-modules/directories/default.nix new file mode 100644 index 0000000000000..eae11953113be --- /dev/null +++ b/pkgs/development/ocaml-modules/directories/default.nix @@ -0,0 +1,33 @@ +{ lib, fetchFromGitHub, buildDunePackage }: + +buildDunePackage rec { + pname = "directories"; + version = "0.2"; + useDune2 = true; + + minimumOCamlVersion = "4.07"; + + src = fetchFromGitHub { + owner = "ocamlpro"; + repo = pname; + rev = version; + sha256 = "0s7ginh0g0fhw8xf9v58cx99a8q9jqsf4i0p134m5qzf84qpjwff"; + }; + + meta = { + homepage = "https://github.com/ocamlpro/directories"; + description = "An OCaml library that provides configuration, cache and data paths (and more!) following the suitable conventions on Linux, macOS and Windows"; + longDescription = '' + directories is an OCaml library that provides configuration, cache and + data paths (and more!) following the suitable conventions on Linux, macOS + and Windows. It is inspired by similar libraries for other languages such + as directories-jvm. + + The following conventions are used: XDG Base Directory Specification and + xdg-user-dirs on Linux, Known Folders on Windows, Standard Directories on + macOS. + ''; + license = lib.licenses.isc; + maintainers = with lib.maintainers; [ bcc32 ]; + }; +} diff --git a/pkgs/development/ocaml-modules/integers/default.nix b/pkgs/development/ocaml-modules/integers/default.nix index ad6f1f9f813d3..97443bf5706e7 100644 --- a/pkgs/development/ocaml-modules/integers/default.nix +++ b/pkgs/development/ocaml-modules/integers/default.nix @@ -1,9 +1,11 @@ -{ lib, fetchzip, buildDunePackage }: +{ lib, fetchzip, buildDunePackage, ocaml }: buildDunePackage rec { pname = "integers"; version = "0.4.0"; + useDune2 = lib.versionAtLeast ocaml.version "4.08"; + src = fetchzip { url = "https://github.com/ocamllabs/ocaml-integers/archive/${version}.tar.gz"; sha256 = "0yp3ab0ph7mp5741g7333x4nx8djjvxzpnv3zvsndyzcycspn9dd"; diff --git a/pkgs/development/ocaml-modules/mariadb/default.nix b/pkgs/development/ocaml-modules/mariadb/default.nix index ed3e5999b4165..2c3c7c423ac06 100644 --- a/pkgs/development/ocaml-modules/mariadb/default.nix +++ b/pkgs/development/ocaml-modules/mariadb/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, buildOasisPackage +{ lib, fetchFromGitHub, buildOasisPackage , ctypes, mariadb, libmysqlclient }: buildOasisPackage rec { diff --git a/pkgs/development/python-modules/HAP-python/default.nix b/pkgs/development/python-modules/HAP-python/default.nix index 3cd211db75592..2e740fcc2c86c 100644 --- a/pkgs/development/python-modules/HAP-python/default.nix +++ b/pkgs/development/python-modules/HAP-python/default.nix @@ -1,41 +1,75 @@ -{ lib, buildPythonPackage, fetchFromGitHub, isPy3k, curve25519-donna, ed25519 -, cryptography, ecdsa, zeroconf, pytestCheckHook }: +{ lib +, buildPythonPackage +, cryptography +, curve25519-donna +, ecdsa +, ed25519 +, fetchFromGitHub +, h11 +, pytest-asyncio +, pytest-timeout +, pytestCheckHook +, pythonOlder +, zeroconf +}: buildPythonPackage rec { pname = "HAP-python"; - version = "3.1.0"; + version = "3.3.2"; + disabled = pythonOlder "3.5"; # pypi package does not include tests src = fetchFromGitHub { owner = "ikalchev"; repo = pname; rev = "v${version}"; - sha256 = "1qg38lfjby2xfm09chzc40a7i3b84kgyfs7g4xq8f5m8s39hg6d7"; + sha256 = "sha256-oDTyFIhf7oogYyh9LpmVtagi1kDXLCc/7c2UH1dL2Sg="; }; - disabled = !isPy3k; - propagatedBuildInputs = [ - curve25519-donna - ed25519 cryptography + curve25519-donna ecdsa + ed25519 + h11 zeroconf ]; - checkInputs = [ pytestCheckHook ]; + checkInputs = [ + pytest-asyncio + pytest-timeout + pytestCheckHook + ]; disabledTests = [ - #disable tests needing network - "test_persist" - "test_setup_endpoints" + # Disable tests needing network + "camera" + "pair" + "test_async_subscribe_client_topic" "test_auto_add_aid_mac" - "test_service_callbacks" - "test_send_events" - "test_not_standalone_aid" - "test_start_stop_async_acc" + "test_connection_management" + "test_crypto_failure_closes_connection" + "test_empty_encrypted_data" "test_external_zeroconf" - "test_start_stop_sync_acc" + "test_get_accessories" + "test_get_characteristics" + "test_handle_set_handle_set" + "test_handle_snapshot_encrypted_non_existant_accessory" + "test_http_11_keep_alive" + "test_http10_close" + "test_mdns_service_info" + "test_mixing_service_char_callbacks_partial_failure" + "test_not_standalone_aid" + "test_persist" + "test_push_event" + "test_send_events" + "test_service_callbacks" + "test_set_characteristics_with_crypto" + "test_setup_endpoints" + "test_start" + "test_upgrade_to_encrypted" + "test_we_can_start_stop" + "test_xhm_uri" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/aiomultiprocess/default.nix b/pkgs/development/python-modules/aiomultiprocess/default.nix index 9b648d5953790..7b84996a1c915 100644 --- a/pkgs/development/python-modules/aiomultiprocess/default.nix +++ b/pkgs/development/python-modules/aiomultiprocess/default.nix @@ -1,20 +1,26 @@ { lib , buildPythonPackage , fetchFromGitHub +, flit-core , pytestCheckHook +, pythonOlder }: buildPythonPackage rec { pname = "aiomultiprocess"; - version = "0.8.0"; + version = "0.9.0"; + format = "pyproject"; + disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "omnilib"; repo = pname; rev = "v${version}"; - sha256 = "0vkj1vgvlv828pi3sn0hjzdy9f0j63gljs2ylibbsaixa7mbkpvy"; + sha256 = "sha256-yOP69FXDb2Grmtszx7oa6uiJGUar8su3KwqQPI+xjrw="; }; + nativeBuildInputs = [ flit-core ]; + checkInputs = [ pytestCheckHook ]; pytestFlagsArray = [ "aiomultiprocess/tests/*.py" ]; diff --git a/pkgs/development/python-modules/aioshelly/default.nix b/pkgs/development/python-modules/aioshelly/default.nix index f53877e03a3cb..058282b4c3534 100644 --- a/pkgs/development/python-modules/aioshelly/default.nix +++ b/pkgs/development/python-modules/aioshelly/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "aioshelly"; - version = "0.5.4"; + version = "0.6.1"; src = fetchFromGitHub { owner = "home-assistant-libs"; repo = pname; rev = version; - sha256 = "sha256-EjzWx3wcmTfB3OmN0OB37K6wYKVO3HzGEIf+uihas8k="; + sha256 = "sha256-2igN5mmkXyYpQeAoPAYzhirictuionVMbqifNigEYdw="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-mgmt-resource/default.nix b/pkgs/development/python-modules/azure-mgmt-resource/default.nix index bdba89498877d..5cbbee77ae8ef 100644 --- a/pkgs/development/python-modules/azure-mgmt-resource/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-resource/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { - version = "15.0.0"; + version = "16.0.0"; pname = "azure-mgmt-resource"; disabled = !isPy3k; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "80ecb69aa21152b924edf481e4b26c641f11aa264120bc322a14284811df9c14"; + sha256 = "0bdbdc9c1ed2ef975d8dff45f358d1e06dc6761eace5b6817f13993447e48a68"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/bleach/default.nix b/pkgs/development/python-modules/bleach/default.nix index 33523a6806348..53319466d3a55 100644 --- a/pkgs/development/python-modules/bleach/default.nix +++ b/pkgs/development/python-modules/bleach/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "bleach"; - version = "3.2.3"; + version = "3.3.0"; src = fetchPypi { inherit pname version; - sha256 = "c6ad42174219b64848e2e2cd434e44f56cd24a93a9b4f8bc52cfed55a1cd5aad"; + sha256 = "sha256-mLMXBznl6D3Z3BljPwdHJ62EjL7bYCZwjIrC07aXpDM="; }; checkInputs = [ pytest pytestrunner ]; diff --git a/pkgs/development/python-modules/boto3/default.nix b/pkgs/development/python-modules/boto3/default.nix index 6077d6335fa1b..1c035a2470aa2 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.17.18"; # N.B: if you change this, change botocore and awscli to a matching version + version = "1.17.20"; # N.B: if you change this, change botocore and awscli to a matching version src = fetchPypi { inherit pname version; - sha256 = "sha256-NXCjwPvYC8swRJ+Hz50vertn+sKl4xfQAvmSHFm+mxc="; + sha256 = "sha256-Ihnx6+iNJmr6VRb5k5g+uodCuVf6T9aFTzxzqjAw6TE="; }; 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 514e63fdbbfe6..5714cbf5fb8e7 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.20.18"; # N.B: if you change this, change boto3 and awscli to a matching version + version = "1.20.20"; # N.B: if you change this, change boto3 and awscli to a matching version src = fetchPypi { inherit pname version; - sha256 = "sha256-UZALENpK5FvksWBF5bL/fRFYp5VdnXzF5am6MXDxBYY="; + sha256 = "sha256-gMMqgfse6L36B0p5v7iFuyAG6Kl4LyNTwMn2OScE4To="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/cot/default.nix b/pkgs/development/python-modules/cot/default.nix index a6de8321dc0c0..607057b73f219 100644 --- a/pkgs/development/python-modules/cot/default.nix +++ b/pkgs/development/python-modules/cot/default.nix @@ -1,13 +1,12 @@ { lib, stdenv, buildPythonPackage, fetchPypi, pythonOlder, isPy3k -, argcomplete, colorlog, pyvmomi, requests, verboselogs +, colorlog, pyvmomi, requests, verboselogs , psutil, pyopenssl, setuptools -, mock, pytest, pytest-mock, pytestCheckHook, qemu +, mock, pytest-mock, pytestCheckHook, qemu }: buildPythonPackage rec { pname = "cot"; version = "2.2.1"; - disabled = !isPy3k; src = fetchPypi { diff --git a/pkgs/development/python-modules/datadog/default.nix b/pkgs/development/python-modules/datadog/default.nix index a8917c3965f8a..4a1bddfe3692b 100644 --- a/pkgs/development/python-modules/datadog/default.nix +++ b/pkgs/development/python-modules/datadog/default.nix @@ -1,6 +1,19 @@ -{ lib, buildPythonPackage, fetchPypi, pythonOlder -, decorator, requests, simplejson, pillow, typing -, nose, mock, pytest, freezegun }: +{ lib +, buildPythonPackage +, fetchPypi +, pythonOlder +, decorator +, requests +, typing +, configparser +, click +, freezegun +, mock +, pytestCheckHook +, pytest-vcr +, python-dateutil +, vcrpy +}: buildPythonPackage rec { pname = "datadog"; @@ -15,13 +28,30 @@ buildPythonPackage rec { find . -name '*.pyc' -exec rm {} \; ''; - propagatedBuildInputs = [ decorator requests simplejson pillow ] - ++ lib.optionals (pythonOlder "3.5") [ typing ]; + propagatedBuildInputs = [ decorator requests ] + ++ lib.optional (pythonOlder "3.5") typing + ++ lib.optional (pythonOlder "3.0") configparser; - checkInputs = [ nose mock pytest freezegun ]; - checkPhase = '' - pytest tests/unit - ''; + checkInputs = [ + click + freezegun + mock + pytestCheckHook + pytest-vcr + python-dateutil + vcrpy + ]; + + disabledTestPaths = [ + "tests/unit/dogstatsd/test_statsd.py" # does not work in sandbox + ]; + + disabledTests = [ + "test_default_settings_set" + "test_threadstats_thread_safety" + ]; + + pythonImportsCheck = [ "datadog" ]; meta = with lib; { description = "The Datadog Python library"; diff --git a/pkgs/development/python-modules/django-mailman3/default.nix b/pkgs/development/python-modules/django-mailman3/default.nix index 6419aa2c6d542..54cde59a4bded 100644 --- a/pkgs/development/python-modules/django-mailman3/default.nix +++ b/pkgs/development/python-modules/django-mailman3/default.nix @@ -21,10 +21,12 @@ buildPythonPackage rec { PYTHONPATH=.:$PYTHONPATH django-admin.py test --settings=django_mailman3.tests.settings_test ''; + pythonImportsCheck = [ "django_mailman3" ]; + meta = with lib; { description = "Django library for Mailman UIs"; homepage = "https://gitlab.com/mailman/django-mailman3"; - license = licenses.gpl3; + license = licenses.gpl3Plus; maintainers = with maintainers; [ globin peti ]; }; } diff --git a/pkgs/development/python-modules/dulwich/default.nix b/pkgs/development/python-modules/dulwich/default.nix index e6b02b6399fbd..a4c8cb7227fa7 100644 --- a/pkgs/development/python-modules/dulwich/default.nix +++ b/pkgs/development/python-modules/dulwich/default.nix @@ -13,12 +13,12 @@ }: buildPythonPackage rec { - version = "0.20.19"; + version = "0.20.20"; pname = "dulwich"; src = fetchPypi { inherit pname version; - sha256 = "7a5c976c5ce737ec207be1815c654351bf1d0387fc6480ed32cd58c9d0e2cda9"; + sha256 = "sha256-QmlZuXBfrcxsgg5a3zKR1xpIq6CvzPdBFCLjMI8RX4c="; }; LC_ALL = "en_US.UTF-8"; diff --git a/pkgs/development/python-modules/exdown/default.nix b/pkgs/development/python-modules/exdown/default.nix index 44d151172844f..946665add3ff9 100644 --- a/pkgs/development/python-modules/exdown/default.nix +++ b/pkgs/development/python-modules/exdown/default.nix @@ -3,14 +3,14 @@ buildPythonPackage rec { pname = "exdown"; - version = "0.7.1"; + version = "0.8.5"; format = "pyproject"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "sha256-vnSso3vmPIjX7JX+NwoxguwqwPHocJACeh5H0ClPcUI="; + sha256 = "1ly67whyfn74nr0dncarf3xbd96hacvzgjihx4ibckkc4h9z46bj"; }; propagatedBuildInputs = lib.optionals (pythonOlder "3.8") [ importlib-metadata ]; diff --git a/pkgs/development/python-modules/exrex/default.nix b/pkgs/development/python-modules/exrex/default.nix new file mode 100644 index 0000000000000..8c980c8d00fad --- /dev/null +++ b/pkgs/development/python-modules/exrex/default.nix @@ -0,0 +1,25 @@ +{ lib +, buildPythonPackage +, fetchPypi +}: + +buildPythonPackage rec { + pname = "exrex"; + version = "0.10.5"; + + src = fetchPypi { + inherit pname version; + sha256 = "1wq8nyycdprxl9q9y1pfhkbca4rvysj45h1xn7waybl3v67v3f1z"; + }; + + # Projec thas no released tests + doCheck = false; + pythonImportsCheck = [ "exrex" ]; + + meta = with lib; { + description = "Irregular methods on regular expressions"; + homepage = "https://github.com/asciimoo/exrex"; + license = with licenses; [ agpl3Plus ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/google-cloud-bigquery/default.nix b/pkgs/development/python-modules/google-cloud-bigquery/default.nix index 644c7ef91858e..228f3b68b61b9 100644 --- a/pkgs/development/python-modules/google-cloud-bigquery/default.nix +++ b/pkgs/development/python-modules/google-cloud-bigquery/default.nix @@ -17,11 +17,11 @@ buildPythonPackage rec { pname = "google-cloud-bigquery"; - version = "2.9.0"; + version = "2.10.0"; src = fetchPypi { inherit pname version; - sha256 = "33fcbdf5567bdb7657fb3485f061e7f1b45361f65fdafc168ab9172117fd9a5a"; + sha256 = "fac9adb1394d948e259fba1df4e86a6c34cfccaf19af7bdbdf9640cf6e313a71"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/gradient_statsd/default.nix b/pkgs/development/python-modules/gradient_statsd/default.nix index ada005d14f8ea..180e20c9f5607 100644 --- a/pkgs/development/python-modules/gradient_statsd/default.nix +++ b/pkgs/development/python-modules/gradient_statsd/default.nix @@ -1,5 +1,5 @@ { lib, fetchPypi, buildPythonPackage -, boto3, requests, datadog, configparser, python +, requests, datadog, configparser, python }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/meshio/default.nix b/pkgs/development/python-modules/meshio/default.nix new file mode 100644 index 0000000000000..2c293b3b9c267 --- /dev/null +++ b/pkgs/development/python-modules/meshio/default.nix @@ -0,0 +1,40 @@ +{ lib +, buildPythonPackage +, fetchPypi +, numpy +, netcdf4 +, h5py +, exdown +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "meshio"; + version = "4.3.10"; + format = "pyproject"; + + src = fetchPypi { + inherit pname version; + sha256 = "1i34bk8bbc0dnizrlgj0yxnbzyvndkmnl6ryymxgcl9rv1abkfki"; + }; + + propagatedBuildInputs = [ + numpy + netcdf4 + h5py + ]; + + checkInputs = [ + exdown + pytestCheckHook + ]; + + pythonImportsCheck = ["meshio"]; + + meta = with lib; { + homepage = "https://github.com/nschloe/meshio"; + description = "I/O for mesh files."; + license = licenses.mit; + maintainers = with maintainers; [ wd15 ]; + }; +} diff --git a/pkgs/development/python-modules/myjwt/default.nix b/pkgs/development/python-modules/myjwt/default.nix new file mode 100644 index 0000000000000..d80e66e07bf03 --- /dev/null +++ b/pkgs/development/python-modules/myjwt/default.nix @@ -0,0 +1,58 @@ +{ lib +, stdenv +, buildPythonPackage +, fetchFromGitHub +, click +, colorama +, cryptography +, exrex +, pyopenssl +, pyperclip +, questionary +, requests +, pytestCheckHook +, pytest-mock +, requests-mock +}: + +buildPythonPackage rec { + pname = "myjwt"; + version = "1.4.0"; + + src = fetchFromGitHub { + owner = "mBouamama"; + repo = "MyJWT"; + rev = version; + sha256 = "1n3lvdrzp6wbbcygjwa7xar2jnhjnrz7a9khmn2phhkkngxm5rc4"; + }; + + patches = [ ./pinning.patch ]; + + propagatedBuildInputs = [ + click + colorama + cryptography + exrex + pyopenssl + pyperclip + questionary + requests + ]; + + checkInputs = [ + pytestCheckHook + pytest-mock + requests-mock + ]; + + pythonImportsCheck = [ "myjwt" ]; + + meta = with lib; { + description = "CLI tool for testing vulnerabilities on Json Web Token(JWT)"; + homepage = "https://github.com/mBouamama/MyJWT"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + # Build failures + broken = stdenv.isDarwin; + }; +} diff --git a/pkgs/development/python-modules/myjwt/pinning.patch b/pkgs/development/python-modules/myjwt/pinning.patch new file mode 100644 index 0000000000000..abae9d0e2ecb5 --- /dev/null +++ b/pkgs/development/python-modules/myjwt/pinning.patch @@ -0,0 +1,21 @@ +diff --git a/requirements.txt b/requirements.txt +index 3017e02..2b465db 100644 +--- a/requirements.txt ++++ b/requirements.txt +@@ -1,8 +1,8 @@ +-click==7.1.2 +-colorama==0.4.4 +-cryptography==3.3.1 +-exrex==0.10.5 +-pyOpenSSL==20.0.1 +-pyperclip==1.8.1 +-questionary==1.9.0 +-requests==2.25.1 ++click ++colorama ++cryptography ++exrex ++pyOpenSSL ++pyperclip ++questionary ++requests diff --git a/pkgs/development/python-modules/pillow/default.nix b/pkgs/development/python-modules/pillow/default.nix index 5597f459219b0..60af19347fad6 100644 --- a/pkgs/development/python-modules/pillow/default.nix +++ b/pkgs/development/python-modules/pillow/default.nix @@ -5,13 +5,13 @@ import ./generic.nix (rec { pname = "Pillow"; - version = "8.1.0"; + version = "8.1.1"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "1fnvc07m15fv59bdlkds1q7rl9jrr3cbbn69sfqvzvdpjbknhxl8"; + sha256 = "1fnvc07m15fv59bdlkds1q7rl9jrr3cbbn69sfqvzvdpjbknhxl9"; }; meta = with lib; { diff --git a/pkgs/development/python-modules/protobuf/default.nix b/pkgs/development/python-modules/protobuf/default.nix index aa4d00892dd8e..60c6f333275be 100644 --- a/pkgs/development/python-modules/protobuf/default.nix +++ b/pkgs/development/python-modules/protobuf/default.nix @@ -1,6 +1,5 @@ { buildPackages , lib -, stdenv , fetchpatch , python , buildPythonPackage diff --git a/pkgs/development/python-modules/pyinsteon/default.nix b/pkgs/development/python-modules/pyinsteon/default.nix index 8596883326bac..cd8c566c46543 100644 --- a/pkgs/development/python-modules/pyinsteon/default.nix +++ b/pkgs/development/python-modules/pyinsteon/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "pyinsteon"; - version = "1.0.8"; + version = "1.0.9"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "0d028fcqmdzxp0vsz7digx794s9l65ydsnsyvyx275z6577x7h4h"; + sha256 = "sha256-+3tA+YdpTKDt7uOSl6Z1G8jTjpBJ8S9gjiQTacQSFTc="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pylutron/default.nix b/pkgs/development/python-modules/pylutron/default.nix index 33dfde5cbb87f..b9ed3cc20e266 100644 --- a/pkgs/development/python-modules/pylutron/default.nix +++ b/pkgs/development/python-modules/pylutron/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "c305530e9a114ff4c8261a116a9d13d356bc82662dfaf7ca73e01346cea9841e"; + sha256 = "sha256-wwVTDpoRT/TIJhoRap0T01a8gmYt+vfKc+ATRs6phB4="; }; # Project has no tests diff --git a/pkgs/development/python-modules/pymyq/default.nix b/pkgs/development/python-modules/pymyq/default.nix index e93d0b602b4d8..71788db45c9aa 100644 --- a/pkgs/development/python-modules/pymyq/default.nix +++ b/pkgs/development/python-modules/pymyq/default.nix @@ -4,17 +4,19 @@ , buildPythonPackage , fetchFromGitHub , pkce +, pythonOlder }: buildPythonPackage rec { pname = "pymyq"; - version = "3.0.3"; + version = "3.0.4"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "arraylabs"; repo = pname; rev = "v${version}"; - sha256 = "1wrfnbz87ns2ginyvljna0axl35s0xfaiqwzapxm8ira40ax5wrl"; + sha256 = "sha256-jeoFlLBjD81Bt6E75rk4U1Ach53KGy23QGx+A6X2rpg="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pyside/shiboken.nix b/pkgs/development/python-modules/pyside/shiboken.nix index 2690422932f2b..fb6d2f6d2298a 100644 --- a/pkgs/development/python-modules/pyside/shiboken.nix +++ b/pkgs/development/python-modules/pyside/shiboken.nix @@ -18,7 +18,6 @@ buildPythonPackage rec { pname = "pyside-shiboken"; version = "1.2.4"; format = "other"; - disabled = !isPy3k; src = fetchFromGitHub { owner = "PySide"; diff --git a/pkgs/development/python-modules/pysvn/default.nix b/pkgs/development/python-modules/pysvn/default.nix index 9e9948607093c..37e3490a54c7c 100644 --- a/pkgs/development/python-modules/pysvn/default.nix +++ b/pkgs/development/python-modules/pysvn/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { format = "other"; src = fetchurl { - url = "http://pysvn.barrys-emacs.org/source_kits/${pname}-${version}.tar.gz"; + url = "https://pysvn.barrys-emacs.org/source_kits/${pname}-${version}.tar.gz"; sha256 = "sRPa4wNyjDmGdF1gTOgLS0pnrdyZwkkH4/9UCdh/R9Q="; }; @@ -79,5 +79,7 @@ buildPythonPackage rec { description = "Python bindings for Subversion"; homepage = "http://pysvn.tigris.org/"; license = licenses.asl20; + # g++: command not found + broken = stdenv.isDarwin; }; } diff --git a/pkgs/development/python-modules/questionary/default.nix b/pkgs/development/python-modules/questionary/default.nix new file mode 100644 index 0000000000000..ecb33f6adb159 --- /dev/null +++ b/pkgs/development/python-modules/questionary/default.nix @@ -0,0 +1,39 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, poetry +, prompt_toolkit +, pytest-cov +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "questionary"; + version = "1.9.0"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "tmbo"; + repo = pname; + rev = version; + sha256 = "1x748bz7l2r48031dj6vr6jvvac28pv6vx1bina4lz60h1qac1kf"; + }; + + nativeBuildInputs = [ poetry ]; + + propagatedBuildInputs = [ prompt_toolkit ]; + + checkInputs = [ + pytest-cov + pytestCheckHook + ]; + + pythonImportsCheck = [ "questionary" ]; + + meta = with lib; { + description = "Python library to build command line user prompts"; + homepage = "https://github.com/bachya/regenmaschine"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/readme_renderer/default.nix b/pkgs/development/python-modules/readme_renderer/default.nix index 57a84e69d205d..0d22a0c56c9f4 100644 --- a/pkgs/development/python-modules/readme_renderer/default.nix +++ b/pkgs/development/python-modules/readme_renderer/default.nix @@ -1,40 +1,45 @@ { lib +, bleach , buildPythonPackage -, fetchPypi -, pytest -, mock , cmarkgfm -, bleach , docutils +, fetchPypi , future +, mock , pygments -, six +, pytestCheckHook +, pythonOlder }: buildPythonPackage rec { pname = "readme_renderer"; - version = "28.0"; + version = "29.0"; + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "6b7e5aa59210a40de72eb79931491eaf46fefca2952b9181268bd7c7c65c260a"; + sha256 = "sha256-kv1awr+Gd/MQ8zA6pLzludX58glKuYwp8TeR17gFo9s="; }; - checkInputs = [ pytest mock ]; - propagatedBuildInputs = [ - bleach cmarkgfm docutils future pygments six + bleach + cmarkgfm + docutils + future + pygments + ]; + + checkInputs = [ + mock + pytestCheckHook ]; - checkPhase = '' - # disable one failing test case - # fixtures test is failing for incorrect class name - py.test -k "not test_invalid_link and not fixtures" - ''; + pythonImportsCheck = [ "readme_renderer" ]; - meta = { - description = "readme_renderer is a library for rendering readme descriptions for Warehouse"; + meta = with lib; { + description = "Python library for rendering readme descriptions"; homepage = "https://github.com/pypa/readme_renderer"; - license = lib.licenses.asl20; + license = with licenses; [ asl20 ]; + maintainers = with maintainers; [ fab ]; }; } diff --git a/pkgs/development/python-modules/requests/default.nix b/pkgs/development/python-modules/requests/default.nix index 20ba44ee2a860..060866b04e87c 100644 --- a/pkgs/development/python-modules/requests/default.nix +++ b/pkgs/development/python-modules/requests/default.nix @@ -33,6 +33,9 @@ buildPythonPackage rec { pytestCheckHook ]; + # AttributeError: 'KeywordMapping' object has no attribute 'get' + doCheck = ! isPy27; + disabledTests = [ # Disable tests that require network access and use httpbin "requests.api.request" @@ -56,7 +59,5 @@ buildPythonPackage rec { homepage = "http://docs.python-requests.org/en/latest/"; license = licenses.asl20; maintainers = with maintainers; [ fab ]; - # AttributeError: 'KeywordMapping' object has no attribute 'get' - broken = isPy27; }; } diff --git a/pkgs/development/python-modules/rfcat/default.nix b/pkgs/development/python-modules/rfcat/default.nix new file mode 100644 index 0000000000000..7bb390e79a22b --- /dev/null +++ b/pkgs/development/python-modules/rfcat/default.nix @@ -0,0 +1,50 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, future +, ipython +, numpy +, pyserial +, pyusb +, hostPlatform +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "rfcat"; + version = "1.9.5"; + + src = fetchFromGitHub { + owner = "atlas0fd00m"; + repo = "rfcat"; + rev = "v${version}"; + sha256 = "1mmr7g7ma70sk6vl851430nqnd7zxsk7yb0xngwrdx9z7fbz2ck0"; + }; + + propagatedBuildInputs = [ + future + ipython + numpy + pyserial + pyusb + ]; + + postInstall = lib.optionalString hostPlatform.isLinux '' + mkdir -p $out/etc/udev/rules.d + cp etc/udev/rules.d/20-rfcat.rules $out/etc/udev/rules.d + ''; + + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ "rflib" ]; + + meta = with lib; { + description = "Swiss Army knife of sub-GHz ISM band radio"; + homepage = "https://github.com/atlas0fd00m/rfcat"; + license = licenses.bsd3; + maintainers = with maintainers; [ trepetti ]; + changelog = "https://github.com/atlas0fd00m/rfcat/releases/tag/v${version}"; + }; +} diff --git a/pkgs/development/python-modules/sagemaker/default.nix b/pkgs/development/python-modules/sagemaker/default.nix index ad25df58b105d..116f4b6f676e1 100644 --- a/pkgs/development/python-modules/sagemaker/default.nix +++ b/pkgs/development/python-modules/sagemaker/default.nix @@ -14,11 +14,11 @@ buildPythonPackage rec { pname = "sagemaker"; - version = "2.27.0"; + version = "2.28.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-1u5icjqz23j0QUToStZZMklBAYF4A1cfBqzg83MQAQI="; + sha256 = "sha256-SOk4VM227gAlLX615xPy0lcATRzth7M3HGH557iF2Wc="; }; pythonImportsCheck = [ diff --git a/pkgs/development/python-modules/setuptools-rust/default.nix b/pkgs/development/python-modules/setuptools-rust/default.nix index cdf5e5aa27fc0..e3d8a35186a91 100644 --- a/pkgs/development/python-modules/setuptools-rust/default.nix +++ b/pkgs/development/python-modules/setuptools-rust/default.nix @@ -5,14 +5,13 @@ , isPy27 , semantic-version , setuptools -, setuptools_scm +, setuptools-scm , toml }: buildPythonPackage rec { pname = "setuptools-rust"; version = "0.11.6"; - disabled = isPy27; src = fetchPypi { @@ -20,10 +19,14 @@ buildPythonPackage rec { sha256 = "a5b5954909cbc5d66b914ee6763f81fa2610916041c7266105a469f504a7c4ca"; }; - nativeBuildInputs = [ setuptools_scm ]; + nativeBuildInputs = [ setuptools-scm ]; propagatedBuildInputs = [ semantic-version setuptools toml ]; + # no tests + doCheck = false; + pythonImportsCheck = [ "setuptools_rust" ]; + passthru.tests.pyo3 = callPackage ./pyo3-test {}; meta = with lib; { diff --git a/pkgs/development/python-modules/sfepy/default.nix b/pkgs/development/python-modules/sfepy/default.nix index 8a37f41086eae..dacd589b1212a 100644 --- a/pkgs/development/python-modules/sfepy/default.nix +++ b/pkgs/development/python-modules/sfepy/default.nix @@ -9,15 +9,21 @@ , cython , python , sympy +, meshio +, mpi4py +, psutil +, openssh +, pythonOlder }: buildPythonPackage rec { - name = "sfepy_${version}"; - version = "2019.4"; + name = "sfepy"; + version = "2020.4"; + disabled = pythonOlder "3.8"; src = fetchurl { url="https://github.com/sfepy/sfepy/archive/release_${version}.tar.gz"; - sha256 = "1l9vgcw09l6bwhgfzlbn68fzpvns25r6nkd1pcp7hz5165hs6zzn"; + sha256 = "1wb0ik6kjg3mksxin0abr88bhsly67fpg36qjdzabhj0xn7j1yaz"; }; propagatedBuildInputs = [ @@ -28,12 +34,15 @@ buildPythonPackage rec { pyparsing tables sympy + meshio + mpi4py + psutil + openssh ]; postPatch = '' - # broken test - rm tests/test_homogenization_perfusion.py - rm tests/test_splinebox.py + # broken tests + rm tests/test_meshio.py # slow tests rm tests/test_input_*.py @@ -47,6 +56,7 @@ buildPythonPackage rec { ''; checkPhase = '' + export OMPI_MCA_plm_rsh_agent=${openssh}/bin/ssh export HOME=$TMPDIR mv sfepy sfepy.hidden mkdir -p $HOME/.matplotlib diff --git a/pkgs/development/python-modules/sphinx-autobuild/default.nix b/pkgs/development/python-modules/sphinx-autobuild/default.nix index 958c1a6b19c5e..739ea2afa820b 100644 --- a/pkgs/development/python-modules/sphinx-autobuild/default.nix +++ b/pkgs/development/python-modules/sphinx-autobuild/default.nix @@ -1,5 +1,4 @@ { lib -, stdenv , buildPythonPackage , fetchPypi , sphinx diff --git a/pkgs/development/python-modules/subarulink/default.nix b/pkgs/development/python-modules/subarulink/default.nix index 5b6362b76a147..ac80be2fe0c53 100644 --- a/pkgs/development/python-modules/subarulink/default.nix +++ b/pkgs/development/python-modules/subarulink/default.nix @@ -12,13 +12,13 @@ buildPythonPackage rec { pname = "subarulink"; - version = "0.3.11"; + version = "0.3.12"; src = fetchFromGitHub { owner = "G-Two"; repo = pname; rev = "subaru-v${version}"; - sha256 = "1ink9bhph6blidnfsqwq01grhp7ghacmkd4vzgb9hnhl9l52s1jq"; + sha256 = "0mhy4np3g10k778062sp2q65cfjhp4y1fghn8yvs6qg6jmg047z6"; }; propagatedBuildInputs = [ aiohttp stdiomask ]; diff --git a/pkgs/development/python-modules/w3lib/default.nix b/pkgs/development/python-modules/w3lib/default.nix index 0c80423e36a22..a626bdd6ec02a 100644 --- a/pkgs/development/python-modules/w3lib/default.nix +++ b/pkgs/development/python-modules/w3lib/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , fetchPypi , six -, pytest +, pytestCheckHook }: buildPythonPackage rec { @@ -14,7 +14,14 @@ buildPythonPackage rec { sha256 = "1pv02lvvmgz2qb61vz1jkjc04fgm4hpfvaj5zm4i3mjp64hd1mha"; }; - buildInputs = [ six pytest ]; + propagatedBuildInputs = [ six ]; + + checkInputs = [ pytestCheckHook ]; + pythonImportsCheck = [ "w3lib" ]; + + disabledTests = [ + "test_add_or_replace_parameter" + ]; meta = with lib; { description = "A library of web-related functions"; @@ -22,5 +29,4 @@ buildPythonPackage rec { license = licenses.bsd3; maintainers = with maintainers; [ drewkett ]; }; - } diff --git a/pkgs/development/python-modules/xknx/default.nix b/pkgs/development/python-modules/xknx/default.nix index 841348339a718..72a5474886330 100644 --- a/pkgs/development/python-modules/xknx/default.nix +++ b/pkgs/development/python-modules/xknx/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "xknx"; - version = "0.17.0"; + version = "0.17.1"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "XKNX"; repo = pname; rev = version; - sha256 = "sha256-fzLqkeCfeLNu13R9cp1XVh8fE2B3L47UDpuWOod33gU="; + sha256 = "sha256-FNI6zodwlYdJDxncCOubClG9L1U6HGkQxdEEp0LdW04="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/tools/build-managers/sbt-extras/default.nix b/pkgs/development/tools/build-managers/sbt-extras/default.nix index f16d2838c9e27..f25dfe6c28a77 100644 --- a/pkgs/development/tools/build-managers/sbt-extras/default.nix +++ b/pkgs/development/tools/build-managers/sbt-extras/default.nix @@ -3,14 +3,14 @@ stdenv.mkDerivation rec { pname = "sbt-extras"; - rev = "dc4f350f112580fcdf5f6fa7e8d5d2116475f84a"; - version = "2021-03-01"; + rev = "2c582cdbb37dd487bf2140010ddd2e20f3c1394e"; + version = "2021-03-03"; src = fetchFromGitHub { owner = "paulp"; repo = "sbt-extras"; inherit rev; - sha256 = "00qlmxnxmsjs5z03sd46j9spcz1jjkabip4z6f6r43pahjqyd0dk"; + sha256 = "1j4j46gzw05bis7akvzfdj36xdwxcabq66wyf917z8vsy31vvajp"; }; dontBuild = true; @@ -18,6 +18,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ makeWrapper ]; installPhase = '' + runHook preInstall + mkdir -p $out/bin substituteInPlace bin/sbt --replace 'declare java_cmd="java"' 'declare java_cmd="${jdk}/bin/java"' @@ -25,6 +27,8 @@ stdenv.mkDerivation rec { install bin/sbt $out/bin wrapProgram $out/bin/sbt --prefix PATH : ${lib.makeBinPath [ which curl ]} + + runHook postInstall ''; doInstallCheck = true; diff --git a/pkgs/development/tools/build-managers/sbt/default.nix b/pkgs/development/tools/build-managers/sbt/default.nix index c9518d685b513..7ea10ac90abb3 100644 --- a/pkgs/development/tools/build-managers/sbt/default.nix +++ b/pkgs/development/tools/build-managers/sbt/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-wqdZ/kCjwhoWtaiNAM1m869vByHk6mG2OULfuDotVP0="; }; - patchPhase = '' + postPatch = '' echo -java-home ${jre.home} >>conf/sbtopts ''; @@ -25,17 +25,16 @@ stdenv.mkDerivation rec { buildInputs = lib.optionals stdenv.isLinux [ zlib ]; installPhase = '' + runHook preInstall + mkdir -p $out/share/sbt $out/bin cp -ra . $out/share/sbt ln -sT ../share/sbt/bin/sbt $out/bin/sbt ln -sT ../share/sbt/bin/sbtn-x86_64-${ if (stdenv.isDarwin) then "apple-darwin" else "pc-linux" } $out/bin/sbtn - ''; - doInstallCheck = true; - installCheckPhase = '' - ($out/bin/sbt --offline --version 2>&1 || true) | grep 'getting org.scala-sbt sbt ${version} (this may take some time)' + runHook postInstall ''; meta = with lib; { diff --git a/pkgs/development/tools/checkmake/default.nix b/pkgs/development/tools/checkmake/default.nix index c48dbe680238d..3c21af8ff38d7 100644 --- a/pkgs/development/tools/checkmake/default.nix +++ b/pkgs/development/tools/checkmake/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchFromGitHub, git, pandoc, lib }: +{ buildGoPackage, fetchFromGitHub, git, pandoc, lib }: buildGoPackage rec { pname = "checkmake"; diff --git a/pkgs/development/tools/continuous-integration/buildkite-agent/generic.nix b/pkgs/development/tools/continuous-integration/buildkite-agent/generic.nix index 64ca730d7dc04..3b9de427bde0d 100644 --- a/pkgs/development/tools/continuous-integration/buildkite-agent/generic.nix +++ b/pkgs/development/tools/continuous-integration/buildkite-agent/generic.nix @@ -1,4 +1,4 @@ -{ buildGoPackage, makeWrapper, coreutils, git, openssh, bash, gnused, gnugrep +{ lib, buildGoPackage, makeWrapper, coreutils, git, openssh, bash, gnused, gnugrep , src, version, hasBootstrapScript, postPatch ? "" , ... }: let diff --git a/pkgs/development/tools/go-mockery/default.nix b/pkgs/development/tools/go-mockery/default.nix new file mode 100644 index 0000000000000..db876ea09f2fc --- /dev/null +++ b/pkgs/development/tools/go-mockery/default.nix @@ -0,0 +1,22 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "go-mockery"; + version = "2.5.1"; + + src = fetchFromGitHub { + owner = "vektra"; + repo = "mockery"; + rev = "v${version}"; + sha256 = "5W5WGWqxpZzOqk1VOlLeggIqfneRb7s7ZT5faNEhDos="; + }; + + vendorSha256 = "//V3ia3YP1hPgC1ipScURZ5uXU4A2keoG6dGuwaPBcA="; + + meta = with lib; { + homepage = "https://github.com/vektra/mockery"; + description = "A mock code autogenerator for Golang"; + maintainers = with maintainers; [ fbrs ]; + license = licenses.bsd3; + }; +} diff --git a/pkgs/development/tools/gops/default.nix b/pkgs/development/tools/gops/default.nix index 35d7cf50a7ede..0f0230049cf99 100644 --- a/pkgs/development/tools/gops/default.nix +++ b/pkgs/development/tools/gops/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "gops"; - version = "0.3.15"; + version = "0.3.16"; src = fetchFromGitHub { owner = "google"; repo = "gops"; rev = "v${version}"; - sha256 = "091idnsgbwabmm5s9zhm474fbxvjvpkvwg68snbypfll7wdr3phy"; + sha256 = "1ksypkja5smxvrhgcjk0w18ws97crx6bx5sj20sh8352xx0nm6mp"; }; vendorSha256 = null; diff --git a/pkgs/development/tools/luaformatter/default.nix b/pkgs/development/tools/luaformatter/default.nix new file mode 100644 index 0000000000000..991f1a377170a --- /dev/null +++ b/pkgs/development/tools/luaformatter/default.nix @@ -0,0 +1,30 @@ +{ cmake, fetchFromGitHub, lib, stdenv }: + +stdenv.mkDerivation rec { + pname = "luaformatter"; + version = "1.3.4"; + + src = fetchFromGitHub { + owner = "koihik"; + repo = "luaformatter"; + rev = version; + sha256 = "163190g37r6npg5k5mhdwckdhv9nwy2gnfp5jjk8p0s6cyvydqjw"; + fetchSubmodules = true; + }; + + nativeBuildInputs = [ cmake ]; + + installPhase = '' + runHook preInstall + mkdir -p $out/bin + cp lua-format $out/bin + runHook postInstall + ''; + + meta = with lib; { + description = "Code formatter for lua"; + homepage = "https://github.com/koihik/luaformatter"; + license = licenses.asl20; + maintainers = with maintainers; [ figsoda ]; + }; +} diff --git a/pkgs/development/tools/misc/hound/default.nix b/pkgs/development/tools/misc/hound/default.nix index 201241fb8350d..e5bf07089861f 100644 --- a/pkgs/development/tools/misc/hound/default.nix +++ b/pkgs/development/tools/misc/hound/default.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "hound"; - version = "unstable-2021-01-26"; + version = "0.4.0"; src = fetchFromGitHub { owner = "hound-search"; repo = "hound"; - rev = "b88fc1f79d668e6671a478ddf4fb3e73a63067b9"; - sha256 = "00xc3cj7d3klvhsh9hivvjwgzb6lycw3r3w7nch98nv2j8iljc44"; + rev = "v${version}"; + sha256 = "0p5w54fr5xz19ff8k5xkyq3iqhjki8wc0hj2x1pnmk6hzrz6hf65"; }; vendorSha256 = "0x1nhhhvqmz3qssd2d44zaxbahj8lh9r4m5jxdvzqk6m3ly7y0b6"; diff --git a/pkgs/development/tools/misc/nxpmicro-mfgtools/default.nix b/pkgs/development/tools/misc/nxpmicro-mfgtools/default.nix index a35cc57b82572..8b603fbc5ce52 100644 --- a/pkgs/development/tools/misc/nxpmicro-mfgtools/default.nix +++ b/pkgs/development/tools/misc/nxpmicro-mfgtools/default.nix @@ -25,6 +25,14 @@ stdenv.mkDerivation rec { preConfigure = "echo ${version} > .tarball-version"; + postInstall = '' + # rules printed by the following invocation are static, + # they come from hardcoded configs in libuuu/config.cpp:48 + $out/bin/uuu -udev > udev-rules 2>stderr.txt + rules_file="$(cat stderr.txt|grep '1: put above udev run into'|sed 's|^.*/||')" + install -D udev-rules "$out/lib/udev/rules.d/$rules_file" + ''; + meta = with lib; { description = "Freescale/NXP I.MX chip image deploy tools"; longDescription = '' diff --git a/pkgs/development/tools/parsing/tree-sitter/default.nix b/pkgs/development/tools/parsing/tree-sitter/default.nix index 78fb3b7f937f2..44d2a8d3c15b0 100644 --- a/pkgs/development/tools/parsing/tree-sitter/default.nix +++ b/pkgs/development/tools/parsing/tree-sitter/default.nix @@ -16,14 +16,14 @@ let # 1) change all these hashes # 2) nix-build -A tree-sitter.updater.update-all-grammars # 3) run the ./result script that is output by that (it updates ./grammars) - version = "0.17.3"; - sha256 = "sha256-uQs80r9cPX8Q46irJYv2FfvuppwonSS5HVClFujaP+U="; - cargoSha256 = "sha256-fonlxLNh9KyEwCj7G5vxa7cM/DlcHNFbQpp0SwVQ3j4="; + version = "0.18.2"; + sha256 = "1kh3bqn28nal3mmwszbih8hbq25vxy3zd45pzj904yf0ds5ql684"; + cargoSha256 = "06jbn4ai5lrxzv51vfjzjs7kgxw4nh2vbafc93gma4k14gggyygc"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter"; - rev = version; + rev = "v${version}"; inherit sha256; fetchSubmodules = true; }; diff --git a/pkgs/development/tools/parsing/tree-sitter/grammar.nix b/pkgs/development/tools/parsing/tree-sitter/grammar.nix index f92e0d79426c8..d9ad21dea6138 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammar.nix +++ b/pkgs/development/tools/parsing/tree-sitter/grammar.nix @@ -30,7 +30,11 @@ stdenv.mkDerivation { if [ ! -f "$scanner_cc" ]; then scanner_cc="" fi - $CC -I$src/src/ -shared -o parser -Os $src/src/parser.c $scanner_cc -lstdc++ + scanner_c="$src/src/scanner.c" + if [ ! -f "$scanner_c" ]; then + scanner_c="" + fi + $CC -I$src/src/ -shared -o parser -Os $src/src/parser.c $scanner_cc $scanner_c -lstdc++ runHook postBuild ''; installPhase = '' diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-c-sharp.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-c-sharp.json index 81ccf5a847265..989f7bf536714 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-c-sharp.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-c-sharp.json @@ -1,9 +1,9 @@ { "url": "https://github.com/tree-sitter/tree-sitter-c-sharp", - "rev": "aae8ab2b681082ce7a35d8d5fdf75ffcf7f994e5", - "date": "2021-01-08T13:18:05+00:00", - "path": "/nix/store/fpx44l1j2dz3drnvfb7746d8zxn37gwi-tree-sitter-c-sharp", - "sha256": "107bxz9bhyixdla3xli06ism8rnkha7pa79hi7lyx00sfnjmgcc8", + "rev": "21ec3c3deb4365085aa353fadbc6a616d7769f9f", + "date": "2021-02-18T09:41:56-08:00", + "path": "/nix/store/8172rv05dvvlyp4cfmr2b41g4a20vlcf-tree-sitter-c-sharp", + "sha256": "1cc0ss09bfv2xy77bpcmy6y2hqis7a8xby9afcaxcn5llj593ynj", "fetchSubmodules": false, "deepClone": false, "leaveDotGit": false diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-c.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-c.json index 401bea63e0ac2..31301d981d08a 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-c.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-c.json @@ -1,9 +1,9 @@ { "url": "https://github.com/tree-sitter/tree-sitter-c", - "rev": "99151b1e9293c9e025498fee7e6691e1a52e1d03", - "date": "2020-05-14T11:39:30-07:00", - "path": "/nix/store/b5xqnw967s9a58wcpyspbkgbph6jxarv-tree-sitter-c", - "sha256": "07ax01r3npw13jlv20k15q2hdhqa0rwm2km6f5j50byqvmgfc6fm", + "rev": "fa408bc9e77f4b770bd1db984ca00c901ddf95fc", + "date": "2021-02-24T11:13:22-08:00", + "path": "/nix/store/8rlr93kjsvbpc8vgfxw02vcaprlfmprq-tree-sitter-c", + "sha256": "03nb8nlnkfw8p8bi4grfyh31l6419sk7ak2hnkpnnjs0y0gqb7jm", "fetchSubmodules": false, "deepClone": false, "leaveDotGit": false diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cpp.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cpp.json index a4538b1a932a7..d5878b65fa3c9 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cpp.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cpp.json @@ -1,9 +1,9 @@ { "url": "https://github.com/tree-sitter/tree-sitter-cpp", - "rev": "a35a275df92e7583df38f2de2562361f2b69987e", - "date": "2020-12-13T11:27:21-08:00", - "path": "/nix/store/l0mv4q1xdxz94ym1nl73y52i1yr9zcgi-tree-sitter-cpp", - "sha256": "130vizybkm11j3lpzmf183myz0vjxq75mpy6qz48rrkidhnrlryk", + "rev": "3bfe046f3967fef92ebb33f8cd58c3ff373d5e56", + "date": "2021-02-25T11:55:19-08:00", + "path": "/nix/store/m2sd8ic8j3dayfa0zz0shc2pjaamahpf-tree-sitter-cpp", + "sha256": "052imxj6920ia002pzgwj2rg75xq3xpa80w8sjdq4mnlksy8v7g6", "fetchSubmodules": false, "deepClone": false, "leaveDotGit": false diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-css.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-css.json index b8609c0bd17d1..6a4795d740501 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-css.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-css.json @@ -1,9 +1,9 @@ { "url": "https://github.com/tree-sitter/tree-sitter-css", - "rev": "23f2cb97d47860c517f67f03e1f4b621d5bd2085", - "date": "2020-05-14T14:44:30-07:00", - "path": "/nix/store/r5pkz9kly0mhgrmqzdzdsr6d1dpqavld-tree-sitter-css", - "sha256": "17svpf36p0p7spppzhm3fi833zpdl2l1scg34r6d4vcbv7dknrjy", + "rev": "e882c98b5e62d864f7f9e4d855b19b6050c897a8", + "date": "2021-02-12T10:45:27-08:00", + "path": "/nix/store/g368rqak07i91ddma16pkccp63y2s5yv-tree-sitter-css", + "sha256": "0firlbl81vxnw5dp31inabizjhqc37rnbvwf05668qpfjl9gc03z", "fetchSubmodules": false, "deepClone": false, "leaveDotGit": false diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-embedded-template.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-embedded-template.json index f0ef7079bf67a..02e4977fa333f 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-embedded-template.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-embedded-template.json @@ -1,9 +1,9 @@ { "url": "https://github.com/tree-sitter/tree-sitter-embedded-template", - "rev": "8269c1360e5b1b9ba3e04e7896d9dd2f060de12f", - "date": "2020-07-20T12:50:27-07:00", - "path": "/nix/store/9ijnzv72vc1n56k6f1xp3kb7lc9hvlhh-tree-sitter-embedded-template", - "sha256": "03symsaxp8m128cn5h14pnm30ihpc49syb4vybpdvgcvraa408qq", + "rev": "872f037009ae700e3d4c3f83284af8f51c184dd4", + "date": "2021-02-05T09:53:39-08:00", + "path": "/nix/store/qg1lmgjrvjxg05bf7dczx5my9r83rxyb-tree-sitter-embedded-template", + "sha256": "0iffxki8pqavvi0cyndgyr4gp0f4zcdbv7gn7ar4sp17pksk5ss6", "fetchSubmodules": false, "deepClone": false, "leaveDotGit": false diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-java.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-java.json index 260dc4d10c003..66c8594496956 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-java.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-java.json @@ -1,9 +1,9 @@ { "url": "https://github.com/tree-sitter/tree-sitter-java", - "rev": "f7b62ac33d63bea56ce202ace107aaa4285e50af", - "date": "2020-10-27T13:41:02-04:00", - "path": "/nix/store/h51zjbzdrm89gczcdv7nyih54vnd2xps-tree-sitter-java", - "sha256": "0jbh79brs1dskfqw05s9ndrp46hibyc37nfvhxlvanmgj3pjwgxb", + "rev": "16c07a726c34c9925b3e28716b2d6d60e3643252", + "date": "2021-02-11T09:32:05-08:00", + "path": "/nix/store/1b64g1a3cvq1hspys9z2z1lsawg2b9m2-tree-sitter-java", + "sha256": "1rag75r71cp8cvkf4f3wj911jppypziri19zysyy3pgzhznqy4zd", "fetchSubmodules": false, "deepClone": false, "leaveDotGit": false diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-javascript.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-javascript.json index 2c563f3fbfa49..8d1aa2daf53e3 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-javascript.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-javascript.json @@ -1,9 +1,9 @@ { "url": "https://github.com/tree-sitter/tree-sitter-javascript", - "rev": "3f8b62f9befd3cb3b4cb0de22f6595a0aadf76ca", - "date": "2020-12-02T10:20:20-08:00", - "path": "/nix/store/c17bf7sjq95lank5ygbglv8j48i5z9w3-tree-sitter-javascript", - "sha256": "0fjq1jzrzd8c8rfxkh2s25gnqlyc19k3a8i3r1129kakisn1288k", + "rev": "37af80d372ae9e2f5adc2c6321d5a34294dc348b", + "date": "2021-02-24T09:50:29-08:00", + "path": "/nix/store/y8jbjblicw2c65kil2y4d6vdn9r9h9w5-tree-sitter-javascript", + "sha256": "0cr75184abpg95bl6wgkqn7ay849bjsib48m9pdb5jrly1idw6n2", "fetchSubmodules": false, "deepClone": false, "leaveDotGit": false diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-nix.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-nix.json index 6d055ca0ae939..8d0b5aaf0e4f2 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-nix.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-nix.json @@ -1,9 +1,9 @@ { "url": "https://github.com/cstrahan/tree-sitter-nix", - "rev": "791b5ff0e4f0da358cbb941788b78d436a2ca621", - "date": "2019-05-10T15:57:43-05:00", - "path": "/nix/store/5gcddcxf6jfr4f0p203jnbjc0zxk207d-tree-sitter-nix", - "sha256": "1y5b3wh3fcmbgq8r2i97likzfp1zp02m58zacw5a1cjqs5raqz66", + "rev": "a6bae0619126d70c756c11e404d8f4ad5108242f", + "date": "2021-02-09T00:48:18-06:00", + "path": "/nix/store/1rfsi62v549h72vw7ysciaw17vr5h9yx-tree-sitter-nix", + "sha256": "08n496k0vn7c2751gywl1v40490azlri7c92dr2wfgw5jxhjmb0d", "fetchSubmodules": false, "deepClone": false, "leaveDotGit": false diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-python.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-python.json index ff60ff80101e7..ded864c897689 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-python.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-python.json @@ -1,9 +1,9 @@ { "url": "https://github.com/tree-sitter/tree-sitter-python", - "rev": "f568dfabf7c4611077467a9cd13297fa0658abb6", - "date": "2021-01-06T13:32:39-08:00", - "path": "/nix/store/5g256n8ym3ll2kp9jlmnkaxpnyf6rpk3-tree-sitter-python", - "sha256": "1lxmzrkw4k9pba4xywnbd1pk2x5s99qa4skgqvgy3imgbhy7ilkh", + "rev": "3196e288650992bca2399dda15ac703c342a22bb", + "date": "2021-01-19T11:31:59-08:00", + "path": "/nix/store/0y394nsknvjxpxnsfscab531mivnzhap-tree-sitter-python", + "sha256": "0fbkyysz0qsjqzqznwgf52wsgb10h8agc4p68zafiibwlp72gd09", "fetchSubmodules": false, "deepClone": false, "leaveDotGit": false diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ql.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ql.json index 27042b6ef9579..f799ce410c6c8 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ql.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ql.json @@ -1,9 +1,9 @@ { "url": "https://github.com/tree-sitter/tree-sitter-ql", - "rev": "a0d688d62dcb9cbc7c53f0d98343c458b3776b3d", - "date": "2020-09-16T12:56:09-07:00", - "path": "/nix/store/dfdaf6wg80dfw5fvdiir7n9nj6j30g3g-tree-sitter-ql", - "sha256": "0f6rfhrbvpg8czfa7mld45by3rp628bs6fyl47a8mn18w6x0n5g2", + "rev": "f3738c138ba753eed5da386c7321cb139d185d39", + "date": "2021-02-19T10:26:41+00:00", + "path": "/nix/store/dww93fp6psaw4lhiwyn8qajq8mvsyv5s-tree-sitter-ql", + "sha256": "15wqyf0q9arr4jh0dfjr5200rghy989wvf311cffma7706ngmgxb", "fetchSubmodules": false, "deepClone": false, "leaveDotGit": false diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-rust.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-rust.json index c02d03d11d94e..12d7f58aecb29 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-rust.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-rust.json @@ -1,9 +1,9 @@ { "url": "https://github.com/tree-sitter/tree-sitter-rust", - "rev": "2beedf23bedbd7b02b416518693e8eed3944d4a0", - "date": "2021-01-05T10:00:48-08:00", - "path": "/nix/store/2igv1zlnl535b86zj8s9s3ir4q85933x-tree-sitter-rust", - "sha256": "0iicwhxf1f56zqpsagbm8nr30fpssi970mi9i47az206dbs506ly", + "rev": "ab7f7962073fec96e0b64fbd1697263fe2c79281", + "date": "2021-02-16T21:17:08-08:00", + "path": "/nix/store/zy2sccixlk8lwkqamikz03j42s13ndjp-tree-sitter-rust", + "sha256": "06zmbwgsvyaz0wgja8r3ir06z67gix7i62zj0k3bbng6smdnhp9w", "fetchSubmodules": false, "deepClone": false, "leaveDotGit": false diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-typescript.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-typescript.json index fda72fc99c6ed..679d7e4ed6aed 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-typescript.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-typescript.json @@ -1,9 +1,9 @@ { "url": "https://github.com/tree-sitter/tree-sitter-typescript", - "rev": "2d1c7d5c10c33cb444d1781fa76f2936810afec4", - "date": "2021-01-07T09:49:56-08:00", - "path": "/nix/store/s65bv25523lwa9yrqbj9hsh0k4ig6pbx-tree-sitter-typescript", - "sha256": "09bv44n181az5rqjd43wngj9bghwy0237gpvs6xkjf9j19kvy0yi", + "rev": "543cbe44f16189f7f1b739cf268d70f373d94b87", + "date": "2021-02-25T11:54:57-08:00", + "path": "/nix/store/liyi8hkl55dcbs1wc4w2jw4zf717bb29-tree-sitter-typescript", + "sha256": "0ljhkhi8fp38l1n6wam7l8bdqxr95d0c1mf7i6p1gb6xrjzssik0", "fetchSubmodules": false, "deepClone": false, "leaveDotGit": false diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/default.nix b/pkgs/development/tools/poetry2nix/poetry2nix/default.nix index c23b50b8403ae..3b622c20559e9 100644 --- a/pkgs/development/tools/poetry2nix/poetry2nix/default.nix +++ b/pkgs/development/tools/poetry2nix/poetry2nix/default.nix @@ -4,6 +4,9 @@ , poetryLib ? import ./lib.nix { inherit lib pkgs; stdenv = pkgs.stdenv; } }: let + # Poetry2nix version + version = "1.16.0"; + inherit (poetryLib) isCompatible readTOML moduleName; /* The default list of poetry2nix override overlays */ @@ -70,8 +73,7 @@ let in lib.makeScope pkgs.newScope (self: { - # Poetry2nix version - version = "1.15.5"; + inherit version; /* Returns a package of editable sources whose changes will be available without needing to restart the nix-shell. diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/lib.nix b/pkgs/development/tools/poetry2nix/poetry2nix/lib.nix index 4626f7fec37e3..6af37b395e0cf 100644 --- a/pkgs/development/tools/poetry2nix/poetry2nix/lib.nix +++ b/pkgs/development/tools/poetry2nix/poetry2nix/lib.nix @@ -157,7 +157,7 @@ let missingBuildBackendError = "No build-system.build-backend section in pyproject.toml. " + "Add such a section as described in https://python-poetry.org/docs/pyproject/#poetry-and-pep-517"; requires = lib.attrByPath [ "build-system" "requires" ] (throw missingBuildBackendError) pyProject; - requiredPkgs = builtins.map (n: lib.elemAt (builtins.match "([^!=<>~\[]+).*" n) 0) requires; + requiredPkgs = builtins.map (n: lib.elemAt (builtins.match "([^!=<>~[]+).*" n) 0) requires; in builtins.map (drvAttr: pythonPackages.${drvAttr} or (throw "unsupported build system requirement ${drvAttr}")) requiredPkgs; diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix b/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix index 7a5233fecdf1e..2106708a28f68 100644 --- a/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix +++ b/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix @@ -250,6 +250,15 @@ self: super: } ); + gdal = super.gdal.overridePythonAttrs ( + old: { + preBuild = (old.preBuild or "") + '' + substituteInPlace setup.cfg \ + --replace "../../apps/gdal-config" '${pkgs.gdal}/bin/gdal-config' + ''; + } + ); + grandalf = super.grandalf.overridePythonAttrs ( old: { buildInputs = (old.buildInputs or [ ]) ++ [ self.pytest-runner ]; @@ -360,9 +369,13 @@ self: super: } ); - # disable the removal of pyproject.toml, required because of setuptools_scm jaraco-functools = super.jaraco-functools.overridePythonAttrs ( old: { + # required for the extra "toml" dependency in setuptools_scm[toml] + buildInputs = (old.buildInputs or [ ]) ++ [ + self.toml + ]; + # disable the removal of pyproject.toml, required because of setuptools_scm dontPreferSetupPy = true; } ); @@ -378,6 +391,15 @@ self: super: } ); + jsondiff = super.jsondiff.overridePythonAttrs ( + old: { + preBuild = (old.preBuild or "") + '' + substituteInPlace setup.py \ + --replace "'jsondiff=jsondiff.cli:main_deprecated'," "" + ''; + } + ); + jsonpickle = super.jsonpickle.overridePythonAttrs ( old: { dontPreferSetupPy = true; @@ -558,6 +580,13 @@ self: super: buildInputs = oa.buildInputs ++ [ self.pbr ]; }); + moto = super.moto.overridePythonAttrs ( + old: { + buildInputs = (old.buildInputs or [ ]) ++ + [ self.sshpubkeys ]; + } + ); + mpi4py = super.mpi4py.overridePythonAttrs ( old: let @@ -674,6 +703,12 @@ self: super: } ); + pdal = super.pdal.overridePythonAttrs ( + old: { + PDAL_CONFIG = "${pkgs.pdal}/bin/pdal-config"; + } + ); + peewee = super.peewee.overridePythonAttrs ( old: let @@ -733,9 +768,13 @@ self: super: ''; }); - # disable the removal of pyproject.toml, required because of setuptools_scm portend = super.portend.overridePythonAttrs ( old: { + # required for the extra "toml" dependency in setuptools_scm[toml] + buildInputs = (old.buildInputs or [ ]) ++ [ + self.toml + ]; + # disable the removal of pyproject.toml, required because of setuptools_scm dontPreferSetupPy = true; } ); @@ -920,6 +959,16 @@ self: super: } ); + pyproj = super.pyproj.overridePythonAttrs ( + old: { + buildInputs = (old.buildInputs or [ ]) ++ + [ self.cython ]; + PROJ_DIR = "${pkgs.proj}"; + PROJ_LIBDIR = "${pkgs.proj}/lib"; + PROJ_INCDIR = "${pkgs.proj.dev}/include"; + } + ); + python-bugzilla = super.python-bugzilla.overridePythonAttrs ( old: { nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ @@ -952,6 +1001,8 @@ self: super: old: { format = "other"; + dontWrapQtApps = true; + nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ pkgs.pkg-config pkgs.qt5.qmake @@ -1071,12 +1122,9 @@ self: super: pytest-runner = super.pytest-runner or super.pytestrunner; - python-jose = super.python-jose.overridePythonAttrs ( + pytest-pylint = super.pytest-pylint.overridePythonAttrs ( old: { - postPath = '' - substituteInPlace setup.py --replace "'pytest-runner'," "" - substituteInPlace setup.py --replace "'pytest-runner'" "" - ''; + buildInputs = [ self.pytest-runner ]; } ); @@ -1101,6 +1149,11 @@ self: super: ''; }); + python-jose = super.python-jose.overridePythonAttrs ( + old: { + buildInputs = [ self.pytest-runner ]; + } + ); ffmpeg-python = super.ffmpeg-python.overridePythonAttrs ( old: { @@ -1233,9 +1286,13 @@ self: super: } ); - # disable the removal of pyproject.toml, required because of setuptools_scm tempora = super.tempora.overridePythonAttrs ( old: { + # required for the extra "toml" dependency in setuptools_scm[toml] + buildInputs = (old.buildInputs or [ ]) ++ [ + self.toml + ]; + # disable the removal of pyproject.toml, required because of setuptools_scm dontPreferSetupPy = true; } ); diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/pkgs/poetry/poetry.lock b/pkgs/development/tools/poetry2nix/poetry2nix/pkgs/poetry/poetry.lock index 973733a6d617f..b1be7a3f4e5e7 100644 --- a/pkgs/development/tools/poetry2nix/poetry2nix/pkgs/poetry/poetry.lock +++ b/pkgs/development/tools/poetry2nix/poetry2nix/pkgs/poetry/poetry.lock @@ -16,15 +16,15 @@ python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*" [[package]] name = "attrs" -version = "20.2.0" +version = "20.3.0" description = "Classes Without Boilerplate" category = "dev" optional = false python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*" [package.extras] -dev = ["coverage[toml] (>=5.0.2)", "hypothesis", "pympler", "pytest (>=4.3.0)", "six", "zope.interface", "sphinx", "sphinx-rtd-theme", "pre-commit"] -docs = ["sphinx", "sphinx-rtd-theme", "zope.interface"] +dev = ["coverage[toml] (>=5.0.2)", "hypothesis", "pympler", "pytest (>=4.3.0)", "six", "zope.interface", "furo", "sphinx", "pre-commit"] +docs = ["furo", "sphinx", "zope.interface"] tests = ["coverage[toml] (>=5.0.2)", "hypothesis", "pympler", "pytest (>=4.3.0)", "six", "zope.interface"] tests_no_zope = ["coverage[toml] (>=5.0.2)", "hypothesis", "pympler", "pytest (>=4.3.0)", "six"] @@ -38,7 +38,7 @@ python-versions = ">=2.6" [package.extras] docs = ["sphinx", "jaraco.packaging (>=3.2)", "rst.linker (>=1.9)"] -testing = ["pytest (>=3.5,<3.7.3 || >3.7.3)", "pytest-checkdocs (>=1.2.3)", "pytest-flake8", "pytest-black-multipy", "pytest-cov"] +testing = ["pytest (>=3.5,!=3.7.3)", "pytest-checkdocs (>=1.2.3)", "pytest-flake8", "pytest-black-multipy", "pytest-cov"] [[package]] name = "cachecontrol" @@ -72,7 +72,7 @@ msgpack = ["msgpack-python (>=0.5,<0.6)"] [[package]] name = "certifi" -version = "2020.6.20" +version = "2020.12.5" description = "Python package for providing Mozilla's CA Bundle." category = "main" optional = false @@ -80,7 +80,7 @@ python-versions = "*" [[package]] name = "cffi" -version = "1.14.3" +version = "1.14.5" description = "Foreign Function Interface for Python calling C code." category = "main" optional = false @@ -99,11 +99,11 @@ python-versions = ">=3.6.1" [[package]] name = "chardet" -version = "3.0.4" +version = "4.0.0" description = "Universal encoding detector for Python 2 and 3" category = "main" optional = false -python-versions = "*" +python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*" [[package]] name = "cleo" @@ -134,7 +134,7 @@ typing-extensions = {version = ">=3.6,<4.0", markers = "python_version >= \"3.5\ [[package]] name = "colorama" -version = "0.4.3" +version = "0.4.4" description = "Cross-platform colored terminal text." category = "dev" optional = false @@ -150,7 +150,7 @@ python-versions = ">=2.6" [package.extras] docs = ["sphinx", "jaraco.packaging (>=3.2)", "rst.linker (>=1.9)"] -testing = ["pytest (>=3.5,<3.7.3 || >3.7.3)", "pytest-checkdocs (>=1.2)", "pytest-flake8", "pytest-black-multipy"] +testing = ["pytest (>=3.5,!=3.7.3)", "pytest-checkdocs (>=1.2)", "pytest-flake8", "pytest-black-multipy"] [[package]] name = "contextlib2" @@ -162,7 +162,7 @@ python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*" [[package]] name = "coverage" -version = "5.3" +version = "5.5" description = "Code coverage measurement for Python" category = "dev" optional = false @@ -181,7 +181,7 @@ python-versions = ">=3.6,<4.0" [[package]] name = "cryptography" -version = "3.1.1" +version = "3.2.1" description = "cryptography is a package which provides cryptographic recipes and primitives to Python developers." category = "main" optional = false @@ -194,11 +194,30 @@ ipaddress = {version = "*", markers = "python_version < \"3\""} six = ">=1.4.1" [package.extras] -docs = ["sphinx (>=1.6.5,<1.8.0 || >1.8.0,<3.1.0 || >3.1.0,<3.1.1 || >3.1.1)", "sphinx-rtd-theme"] +docs = ["sphinx (>=1.6.5,!=1.8.0,!=3.1.0,!=3.1.1)", "sphinx-rtd-theme"] docstest = ["doc8", "pyenchant (>=1.6.11)", "twine (>=1.12.0)", "sphinxcontrib-spelling (>=4.0.1)"] pep8test = ["black", "flake8", "flake8-import-order", "pep8-naming"] ssh = ["bcrypt (>=3.1.5)"] -test = ["pytest (>=3.6.0,<3.9.0 || >3.9.0,<3.9.1 || >3.9.1,<3.9.2 || >3.9.2)", "pretend", "iso8601", "pytz", "hypothesis (>=1.11.4,<3.79.2 || >3.79.2)"] +test = ["pytest (>=3.6.0,!=3.9.0,!=3.9.1,!=3.9.2)", "pretend", "iso8601", "pytz", "hypothesis (>=1.11.4,!=3.79.2)"] + +[[package]] +name = "cryptography" +version = "3.4.6" +description = "cryptography is a package which provides cryptographic recipes and primitives to Python developers." +category = "main" +optional = false +python-versions = ">=3.6" + +[package.dependencies] +cffi = ">=1.12" + +[package.extras] +docs = ["sphinx (>=1.6.5,!=1.8.0,!=3.1.0,!=3.1.1)", "sphinx-rtd-theme"] +docstest = ["doc8", "pyenchant (>=1.6.11)", "twine (>=1.12.0)", "sphinxcontrib-spelling (>=4.0.1)"] +pep8test = ["black", "flake8", "flake8-import-order", "pep8-naming"] +sdist = ["setuptools-rust (>=0.11.4)"] +ssh = ["bcrypt (>=3.1.5)"] +test = ["pytest (>=6.0)", "pytest-cov", "pytest-subtests", "pytest-xdist", "pretend", "iso8601", "pytz", "hypothesis (>=1.11.4,!=3.79.2)"] [[package]] name = "distlib" @@ -298,11 +317,11 @@ six = "*" [[package]] name = "identify" -version = "1.5.5" +version = "2.1.0" description = "File identification library for Python" category = "dev" optional = false -python-versions = "!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,>=2.7" +python-versions = ">=3.6.1" [package.extras] license = ["editdistance"] @@ -335,7 +354,7 @@ testing = ["packaging", "pep517", "importlib-resources (>=1.3)"] [[package]] name = "importlib-resources" -version = "3.0.0" +version = "3.2.1" description = "Read resources from Python packages" category = "main" optional = false @@ -361,14 +380,14 @@ python-versions = "*" [[package]] name = "jeepney" -version = "0.4.3" +version = "0.6.0" description = "Low-level, pure Python DBus protocol wrapper." category = "main" optional = false -python-versions = ">=3.5" +python-versions = ">=3.6" [package.extras] -dev = ["testpath"] +test = ["pytest", "pytest-trio", "pytest-asyncio", "testpath", "trio"] [[package]] name = "keyring" @@ -385,7 +404,7 @@ secretstorage = {version = "<3", markers = "(sys_platform == \"linux2\" or sys_p [package.extras] docs = ["sphinx", "jaraco.packaging (>=3.2)", "rst.linker (>=1.9)"] -testing = ["pytest (>=3.5,<3.7.3 || >3.7.3)", "pytest-checkdocs", "pytest-flake8"] +testing = ["pytest (>=3.5,!=3.7.3)", "pytest-checkdocs", "pytest-flake8"] [[package]] name = "keyring" @@ -402,25 +421,25 @@ secretstorage = {version = "*", markers = "sys_platform == \"linux\""} [package.extras] docs = ["sphinx", "jaraco.packaging (>=3.2)", "rst.linker (>=1.9)"] -testing = ["pytest (>=3.5,<3.7.3 || >3.7.3)", "pytest-checkdocs (>=1.2.3)", "pytest-flake8", "pytest-black-multipy", "pytest-cov"] +testing = ["pytest (>=3.5,!=3.7.3)", "pytest-checkdocs (>=1.2.3)", "pytest-flake8", "pytest-black-multipy", "pytest-cov"] [[package]] name = "keyring" -version = "21.4.0" +version = "21.8.0" description = "Store and access your passwords safely." category = "main" optional = false python-versions = ">=3.6" [package.dependencies] -importlib-metadata = {version = "*", markers = "python_version < \"3.8\""} +importlib-metadata = {version = ">=1", markers = "python_version < \"3.8\""} jeepney = {version = ">=0.4.2", markers = "sys_platform == \"linux\""} pywin32-ctypes = {version = "<0.1.0 || >0.1.0,<0.1.1 || >0.1.1", markers = "sys_platform == \"win32\""} -SecretStorage = {version = ">=3", markers = "sys_platform == \"linux\""} +SecretStorage = {version = ">=3.2", markers = "sys_platform == \"linux\""} [package.extras] -docs = ["sphinx", "jaraco.packaging (>=3.2)", "rst.linker (>=1.9)"] -testing = ["pytest (>=3.5,<3.7.3 || >3.7.3)", "pytest-checkdocs (>=1.2.3)", "pytest-flake8", "pytest-black (>=0.3.7)", "pytest-cov", "pytest-mypy"] +docs = ["sphinx", "jaraco.packaging (>=8.2)", "rst.linker (>=1.9)"] +testing = ["pytest (>=3.5,!=3.7.3)", "pytest-checkdocs (>=1.2.3)", "pytest-flake8", "pytest-cov", "jaraco.test (>=3.2.0)", "pytest-black (>=0.3.7)", "pytest-mypy"] [[package]] name = "lockfile" @@ -460,7 +479,15 @@ six = ">=1.0.0,<2.0.0" [[package]] name = "more-itertools" -version = "8.5.0" +version = "8.6.0" +description = "More routines for operating on iterables, beyond itertools" +category = "dev" +optional = false +python-versions = ">=3.5" + +[[package]] +name = "more-itertools" +version = "8.7.0" description = "More routines for operating on iterables, beyond itertools" category = "dev" optional = false @@ -468,7 +495,7 @@ python-versions = ">=3.5" [[package]] name = "msgpack" -version = "1.0.0" +version = "1.0.2" description = "MessagePack (de)serializer." category = "main" optional = false @@ -484,7 +511,7 @@ python-versions = "*" [[package]] name = "packaging" -version = "20.4" +version = "20.9" description = "Core utilities for Python packages" category = "main" optional = false @@ -492,7 +519,6 @@ python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*" [package.dependencies] pyparsing = ">=2.0.2" -six = "*" [[package]] name = "pastel" @@ -527,7 +553,7 @@ ptyprocess = ">=0.5" [[package]] name = "pkginfo" -version = "1.5.0.1" +version = "1.7.0" description = "Query metadatdata from sdists / bdists / installed packages." category = "main" optional = false @@ -552,7 +578,7 @@ dev = ["pre-commit", "tox"] [[package]] name = "poetry-core" -version = "1.0.0" +version = "1.0.2" description = "Poetry PEP 517 Build Backend" category = "main" optional = false @@ -567,7 +593,7 @@ typing = {version = ">=3.7.4.1,<4.0.0.0", markers = "python_version >= \"2.7\" a [[package]] name = "pre-commit" -version = "2.7.1" +version = "2.10.1" description = "A framework for managing and maintaining multi-language pre-commit hooks." category = "dev" optional = false @@ -585,7 +611,7 @@ virtualenv = ">=20.0.8" [[package]] name = "ptyprocess" -version = "0.6.0" +version = "0.7.0" description = "Run a subprocess in a pseudo terminal" category = "main" optional = false @@ -593,7 +619,7 @@ python-versions = "*" [[package]] name = "py" -version = "1.9.0" +version = "1.10.0" description = "library with cross-python path, ini-parsing, io, code, log facilities" category = "dev" optional = false @@ -672,23 +698,23 @@ py = ">=1.5.0" wcwidth = "*" [package.extras] -checkqa-mypy = ["mypy (v0.761)"] +checkqa-mypy = ["mypy (==v0.761)"] testing = ["argcomplete", "hypothesis (>=3.56)", "mock", "nose", "requests", "xmlschema"] [[package]] name = "pytest-cov" -version = "2.10.1" +version = "2.11.1" description = "Pytest plugin for measuring coverage." category = "dev" optional = false python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*" [package.dependencies] -coverage = ">=4.4" +coverage = ">=5.2.1" pytest = ">=4.6" [package.extras] -testing = ["fields", "hunter", "process-tests (2.0.2)", "six", "pytest-xdist", "virtualenv"] +testing = ["fields", "hunter", "process-tests (==2.0.2)", "six", "pytest-xdist", "virtualenv"] [[package]] name = "pytest-mock" @@ -728,15 +754,15 @@ python-versions = "*" [[package]] name = "pyyaml" -version = "5.3.1" +version = "5.4.1" description = "YAML parser and emitter for Python" category = "dev" optional = false -python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*" +python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, !=3.5.*" [[package]] name = "requests" -version = "2.24.0" +version = "2.25.1" description = "Python HTTP for Humans." category = "main" optional = false @@ -744,13 +770,13 @@ python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*" [package.dependencies] certifi = ">=2017.4.17" -chardet = ">=3.0.2,<4" +chardet = ">=3.0.2,<5" idna = ">=2.5,<3" -urllib3 = ">=1.21.1,<1.25.0 || >1.25.0,<1.25.1 || >1.25.1,<1.26" +urllib3 = ">=1.21.1,<1.27" [package.extras] security = ["pyOpenSSL (>=0.14)", "cryptography (>=1.3.4)"] -socks = ["PySocks (>=1.5.6,<1.5.7 || >1.5.7)", "win-inet-pton"] +socks = ["PySocks (>=1.5.6,!=1.5.7)", "win-inet-pton"] [[package]] name = "requests-toolbelt" @@ -787,19 +813,19 @@ dbus-python = ["dbus-python"] [[package]] name = "secretstorage" -version = "3.1.2" +version = "3.3.1" description = "Python bindings to FreeDesktop.org Secret Service API" category = "main" optional = false -python-versions = ">=3.5" +python-versions = ">=3.6" [package.dependencies] -cryptography = "*" -jeepney = ">=0.4.2" +cryptography = ">=2.0" +jeepney = ">=0.6" [[package]] name = "shellingham" -version = "1.3.2" +version = "1.4.0" description = "Tool to Detect Surrounding Shell" category = "main" optional = false @@ -807,15 +833,19 @@ python-versions = "!=3.0,!=3.1,!=3.2,!=3.3,>=2.6" [[package]] name = "singledispatch" -version = "3.4.0.3" -description = "This library brings functools.singledispatch from Python 3.4 to Python 2.6-3.3." +version = "3.6.1" +description = "Backport functools.singledispatch from Python 3.4 to Python 2.6-3.3." category = "main" optional = false -python-versions = "*" +python-versions = ">=2.6" [package.dependencies] six = "*" +[package.extras] +docs = ["sphinx", "jaraco.packaging (>=8.2)", "rst.linker (>=1.9)"] +testing = ["pytest (>=4.6)", "pytest-checkdocs (>=1.2.3)", "pytest-flake8", "pytest-cov", "pytest-black (>=0.3.7)", "unittest2"] + [[package]] name = "six" version = "1.15.0" @@ -842,11 +872,11 @@ python-versions = "*" [[package]] name = "toml" -version = "0.10.1" +version = "0.10.2" description = "Python Library for Tom's Obvious, Minimal Language" category = "dev" optional = false -python-versions = "*" +python-versions = ">=2.6, !=3.0.*, !=3.1.*, !=3.2.*" [[package]] name = "tomlkit" @@ -863,7 +893,7 @@ typing = {version = ">=3.6,<4.0", markers = "python_version >= \"2.7\" and pytho [[package]] name = "tox" -version = "3.20.0" +version = "3.23.0" description = "tox is a generic virtualenv management and test command line tool" category = "dev" optional = false @@ -872,7 +902,7 @@ python-versions = "!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*,>=2.7" [package.dependencies] colorama = {version = ">=0.4.1", markers = "platform_system == \"Windows\""} filelock = ">=3.0.0" -importlib-metadata = {version = ">=0.12,<2", markers = "python_version < \"3.8\""} +importlib-metadata = {version = ">=0.12", markers = "python_version < \"3.8\""} packaging = ">=14" pluggy = ">=0.12.0" py = ">=1.4.17" @@ -882,7 +912,7 @@ virtualenv = ">=16.0.0,<20.0.0 || >20.0.0,<20.0.1 || >20.0.1,<20.0.2 || >20.0.2, [package.extras] docs = ["pygments-github-lexers (>=0.0.5)", "sphinx (>=2.0.0)", "sphinxcontrib-autoprogram (>=0.1.5)", "towncrier (>=18.5.0)"] -testing = ["flaky (>=3.4.0)", "freezegun (>=0.3.11)", "pathlib2 (>=2.3.3)", "psutil (>=5.6.1)", "pytest (>=4.0.0)", "pytest-cov (>=2.5.1)", "pytest-mock (>=1.10.0)", "pytest-randomly (>=1.0.0)", "pytest-xdist (>=1.22.2)"] +testing = ["flaky (>=3.4.0)", "freezegun (>=0.3.11)", "psutil (>=5.6.1)", "pytest (>=4.0.0)", "pytest-cov (>=2.5.1)", "pytest-mock (>=1.10.0)", "pytest-randomly (>=1.0.0)", "pytest-xdist (>=1.22.2)", "pathlib2 (>=2.3.3)"] [[package]] name = "typing" @@ -900,12 +930,9 @@ category = "main" optional = false python-versions = "*" -[package.dependencies] -typing = {version = ">=3.7.4", markers = "python_version < \"3.5\""} - [[package]] name = "urllib3" -version = "1.25.10" +version = "1.25.11" description = "HTTP library with thread-safe connection pooling, file post, and more." category = "main" optional = false @@ -913,12 +940,12 @@ python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, <4" [package.extras] brotli = ["brotlipy (>=0.6.0)"] -secure = ["certifi", "cryptography (>=1.3.4)", "idna (>=2.0.0)", "pyOpenSSL (>=0.14)", "ipaddress"] -socks = ["PySocks (>=1.5.6,<1.5.7 || >1.5.7,<2.0)"] +secure = ["pyOpenSSL (>=0.14)", "cryptography (>=1.3.4)", "idna (>=2.0.0)", "certifi", "ipaddress"] +socks = ["PySocks (>=1.5.6,!=1.5.7,<2.0)"] [[package]] name = "virtualenv" -version = "20.0.31" +version = "20.4.2" description = "Virtual Python Environment builder" category = "main" optional = false @@ -928,14 +955,14 @@ python-versions = "!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,>=2.7" appdirs = ">=1.4.3,<2" distlib = ">=0.3.1,<1" filelock = ">=3.0.0,<4" -importlib-metadata = {version = ">=0.12,<2", markers = "python_version < \"3.8\""} +importlib-metadata = {version = ">=0.12", markers = "python_version < \"3.8\""} importlib-resources = {version = ">=1.0", markers = "python_version < \"3.7\""} pathlib2 = {version = ">=2.3.3,<3", markers = "python_version < \"3.4\" and sys_platform != \"win32\""} six = ">=1.9.0,<2" [package.extras] docs = ["proselint (>=0.10.2)", "sphinx (>=3)", "sphinx-argparse (>=0.2.5)", "sphinx-rtd-theme (>=0.4.3)", "towncrier (>=19.9.0rc1)"] -testing = ["coverage (>=5)", "coverage-enable-subprocess (>=1)", "flaky (>=3)", "pytest (>=4)", "pytest-env (>=0.6.2)", "pytest-freezegun (>=0.4.1)", "pytest-mock (>=2)", "pytest-randomly (>=1)", "pytest-timeout (>=1)", "pytest-xdist (>=1.31.0)", "packaging (>=20.0)", "xonsh (>=0.9.16)"] +testing = ["coverage (>=4)", "coverage-enable-subprocess (>=1)", "flaky (>=3)", "pytest (>=4)", "pytest-env (>=0.6.2)", "pytest-freezegun (>=0.4.1)", "pytest-mock (>=2)", "pytest-randomly (>=1)", "pytest-timeout (>=1)", "packaging (>=20.0)", "xonsh (>=0.9.16)"] [[package]] name = "wcwidth" @@ -974,7 +1001,7 @@ testing = ["pathlib2", "unittest2", "jaraco.itertools", "func-timeout"] [metadata] lock-version = "1.1" python-versions = "~2.7 || ^3.5" -content-hash = "1e774c9d8b7f6812d721cff08b51554f9a0cd051e2ae0e884421bcb56718d131" +content-hash = "f716089bf560bb051980ddb5ff40b200027e9d9f2ed17fc7dd5576d80f5ad62a" [metadata.files] appdirs = [ @@ -986,8 +1013,8 @@ atomicwrites = [ {file = "atomicwrites-1.4.0.tar.gz", hash = "sha256:ae70396ad1a434f9c7046fd2dd196fc04b12f9e91ffb859164193be8b6168a7a"}, ] attrs = [ - {file = "attrs-20.2.0-py2.py3-none-any.whl", hash = "sha256:fce7fc47dfc976152e82d53ff92fa0407700c21acd20886a13777a0d20e655dc"}, - {file = "attrs-20.2.0.tar.gz", hash = "sha256:26b54ddbbb9ee1d34d5d3668dd37d6cf74990ab23c828c2888dccdceee395594"}, + {file = "attrs-20.3.0-py2.py3-none-any.whl", hash = "sha256:31b2eced602aa8423c2aea9c76a724617ed67cf9513173fd3a4f03e3a929c7e6"}, + {file = "attrs-20.3.0.tar.gz", hash = "sha256:832aa3cde19744e49938b91fea06d69ecb9e649c93ba974535d08ad92164f700"}, ] "backports.functools-lru-cache" = [ {file = "backports.functools_lru_cache-1.6.1-py2.py3-none-any.whl", hash = "sha256:0bada4c2f8a43d533e4ecb7a12214d9420e66eb206d54bf2d682581ca4b80848"}, @@ -1002,54 +1029,55 @@ cachy = [ {file = "cachy-0.3.0.tar.gz", hash = "sha256:186581f4ceb42a0bbe040c407da73c14092379b1e4c0e327fdb72ae4a9b269b1"}, ] certifi = [ - {file = "certifi-2020.6.20-py2.py3-none-any.whl", hash = "sha256:8fc0819f1f30ba15bdb34cceffb9ef04d99f420f68eb75d901e9560b8749fc41"}, - {file = "certifi-2020.6.20.tar.gz", hash = "sha256:5930595817496dd21bb8dc35dad090f1c2cd0adfaf21204bf6732ca5d8ee34d3"}, + {file = "certifi-2020.12.5-py2.py3-none-any.whl", hash = "sha256:719a74fb9e33b9bd44cc7f3a8d94bc35e4049deebe19ba7d8e108280cfd59830"}, + {file = "certifi-2020.12.5.tar.gz", hash = "sha256:1a4995114262bffbc2413b159f2a1a480c969de6e6eb13ee966d470af86af59c"}, ] cffi = [ - {file = "cffi-1.14.3-2-cp27-cp27m-macosx_10_9_x86_64.whl", hash = "sha256:3eeeb0405fd145e714f7633a5173318bd88d8bbfc3dd0a5751f8c4f70ae629bc"}, - {file = "cffi-1.14.3-2-cp35-cp35m-macosx_10_9_x86_64.whl", hash = "sha256:cb763ceceae04803adcc4e2d80d611ef201c73da32d8f2722e9d0ab0c7f10768"}, - {file = "cffi-1.14.3-2-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:44f60519595eaca110f248e5017363d751b12782a6f2bd6a7041cba275215f5d"}, - {file = "cffi-1.14.3-2-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:c53af463f4a40de78c58b8b2710ade243c81cbca641e34debf3396a9640d6ec1"}, - {file = "cffi-1.14.3-2-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:33c6cdc071ba5cd6d96769c8969a0531be2d08c2628a0143a10a7dcffa9719ca"}, - {file = "cffi-1.14.3-2-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:c11579638288e53fc94ad60022ff1b67865363e730ee41ad5e6f0a17188b327a"}, - {file = "cffi-1.14.3-cp27-cp27m-manylinux1_i686.whl", hash = "sha256:3cb3e1b9ec43256c4e0f8d2837267a70b0e1ca8c4f456685508ae6106b1f504c"}, - {file = "cffi-1.14.3-cp27-cp27m-manylinux1_x86_64.whl", hash = "sha256:f0620511387790860b249b9241c2f13c3a80e21a73e0b861a2df24e9d6f56730"}, - {file = "cffi-1.14.3-cp27-cp27m-win32.whl", hash = "sha256:005f2bfe11b6745d726dbb07ace4d53f057de66e336ff92d61b8c7e9c8f4777d"}, - {file = "cffi-1.14.3-cp27-cp27m-win_amd64.whl", hash = "sha256:2f9674623ca39c9ebe38afa3da402e9326c245f0f5ceff0623dccdac15023e05"}, - {file = "cffi-1.14.3-cp27-cp27mu-manylinux1_i686.whl", hash = "sha256:09e96138280241bd355cd585148dec04dbbedb4f46128f340d696eaafc82dd7b"}, - {file = "cffi-1.14.3-cp27-cp27mu-manylinux1_x86_64.whl", hash = "sha256:3363e77a6176afb8823b6e06db78c46dbc4c7813b00a41300a4873b6ba63b171"}, - {file = "cffi-1.14.3-cp35-cp35m-manylinux1_i686.whl", hash = "sha256:0ef488305fdce2580c8b2708f22d7785ae222d9825d3094ab073e22e93dfe51f"}, - {file = "cffi-1.14.3-cp35-cp35m-manylinux1_x86_64.whl", hash = "sha256:0b1ad452cc824665ddc682400b62c9e4f5b64736a2ba99110712fdee5f2505c4"}, - {file = "cffi-1.14.3-cp35-cp35m-win32.whl", hash = "sha256:85ba797e1de5b48aa5a8427b6ba62cf69607c18c5d4eb747604b7302f1ec382d"}, - {file = "cffi-1.14.3-cp35-cp35m-win_amd64.whl", hash = "sha256:e66399cf0fc07de4dce4f588fc25bfe84a6d1285cc544e67987d22663393926d"}, - {file = "cffi-1.14.3-cp36-cp36m-manylinux1_i686.whl", hash = "sha256:15f351bed09897fbda218e4db5a3d5c06328862f6198d4fb385f3e14e19decb3"}, - {file = "cffi-1.14.3-cp36-cp36m-manylinux1_x86_64.whl", hash = "sha256:4d7c26bfc1ea9f92084a1d75e11999e97b62d63128bcc90c3624d07813c52808"}, - {file = "cffi-1.14.3-cp36-cp36m-manylinux2014_aarch64.whl", hash = "sha256:23e5d2040367322824605bc29ae8ee9175200b92cb5483ac7d466927a9b3d537"}, - {file = "cffi-1.14.3-cp36-cp36m-win32.whl", hash = "sha256:a624fae282e81ad2e4871bdb767e2c914d0539708c0f078b5b355258293c98b0"}, - {file = "cffi-1.14.3-cp36-cp36m-win_amd64.whl", hash = "sha256:de31b5164d44ef4943db155b3e8e17929707cac1e5bd2f363e67a56e3af4af6e"}, - {file = "cffi-1.14.3-cp37-cp37m-manylinux1_i686.whl", hash = "sha256:f92cdecb618e5fa4658aeb97d5eb3d2f47aa94ac6477c6daf0f306c5a3b9e6b1"}, - {file = "cffi-1.14.3-cp37-cp37m-manylinux1_x86_64.whl", hash = "sha256:22399ff4870fb4c7ef19fff6eeb20a8bbf15571913c181c78cb361024d574579"}, - {file = "cffi-1.14.3-cp37-cp37m-manylinux2014_aarch64.whl", hash = "sha256:f4eae045e6ab2bb54ca279733fe4eb85f1effda392666308250714e01907f394"}, - {file = "cffi-1.14.3-cp37-cp37m-win32.whl", hash = "sha256:b0358e6fefc74a16f745afa366acc89f979040e0cbc4eec55ab26ad1f6a9bfbc"}, - {file = "cffi-1.14.3-cp37-cp37m-win_amd64.whl", hash = "sha256:6642f15ad963b5092d65aed022d033c77763515fdc07095208f15d3563003869"}, - {file = "cffi-1.14.3-cp38-cp38-manylinux1_i686.whl", hash = "sha256:2791f68edc5749024b4722500e86303a10d342527e1e3bcac47f35fbd25b764e"}, - {file = "cffi-1.14.3-cp38-cp38-manylinux1_x86_64.whl", hash = "sha256:529c4ed2e10437c205f38f3691a68be66c39197d01062618c55f74294a4a4828"}, - {file = "cffi-1.14.3-cp38-cp38-manylinux2014_aarch64.whl", hash = "sha256:8f0f1e499e4000c4c347a124fa6a27d37608ced4fe9f7d45070563b7c4c370c9"}, - {file = "cffi-1.14.3-cp38-cp38-win32.whl", hash = "sha256:3b8eaf915ddc0709779889c472e553f0d3e8b7bdf62dab764c8921b09bf94522"}, - {file = "cffi-1.14.3-cp38-cp38-win_amd64.whl", hash = "sha256:bbd2f4dfee1079f76943767fce837ade3087b578aeb9f69aec7857d5bf25db15"}, - {file = "cffi-1.14.3-cp39-cp39-manylinux1_i686.whl", hash = "sha256:cc75f58cdaf043fe6a7a6c04b3b5a0e694c6a9e24050967747251fb80d7bce0d"}, - {file = "cffi-1.14.3-cp39-cp39-manylinux1_x86_64.whl", hash = "sha256:bf39a9e19ce7298f1bd6a9758fa99707e9e5b1ebe5e90f2c3913a47bc548747c"}, - {file = "cffi-1.14.3-cp39-cp39-win32.whl", hash = "sha256:d80998ed59176e8cba74028762fbd9b9153b9afc71ea118e63bbf5d4d0f9552b"}, - {file = "cffi-1.14.3-cp39-cp39-win_amd64.whl", hash = "sha256:c150eaa3dadbb2b5339675b88d4573c1be3cb6f2c33a6c83387e10cc0bf05bd3"}, - {file = "cffi-1.14.3.tar.gz", hash = "sha256:f92f789e4f9241cd262ad7a555ca2c648a98178a953af117ef7fad46aa1d5591"}, + {file = "cffi-1.14.5-cp27-cp27m-macosx_10_9_x86_64.whl", hash = "sha256:bb89f306e5da99f4d922728ddcd6f7fcebb3241fc40edebcb7284d7514741991"}, + {file = "cffi-1.14.5-cp27-cp27m-manylinux1_i686.whl", hash = "sha256:34eff4b97f3d982fb93e2831e6750127d1355a923ebaeeb565407b3d2f8d41a1"}, + {file = "cffi-1.14.5-cp27-cp27m-manylinux1_x86_64.whl", hash = "sha256:99cd03ae7988a93dd00bcd9d0b75e1f6c426063d6f03d2f90b89e29b25b82dfa"}, + {file = "cffi-1.14.5-cp27-cp27m-win32.whl", hash = "sha256:65fa59693c62cf06e45ddbb822165394a288edce9e276647f0046e1ec26920f3"}, + {file = "cffi-1.14.5-cp27-cp27m-win_amd64.whl", hash = "sha256:51182f8927c5af975fece87b1b369f722c570fe169f9880764b1ee3bca8347b5"}, + {file = "cffi-1.14.5-cp27-cp27mu-manylinux1_i686.whl", hash = "sha256:43e0b9d9e2c9e5d152946b9c5fe062c151614b262fda2e7b201204de0b99e482"}, + {file = "cffi-1.14.5-cp27-cp27mu-manylinux1_x86_64.whl", hash = "sha256:cbde590d4faaa07c72bf979734738f328d239913ba3e043b1e98fe9a39f8b2b6"}, + {file = "cffi-1.14.5-cp35-cp35m-macosx_10_9_x86_64.whl", hash = "sha256:5de7970188bb46b7bf9858eb6890aad302577a5f6f75091fd7cdd3ef13ef3045"}, + {file = "cffi-1.14.5-cp35-cp35m-manylinux1_i686.whl", hash = "sha256:a465da611f6fa124963b91bf432d960a555563efe4ed1cc403ba5077b15370aa"}, + {file = "cffi-1.14.5-cp35-cp35m-manylinux1_x86_64.whl", hash = "sha256:d42b11d692e11b6634f7613ad8df5d6d5f8875f5d48939520d351007b3c13406"}, + {file = "cffi-1.14.5-cp35-cp35m-win32.whl", hash = "sha256:72d8d3ef52c208ee1c7b2e341f7d71c6fd3157138abf1a95166e6165dd5d4369"}, + {file = "cffi-1.14.5-cp35-cp35m-win_amd64.whl", hash = "sha256:29314480e958fd8aab22e4a58b355b629c59bf5f2ac2492b61e3dc06d8c7a315"}, + {file = "cffi-1.14.5-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:3d3dd4c9e559eb172ecf00a2a7517e97d1e96de2a5e610bd9b68cea3925b4892"}, + {file = "cffi-1.14.5-cp36-cp36m-manylinux1_i686.whl", hash = "sha256:48e1c69bbacfc3d932221851b39d49e81567a4d4aac3b21258d9c24578280058"}, + {file = "cffi-1.14.5-cp36-cp36m-manylinux1_x86_64.whl", hash = "sha256:69e395c24fc60aad6bb4fa7e583698ea6cc684648e1ffb7fe85e3c1ca131a7d5"}, + {file = "cffi-1.14.5-cp36-cp36m-manylinux2014_aarch64.whl", hash = "sha256:9e93e79c2551ff263400e1e4be085a1210e12073a31c2011dbbda14bda0c6132"}, + {file = "cffi-1.14.5-cp36-cp36m-win32.whl", hash = "sha256:58e3f59d583d413809d60779492342801d6e82fefb89c86a38e040c16883be53"}, + {file = "cffi-1.14.5-cp36-cp36m-win_amd64.whl", hash = "sha256:005a36f41773e148deac64b08f233873a4d0c18b053d37da83f6af4d9087b813"}, + {file = "cffi-1.14.5-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:2894f2df484ff56d717bead0a5c2abb6b9d2bf26d6960c4604d5c48bbc30ee73"}, + {file = "cffi-1.14.5-cp37-cp37m-manylinux1_i686.whl", hash = "sha256:0857f0ae312d855239a55c81ef453ee8fd24136eaba8e87a2eceba644c0d4c06"}, + {file = "cffi-1.14.5-cp37-cp37m-manylinux1_x86_64.whl", hash = "sha256:cd2868886d547469123fadc46eac7ea5253ea7fcb139f12e1dfc2bbd406427d1"}, + {file = "cffi-1.14.5-cp37-cp37m-manylinux2014_aarch64.whl", hash = "sha256:35f27e6eb43380fa080dccf676dece30bef72e4a67617ffda586641cd4508d49"}, + {file = "cffi-1.14.5-cp37-cp37m-win32.whl", hash = "sha256:9ff227395193126d82e60319a673a037d5de84633f11279e336f9c0f189ecc62"}, + {file = "cffi-1.14.5-cp37-cp37m-win_amd64.whl", hash = "sha256:9cf8022fb8d07a97c178b02327b284521c7708d7c71a9c9c355c178ac4bbd3d4"}, + {file = "cffi-1.14.5-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:8b198cec6c72df5289c05b05b8b0969819783f9418e0409865dac47288d2a053"}, + {file = "cffi-1.14.5-cp38-cp38-manylinux1_i686.whl", hash = "sha256:ad17025d226ee5beec591b52800c11680fca3df50b8b29fe51d882576e039ee0"}, + {file = "cffi-1.14.5-cp38-cp38-manylinux1_x86_64.whl", hash = "sha256:6c97d7350133666fbb5cf4abdc1178c812cb205dc6f41d174a7b0f18fb93337e"}, + {file = "cffi-1.14.5-cp38-cp38-manylinux2014_aarch64.whl", hash = "sha256:8ae6299f6c68de06f136f1f9e69458eae58f1dacf10af5c17353eae03aa0d827"}, + {file = "cffi-1.14.5-cp38-cp38-win32.whl", hash = "sha256:b85eb46a81787c50650f2392b9b4ef23e1f126313b9e0e9013b35c15e4288e2e"}, + {file = "cffi-1.14.5-cp38-cp38-win_amd64.whl", hash = "sha256:1f436816fc868b098b0d63b8920de7d208c90a67212546d02f84fe78a9c26396"}, + {file = "cffi-1.14.5-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:1071534bbbf8cbb31b498d5d9db0f274f2f7a865adca4ae429e147ba40f73dea"}, + {file = "cffi-1.14.5-cp39-cp39-manylinux1_i686.whl", hash = "sha256:9de2e279153a443c656f2defd67769e6d1e4163952b3c622dcea5b08a6405322"}, + {file = "cffi-1.14.5-cp39-cp39-manylinux1_x86_64.whl", hash = "sha256:6e4714cc64f474e4d6e37cfff31a814b509a35cb17de4fb1999907575684479c"}, + {file = "cffi-1.14.5-cp39-cp39-manylinux2014_aarch64.whl", hash = "sha256:158d0d15119b4b7ff6b926536763dc0714313aa59e320ddf787502c70c4d4bee"}, + {file = "cffi-1.14.5-cp39-cp39-win32.whl", hash = "sha256:afb29c1ba2e5a3736f1c301d9d0abe3ec8b86957d04ddfa9d7a6a42b9367e396"}, + {file = "cffi-1.14.5-cp39-cp39-win_amd64.whl", hash = "sha256:f2d45f97ab6bb54753eab54fffe75aaf3de4ff2341c9daee1987ee1837636f1d"}, + {file = "cffi-1.14.5.tar.gz", hash = "sha256:fd78e5fee591709f32ef6edb9a015b4aa1a5022598e36227500c8f4e02328d9c"}, ] cfgv = [ {file = "cfgv-3.2.0-py2.py3-none-any.whl", hash = "sha256:32e43d604bbe7896fe7c248a9c2276447dbef840feb28fe20494f62af110211d"}, {file = "cfgv-3.2.0.tar.gz", hash = "sha256:cf22deb93d4bcf92f345a5c3cd39d3d41d6340adc60c78bbbd6588c384fda6a1"}, ] chardet = [ - {file = "chardet-3.0.4-py2.py3-none-any.whl", hash = "sha256:fc323ffcaeaed0e0a02bf4d117757b98aed530d9ed4531e3e15460124c106691"}, - {file = "chardet-3.0.4.tar.gz", hash = "sha256:84ab92ed1c4d4f16916e05906b6b75a6c0fb5db821cc65e70cbd64a3e2a5eaae"}, + {file = "chardet-4.0.0-py2.py3-none-any.whl", hash = "sha256:f864054d66fd9118f2e67044ac8981a54775ec5b67aed0441892edb553d21da5"}, + {file = "chardet-4.0.0.tar.gz", hash = "sha256:0d6f53a15db4120f2b08c94f11e7d93d2c911ee118b6b30a04ec3ee8310179fa"}, ] cleo = [ {file = "cleo-0.8.1-py2.py3-none-any.whl", hash = "sha256:141cda6dc94a92343be626bb87a0b6c86ae291dfc732a57bf04310d4b4201753"}, @@ -1060,8 +1088,8 @@ clikit = [ {file = "clikit-0.6.2.tar.gz", hash = "sha256:442ee5db9a14120635c5990bcdbfe7c03ada5898291f0c802f77be71569ded59"}, ] colorama = [ - {file = "colorama-0.4.3-py2.py3-none-any.whl", hash = "sha256:7d73d2a99753107a36ac6b455ee49046802e59d9d076ef8e47b61499fa29afff"}, - {file = "colorama-0.4.3.tar.gz", hash = "sha256:e96da0d330793e2cb9485e9ddfd918d456036c7149416295932478192f4436a1"}, + {file = "colorama-0.4.4-py2.py3-none-any.whl", hash = "sha256:9f47eda37229f68eee03b24b9748937c7dc3868f906e8ba69fbcbdd3bc5dc3e2"}, + {file = "colorama-0.4.4.tar.gz", hash = "sha256:5941b2b48a20143d2267e95b1c2a7603ce057ee39fd88e7329b0c292aa16869b"}, ] configparser = [ {file = "configparser-4.0.2-py2.py3-none-any.whl", hash = "sha256:254c1d9c79f60c45dfde850850883d5aaa7f19a23f13561243a050d5a7c3fe4c"}, @@ -1072,68 +1100,93 @@ contextlib2 = [ {file = "contextlib2-0.6.0.post1.tar.gz", hash = "sha256:01f490098c18b19d2bd5bb5dc445b2054d2fa97f09a4280ba2c5f3c394c8162e"}, ] coverage = [ - {file = "coverage-5.3-cp27-cp27m-macosx_10_13_intel.whl", hash = "sha256:bd3166bb3b111e76a4f8e2980fa1addf2920a4ca9b2b8ca36a3bc3dedc618270"}, - {file = "coverage-5.3-cp27-cp27m-macosx_10_9_x86_64.whl", hash = "sha256:9342dd70a1e151684727c9c91ea003b2fb33523bf19385d4554f7897ca0141d4"}, - {file = "coverage-5.3-cp27-cp27m-manylinux1_i686.whl", hash = "sha256:63808c30b41f3bbf65e29f7280bf793c79f54fb807057de7e5238ffc7cc4d7b9"}, - {file = "coverage-5.3-cp27-cp27m-manylinux1_x86_64.whl", hash = "sha256:4d6a42744139a7fa5b46a264874a781e8694bb32f1d76d8137b68138686f1729"}, - {file = "coverage-5.3-cp27-cp27m-win32.whl", hash = "sha256:86e9f8cd4b0cdd57b4ae71a9c186717daa4c5a99f3238a8723f416256e0b064d"}, - {file = "coverage-5.3-cp27-cp27m-win_amd64.whl", hash = "sha256:7858847f2d84bf6e64c7f66498e851c54de8ea06a6f96a32a1d192d846734418"}, - {file = "coverage-5.3-cp27-cp27mu-manylinux1_i686.whl", hash = "sha256:530cc8aaf11cc2ac7430f3614b04645662ef20c348dce4167c22d99bec3480e9"}, - {file = "coverage-5.3-cp27-cp27mu-manylinux1_x86_64.whl", hash = "sha256:381ead10b9b9af5f64646cd27107fb27b614ee7040bb1226f9c07ba96625cbb5"}, - {file = "coverage-5.3-cp35-cp35m-macosx_10_13_x86_64.whl", hash = "sha256:71b69bd716698fa62cd97137d6f2fdf49f534decb23a2c6fc80813e8b7be6822"}, - {file = "coverage-5.3-cp35-cp35m-manylinux1_i686.whl", hash = "sha256:1d44bb3a652fed01f1f2c10d5477956116e9b391320c94d36c6bf13b088a1097"}, - {file = "coverage-5.3-cp35-cp35m-manylinux1_x86_64.whl", hash = "sha256:1c6703094c81fa55b816f5ae542c6ffc625fec769f22b053adb42ad712d086c9"}, - {file = "coverage-5.3-cp35-cp35m-win32.whl", hash = "sha256:cedb2f9e1f990918ea061f28a0f0077a07702e3819602d3507e2ff98c8d20636"}, - {file = "coverage-5.3-cp35-cp35m-win_amd64.whl", hash = "sha256:7f43286f13d91a34fadf61ae252a51a130223c52bfefb50310d5b2deb062cf0f"}, - {file = "coverage-5.3-cp36-cp36m-macosx_10_13_x86_64.whl", hash = "sha256:c851b35fc078389bc16b915a0a7c1d5923e12e2c5aeec58c52f4aa8085ac8237"}, - {file = "coverage-5.3-cp36-cp36m-manylinux1_i686.whl", hash = "sha256:aac1ba0a253e17889550ddb1b60a2063f7474155465577caa2a3b131224cfd54"}, - {file = "coverage-5.3-cp36-cp36m-manylinux1_x86_64.whl", hash = "sha256:2b31f46bf7b31e6aa690d4c7a3d51bb262438c6dcb0d528adde446531d0d3bb7"}, - {file = "coverage-5.3-cp36-cp36m-win32.whl", hash = "sha256:c5f17ad25d2c1286436761b462e22b5020d83316f8e8fcb5deb2b3151f8f1d3a"}, - {file = "coverage-5.3-cp36-cp36m-win_amd64.whl", hash = "sha256:aef72eae10b5e3116bac6957de1df4d75909fc76d1499a53fb6387434b6bcd8d"}, - {file = "coverage-5.3-cp37-cp37m-macosx_10_13_x86_64.whl", hash = "sha256:e8caf961e1b1a945db76f1b5fa9c91498d15f545ac0ababbe575cfab185d3bd8"}, - {file = "coverage-5.3-cp37-cp37m-manylinux1_i686.whl", hash = "sha256:29a6272fec10623fcbe158fdf9abc7a5fa032048ac1d8631f14b50fbfc10d17f"}, - {file = "coverage-5.3-cp37-cp37m-manylinux1_x86_64.whl", hash = "sha256:2d43af2be93ffbad25dd959899b5b809618a496926146ce98ee0b23683f8c51c"}, - {file = "coverage-5.3-cp37-cp37m-win32.whl", hash = "sha256:c3888a051226e676e383de03bf49eb633cd39fc829516e5334e69b8d81aae751"}, - {file = "coverage-5.3-cp37-cp37m-win_amd64.whl", hash = "sha256:9669179786254a2e7e57f0ecf224e978471491d660aaca833f845b72a2df3709"}, - {file = "coverage-5.3-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:0203acd33d2298e19b57451ebb0bed0ab0c602e5cf5a818591b4918b1f97d516"}, - {file = "coverage-5.3-cp38-cp38-manylinux1_i686.whl", hash = "sha256:582ddfbe712025448206a5bc45855d16c2e491c2dd102ee9a2841418ac1c629f"}, - {file = "coverage-5.3-cp38-cp38-manylinux1_x86_64.whl", hash = "sha256:0f313707cdecd5cd3e217fc68c78a960b616604b559e9ea60cc16795c4304259"}, - {file = "coverage-5.3-cp38-cp38-win32.whl", hash = "sha256:78e93cc3571fd928a39c0b26767c986188a4118edc67bc0695bc7a284da22e82"}, - {file = "coverage-5.3-cp38-cp38-win_amd64.whl", hash = "sha256:8f264ba2701b8c9f815b272ad568d555ef98dfe1576802ab3149c3629a9f2221"}, - {file = "coverage-5.3-cp39-cp39-macosx_10_13_x86_64.whl", hash = "sha256:50691e744714856f03a86df3e2bff847c2acede4c191f9a1da38f088df342978"}, - {file = "coverage-5.3-cp39-cp39-manylinux1_i686.whl", hash = "sha256:9361de40701666b034c59ad9e317bae95c973b9ff92513dd0eced11c6adf2e21"}, - {file = "coverage-5.3-cp39-cp39-manylinux1_x86_64.whl", hash = "sha256:c1b78fb9700fc961f53386ad2fd86d87091e06ede5d118b8a50dea285a071c24"}, - {file = "coverage-5.3-cp39-cp39-win32.whl", hash = "sha256:cb7df71de0af56000115eafd000b867d1261f786b5eebd88a0ca6360cccfaca7"}, - {file = "coverage-5.3-cp39-cp39-win_amd64.whl", hash = "sha256:47a11bdbd8ada9b7ee628596f9d97fbd3851bd9999d398e9436bd67376dbece7"}, - {file = "coverage-5.3.tar.gz", hash = "sha256:280baa8ec489c4f542f8940f9c4c2181f0306a8ee1a54eceba071a449fb870a0"}, + {file = "coverage-5.5-cp27-cp27m-macosx_10_9_x86_64.whl", hash = "sha256:b6d534e4b2ab35c9f93f46229363e17f63c53ad01330df9f2d6bd1187e5eaacf"}, + {file = "coverage-5.5-cp27-cp27m-manylinux1_i686.whl", hash = "sha256:b7895207b4c843c76a25ab8c1e866261bcfe27bfaa20c192de5190121770672b"}, + {file = "coverage-5.5-cp27-cp27m-manylinux1_x86_64.whl", hash = "sha256:c2723d347ab06e7ddad1a58b2a821218239249a9e4365eaff6649d31180c1669"}, + {file = "coverage-5.5-cp27-cp27m-manylinux2010_i686.whl", hash = "sha256:900fbf7759501bc7807fd6638c947d7a831fc9fdf742dc10f02956ff7220fa90"}, + {file = "coverage-5.5-cp27-cp27m-manylinux2010_x86_64.whl", hash = "sha256:004d1880bed2d97151facef49f08e255a20ceb6f9432df75f4eef018fdd5a78c"}, + {file = "coverage-5.5-cp27-cp27m-win32.whl", hash = "sha256:06191eb60f8d8a5bc046f3799f8a07a2d7aefb9504b0209aff0b47298333302a"}, + {file = "coverage-5.5-cp27-cp27m-win_amd64.whl", hash = "sha256:7501140f755b725495941b43347ba8a2777407fc7f250d4f5a7d2a1050ba8e82"}, + {file = "coverage-5.5-cp27-cp27mu-manylinux1_i686.whl", hash = "sha256:372da284cfd642d8e08ef606917846fa2ee350f64994bebfbd3afb0040436905"}, + {file = "coverage-5.5-cp27-cp27mu-manylinux1_x86_64.whl", hash = "sha256:8963a499849a1fc54b35b1c9f162f4108017b2e6db2c46c1bed93a72262ed083"}, + {file = "coverage-5.5-cp27-cp27mu-manylinux2010_i686.whl", hash = "sha256:869a64f53488f40fa5b5b9dcb9e9b2962a66a87dab37790f3fcfb5144b996ef5"}, + {file = "coverage-5.5-cp27-cp27mu-manylinux2010_x86_64.whl", hash = "sha256:4a7697d8cb0f27399b0e393c0b90f0f1e40c82023ea4d45d22bce7032a5d7b81"}, + {file = "coverage-5.5-cp310-cp310-macosx_10_14_x86_64.whl", hash = "sha256:8d0a0725ad7c1a0bcd8d1b437e191107d457e2ec1084b9f190630a4fb1af78e6"}, + {file = "coverage-5.5-cp310-cp310-manylinux1_x86_64.whl", hash = "sha256:51cb9476a3987c8967ebab3f0fe144819781fca264f57f89760037a2ea191cb0"}, + {file = "coverage-5.5-cp310-cp310-win_amd64.whl", hash = "sha256:c0891a6a97b09c1f3e073a890514d5012eb256845c451bd48f7968ef939bf4ae"}, + {file = "coverage-5.5-cp35-cp35m-macosx_10_9_x86_64.whl", hash = "sha256:3487286bc29a5aa4b93a072e9592f22254291ce96a9fbc5251f566b6b7343cdb"}, + {file = "coverage-5.5-cp35-cp35m-manylinux1_i686.whl", hash = "sha256:deee1077aae10d8fa88cb02c845cfba9b62c55e1183f52f6ae6a2df6a2187160"}, + {file = "coverage-5.5-cp35-cp35m-manylinux1_x86_64.whl", hash = "sha256:f11642dddbb0253cc8853254301b51390ba0081750a8ac03f20ea8103f0c56b6"}, + {file = "coverage-5.5-cp35-cp35m-manylinux2010_i686.whl", hash = "sha256:6c90e11318f0d3c436a42409f2749ee1a115cd8b067d7f14c148f1ce5574d701"}, + {file = "coverage-5.5-cp35-cp35m-manylinux2010_x86_64.whl", hash = "sha256:30c77c1dc9f253283e34c27935fded5015f7d1abe83bc7821680ac444eaf7793"}, + {file = "coverage-5.5-cp35-cp35m-win32.whl", hash = "sha256:9a1ef3b66e38ef8618ce5fdc7bea3d9f45f3624e2a66295eea5e57966c85909e"}, + {file = "coverage-5.5-cp35-cp35m-win_amd64.whl", hash = "sha256:972c85d205b51e30e59525694670de6a8a89691186012535f9d7dbaa230e42c3"}, + {file = "coverage-5.5-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:af0e781009aaf59e25c5a678122391cb0f345ac0ec272c7961dc5455e1c40066"}, + {file = "coverage-5.5-cp36-cp36m-manylinux1_i686.whl", hash = "sha256:74d881fc777ebb11c63736622b60cb9e4aee5cace591ce274fb69e582a12a61a"}, + {file = "coverage-5.5-cp36-cp36m-manylinux1_x86_64.whl", hash = "sha256:92b017ce34b68a7d67bd6d117e6d443a9bf63a2ecf8567bb3d8c6c7bc5014465"}, + {file = "coverage-5.5-cp36-cp36m-manylinux2010_i686.whl", hash = "sha256:d636598c8305e1f90b439dbf4f66437de4a5e3c31fdf47ad29542478c8508bbb"}, + {file = "coverage-5.5-cp36-cp36m-manylinux2010_x86_64.whl", hash = "sha256:41179b8a845742d1eb60449bdb2992196e211341818565abded11cfa90efb821"}, + {file = "coverage-5.5-cp36-cp36m-win32.whl", hash = "sha256:040af6c32813fa3eae5305d53f18875bedd079960822ef8ec067a66dd8afcd45"}, + {file = "coverage-5.5-cp36-cp36m-win_amd64.whl", hash = "sha256:5fec2d43a2cc6965edc0bb9e83e1e4b557f76f843a77a2496cbe719583ce8184"}, + {file = "coverage-5.5-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:18ba8bbede96a2c3dde7b868de9dcbd55670690af0988713f0603f037848418a"}, + {file = "coverage-5.5-cp37-cp37m-manylinux1_i686.whl", hash = "sha256:2910f4d36a6a9b4214bb7038d537f015346f413a975d57ca6b43bf23d6563b53"}, + {file = "coverage-5.5-cp37-cp37m-manylinux1_x86_64.whl", hash = "sha256:f0b278ce10936db1a37e6954e15a3730bea96a0997c26d7fee88e6c396c2086d"}, + {file = "coverage-5.5-cp37-cp37m-manylinux2010_i686.whl", hash = "sha256:796c9c3c79747146ebd278dbe1e5c5c05dd6b10cc3bcb8389dfdf844f3ead638"}, + {file = "coverage-5.5-cp37-cp37m-manylinux2010_x86_64.whl", hash = "sha256:53194af30d5bad77fcba80e23a1441c71abfb3e01192034f8246e0d8f99528f3"}, + {file = "coverage-5.5-cp37-cp37m-win32.whl", hash = "sha256:184a47bbe0aa6400ed2d41d8e9ed868b8205046518c52464fde713ea06e3a74a"}, + {file = "coverage-5.5-cp37-cp37m-win_amd64.whl", hash = "sha256:2949cad1c5208b8298d5686d5a85b66aae46d73eec2c3e08c817dd3513e5848a"}, + {file = "coverage-5.5-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:217658ec7187497e3f3ebd901afdca1af062b42cfe3e0dafea4cced3983739f6"}, + {file = "coverage-5.5-cp38-cp38-manylinux1_i686.whl", hash = "sha256:1aa846f56c3d49205c952d8318e76ccc2ae23303351d9270ab220004c580cfe2"}, + {file = "coverage-5.5-cp38-cp38-manylinux1_x86_64.whl", hash = "sha256:24d4a7de75446be83244eabbff746d66b9240ae020ced65d060815fac3423759"}, + {file = "coverage-5.5-cp38-cp38-manylinux2010_i686.whl", hash = "sha256:d1f8bf7b90ba55699b3a5e44930e93ff0189aa27186e96071fac7dd0d06a1873"}, + {file = "coverage-5.5-cp38-cp38-manylinux2010_x86_64.whl", hash = "sha256:970284a88b99673ccb2e4e334cfb38a10aab7cd44f7457564d11898a74b62d0a"}, + {file = "coverage-5.5-cp38-cp38-win32.whl", hash = "sha256:01d84219b5cdbfc8122223b39a954820929497a1cb1422824bb86b07b74594b6"}, + {file = "coverage-5.5-cp38-cp38-win_amd64.whl", hash = "sha256:2e0d881ad471768bf6e6c2bf905d183543f10098e3b3640fc029509530091502"}, + {file = "coverage-5.5-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:d1f9ce122f83b2305592c11d64f181b87153fc2c2bbd3bb4a3dde8303cfb1a6b"}, + {file = "coverage-5.5-cp39-cp39-manylinux1_i686.whl", hash = "sha256:13c4ee887eca0f4c5a247b75398d4114c37882658300e153113dafb1d76de529"}, + {file = "coverage-5.5-cp39-cp39-manylinux1_x86_64.whl", hash = "sha256:52596d3d0e8bdf3af43db3e9ba8dcdaac724ba7b5ca3f6358529d56f7a166f8b"}, + {file = "coverage-5.5-cp39-cp39-manylinux2010_i686.whl", hash = "sha256:2cafbbb3af0733db200c9b5f798d18953b1a304d3f86a938367de1567f4b5bff"}, + {file = "coverage-5.5-cp39-cp39-manylinux2010_x86_64.whl", hash = "sha256:44d654437b8ddd9eee7d1eaee28b7219bec228520ff809af170488fd2fed3e2b"}, + {file = "coverage-5.5-cp39-cp39-win32.whl", hash = "sha256:d314ed732c25d29775e84a960c3c60808b682c08d86602ec2c3008e1202e3bb6"}, + {file = "coverage-5.5-cp39-cp39-win_amd64.whl", hash = "sha256:13034c4409db851670bc9acd836243aeee299949bd5673e11844befcb0149f03"}, + {file = "coverage-5.5-pp36-none-any.whl", hash = "sha256:f030f8873312a16414c0d8e1a1ddff2d3235655a2174e3648b4fa66b3f2f1079"}, + {file = "coverage-5.5-pp37-none-any.whl", hash = "sha256:2a3859cb82dcbda1cfd3e6f71c27081d18aa251d20a17d87d26d4cd216fb0af4"}, + {file = "coverage-5.5.tar.gz", hash = "sha256:ebe78fe9a0e874362175b02371bdfbee64d8edc42a044253ddf4ee7d3c15212c"}, ] crashtest = [ {file = "crashtest-0.3.1-py3-none-any.whl", hash = "sha256:300f4b0825f57688b47b6d70c6a31de33512eb2fa1ac614f780939aa0cf91680"}, {file = "crashtest-0.3.1.tar.gz", hash = "sha256:42ca7b6ce88b6c7433e2ce47ea884e91ec93104a4b754998be498a8e6c3d37dd"}, ] cryptography = [ - {file = "cryptography-3.1.1-cp27-cp27m-macosx_10_10_x86_64.whl", hash = "sha256:65beb15e7f9c16e15934569d29fb4def74ea1469d8781f6b3507ab896d6d8719"}, - {file = "cryptography-3.1.1-cp27-cp27m-manylinux1_x86_64.whl", hash = "sha256:983c0c3de4cb9fcba68fd3f45ed846eb86a2a8b8d8bc5bb18364c4d00b3c61fe"}, - {file = "cryptography-3.1.1-cp27-cp27m-manylinux2010_x86_64.whl", hash = "sha256:e97a3b627e3cb63c415a16245d6cef2139cca18bb1183d1b9375a1c14e83f3b3"}, - {file = "cryptography-3.1.1-cp27-cp27m-win32.whl", hash = "sha256:cb179acdd4ae1e4a5a160d80b87841b3d0e0be84af46c7bb2cd7ece57a39c4ba"}, - {file = "cryptography-3.1.1-cp27-cp27m-win_amd64.whl", hash = "sha256:b372026ebf32fe2523159f27d9f0e9f485092e43b00a5adacf732192a70ba118"}, - {file = "cryptography-3.1.1-cp27-cp27mu-manylinux1_x86_64.whl", hash = "sha256:680da076cad81cdf5ffcac50c477b6790be81768d30f9da9e01960c4b18a66db"}, - {file = "cryptography-3.1.1-cp27-cp27mu-manylinux2010_x86_64.whl", hash = "sha256:5d52c72449bb02dd45a773a203196e6d4fae34e158769c896012401f33064396"}, - {file = "cryptography-3.1.1-cp35-abi3-macosx_10_10_x86_64.whl", hash = "sha256:f0e099fc4cc697450c3dd4031791559692dd941a95254cb9aeded66a7aa8b9bc"}, - {file = "cryptography-3.1.1-cp35-abi3-manylinux1_x86_64.whl", hash = "sha256:a7597ffc67987b37b12e09c029bd1dc43965f75d328076ae85721b84046e9ca7"}, - {file = "cryptography-3.1.1-cp35-abi3-manylinux2010_x86_64.whl", hash = "sha256:4549b137d8cbe3c2eadfa56c0c858b78acbeff956bd461e40000b2164d9167c6"}, - {file = "cryptography-3.1.1-cp35-abi3-manylinux2014_aarch64.whl", hash = "sha256:89aceb31cd5f9fc2449fe8cf3810797ca52b65f1489002d58fe190bfb265c536"}, - {file = "cryptography-3.1.1-cp35-cp35m-win32.whl", hash = "sha256:559d622aef2a2dff98a892eef321433ba5bc55b2485220a8ca289c1ecc2bd54f"}, - {file = "cryptography-3.1.1-cp35-cp35m-win_amd64.whl", hash = "sha256:451cdf60be4dafb6a3b78802006a020e6cd709c22d240f94f7a0696240a17154"}, - {file = "cryptography-3.1.1-cp36-abi3-win32.whl", hash = "sha256:762bc5a0df03c51ee3f09c621e1cee64e3a079a2b5020de82f1613873d79ee70"}, - {file = "cryptography-3.1.1-cp36-abi3-win_amd64.whl", hash = "sha256:b12e715c10a13ca1bd27fbceed9adc8c5ff640f8e1f7ea76416352de703523c8"}, - {file = "cryptography-3.1.1-cp36-cp36m-win32.whl", hash = "sha256:21b47c59fcb1c36f1113f3709d37935368e34815ea1d7073862e92f810dc7499"}, - {file = "cryptography-3.1.1-cp36-cp36m-win_amd64.whl", hash = "sha256:48ee615a779ffa749d7d50c291761dc921d93d7cf203dca2db663b4f193f0e49"}, - {file = "cryptography-3.1.1-cp37-cp37m-win32.whl", hash = "sha256:b2bded09c578d19e08bd2c5bb8fed7f103e089752c9cf7ca7ca7de522326e921"}, - {file = "cryptography-3.1.1-cp37-cp37m-win_amd64.whl", hash = "sha256:f99317a0fa2e49917689b8cf977510addcfaaab769b3f899b9c481bbd76730c2"}, - {file = "cryptography-3.1.1-cp38-cp38-win32.whl", hash = "sha256:ab010e461bb6b444eaf7f8c813bb716be2d78ab786103f9608ffd37a4bd7d490"}, - {file = "cryptography-3.1.1-cp38-cp38-win_amd64.whl", hash = "sha256:99d4984aabd4c7182050bca76176ce2dbc9fa9748afe583a7865c12954d714ba"}, - {file = "cryptography-3.1.1.tar.gz", hash = "sha256:9d9fc6a16357965d282dd4ab6531013935425d0dc4950df2e0cf2a1b1ac1017d"}, + {file = "cryptography-3.2.1-cp27-cp27m-macosx_10_10_x86_64.whl", hash = "sha256:6dc59630ecce8c1f558277ceb212c751d6730bd12c80ea96b4ac65637c4f55e7"}, + {file = "cryptography-3.2.1-cp27-cp27m-manylinux1_x86_64.whl", hash = "sha256:75e8e6684cf0034f6bf2a97095cb95f81537b12b36a8fedf06e73050bb171c2d"}, + {file = "cryptography-3.2.1-cp27-cp27m-manylinux2010_x86_64.whl", hash = "sha256:4e7268a0ca14536fecfdf2b00297d4e407da904718658c1ff1961c713f90fd33"}, + {file = "cryptography-3.2.1-cp27-cp27m-win32.whl", hash = "sha256:7117319b44ed1842c617d0a452383a5a052ec6aa726dfbaffa8b94c910444297"}, + {file = "cryptography-3.2.1-cp27-cp27m-win_amd64.whl", hash = "sha256:a733671100cd26d816eed39507e585c156e4498293a907029969234e5e634bc4"}, + {file = "cryptography-3.2.1-cp27-cp27mu-manylinux1_x86_64.whl", hash = "sha256:a75f306a16d9f9afebfbedc41c8c2351d8e61e818ba6b4c40815e2b5740bb6b8"}, + {file = "cryptography-3.2.1-cp27-cp27mu-manylinux2010_x86_64.whl", hash = "sha256:5849d59358547bf789ee7e0d7a9036b2d29e9a4ddf1ce5e06bb45634f995c53e"}, + {file = "cryptography-3.2.1-cp35-abi3-macosx_10_10_x86_64.whl", hash = "sha256:bd717aa029217b8ef94a7d21632a3bb5a4e7218a4513d2521c2a2fd63011e98b"}, + {file = "cryptography-3.2.1-cp35-abi3-manylinux1_x86_64.whl", hash = "sha256:efe15aca4f64f3a7ea0c09c87826490e50ed166ce67368a68f315ea0807a20df"}, + {file = "cryptography-3.2.1-cp35-abi3-manylinux2010_x86_64.whl", hash = "sha256:32434673d8505b42c0de4de86da8c1620651abd24afe91ae0335597683ed1b77"}, + {file = "cryptography-3.2.1-cp35-abi3-manylinux2014_aarch64.whl", hash = "sha256:7b8d9d8d3a9bd240f453342981f765346c87ade811519f98664519696f8e6ab7"}, + {file = "cryptography-3.2.1-cp35-cp35m-win32.whl", hash = "sha256:d3545829ab42a66b84a9aaabf216a4dce7f16dbc76eb69be5c302ed6b8f4a29b"}, + {file = "cryptography-3.2.1-cp35-cp35m-win_amd64.whl", hash = "sha256:a4e27ed0b2504195f855b52052eadcc9795c59909c9d84314c5408687f933fc7"}, + {file = "cryptography-3.2.1-cp36-abi3-win32.whl", hash = "sha256:13b88a0bd044b4eae1ef40e265d006e34dbcde0c2f1e15eb9896501b2d8f6c6f"}, + {file = "cryptography-3.2.1-cp36-abi3-win_amd64.whl", hash = "sha256:07ca431b788249af92764e3be9a488aa1d39a0bc3be313d826bbec690417e538"}, + {file = "cryptography-3.2.1-cp36-cp36m-win32.whl", hash = "sha256:a035a10686532b0587d58a606004aa20ad895c60c4d029afa245802347fab57b"}, + {file = "cryptography-3.2.1-cp36-cp36m-win_amd64.whl", hash = "sha256:d26a2557d8f9122f9bf445fc7034242f4375bd4e95ecda007667540270965b13"}, + {file = "cryptography-3.2.1-cp37-cp37m-win32.whl", hash = "sha256:545a8550782dda68f8cdc75a6e3bf252017aa8f75f19f5a9ca940772fc0cb56e"}, + {file = "cryptography-3.2.1-cp37-cp37m-win_amd64.whl", hash = "sha256:55d0b896631412b6f0c7de56e12eb3e261ac347fbaa5d5e705291a9016e5f8cb"}, + {file = "cryptography-3.2.1-cp38-cp38-win32.whl", hash = "sha256:3cd75a683b15576cfc822c7c5742b3276e50b21a06672dc3a800a2d5da4ecd1b"}, + {file = "cryptography-3.2.1-cp38-cp38-win_amd64.whl", hash = "sha256:d25cecbac20713a7c3bc544372d42d8eafa89799f492a43b79e1dfd650484851"}, + {file = "cryptography-3.2.1.tar.gz", hash = "sha256:d3d5e10be0cf2a12214ddee45c6bd203dab435e3d83b4560c03066eda600bfe3"}, + {file = "cryptography-3.4.6-cp36-abi3-macosx_10_10_x86_64.whl", hash = "sha256:57ad77d32917bc55299b16d3b996ffa42a1c73c6cfa829b14043c561288d2799"}, + {file = "cryptography-3.4.6-cp36-abi3-manylinux2010_x86_64.whl", hash = "sha256:93cfe5b7ff006de13e1e89830810ecbd014791b042cbe5eec253be11ac2b28f3"}, + {file = "cryptography-3.4.6-cp36-abi3-manylinux2014_aarch64.whl", hash = "sha256:5ecf2bcb34d17415e89b546dbb44e73080f747e504273e4d4987630493cded1b"}, + {file = "cryptography-3.4.6-cp36-abi3-manylinux2014_x86_64.whl", hash = "sha256:fec7fb46b10da10d9e1d078d1ff8ed9e05ae14f431fdbd11145edd0550b9a964"}, + {file = "cryptography-3.4.6-cp36-abi3-win32.whl", hash = "sha256:df186fcbf86dc1ce56305becb8434e4b6b7504bc724b71ad7a3239e0c9d14ef2"}, + {file = "cryptography-3.4.6-cp36-abi3-win_amd64.whl", hash = "sha256:66b57a9ca4b3221d51b237094b0303843b914b7d5afd4349970bb26518e350b0"}, + {file = "cryptography-3.4.6.tar.gz", hash = "sha256:2d32223e5b0ee02943f32b19245b61a62db83a882f0e76cc564e1cec60d48f87"}, ] distlib = [ {file = "distlib-0.3.1-py2.py3-none-any.whl", hash = "sha256:8c09de2c67b3e7deef7184574fc060ab8a793e7adbb183d942c389c8b13c52fb"}, @@ -1175,8 +1228,8 @@ httpretty = [ {file = "httpretty-0.9.7.tar.gz", hash = "sha256:66216f26b9d2c52e81808f3e674a6fb65d4bf719721394a1a9be926177e55fbe"}, ] identify = [ - {file = "identify-1.5.5-py2.py3-none-any.whl", hash = "sha256:da683bfb7669fa749fc7731f378229e2dbf29a1d1337cbde04106f02236eb29d"}, - {file = "identify-1.5.5.tar.gz", hash = "sha256:7c22c384a2c9b32c5cc891d13f923f6b2653aa83e2d75d8f79be240d6c86c4f4"}, + {file = "identify-2.1.0-py2.py3-none-any.whl", hash = "sha256:2a5fdf2f5319cc357eda2550bea713a404392495961022cf2462624ce62f0f46"}, + {file = "identify-2.1.0.tar.gz", hash = "sha256:2179e7359471ab55729f201b3fdf7dc2778e221f868410fedcb0987b791ba552"}, ] idna = [ {file = "idna-2.10-py2.py3-none-any.whl", hash = "sha256:b97d804b1e9b523befed77c48dacec60e6dcb0b5391d57af6a65a312a90648c0"}, @@ -1187,24 +1240,24 @@ importlib-metadata = [ {file = "importlib_metadata-1.7.0.tar.gz", hash = "sha256:90bb658cdbbf6d1735b6341ce708fc7024a3e14e99ffdc5783edea9f9b077f83"}, ] importlib-resources = [ - {file = "importlib_resources-3.0.0-py2.py3-none-any.whl", hash = "sha256:d028f66b66c0d5732dae86ba4276999855e162a749c92620a38c1d779ed138a7"}, - {file = "importlib_resources-3.0.0.tar.gz", hash = "sha256:19f745a6eca188b490b1428c8d1d4a0d2368759f32370ea8fb89cad2ab1106c3"}, + {file = "importlib_resources-3.2.1-py2.py3-none-any.whl", hash = "sha256:e2860cf0c4bc999947228d18be154fa3779c5dde0b882bd2d7b3f4d25e698bd6"}, + {file = "importlib_resources-3.2.1.tar.gz", hash = "sha256:a9fe213ab6452708ec1b3f4ec6f2881b8ab3645cb4e5efb7fea2bbf05a91db3b"}, ] ipaddress = [ {file = "ipaddress-1.0.23-py2.py3-none-any.whl", hash = "sha256:6e0f4a39e66cb5bb9a137b00276a2eff74f93b71dcbdad6f10ff7df9d3557fcc"}, {file = "ipaddress-1.0.23.tar.gz", hash = "sha256:b7f8e0369580bb4a24d5ba1d7cc29660a4a6987763faf1d8a8046830e020e7e2"}, ] jeepney = [ - {file = "jeepney-0.4.3-py3-none-any.whl", hash = "sha256:d6c6b49683446d2407d2fe3acb7a368a77ff063f9182fe427da15d622adc24cf"}, - {file = "jeepney-0.4.3.tar.gz", hash = "sha256:3479b861cc2b6407de5188695fa1a8d57e5072d7059322469b62628869b8e36e"}, + {file = "jeepney-0.6.0-py3-none-any.whl", hash = "sha256:aec56c0eb1691a841795111e184e13cad504f7703b9a64f63020816afa79a8ae"}, + {file = "jeepney-0.6.0.tar.gz", hash = "sha256:7d59b6622675ca9e993a6bd38de845051d315f8b0c72cca3aef733a20b648657"}, ] keyring = [ {file = "keyring-18.0.1-py2.py3-none-any.whl", hash = "sha256:7b29ebfcf8678c4da531b2478a912eea01e80007e5ddca9ee0c7038cb3489ec6"}, {file = "keyring-18.0.1.tar.gz", hash = "sha256:67d6cc0132bd77922725fae9f18366bb314fd8f95ff4d323a4df41890a96a838"}, {file = "keyring-20.0.1-py2.py3-none-any.whl", hash = "sha256:c674f032424b4bffc62abeac5523ec49cc84aed07a480c3233e0baf618efc15c"}, {file = "keyring-20.0.1.tar.gz", hash = "sha256:963bfa7f090269d30bdc5e25589e5fd9dad2cf2a7c6f176a7f2386910e5d0d8d"}, - {file = "keyring-21.4.0-py3-none-any.whl", hash = "sha256:4e34ea2fdec90c1c43d6610b5a5fafa1b9097db1802948e90caf5763974b8f8d"}, - {file = "keyring-21.4.0.tar.gz", hash = "sha256:9aeadd006a852b78f4b4ef7c7556c2774d2432bbef8ee538a3e9089ac8b11466"}, + {file = "keyring-21.8.0-py3-none-any.whl", hash = "sha256:4be9cbaaaf83e61d6399f733d113ede7d1c73bc75cb6aeb64eee0f6ac39b30ea"}, + {file = "keyring-21.8.0.tar.gz", hash = "sha256:1746d3ac913d449a090caf11e9e4af00e26c3f7f7e81027872192b2398b98675"}, ] lockfile = [ {file = "lockfile-0.12.2-py2.py3-none-any.whl", hash = "sha256:6c3cb24f344923d30b2785d5ad75182c8ea7ac1b6171b08657258ec7429d50fa"}, @@ -1218,36 +1271,48 @@ more-itertools = [ {file = "more-itertools-5.0.0.tar.gz", hash = "sha256:38a936c0a6d98a38bcc2d03fdaaedaba9f412879461dd2ceff8d37564d6522e4"}, {file = "more_itertools-5.0.0-py2-none-any.whl", hash = "sha256:c0a5785b1109a6bd7fac76d6837fd1feca158e54e521ccd2ae8bfe393cc9d4fc"}, {file = "more_itertools-5.0.0-py3-none-any.whl", hash = "sha256:fe7a7cae1ccb57d33952113ff4fa1bc5f879963600ed74918f1236e212ee50b9"}, - {file = "more-itertools-8.5.0.tar.gz", hash = "sha256:6f83822ae94818eae2612063a5101a7311e68ae8002005b5e05f03fd74a86a20"}, - {file = "more_itertools-8.5.0-py3-none-any.whl", hash = "sha256:9b30f12df9393f0d28af9210ff8efe48d10c94f73e5daf886f10c4b0b0b4f03c"}, + {file = "more-itertools-8.6.0.tar.gz", hash = "sha256:b3a9005928e5bed54076e6e549c792b306fddfe72b2d1d22dd63d42d5d3899cf"}, + {file = "more_itertools-8.6.0-py3-none-any.whl", hash = "sha256:8e1a2a43b2f2727425f2b5839587ae37093f19153dc26c0927d1048ff6557330"}, + {file = "more-itertools-8.7.0.tar.gz", hash = "sha256:c5d6da9ca3ff65220c3bfd2a8db06d698f05d4d2b9be57e1deb2be5a45019713"}, + {file = "more_itertools-8.7.0-py3-none-any.whl", hash = "sha256:5652a9ac72209ed7df8d9c15daf4e1aa0e3d2ccd3c87f8265a0673cd9cbc9ced"}, ] msgpack = [ - {file = "msgpack-1.0.0-cp35-cp35m-manylinux1_i686.whl", hash = "sha256:cec8bf10981ed70998d98431cd814db0ecf3384e6b113366e7f36af71a0fca08"}, - {file = "msgpack-1.0.0-cp35-cp35m-manylinux1_x86_64.whl", hash = "sha256:aa5c057eab4f40ec47ea6f5a9825846be2ff6bf34102c560bad5cad5a677c5be"}, - {file = "msgpack-1.0.0-cp36-cp36m-macosx_10_13_x86_64.whl", hash = "sha256:4233b7f86c1208190c78a525cd3828ca1623359ef48f78a6fea4b91bb995775a"}, - {file = "msgpack-1.0.0-cp36-cp36m-manylinux1_i686.whl", hash = "sha256:b3758dfd3423e358bbb18a7cccd1c74228dffa7a697e5be6cb9535de625c0dbf"}, - {file = "msgpack-1.0.0-cp36-cp36m-manylinux1_x86_64.whl", hash = "sha256:25b3bc3190f3d9d965b818123b7752c5dfb953f0d774b454fd206c18fe384fb8"}, - {file = "msgpack-1.0.0-cp36-cp36m-win32.whl", hash = "sha256:e7bbdd8e2b277b77782f3ce34734b0dfde6cbe94ddb74de8d733d603c7f9e2b1"}, - {file = "msgpack-1.0.0-cp36-cp36m-win_amd64.whl", hash = "sha256:5dba6d074fac9b24f29aaf1d2d032306c27f04187651511257e7831733293ec2"}, - {file = "msgpack-1.0.0-cp37-cp37m-macosx_10_13_x86_64.whl", hash = "sha256:908944e3f038bca67fcfedb7845c4a257c7749bf9818632586b53bcf06ba4b97"}, - {file = "msgpack-1.0.0-cp37-cp37m-manylinux1_i686.whl", hash = "sha256:db685187a415f51d6b937257474ca72199f393dad89534ebbdd7d7a3b000080e"}, - {file = "msgpack-1.0.0-cp37-cp37m-manylinux1_x86_64.whl", hash = "sha256:ea41c9219c597f1d2bf6b374d951d310d58684b5de9dc4bd2976db9e1e22c140"}, - {file = "msgpack-1.0.0-cp37-cp37m-win32.whl", hash = "sha256:e35b051077fc2f3ce12e7c6a34cf309680c63a842db3a0616ea6ed25ad20d272"}, - {file = "msgpack-1.0.0-cp37-cp37m-win_amd64.whl", hash = "sha256:5bea44181fc8e18eed1d0cd76e355073f00ce232ff9653a0ae88cb7d9e643322"}, - {file = "msgpack-1.0.0-cp38-cp38-macosx_10_13_x86_64.whl", hash = "sha256:c901e8058dd6653307906c5f157f26ed09eb94a850dddd989621098d347926ab"}, - {file = "msgpack-1.0.0-cp38-cp38-manylinux1_i686.whl", hash = "sha256:271b489499a43af001a2e42f42d876bb98ccaa7e20512ff37ca78c8e12e68f84"}, - {file = "msgpack-1.0.0-cp38-cp38-manylinux1_x86_64.whl", hash = "sha256:7a22c965588baeb07242cb561b63f309db27a07382825fc98aecaf0827c1538e"}, - {file = "msgpack-1.0.0-cp38-cp38-win32.whl", hash = "sha256:002a0d813e1f7b60da599bdf969e632074f9eec1b96cbed8fb0973a63160a408"}, - {file = "msgpack-1.0.0-cp38-cp38-win_amd64.whl", hash = "sha256:39c54fdebf5fa4dda733369012c59e7d085ebdfe35b6cf648f09d16708f1be5d"}, - {file = "msgpack-1.0.0.tar.gz", hash = "sha256:9534d5cc480d4aff720233411a1f765be90885750b07df772380b34c10ecb5c0"}, + {file = "msgpack-1.0.2-cp35-cp35m-manylinux1_i686.whl", hash = "sha256:b6d9e2dae081aa35c44af9c4298de4ee72991305503442a5c74656d82b581fe9"}, + {file = "msgpack-1.0.2-cp35-cp35m-manylinux1_x86_64.whl", hash = "sha256:a99b144475230982aee16b3d249170f1cccebf27fb0a08e9f603b69637a62192"}, + {file = "msgpack-1.0.2-cp35-cp35m-manylinux2014_aarch64.whl", hash = "sha256:1026dcc10537d27dd2d26c327e552f05ce148977e9d7b9f1718748281b38c841"}, + {file = "msgpack-1.0.2-cp36-cp36m-macosx_10_14_x86_64.whl", hash = "sha256:fe07bc6735d08e492a327f496b7850e98cb4d112c56df69b0c844dbebcbb47f6"}, + {file = "msgpack-1.0.2-cp36-cp36m-manylinux1_i686.whl", hash = "sha256:9ea52fff0473f9f3000987f313310208c879493491ef3ccf66268eff8d5a0326"}, + {file = "msgpack-1.0.2-cp36-cp36m-manylinux1_x86_64.whl", hash = "sha256:26a1759f1a88df5f1d0b393eb582ec022326994e311ba9c5818adc5374736439"}, + {file = "msgpack-1.0.2-cp36-cp36m-manylinux2014_aarch64.whl", hash = "sha256:497d2c12426adcd27ab83144057a705efb6acc7e85957a51d43cdcf7f258900f"}, + {file = "msgpack-1.0.2-cp36-cp36m-win32.whl", hash = "sha256:e89ec55871ed5473a041c0495b7b4e6099f6263438e0bd04ccd8418f92d5d7f2"}, + {file = "msgpack-1.0.2-cp36-cp36m-win_amd64.whl", hash = "sha256:a4355d2193106c7aa77c98fc955252a737d8550320ecdb2e9ac701e15e2943bc"}, + {file = "msgpack-1.0.2-cp37-cp37m-macosx_10_14_x86_64.whl", hash = "sha256:d6c64601af8f3893d17ec233237030e3110f11b8a962cb66720bf70c0141aa54"}, + {file = "msgpack-1.0.2-cp37-cp37m-manylinux1_i686.whl", hash = "sha256:f484cd2dca68502de3704f056fa9b318c94b1539ed17a4c784266df5d6978c87"}, + {file = "msgpack-1.0.2-cp37-cp37m-manylinux1_x86_64.whl", hash = "sha256:f3e6aaf217ac1c7ce1563cf52a2f4f5d5b1f64e8729d794165db71da57257f0c"}, + {file = "msgpack-1.0.2-cp37-cp37m-manylinux2014_aarch64.whl", hash = "sha256:8521e5be9e3b93d4d5e07cb80b7e32353264d143c1f072309e1863174c6aadb1"}, + {file = "msgpack-1.0.2-cp37-cp37m-win32.whl", hash = "sha256:31c17bbf2ae5e29e48d794c693b7ca7a0c73bd4280976d408c53df421e838d2a"}, + {file = "msgpack-1.0.2-cp37-cp37m-win_amd64.whl", hash = "sha256:8ffb24a3b7518e843cd83538cf859e026d24ec41ac5721c18ed0c55101f9775b"}, + {file = "msgpack-1.0.2-cp38-cp38-macosx_10_14_x86_64.whl", hash = "sha256:b28c0876cce1466d7c2195d7658cf50e4730667196e2f1355c4209444717ee06"}, + {file = "msgpack-1.0.2-cp38-cp38-manylinux1_i686.whl", hash = "sha256:87869ba567fe371c4555d2e11e4948778ab6b59d6cc9d8460d543e4cfbbddd1c"}, + {file = "msgpack-1.0.2-cp38-cp38-manylinux1_x86_64.whl", hash = "sha256:b55f7db883530b74c857e50e149126b91bb75d35c08b28db12dcb0346f15e46e"}, + {file = "msgpack-1.0.2-cp38-cp38-manylinux2014_aarch64.whl", hash = "sha256:ac25f3e0513f6673e8b405c3a80500eb7be1cf8f57584be524c4fa78fe8e0c83"}, + {file = "msgpack-1.0.2-cp38-cp38-win32.whl", hash = "sha256:0cb94ee48675a45d3b86e61d13c1e6f1696f0183f0715544976356ff86f741d9"}, + {file = "msgpack-1.0.2-cp38-cp38-win_amd64.whl", hash = "sha256:e36a812ef4705a291cdb4a2fd352f013134f26c6ff63477f20235138d1d21009"}, + {file = "msgpack-1.0.2-cp39-cp39-macosx_10_14_x86_64.whl", hash = "sha256:2a5866bdc88d77f6e1370f82f2371c9bc6fc92fe898fa2dec0c5d4f5435a2694"}, + {file = "msgpack-1.0.2-cp39-cp39-manylinux1_i686.whl", hash = "sha256:92be4b12de4806d3c36810b0fe2aeedd8d493db39e2eb90742b9c09299eb5759"}, + {file = "msgpack-1.0.2-cp39-cp39-manylinux1_x86_64.whl", hash = "sha256:de6bd7990a2c2dabe926b7e62a92886ccbf809425c347ae7de277067f97c2887"}, + {file = "msgpack-1.0.2-cp39-cp39-manylinux2014_aarch64.whl", hash = "sha256:5a9ee2540c78659a1dd0b110f73773533ee3108d4e1219b5a15a8d635b7aca0e"}, + {file = "msgpack-1.0.2-cp39-cp39-win32.whl", hash = "sha256:c747c0cc08bd6d72a586310bda6ea72eeb28e7505990f342552315b229a19b33"}, + {file = "msgpack-1.0.2-cp39-cp39-win_amd64.whl", hash = "sha256:d8167b84af26654c1124857d71650404336f4eb5cc06900667a493fc619ddd9f"}, + {file = "msgpack-1.0.2.tar.gz", hash = "sha256:fae04496f5bc150eefad4e9571d1a76c55d021325dcd484ce45065ebbdd00984"}, ] nodeenv = [ {file = "nodeenv-1.5.0-py2.py3-none-any.whl", hash = "sha256:5304d424c529c997bc888453aeaa6362d242b6b4631e90f3d4bf1b290f1c84a9"}, {file = "nodeenv-1.5.0.tar.gz", hash = "sha256:ab45090ae383b716c4ef89e690c41ff8c2b257b85b309f01f3654df3d084bd7c"}, ] packaging = [ - {file = "packaging-20.4-py2.py3-none-any.whl", hash = "sha256:998416ba6962ae7fbd6596850b80e17859a5753ba17c32284f67bfff33784181"}, - {file = "packaging-20.4.tar.gz", hash = "sha256:4357f74f47b9c12db93624a82154e9b120fa8293699949152b22065d556079f8"}, + {file = "packaging-20.9-py2.py3-none-any.whl", hash = "sha256:67714da7f7bc052e064859c05c595155bd1ee9f69f76557e21f051443c20947a"}, + {file = "packaging-20.9.tar.gz", hash = "sha256:5b327ac1320dc863dca72f4514ecc086f31186744b84a230374cc1fd776feae5"}, ] pastel = [ {file = "pastel-0.2.1-py2.py3-none-any.whl", hash = "sha256:4349225fcdf6c2bb34d483e523475de5bb04a5c10ef711263452cb37d7dd4364"}, @@ -1262,28 +1327,28 @@ pexpect = [ {file = "pexpect-4.8.0.tar.gz", hash = "sha256:fc65a43959d153d0114afe13997d439c22823a27cefceb5ff35c2178c6784c0c"}, ] pkginfo = [ - {file = "pkginfo-1.5.0.1-py2.py3-none-any.whl", hash = "sha256:a6d9e40ca61ad3ebd0b72fbadd4fba16e4c0e4df0428c041e01e06eb6ee71f32"}, - {file = "pkginfo-1.5.0.1.tar.gz", hash = "sha256:7424f2c8511c186cd5424bbf31045b77435b37a8d604990b79d4e70d741148bb"}, + {file = "pkginfo-1.7.0-py2.py3-none-any.whl", hash = "sha256:9fdbea6495622e022cc72c2e5e1b735218e4ffb2a2a69cde2694a6c1f16afb75"}, + {file = "pkginfo-1.7.0.tar.gz", hash = "sha256:029a70cb45c6171c329dfc890cde0879f8c52d6f3922794796e06f577bb03db4"}, ] pluggy = [ {file = "pluggy-0.13.1-py2.py3-none-any.whl", hash = "sha256:966c145cd83c96502c3c3868f50408687b38434af77734af1e9ca461a4081d2d"}, {file = "pluggy-0.13.1.tar.gz", hash = "sha256:15b2acde666561e1298d71b523007ed7364de07029219b604cf808bfa1c765b0"}, ] poetry-core = [ - {file = "poetry-core-1.0.0.tar.gz", hash = "sha256:6a664ff389b9f45382536f8fa1611a0cb4d2de7c5a5c885db1f0c600cd11fbd5"}, - {file = "poetry_core-1.0.0-py2.py3-none-any.whl", hash = "sha256:769288e0e1b88dfcceb3185728f0b7388b26d5f93d6c22d2dcae372da51d200d"}, + {file = "poetry-core-1.0.2.tar.gz", hash = "sha256:ff505d656a6cf40ffbf84393d8b5bf37b78523a15def3ac473b6fad74261ee71"}, + {file = "poetry_core-1.0.2-py2.py3-none-any.whl", hash = "sha256:ee0ed4164440eeab27d1b01bc7b9b3afdc3124f68d4ea28d0821a402a9c7c044"}, ] pre-commit = [ - {file = "pre_commit-2.7.1-py2.py3-none-any.whl", hash = "sha256:810aef2a2ba4f31eed1941fc270e72696a1ad5590b9751839c90807d0fff6b9a"}, - {file = "pre_commit-2.7.1.tar.gz", hash = "sha256:c54fd3e574565fe128ecc5e7d2f91279772ddb03f8729645fa812fe809084a70"}, + {file = "pre_commit-2.10.1-py2.py3-none-any.whl", hash = "sha256:16212d1fde2bed88159287da88ff03796863854b04dc9f838a55979325a3d20e"}, + {file = "pre_commit-2.10.1.tar.gz", hash = "sha256:399baf78f13f4de82a29b649afd74bef2c4e28eb4f021661fc7f29246e8c7a3a"}, ] ptyprocess = [ - {file = "ptyprocess-0.6.0-py2.py3-none-any.whl", hash = "sha256:d7cc528d76e76342423ca640335bd3633420dc1366f258cb31d05e865ef5ca1f"}, - {file = "ptyprocess-0.6.0.tar.gz", hash = "sha256:923f299cc5ad920c68f2bc0bc98b75b9f838b93b599941a6b63ddbc2476394c0"}, + {file = "ptyprocess-0.7.0-py2.py3-none-any.whl", hash = "sha256:4b41f3967fce3af57cc7e94b888626c18bf37a083e3651ca8feeb66d492fef35"}, + {file = "ptyprocess-0.7.0.tar.gz", hash = "sha256:5c5d0a3b48ceee0b48485e0c26037c0acd7d29765ca3fbb5cb3831d347423220"}, ] py = [ - {file = "py-1.9.0-py2.py3-none-any.whl", hash = "sha256:366389d1db726cd2fcfc79732e75410e5fe4d31db13692115529d34069a043c2"}, - {file = "py-1.9.0.tar.gz", hash = "sha256:9ca6883ce56b4e8da7e79ac18787889fa5206c79dcc67fb065376cd2fe03f342"}, + {file = "py-1.10.0-py2.py3-none-any.whl", hash = "sha256:3b80836aa6d1feeaa108e046da6423ab8f6ceda6468545ae8d02d9d58d18818a"}, + {file = "py-1.10.0.tar.gz", hash = "sha256:21b81bda15b66ef5e1a777a21c4dcd9c20ad3efd0b3f817e7a809035269e1bd3"}, ] pycparser = [ {file = "pycparser-2.20-py2.py3-none-any.whl", hash = "sha256:7582ad22678f0fcd81102833f60ef8d0e57288b6b5fb00323d101be910e35705"}, @@ -1304,8 +1369,8 @@ pytest = [ {file = "pytest-5.4.3.tar.gz", hash = "sha256:7979331bfcba207414f5e1263b5a0f8f521d0f457318836a7355531ed1a4c7d8"}, ] pytest-cov = [ - {file = "pytest-cov-2.10.1.tar.gz", hash = "sha256:47bd0ce14056fdd79f93e1713f88fad7bdcc583dcd7783da86ef2f085a0bb88e"}, - {file = "pytest_cov-2.10.1-py2.py3-none-any.whl", hash = "sha256:45ec2d5182f89a81fc3eb29e3d1ed3113b9e9a873bcddb2a71faaab066110191"}, + {file = "pytest-cov-2.11.1.tar.gz", hash = "sha256:359952d9d39b9f822d9d29324483e7ba04a3a17dd7d05aa6beb7ea01e359e5f7"}, + {file = "pytest_cov-2.11.1-py2.py3-none-any.whl", hash = "sha256:bdb9fdb0b85a7cc825269a4c56b48ccaa5c7e365054b6038772c32ddcdc969da"}, ] pytest-mock = [ {file = "pytest-mock-1.13.0.tar.gz", hash = "sha256:e24a911ec96773022ebcc7030059b57cd3480b56d4f5d19b7c370ec635e6aed5"}, @@ -1319,21 +1384,31 @@ pywin32-ctypes = [ {file = "pywin32_ctypes-0.2.0-py2.py3-none-any.whl", hash = "sha256:9dc2d991b3479cc2df15930958b674a48a227d5361d413827a4cfd0b5876fc98"}, ] pyyaml = [ - {file = "PyYAML-5.3.1-cp27-cp27m-win32.whl", hash = "sha256:74809a57b329d6cc0fdccee6318f44b9b8649961fa73144a98735b0aaf029f1f"}, - {file = "PyYAML-5.3.1-cp27-cp27m-win_amd64.whl", hash = "sha256:240097ff019d7c70a4922b6869d8a86407758333f02203e0fc6ff79c5dcede76"}, - {file = "PyYAML-5.3.1-cp35-cp35m-win32.whl", hash = "sha256:4f4b913ca1a7319b33cfb1369e91e50354d6f07a135f3b901aca02aa95940bd2"}, - {file = "PyYAML-5.3.1-cp35-cp35m-win_amd64.whl", hash = "sha256:cc8955cfbfc7a115fa81d85284ee61147059a753344bc51098f3ccd69b0d7e0c"}, - {file = "PyYAML-5.3.1-cp36-cp36m-win32.whl", hash = "sha256:7739fc0fa8205b3ee8808aea45e968bc90082c10aef6ea95e855e10abf4a37b2"}, - {file = "PyYAML-5.3.1-cp36-cp36m-win_amd64.whl", hash = "sha256:69f00dca373f240f842b2931fb2c7e14ddbacd1397d57157a9b005a6a9942648"}, - {file = "PyYAML-5.3.1-cp37-cp37m-win32.whl", hash = "sha256:d13155f591e6fcc1ec3b30685d50bf0711574e2c0dfffd7644babf8b5102ca1a"}, - {file = "PyYAML-5.3.1-cp37-cp37m-win_amd64.whl", hash = "sha256:73f099454b799e05e5ab51423c7bcf361c58d3206fa7b0d555426b1f4d9a3eaf"}, - {file = "PyYAML-5.3.1-cp38-cp38-win32.whl", hash = "sha256:06a0d7ba600ce0b2d2fe2e78453a470b5a6e000a985dd4a4e54e436cc36b0e97"}, - {file = "PyYAML-5.3.1-cp38-cp38-win_amd64.whl", hash = "sha256:95f71d2af0ff4227885f7a6605c37fd53d3a106fcab511b8860ecca9fcf400ee"}, - {file = "PyYAML-5.3.1.tar.gz", hash = "sha256:b8eac752c5e14d3eca0e6dd9199cd627518cb5ec06add0de9d32baeee6fe645d"}, + {file = "PyYAML-5.4.1-cp27-cp27m-macosx_10_9_x86_64.whl", hash = "sha256:3b2b1824fe7112845700f815ff6a489360226a5609b96ec2190a45e62a9fc922"}, + {file = "PyYAML-5.4.1-cp27-cp27m-win32.whl", hash = "sha256:129def1b7c1bf22faffd67b8f3724645203b79d8f4cc81f674654d9902cb4393"}, + {file = "PyYAML-5.4.1-cp27-cp27m-win_amd64.whl", hash = "sha256:4465124ef1b18d9ace298060f4eccc64b0850899ac4ac53294547536533800c8"}, + {file = "PyYAML-5.4.1-cp27-cp27mu-manylinux1_x86_64.whl", hash = "sha256:bb4191dfc9306777bc594117aee052446b3fa88737cd13b7188d0e7aa8162185"}, + {file = "PyYAML-5.4.1-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:6c78645d400265a062508ae399b60b8c167bf003db364ecb26dcab2bda048253"}, + {file = "PyYAML-5.4.1-cp36-cp36m-manylinux1_x86_64.whl", hash = "sha256:4e0583d24c881e14342eaf4ec5fbc97f934b999a6828693a99157fde912540cc"}, + {file = "PyYAML-5.4.1-cp36-cp36m-win32.whl", hash = "sha256:3bd0e463264cf257d1ffd2e40223b197271046d09dadf73a0fe82b9c1fc385a5"}, + {file = "PyYAML-5.4.1-cp36-cp36m-win_amd64.whl", hash = "sha256:e4fac90784481d221a8e4b1162afa7c47ed953be40d31ab4629ae917510051df"}, + {file = "PyYAML-5.4.1-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:5accb17103e43963b80e6f837831f38d314a0495500067cb25afab2e8d7a4018"}, + {file = "PyYAML-5.4.1-cp37-cp37m-manylinux1_x86_64.whl", hash = "sha256:e1d4970ea66be07ae37a3c2e48b5ec63f7ba6804bdddfdbd3cfd954d25a82e63"}, + {file = "PyYAML-5.4.1-cp37-cp37m-win32.whl", hash = "sha256:dd5de0646207f053eb0d6c74ae45ba98c3395a571a2891858e87df7c9b9bd51b"}, + {file = "PyYAML-5.4.1-cp37-cp37m-win_amd64.whl", hash = "sha256:08682f6b72c722394747bddaf0aa62277e02557c0fd1c42cb853016a38f8dedf"}, + {file = "PyYAML-5.4.1-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:d2d9808ea7b4af864f35ea216be506ecec180628aced0704e34aca0b040ffe46"}, + {file = "PyYAML-5.4.1-cp38-cp38-manylinux1_x86_64.whl", hash = "sha256:8c1be557ee92a20f184922c7b6424e8ab6691788e6d86137c5d93c1a6ec1b8fb"}, + {file = "PyYAML-5.4.1-cp38-cp38-win32.whl", hash = "sha256:fa5ae20527d8e831e8230cbffd9f8fe952815b2b7dae6ffec25318803a7528fc"}, + {file = "PyYAML-5.4.1-cp38-cp38-win_amd64.whl", hash = "sha256:0f5f5786c0e09baddcd8b4b45f20a7b5d61a7e7e99846e3c799b05c7c53fa696"}, + {file = "PyYAML-5.4.1-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:294db365efa064d00b8d1ef65d8ea2c3426ac366c0c4368d930bf1c5fb497f77"}, + {file = "PyYAML-5.4.1-cp39-cp39-manylinux1_x86_64.whl", hash = "sha256:74c1485f7707cf707a7aef42ef6322b8f97921bd89be2ab6317fd782c2d53183"}, + {file = "PyYAML-5.4.1-cp39-cp39-win32.whl", hash = "sha256:49d4cdd9065b9b6e206d0595fee27a96b5dd22618e7520c33204a4a3239d5b10"}, + {file = "PyYAML-5.4.1-cp39-cp39-win_amd64.whl", hash = "sha256:c20cfa2d49991c8b4147af39859b167664f2ad4561704ee74c1de03318e898db"}, + {file = "PyYAML-5.4.1.tar.gz", hash = "sha256:607774cbba28732bfa802b54baa7484215f530991055bb562efbed5b2f20a45e"}, ] requests = [ - {file = "requests-2.24.0-py2.py3-none-any.whl", hash = "sha256:fe75cc94a9443b9246fc7049224f75604b113c36acb93f87b80ed42c44cbb898"}, - {file = "requests-2.24.0.tar.gz", hash = "sha256:b3559a131db72c33ee969480840fff4bb6dd111de7dd27c8ee1f820f4f00231b"}, + {file = "requests-2.25.1-py2.py3-none-any.whl", hash = "sha256:c210084e36a42ae6b9219e00e48287def368a26d03a048ddad7bfee44f75871e"}, + {file = "requests-2.25.1.tar.gz", hash = "sha256:27973dd4a904a4f13b263a19c866c13b92a39ed1c964655f025f3f8d3d75b804"}, ] requests-toolbelt = [ {file = "requests-toolbelt-0.9.1.tar.gz", hash = "sha256:968089d4584ad4ad7c171454f0a5c6dac23971e9472521ea3b6d49d610aa6fc0"}, @@ -1354,16 +1429,16 @@ scandir = [ ] secretstorage = [ {file = "SecretStorage-2.3.1.tar.gz", hash = "sha256:3af65c87765323e6f64c83575b05393f9e003431959c9395d1791d51497f29b6"}, - {file = "SecretStorage-3.1.2-py3-none-any.whl", hash = "sha256:b5ec909dde94d4ae2fa26af7c089036997030f0cf0a5cb372b4cccabd81c143b"}, - {file = "SecretStorage-3.1.2.tar.gz", hash = "sha256:15da8a989b65498e29be338b3b279965f1b8f09b9668bd8010da183024c8bff6"}, + {file = "SecretStorage-3.3.1-py3-none-any.whl", hash = "sha256:422d82c36172d88d6a0ed5afdec956514b189ddbfb72fefab0c8a1cee4eaf71f"}, + {file = "SecretStorage-3.3.1.tar.gz", hash = "sha256:fd666c51a6bf200643495a04abb261f83229dcb6fd8472ec393df7ffc8b6f195"}, ] shellingham = [ - {file = "shellingham-1.3.2-py2.py3-none-any.whl", hash = "sha256:7f6206ae169dc1a03af8a138681b3f962ae61cc93ade84d0585cca3aaf770044"}, - {file = "shellingham-1.3.2.tar.gz", hash = "sha256:576c1982bea0ba82fb46c36feb951319d7f42214a82634233f58b40d858a751e"}, + {file = "shellingham-1.4.0-py2.py3-none-any.whl", hash = "sha256:536b67a0697f2e4af32ab176c00a50ac2899c5a05e0d8e2dadac8e58888283f9"}, + {file = "shellingham-1.4.0.tar.gz", hash = "sha256:4855c2458d6904829bd34c299f11fdeed7cfefbf8a2c522e4caea6cd76b3171e"}, ] singledispatch = [ - {file = "singledispatch-3.4.0.3-py2.py3-none-any.whl", hash = "sha256:833b46966687b3de7f438c761ac475213e53b306740f1abfaa86e1d1aae56aa8"}, - {file = "singledispatch-3.4.0.3.tar.gz", hash = "sha256:5b06af87df13818d14f08a028e42f566640aef80805c3b50c5056b086e3c2b9c"}, + {file = "singledispatch-3.6.1-py2.py3-none-any.whl", hash = "sha256:85c97f94c8957fa4e6dab113156c182fb346d56d059af78aad710bced15f16fb"}, + {file = "singledispatch-3.6.1.tar.gz", hash = "sha256:58b46ce1cc4d43af0aac3ac9a047bdb0f44e05f0b2fa2eec755863331700c865"}, ] six = [ {file = "six-1.15.0-py2.py3-none-any.whl", hash = "sha256:8b74bedcbbbaca38ff6d7491d76f2b06b3592611af620f8426e82dddb04a5ced"}, @@ -1371,22 +1446,23 @@ six = [ ] subprocess32 = [ {file = "subprocess32-3.5.4-cp27-cp27m-macosx_10_6_intel.whl", hash = "sha256:88e37c1aac5388df41cc8a8456bb49ebffd321a3ad4d70358e3518176de3a56b"}, + {file = "subprocess32-3.5.4-cp27-cp27mu-manylinux2014_x86_64.whl", hash = "sha256:e45d985aef903c5b7444d34350b05da91a9e0ea015415ab45a21212786c649d0"}, {file = "subprocess32-3.5.4.tar.gz", hash = "sha256:eb2937c80497978d181efa1b839ec2d9622cf9600a039a79d0e108d1f9aec79d"}, ] termcolor = [ {file = "termcolor-1.1.0.tar.gz", hash = "sha256:1d6d69ce66211143803fbc56652b41d73b4a400a2891d7bf7a1cdf4c02de613b"}, ] toml = [ - {file = "toml-0.10.1-py2.py3-none-any.whl", hash = "sha256:bda89d5935c2eac546d648028b9901107a595863cb36bae0c73ac804a9b4ce88"}, - {file = "toml-0.10.1.tar.gz", hash = "sha256:926b612be1e5ce0634a2ca03470f95169cf16f939018233a670519cb4ac58b0f"}, + {file = "toml-0.10.2-py2.py3-none-any.whl", hash = "sha256:806143ae5bfb6a3c6e736a764057db0e6a0e05e338b5630894a5f779cabb4f9b"}, + {file = "toml-0.10.2.tar.gz", hash = "sha256:b3bda1d108d5dd99f4a20d24d9c348e91c4db7ab1b749200bded2f839ccbe68f"}, ] tomlkit = [ {file = "tomlkit-0.7.0-py2.py3-none-any.whl", hash = "sha256:6babbd33b17d5c9691896b0e68159215a9387ebfa938aa3ac42f4a4beeb2b831"}, {file = "tomlkit-0.7.0.tar.gz", hash = "sha256:ac57f29693fab3e309ea789252fcce3061e19110085aa31af5446ca749325618"}, ] tox = [ - {file = "tox-3.20.0-py2.py3-none-any.whl", hash = "sha256:e6318f404aff16522ff5211c88cab82b39af121735a443674e4e2e65f4e4637b"}, - {file = "tox-3.20.0.tar.gz", hash = "sha256:eb629ddc60e8542fd4a1956b2462e3b8771d49f1ff630cecceacaa0fbfb7605a"}, + {file = "tox-3.23.0-py2.py3-none-any.whl", hash = "sha256:e007673f3595cede9b17a7c4962389e4305d4a3682a6c5a4159a1453b4f326aa"}, + {file = "tox-3.23.0.tar.gz", hash = "sha256:05a4dbd5e4d3d8269b72b55600f0b0303e2eb47ad5c6fe76d3576f4c58d93661"}, ] typing = [ {file = "typing-3.7.4.3-py2-none-any.whl", hash = "sha256:283d868f5071ab9ad873e5e52268d611e851c870a2ba354193026f2dfb29d8b5"}, @@ -1398,12 +1474,12 @@ typing-extensions = [ {file = "typing_extensions-3.7.4.3.tar.gz", hash = "sha256:99d4073b617d30288f569d3f13d2bd7548c3a7e4c8de87db09a9d29bb3a4a60c"}, ] urllib3 = [ - {file = "urllib3-1.25.10-py2.py3-none-any.whl", hash = "sha256:e7983572181f5e1522d9c98453462384ee92a0be7fac5f1413a1e35c56cc0461"}, - {file = "urllib3-1.25.10.tar.gz", hash = "sha256:91056c15fa70756691db97756772bb1eb9678fa585d9184f24534b100dc60f4a"}, + {file = "urllib3-1.25.11-py2.py3-none-any.whl", hash = "sha256:f5321fbe4bf3fefa0efd0bfe7fb14e90909eb62a48ccda331726b4319897dd5e"}, + {file = "urllib3-1.25.11.tar.gz", hash = "sha256:8d7eaa5a82a1cac232164990f04874c594c9453ec55eef02eab885aa02fc17a2"}, ] virtualenv = [ - {file = "virtualenv-20.0.31-py2.py3-none-any.whl", hash = "sha256:e0305af10299a7fb0d69393d8f04cb2965dda9351140d11ac8db4e5e3970451b"}, - {file = "virtualenv-20.0.31.tar.gz", hash = "sha256:43add625c53c596d38f971a465553f6318decc39d98512bc100fa1b1e839c8dc"}, + {file = "virtualenv-20.4.2-py2.py3-none-any.whl", hash = "sha256:2be72df684b74df0ea47679a7df93fd0e04e72520022c57b479d8f881485dbe3"}, + {file = "virtualenv-20.4.2.tar.gz", hash = "sha256:147b43894e51dd6bba882cf9c282447f780e2251cd35172403745fc381a0a80d"}, ] wcwidth = [ {file = "wcwidth-0.2.5-py2.py3-none-any.whl", hash = "sha256:beb4802a9cebb9144e99086eff703a642a13d6a0052920003a230f3294bbe784"}, diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/pkgs/poetry/pyproject.toml b/pkgs/development/tools/poetry2nix/poetry2nix/pkgs/poetry/pyproject.toml index 0868175ea45dc..02f6dabc86fce 100644 --- a/pkgs/development/tools/poetry2nix/poetry2nix/pkgs/poetry/pyproject.toml +++ b/pkgs/development/tools/poetry2nix/poetry2nix/pkgs/poetry/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "poetry" -version = "1.1.4" +version = "1.1.5" description = "Python dependency management and packaging made easy." authors = [ "Sébastien Eustace <sebastien@eustace.io>" @@ -24,7 +24,7 @@ classifiers = [ [tool.poetry.dependencies] python = "~2.7 || ^3.5" -poetry-core = "^1.0.0" +poetry-core = "~1.0.2" cleo = "^0.8.1" clikit = "^0.6.2" crashtest = { version = "^0.3.0", python = "^3.6" } @@ -71,6 +71,10 @@ pre-commit = { version = "^2.6", python = "^3.6.1" } tox = "^3.0" pytest-sugar = "^0.9.2" httpretty = "^0.9.6" +# We need to restrict the version of urllib3 to avoid +# httpretty breaking. This is fixed in httpretty >= 1.0.3 +# but it's not compatible with Python 2.7 and 3.5. +urllib3 = "~1.25.10" [tool.poetry.scripts] poetry = "poetry.console:main" diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/pkgs/poetry/src.json b/pkgs/development/tools/poetry2nix/poetry2nix/pkgs/poetry/src.json index 4a1e8890c28c3..fcdb01e29c1dc 100644 --- a/pkgs/development/tools/poetry2nix/poetry2nix/pkgs/poetry/src.json +++ b/pkgs/development/tools/poetry2nix/poetry2nix/pkgs/poetry/src.json @@ -1,7 +1,7 @@ { "owner": "python-poetry", "repo": "poetry", - "rev": "8312e3f2dbfa126cd311c666fea30656941e1bd3", - "sha256": "0lx3qpz5dad0is7ki5a4vxphvc8cm8fnv4bmrx226a6nvvaj6ahs", + "rev": "a9704149394151f4d0d28cd5d8ee2283c7d10787", + "sha256": "0bv6irpscpak6pldkzrx4j12dqnpfz5h8fy5lliglizv0avh60hf", "fetchSubmodules": true } diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/pkgs/poetry/update b/pkgs/development/tools/poetry2nix/poetry2nix/pkgs/poetry/update index 33a2823f360a7..915726c658f55 100755 --- a/pkgs/development/tools/poetry2nix/poetry2nix/pkgs/poetry/update +++ b/pkgs/development/tools/poetry2nix/poetry2nix/pkgs/poetry/update @@ -1,5 +1,5 @@ #!/usr/bin/env nix-shell -#! nix-shell -i bash -p curl nix-prefetch-github +#! nix-shell -i bash -p curl nix-prefetch-github jq rev=$(curl -s https://api.github.com/repos/python-poetry/poetry/releases/latest | jq -r '.name') nix-prefetch-github --rev "$rev" python-poetry poetry > src.json diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/semver.nix b/pkgs/development/tools/poetry2nix/poetry2nix/semver.nix index bf001392e6afe..0ef1d4c316ac4 100644 --- a/pkgs/development/tools/poetry2nix/poetry2nix/semver.nix +++ b/pkgs/development/tools/poetry2nix/poetry2nix/semver.nix @@ -3,7 +3,7 @@ let inherit (builtins) elemAt match; operators = let - matchWildCard = s: match "([^\*])(\.[\*])" s; + matchWildCard = s: match "([^*])(\\.[*])" s; mkComparison = ret: version: v: builtins.compareVersions version v == ret; mkIdxComparison = idx: version: v: let @@ -52,8 +52,8 @@ let # }; re = { - operators = "([=><!~\^]+)"; - version = "([0-9\.\*x]+)"; + operators = "([=><!~^]+)"; + version = "([0-9.*x]+)"; }; parseConstraint = constraint: let diff --git a/pkgs/development/tools/rust/cargo-cross/default.nix b/pkgs/development/tools/rust/cargo-cross/default.nix new file mode 100644 index 0000000000000..f7ce0283f6ff4 --- /dev/null +++ b/pkgs/development/tools/rust/cargo-cross/default.nix @@ -0,0 +1,40 @@ +{ lib +, rustPlatform +, fetchFromGitHub +, fetchpatch +, nix-update-script +}: + +rustPlatform.buildRustPackage rec { + pname = "cargo-cross"; + version = "0.2.1"; + + src = fetchFromGitHub { + owner = "rust-embedded"; + repo = "cross"; + rev = "v${version}"; + sha256 = "sha256:1py5w4kf612x4qxi190ilsrx0zzwdzk9i47ppvqblska1s47qa2w"; + }; + + cargoSha256 = "sha256-3xSuTBcWRGn5HH7LnvwioeRWjehaPW1HCPjN5SUUVfo="; + + cargoPatches = [ + (fetchpatch { + url = "https://github.com/rust-embedded/cross/commit/e86ad2e5a55218395df7eaaf91900e22b809083c.patch"; + sha256 = "sha256:1zrcj5fm3irmlrfkgb65kp2pjkry0rg5nn9pwsk9p0i6dpapjc7k"; + }) + ]; + + passthru = { + updateScript = nix-update-script { + attrPath = pname; + }; + }; + + meta = with lib; { + description = "Zero setup cross compilation and cross testing"; + homepage = "https://github.com/rust-embedded/cross"; + license = with licenses; [ asl20 /* or */ mit ]; + maintainers = with maintainers; [ otavio ]; + }; +} diff --git a/pkgs/development/tools/rust/cargo-expand/default.nix b/pkgs/development/tools/rust/cargo-expand/default.nix index 09650e8a38686..7cb366c5502c5 100644 --- a/pkgs/development/tools/rust/cargo-expand/default.nix +++ b/pkgs/development/tools/rust/cargo-expand/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-expand"; - version = "1.0.4"; + version = "1.0.5"; src = fetchFromGitHub { owner = "dtolnay"; repo = pname; rev = version; - sha256 = "09jdqf1f8kl2c3k4cp8j3qqb96gclhncvfdwg2l3bmh5r10id9b3"; + sha256 = "sha256-FWXSEGjTr2DewZ8NidzPdc6jhfNAUdV9qKyR7ZciWio="; }; - cargoSha256 = "0mx01h2zv7mpyi8s1545b7hjxn9aslzpbngrq4ii9rfqznz3r8k9"; + cargoSha256 = "sha256-uvTxOZPMTCd+3WQJeVfSC5mlJ487hJKs/0Dd2C8cpcM="; meta = with lib; { description = diff --git a/pkgs/development/tools/rust/cargo-limit/default.nix b/pkgs/development/tools/rust/cargo-limit/default.nix index 37c905879bf05..3ebe5ef13046d 100644 --- a/pkgs/development/tools/rust/cargo-limit/default.nix +++ b/pkgs/development/tools/rust/cargo-limit/default.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-limit"; - version = "0.0.6"; + version = "0.0.7"; src = fetchFromGitHub { owner = "alopatindev"; repo = "cargo-limit"; rev = version; - sha256 = "sha256-2YngMRPNiUVqg82Ck/ovcMbZV+STGyowT9zlwBkcKok="; + sha256 = "sha256-8HsYhWYeRhCPTxVnU8hOJKLXvza8i9KvKTLL6yLo0+c="; }; - cargoSha256 = "sha256-4HQhBE4kNhOhO48PBiAxtppmaqy7jaV8p/jb/Uv7vJk="; + cargoSha256 = "sha256-8uA4oFExrzDMeMV5MacbtE0Awdfx+jUUkrKd7ushOHo="; passthru = { updateScript = nix-update-script { diff --git a/pkgs/development/tools/rust/cargo-valgrind/default.nix b/pkgs/development/tools/rust/cargo-valgrind/default.nix index 50cffe74848ed..1c1a4c32c6234 100644 --- a/pkgs/development/tools/rust/cargo-valgrind/default.nix +++ b/pkgs/development/tools/rust/cargo-valgrind/default.nix @@ -1,5 +1,4 @@ { lib -, stdenv , rustPlatform , fetchFromGitHub , nix-update-script diff --git a/pkgs/development/tools/vagrant/default.nix b/pkgs/development/tools/vagrant/default.nix index 701b973ad4f7b..34662498f2333 100644 --- a/pkgs/development/tools/vagrant/default.nix +++ b/pkgs/development/tools/vagrant/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchurl, buildRubyGem, bundlerEnv, ruby, libarchive -, libguestfs, qemu, writeText, withLibvirt ? stdenv.isLinux, fetchpatch +, libguestfs, qemu, writeText, withLibvirt ? stdenv.isLinux }: let diff --git a/pkgs/games/cbonsai/default.nix b/pkgs/games/cbonsai/default.nix new file mode 100644 index 0000000000000..4702991c2907d --- /dev/null +++ b/pkgs/games/cbonsai/default.nix @@ -0,0 +1,27 @@ +{ stdenv, lib, fetchFromGitLab, ncurses, pkg-config, nix-update-script }: + +stdenv.mkDerivation rec { + version = "1.0.0"; + pname = "cbonsai"; + + src = fetchFromGitLab { + owner = "jallbrit"; + repo = pname; + rev = "v${version}"; + sha256 = "1jc34j627pnyjgs8hjxqaa89j24gyf0rq9w61mkhgg0kria62as7"; + }; + + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ ncurses ]; + installFlags = [ "PREFIX=$(out)" ]; + + passthru.updateScript = nix-update-script { attrPath = pname; }; + + meta = with lib; { + description = "Grow bonsai trees in your terminal"; + homepage = "https://gitlab.com/jallbrit/cbonsai"; + license = with licenses; [ gpl3Only ]; + maintainers = with maintainers; [ manveru ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/games/dwarf-fortress/legends-browser/default.nix b/pkgs/games/dwarf-fortress/legends-browser/default.nix index 1efae4d2802ad..2a3da233b4506 100644 --- a/pkgs/games/dwarf-fortress/legends-browser/default.nix +++ b/pkgs/games/dwarf-fortress/legends-browser/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenvNoCC, buildEnv, writeShellScriptBin, fetchurl, jre }: +{ lib, buildEnv, writeShellScriptBin, fetchurl, jre }: let name = "legends-browser-${version}"; diff --git a/pkgs/games/shattered-pixel-dungeon/default.nix b/pkgs/games/shattered-pixel-dungeon/default.nix index 3639eb46ffebc..8d92c88e1be4b 100644 --- a/pkgs/games/shattered-pixel-dungeon/default.nix +++ b/pkgs/games/shattered-pixel-dungeon/default.nix @@ -81,7 +81,7 @@ in stdenv.mkDerivation rec { homepage = "https://shatteredpixel.com/"; downloadPage = "https://github.com/00-Evan/shattered-pixel-dungeon/releases"; description = "Traditional roguelike game with pixel-art graphics and simple interface"; - license = licenses.gpl3; + license = licenses.gpl3Plus; maintainers = with maintainers; [ fgaz ]; platforms = platforms.all; # https://github.com/NixOS/nixpkgs/pull/99885#issuecomment-740065005 diff --git a/pkgs/games/vms-empire/default.nix b/pkgs/games/vms-empire/default.nix index fcfc89667af2a..b3e89617ef33a 100644 --- a/pkgs/games/vms-empire/default.nix +++ b/pkgs/games/vms-empire/default.nix @@ -1,26 +1,50 @@ -{ lib, stdenv, fetchurl, ncurses, xmlto }: +{ lib +, stdenv +, fetchurl +, ncurses +, xmlto +, docbook_xml_dtd_44 +, docbook_xsl +, installShellFiles +}: stdenv.mkDerivation rec { pname = "vms-empire"; - version = "1.15"; + version = "1.16"; src = fetchurl{ - url = "http://www.catb.org/~esr/vms-empire/${pname}-${version}.tar.gz"; - sha256 = "1vcpglkimcljb8s1dp6lzr5a0vbfxmh6xf37cmb8rf9wc3pghgn3"; + url = "http://www.catb.org/~esr/${pname}/${pname}-${version}.tar.gz"; + hash = "sha256-XETIbt/qVU+TpamPc2WQynqqUuZqkTUnItBprjg+gPk="; }; - buildInputs = - [ ncurses xmlto ]; + nativeBuildInputs = [ installShellFiles ]; + buildInputs = [ + ncurses + xmlto + docbook_xml_dtd_44 + docbook_xsl + ]; + + postBuild = '' + xmlto man vms-empire.xml + xmlto html-nochunks vms-empire.xml + ''; - patchPhase = '' - sed -i -e 's|^install: empire\.6 uninstall|install: empire.6|' -e 's|usr/||g' Makefile + installPhase = '' + runHook preInstall + install -D vms-empire -t ${placeholder "out"}/bin/ + install -D vms-empire.html -t ${placeholder "out"}/share/doc/${pname}/ + install -D vms-empire.desktop -t ${placeholder "out"}/share/applications/ + install -D vms-empire.png -t ${placeholder "out"}/share/icons/hicolor/48x48/apps/ + install -D vms-empire.xml -t ${placeholder "out"}/share/appdata/ + installManPage empire.6 + runHook postInstall ''; hardeningDisable = [ "format" ]; - makeFlags = [ "DESTDIR=$(out)" ]; - meta = with lib; { + homepage = "http://catb.org/~esr/vms-empire/"; description = "The ancestor of all expand/explore/exploit/exterminate games"; longDescription = '' Empire is a simulation of a full-scale war between two emperors, the @@ -30,11 +54,8 @@ stdenv.mkDerivation rec { expand/explore/exploit/exterminate games, including Civilization and Master of Orion. ''; - homepage = "http://catb.org/~esr/vms-empire/"; - license = licenses.gpl2; + license = licenses.gpl2Only; maintainers = [ maintainers.AndersonTorres ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } - - diff --git a/pkgs/misc/documentation-highlighter/default.nix b/pkgs/misc/documentation-highlighter/default.nix index 022cc4aa834ec..2a34e36742d57 100644 --- a/pkgs/misc/documentation-highlighter/default.nix +++ b/pkgs/misc/documentation-highlighter/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, runCommand }: +{ lib, runCommand }: runCommand "documentation-highlighter" { meta = { description = "Highlight.js sources for the Nix Ecosystem's documentation"; diff --git a/pkgs/misc/vscode-extensions/default.nix b/pkgs/misc/vscode-extensions/default.nix index 7224e302f1317..67a612a4bec16 100644 --- a/pkgs/misc/vscode-extensions/default.nix +++ b/pkgs/misc/vscode-extensions/default.nix @@ -524,6 +524,8 @@ let }; }; + ms-dotnettools.csharp = callPackage ./ms-dotnettools-csharp { }; + ms-kubernetes-tools.vscode-kubernetes-tools = buildVscodeMarketplaceExtension { mktplcRef = { name = "vscode-kubernetes-tools"; diff --git a/pkgs/misc/vscode-extensions/ms-dotnettools-csharp/default.nix b/pkgs/misc/vscode-extensions/ms-dotnettools-csharp/default.nix new file mode 100644 index 0000000000000..a7b0e17ecbfbc --- /dev/null +++ b/pkgs/misc/vscode-extensions/ms-dotnettools-csharp/default.nix @@ -0,0 +1,143 @@ +{ lib +, fetchurl +, vscode-utils +, unzip +, patchelf +, makeWrapper +, icu +, stdenv +, openssl +, mono6 +}: + +let + # Get as close as possible as the `package.json` required version. + # This is what drives omnisharp. + mono = mono6; + + rtDepsSrcsFromJson = builtins.fromJSON (builtins.readFile ./rt-deps-bin-srcs.json); + + rtDepsBinSrcs = builtins.mapAttrs (k: v: + let + # E.g: "OmniSharp-x86_64-linux" + kSplit = builtins.split "(-)" k; + name = builtins.elemAt kSplit 0; + arch = builtins.elemAt kSplit 2; + platform = builtins.elemAt kSplit 4; + in + { + inherit name arch platform; + installPath = v.installPath; + binaries = v.binaries; + bin-src = fetchurl { + urls = v.urls; + inherit (v) sha256; + }; + } + ) + rtDepsSrcsFromJson; + + arch = "x86_64"; + platform = "linux"; + + rtDepBinSrcByName = bSrcName: + rtDepsBinSrcs."${bSrcName}-${arch}-${platform}"; + + omnisharp = rtDepBinSrcByName "OmniSharp"; + vsdbg = rtDepBinSrcByName "Debugger"; + razor = rtDepBinSrcByName "Razor"; +in + +vscode-utils.buildVscodeMarketplaceExtension { + mktplcRef = { + name = "csharp"; + publisher = "ms-dotnettools"; + version = "1.23.2"; + sha256 = "0ydaiy8jfd1bj50bqiaz5wbl7r6qwmbz9b29bydimq0rdjgapaar"; + }; + + nativeBuildInputs = [ + unzip + patchelf + makeWrapper + ]; + + postPatch = '' + declare ext_unique_id + # See below as to why we cannot take the whole basename. + ext_unique_id="$(basename "$out" | head -c 32)" + + # Fix 'Unable to connect to debuggerEventsPipeName .. exceeds the maximum length 107.' when + # attempting to launch a specific test in debug mode. The extension attemps to open + # a pipe in extension dir which would fail anyway. We change to target file path + # to a path in tmp dir with a short name based on the unique part of the nix store path. + # This is however a brittle patch as we're working on minified code. + # Hence the attempt to only hold on stable names. + # However, this really would better be fixed upstream. + sed -i \ + -E -e 's/(this\._pipePath=[a-zA-Z0-9_]+\.join\()([a-zA-Z0-9_]+\.getExtensionPath\(\)[^,]*,)/\1require("os").tmpdir(), "'"$ext_unique_id"'"\+/g' \ + "$PWD/dist/extension.js" + + unzip_to() { + declare src_zip="''${1?}" + declare target_dir="''${2?}" + mkdir -p "$target_dir" + if unzip "$src_zip" -d "$target_dir"; then + true + elif [[ "1" -eq "$?" ]]; then + 1>&2 echo "WARNING: unzip('$?' -> skipped files)." + else + 1>&2 echo "ERROR: unzip('$?')." + fi + } + + patchelf_add_icu_as_needed() { + declare elf="''${1?}" + declare icu_major_v="${ + with builtins; head (splitVersion (parseDrvName icu.name).version)}" + + for icu_lib in icui18n icuuc icudata; do + patchelf --add-needed "lib''${icu_lib}.so.$icu_major_v" "$elf" + done + } + + patchelf_common() { + declare elf="''${1?}" + + patchelf_add_icu_as_needed "$elf" + patchelf --add-needed "libssl.so" "$elf" + patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + --set-rpath "${lib.makeLibraryPath [ stdenv.cc.cc openssl.out icu.out ]}:\$ORIGIN" \ + "$elf" + } + + declare omnisharp_dir="$PWD/${omnisharp.installPath}" + unzip_to "${omnisharp.bin-src}" "$omnisharp_dir" + rm "$omnisharp_dir/bin/mono" + ln -s -T "${mono6}/bin/mono" "$omnisharp_dir/bin/mono" + chmod a+x "$omnisharp_dir/run" + touch "$omnisharp_dir/install.Lock" + + declare vsdbg_dir="$PWD/${vsdbg.installPath}" + unzip_to "${vsdbg.bin-src}" "$vsdbg_dir" + chmod a+x "$vsdbg_dir/vsdbg-ui" + chmod a+x "$vsdbg_dir/vsdbg" + touch "$vsdbg_dir/install.complete" + touch "$vsdbg_dir/install.Lock" + patchelf_common "$vsdbg_dir/vsdbg" + patchelf_common "$vsdbg_dir/vsdbg-ui" + + declare razor_dir="$PWD/${razor.installPath}" + unzip_to "${razor.bin-src}" "$razor_dir" + chmod a+x "$razor_dir/rzls" + touch "$razor_dir/install.Lock" + patchelf_common "$razor_dir/rzls" + ''; + + meta = with lib; { + description = "C# for Visual Studio Code (powered by OmniSharp)"; + license = licenses.mit; + maintainers = [ maintainers.jraygauthier ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/misc/vscode-extensions/ms-dotnettools-csharp/rt-deps-bin-srcs.json b/pkgs/misc/vscode-extensions/ms-dotnettools-csharp/rt-deps-bin-srcs.json new file mode 100644 index 0000000000000..91ee056efc1f7 --- /dev/null +++ b/pkgs/misc/vscode-extensions/ms-dotnettools-csharp/rt-deps-bin-srcs.json @@ -0,0 +1,37 @@ +{ + "OmniSharp-x86_64-linux": { + "installPath": ".omnisharp/1.37.1", + "binaries": [ + "./mono.linux-x86_64", + "./run" + ], + "urls": [ + "https://download.visualstudio.microsoft.com/download/pr/46933d64-075c-4f9f-b205-da4a839e2e3c/4bba2c3f40106056b53721c164ff86fa/omnisharp-linux-x64-1.37.1.zip", + "https://roslynomnisharp.blob.core.windows.net/releases/1.37.1/omnisharp-linux-x64-1.37.1.zip" + ], + "sha256": "0yzxkbq0fyq2bv0s7qmycxl0w54lla0vykg1a5lpv9j38k062vvz" + }, + "Debugger-x86_64-linux": { + "installPath": ".debugger", + "binaries": [ + "./vsdbg-ui", + "./vsdbg" + ], + "urls": [ + "https://download.visualstudio.microsoft.com/download/pr/292d2e01-fb93-455f-a6b3-76cddad4f1ef/2e9b8bc5431d8f6c56025e76eaabbdff/coreclr-debug-linux-x64.zip", + "https://vsdebugger.blob.core.windows.net/coreclr-debug-1-22-2/coreclr-debug-linux-x64.zip" + ], + "sha256": "1lhyjq6g6lc1b4n4z57g0ssr5msqgsmrl8yli8j9ah5s3jq1lrda" + }, + "Razor-x86_64-linux": { + "installPath": ".razor", + "binaries": [ + "./rzls" + ], + "urls": [ + "https://download.visualstudio.microsoft.com/download/pr/757f5246-2b09-43fe-9a8d-840cfd15092b/2b6d8eee0470acf725c1c7a09f8b6475/razorlanguageserver-linux-x64-6.0.0-alpha.1.20418.9.zip", + "https://razorvscodetest.blob.core.windows.net/languageserver/RazorLanguageServer-linux-x64-6.0.0-alpha.1.20418.9.zip" + ], + "sha256": "1hksxq867anb9h040497phszq64f6krg4a46w0xqrm6crj8znqr5" + } +} diff --git a/pkgs/misc/vscode-extensions/ms-dotnettools-csharp/update-bin-srcs b/pkgs/misc/vscode-extensions/ms-dotnettools-csharp/update-bin-srcs new file mode 100755 index 0000000000000..ecd7efba05d8e --- /dev/null +++ b/pkgs/misc/vscode-extensions/ms-dotnettools-csharp/update-bin-srcs @@ -0,0 +1,25 @@ +#!/usr/bin/env nix-shell +#!nix-shell -I nixpkgs=../../../.. -i bash -p curl jq unzip +set -euf -o pipefail + +declare scriptDir +scriptDir=$(cd "$(dirname "$0")"; pwd) +1>&2 echo "scriptDir='$scriptDir'" + +. "$scriptDir/update-bin-srcs-lib.sh" + +declare extPublisher="ms-dotnettools" +declare extName="csharp" +declare defaultExtVersion="1.23.2" +declare extVersion="${1:-$defaultExtVersion}" + +formatExtRuntimeDeps \ + "$extPublisher" "$extName" "$extVersion" \ + | computeAndAttachExtRtDepsChecksums \ + | jqStreamToJson \ + | tee "$scriptDir/rt-deps-bin-srcs.json" \ + | jq '.' + +# TODO: Unfortunatly no simple json to nix implementation available. +# This would allow us to dump to './rt-deps-bin-srcs.nix' instead. +# jsonToNix diff --git a/pkgs/misc/vscode-extensions/ms-dotnettools-csharp/update-bin-srcs-lib.sh b/pkgs/misc/vscode-extensions/ms-dotnettools-csharp/update-bin-srcs-lib.sh new file mode 100755 index 0000000000000..ad494a37908a9 --- /dev/null +++ b/pkgs/misc/vscode-extensions/ms-dotnettools-csharp/update-bin-srcs-lib.sh @@ -0,0 +1,154 @@ +#!/usr/bin/env bash + +prefetchExtensionZip() { + declare publisher="${1?}" + declare name="${2?}" + declare version="${3?}" + + 1>&2 echo + 1>&2 echo "------------- Downloading extension ---------------" + + declare extZipStoreName="${publisher}-${name}.zip" + declare extUrl="https://${publisher}.gallery.vsassets.io/_apis/public/gallery/publisher/${publisher}/extension/${name}/${version}/assetbyname/Microsoft.VisualStudio.Services.VSIXPackage"; + 1>&2 echo "extUrl='$extUrl'" + declare nixPrefetchArgs=( --name "$extZipStoreName" --print-path "$extUrl" ) + + 1>&2 printf "$ nix-prefetch-url" + 1>&2 printf " %q" "${nixPrefetchArgs[@]}" + 1>&2 printf " 2> /dev/null\n" + declare zipShaWStorePath + zipShaWStorePath=$(nix-prefetch-url "${nixPrefetchArgs[@]}" 2> /dev/null) + + 1>&2 echo "zipShaWStorePath='$zipShaWStorePath'" + echo "$zipShaWStorePath" +} + + +prefetchExtensionUnpacked() { + declare publisher="${1?}" + declare name="${2?}" + declare version="${3?}" + + declare zipShaWStorePath + zipShaWStorePath="$(prefetchExtensionZip "$publisher" "$name" "$version")" + + declare zipStorePath + zipStorePath="$(echo "$zipShaWStorePath" | tail -n1)" + 1>&2 echo "zipStorePath='$zipStorePath'" + + function rm_tmpdir() { + 1>&2 printf "rm -rf -- %q\n" "$tmpDir" + rm -rf -- "$tmpDir" + unset tmpDir + trap - INT TERM HUP EXIT + } + function make_trapped_tmpdir() { + tmpDir=$(mktemp -d) + trap rm_tmpdir INT TERM HUP EXIT + } + + 1>&2 echo + 1>&2 echo "------------- Unpacking extension ---------------" + + make_trapped_tmpdir + declare unzipArgs=( -q -d "$tmpDir" "$zipStorePath" ) + 1>&2 printf "$ unzip" + 1>&2 printf " %q" "${unzipArgs[@]}" + 1>&2 printf "\n" + unzip "${unzipArgs[@]}" + + declare unpackedStoreName="${publisher}-${name}" + + declare unpackedStorePath + unpackedStorePath="$(nix add-to-store -n "$unpackedStoreName" "$tmpDir")" + declare unpackedSha256 + unpackedSha256="$(nix hash-path --base32 --type sha256 "$unpackedStorePath")" + 1>&2 echo "unpackedStorePath='$unpackedStorePath'" + 1>&2 echo "unpackedSha256='$unpackedSha256'" + + rm_tmpdir + + echo "$unpackedSha256" + echo "$unpackedStorePath" +} + + +prefetchExtensionJson() { + declare publisher="${1?}" + declare name="${2?}" + declare version="${3?}" + + declare unpackedShaWStorePath + unpackedShaWStorePath="$(prefetchExtensionUnpacked "$publisher" "$name" "$version")" + + declare unpackedStorePath + unpackedStorePath="$(echo "$unpackedShaWStorePath" | tail -n1)" + 1>&2 echo "unpackedStorePath='$unpackedStorePath'" + + declare jsonShaWStorePath + jsonShaWStorePath=$(nix-prefetch-url --print-path "file://${unpackedStorePath}/extension/package.json" 2> /dev/null) + + 1>&2 echo "jsonShaWStorePath='$jsonShaWStorePath'" + echo "$jsonShaWStorePath" +} + + +formatExtRuntimeDeps() { + declare publisher="${1?}" + declare name="${2?}" + declare version="${3?}" + + declare jsonShaWStorePath + jsonShaWStorePath="$(prefetchExtensionJson "$publisher" "$name" "$version")" + + declare jsonStorePath + jsonStorePath="$(echo "$jsonShaWStorePath" | tail -n1)" + 1>&2 echo "jsonStorePath='$jsonStorePath'" + + declare jqQuery + jqQuery=$(cat <<'EOF' +.runtimeDependencies \ +| map(select(.platforms[] | in({"linux": null}))) \ +| map(select(.architectures[] | in({"x86_64": null}))) \ +| .[] | {(.id + "-" + (.architectures[0]) + "-" + (.platforms[0])): \ +{installPath, binaries, urls: [.url, .fallbackUrl]}} +EOF +) + + 1>&2 printf "$ cat %q | jq '%s'\n" "$jsonStorePath" "$jqQuery" + cat "$jsonStorePath" | jq "$jqQuery" +} + + +computeExtRtDepChecksum() { + declare rtDepJsonObject="${1?}" + declare url + url="$(echo "$rtDepJsonObject" | jq -j '.[].urls[0]')" + declare sha256 + 1>&2 printf "$ nix-prefetch-url '%s'\n" "$url" + sha256="$(nix-prefetch-url "$url")" + 1>&2 echo "$sha256" + echo "$sha256" +} + + +computeAndAttachExtRtDepsChecksums() { + while read -r rtDepJsonObject; do + declare sha256 + sha256="$(computeExtRtDepChecksum "$rtDepJsonObject")" + echo "$rtDepJsonObject" | jq --arg sha256 "$sha256" '.[].sha256 = $sha256' + done < <(cat - | jq -c '.') +} + + +jqStreamToJson() { + cat - | jq --slurp '. | add' +} + + +jsonToNix() { + # TODO: Replacing this non functional stuff with a proper json to nix + # implementation would allow us to produce a 'rt-deps-bin-srcs.nix' file instead. + false + cat - | sed -E -e 's/": /" = /g' -e 's/,$/;/g' -e 's/ }$/ };/g' -e 's/ ]$/ ];/g' +} diff --git a/pkgs/os-specific/linux/dpdk/default.nix b/pkgs/os-specific/linux/dpdk/default.nix index ab1839368958a..e71da643bb429 100644 --- a/pkgs/os-specific/linux/dpdk/default.nix +++ b/pkgs/os-specific/linux/dpdk/default.nix @@ -70,6 +70,6 @@ in stdenv.mkDerivation rec { homepage = "http://dpdk.org/"; license = with licenses; [ lgpl21 gpl2 bsd2 ]; platforms = platforms.linux; - maintainers = with maintainers; [ domenkozar magenbluten orivej ]; + maintainers = with maintainers; [ magenbluten orivej ]; }; } diff --git a/pkgs/os-specific/linux/kernel/linux-rt-5.6.nix b/pkgs/os-specific/linux/kernel/linux-rt-5.11.nix index 7c77454040d5c..e56d2319a969c 100644 --- a/pkgs/os-specific/linux/kernel/linux-rt-5.6.nix +++ b/pkgs/os-specific/linux/kernel/linux-rt-5.11.nix @@ -6,22 +6,26 @@ , ... } @ args: let - version = "5.6.19-rt12"; # updated by ./update-rt.sh + version = "5.11.2-rt9"; # updated by ./update-rt.sh branch = lib.versions.majorMinor version; kversion = builtins.elemAt (lib.splitString "-" version) 0; in buildLinux (args // { inherit version; + # modDirVersion needs a patch number, change X.Y-rtZ to X.Y.0-rtZ. + modDirVersion = if (builtins.match "[^.]*[.][^.]*-.*" version) == null then version + else lib.replaceStrings ["-"] [".0-"] version; + src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${kversion}.tar.xz"; - sha256 = "1s0yc1138sglbm4vyizl4r7hnc1l7nykdjp4063ad67yayr2ylv2"; + sha256 = "186ha9fsk2qvrjkq7yvpmml938byz92m8ykcvbw4w9pmp8y5njlh"; }; kernelPatches = let rt-patch = { name = "rt"; patch = fetchurl { url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz"; - sha256 = "0ia8rx0615x0z2s4ppw1244crg7c5ak07c9n3wbnz7y8bk8hyxws"; + sha256 = "0707rjai04x12llvs004800pkb0axf0d1sssahf3xhgrbalg94y1"; }; }; in [ rt-patch ] ++ lib.remove rt-patch kernelPatches; diff --git a/pkgs/os-specific/linux/numad/default.nix b/pkgs/os-specific/linux/numad/default.nix index cab5fe15e66d7..21d5a871f4e91 100644 --- a/pkgs/os-specific/linux/numad/default.nix +++ b/pkgs/os-specific/linux/numad/default.nix @@ -24,6 +24,6 @@ stdenv.mkDerivation rec { homepage = "https://fedoraproject.org/wiki/Features/numad"; license = licenses.lgpl21; platforms = platforms.linux; - maintainers = with maintainers; [ domenkozar ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/os-specific/linux/v4l2loopback/default.nix b/pkgs/os-specific/linux/v4l2loopback/default.nix index 5e0125da00a6f..73b2f58951158 100644 --- a/pkgs/os-specific/linux/v4l2loopback/default.nix +++ b/pkgs/os-specific/linux/v4l2loopback/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { description = "A kernel module to create V4L2 loopback devices"; homepage = "https://github.com/umlaeute/v4l2loopback"; license = licenses.gpl2; - maintainers = [ maintainers.domenkozar ]; + maintainers = [ ]; platforms = platforms.linux; }; } diff --git a/pkgs/servers/keycloak/default.nix b/pkgs/servers/keycloak/default.nix index aaa2a2f2b5c8f..3726facd58351 100644 --- a/pkgs/servers/keycloak/default.nix +++ b/pkgs/servers/keycloak/default.nix @@ -18,11 +18,11 @@ let in stdenv.mkDerivation rec { pname = "keycloak"; - version = "12.0.3"; + version = "12.0.4"; src = fetchzip { url = "https://github.com/keycloak/keycloak/releases/download/${version}/keycloak-${version}.zip"; - sha256 = "sha256-YUeSX02iLhrGzItnbUbK8ib7IfWG3+2k154cTPAt8Wc="; + sha256 = "sha256-7DKKpuKPoSKIpfvhCvLzuyepbmixgq0+o+83FKi6Dwc="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/servers/mail/mailhog/default.nix b/pkgs/servers/mail/mailhog/default.nix index 674fdbabb4eb9..0032c4a630e92 100644 --- a/pkgs/servers/mail/mailhog/default.nix +++ b/pkgs/servers/mail/mailhog/default.nix @@ -13,6 +13,8 @@ buildGoPackage rec { sha256 = "124216850572r1h0ii7ad6jd1cd5czcvkz7k2jzvjb4pv2kl8p3y"; }; + buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ]; + meta = with lib; { description = "Web and API based SMTP testing"; homepage = "https://github.com/mailhog/MailHog"; diff --git a/pkgs/servers/mail/mailman/postorius.nix b/pkgs/servers/mail/mailman/postorius.nix index 9330de3a8f386..fc9f6217d934c 100644 --- a/pkgs/servers/mail/mailman/postorius.nix +++ b/pkgs/servers/mail/mailman/postorius.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "postorius"; - version = "1.3.3"; + version = "1.3.4"; src = fetchPypi { inherit pname version; - sha256 = "08jn23gblbkfl09qlykbpsmp39mmach3sl69h1j5cd5kkx839rwa"; + sha256 = "sha256-L2ApUGQNvR0UVvodVM+wMzjYLZkegI4fT4yUiU/cibU="; }; propagatedBuildInputs = [ django-mailman3 readme_renderer ]; @@ -17,10 +17,10 @@ buildPythonPackage rec { # Tries to connect to database. doCheck = false; - meta = { - homepage = "https://www.gnu.org/software/mailman/"; + meta = with lib; { + homepage = "https://docs.mailman3.org/projects/postorius"; description = "Web-based user interface for managing GNU Mailman"; - license = lib.licenses.gpl3; - maintainers = with lib.maintainers; [ globin peti ]; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ globin peti ]; }; } diff --git a/pkgs/servers/monitoring/loki/default.nix b/pkgs/servers/monitoring/loki/default.nix index 99f83e1bfbd3a..370006a591e86 100644 --- a/pkgs/servers/monitoring/loki/default.nix +++ b/pkgs/servers/monitoring/loki/default.nix @@ -26,6 +26,10 @@ buildGoModule rec { passthru.tests = { inherit (nixosTests) loki; }; + buildFlagsArray = let t = "github.com/grafana/loki/pkg/build"; in '' + -ldflags=-s -w -X ${t}.Version=${version} -X ${t}.BuildUser=nix@nixpkgs -X ${t}.BuildDate=unknown -X ${t}.Branch=unknown -X ${t}.Revision=unknown + ''; + doCheck = true; meta = with lib; { diff --git a/pkgs/servers/monitoring/munin/default.nix b/pkgs/servers/monitoring/munin/default.nix index 5168f2e7e9d63..64ee8752f1f47 100644 --- a/pkgs/servers/monitoring/munin/default.nix +++ b/pkgs/servers/monitoring/munin/default.nix @@ -136,7 +136,7 @@ stdenv.mkDerivation rec { ''; homepage = "http://munin-monitoring.org/"; license = licenses.gpl2; - maintainers = [ maintainers.domenkozar maintainers.bjornfor ]; + maintainers = [ maintainers.bjornfor ]; platforms = platforms.linux; }; } diff --git a/pkgs/servers/monitoring/prometheus/flow-exporter.nix b/pkgs/servers/monitoring/prometheus/flow-exporter.nix index 4b2e76f7043f8..c4b9f06fdde5c 100644 --- a/pkgs/servers/monitoring/prometheus/flow-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/flow-exporter.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub, lib }: +{ buildGoModule, fetchFromGitHub, lib }: buildGoModule rec { pname = "flow-exporter"; diff --git a/pkgs/servers/monitoring/prometheus/smokeping-prober.nix b/pkgs/servers/monitoring/prometheus/smokeping-prober.nix index b1c3bc6999f71..d21ddcf564726 100644 --- a/pkgs/servers/monitoring/prometheus/smokeping-prober.nix +++ b/pkgs/servers/monitoring/prometheus/smokeping-prober.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub, nixosTests }: +{ lib, buildGoModule, fetchFromGitHub, nixosTests }: let baseVersion = "0.3.1"; diff --git a/pkgs/servers/nextcloud/default.nix b/pkgs/servers/nextcloud/default.nix index a40dd71fafd9c..8205f4f860a94 100644 --- a/pkgs/servers/nextcloud/default.nix +++ b/pkgs/servers/nextcloud/default.nix @@ -31,24 +31,19 @@ let }; }; in { - nextcloud17 = throw '' - Nextcloud v17 has been removed from `nixpkgs` as the support for it will be dropped - by upstream within the lifetime of NixOS 20.09[1]. Please upgrade to Nextcloud v18 by + nextcloud18 = throw '' + Nextcloud v18 has been removed from `nixpkgs` as the support for it was dropped + by upstream in 2021-01. Please upgrade to at least Nextcloud v19 by declaring - services.nextcloud.package = pkgs.nextcloud18; + services.nextcloud.package = pkgs.nextcloud19; in your NixOS config. [1] https://docs.nextcloud.com/server/18/admin_manual/release_schedule.html ''; - nextcloud18 = generic { - version = "18.0.10"; - sha256 = "0kv9mdn36shr98kh27969b8xs7pgczbyjklrfskxy9mph7bbzir6"; - eol = true; - }; - + # FIXME(@Ma27) remove on 21.05 nextcloud19 = generic { version = "19.0.6"; sha256 = "sha256-pqqIayE0OyTailtd2zeYi+G1APjv/YHqyO8jCpq7KJg="; @@ -61,4 +56,9 @@ in { version = "20.0.7"; sha256 = "sha256-jO2Ct3K/CvZ9W+EyPkD5d0KbwKK8yGQJXvx4dnUAtys="; }; + + nextcloud21 = generic { + version = "21.0.0"; + sha256 = "sha256-zq2u72doWhGvxbI7Coa6PHvQp7E41dHswFJiODZV8fA="; + }; } diff --git a/pkgs/servers/pleroma-otp/default.nix b/pkgs/servers/pleroma-otp/default.nix index 4905acd075773..10fd2627743f8 100644 --- a/pkgs/servers/pleroma-otp/default.nix +++ b/pkgs/servers/pleroma-otp/default.nix @@ -12,19 +12,19 @@ }: stdenv.mkDerivation { pname = "pleroma-otp"; - version = "2.2.2"; + version = "2.3.0"; # To find the latest binary release stable link, have a look at # the CI pipeline for the latest commit of the stable branch # https://git.pleroma.social/pleroma/pleroma/-/tree/stable src = { aarch64-linux = fetchurl { - url = "https://git.pleroma.social/pleroma/pleroma/-/jobs/175288/artifacts/download"; - sha256 = "107kp5zqwq1lixk1cwkx4v7zpm0h248xzlm152aj36ghb43j2snw"; + url = "https://git.pleroma.social/pleroma/pleroma/-/jobs/182392/artifacts/download"; + sha256 = "1drpd6xh7m2damxi5impb8jwvjl6m3qv5yxynl12i8g66vi3rbwf"; }; x86_64-linux = fetchurl { - url = "https://git.pleroma.social/pleroma/pleroma/-/jobs/175284/artifacts/download"; - sha256 = "1c6l04gga9iigm249ywwcrjg6wzy8iiid652mws3j9dnl71w2sim"; + url = "https://git.pleroma.social/pleroma/pleroma/-/jobs/182388/artifacts/download"; + sha256 = "0glr0iiqmylwwsn5r946yqr9kx97j2zznrc0imyxm3j0vhz8xzl4"; }; }."${stdenv.hostPlatform.system}"; diff --git a/pkgs/servers/plik/default.nix b/pkgs/servers/plik/default.nix new file mode 100644 index 0000000000000..b66ca14e415dd --- /dev/null +++ b/pkgs/servers/plik/default.nix @@ -0,0 +1,25 @@ +{ lib, fetchurl, makeWrapper, runCommand, callPackage }: + +let + version = "1.3.1"; + + programs = callPackage ./programs.nix {}; + + webapp = fetchurl { + url = "https://github.com/root-gg/plik/releases/download/${version}/plik-${version}-linux-amd64.tar.gz"; + sha256 = "KN6cp29KKdGamYnfL3jYltx0EDx6syDPfV0jShOk7Zw="; + }; + +in { + + inherit (programs) plik plikd-unwrapped; + + plikd = runCommand "plikd-${version}" { nativeBuildInputs = [ makeWrapper ]; } '' + mkdir -p $out/libexec/plikd/{bin,webapp} $out/bin + tar xf ${webapp} plik-${version}-linux-amd64/webapp/dist/ + mv plik-*/webapp/dist $out/libexec/plikd/webapp + cp ${programs.plikd-unwrapped}/bin/plikd $out/libexec/plikd/bin/plikd + makeWrapper $out/libexec/plikd/bin/plikd $out/bin/plikd \ + --run "cd $out/libexec/plikd/bin" + ''; +} diff --git a/pkgs/servers/plik/programs.nix b/pkgs/servers/plik/programs.nix new file mode 100644 index 0000000000000..ff83ec5ff6899 --- /dev/null +++ b/pkgs/servers/plik/programs.nix @@ -0,0 +1,42 @@ +{ lib, buildGoModule, fetchFromGitHub, fetchurl, makeWrapper, runCommand }: + +let + version = "1.3.1"; + + src = fetchFromGitHub { + owner = "root-gg"; + repo = "plik"; + rev = version; + sha256 = "C/1Uwjsqd9n3WSXlnlq9K3EJHkLOSavS9cPqF2UqmGo="; + }; + + vendorSha256 = "klmWXC3tkoOcQHhiQZjR2C5jqaRJqMQOLtVxZ0cFq/Y="; + + meta = with lib; { + homepage = "https://plik.root.gg/"; + description = "Scalable & friendly temporary file upload system"; + maintainers = with maintainers; [ freezeboy ]; + license = licenses.mit; + }; +in { + + plik = buildGoModule { + pname = "plik"; + inherit version meta src vendorSha256; + + subPackages = [ "client" ]; + postInstall = '' + mv $out/bin/client $out/bin/plik + ''; + }; + + plikd-unwrapped = buildGoModule { + pname = "plikd-unwrapped"; + inherit version src vendorSha256; + + subPackages = [ "server" ]; + postFixup = '' + mv $out/bin/server $out/bin/plikd + ''; + }; +} diff --git a/pkgs/servers/search/elasticsearch/6.x.nix b/pkgs/servers/search/elasticsearch/6.x.nix index b3ad305687afa..3558fd5935e48 100644 --- a/pkgs/servers/search/elasticsearch/6.x.nix +++ b/pkgs/servers/search/elasticsearch/6.x.nix @@ -62,7 +62,7 @@ stdenv.mkDerivation (rec { }; } // optionalAttrs enableUnfree { dontPatchELF = true; - nativeBuildInputs = [ autoPatchelfHook ]; + nativeBuildInputs = [ makeWrapper autoPatchelfHook ]; runtimeDependencies = [ zlib ]; postFixup = '' for exe in $(find $out/modules/x-pack-ml/platform/linux-x86_64/bin -executable -type f); do diff --git a/pkgs/servers/search/elasticsearch/7.x.nix b/pkgs/servers/search/elasticsearch/7.x.nix index ffe8a75412bdf..f808b6985b47b 100644 --- a/pkgs/servers/search/elasticsearch/7.x.nix +++ b/pkgs/servers/search/elasticsearch/7.x.nix @@ -73,7 +73,7 @@ stdenv.mkDerivation (rec { }; } // optionalAttrs enableUnfree { dontPatchELF = true; - nativeBuildInputs = [ autoPatchelfHook ]; + nativeBuildInputs = [ makeWrapper autoPatchelfHook ]; runtimeDependencies = [ zlib ]; postFixup = '' for exe in $(find $out/modules/x-pack-ml/platform/linux-x86_64/bin -executable -type f); do diff --git a/pkgs/servers/search/solr/default.nix b/pkgs/servers/search/solr/default.nix index 2b22c38143c73..479a7616ae150 100644 --- a/pkgs/servers/search/solr/default.nix +++ b/pkgs/servers/search/solr/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { description = "Open source enterprise search platform from the Apache Lucene project"; license = licenses.asl20; platforms = platforms.all; - maintainers = with maintainers; [ domenkozar aanderse ]; + maintainers = with maintainers; [ aanderse ]; }; } diff --git a/pkgs/shells/zsh/zsh-autosuggestions/default.nix b/pkgs/shells/zsh/zsh-autosuggestions/default.nix index 3f5cadfccb1d0..f9502152277fb 100644 --- a/pkgs/shells/zsh/zsh-autosuggestions/default.nix +++ b/pkgs/shells/zsh/zsh-autosuggestions/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub, zsh }: -# To make use of this derivation, use the `programs.zsh.enableAutoSuggestions` option +# To make use of this derivation, use the `programs.zsh.autosuggestions.enable` option stdenv.mkDerivation rec { pname = "zsh-autosuggestions"; diff --git a/pkgs/tools/admin/aws-vault/default.nix b/pkgs/tools/admin/aws-vault/default.nix index d55b90f3b84d5..13860b4bf7cea 100644 --- a/pkgs/tools/admin/aws-vault/default.nix +++ b/pkgs/tools/admin/aws-vault/default.nix @@ -1,4 +1,4 @@ -{ buildGoModule, lib, fetchFromGitHub }: +{ buildGoModule, lib, fetchFromGitHub, installShellFiles }: buildGoModule rec { pname = "aws-vault"; version = "6.2.0"; @@ -12,6 +12,16 @@ buildGoModule rec { vendorSha256 = "18lmxx784377x1v0gr6fkdx5flhcajsqlzyjx508z0kih6ammc0z"; + nativeBuildInputs = [ installShellFiles ]; + + postInstall = '' + installShellCompletion --cmd aws-vault \ + --bash $src/contrib/completions/bash/aws-vault.bash \ + --fish $src/contrib/completions/fish/aws-vault.fish \ + --zsh $src/contrib/completions/zsh/aws-vault.zsh + ''; + + doCheck = false; subPackages = [ "." ]; diff --git a/pkgs/tools/admin/awscli/default.nix b/pkgs/tools/admin/awscli/default.nix index 23c37ef3ebdaa..264eb7b09c41b 100644 --- a/pkgs/tools/admin/awscli/default.nix +++ b/pkgs/tools/admin/awscli/default.nix @@ -28,11 +28,11 @@ let in with py.pkgs; buildPythonApplication rec { pname = "awscli"; - version = "1.19.18"; # N.B: if you change this, change botocore and boto3 to a matching version too + version = "1.19.20"; # N.B: if you change this, change botocore and boto3 to a matching version too src = fetchPypi { inherit pname version; - sha256 = "sha256-K+Q2IXMHywtyyjPz1jtkFAHy9vkSFH4znjdD+0GnU1o="; + sha256 = "sha256-Fu+KuGOGDUMXgwUKabZjaCBQHdlLLBwPJXU4rlohKNs="; }; # https://github.com/aws/aws-cli/issues/4837 diff --git a/pkgs/tools/admin/gixy/default.nix b/pkgs/tools/admin/gixy/default.nix index 118457d408022..06656a9e033bc 100644 --- a/pkgs/tools/admin/gixy/default.nix +++ b/pkgs/tools/admin/gixy/default.nix @@ -1,11 +1,11 @@ -{ lib, fetchFromGitHub, python }: +{ lib, fetchFromGitHub, python3 }: -python.pkgs.buildPythonApplication rec { +python3.pkgs.buildPythonApplication rec { pname = "gixy"; version = "0.1.20"; # package is only compatible with python 2.7 and 3.5+ - disabled = with python.pkgs; !(pythonAtLeast "3.5" || isPy27); + disabled = with python3.pkgs; !(pythonAtLeast "3.5" || isPy27); # fetching from GitHub because the PyPi source is missing the tests src = fetchFromGitHub { @@ -19,7 +19,7 @@ python.pkgs.buildPythonApplication rec { sed -ie '/argparse/d' setup.py ''; - propagatedBuildInputs = with python.pkgs; [ + propagatedBuildInputs = with python3.pkgs; [ cached-property ConfigArgParse pyparsing diff --git a/pkgs/tools/audio/beets/default.nix b/pkgs/tools/audio/beets/default.nix index 5f22ffa9602c2..7fea4bd28d4f2 100644 --- a/pkgs/tools/audio/beets/default.nix +++ b/pkgs/tools/audio/beets/default.nix @@ -3,8 +3,8 @@ , runtimeShell , unstableGitUpdater -# Attributes needed for tests of the external plugins -, callPackage, beets +# external plugins package set +, beetsExternalPlugins , enableAbsubmit ? lib.elem stdenv.hostPlatform.system essentia-extractor.meta.platforms, essentia-extractor ? null , enableAcousticbrainz ? true @@ -116,15 +116,6 @@ let doInstallCheck = false; }); - pluginArgs = externalTestArgs // { inherit pythonPackages; }; - - plugins = { - alternatives = callPackage ./plugins/alternatives.nix pluginArgs; - check = callPackage ./plugins/check.nix pluginArgs; - copyartifacts = callPackage ./plugins/copyartifacts.nix pluginArgs; - extrafiles = callPackage ./plugins/extrafiles.nix pluginArgs; - }; - in pythonPackages.buildPythonApplication rec { pname = "beets"; # While there is a stable version, 1.4.9, it is more than 1000 commits behind @@ -169,7 +160,7 @@ in pythonPackages.buildPythonApplication rec { || enableSubsonicupdate || enableAcousticbrainz) pythonPackages.requests - ++ optional enableCheck plugins.check + ++ optional enableCheck beetsExternalPlugins.check ++ optional enableConvert ffmpeg ++ optional enableDiscogs pythonPackages.discogs_client ++ optional enableGmusic pythonPackages.gmusicapi @@ -179,9 +170,9 @@ in pythonPackages.buildPythonApplication rec { ++ optional enableSonosUpdate pythonPackages.soco ++ optional enableThumbnails pythonPackages.pyxdg ++ optional enableWeb pythonPackages.flask - ++ optional enableAlternatives plugins.alternatives - ++ optional enableCopyArtifacts plugins.copyartifacts - ++ optional enableExtraFiles plugins.extrafiles + ++ optional enableAlternatives beetsExternalPlugins.alternatives + ++ optional enableCopyArtifacts beetsExternalPlugins.copyartifacts + ++ optional enableExtraFiles beetsExternalPlugins.extrafiles ; buildInputs = [ @@ -289,7 +280,8 @@ in pythonPackages.buildPythonApplication rec { makeWrapperArgs = [ "--set GI_TYPELIB_PATH \"$GI_TYPELIB_PATH\"" "--set GST_PLUGIN_SYSTEM_PATH_1_0 \"$GST_PLUGIN_SYSTEM_PATH_1_0\"" ]; passthru = { - externalPlugins = plugins; + # FIXME: remove in favor of pkgs.beetsExternalPlugins + externalPlugins = beetsExternalPlugins; updateScript = unstableGitUpdater { url = "https://github.com/beetbox/beets"; }; }; @@ -297,7 +289,7 @@ in pythonPackages.buildPythonApplication rec { description = "Music tagger and library organizer"; homepage = "http://beets.io"; license = licenses.mit; - maintainers = with maintainers; [ aszlig domenkozar doronbehar lovesegfault pjones ]; + maintainers = with maintainers; [ aszlig doronbehar lovesegfault pjones ]; platforms = platforms.linux; }; } diff --git a/pkgs/tools/audio/beets/plugins/alternatives.nix b/pkgs/tools/audio/beets/plugins/alternatives.nix index 793611699ec8c..797aab16c1aef 100644 --- a/pkgs/tools/audio/beets/plugins/alternatives.nix +++ b/pkgs/tools/audio/beets/plugins/alternatives.nix @@ -1,4 +1,4 @@ -{ fetchFromGitHub, beets, pythonPackages }: +{ lib, fetchFromGitHub, beets, pythonPackages }: pythonPackages.buildPythonApplication rec { pname = "beets-alternatives"; diff --git a/pkgs/tools/audio/beets/plugins/check.nix b/pkgs/tools/audio/beets/plugins/check.nix index 441dcfe579f49..259b62a23b052 100644 --- a/pkgs/tools/audio/beets/plugins/check.nix +++ b/pkgs/tools/audio/beets/plugins/check.nix @@ -16,7 +16,7 @@ pythonPackages.buildPythonApplication rec { propagatedBuildInputs = [ flac liboggz mp3val ]; # patch out broken tests - patches = [ ./beet-check-tests.patch ]; + patches = [ ./check-tests.patch ]; # patch out futures dependency, it is only needed for Python2 which we don't # support. diff --git a/pkgs/tools/audio/beets/plugins/copyartifacts.nix b/pkgs/tools/audio/beets/plugins/copyartifacts.nix index 5af52066caa78..b8a17a7d13e10 100644 --- a/pkgs/tools/audio/beets/plugins/copyartifacts.nix +++ b/pkgs/tools/audio/beets/plugins/copyartifacts.nix @@ -1,4 +1,4 @@ -{ fetchFromGitHub, beets, pythonPackages, glibcLocales }: +{ lib, fetchFromGitHub, beets, pythonPackages, glibcLocales }: pythonPackages.buildPythonApplication { name = "beets-copyartifacts"; diff --git a/pkgs/tools/audio/yabridge/default.nix b/pkgs/tools/audio/yabridge/default.nix index 56f6cddb61edf..034e73207e307 100644 --- a/pkgs/tools/audio/yabridge/default.nix +++ b/pkgs/tools/audio/yabridge/default.nix @@ -17,7 +17,7 @@ let owner = "fraillt"; repo = "bitsery"; rev = "v${version}"; - sha256 = "132b0n0xlpcv97l6bhk9n57hg95pkhwqzvr9jkv57nmggn76s5q7"; + hash = "sha256-Bxdtjn2v2lP2lCnvjzmct6QHT7FpwmXoSZtd2oEFS4w="; }; }; @@ -28,7 +28,7 @@ let owner = "Naios"; repo = "function2"; rev = version; - sha256 = "0abrz2as62725g212qswi35nsdlf5wrhcz78hm2qidbgqr9rkir5"; + hash = "sha256-JceZU8ZvtYhFheh8BjMvjjZty4hcYxHEK+IIo5X4eSk="; }; }; @@ -39,7 +39,7 @@ let owner = "marzer"; repo = "tomlplusplus"; rev = "v${version}"; - sha256 = "0fspinnpyk1c9ay0h3wl8d4bbm6aswlypnrw2c7pk2i4mh981b4b"; + hash = "sha256-i6yAEqwkinkPEzzb6ynXytS1SEOUDwi8SixMf62NVzs="; }; }; @@ -51,19 +51,19 @@ let repo = "vst3sdk"; rev = version; fetchSubmodules = true; - sha256 = "1fqpylkbljifwdw2z75agc0yxnhmv4b09fxs3rvlw1qmm5mwx0p2"; + sha256 = "sha256-4oLOa6kVB053Hrq7BBbZFdruAXuqnC944y5Kuib1F7s="; }; }; in stdenv.mkDerivation rec { pname = "yabridge"; - version = "3.0.0"; + version = "3.0.1"; # NOTE: Also update yabridgectl's cargoSha256 when this is updated src = fetchFromGitHub { owner = "robbert-vdh"; repo = pname; rev = version; - sha256 = "0ha7jhnkd2i49q5rz2hp7sq6hv19bir99x51hs6nvvcf16hlf2bp"; + hash = "sha256-BT8Qj8WvyRlBwSuIIlfWVhlG3RSv2sFnSskCcjPF/N0="; }; # Unpack subproject sources diff --git a/pkgs/tools/audio/yabridgectl/default.nix b/pkgs/tools/audio/yabridgectl/default.nix index 6fa85cd89e8b9..6a77b502aeecb 100644 --- a/pkgs/tools/audio/yabridgectl/default.nix +++ b/pkgs/tools/audio/yabridgectl/default.nix @@ -6,9 +6,12 @@ rustPlatform.buildRustPackage rec { src = yabridge.src; sourceRoot = "source/tools/yabridgectl"; - cargoSha256 = "1sjhani8h7ap42yqlnj05sx59jyz2h12qlm1ibv8ldxcpwps0bwy"; + cargoHash = "sha256-YSK1DWv9kb6kFUJ4UEhh6psKsVqwpFJjvjJgj2e4BAc="; patches = [ + # By default, yabridgectl locates libyabridge.so by using + # hard-coded distro-specific lib paths. This patch replaces those + # hard coded paths with lib paths from NIX_PROFILE. ./libyabridge-from-nix-profiles.patch ]; diff --git a/pkgs/tools/backup/bacula/default.nix b/pkgs/tools/backup/bacula/default.nix index f35c7a44b586e..c2ed78823317b 100644 --- a/pkgs/tools/backup/bacula/default.nix +++ b/pkgs/tools/backup/bacula/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { description = "Enterprise ready, Network Backup Tool"; homepage = "http://bacula.org/"; license = with licenses; [ agpl3Only bsd2 ]; - maintainers = with maintainers; [ domenkozar lovek323 eleanor ]; + maintainers = with maintainers; [ lovek323 eleanor ]; platforms = platforms.all; }; } diff --git a/pkgs/tools/filesystems/lizardfs/default.nix b/pkgs/tools/filesystems/lizardfs/default.nix index 766ac1f82ea6f..a9e0cd12d9d4b 100644 --- a/pkgs/tools/filesystems/lizardfs/default.nix +++ b/pkgs/tools/filesystems/lizardfs/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv +{ lib +, stdenv , fetchFromGitHub , fetchpatch , cmake @@ -45,5 +46,7 @@ stdenv.mkDerivation rec { platforms = platforms.linux; license = licenses.gpl3; maintainers = with maintainers; [ rushmorem shamilton ]; + # 'fprintf' was not declared in this scope + broken = true; }; } diff --git a/pkgs/tools/filesystems/squashfs/default.nix b/pkgs/tools/filesystems/squashfs/default.nix index 7e55bcf6e0e43..cddb1722584ba 100644 --- a/pkgs/tools/filesystems/squashfs/default.nix +++ b/pkgs/tools/filesystems/squashfs/default.nix @@ -1,18 +1,22 @@ -{ lib, stdenv, fetchFromGitHub, zlib, xz +{ lib +, stdenv +, fetchFromGitHub +, zlib +, xz , lz4 +, lzo , zstd }: -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "squashfs"; version = "4.4"; src = fetchFromGitHub { owner = "plougher"; repo = "squashfs-tools"; + rev = version; sha256 = "0697fv8n6739mcyn57jclzwwbbqwpvjdfkv1qh9s56lvyqnplwaw"; - # Tag "4.4" points to this commit. - rev = "52eb4c279cd283ed9802dd1ceb686560b22ffb67"; }; patches = [ @@ -25,19 +29,26 @@ stdenv.mkDerivation { ./0001-Mksquashfs-add-no-hardlinks-option.patch ] ++ lib.optional stdenv.isDarwin ./darwin.patch; - buildInputs = [ zlib xz zstd lz4 ]; + buildInputs = [ zlib xz zstd lz4 lzo ]; - preBuild = "cd squashfs-tools"; + preBuild = '' + cd squashfs-tools + '' ; - installFlags = [ "INSTALL_DIR=\${out}/bin" ]; + installFlags = [ "INSTALL_DIR=${placeholder "out"}/bin" ]; - makeFlags = [ "XZ_SUPPORT=1" "ZSTD_SUPPORT=1" "LZ4_SUPPORT=1" ]; + makeFlags = [ + "XZ_SUPPORT=1" + "ZSTD_SUPPORT=1" + "LZ4_SUPPORT=1" + "LZO_SUPPORT=1" + ]; - meta = { - homepage = "http://squashfs.sourceforge.net/"; + meta = with lib; { + homepage = "https://github.com/plougher/squashfs-tools"; description = "Tool for creating and unpacking squashfs filesystems"; - platforms = lib.platforms.unix; - license = lib.licenses.gpl2Plus; - maintainers = with lib.maintainers; [ ruuda ]; + platforms = platforms.unix; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ ruuda ]; }; } diff --git a/pkgs/tools/misc/0x0/default.nix b/pkgs/tools/misc/0x0/default.nix index 39cfcefaee8af..0b9c6f7c3bbb7 100644 --- a/pkgs/tools/misc/0x0/default.nix +++ b/pkgs/tools/misc/0x0/default.nix @@ -26,5 +26,6 @@ stdenv.mkDerivation { homepage = "https://gitlab.com/somasis/scripts/"; maintainers = [ maintainers.ar1a ]; license = licenses.unlicense; + platforms = platforms.unix; }; } diff --git a/pkgs/tools/misc/blflash/default.nix b/pkgs/tools/misc/blflash/default.nix new file mode 100644 index 0000000000000..bf09fc8d0a7cc --- /dev/null +++ b/pkgs/tools/misc/blflash/default.nix @@ -0,0 +1,22 @@ +{ lib, fetchFromGitHub, rustPlatform }: + +rustPlatform.buildRustPackage rec { + pname = "blflash"; + version = "0.3.2"; + + src = fetchFromGitHub { + owner = "spacemeowx2"; + repo = "blflash"; + rev = "v${version}"; + sha256 = "sha256-+2ncK1ibtQwlBREw4Yiqj4vFvAcZqjkoTBtBdAAUoRg="; + }; + + cargoSha256 = "sha256-tt9jfcoEw/HQ0/qU4lhbqKtIw/lthDTcyf/3HYQNPEY="; + + meta = with lib; { + description = "An bl602 serial flasher written in Rust"; + homepage = "https://github.com/spacemeowx2/blflash"; + license = with licenses; [ mit asl20 ]; + maintainers = with maintainers; [ _0x4A6F ]; + }; +} diff --git a/pkgs/tools/misc/broadlink-cli/default.nix b/pkgs/tools/misc/broadlink-cli/default.nix index cb5f582d2dec2..4b22e6493a732 100644 --- a/pkgs/tools/misc/broadlink-cli/default.nix +++ b/pkgs/tools/misc/broadlink-cli/default.nix @@ -1,17 +1,16 @@ { lib, python3Packages, fetchFromGitHub }: -python3Packages.buildPythonApplication { +python3Packages.buildPythonApplication rec { pname = "broadlink-cli"; - inherit (python3Packages.broadlink) version; + version = "0.16.0"; # the tools are available as part of the source distribution from GH but # not pypi, so we have to fetch them here. src = fetchFromGitHub { owner = "mjg59"; repo = "python-broadlink"; - # this rev is version 0.15.0 - rev = "99add9e6feea6e47be4f3a58783556d7838b759c"; - sha256 = "1q1q62brvfjcb18i0j4ca5cxqzjwv1iywdrdby0yjqa4wm6ywq6b"; + rev = version; + sha256 = "sha256-fdwy58AopAcDp18APzvYionEbrKfTlH/yFpT1gG5iDs="; }; format = "other"; @@ -23,8 +22,8 @@ python3Packages.buildPythonApplication { installPhase = '' runHook preInstall - install -Dm755 -t $out/bin cli/broadlink_{cli,discovery} - install -Dm644 -t $out/share/doc/broadlink cli/README.md + install -Dm555 -t $out/bin cli/broadlink_{cli,discovery} + install -Dm444 -t $out/share/doc/broadlink cli/README.md runHook postInstall ''; diff --git a/pkgs/tools/misc/calamares/default.nix b/pkgs/tools/misc/calamares/default.nix index e79774da9177b..90abc76592038 100644 --- a/pkgs/tools/misc/calamares/default.nix +++ b/pkgs/tools/misc/calamares/default.nix @@ -1,6 +1,6 @@ { lib, fetchurl, boost, cmake, extra-cmake-modules, kparts, kpmcore , kservice, libatasmart, libxcb, libyamlcpp, parted, polkit-qt, python, qtbase -, qtquickcontrols, qtsvg, qttools, qtwebengine, util-linux, glibc, tzdata +, qtquickcontrols, qtsvg, qttools, qtwebengine, util-linux, tzdata , ckbcomp, xkeyboard_config, mkDerivation }: @@ -21,8 +21,6 @@ mkDerivation rec { qtquickcontrols qtsvg qttools qtwebengine.dev util-linux ]; - enableParallelBuilding = false; - cmakeFlags = [ "-DPYTHON_LIBRARY=${python}/lib/lib${python.libPrefix}.so" "-DPYTHON_INCLUDE_DIR=${python}/include/${python.libPrefix}" diff --git a/pkgs/tools/misc/cloud-utils/default.nix b/pkgs/tools/misc/cloud-utils/default.nix index b10259f24fc2f..32ef248ca854c 100644 --- a/pkgs/tools/misc/cloud-utils/default.nix +++ b/pkgs/tools/misc/cloud-utils/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchurl, makeWrapper , gawk, gnused, util-linux, file -, wget, python3, qemu-utils, euca2ools +, wget, python3, qemu-utils , e2fsprogs, cdrkit , gptfdisk }: diff --git a/pkgs/tools/misc/coreboot-utils/default.nix b/pkgs/tools/misc/coreboot-utils/default.nix index c05d50cdbc1b0..39e6e6f211a34 100644 --- a/pkgs/tools/misc/coreboot-utils/default.nix +++ b/pkgs/tools/misc/coreboot-utils/default.nix @@ -7,7 +7,7 @@ let description = "Various coreboot-related tools"; homepage = "https://www.coreboot.org"; license = licenses.gpl2; - maintainers = [ maintainers.petabyteboy ]; + maintainers = with maintainers; [ petabyteboy felixsinger ]; platforms = platforms.linux; }; diff --git a/pkgs/tools/misc/exa/default.nix b/pkgs/tools/misc/exa/default.nix index f275d254677c3..326a978f06064 100644 --- a/pkgs/tools/misc/exa/default.nix +++ b/pkgs/tools/misc/exa/default.nix @@ -1,43 +1,34 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, rustPlatform, cmake, perl, pkg-config, zlib +{ lib, stdenv, fetchFromGitHub, rustPlatform, cmake, pandoc, pkg-config, zlib , Security, libiconv, installShellFiles }: -with rustPlatform; - -buildRustPackage rec { +rustPlatform.buildRustPackage rec { pname = "exa"; - version = "0.9.0"; + version = "unstable-2021-01-14"; - cargoSha256 = "0nl106jlbr8gnnlbi20mrc6zyww7vxgmw6w34ibndxqh9ggxwfvr"; + cargoSha256 = "1lmjh0grpnx20y6raxnxgjkr92h395r6jk8mm2ypc4cxpxczdqvl"; src = fetchFromGitHub { owner = "ogham"; - repo = "exa"; - rev = "v${version}"; - sha256 = "14qlm9zb9v22hxbbi833xaq2b7qsxnmh15s317200vz5f1305hhw"; + repo = pname; + rev = "13b91cced4cab012413b25c9d3e30c63548639d0"; + sha256 = "18y4v1s102lh3gvgjwdd66qlsr75wpwpcj8zsk5y5r95a405dkfm"; }; - patches = [ - (fetchpatch { - # https://github.com/ogham/exa/pull/584 - name = "fix-panic-on-broken-symlink-in-git-repository.patch"; - url = "https://github.com/ogham/exa/pull/584/commits/a7a8e99cf3a15992afb2383435da0231917ffb54.patch"; - sha256 = "0n5q483sz300jkp0sbb350hdinmkw7s6bmigdyr6ypz3fvygd9hx"; - }) - ]; - - nativeBuildInputs = [ cmake pkg-config perl installShellFiles ]; + nativeBuildInputs = [ cmake pkg-config installShellFiles pandoc ]; buildInputs = [ zlib ] ++ lib.optionals stdenv.isDarwin [ libiconv Security ]; outputs = [ "out" "man" ]; postInstall = '' - installManPage contrib/man/exa.1 + pandoc --standalone -f markdown -t man man/exa.1.md > man/exa.1 + pandoc --standalone -f markdown -t man man/exa_colors.5.md > man/exa_colors.5 + installManPage man/exa.1 man/exa_colors.5 installShellCompletion \ - --name exa contrib/completions.bash \ - --name exa.fish contrib/completions.fish \ - --name _exa contrib/completions.zsh + --name exa completions/completions.bash \ + --name exa.fish completions/completions.fish \ + --name _exa completions/completions.zsh ''; # Some tests fail, but Travis ensures a proper build diff --git a/pkgs/tools/misc/ldapvi/default.nix b/pkgs/tools/misc/ldapvi/default.nix index 9b57a295de0fc..759e86080903b 100644 --- a/pkgs/tools/misc/ldapvi/default.nix +++ b/pkgs/tools/misc/ldapvi/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation { ''; homepage = "http://www.lichteblau.com/ldapvi/"; license = licenses.gpl2; - maintainers = with maintainers; [ domenkozar ]; + maintainers = with maintainers; [ ]; platforms = lib.platforms.linux; }; } diff --git a/pkgs/tools/misc/lifecycled/default.nix b/pkgs/tools/misc/lifecycled/default.nix new file mode 100644 index 0000000000000..1c30b760a9c8e --- /dev/null +++ b/pkgs/tools/misc/lifecycled/default.nix @@ -0,0 +1,31 @@ +{ lib +, buildGoModule +, fetchFromGitHub +}: +buildGoModule rec { + pname = "lifecycled"; + version = "3.1.0"; + + src = fetchFromGitHub { + owner = "buildkite"; + repo = "lifecycled"; + rev = "v${version}"; + sha256 = "F9eovZpwbigP0AMdjAIxULPLDC3zO6GxQmPdt5Xvpkk="; + }; + + vendorSha256 = "q5wYKSLHRzL+UGn29kr8+mUupOPR1zohTscbzjMRCS0="; + + postInstall = '' + mkdir -p $out/lib/systemd/system + substitute init/systemd/lifecycled.unit $out/lib/systemd/system/lifecycled.service \ + --replace /usr/bin/lifecycled $out/bin/lifecycled + ''; + + meta = with lib; { + description = "A daemon for responding to AWS AutoScaling Lifecycle Hooks"; + homepage = "https://github.com/buildkite/lifecycled/"; + license = licenses.mit; + maintainers = with maintainers; [ cole-h grahamc ]; + }; +} + diff --git a/pkgs/tools/misc/mons/default.nix b/pkgs/tools/misc/mons/default.nix index 71a12c8879686..920cab1763b8e 100644 --- a/pkgs/tools/misc/mons/default.nix +++ b/pkgs/tools/misc/mons/default.nix @@ -12,6 +12,16 @@ stdenv.mkDerivation rec { fetchSubmodules = true; }; + patches = [ + # Substitute xrandr path with @xrandr@ so we can replace it with + # real path in substituteInPlace + ./xrandr.patch + ]; + + postPatch = '' + substituteInPlace mons.sh --replace '@xrandr@' '${xrandr}/bin/xrandr' + ''; + nativeBuildInputs = [ help2man ]; makeFlags = [ "DESTDIR=$(out)" @@ -22,6 +32,6 @@ stdenv.mkDerivation rec { description = "POSIX Shell script to quickly manage 2-monitors display"; homepage = "https://github.com/Ventto/mons.git"; license = licenses.mit; - maintainers = [ maintainers.mschneider ]; + maintainers = with maintainers; [ mschneider thiagokokada ]; }; } diff --git a/pkgs/tools/misc/mons/xrandr.patch b/pkgs/tools/misc/mons/xrandr.patch new file mode 100644 index 0000000000000..6cbcdf9d514ee --- /dev/null +++ b/pkgs/tools/misc/mons/xrandr.patch @@ -0,0 +1,14 @@ +diff --git a/mons.sh b/mons.sh +index b86ce5c..feb0f33 100755 +--- a/mons.sh ++++ b/mons.sh +@@ -151,8 +151,7 @@ main() { + # ============================= + + [ -z "$DISPLAY" ] && { echo 'DISPLAY: no variable set.'; exit 1; } +- command -vp xrandr >/dev/null 2>&1 || { echo 'xrandr: command not found.'; exit 1; } +- XRANDR="$(command -pv xrandr)" ++ XRANDR="@xrandr@" + + # ============================= + # Argument Checking diff --git a/pkgs/tools/misc/nix-direnv/default.nix b/pkgs/tools/misc/nix-direnv/default.nix index 833f8313f6172..3fe8e3f387024 100644 --- a/pkgs/tools/misc/nix-direnv/default.nix +++ b/pkgs/tools/misc/nix-direnv/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, gnugrep, nix }: +{ lib, stdenv, fetchFromGitHub, gnugrep, nix, nixFlakes }: stdenv.mkDerivation rec { pname = "nix-direnv"; @@ -14,9 +14,8 @@ stdenv.mkDerivation rec { # Substitute instead of wrapping because the resulting file is # getting sourced, not executed: postPatch = '' - substituteInPlace direnvrc \ - --replace "\''${NIX_BIN_PREFIX:-}" "\''${NIX_BIN_PREFIX:-${nix}/bin/}" \ - --replace "grep" "${gnugrep}/bin/grep" + sed -i "1a NIX_BIN_PREFIX=${nixFlakes}/bin/" direnvrc + substituteInPlace direnvrc --replace "grep" "${gnugrep}/bin/grep" ''; installPhase = '' diff --git a/pkgs/tools/misc/topgrade/default.nix b/pkgs/tools/misc/topgrade/default.nix index 6dc47e317253e..c6021c0599bcf 100644 --- a/pkgs/tools/misc/topgrade/default.nix +++ b/pkgs/tools/misc/topgrade/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "topgrade"; - version = "6.6.0"; + version = "6.7.0"; src = fetchFromGitHub { owner = "r-darwish"; repo = pname; rev = "v${version}"; - sha256 = "sha256-YMg5HWDvBsYJZCxYrQuQqU4xLY8DORKYkK319pryA5I="; + sha256 = "sha256-UikJZFSnkYGGGMm6hrOqs+ax9HwUsZPht9wV79rJBgE="; }; - cargoSha256 = "sha256-G6ToQzPxuKpe1YQ4nLDJLjb3qx8D3VpuigXfdf7RHCQ="; + cargoSha256 = "sha256-8MvXpJVwiIThwq8Du/9nQ0QINpqgemwiRpunzIUqkXk="; buildInputs = lib.optional stdenv.isDarwin Foundation; diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix index 4879bd9b04280..96a4b8e7fee87 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 = "2021.03.02"; + version = "2021.03.03"; src = fetchurl { url = "https://yt-dl.org/downloads/${version}/${pname}-${version}.tar.gz"; - sha256 = "0g3fmbxbixi92vbjjy5dabz538yvfzdp649kafs09n55iw29s3f8"; + sha256 = "11z2v8mdii0bl13850mc6hgz80d0kgzb4hdxyikc3wa4jqfwrq7f"; }; nativeBuildInputs = [ installShellFiles makeWrapper ]; diff --git a/pkgs/tools/networking/aircrack-ng/default.nix b/pkgs/tools/networking/aircrack-ng/default.nix index eda64978c63d1..33a90636659a7 100644 --- a/pkgs/tools/networking/aircrack-ng/default.nix +++ b/pkgs/tools/networking/aircrack-ng/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { description = "Wireless encryption cracking tools"; homepage = "http://www.aircrack-ng.org/"; license = licenses.gpl2Plus; - maintainers = with maintainers; [ domenkozar ]; + maintainers = with maintainers; [ ]; platforms = platforms.linux; }; } diff --git a/pkgs/tools/networking/chisel/default.nix b/pkgs/tools/networking/chisel/default.nix index 8533958ac2bb6..5d82a549e889f 100644 --- a/pkgs/tools/networking/chisel/default.nix +++ b/pkgs/tools/networking/chisel/default.nix @@ -1,7 +1,6 @@ { buildGoModule , fetchFromGitHub , lib -, stdenv }: buildGoModule rec { diff --git a/pkgs/tools/networking/getmail/default.nix b/pkgs/tools/networking/getmail/default.nix index 4e20cbe74410a..44481802cc083 100644 --- a/pkgs/tools/networking/getmail/default.nix +++ b/pkgs/tools/networking/getmail/default.nix @@ -19,7 +19,7 @@ python2Packages.buildPythonApplication rec { meta = { description = "A program for retrieving mail"; - maintainers = [ lib.maintainers.raskin lib.maintainers.domenkozar ]; + maintainers = [ lib.maintainers.raskin ]; platforms = lib.platforms.linux; homepage = "http://pyropus.ca/software/getmail/"; diff --git a/pkgs/tools/networking/getmail6/default.nix b/pkgs/tools/networking/getmail6/default.nix index 40be3d2944a40..90f969f2d7685 100644 --- a/pkgs/tools/networking/getmail6/default.nix +++ b/pkgs/tools/networking/getmail6/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, python3Packages, lib }: +{ fetchFromGitHub, python3Packages, lib }: python3Packages.buildPythonApplication rec { pname = "getmail6"; diff --git a/pkgs/tools/networking/snabb/default.nix b/pkgs/tools/networking/snabb/default.nix index 9ee014396530c..d65f4fae30e31 100644 --- a/pkgs/tools/networking/snabb/default.nix +++ b/pkgs/tools/networking/snabb/default.nix @@ -58,6 +58,6 @@ stdenv.mkDerivation rec { ''; platforms = [ "x86_64-linux" ]; license = licenses.asl20; - maintainers = [ maintainers.lukego maintainers.domenkozar ]; + maintainers = [ maintainers.lukego ]; }; } diff --git a/pkgs/tools/networking/zs-apc-spdu-ctl/default.nix b/pkgs/tools/networking/zs-apc-spdu-ctl/default.nix new file mode 100644 index 0000000000000..275cc88e597aa --- /dev/null +++ b/pkgs/tools/networking/zs-apc-spdu-ctl/default.nix @@ -0,0 +1,36 @@ +{ cmake +, fetchFromGitHub +, fping +, lib +, libowlevelzs +, net-snmp +, stdenv +}: + +# TODO: add a services entry for the /etc/zs-apc-spdu.conf file +stdenv.mkDerivation rec { + pname = "zs-apc-spdu-ctl"; + version = "0.0.2"; + + src = fetchFromGitHub { + owner = "zseri"; + repo = "zs-apc-spdu-ctl"; + rev = "v${version}"; + sha256 = "TMV9ETWBVeXq6tZ2e0CrvHBXoyKfOLCQurjBdf/iw/M="; + }; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ fping libowlevelzs net-snmp ]; + + postPatch = '' + substituteInPlace src/confent.cxx \ + --replace /usr/sbin/fping "${lib.makeBinPath [fping]}/fping" + ''; + + meta = with lib; { + description = "APC SPDU control utility"; + license = licenses.mit; + maintainers = with maintainers; [ zseri ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/tools/nix/nix-output-monitor/default.nix b/pkgs/tools/nix/nix-output-monitor/default.nix index f3b080938eb40..46020233ff1df 100644 --- a/pkgs/tools/nix/nix-output-monitor/default.nix +++ b/pkgs/tools/nix/nix-output-monitor/default.nix @@ -1,21 +1,23 @@ { mkDerivation, ansi-terminal, async, attoparsec, base, containers , cassava, directory, HUnit, mtl, nix-derivation, process, relude, lib , stm, terminal-size, text, time, unix, wcwidth, fetchFromGitHub +, lock-file, data-default, expect, runtimeShell }: -mkDerivation { +mkDerivation rec { pname = "nix-output-monitor"; - version = "1.0.1.1"; + version = "1.0.3.0"; src = fetchFromGitHub { owner = "maralorn"; repo = "nix-output-monitor"; - sha256 = "1wi1gsl5q1sy7k6k5wxhwpwzki7rghhbsyzm84hnw6h93w6401ax"; - rev = "v1.0.1.1"; + sha256 = "1gidg03cwz8ss370bgz4a2g9ldj1lap5ws7dmfg6vigpx8mxigpb"; + rev = "v${version}"; }; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ ansi-terminal async attoparsec base cassava containers directory mtl - nix-derivation relude stm terminal-size text time unix wcwidth + nix-derivation relude stm terminal-size text time unix wcwidth lock-file + data-default ]; executableHaskellDepends = [ ansi-terminal async attoparsec base containers directory mtl @@ -25,6 +27,13 @@ mkDerivation { ansi-terminal async attoparsec base containers directory HUnit mtl nix-derivation process relude stm text time unix ]; + postInstall = '' + cat > $out/bin/nom-build << EOF + #!${runtimeShell} + ${expect}/bin/unbuffer nix-build "\$@" 2>&1 | exec $out/bin/nom + EOF + chmod a+x $out/bin/nom-build + ''; homepage = "https://github.com/maralorn/nix-output-monitor"; description = "Parses output of nix-build to show additional information"; license = lib.licenses.agpl3Plus; diff --git a/pkgs/tools/package-management/nixops/default.nix b/pkgs/tools/package-management/nixops/default.nix index 0dcbeb8abfedc..16ecc7f11de8d 100644 --- a/pkgs/tools/package-management/nixops/default.nix +++ b/pkgs/tools/package-management/nixops/default.nix @@ -63,7 +63,7 @@ in python2Packages.buildPythonApplication { meta = { homepage = "https://github.com/NixOS/nixops"; description = "NixOS cloud provisioning and deployment tool"; - maintainers = with lib.maintainers; [ aminechikhaoui eelco rob domenkozar ]; + maintainers = with lib.maintainers; [ aminechikhaoui eelco rob ]; platforms = lib.platforms.unix; license = lib.licenses.lgpl3; }; diff --git a/pkgs/tools/package-management/python2nix/default.nix b/pkgs/tools/package-management/python2nix/default.nix index b6ffe9abc0243..c36a488647a73 100644 --- a/pkgs/tools/package-management/python2nix/default.nix +++ b/pkgs/tools/package-management/python2nix/default.nix @@ -13,7 +13,7 @@ pythonPackages.buildPythonApplication { propagatedBuildInputs = with pythonPackages; [ requests pip setuptools ]; meta = with lib; { - maintainers = [ maintainers.domenkozar ]; + maintainers = [ ]; platforms = platforms.all; }; } diff --git a/pkgs/tools/security/kwalletcli/default.nix b/pkgs/tools/security/kwalletcli/default.nix index c1849bdca3953..d18d5c1ef8b56 100644 --- a/pkgs/tools/security/kwalletcli/default.nix +++ b/pkgs/tools/security/kwalletcli/default.nix @@ -3,13 +3,13 @@ mkDerivation rec { pname = "kwalletcli"; - version = "3.02"; + version = "3.03"; src = fetchFromGitHub { owner = "MirBSD"; repo = pname; rev = "${pname}-${lib.replaceStrings [ "." ] [ "_" ] version}"; - sha256 = "1gq45afb5nmmjfqxglv7wvcxcjd9822pc7nysq0350jmmmqwb474"; + sha256 = "sha256-DUtaQITzHhQrqA9QJd0U/5EDjH0IzY9/kal/7SYQ/Ck="; }; postPatch = '' diff --git a/pkgs/tools/security/libtpms/default.nix b/pkgs/tools/security/libtpms/default.nix index 71966a934d624..67228be6741bc 100644 --- a/pkgs/tools/security/libtpms/default.nix +++ b/pkgs/tools/security/libtpms/default.nix @@ -3,18 +3,17 @@ , fetchFromGitHub , pkg-config, autoreconfHook , openssl, perl -, tpm2Support ? false }: stdenv.mkDerivation rec { pname = "libtpms"; - version = "0.7.4"; + version = "0.8.0"; src = fetchFromGitHub { owner = "stefanberger"; repo = "libtpms"; rev = "v${version}"; - sha256 = "sha256-nZSBD3WshlZHVMBFmDBBdFkhBjNgtASfg6+lYOOAhZ8="; + sha256 = "sha256-/zvMXdAOb4J3YaqdVJvTUI1/JFC0OKwgiYwYgYB62Y4="; }; nativeBuildInputs = [ @@ -24,14 +23,13 @@ stdenv.mkDerivation rec { ]; buildInputs = [ openssl ]; - outputs = [ "out" "lib" "man" "dev" ]; + outputs = [ "out" "man" "dev" ]; enableParallelBuilding = true; configureFlags = [ "--with-openssl" - ] ++ lib.optionals tpm2Support [ - "--with-tpm2" # TPM2 support is flagged experimental by upstream + "--with-tpm2" ]; meta = with lib; { diff --git a/pkgs/tools/security/proxmark3/proxmark3-rrg.nix b/pkgs/tools/security/proxmark3/proxmark3-rrg.nix index 04def66d03c9d..2ae3443947241 100644 --- a/pkgs/tools/security/proxmark3/proxmark3-rrg.nix +++ b/pkgs/tools/security/proxmark3/proxmark3-rrg.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, mkDerivation, fetchFromGitHub, pkg-config, gcc-arm-embedded, bluez5 +{ lib, mkDerivation, fetchFromGitHub, pkg-config, gcc-arm-embedded, bluez5 , readline , hardwarePlatform ? "PM3RDV4" diff --git a/pkgs/tools/system/gdu/default.nix b/pkgs/tools/system/gdu/default.nix index 9202b31709ef5..c6f4d5dc5852e 100644 --- a/pkgs/tools/system/gdu/default.nix +++ b/pkgs/tools/system/gdu/default.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "gdu"; - version = "4.6.5"; + version = "4.7.0"; src = fetchFromGitHub { owner = "dundee"; repo = pname; rev = "v${version}"; - sha256 = "sha256-pky6YY0K4pilPcUY3sJSf4cEF10obZOHd9Jih9Igu6M="; + sha256 = "sha256-HIVLerSx0XLMvRRJUUGT1M50DbSsFNutOSM5HTTV9mc="; }; - vendorSha256 = "1aw9cgm9m3bflncpfk2qsid2aqs710nn2bpxx46n54kw9jkvj8s2"; + vendorSha256 = "sha256-QiO5p0x8kmIN6f0uYS0IR2MlWtRYTHeZpW6Nmupjias="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/tools/system/snooze/default.nix b/pkgs/tools/system/snooze/default.nix index 750a0954d3fb5..05c0b69c922b0 100644 --- a/pkgs/tools/system/snooze/default.nix +++ b/pkgs/tools/system/snooze/default.nix @@ -14,6 +14,6 @@ stdenv.mkDerivation rec { description = "Tool for waiting until a particular time and then running a command"; maintainers = with maintainers; [ kaction ]; license = licenses.cc0; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/tools/text/dirdiff/default.nix b/pkgs/tools/text/dirdiff/default.nix new file mode 100644 index 0000000000000..b49df59b29e1e --- /dev/null +++ b/pkgs/tools/text/dirdiff/default.nix @@ -0,0 +1,59 @@ +{ copyDesktopItems, fetchurl, lib, makeDesktopItem, stdenv, tcl, tk }: + +stdenv.mkDerivation rec { + pname = "dirdiff"; + version = "2.1"; + + src = fetchurl { + url = "https://www.samba.org/ftp/paulus/${pname}-${version}.tar.gz"; + sha256 = "0lljd8av68j70733yshzzhxjr1lm0vgmbqsm8f02g03qsma3cdyb"; + }; + + nativeBuildInputs = [ copyDesktopItems ]; + buildInputs = [ tcl tk ]; + + # Some light path patching. + patches = [ ./dirdiff-2.1-vars.patch ]; + postPatch = '' + for file in dirdiff Makefile; do + substituteInPlace "$file" \ + --subst-var out \ + --subst-var-by tcl ${tcl} \ + --subst-var-by tk ${tk} + done + ''; + + # If we don't create the directories ourselves, then 'make install' creates + # files named 'bin' and 'lib'. + preInstall = '' + mkdir -p $out/bin $out/lib + ''; + + installFlags = [ + "BINDIR=${placeholder "out"}/bin" + "LIBDIR=${placeholder "out"}/lib" + ]; + + desktopItems = [ + (makeDesktopItem { + name = "dirdiff"; + exec = "dirdiff"; + desktopName = "Dirdiff"; + genericName = "Directory Diff Viewer"; + comment = "Diff and merge directory trees"; + categories = "Development;"; + }) + ]; + + meta = with lib; { + description = "Graphical directory tree diff and merge tool"; + longDescription = '' + Dirdiff is a graphical tool for displaying the differences between + directory trees and for merging changes from one tree into another. + ''; + homepage = "https://www.samba.org/ftp/paulus/"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ khumba ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/tools/text/dirdiff/dirdiff-2.1-vars.patch b/pkgs/tools/text/dirdiff/dirdiff-2.1-vars.patch new file mode 100644 index 0000000000000..4e7aa025754a4 --- /dev/null +++ b/pkgs/tools/text/dirdiff/dirdiff-2.1-vars.patch @@ -0,0 +1,32 @@ +diff '--color=auto' -ru dirdiff-2.1/dirdiff dirdiff-2.1-patched/dirdiff +--- dirdiff-2.1/dirdiff 2005-04-20 03:09:53.000000000 -0700 ++++ dirdiff-2.1-patched/dirdiff 2021-02-14 22:54:09.837692023 -0800 +@@ -1,6 +1,6 @@ + #!/bin/sh + # Tcl ignores the next line \ +-exec wish "$0" -- "${1+$@}" ++exec @tk@/bin/wish "$0" -- "${1+$@}" + + # Copyright (C) 1999-2004 Paul Mackerras. All rights reserved. + # This program is free software; it may be used, copied, modified +@@ -17,7 +17,7 @@ + set TclExe [info nameofexecutable] + set compound_ok [expr {$tcl_version >= 8.4}] + +-set nofilecmp [catch {load libfilecmp.so.0.0}] ++set nofilecmp [catch {load @out@/lib/libfilecmp.so.0.0}] + set rcsflag {} + set diffbflag {} + set diffBflag {} +diff '--color=auto' -ru dirdiff-2.1/Makefile dirdiff-2.1-patched/Makefile +--- dirdiff-2.1/Makefile 2005-04-19 03:22:01.000000000 -0700 ++++ dirdiff-2.1-patched/Makefile 2021-02-14 22:54:58.575400923 -0800 +@@ -7,7 +7,7 @@ + INSTALL=install + + # You may need to change the -I arguments depending on your system +-CFLAGS=-O3 -I/usr/include/tcl8.3/ -I/usr/include/tcl ++CFLAGS=-O3 -I@tcl@/include + + all: libfilecmp.so.0.0 + diff --git a/pkgs/tools/text/mpage/default.nix b/pkgs/tools/text/mpage/default.nix index 9bde7f388dcf6..99cfec97a70b8 100644 --- a/pkgs/tools/text/mpage/default.nix +++ b/pkgs/tools/text/mpage/default.nix @@ -7,8 +7,9 @@ stdenv.mkDerivation rec { sha256 = "1zn37r5xrvjgjbw2bdkc0r7s6q8b1krmcryzj0yf0dyxbx79rasi"; }; - patchPhase = '' + postPatch = '' sed -i "Makefile" -e "s|^ *PREFIX *=.*$|PREFIX = $out|g" + substituteInPlace Makefile --replace 'gcc' '${stdenv.cc.targetPrefix}cc' ''; meta = { @@ -24,6 +25,6 @@ stdenv.mkDerivation rec { license = "liberal"; # a non-copyleft license, see `Copyright' file homepage = "http://www.mesa.nl/pub/mpage/"; - platforms = lib.platforms.linux; + platforms = lib.platforms.all; }; } diff --git a/pkgs/tools/text/numdiff/default.nix b/pkgs/tools/text/numdiff/default.nix index db27c1bfd0c0f..317d29003cd31 100644 --- a/pkgs/tools/text/numdiff/default.nix +++ b/pkgs/tools/text/numdiff/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl }: +{ lib, stdenv, fetchurl, libintl }: stdenv.mkDerivation rec { @@ -9,6 +9,9 @@ stdenv.mkDerivation rec { url = "mirror://savannah/numdiff/numdiff-${version}.tar.gz"; sha256 = "1vzmjh8mhwwysn4x4m2vif7q2k8i19x8azq7pzmkwwj4g48lla47"; }; + + buildInputs = [ libintl ]; + meta = with lib; { description = '' A little program that can be used to compare putatively similar files @@ -18,6 +21,6 @@ stdenv.mkDerivation rec { homepage = "https://www.nongnu.org/numdiff/"; license = licenses.gpl3Plus; maintainers = with maintainers; []; - platforms = platforms.gnu ++ platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/tools/text/poedit/default.nix b/pkgs/tools/text/poedit/default.nix index 63d0c05e543b5..185b2a41c46a9 100644 --- a/pkgs/tools/text/poedit/default.nix +++ b/pkgs/tools/text/poedit/default.nix @@ -41,6 +41,6 @@ stdenv.mkDerivation rec { homepage = "https://www.poedit.net/"; license = licenses.mit; platforms = platforms.unix; - maintainers = with maintainers; [ domenkozar ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/tools/text/uni2ascii/default.nix b/pkgs/tools/text/uni2ascii/default.nix index 19c95dcec637e..e2bda04d13f14 100644 --- a/pkgs/tools/text/uni2ascii/default.nix +++ b/pkgs/tools/text/uni2ascii/default.nix @@ -34,6 +34,6 @@ stdenv.mkDerivation rec { similar ASCII characters, e.g. by stripping diacritics. ''; maintainers = with lib.maintainers; [ goibhniu ]; - platforms = lib.platforms.linux; + platforms = lib.platforms.all; }; } diff --git a/pkgs/tools/text/unrtf/default.nix b/pkgs/tools/text/unrtf/default.nix index 57ffe95988d07..3357404a7d3c8 100644 --- a/pkgs/tools/text/unrtf/default.nix +++ b/pkgs/tools/text/unrtf/default.nix @@ -1,22 +1,14 @@ -{ lib, stdenv, fetchurl, fetchpatch, autoconf, automake, libiconv }: +{ lib, stdenv, fetchurl, autoconf, automake, libiconv }: stdenv.mkDerivation rec { pname = "unrtf"; - version = "0.21.9"; + version = "0.21.10"; src = fetchurl { - url = "https://www.gnu.org/software/unrtf/${pname}-${version}.tar.gz"; - sha256 = "1pcdzf2h1prn393dkvg93v80vh38q0v817xnbwrlwxbdz4k7i8r2"; + url = "https://ftp.gnu.org/gnu/${pname}/${pname}-${version}.tar.gz"; + sha256 = "1bil6z4niydz9gqm2j861dkxmqnpc8m7hvidsjbzz7x63whj17xl"; }; - patches = [ - (fetchpatch { - name = "CVE-2016-10091-0001-convert.c-Use-safe-buffer-size-and-snprintf.patch"; - url = "https://bugs.debian.org/cgi-bin/bugreport.cgi?att=1;bug=849705;filename=0001-convert.c-Use-safe-buffer-size-and-snprintf.patch;msg=20"; - sha256 = "0s0fjvm3zdm9967sijlipfrwjs0h23n2n8fa6f40xxp8y5qq5a0b"; - }) - ]; - nativeBuildInputs = [ autoconf automake ]; buildInputs = [ libiconv ]; diff --git a/pkgs/tools/text/yaml-merge/default.nix b/pkgs/tools/text/yaml-merge/default.nix index d36522edb8743..7c4ecc49df5dd 100644 --- a/pkgs/tools/text/yaml-merge/default.nix +++ b/pkgs/tools/text/yaml-merge/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation { description = "Merge YAML data files"; homepage = "https://github.com/abbradar/yaml-merge"; license = licenses.bsd2; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = with maintainers; [ abbradar ]; }; } diff --git a/pkgs/tools/virtualization/awsebcli/default.nix b/pkgs/tools/virtualization/awsebcli/default.nix index 796ea36eacfd5..1c9e81492323e 100644 --- a/pkgs/tools/virtualization/awsebcli/default.nix +++ b/pkgs/tools/virtualization/awsebcli/default.nix @@ -92,5 +92,6 @@ in with localPython.pkgs; buildPythonApplication rec { description = "A command line interface for Elastic Beanstalk"; maintainers = with maintainers; [ eqyiel ]; license = licenses.asl20; + broken = true; }; } diff --git a/pkgs/tools/virtualization/cloud-init/default.nix b/pkgs/tools/virtualization/cloud-init/default.nix index 24ecb7f99c374..dfd3321b6b62d 100644 --- a/pkgs/tools/virtualization/cloud-init/default.nix +++ b/pkgs/tools/virtualization/cloud-init/default.nix @@ -8,7 +8,6 @@ , requests , jsonschema , jsonpatch -, pytest , httpretty , dmidecode , pytestCheckHook @@ -17,11 +16,9 @@ , openssh }: -let version = "20.3"; - -in buildPythonApplication { +buildPythonApplication rec { pname = "cloud-init"; - inherit version; + version = "20.3"; namePrefix = ""; src = fetchFromGitHub { @@ -81,10 +78,10 @@ in buildPythonApplication { export TMPDIR=/tmp ''; - meta = { + meta = with lib; { homepage = "https://cloudinit.readthedocs.org"; description = "Provides configuration and customization of cloud instance"; - maintainers = [ lib.maintainers.madjar lib.maintainers.phile314 ]; - platforms = lib.platforms.all; + maintainers = with maintainers; [ madjar phile314 ]; + platforms = platforms.all; }; } diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 7f6990c4ffb6b..f767f22c1f6c8 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -340,6 +340,7 @@ mapAliases ({ liblapackWithoutAtlas = lapack-reference; # added 2018-11-05 liblastfm = libsForQt5.liblastfm; # added 2020-06-14 liblrdf = lrdf; # added 2018-04-25 + libosmpbf = throw "libosmpbf was removed because it is no longer required by osrm-backend"; libqrencode = qrencode; # added 2019-01-01 librdf = lrdf; # added 2020-03-22 librecad2 = librecad; # backwards compatibility alias, added 2015-10 @@ -602,6 +603,7 @@ mapAliases ({ urxvt_theme_switch = rxvt-unicode-plugins.theme-switch; # added 2020-02-02 urxvt_vtwheel = rxvt-unicode-plugins.vtwheel; # added 2020-02-02 urxvt_bidi = rxvt-unicode-plugins.bidi; # added 2020-02-02 + s2n = s2n-tls; # added 2021-03-03 s6Dns = s6-dns; # added 2018-07-23 s6Networking = s6-networking; # added 2018-07-23 s6LinuxUtils = s6-linux-utils; # added 2018-07-23 @@ -680,6 +682,7 @@ mapAliases ({ surf-webkit2 = surf; # added 2017-04-02 sup = throw "sup was deprecated on 2019-09-10: abandoned by upstream"; swfdec = throw "swfdec has been removed as broken and unmaintained."; # added 2020-08-23 + swtpm-tpm2 = swtpm; # added 2021-02-26 system_config_printer = system-config-printer; # added 2016-01-03 systemd-cryptsetup-generator = throw "systemd-cryptsetup-generator is now included in the systemd package"; # added 2020-07-12 systemd_with_lvm2 = throw "systemd_with_lvm2 is obsolete, enabled by default via the lvm module"; # added 2020-07-12 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4c717c5418d69..37a87e5b4b4bb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -797,6 +797,8 @@ in inherit (darwin.apple_sdk.frameworks) Cocoa CoreGraphics Foundation IOKit Kernel OpenGL; }; + lifecycled = callPackage ../tools/misc/lifecycled { }; + lilyterm = callPackage ../applications/terminal-emulators/lilyterm { inherit (gnome2) vte; gtk = gtk2; @@ -3009,6 +3011,26 @@ in pythonPackages = python3Packages; }; + beetsExternalPlugins = + let + pluginArgs = { + # This is a stripped down beets for testing of the external plugins. + beets = (beets.override { + enableAlternatives = false; + enableCopyArtifacts = false; + enableExtraFiles = false; + }).overrideAttrs (lib.const { + doInstallCheck = false; + }); + pythonPackages = python3Packages; + }; + in lib.recurseIntoAttrs { + alternatives = callPackage ../tools/audio/beets/plugins/alternatives.nix pluginArgs; + check = callPackage ../tools/audio/beets/plugins/check.nix pluginArgs; + copyartifacts = callPackage ../tools/audio/beets/plugins/copyartifacts.nix pluginArgs; + extrafiles = callPackage ../tools/audio/beets/plugins/extrafiles.nix pluginArgs; + }; + bento4 = callPackage ../tools/video/bento4 { }; bepasty = callPackage ../tools/misc/bepasty { }; @@ -3670,6 +3692,11 @@ in inherit (pythonPackages) mutagen python wrapPython; }; + dirdiff = callPackage ../tools/text/dirdiff { + tcl = tcl-8_5; + tk = tk-8_5; + }; + picotts = callPackage ../tools/audio/picotts { }; wgetpaste = callPackage ../tools/text/wgetpaste { }; @@ -5865,9 +5892,12 @@ in nodejs-slim = nodejs-slim-14_x; - nodejs-10_x = callPackage ../development/web/nodejs/v10.nix { }; + nodejs-10_x = callPackage ../development/web/nodejs/v10.nix { + icu = icu67; + }; nodejs-slim-10_x = callPackage ../development/web/nodejs/v10.nix { enableNpm = false; + icu = icu67; }; nodejs-12_x = callPackage ../development/web/nodejs/v12.nix { }; nodejs-slim-12_x = callPackage ../development/web/nodejs/v12.nix { @@ -6550,7 +6580,7 @@ in grocy = callPackage ../servers/grocy { }; inherit (callPackage ../servers/nextcloud {}) - nextcloud17 nextcloud18 nextcloud19 nextcloud20; + nextcloud18 nextcloud19 nextcloud20 nextcloud21; nextcloud-client = libsForQt5.callPackage ../applications/networking/nextcloud-client { }; @@ -7180,6 +7210,9 @@ in plujain-ramp = callPackage ../applications/audio/plujain-ramp { }; + inherit (callPackage ../servers/plik { }) + plik plikd; + plex = callPackage ../servers/plex { }; plexRaw = callPackage ../servers/plex/raw.nix { }; @@ -8234,11 +8267,6 @@ in swec = callPackage ../tools/networking/swec { }; swtpm = callPackage ../tools/security/swtpm { }; - swtpm-tpm2 = swtpm.override { - libtpms = libtpms.override { - tpm2Support = true; - }; - }; svn2git = callPackage ../applications/version-management/git-and-tools/svn2git { git = gitSVN; @@ -8784,6 +8812,8 @@ in vo-amrwbenc = callPackage ../development/libraries/vo-amrwbenc { }; + vo-aacenc = callPackage ../development/libraries/vo-aacenc { }; + vobcopy = callPackage ../tools/cd-dvd/vobcopy { }; vobsub2srt = callPackage ../tools/cd-dvd/vobsub2srt { }; @@ -9361,6 +9391,8 @@ in zinit = callPackage ../shells/zsh/zinit {} ; + zs-apc-spdu-ctl = callPackage ../tools/networking/zs-apc-spdu-ctl { }; + zsh-autoenv = callPackage ../tools/misc/zsh-autoenv { }; zsh-autopair = callPackage ../shells/zsh/zsh-autopair { }; @@ -10903,6 +10935,7 @@ in cargo-crev = callPackage ../development/tools/rust/cargo-crev { inherit (darwin.apple_sdk.frameworks) Security; }; + cargo-cross = callPackage ../development/tools/rust/cargo-cross { }; cargo-deny = callPackage ../development/tools/rust/cargo-deny { inherit (darwin.apple_sdk.frameworks) Security; }; @@ -11738,6 +11771,10 @@ in pharo-spur64 = assert stdenv.is64bit; pharo-vms.spur64; pharo-launcher = callPackage ../development/pharo/launcher { }; + umr = callPackage ../development/misc/umr { + llvmPackages = llvmPackages_latest; + }; + srandrd = callPackage ../tools/X11/srandrd { }; srecord = callPackage ../development/tools/misc/srecord { }; @@ -12610,6 +12647,8 @@ in lttv = callPackage ../development/tools/misc/lttv { }; + luaformatter = callPackage ../development/tools/luaformatter { }; + massif-visualizer = libsForQt5.callPackage ../development/tools/analysis/massif-visualizer { }; maven = maven3; @@ -15350,6 +15389,8 @@ in libmicrohttpd = libmicrohttpd_0_9_72; }; + libjwt = callPackage ../development/libraries/libjwt { }; + libkate = callPackage ../development/libraries/libkate { }; libkeyfinder = callPackage ../development/libraries/libkeyfinder { }; @@ -15494,8 +15535,6 @@ in libosmocore = callPackage ../applications/misc/libosmocore { }; - libosmpbf = callPackage ../development/libraries/libosmpbf {}; - libotr = callPackage ../development/libraries/libotr { }; libow = callPackage ../development/libraries/libow { }; @@ -15914,6 +15953,10 @@ in opencl-clang = callPackage ../development/libraries/opencl-clang { }; + mapbox-gl-native = libsForQt5.callPackage ../development/libraries/mapbox-gl-native { }; + + mapbox-gl-qml = libsForQt5.callPackage ../development/libraries/mapbox-gl-qml { }; + mapnik = callPackage ../development/libraries/mapnik { }; marisa = callPackage ../development/libraries/marisa {}; @@ -16061,6 +16104,8 @@ in ndpi = callPackage ../development/libraries/ndpi { }; + nemo-qml-plugin-dbus = libsForQt5.callPackage ../development/libraries/nemo-qml-plugin-dbus { }; + nifticlib = callPackage ../development/libraries/science/biology/nifticlib { }; notify-sharp = callPackage ../development/libraries/notify-sharp { }; @@ -16376,8 +16421,6 @@ in polkit = callPackage ../development/libraries/polkit { }; - polkit_qt4 = callPackage ../development/libraries/polkit-qt-1/qt-4.nix { }; - poppler = callPackage ../development/libraries/poppler { lcms = lcms2; }; poppler_0_61 = callPackage ../development/libraries/poppler/0.61.nix { lcms = lcms2; }; @@ -16712,6 +16755,8 @@ in rubberband = callPackage ../development/libraries/rubberband { }; + s2geometry = callPackage ../development/libraries/s2geometry { }; + /* This package references ghc844, which we no longer have. Unfortunately, I have been unable to mark it as "broken" in a way that the ofBorg bot recognizes. Since I don't want to merge code into master that generates @@ -16795,7 +16840,7 @@ in graphite2 = callPackage ../development/libraries/silgraphite/graphite2.nix {}; - s2n = callPackage ../development/libraries/s2n { }; + s2n-tls = callPackage ../development/libraries/s2n-tls { }; simavr = callPackage ../development/tools/simavr { avrgcc = pkgsCross.avr.buildPackages.gcc; @@ -17833,6 +17878,7 @@ in bind = callPackage ../servers/dns/bind { }; dnsutils = bind.dnsutils; + dig = bind.dnsutils; inherit (callPackages ../servers/bird { }) bird bird6 bird2; @@ -19289,28 +19335,29 @@ in ]; }; - linux-rt_5_6 = callPackage ../os-specific/linux/kernel/linux-rt-5.6.nix { + linux_5_10 = callPackage ../os-specific/linux/kernel/linux-5.10.nix { kernelPatches = [ kernelPatches.bridge_stp_helper kernelPatches.request_key_helper ]; }; - linux_5_10 = callPackage ../os-specific/linux/kernel/linux-5.10.nix { + linux_5_11 = callPackage ../os-specific/linux/kernel/linux-5.11.nix { kernelPatches = [ kernelPatches.bridge_stp_helper kernelPatches.request_key_helper ]; }; - linux_5_11 = callPackage ../os-specific/linux/kernel/linux-5.11.nix { + linux-rt_5_10 = callPackage ../os-specific/linux/kernel/linux-rt-5.10.nix { kernelPatches = [ kernelPatches.bridge_stp_helper kernelPatches.request_key_helper + kernelPatches.export-rt-sched-migrate ]; }; - linux-rt_5_10 = callPackage ../os-specific/linux/kernel/linux-rt-5.10.nix { + linux-rt_5_11 = callPackage ../os-specific/linux/kernel/linux-rt-5.11.nix { kernelPatches = [ kernelPatches.bridge_stp_helper kernelPatches.request_key_helper @@ -19573,10 +19620,10 @@ in # Realtime kernel packages. linuxPackages-rt_5_4 = linuxPackagesFor pkgs.linux-rt_5_4; - linuxPackages-rt_5_6 = linuxPackagesFor pkgs.linux-rt_5_6; linuxPackages-rt_5_10 = linuxPackagesFor pkgs.linux-rt_5_10; + linuxPackages-rt_5_11 = linuxPackagesFor pkgs.linux-rt_5_11; linuxPackages-rt = linuxPackages-rt_5_4; - linuxPackages-rt_latest = linuxPackages-rt_5_10; + linuxPackages-rt_latest = linuxPackages-rt_5_11; linux-rt = linuxPackages-rt.kernel; linux-rt_latest = linuxPackages-rt_latest.kernel; @@ -19897,6 +19944,8 @@ in go-migrate = callPackage ../development/tools/go-migrate { }; + go-mockery = callPackage ../development/tools/go-mockery { }; + gomacro = callPackage ../development/tools/gomacro { }; gomodifytags = callPackage ../development/tools/gomodifytags { }; @@ -21308,6 +21357,7 @@ in apostrophe = callPackage ../applications/editors/apostrophe { pythonPackages = python3Packages; + texlive = texlive.combined.scheme-medium; }; aqemu = libsForQt5.callPackage ../applications/virtualization/aqemu { }; @@ -21503,6 +21553,8 @@ in inherit (darwin.apple_sdk.frameworks) Cocoa CoreGraphics ForceFeedback OpenAL OpenGL; }; + blflash = callPackage ../tools/misc/blflash { }; + blogc = callPackage ../applications/misc/blogc { }; bluefish = callPackage ../applications/editors/bluefish { @@ -23385,6 +23437,12 @@ in kubernetes-helm = callPackage ../applications/networking/cluster/helm { }; + wrapHelm = callPackage ../applications/networking/cluster/helm/wrapper.nix { }; + + kubernetes-helm-wrapped = wrapHelm kubernetes-helm {}; + + kubernetes-helmPlugins = dontRecurseIntoAttrs (callPackage ../applications/networking/cluster/helm/plugins { }); + kubetail = callPackage ../applications/networking/cluster/kubetail { } ; kupfer = callPackage ../applications/misc/kupfer { @@ -23437,6 +23495,8 @@ in libowfat = callPackage ../development/libraries/libowfat { }; + libowlevelzs = callPackage ../development/libraries/libowlevelzs { }; + librecad = libsForQt514.callPackage ../applications/misc/librecad { }; libreoffice = hiPrio libreoffice-still; @@ -23606,7 +23666,7 @@ in mail-notification = callPackage ../desktops/gnome-2/desktop/mail-notification {}; - magnetophonDSP = { + magnetophonDSP = lib.recurseIntoAttrs { CharacterCompressor = callPackage ../applications/audio/magnetophonDSP/CharacterCompressor { }; CompBus = callPackage ../applications/audio/magnetophonDSP/CompBus { }; ConstantDetuneChorus = callPackage ../applications/audio/magnetophonDSP/ConstantDetuneChorus { }; @@ -24581,6 +24641,8 @@ in ponymix = callPackage ../applications/audio/ponymix { }; + pothos = libsForQt5.callPackage ../applications/radio/pothos { }; + potrace = callPackage ../applications/graphics/potrace {}; posterazor = callPackage ../applications/misc/posterazor { }; @@ -24634,6 +24696,8 @@ in puremapping = callPackage ../applications/audio/pd-plugins/puremapping { }; + pure-maps = libsForQt5.callPackage ../applications/misc/pure-maps { }; + pwdsafety = callPackage ../tools/security/pwdsafety { }; pybitmessage = callPackage ../applications/networking/instant-messengers/pybitmessage { }; @@ -26697,6 +26761,8 @@ in cataclysm-dda-git = cataclysmDDA.git.tiles; + cbonsai = callPackage ../games/cbonsai { }; + chessdb = callPackage ../games/chessdb { }; chessx = libsForQt5.callPackage ../games/chessx { }; @@ -29311,6 +29377,8 @@ in sndio = callPackage ../misc/sndio { }; + stork = callPackage ../applications/misc/stork { }; + oclgrind = callPackage ../development/tools/analysis/oclgrind { }; opkg = callPackage ../tools/package-management/opkg { }; @@ -29470,6 +29538,8 @@ in sane-backends-git = callPackage ../applications/graphics/sane/backends/git.nix (config.sane or {}); + senv = callPackage ../applications/misc/senv { }; + brlaser = callPackage ../misc/cups/drivers/brlaser { }; fxlinuxprint = callPackage ../misc/cups/drivers/fxlinuxprint { }; diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 0b2c548c1e033..51dd6c257b23b 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -242,6 +242,8 @@ let digestif = callPackage ../development/ocaml-modules/digestif { }; + directories = callPackage ../development/ocaml-modules/directories { }; + dispatch = callPackage ../development/ocaml-modules/dispatch { }; dns = callPackage ../development/ocaml-modules/dns { }; diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index 3c8738565f60e..c9c4414f2fbfc 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -16,7 +16,7 @@ lib.makeScope pkgs.newScope (self: with self; { # Wrap mkDerivation to prepend pname with "php-" to make names consistent # with how buildPecl does it and make the file easier to overview. mkDerivation = { pname, ... }@args: pkgs.stdenv.mkDerivation (args // { - pname = "php-${php.version}-${pname}"; + pname = "php-${pname}"; }); pcre' = if (lib.versionAtLeast php.version "7.3") then pcre2 else pcre; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 7a40c4dbefef6..d937a8bf7e483 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -126,7 +126,13 @@ in { # helpers - wrapPython = callPackage ../development/interpreters/python/wrap-python.nix {inherit python; inherit (pkgs) makeSetupHook makeWrapper; }; + # We use build packages because we are making a setup hook to be used as a + # native build input. The script itself references both the build-time + # (build) and run-time (host) python from the explicitly passed in `python` + # attribute, so the `buildPackages` doesn't effect that. + wrapPython = pkgs.buildPackages.callPackage ../development/interpreters/python/wrap-python.nix { + inherit python; + }; # Dont take pythonPackages from "global" pkgs scope to avoid mixing python versions pythonPackages = self; @@ -2157,6 +2163,8 @@ in { exifread = callPackage ../development/python-modules/exifread { }; + exrex = callPackage ../development/python-modules/exrex { }; + extras = callPackage ../development/python-modules/extras { }; eyeD3 = callPackage ../development/python-modules/eyed3 { }; @@ -4060,6 +4068,8 @@ in { mesa = callPackage ../development/python-modules/mesa { }; + meshio = callPackage ../development/python-modules/meshio { }; + meshlabxml = callPackage ../development/python-modules/meshlabxml { }; meson = disabledIf (pythonOlder "3.5") (toPythonModule ((pkgs.meson.override { python3 = python; }).overrideAttrs @@ -4300,6 +4310,8 @@ in { mygpoclient = callPackage ../development/python-modules/mygpoclient { }; + myjwt = callPackage ../development/python-modules/myjwt { }; + mypy = callPackage ../development/python-modules/mypy { }; mypy-extensions = callPackage ../development/python-modules/mypy/extensions.nix { }; @@ -6767,6 +6779,8 @@ in { querystring_parser = callPackage ../development/python-modules/querystring-parser { }; + questionary = callPackage ../development/python-modules/questionary { }; + queuelib = callPackage ../development/python-modules/queuelib { }; r2pipe = callPackage ../development/python-modules/r2pipe { }; @@ -6927,6 +6941,8 @@ in { rfc7464 = callPackage ../development/python-modules/rfc7464 { }; + rfcat = callPackage ../development/python-modules/rfcat { }; + rhpl = disabledIf isPy3k (callPackage ../development/python-modules/rhpl { }); rich = callPackage ../development/python-modules/rich { }; diff --git a/pkgs/top-level/qt5-packages.nix b/pkgs/top-level/qt5-packages.nix index 223132217a5dc..336f58adf11e2 100644 --- a/pkgs/top-level/qt5-packages.nix +++ b/pkgs/top-level/qt5-packages.nix @@ -127,7 +127,7 @@ in (kdeFrameworks // plasma5 // plasma5.thirdParty // kdeApplications // qt5 // plasma-wayland-protocols = callPackage ../development/libraries/plasma-wayland-protocols { }; - polkit-qt = callPackage ../development/libraries/polkit-qt-1/qt-5.nix { }; + polkit-qt = callPackage ../development/libraries/polkit-qt-1 { }; poppler = callPackage ../development/libraries/poppler { lcms = pkgs.lcms2; |