Merge master into staging-next

authored by github-actions[bot] and committed by GitHub 527502c9 f8118e6f

+146 -29
+2 -2
pkgs/applications/audio/strawberry/default.nix
··· 42 42 in 43 43 stdenv.mkDerivation rec { 44 44 pname = "strawberry"; 45 - version = "1.0.8"; 45 + version = "1.0.9"; 46 46 47 47 src = fetchFromGitHub { 48 48 owner = "jonaski"; 49 49 repo = pname; 50 50 rev = version; 51 - hash = "sha256-NhouAHr5fKdH62rtCIHlr8ennixIf9YQrf4zRIGjfxs="; 51 + hash = "sha256-l6q9iTC3K7SwD0KfVVtXUGzeyuuR6OxtPkaj85s+qT4="; 52 52 }; 53 53 54 54 # the big strawberry shown in the context menu is *very* much in your face, so use the grey version instead
+8 -7
pkgs/applications/networking/instant-messengers/caprine-bin/build-from-appimage.nix
··· 9 9 }: 10 10 11 11 let 12 - name = "${pname}-${version}"; 13 12 src = fetchurl { 14 13 url = "https://github.com/sindresorhus/caprine/releases/download/v${version}/Caprine-${version}.AppImage"; 15 14 name = "Caprine-${version}.AppImage"; 16 15 inherit sha256; 17 16 }; 18 - extracted = appimageTools.extractType2 { inherit name src; }; 17 + extracted = appimageTools.extractType2 { inherit pname version src; }; 19 18 in 20 19 (appimageTools.wrapType2 { 21 - inherit name src; 20 + inherit pname version src; 21 + 22 + passthru = { 23 + inherit pname version src; 24 + }; 22 25 23 26 profile = '' 24 27 export LC_ALL=C.UTF-8 ··· 27 30 extraPkgs = pkgs: appimageTools.defaultFhsEnvArgs.multiPkgs pkgs; 28 31 29 32 extraInstallCommands = '' 30 - mv $out/bin/{${name},caprine} 33 + mv $out/bin/{${pname}-${version},caprine} 31 34 32 35 mkdir -p $out/share 33 36 "${xorg.lndir}/bin/lndir" -silent "${extracted}/usr/share" "$out/share" ··· 42 45 platforms = [ "x86_64-linux" ]; 43 46 mainProgram = "caprine"; 44 47 }; 45 - }) // { 46 - inherit pname version; 47 - } 48 + })
+3 -3
pkgs/applications/networking/instant-messengers/caprine-bin/default.nix
··· 1 1 { lib, callPackage, stdenvNoCC }: 2 2 let 3 3 pname = "caprine"; 4 - version = "2.55.4"; 4 + version = "2.55.5"; 5 5 metaCommon = with lib; { 6 6 description = "An elegant Facebook Messenger desktop app"; 7 7 homepage = "https://sindresorhus.com/caprine"; ··· 10 10 }; 11 11 x86_64-appimage = callPackage ./build-from-appimage.nix { 12 12 inherit pname version metaCommon; 13 - sha256 = "221PyDoCkWqDdewCkFycpjMTcVOcl58blCjrC7O7xyk="; 13 + sha256 = "MMbyiLBrdMGENRq493XzkcsDoXr3Aq3rXAni1egkPbo="; 14 14 }; 15 15 x86_64-dmg = callPackage ./build-from-dmg.nix { 16 16 inherit pname version metaCommon; 17 - sha256 = "6SOqlH7Z9DuQVR4i1OltnSb4dJscFUxaXxgNkE5FVUE="; 17 + sha256 = "1txuSQk6tH0xsjPk5cWUVnaAw4XBOr1+Fel06NLKFfk="; 18 18 }; 19 19 in 20 20 (if stdenvNoCC.isDarwin then x86_64-dmg else x86_64-appimage).overrideAttrs (oldAttrs: {
+22
pkgs/applications/networking/ipfs-upload-client/default.nix
··· 1 + { lib, buildGoModule, fetchFromGitHub }: 2 + 3 + buildGoModule rec { 4 + pname = "ipfs-upload-client"; 5 + version = "0.1.1"; 6 + 7 + src = fetchFromGitHub { 8 + owner = "infura"; 9 + repo = "ipfs-upload-client"; 10 + rev = "v${version}"; 11 + sha256 = "sha256-O9N2QGQDNk/nwpuJrJKy9arN3gjsBAL+IdghfSaUrCw="; 12 + }; 13 + 14 + vendorSha256 = "sha256-YzIUoN/B4TBlAfmvORrR9Gy+lMzwlaePm8yBoMsPaYU="; 15 + 16 + meta = with lib; { 17 + description = "A minimal CLI tool to upload files and directories to IPFS via Infura's IPFS or another API endpoint"; 18 + homepage = "https://github.com/INFURA/ipfs-upload-client"; 19 + license = licenses.mit; 20 + maintainers = with maintainers; [ matthewcroughan ]; 21 + }; 22 + }
+37
pkgs/applications/radio/rscw/default.nix
··· 1 + { lib 2 + , stdenv 3 + , fetchurl 4 + , fftw 5 + , gtk2 6 + , pkg-config 7 + }: 8 + 9 + stdenv.mkDerivation rec { 10 + pname = "rscw"; 11 + version = "0.1e"; 12 + 13 + src = fetchurl { 14 + url = "https://www.pa3fwm.nl/software/${pname}/${pname}-${version}.tgz"; 15 + sha256 = "1hxwxmqc5jinr14ya1idigqigc8qhy1vimzcwy2vmwdjay2sqik2"; 16 + }; 17 + 18 + setSourceRoot = "sourceRoot=`pwd`"; 19 + 20 + nativeBuildInputs = [ pkg-config ]; 21 + buildInputs = [ gtk2 fftw ]; 22 + 23 + installPhase = '' 24 + install -D -m 0755 noisycw $out/bin/noisycw 25 + install -D -m 0755 rs12tlmdec $out/bin/rs12tlmdec 26 + install -D -m 0755 rscw $out/bin/rscw 27 + install -D -m 0755 rscwx $out/bin/rscwx 28 + ''; 29 + 30 + meta = with lib; { 31 + description = "Receive CW through the soundcard"; 32 + homepage = "https://www.pa3fwm.nl/software/rscw/"; 33 + license = licenses.gpl2; 34 + maintainers = with maintainers; [ earldouglas ]; 35 + platforms = platforms.linux; 36 + }; 37 + }
+1
pkgs/development/libraries/isa-l/default.nix
··· 23 23 homepage = "https://github.com/intel/isa-l"; 24 24 maintainers = with maintainers; [ jbedo ]; 25 25 platforms = platforms.all; 26 + broken = stdenv.isDarwin && stdenv.isAarch64; # does not build on M1 mac (asm/hwcap.h file not found) maybe needs gcc not clang? 26 27 }; 27 28 }
+2 -2
pkgs/development/python-modules/asysocks/default.nix
··· 7 7 8 8 buildPythonPackage rec { 9 9 pname = "asysocks"; 10 - version = "0.2.0"; 10 + version = "0.2.1"; 11 11 format = "setuptools"; 12 12 13 13 disabled = pythonOlder "3.7"; 14 14 15 15 src = fetchPypi { 16 16 inherit pname version; 17 - sha256 = "sha256-1mrXgwWI1XGmN3J9HJBktHFowIEU+RPt9L6S4ylHTzw="; 17 + sha256 = "sha256-j0UWCI6+x/CNjFSeXnXnqGtB5gQ6+SC6SJXPP2xlQVA="; 18 18 }; 19 19 20 20 propagatedBuildInputs = [
+2 -2
pkgs/development/python-modules/gehomesdk/default.nix
··· 13 13 14 14 buildPythonPackage rec { 15 15 pname = "gehomesdk"; 16 - version = "0.5.0"; 16 + version = "0.5.6"; 17 17 format = "setuptools"; 18 18 19 19 disabled = pythonOlder "3.7"; 20 20 21 21 src = fetchPypi { 22 22 inherit pname version; 23 - sha256 = "sha256-XxJEiWiblnvKCfcM8sNFEjV2gw7cc7A9P6H4JEAleRQ="; 23 + sha256 = "sha256-EW26TzmD+F2IkzJkcoUdfYIJ3vkBYQhIFiEqnfDSmiw="; 24 24 }; 25 25 26 26 propagatedBuildInputs = [
+26
pkgs/development/python-modules/piccolo-theme/default.nix
··· 1 + { lib, buildPythonPackage, fetchPypi, sphinx }: 2 + 3 + buildPythonPackage rec { 4 + pname = "piccolo-theme"; 5 + version = "0.12.0"; 6 + 7 + src = fetchPypi { 8 + pname = "piccolo_theme"; 9 + inherit version; 10 + sha256 = "sha256-o6uaqAo/Nb28doByq40XakKJpA4o6/Z/PzMhmb058FE="; 11 + }; 12 + 13 + propagatedBuildInputs = [ 14 + sphinx 15 + ]; 16 + 17 + pythonImportsCheck = [ "piccolo_theme" ]; 18 + 19 + meta = with lib; { 20 + description = "Clean and modern Sphinx theme"; 21 + homepage = "https://piccolo-theme.readthedocs.io"; 22 + license = licenses.mit; 23 + maintainers = with maintainers; [ loicreynier ]; 24 + platforms = platforms.unix; 25 + }; 26 + }
+2 -2
pkgs/tools/networking/checkip/default.nix
··· 5 5 6 6 buildGoModule rec { 7 7 pname = "checkip"; 8 - version = "0.40.1"; 8 + version = "0.40.3"; 9 9 10 10 src = fetchFromGitHub { 11 11 owner = "jreisinger"; 12 12 repo = pname; 13 13 rev = "v${version}"; 14 - sha256 = "sha256-SPfr88ZEIFlbU4ofuxb2I42L7FR4EXbckCVylEQHfN4="; 14 + sha256 = "sha256-XUSEmRd7wUN9b3QaVZtIfugw4hXpB4Nc9qk3m1NQS0o="; 15 15 }; 16 16 17 17 vendorSha256 = "sha256-bFhSMjm9rqUUbCV9keeXm+yhzQMKrYKs1DbCt53J8aM=";
+3 -3
pkgs/tools/security/scilla/default.nix
··· 5 5 6 6 buildGoModule rec { 7 7 pname = "scilla"; 8 - version = "1.2.2"; 8 + version = "1.2.3"; 9 9 10 10 src = fetchFromGitHub { 11 11 owner = "edoardottt"; 12 12 repo = pname; 13 13 rev = "v${version}"; 14 - sha256 = "sha256-1akwc/J1W1zMNqEc2Vv8wdElKbOVJ8uL3XXftGVwWnQ="; 14 + sha256 = "sha256-VTX4NG3BzmLpf2sIxZ5DGjg9dnCTSO0VbGx2PMhjBPg="; 15 15 }; 16 16 17 - vendorSha256 = "sha256-uTL2qr/LWmdmZipfnbzzzIx6X3fJtB1A9uYekogZN3w="; 17 + vendorSha256 = "sha256-aoz2H7hkk85ntao6e5Chn++T2kA5jogHrd/ltVqNS3A="; 18 18 19 19 meta = with lib; { 20 20 description = "Information gathering tool for DNS, ports and more";
+3 -3
pkgs/tools/security/sx-go/default.nix
··· 7 7 8 8 buildGoModule rec { 9 9 pname = "sx-go"; 10 - version = "0.4.0"; 10 + version = "0.5.0"; 11 11 12 12 src = fetchFromGitHub { 13 13 owner = "v-byte-cpu"; 14 14 repo = "sx"; 15 15 rev = "v${version}"; 16 - sha256 = "0djpwy40wj5asky8a16i7a117816p8g94p5y0wkl74jp07cybmrl"; 16 + sha256 = "sha256-HTIzA1QOVn3V/hGUu7wLIYUNYmcJ/FXi2yr6BGRizZA="; 17 17 }; 18 18 19 - vendorSha256 = "0n1h9jch0zfafli8djjr6wkgfxxpnh4q873d5mr1xg8a25qhlifr"; 19 + vendorSha256 = "sha256-TWRMNt6x8zuvhP1nz4R6IVCX+9HityvVpzxRhDiMyO4="; 20 20 21 21 buildInputs = [ 22 22 libpcap
+2 -2
pkgs/tools/security/tlsx/default.nix
··· 5 5 6 6 buildGoModule rec { 7 7 pname = "tlsx"; 8 - version = "0.0.6"; 8 + version = "0.0.7"; 9 9 10 10 src = fetchFromGitHub { 11 11 owner = "projectdiscovery"; 12 12 repo = pname; 13 13 rev = "v${version}"; 14 - hash = "sha256-0/J+2TDY63Zj40GzdL7M4ApJJ6xtqZWMIQnl3GSlvQA="; 14 + hash = "sha256-tyZDmtqQLTV06mLo1lg/qWRjvxvgVvGpoRXWX9HtXeo="; 15 15 }; 16 16 17 17 vendorSha256 = "sha256-ERZ4mWmtOsW1nYUshSbCzhy+KcujviPtL4LS/soPrFQ=";
+3 -3
pkgs/tools/security/uncover/default.nix
··· 5 5 6 6 buildGoModule rec { 7 7 pname = "uncover"; 8 - version = "0.0.6"; 8 + version = "0.0.7"; 9 9 10 10 src = fetchFromGitHub { 11 11 owner = "projectdiscovery"; 12 12 repo = pname; 13 13 rev = "v${version}"; 14 - hash = "sha256-iWSaNfRZJ59C7DWsPett9zM6hi/kOtpxlkw2haMeuaY="; 14 + hash = "sha256-xQHcJgbWYOvAsoZNzBB7uEs9qIsKGitmurruE+dwjt8="; 15 15 }; 16 16 17 - vendorSha256 = "sha256-M50pQJCzEXSBXUsjwxlM8s1WgcPwZgBpArUExLP+bRY="; 17 + vendorSha256 = "sha256-FePZWseFEbBhBIsojw67SCZufSJygekZjlk0d7aceak="; 18 18 19 19 meta = with lib; { 20 20 description = "API wrapper to search for exposed hosts";
+22
pkgs/tools/security/vault-medusa/default.nix
··· 1 + { lib, fetchFromGitHub, buildGoModule }: 2 + 3 + buildGoModule rec { 4 + pname = "vault-medusa"; 5 + version = "0.3.5"; 6 + 7 + src = fetchFromGitHub { 8 + owner = "jonasvinther"; 9 + repo = "medusa"; 10 + rev = "v${version}"; 11 + sha256 = "sha256-W5OkLOtRH1l/h3liV7ANyS3jqu0IGM5ZnZGAk/Yaz6I="; 12 + }; 13 + 14 + vendorSha256 = "sha256-mlZHA5XGtOg4yd1iepWvxPWx0VaIY3XotlW6CEm7i1k="; 15 + 16 + meta = with lib; { 17 + description = "A cli tool for importing and exporting Hashicorp Vault secrets"; 18 + homepage = "https://github.com/jonasvinther/medusa"; 19 + license = licenses.mit; 20 + maintainers = with maintainers; [ "bpaulin" ]; 21 + }; 22 + }
+6
pkgs/top-level/all-packages.nix
··· 7691 7691 ipfs-migrator-unwrapped = callPackage ../applications/networking/ipfs-migrator/unwrapped.nix { }; 7692 7692 ipfs-migrator = callPackage ../applications/networking/ipfs-migrator { }; 7693 7693 7694 + ipfs-upload-client = callPackage ../applications/networking/ipfs-upload-client { }; 7695 + 7694 7696 ipget = callPackage ../applications/networking/ipget { }; 7695 7697 7696 7698 i-pi = with python3Packages; toPythonApplication i-pi; ··· 10577 10579 rpmextract = callPackage ../tools/archivers/rpmextract { }; 10578 10580 10579 10581 rrdtool = callPackage ../tools/misc/rrdtool { }; 10582 + 10583 + rscw = callPackage ../applications/radio/rscw { }; 10580 10584 10581 10585 rset = callPackage ../tools/admin/rset { }; 10582 10586 ··· 36281 36285 unixcw = libsForQt5.callPackage ../applications/radio/unixcw { }; 36282 36286 36283 36287 vault = callPackage ../tools/security/vault { }; 36288 + 36289 + vault-medusa = callPackage ../tools/security/vault-medusa { }; 36284 36290 36285 36291 vault-bin = callPackage ../tools/security/vault/vault-bin.nix { }; 36286 36292
+2
pkgs/top-level/python-packages.nix
··· 6764 6764 6765 6765 picos = callPackage ../development/python-modules/picos { }; 6766 6766 6767 + piccolo-theme = callPackage ../development/python-modules/piccolo-theme { }; 6768 + 6767 6769 pid = callPackage ../development/python-modules/pid { }; 6768 6770 6769 6771 piep = callPackage ../development/python-modules/piep { };