diff options
74 files changed, 1231 insertions, 322 deletions
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 2bcf0cccb3a72..f8962501ebdcb 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -3560,6 +3560,16 @@ githubId = 87115; name = "Wael Nasreddine"; }; + kamadorueda = { + name = "Kevin Amado"; + email = "kamadorueda@gmail.com"; + github = "kamadorueda"; + githubId = 47480384; + keys = [{ + longkeyid = "rsa4096/0x04D0CEAF916A9A40"; + fingerprint = "2BE3 BAFD 793E A349 ED1F F00F 04D0 CEAF 916A 9A40"; + }]; + }; kamilchm = { email = "kamil.chm@gmail.com"; github = "kamilchm"; @@ -7280,6 +7290,11 @@ githubId = 797581; name = "Vincent Bernardoff"; }; + vcanadi = { + email = "vito.canadi@gmail.com"; + github = "vcanadi"; + name = "Vitomir Čanadi"; + }; vcunat = { name = "Vladimír Čunát"; email = "v@cunat.cz"; # vcunat@gmail.com predominated in commits before 2019/03 diff --git a/nixos/modules/services/web-servers/nginx/default.nix b/nixos/modules/services/web-servers/nginx/default.nix index ada7a25604c40..60a5b503def9c 100644 --- a/nixos/modules/services/web-servers/nginx/default.nix +++ b/nixos/modules/services/web-servers/nginx/default.nix @@ -178,6 +178,8 @@ let then "/etc/nginx/nginx.conf" else configFile; + execCommand = "${cfg.package}/bin/nginx -c '${configPath}' -p '${cfg.stateDir}'"; + vhosts = concatStringsSep "\n" (mapAttrsToList (vhostName: vhost: let onlySSL = vhost.onlySSL || vhost.enableSSL; @@ -682,10 +684,10 @@ in stopIfChanged = false; preStart = '' ${cfg.preStart} - ${cfg.package}/bin/nginx -c '${configPath}' -p '${cfg.stateDir}' -t + ${execCommand} -t ''; serviceConfig = { - ExecStart = "${cfg.package}/bin/nginx -c '${configPath}' -p '${cfg.stateDir}'"; + ExecStart = execCommand; ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; Restart = "always"; RestartSec = "10s"; @@ -706,11 +708,18 @@ in }; systemd.services.nginx-config-reload = mkIf cfg.enableReload { - wantedBy = [ "nginx.service" ]; + wants = [ "nginx.service" ]; + wantedBy = [ "multi-user.target" ]; restartTriggers = [ configFile ]; + # commented, because can cause extra delays during activate for this config: + # services.nginx.virtualHosts."_".locations."/".proxyPass = "http://blabla:3000"; + # stopIfChanged = false; + serviceConfig.Type = "oneshot"; + serviceConfig.TimeoutSec = 60; script = '' if ${pkgs.systemd}/bin/systemctl -q is-active nginx.service ; then - ${pkgs.systemd}/bin/systemctl reload nginx.service + ${execCommand} -t && \ + ${pkgs.systemd}/bin/systemctl reload nginx.service fi ''; serviceConfig.RemainAfterExit = true; diff --git a/nixos/tests/nginx.nix b/nixos/tests/nginx.nix index 55d2c9309084a..7358800a67633 100644 --- a/nixos/tests/nginx.nix +++ b/nixos/tests/nginx.nix @@ -7,7 +7,7 @@ import ./make-test-python.nix ({ pkgs, ... }: { name = "nginx"; meta = with pkgs.stdenv.lib.maintainers; { - maintainers = [ mbbx6spp ]; + maintainers = [ mbbx6spp danbst ]; }; nodes = { @@ -59,6 +59,11 @@ import ./make-test-python.nix ({ pkgs, ... }: { { services.nginx.package = pkgs.nginxUnstable; } + + { + services.nginx.package = pkgs.nginxUnstable; + services.nginx.virtualHosts."!@$$(#*%".locations."~@#*$*!)".proxyPass = ";;;"; + } ]; }; @@ -68,6 +73,7 @@ import ./make-test-python.nix ({ pkgs, ... }: { etagSystem = "${nodes.webserver.config.system.build.toplevel}/fine-tune/child-1"; justReloadSystem = "${nodes.webserver.config.system.build.toplevel}/fine-tune/child-2"; reloadRestartSystem = "${nodes.webserver.config.system.build.toplevel}/fine-tune/child-3"; + reloadWithErrorsSystem = "${nodes.webserver.config.system.build.toplevel}/fine-tune/child-4"; in '' url = "http://localhost/index.html" @@ -110,5 +116,17 @@ import ./make-test-python.nix ({ pkgs, ... }: { ) webserver.wait_for_unit("nginx") webserver.succeed("journalctl -u nginx | grep -q -i stopped") + + with subtest("nixos-rebuild --switch should fail when there are configuration errors"): + webserver.fail( + "${reloadWithErrorsSystem}/bin/switch-to-configuration test >&2" + ) + webserver.succeed("[[ $(systemctl is-failed nginx-config-reload) == failed ]]") + webserver.succeed("[[ $(systemctl is-failed nginx) == active ]]") + # just to make sure operation is idempotent. During development I had a situation + # when first time it shows error, but stops showing it on subsequent rebuilds + webserver.fail( + "${reloadWithErrorsSystem}/bin/switch-to-configuration test >&2" + ) ''; }) diff --git a/pkgs/applications/editors/texmaker/default.nix b/pkgs/applications/editors/texmaker/default.nix index 71043cb78fe13..c45025dd80cc1 100644 --- a/pkgs/applications/editors/texmaker/default.nix +++ b/pkgs/applications/editors/texmaker/default.nix @@ -2,11 +2,11 @@ mkDerivation rec { pname = "texmaker"; - version = "5.0.3"; + version = "5.0.4"; src = fetchurl { url = "http://www.xm1math.net/texmaker/${pname}-${version}.tar.bz2"; - sha256 = "0vrj9w5lk3vf6138n5bz8phmy3xp5kv4dq1rgirghcf4hbxdyx30"; + sha256 = "1qnh5g8zkjpjmw2l8spcynpfgs3wpcfcla5ms2kkgvkbdlzspqqx"; }; buildInputs = [ qtbase qtscript poppler zlib ]; diff --git a/pkgs/applications/graphics/pdfcpu/default.nix b/pkgs/applications/graphics/pdfcpu/default.nix index 8dd9ef1cb2545..f31506ce73398 100644 --- a/pkgs/applications/graphics/pdfcpu/default.nix +++ b/pkgs/applications/graphics/pdfcpu/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "pdfcpu"; - version = "0.3.1"; + version = "0.3.2"; src = fetchFromGitHub { owner = "pdfcpu"; repo = pname; rev = "v${version}"; - sha256 = "13i9hz7gg82s17ky715a6czpisn4fpx2xjbmydq7j81b44x7m3vc"; + sha256 = "0a7d36hzcvj68apzc726r2vqsjyrkcynxif5laarxapm6p67g3z4"; }; - modSha256 = "1nagb3k2ghfw27g4vcmn7v8s5flg387jpf1l18gw6c44a1xjcivs"; + modSha256 = "0ak34wr5cbcvblndslsxdd24vfj3h02xqjqnj5amkll5iqn5mzi1"; subPackages = [ "cmd/pdfcpu" ]; diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix index 40e69f8c9bcb4..0bfa850cb26e0 100644 --- a/pkgs/applications/kde/default.nix +++ b/pkgs/applications/kde/default.nix @@ -146,6 +146,7 @@ let krdc = callPackage ./krdc.nix {}; krfb = callPackage ./krfb.nix {}; kruler = callPackage ./kruler.nix {}; + ksudoku = callPackage ./ksudoku.nix {}; ksystemlog = callPackage ./ksystemlog.nix {}; ktnef = callPackage ./ktnef.nix {}; ktouch = callPackage ./ktouch.nix {}; diff --git a/pkgs/applications/kde/ksudoku.nix b/pkgs/applications/kde/ksudoku.nix new file mode 100644 index 0000000000000..3641c1b333237 --- /dev/null +++ b/pkgs/applications/kde/ksudoku.nix @@ -0,0 +1,18 @@ +{ lib +, mkDerivation +, extra-cmake-modules +, libGLU +, kdoctools +, kdeclarative +, libkdegames +}: + +mkDerivation { + name = "ksudoku"; + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; + buildInputs = [ libGLU kdeclarative libkdegames ]; + meta = { + license = with lib.licenses; [ gpl2 ]; + maintainers = with lib.maintainers; [ genesis ]; + }; +} diff --git a/pkgs/applications/networking/flexget/default.nix b/pkgs/applications/networking/flexget/default.nix index d735c06a53196..98d37fae9114d 100644 --- a/pkgs/applications/networking/flexget/default.nix +++ b/pkgs/applications/networking/flexget/default.nix @@ -1,34 +1,12 @@ -{ lib, python3 }: +{ lib, python3Packages }: -# Flexget have been a trouble maker in the past, -# if you see flexget breaking when updating packages, don't worry. -# The current state is that we have no active maintainers for this package. -# -- Mic92 - -let - python' = python3.override { inherit packageOverrides; }; - - packageOverrides = self: super: { - guessit = super.guessit.overridePythonAttrs (old: rec { - version = "3.0.3"; - src = old.src.override { - inherit version; - sha256 = "1q06b3k31bfb8cxjimpf1rkcrwnc596a9cppjw15minvdangl32r"; - }; - }); - }; - -in - -with python'.pkgs; - -buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "FlexGet"; - version = "2.21.25"; + version = "3.0.31"; - src = fetchPypi { + src = python3Packages.fetchPypi { inherit pname version; - sha256 = "0l77fgg0w5dca1bwk4fcc1yz1g7njb0x07yx4bazyg821gl15rc9"; + sha256 = "b9edd905556c77b40046b5d7a27151b76a1c9a8c43a4e4153279ad42a784844e"; }; postPatch = '' @@ -43,29 +21,42 @@ buildPythonApplication rec { # ~400 failures doCheck = false; - propagatedBuildInputs = [ + propagatedBuildInputs = with python3Packages; [ # See https://github.com/Flexget/Flexget/blob/master/requirements.in - feedparser sqlalchemy pyyaml - beautifulsoup4 html5lib - PyRSS2Gen pynzb rpyc jinja2 - requests dateutil jsonschema - pathpy guessit rebulk APScheduler - terminaltables colorclass - cherrypy flask flask-restful - flask-restplus flask-compress - flask_login flask-cors - pyparsing zxcvbn future + APScheduler + beautifulsoup4 + cherrypy + colorclass + feedparser + flask-compress + flask-cors + flask_login + flask-restful + flask-restplus + flask + guessit + html5lib + jinja2 + jsonschema + loguru progressbar - # Optional requirements - deluge-client - # Plugins - transmissionrpc - ] ++ lib.optional (pythonOlder "3.4") pathlib; + pynzb + pyparsing + PyRSS2Gen + dateutil + pyyaml + rebulk + requests + rpyc + sqlalchemy + terminaltables + zxcvbn + ]; meta = with lib; { - homepage = https://flexget.com/; - description = "Multipurpose automation tool for content like torrents"; + homepage = "https://flexget.com/"; + description = "Multipurpose automation tool for all of your media"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ marsam ]; }; } diff --git a/pkgs/applications/networking/instant-messengers/psi/default.nix b/pkgs/applications/networking/instant-messengers/psi/default.nix index e895b3cc00d1a..19438c4d037b6 100644 --- a/pkgs/applications/networking/instant-messengers/psi/default.nix +++ b/pkgs/applications/networking/instant-messengers/psi/default.nix @@ -1,27 +1,26 @@ -{ stdenv, fetchurl, enchant, qt4, zlib, sox, libX11, xorgproto, libSM -, libICE, qca2, pkgconfig, which, glib -, libXScrnSaver +{ stdenv, fetchFromGitHub, cmake, wrapQtAppsHook +, qtbase, qtmultimedia, qtx11extras, qttools, qtwebengine +, libidn, qca2-qt5, libXScrnSaver, hunspell }: - stdenv.mkDerivation rec { - name = "psi-0.15"; - - src = fetchurl { - url = "mirror://sourceforge/psi/${name}.tar.bz2"; - sha256 = "593b5ddd7934af69c245afb0e7290047fd7dedcfd8765baca5a3a024c569c7e6"; + pname = "psi"; + version = "1.4"; + src = fetchFromGitHub { + owner = "psi-im"; + repo = pname; + rev = version; + sha256 = "09c7cg96vgxzgbpypgcw7yv73gvzppbi1lm4svbpfn2cfxy059d4"; + fetchSubmodules = true; }; - - buildInputs = - [ enchant qt4 zlib sox libX11 xorgproto libSM libICE - qca2 pkgconfig which glib libXScrnSaver - ]; - - NIX_CFLAGS_COMPILE="-I${qca2}/include/QtCrypto"; - - NIX_LDFLAGS="-lqca"; - + patches = [ + ./fix-cmake-hunspell-1.7.patch + ]; + nativeBuildInputs = [ cmake wrapQtAppsHook ]; + buildInputs = [ + qtbase qtmultimedia qtx11extras qttools qtwebengine + libidn qca2-qt5 libXScrnSaver hunspell + ]; enableParallelBuilding = true; - meta = with stdenv.lib; { description = "Psi, an XMPP (Jabber) client"; maintainers = [ maintainers.raskin ]; diff --git a/pkgs/applications/networking/instant-messengers/psi/fix-cmake-hunspell-1.7.patch b/pkgs/applications/networking/instant-messengers/psi/fix-cmake-hunspell-1.7.patch new file mode 100644 index 0000000000000..7d5711a6f2bcc --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/psi/fix-cmake-hunspell-1.7.patch @@ -0,0 +1,12 @@ +diff --git a/cmake/modules/FindHunspell.cmake b/cmake/modules/FindHunspell.cmake +index a2d180b3..3a5aef3a 100644 +--- a/cmake/modules/FindHunspell.cmake ++++ b/cmake/modules/FindHunspell.cmake +@@ -64,6 +64,7 @@ set(HUNSPELL_NAMES + hunspell-1.4 + hunspell-1.5 + hunspell-1.6 ++ hunspell-1.7 + libhunspell${d} + ) + find_library( diff --git a/pkgs/applications/networking/protonmail-bridge/default.nix b/pkgs/applications/networking/protonmail-bridge/default.nix index a585e7f948bbd..7acf821dfcf4e 100644 --- a/pkgs/applications/networking/protonmail-bridge/default.nix +++ b/pkgs/applications/networking/protonmail-bridge/default.nix @@ -2,7 +2,7 @@ , libsecret, libGL, libpulseaudio, glib, wrapQtAppsHook, mkDerivation }: let - version = "1.2.2-1"; + version = "1.2.3-1"; description = '' An application that runs on your computer in the background and seamlessly encrypts @@ -16,7 +16,7 @@ in mkDerivation { src = fetchurl { url = "https://protonmail.com/download/protonmail-bridge_${version}_amd64.deb"; - sha256 = "16hfa07wdqcns79395wjdglg2cjyblqgz1hx8rl15qm7n5f24ckl"; + sha256 = "032ggk9fvd19fbsqkzwzwh0hpyg8gpkrin71di7zsx6ias5innw1"; }; sourceRoot = "."; diff --git a/pkgs/applications/radio/soapysdr/default.nix b/pkgs/applications/radio/soapysdr/default.nix index 5e4a78cfbd22f..c4879f01e6065 100644 --- a/pkgs/applications/radio/soapysdr/default.nix +++ b/pkgs/applications/radio/soapysdr/default.nix @@ -1,7 +1,8 @@ { stdenv, lib, lndir, makeWrapper , fetchFromGitHub, cmake , libusb, pkgconfig -, python, swig2, numpy, ncurses +, usePython ? false +, python, ncurses, swig2 , extraPackages ? [] } : @@ -24,12 +25,14 @@ in stdenv.mkDerivation { }; nativeBuildInputs = [ cmake makeWrapper pkgconfig ]; - buildInputs = [ libusb ncurses numpy python swig2 ]; + buildInputs = [ libusb ncurses ] + ++ lib.optionals usePython [ python swig2 ]; + + propagatedBuildInputs = lib.optional usePython python.pkgs.numpy; cmakeFlags = [ "-DCMAKE_BUILD_TYPE=Release" - "-DUSE_PYTHON_CONFIG=ON" - ]; + ] ++ lib.optional usePython "-DUSE_PYTHON_CONFIG=ON"; postFixup = lib.optionalString (lib.length extraPackages != 0) '' # Join all plugins via symlinking diff --git a/pkgs/applications/video/shotcut/default.nix b/pkgs/applications/video/shotcut/default.nix index 4636ce48b1a5b..33ce5c18028fa 100644 --- a/pkgs/applications/video/shotcut/default.nix +++ b/pkgs/applications/video/shotcut/default.nix @@ -3,34 +3,20 @@ , qtquickcontrols, qtgraphicaleffects, libmlt, qmake, qttools }: -assert stdenv.lib.versionAtLeast libmlt.version "6.8.0"; -assert stdenv.lib.versionAtLeast mlt.version "6.8.0"; - -let - # https://github.com/mltframework/shotcut/issues/771 - fixVaapiRendering1 = fetchpatch { - url = "https://github.com/peti/shotcut/commit/038f6839298fc1e9e80ddf84fe168a78118bc625.patch"; - sha256 = "153z1g6criszd6gdkw4f5zk0gmh0jar6l2g8fzwjhhcvkdz30vbp"; - }; - fixVaapiRendering2 = fetchpatch { - url = "https://github.com/peti/shotcut/commit/653c485f92d2847fdac517e3f797c9254826ffab.patch"; - sha256 = "1qd0zgyahda72xh3avlg7lg0jq94wq5847154qlrgzj8b4n7vizw"; - }; -in +assert stdenv.lib.versionAtLeast libmlt.version "6.18.0"; +assert stdenv.lib.versionAtLeast mlt.version "6.18.0"; mkDerivation rec { pname = "shotcut"; - version = "19.09.14"; + version = "19.12.31"; src = fetchFromGitHub { owner = "mltframework"; repo = "shotcut"; rev = "v${version}"; - sha256 = "1cl8ba1n0h450r4n5mfqmyjaxvczs3m19blwxslqskvmxy5my3cn"; + sha256 = "1vwgah8pp2kbd0iaz952d3bwxphk06yxqc0pi4hk1mklkh87qzm9"; }; - patches = [ fixVaapiRendering1 fixVaapiRendering2 ]; - enableParallelBuilding = true; nativeBuildInputs = [ pkgconfig qmake ]; buildInputs = [ @@ -74,7 +60,7 @@ mkDerivation rec { ''; homepage = https://shotcut.org; license = licenses.gpl3; - maintainers = with maintainers; [ goibhniu woffs ]; + maintainers = with maintainers; [ goibhniu woffs peti ]; platforms = platforms.linux; }; } diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index ea742c3e2594f..ccd570427caee 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -96472,7 +96472,7 @@ self: { "git-annex" = callPackage ({ mkDerivation, aeson, async, attoparsec, aws, base, blaze-builder - , bloomfilter, bup, byteable, bytestring, Cabal, case-insensitive + , bloomfilter, byteable, bytestring, Cabal, case-insensitive , clientsession, concurrent-output, conduit, connection, containers , crypto-api, cryptonite, curl, data-default, DAV, dbus, deepseq , directory, disk-free-space, dlist, edit-distance, exceptions @@ -96524,7 +96524,7 @@ self: { wai-extra warp warp-tls yesod yesod-core yesod-form yesod-static ]; executableSystemDepends = [ - bup curl git gnupg lsof openssh perl rsync wget which + curl git gnupg lsof openssh perl rsync wget which ]; preConfigure = "export HOME=$TEMPDIR; patchShebangs ."; postBuild = '' @@ -96537,7 +96537,7 @@ self: { description = "manage files with git, without checking their contents into git"; license = stdenv.lib.licenses.agpl3; maintainers = with stdenv.lib.maintainers; [ peti ]; - }) {inherit (pkgs) bup; inherit (pkgs) curl; inherit (pkgs) git; + }) {inherit (pkgs) curl; inherit (pkgs) git; inherit (pkgs) gnupg; inherit (pkgs) lsof; inherit (pkgs) openssh; inherit (pkgs) perl; inherit (pkgs) rsync; inherit (pkgs) wget; inherit (pkgs) which;}; diff --git a/pkgs/development/libraries/libmad/default.nix b/pkgs/development/libraries/libmad/default.nix index 9d935daddadb1..24de4aa2e4a00 100644 --- a/pkgs/development/libraries/libmad/default.nix +++ b/pkgs/development/libraries/libmad/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { ++ stdenv.lib.optionals stdenv.cc.isClang [ (fetchpatch { url = "https://github.com/KaOSx/main/raw/1270b8080f37fb6cca562829a521991800b0a497/libmad/optimize.diff"; - sha256 = "1wp60ywzk6nmxc3kq3v6i8b7s4cibvf5cjir859zv10y5aa1d0pk"; + sha256 = "0hcxzz9ql1fizyqbsgdchdwi7bvchfr72172j43hpyj53p0yabc6"; }) ]; diff --git a/pkgs/development/libraries/mlt/default.nix b/pkgs/development/libraries/mlt/default.nix index 5099991c117f3..b56e33e402410 100644 --- a/pkgs/development/libraries/mlt/default.nix +++ b/pkgs/development/libraries/mlt/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "mlt"; - version = "6.16.0"; + version = "6.18.0"; src = fetchFromGitHub { owner = "mltframework"; repo = "mlt"; rev = "v${version}"; - sha256 = "1362fv63p34kza9v4b71b6wakgvsa2vdx9y0g28x3yh4cp4k97kx"; + sha256 = "0iiqym15n8kbnjzj0asmm86gs23yykz0va5b475cc4v2vv5admgx"; }; buildInputs = [ @@ -24,8 +24,7 @@ stdenv.mkDerivation rec { # Mostly taken from: # http://www.kdenlive.org/user-manual/downloading-and-installing-kdenlive/installing-source/installing-mlt-rendering-engine configureFlags = [ - "--avformat-swscale" "--enable-gpl" "--enable-gpl" "--enable-gpl3" - "--enable-opengl" + "--avformat-swscale" "--enable-gpl" "--enable-gpl3" "--enable-opengl" ]; enableParallelBuilding = true; @@ -43,7 +42,7 @@ stdenv.mkDerivation rec { description = "Open source multimedia framework, designed for television broadcasting"; homepage = https://www.mltframework.org; license = licenses.gpl3; - maintainers = [ maintainers.tohl ]; + maintainers = with maintainers; [ tohl peti ]; platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/mlt/qt-5.nix b/pkgs/development/libraries/mlt/qt-5.nix index 0e3750df415af..4d7ecd92e6185 100644 --- a/pkgs/development/libraries/mlt/qt-5.nix +++ b/pkgs/development/libraries/mlt/qt-5.nix @@ -7,13 +7,13 @@ let inherit (stdenv.lib) getDev; in stdenv.mkDerivation rec { pname = "mlt"; - version = "6.16.0"; + version = "6.18.0"; src = fetchFromGitHub { owner = "mltframework"; repo = "mlt"; rev = "v${version}"; - sha256 = "1362fv63p34kza9v4b71b6wakgvsa2vdx9y0g28x3yh4cp4k97kx"; + sha256 = "0iiqym15n8kbnjzj0asmm86gs23yykz0va5b475cc4v2vv5admgx"; }; buildInputs = [ diff --git a/pkgs/development/libraries/ntl/default.nix b/pkgs/development/libraries/ntl/default.nix index 699931b686b42..a4d1e275a0a81 100644 --- a/pkgs/development/libraries/ntl/default.nix +++ b/pkgs/development/libraries/ntl/default.nix @@ -14,11 +14,11 @@ assert withGf2x -> gf2x != null; stdenv.mkDerivation rec { pname = "ntl"; - version = "11.4.2"; + version = "11.4.3"; src = fetchurl { url = "http://www.shoup.net/ntl/ntl-${version}.tar.gz"; - sha256 = "11r3f37psdbjw926kf6bn5bp69aj88f5cchvv1xh2bhrcjdp4r1b"; + sha256 = "1lisp3064rch3jaa2wrhy1s9kll7i3ka3d0y6lj6l3l4ckfcrhdp"; }; buildInputs = [ diff --git a/pkgs/development/libraries/science/math/clmagma/default.nix b/pkgs/development/libraries/science/math/clmagma/default.nix new file mode 100644 index 0000000000000..b5c59a83277dd --- /dev/null +++ b/pkgs/development/libraries/science/math/clmagma/default.nix @@ -0,0 +1,75 @@ +{ stdenv, fetchurl, gfortran, opencl-headers, clblas, ocl-icd, mkl, intel-ocl }: + +with stdenv.lib; + +let + version = "1.3.0"; + incfile = builtins.toFile "make.inc.custom" '' + CC = g++ + FORT = gfortran + + ARCH = ar + ARCHFLAGS = cr + RANLIB = ranlib + + OPTS = -fPIC -O3 -DADD_ -Wall + FOPTS = -fPIC -O3 -DADD_ -Wall -x f95-cpp-input + F77OPTS = -fPIC -O3 -DADD_ -Wall + LDOPTS = -fPIC + + -include make.check-mkl + -include make.check-clblas + + # Gnu mkl is not available I guess? + #LIB = -lmkl_gf_lp64 -lmkl_gnu_thread -lmkl_core -lpthread -lm -fopenmp + LIB = -lmkl_intel_lp64 -lmkl_intel_thread -lmkl_core -liomp5 -lm -fopenmp + LIB += -lclBLAS -lOpenCL + + LIBDIR = -L$(MKLROOT)/lib/intel64 \ + -L$(MKLROOT)/../compiler/lib/intel64 \ + -L$(clBLAS)/lib64 + + INC = -I$(clBLAS)/include + #-I$(AMDAPP)/include + ''; +in stdenv.mkDerivation { + name = "clmagma-${version}"; + src = fetchurl { + url = "http://icl.cs.utk.edu/projectsfiles/magma/cl/clmagma-${version}.tar.gz"; + sha256 = "1n27ny0xhwirw2ydn46pfcwy53gzia9zbam4irx44fd4d7f9ydv7"; + name = "clmagma-${version}.tar.gz"; + }; + + buildInputs = [ + gfortran + clblas + opencl-headers + ocl-icd + mkl + intel-ocl + ]; + + enableParallelBuilding=true; + + MKLROOT = "${mkl}"; + clBLAS = "${clblas}"; + + # Otherwise build looks for it in /run/opengl-driver/etc/OpenCL/vendors, + # which is not available. + OPENCL_VENDOR_PATH="${intel-ocl}/etc/OpenCL/vendors"; + + preBuild = '' + # By default it tries to use GPU, and thus fails for CPUs + sed -i "s/CL_DEVICE_TYPE_GPU/CL_DEVICE_TYPE_DEFAULT/" interface_opencl/clmagma_runtime.cpp + sed -i "s%/usr/local/clmagma%/$out%" Makefile.internal + cp ${incfile} make.inc + ''; + + meta = with stdenv.lib; { + description = "Matrix Algebra on GPU and Multicore Architectures, OpenCL port"; + license = licenses.bsd3; + homepage = http://icl.cs.utk.edu/magma/index.html; + platforms = platforms.linux; + maintainers = with maintainers; [ volhovm ]; + }; +} diff --git a/pkgs/development/libraries/science/math/mkl/default.nix b/pkgs/development/libraries/science/math/mkl/default.nix index 382d2c303e3c9..604413c96d8a2 100644 --- a/pkgs/development/libraries/science/math/mkl/default.nix +++ b/pkgs/development/libraries/science/math/mkl/default.nix @@ -1,4 +1,4 @@ -{ stdenvNoCC, fetchurl, rpmextract, undmg, darwin }: +{ stdenvNoCC, fetchurl, rpmextract, undmg, darwin, enableStatic ? false }: /* For details on using mkl as a blas provider for python packages such as numpy, numexpr, scipy, etc., see the Python section of the NixPkgs manual. @@ -46,12 +46,28 @@ in stdenvNoCC.mkDerivation { tar xzvf $f done '' else '' - rpmextract rpm/intel-mkl-cluster-rt-${rpm-ver}.x86_64.rpm - rpmextract rpm/intel-mkl-common-c-${rpm-ver}.noarch.rpm + # Common stuff rpmextract rpm/intel-mkl-core-${rpm-ver}.x86_64.rpm + rpmextract rpm/intel-mkl-common-c-${rpm-ver}.noarch.rpm + rpmextract rpm/intel-mkl-common-f-${rpm-ver}.noarch.rpm + + # Dynamic libraries + rpmextract rpm/intel-mkl-cluster-rt-${rpm-ver}.x86_64.rpm rpmextract rpm/intel-mkl-core-rt-${rpm-ver}.x86_64.rpm + rpmextract rpm/intel-mkl-gnu-f-rt-${rpm-ver}.x86_64.rpm + rpmextract rpm/intel-mkl-gnu-rt-${rpm-ver}.x86_64.rpm + + # Intel OpenMP runtime rpmextract rpm/intel-openmp-${openmp-ver}.x86_64.rpm - ''; + '' + (if enableStatic then '' + # Static libraries + rpmextract rpm/intel-mkl-cluster-${rpm-ver}.x86_64.rpm + rpmextract rpm/intel-mkl-gnu-${rpm-ver}.x86_64.rpm + rpmextract rpm/intel-mkl-gnu-f-${rpm-ver}.x86_64.rpm + '' else '' + # Take care of installing dynamic-only PkgConfig files during the installPhase + '' + ); installPhase = '' for f in $(find . -name 'mkl*.pc') ; do @@ -80,16 +96,21 @@ in stdenvNoCC.mkDerivation { cp -r compilers_and_libraries_${version}/mac/mkl/bin/pkgconfig/* $out/lib/pkgconfig '' else '' mkdir -p $out/lib + cp license.txt $out/lib/ cp -r opt/intel/compilers_and_libraries_${version}/linux/mkl/include $out/ + mkdir -p $out/lib/pkgconfig + '') + + (if enableStatic then '' cp -r opt/intel/compilers_and_libraries_${version}/linux/compiler/lib/intel64_lin/* $out/lib/ cp -r opt/intel/compilers_and_libraries_${version}/linux/mkl/lib/intel64_lin/* $out/lib/ - cp license.txt $out/lib/ - - mkdir -p $out/lib/pkgconfig cp -r opt/intel/compilers_and_libraries_${version}/linux/mkl/bin/pkgconfig/* $out/lib/pkgconfig - ''); + '' else '' + cp -r opt/intel/compilers_and_libraries_${version}/linux/compiler/lib/intel64_lin/*.so* $out/lib/ + cp -r opt/intel/compilers_and_libraries_${version}/linux/mkl/lib/intel64_lin/*.so* $out/lib/ + cp -r opt/intel/compilers_and_libraries_${version}/linux/mkl/bin/pkgconfig/*dynamic*.pc $out/lib/pkgconfig + ''); # fixDarwinDylibName fails for libmkl_cdft_core.dylib because the # larger updated load commands do not fit. Use install_name_tool diff --git a/pkgs/development/libraries/unicorn-emu/default.nix b/pkgs/development/libraries/unicorn-emu/default.nix index 96f318ff0ef50..7917b69540648 100644 --- a/pkgs/development/libraries/unicorn-emu/default.nix +++ b/pkgs/development/libraries/unicorn-emu/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; configurePhase = '' patchShebangs make.sh ''; - buildPhase = '' ./make.sh ''; + buildPhase = '' ./make.sh '' + stdenv.lib.optionalString stdenv.isDarwin "macos-universal-no"; installPhase = '' env PREFIX=$out ./make.sh install ''; nativeBuildInputs = [ pkgconfig python ]; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { description = "Lightweight multi-platform CPU emulator library"; homepage = "http://www.unicorn-engine.org"; license = stdenv.lib.licenses.bsd3; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.unix; maintainers = [ stdenv.lib.maintainers.thoughtpolice ]; }; } diff --git a/pkgs/development/ocaml-modules/csv/default.nix b/pkgs/development/ocaml-modules/csv/default.nix index bfddc8d1c662d..05a1861280403 100644 --- a/pkgs/development/ocaml-modules/csv/default.nix +++ b/pkgs/development/ocaml-modules/csv/default.nix @@ -2,11 +2,11 @@ buildDunePackage rec { pname = "csv"; - version = "2.2"; + version = "2.4"; src = fetchurl { url = "https://github.com/Chris00/ocaml-${pname}/releases/download/${version}/csv-${version}.tbz"; - sha256 = "1llwjdi14vvfy4966crapibq0djii71x47b0yxhjcl5jw4xnsaha"; + sha256 = "13m9n8mdss6jfbiw7d5bybxn4n85vmg4zw7dc968qrgjfy0w9zhk"; }; meta = { diff --git a/pkgs/development/python-modules/azure-identity/default.nix b/pkgs/development/python-modules/azure-identity/default.nix new file mode 100644 index 0000000000000..e4b894eca64b2 --- /dev/null +++ b/pkgs/development/python-modules/azure-identity/default.nix @@ -0,0 +1,53 @@ +{ buildPythonPackage +, fetchPypi +, isPy38 +, lib + +# pythonPackages +, azure-common +, azure-core +, azure-nspkg +, cryptography +, mock +, msal +, msal-extensions +, msrest +, msrestazure +}: + +buildPythonPackage rec { + pname = "azure-identity"; + version = "1.1.0"; + disabled = isPy38; + + src = fetchPypi { + inherit pname version; + extension = "zip"; + sha256 = "1xn4nwi4vly8n3mmphv0wbdg9k55gsgmk3fdwma8rm3m3c7593hc"; + }; + + propagatedBuildInputs = [ + azure-common + azure-core + azure-nspkg + cryptography + mock + msal + msal-extensions + msrest + msrestazure + ]; + + # Requires checkout from mono-repo and a mock account: + # https://github.com/Azure/azure-sdk-for-python/blob/master/sdk/identity/tests.yml + doCheck = false; + + meta = with lib; { + description = "Microsoft Azure Identity Library for Python"; + homepage = "https://github.com/Azure/azure-sdk-for-python"; + license = licenses.mit; + maintainers = with maintainers; [ + kamadorueda + ]; + }; +} diff --git a/pkgs/development/python-modules/azure-keyvault-nspkg/default.nix b/pkgs/development/python-modules/azure-keyvault-nspkg/default.nix new file mode 100644 index 0000000000000..fd3f3c0284f97 --- /dev/null +++ b/pkgs/development/python-modules/azure-keyvault-nspkg/default.nix @@ -0,0 +1,35 @@ +{ buildPythonPackage +, fetchPypi +, lib + +# pythonPackages +, azure-nspkg +}: + +buildPythonPackage rec { + pname = "azure-keyvault-nspkg"; + version = "1.0.0"; + + src = fetchPypi { + inherit pname version; + extension = "zip"; + sha256 = "0hdnd6124hx7s16z1pssmq5m5mqqqz8s38ixl9aayv4wmf5bhs5c"; + }; + + propagatedBuildInputs = [ + azure-nspkg + ]; + + # Just a namespace package, no tests exist: + # https://github.com/Azure/azure-sdk-for-python/blob/master/sdk/keyvault/tests.yml + doCheck = false; + + meta = with lib; { + description = "Microsoft Azure Key Vault Namespace Package [Internal]"; + homepage = "https://github.com/Azure/azure-sdk-for-python"; + license = licenses.mit; + maintainers = with maintainers; [ + kamadorueda + ]; + }; +} diff --git a/pkgs/development/python-modules/bandit/default.nix b/pkgs/development/python-modules/bandit/default.nix new file mode 100644 index 0000000000000..64ef8ec53fa5f --- /dev/null +++ b/pkgs/development/python-modules/bandit/default.nix @@ -0,0 +1,44 @@ +{ buildPythonPackage +, fetchPypi +, lib +, isPy3k + +# pythonPackages +, GitPython +, pbr +, pyyaml +, six +, stevedore +}: + +buildPythonPackage rec { + pname = "bandit"; + version = "1.6.2"; + disabled = !isPy3k; + + src = fetchPypi { + inherit pname version; + sha256 = "0rb034c99pyhb4a60z7f2kz40cjydhm8m9v2blaal1rmhlam7rs1"; + }; + + propagatedBuildInputs = [ + GitPython + pbr + pyyaml + six + stevedore + ]; + + # Framework is Tox, tox performs 'pip install' inside the virtual-env + # and this requires Network Connectivity + doCheck = false; + + meta = { + description = "Security oriented static analyser for python code"; + homepage = "https://bandit.readthedocs.io/en/latest/"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ + kamadorueda + ]; + }; +} diff --git a/pkgs/development/python-modules/cachetools/default.nix b/pkgs/development/python-modules/cachetools/default.nix index dabd5cee60e97..30f0d9132bb17 100644 --- a/pkgs/development/python-modules/cachetools/default.nix +++ b/pkgs/development/python-modules/cachetools/default.nix @@ -3,7 +3,6 @@ buildPythonPackage rec { pname = "cachetools"; version = "4.0.0"; - disabled = isPy27; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/graph-tool/2.x.x.nix b/pkgs/development/python-modules/graph-tool/2.x.x.nix index 4b0e665de0984..e069c8f8c7b6b 100644 --- a/pkgs/development/python-modules/graph-tool/2.x.x.nix +++ b/pkgs/development/python-modules/graph-tool/2.x.x.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, python, cairomm, sparsehash, pycairo, autoreconfHook -, pkgconfig, boost, expat, scipy, cgal, gmp, mpfr +, pkg-config, boost, expat, scipy, cgal, gmp, mpfr , gobject-introspection, pygobject3, gtk3, matplotlib, ncurses , buildPythonPackage , fetchpatch @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "graph-tool"; format = "other"; - version = "2.27"; + version = "2.29"; meta = with stdenv.lib; { description = "Python module for manipulation and statistical analysis of graphs"; @@ -21,25 +21,9 @@ buildPythonPackage rec { src = fetchurl { url = "https://downloads.skewed.de/graph-tool/graph-tool-${version}.tar.bz2"; - sha256 = "04s31qwlfcl7bwsggnic8gqcqmx2wsrmfw77nf7vzgnz42bwch27"; + sha256 = "0ykzcnqc5bhqb4xlf9ahpp807vj5868xdrmcj6fggqnnpqv4633c"; }; - patches = [ - # fix build with cgal 4.13 (https://git.skewed.de/count0/graph-tool/issues/509) - (fetchpatch { - name = "cgal-4.13.patch"; - url = "https://git.skewed.de/count0/graph-tool/commit/aa39e4a6b42d43fac30c841d176c75aff92cc01a.patch"; - sha256 = "1578inb4jqwq2fhhwscn5z95nzmaxvmvk30nzs5wirr26iznap4m"; - }) - ] ++ (lib.optionals (pythonAtLeast "3.7") [ - # # python 3.7 compatibility (`async` is now reserved) - (fetchpatch { - name = "async-reserved.patch"; - url = "https://git.skewed.de/count0/graph-tool/commit/0407f41a35b6be7c670927fb5dc578cbd0e88be4.patch"; - sha256 = "1fklznhmfvbb3ykwzyf8p2hiczby6y7r0xnkkjl2jkxlvr24000q"; - }) - ]); - configureFlags = [ "--with-python-module-path=$(out)/${python.sitePackages}" "--with-boost-libdir=${boost}/lib" @@ -48,7 +32,7 @@ buildPythonPackage rec { "--enable-openmp" ]; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ ncurses ]; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/ipykernel/default.nix b/pkgs/development/python-modules/ipykernel/default.nix index f4e7a10907451..5202483ab326f 100644 --- a/pkgs/development/python-modules/ipykernel/default.nix +++ b/pkgs/development/python-modules/ipykernel/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { }) ]; - checkInputs = [ pytestCheckHook nose ]; + checkInputs = [ pytestCheckHook nose flaky ]; dontUseSetuptoolsCheck = true; preCheck = '' export HOME=$(mktemp -d) diff --git a/pkgs/development/python-modules/javaobj-py3/default.nix b/pkgs/development/python-modules/javaobj-py3/default.nix new file mode 100644 index 0000000000000..54656e1ea993c --- /dev/null +++ b/pkgs/development/python-modules/javaobj-py3/default.nix @@ -0,0 +1,26 @@ +{ buildPythonPackage +, fetchPypi +, lib +}: + +buildPythonPackage rec { + pname = "javaobj-py3"; + version = "0.3.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "0j9532i7bnjd0v4a8c36mjj9rsdnbmckk65dh9sbmvnhy3j6jx55"; + }; + + # Tests assume network connectivity + doCheck = false; + + meta = { + description = "Module for serializing and de-serializing Java objects"; + homepage = "https://github.com/tcalmant/python-javaobj"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ + kamadorueda + ]; + }; +} diff --git a/pkgs/development/python-modules/loguru/default.nix b/pkgs/development/python-modules/loguru/default.nix index ed2c8992b7d22..ceb9f841a4616 100644 --- a/pkgs/development/python-modules/loguru/default.nix +++ b/pkgs/development/python-modules/loguru/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi, isPy27, pytest, colorama }: +{ stdenv, buildPythonPackage, fetchPypi, isPy27, colorama, pytestCheckHook }: buildPythonPackage rec { pname = "loguru"; @@ -10,12 +10,12 @@ buildPythonPackage rec { sha256 = "d5ddf363b7e0e562652f283f74a89bf35601baf16b70f2cd2736a2f8c6638748"; }; - checkInputs = [ pytest colorama ]; - checkPhase = '' - pytest -k 'not test_time_rotation_reopening' - ''; + checkInputs = [ pytestCheckHook colorama ]; - meta = with lib; { + disabledTests = [ "test_time_rotation_reopening" "test_file_buffering" ] + ++ stdenv.lib.optionals stdenv.isDarwin [ "test_rotation_and_retention" "test_rotation_and_retention_timed_file" "test_renaming" ]; + + meta = with stdenv.lib; { homepage = https://github.com/Delgan/loguru; description = "Python logging made (stupidly) simple"; license = licenses.mit; diff --git a/pkgs/development/python-modules/msal-extensions/default.nix b/pkgs/development/python-modules/msal-extensions/default.nix new file mode 100644 index 0000000000000..c866382b10337 --- /dev/null +++ b/pkgs/development/python-modules/msal-extensions/default.nix @@ -0,0 +1,35 @@ +{ buildPythonPackage +, fetchPypi +, lib + +# pythonPackages +, msal +, portalocker +}: + +buildPythonPackage rec { + pname = "msal-extensions"; + version = "0.1.3"; + + src = fetchPypi { + inherit pname version; + sha256 = "1p05cbfksnhijx1il7s24js2ydzgxbpiasf607qdpb5sljlp3qar"; + }; + + propagatedBuildInputs = [ + msal + portalocker + ]; + + # No tests found + doCheck = false; + + meta = with lib; { + description = "The Microsoft Authentication Library Extensions (MSAL-Extensions) for Python"; + homepage = "https://github.com/AzureAD/microsoft-authentication-library-for-python"; + license = licenses.mit; + maintainers = with maintainers; [ + kamadorueda + ]; + }; +} diff --git a/pkgs/development/python-modules/msal/default.nix b/pkgs/development/python-modules/msal/default.nix new file mode 100644 index 0000000000000..6f2566c2c1c06 --- /dev/null +++ b/pkgs/development/python-modules/msal/default.nix @@ -0,0 +1,36 @@ +{ buildPythonPackage +, fetchPypi +, lib + +# pythonPackages +, pyjwt +, requests +}: + +buildPythonPackage rec { + pname = "msal"; + version = "1.0.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "0h33wayvakggr684spdyhiqvrwraavcbk3phmcbavb3zqxd3zgpc"; + }; + + propagatedBuildInputs = [ + pyjwt + requests + ]; + + # Tests assume Network Connectivity: + # https://github.com/AzureAD/microsoft-authentication-library-for-python/blob/e2958961e8ec16d0af4199f60c36c3f913497e48/tests/test_authority.py#L73 + doCheck = false; + + meta = with lib; { + description = "The Microsoft Authentication Library (MSAL) for Python library enables your app to access the Microsoft Cloud by supporting authentication of users with Microsoft Azure Active Directory accounts (AAD) and Microsoft Accounts (MSA) using industry standard OAuth2 and OpenID Connect"; + homepage = "https://github.com/AzureAD/microsoft-authentication-library-for-python"; + license = licenses.mit; + maintainers = with maintainers; [ + kamadorueda + ]; + }; +} diff --git a/pkgs/development/python-modules/names/default.nix b/pkgs/development/python-modules/names/default.nix new file mode 100644 index 0000000000000..b65bb463475bc --- /dev/null +++ b/pkgs/development/python-modules/names/default.nix @@ -0,0 +1,36 @@ +{ buildPythonPackage +, fetchFromGitHub +, lib + +# pythonPackages +, pytest +}: + +buildPythonPackage rec { + pname = "names"; + version = "0.3.0"; + + src = fetchFromGitHub { + owner = "treyhunner"; + repo = pname; + rev = version; + sha256 = "0jfn11bl05k3qkqw0f4vi2i2lhllxdrbb1732qiisdy9fbvv8611"; + }; + + checkInputs = [ + pytest + ]; + + checkPhase = '' + pytest + ''; + + meta = { + description = "Generate random names"; + homepage = "https://github.com/treyhunner/names"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ + kamadorueda + ]; + }; +} diff --git a/pkgs/development/python-modules/notedown/default.nix b/pkgs/development/python-modules/notedown/default.nix new file mode 100644 index 0000000000000..c1dacc84da0c7 --- /dev/null +++ b/pkgs/development/python-modules/notedown/default.nix @@ -0,0 +1,37 @@ +{ buildPythonPackage +, fetchPypi +, lib +, nbconvert +, nbformat +, notebook +, pandoc-attributes +, six +}: + +buildPythonPackage rec { + pname = "notedown"; + version = "1.5.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "36e033ebbbe5aca0fab031ffaf3611d5bc5c50237df68ff81bb95f8be353a1ee"; + }; + + propagatedBuildInputs = [ + notebook + nbconvert + nbformat + pandoc-attributes + six + ]; + + # No tests in pypi source + doCheck = false; + + meta = { + homepage = https://github.com/aaren/notedown; + description = "Convert IPython Notebooks to markdown (and back)"; + license = lib.licenses.bsd2; + maintainers = with lib.maintainers; [ vcanadi ]; + }; +} diff --git a/pkgs/development/python-modules/oyaml/default.nix b/pkgs/development/python-modules/oyaml/default.nix new file mode 100644 index 0000000000000..e445086d0c76f --- /dev/null +++ b/pkgs/development/python-modules/oyaml/default.nix @@ -0,0 +1,41 @@ +{ buildPythonPackage +, fetchFromGitHub +, lib + +# pythonPackages +, pytest +, pyyaml +}: + +buildPythonPackage rec { + pname = "oyaml"; + version = "0.9"; + + src = fetchFromGitHub { + owner = "wimglenn"; + repo = "oyaml"; + rev = "v${version}"; + sha256 = "13xjdym0p0jh9bvyjsbhi4yznlp68bamy3xi4w5wpcrzlcq6cfh9"; + }; + + propagatedBuildInputs = [ + pyyaml + ]; + + checkInputs = [ + pytest + ]; + + checkPhase = '' + pytest test_oyaml.py + ''; + + meta = { + description = "Ordered YAML: drop-in replacement for PyYAML which preserves dict ordering"; + homepage = "https://github.com/wimglenn/oyaml"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ + kamadorueda + ]; + }; +} diff --git a/pkgs/development/python-modules/pandoc-attributes/default.nix b/pkgs/development/python-modules/pandoc-attributes/default.nix new file mode 100644 index 0000000000000..8b5652bfb5441 --- /dev/null +++ b/pkgs/development/python-modules/pandoc-attributes/default.nix @@ -0,0 +1,29 @@ +{ buildPythonPackage +, fetchPypi +, lib +, pandocfilters +}: + +buildPythonPackage rec { + pname = "pandoc-attributes"; + version = "0.1.7"; + + src = fetchPypi { + inherit pname version; + sha256 = "69221502dac74f5df1317011ce62c85a83eef5da3b71c63b1908e98224304a8c"; + }; + + propagatedBuildInputs = [ + pandocfilters + ]; + + # No tests in pypi source + doCheck = false; + + meta = { + homepage = https://github.com/aaren/pandoc-attributes; + description = "An Attribute class to be used with pandocfilters"; + license = lib.licenses.bsd2; + maintainers = with lib.maintainers; [ vcanadi ]; + }; +} diff --git a/pkgs/development/python-modules/pybind11/default.nix b/pkgs/development/python-modules/pybind11/default.nix index 76e60fda86a87..a8c66a49fb8ce 100644 --- a/pkgs/development/python-modules/pybind11/default.nix +++ b/pkgs/development/python-modules/pybind11/default.nix @@ -1,4 +1,5 @@ -{ lib +{ stdenv +, lib , buildPythonPackage , fetchFromGitHub , fetchpatch @@ -28,7 +29,7 @@ buildPythonPackage rec { cmakeFlags = [ "-DEIGEN3_INCLUDE_DIR=${eigen}/include/eigen3" - ] ++ lib.optionals (python.isPy3k) [ + ] ++ lib.optionals (python.isPy3k && !stdenv.cc.isClang) [ # Enable some tests only on Python 3. The "test_string_view" test # 'testTypeError: string_view16_chars(): incompatible function arguments' # fails on Python 2. diff --git a/pkgs/development/python-modules/pyjks/default.nix b/pkgs/development/python-modules/pyjks/default.nix new file mode 100644 index 0000000000000..d9e2074fb28a0 --- /dev/null +++ b/pkgs/development/python-modules/pyjks/default.nix @@ -0,0 +1,37 @@ +{ buildPythonPackage +, fetchPypi +, lib + +# pythonPackages +, pyasn1-modules +, pycryptodomex +, twofish +}: + +buildPythonPackage rec { + pname = "pyjks"; + version = "19.0.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "06h1cybsdj2wi0jf7igbr722xfm87crqn4g7m3bgrpxwi41b9rcw"; + }; + + propagatedBuildInputs = [ + pyasn1-modules + pycryptodomex + twofish + ]; + + # Tests assume network connectivity + doCheck = false; + + meta = { + description = "Pure-Python Java Keystore (JKS) library"; + homepage = "https://github.com/kurtbrose/pyjks"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ + kamadorueda + ]; + }; +} diff --git a/pkgs/development/python-modules/pysmb/default.nix b/pkgs/development/python-modules/pysmb/default.nix new file mode 100644 index 0000000000000..07de522f79621 --- /dev/null +++ b/pkgs/development/python-modules/pysmb/default.nix @@ -0,0 +1,36 @@ +{ buildPythonPackage +, fetchPypi +, lib + +# pythonPackages +, pyasn1 +}: + +buildPythonPackage rec { + pname = "pysmb"; + version = "1.1.28"; + + src = fetchPypi { + inherit pname version; + format = "setuptools"; + extension = "zip"; + sha256 = "0x44yq440c1j3xnl7qigz2fpfzhx68n9mbj7ps7rd0kj0plcmr2q"; + }; + + propagatedBuildInputs = [ + pyasn1 + ]; + + # Tests require Network Connectivity and a server up and running + # https://github.com/miketeo/pysmb/blob/master/python3/tests/README_1st.txt + doCheck = false; + + meta = { + description = "Experimental SMB/CIFS library written in Python to support file sharing between Windows and Linux machines"; + homepage = "https://miketeo.net/wp/index.php/projects/pysmb"; + license = lib.licenses.zlib; + maintainers = with lib.maintainers; [ + kamadorueda + ]; + }; +} diff --git a/pkgs/development/python-modules/requirements-detector/default.nix b/pkgs/development/python-modules/requirements-detector/default.nix new file mode 100644 index 0000000000000..a0f312389f1a8 --- /dev/null +++ b/pkgs/development/python-modules/requirements-detector/default.nix @@ -0,0 +1,38 @@ +{ buildPythonPackage +, fetchFromGitHub +, isPy27 +, lib + +# pythonPackages +, pytest +}: + +buildPythonPackage rec { + pname = "requirements-detector"; + version = "0.6"; + disabled = isPy27; + + src = fetchFromGitHub { + owner = "yuvadm"; + repo = pname; + rev = version; + sha256 = "15s0n1lhkz0zwi33waqkkjipal3f7s45rxsj1bw89xpr4dj87qx5"; + }; + + checkInputs = [ + pytest + ]; + + checkPhase = '' + pytest + ''; + + meta = { + description = "Python tool to find and list requirements of a Python project"; + homepage = "https://github.com/landscapeio/requirements-detector"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ + kamadorueda + ]; + }; +} diff --git a/pkgs/development/python-modules/sphinxcontrib-tikz/binary-paths.patch b/pkgs/development/python-modules/sphinxcontrib-tikz/binary-paths.patch new file mode 100644 index 0000000000000..847a6e076918b --- /dev/null +++ b/pkgs/development/python-modules/sphinxcontrib-tikz/binary-paths.patch @@ -0,0 +1,22 @@ +diff --git a/sphinxcontrib/tikz.py b/sphinxcontrib/tikz.py +index ee21113..a4f4589 100644 +--- a/sphinxcontrib/tikz.py ++++ b/sphinxcontrib/tikz.py +@@ -242,7 +242,7 @@ def render_tikz(self, node, libs='', stringsubst=False): + tf.write(latex) + tf.close() + +- system([self.builder.config.latex_engine, '--interaction=nonstopmode', ++ system(['@texLive@/bin/pdflatex', '--interaction=nonstopmode', + 'tikz-%s.tex' % shasum], + self.builder) + +@@ -281,7 +281,7 @@ def render_tikz(self, node, libs='', stringsubst=False): + '-sOutputFile=%s' % outfn, '-r' + resolution + 'x' + resolution, + '-f', 'tikz-%s.pdf' % shasum], self.builder) + elif self.builder.config.tikz_proc_suite == "pdf2svg": +- system(['pdf2svg', 'tikz-%s.pdf' % shasum, outfn], self.builder) ++ system(['@pdf2svg@/bin/pdf2svg', 'tikz-%s.pdf' % shasum, outfn], self.builder) + else: + self.builder._tikz_warned = True + raise TikzExtError('Error (tikz extension): Invalid configuration ' diff --git a/pkgs/development/python-modules/sphinxcontrib-tikz/default.nix b/pkgs/development/python-modules/sphinxcontrib-tikz/default.nix new file mode 100644 index 0000000000000..15585679a2939 --- /dev/null +++ b/pkgs/development/python-modules/sphinxcontrib-tikz/default.nix @@ -0,0 +1,38 @@ +{ lib +, substituteAll +, buildPythonPackage +, fetchPypi +, sphinx +, pdf2svg +, texLive +}: + +buildPythonPackage rec { + pname = "sphinxcontrib-tikz"; + version = "0.4.6"; + + src = fetchPypi { + inherit pname version; + sha256 = "4f362b11e3c2bd17d5f0f07fec03917c16fc5bbcda6fe31ee137c547ed6b03a3"; + }; + + patches = [ + (substituteAll { + src = ./binary-paths.patch; + inherit texLive pdf2svg; + }) + ]; + + propagatedBuildInputs = [ sphinx ]; + + # no tests in package + doCheck = false; + + meta = with lib; { + description = "TikZ extension for Sphinx"; + homepage = https://bitbucket.org/philexander/tikz; + maintainers = with maintainers; [ costrouc ]; + license = licenses.bsd3; + }; + +} diff --git a/pkgs/development/python-modules/twofish/default.nix b/pkgs/development/python-modules/twofish/default.nix new file mode 100644 index 0000000000000..1fe541b072907 --- /dev/null +++ b/pkgs/development/python-modules/twofish/default.nix @@ -0,0 +1,33 @@ +{ buildPythonPackage +, fetchPypi +, lib + +# pythonPackages +, javaobj-py3 +}: + +buildPythonPackage rec { + pname = "twofish"; + version = "0.3.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "1yihp2n42amrxw0wk9f66llpb3w5kwhgkcdg9krkzcik1nsqp7dh"; + }; + + propagatedBuildInputs = [ + javaobj-py3 + ]; + + # No tests implemented + doCheck = false; + + meta = { + description = "Bindings for the Twofish implementation by Niels Ferguson"; + homepage = "https://github.com/keybase/python-twofish"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ + kamadorueda + ]; + }; +} diff --git a/pkgs/development/python-modules/unicorn/default.nix b/pkgs/development/python-modules/unicorn/default.nix index 725c73960f5d9..86542439439e1 100644 --- a/pkgs/development/python-modules/unicorn/default.nix +++ b/pkgs/development/python-modules/unicorn/default.nix @@ -1,23 +1,23 @@ -{ stdenv, buildPackages, buildPythonPackage, fetchPypi }: +{ stdenv, buildPythonPackage, setuptools, unicorn-emu }: buildPythonPackage rec { pname = "unicorn"; - version = "1.0.1"; + version = stdenv.lib.getVersion unicorn-emu; - src = fetchPypi { - inherit pname version; - sha256 = "0a5b4vh734b3wfkgapzzf8x18rimpmzvwwkly56da84n27wfw9bg"; - }; + src = unicorn-emu.src; + sourceRoot = "unicorn-${version}/bindings/python"; - # needs python2 at build time - PYTHON=buildPackages.python2.interpreter; + prePatch = '' + ln -s ${unicorn-emu}/lib/libunicorn${stdenv.targetPlatform.extensions.sharedLibrary} prebuilt/ + ln -s ${unicorn-emu}/lib/libunicorn.a prebuilt/ + ''; - setupPyBuildFlags = [ "--plat-name" "linux" ]; + propagatedBuildInputs = [ setuptools ]; meta = with stdenv.lib; { - description = "Unicorn CPU emulator engine"; + description = "Python bindings for Unicorn CPU emulator engine"; homepage = "http://www.unicorn-engine.org/"; license = [ licenses.gpl2 ]; - maintainers = [ maintainers.bennofs ]; + maintainers = with maintainers; [ bennofs ris ]; }; } diff --git a/pkgs/development/python-modules/viewstate/default.nix b/pkgs/development/python-modules/viewstate/default.nix new file mode 100644 index 0000000000000..cd64dcc756434 --- /dev/null +++ b/pkgs/development/python-modules/viewstate/default.nix @@ -0,0 +1,36 @@ +{ buildPythonPackage +, fetchFromGitHub +, isPy3k +, lib +, pytest +}: + +buildPythonPackage rec { + pname = "viewstate"; + version = "0.4.3"; + disabled = !isPy3k; + + src = fetchFromGitHub { + owner = "yuvadm"; + repo = pname; + rev = "v${version}"; + sha256 = "15s0n1lhkz0zwi33waqkkjipal3f7s45rxsj1bw89xpr4dj87qx5"; + }; + + checkInputs = [ + pytest + ]; + + checkPhase = '' + pytest + ''; + + meta = { + description = ".NET viewstate decoder"; + homepage = "https://github.com/yuvadm/viewstate"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ + kamadorueda + ]; + }; +} diff --git a/pkgs/development/tools/ocaml/cppo/default.nix b/pkgs/development/tools/ocaml/cppo/default.nix index fc5f2e4a688ba..d6327010e30e4 100644 --- a/pkgs/development/tools/ocaml/cppo/default.nix +++ b/pkgs/development/tools/ocaml/cppo/default.nix @@ -7,8 +7,8 @@ assert stdenv.lib.versionAtLeast ocaml.version "3.12"; let param = if stdenv.lib.versionAtLeast ocaml.version "4.02" then { - version = "1.6.6"; - sha256 = "1smcc0l6fh2n0y6bp96c69j5nw755jja99w0b206wx3yb2m4w2hs"; + version = "1.6.5"; + sha256 = "03c0amszy28shinvz61hm340jz446zz5763a1pdqlza36kwcj0p0"; buildInputs = [ dune ]; extra = { inherit (dune) installPhase; @@ -31,7 +31,7 @@ stdenv.mkDerivation ({ name = "${pname}-${param.version}"; src = fetchFromGitHub { - owner = "ocaml-community"; + owner = "mjambon"; repo = pname; rev = "v${param.version}"; inherit (param) sha256; diff --git a/pkgs/development/tools/poetry/default.nix b/pkgs/development/tools/poetry/default.nix index 7843b1665f1c1..6a4ca2a3057d2 100644 --- a/pkgs/development/tools/poetry/default.nix +++ b/pkgs/development/tools/poetry/default.nix @@ -33,9 +33,13 @@ poetry2nix.mkPoetryApplication { mkdir -p $out/bin cat > $out/bin/poetry <<EOF - #!${runtimeShell} - export PYTHONPATH=$out/lib/${python.libPrefix}/site-packages:$PYTHONPATH - exec ${python.interpreter} -m poetry "\$@" + #!${python.interpreter} + import sys + + if __name__ == '__main__': + sys.path.append("$out/lib/${python.libPrefix}/site-packages") + from poetry.console import main + main() EOF chmod +x $out/bin/poetry diff --git a/pkgs/misc/vim-plugins/overrides.nix b/pkgs/misc/vim-plugins/overrides.nix index a885dc163a18a..4985f02bfb2b8 100644 --- a/pkgs/misc/vim-plugins/overrides.nix +++ b/pkgs/misc/vim-plugins/overrides.nix @@ -17,12 +17,15 @@ # deoplete-khard dependency , khard -# vim-go denpencies +# vim-go dependencies , asmfmt, delve, errcheck, godef, golint , gomodifytags, gotags, gotools, go-motion , gnused, reftools, gogetdoc, gometalinter , impl, iferr, gocode, gocode-gomod, go-tools +# direnv-vim dependencies +, direnv + # vCoolor dependency , gnome3 }: @@ -100,6 +103,14 @@ self: super: { ''; }); + direnv-vim = super.direnv-vim.overrideAttrs(oa: { + preFixup = oa.preFixup or "" + '' + substituteInPlace $out/share/vim-plugins/direnv-vim/autoload/direnv.vim \ + --replace "let s:direnv_cmd = get(g:, 'direnv_cmd', 'direnv')" \ + "let s:direnv_cmd = get(g:, 'direnv_cmd', '${lib.getBin direnv}/bin/direnv')" + ''; + }); + clighter8 = super.clighter8.overrideAttrs(old: { preFixup = '' sed "/^let g:clighter8_libclang_path/s|')$|${llvmPackages.clang.cc.lib}/lib/libclang.so')|" \ @@ -402,6 +413,9 @@ self: super: { dependencies = with super; [ vim-addon-mw-utils tlib_vim ]; }); + vim-terraform = super.vim-terraform.overrideAttrs(oa: { + patches = (oa.patches or []) ++ lib.singleton ./vim-terraform-fix-event.patch; + }); vim-wakatime = super.vim-wakatime.overrideAttrs(old: { buildInputs = [ python ]; diff --git a/pkgs/misc/vim-plugins/vim-terraform-fix-event.patch b/pkgs/misc/vim-plugins/vim-terraform-fix-event.patch new file mode 100644 index 0000000000000..b36c4992c13f1 --- /dev/null +++ b/pkgs/misc/vim-plugins/vim-terraform-fix-event.patch @@ -0,0 +1,23 @@ +From cad4661952ad7983ece6d6486f0f68d437037015 Mon Sep 17 00:00:00 2001 +From: "Wael M. Nasreddine" <wael.nasreddine@gmail.com> +Date: Thu, 2 Jan 2020 13:31:13 -0800 +Subject: [PATCH] Put the autocmd filetypedetect in an augroup + +--- + ftdetect/terraform.vim | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/ftdetect/terraform.vim b/ftdetect/terraform.vim +index 5919422..24bc731 100644 +--- a/ftdetect/terraform.vim ++++ b/ftdetect/terraform.vim +@@ -1,5 +1,8 @@ + " By default, Vim associates .tf files with TinyFugue - tell it not to. +-autocmd! filetypedetect BufRead,BufNewFile *.tf ++augroup filetypedetect ++ au BufRead,BufNewFile *.tf set filetype=terraform ++augroup END ++ + autocmd BufRead,BufNewFile *.tf set filetype=terraform + autocmd BufRead,BufNewFile *.tfvars set filetype=terraform + autocmd BufRead,BufNewFile *.tfstate set filetype=json diff --git a/pkgs/os-specific/linux/ddcci/default.nix b/pkgs/os-specific/linux/ddcci/default.nix new file mode 100644 index 0000000000000..6c3bc558fa846 --- /dev/null +++ b/pkgs/os-specific/linux/ddcci/default.nix @@ -0,0 +1,42 @@ +{ stdenv, fetchFromGitLab, kernel }: + +stdenv.mkDerivation rec { + pname = "ddcci-driver"; + version = "0.3.2"; + name = "${pname}-${kernel.version}-${version}"; + + src = fetchFromGitLab { + owner = "${pname}-linux"; + repo = "${pname}-linux"; + rev = "v${version}"; + sha256 = "0jl4l3vvxn85cbqr80p6bgyhf2vx9kbadrwx086wkj9ni8k6x5m6"; + }; + + hardeningDisable = [ "pic" ]; + + nativeBuildInputs = kernel.moduleBuildDependencies; + + prePatch = '' + substituteInPlace ./ddcci/Makefile \ + --replace 'SUBDIRS="$(src)"' 'M=$(PWD)' \ + --replace depmod \# + substituteInPlace ./ddcci-backlight/Makefile \ + --replace 'SUBDIRS="$(src)"' 'M=$(PWD)' \ + --replace depmod \# + ''; + + makeFlags = [ + "KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" + "KVER=${kernel.modDirVersion}" + "KERNEL_MODLIB=$(out)/lib/modules/${kernel.modDirVersion}" + "INCLUDEDIR=$(out)/include" + ]; + + meta = with stdenv.lib; { + description = "Kernel module driver for DDC/CI monitors"; + homepage = "https://gitlab.com/ddcci-driver-linux/ddcci-driver-linux"; + license = licenses.gpl2; + maintainers = with maintainers; [ bricewge ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/os-specific/linux/kernel/linux-4.14.nix b/pkgs/os-specific/linux/kernel/linux-4.14.nix index 57b3aeaa82f63..bcb2f0f8e7d78 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.14.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.14.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "4.14.161"; + version = "4.14.162"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1jc1izlvgymp9x61r4yz2xhplwmp6x8laxqj9wy33iz6a2gn48wx"; + sha256 = "0jwbr7q17khv0174hl0kp78bsyhjv0mljfvrnbl9qdfl9hi70lgn"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-4.4.nix b/pkgs/os-specific/linux/kernel/linux-4.4.nix index e63f96d6876f5..2ee7241396fb1 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.4.nix @@ -1,11 +1,11 @@ { stdenv, buildPackages, fetchurl, perl, buildLinux, ... } @ args: buildLinux (args // rec { - version = "4.4.207"; + version = "4.4.208"; extraMeta.branch = "4.4"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "024flajnl3l4yk8sgqdrfrl21js4vsjcv4ivmjblj4l9fl3hdjb6"; + sha256 = "03jj91z5dc0ybpjy9w6aanb3k53gcj7gsjc32h3ldf72hlmgz6aq"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-4.9.nix b/pkgs/os-specific/linux/kernel/linux-4.9.nix index 27e802f610709..e95a0d98139c1 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.9.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.9.nix @@ -1,11 +1,11 @@ { stdenv, buildPackages, fetchurl, perl, buildLinux, ... } @ args: buildLinux (args // rec { - version = "4.9.207"; + version = "4.9.208"; extraMeta.branch = "4.9"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "090181vij95py22jhx7baaxabb78w0j5hsfsnzp6bv2vgdz671na"; + sha256 = "0njjw1i8dilihn1hz62zra4b9y05fb3r2k2sqlkd0wfn86c1rbdp"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-libre.nix b/pkgs/os-specific/linux/kernel/linux-libre.nix index 04da4a6afc2a0..22fe4eae52eaf 100644 --- a/pkgs/os-specific/linux/kernel/linux-libre.nix +++ b/pkgs/os-specific/linux/kernel/linux-libre.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchsvn, linux , scripts ? fetchsvn { url = "https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/branches/"; - rev = "17161"; + rev = "17163"; sha256 = "0hyd7wp73w4555d42xcvk4x4nxrfckbzah2ckb4d2aqzxab87789"; } , ... diff --git a/pkgs/os-specific/linux/odp-dpdk/default.nix b/pkgs/os-specific/linux/odp-dpdk/default.nix index 66185de03a16b..e1acda120253e 100644 --- a/pkgs/os-specific/linux/odp-dpdk/default.nix +++ b/pkgs/os-specific/linux/odp-dpdk/default.nix @@ -34,6 +34,8 @@ in stdenv.mkDerivation rec { jansson ]; + NIX_CFLAGS_COMPILE = [ "-Wno-error=address-of-packed-member" ]; + # for some reason, /build/odp-dpdk-1.22.0.0_DPDK_18.11/lib/.libs ends up in all binaries, # while it should be $out/lib instead. # prepend rpath with the proper location, the /build will get removed during rpath shrinking diff --git a/pkgs/servers/http/nginx/modules.nix b/pkgs/servers/http/nginx/modules.nix index 5e21e8734bf15..78ad5c5582d81 100644 --- a/pkgs/servers/http/nginx/modules.nix +++ b/pkgs/servers/http/nginx/modules.nix @@ -258,6 +258,15 @@ in inputs = [ pkgs.pam ]; }; + pinba = { + src = fetchFromGitHub { + owner = "tony2001"; + repo = "ngx_http_pinba_module"; + rev = "28131255d4797a7e2f82a6a35cf9fc03c4678fe6"; + sha256 = "00fii8bjvyipq6q47xhjhm3ylj4rhzmlk3qwxmfpdn37j7bc8p8c"; + }; + }; + push-stream ={ src = fetchFromGitHub { owner = "wandenberg"; diff --git a/pkgs/servers/web-apps/wordpress/default.nix b/pkgs/servers/web-apps/wordpress/default.nix index 0cf16f177912a..00ea34829aa15 100644 --- a/pkgs/servers/web-apps/wordpress/default.nix +++ b/pkgs/servers/web-apps/wordpress/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "wordpress"; - version = "5.2.4"; + version = "5.3.2"; src = fetchurl { url = "https://wordpress.org/${pname}-${version}.tar.gz"; - sha256 = "1vf5220rw37sxvzy6yxn636ip2lx4bkc84z7q8rdwcs2wkv6md1p"; + sha256 = "0rq1j431x0fvcpry721hxglszql4c80qr26fglcdlm51h9z6i1p1"; }; installPhase = '' diff --git a/pkgs/tools/filesystems/sshfs-fuse/default.nix b/pkgs/tools/filesystems/sshfs-fuse/default.nix index af7ef8b8215b8..018dfe7858e35 100644 --- a/pkgs/tools/filesystems/sshfs-fuse/default.nix +++ b/pkgs/tools/filesystems/sshfs-fuse/default.nix @@ -1,25 +1,21 @@ -{ stdenv, fetchFromGitHub, fetchpatch, meson, pkgconfig, ninja, docutils, makeWrapper +{ stdenv, fetchFromGitHub +, meson, pkgconfig, ninja, docutils, makeWrapper , fuse3, glib , which, python3Packages , openssh }: stdenv.mkDerivation rec { - version = "3.6.0"; + version = "3.7.0"; pname = "sshfs-fuse"; src = fetchFromGitHub { owner = "libfuse"; repo = "sshfs"; rev = "sshfs-${version}"; - sha256 = "0l4a6azsp920fhl4safxjam6821b77zxhw8mjgm33f60pksslww0"; + sha256 = "119qvjaai3nqs2psqk2kv4gxjchrnrcfnmlwk7yxnj3v59pgyxhv"; }; - patches = [ (fetchpatch { - url = "https://github.com/libfuse/sshfs/commit/a548abd1f33a8423bec72724a5f48eb96fa55dd2.patch"; - sha256 = "19p94aw7nvydd7p2bd1f5cqhlhhamjhda31k22sg06xaqyl893jm"; - }) ]; - nativeBuildInputs = [ meson pkgconfig ninja docutils makeWrapper ]; buildInputs = [ fuse3 glib ]; checkInputs = [ which python3Packages.pytest ]; diff --git a/pkgs/tools/misc/ckb-next/default.nix b/pkgs/tools/misc/ckb-next/default.nix index 575cb686f9d46..738430f561bd3 100644 --- a/pkgs/tools/misc/ckb-next/default.nix +++ b/pkgs/tools/misc/ckb-next/default.nix @@ -2,14 +2,14 @@ , pkgconfig, qtbase, cmake, zlib, kmod }: mkDerivation rec { - version = "0.3.2"; + version = "0.4.2"; pname = "ckb-next"; src = fetchFromGitHub { owner = "ckb-next"; repo = "ckb-next"; rev = "v${version}"; - sha256 = "0ri5n7r1vhsgk6s64abvqcdrs5fmlwprw0rxiwfy0j8a9qcic1dr"; + sha256 = "1mkx1psw5xnpscdfik1kpzsnfhhkn3571i7acr9gxyjr27sckplc"; }; buildInputs = [ @@ -25,11 +25,12 @@ mkDerivation rec { cmakeFlags = [ "-DINSTALL_DIR_ANIMATIONS=libexec" + "-DUDEV_RULE_DIRECTORY=lib/udev/rules.d" + "-DFORCE_INIT_SYSTEM=systemd" ]; patches = [ ./install-dirs.patch - ./systemd-service.patch (substituteAll { name = "ckb-next-modprobe.patch"; src = ./modprobe.patch; diff --git a/pkgs/tools/misc/ckb-next/install-dirs.patch b/pkgs/tools/misc/ckb-next/install-dirs.patch index 5545292a65ee4..0f113d71aa3fa 100644 --- a/pkgs/tools/misc/ckb-next/install-dirs.patch +++ b/pkgs/tools/misc/ckb-next/install-dirs.patch @@ -1,32 +1,13 @@ diff --git a/src/daemon/CMakeLists.txt b/src/daemon/CMakeLists.txt -index 09056a7..1bb4595 100644 +index 2fc10a8..22dbd14 100644 --- a/src/daemon/CMakeLists.txt +++ b/src/daemon/CMakeLists.txt -@@ -456,7 +456,7 @@ endif () - if (LINUX) - install( - FILES "${CMAKE_SOURCE_DIR}/linux/udev/99-ckb-daemon.rules" -- DESTINATION "/etc/udev/rules.d" -+ DESTINATION "${CMAKE_INSTALL_PREFIX}/lib/udev/rules.d" - PERMISSIONS - OWNER_READ OWNER_WRITE - GROUP_READ -diff --git a/src/libs/ckb-next/CMakeLists.txt b/src/libs/ckb-next/CMakeLists.txt -index ecc591c..35de563 100644 ---- a/src/libs/ckb-next/CMakeLists.txt -+++ b/src/libs/ckb-next/CMakeLists.txt -@@ -75,12 +75,12 @@ if(NOT MACOS) - NAMESPACE - ${CMAKE_PROJECT_NAME}:: - DESTINATION -- "/usr/lib/cmake/${CMAKE_PROJECT_NAME}/${PROJECT_NAME}") -+ "${CMAKE_INSTALL_PREFIX}/lib/cmake/${CMAKE_PROJECT_NAME}/${PROJECT_NAME}") - +@@ -421,7 +421,7 @@ if ("${CKB_NEXT_INIT_SYSTEM}" STREQUAL "launchd") + elseif ("${CKB_NEXT_INIT_SYSTEM}" STREQUAL "systemd") install( - FILES - "cmake/${PROJECT_NAME}Config.cmake" - "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}/${PROJECT_NAME}ConfigVersion.cmake" - DESTINATION -- "/usr/lib/cmake/${CMAKE_PROJECT_NAME}/${PROJECT_NAME}") -+ "${CMAKE_INSTALL_PREFIX}/lib/cmake/${CMAKE_PROJECT_NAME}/${PROJECT_NAME}") - endif() + FILES "${CMAKE_CURRENT_BINARY_DIR}/service/ckb-next-daemon.service" +- DESTINATION "/usr/lib/systemd/system" ++ DESTINATION "${CMAKE_INSTALL_PREFIX}/lib/systemd/system" + PERMISSIONS + OWNER_READ OWNER_WRITE + GROUP_READ diff --git a/pkgs/tools/misc/ckb-next/modprobe.patch b/pkgs/tools/misc/ckb-next/modprobe.patch index f2156fc3b23bb..a2cbe262e89fb 100644 --- a/pkgs/tools/misc/ckb-next/modprobe.patch +++ b/pkgs/tools/misc/ckb-next/modprobe.patch @@ -1,26 +1,26 @@ diff --git a/src/daemon/input_linux.c b/src/daemon/input_linux.c -index 1cedb07..8e0b24b 100644 +index 8489f5b..b851419 100644 --- a/src/daemon/input_linux.c +++ b/src/daemon/input_linux.c -@@ -58,7 +58,7 @@ int os_inputopen(usbdevice* kb){ - /// First check whether the uinput module is loaded by the kernel. - /// - // Load the uinput module (if it's not loaded already) -- if(system("modprobe uinput") != 0) { -+ if(system("@kmod@/bin/modprobe uinput") != 0) { - ckb_fatal("Failed to load uinput module\n"); - return 1; - } +@@ -63,7 +63,7 @@ int os_inputopen(usbdevice* kb){ + + // If not available, load the module + if(fd < 0){ +- if(system("modprobe uinput") != 0) { ++ if(system("@kmod@/bin/modprobe uinput") != 0) { + ckb_fatal("Failed to load uinput module\n"); + return 1; + } diff --git a/src/gui/mainwindow.cpp b/src/gui/mainwindow.cpp -index 3601146..3f2f78f 100644 +index 1eb95bd..f7d38ba 100644 --- a/src/gui/mainwindow.cpp +++ b/src/gui/mainwindow.cpp -@@ -251,7 +251,7 @@ void MainWindow::updateVersion(){ - daemonWarning.append(tr("<br /><b>Warning:</b> System Extension by \"Fumihiko Takayama\" is not allowed in Security & Privacy. Please allow it and then unplug and replug your devices.")); +@@ -284,7 +284,7 @@ void MainWindow::updateVersion(){ #elif defined(Q_OS_LINUX) - QProcess modprobe; -- modprobe.start("modprobe", QStringList("uinput")); -+ modprobe.start("@kmod@/bin/modprobe", QStringList("uinput")); + if(!(QFileInfo("/dev/uinput").exists() || QFileInfo("/dev/input/uinput").exists())){ + QProcess modprobe; +- modprobe.start("modprobe", QStringList("uinput")); ++ modprobe.start("@kmod@/bin/modprobe", QStringList("uinput")); - if(!modprobe.waitForFinished()) - qDebug() << "Modprobe error"; + if(!modprobe.waitForFinished()) + qDebug() << "Modprobe error"; diff --git a/pkgs/tools/misc/ckb-next/systemd-service.patch b/pkgs/tools/misc/ckb-next/systemd-service.patch deleted file mode 100644 index 917bc09627f76..0000000000000 --- a/pkgs/tools/misc/ckb-next/systemd-service.patch +++ /dev/null @@ -1,45 +0,0 @@ -diff --git a/src/daemon/CMakeLists.txt b/src/daemon/CMakeLists.txt -index 09056a7..72a7249 100644 ---- a/src/daemon/CMakeLists.txt -+++ b/src/daemon/CMakeLists.txt -@@ -249,12 +249,7 @@ elseif (LINUX) - # but it is not enabled by default and systemd is used instead. (Ubuntu 15.04+) - - # A way to check for upstart -- execute_process( -- COMMAND initctl --version -- OUTPUT_VARIABLE initctl_output -- OUTPUT_STRIP_TRAILING_WHITESPACE) -- -- if ("${initctl_output}" MATCHES "upstart") -+ if (FALSE) - message(STATUS "upstart detected") - set(CKB_NEXT_INIT_SYSTEM "upstart" CACHE INTERNAL "") - set(DISALLOW_SYSVINIT TRUE) -@@ -292,7 +287,7 @@ elseif (LINUX) - endif () - - # A way to check for systemd -- if (EXISTS "/run/systemd/system") -+ if (TRUE) - message(STATUS "systemd detected") - set(CKB_NEXT_INIT_SYSTEM "systemd" CACHE INTERNAL "") - set(DISALLOW_SYSVINIT TRUE) -@@ -328,7 +323,7 @@ elseif (LINUX) - endif () - - # A way to check for OpenRC -- if (EXISTS "/run/openrc/softlevel") -+ if (FALSE) - message(STATUS "OpenRC detected") - set(CKB_NEXT_INIT_SYSTEM "OpenRC" CACHE INTERNAL "") - set(DISALLOW_SYSVINIT TRUE) -@@ -419,7 +414,7 @@ if ("${CKB_NEXT_INIT_SYSTEM}" STREQUAL "launchd") - elseif ("${CKB_NEXT_INIT_SYSTEM}" STREQUAL "systemd") - install( - FILES "${CMAKE_CURRENT_BINARY_DIR}/service/ckb-next-daemon.service" -- DESTINATION "/usr/lib/systemd/system" -+ DESTINATION "${CMAKE_INSTALL_PREFIX}/lib/systemd/system" - PERMISSIONS - OWNER_READ OWNER_WRITE - GROUP_READ diff --git a/pkgs/tools/misc/fzf/default.nix b/pkgs/tools/misc/fzf/default.nix index 9de5ca0df7829..960373e7e5fc0 100644 --- a/pkgs/tools/misc/fzf/default.nix +++ b/pkgs/tools/misc/fzf/default.nix @@ -36,15 +36,13 @@ buildGoModule rec { ''; postInstall = '' - name="${pname}-${version}" - cp $src/bin/fzf-tmux $out/bin mkdir -p $man/share/man cp -r $src/man/man1 $man/share/man - mkdir -p $out/share/vim-plugins/$name - cp -r $src/plugin $out/share/vim-plugins/$name + mkdir -p $out/share/vim-plugins/${pname} + cp -r $src/plugin $out/share/vim-plugins/${pname} cp -R $src/shell $out/share/fzf cat <<SCRIPT > $out/bin/fzf-share diff --git a/pkgs/tools/misc/heimdall/default.nix b/pkgs/tools/misc/heimdall/default.nix index a8100e455f0b8..26396fee507e7 100644 --- a/pkgs/tools/misc/heimdall/default.nix +++ b/pkgs/tools/misc/heimdall/default.nix @@ -21,11 +21,14 @@ mkDerivation { cmakeFlags = [ "-DDISABLE_FRONTEND=${if enableGUI then "OFF" else "ON"}" + "-DLIBUSB_LIBRARY=${libusb1}" ]; preConfigure = '' # Give ownership of the Galaxy S USB device to the logged in user. substituteInPlace heimdall/60-heimdall.rules --replace 'MODE="0666"' 'TAG+="uaccess"' + '' + stdenv.lib.optionalString stdenv.isDarwin '' + substituteInPlace libpit/CMakeLists.txt --replace "-std=gnu++11" "" ''; installPhase = '' diff --git a/pkgs/tools/misc/onefetch/default.nix b/pkgs/tools/misc/onefetch/default.nix index be8c4fb9c0646..e51a00dc7bd0b 100644 --- a/pkgs/tools/misc/onefetch/default.nix +++ b/pkgs/tools/misc/onefetch/default.nix @@ -1,15 +1,15 @@ -{ fetchFromGitHub, rustPlatform, stdenv +{ fetchFromGitHub, rustPlatform, stdenv, fetchpatch , CoreFoundation, libiconv, libresolv, Security }: rustPlatform.buildRustPackage rec { pname = "onefetch"; - version = "2.1.0"; + version = "2.2.0"; src = fetchFromGitHub { owner = "o2sh"; repo = pname; rev = "v${version}"; - sha256 = "02mdzpzfcxp9na86b4jcqqjd3id5jslgmnq1jc0vykg58xha51jg"; + sha256 = "1sgpai3gx3w7w3ilmbnmzgdxdim6klkfiqaqxmffpyap6qgksfqs"; }; cargoSha256 = "1phv06zf47bv5cmhypivljfiynrblha0kj13c5al9l0hd1xx749h"; @@ -17,6 +17,14 @@ rustPlatform.buildRustPackage rec { buildInputs = with stdenv; lib.optionals isDarwin [ CoreFoundation libiconv libresolv Security ]; + cargoPatches = [ + # fix wrong version in Cargo.lock + (fetchpatch { + url = "https://github.com/o2sh/onefetch/commit/b69fe660d72b65d7efac99ac5db3b03a82d8667f.patch"; + sha256 = "14przkdyd4yd11xpdgyscs70w9gpnh02j3xdzxf6h895w3mn84lx"; + }) + ]; + meta = with stdenv.lib; { description = "Git repository summary on your terminal"; homepage = "https://github.com/o2sh/onefetch"; diff --git a/pkgs/tools/misc/tmux-xpanes/default.nix b/pkgs/tools/misc/tmux-xpanes/default.nix new file mode 100644 index 0000000000000..3ea5f758050df --- /dev/null +++ b/pkgs/tools/misc/tmux-xpanes/default.nix @@ -0,0 +1,33 @@ +{ stdenv, fetchFromGitHub, openssl, perl }: + +stdenv.mkDerivation rec { + pname = "tmux-xpanes"; + version = "4.1.0"; + + src = fetchFromGitHub { + owner = "greymd"; + repo = pname; + rev = "v${version}"; + sha256 = "11yz6rh2ckd1z8q80n8giv2gcz2i22fgf3pnfxq96qrzflb0d96a"; + }; + + buildInputs = [ openssl perl ]; + + installPhase = '' + # Create directories. + install -m 755 -d $out/bin/ + install -m 755 -d $out/share/man/man1/ + + # Perform installation. + install -m 755 bin/* $out/bin/ + install -m 644 man/*.1 $out/share/man/man1/ + ''; + + meta = with stdenv.lib; { + description = "tmux-based terminal divider"; + homepage = "https://github.com/greymd/tmux-xpanes"; + license = licenses.mit; + platforms = platforms.unix; + maintainers = with maintainers; [ monsieurp ]; + }; +} diff --git a/pkgs/tools/networking/wireguard-go/0001-Fix-darwin-build.patch b/pkgs/tools/networking/wireguard-go/0001-Fix-darwin-build.patch new file mode 100644 index 0000000000000..d79d9e3531f3f --- /dev/null +++ b/pkgs/tools/networking/wireguard-go/0001-Fix-darwin-build.patch @@ -0,0 +1,26 @@ +From 63360467da4ae6d7fc8c0e05619bdf8813c7e417 Mon Sep 17 00:00:00 2001 +From: Maximilian Bosch <maximilian@mbosch.me> +Date: Sun, 5 Jan 2020 15:35:15 +0100 +Subject: [PATCH] Fix darwin build + +--- + rwcancel/select_default.go | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/rwcancel/select_default.go b/rwcancel/select_default.go +index dd23cda..03f3452 100644 +--- a/rwcancel/select_default.go ++++ b/rwcancel/select_default.go +@@ -9,6 +9,7 @@ package rwcancel + + import "golang.org/x/sys/unix" + +-func unixSelect(nfd int, r *unix.FdSet, w *unix.FdSet, e *unix.FdSet, timeout *unix.Timeval) error { +- return unix.Select(nfd, r, w, e, timeout) ++func unixSelect(nfd int, r *unix.FdSet, w *unix.FdSet, e *unix.FdSet, timeout *unix.Timeval) (err error) { ++ _, err = unix.Select(nfd, r, w, e, timeout) ++ return + } +-- +2.23.1 + diff --git a/pkgs/tools/networking/wireguard-go/default.nix b/pkgs/tools/networking/wireguard-go/default.nix index 08ef1d3499c64..8832560b3b103 100644 --- a/pkgs/tools/networking/wireguard-go/default.nix +++ b/pkgs/tools/networking/wireguard-go/default.nix @@ -11,6 +11,8 @@ buildGoPackage rec { sha256 = "0s3hvqpz13n630yvi0476hfzrp3xcj8x61zc2hl5z70f8kvbay4i"; }; + patches = [ ./0001-Fix-darwin-build.patch ]; + goDeps = ./deps.nix; passthru.updateScript = ./update.sh; diff --git a/pkgs/tools/networking/zerotierone/default.nix b/pkgs/tools/networking/zerotierone/default.nix index 58f2e81600864..da5b8837523d3 100644 --- a/pkgs/tools/networking/zerotierone/default.nix +++ b/pkgs/tools/networking/zerotierone/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, openssl, lzo, zlib, iproute, which, ronn }: +{ stdenv, buildPackages, fetchFromGitHub, openssl, lzo, zlib, iproute, ronn }: stdenv.mkDerivation rec { pname = "zerotierone"; @@ -20,11 +20,14 @@ stdenv.mkDerivation rec { patchShebangs ./doc/build.sh substituteInPlace ./doc/build.sh \ - --replace '/usr/bin/ronn' '${ronn}/bin/ronn' \ - --replace 'ronn -r' '${ronn}/bin/ronn -r' + --replace '/usr/bin/ronn' '${buildPackages.ronn}/bin/ronn' \ ''; - buildInputs = [ openssl lzo zlib iproute which ronn ]; + + nativeBuildInputs = [ ronn ]; + buildInputs = [ openssl lzo zlib iproute ]; + + enableParallelBuilding = true; installPhase = '' install -Dt "$out/bin/" zerotier-one @@ -43,7 +46,7 @@ stdenv.mkDerivation rec { description = "Create flat virtual Ethernet networks of almost unlimited size"; homepage = https://www.zerotier.com; license = licenses.bsl11; - maintainers = with maintainers; [ sjmackenzie zimbatm ehmry obadz ]; - platforms = platforms.x86_64 ++ platforms.aarch64; + maintainers = with maintainers; [ sjmackenzie zimbatm ehmry obadz danielfullmer ]; + platforms = with platforms; x86_64 ++ aarch64 ++ arm; }; } diff --git a/pkgs/tools/security/aws-okta/default.nix b/pkgs/tools/security/aws-okta/default.nix index 66a9f61eefb29..71732f26934b4 100644 --- a/pkgs/tools/security/aws-okta/default.nix +++ b/pkgs/tools/security/aws-okta/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "aws-okta"; - version = "0.20.1"; + version = "0.26.3"; goPackagePath = "github.com/segmentio/aws-okta"; @@ -10,7 +10,7 @@ buildGoPackage rec { owner = "segmentio"; repo = "aws-okta"; rev = "v${version}"; - sha256 = "084lb9rp04vbpzmvsb2l92a4gp7c8g28x4xsagzwkqqpwi3fd15d"; + sha256 = "0n6xm3yv0lxfapchzfrqi05hk918n4lh1hcp7gq7hybam93rld96"; }; goDeps = ./deps.nix; diff --git a/pkgs/tools/video/rav1e/default.nix b/pkgs/tools/video/rav1e/default.nix index 1b0fa9f551b80..b57fa540837e3 100644 --- a/pkgs/tools/video/rav1e/default.nix +++ b/pkgs/tools/video/rav1e/default.nix @@ -1,8 +1,8 @@ -{ rustPlatform, fetchFromGitHub, fetchurl, stdenv, lib, unzip, nasm }: +{ rustPlatform, fetchFromGitHub, fetchurl, stdenv, lib, nasm }: rustPlatform.buildRustPackage rec { pname = "rav1e"; - version = "0.2.0"; + version = "0.2.1"; src = stdenv.mkDerivation rec { name = "${pname}-${version}-source"; @@ -11,24 +11,21 @@ rustPlatform.buildRustPackage rec { owner = "xiph"; repo = "rav1e"; rev = "v${version}"; - sha256 = "0sij9hwnar27gcwvfcjbhgyrhw99zjv8gr9s9gshqi766p5dy51a"; + sha256 = "1lv8g1vw11lanyx6lqr34hb6m4x1fvwb60kgg5nk8s8hgdr18i0y"; }; cargoLock = fetchurl { - url = "https://github.com/xiph/rav1e/releases/download/v${version}/rav1e-${version}.zip"; - sha256 = "1i48c7mvc9q20d76p2rpxva551249m3p52q2z1g9sj4xzpyyk41m"; + url = "https://github.com/xiph/rav1e/releases/download/v${version}/Cargo.lock"; + sha256 = "1d51wcm537pzfmq48vsv87dwf035yl03qkfc0372gchpv079561w"; }; - nativeBuildInputs = [ unzip ]; - installPhase = '' mkdir -p $out cp -R ./* $out/ - unzip ${cargoLock} - cp ./Cargo.lock $out/Cargo.lock + cp ${cargoLock} $out/Cargo.lock ''; }; - cargoSha256 = "1z0xrcq4mx6gpjyqh1csa424sxmx54z3x7ij3w2063h6s2fv9jy3"; + cargoSha256 = "0frr4sx05pwvj9gmlvmis6lrnbwk3x579fv3kw38374jy33nrr6z"; nativeBuildInputs = [ nasm ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index dae4c81318b9f..9c977dfddfa2e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6752,6 +6752,8 @@ in tmuxinator = callPackage ../tools/misc/tmuxinator { }; + tmux-xpanes = callPackage ../tools/misc/tmux-xpanes { }; + tmuxPlugins = recurseIntoAttrs (callPackage ../misc/tmux-plugins { }); tmsu = callPackage ../tools/filesystems/tmsu { }; @@ -14112,12 +14114,11 @@ in soapyhackrf = callPackage ../applications/radio/soapyhackrf { }; - soapysdr = callPackage ../applications/radio/soapysdr { inherit (python3Packages) python numpy; }; + soapysdr = callPackage ../applications/radio/soapysdr { }; soapyremote = callPackage ../applications/radio/soapyremote { }; soapysdr-with-plugins = callPackage ../applications/radio/soapysdr { - inherit (python3Packages) python numpy; extraPackages = [ limesuite soapyairspy @@ -16378,6 +16379,8 @@ in cpupower = callPackage ../os-specific/linux/cpupower { }; + ddcci-driver = callPackage ../os-specific/linux/ddcci { }; + deepin-anything = callPackage ../os-specific/linux/deepin-anything { }; digimend = callPackage ../os-specific/linux/digimend { }; @@ -20815,7 +20818,7 @@ in ps2client = callPackage ../applications/networking/ps2client { }; - psi = callPackage ../applications/networking/instant-messengers/psi { }; + psi = libsForQt5.callPackage ../applications/networking/instant-messengers/psi { }; psi-plus = libsForQt5.callPackage ../applications/networking/instant-messengers/psi-plus { }; @@ -23880,6 +23883,7 @@ in lie = callPackage ../applications/science/math/LiE { }; magma = callPackage ../development/libraries/science/math/magma { }; + clmagma = callPackage ../development/libraries/science/math/clmagma { }; mathematica = callPackage ../applications/science/math/mathematica { }; mathematica9 = callPackage ../applications/science/math/mathematica/9.nix { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e7b1c4d54686f..6d41aaf336464 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -282,10 +282,14 @@ in { azure-graphrbac = callPackage ../development/python-modules/azure-graphrbac { }; + azure-identity = callPackage ../development/python-modules/azure-identity { }; + azure-keyvault = callPackage ../development/python-modules/azure-keyvault { }; azure-keyvault-keys = callPackage ../development/python-modules/azure-keyvault-keys { }; + azure-keyvault-nspkg = callPackage ../development/python-modules/azure-keyvault-nspkg { }; + azure-keyvault-secrets = callPackage ../development/python-modules/azure-keyvault-secrets { }; azure-loganalytics = callPackage ../development/python-modules/azure-loganalytics { }; @@ -833,9 +837,14 @@ in { mpi = pkgs.openmpi; }; - msrestazure = callPackage ../development/python-modules/msrestazure { }; + msal = callPackage ../development/python-modules/msal { }; + + msal-extensions = callPackage ../development/python-modules/msal-extensions { }; + msrest = callPackage ../development/python-modules/msrest { }; + msrestazure = callPackage ../development/python-modules/msrestazure { }; + multiset = callPackage ../development/python-modules/multiset { }; mwclient = callPackage ../development/python-modules/mwclient { }; @@ -1157,6 +1166,8 @@ in { slurm = pkgs.slurm; }; + pysmb = callPackage ../development/python-modules/pysmb { }; + pysmf = callPackage ../development/python-modules/pysmf { }; pyspinel = callPackage ../development/python-modules/pyspinel {}; @@ -1339,6 +1350,16 @@ in { snapcast = callPackage ../development/python-modules/snapcast { }; + soapysdr = toPythonModule (pkgs.soapysdr.override { + python = self.python; + usePython = true; + }); + + soapysdr-with-plugins = toPythonModule (pkgs.soapysdr-with-plugins.override { + python = self.python; + usePython = true; + }); + sparse = callPackage ../development/python-modules/sparse { }; spglib = callPackage ../development/python-modules/spglib { }; @@ -1661,6 +1682,8 @@ in { babelfish = callPackage ../development/python-modules/babelfish {}; + bandit = callPackage ../development/python-modules/bandit {}; + basiciw = callPackage ../development/python-modules/basiciw { inherit (pkgs) gcc wirelesstools; }; @@ -1967,7 +1990,7 @@ in { certifi = callPackage ../development/python-modules/certifi { }; certipy = callPackage ../development/python-modules/certipy {}; - + characteristic = callPackage ../development/python-modules/characteristic { }; chart-studio = callPackage ../development/python-modules/chart-studio { }; @@ -2179,6 +2202,8 @@ in { pyjet = callPackage ../development/python-modules/pyjet {}; + pyjks = callPackage ../development/python-modules/pyjks {}; + PyLD = callPackage ../development/python-modules/PyLD { }; python-jose = callPackage ../development/python-modules/python-jose {}; @@ -2837,6 +2862,8 @@ in { oset = callPackage ../development/python-modules/oset { }; + oyaml = callPackage ../development/python-modules/oyaml { }; + pamela = callPackage ../development/python-modules/pamela { }; paperspace = callPackage ../development/python-modules/paperspace { }; @@ -3408,7 +3435,7 @@ in { wtf-peewee = callPackage ../development/python-modules/wtf-peewee { }; graph-tool = callPackage ../development/python-modules/graph-tool/2.x.x.nix { - inherit (pkgs) pkgconfig; + inherit (pkgs) pkg-config; }; grappelli_safe = callPackage ../development/python-modules/grappelli_safe { }; @@ -4192,6 +4219,8 @@ in { nameparser = callPackage ../development/python-modules/nameparser { }; + names = callPackage ../development/python-modules/names { }; + nbconvert = callPackage ../development/python-modules/nbconvert { }; nbformat = callPackage ../development/python-modules/nbformat { }; @@ -4265,6 +4294,8 @@ in { notebook = if isPy3k then callPackage ../development/python-modules/notebook { } else callPackage ../development/python-modules/notebook/2.nix { }; + notedown = callPackage ../development/python-modules/notedown { }; + notify = callPackage ../development/python-modules/notify { }; notify2 = callPackage ../development/python-modules/notify2 {}; @@ -4363,7 +4394,17 @@ in { rfc3986 = callPackage ../development/python-modules/rfc3986 { }; - cachetools = callPackage ../development/python-modules/cachetools {}; + cachetools = let + cachetools' = callPackage ../development/python-modules/cachetools {}; + cachetools_2 = cachetools'.overridePythonAttrs(oldAttrs: rec { + version = "3.1.1"; + src = oldAttrs.src.override { + inherit version; + sha256 = "16m69l6n6y1r1y7cklm92rr7v69ldig2n3lbl3j323w5jz7d78lf"; + }; + + }); + in if isPy3k then cachetools' else cachetools_2; cma = callPackage ../development/python-modules/cma { }; @@ -4956,7 +4997,16 @@ in { pywinrm = callPackage ../development/python-modules/pywinrm { }; - pyxattr = callPackage ../development/python-modules/pyxattr { }; + pyxattr = let + pyxattr' = callPackage ../development/python-modules/pyxattr { }; + pyxattr_2 = pyxattr'.overridePythonAttrs(oldAttrs: rec { + version = "0.6.1"; + src = oldAttrs.src.override { + inherit version; + sha256 = "b525843f6b51036198b3b87c4773a5093d6dec57d60c18a1f269dd7059aa16e3"; + }; + }); + in if isPy3k then pyxattr' else pyxattr_2; pyamg = callPackage ../development/python-modules/pyamg { }; @@ -5101,6 +5151,8 @@ in { requests-http-signature = callPackage ../development/python-modules/requests-http-signature { }; + requirements-detector = callPackage ../development/python-modules/requirements-detector { }; + resampy = callPackage ../development/python-modules/resampy { }; restructuredtext_lint = callPackage ../development/python-modules/restructuredtext_lint { }; @@ -5742,6 +5794,10 @@ in { sphinxcontrib-spelling = callPackage ../development/python-modules/sphinxcontrib-spelling { }; + sphinxcontrib-tikz = callPackage ../development/python-modules/sphinxcontrib-tikz { + texLive = pkgs.texlive.combine { inherit (pkgs.texlive) scheme-small standalone pgfplots; }; + }; + sphinx_pypi_upload = callPackage ../development/python-modules/sphinx_pypi_upload { }; Pweave = callPackage ../development/python-modules/pweave { }; @@ -6284,6 +6340,8 @@ in { pandocfilters = callPackage ../development/python-modules/pandocfilters { }; + pandoc-attributes = callPackage ../development/python-modules/pandoc-attributes { }; + htmltreediff = callPackage ../development/python-modules/htmltreediff { }; repeated_test = callPackage ../development/python-modules/repeated_test { }; @@ -6389,6 +6447,8 @@ in { jaraco_stream = callPackage ../development/python-modules/jaraco_stream { }; + javaobj-py3 = callPackage ../development/python-modules/javaobj-py3 { }; + javaproperties = callPackage ../development/python-modules/javaproperties { }; tempora= callPackage ../development/python-modules/tempora { }; @@ -6460,12 +6520,16 @@ in { twilio = callPackage ../development/python-modules/twilio { }; + twofish = callPackage ../development/python-modules/twofish { }; + uranium = callPackage ../development/python-modules/uranium { }; uuid = callPackage ../development/python-modules/uuid { }; versioneer = callPackage ../development/python-modules/versioneer { }; + viewstate = callPackage ../development/python-modules/viewstate { }; + vine = callPackage ../development/python-modules/vine { }; visitor = callPackage ../development/python-modules/visitor { }; diff --git a/pkgs/top-level/static.nix b/pkgs/top-level/static.nix index 687086b6ed3b2..7736a265b9470 100644 --- a/pkgs/top-level/static.nix +++ b/pkgs/top-level/static.nix @@ -55,7 +55,7 @@ self: super: let removeUnknownConfigureFlags = f: with self.lib; remove "--disable-shared" (remove "--enable-static" f); - + ocamlFixPackage = b: b.overrideAttrs (o: { configurePlatforms = [ ]; @@ -63,7 +63,7 @@ self: super: let buildInputs = o.buildInputs ++ o.nativeBuildInputs or [ ]; propagatedNativeBuildInputs = o.propagatedBuildInputs or [ ]; }); - + ocamlStaticAdapter = _: super: self.lib.mapAttrs (_: p: if p ? overrideAttrs then ocamlFixPackage p else p) @@ -153,6 +153,7 @@ in { static = true; }; openblas = super.openblas.override { enableStatic = true; }; + mkl = super.mkl.override { enableStatic = true; }; nix = super.nix.override { withAWS = false; }; # openssl 1.1 doesn't compile openssl = super.openssl_1_0_2.override { @@ -209,7 +210,7 @@ in { kmod = super.kmod.override { withStatic = true; }; - + curl = super.curl.override { # a very sad story: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=439039 gssSupport = false; @@ -241,6 +242,6 @@ in { ocaml-ng = self.lib.mapAttrs (_: set: if set ? overrideScope' then set.overrideScope' ocamlStaticAdapter else set ) super.ocaml-ng; - + python27 = super.python27.override { static = true; }; } |