Merge master into staging-next

pkgs/applications/networking/cluster/octant/plugins/starboard-octant-plugin.nix

@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "starboard-octant-plugin";
-  version = "0.7.0";
+  version = "0.7.1";
 
   src = fetchFromGitHub {
     owner = "aquasecurity";
     repo = pname;
     rev = "v${version}";
-    sha256 = "140m7mnpqhfbp2qqpr3jjsc770xdph98mm5zpgwzg0jwgpsrcxsm";
+    sha256 = "11c8znbijhvxl2mas205mb18sqw868l6c86ah5hlkqh3niq2gmv3";
   };
 
-  vendorSha256 = "0aphx2rpnvzmfyfs11hf8j5b7s5lgw4kcq4jpdrkjwx7zhl6qx2g";
+  vendorSha256 = "0rmynfm5afjxc2lxy2rh9y6zhdd2q95wji2q8hcz78zank43rkcq";
 
   meta = with lib; {
     description = "Octant plugin for viewing Starboard security information";

pkgs/development/libraries/libtorrent-rasterbar/1.2/default.nix

@@ -3,8 +3,7 @@
 }:
 
 let
-  version = "1.2.6";
+  version = "1.2.11";
-  formattedVersion = stdenv.lib.replaceChars ["."] ["_"] version;
 
   # 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}";
+    rev = "v${version}";
-    sha256 = "140gc9j6lymy5kr0gviqznpg4hl57rz2q6vpb9sjkkimr19lrvdr";
+    sha256 = "05qm8mcyxsnb6zb8nckln1gkk8ncwzfhsz7d7p3fhx6gdsc8j71b";
   };
 
   enableParallelBuilding = true;

pkgs/development/libraries/libtorrent-rasterbar/2.0/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;
+  };
+}

pkgs/development/python-modules/awkward/default.nix

@@ -9,12 +9,12 @@
 }:
 
 buildPythonPackage rec {
-  pname = "awkward1";
+  pname = "awkward";
-  version = "0.4.5";
+  version = "1.0.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "8c786d1641343e9887c21794f9a3bf51716b00ed3b182491f1acbc9e389b31bb";
+    sha256 = "d856b4a166ae054363368aed2e4a44338fec069baa4242e7d567c8323ebcc1eb";
   };
 
   nativeBuildInputs = [ cmake ];

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; {

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 ];
+  };
+}

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

pkgs/development/tools/knightos/scas/default.nix

@@ -1,26 +1,26 @@
 { fetchFromGitHub, stdenv, cmake }:
 
-
 stdenv.mkDerivation rec {
   pname = "scas";
 
-  version = "0.4.6";
+  version = "0.5.3";
 
   src = fetchFromGitHub {
     owner = "KnightOS";
     repo = "scas";
     rev = version;
-    sha256 = "1c6s9nivbwgv0f8n7j73h54ydgqw5dcpq8l752dfrnqg3kv3nn0h";
+    sha256 = "0z6r07cl92kq860ddas5p88l990ih9cfqlzy5y4mk5hrmjzya60j";
   };
 
-  nativeBuildInputs = [ cmake ];
+  cmakeFlags = [ "-DSCAS_LIBRARY=1" ];
 
-  hardeningDisable = [ "format" ];
+  nativeBuildInputs = [ cmake ];
 
   meta = with stdenv.lib; {
     homepage    = "https://knightos.org/";
     description = "Assembler and linker for the Z80";
     license     = licenses.mit;
     maintainers = with maintainers; [ siraben ];
+    platforms   = platforms.unix;
   };
 }

pkgs/development/tools/knightos/z80e/default.nix

@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "z80e";
-  version = "0.5.0";
+  version = "0.5.2";
 
   src = fetchFromGitHub {
     owner = "KnightOS";
     repo = "z80e";
     rev = version;
-    sha256 = "18nnip6nv1pq19bxgd07fv7ci3c5yj8d9cip97a4zsfab7bmbq6k";
+    sha256 = "0gdv17ynjd6zf3i4hkimd89xkrd8kxas3bf8d5sq54fdicapvkzc";
   };
 
   nativeBuildInputs = [ cmake knightos-scas ];

pkgs/games/openxray/default.nix

@@ -66,7 +66,7 @@ in stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
-    description = "X-Ray Engine 1.6 expansion. Original version was used in S.T.A.L.K.E.R.: Call of Pripyat";
+    description = "Improved version of the X-Ray Engine, the game engine used in the world-famous S.T.A.L.K.E.R. game series by GSC Game World";
     homepage = src.meta.homepage;
     license = licenses.unfree // {
       url = "https://github.com/OpenXRay/xray-16/blob/xd_dev/License.txt";

pkgs/servers/monitoring/fusion-inventory/default.nix

