renpy: reformat with nixfmt-rfc-style and migrate to by-name

+61 -20
+61 -18
pkgs/development/interpreters/renpy/default.nix pkgs/by-name/re/renpy/package.nix
··· 1 - { lib, stdenv, fetchFromGitHub, python3, pkg-config, SDL2 2 - , libpng, ffmpeg, freetype, glew, libGL, libGLU, fribidi, zlib, harfbuzz 3 - , makeWrapper 1 + { 2 + lib, 3 + stdenv, 4 + fetchFromGitHub, 5 + python3, 6 + pkg-config, 7 + SDL2, 8 + libpng, 9 + ffmpeg, 10 + freetype, 11 + glew, 12 + libGL, 13 + libGLU, 14 + fribidi, 15 + zlib, 16 + harfbuzz, 17 + makeWrapper, 4 18 }: 5 19 6 20 let ··· 11 25 base_version = "8.2.1"; 12 26 vc_version = "24030407"; 13 27 version = "${base_version}.${vc_version}"; 14 - in stdenv.mkDerivation { 28 + in 29 + stdenv.mkDerivation { 15 30 pname = "renpy"; 16 31 inherit version; 17 32 ··· 31 46 python3.pkgs.setuptools 32 47 ]; 33 48 34 - buildInputs = [ 35 - SDL2 libpng ffmpeg freetype glew libGLU libGL fribidi zlib harfbuzz 36 - ] ++ (with python3.pkgs; [ 37 - python pygame-sdl2 tkinter future six pefile requests ecdsa 38 - ]); 49 + buildInputs = 50 + [ 51 + SDL2 52 + libpng 53 + ffmpeg 54 + freetype 55 + glew 56 + libGLU 57 + libGL 58 + fribidi 59 + zlib 60 + harfbuzz 61 + ] 62 + ++ (with python3.pkgs; [ 63 + python 64 + pygame-sdl2 65 + tkinter 66 + future 67 + six 68 + pefile 69 + requests 70 + ecdsa 71 + ]); 39 72 40 73 RENPY_DEPS_INSTALL = lib.concatStringsSep "::" [ 41 - SDL2 SDL2.dev libpng ffmpeg.lib freetype glew.dev libGLU libGL fribidi zlib harfbuzz.dev 74 + SDL2 75 + SDL2.dev 76 + libpng 77 + ffmpeg.lib 78 + freetype 79 + glew.dev 80 + libGLU 81 + libGL 82 + fribidi 83 + zlib 84 + harfbuzz.dev 42 85 ]; 43 86 44 87 enableParallelBuilding = true; 45 88 46 - patches = [ 47 - ./shutup-erofs-errors.patch 48 - ]; 89 + patches = [ ./shutup-erofs-errors.patch ]; 49 90 50 91 postPatch = '' 51 92 cp tutorial/game/tutorial_director.rpy{m,} ··· 81 122 82 123 env.NIX_CFLAGS_COMPILE = with python3.pkgs; "-I${pygame-sdl2}/include/${python.libPrefix}"; 83 124 84 - meta = with lib; { 125 + meta = { 85 126 description = "Visual Novel Engine"; 86 127 mainProgram = "renpy"; 87 128 homepage = "https://renpy.org/"; 88 129 changelog = "https://renpy.org/doc/html/changelog.html"; 89 - license = licenses.mit; 90 - platforms = platforms.linux; 91 - maintainers = with maintainers; [ shadowrz ]; 130 + license = lib.licenses.mit; 131 + platforms = lib.platforms.linux; 132 + maintainers = with lib.maintainers; [ shadowrz ]; 92 133 }; 93 134 94 - passthru = { inherit base_version vc_version; }; 135 + passthru = { 136 + inherit base_version vc_version; 137 + }; 95 138 }
pkgs/development/interpreters/renpy/shutup-erofs-errors.patch pkgs/by-name/re/renpy/shutup-erofs-errors.patch
-2
pkgs/top-level/all-packages.nix
··· 12393 12393 12394 12394 redsocks = callPackage ../tools/networking/redsocks { }; 12395 12395 12396 - renpy = callPackage ../development/interpreters/renpy { }; 12397 - 12398 12396 rep = callPackage ../development/tools/rep { }; 12399 12397 12400 12398 repseek = callPackage ../applications/science/biology/repseek { };