diff options
Diffstat (limited to 'pkgs')
37 files changed, 231 insertions, 165 deletions
diff --git a/pkgs/applications/editors/eclipse/default.nix b/pkgs/applications/editors/eclipse/default.nix index 2c175f32d628..586e2343cd3e 100644 --- a/pkgs/applications/editors/eclipse/default.nix +++ b/pkgs/applications/editors/eclipse/default.nix @@ -12,13 +12,13 @@ assert stdenv ? glibc; # find the downloads needed for new versions # # to test: -# $ for e in cpp modeling platform sdk java committers; do nix build -f default.nix pkgs.eclipses.eclipse-${e} -o eclipse-${e}; done +# $ for e in cpp modeling platform sdk java committers rcp rust; do nix build -f default.nix pkgs.eclipses.eclipse-${e} -o eclipse-${e}; done let platform_major = "4"; - platform_minor = "17"; + platform_minor = "18"; year = "2020"; - month = "09"; + month = "12"; timestamp = "${year}${month}021800"; gtk = gtk3; in rec { @@ -37,7 +37,7 @@ in rec { src = fetchurl { url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-cpp-${year}-${month}-R-linux-gtk-x86_64.tar.gz"; - sha512 = "270pk7vvfvanig49xkrail01nf967zlp7xf8rvyh2ya7s0y0akj2bi0y4yms4gwijmingm8y2ir9qynd360mzwl8mnc1c31ykf9l3lh"; + sha512 = "MR6ddNmBKyXCyVGlGPfq6K2zJRywy4I5QDXji3rh81eJQ6zkEguo+VvD75i/szg/+FbCVA09vDVV06JgL4SHwQ=="; }; }; @@ -49,7 +49,7 @@ in rec { src = fetchurl { url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-modeling-${year}-${month}-R-linux-gtk-x86_64.tar.gz"; - sha512 = "26bb6cbnw94ml585aqrs8wpfksd2883njlqi48klpbn5n1bwpnpwvymx9q46i49piiyp0r1pa8ghdcgiwcakvri5nzldlh522fs7h5y"; + sha512 = "hSi3IL+fWhlUfEJYv4LFO7WNbZpiofAgNGZbEOIBS0VpeHfJ5Y6UKMKMLfQlG3hlkAL5jg/cEJKb/ad4DxHbjQ=="; }; }; @@ -61,7 +61,7 @@ in rec { src = fetchurl { url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops${platform_major}/R-${platform_major}.${platform_minor}-${timestamp}/eclipse-platform-${platform_major}.${platform_minor}-linux-gtk-x86_64.tar.gz"; - sha512 = "2i3gjxmq1i4p70q2l5749b96z1r4nv15dii17fywbyby3kbggwhfvaydizy7z5p6kn0y91dw13p7gmg3qpr9d46mb8f8h3sxks7fyl9"; + sha512 = "cPRa7ICogpcuwzOlzSSCEcWpwpUhQuIv6lGBKuAu9mOwj7Nz0TPaWVWNqN1541uVRXVTzcWX+mwc2UBPzWUPxg=="; }; }; @@ -86,7 +86,7 @@ in rec { src = fetchurl { url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops${platform_major}/R-${platform_major}.${platform_minor}-${timestamp}/eclipse-SDK-${platform_major}.${platform_minor}-linux-gtk-x86_64.tar.gz"; - sha512 = "1c29r7qwjrjv86q2c4bhlrmmh50690lrq164jzrlisys9vnxb6wii0gwb34p9m1xqr3lgba1zhffb4jx18prrk0x8xbd78mp0lvya3k"; + sha512 = "iN6z5iSJ2bhE1IH3uJj7aiaF/nSIgIAqadvaTBpE4gkgLAXgtfraFAzgcw0zJr5m2u5mULfW45hLkmIXselniQ=="; }; }; @@ -98,7 +98,7 @@ in rec { src = fetchurl { url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-java-${year}-${month}-R-linux-gtk-x86_64.tar.gz"; - sha512 = "3rkpngrk6423i2pcf241wbr9jfzwxm2qwm57ipjpjw6705w1rapcws4bibqjznlf34lqvnynkw2wihy51j1ryw25z9fc2jsvyj67c1q"; + sha512 = "HVqsWUVNNRdcaziGdNI96R9F2VMUE4nYK1VX1G3pK+srFDlkJ7+rj2sZjtWL7WcJR1XSbT03nJJzPyp01RsCvQ=="; }; }; @@ -110,7 +110,7 @@ in rec { src = fetchurl { url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-committers-${year}-${month}-R-linux-gtk-x86_64.tar.gz"; - sha512 = "3gnqamrn3x2gr4dfcgl7ppxpyi1q422l0sm7sh0vmipbs9l1c58plm3p14j9rjsyjlly2xjci6dg7sb9mj6259vc640wafnzcs89ii1"; + sha512 = "UtI4piLNRM3TsM9PzbGgsPqTkiurJ+7Q7jVra45an4YJHtfWcGTxxwUNnRzay6cHT49AjrWtVf1bovWSDXMiQA=="; }; }; @@ -122,7 +122,19 @@ in rec { src = fetchurl { url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-rcp-${year}-${month}-R-linux-gtk-x86_64.tar.gz"; - sha512 = "216g805fgpb7vwbgk36xkf467vijvaa3x0gk4d94pi92d9wdh5dph6wjjr4ka9rvg0pzxxr8y3sgbfqqzqpc82bgiz5qqr93sprh9bj"; + sha512 = "9DqNjSx1Ypdzpt1jIOJ9KFx8y+cG55K6bqkWTqnGjjDr4h4mWSzvGjHGUtFrKl92WRzQZKjNPxzVreDMcUkc/g=="; + }; + }; + + ### Eclipse IDE for Rust Developers + + eclipse-rust = buildEclipse { + name = "eclipse-rust-${platform_major}.${platform_minor}"; + description = "Eclipse IDE for Rust Developers"; + src = + fetchurl { + url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-rust-${year}-${month}-R-linux-gtk-x86_64.tar.gz"; + sha512 = "QbaG1knCMFnVQkPeApcIamJMXPyL8zUQa0ZsTJOuTgU/fD1RiHN7/WS6ax5azzIJhpjEtj2LMU4XV+MwkzResw=="; }; }; diff --git a/pkgs/applications/editors/eclipse/plugins.nix b/pkgs/applications/editors/eclipse/plugins.nix index 43ab2a796ebd..0b58bc21069e 100644 --- a/pkgs/applications/editors/eclipse/plugins.nix +++ b/pkgs/applications/editors/eclipse/plugins.nix @@ -255,12 +255,12 @@ rec { cdt = buildEclipseUpdateSite rec { name = "cdt-${version}"; # find current version at https://www.eclipse.org/cdt/downloads.php - version = "10.0.1"; + version = "10.1.0"; src = fetchzip { stripRoot = false; - url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/tools/cdt/releases/10.0/${name}/${name}.zip"; - sha256 = "1smi1yc4l627bb01zp0pcilm6d0hysxk440hy4n55gz3jxilygx5"; + url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/tools/cdt/releases/10.1/${name}/${name}.zip"; + sha256 = "q0O6OE2u0bdz1+nOkzXDrrOOzoEbVaXnejx4lX7uZgk="; }; meta = with stdenv.lib; { @@ -472,12 +472,12 @@ rec { jdt = buildEclipseUpdateSite rec { name = "jdt-${version}"; - version = "4.17"; + version = "4.18"; src = fetchzip { stripRoot = false; - url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-${version}-202009021800/org.eclipse.jdt-${version}.zip"; - sha256 = "16vb88ywqfh0rix5krp2g39yhisv4i797g9c03aayzy5lynqm3ky"; + url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-${version}-202012021800/org.eclipse.jdt-${version}.zip"; + sha256 = "q0O6OE2u0bdz1+nOkzXDrrOOzoEbVaXnejx4lX7uZgk="; }; meta = with stdenv.lib; { diff --git a/pkgs/applications/misc/tty-share/default.nix b/pkgs/applications/misc/tty-share/default.nix new file mode 100644 index 000000000000..a9fcb969f675 --- /dev/null +++ b/pkgs/applications/misc/tty-share/default.nix @@ -0,0 +1,24 @@ +{ stdenv, buildGoPackage, fetchFromGitHub }: + +# Upstream has a `./vendor` directory with all deps which we rely upon. +buildGoPackage rec { + pname = "tty-share"; + version = "2.0.0"; + + src = fetchFromGitHub { + owner = "elisescu"; + repo = "tty-share"; + rev = "v${version}"; + sha256 = "1d2vd3d1lb4n0jq4s0p5mii1vz4r3z36hykr5mnx53srsni1wsj5"; + }; + + goPackagePath = "github.com/elisescu/tty-share"; + + meta = with stdenv.lib; { + homepage = "https://tty-share.com"; + description = "Share terminal via browser for remote work or shared sessions"; + platforms = platforms.linux; + license = licenses.mit; + maintainers = with maintainers; [ andys8 ]; + }; +} diff --git a/pkgs/applications/networking/instant-messengers/mirage/default.nix b/pkgs/applications/networking/instant-messengers/mirage/default.nix index 0aa2dbf889bb..decdb18aa063 100644 --- a/pkgs/applications/networking/instant-messengers/mirage/default.nix +++ b/pkgs/applications/networking/instant-messengers/mirage/default.nix @@ -1,7 +1,7 @@ -{ lib, mkDerivation, fetchFromGitHub +{ stdenv, mkDerivation, fetchFromGitHub , qmake, pkgconfig, olm, wrapQtAppsHook , qtbase, qtquickcontrols2, qtkeychain, qtmultimedia, qttools, qtgraphicaleffects -, python3Packages, pyotherside +, python3Packages, pyotherside, libXScrnSaver }: let @@ -13,13 +13,13 @@ let in mkDerivation rec { pname = "mirage"; - version = "0.5.2"; + version = "0.6.4"; src = fetchFromGitHub { owner = "mirukana"; repo = pname; rev = "v${version}"; - sha256 = "0i891fafdncdz1xg6nji80jb86agsrbdvai9nwf1yy126q7piryv"; + sha256 = "15x0x2rf4fzsd0zr84fq3j3ddzkgc5il8s54jpxk8wl4ah03g4nv"; fetchSubmodules = true; }; @@ -30,13 +30,14 @@ mkDerivation rec { qtquickcontrols2 qtkeychain qtgraphicaleffects olm pyotherside + libXScrnSaver ]; propagatedBuildInputs = pypkgs; pythonPath = pypkgs; - qmakeFlags = [ "PREFIX=${placeholder "out"}" ]; + qmakeFlags = [ "PREFIX=${placeholder "out"}" "CONFIG+=qtquickcompiler" ]; dontWrapQtApps = true; postInstall = '' @@ -46,11 +47,12 @@ mkDerivation rec { "''${qtWrapperArgs[@]}" ''; - meta = with lib; { + meta = with stdenv.lib; { description = "A fancy, customizable, keyboard-operable Qt/QML+Python Matrix chat client for encrypted and decentralized communication"; homepage = "https://github.com/mirukana/mirage"; license = licenses.lgpl3; maintainers = with maintainers; [ colemickens ]; + broken = stdenv.isDarwin; inherit (qtbase.meta) platforms; inherit version; }; diff --git a/pkgs/applications/networking/p2p/deluge/1/default.nix b/pkgs/applications/networking/p2p/deluge/1.nix index 7ab337924155..aa70f969d221 100644 --- a/pkgs/applications/networking/p2p/deluge/1/default.nix +++ b/pkgs/applications/networking/p2p/deluge/1.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, intltool, libtorrentRasterbar, pythonPackages }: +{ stdenv, fetchurl, fetchpatch, intltool, libtorrent-rasterbar, pythonPackages }: pythonPackages.buildPythonPackage rec { pname = "deluge"; @@ -19,7 +19,7 @@ pythonPackages.buildPythonPackage rec { propagatedBuildInputs = with pythonPackages; [ pyGtkGlade twisted Mako chardet pyxdg pyopenssl service-identity - libtorrentRasterbar.dev libtorrentRasterbar.python setuptools + libtorrent-rasterbar.dev libtorrent-rasterbar.python setuptools ]; nativeBuildInputs = [ intltool ]; diff --git a/pkgs/applications/networking/p2p/deluge/2/default.nix b/pkgs/applications/networking/p2p/deluge/default.nix index 2e9f08ce98a8..f9c421c40873 100644 --- a/pkgs/applications/networking/p2p/deluge/2/default.nix +++ b/pkgs/applications/networking/p2p/deluge/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, intltool, libtorrentRasterbar, pythonPackages +{ stdenv, fetchurl, intltool, libtorrent-rasterbar, pythonPackages , gtk3, glib, gobject-introspection, librsvg, wrapGAppsHook }: pythonPackages.buildPythonPackage rec { @@ -12,7 +12,7 @@ pythonPackages.buildPythonPackage rec { propagatedBuildInputs = with pythonPackages; [ twisted Mako chardet pyxdg pyopenssl service-identity - libtorrentRasterbar.dev libtorrentRasterbar.python setuptools + libtorrent-rasterbar.dev libtorrent-rasterbar.python setuptools setproctitle pillow rencode six zope_interface dbus-python pygobject3 pycairo gtk3 gobject-introspection librsvg diff --git a/pkgs/applications/networking/p2p/qbittorrent/default.nix b/pkgs/applications/networking/p2p/qbittorrent/default.nix index ac6717293928..2e69ad23e14c 100644 --- a/pkgs/applications/networking/p2p/qbittorrent/default.nix +++ b/pkgs/applications/networking/p2p/qbittorrent/default.nix @@ -1,5 +1,5 @@ { mkDerivation, lib, fetchFromGitHub, makeWrapper, pkgconfig -, boost, libtorrentRasterbar, qtbase, qttools, qtsvg +, boost, libtorrent-rasterbar, qtbase, qttools, qtsvg , debugSupport ? false , guiSupport ? true, dbus ? null # GUI (disable to run headless) , webuiSupport ? true # WebUI @@ -24,7 +24,7 @@ mkDerivation rec { # NOTE: 2018-05-31: CMake is working but it is not officially supported nativeBuildInputs = [ makeWrapper pkgconfig ]; - buildInputs = [ boost libtorrentRasterbar qtbase qttools qtsvg ] + buildInputs = [ boost libtorrent-rasterbar qtbase qttools qtsvg ] ++ optional guiSupport dbus # D(esktop)-Bus depends on GUI support ++ optional trackerSearch python3; diff --git a/pkgs/applications/networking/p2p/tribler/default.nix b/pkgs/applications/networking/p2p/tribler/default.nix index 5cab23ecd710..d30697a4df00 100644 --- a/pkgs/applications/networking/p2p/tribler/default.nix +++ b/pkgs/applications/networking/p2p/tribler/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { ]; pythonPath = [ - python3Packages.libtorrentRasterbar + python3Packages.libtorrent-rasterbar python3Packages.twisted python3Packages.netifaces python3Packages.pycrypto diff --git a/pkgs/applications/version-management/pijul/default.nix b/pkgs/applications/version-management/pijul/default.nix index b09267fb9395..1439f7922489 100644 --- a/pkgs/applications/version-management/pijul/default.nix +++ b/pkgs/applications/version-management/pijul/default.nix @@ -13,14 +13,14 @@ rustPlatform.buildRustPackage rec { pname = "pijul"; - version = "1.0.0-alpha.21"; + version = "1.0.0-alpha.24"; src = fetchCrate { inherit version pname; - sha256 = "0csa2a8ci6b9vgq57hyz2ng0x8pv1p1ilw72z2b8rrpacdrzb633"; + sha256 = "1h1vgx0zlymnhalqsgmp9gv6sxbizmyryldx5vzl6djl23dvzd6s"; }; - cargoSha256 = "05z5iqs63s6cvaq4sjfxhcg5ka3rwn6ikcjs26jyqcbkp2bd9z88"; + cargoSha256 = "1yx7qqfyabhrf6mcca4frdcp9a426khp90nznhshhm71liqr9y44"; cargoBuildFlags = stdenv.lib.optional gitImportSupport "--features=git"; diff --git a/pkgs/applications/video/kodi/plugins.nix b/pkgs/applications/video/kodi/plugins.nix index 6863ef9ca622..12c16a744b08 100644 --- a/pkgs/applications/video/kodi/plugins.nix +++ b/pkgs/applications/video/kodi/plugins.nix @@ -467,7 +467,7 @@ let self = rec { propagatedBuildInputs = [ simpleplugin python2Packages.requests - python2Packages.libtorrentRasterbar + python2Packages.libtorrent-rasterbar ]; meta = { diff --git a/pkgs/applications/virtualization/conmon/default.nix b/pkgs/applications/virtualization/conmon/default.nix index d2f1f2debe54..e143ebcca755 100644 --- a/pkgs/applications/virtualization/conmon/default.nix +++ b/pkgs/applications/virtualization/conmon/default.nix @@ -9,20 +9,25 @@ stdenv.mkDerivation rec { pname = "conmon"; - version = "2.0.21"; + version = "2.0.22"; src = fetchFromGitHub { owner = "containers"; repo = pname; rev = "v${version}"; - sha256 = "13g436s00bcwzs31qsx5rpgkbbyxd4zvx8mbkq10gkrsv4r04q23"; + sha256 = "07wd3pns6x25dcnc1r84cwmrzg8xgzsfmidkclcpcagf97ad7jmc"; }; nativeBuildInputs = [ pkg-config ]; buildInputs = [ glib systemd ] ++ stdenv.lib.optionals (!stdenv.hostPlatform.isMusl) [ glibc glibc.static ]; - installFlags = [ "PREFIX=$(out)" ]; + # manpage requires building the vendored go-md2man + makeFlags = [ "bin/conmon" ]; + + installPhase = '' + install -D bin/conmon -t $out/bin + ''; passthru.tests = { inherit (nixosTests) cri-o podman; }; diff --git a/pkgs/development/libraries/libtorrent-rasterbar/1.1/default.nix b/pkgs/development/libraries/libtorrent-rasterbar/1.1.nix index b2c958795f3e..b2c958795f3e 100644 --- a/pkgs/development/libraries/libtorrent-rasterbar/1.1/default.nix +++ b/pkgs/development/libraries/libtorrent-rasterbar/1.1.nix diff --git a/pkgs/development/libraries/libtorrent-rasterbar/1.2/default.nix b/pkgs/development/libraries/libtorrent-rasterbar/1.2.nix index 1233dcb39334..9a165780b7e2 100644 --- a/pkgs/development/libraries/libtorrent-rasterbar/1.2/default.nix +++ b/pkgs/development/libraries/libtorrent-rasterbar/1.2.nix @@ -3,8 +3,7 @@ }: let - version = "1.2.6"; - formattedVersion = stdenv.lib.replaceChars ["."] ["_"] version; + version = "1.2.11"; # Make sure we override python, so the correct version is chosen # for the bindings, if overridden @@ -17,8 +16,8 @@ in stdenv.mkDerivation { src = fetchFromGitHub { owner = "arvidn"; repo = "libtorrent"; - rev = "libtorrent-${formattedVersion}"; - sha256 = "140gc9j6lymy5kr0gviqznpg4hl57rz2q6vpb9sjkkimr19lrvdr"; + rev = "v${version}"; + sha256 = "05qm8mcyxsnb6zb8nckln1gkk8ncwzfhsz7d7p3fhx6gdsc8j71b"; }; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/libtorrent-rasterbar/default.nix b/pkgs/development/libraries/libtorrent-rasterbar/default.nix new file mode 100644 index 000000000000..e9c59ed97e82 --- /dev/null +++ b/pkgs/development/libraries/libtorrent-rasterbar/default.nix @@ -0,0 +1,47 @@ +{ stdenv, fetchFromGitHub, cmake +, zlib, boost, openssl, python, ncurses, SystemConfiguration +}: + +let + version = "2.0.1"; + + # Make sure we override python, so the correct version is chosen + boostPython = boost.override { enablePython = true; inherit python; }; + +in stdenv.mkDerivation { + pname = "libtorrent-rasterbar"; + inherit version; + + src = fetchFromGitHub { + owner = "arvidn"; + repo = "libtorrent"; + rev = "v${version}"; + sha256 = "04ppw901babkfkis89pyb8kiyn39kb21k1s838xjq5ghbral1b1c"; + fetchSubmodules = true; + }; + + nativeBuildInputs = [ cmake ]; + + buildInputs = [ boostPython openssl zlib python ncurses ] + ++ stdenv.lib.optionals stdenv.isDarwin [ SystemConfiguration ]; + + postInstall = '' + moveToOutput "include" "$dev" + moveToOutput "lib/${python.libPrefix}" "$python" + ''; + + outputs = [ "out" "dev" "python" ]; + + cmakeFlags = [ + "-Dpython-bindings=on" + ]; + + meta = with stdenv.lib; { + homepage = "https://libtorrent.org/"; + description = "A C++ BitTorrent implementation focusing on efficiency and scalability"; + license = licenses.bsd3; + maintainers = [ maintainers.phreedom ]; + broken = stdenv.isDarwin; + platforms = platforms.unix; + }; +} diff --git a/pkgs/development/libraries/nuspell/default.nix b/pkgs/development/libraries/nuspell/default.nix index 3fac1421899a..ce682e5b8811 100644 --- a/pkgs/development/libraries/nuspell/default.nix +++ b/pkgs/development/libraries/nuspell/default.nix @@ -30,6 +30,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Free and open source C++ spell checking library"; homepage = "https://nuspell.github.io/"; + platforms = platforms.all; maintainers = with maintainers; [ fpletz ]; license = licenses.lgpl3Plus; }; diff --git a/pkgs/development/python-modules/awkward1/default.nix b/pkgs/development/python-modules/awkward/default.nix index dae8a235d80f..9b9ca52b947b 100644 --- a/pkgs/development/python-modules/awkward1/default.nix +++ b/pkgs/development/python-modules/awkward/default.nix @@ -9,12 +9,12 @@ }: buildPythonPackage rec { - pname = "awkward1"; - version = "0.4.5"; + pname = "awkward"; + version = "1.0.1"; src = fetchPypi { inherit pname version; - sha256 = "8c786d1641343e9887c21794f9a3bf51716b00ed3b182491f1acbc9e389b31bb"; + sha256 = "d856b4a166ae054363368aed2e4a44338fec069baa4242e7d567c8323ebcc1eb"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/python-modules/hstspreload/default.nix b/pkgs/development/python-modules/hstspreload/default.nix index 99612882814f..cf6206d346a0 100644 --- a/pkgs/development/python-modules/hstspreload/default.nix +++ b/pkgs/development/python-modules/hstspreload/default.nix @@ -6,14 +6,14 @@ buildPythonPackage rec { pname = "hstspreload"; - version = "2020.6.9"; + version = "2020.11.21"; disabled = isPy27; src = fetchFromGitHub { owner = "sethmlarson"; repo = pname; rev = version; - sha256 = "12js2xcj4979jklc19hjmv5p2b6689p18p4w9swhjc6cgcwm4jy2"; + sha256 = "0z2bq51dw1zak13558s2vj7pdnwad402f3ia5j2an0r678rwhsij"; }; # tests require network connection diff --git a/pkgs/development/python-modules/pipx/default.nix b/pkgs/development/python-modules/pipx/default.nix index 3b35b67bf091..122f34edb604 100644 --- a/pkgs/development/python-modules/pipx/default.nix +++ b/pkgs/development/python-modules/pipx/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "pipx"; - version = "0.15.5.1"; + version = "0.15.6.0"; disabled = pythonOlder "3.6"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "pipxproject"; repo = pname; rev = version; - sha256 = "0lq8dfkq4ji11r4k5csqzyv0757fbxiax6ixn94f9747zrikssf6"; + sha256 = "1yffswayjfkmq86ygisja0mkg55pqj9pdml5nc0z05222sfnvn1a"; }; propagatedBuildInputs = [ userpath argcomplete packaging ]; @@ -40,6 +40,8 @@ buildPythonPackage rec { "internet" "runpip" "upgrade" + "suffix" + "legacy_venv" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/wsnsimpy/default.nix b/pkgs/development/python-modules/wsnsimpy/default.nix new file mode 100644 index 000000000000..febb66605c8a --- /dev/null +++ b/pkgs/development/python-modules/wsnsimpy/default.nix @@ -0,0 +1,31 @@ +{ buildPythonPackage, fetchPypi, isPy27, lib, setuptools, simpy, tkinter +# GUI-based visualization of the simulation is optional +, enableVisualization ? true }: + +buildPythonPackage rec { + pname = "wsnsimpy"; + version = "0.2.5"; + disabled = isPy27; + + src = fetchPypi { + inherit pname version; + sha256 = "1b7fdqwc2v9alfwf2fr0aqr8rf2pb5lpm4anpilmvrh2lhjar4i2"; + }; + + propagatedBuildInputs = [ setuptools simpy ] + ++ lib.optional enableVisualization tkinter; + + # No test cases are included, thus unittest tries to run the examples, which + # fail because no DISPLAYs are available. + doCheck = false; + + pythonImportsCheck = [ "wsnsimpy" ] + ++ lib.optional enableVisualization "wsnsimpy.wsnsimpy_tk"; + + meta = with lib; { + description = "SimPy-based WSN Simulator"; + homepage = "https://pypi.org/project/wsnsimpy/"; + license = licenses.bsd2; + maintainers = with maintainers; [ dmrauh ]; + }; +} diff --git a/pkgs/development/python-modules/xkcdpass/default.nix b/pkgs/development/python-modules/xkcdpass/default.nix index d21142f5dc0d..8cb5b5f0777a 100644 --- a/pkgs/development/python-modules/xkcdpass/default.nix +++ b/pkgs/development/python-modules/xkcdpass/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "xkcdpass"; - version = "1.17.3"; + version = "1.17.6"; src = fetchPypi { inherit pname version; - sha256 = "95cf3fd41130606ba64ec7edb9efac7c5d61efe21abab51a2c21ccbbebc48bb6"; + sha256 = "0ghsjs5bxl996pap910q9s21nywb26mfpjd92rbfywbnj8f2k2cy"; }; # No tests included |