Unverified Commit 40d6df82 authored by Matthieu Coudron's avatar Matthieu Coudron Committed by GitHub
Browse files

gscrabble: drop; fltrator: move to by-name (#476694)

parents 74849451 c23e6c3d

pkgs/games/fltrator/default.nix→pkgs/by-name/fl/fltrator/package.nix

+5 −5
Original line number Diff line number Diff line
@@ -3,22 +3,22 @@ 
  stdenv,

  fetchurl,

  unzip,

  fltk,

  fltk-minimal,

  which,

  libjpeg,

}:



stdenv.mkDerivation rec {

stdenv.mkDerivation (finalAttrs: {

  pname = "fltrator";

  version = "2.3";



  src = fetchurl {

    url = "mirror://sourceforge/fltrator/fltrator-${version}-code.zip";

    url = "mirror://sourceforge/fltrator/fltrator-${finalAttrs.version}-code.zip";

    sha256 = "125aqq1sfrm0c9cm6gyylwdmc8xrb0rjf563xvw7q28sdbl6ayp7";

  };



  buildInputs = [

    fltk

    fltk-minimal

    libjpeg

  ];

  nativeBuildInputs = [
@@ -61,4 +61,4 @@ stdenv.mkDerivation rec { 
    license = lib.licenses.gpl3;

  };



}
 
})

pkgs/games/gscrabble/default.nix

deleted100644 → 0
+0 −64
Original line number Diff line number Diff line 
{

  lib,

  buildPythonApplication,

  fetchFromGitHub,

  gtk3,

  wrapGAppsHook3,

  gst_all_1,

  gobject-introspection,

  gst-python,

  pygobject3,

  adwaita-icon-theme,

}:



buildPythonApplication {

  pname = "gscrabble";

  version = "unstable-2020-04-21";

  format = "setuptools";



  src = fetchFromGitHub {

    owner = "RaaH";

    repo = "gscrabble";

    rev = "aba37f062a6b183dcc084c453f395af1dc437ec8";

    sha256 = "sha256-rYpPHgOlPRnlA+Nkvo/J+/8/vl24/Ssk55fTq9oNCz4=";

  };



  doCheck = false;



  nativeBuildInputs = [

    wrapGAppsHook3

    gobject-introspection

  ];



  buildInputs = with gst_all_1; [

    gst-plugins-base

    gst-plugins-good

    gst-plugins-ugly

    gst-plugins-bad

    adwaita-icon-theme

    gtk3

  ];



  propagatedBuildInputs = [

    gst-python

    pygobject3

  ];



  preFixup = ''

    gappsWrapperArgs+=(

      --prefix PYTHONPATH : "$out/share/GScrabble/modules"

      )

  '';



  meta = {

    # Fails to build, probably incompatible with latest Python

    # error: Multiple top-level packages discovered in a flat-layout

    # https://github.com/RaaH/gscrabble/issues/13

    broken = true;

    description = "Golden Scrabble crossword puzzle game";

    homepage = "https://github.com/RaaH/gscrabble/";

    license = lib.licenses.gpl2Plus;

    platforms = lib.platforms.linux;

    maintainers = with lib.maintainers; [ onny ];

  };

}

pkgs/top-level/aliases.nix

+1 −0
Original line number Diff line number Diff line
@@ -772,6 +772,7 @@ mapAliases { 
  graphite-kde-theme = throw "'graphite-kde-theme' has been removed, as it is only compatible with Plasma 5, which is EOL"; # Added 2025-08-20

  gringo = throw "'gringo' has been renamed to/replaced by 'clingo'"; # Converted to throw 2025-10-27

  grub2_full = throw "'grub2_full' has been renamed to/replaced by 'grub2'"; # Converted to throw 2025-10-27

  gscrabble = throw "'gscrabble' has been removed, as it is unmaintained upstream, and broken in nixpkgs"; # Added 2026-01-03

  gsettings-qt = lomiri.gsettings-qt; # Added 2025-12-06

  gtkcord4 = throw "'gtkcord4' has been renamed to/replaced by 'dissent'"; # Converted to throw 2025-10-27

  gtkextra = throw "'gtkextra' has been removed due to lack of maintenance upstream."; # Added 2025-06-10

pkgs/top-level/all-packages.nix

+0 −6
Original line number Diff line number Diff line
@@ -12246,10 +12246,6 @@ with pkgs; 
    d2x-rebirth-full

    ;



  fltrator = callPackage ../games/fltrator {

    fltk = fltk-minimal;

  };



  factorio = callPackage ../by-name/fa/factorio/package.nix { releaseType = "alpha"; };



  factorio-experimental = factorio.override {
@@ -12300,8 +12296,6 @@ with pkgs; 


  freeciv_gtk = freeciv;



  gscrabble = python3Packages.callPackage ../games/gscrabble { };



  ibmcloud-cli = callPackage ../tools/admin/ibmcloud-cli { stdenv = stdenvNoCC; };



  # used as base package for iortcw forks