Unverified Commit b817555a authored by 7c6f434c's avatar 7c6f434c Committed by GitHub
Browse files

Merge pull request #279396 from Stunkymonkey/pygame-sdl2-normalize 

python311Packages.pygame-sdl2: rename from pygame_sdl2
parents c360b497 108cf3db

pkgs/development/interpreters/renpy/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ in stdenv.mkDerivation rec { 
  buildInputs = [

    SDL2 libpng ffmpeg freetype glew libGLU libGL fribidi zlib

  ] ++ (with python3.pkgs; [

    python pygame_sdl2 tkinter future six pefile requests ecdsa

    python pygame-sdl2 tkinter future six pefile requests ecdsa

  ]);



  RENPY_DEPS_INSTALL = lib.concatStringsSep "::" (map (path: path) [
@@ -77,7 +77,7 @@ in stdenv.mkDerivation rec { 
    runHook postInstall

  '';



  env.NIX_CFLAGS_COMPILE = with python3.pkgs; "-I${pygame_sdl2}/include/${python.libPrefix}";

  env.NIX_CFLAGS_COMPILE = with python3.pkgs; "-I${pygame-sdl2}/include/${python.libPrefix}";



  meta = with lib; {

    description = "Visual Novel Engine";

pkgs/development/python-modules/pygame_sdl2/default.nix→pkgs/development/python-modules/pygame-sdl2/default.nix

+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
, cython, SDL2, SDL2_image, SDL2_ttf, SDL2_mixer, libjpeg, libpng }:



buildPythonPackage rec {

  pname = "pygame_sdl2";

  pname = "pygame-sdl2";

  version = "2.1.0";

  format = "setuptools";

  renpy_version = renpy.base_version;

pkgs/top-level/python-aliases.nix

+1 −0
Original line number Diff line number Diff line
@@ -315,6 +315,7 @@ mapAliases ({ 
  pyblake2 = throw "pyblake2 is deprecated in favor of hashlib"; # added 2023-04-23

  pyblock = throw "pyblock has been removed, since it is abandoned and broken"; # added 2023-06-20

  pydrive = throw "pydrive is broken and deprecated and has been replaced with pydrive2."; # added 2022-06-01

  pygame_sdl2 = pygame-sdl2; # added 2024-01-07

  pygbm = throw "pygbm has been removed, since it is abandoned and broken"; # added 2023-06-20

  PyGithub = pygithub; # added 2023-02-19

  pyGtkGlade = throw "Glade support for pygtk has been removed"; # added 2022-01-15

pkgs/top-level/python-packages.nix

+1 −1
Original line number Diff line number Diff line
@@ -10411,7 +10411,7 @@ self: super: with self; { 
    SDL2_image = pkgs.SDL2_image_2_0_5;

  };













  pygame_sdl2 = callPackage ../development/python-modules/pygame_sdl2 { };













  pygame-sdl2 = callPackage ../development/python-modules/pygame-sdl2 { };





























  pygame-gui = callPackage ../development/python-modules/pygame-gui { };