Commit 2fd6af19 authored by Eirik Wittersø's avatar Eirik Wittersø Committed by Emery Hemingway
Browse files

fetchFromBittorrent: Rename to fetchtorrent

parent 9b3fcd48

doc/builders/fetchers.chapter.md

+5 −5
Original line number Diff line number Diff line
@@ -243,21 +243,21 @@ or 


***

```

## `fetchFromBittorrent` {#fetchfrombittorrent}

## `fetchtorrent` {#fetchtorrent}



`fetchFromBittorrent` expects two arguments. `url` which can either be a Magnet URI (Magnet Link) such as `magnet:?xt=urn:btih:dd8255ecdc7ca55fb0bbf81323d87062db1f6d1c` or an HTTP URL pointing to a `.torrent` file. It can also take a `config` argument which will craft a `settings.json` configuration file and give it to `transmission`, the underlying program that is performing the fetch. The available config options for `transmission` can be found [here](https://github.com/transmission/transmission/blob/main/docs/Editing-Configuration-Files.md#options)

`fetchtorrent` expects two arguments. `url` which can either be a Magnet URI (Magnet Link) such as `magnet:?xt=urn:btih:dd8255ecdc7ca55fb0bbf81323d87062db1f6d1c` or an HTTP URL pointing to a `.torrent` file. It can also take a `config` argument which will craft a `settings.json` configuration file and give it to `transmission`, the underlying program that is performing the fetch. The available config options for `transmission` can be found [here](https://github.com/transmission/transmission/blob/main/docs/Editing-Configuration-Files.md#options)



```

{ fetchFromBittorrent }:

{ fetchtorrent }:



