Unverified Commit 7807a923 authored by Peder Bergebakken Sundt's avatar Peder Bergebakken Sundt Committed by GitHub
Browse files

python3Packages.pygame: rename to pygame-original, point to pygame-ce for Python >= 3.14 (#475917)

parents 1e4b6f43 6c601146
Loading
Loading
Loading
Loading
+2 −0
Original line number Diff line number Diff line
@@ -29,6 +29,8 @@

- `iroh` has been removed and split up into `iroh-dns-server` and `iroh-relay`.

- `python3Packages.pygame` has been been renamed to `python3Packages.pygame-original`, the attribute `python3Packages.pygame` will from python 3.14 default to the more actively maintained `python3Packages.pygame-ce`

- `python3Packages.gradio` has been updated to version 6. See upstream's migration guide at https://www.gradio.app/main/guides/gradio-6-migration-guide.

- `vicinae` has been updated to v0.17. Version 0.17 contains a complete overhaul of the configuration system. For update instructions, see the [release notes for v0.17.0](https://github.com/vicinaehq/vicinae/releases/tag/v0.17.0) and the [upstream configuration documentation](https://docs.vicinae.com/config).
+11 −6
Original line number Diff line number Diff line
{
  lib,
  fetchFromSourcehut,
  python3Packages,
  python312Packages,
}:

python3Packages.buildPythonApplication rec {
python312Packages.buildPythonApplication rec {
  pname = "brutalmaze";
  version = "1.1.1";
  format = "pyproject";
  disabled = python3Packages.pythonOlder "3.7";
  disabled = python312Packages.pythonOlder "3.7";

  src = fetchFromSourcehut {
    owner = "~cnx";
@@ -17,14 +17,19 @@ python3Packages.buildPythonApplication rec {
    sha256 = "1m105iq378mypj64syw59aldbm6bj4ma4ynhc50gafl656fabg4y";
  };

  nativeBuildInputs = with python3Packages; [
  postPatch = ''
    substituteInPlace pyproject.toml \
      --replace-fail "pygame" "pygame-ce"
  '';

  nativeBuildInputs = with python312Packages; [
    flit-core
  ];

  propagatedBuildInputs = with python3Packages; [
  propagatedBuildInputs = with python312Packages; [
    loca
    palace
    pygame
    pygame-ce
  ];

  doCheck = false; # there's no test
+6 −1
Original line number Diff line number Diff line
@@ -31,6 +31,11 @@ python3.pkgs.buildPythonApplication {
  srcs = [ main_src ] ++ lib.optional enableDefaultMusicPack music_src;
  sourceRoot = main_src.name;

  postPatch = ''
    substituteInPlace setup.py \
      --replace-fail "pygame>=2.5.2" "pygame-ce"
  '';

  nativeBuildInputs = [ unzip ]; # The music is zipped

  build-system = with python3.pkgs; [
@@ -38,7 +43,7 @@ python3.pkgs.buildPythonApplication {
  ];

  dependencies = with python3.pkgs; [
    pygame
    pygame-ce
    numpy
    polib
  ];
+0 −0

File moved.

+0 −0

File moved.

Loading