From f3db387b97b11f945a05f5068e998721372bd8c2 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Sat, 9 Mar 2024 23:58:35 -0300 Subject: [PATCH 1/5] fsuae: prepare for by-name migration - set strictDeps - meta.mainProgram - meta.platforms uses lib.systems machinery --- pkgs/applications/emulators/fs-uae/default.nix | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/emulators/fs-uae/default.nix b/pkgs/applications/emulators/fs-uae/default.nix index 8f22a86283ed98a..2dd75b57425ef35 100644 --- a/pkgs/applications/emulators/fs-uae/default.nix +++ b/pkgs/applications/emulators/fs-uae/default.nix @@ -1,8 +1,7 @@ { lib -, stdenv -, fetchFromGitHub , SDL2 , autoreconfHook +, fetchFromGitHub , freetype , gettext , glib @@ -13,6 +12,7 @@ , lua , openal , pkg-config +, stdenv , zip , zlib }: @@ -31,6 +31,7 @@ stdenv.mkDerivation (finalAttrs:{ nativeBuildInputs = [ autoreconfHook pkg-config + zip ]; buildInputs = [ @@ -44,10 +45,11 @@ stdenv.mkDerivation (finalAttrs:{ libmpeg2 lua openal - zip zlib ]; + strictDeps = true; + meta = { homepage = "https://fs-uae.net"; description = "An accurate, customizable Amiga Emulator"; @@ -58,7 +60,9 @@ stdenv.mkDerivation (finalAttrs:{ Amigas. ''; license = lib.licenses.gpl2Plus; + mainProgram = "fs-uae"; maintainers = with lib.maintainers; [ AndersonTorres ]; - platforms = [ "i686-linux" "x86_64-linux" ]; + platforms = with lib.systems.inspect; + patternLogicalAnd patterns.isx86 patterns.isLinux; }; }) From 91856c93b381f3998738b7ca9468fc473e77cf50 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Sun, 10 Mar 2024 00:22:21 -0300 Subject: [PATCH 2/5] fsuae-launcher: prepare for by-name migration - get rid of libsForQt5.callPackage - set strictDeps - meta.mainProgram - meta.platforms uses lib.systems machinery --- .../emulators/fs-uae/launcher.nix | 21 +++++++++++-------- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/pkgs/applications/emulators/fs-uae/launcher.nix b/pkgs/applications/emulators/fs-uae/launcher.nix index 51349182832a9ad..550b0da7af68dfb 100644 --- a/pkgs/applications/emulators/fs-uae/launcher.nix +++ b/pkgs/applications/emulators/fs-uae/launcher.nix @@ -1,10 +1,10 @@ { lib -, stdenv , fetchurl -, gettext -, python3 -, wrapQtAppsHook , fsuae +, gettext +, python3Packages +, stdenv +, libsForQt5 }: stdenv.mkDerivation (finalAttrs: { @@ -18,16 +18,18 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ gettext - python3 - wrapQtAppsHook + python3Packages.python + libsForQt5.wrapQtAppsHook ]; - buildInputs = with python3.pkgs; [ + buildInputs = with python3Packages; [ pyqt5 requests setuptools ]; + strictDeps = true; + makeFlags = [ "prefix=$(out)" ]; dontWrapQtApps = true; @@ -47,8 +49,9 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://fs-uae.net"; description = "Graphical front-end for the FS-UAE emulator"; license = lib.licenses.gpl2Plus; + mainProgram = "fs-uae-launcher"; maintainers = with lib.maintainers; [ sander AndersonTorres ]; - platforms = [ "i686-linux" "x86_64-linux" ]; + platforms = with lib.systems.inspect; + patternLogicalAnd patterns.isx86 patterns.isLinux; }; }) - diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b503f53be77314f..19b39131ce1b709 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2689,7 +2689,7 @@ with pkgs; fsuae = callPackage ../applications/emulators/fs-uae { }; - fsuae-launcher = libsForQt5.callPackage ../applications/emulators/fs-uae/launcher.nix { }; + fsuae-launcher = callPackage ../applications/emulators/fs-uae/launcher.nix { }; fuc = callPackage ../tools/misc/fuc { }; From c2ad2cde3a2ae9831374801970fc07497c334529 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Sun, 10 Mar 2024 00:26:28 -0300 Subject: [PATCH 3/5] fsuae: migrate to by-name --- .../fs-uae/default.nix => by-name/fs/fsuae/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{applications/emulators/fs-uae/default.nix => by-name/fs/fsuae/package.nix} (100%) diff --git a/pkgs/applications/emulators/fs-uae/default.nix b/pkgs/by-name/fs/fsuae/package.nix similarity index 100% rename from pkgs/applications/emulators/fs-uae/default.nix rename to pkgs/by-name/fs/fsuae/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 19b39131ce1b709..7b90903e248274f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2687,8 +2687,6 @@ with pkgs; fsrx = callPackage ../tools/misc/fsrx { }; - fsuae = callPackage ../applications/emulators/fs-uae { }; - fsuae-launcher = callPackage ../applications/emulators/fs-uae/launcher.nix { }; fuc = callPackage ../tools/misc/fuc { }; From f67c4bbccf1b4bac1d1b26e2812442cbc40f2f59 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Sun, 10 Mar 2024 00:27:03 -0300 Subject: [PATCH 4/5] fsuae-launcher: migrate to by-name --- .../launcher.nix => by-name/fs/fsuae-launcher/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{applications/emulators/fs-uae/launcher.nix => by-name/fs/fsuae-launcher/package.nix} (100%) diff --git a/pkgs/applications/emulators/fs-uae/launcher.nix b/pkgs/by-name/fs/fsuae-launcher/package.nix similarity index 100% rename from pkgs/applications/emulators/fs-uae/launcher.nix rename to pkgs/by-name/fs/fsuae-launcher/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7b90903e248274f..839ac2155dca3e2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2687,8 +2687,6 @@ with pkgs; fsrx = callPackage ../tools/misc/fsrx { }; - fsuae-launcher = callPackage ../applications/emulators/fs-uae/launcher.nix { }; - fuc = callPackage ../tools/misc/fuc { }; fuse-emulator = callPackage ../applications/emulators/fuse-emulator { }; From 773de59c1b602822af1e6ed750481cdcb896b6ac Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Sun, 10 Mar 2024 00:31:00 -0300 Subject: [PATCH 5/5] fsuae-launcher: 3.1.68 -> 3.1.70 Co-authored-by: R. RyanTM --- pkgs/by-name/fs/fsuae-launcher/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/fs/fsuae-launcher/package.nix b/pkgs/by-name/fs/fsuae-launcher/package.nix index 550b0da7af68dfb..da6eb5ed35b827d 100644 --- a/pkgs/by-name/fs/fsuae-launcher/package.nix +++ b/pkgs/by-name/fs/fsuae-launcher/package.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "fs-uae-launcher"; - version = "3.1.68"; + version = "3.1.70"; src = fetchurl { url = "https://fs-uae.net/files/FS-UAE-Launcher/Stable/${finalAttrs.version}/fs-uae-launcher-${finalAttrs.version}.tar.xz"; - hash = "sha256-42EERC2yeODx0HPbwr4vmpN80z6WSWi3WzJMOT+OwDA="; + hash = "sha256-yvJ8sa44V13SEUJ6C9SgS+N2ZFH5+20TTL2ICY9A36c="; }; nativeBuildInputs = [