From 81295a476a484e20d810f3fa21c4758b9bfd84fb Mon Sep 17 00:00:00 2001 From: devhell Date: Sat, 30 Mar 2024 16:35:15 +0000 Subject: [PATCH 1/2] {lib}mediainfo{-gui}: move to by-name structure --- .../default.nix => by-name/li/libmediainfo/package.nix} | 0 .../default.nix => by-name/me/mediainfo-gui/package.nix} | 0 .../default.nix => by-name/me/mediainfo/package.nix} | 0 pkgs/top-level/all-packages.nix | 6 ------ 4 files changed, 6 deletions(-) rename pkgs/{development/libraries/libmediainfo/default.nix => by-name/li/libmediainfo/package.nix} (100%) rename pkgs/{applications/misc/mediainfo-gui/default.nix => by-name/me/mediainfo-gui/package.nix} (100%) rename pkgs/{applications/misc/mediainfo/default.nix => by-name/me/mediainfo/package.nix} (100%) diff --git a/pkgs/development/libraries/libmediainfo/default.nix b/pkgs/by-name/li/libmediainfo/package.nix similarity index 100% rename from pkgs/development/libraries/libmediainfo/default.nix rename to pkgs/by-name/li/libmediainfo/package.nix diff --git a/pkgs/applications/misc/mediainfo-gui/default.nix b/pkgs/by-name/me/mediainfo-gui/package.nix similarity index 100% rename from pkgs/applications/misc/mediainfo-gui/default.nix rename to pkgs/by-name/me/mediainfo-gui/package.nix diff --git a/pkgs/applications/misc/mediainfo/default.nix b/pkgs/by-name/me/mediainfo/package.nix similarity index 100% rename from pkgs/applications/misc/mediainfo/default.nix rename to pkgs/by-name/me/mediainfo/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e5b454bfcb0e..9efb1dae6e80 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22629,8 +22629,6 @@ with pkgs; libmediaart = callPackage ../development/libraries/libmediaart { }; - libmediainfo = callPackage ../development/libraries/libmediainfo { }; - libmhash = callPackage ../development/libraries/libmhash { }; libmodbus = callPackage ../development/libraries/libmodbus { }; @@ -33018,10 +33016,6 @@ with pkgs; mediaelch-qt5 = libsForQt5.callPackage ../applications/misc/mediaelch { }; mediaelch-qt6 = qt6Packages.callPackage ../applications/misc/mediaelch { }; - mediainfo = callPackage ../applications/misc/mediainfo { }; - - mediainfo-gui = callPackage ../applications/misc/mediainfo-gui { }; - mediathekview = callPackage ../applications/video/mediathekview { jre = temurin-bin-20; }; meteo = callPackage ../applications/networking/weather/meteo { }; From f4e420025a70ca1da675705c78d002b1c5c0873b Mon Sep 17 00:00:00 2001 From: devhell Date: Sat, 30 Mar 2024 16:44:37 +0000 Subject: [PATCH 2/2] {lib}mediainfo{-gui}: 24.01{.1} -> 24.03 --- pkgs/by-name/li/libmediainfo/package.nix | 4 ++-- pkgs/by-name/me/mediainfo-gui/package.nix | 4 ++-- pkgs/by-name/me/mediainfo/package.nix | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/li/libmediainfo/package.nix b/pkgs/by-name/li/libmediainfo/package.nix index ee81e63ba5e4..c0abeb221ec8 100644 --- a/pkgs/by-name/li/libmediainfo/package.nix +++ b/pkgs/by-name/li/libmediainfo/package.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "libmediainfo"; - version = "24.01"; + version = "24.03"; src = fetchurl { url = "https://mediaarea.net/download/source/libmediainfo/${version}/libmediainfo_${version}.tar.xz"; - hash = "sha256-oC38Zon0hc7Ab6EqNBTDw6ooU7Td4YrqtLVKVsgxYlk="; + hash = "sha256-zCu0TkB8iQq1ZpNMVnY5GFBatYwUE0tT8NHanuokLI0="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; diff --git a/pkgs/by-name/me/mediainfo-gui/package.nix b/pkgs/by-name/me/mediainfo-gui/package.nix index bbb4f6432fb4..a321db523179 100644 --- a/pkgs/by-name/me/mediainfo-gui/package.nix +++ b/pkgs/by-name/me/mediainfo-gui/package.nix @@ -6,11 +6,11 @@ let in stdenv.mkDerivation rec { pname = "mediainfo-gui"; - version = "24.01.1"; + version = "24.03"; src = fetchurl { url = "https://mediaarea.net/download/source/mediainfo/${version}/mediainfo_${version}.tar.xz"; - hash = "sha256-MupkbVyGxj1UQY0QsnNiYKtD5Lcn+B6N1ez16bXj/TQ="; + hash = "sha256-b/jx+i+FmhMJH3Wiz5E0hmRPbiWa0cJa+5qT5IRExWM="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; diff --git a/pkgs/by-name/me/mediainfo/package.nix b/pkgs/by-name/me/mediainfo/package.nix index 3891715e7b23..4fcaf4636d42 100644 --- a/pkgs/by-name/me/mediainfo/package.nix +++ b/pkgs/by-name/me/mediainfo/package.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "mediainfo"; - version = "24.01.1"; + version = "24.03"; src = fetchurl { url = "https://mediaarea.net/download/source/mediainfo/${version}/mediainfo_${version}.tar.xz"; - hash = "sha256-MupkbVyGxj1UQY0QsnNiYKtD5Lcn+B6N1ez16bXj/TQ="; + hash = "sha256-b/jx+i+FmhMJH3Wiz5E0hmRPbiWa0cJa+5qT5IRExWM="; }; nativeBuildInputs = [ autoreconfHook pkg-config ];