From bfc84fec9bd99d0838d815d992c1d0f82c022002 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Sat, 24 Sep 2011 20:44:11 +0000 Subject: Add a notice about libpng branch svn path=/nixpkgs/trunk/; revision=29474 --- pkgs/development/libraries/libpng/default.nix | 1 + 1 file changed, 1 insertion(+) (limited to 'pkgs/development/libraries') diff --git a/pkgs/development/libraries/libpng/default.nix b/pkgs/development/libraries/libpng/default.nix index 16fe511f1f1a..7ba9bfb54b37 100644 --- a/pkgs/development/libraries/libpng/default.nix +++ b/pkgs/development/libraries/libpng/default.nix @@ -2,6 +2,7 @@ assert zlib != null; +# If you want to upgrade libpng, look at libpng15 branch stdenv.mkDerivation rec { name = "libpng-1.2.46"; -- cgit 1.4.1 From 2b67f92ec9b875a67a4c612ef1317fe9d893a626 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Sun, 25 Sep 2011 03:39:23 +0000 Subject: allegro-4.4.2; compiles against libpng-1.5.4 svn path=/nixpkgs/trunk/; revision=29477 --- pkgs/development/libraries/allegro/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs/development/libraries') diff --git a/pkgs/development/libraries/allegro/default.nix b/pkgs/development/libraries/allegro/default.nix index e5a976c3418b..019455ae142b 100644 --- a/pkgs/development/libraries/allegro/default.nix +++ b/pkgs/development/libraries/allegro/default.nix @@ -13,11 +13,11 @@ let (builtins.attrNames (builtins.removeAttrs x helperArgNames)); sourceInfo = rec { baseName="allegro"; - version="4.4.0.1"; + version="4.4.2"; name="${baseName}-${version}"; project="alleg"; - url="mirror://sourceforge/project/${project}/${baseName}/${version}/${name}.tar.gz"; - hash="0qgkmazr07lmnbj6h6yk10vmcm15gafcwy5jn7xpwy7bahzraiz0"; + url="mirror://sourceforge/project/${project}/${name}.tar.gz"; + hash="1p0ghkmpc4kwij1z9rzxfv7adnpy4ayi0ifahlns1bdzgmbyf88v"; }; in rec { -- cgit 1.4.1 From 8a8cb045331251a611567fe3d4487c7d6fc79c0b Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 25 Sep 2011 17:11:23 +0000 Subject: haskell-numeric-prelude: updated to version 0.2.2.1 svn path=/nixpkgs/trunk/; revision=29480 --- pkgs/development/libraries/haskell/numeric-prelude/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development/libraries') diff --git a/pkgs/development/libraries/haskell/numeric-prelude/default.nix b/pkgs/development/libraries/haskell/numeric-prelude/default.nix index c420d2677705..cef5347e758f 100644 --- a/pkgs/development/libraries/haskell/numeric-prelude/default.nix +++ b/pkgs/development/libraries/haskell/numeric-prelude/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "numeric-prelude"; - version = "0.2.2"; - sha256 = "bc6adb8c2f04e0e1f62e183e052974700143dc93b1a3cbafe3562aa1f7a649fd"; + version = "0.2.2.1"; + sha256 = "12b2h103f43rlrfk3zck6mzbvw6v4jf8g4kxz1k14v201lrvb2da"; isLibrary = true; isExecutable = true; buildDepends = [ -- cgit 1.4.1 From 503536703ee7a8eccd5ad24a0cc325304538d097 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sun, 25 Sep 2011 18:12:40 +0000 Subject: Fix Allegro URL svn path=/nixpkgs/trunk/; revision=29481 --- pkgs/development/libraries/allegro/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pkgs/development/libraries') diff --git a/pkgs/development/libraries/allegro/default.nix b/pkgs/development/libraries/allegro/default.nix index 019455ae142b..75842bee9f8f 100644 --- a/pkgs/development/libraries/allegro/default.nix +++ b/pkgs/development/libraries/allegro/default.nix @@ -16,7 +16,7 @@ let version="4.4.2"; name="${baseName}-${version}"; project="alleg"; - url="mirror://sourceforge/project/${project}/${name}.tar.gz"; + url="mirror://sourceforge/project/${project}/${baseName}/${version}/${name}.tar.gz"; hash="1p0ghkmpc4kwij1z9rzxfv7adnpy4ayi0ifahlns1bdzgmbyf88v"; }; in -- cgit 1.4.1 From d65cab385254fd80eb4d97e8097bc26193ebee95 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sun, 25 Sep 2011 21:07:48 +0000 Subject: Adding Allegro 5 svn path=/nixpkgs/trunk/; revision=29482 --- pkgs/development/libraries/allegro/5.nix | 61 ++++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 1 + 2 files changed, 62 insertions(+) create mode 100644 pkgs/development/libraries/allegro/5.nix (limited to 'pkgs/development/libraries') diff --git a/pkgs/development/libraries/allegro/5.nix b/pkgs/development/libraries/allegro/5.nix new file mode 100644 index 000000000000..2bfc57011fdf --- /dev/null +++ b/pkgs/development/libraries/allegro/5.nix @@ -0,0 +1,61 @@ + +x@{builderDefsPackage + , texinfo, libXext, xextproto, libX11, xproto, libXpm, libXt, libXcursor + , alsaLib, cmake, zlib, libpng, libvorbis, libXxf86dga, libXxf86misc + , xf86dgaproto, xf86miscproto, xf86vidmodeproto, libXxf86vm, openal, mesa + , kbproto + , ...}: +builderDefsPackage +(a : +let + helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ + []; + + buildInputs = map (n: builtins.getAttr n x) + (builtins.attrNames (builtins.removeAttrs x helperArgNames)); + sourceInfo = rec { + baseName="allegro"; + version="5.0.4"; + name="${baseName}-${version}"; + project="alleg"; + url="mirror://sourceforge/project/${project}/${baseName}/${version}/${name}.tar.gz"; + hash="0vm93kqvvw4rw2zx4l64c2i86xl5giwbqbyki4b2b83z0acpmc1n"; + }; +in +rec { + src = a.fetchurl { + url = sourceInfo.url; + sha256 = sourceInfo.hash; + }; + + inherit (sourceInfo) name version; + inherit buildInputs; + + /* doConfigure should be removed if not needed */ + phaseNames = ["doCmake" "doMakeInstall"]; + + doCmake = a.fullDepEntry ('' + export NIX_LDFLAGS="$NIX_LDFLAGS -lXext -lX11 -lXpm -lXcursor -lXxf86vm" + cmake -D CMAKE_INSTALL_PREFIX=$out -D CMAKE_SKIP_RPATH=ON . + '') ["minInit" "doUnpack" "addInputs"]; + + makeFlags = [ + ]; + + meta = { + description = "A game programming library"; + license = "free-noncopyleft"; # giftware + maintainers = with a.lib.maintainers; + [ + raskin + ]; + platforms = with a.lib.platforms; + linux; + }; + passthru = { + updateInfo = { + downloadPage = "http://sourceforge.net/projects/alleg/files/"; + }; + }; +}) x + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b95878f3e297..36b4af0e2ad1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3027,6 +3027,7 @@ let agg = callPackage ../development/libraries/agg { }; allegro = callPackage ../development/libraries/allegro {}; + allegro5 = callPackage ../development/libraries/allegro/5.nix {}; amrnb = callPackage ../development/libraries/amrnb { }; -- cgit 1.4.1 From 1d9c2ff41365c388fe04b2b206bd1057b3ce60ec Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Sun, 25 Sep 2011 23:36:20 +0000 Subject: Let hydra build SDL_image on all platforms svn path=/nixpkgs/trunk/; revision=29486 --- pkgs/development/libraries/SDL_image/default.nix | 2 ++ 1 file changed, 2 insertions(+) (limited to 'pkgs/development/libraries') diff --git a/pkgs/development/libraries/SDL_image/default.nix b/pkgs/development/libraries/SDL_image/default.nix index 21461cc42595..d0d10ac40c9e 100644 --- a/pkgs/development/libraries/SDL_image/default.nix +++ b/pkgs/development/libraries/SDL_image/default.nix @@ -25,5 +25,7 @@ stdenv.mkDerivation rec { meta = { description = "SDL image library"; + homepage = http://www.libsdl.org/projects/SDL_image/; + platforms = stdenv.lib.platforms.all; }; } -- cgit 1.4.1