nek0/haskelloids
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

preparating transition to affectionate affection engine

Browse source
This commit is contained in:
nek0 2020-05-04 15:44:14 +02:00
parent e70ca9a8e9
commit 13b6da1e44
4 changed files with 43 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
cabal.config
View file

@ -1 +0,0 @@
constraints: affection +debug

4
cabal.project Normal file
View file

@ -0,0 +1,4 @@
constraints: affection +debug
packages:
./.
../affection

6
haskelloids.cabal
View file

@ -67,9 +67,9 @@ executable haskelloids
-- other-extensions: -- other-extensions:
-- Other library packages from which modules are imported. -- Other library packages from which modules are imported.
build-depends: base >=4.9 && <4.12 build-depends: base >=4.12 && <5
, affection >= 0.0.0.9 , affection == 0.0.0.10
, sdl2 >= 2.1.3.1 , sdl2 >= 2.5.0.0
, OpenGL , OpenGL
, containers , containers
, random , random

58
shell.nix
View file

@ -13,8 +13,8 @@ let
}: }:
mkDerivation { mkDerivation {
pname = "sdl2"; pname = "sdl2";
version = "2.4.1.0"; version = "2.5.2.0";
sha256 = "21a569c0c19f8ff2bbe1cf1d3eb32f65e8143806de353cedd240df5e9d088b5c"; sha256 = "9c4110b1e772739bf62c641d375665f9d0af3ad64ed73b24ef407a82e7648fa1";
isLibrary = true; isLibrary = true;
isExecutable = true; isExecutable = true;
enableSeparateDataOutput = true; enableSeparateDataOutput = true;
@ -23,42 +23,56 @@ let
]; ];
librarySystemDepends = [ SDL2 ]; librarySystemDepends = [ SDL2 ];
libraryPkgconfigDepends = [ SDL2 ]; libraryPkgconfigDepends = [ SDL2 ];
doCheck = false;
testHaskellDepends = [ base deepseq linear vector weigh ]; testHaskellDepends = [ base deepseq linear vector weigh ];
description = "Both high- and low-level bindings to the SDL library (version 2.0.4+)."; doHaddock = false;
doCheck = false;
description = "Both high- and low-level bindings to the SDL library (version 2.0.6+).";
license = stdenv.lib.licenses.bsd3; license = stdenv.lib.licenses.bsd3;
}) {}; }) {};
nanovgNeko = with haskellPackages; callPackage ({ nanovg = with haskellPackages; callPackage (
mkDerivation, base, bytestring, c2hs, containers, glew, hspec, { mkDerivation, base, bytestring, c2hs, containers, glew
inline-c, libGL, libGLU, QuickCheck, text, vector, pkgconfig }: , hspec, inline-c, libGL, libGLU, QuickCheck, stdenv, text, vector
}:
mkDerivation { mkDerivation {
pname = "nanovg"; pname = "nanovg";
version = "0.6.0.0"; version = "0.6.0.0";
#src = pkgs.fetchFromGitHub {
# owner = "nek0";
# repo = "nanovg-hs";
# rev = "21868dc2c8e6eae8e7c0962d22890a8f2522cab0";
# sha256 = "0diyyajniyxzmg5za34crwwlajf40x8bplja6mbgv2syax5d446d";
# fetchSubmodules = true;
#};
src = ../nanovg-hs; src = ../nanovg-hs;
revision = "1";
isLibrary = true; isLibrary = true;
isExecutable = true; isExecutable = true;
doCheck = false;
libraryHaskellDepends = [ base bytestring containers text vector ]; libraryHaskellDepends = [ base bytestring containers text vector ];
librarySystemDepends = [ glew libGL libGLU pkgconfig ]; librarySystemDepends = [ glew libGL libGLU ];
libraryPkgconfigDepends = [ glew ];
libraryToolDepends = [ c2hs ]; libraryToolDepends = [ c2hs ];
testHaskellDepends = [ base containers hspec inline-c QuickCheck ]; testHaskellDepends = [ base containers hspec inline-c QuickCheck ];
homepage = "https://github.com/cocreature/nanovg-hs"; homepage = "https://github.com/cocreature/nanovg-hs";
description = "Haskell bindings for nanovg"; description = "Haskell bindings for nanovg";
license = pkgs.stdenv.lib.licenses.isc; license = stdenv.lib.licenses.isc;
hydraPlatforms = pkgs.stdenv.lib.platforms.none; }
}) { inherit (pkgs) glew; inherit (pkgs) libGL; inherit (pkgs) libGLU; inherit (pkgs) pkgconfig; }; ) {};
affection = with haskellPackages; callPackage(
{ mkDerivation, base, bytestring, clock, containers, glib, linear
, monad-loops, monad-parallel, mtl, OpenGL, stdenv, stm, text
, uuid, vector
}:
mkDerivation {
pname = "affection";
version = "0.0.0.10";
src = ../affection;
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
base bytestring clock containers glib linear monad-loops
monad-parallel mtl OpenGL sdl2 stm text uuid vector
];
homepage = "https://github.com/nek0/affection#readme";
description = "A simple Game Engine using SDL";
license = stdenv.lib.licenses.lgpl3;
}
) {};
f = { mkDerivation, affection, base, containers, glew f = { mkDerivation, base, containers, glew
, linear, OpenGL, random, stdenv, stm , linear, OpenGL, random, stdenv, stm
}: }:
mkDerivation { mkDerivation {
@ -69,7 +83,7 @@ let
isExecutable = true; isExecutable = true;
enableExecutableProfiling = true; enableExecutableProfiling = true;
executableHaskellDepends = [ executableHaskellDepends = [
affection base containers linear nanovgNeko OpenGL random sdl stm affection base containers linear nanovg OpenGL random sdl stm
]; ];
executableSystemDepends = [ glew ]; executableSystemDepends = [ glew ];
executablePkgconfigDepends = [ glew ]; executablePkgconfigDepends = [ glew ];