Unverified Commit d5c7eb29 authored by Thiago Kenji Okada's avatar Thiago Kenji Okada Committed by GitHub
Browse files

Merge pull request #322429 from thiagokokada/rtorrent-bump 

rtorrent: 0.9.8+date=2022-06-20 -> 0.9.8-unstable-2023-03-16; libtorrent: 0.13.8+date=2021-08-07 -> unstable-2023-03-16
parents e05a365d ba42623f

pkgs/applications/networking/p2p/rakshasa-rtorrent/libtorrent.nix→pkgs/by-name/li/libtorrent/package.nix

+11 −8
Original line number Diff line number Diff line
@@ -10,17 +10,18 @@ 
, openssl

, pkg-config

, zlib

, unstableGitUpdater

}:



stdenv.mkDerivation rec {

stdenv.mkDerivation {

  pname = "rakshasa-libtorrent";

  version = "0.13.8+date=2021-08-07";

  version = "0.13.8-unstable-2023-03-16";



  src = fetchFromGitHub {

    owner = "rakshasa";

    repo = "libtorrent";

    rev = "53596afc5fae275b3fb5753a4bb2a1a7f7cf6a51";

    hash = "sha256-gyl/jfbptHz/gHkkVGWShhv1Z7o9fa9nJIz27U2A6wg=";

    rev = "91f8cf4b0358d9b4480079ca7798fa7d9aec76b5";

    hash = "sha256-mEIrMwpWMCAA70Qb/UIOg8XTfg71R/2F4kb3QG38duU=";

  };



  nativeBuildInputs = [
@@ -36,13 +37,15 @@ stdenv.mkDerivation rec { 
    zlib

  ];



  passthru.updateScript = unstableGitUpdater { tagPrefix = "v"; };



  enableParallelBuilding = true;



  meta = with lib; {

  meta = {

    homepage = "https://github.com/rakshasa/libtorrent";

    description = "BitTorrent library written in C++ for *nix, with focus on high performance and good code";

    license = licenses.gpl2Plus;

    maintainers = with maintainers; [ ebzzry codyopel ];

    platforms = platforms.unix;

    license = lib.licenses.gpl2Plus;

    maintainers = with lib.maintainers; [ ebzzry codyopel thiagokokada ];

    platforms = lib.platforms.unix;

  };

}

pkgs/applications/networking/p2p/rakshasa-rtorrent/default.nix→pkgs/by-name/rt/rtorrent/package.nix

+21 −14
Original line number Diff line number Diff line 
{ lib

, stdenv

, fetchFromGitHub

, autoreconfHook

, autoconf-archive

, autoreconfHook

, cppunit

, curl

, fetchFromGitHub

, installShellFiles

, libsigcxx

, libtool

, libtorrent
@@ -14,19 +15,22 @@ 
, xmlrpc_c

, zlib

, nixosTests

, unstableGitUpdater

}:



stdenv.mkDerivation {

  pname = "rakshasa-rtorrent";

  version = "0.9.8+date=2022-06-20";

  version = "0.9.8-unstable-2023-03-16";



  src = fetchFromGitHub {

    owner = "rakshasa";

    repo = "rtorrent";

    rev = "92bec88d0904bfb31c808085c2fd0f22d0ec8db7";

    hash = "sha256-er7UdIb+flhq0ye76UmomgfHV2ZSBROpXmfrNDHwTWw=";

    rev = "1da0e3476dcabbf74b2e836d6b4c37b4d96bde09";

    hash = "sha256-OXOZSMuNAU+VGwNyyfzcmkTRjDJq9HsKUNxZDYpSvFQ=";

  };



  outputs = [ "out" "man" ];



  passthru = {

    inherit libtorrent;

  };
@@ -34,6 +38,7 @@ stdenv.mkDerivation { 
  nativeBuildInputs = [

    autoconf-archive

    autoreconfHook

    installShellFiles

    pkg-config

  ];
@@ -54,24 +59,26 @@ stdenv.mkDerivation { 
    "--with-posix-fallocate"

  ];



  passthru.tests = {

  passthru = {

    updateScript = unstableGitUpdater { tagPrefix = "v"; };

    tests = {

      inherit (nixosTests) rtorrent;

    };

  };



  enableParallelBuilding = true;



  postInstall = ''

    mkdir -p $out/share/man/man1 $out/share/doc/rtorrent

    mv doc/old/rtorrent.1 $out/share/man/man1/rtorrent.1

    mv doc/rtorrent.rc $out/share/doc/rtorrent/rtorrent.rc

    installManPage doc/old/rtorrent.1

    install -Dm644 doc/rtorrent.rc-example -t $out/share/doc/rtorrent/rtorrent.rc

  '';



  meta = with lib; {

  meta = {

    homepage = "https://rakshasa.github.io/rtorrent/";

    description = "Ncurses client for libtorrent, ideal for use with screen, tmux, or dtach";

    license = licenses.gpl2Plus;

    maintainers = with maintainers; [ ebzzry codyopel ];

    platforms = platforms.unix;

    license = lib.licenses.gpl2Plus;

    maintainers = with lib.maintainers; [ ebzzry codyopel thiagokokada ];

    platforms = lib.platforms.unix;

    mainProgram = "rtorrent";

  };

}

pkgs/top-level/all-packages.nix

+0 −4
Original line number Diff line number Diff line
@@ -10208,10 +10208,6 @@ with pkgs; 














  libnids = callPackage ../tools/networking/libnids { };



























  rtorrent = callPackage ../applications/networking/p2p/rakshasa-rtorrent {













    libtorrent = callPackage ../applications/networking/p2p/rakshasa-rtorrent/libtorrent.nix { };













  };



























  jesec-rtorrent = callPackage ../applications/networking/p2p/jesec-rtorrent {















    libtorrent = callPackage ../applications/networking/p2p/jesec-rtorrent/libtorrent.nix { };















  };