From a333985d59dd190f7b3dd96c862962fc8a09c5fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Milan=20P=C3=A4ssler?= Date: Sun, 20 Dec 2020 14:35:14 +0100 Subject: [PATCH] libtorrentRasterbar: rename to libtorrent-rasterbar This is done to match upstream naming: https://github.com/NixOS/nixpkgs/pull/107194#issuecomment-748501379 --- pkgs/applications/networking/p2p/deluge/1.nix | 4 ++-- pkgs/applications/networking/p2p/deluge/default.nix | 4 ++-- .../networking/p2p/qbittorrent/default.nix | 4 ++-- pkgs/applications/networking/p2p/tribler/default.nix | 2 +- pkgs/applications/video/kodi/plugins.nix | 2 +- pkgs/games/spring/springlobby.nix | 4 ++-- pkgs/os-specific/linux/btfs/default.nix | 4 ++-- pkgs/top-level/aliases.nix | 4 ++++ pkgs/top-level/all-packages.nix | 12 ++++++------ pkgs/top-level/python-packages.nix | 6 +++--- 10 files changed, 25 insertions(+), 21 deletions(-) diff --git a/pkgs/applications/networking/p2p/deluge/1.nix b/pkgs/applications/networking/p2p/deluge/1.nix index 7ab337924155..aa70f969d221 100644 --- a/pkgs/applications/networking/p2p/deluge/1.nix +++ b/pkgs/applications/networking/p2p/deluge/1.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, intltool, libtorrentRasterbar, pythonPackages }: +{ stdenv, fetchurl, fetchpatch, intltool, libtorrent-rasterbar, pythonPackages }: pythonPackages.buildPythonPackage rec { pname = "deluge"; @@ -19,7 +19,7 @@ pythonPackages.buildPythonPackage rec { propagatedBuildInputs = with pythonPackages; [ pyGtkGlade twisted Mako chardet pyxdg pyopenssl service-identity - libtorrentRasterbar.dev libtorrentRasterbar.python setuptools + libtorrent-rasterbar.dev libtorrent-rasterbar.python setuptools ]; nativeBuildInputs = [ intltool ]; diff --git a/pkgs/applications/networking/p2p/deluge/default.nix b/pkgs/applications/networking/p2p/deluge/default.nix index 2e9f08ce98a8..f9c421c40873 100644 --- a/pkgs/applications/networking/p2p/deluge/default.nix +++ b/pkgs/applications/networking/p2p/deluge/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, intltool, libtorrentRasterbar, pythonPackages +{ stdenv, fetchurl, intltool, libtorrent-rasterbar, pythonPackages , gtk3, glib, gobject-introspection, librsvg, wrapGAppsHook }: pythonPackages.buildPythonPackage rec { @@ -12,7 +12,7 @@ pythonPackages.buildPythonPackage rec { propagatedBuildInputs = with pythonPackages; [ 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 dbus-python pygobject3 pycairo gtk3 gobject-introspection librsvg diff --git a/pkgs/applications/networking/p2p/qbittorrent/default.nix b/pkgs/applications/networking/p2p/qbittorrent/default.nix index ac6717293928..2e69ad23e14c 100644 --- a/pkgs/applications/networking/p2p/qbittorrent/default.nix +++ b/pkgs/applications/networking/p2p/qbittorrent/default.nix @@ -1,5 +1,5 @@ { mkDerivation, lib, fetchFromGitHub, makeWrapper, pkgconfig -, boost, libtorrentRasterbar, qtbase, qttools, qtsvg +, boost, libtorrent-rasterbar, qtbase, qttools, qtsvg , debugSupport ? false , guiSupport ? true, dbus ? null # GUI (disable to run headless) , webuiSupport ? true # WebUI @@ -24,7 +24,7 @@ mkDerivation rec { # NOTE: 2018-05-31: CMake is working but it is not officially supported 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 trackerSearch python3; diff --git a/pkgs/applications/networking/p2p/tribler/default.nix b/pkgs/applications/networking/p2p/tribler/default.nix index 5cab23ecd710..d30697a4df00 100644 --- a/pkgs/applications/networking/p2p/tribler/default.nix +++ b/pkgs/applications/networking/p2p/tribler/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { ]; pythonPath = [ - python3Packages.libtorrentRasterbar + python3Packages.libtorrent-rasterbar python3Packages.twisted python3Packages.netifaces python3Packages.pycrypto diff --git a/pkgs/applications/video/kodi/plugins.nix b/pkgs/applications/video/kodi/plugins.nix index 6863ef9ca622..12c16a744b08 100644 --- a/pkgs/applications/video/kodi/plugins.nix +++ b/pkgs/applications/video/kodi/plugins.nix @@ -467,7 +467,7 @@ let self = rec { propagatedBuildInputs = [ simpleplugin python2Packages.requests - python2Packages.libtorrentRasterbar + python2Packages.libtorrent-rasterbar ]; meta = { diff --git a/pkgs/games/spring/springlobby.nix b/pkgs/games/spring/springlobby.nix index 33dc364c5b70..231090419e66 100644 --- a/pkgs/games/spring/springlobby.nix +++ b/pkgs/games/spring/springlobby.nix @@ -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 , makeWrapper, glib, minizip, alure, pcre, jsoncpp }: @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkgconfig gettext doxygen makeWrapper ]; buildInputs = [ - wxGTK30 openal curl libtorrentRasterbar pcre jsoncpp + wxGTK30 openal curl libtorrent-rasterbar pcre jsoncpp boost libpng libX11 libnotify gtk2 glib minizip alure ]; diff --git a/pkgs/os-specific/linux/btfs/default.nix b/pkgs/os-specific/linux/btfs/default.nix index 762baa587112..6d919ce57d4f 100644 --- a/pkgs/os-specific/linux/btfs/default.nix +++ b/pkgs/os-specific/linux/btfs/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig -, python3, boost, fuse, libtorrentRasterbar, curl }: +, python3, boost, fuse, libtorrent-rasterbar, curl }: stdenv.mkDerivation rec { pname = "btfs"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkgconfig ]; buildInputs = [ - boost fuse libtorrentRasterbar curl python3 + boost fuse libtorrent-rasterbar curl python3 ]; meta = with stdenv.lib; { diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 3d4ce4b45363..3f7b4c424e54 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -700,6 +700,10 @@ mapAliases ({ gnome_user_docs = gnome-user-docs; # added 2019-11-20 # spidermonkey is not ABI upwards-ompatible, so only allow this for nix-shell 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 # branch-off diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1e4670e667cd..92c9ff5286d3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3333,11 +3333,11 @@ in deluge-2_x = callPackage ../applications/networking/p2p/deluge { 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 { pythonPackages = python2Packages; - libtorrentRasterbar = libtorrentRasterbar-1_1_x; + libtorrent-rasterbar = libtorrent-rasterbar-1_1_x; }; deluge = deluge-2_x; @@ -14676,18 +14676,18 @@ in 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; 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; }; - 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 libtoxcore-new = callPackage ../development/libraries/libtoxcore/new-api.nix { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ceb6cda984f1..440b53aaf2a4 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3514,10 +3514,10 @@ in { libtmux = callPackage ../development/python-modules/libtmux { }; - libtorrentRasterbar = if isPy27 then - (toPythonModule (pkgs.libtorrentRasterbar-1_2_x.override { inherit python; })).python + libtorrent-rasterbar = if isPy27 then + (toPythonModule (pkgs.libtorrent-rasterbar-1_2_x.override { inherit python; })).python 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; };