diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 689503eb7a55..bc4be66d903f 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -13908,6 +13908,12 @@ githubId = 1962985; name = "Vincenzo Mantova"; }; + xyenon = { + name = "XYenon"; + email = "i@xyenon.bid"; + github = "xyenon"; + githubId = 20698483; + }; xzfc = { email = "xzfcpw@gmail.com"; github = "xzfc"; diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix index 1b96dce645ef..5e852275b4a1 100644 --- a/maintainers/team-list.nix +++ b/maintainers/team-list.nix @@ -142,6 +142,7 @@ with lib.maintainers; { tomberek ]; scope = "Maintain the Cosmopolitan LibC and related programs."; + shortName = "Cosmopolitan"; }; deshaw = { diff --git a/pkgs/applications/networking/browsers/brave/default.nix b/pkgs/applications/networking/browsers/brave/default.nix index 2983ced459f8..7833722c4d92 100644 --- a/pkgs/applications/networking/browsers/brave/default.nix +++ b/pkgs/applications/networking/browsers/brave/default.nix @@ -90,11 +90,11 @@ in stdenv.mkDerivation rec { pname = "brave"; - version = "1.38.115"; + version = "1.39.122"; src = fetchurl { url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb"; - sha256 = "sha256-YQpFsB3VVzsOa7PoZ+TLv10Dzm9z819cmyw7atnG/Cs="; + sha256 = "sha256-UJtVFvcVzfpdDbCkXs9UetS/1IUIn1mxUy7TcaXL5Jo="; }; dontConfigure = true; diff --git a/pkgs/applications/networking/nali/default.nix b/pkgs/applications/networking/nali/default.nix index 39a07d9d4ab0..f90ec3644c7c 100644 --- a/pkgs/applications/networking/nali/default.nix +++ b/pkgs/applications/networking/nali/default.nix @@ -2,22 +2,22 @@ buildGoModule rec { pname = "nali"; - version = "0.3.2"; + version = "0.4.2"; src = fetchFromGitHub { owner = "zu1k"; repo = "nali"; rev = "v${version}"; - sha256 = "sha256-iRLoUBA+Kzv1/LZQ8HCvR79K1riYErxEWhB0OmvFy2g="; + sha256 = "sha256-7NUUX4hDwvMBBQvxiB7P/lNHKgxwOFObdD6DUd0vX5c="; }; - vendorSha256 = "sha256-0u6n53hL2+GvqbYpAKN54n7uiTHSsgyjedt20nT1yRc="; + vendorSha256 = "sha256-Ld5HehK5MnPwl6KtIl0b4nQRiXO4DjKVPL1iti/WBIQ="; subPackages = [ "." ]; meta = with lib; { description = "An offline tool for querying IP geographic information and CDN provider"; homepage = "https://github.com/zu1k/nali"; license = licenses.mit; - maintainers = with maintainers; [ diffumist ]; + maintainers = with maintainers; [ diffumist xyenon ]; }; } diff --git a/pkgs/applications/science/logic/abc/default.nix b/pkgs/applications/science/logic/abc/default.nix index 4e808dd8f19e..11121d1f5584 100644 --- a/pkgs/applications/science/logic/abc/default.nix +++ b/pkgs/applications/science/logic/abc/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "abc-verifier"; - version = "2022.03.22"; + version = "2022.05.06"; src = fetchFromGitHub { owner = "yosyshq"; repo = "abc"; - rev = "00b674d5b3ccefc7f2abcbf5b650fc14298ac549"; - hash = "sha256-jQgHptARRuhlF+8R92so8PyBTI5t/q/rSGO5yce5WSs="; + rev = "09a7e6dac739133a927ae7064d319068ab927f90"; + hash = "sha256-+1UcYjK2mvhlTHl6lVCcj5q+1D8RUTquHaajSl5NuJg="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/applications/video/anime-downloader/default.nix b/pkgs/applications/video/anime-downloader/default.nix new file mode 100644 index 000000000000..cf8edb33dd87 --- /dev/null +++ b/pkgs/applications/video/anime-downloader/default.nix @@ -0,0 +1,51 @@ +{ lib, python3, aria2, mpv, nodejs, fetchFromGitHub }: + +python3.pkgs.buildPythonApplication rec { + pname = "anime-downloader"; + version = "5.0.14"; + + src = fetchFromGitHub { + owner = "anime-dl"; + repo = "anime-downloader"; + rev = version; + sha256 = "sha256-Uk2mtsSrb8fCD9JCFzvLBzMEB7ViVDrKPSOKy9ALJ6o="; + }; + + buildInputs = with python3.pkgs; [ + jsbeautifier + pycryptodome + requests + ]; + + propagatedBuildInputs = [ + aria2 + mpv + nodejs + ] ++ (with python3.pkgs; [ + beautifulsoup4 + cfscrape + click + coloredlogs + fuzzywuzzy + pySmartDL + pyqt5 + requests-cache + selenium + tabulate + ]); + + doCheck = false; + # FIXME: checks must be disabled because they are lacking the qt env. + # They fail like this, even if built and wrapped with all Qt and runtime dependencies. + # Ref.: https://github.com/NixOS/nixpkgs/blob/634141959076a8ab69ca2cca0f266852256d79ee/pkgs/applications/misc/openlp/lib.nix#L20-L23 + + passthru.updateScript = ./update.sh; + + meta = with lib; { + homepage = "https://github.com/anime-dl/anime-downloader"; + description = "A simple but powerful anime downloader and streamer"; + license = licenses.unlicense; + platforms = platforms.linux; + maintainers = with maintainers; [ WeebSorceress ]; + }; +} diff --git a/pkgs/applications/video/anime-downloader/update.sh b/pkgs/applications/video/anime-downloader/update.sh new file mode 100755 index 000000000000..292299298ad9 --- /dev/null +++ b/pkgs/applications/video/anime-downloader/update.sh @@ -0,0 +1,8 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p curl jq common-updater-scripts + +set -eu -o pipefail + +version="$(curl --silent "https://api.github.com/repos/anime-dl/anime-downloader/releases" | jq '.[0].tag_name' --raw-output)" + +update-source-version anime-downloader "$version" diff --git a/pkgs/applications/video/kodi/addons/urllib3/default.nix b/pkgs/applications/video/kodi/addons/urllib3/default.nix index a8365f5f68d7..1becee357bee 100644 --- a/pkgs/applications/video/kodi/addons/urllib3/default.nix +++ b/pkgs/applications/video/kodi/addons/urllib3/default.nix @@ -1,23 +1,20 @@ -{ lib, buildKodiAddon, fetchFromGitHub, addonUpdateScript }: +{ lib, buildKodiAddon, fetchzip, addonUpdateScript }: buildKodiAddon rec { pname = "urllib3"; namespace = "script.module.urllib3"; - version = "1.26.8+matrix.1"; + version = "1.26.9+matrix.1"; - # temporarily fetching from a PR because of CVE-2021-33503 - # see https://github.com/xbmc/repo-scripts/pull/2193 for details - src = fetchFromGitHub { - owner = "xbmc"; - repo = "repo-scripts"; - rev = "f0bfacab4732e33c5669bedd1a86319fa9e38338"; - sha256 = "sha256-UEMLrIvuuPARGHMsz6dOZrOuHIYVSpi0gBy2lK1Y2sk="; + src = fetchzip { + url = "https://mirrors.kodi.tv/addons/matrix/${namespace}/${namespace}-${version}.zip"; + sha256 = "w2HXepAHLE4NAWTXOQgY3ifr3mlI/QYF6KAKqpAmO/g="; }; - sourceRoot = "source/script.module.urllib3"; - passthru = { pythonPath = "lib"; + updateScript = addonUpdateScript { + attrPath = "kodi.packages.urllib3"; + }; }; meta = with lib; { diff --git a/pkgs/development/compilers/yosys/default.nix b/pkgs/development/compilers/yosys/default.nix index a48d5319b5ce..564ada5d6c07 100644 --- a/pkgs/development/compilers/yosys/default.nix +++ b/pkgs/development/compilers/yosys/default.nix @@ -72,13 +72,13 @@ let in stdenv.mkDerivation rec { pname = "yosys"; - version = "0.16"; + version = "0.18"; src = fetchFromGitHub { owner = "YosysHQ"; repo = "yosys"; rev = "${pname}-${version}"; - hash = "sha256-X1yygoat6ezJt9jLO+W528ryf381nKGDQ3cfrG1ZbIk="; + hash = "sha256-uvJYL7cUhf6gTvfeIVKWMB2DH5qcYzhB2WPeJf1rCTI="; }; enableParallelBuilding = true; diff --git a/pkgs/development/python-modules/gcal-sync/default.nix b/pkgs/development/python-modules/gcal-sync/default.nix index 33a19779ba14..ea101117c135 100644 --- a/pkgs/development/python-modules/gcal-sync/default.nix +++ b/pkgs/development/python-modules/gcal-sync/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "gcal-sync"; - version = "0.9.0"; + version = "0.10.0"; disabled = pythonOlder "3.9"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "allenporter"; repo = "gcal_sync"; rev = "refs/tags/${version}"; - hash = "sha256-7XvwN1sShvmg7Co3FyzPYJFCe961Ly4/854A1po22ds="; + hash = "sha256-RwQOLeOGxT8FijDSrByhZC/T8pFRDfJbA1eAQ1l4qUU="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/miniaudio/default.nix b/pkgs/development/python-modules/miniaudio/default.nix index e18396accfcc..d40c1df47cd9 100644 --- a/pkgs/development/python-modules/miniaudio/default.nix +++ b/pkgs/development/python-modules/miniaudio/default.nix @@ -11,15 +11,15 @@ buildPythonPackage rec { pname = "miniaudio"; - version = "1.46"; + version = "1.50"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "irmen"; repo = "pyminiaudio"; - rev = "v${version}"; - sha256 = "16llwmbbd9445rwhl4v66kf5zd7yl3a94zm9xyllq6ij7vnhg5jb"; + rev = "refs/tags/v${version}"; + sha256 = "sha256-GqpOuL+q5v9sKCpbNpPH4uC7k2HBs0RkTWaIC5A2eHI="; }; buildInputs = lib.optionals stdenv.isDarwin [ diff --git a/pkgs/development/python-modules/ocrmypdf/default.nix b/pkgs/development/python-modules/ocrmypdf/default.nix index 89faff436664..97b0bfd4cbca 100644 --- a/pkgs/development/python-modules/ocrmypdf/default.nix +++ b/pkgs/development/python-modules/ocrmypdf/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { pname = "ocrmypdf"; - version = "13.4.7"; + version = "13.5.0"; src = fetchFromGitHub { owner = "ocrmypdf"; @@ -39,7 +39,7 @@ buildPythonPackage rec { postFetch = '' rm "$out/.git_archival.txt" ''; - hash = "sha256-jCfMCjh8MdH5K76iyJCgtkgPtpxnCxlXlzttTIzINPk="; + hash = "sha256-jGVqH2z8NRnQcm4hv4OufCm26o6Qr8/mBRIScvcUpkE="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/ocrmypdf/paths.patch b/pkgs/development/python-modules/ocrmypdf/paths.patch index 47521e1033eb..9b1eed233cbb 100644 --- a/pkgs/development/python-modules/ocrmypdf/paths.patch +++ b/pkgs/development/python-modules/ocrmypdf/paths.patch @@ -1,20 +1,20 @@ diff --git a/src/ocrmypdf/_exec/ghostscript.py b/src/ocrmypdf/_exec/ghostscript.py -index 1146cc5f..43f3915c 100644 +index 4da65483..af750249 100644 --- a/src/ocrmypdf/_exec/ghostscript.py +++ b/src/ocrmypdf/_exec/ghostscript.py -@@ -40,15 +40,7 @@ For details see: +@@ -35,15 +35,7 @@ log = logging.getLogger(__name__) # Most reliable what to get the bitness of Python interpreter, according to Python docs - _is_64bit = sys.maxsize > 2 ** 32 + _IS_64BIT = sys.maxsize > 2**32 --_gswin = None +-_GSWIN = None -if os.name == 'nt': -- if _is_64bit: -- _gswin = 'gswin64c' +- if _IS_64BIT: +- _GSWIN = 'gswin64c' - else: -- _gswin = 'gswin32c' +- _GSWIN = 'gswin32c' - --GS = _gswin if _gswin else 'gs' --del _gswin +-GS = _GSWIN if _GSWIN else 'gs' +-del _GSWIN +GS = '@gs@' @@ -73,10 +73,10 @@ index ca8a4542..d0544174 100644 '--skip-if-larger', '--quality', diff --git a/src/ocrmypdf/_exec/tesseract.py b/src/ocrmypdf/_exec/tesseract.py -index a3688f65..61f54465 100644 +index 01177cac..665f1145 100644 --- a/src/ocrmypdf/_exec/tesseract.py +++ b/src/ocrmypdf/_exec/tesseract.py -@@ -75,7 +75,7 @@ class TesseractVersion(StrictVersion): +@@ -114,7 +114,7 @@ class TesseractVersion(Version): def version() -> str: @@ -85,7 +85,7 @@ index a3688f65..61f54465 100644 def has_user_words(): -@@ -97,7 +97,7 @@ def get_languages(): +@@ -141,7 +141,7 @@ def get_languages(): msg += output return msg @@ -94,7 +94,7 @@ index a3688f65..61f54465 100644 try: proc = run( args_tess, -@@ -119,7 +119,7 @@ def get_languages(): +@@ -163,7 +163,7 @@ def get_languages(): def tess_base_args(langs: List[str], engine_mode: Optional[int]) -> List[str]: @@ -104,10 +104,10 @@ index a3688f65..61f54465 100644 args.extend(['-l', '+'.join(langs)]) if engine_mode is not None: diff --git a/src/ocrmypdf/_exec/unpaper.py b/src/ocrmypdf/_exec/unpaper.py -index aec365c2..cc5cb7e4 100644 +index 479959ef..cc15fdec 100644 --- a/src/ocrmypdf/_exec/unpaper.py +++ b/src/ocrmypdf/_exec/unpaper.py -@@ -31,7 +31,7 @@ log = logging.getLogger(__name__) +@@ -69,7 +69,7 @@ class UnpaperImageTooLargeError(Exception): def version() -> str: @@ -115,13 +115,13 @@ index aec365c2..cc5cb7e4 100644 + return get_version('@unpaper@') - def _setup_unpaper_io(tmpdir: Path, input_file: Path) -> Tuple[Path, Path]: -@@ -71,7 +71,7 @@ def _setup_unpaper_io(tmpdir: Path, input_file: Path) -> Tuple[Path, Path]: - def run( + SUFFIXES = {'1': '.pbm', 'L': '.pgm', 'RGB': '.ppm'} +@@ -123,7 +123,7 @@ def _setup_unpaper_io(input_file: Path) -> Iterator[Tuple[Path, Path, Path]]: + def run_unpaper( input_file: Path, output_file: Path, *, dpi: DecFloat, mode_args: List[str] ) -> None: - args_unpaper = ['unpaper', '-v', '--dpi', str(round(dpi, 6))] + mode_args + args_unpaper = ['@unpaper@', '-v', '--dpi', str(round(dpi, 6))] + mode_args - with TemporaryDirectory() as tmpdir: - input_pnm, output_pnm = _setup_unpaper_io(Path(tmpdir), input_file) + with _setup_unpaper_io(input_file) as (input_pnm, output_pnm, tmpdir): + # To prevent any shenanigans from accepting arbitrary parameters in diff --git a/pkgs/development/python-modules/peaqevcore/default.nix b/pkgs/development/python-modules/peaqevcore/default.nix index 6bffbd408ef5..73042ab3c807 100644 --- a/pkgs/development/python-modules/peaqevcore/default.nix +++ b/pkgs/development/python-modules/peaqevcore/default.nix @@ -6,14 +6,14 @@ buildPythonPackage rec { pname = "peaqevcore"; - version = "1.1.1"; + version = "1.2.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-hTHsY/Xs30DXD6T8pAS3NvGqBPeS3PKRRyH5UxaU57c="; + hash = "sha256-PzGWqBL3276hlcS9beW920Ei75hAxLXxttD8zDPWELE="; }; postPatch = '' diff --git a/pkgs/development/python-modules/types-redis/default.nix b/pkgs/development/python-modules/types-redis/default.nix index 735398d57ab2..b98628c095cd 100644 --- a/pkgs/development/python-modules/types-redis/default.nix +++ b/pkgs/development/python-modules/types-redis/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "types-redis"; - version = "4.2.8"; + version = "4.3.0"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "sha256-L+NNQLx4UduHUs2mIQxKi+zRuv2a213xieEVg3cL+aA="; + sha256 = "sha256-9L2b5qt0Hx2pEFzwpORiiG3B1drkbW0/a3/X6B/+uig="; }; # Module doesn't have tests diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6809b9547810..a686547f1383 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -225,6 +225,8 @@ with pkgs; ani-cli = callPackage ../applications/video/ani-cli { }; + anime-downloader = callPackage ../applications/video/anime-downloader { }; + aocd = with python3Packages; toPythonApplication aocd; aesfix = callPackage ../tools/security/aesfix { }; @@ -28487,7 +28489,9 @@ with pkgs; nload = callPackage ../applications/networking/nload { }; - nali = callPackage ../applications/networking/nali { }; + nali = callPackage ../applications/networking/nali { + buildGoModule = buildGo118Module; + }; normalize = callPackage ../applications/audio/normalize { };