Add package versions to some of the packages or fix existing ones to conform to nixpkgs conventions.

This commit is contained in:
Evgeny Egorochkin 2013-06-07 03:13:54 +03:00
parent 61baf49624
commit 9c6f7cc9c1
25 changed files with 39 additions and 34 deletions

View file

@ -11,7 +11,7 @@ let
in in
stdenv.mkDerivation { stdenv.mkDerivation {
name = "ardour3"; name = "ardour-3.0";
src = fetchgit { src = fetchgit {
url = git://git.ardour.org/ardour/ardour.git; url = git://git.ardour.org/ardour/ardour.git;

View file

@ -12,7 +12,7 @@
}: }:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "csound5.18.02"; name = "csound-5.18.02";
enableParallelBuilding = true; enableParallelBuilding = true;

View file

@ -3,10 +3,11 @@
randrproto, xcbutil, xf86vidmodeproto }: randrproto, xcbutil, xf86vidmodeproto }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "redshift"; pname = "redshift";
version = "1.6"; version = "1.6";
name = "${pname}-${version}";
src = fetchurl { src = fetchurl {
url = "http://launchpad.net/${name}/trunk/${version}/+download/${name}-${version}.tar.bz2"; url = "http://launchpad.net/${pname}/trunk/${version}/+download/${pname}-${version}.tar.bz2";
sha256 = "0g46zhqnx3y2fssmyjgaardzhjw1j29l1dbc2kmccw9wxqfla1wi"; sha256 = "0g46zhqnx3y2fssmyjgaardzhjw1j29l1dbc2kmccw9wxqfla1wi";
}; };
@ -25,4 +26,4 @@ stdenv.mkDerivation rec {
license = "GPLv3+"; license = "GPLv3+";
homepage = "http://jonls.dk/redshift"; homepage = "http://jonls.dk/redshift";
}; };
} }

View file

