Merge master into staging-next

pkgs/applications/audio/strawberry/default.nix

···
 in
 stdenv.mkDerivation rec {
   pname = "strawberry";
-  version = "1.0.8";
+  version = "1.0.9";
 
   src = fetchFromGitHub {
     owner = "jonaski";
     repo = pname;
     rev = version;
-    hash = "sha256-NhouAHr5fKdH62rtCIHlr8ennixIf9YQrf4zRIGjfxs=";
+    hash = "sha256-l6q9iTC3K7SwD0KfVVtXUGzeyuuR6OxtPkaj85s+qT4=";
   };
 
   # the big strawberry shown in the context menu is *very* much in your face, so use the grey version instead

pkgs/applications/networking/instant-messengers/caprine-bin/build-from-appimage.nix

···
 }:
 
 let
-  name = "${pname}-${version}";
   src = fetchurl {
     url = "https://github.com/sindresorhus/caprine/releases/download/v${version}/Caprine-${version}.AppImage";
     name = "Caprine-${version}.AppImage";
     inherit sha256;
   };
-  extracted = appimageTools.extractType2 { inherit name src; };
+  extracted = appimageTools.extractType2 { inherit pname version src; };
 in
 (appimageTools.wrapType2 {
-  inherit name src;
+  inherit pname version src;
+
+  passthru = {
+    inherit pname version src;
+  };
 
   profile = ''
     export LC_ALL=C.UTF-8
···
   extraPkgs = pkgs: appimageTools.defaultFhsEnvArgs.multiPkgs pkgs;
 
   extraInstallCommands = ''
-    mv $out/bin/{${name},caprine}
+    mv $out/bin/{${pname}-${version},caprine}
 
     mkdir -p $out/share
     "${xorg.lndir}/bin/lndir" -silent "${extracted}/usr/share" "$out/share"
···
     platforms = [ "x86_64-linux" ];
     mainProgram = "caprine";
   };
-}) // {
-  inherit pname version;
-}
+})

pkgs/applications/networking/instant-messengers/caprine-bin/default.nix

···
 { lib, callPackage, stdenvNoCC }:
 let
   pname = "caprine";
-  version = "2.55.4";
+  version = "2.55.5";
   metaCommon = with lib; {
     description = "An elegant Facebook Messenger desktop app";
     homepage = "https://sindresorhus.com/caprine";
···
   };
   x86_64-appimage = callPackage ./build-from-appimage.nix {
     inherit pname version metaCommon;
-    sha256 = "221PyDoCkWqDdewCkFycpjMTcVOcl58blCjrC7O7xyk=";
+    sha256 = "MMbyiLBrdMGENRq493XzkcsDoXr3Aq3rXAni1egkPbo=";
   };
   x86_64-dmg = callPackage ./build-from-dmg.nix {
     inherit pname version metaCommon;
-    sha256 = "6SOqlH7Z9DuQVR4i1OltnSb4dJscFUxaXxgNkE5FVUE=";
+    sha256 = "1txuSQk6tH0xsjPk5cWUVnaAw4XBOr1+Fel06NLKFfk=";
   };
 in
 (if stdenvNoCC.isDarwin then x86_64-dmg else x86_64-appimage).overrideAttrs (oldAttrs: {

pkgs/applications/networking/ipfs-upload-client/default.nix

···
+{ lib, buildGoModule, fetchFromGitHub }:
+
+buildGoModule rec {
+  pname = "ipfs-upload-client";
+  version = "0.1.1";
+
+  src = fetchFromGitHub {
+    owner = "infura";
+    repo = "ipfs-upload-client";
+    rev = "v${version}";
+    sha256 = "sha256-O9N2QGQDNk/nwpuJrJKy9arN3gjsBAL+IdghfSaUrCw=";
+  };
+
+  vendorSha256 = "sha256-YzIUoN/B4TBlAfmvORrR9Gy+lMzwlaePm8yBoMsPaYU=";
+
+  meta = with lib; {
+    description = "A minimal CLI tool to upload files and directories to IPFS via Infura's IPFS or another API endpoint";
+    homepage = "https://github.com/INFURA/ipfs-upload-client";
+    license = licenses.mit;
+    maintainers = with maintainers; [ matthewcroughan ];
+  };
+}

pkgs/applications/radio/rscw/default.nix

···
+{ lib
+, stdenv
+, fetchurl
+, fftw
+, gtk2
+, pkg-config
+}:
+
+stdenv.mkDerivation rec {
+  pname = "rscw";
+  version = "0.1e";
+
+  src = fetchurl {
+    url = "https://www.pa3fwm.nl/software/${pname}/${pname}-${version}.tgz";
+    sha256 = "1hxwxmqc5jinr14ya1idigqigc8qhy1vimzcwy2vmwdjay2sqik2";
+  };
+
+  setSourceRoot = "sourceRoot=`pwd`";
+
+  nativeBuildInputs = [ pkg-config ];
+  buildInputs = [ gtk2 fftw ];
+
+  installPhase = ''
+    install -D -m 0755 noisycw $out/bin/noisycw
+    install -D -m 0755 rs12tlmdec $out/bin/rs12tlmdec
+    install -D -m 0755 rscw $out/bin/rscw
+    install -D -m 0755 rscwx $out/bin/rscwx
+  '';
+
+  meta = with lib; {
+    description = "Receive CW through the soundcard";
+    homepage = "https://www.pa3fwm.nl/software/rscw/";
+    license = licenses.gpl2;
+    maintainers = with maintainers; [ earldouglas ];
+    platforms = platforms.linux;
+  };
+}

pkgs/development/libraries/isa-l/default.nix

···
     homepage = "https://github.com/intel/isa-l";
     maintainers = with maintainers; [ jbedo ];
     platforms = platforms.all;
+    broken = stdenv.isDarwin && stdenv.isAarch64; # does not build on M1 mac (asm/hwcap.h file not found) maybe needs gcc not clang?
   };
 }

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