@@ -1,32 +1,18 @@
-{ stdenv, lib, fetchurl, perlPackages, nix, dmidecode, pciutils, usbutils, iproute, nettools
+{ stdenv, lib, perlPackages, nix, dmidecode, pciutils, usbutils, iproute, nettools
 , fetchFromGitHub, makeWrapper
 }:
 
 perlPackages.buildPerlPackage rec {
   pname = "FusionInventory-Agent";
-  version = "2.3.21";
+  version = "2.6";
 
   src = fetchFromGitHub {
     owner = "fusioninventory";
     repo = "fusioninventory-agent";
     rev = version;
-    sha256 = "034clffcn0agx85macjgml4lyhvvck7idn94pqd2c77pk6crvw2y";
+    sha256 = "1hbp5a9m03n6a80xc8z640zs71qhqk4ifafr6fp0vvzzvq097ip2";
   };
 
-  patches = [
-    ./remove_software_test.patch
-    # support for os-release file
-    (fetchurl {
-      url = "https://github.com/fusioninventory/fusioninventory-agent/pull/396.diff";
-      sha256 = "0bxrjmff80ab01n23xggci32ajsah6zvcmz5x4hj6ayy6dzwi6jb";
-    })
-    # support for Nix software inventory
-    (fetchurl {
-      url = "https://github.com/fusioninventory/fusioninventory-agent/pull/397.diff";
-      sha256 = "0pyf7mp0zsb3zcqb6yysr1zfp54p9ciwjn1pzayw6s9flmcgrmbw";
-    })
-    ];
-
   postPatch = ''
 
     patchShebangs bin
@@ -68,6 +54,9 @@ perlPackages.buildPerlPackage rec {
     XMLTreePP
   ];
 
+  # Test fails due to "Argument list too long"
+  doCheck = false;
+
   installPhase = ''
     mkdir -p $out
 

pkgs/servers/monitoring/fusion-inventory/remove_software_test.patch

@@ -1,67 +0,0 @@
-diff --git a/t/agent/snmp/live.t b/t/agent/snmp/live.t
-index 8ee7ff02c..bd5551ab3 100755
---- a/t/agent/snmp/live.t
-+++ b/t/agent/snmp/live.t
-@@ -11,7 +11,7 @@ use Test::More;
- use FusionInventory::Agent::XML::Response;
- use FusionInventory::Agent::SNMP::Live;
- 
--plan tests => 12;
-+plan tests => 11;
- 
- my $snmp;
- throws_ok {
-@@ -52,15 +52,6 @@ throws_ok {
- } qr/^Unable to resolve the UDP\/IPv4 address "none"/,
- 'instanciation: unresolvable host';
- 
--throws_ok {
--    $snmp = FusionInventory::Agent::SNMP::Live->new(
--        version   => 1,
--        community => 'public',
--        hostname  => '1.1.1.1'
--    );
--} qr/no response from host 1.1.1.1/,
--'instanciation: unresponding host';
--
- SKIP: {
- skip 'live SNMP test disabled', 6 unless $ENV{TEST_LIVE_SNMP};
- 
-diff --git a/t/apps/agent.t b/t/apps/agent.t
-index c0f6fc52f..c83837d70 100755
---- a/t/apps/agent.t
-+++ b/t/apps/agent.t
-@@ -12,7 +12,7 @@ use XML::TreePP;
- use FusionInventory::Agent::Tools;
- use FusionInventory::Test::Utils;
- 
--plan tests => 34;
-+plan tests => 33;
- 
- my ($content, $out, $err, $rc);
- 
-@@ -71,11 +71,6 @@ subtest "first inventory execution and content" => sub {
-     check_content_ok($out);
- };
- 
--ok(
--    exists $content->{REQUEST}->{CONTENT}->{SOFTWARES},
--    'inventory has software'
--);
--
- ok(
-     exists $content->{REQUEST}->{CONTENT}->{ENVS},
-     'inventory has environment variables'
-diff --git a/t/tasks/inventory/linux/softwares.t b/t/tasks/inventory/linux/softwares.t
-index 72a0e578c..13944f34f 100755
---- a/t/tasks/inventory/linux/softwares.t
-+++ b/t/tasks/inventory/linux/softwares.t
-@@ -89,7 +89,7 @@ my $rpm_packages = [
-         PUBLISHER   => 'Mageia.Org',
-         NAME        => 'xfsprogs',
-         COMMENTS    => 'Utilities for managing the XFS filesystem',
--        INSTALLDATE => '25/03/2012',
-+        INSTALLDATE => '24/03/2012',
-         FILESIZE    => '3628382',
-         FROM        => 'rpm',
-         ARCH        => 'x86_64',

pkgs/servers/sql/postgresql/ext/postgis.nix

@@ -15,13 +15,13 @@
 }:
 stdenv.mkDerivation rec {
   pname = "postgis";
-  version = "3.0.3";
+  version = "3.1.0";
 
   outputs = [ "out" "doc" ];
 
   src = fetchurl {
     url = "https://download.osgeo.org/postgis/source/postgis-${version}.tar.gz";
-    sha256 = "05s8cx1rlysiq7dd44kf7cid0la61a4p895j9g95bvfb8v8dpzh7";
+    sha256 = "008280ijd6m9h35y9lcpql0fk0h9f3zkc1pfkdm0rkbnd12y41ns";
   };
 
   buildInputs = [ libxml2 postgresql geos proj gdal json_c protobufc ]

pkgs/tools/security/rbw/default.nix

@@ -20,15 +20,15 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "rbw";
-  version = "0.5.0";
+  version = "0.5.2";
 
   src = fetchCrate {
     inherit version;
     crateName = pname;
-    sha256 = "0p37kwkp153mkns4bh7k7gnksk6c31214wlw3faf42daav32mmgw";
+    sha256 = "1mxl71yz2iy5s6pbp33cwkfzzilkla4qqiskd6jsd5fdlrrwlxqm";
   };
 
-  cargoSha256 = "1vkgh0995xx0hr96mnzmdgd15gs6da7ynywqcjgcw5kr48bf1063";
+  cargoSha256 = "19gznam64s17kha3accgjks5rmd9kpqqgxg3dfrk7fg5v4431007";
 
   nativeBuildInputs = [
     pkgconfig
@@ -72,6 +72,7 @@ rustPlatform.buildRustPackage rec {
   meta = with lib; {
     description = "Unofficial command line client for Bitwarden";
     homepage = "https://crates.io/crates/rbw";
+    changelog = "https://git.tozt.net/rbw/plain/CHANGELOG.md?id=${version}";
     license = licenses.mit;
     maintainers = with maintainers; [ albakham luc65r marsam ];
   };

pkgs/tools/system/daemon/default.nix

@@ -9,7 +9,11 @@ stdenv.mkDerivation rec {
     sha256 = "0b17zzl7bqnkn7a4pr3l6fxqfmxfld7izphrab5nvhc4wzng4spn";
   };
 
-  makeFlags = [ "PREFIX=$(out)" ];
+  makeFlags = [
+    "PREFIX=$(out)"
+    "CC=${stdenv.cc.targetPrefix}cc"
+  ];
+
   buildInputs = [ perl ];
 
   meta = with stdenv.lib; {

pkgs/top-level/all-packages.nix

@@ -3333,7 +3333,7 @@ in
 
   deluge-2_x = callPackage ../applications/networking/p2p/deluge/2 {
     pythonPackages = python3Packages;
-    libtorrentRasterbar = libtorrentRasterbar.override { python = python3; };
+    libtorrentRasterbar = libtorrentRasterbar-1_2_x.override { python = python3; };
   };
   deluge-1_x = callPackage ../applications/networking/p2p/deluge/1 {
     pythonPackages = python2Packages;
@@ -14670,13 +14670,18 @@ in
 
   libtomcrypt = callPackage ../development/libraries/libtomcrypt { };
 
+  libtorrentRasterbar-2_0_x = callPackage ../development/libraries/libtorrent-rasterbar/2.0 {
+    inherit (darwin.apple_sdk.frameworks) SystemConfiguration;
+    python = python3;
+  };
+
   libtorrentRasterbar-1_2_x = callPackage ../development/libraries/libtorrent-rasterbar/1.2 {
     inherit (darwin.apple_sdk.frameworks) SystemConfiguration;
   };
 
   libtorrentRasterbar-1_1_x = callPackage ../development/libraries/libtorrent-rasterbar/1.1 { };
 
-  libtorrentRasterbar = libtorrentRasterbar-1_2_x;
+  libtorrentRasterbar = libtorrentRasterbar-2_0_x;
 
   # this is still the new version of the old API
   libtoxcore-new = callPackage ../development/libraries/libtoxcore/new-api.nix { };

pkgs/top-level/python-packages.nix

@@ -505,7 +505,7 @@ in {
   awesome-slugify = callPackage ../development/python-modules/awesome-slugify { };
 
   awkward0 = callPackage ../development/python-modules/awkward0 { };
-  awkward1 = callPackage ../development/python-modules/awkward1 { };
+  awkward = callPackage ../development/python-modules/awkward { };
 
   aws-adfs = callPackage ../development/python-modules/aws-adfs { };
 
@@ -3514,7 +3514,10 @@ in {
 
   libtmux = callPackage ../development/python-modules/libtmux { };
 
-  libtorrentRasterbar = (toPythonModule (pkgs.libtorrentRasterbar.override { inherit python; })).python;
+  libtorrentRasterbar = if isPy27 then
+    (toPythonModule (pkgs.libtorrentRasterbar-1_2_x.override { inherit python; })).python
+  else
+    (toPythonModule (pkgs.libtorrentRasterbar.override { inherit python; })).python;
 
   libusb1 = callPackage ../development/python-modules/libusb1 { inherit (pkgs) libusb1; };
 
@@ -7858,6 +7861,8 @@ in {
 
   WSME = callPackage ../development/python-modules/WSME { };
 
+  wsnsimpy = callPackage ../development/python-modules/wsnsimpy { };
+
   wsproto = if (pythonAtLeast "3.6") then
     callPackage ../development/python-modules/wsproto { }
   else