diff options
39 files changed, 185 insertions, 119 deletions
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index a72145562d40..a9a26a988c08 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -3896,6 +3896,11 @@ github = "pierrechevalier83"; name = "Pierre Chevalier"; }; + pierreis = { + email = "pierre@pierre.is"; + github = "pierreis"; + name = "Pierre Matri"; + }; pierrer = { email = "pierrer@pi3r.be"; github = "pierrer"; diff --git a/nixos/modules/services/misc/octoprint.nix b/nixos/modules/services/misc/octoprint.nix index baa7c3ade52e..52ae25201c35 100644 --- a/nixos/modules/services/misc/octoprint.nix +++ b/nixos/modules/services/misc/octoprint.nix @@ -7,7 +7,7 @@ let cfg = config.services.octoprint; baseConfig = { - plugins.cura.cura_engine = "${pkgs.curaengine_stable}/bin/CuraEngine"; + plugins.curalegacy.cura_engine = "${pkgs.curaengine_stable}/bin/CuraEngine"; server.host = cfg.host; server.port = cfg.port; webcam.ffmpeg = "${pkgs.ffmpeg.bin}/bin/ffmpeg"; diff --git a/pkgs/applications/graphics/avocode/default.nix b/pkgs/applications/graphics/avocode/default.nix index a413b7227326..e4a33edfb8b1 100644 --- a/pkgs/applications/graphics/avocode/default.nix +++ b/pkgs/applications/graphics/avocode/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { name = "avocode-${version}"; - version = "3.7.2"; + version = "3.8.0"; src = fetchurl { url = "https://media.avocode.com/download/avocode-app/${version}/avocode-${version}-linux.zip"; - sha256 = "0qwghs9q91ifywvrn8jgnnqzfrbbsi4lf92ikxq0dmdv734pdw0c"; + sha256 = "1m5shx4xnjrf5lfxivh3ns0a08wdrkhfyk6hbmkv65j9pwc1sr8n"; }; libPath = stdenv.lib.makeLibraryPath (with xorg; [ diff --git a/pkgs/applications/misc/buku/default.nix b/pkgs/applications/misc/buku/default.nix index 9822a187b9e8..4a73e6b002ee 100644 --- a/pkgs/applications/misc/buku/default.nix +++ b/pkgs/applications/misc/buku/default.nix @@ -1,14 +1,14 @@ { stdenv, python3, fetchFromGitHub, fetchpatch }: with python3.pkgs; buildPythonApplication rec { - version = "4.2"; + version = "4.2.2"; pname = "buku"; src = fetchFromGitHub { owner = "jarun"; repo = "buku"; rev = "v${version}"; - sha256 = "1ipvhd9wa4iq0763b9h4f3xa6x31bssi6m0595w97mdhh9n6bgxg"; + sha256 = "1wy5i1av1s98yr56ybiq66kv0vg48zci3fp91zfgj04nh2966w1w"; }; checkInputs = [ diff --git a/pkgs/applications/misc/cura/default.nix b/pkgs/applications/misc/cura/default.nix index d570a2570d1c..958b0d4844bb 100644 --- a/pkgs/applications/misc/cura/default.nix +++ b/pkgs/applications/misc/cura/default.nix @@ -2,20 +2,20 @@ mkDerivation rec { name = "cura-${version}"; - version = "4.0.0"; + version = "4.1.0"; src = fetchFromGitHub { owner = "Ultimaker"; repo = "Cura"; rev = version; - sha256 = "18pxlmrw8m2mir177f0j9bma7rk29vam91gd86c0d458nw21q2qf"; + sha256 = "1mfpnjrh3splpkadgml3v71k939g56zb9hbmzghwfjwlrf8valmz"; }; materials = fetchFromGitHub { owner = "Ultimaker"; repo = "fdm_materials"; rev = version; - sha256 = "0g2dkph0ll7d9109n17vmfwb4fpc8lhyb1z1q68j8vblyvg08d12"; + sha256 = "0yp2162msxfwpixzvassn23p7r3swjpwk4nhsjka5w6fm8pv0wpl"; }; buildInputs = [ qtbase qtquickcontrols2 qtgraphicaleffects ]; @@ -27,12 +27,6 @@ mkDerivation rec { cmakeFlags = [ "-DURANIUM_DIR=${python3.pkgs.uranium.src}" "-DCURA_VERSION=${version}" - - # see https://github.com/Ultimaker/Cura/issues/5142 - "-DCURA_SDK_VERSION=6.0.0" - - # remove after 4.0.0, see https://github.com/void-linux/void-packages/pull/9880#issuecomment-475453025 - "-DCURA_CLOUD_API_VERSION=1" ]; postPatch = '' diff --git a/pkgs/applications/misc/curaengine/default.nix b/pkgs/applications/misc/curaengine/default.nix index 9188e461e519..25cfccd3ed38 100644 --- a/pkgs/applications/misc/curaengine/default.nix +++ b/pkgs/applications/misc/curaengine/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "curaengine-${version}"; - version = "4.0.0"; + version = "4.1.0"; src = fetchFromGitHub { owner = "Ultimaker"; repo = "CuraEngine"; rev = version; - sha256 = "0p4zcckrlrpyp5xdqgvp0phmawyh4cy8vipim9fvgsfcin4vhrv7"; + sha256 = "14zy9ir46vndsi4l8kapm6byw02fimm7ava2rfi0kvcckf5yq9w8"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/applications/misc/gcalcli/default.nix b/pkgs/applications/misc/gcalcli/default.nix index 9313612370c8..6f380114a276 100644 --- a/pkgs/applications/misc/gcalcli/default.nix +++ b/pkgs/applications/misc/gcalcli/default.nix @@ -5,13 +5,13 @@ with python3.pkgs; buildPythonApplication rec { pname = "gcalcli"; - version = "4.1.0"; + version = "4.1.1"; src = fetchFromGitHub { owner = "insanum"; repo = pname; rev = "v${version}"; - sha256 = "06iijpwlvvn8bj81s4znhykilvwvydxjmzd3d4nsa5j2kj3iwshi"; + sha256 = "1qlmslywm4dfimggly4p0ckn2gj165mq1p0wkry9jpb3sg1m5fdf"; }; postPatch = lib.optionalString stdenv.isLinux '' diff --git a/pkgs/applications/misc/gpx-viewer/default.nix b/pkgs/applications/misc/gpx-viewer/default.nix index f7cfee3e6516..a5ee6c8e4ae5 100644 --- a/pkgs/applications/misc/gpx-viewer/default.nix +++ b/pkgs/applications/misc/gpx-viewer/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, intltool, pkgconfig, gnome3, libchamplain, gdl, shared-mime-info, desktop-file-utils, wrapGAppsHook }: +{ stdenv, fetchurl, intltool, libxml2, pkgconfig, gnome3, libchamplain, gdl, shared-mime-info, desktop-file-utils, wrapGAppsHook }: stdenv.mkDerivation rec { name = "gpx-viewer-${version}"; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { desktop-file-utils # For update-desktop-database wrapGAppsHook # Fix error: GLib-GIO-ERROR **: No GSettings schemas are installed on the system ]; - buildInputs = [ gdl libchamplain gnome3.adwaita-icon-theme ]; + buildInputs = [ gdl libchamplain gnome3.adwaita-icon-theme libxml2 ]; meta = with stdenv.lib; { homepage = https://blog.sarine.nl/tag/gpxviewer/; diff --git a/pkgs/applications/misc/octoprint/default.nix b/pkgs/applications/misc/octoprint/default.nix index b8ed4c5ddbee..1eb1a1b93fb6 100644 --- a/pkgs/applications/misc/octoprint/default.nix +++ b/pkgs/applications/misc/octoprint/default.nix @@ -15,13 +15,9 @@ let packageOverrides = lib.foldr lib.composeExtensions (self: super: { }) ([ (mkOverride "flask" "0.10.1" "0wrkavjdjndknhp8ya8j850jq7a1cli4g5a93mg8nh1xz2gq50sc") (mkOverride "flask_login" "0.2.11" "1rg3rsjs1gwi2pw6vr9jmhaqm9b3vc9c4hfcsvp4y8agbh7g3mc3") - (mkOverride "pylru" "1.0.9" "0b0pq0l7xv83dfsajsc49jcxzc99kb9jfx1a1dlx22hzcy962dvi") (mkOverride "sarge" "0.1.4" "08s8896973bz1gg0pkr592w6g4p6v47bkfvws5i91p9xf8b35yar") (mkOverride "tornado" "4.5.3" "02jzd23l4r6fswmwxaica9ldlyc2p6q8dk6dyff7j58fmdzf853d") - # https://github.com/NixOS/nixpkgs/pull/58179#issuecomment-478605134 - (mkOverride "werkzeug" "0.14.1" "c3fd7a7d41976d9f44db327260e263132466836cef6f91512889ed60ad26557c") - # Octoprint holds back jinja2 to 2.8.1 due to breaking changes. # This old version does not have updated test config for pytest 4, # and pypi tarball doesn't contain tests dir anyways. @@ -43,16 +39,15 @@ let "Flask-Assets" "Flask-Babel" "Flask-Principal" - "PyYAML" "emoji" "flask" "future" "futures" "monotonic" + "markdown" "pkginfo" "psutil" "pyserial" - "python-dateutil" "requests" "rsa" "sarge" @@ -60,19 +55,19 @@ let "semantic_version" "watchdog" "websocket-client" - "werkzeug" "wrapt" + "sentry-sdk" ]; in py.pkgs.buildPythonApplication rec { pname = "OctoPrint"; - version = "1.3.10"; + version = "1.3.11"; src = fetchFromGitHub { owner = "foosel"; repo = "OctoPrint"; rev = version; - sha256 = "1pvh7ay76zrvfzcsadh3sl48sgf3by9vpiaqlrkscsw02zirx9r7"; + sha256 = "1102ki1819wsmkfg4riz4i0hjlr3w6nsvk8wrzqq0lc0s5ycf4jx"; }; propagatedBuildInputs = with py.pkgs; [ @@ -80,8 +75,8 @@ in py.pkgs.buildPythonApplication rec { semantic-version flask_principal werkzeug flaskbabel tornado psutil pyserial flask_login netaddr markdown sockjs-tornado pylru pyyaml sarge feedparser netifaces click websocket_client - scandir chainmap future dateutil futures wrapt monotonic emoji - frozendict + scandir chainmap future futures wrapt monotonic emoji + frozendict cachelib sentry-sdk typing ] ++ lib.optionals stdenv.isDarwin [ py.pkgs.appdirs ]; checkInputs = with py.pkgs; [ nose mock ddt ]; diff --git a/pkgs/applications/misc/octoprint/plugins.nix b/pkgs/applications/misc/octoprint/plugins.nix index 327a59618c2b..1aca5164f6c8 100644 --- a/pkgs/applications/misc/octoprint/plugins.nix +++ b/pkgs/applications/misc/octoprint/plugins.nix @@ -104,6 +104,25 @@ let }; }; + curaenginelegacy = buildPlugin rec { + pname = "CuraEngineLegacy"; + version = "1.0.2"; + + src = fetchFromGitHub { + owner = "OctoPrint"; + repo = "OctoPrint-${pname}"; + rev = version; + sha256 = "1cdb276wfyf3wcfj5g3migd6b6aqmkrxncrqjfcfx4j4k3xac965"; + }; + + meta = with stdenv.lib; { + description = "Plugin for slicing via Cura Legacy from within OctoPrint"; + homepage = "https://github.com/OctoPrint/OctoPrint-CuraEngineLegacy"; + license = licenses.agpl3; + maintainers = with maintainers; [ gebner ]; + }; + }; + }; in self diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix index 1241c819a9a7..e1ba29007852 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix @@ -57,11 +57,11 @@ let in stdenv.mkDerivation rec { name = "signal-desktop-${version}"; - version = "1.25.0"; + version = "1.25.1"; src = fetchurl { url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb"; - sha256 = "0yz4y621b5brmsrl3r6r0svwyz5cll4jqnr5zs76i8ak903xaccz"; + sha256 = "1185psv93amqj0s7rgm8bhl3y4jcxc1945paslvjbmw01vi3p1lp"; }; phases = [ "unpackPhase" "installPhase" ]; diff --git a/pkgs/applications/networking/mailreaders/balsa/default.nix b/pkgs/applications/networking/mailreaders/balsa/default.nix index f7f34a671837..db3cd7782e8f 100644 --- a/pkgs/applications/networking/mailreaders/balsa/default.nix +++ b/pkgs/applications/networking/mailreaders/balsa/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { name = "balsa-${version}"; - version = "2.5.6"; + version = "2.5.7"; src = fetchurl { url = "https://pawsa.fedorapeople.org/balsa/${name}.tar.bz2"; - sha256 = "17k6wcsl8gki7cskr3hhmfj6n54rha8ca3b6fzd8blsl5shsankx"; + sha256 = "0yfqhfpwm1qnwmbpr6dfn2f5w8a8xxq51pn8ypgg0fw973l1c1nx"; }; nativeBuildInputs = [ diff --git a/pkgs/development/compilers/sbcl/default.nix b/pkgs/development/compilers/sbcl/default.nix index 469d7847409f..e2cc7adc26e1 100644 --- a/pkgs/development/compilers/sbcl/default.nix +++ b/pkgs/development/compilers/sbcl/default.nix @@ -10,11 +10,11 @@ stdenv.mkDerivation rec { name = "sbcl-${version}"; - version = "1.5.1"; + version = "1.5.3"; src = fetchurl { url = "mirror://sourceforge/project/sbcl/sbcl/${version}/${name}-source.tar.bz2"; - sha256 = "08z62qba0kmm15k93s2rq7ipi769895g8iwigcp20qjh6amwnwph"; + sha256 = "0334cfnvjy0ccq9p05mxrgawhww8wb73rp318qcsf9yj8h8r19yj"; }; buildInputs = [texinfo]; diff --git a/pkgs/development/libraries/armadillo/default.nix b/pkgs/development/libraries/armadillo/default.nix index 7ef4feab188d..c65689136646 100644 --- a/pkgs/development/libraries/armadillo/default.nix +++ b/pkgs/development/libraries/armadillo/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, cmake, openblasCompat, superlu, hdf5 }: stdenv.mkDerivation rec { - version = "9.300.2"; + version = "9.400.4"; name = "armadillo-${version}"; src = fetchurl { url = "mirror://sourceforge/arma/armadillo-${version}.tar.xz"; - sha256 = "1d2nsbspj9vzgzb6w2vgjv2wzidjzc8sr8wkz2zl7wxpgspl299n"; + sha256 = "1wv08i8mq16hswxkll3kmbfih4hz4d8v7apszm76lwxpya2bm65l"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/catch2/default.nix b/pkgs/development/libraries/catch2/default.nix index c81e97b970e5..67f5350d8fe6 100644 --- a/pkgs/development/libraries/catch2/default.nix +++ b/pkgs/development/libraries/catch2/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "catch2-${version}"; - version = "2.7.2"; + version = "2.8.0"; src = fetchFromGitHub { owner = "catchorg"; repo = "Catch2"; rev = "v${version}"; - sha256="0h4yihf2avaw9awcigdqqlnfk5ak7scfv5lm0j8s6la4hyswc982"; + sha256="1i7nz29gcsy9cnljb0sb1fw8fg9p1gdh2pdhrgj3kcrsnxgbyhrq"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/folly/default.nix b/pkgs/development/libraries/folly/default.nix index d2f66ad55f0d..00ac6abbc8eb 100644 --- a/pkgs/development/libraries/folly/default.nix +++ b/pkgs/development/libraries/folly/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "folly-${version}"; - version = "2019.04.22.00"; + version = "2019.05.27.00"; src = fetchFromGitHub { owner = "facebook"; repo = "folly"; rev = "v${version}"; - sha256 = "08aniprv2a96d3k36k668maq9nysxh0cm58i0hvy71cqcmc97h7p"; + sha256 = "00xacaziqllps069xzg7iz68rj5hr8mj3rbi4shkrr9jq51y9ikj"; }; nativeBuildInputs = [ cmake ]; @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { homepage = https://github.com/facebook/folly; license = licenses.asl20; # 32bit is not supported: https://github.com/facebook/folly/issues/103 - platforms = [ "x86_64-linux" ]; - maintainers = with maintainers; [ abbradar ]; + platforms = [ "x86_64-linux" "x86_64-darwin" ]; + maintainers = with maintainers; [ abbradar pierreis ]; }; } diff --git a/pkgs/development/libraries/libimagequant/default.nix b/pkgs/development/libraries/libimagequant/default.nix index ccd52f81d111..83afd26bf1d3 100644 --- a/pkgs/development/libraries/libimagequant/default.nix +++ b/pkgs/development/libraries/libimagequant/default.nix @@ -1,29 +1,26 @@ -{ stdenv, fetchFromGitHub, unzip }: +{ stdenv, fetchFromGitHub }: -with stdenv; +stdenv.mkDerivation rec { + pname = "libimagequant"; + version = "2.12.3"; -let - version = "2.12.2"; -in - mkDerivation { - name = "libimagequant-${version}"; - src = fetchFromGitHub { - owner = "ImageOptim"; - repo = "libimagequant"; - rev = "${version}"; - sha256 = "1k61ifcjbp2lcrwqidflj99inkyhpbrw0hl1nzq1rjp5dnw2y5lw"; - }; + src = fetchFromGitHub { + owner = "ImageOptim"; + repo = pname; + rev = version; + sha256 = "0qsfq1kv1m5jzn9v9iz0bac66k4clcis1c9877qabnwzwmwma5v0"; + }; - preConfigure = '' - patchShebangs ./configure - ''; + preConfigure = '' + patchShebangs ./configure + ''; - meta = { - homepage = https://pngquant.org/lib/; - description = "Image quantization library"; - longDescription = "Small, portable C library for high-quality conversion of RGBA images to 8-bit indexed-color (palette) images."; - license = lib.licenses.gpl3Plus; - platforms = lib.platforms.unix; - maintainers = with lib.maintainers; [ ma9e ]; - }; - } + meta = with stdenv.lib; { + homepage = "https://pngquant.org/lib/"; + description = "Image quantization library"; + longDescription = "Small, portable C library for high-quality conversion of RGBA images to 8-bit indexed-color (palette) images."; + license = licenses.gpl3Plus; + platforms = platforms.unix; + maintainers = with maintainers; [ ma9e marsam ]; + }; +} diff --git a/pkgs/development/python-modules/Nikola/default.nix b/pkgs/development/python-modules/Nikola/default.nix index 2577711c5259..c6548f1b5984 100644 --- a/pkgs/development/python-modules/Nikola/default.nix +++ b/pkgs/development/python-modules/Nikola/default.nix @@ -58,6 +58,12 @@ buildPythonPackage rec { sha256 = "1a5y1qriy76hl4yxvbf365b1ggsxybm06mi1pwb5jkgbkwk2gkrf"; }; + patchPhase = '' + # upstream added bound so that requires.io doesn't send mails about update + # nikola should work with markdown 3.0: https://github.com/getnikola/nikola/pull/3175#issue-220147596 + sed -i 's/Markdown>.*/Markdown/' requirements.txt + ''; + checkPhase = '' LANG="en_US.UTF-8" LC_ALL="en_US.UTF-8" py.test . ''; diff --git a/pkgs/development/python-modules/cachelib/default.nix b/pkgs/development/python-modules/cachelib/default.nix new file mode 100644 index 000000000000..703f3797d1bf --- /dev/null +++ b/pkgs/development/python-modules/cachelib/default.nix @@ -0,0 +1,18 @@ +{ stdenv, buildPythonPackage, fetchPypi }: + +buildPythonPackage rec { + pname = "cachelib"; + version = "0.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "13dfv0a4ahgx0wmpqv8jqhshim4229p9c1c7gcsra81pkm89p24b"; + }; + + meta = with stdenv.lib; { + homepage = "https://github.com/pallets/cachelib"; + description = "Collection of cache libraries in the same API interface"; + license = licenses.bsd3; + maintainers = with maintainers; [ gebner ]; + }; +} diff --git a/pkgs/development/python-modules/libarcus/default.nix b/pkgs/development/python-modules/libarcus/default.nix index 671949669492..add1957dd6df 100644 --- a/pkgs/development/python-modules/libarcus/default.nix +++ b/pkgs/development/python-modules/libarcus/default.nix @@ -1,16 +1,16 @@ -{ stdenv, buildPythonPackage, fetchFromGitHub +{ stdenv, buildPythonPackage, python, fetchFromGitHub , cmake, sip, protobuf, pythonOlder }: buildPythonPackage rec { pname = "libarcus"; - version = "4.0.0"; + version = "4.1.0"; format = "other"; src = fetchFromGitHub { owner = "Ultimaker"; repo = "libArcus"; rev = version; - sha256 = "14c62bsc2cynhaajpdidcqpq2vqwshrdkqyzwvpsjjbfmlx3b1ay"; + sha256 = "1x06daijxbrqj0dlxmi2zn7ap74zf6hih3krmkwhvarm2nr052g4"; }; disabled = pythonOlder "3.4.0"; @@ -20,8 +20,7 @@ buildPythonPackage rec { buildInputs = [ protobuf ]; postPatch = '' - # To workaround buggy SIP detection which overrides PYTHONPATH - sed -i '/SET(ENV{PYTHONPATH}/d' cmake/FindSIP.cmake + sed -i 's#''${Python3_SITELIB}#${placeholder "out"}/${python.sitePackages}#' cmake/SIPMacros.cmake ''; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/libsavitar/default.nix b/pkgs/development/python-modules/libsavitar/default.nix index dc783ba8f33a..f0fbcf5f3116 100644 --- a/pkgs/development/python-modules/libsavitar/default.nix +++ b/pkgs/development/python-modules/libsavitar/default.nix @@ -1,20 +1,19 @@ -{ stdenv, buildPythonPackage, pythonOlder, fetchFromGitHub, cmake, sip }: +{ stdenv, buildPythonPackage, python, pythonOlder, fetchFromGitHub, cmake, sip }: buildPythonPackage rec { pname = "libsavitar"; - version = "4.0.0"; + version = "4.1.0"; format = "other"; src = fetchFromGitHub { owner = "Ultimaker"; repo = "libSavitar"; rev = version; - sha256 = "1q70l37qafzfkpw8vlagmpd2w576b6jc1xmxp3wf3qfq45j8kya0"; + sha256 = "132bgcvjkr61pzf244hwz8gxzpg1i50na4bkcipwnyxdravdkkgf"; }; postPatch = '' - # To workaround buggy SIP detection which overrides PYTHONPATH - sed -i '/SET(ENV{PYTHONPATH}/d' cmake/FindSIP.cmake + sed -i 's#''${Python3_SITELIB}#${placeholder "out"}/${python.sitePackages}#' cmake/SIPMacros.cmake ''; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/python-modules/markdown/default.nix b/pkgs/development/python-modules/markdown/default.nix index f2397138771e..364fa4d81be2 100644 --- a/pkgs/development/python-modules/markdown/default.nix +++ b/pkgs/development/python-modules/markdown/default.nix @@ -7,22 +7,18 @@ buildPythonPackage rec { pname = "Markdown"; - version = "2.6.10"; + version = "3.1.1"; src = fetchPypi { - extension = "zip"; inherit pname version; - sha256 = "cfa536d1ee8984007fcecc5a38a493ff05c174cb74cb2341dafd175e6bc30851"; + sha256 = "2e50876bcdd74517e7b71f3e7a76102050edec255b3983403f1a63e7c8a41e7a"; }; - # error: invalid command 'test' -# doCheck = false; - checkInputs = [ nose pyyaml ]; meta = { - description = "A Python implementation of John Gruber’s Markdown with Extension support"; - homepage = https://github.com/Python-Markdown/markdown; + description = "A Python implementation of John Gruber's Markdown with Extension support"; + homepage = "https://github.com/Python-Markdown/markdown"; license = lib.licenses.bsd3; }; } diff --git a/pkgs/development/python-modules/markdownsuperscript/default.nix b/pkgs/development/python-modules/markdownsuperscript/default.nix index 62bf7a93098e..1212651aec81 100644 --- a/pkgs/development/python-modules/markdownsuperscript/default.nix +++ b/pkgs/development/python-modules/markdownsuperscript/default.nix @@ -1,4 +1,5 @@ -{ stdenv, buildPythonPackage, fetchPypi, markdown }: +{ stdenv, buildPythonPackage, fetchPypi, markdown, + pytest, pytestrunner, pytestcov, coverage }: buildPythonPackage rec { pname = "MarkdownSuperscript"; @@ -11,7 +12,15 @@ buildPythonPackage rec { propagatedBuildInputs = [ markdown ]; - doCheck = false; # See https://github.com/NixOS/nixpkgs/pull/26985 + postPatch = '' + # remove version bounds for Markdown dependency + sed 's/\["Markdown.*"\]/["Markdown"]/' -i setup.py + + # remove version bounds for test dependencies + sed 's/=.*//' -i requirements/*.txt + ''; + + checkInputs = [ pytest pytestrunner pytestcov coverage ]; meta = { description = "An extension to the Python Markdown package enabling superscript text"; diff --git a/pkgs/development/python-modules/pelican/default.nix b/pkgs/development/python-modules/pelican/default.nix index 19d9b7853495..ee38d5a7a84c 100644 --- a/pkgs/development/python-modules/pelican/default.nix +++ b/pkgs/development/python-modules/pelican/default.nix @@ -42,6 +42,11 @@ buildPythonPackage rec { postPatch= '' substituteInPlace pelican/tests/test_pelican.py \ --replace "'git'" "'${git}/bin/git'" + + # Markdown-3.1 changed footnote separator to colon + # https://github.com/getpelican/pelican/issues/2493#issuecomment-491723744 + sed -i '/test_article_with_footnote/i\ + @unittest.skip("")' pelican/tests/test_readers.py ''; LC_ALL="en_US.UTF-8"; diff --git a/pkgs/development/python-modules/pylru/default.nix b/pkgs/development/python-modules/pylru/default.nix index b0fd4f4003a4..8ca565834d4a 100644 --- a/pkgs/development/python-modules/pylru/default.nix +++ b/pkgs/development/python-modules/pylru/default.nix @@ -2,15 +2,15 @@ buildPythonPackage rec { pname = "pylru"; - version = "1.1.0"; + version = "1.2.0"; src = fetchPypi { inherit pname version; - sha256 = "e03a3d354eb8fdfa11638698e8a1f06cd3b3a214ebc0a120c603a79290d9ebec"; + sha256 = "492f934bb98dc6c8b2370c02c95c65516ddc08c8f64d27f70087eb038621d297"; }; meta = with lib; { - homepage = https://github.com/jlhutch/pylru; + homepage = "https://github.com/jlhutch/pylru"; description = "A least recently used (LRU) cache implementation"; license = licenses.gpl2; maintainers = with maintainers; [ abbradar ]; diff --git a/pkgs/development/python-modules/sentry-sdk/default.nix b/pkgs/development/python-modules/sentry-sdk/default.nix new file mode 100644 index 000000000000..503b899ec22d --- /dev/null +++ b/pkgs/development/python-modules/sentry-sdk/default.nix @@ -0,0 +1,20 @@ +{ stdenv, buildPythonPackage, fetchPypi, urllib3, certifi }: + +buildPythonPackage rec { + pname = "sentry-sdk"; + version = "0.8.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "f5819df450d7b0696be69a0c6d70a09e4890a3844ee8ccb7a461794135bd5965"; + }; + + propagatedBuildInputs = [ urllib3 certifi ]; + + meta = with stdenv.lib; { + homepage = "https://github.com/getsentry/sentry-python"; + description = "New Python SDK for Sentry.io"; + license = licenses.bsd2; + maintainers = with maintainers; [ gebner ]; + }; +} diff --git a/pkgs/development/python-modules/trezor/default.nix b/pkgs/development/python-modules/trezor/default.nix index 4a2920418f1c..589878d69f52 100644 --- a/pkgs/development/python-modules/trezor/default.nix +++ b/pkgs/development/python-modules/trezor/default.nix @@ -14,13 +14,13 @@ buildPythonPackage rec { pname = "trezor"; - version = "0.11.2"; + version = "0.11.3"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "a6f4b47b37a21247535fc43411cb70a8c61ef0a5a2dfee668bd05611e2741fb8"; + sha256 = "c79a500e90d003073c8060d319dceb042caaba9472f13990c77ed37d04a82108"; }; propagatedBuildInputs = [ typing-extensions protobuf hidapi ecdsa mnemonic requests pyblake2 click construct libusb1 rlp ]; @@ -43,6 +43,6 @@ buildPythonPackage rec { description = "Python library for communicating with TREZOR Bitcoin Hardware Wallet"; homepage = https://github.com/trezor/python-trezor; license = lib.licenses.gpl3; - maintainers = with lib.maintainers; [ np prusnak ]; + maintainers = with lib.maintainers; [ np prusnak mmahut ]; }; } diff --git a/pkgs/development/python-modules/uranium/default.nix b/pkgs/development/python-modules/uranium/default.nix index b4081870fbe6..6365846bd263 100644 --- a/pkgs/development/python-modules/uranium/default.nix +++ b/pkgs/development/python-modules/uranium/default.nix @@ -2,7 +2,7 @@ , pyqt5, numpy, scipy, shapely, libarcus, doxygen, gettext, pythonOlder }: buildPythonPackage rec { - version = "4.0.0"; + version = "4.1.0"; pname = "uranium"; format = "other"; @@ -10,7 +10,7 @@ buildPythonPackage rec { owner = "Ultimaker"; repo = "Uranium"; rev = version; - sha256 = "1dzn064np76q0xpypcwsa7k7arzihg79xw1pgcvdizk9kzc6rw3y"; + sha256 = "0vjlir9rd3xdlb8icdcr51qjmnh8nny6ajycria9idccriaqficj"; }; disabled = pythonOlder "3.5.0"; diff --git a/pkgs/development/tools/analysis/checkstyle/default.nix b/pkgs/development/tools/analysis/checkstyle/default.nix index eee347f52669..5b80a5079b6e 100644 --- a/pkgs/development/tools/analysis/checkstyle/default.nix +++ b/pkgs/development/tools/analysis/checkstyle/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, makeWrapper, jre }: stdenv.mkDerivation rec { - version = "8.20"; + version = "8.21"; name = "checkstyle-${version}"; src = fetchurl { url = "https://github.com/checkstyle/checkstyle/releases/download/checkstyle-${version}/checkstyle-${version}-all.jar"; - sha256 = "1vsszdmdpyjdwlc9qqw4m8s6rw3pkdrczrmlmydwqmzvzr559nyp"; + sha256 = "1jd6kbfmvgr3mr8kjhhr1fj1i3j36ysnfi14g5027ngwbq7klm7d"; }; nativeBuildInputs = [ makeWrapper ]; @@ -32,6 +32,6 @@ stdenv.mkDerivation rec { homepage = http://checkstyle.sourceforge.net/; license = licenses.lgpl21; maintainers = with maintainers; [ pSub ]; - platforms = with platforms; linux; + platforms = jre.meta.platforms; }; } diff --git a/pkgs/development/tools/build-managers/buck/default.nix b/pkgs/development/tools/build-managers/buck/default.nix index 2cbf3a33a094..6963ccd161a1 100644 --- a/pkgs/development/tools/build-managers/buck/default.nix +++ b/pkgs/development/tools/build-managers/buck/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "buck"; - version = "2019.05.06.01"; + version = "2019.05.22.01"; src = fetchFromGitHub { owner = "facebook"; repo = pname; rev = "v${version}"; - sha256 = "0bcj1g8hmcpdgz3c2sxglxxq1jn1x0p9dk6hml8ajkn4h82kw12y"; + sha256 = "1fxprw18kd3cw1lzv4xi1lnbdni06hs4vm9yh0w548rsfn3wnmxq"; }; patches = [ ./pex-mtime.patch ]; diff --git a/pkgs/development/tools/coursier/default.nix b/pkgs/development/tools/coursier/default.nix index 4bc3f464c1b4..299e7d9d4992 100644 --- a/pkgs/development/tools/coursier/default.nix +++ b/pkgs/development/tools/coursier/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "coursier-${version}"; - version = "1.1.0-M14-4"; + version = "1.1.0-M14-6"; src = fetchurl { url = "https://github.com/coursier/coursier/releases/download/v${version}/coursier"; - sha256 = "1rlfqqlinbf472j7ifb8k4zkk2cx543cgnr0hi32qmqmzi0f89r2"; + sha256 = "01q0gz4qnwvnd7mprcm5aj77hrxyr6ax8jp4d9jkqfkg272znaj7"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/tools/rust/cargo-xbuild/default.nix b/pkgs/development/tools/rust/cargo-xbuild/default.nix index e3cdc117ded6..5f74932a6920 100644 --- a/pkgs/development/tools/rust/cargo-xbuild/default.nix +++ b/pkgs/development/tools/rust/cargo-xbuild/default.nix @@ -2,13 +2,13 @@ rustPlatform.buildRustPackage rec { pname = "cargo-xbuild"; - version = "0.5.9"; + version = "0.5.11"; src = fetchFromGitHub { owner = "rust-osdev"; repo = pname; rev = "v${version}"; - sha256 = "0c4gls25vvkh4hw8apic03zb54m1v69n9ycwcp49c73ky8lrn0vj"; + sha256 = "04vgb443bmrfklvzhjfidpi3pp2svbc3bwq674m9fn7sbdp6rnwm"; }; cargoSha256 = "1r9i79lymfwpbcx2lp509v435qpkl9bqly1ya369p41n5yprrcjv"; diff --git a/pkgs/os-specific/linux/batman-adv/alfred.nix b/pkgs/os-specific/linux/batman-adv/alfred.nix index 671b13c4d79c..cb240ba16953 100644 --- a/pkgs/os-specific/linux/batman-adv/alfred.nix +++ b/pkgs/os-specific/linux/batman-adv/alfred.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, pkgconfig, gpsd, libcap, libnl }: let - ver = "2019.1"; + ver = "2019.2"; in stdenv.mkDerivation rec { name = "alfred-${ver}"; src = fetchurl { url = "https://downloads.open-mesh.org/batman/releases/batman-adv-${ver}/${name}.tar.gz"; - sha256 = "0nsi5g77zsl0s683r0hqz91xs2bz91ic9c1qdsa3ikd46z8s8lkj"; + sha256 = "1whbi39sx3gz91yvynr7vmnc2l9lcvyynjbd3d9wg6bsm7lz0mmn"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/os-specific/linux/batman-adv/batctl.nix b/pkgs/os-specific/linux/batman-adv/batctl.nix index 44c975b8dcc1..58c6a7167e30 100644 --- a/pkgs/os-specific/linux/batman-adv/batctl.nix +++ b/pkgs/os-specific/linux/batman-adv/batctl.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, pkgconfig, libnl }: let - ver = "2019.1"; + ver = "2019.2"; in stdenv.mkDerivation rec { name = "batctl-${ver}"; src = fetchurl { url = "https://downloads.open-mesh.org/batman/releases/batman-adv-${ver}/${name}.tar.gz"; - sha256 = "14wp8rvm2m1r5qz7p1m08bzg2gmqyldkw1p6gk8rkdyqb3q0abg8"; + sha256 = "18qfz209pyksklcnrgvw6hm30iw7dng0rxi2njqxhk3xzw464rgv"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/servers/ftp/bftpd/default.nix b/pkgs/servers/ftp/bftpd/default.nix index 02bf714a42bf..ca071d215af9 100644 --- a/pkgs/servers/ftp/bftpd/default.nix +++ b/pkgs/servers/ftp/bftpd/default.nix @@ -5,11 +5,11 @@ let in stdenv.mkDerivation rec { name = "${pname}-${version}"; - version = "5.0"; + version = "5.1"; src = fetchurl { url = "mirror://sourceforge/project/${pname}/${pname}/${name}/${name}.tar.gz"; - sha256 = "1qagqsbg7zblkhg3vrj47k5f1q09r4az7gna86rxf253kmg90yqp"; + sha256 = "1kk5xs9w6cy3yf3yqzls80vxzy0a8zxvhq854wm21pz2grn3n5yh"; }; preConfigure = '' diff --git a/pkgs/servers/nosql/redis/default.nix b/pkgs/servers/nosql/redis/default.nix index 16f21391dee1..0ce948c715e0 100644 --- a/pkgs/servers/nosql/redis/default.nix +++ b/pkgs/servers/nosql/redis/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, lua }: stdenv.mkDerivation rec { - version = "5.0.4"; + version = "5.0.5"; name = "redis-${version}"; src = fetchurl { url = "http://download.redis.io/releases/${name}.tar.gz"; - sha256 = "1pc7r4lbvhiyln7y529798nv8lxasky6sgspw49hkxi3bbzwxs9w"; + sha256 = "0xd3ak527cnkz2cn422l2ag9nsa6mhv7y2y49zwqy7fjk6bh0f91"; }; buildInputs = [ lua ]; diff --git a/pkgs/tools/security/aide/default.nix b/pkgs/tools/security/aide/default.nix index 6fbc411bf75c..1513ae58a0b6 100644 --- a/pkgs/tools/security/aide/default.nix +++ b/pkgs/tools/security/aide/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "aide-${version}"; - version = "0.16.1"; + version = "0.16.2"; src = fetchurl { url = "https://github.com/aide/aide/releases/download/v${version}/${name}.tar.gz"; - sha256 = "1dqhc0c24wa4zid06pfy61k357yvzh28ij86bk9jf6hcqzn7qaqg"; + sha256 = "15xp47sz7kk1ciffw3f5xw2jg2mb2lqrbr3q6p4bkbz5dap9iy8p"; }; buildInputs = [ flex bison libmhash zlib acl attr libselinux pcre ]; diff --git a/pkgs/tools/security/bruteforce-luks/default.nix b/pkgs/tools/security/bruteforce-luks/default.nix index bcd0593e88f8..69444d1612e8 100644 --- a/pkgs/tools/security/bruteforce-luks/default.nix +++ b/pkgs/tools/security/bruteforce-luks/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { name = "bruteforce-luks-${version}"; - version = "1.3.1"; + version = "1.3.2"; src = fetchFromGitHub { - sha256 = "14ckm31wbzf3lnk472bywjjlh9kysb793nsh2gp04aa5hp5lym58"; + sha256 = "0ws5bm5pczhvqrlhl60h8a9rdwk6xlh9wr5ndnkyxvv7m90qpy9b"; rev = version; repo = "bruteforce-luks"; owner = "glv2"; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 9c240e36b88d..2df56150e16b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -319,6 +319,8 @@ in { cachecontrol = callPackage ../development/python-modules/cachecontrol { }; + cachelib = callPackage ../development/python-modules/cachelib { }; + cachy = callPackage ../development/python-modules/cachy { }; cdecimal = callPackage ../development/python-modules/cdecimal { }; @@ -890,6 +892,8 @@ in { selectors2 = callPackage ../development/python-modules/selectors2 { }; + sentry-sdk = callPackage ../development/python-modules/sentry-sdk {}; + sepaxml = callPackage ../development/python-modules/sepaxml { }; serversyncstorage = callPackage ../development/python-modules/serversyncstorage {}; |