From 0dcf65711c829fc3f9816680e26ef8b2dc06b9fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Milan=20P=C3=A4ssler?= Date: Sun, 20 Dec 2020 14:19:31 +0100 Subject: [PATCH] libtorrentRasterbar: move files to match common nixpkgs layout No other packages have an own directory for each version with only one file in each directory. --- .../libtorrent-rasterbar/{1.1/default.nix => 1.1.nix} | 0 .../libtorrent-rasterbar/{1.2/default.nix => 1.2.nix} | 0 .../libraries/libtorrent-rasterbar/{2.0 => }/default.nix | 0 pkgs/top-level/all-packages.nix | 6 +++--- 4 files changed, 3 insertions(+), 3 deletions(-) rename pkgs/development/libraries/libtorrent-rasterbar/{1.1/default.nix => 1.1.nix} (100%) rename pkgs/development/libraries/libtorrent-rasterbar/{1.2/default.nix => 1.2.nix} (100%) rename pkgs/development/libraries/libtorrent-rasterbar/{2.0 => }/default.nix (100%) diff --git a/pkgs/development/libraries/libtorrent-rasterbar/1.1/default.nix b/pkgs/development/libraries/libtorrent-rasterbar/1.1.nix similarity index 100% rename from pkgs/development/libraries/libtorrent-rasterbar/1.1/default.nix rename to pkgs/development/libraries/libtorrent-rasterbar/1.1.nix diff --git a/pkgs/development/libraries/libtorrent-rasterbar/1.2/default.nix b/pkgs/development/libraries/libtorrent-rasterbar/1.2.nix similarity index 100% rename from pkgs/development/libraries/libtorrent-rasterbar/1.2/default.nix rename to pkgs/development/libraries/libtorrent-rasterbar/1.2.nix diff --git a/pkgs/development/libraries/libtorrent-rasterbar/2.0/default.nix b/pkgs/development/libraries/libtorrent-rasterbar/default.nix similarity index 100% rename from pkgs/development/libraries/libtorrent-rasterbar/2.0/default.nix rename to pkgs/development/libraries/libtorrent-rasterbar/default.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c71776008acf..1e4670e667cd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14676,16 +14676,16 @@ in libtomcrypt = callPackage ../development/libraries/libtomcrypt { }; - libtorrentRasterbar-2_0_x = callPackage ../development/libraries/libtorrent-rasterbar/2.0 { + libtorrentRasterbar-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 { + libtorrentRasterbar-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 { }; + libtorrentRasterbar-1_1_x = callPackage ../development/libraries/libtorrent-rasterbar/1.1.nix { }; libtorrentRasterbar = libtorrentRasterbar-2_0_x;