From b00ebade21316ac4e45427014dd5af34e3f4b7b1 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Mon, 3 Jan 2022 18:55:33 -0300 Subject: [PATCH 1/5] fsuae-launcher/default.nix: move to fsuae/launcher.nix --- .../{fs-uae-launcher/default.nix => fs-uae/launcher.nix} | 0 pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename pkgs/misc/emulators/{fs-uae-launcher/default.nix => fs-uae/launcher.nix} (100%) diff --git a/pkgs/misc/emulators/fs-uae-launcher/default.nix b/pkgs/misc/emulators/fs-uae/launcher.nix similarity index 100% rename from pkgs/misc/emulators/fs-uae-launcher/default.nix rename to pkgs/misc/emulators/fs-uae/launcher.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e4df8669cfb3..f6a11213afb2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -33195,7 +33195,7 @@ with pkgs; fsuae = callPackage ../misc/emulators/fs-uae { }; - fsuae-launcher = callPackage ../misc/emulators/fs-uae-launcher { + fsuae-launcher = callPackage ../misc/emulators/fs-uae/launcher.nix { inherit (python3Packages) pyqt5 setuptools requests; }; From d5dede7ae874ca0f4af925ae3cb33d1f32ef807b Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Mon, 3 Jan 2022 20:19:59 -0300 Subject: [PATCH 2/5] fsuae-launcher: refactor --- pkgs/misc/emulators/fs-uae/launcher.nix | 29 +++++++++++++++++++------ pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 23 insertions(+), 10 deletions(-) diff --git a/pkgs/misc/emulators/fs-uae/launcher.nix b/pkgs/misc/emulators/fs-uae/launcher.nix index 9416e92e2b02..afe12aab0c83 100644 --- a/pkgs/misc/emulators/fs-uae/launcher.nix +++ b/pkgs/misc/emulators/fs-uae/launcher.nix @@ -1,5 +1,9 @@ -{ stdenv, lib, fetchurl, makeWrapper, python3, gettext -, pyqt5, setuptools, requests +{ lib +, stdenv +, fetchurl +, gettext +, makeWrapper +, python3 }: stdenv.mkDerivation rec { @@ -11,18 +15,29 @@ stdenv.mkDerivation rec { sha256 = "1dknra4ngz7bpppwqghmza1q68pn1yaw54p9ba0f42zwp427ly97"; }; + nativeBuildInputs = [ + gettext + makeWrapper + python3 + ]; + + buildInputs = with python3.pkgs; [ + pyqt5 + requests + setuptools + ]; + makeFlags = [ "prefix=$(out)" ]; - nativeBuildInputs = [ makeWrapper python3 gettext ]; - buildInputs = [ pyqt5 setuptools requests ]; + postInstall = '' wrapProgram $out/bin/fs-uae-launcher --set PYTHONPATH "$PYTHONPATH" ''; - meta = { + meta = with lib; { + homepage = "https://fs-uae.net"; description = "Graphical front-end for the FS-UAE emulator"; license = lib.licenses.gpl2Plus; - homepage = "https://fs-uae.net"; - maintainers = with lib; [ maintainers.sander ]; + maintainers = with maintainers; [ sander AndersonTorres ]; platforms = [ "i686-linux" "x86_64-linux" ]; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f6a11213afb2..3552a8da14ec 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -33195,9 +33195,7 @@ with pkgs; fsuae = callPackage ../misc/emulators/fs-uae { }; - fsuae-launcher = callPackage ../misc/emulators/fs-uae/launcher.nix { - inherit (python3Packages) pyqt5 setuptools requests; - }; + fsuae-launcher = callPackage ../misc/emulators/fs-uae/launcher.nix { }; putty = callPackage ../applications/networking/remote/putty { gtk2 = gtk2-x11; From 240ed9830f55596136076ccb233c445d8c423957 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Mon, 3 Jan 2022 20:20:29 -0300 Subject: [PATCH 3/5] fsuae: 3.0.5 -> 3.1.66 --- pkgs/misc/emulators/fs-uae/default.nix | 61 ++++++++++++++++++++------ 1 file changed, 47 insertions(+), 14 deletions(-) diff --git a/pkgs/misc/emulators/fs-uae/default.nix b/pkgs/misc/emulators/fs-uae/default.nix index eef8c2c32533..4bd67908a787 100644 --- a/pkgs/misc/emulators/fs-uae/default.nix +++ b/pkgs/misc/emulators/fs-uae/default.nix @@ -1,21 +1,56 @@ -{ lib, stdenv, fetchurl, pkg-config -, gettext, gtk2, SDL2, zlib, glib, openal, libGLU, libGL, lua, freetype, libmpeg2, zip }: +{ lib +, stdenv +, fetchFromGitHub +, SDL2 +, autoreconfHook +, freetype +, gettext +, glib +, gtk2 +, libGL +, libGLU +, libmpeg2 +, lua +, openal +, pkg-config +, zip +, zlib +}: + -with lib; stdenv.mkDerivation rec { - pname = "fs-uae"; - version = "3.0.5"; + version = "3.1.66"; - src = fetchurl { - url = "https://fs-uae.net/stable/${version}/${pname}-${version}.tar.gz"; - sha256 = "1qwzhp34wy7bnd3c0plv11rg9fs5m92rh3ffnr9pn6ng0cpc8vpj"; + src = fetchFromGitHub { + owner = "FrodeSolheim"; + repo = pname; + rev = "v${version}"; + hash = "sha256-zPVRPazelmNaxcoCStB0j9b9qwQDTgv3O7Bg3VlW9ys="; }; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ gettext gtk2 SDL2 zlib glib openal libGLU libGL lua freetype libmpeg2 zip ]; + nativeBuildInputs = [ + autoreconfHook + pkg-config + ]; - meta = { + buildInputs = [ + SDL2 + freetype + gettext + glib + gtk2 + libGL + libGLU + libmpeg2 + lua + openal + zip + zlib + ]; + + meta = with lib; { + homepage = "https://fs-uae.net"; description = "An accurate, customizable Amiga Emulator"; longDescription = '' FS-UAE integrates the most accurate Amiga emulation code available @@ -24,9 +59,7 @@ stdenv.mkDerivation rec { create customized Amigas. ''; license = licenses.gpl2Plus; - homepage = "https://fs-uae.net"; - maintainers = with lib; [ maintainers.AndersonTorres ]; + maintainers = with maintainers; [ AndersonTorres ]; platforms = [ "i686-linux" "x86_64-linux" ]; }; } -# TODO: testing and Python GUI support From ff0f9a44216383b990886c27650f56e86fcda8d1 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Mon, 3 Jan 2022 18:35:27 -0300 Subject: [PATCH 4/5] free42: 3.0.8 -> 3.0.9 --- pkgs/applications/misc/free42/default.nix | 25 +++++++++++++++-------- 1 file changed, 17 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/misc/free42/default.nix b/pkgs/applications/misc/free42/default.nix index a303e26d8e0c..14351990e72b 100644 --- a/pkgs/applications/misc/free42/default.nix +++ b/pkgs/applications/misc/free42/default.nix @@ -10,17 +10,24 @@ stdenv.mkDerivation rec { pname = "free42"; - version = "3.0.8"; + version = "3.0.9"; src = fetchFromGitHub { owner = "thomasokken"; repo = pname; rev = "v${version}"; - sha256 = "sha256-nZCuFumAyeUxRmmtd6/qvXk3LVZgbDhlsDygXMWDfp0="; + hash = "sha256-ZSwqgHsfe9apyYZ1fkvDMnQxdNb9E8U1l9jvC9t693w="; }; - nativeBuildInputs = [ copyDesktopItems pkg-config ]; - buildInputs = [ gtk3 alsa-lib ]; + nativeBuildInputs = [ + copyDesktopItems + pkg-config + ]; + + buildInputs = [ + alsa-lib + gtk3 + ]; postPatch = '' sed -i -e "s|/bin/ls|ls|" gtk/Makefile @@ -30,23 +37,24 @@ stdenv.mkDerivation rec { buildPhase = '' runHook preBuild + make -C gtk cleaner make --jobs=$NIX_BUILD_CORES -C gtk make -C gtk clean make --jobs=$NIX_BUILD_CORES -C gtk BCD_MATH=1 + runHook postBuild ''; - preInstall = '' + installPhase = '' + runHook preInstall + install --directory $out/bin \ $out/share/doc/${pname} \ $out/share/${pname}/skins \ $out/share/icons/hicolor/48x48/apps \ $out/share/icons/hicolor/128x128/apps - ''; - installPhase = '' - runHook preInstall install -m755 gtk/free42dec gtk/free42bin $out/bin install -m644 gtk/README $out/share/doc/${pname}/README-GTK install -m644 README $out/share/doc/${pname}/README @@ -54,6 +62,7 @@ stdenv.mkDerivation rec { install -m644 gtk/icon-48x48.xpm $out/share/icons/hicolor/48x48/apps install -m644 gtk/icon-128x128.xpm $out/share/icons/hicolor/128x128/apps install -m644 skins/* $out/share/${pname}/skins + runHook postInstall ''; From d6007bd3fe07c62efcc20c8d8cdd00a203f0a426 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Mon, 3 Jan 2022 17:08:43 -0300 Subject: [PATCH 5/5] cimg: 2.9.9 -> 3.0.0 --- pkgs/development/libraries/cimg/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/cimg/default.nix b/pkgs/development/libraries/cimg/default.nix index 09a407fc3bc3..47e9ffa925ab 100644 --- a/pkgs/development/libraries/cimg/default.nix +++ b/pkgs/development/libraries/cimg/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "cimg"; - version = "2.9.9"; + version = "3.0.0"; src = fetchFromGitHub { owner = "dtschump"; repo = "CImg"; rev = "v.${version}"; - hash = "sha256-DWyqVN7v+j2XCArv4jmrD45XKWMNhd2DddJHH3gQWQY="; + hash = "sha256-dC4VuWTz0uyFxLjBQ+2ggndHaCErcoI7tJMfkqbWmeg="; }; outputs = [ "out" "doc" ]; @@ -21,8 +21,8 @@ stdenv.mkDerivation rec { install -dm 755 $out/include/CImg/plugins $doc/share/doc/cimg/examples install -m 644 CImg.h $out/include/ - cp -dr --no-preserve=ownership examples/* $doc/share/doc/cimg/examples/ cp -dr --no-preserve=ownership plugins/* $out/include/CImg/plugins/ + cp -dr --no-preserve=ownership examples/* $doc/share/doc/cimg/examples/ cp README.txt $doc/share/doc/cimg/ runHook postInstall