···
 
 buildPythonPackage rec {
   pname = "asysocks";
-  version = "0.2.0";
+  version = "0.2.1";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-1mrXgwWI1XGmN3J9HJBktHFowIEU+RPt9L6S4ylHTzw=";
+    sha256 = "sha256-j0UWCI6+x/CNjFSeXnXnqGtB5gQ6+SC6SJXPP2xlQVA=";
   };
 
   propagatedBuildInputs = [

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

···
 
 buildPythonPackage rec {
   pname = "gehomesdk";
-  version = "0.5.0";
+  version = "0.5.6";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-XxJEiWiblnvKCfcM8sNFEjV2gw7cc7A9P6H4JEAleRQ=";
+    sha256 = "sha256-EW26TzmD+F2IkzJkcoUdfYIJ3vkBYQhIFiEqnfDSmiw=";
   };
 
   propagatedBuildInputs = [

pkgs/development/python-modules/piccolo-theme/default.nix

···
+{ lib, buildPythonPackage, fetchPypi, sphinx }:
+
+buildPythonPackage rec {
+  pname = "piccolo-theme";
+  version = "0.12.0";
+
+  src = fetchPypi {
+    pname = "piccolo_theme";
+    inherit version;
+    sha256 = "sha256-o6uaqAo/Nb28doByq40XakKJpA4o6/Z/PzMhmb058FE=";
+  };
+
+  propagatedBuildInputs = [
+    sphinx
+  ];
+
+  pythonImportsCheck = [ "piccolo_theme" ];
+
+  meta = with lib; {
+    description = "Clean and modern Sphinx theme";
+    homepage = "https://piccolo-theme.readthedocs.io";
+    license = licenses.mit;
+    maintainers = with maintainers; [ loicreynier ];
+    platforms = platforms.unix;
+  };
+}

pkgs/tools/networking/checkip/default.nix

···
 
 buildGoModule rec {
   pname = "checkip";
-  version = "0.40.1";
+  version = "0.40.3";
 
   src = fetchFromGitHub {
     owner = "jreisinger";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-SPfr88ZEIFlbU4ofuxb2I42L7FR4EXbckCVylEQHfN4=";
+    sha256 = "sha256-XUSEmRd7wUN9b3QaVZtIfugw4hXpB4Nc9qk3m1NQS0o=";
   };
 
   vendorSha256 = "sha256-bFhSMjm9rqUUbCV9keeXm+yhzQMKrYKs1DbCt53J8aM=";

pkgs/tools/security/scilla/default.nix

···
 
 buildGoModule rec {
   pname = "scilla";
-  version = "1.2.2";
+  version = "1.2.3";
 
   src = fetchFromGitHub {
     owner = "edoardottt";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-1akwc/J1W1zMNqEc2Vv8wdElKbOVJ8uL3XXftGVwWnQ=";
+    sha256 = "sha256-VTX4NG3BzmLpf2sIxZ5DGjg9dnCTSO0VbGx2PMhjBPg=";
   };
 
-  vendorSha256 = "sha256-uTL2qr/LWmdmZipfnbzzzIx6X3fJtB1A9uYekogZN3w=";
+  vendorSha256 = "sha256-aoz2H7hkk85ntao6e5Chn++T2kA5jogHrd/ltVqNS3A=";
 
   meta = with lib; {
     description = "Information gathering tool for DNS, ports and more";

pkgs/tools/security/sx-go/default.nix

···
 
 buildGoModule rec {
   pname = "sx-go";
-  version = "0.4.0";
+  version = "0.5.0";
 
   src = fetchFromGitHub {
     owner = "v-byte-cpu";
     repo = "sx";
     rev = "v${version}";
-    sha256 = "0djpwy40wj5asky8a16i7a117816p8g94p5y0wkl74jp07cybmrl";
+    sha256 = "sha256-HTIzA1QOVn3V/hGUu7wLIYUNYmcJ/FXi2yr6BGRizZA=";
   };
 
-  vendorSha256 = "0n1h9jch0zfafli8djjr6wkgfxxpnh4q873d5mr1xg8a25qhlifr";
+  vendorSha256 = "sha256-TWRMNt6x8zuvhP1nz4R6IVCX+9HityvVpzxRhDiMyO4=";
 
   buildInputs = [
     libpcap

pkgs/tools/security/tlsx/default.nix

···
 
 buildGoModule rec {
   pname = "tlsx";
-  version = "0.0.6";
+  version = "0.0.7";
 
   src = fetchFromGitHub {
     owner = "projectdiscovery";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-0/J+2TDY63Zj40GzdL7M4ApJJ6xtqZWMIQnl3GSlvQA=";
+    hash = "sha256-tyZDmtqQLTV06mLo1lg/qWRjvxvgVvGpoRXWX9HtXeo=";
   };
 
   vendorSha256 = "sha256-ERZ4mWmtOsW1nYUshSbCzhy+KcujviPtL4LS/soPrFQ=";

pkgs/tools/security/uncover/default.nix

···
 
 buildGoModule rec {
   pname = "uncover";
-  version = "0.0.6";
+  version = "0.0.7";
 
   src = fetchFromGitHub {
     owner = "projectdiscovery";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-iWSaNfRZJ59C7DWsPett9zM6hi/kOtpxlkw2haMeuaY=";
+    hash = "sha256-xQHcJgbWYOvAsoZNzBB7uEs9qIsKGitmurruE+dwjt8=";
   };
 
-  vendorSha256 = "sha256-M50pQJCzEXSBXUsjwxlM8s1WgcPwZgBpArUExLP+bRY=";
+  vendorSha256 = "sha256-FePZWseFEbBhBIsojw67SCZufSJygekZjlk0d7aceak=";
 
   meta = with lib; {
     description = "API wrapper to search for exposed hosts";

pkgs/tools/security/vault-medusa/default.nix

···
+{ lib, fetchFromGitHub, buildGoModule }:
+
+buildGoModule rec {
+  pname = "vault-medusa";
+  version = "0.3.5";
+
+  src = fetchFromGitHub {
+    owner = "jonasvinther";
+    repo = "medusa";
+    rev = "v${version}";
+    sha256 = "sha256-W5OkLOtRH1l/h3liV7ANyS3jqu0IGM5ZnZGAk/Yaz6I=";
+  };
+
+  vendorSha256 = "sha256-mlZHA5XGtOg4yd1iepWvxPWx0VaIY3XotlW6CEm7i1k=";
+
+  meta = with lib; {
+    description = "A cli tool for importing and exporting Hashicorp Vault secrets";
+    homepage = "https://github.com/jonasvinther/medusa";
+    license = licenses.mit;
+    maintainers = with maintainers; [ "bpaulin" ];
+  };
+}

pkgs/top-level/all-packages.nix

···
   ipfs-migrator-unwrapped = callPackage ../applications/networking/ipfs-migrator/unwrapped.nix { };
   ipfs-migrator = callPackage ../applications/networking/ipfs-migrator { };
 
+  ipfs-upload-client = callPackage ../applications/networking/ipfs-upload-client { };
+
   ipget = callPackage ../applications/networking/ipget { };
 
   i-pi = with python3Packages; toPythonApplication i-pi;
···
   rpmextract = callPackage ../tools/archivers/rpmextract { };
 
   rrdtool = callPackage ../tools/misc/rrdtool { };
+
+  rscw = callPackage ../applications/radio/rscw { };
 
   rset = callPackage ../tools/admin/rset { };
 
···
   unixcw = libsForQt5.callPackage ../applications/radio/unixcw { };
 
   vault = callPackage ../tools/security/vault { };
+
+  vault-medusa = callPackage ../tools/security/vault-medusa { };
 
   vault-bin = callPackage ../tools/security/vault/vault-bin.nix { };
 

pkgs/top-level/python-packages.nix

···
 
   picos = callPackage ../development/python-modules/picos { };
 
+  piccolo-theme = callPackage ../development/python-modules/piccolo-theme { };
+
   pid = callPackage ../development/python-modules/pid { };
 
   piep = callPackage ../development/python-modules/piep { };