fetchFromBittorrent {

fetchtorrent {

  config = { peer-limit-global = 100; };

  url = "magnet:?xt=urn:btih:dd8255ecdc7ca55fb0bbf81323d87062db1f6d1c";

  sha256 = "";

}

```



### Parameters {#fetchfrombittorrent-parameters}

### Parameters {#fetchtorrent-parameters}



- `url`: Magnet URI (Magnet Link) such as `magnet:?xt=urn:btih:dd8255ecdc7ca55fb0bbf81323d87062db1f6d1c` or an HTTP URL pointing to a `.torrent` file.

pkgs/build-support/fetchbittorrent/default.nix→pkgs/build-support/fetchtorrent/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -30,13 +30,13 @@ let 
  jsonConfig = (formats.json {}).generate "jsonConfig" config;

in

runCommand name {

  nativeBuildInputs = [ cacert ] ++ (if (backend == "transmission" ) then [ transmission_noSystemd ] else if (backend == "rqbit") then [ rqbit ] else throw "rqbit or transmission are the only available backends for fetchbittorrent");

  nativeBuildInputs = [ cacert ] ++ (if (backend == "transmission" ) then [ transmission_noSystemd ] else if (backend == "rqbit") then [ rqbit ] else throw "rqbit or transmission are the only available backends for fetchtorrent");

  outputHashAlgo = if hash != "" then null else "sha256";

  outputHash = hash;

  outputHashMode = if recursiveHash then "recursive" else "flat";



  # url will be written to the derivation, meaning it can be parsed and utilized

  # by external tools, such as tools that may want to seed fetchBittorrent calls

  # by external tools, such as tools that may want to seed fetchtorrent calls

  # in nixpkgs

  inherit url;

}

pkgs/build-support/fetchbittorrent/tests.nix→pkgs/build-support/fetchtorrent/tests.nix

+5 −5
Original line number Diff line number Diff line 
{ testers, fetchFromBittorrent, ... }:

{ testers, fetchtorrent, ... }:



{

  http-link = testers.invalidateFetcherByDrvHash fetchFromBittorrent {

  http-link = testers.invalidateFetcherByDrvHash fetchtorrent {

    url = "https://webtorrent.io/torrents/wired-cd.torrent";

    hash = "sha256-OCsC22WuanqoN6lPv5wDT5ZxPcEHDpZ1EgXGvz1SDYo=";

    backend = "transmission";

  };

  magnet-link = testers.invalidateFetcherByDrvHash fetchFromBittorrent {

  magnet-link = testers.invalidateFetcherByDrvHash fetchtorrent {

    url = "magnet:?xt=urn:btih:a88fda5954e89178c372716a6a78b8180ed4dad3&dn=The+WIRED+CD+-+Rip.+Sample.+Mash.+Share&tr=udp%3A%2F%2Fexplodie.org%3A6969&tr=udp%3A%2F%2Ftracker.coppersurfer.tk%3A6969&tr=udp%3A%2F%2Ftracker.empire-js.us%3A1337&tr=udp%3A%2F%2Ftracker.leechers-paradise.org%3A6969&tr=udp%3A%2F%2Ftracker.opentrackr.org%3A1337&tr=wss%3A%2F%2Ftracker.btorrent.xyz&tr=wss%3A%2F%2Ftracker.fastcast.nz&tr=wss%3A%2F%2Ftracker.openwebtorrent.com&ws=https%3A%2F%2Fwebtorrent.io%2Ftorrents%2F&xs=https%3A%2F%2Fwebtorrent.io%2Ftorrents%2Fwired-cd.torrent";

    hash = "sha256-OCsC22WuanqoN6lPv5wDT5ZxPcEHDpZ1EgXGvz1SDYo=";

    backend = "transmission";

  };

  http-link-rqbit = testers.invalidateFetcherByDrvHash fetchFromBittorrent {

  http-link-rqbit = testers.invalidateFetcherByDrvHash fetchtorrent {

    url = "https://webtorrent.io/torrents/wired-cd.torrent";

    hash = "sha256-OCsC22WuanqoN6lPv5wDT5ZxPcEHDpZ1EgXGvz1SDYo=";

    backend = "rqbit";

  };

  magnet-link-rqbit = testers.invalidateFetcherByDrvHash fetchFromBittorrent {

  magnet-link-rqbit = testers.invalidateFetcherByDrvHash fetchtorrent {

    url = "magnet:?xt=urn:btih:a88fda5954e89178c372716a6a78b8180ed4dad3&dn=The+WIRED+CD+-+Rip.+Sample.+Mash.+Share&tr=udp%3A%2F%2Fexplodie.org%3A6969&tr=udp%3A%2F%2Ftracker.coppersurfer.tk%3A6969&tr=udp%3A%2F%2Ftracker.empire-js.us%3A1337&tr=udp%3A%2F%2Ftracker.leechers-paradise.org%3A6969&tr=udp%3A%2F%2Ftracker.opentrackr.org%3A1337&tr=wss%3A%2F%2Ftracker.btorrent.xyz&tr=wss%3A%2F%2Ftracker.fastcast.nz&tr=wss%3A%2F%2Ftracker.openwebtorrent.com&ws=https%3A%2F%2Fwebtorrent.io%2Ftorrents%2F&xs=https%3A%2F%2Fwebtorrent.io%2Ftorrents%2Fwired-cd.torrent";

    hash = "sha256-OCsC22WuanqoN6lPv5wDT5ZxPcEHDpZ1EgXGvz1SDYo=";

    backend = "rqbit";

pkgs/test/default.nix

+1 −1
Original line number Diff line number Diff line
@@ -104,7 +104,7 @@ with pkgs; 
  cc-multilib-clang = callPackage ./cc-wrapper/multilib.nix { stdenv = clangMultiStdenv; };



  fetchurl = callPackages ../build-support/fetchurl/tests.nix { };

  fetchFromBittorrent = callPackages ../build-support/fetchbittorrent/tests.nix { };

  fetchtorrent = callPackages ../build-support/fetchtorrent/tests.nix { };

  fetchpatch = callPackages ../build-support/fetchpatch/tests.nix { };

  fetchpatch2 = callPackages ../build-support/fetchpatch/tests.nix { fetchpatch = fetchpatch2; };

  fetchDebianPatch = callPackages ../build-support/fetchdebianpatch/tests.nix { };

pkgs/top-level/all-packages.nix

+1 −1
Original line number Diff line number Diff line
@@ -1118,7 +1118,7 @@ with pkgs; 














  fetchs3 = callPackage ../build-support/fetchs3 { };



























  fetchFromBittorrent = callPackage ../build-support/fetchbittorrent { };













  fetchtorrent = callPackage ../build-support/fetchtorrent { };





























  fetchsvn = if stdenv.buildPlatform != stdenv.hostPlatform















    # hack around splicing being crummy with things that (correctly) don't eval.