public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

libtorrentRasterbar: rename to libtorrent-rasterbar

Browse Source 
This is done to match upstream naming:
https://github.com/NixOS/nixpkgs/pull/107194#issuecomment-748501379
This commit is contained in:
Milan Pässler 2020-12-20 14:35:14 +01:00 committed by Milan
parent 0dcf65711c
commit a333985d59
10 changed files with 25 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/applications/networking/p2p/deluge/1.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, fetchpatch, intltool, libtorrentRasterbar, pythonPackages }: { stdenv, fetchurl, fetchpatch, intltool, libtorrent-rasterbar, pythonPackages }:
pythonPackages.buildPythonPackage rec { pythonPackages.buildPythonPackage rec {
pname = "deluge"; pname = "deluge";
@ -19,7 +19,7 @@ pythonPackages.buildPythonPackage rec {
propagatedBuildInputs = with pythonPackages; [ propagatedBuildInputs = with pythonPackages; [
pyGtkGlade twisted Mako chardet pyxdg pyopenssl service-identity pyGtkGlade twisted Mako chardet pyxdg pyopenssl service-identity
libtorrentRasterbar.dev libtorrentRasterbar.python setuptools libtorrent-rasterbar.dev libtorrent-rasterbar.python setuptools
]; ];
nativeBuildInputs = [ intltool ]; nativeBuildInputs = [ intltool ];

4
pkgs/applications/networking/p2p/deluge/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, intltool, libtorrentRasterbar, pythonPackages { stdenv, fetchurl, intltool, libtorrent-rasterbar, pythonPackages
, gtk3, glib, gobject-introspection, librsvg, wrapGAppsHook }: , gtk3, glib, gobject-introspection, librsvg, wrapGAppsHook }:
pythonPackages.buildPythonPackage rec { pythonPackages.buildPythonPackage rec {
@ -12,7 +12,7 @@ pythonPackages.buildPythonPackage rec {
propagatedBuildInputs = with pythonPackages; [ propagatedBuildInputs = with pythonPackages; [
twisted Mako chardet pyxdg pyopenssl service-identity twisted Mako chardet pyxdg pyopenssl service-identity
libtorrentRasterbar.dev libtorrentRasterbar.python setuptools libtorrent-rasterbar.dev libtorrent-rasterbar.python setuptools
setproctitle pillow rencode six zope_interface setproctitle pillow rencode six zope_interface
dbus-python pygobject3 pycairo dbus-python pygobject3 pycairo
gtk3 gobject-introspection librsvg gtk3 gobject-introspection librsvg

4
pkgs/applications/networking/p2p/qbittorrent/default.nix
View File

@ -1,5 +1,5 @@
{ mkDerivation, lib, fetchFromGitHub, makeWrapper, pkgconfig { mkDerivation, lib, fetchFromGitHub, makeWrapper, pkgconfig
, boost, libtorrentRasterbar, qtbase, qttools, qtsvg , boost, libtorrent-rasterbar, qtbase, qttools, qtsvg
, debugSupport ? false , debugSupport ? false
, guiSupport ? true, dbus ? null # GUI (disable to run headless) , guiSupport ? true, dbus ? null # GUI (disable to run headless)
, webuiSupport ? true # WebUI , webuiSupport ? true # WebUI
@ -24,7 +24,7 @@ mkDerivation rec {
# NOTE: 2018-05-31: CMake is working but it is not officially supported # NOTE: 2018-05-31: CMake is working but it is not officially supported
nativeBuildInputs = [ makeWrapper pkgconfig ]; nativeBuildInputs = [ makeWrapper pkgconfig ];
buildInputs = [ boost libtorrentRasterbar qtbase qttools qtsvg ] buildInputs = [ boost libtorrent-rasterbar qtbase qttools qtsvg ]
++ optional guiSupport dbus # D(esktop)-Bus depends on GUI support ++ optional guiSupport dbus # D(esktop)-Bus depends on GUI support
++ optional trackerSearch python3; ++ optional trackerSearch python3;

2
pkgs/applications/networking/p2p/tribler/default.nix
View File

@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
]; ];
pythonPath = [ pythonPath = [
python3Packages.libtorrentRasterbar python3Packages.libtorrent-rasterbar
python3Packages.twisted python3Packages.twisted
python3Packages.netifaces python3Packages.netifaces
python3Packages.pycrypto python3Packages.pycrypto

2
pkgs/applications/video/kodi/plugins.nix
View File

@ -467,7 +467,7 @@ let self = rec {
propagatedBuildInputs = [ propagatedBuildInputs = [
simpleplugin simpleplugin
python2Packages.requests python2Packages.requests
python2Packages.libtorrentRasterbar python2Packages.libtorrent-rasterbar
]; ];
meta = { meta = {

4
pkgs/games/spring/springlobby.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, fetchpatch, cmake, wxGTK30, openal, pkgconfig, curl, libtorrentRasterbar { stdenv, fetchurl, fetchpatch, cmake, wxGTK30, openal, pkgconfig, curl, libtorrent-rasterbar
, libpng, libX11, gettext, boost, libnotify, gtk2, doxygen, spring , libpng, libX11, gettext, boost, libnotify, gtk2, doxygen, spring
, makeWrapper, glib, minizip, alure, pcre, jsoncpp }: , makeWrapper, glib, minizip, alure, pcre, jsoncpp }:
@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake pkgconfig gettext doxygen makeWrapper ]; nativeBuildInputs = [ cmake pkgconfig gettext doxygen makeWrapper ];
buildInputs = [ buildInputs = [
wxGTK30 openal curl libtorrentRasterbar pcre jsoncpp wxGTK30 openal curl libtorrent-rasterbar pcre jsoncpp
boost libpng libX11 libnotify gtk2 glib minizip alure boost libpng libX11 libnotify gtk2 glib minizip alure
]; ];

4
pkgs/os-specific/linux/btfs/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig
, python3, boost, fuse, libtorrentRasterbar, curl }: , python3, boost, fuse, libtorrent-rasterbar, curl }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "btfs"; pname = "btfs";
@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ autoreconfHook pkgconfig ]; nativeBuildInputs = [ autoreconfHook pkgconfig ];
buildInputs = [ buildInputs = [
boost fuse libtorrentRasterbar curl python3 boost fuse libtorrent-rasterbar curl python3
]; ];
meta = with stdenv.lib; { meta = with stdenv.lib; {

4
pkgs/top-level/aliases.nix
View File

@ -700,6 +700,10 @@ mapAliases ({
gnome_user_docs = gnome-user-docs; # added 2019-11-20 gnome_user_docs = gnome-user-docs; # added 2019-11-20
# spidermonkey is not ABI upwards-ompatible, so only allow this for nix-shell # spidermonkey is not ABI upwards-ompatible, so only allow this for nix-shell
spidermonkey = spidermonkey_78; # added 2020-10-09 spidermonkey = spidermonkey_78; # added 2020-10-09
libtorrentRasterbar = libtorrent-rasterbar; # added 2020-12-20
libtorrentRasterbar-2_0_x = libtorrent-rasterbar-2_0_x; # added 2020-12-20
libtorrentRasterbar-1_2_x = libtorrent-rasterbar-1_2_x; # added 2020-12-20
libtorrentRasterbar-1_1_x = libtorrent-rasterbar-1_1_x; # added 2020-12-20
# TODO(ekleog): add ‘wasm’ alias to ‘ocamlPackages.wasm’ after 19.03 # TODO(ekleog): add ‘wasm’ alias to ‘ocamlPackages.wasm’ after 19.03
# branch-off # branch-off

12
pkgs/top-level/all-packages.nix
View File

@ -3333,11 +3333,11 @@ in
deluge-2_x = callPackage ../applications/networking/p2p/deluge { deluge-2_x = callPackage ../applications/networking/p2p/deluge {
pythonPackages = python3Packages; pythonPackages = python3Packages;
libtorrentRasterbar = libtorrentRasterbar-1_2_x.override { python = python3; }; libtorrent-rasterbar = libtorrent-rasterbar-1_2_x.override { python = python3; };
}; };
deluge-1_x = callPackage ../applications/networking/p2p/deluge/1.nix { deluge-1_x = callPackage ../applications/networking/p2p/deluge/1.nix {
pythonPackages = python2Packages; pythonPackages = python2Packages;
libtorrentRasterbar = libtorrentRasterbar-1_1_x; libtorrent-rasterbar = libtorrent-rasterbar-1_1_x;
}; };
deluge = deluge-2_x; deluge = deluge-2_x;
@ -14676,18 +14676,18 @@ in
libtomcrypt = callPackage ../development/libraries/libtomcrypt { }; libtomcrypt = callPackage ../development/libraries/libtomcrypt { };
libtorrentRasterbar-2_0_x = callPackage ../development/libraries/libtorrent-rasterbar { libtorrent-rasterbar-2_0_x = callPackage ../development/libraries/libtorrent-rasterbar {
inherit (darwin.apple_sdk.frameworks) SystemConfiguration; inherit (darwin.apple_sdk.frameworks) SystemConfiguration;
python = python3; python = python3;
}; };
libtorrentRasterbar-1_2_x = callPackage ../development/libraries/libtorrent-rasterbar/1.2.nix { libtorrent-rasterbar-1_2_x = callPackage ../development/libraries/libtorrent-rasterbar/1.2.nix {
inherit (darwin.apple_sdk.frameworks) SystemConfiguration; inherit (darwin.apple_sdk.frameworks) SystemConfiguration;
}; };
libtorrentRasterbar-1_1_x = callPackage ../development/libraries/libtorrent-rasterbar/1.1.nix { }; libtorrent-rasterbar-1_1_x = callPackage ../development/libraries/libtorrent-rasterbar/1.1.nix { };
libtorrentRasterbar = libtorrentRasterbar-2_0_x; libtorrent-rasterbar = libtorrent-rasterbar-2_0_x;
# this is still the new version of the old API # this is still the new version of the old API
libtoxcore-new = callPackage ../development/libraries/libtoxcore/new-api.nix { }; libtoxcore-new = callPackage ../development/libraries/libtoxcore/new-api.nix { };

6
pkgs/top-level/python-packages.nix
View File

@ -3514,10 +3514,10 @@ in {
libtmux = callPackage ../development/python-modules/libtmux { }; libtmux = callPackage ../development/python-modules/libtmux { };
libtorrentRasterbar = if isPy27 then libtorrent-rasterbar = if isPy27 then
(toPythonModule (pkgs.libtorrentRasterbar-1_2_x.override { inherit python; })).python (toPythonModule (pkgs.libtorrent-rasterbar-1_2_x.override { inherit python; })).python
else else
(toPythonModule (pkgs.libtorrentRasterbar.override { inherit python; })).python; (toPythonModule (pkgs.libtorrent-rasterbar.override { inherit python; })).python;
libusb1 = callPackage ../development/python-modules/libusb1 { inherit (pkgs) libusb1; }; libusb1 = callPackage ../development/python-modules/libusb1 { inherit (pkgs) libusb1; };