diff options
| -rw-r--r-- | pkgs/applications/networking/p2p/mldonkey/default.nix | 10 | ||||
| -rw-r--r-- | pkgs/development/libraries/libctemplate/2.2.nix | 18 | ||||
| -rw-r--r-- | pkgs/development/libraries/libmhash/default.nix | 26 | ||||
| -rw-r--r-- | pkgs/development/tools/misc/checkbashisms/default.nix | 12 | ||||
| -rw-r--r-- | pkgs/tools/security/steghide/default.nix | 47 | ||||
| -rw-r--r-- | pkgs/tools/typesetting/tex/auctex/default.nix | 10 |
6 files changed, 61 insertions, 62 deletions
diff --git a/pkgs/applications/networking/p2p/mldonkey/default.nix b/pkgs/applications/networking/p2p/mldonkey/default.nix index f2c17199f2a..280a0468753 100644 --- a/pkgs/applications/networking/p2p/mldonkey/default.nix +++ b/pkgs/applications/networking/p2p/mldonkey/default.nix @@ -2,20 +2,20 @@ stdenv.mkDerivation (rec { name = "mldonkey-3.1.5"; - + src = fetchurl { url = "mirror://sourceforge/mldonkey/${name}.tar.bz2"; sha256 = "1jqik6b09p27ckssppfiqpph7alxbgpnf9w1s0lalmi3qyyd9ybl"; }; - + + buildInputs = [ ocaml zlib ncurses bzip2 file gd libpng libjpeg ]; + configureFlags = [ "--disable-gui" ]; + meta = { description = "Client for many p2p networks, with multiple frontends"; homepage = http://mldonkey.sourceforge.net/; license = stdenv.lib.licenses.gpl2; }; - - buildInputs = [ ocaml zlib ncurses bzip2 file gd libpng libjpeg ]; - configureFlags = [ "--disable-gui" ]; } // (if !ocaml.nativeCompilers then { # Byte code compilation (the ocaml opt compiler is not supported in some platforms) diff --git a/pkgs/development/libraries/libctemplate/2.2.nix b/pkgs/development/libraries/libctemplate/2.2.nix index 36652f7abc7..4851dbf3c54 100644 --- a/pkgs/development/libraries/libctemplate/2.2.nix +++ b/pkgs/development/libraries/libctemplate/2.2.nix @@ -1,6 +1,15 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { + pname = "ctemplate"; + version = "2.2"; + name = "${pname}-${version}"; + + src = fetchurl { + url = "http://ctemplate.googlecode.com/files/${name}.tar.gz"; + sha256 = "0vv8gvyndppm9m5s1i5k0jvwcz41l1vfgg04r7nssdpzyz0cpwq4"; + }; + meta = { description = "A simple but powerful template language for C++"; longDescription = '' @@ -10,13 +19,4 @@ stdenv.mkDerivation rec { homepage = http://code.google.com/p/google-ctemplate/; license = "bsd"; }; - - pname = "ctemplate"; - version = "2.2"; - name = "${pname}-${version}"; - - src = fetchurl { - url = "http://ctemplate.googlecode.com/files/${name}.tar.gz"; - sha256 = "0vv8gvyndppm9m5s1i5k0jvwcz41l1vfgg04r7nssdpzyz0cpwq4"; - }; } diff --git a/pkgs/development/libraries/libmhash/default.nix b/pkgs/development/libraries/libmhash/default.nix index 565340ac271..256220fa211 100644 --- a/pkgs/development/libraries/libmhash/default.nix +++ b/pkgs/development/libraries/libmhash/default.nix @@ -1,6 +1,19 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { + pname = "mhash"; + version = "0.9.9.9"; + name = "${pname}-${version}"; + + src = fetchurl { + url = "mirror://sourceforge/${pname}/${name}.tar.bz2"; + sha256 = "1w7yiljan8gf1ibiypi6hm3r363imm3sxl1j8hapjdq3m591qljn"; + }; + + dontDisableStatic = true; + + patches = [ ./autotools-define-conflict-debian-fix.patch ]; + meta = { description = "Hash algorithms library"; longDescription = '' @@ -12,17 +25,4 @@ stdenv.mkDerivation rec { homepage = http://mhash.sourceforge.net; license = "LGPL"; }; - - pname = "mhash"; - version = "0.9.9.9"; - name = "${pname}-${version}"; - - dontDisableStatic = true; - - src = fetchurl { - url = "mirror://sourceforge/${pname}/${name}.tar.bz2"; - sha256 = "1w7yiljan8gf1ibiypi6hm3r363imm3sxl1j8hapjdq3m591qljn"; - }; - - patches = [ ./autotools-define-conflict-debian-fix.patch ]; } diff --git a/pkgs/development/tools/misc/checkbashisms/default.nix b/pkgs/development/tools/misc/checkbashisms/default.nix index 1585b126961..338585122a5 100644 --- a/pkgs/development/tools/misc/checkbashisms/default.nix +++ b/pkgs/development/tools/misc/checkbashisms/default.nix @@ -10,12 +10,6 @@ stdenv.mkDerivation rec { sha256 = "1vm0yykkg58ja9ianfpm3mgrpah109gj33b41kl0jmmm11zip9jd"; }; - meta = { - homepage = http://sourceforge.net/projects/checkbaskisms/; - description = "Check shell scripts for non-portable syntax"; - license = stdenv.lib.licenses.gpl2; - }; - # The link returns directly the script. No need for unpacking unpackPhase = "true"; @@ -29,4 +23,10 @@ stdenv.mkDerivation rec { fixupPhase = '' sed -e "s#/usr/bin/perl#$perl/bin/perl#" -i $out/bin/checkbashisms ''; + + meta = { + homepage = http://sourceforge.net/projects/checkbaskisms/; + description = "Check shell scripts for non-portable syntax"; + license = stdenv.lib.licenses.gpl2; + }; } diff --git a/pkgs/tools/security/steghide/default.nix b/pkgs/tools/security/steghide/default.nix index 03e8c727022..5d5e0fb4afc 100644 --- a/pkgs/tools/security/steghide/default.nix +++ b/pkgs/tools/security/steghide/default.nix @@ -1,30 +1,29 @@ { stdenv, fetchurl, libjpeg, libmcrypt, zlib, libmhash, gettext, libtool}: - stdenv.mkDerivation rec { - buildInputs = [ libjpeg libmcrypt zlib libmhash gettext libtool ]; - version = "0.5.1"; - name = "steghide-${version}"; +stdenv.mkDerivation rec { + buildInputs = [ libjpeg libmcrypt zlib libmhash gettext libtool ]; + version = "0.5.1"; + name = "steghide-${version}"; - meta = with stdenv.lib; { - homepage = http://steghide.sourceforge.net/; - description = "Steganography program that is able to hide data in various kinds of image- and audio-files"; - license = licenses.gpl2; - }; + src = fetchurl { + url = "mirror://sourceforge/steghide/steghide/${version}/steghide-${version}.tar.gz" ; + sha256 = "78069b7cfe9d1f5348ae43f918f06f91d783c2b3ff25af021e6a312cf541b47b"; + }; - src = fetchurl { - url = "mirror://sourceforge/steghide/steghide/${version}/steghide-${version}.tar.gz" ; - sha256 = "78069b7cfe9d1f5348ae43f918f06f91d783c2b3ff25af021e6a312cf541b47b"; - }; + patches = [ + ./patches/steghide-0.5.1-gcc34.patch + ./patches/steghide-0.5.1-gcc4.patch + ./patches/steghide-0.5.1-gcc43.patch + ]; - patches = [ - ./patches/steghide-0.5.1-gcc34.patch - ./patches/steghide-0.5.1-gcc4.patch - ./patches/steghide-0.5.1-gcc43.patch - ]; + # AM_CXXFLAGS needed for automake + preConfigure = '' + export AM_CXXFLAGS="$CXXFLAGS -std=c++0x" + ''; - # AM_CXXFLAGS needed for automake - preConfigure = '' - export AM_CXXFLAGS="$CXXFLAGS -std=c++0x" - ''; - - } + meta = with stdenv.lib; { + homepage = http://steghide.sourceforge.net/; + description = "Steganography program that is able to hide data in various kinds of image- and audio-files"; + license = licenses.gpl2; + }; +} diff --git a/pkgs/tools/typesetting/tex/auctex/default.nix b/pkgs/tools/typesetting/tex/auctex/default.nix index 0d2282a4fd8..7707bece0ba 100644 --- a/pkgs/tools/typesetting/tex/auctex/default.nix +++ b/pkgs/tools/typesetting/tex/auctex/default.nix @@ -12,11 +12,6 @@ let auctex = stdenv.mkDerivation ( rec { outputs = [ "out" "tex" ]; - meta = { - description = "Extensible package for writing and formatting TeX files in GNU Emacs and XEmacs"; - homepage = http://www.gnu.org/software/auctex; - }; - src = fetchurl { url = "mirror://gnu/${pname}/${name}.tar.gz"; sha256 = "1cf9fkkmzjxa4jvk6c01zgxdikr4zzb5pcx8i4r0hwdk0xljkbwq"; @@ -32,6 +27,11 @@ let auctex = stdenv.mkDerivation ( rec { "--with-lispdir=\${out}/share/emacs/site-lisp" "--with-texmf-dir=\${tex}" ]; + + meta = { + description = "Extensible package for writing and formatting TeX files in GNU Emacs and XEmacs"; + homepage = http://www.gnu.org/software/auctex; + }; }); in auctex // { pkgs = [ auctex.tex ]; } |