diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2009-10-28 14:06:56 +0000 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2009-10-28 14:06:56 +0000 |
commit | f53195f29e69dbb79f44039b809bb1fa40f34ac2 (patch) | |
tree | 03d9da1314f6c0f6dfd1a0f5cf2f5ffe4aa3a8a2 /pkgs/development | |
parent | cbfbaf736a0e697c0ee8188e9f68cfde5bd703e3 (diff) |
* Improved a bunch of "name" attributes (mostly missing version
numbers). svn path=/nixpkgs/trunk/; revision=17991
Diffstat (limited to 'pkgs/development')
-rw-r--r-- | pkgs/development/compilers/webdsl/default.nix | 2 | ||||
-rw-r--r-- | pkgs/development/compilers/yap/default.nix | 19 | ||||
-rw-r--r-- | pkgs/development/libraries/lib3ds/default.nix | 21 | ||||
-rw-r--r-- | pkgs/development/libraries/liblo/default.nix | 15 | ||||
-rw-r--r-- | pkgs/development/libraries/liboop/default.nix | 5 | ||||
-rw-r--r-- | pkgs/development/libraries/libqglviewer/default.nix | 32 | ||||
-rw-r--r-- | pkgs/development/libraries/libzrtpcpp/default.nix | 7 | ||||
-rw-r--r-- | pkgs/development/tools/misc/texi2html/default.nix (renamed from pkgs/development/tools/misc/texitohtml/default.nix) | 13 | ||||
-rw-r--r-- | pkgs/development/tools/profiling/sysprof/default.nix | 2 |
9 files changed, 59 insertions, 57 deletions
diff --git a/pkgs/development/compilers/webdsl/default.nix b/pkgs/development/compilers/webdsl/default.nix index 961f68b503023..6c878717220e1 100644 --- a/pkgs/development/compilers/webdsl/default.nix +++ b/pkgs/development/compilers/webdsl/default.nix @@ -1,7 +1,7 @@ {stdenv, fetchurl, pkgconfig, strategoPackages}: stdenv.mkDerivation rec { - name = "webdsl-9.7pre3056.tar.gz"; + name = "webdsl-9.7pre3056"; src = fetchurl { url = "http://hydra.nixos.org/build/71896/download/1/webdsl-9.7pre3056.tar.gz"; diff --git a/pkgs/development/compilers/yap/default.nix b/pkgs/development/compilers/yap/default.nix index 27075d1cca637..753c0f8ee7783 100644 --- a/pkgs/development/compilers/yap/default.nix +++ b/pkgs/development/compilers/yap/default.nix @@ -1,17 +1,16 @@ -args: -args.stdenv.mkDerivation rec { - name = "Yap-5.1.1"; +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "yap-5.1.1"; - src = args.fetchurl { - url = "http://downloads.sourceforge.net/yap/${name}.tar.gz"; + src = fetchurl { + url = "http://downloads.sourceforge.net/yap/Yap-5.1.1.tar.gz"; sha256 = "0bajxmlla9gay4m4l7y7x6qldxzi0jcq2ykgpjk9liky7g5kbnya"; }; - buildInputs =(with args; []); - meta = { - description = "Yap Prolog System is a ISO-compatible high-performance Prolog compiler"; - homepage = http://yap.sourceforge.net/; - license = "artistic"; + description = "Yap Prolog System is a ISO-compatible high-performance Prolog compiler"; + homepage = http://yap.sourceforge.net/; + license = "artistic"; }; } diff --git a/pkgs/development/libraries/lib3ds/default.nix b/pkgs/development/libraries/lib3ds/default.nix index ec7f4adf03161..82367600467f8 100644 --- a/pkgs/development/libraries/lib3ds/default.nix +++ b/pkgs/development/libraries/lib3ds/default.nix @@ -1,18 +1,19 @@ -args: -args.stdenv.mkDerivation { - name = "lib3ds"; +{ stdenv, fetchurl, unzip }: + +stdenv.mkDerivation rec { + name = "lib3ds-1.3.0"; - src = args.fetchurl { - url = mirror://sourceforge/lib3ds/lib3ds-1.3.0.zip; + src = fetchurl { + url = "mirror://sourceforge/lib3ds/${name}.zip"; sha256 = "1qr9arfdkjf7q11xhvxwzmhxqz3nhcjkyb8zzfjpz9jm54q0rc7m"; }; - buildInputs =(with args; [unzip]); + buildInputs = [ unzip ]; meta = { - description = "library for managing 3D-Studio Release 3 and 4 \".3DS\" files"; - homepage = http://lib3ds.sourceforge.net/; - license = "LGPL"; - }; + description = "Library for managing 3D-Studio Release 3 and 4 \".3DS\" files"; + homepage = http://lib3ds.sourceforge.net/; + license = "LGPL"; + }; } diff --git a/pkgs/development/libraries/liblo/default.nix b/pkgs/development/libraries/liblo/default.nix index d8f75d1b4c3ed..a2235da408e31 100644 --- a/pkgs/development/libraries/liblo/default.nix +++ b/pkgs/development/libraries/liblo/default.nix @@ -1,19 +1,18 @@ -args: with args; -stdenv.mkDerivation { - name = "liblo"; +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "liblo-0.26"; src = fetchurl { - url = mirror://sourceforge/liblo/liblo/0.26/liblo-0.26.tar.gz; + url = "mirror://sourceforge/liblo/liblo/0.26/${name}.tar.gz"; sha256 = "0n124fv9m8yjxs2yxnp3l1i30b8qgg1zx51y63ax12hpz04zndm6"; }; - buildInputs = []; - meta = { description = "lightweight library to handle the sending and receiving of messages according to the Open Sound Control (OSC) protocol"; homepage = http://sourceforge.net/projects/liblo; license = "GPLv2"; - maintainers = [args.lib.maintainers.marcweber]; - platforms = args.lib.platforms.linux; + maintainers = [stdenv.lib.maintainers.marcweber]; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/development/libraries/liboop/default.nix b/pkgs/development/libraries/liboop/default.nix index 2009e92a54d40..20793eb3140fe 100644 --- a/pkgs/development/libraries/liboop/default.nix +++ b/pkgs/development/libraries/liboop/default.nix @@ -1,14 +1,13 @@ {stdenv, fetchurl}: stdenv.mkDerivation { - name = "liboop"; + name = "liboop-1.0"; + src = fetchurl { url = http://download.ofb.net/liboop/liboop.tar.gz; sha256 = "34d83c6e0f09ee15cb2bc3131e219747c3b612bb57cf7d25318ab90da9a2d97c"; }; - buildInputs = []; - meta = { description = "`liboop', an event loop library."; homepage = http://liboop.ofb.net/; diff --git a/pkgs/development/libraries/libqglviewer/default.nix b/pkgs/development/libraries/libqglviewer/default.nix index 6b9d70fb6be2a..c968fd352eb85 100644 --- a/pkgs/development/libraries/libqglviewer/default.nix +++ b/pkgs/development/libraries/libqglviewer/default.nix @@ -1,23 +1,25 @@ -args: -args.stdenv.mkDerivation { - name = "libQGLviewer"; +{ stdenv, fetchurl, qt4 }: - src = args.fetchurl { - url = http://artis.imag.fr/Members/Gilles.Debunne/QGLViewer/src/libQGLViewer-2.2.6-3.tar.gz; - sha256 = "05vjl7af87dhzrdigm941by9c137g8wyca46h3pvhnmr4pgb0ic9"; +stdenv.mkDerivation rec { + name = "libQGLViewer-2.3.4"; + + src = fetchurl { + url = "http://www.libqglviewer.com/src/${name}.tar.gz"; + sha256 = "01b9x2n3v5x3zkky2bjpgbhn5bglqn4gd7x5j5p7y2dw0jnzz7j0"; }; - buildInputs =(with args; [qt4]); + buildInputs = [ qt4 ]; - buildPhase = " - cd QGLViewer - qmake PREFIX=\$out - make - "; + buildPhase = + '' + cd QGLViewer + qmake PREFIX=$out + make + ''; meta = { - description = "trackball-based 3D viewer qt widget including many useful features"; - homepage = http://artis.imag.fr/Members/Gilles.Debunne/QGLViewer/installUnix.html; - license = "GPL2"; + description = "trackball-based 3D viewer qt widget including many useful features"; + homepage = http://artis.imag.fr/Members/Gilles.Debunne/QGLViewer/installUnix.html; + license = "GPL2"; }; } diff --git a/pkgs/development/libraries/libzrtpcpp/default.nix b/pkgs/development/libraries/libzrtpcpp/default.nix index a57f7135cdb57..857197ea0c1b0 100644 --- a/pkgs/development/libraries/libzrtpcpp/default.nix +++ b/pkgs/development/libraries/libzrtpcpp/default.nix @@ -1,9 +1,10 @@ args: with args; -stdenv.mkDerivation { - name = "libzrtpcpp-1.4.1.tar"; + +stdenv.mkDerivation rec { + name = "libzrtpcpp-1.4.1"; src = fetchurl { - url = mirror://gnu/ccrtp/libzrtpcpp-1.4.1.tar.gz; + url = "mirror://gnu/ccrtp/${name}.tar.gz"; sha256 = "0gj5xiv15xnxdbppa06fy02j8jg0zm1capva4nhbpgzg08n7p8y0"; }; diff --git a/pkgs/development/tools/misc/texitohtml/default.nix b/pkgs/development/tools/misc/texi2html/default.nix index db200610a5553..2089142284f40 100644 --- a/pkgs/development/tools/misc/texitohtml/default.nix +++ b/pkgs/development/tools/misc/texi2html/default.nix @@ -1,9 +1,10 @@ -args: with args; -stdenv.mkDerivation { - name = "texi2html"; +{ stdenv, fetchurl, perl }: + +stdenv.mkDerivation rec { + name = "texi2html-1.82"; src = fetchurl { - url = http://www.very-clever.com/download/nongnu/texi2html/texi2html-1.82.tar.bz2; + url = "http://www.very-clever.com/download/nongnu/texi2html/${name}.tar.bz2"; sha256 = "1wdli2szkgm3l0vx8rf6lylw0b0m47dlz9iy004n928nqkzix76n"; }; @@ -13,7 +14,7 @@ stdenv.mkDerivation { description = "Perl script which converts Texinfo source files to HTML output"; homepage = http://www.nongnu.org/texi2html/; license = "GPLv2"; - maintainers = [args.lib.maintainers.marcweber]; - platforms = args.lib.platforms.linux; + maintainers = [stdenv.lib.maintainers.marcweber]; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/development/tools/profiling/sysprof/default.nix b/pkgs/development/tools/profiling/sysprof/default.nix index 397a6033d6268..6939d4a86a6cd 100644 --- a/pkgs/development/tools/profiling/sysprof/default.nix +++ b/pkgs/development/tools/profiling/sysprof/default.nix @@ -2,7 +2,7 @@ , pkgconfig, gtk, glib, pango, libglade }: stdenv.mkDerivation rec { - name = "sysprof-1.0.10"; + name = "sysprof-1.0.10-${kernel.version}"; src = fetchurl { url = "http://www.daimi.au.dk/~sandmann/sysprof/${name}.tar.gz"; |