@ -3,7 +3,7 @@
let inherit (composableDerivation) edf wwf; in let inherit (composableDerivation) edf wwf; in
composableDerivation.composableDerivation {} ( fixed : { composableDerivation.composableDerivation {} ( fixed : {
name = "yate2"; name = "yate-2.2.0_1";
src = fetchurl { src = fetchurl {
url = http://yate.null.ro/tarballs/yate2/yate2.tar.gz; url = http://yate.null.ro/tarballs/yate2/yate2.tar.gz;

View file

@ -23,7 +23,7 @@ rec {
sha256 = sourceInfo.hash; sha256 = sourceInfo.hash;
}; };
inherit (sourceInfo) name version; name = "${sourceInfo.baseName}-${sourceInfo.version}";
inherit buildInputs; inherit buildInputs;
/* doConfigure should be removed if not needed */ /* doConfigure should be removed if not needed */

View file

@ -2,21 +2,22 @@
# nettools needed for hostname # nettools needed for hostname
let let
name = "Isabelle2012"; dirname = "Isabelle2013";
theories = ["HOL" "FOL" "ZF"]; theories = ["HOL" "FOL" "ZF"];
in in
stdenv.mkDerivation { stdenv.mkDerivation {
inherit name theories; name = "isabelle-2013";
inherit dirname theories;
src = fetchurl { src = fetchurl {
url = http://www.cl.cam.ac.uk/research/hvg/isabelle/dist/Isabelle2012.tar.gz; url = http://isabelle.in.tum.de/dist/Isabelle2013_linux.tar.gz;
sha256 = "1w2k5cg0d9hyigax0hwp6d84jnylb13ysk4x5kwl2412xryravxq"; sha256 = "0l17s41hwzma0q2glpxrzic8i6mqd9b7awlpwhz0jkli7fj6ny7b";
}; };
buildInputs = [ perl polyml nettools ]; buildInputs = [ perl polyml nettools ];
sourceRoot = name; sourceRoot = dirname;
patches = [ ./settings.patch ]; patches = [ ./settings.patch ];
@ -40,8 +41,8 @@ stdenv.mkDerivation {
installPhase = '' installPhase = ''
mkdir -p $out/bin mkdir -p $out/bin
mv $TMP/$name $out mv $TMP/$dirname $out
cd $out/$name cd $out/$dirname
bin/isabelle install -p $out/bin bin/isabelle install -p $out/bin
''; '';

View file

@ -23,7 +23,7 @@ rec {
sha256 = sourceInfo.hash; sha256 = sourceInfo.hash;
}; };
inherit (sourceInfo) name version; name = "${sourceInfo.baseName}-${sourceInfo.version}";
inherit buildInputs; inherit buildInputs;
phaseNames = ["makeInstallationDir" "doUnpack" "doMake" "doFinalize"]; phaseNames = ["makeInstallationDir" "doUnpack" "doMake" "doFinalize"];

View file

@ -12,7 +12,7 @@ let
]; ];
in in
stdenv.mkDerivation { stdenv.mkDerivation {
inherit (s) name version; name = "${s.name}-${s.version}";
inherit buildInputs; inherit buildInputs;
src = fetchurl { src = fetchurl {
inherit (s) url sha256; inherit (s) url sha256;

View file

@ -1,7 +1,7 @@
{stdenv, fetchurl}: {stdenv, fetchurl}:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "prover9"; name = "prover9-2009-11a";
src = fetchurl { src = fetchurl {
url = http://www.cs.unm.edu/~mccune/mace4/download/LADR-2009-11A.tar.gz; url = http://www.cs.unm.edu/~mccune/mace4/download/LADR-2009-11A.tar.gz;

View file

@ -1,7 +1,7 @@
{ fetchgit, stdenv, perl }: { fetchgit, stdenv, perl }:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "git2cl"; name = "git2cl-20080827";
src = fetchgit { src = fetchgit {
url = "git://repo.or.cz/git2cl.git"; url = "git://repo.or.cz/git2cl.git";

View file

@ -12,6 +12,7 @@ let
sourceInfo = rec { sourceInfo = rec {
url="http://www.i18nguy.com/unicode/andagii.zip"; url="http://www.i18nguy.com/unicode/andagii.zip";
name="andagii"; name="andagii";
version="1.0.2";
hash="0cknb8vin15akz4ahpyayrpqyaygp9dgrx6qw7zs7d6iv9v59ds1"; hash="0cknb8vin15akz4ahpyayrpqyaygp9dgrx6qw7zs7d6iv9v59ds1";
}; };
in in
@ -21,7 +22,7 @@ rec {
sha256 = sourceInfo.hash; sha256 = sourceInfo.hash;
}; };
inherit (sourceInfo) name version; name = "${sourceInfo.name}-${sourceInfo.version}";
inherit buildInputs; inherit buildInputs;
/* doConfigure should be removed if not needed */ /* doConfigure should be removed if not needed */

View file

@ -22,7 +22,7 @@ rec {
sha256 = sourceInfo.hash; sha256 = sourceInfo.hash;
}; };
inherit (sourceInfo) name version; name = "${sourceInfo.name}-${sourceInfo.version}";
inherit buildInputs; inherit buildInputs;
phaseNames = ["doUnpack" "installFonts"]; phaseNames = ["doUnpack" "installFonts"];

View file

@ -1,10 +1,11 @@
{ fetchurl, stdenv }: { fetchurl, stdenv }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "bigloo3.7a"; name = "bigloo-${version}";
version = "3.7a";
src = fetchurl { src = fetchurl {
url = "ftp://ftp-sop.inria.fr/indes/fp/Bigloo/${name}.tar.gz"; url = "ftp://ftp-sop.inria.fr/indes/fp/Bigloo/bigloo#{version}.tar.gz";
sha256 = "0y8i87c2bpqzap8rhzgpyfgdzq21py5xq6mgp0w6xv4rjcj9d0v1"; sha256 = "0y8i87c2bpqzap8rhzgpyfgdzq21py5xq6mgp0w6xv4rjcj9d0v1";
}; };

View file

@ -4,7 +4,7 @@ let edf = composableDerivation.edf;
wwf = composableDerivation.wwf; in wwf = composableDerivation.wwf; in
composableDerivation.composableDerivation {} { composableDerivation.composableDerivation {} {
name = "hugs98"; name = "hugs98-200609";
src = fetchurl { src = fetchurl {
url = http://cvs.haskell.org/Hugs/downloads/2006-09/hugs98-Sep2006.tar.gz; url = http://cvs.haskell.org/Hugs/downloads/2006-09/hugs98-Sep2006.tar.gz;

View file

@ -5,7 +5,7 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "despotify"; name = "despotify-svn521";
src = fetchsvn { src = fetchsvn {
url = "https://despotify.svn.sourceforge.net/svnroot/despotify"; url = "https://despotify.svn.sourceforge.net/svnroot/despotify";

View file

@ -1,7 +1,7 @@
{stdenv, fetchurl, unzip}: {stdenv, fetchurl, unzip}:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "libf2c"; name = "libf2c-20100903";
src = fetchurl { src = fetchurl {
url = http://www.netlib.org/f2c/libf2c.zip; url = http://www.netlib.org/f2c/libf2c.zip;

View file

@ -1,6 +1,6 @@
args: with args; args: with args;
stdenv.mkDerivation { stdenv.mkDerivation {
name = "libixp_for_wmii"; name = "libixp_for_wmii-0.4";
phases = "unpackPhase installPhase"; phases = "unpackPhase installPhase";
installPhase = " installPhase = "
export LDFLAGS\=$(echo \$NIX_LDFLAGS | sed -e 's/-rpath/-L/g') export LDFLAGS\=$(echo \$NIX_LDFLAGS | sed -e 's/-rpath/-L/g')

View file

@ -1,7 +1,7 @@
{stdenv, fetchurl}: {stdenv, fetchurl}:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "libyaml"; name = "libyaml-0.1.3";
src = fetchurl { src = fetchurl {
url = http://pyyaml.org/download/libyaml/yaml-0.1.3.tar.gz; url = http://pyyaml.org/download/libyaml/yaml-0.1.3.tar.gz;

View file

@ -1,7 +1,7 @@
{ stdenv, fetchurl, cmake, rLang, zlib }: { stdenv, fetchurl, cmake, rLang, zlib }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "biolib"; name = "biolib-${version}";
version = "0.0.1"; version = "0.0.1";

View file

@ -8,7 +8,7 @@ assert buildllvmsparse -> llvm != null;
assert buildc2xml -> libxml2 != null; assert buildc2xml -> libxml2 != null;
stdenv.mkDerivation { stdenv.mkDerivation {
name = "smatch"; name = "smatch-20120924";
src = fetchgit { src = fetchgit {
url = git://repo.or.cz/smatch.git; url = git://repo.or.cz/smatch.git;

View file

@ -1,7 +1,7 @@
{ stdenv, fetchurl, apacheHttpd }: { stdenv, fetchurl, apacheHttpd }:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "mod_evasive_1.10.1"; name = "mod_evasive-1.10.1";
src = fetchurl { src = fetchurl {
url = http://www.zdziarski.com/blog/wp-content/uploads/2010/02/mod_evasive_1.10.1.tar.gz; url = http://www.zdziarski.com/blog/wp-content/uploads/2010/02/mod_evasive_1.10.1.tar.gz;

View file

@ -33,7 +33,7 @@ rec {
chmod a+rx $out/bin/pyMAILt $out/share/${name}/mail.py chmod a+rx $out/bin/pyMAILt $out/share/${name}/mail.py
'') ["minInit" "addInputs" "doUnpack" "defEnsureDir"]; '') ["minInit" "addInputs" "doUnpack" "defEnsureDir"];
name = "pyMAILt"; name = "pyMAILt-20090101";
meta = { meta = {
description = "Email transport module for XMPP"; description = "Email transport module for XMPP";
}; };

View file

@ -2,7 +2,7 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version="0.8.7"; version="0.8.7";
name = "gsmartcontrol"; name = "gsmartcontrol-${version}";
src = fetchurl { src = fetchurl {
url = "http://artificialtime.com/gsmartcontrol/gsmartcontrol-${version}.tar.bz2"; url = "http://artificialtime.com/gsmartcontrol/gsmartcontrol-${version}.tar.bz2";

View file

@ -3,7 +3,7 @@
, fetchurl , fetchurl
}: }:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "hdf5"; name = "hdf5-1.8.10";
src = fetchurl { src = fetchurl {
url = http://www.hdfgroup.org/ftp/HDF5/current/src/hdf5-1.8.10-patch1.tar.gz; url = http://www.hdfgroup.org/ftp/HDF5/current/src/hdf5-1.8.10-patch1.tar.gz;
sha256 = "08ad32fhnci6rdfn6mn3w9v1wcaxdcd326n3ljwkcq4dzhkh28qz"; sha256 = "08ad32fhnci6rdfn6mn3w9v1wcaxdcd326n3ljwkcq4dzhkh28qz";

View file

@ -30,9 +30,10 @@ rec {
xmkmf xmkmf
'') ["doUnpack" "minInit" "addInputs"]; '') ["doUnpack" "minInit" "addInputs"];
name = "vncrec"; name = "vncrec-0.2"; # version taken from Arch AUR
meta = { meta = {
description = "VNC recorder"; description = "VNC recorder";
homepage = http://ronja.twibright.com/utils/vncrec/;
maintainers = [ maintainers = [
]; ];
}; };