From 3a5902323ec1024cbfc1203beefdb6617027b996 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Sun, 10 Nov 2024 22:03:37 +0100
Subject: [PATCH] invidious: move to by-name

---
 .../invidious/default.nix => by-name/in/invidious/package.nix}  | 0
 pkgs/{servers => by-name/in}/invidious/shards.nix               | 0
 pkgs/{servers => by-name/in}/invidious/update.sh                | 2 +-
 pkgs/{servers => by-name/in}/invidious/versions.json            | 0
 pkgs/{servers => by-name/in}/invidious/videojs.nix              | 0
 pkgs/{servers => by-name/in}/invidious/videojs.sh               | 0
 pkgs/top-level/all-packages.nix                                 | 2 --
 7 files changed, 1 insertion(+), 3 deletions(-)
 rename pkgs/{servers/invidious/default.nix => by-name/in/invidious/package.nix} (100%)
 rename pkgs/{servers => by-name/in}/invidious/shards.nix (100%)
 rename pkgs/{servers => by-name/in}/invidious/update.sh (97%)
 rename pkgs/{servers => by-name/in}/invidious/versions.json (100%)
 rename pkgs/{servers => by-name/in}/invidious/videojs.nix (100%)
 rename pkgs/{servers => by-name/in}/invidious/videojs.sh (100%)

diff --git a/pkgs/servers/invidious/default.nix b/pkgs/by-name/in/invidious/package.nix
similarity index 100%
rename from pkgs/servers/invidious/default.nix
rename to pkgs/by-name/in/invidious/package.nix
diff --git a/pkgs/servers/invidious/shards.nix b/pkgs/by-name/in/invidious/shards.nix
similarity index 100%
rename from pkgs/servers/invidious/shards.nix
rename to pkgs/by-name/in/invidious/shards.nix
diff --git a/pkgs/servers/invidious/update.sh b/pkgs/by-name/in/invidious/update.sh
similarity index 97%
rename from pkgs/servers/invidious/update.sh
rename to pkgs/by-name/in/invidious/update.sh
index 848a6a9010ea..a23cc7de0cfe 100755
--- a/pkgs/servers/invidious/update.sh
+++ b/pkgs/by-name/in/invidious/update.sh
@@ -51,7 +51,7 @@ json_set '.invidious.date' "$date"
 json_set '.invidious.commit' "$commit"
 json_set '.invidious.version' "$new_version"
 
-new_hash=$(nix-prefetch -I 'nixpkgs=../../..' "$pkg")
+new_hash=$(nix-prefetch -I 'nixpkgs=../../../..' "$pkg")
 json_set '.invidious.hash' "$new_hash"
 
 # fetch video.js dependencies
diff --git a/pkgs/servers/invidious/versions.json b/pkgs/by-name/in/invidious/versions.json
similarity index 100%
rename from pkgs/servers/invidious/versions.json
rename to pkgs/by-name/in/invidious/versions.json
diff --git a/pkgs/servers/invidious/videojs.nix b/pkgs/by-name/in/invidious/videojs.nix
similarity index 100%
rename from pkgs/servers/invidious/videojs.nix
rename to pkgs/by-name/in/invidious/videojs.nix
diff --git a/pkgs/servers/invidious/videojs.sh b/pkgs/by-name/in/invidious/videojs.sh
similarity index 100%
rename from pkgs/servers/invidious/videojs.sh
rename to pkgs/by-name/in/invidious/videojs.sh
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index fdeeb4ed343c..1c64c52d8c52 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3995,8 +3995,6 @@ with pkgs;
 
   internetarchive = with python3Packages; toPythonApplication internetarchive;
 
-  invidious = callPackage ../servers/invidious { };
-
   iocextract = with python3Packages; toPythonApplication iocextract;
 
   iocsearcher = with python3Packages; toPythonApplication iocsearcher;