ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-27 05:43:50 +03:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into x-updates.

Browse Source
This commit is contained in:
Peter Simons 2012-10-10 19:26:31 +02:00
commit 0bb86f86b1
5 changed files with 45 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
pkgs/applications/science/astronomy/gravit/default.nix
View File

@ -1,24 +1,16 @@
{ stdenv, fetchurl, SDL, SDL_ttf, SDL_image, mesa, lua5_0 }:
{ stdenv, fetchurl, SDL, SDL_ttf, SDL_image, mesa, lua5_1, automake, autoconf }:
let
name = "gravit-0.4.2";
in
stdenv.mkDerivation {
inherit name;
stdenv.mkDerivation rec {
name = "gravit-0.5.0";
src = fetchurl {
url = "http://gravit.slowchop.com/dist/${name}.tar.gz";
sha256 = "f37f3ac256a4acbf575f709addaae8cb01eda4f85537affa28c45f2df6fddb07";
url = "http://gravit.slowchop.com/media/downloads/${name}.tgz";
sha256 = "0lyw0skrkb04s16vgz7ggswjrdxk1h23v5s85s09gjxzjp1xd3xp";
};
buildInputs = [mesa SDL SDL_ttf SDL_image lua5_0];
buildInputs = [mesa SDL SDL_ttf SDL_image lua5_1 automake autoconf];
configureFlags = "CFLAGS=-O3 CXXFLAGS=-O3";
postInstall = ''
mv $out/etc/gravit $out/share/gravit/sample-config
rmdir $out/etc
'';
preConfigure = "sh autogen.sh";
meta = {
homepage = "http://gravit.slowchop.com";

30
pkgs/development/interpreters/lua-5/5.1.nix Normal file
View File

@ -0,0 +1,30 @@
{ stdenv, fetchurl, readline}:
stdenv.mkDerivation rec {
name = "lua-5.1.5";
src = fetchurl {
url = "http://www.lua.org/ftp/${name}.tar.gz";
sha256 = "2640fc56a795f29d28ef15e13c34a47e223960b0240e8cb0a82d9b0738695333";
};
buildInputs = [ readline ];
configurePhase = "makeFlagsArray=( INSTALL_TOP=$out INSTALL_MAN=$out/share/man/man1 PLAT=linux )";
meta = {
homepage = "http://www.lua.org";
description = "Lua is a powerful, fast, lightweight, embeddable scripting language.";
longDescription = ''
Lua combines simple procedural syntax with powerful data
description constructs based on associative arrays and extensible
semantics. Lua is dynamically typed, runs by interpreting bytecode
for a register-based virtual machine, and has automatic memory
management with incremental garbage collection, making it ideal
for configuration, scripting, and rapid prototyping.
'';
license = "MIT";
platforms = stdenv.lib.platforms.unix;
maintainers = [ ];
};
}

8
pkgs/tools/graphics/asymptote/src-for-default.nix
View File

@ -1,7 +1,7 @@
rec {
version="2.18";
name="asymptote-2.18";
hash="0i7jm12lzj983gvpa95a85wxb4v4ksk3cxb0cq359x2kka0b6g5m";
version="2.20";
name="asymptote-2.20";
hash="0ji45v0d9jps8clsl86pvmr22acci3f0ciicmyzak6dbczqyrj80";
url="http://downloads.sourceforge.net/project/asymptote/${version}/asymptote-${version}.src.tgz";
advertisedUrl="http://downloads.sourceforge.net/project/asymptote/2.18/asymptote-2.18.src.tgz";
advertisedUrl="http://downloads.sourceforge.net/project/asymptote/2.20/asymptote-2.20.src.tgz";
}

6
pkgs/tools/system/smartmontools/default.nix
View File

@ -7,14 +7,14 @@ let
};
in
stdenv.mkDerivation rec {
name = "smartmontools-5.43";
name = "smartmontools-6.0";
src = fetchurl {
url = "mirror://sourceforge/smartmontools/${name}.tar.gz";
sha256 = "d845187d1500b87ef8d2c43772bd0218a59114fe58474a903c56777c9175351e";
sha256 = "9fe4ff2b7bcd00fde19db82bba168f5462ed6e857d3ef439495e304e3231d3a6";
};
patchPhase = "cp ${driverdb} drivedb.h";
# patchPhase = "cp ${driverdb} drivedb.h";
meta = {
description = "Tools for monitoring the health of hard drivers";

3
pkgs/top-level/all-packages.nix
View File

@ -2720,10 +2720,9 @@ let
love = callPackage ../development/interpreters/love {};
lua4 = callPackage ../development/interpreters/lua-4 { };
lua5 = callPackage ../development/interpreters/lua-5 { };
lua5_0 = callPackage ../development/interpreters/lua-5/5.0.3.nix { };
lua5_1 = callPackage ../development/interpreters/lua-5/5.1.nix { };
maude = callPackage ../development/interpreters/maude { };