git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #153395 from AndersonTorres/new-cimg

cimg: 2.9.9 -> 3.0.0; fsuae: 3.0.5 -> 3.1.66; free42: 3.0.8 -> 3.0.9

commite24931ba0b068066c60fdf07d577d320343f20d5 authorAnderson Torres <torres.anderson.85@protonmail.com> dateMon 3 Jan 2022, 22:54 (5 years ago) parent27c6507d6007bd
5 files changed+90−35
pkgs/applications/misc/free42/default.nix+17−8 pkgs/development/libraries/cimg/default.nix+3−3 pkgs/misc/emulators/fs-uae/default.nix+47−14 pkgs/misc/emulators/fs-uae-launcher/default.nix → pkgs/misc/emulators/fs-uae/launcher.nix+22−7 pkgs/top-level/all-packages.nix+1−3
pkgs/applications/misc/free42/default.nix+17−8
@@ -10,17 +10,24 @@
1010
1111stdenv.mkDerivation rec {
1212 pname = "free42";
13− version = "3.0.8";
13+ version = "3.0.9";
1414
1515 src = fetchFromGitHub {
1616 owner = "thomasokken";
1717 repo = pname;
1818 rev = "v${version}";
19− sha256 = "sha256-nZCuFumAyeUxRmmtd6/qvXk3LVZgbDhlsDygXMWDfp0=";
19+ hash = "sha256-ZSwqgHsfe9apyYZ1fkvDMnQxdNb9E8U1l9jvC9t693w=";
2020 };
2121
22− nativeBuildInputs = [ copyDesktopItems pkg-config ];
23− buildInputs = [ gtk3 alsa-lib ];
22+ nativeBuildInputs = [
23+ copyDesktopItems
24+ pkg-config
25+ ];
26+
27+ buildInputs = [
28+ alsa-lib
29+ gtk3
30+ ];
2431
2532 postPatch = ''
2633 sed -i -e "s|/bin/ls|ls|" gtk/Makefile
@@ -30,23 +37,24 @@ stdenv.mkDerivation rec {
3037
3138 buildPhase = ''
3239 runHook preBuild
40+
3341 make -C gtk cleaner
3442 make --jobs=$NIX_BUILD_CORES -C gtk
3543 make -C gtk clean
3644 make --jobs=$NIX_BUILD_CORES -C gtk BCD_MATH=1
45+
3746 runHook postBuild
3847 '';
3948
40− preInstall = ''
49+ installPhase = ''
50+ runHook preInstall
51+
4152 install --directory $out/bin \
4253 $out/share/doc/${pname} \
4354 $out/share/${pname}/skins \
4455 $out/share/icons/hicolor/48x48/apps \
4556 $out/share/icons/hicolor/128x128/apps
46− '';
4757
48− installPhase = ''
49− runHook preInstall
5058 install -m755 gtk/free42dec gtk/free42bin $out/bin
5159 install -m644 gtk/README $out/share/doc/${pname}/README-GTK
5260 install -m644 README $out/share/doc/${pname}/README
@@ -54,6 +62,7 @@ stdenv.mkDerivation rec {
5462 install -m644 gtk/icon-48x48.xpm $out/share/icons/hicolor/48x48/apps
5563 install -m644 gtk/icon-128x128.xpm $out/share/icons/hicolor/128x128/apps
5664 install -m644 skins/* $out/share/${pname}/skins
65+
5766 runHook postInstall
5867 '';
5968
pkgs/development/libraries/cimg/default.nix+3−3
@@ -5,13 +5,13 @@
55
66stdenv.mkDerivation rec {
77 pname = "cimg";
8− version = "2.9.9";
8+ version = "3.0.0";
99
1010 src = fetchFromGitHub {
1111 owner = "dtschump";
1212 repo = "CImg";
1313 rev = "v.${version}";
14− hash = "sha256-DWyqVN7v+j2XCArv4jmrD45XKWMNhd2DddJHH3gQWQY=";
14+ hash = "sha256-dC4VuWTz0uyFxLjBQ+2ggndHaCErcoI7tJMfkqbWmeg=";
1515 };
1616
1717 outputs = [ "out" "doc" ];
@@ -21,8 +21,8 @@ stdenv.mkDerivation rec {
2121
2222 install -dm 755 $out/include/CImg/plugins $doc/share/doc/cimg/examples
2323 install -m 644 CImg.h $out/include/
24− cp -dr --no-preserve=ownership examples/* $doc/share/doc/cimg/examples/
2524 cp -dr --no-preserve=ownership plugins/* $out/include/CImg/plugins/
25+ cp -dr --no-preserve=ownership examples/* $doc/share/doc/cimg/examples/
2626 cp README.txt $doc/share/doc/cimg/
2727
2828 runHook postInstall
pkgs/misc/emulators/fs-uae/default.nix+47−14
@@ -1,21 +1,56 @@
1−{ lib, stdenv, fetchurl, pkg-config
2−, gettext, gtk2, SDL2, zlib, glib, openal, libGLU, libGL, lua, freetype, libmpeg2, zip }:
1+{ lib
2+, stdenv
3+, fetchFromGitHub
4+, SDL2
5+, autoreconfHook
6+, freetype
7+, gettext
8+, glib
9+, gtk2
10+, libGL
11+, libGLU
12+, libmpeg2
13+, lua
14+, openal
15+, pkg-config
16+, zip
17+, zlib
18+}:
319
4−with lib;
5−stdenv.mkDerivation rec {
620
21+stdenv.mkDerivation rec {
722 pname = "fs-uae";
8− version = "3.0.5";
23+ version = "3.1.66";
924
10− src = fetchurl {
11− url = "https://fs-uae.net/stable/${version}/${pname}-${version}.tar.gz";
12− sha256 = "1qwzhp34wy7bnd3c0plv11rg9fs5m92rh3ffnr9pn6ng0cpc8vpj";
25+ src = fetchFromGitHub {
26+ owner = "FrodeSolheim";
27+ repo = pname;
28+ rev = "v${version}";
29+ hash = "sha256-zPVRPazelmNaxcoCStB0j9b9qwQDTgv3O7Bg3VlW9ys=";
1330 };
1431
15− nativeBuildInputs = [ pkg-config ];
16− buildInputs = [ gettext gtk2 SDL2 zlib glib openal libGLU libGL lua freetype libmpeg2 zip ];
32+ nativeBuildInputs = [
33+ autoreconfHook
34+ pkg-config
35+ ];
36+
37+ buildInputs = [
38+ SDL2
39+ freetype
40+ gettext
41+ glib
42+ gtk2
43+ libGL
44+ libGLU
45+ libmpeg2
46+ lua
47+ openal
48+ zip
49+ zlib
50+ ];
1751
18− meta = {
52+ meta = with lib; {
53+ homepage = "https://fs-uae.net";
1954 description = "An accurate, customizable Amiga Emulator";
2055 longDescription = ''
2156 FS-UAE integrates the most accurate Amiga emulation code available
@@ -24,9 +59,7 @@ stdenv.mkDerivation rec {
2459 create customized Amigas.
2560 '';
2661 license = licenses.gpl2Plus;
27− homepage = "https://fs-uae.net";
28− maintainers = with lib; [ maintainers.AndersonTorres ];
62+ maintainers = with maintainers; [ AndersonTorres ];
2963 platforms = [ "i686-linux" "x86_64-linux" ];
3064 };
3165}
32−# TODO: testing and Python GUI support
pkgs/misc/emulators/fs-uae-launcher/default.nix → pkgs/misc/emulators/fs-uae/launcher.nixrenamed+22−7
@@ -1,5 +1,9 @@
1−{ stdenv, lib, fetchurl, makeWrapper, python3, gettext
2−, pyqt5, setuptools, requests
1+{ lib
2+, stdenv
3+, fetchurl
4+, gettext
5+, makeWrapper
6+, python3
37}:
48
59stdenv.mkDerivation rec {
@@ -11,18 +15,29 @@ stdenv.mkDerivation rec {
1115 sha256 = "1dknra4ngz7bpppwqghmza1q68pn1yaw54p9ba0f42zwp427ly97";
1216 };
1317
18+ nativeBuildInputs = [
19+ gettext
20+ makeWrapper
21+ python3
22+ ];
23+
24+ buildInputs = with python3.pkgs; [
25+ pyqt5
26+ requests
27+ setuptools
28+ ];
29+
1430 makeFlags = [ "prefix=$(out)" ];
15− nativeBuildInputs = [ makeWrapper python3 gettext ];
16− buildInputs = [ pyqt5 setuptools requests ];
31+
1732 postInstall = ''
1833 wrapProgram $out/bin/fs-uae-launcher --set PYTHONPATH "$PYTHONPATH"
1934 '';
2035
21− meta = {
36+ meta = with lib; {
37+ homepage = "https://fs-uae.net";
2238 description = "Graphical front-end for the FS-UAE emulator";
2339 license = lib.licenses.gpl2Plus;
24− homepage = "https://fs-uae.net";
25− maintainers = with lib; [ maintainers.sander ];
40+ maintainers = with maintainers; [ sander AndersonTorres ];
2641 platforms = [ "i686-linux" "x86_64-linux" ];
2742 };
2843}
pkgs/top-level/all-packages.nix+1−3
@@ -33202,9 +33202,7 @@ with pkgs;
3320233202
3320333203 fsuae = callPackage ../misc/emulators/fs-uae { };
3320433204
33205− fsuae-launcher = callPackage ../misc/emulators/fs-uae-launcher {
33206− inherit (python3Packages) pyqt5 setuptools requests;
33207− };
33205+ fsuae-launcher = callPackage ../misc/emulators/fs-uae/launcher.nix { };
3320833206
3320933207 putty = callPackage ../applications/networking/remote/putty {
3321033208 gtk2 = gtk2-x11;