git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #155106 from Mic92/love-cleanup

treewide: cleanup love related packages

commitbb9046571d78d9cc63a239f7292db5f5b198f69c authorJörg Thalheim <Mic92@users.noreply.github.com> dateWed 19 Jan 2022, 05:54 (5 years ago) parent940d182bae5930
10 files changed+7−395
compare with master
unifiedsplit
pkgs/development/interpreters/love/0.7.nix−57 pkgs/development/interpreters/love/0.8.nix−54 pkgs/development/interpreters/love/0.9.nix−36 pkgs/games/hawkthorne/default.nix−39 pkgs/games/hawkthorne/makefile.patch−33 pkgs/games/nottetris2/default.nix−49 pkgs/games/rimshot/default.nix−55 pkgs/games/vapor/default.nix−61 pkgs/top-level/aliases.nix+7 pkgs/top-level/all-packages.nix−11
pkgs/development/interpreters/love/0.7.nixdeleted−57
@@ -1,57 +0,0 @@
1−{ lib, stdenv, fetchurl, pkg-config
2−, SDL, libGLU, libGL, openal, lua
3−, libdevil, freetype, physfs
4−, libmodplug, mpg123, libvorbis, libogg
5−, libmng
6−}:
7−
8−stdenv.mkDerivation rec {
9− pname = "love";
10− version = "0.7.2";
11−
12− src = fetchurl {
13− url = "https://github.com/love2d/love/releases/download/${version}/love-${version}-linux-src.tar.gz";
14− sha256 = "0s7jywkvydlshlgy11ilzngrnybmq5xlgzp2v2dhlffwrfqdqym5";
15− };
16−
17− # see discussion on arch linux user repository (https://aur.archlinux.org/packages/love07/?setlang=cs#comment-684696)
18− patches = [ ./0.7-gl-prototypes.patch ];
19−
20− nativeBuildInputs = [ pkg-config ];
21− buildInputs = [
22− SDL libGLU libGL openal lua
23− libdevil freetype physfs libmodplug mpg123 libvorbis libogg libmng
24− ];
25−
26− preConfigure = ''
27− luaoptions="${"''"} lua luajit "
28− for i in lua luajit-; do
29− for j in 5 5.0 5.1 5.2 5.3 5.4; do
30− luaoptions="$luaoptions $i$j "
31− done
32− done
33− luaso="$(echo "${lua}/lib/"lib*.so.*)"
34− luaso="''${luaso##*/lib}"
35− luaso="''${luaso%%.so*}"
36− luaoptions="$luaoptions $luaso"
37− sed -e "s/${"''"} lua lua.*;/$luaoptions;/" -i configure
38−
39− luaincdir="$(echo "${lua}/include"/*/ )"
40− test -d "$luaincdir" && {
41− export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I$luaincdir"
42− } || true
43− '';
44−
45− NIX_CFLAGS_COMPILE = ''
46− -I${SDL.dev}/include/SDL
47− -I${freetype.dev}include/freetype2
48− '';
49−
50− meta = {
51− homepage = "https://love2d.org";
52− description = "A Lua-based 2D game engine/scripting language";
53− license = lib.licenses.zlib;
54− platforms = lib.platforms.linux;
55− maintainers = [ lib.maintainers.raskin ];
56− };
57−}
pkgs/development/interpreters/love/0.8.nixdeleted−54
@@ -1,54 +0,0 @@
1−{ lib, stdenv, fetchurl, pkg-config
2−, SDL, libGLU, libGL, openal, lua
3−, libdevil, freetype, physfs
4−, libmodplug, mpg123, libvorbis, libogg
5−}:
6−
7−stdenv.mkDerivation rec {
8− pname = "love";
9− version = "0.8.0";
10−
11− src = fetchurl {
12− url = "https://github.com/love2d/love/releases/download/${version}/love-${version}-linux-src.tar.gz";
13− sha256 = "1k4fcsa8zzi04ja179bmj24hvqcbm3icfvrvrzyz2gw9qwfclrwi";
14− };
15−
16− nativeBuildInputs = [ pkg-config ];
17− buildInputs = [
18− SDL libGLU libGL openal lua
19− libdevil freetype physfs libmodplug mpg123 libvorbis libogg
20− ];
21−
22− preConfigure = ''
23− luaoptions="${"''"} lua luajit "
24− for i in lua luajit-; do
25− for j in 5 5.0 5.1 5.2 5.3 5.4; do
26− luaoptions="$luaoptions $i$j "
27− done
28− done
29− luaso="$(echo "${lua}/lib/"lib*.so.*)"
30− luaso="''${luaso##*/lib}"
31− luaso="''${luaso%%.so*}"
32− luaoptions="$luaoptions $luaso"
33− sed -e "s/${"''"} lua lua.*;/$luaoptions;/" -i configure
34−
35− luaincdir="$(echo "${lua}/include"/*/ )"
36− test -d "$luaincdir" && {
37− export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I$luaincdir"
38− } || true
39− '';
40−
41− NIX_CFLAGS_COMPILE = toString [
42− "-I${SDL.dev}/include/SDL"
43− "-I${freetype.dev}include/freetype2"
44− "-DGL_GLEXT_PROTOTYPES" # https://community.khronos.org/t/glgenbuffers-was-not-declared-in-this-scope/59283/2
45− ];
46−
47− meta = {
48− homepage = "https://love2d.org";
49− description = "A Lua-based 2D game engine/scripting language";
50− license = lib.licenses.zlib;
51− platforms = lib.platforms.linux;
52− maintainers = [ lib.maintainers.raskin ];
53− };
54−}
pkgs/development/interpreters/love/0.9.nixdeleted−36
@@ -1,36 +0,0 @@
1−{ lib, stdenv, fetchurl, pkg-config
2−, SDL2, libGLU, libGL, openal, luajit
3−, libdevil, freetype, physfs
4−, libmodplug, mpg123, libvorbis, libogg
5−}:
6−
7−stdenv.mkDerivation rec {
8− pname = "love";
9− version = "0.9.2";
10−
11− src = fetchurl {
12− url = "https://github.com/love2d/love/releases/download/${version}/love-${version}-linux-src.tar.gz";
13− sha256 = "0wn1npr5gal5b1idh4a5fwc3f5c36lsbjd4r4d699rqlviid15d9";
14− };
15−
16− nativeBuildInputs = [ pkg-config ];
17− buildInputs = [
18− SDL2 libGLU libGL openal luajit
19− libdevil freetype physfs libmodplug mpg123 libvorbis libogg
20− ];
21−
22− configureFlags = [
23− "--with-lua=luajit"
24− ];
25−
26− NIX_CFLAGS_COMPILE = [ "-DluaL_reg=luaL_Reg" ]; # needed since luajit-2.1.0-beta3
27−
28− meta = {
29− homepage = "https://love2d.org";
30− description = "A Lua-based 2D game engine/scripting language";
31− license = lib.licenses.zlib;
32− platforms = lib.platforms.linux;
33− maintainers = [ lib.maintainers.raskin ];
34− broken = true;
35− };
36−}
pkgs/games/hawkthorne/default.nixdeleted−39
@@ -1,39 +0,0 @@
1−{ fetchgit, lib, stdenv, love, curl, zip }:
2−
3−stdenv.mkDerivation {
4− version = "0.12.1";
5− pname = "hawkthorne";
6−
7− src = fetchgit {
8− url = "https://github.com/hawkthorne/hawkthorne-journey.git";
9− rev = "610b9b3907b2a1b21da2ae926e4c7c4c9e19959b";
10− sha256 = "013smhdf9sh91153fpk2bwhhnpg6pn7kfrpw77jmf0v48i3q44h2";
11− };
12−
13− buildInputs = [
14− love curl zip
15− ];
16−
17− patches = [
18− ./makefile.patch
19− ];
20−
21− enableParallelBuilding = true;
22−
23− meta = {
24− description = "Journey to the Center of Hawkthorne - A fan-made retro-style game based on the show Community";
25− longDescription = ''
26− Journey to the Center of Hawkthorne is an open source game written in Love2D.
27− It's based on the show Community, starring Jim Rash and Joel McHale as
28− the primary will-they-or-won't-they relationship.
29−
30− This game has been entirely developed by fans of the show, who were inspired
31− to bring to life the video game used to determine the winner of Pierce
32− Hawthorne's inheritance.
33− '';
34− homepage = "https://www.reddit.com/r/hawkthorne";
35− license = lib.licenses.mit;
36− maintainers = with lib.maintainers; [ campadrenalin ];
37− broken = true;
38− };
39−}
pkgs/games/hawkthorne/makefile.patchdeleted−33
@@ -1,33 +0,0 @@
1−diff --git a/Makefile b/Makefile
2−index 55eb817..f3406aa 100644
3−--- a/Makefile
4−+++ b/Makefile
5−@@ -18,10 +18,14 @@ endif
6−
7− tilemaps := $(patsubst %.tmx,%.lua,$(wildcard src/maps/*.tmx))
8−
9−-maps: $(tilemaps)
10−-
11− love: build/hawkthorne.love
12−
13−+shebang: build/hawkthorne.love
14−+ cat <(echo '#!/usr/bin/env love') build/hawkthorne.love > build/hawkthorne
15−+ chmod +x build/hawkthorne
16−+
17−+maps: $(tilemaps)
18−+
19− build/hawkthorne.love: $(tilemaps) src/*
20− mkdir -p build
21− cd src && zip --symlinks -q -r ../build/hawkthorne.love . -x ".*" \
22−@@ -30,6 +34,12 @@ build/hawkthorne.love: $(tilemaps) src/*
23− run: $(tilemaps) $(LOVE)
24− $(LOVE) src
25−
26−+check: test
27−+
28−+install: shebang
29−+ mkdir -p $(out)/bin
30−+ cp build/hawkthorne $(out)/bin
31−+
32− src/maps/%.lua: src/maps/%.tmx bin/tmx2lua
33− bin/tmx2lua $<
pkgs/games/nottetris2/default.nixdeleted−49
@@ -1,49 +0,0 @@
1−{ lib, stdenv, fetchFromGitHub, zip, love_0_7, makeWrapper, makeDesktopItem }:
2−
3−let
4− pname = "nottetris2";
5− version = "2.0";
6−
7− desktopItem = makeDesktopItem {
8− name = "nottetris2";
9− exec = pname;
10− comment = "It's like tetris, but it's not";
11− desktopName = "nottetris2";
12− genericName = "nottetris2";
13− categories = "Game";
14− };
15−
16−in
17−
18−stdenv.mkDerivation {
19− inherit pname version;
20−
21− src = fetchFromGitHub {
22− owner = "Stabyourself";
23− repo = pname;
24− rev = "v${version}";
25− sha256 = "17iabh6rr8jim70n96rbhif4xq02g2kppscm8l339yqx6mhb64hs";
26− };
27−
28− nativeBuildInputs = [ zip makeWrapper ];
29− buildInputs = [ love_0_7 ];
30−
31− installPhase =
32− ''
33− mkdir -p $out/bin $out/share/games/lovegames $out/share/applications
34− zip -9 -r ${pname}.love ./*
35− mv ${pname}.love $out/share/games/lovegames/${pname}.love
36− makeWrapper ${love_0_7}/bin/love $out/bin/${pname} --add-flags $out/share/games/lovegames/${pname}.love
37− ln -s ${desktopItem}/share/applications/* $out/share/applications/
38− chmod +x $out/bin/${pname}
39− '';
40−
41− meta = with lib; {
42− description = "It's like Tetris, but it's not";
43− platforms = platforms.linux;
44− license = licenses.wtfpl;
45− maintainers = with maintainers; [ yorickvp ];
46− downloadPage = "https://stabyourself.net/nottetris2/";
47− };
48−
49−}
pkgs/games/rimshot/default.nixdeleted−55
@@ -1,55 +0,0 @@
1−{ lib, stdenv, fetchurl, unzip, love, lua, makeWrapper, makeDesktopItem }:
2−
3−stdenv.mkDerivation rec {
4− pname = "rimshot";
5− version = "1.0";
6−
7− src = fetchurl {
8− url = "https://stabyourself.net/dl.php?file=${pname}/${pname}-source.zip";
9− sha256 = "08pdkyvki92549605m9bqnr24ipkbwkp5nkr5aagdqnr8ai4rgmi";
10− };
11−
12− icon = fetchurl {
13− url = "http://stabyourself.net/images/screenshots/rimshot-2.png";
14− sha256 = "08fyiqym3gcpq2vgb5dvafkban42fsbzfcr3iiyw03hz99q53psd";
15− };
16−
17− desktopItem = makeDesktopItem {
18− name = "rimshot";
19− exec = pname;
20− icon = icon;
21− comment = "Create your own music";
22− desktopName = "Rimshot";
23− genericName = "rimshot";
24− categories = "Audio;AudioVideo;Music";
25− };
26−
27− nativeBuildInputs = [ makeWrapper unzip ];
28− buildInputs = [ lua love ];
29−
30− unpackPhase = ''
31− unzip -j $src
32− '';
33−
34− installPhase =
35− ''
36− mkdir -p $out/bin
37− mkdir -p $out/share/games/lovegames
38−
39− cp -v ./*.love $out/share/games/lovegames/${pname}.love
40− makeWrapper ${love}/bin/love $out/bin/${pname} --add-flags $out/share/games/lovegames/${pname}.love
41−
42− chmod +x $out/bin/${pname}
43− mkdir -p $out/share/applications
44− ln -s ${desktopItem}/share/applications/* $out/share/applications/
45− '';
46−
47− meta = with lib; {
48− description = "Create your own music";
49− maintainers = with maintainers; [ leenaars ];
50− platforms = platforms.linux;
51− license = licenses.free;
52− downloadPage = "http://stabyourself.net/rimshot/";
53− };
54−
55−}
pkgs/games/vapor/default.nixdeleted−61
@@ -1,61 +0,0 @@
1−{ lib, stdenv, fetchurl, love, lua, makeWrapper, makeDesktopItem }:
2−
3−let
4− pname = "vapor";
5− version = "0.2.3";
6− commitid = "dbf509f";
7−
8− icon = fetchurl {
9− url = "http://vapor.love2d.org/sites/default/files/vapT240x90.png";
10− sha256 = "1xlra74lpm1y54z6zm6is0gldkswp3wdw09m6a306ch0xjf3f87f";
11− };
12−
13− desktopItem = makeDesktopItem {
14− name = "Vapor";
15− exec = pname;
16− icon = icon;
17− comment = "LÖVE Distribution Client";
18− desktopName = "Vapor";
19− genericName = "vapor";
20− categories = "Game;";
21− };
22−
23−in
24−
25−stdenv.mkDerivation {
26− name = "${pname}-${version}";
27−
28− src = fetchurl {
29− url =
30− "https://github.com/josefnpat/${pname}/releases/download/${version}/${pname}_${commitid}.love";
31− sha256 = "0w2qkrrkzfy4h4jld18apypmbi8a8r89y2l11axlv808i2rg68fk";
32− };
33−
34− nativeBuildInputs = [ makeWrapper ];
35− buildInputs = [ lua love ];
36−
37− dontUnpack = true;
38−
39− installPhase =
40− ''
41− mkdir -p $out/bin
42− mkdir -p $out/share
43−
44− cp -v $src $out/share/${pname}.love
45−
46− makeWrapper ${love}/bin/love $out/bin/${pname} --add-flags $out/share/${pname}.love
47−
48− chmod +x $out/bin/${pname}
49− mkdir -p $out/share/applications
50− ln -s ${desktopItem}/share/applications/* $out/share/applications/
51− '';
52−
53− meta = with lib; {
54− description = "LÖVE Distribution Client allowing access to many games";
55− platforms = platforms.linux;
56− license = licenses.zlib;
57− maintainers = with maintainers; [ leenaars ];
58− downloadPage = "http://vapor.love2d.org/";
59− };
60−
61−}
pkgs/top-level/aliases.nix+7
@@ -386,6 +386,7 @@ mapAliases ({
386386 gupnp_igd = gupnp-igd; # added 2018-02-25
387387 gupnptools = gupnp-tools; # added 2015-12-19
388388 gutenberg = zola; # added 2018-11-17
389+ hawkthorne = throw "hawkthorne has been removed because it depended on a broken version of love"; # added 2022-01-15
389390 hal-flash = throw "hal-flash has been removed as Adobe Flash Player is now deprecated."; # added 2021-02-07
390391 heimdalFull = heimdal; # added 2018-05-01
391392 hepmc = hepmc2; # added 2019-08-05
@@ -574,6 +575,9 @@ mapAliases ({
574575 lua5_expat = luaPackages.luaexpat; # added 2017-05-02
575576 lua5_sec = luaPackages.luasec; # added 2017-05-02
576577 lumpy = throw "lumpy has been removed from nixpkgs, as it is stuck on python2."; # added 2022-01-12
578+ love_0_7 = throw "love_0_7 was removed because it is a very old version and no longer used by any package in nixpkgs"; # added 2022-01-15
579+ love_0_8 = throw "love_0_8 was removed because it is a very old version and no longer used by any package in nixpkgs"; # added 2022-01-15
580+ love_0_9 = throw "love_0_9 was removed because was broken for a long time and no longer used by any package in nixpkgs"; # added 2022-01-15
577581 lxappearance-gtk3 = throw "lxappearance-gtk3 has been removed. Use lxappearance instead, which now defaults to Gtk3"; # added 2020-06-03
578582 lzma = xz; # moved from top-level 2021-03-14
579583 m3d-linux = m33-linux; # added 2016-08-13
@@ -656,6 +660,7 @@ mapAliases ({
656660 nmap-unfree = nmap; # added 2021-04-06
657661 nologin = shadow; # added 2018-04-25
658662 nordic-polar = throw "nordic-polar was removed on 2021-05-27, now integrated in nordic"; # added 2021-05-27
663+ nottetris2 = throw "nottetris2 was removed because it is unmaintained by upstream and broken"; # added 2022-01-15
659664 noto-fonts-cjk = noto-fonts-cjk-sans; # added 2021-12-16
660665 now-cli = throw "now-cli has been replaced with nodePackages.vercel"; # added 2021-08-05
661666 nxproxy = nx-libs; # added 2019-02-15
@@ -859,6 +864,7 @@ mapAliases ({
859864 qt-recordmydesktop = throw "qt-recordmydesktop has been removed from nixpkgs, as it's abandoned and uses deprecated libraries"; # added 2019-12-10
860865 qt-3 = throw "qt-3 has been removed from nixpkgs, as it's unmaintained and insecure"; # added 2021-02-15
861866 rfkill = throw "rfkill has been removed, as it's included in util-linux"; # added 2020-08-23
867+ rimshot = throw "rimshot has been removed, because it is broken and no longer maintained upstream"; # added 2022-01-15
862868 riak-cs = throw "riak-cs is not maintained anymore"; # added 2020-10-14
863869 ring-daemon = jami-daemon; # added 2021-10-26
864870 radare2-cutter = cutter; # added 2021-03-30
@@ -1047,6 +1053,7 @@ mapAliases ({
10471053 uzbl = throw "uzbl has been removed from nixpkgs, as it's unmaintained and uses insecure libraries";
10481054 v4l_utils = v4l-utils; # added 2019-08-07
10491055 v8_3_16_14 = throw "v8_3_16_14 was removed in 2019-11-01: no longer referenced by other packages";
1056+ vapor = throw "vapor was removed because it was unmaintained and upstream service no longer exists";
10501057 vamp = { vampSDK = vamp-plugin-sdk; }; # added 2020-03-26
10511058 varnish62 = throw "varnish62 was removed from nixpkgs, because it is unmaintained upstream. Please switch to a different release."; # 2021-07-26
10521059 varnish63 = throw "varnish63 was removed from nixpkgs, because it is unmaintained upstream. Please switch to a different release."; # 2021-07-26
pkgs/top-level/all-packages.nix−11
@@ -13525,9 +13525,6 @@ with pkgs;
1352513525
1352613526 lolcode = callPackage ../development/interpreters/lolcode { };
1352713527
13528− love_0_7 = callPackage ../development/interpreters/love/0.7.nix { lua=lua5_1; };
13529− love_0_8 = callPackage ../development/interpreters/love/0.8.nix { lua=lua5_1; };
13530− love_0_9 = callPackage ../development/interpreters/love/0.9.nix { };
1353113528 love_0_10 = callPackage ../development/interpreters/love/0.10.nix { };
1353213529 love_11 = callPackage ../development/interpreters/love/11.nix { };
1353313530 love = love_0_10;
@@ -30742,8 +30739,6 @@ with pkgs;
3074230739
3074330740 harmonist = callPackage ../games/harmonist { };
3074430741
30745− hawkthorne = callPackage ../games/hawkthorne { love = love_0_9; };
30746−
3074730742 hedgewars = libsForQt514.callPackage ../games/hedgewars {
3074830743 inherit (haskellPackages) ghcWithPackages;
3074930744 };
@@ -30907,8 +30902,6 @@ with pkgs;
3090730902
3090830903 newtonwars = callPackage ../games/newtonwars { };
3090930904
30910− nottetris2 = callPackage ../games/nottetris2 { };
30911−
3091230905 nudoku = callPackage ../games/nudoku { };
3091330906
3091430907 nxengine-evo = callPackage ../games/nxengine-evo { };
@@ -31057,8 +31050,6 @@ with pkgs;
3105731050
3105831051 rili = callPackage ../games/rili { };
3105931052
31060− rimshot = callPackage ../games/rimshot { love = love_0_7; };
31061−
3106231053 rogue = callPackage ../games/rogue {
3106331054 ncurses = ncurses5;
3106431055 };
@@ -31310,8 +31301,6 @@ with pkgs;
3131031301
3131131302 ut2004demo = res.ut2004Packages.ut2004 [ res.ut2004Packages.ut2004-demo ];
3131231303
31313− vapor = callPackage ../games/vapor { love = love_0_8; };
31314−
3131531304 vapoursynth = callPackage ../development/libraries/vapoursynth {
3131631305 inherit (darwin.apple_sdk.frameworks) ApplicationServices;
3131731306 };