diff options
Diffstat (limited to 'pkgs/development/tools/misc')
18 files changed, 125 insertions, 42 deletions
diff --git a/pkgs/development/tools/misc/automake/setup-hook.sh b/pkgs/development/tools/misc/automake/setup-hook.sh index 4489d343510..2b12ae3aee0 100644 --- a/pkgs/development/tools/misc/automake/setup-hook.sh +++ b/pkgs/development/tools/misc/automake/setup-hook.sh @@ -1,5 +1,5 @@ addAclocals () { - addToSearchPathWithCustomDelimiter : ACLOCAL_PATH /share/aclocal "" $1 + addToSearchPathWithCustomDelimiter : ACLOCAL_PATH /share/aclocal "" $1 } envHooks=(${envHooks[@]} addAclocals) diff --git a/pkgs/development/tools/misc/avrdude/default.nix b/pkgs/development/tools/misc/avrdude/default.nix index e573d0751f2..f87d305dfb2 100644 --- a/pkgs/development/tools/misc/avrdude/default.nix +++ b/pkgs/development/tools/misc/avrdude/default.nix @@ -12,7 +12,7 @@ let #defaultFlags = ["doc"]; }; -in args.stdenv.mkDerivation { +in stdenv.mkDerivation { # passing the flags in case a library using this want's to check them (*) .. inherit (co) /* flags */ buildInputs configureFlags; diff --git a/pkgs/development/tools/misc/ccache/default.nix b/pkgs/development/tools/misc/ccache/default.nix new file mode 100644 index 00000000000..8342dfcc728 --- /dev/null +++ b/pkgs/development/tools/misc/ccache/default.nix @@ -0,0 +1,15 @@ +{stdenv, fetchurl}: + +stdenv.mkDerivation { + name = "ccache-2.4"; + src = fetchurl { + url = http://samba.org/ftp/ccache/ccache-2.4.tar.gz; + sha256 = "435f862ca5168c346f5aa9e242174bbf19a5abcaeecfceeac2f194558827aaa0"; + }; + + meta = { + description = "ccache, a tool that caches compilation results."; + homepage = http://ccache.samba.org/; + license = "GPL"; + }; +} diff --git a/pkgs/development/tools/misc/elfutils/default.nix b/pkgs/development/tools/misc/elfutils/0.127.nix index a57792d7039..efa91fa637c 100644 --- a/pkgs/development/tools/misc/elfutils/default.nix +++ b/pkgs/development/tools/misc/elfutils/0.127.nix @@ -1,9 +1,10 @@ -{stdenv, fetchurl}: +args: with args; stdenv.mkDerivation { - name = "elfutils-0.127"; + name = "elfutils-"+version; src = fetchurl { url = http://nix.cs.uu.nl/dist/tarballs/elfutils-0.127.tar.gz; sha256 = "12n3h5r3c24a6l2wxz0w2dqq072bvgms0dzckivrwp5vdn22lpdv"; }; + preBuild = "sed -e 's/-Werror//' -i */Makefile "; } diff --git a/pkgs/development/tools/misc/elfutils/0.131.nix b/pkgs/development/tools/misc/elfutils/0.131.nix new file mode 100644 index 00000000000..5efe046493d --- /dev/null +++ b/pkgs/development/tools/misc/elfutils/0.131.nix @@ -0,0 +1,9 @@ +args: with args; + +stdenv.mkDerivation { + name = "elfutils-"+version; + src = fetchurl { + url = http://ftp.de.debian.org/debian/pool/main/e/elfutils/elfutils_0.131.orig.tar.gz; + sha256 = "0vqfjpcv81m3q0gsk78qykakhz9rbfwd65i4zsi03xr2lrk9ayll"; + }; +} diff --git a/pkgs/development/tools/misc/gdb/default.nix b/pkgs/development/tools/misc/gdb/default.nix index e914391ea2f..c9a47a953ef 100644 --- a/pkgs/development/tools/misc/gdb/default.nix +++ b/pkgs/development/tools/misc/gdb/default.nix @@ -1,10 +1,10 @@ -{stdenv, fetchurl, ncurses}: +args: with args; -stdenv.mkDerivation { - name = "gdb-6.6"; +stdenv.mkDerivation rec { + name = "gdb-6.7.1"; src = fetchurl { - url = http://ftp.gnu.org/gnu/gdb/gdb-6.6.tar.bz2; - md5 = "a4df41d28dd514d64e8ccbfe125fd9a6"; + url = "mirror://gnu/gdb/${name}.tar.bz2"; + sha256 = "0qig8j8hcqpqfhnnp685rzgj8v88bw2fc5igvbiiqkqg88wfr37r"; }; buildInputs = [ncurses]; } diff --git a/pkgs/development/tools/misc/hasktags/default.nix b/pkgs/development/tools/misc/hasktags/default.nix new file mode 100644 index 00000000000..613d028948f --- /dev/null +++ b/pkgs/development/tools/misc/hasktags/default.nix @@ -0,0 +1,24 @@ +args: +args.stdenv.mkDerivation { + name = "hasktags-modified"; + + src = args.fetchurl { + url = http://mawercer.de/hasktags.hs; + sha256 = "112k97g6mgvwa0a9zrq840mqxxw55cn422h1c134xb0fl29llig7"; + }; + + buildInputs =(with args; [ghc]); + + phases = "buildPhase"; + + # calling it hasktags-modified to not clash with the one distributed with ghc + buildPhase = " + ensureDir \$out/bin + ghc --make \$src -o \$out/bin/hasktags-modified + "; + + meta = { + # this can be removed again when somone comitts my changes into the distribution + description = "Marc's modified hasktags"; + }; +} diff --git a/pkgs/development/tools/misc/indent/2.2.9.nix b/pkgs/development/tools/misc/indent/2.2.9.nix new file mode 100644 index 00000000000..5e92802beed --- /dev/null +++ b/pkgs/development/tools/misc/indent/2.2.9.nix @@ -0,0 +1,29 @@ +args : with args; + let localDefs = builderDefs { + src = /* put a fetchurl here */ + fetchurl { + url = ftp://ftp.gnu.org/gnu/indent/indent-2.2.9.tar.gz; + sha256 = "0rp4divzv5xyflm8ixpp2isa092n0nmhgmhvz56db7k3lnyqg4qb"; + }; + + buildInputs = []; + configureFlags = []; + } null; /* null is a terminator for sumArgs */ + in with localDefs; +let + preBuild = FullDepEntry (" + sed -e '/extern FILE [*]output/i#ifndef OUTPUT_DEFINED_ELSEWHERE' -i src/indent.h + sed -e '/extern FILE [*]output/a#endif' -i src/indent.h + sed -e '1i#define OUTPUT_DEFINED_ELSEWHERE 1' -i src/output.c + ") [minInit doUnpack]; +in +stdenv.mkDerivation rec { + name = "indent"; + builder = writeScript (name + "-builder") + (textClosure localDefs [doConfigure preBuild doMakeInstall doForceShare doPropagate]); + meta = { + description = " + GNU Indent - a source text formatter. +"; + }; +} diff --git a/pkgs/development/tools/misc/intltool/0.36.2.nix b/pkgs/development/tools/misc/intltool/0.36.2.nix index f42a6901dfa..884c76a800c 100644 --- a/pkgs/development/tools/misc/intltool/0.36.2.nix +++ b/pkgs/development/tools/misc/intltool/0.36.2.nix @@ -1,18 +1,20 @@ args : with args; - with builderDefs { + let localDefs = builderDefs { src = /* put a fetchurl here */ fetchurl { url = http://ftp.gnome.org/pub/gnome/sources/intltool/0.36/intltool-0.36.2.tar.bz2; sha256 = "0cfblqz3k5s4rsw6rx9f5v3izsrmrs96293rb7bd02vijbah9gxj"; }; - buildInputs = [perl perlXMLParser]; + propagatedBuildInputs = [perl perlXMLParser]; configureFlags = []; } null; /* null is a terminator for sumArgs */ + in with localDefs; stdenv.mkDerivation rec { name = "intltool-0.36.2"; builder = writeScript (name + "-builder") - (textClosure [doConfigure doMakeInstall doForceShare]); + (textClosure localDefs [doConfigure doMakeInstall doPropagate doForceShare]); + inherit propagatedBuildInputs; meta = { description = " Internalization tool for XML. diff --git a/pkgs/development/tools/misc/intltool/default.nix b/pkgs/development/tools/misc/intltool/default.nix deleted file mode 100644 index c8e4bcf9545..00000000000 --- a/pkgs/development/tools/misc/intltool/default.nix +++ /dev/null @@ -1,2 +0,0 @@ -args : -(import (__toPath ((toString ./JustNothing/.. )+"/"+args.version+".nix"))) args diff --git a/pkgs/development/tools/misc/libtool/default.nix b/pkgs/development/tools/misc/libtool/default.nix index 226552b3943..b955ccbc3c8 100644 --- a/pkgs/development/tools/misc/libtool/default.nix +++ b/pkgs/development/tools/misc/libtool/default.nix @@ -1,10 +1,10 @@ {stdenv, fetchurl, m4, perl}: -stdenv.mkDerivation { - name = "libtool-1.5.22"; +stdenv.mkDerivation rec { + name = "libtool-1.5.26"; src = fetchurl { - url = http://ftp.gnu.org/gnu/libtool/libtool-1.5.22.tar.gz; - md5 = "8e0ac9797b62ba4dcc8a2fb7936412b0"; + url = "mirror://gnu/libtool/" + name + ".tar.gz"; + sha256 = "029ggq5kri1gjn6nfqmgw4w920gyfzscjjxbsxxidal5zqsawd8w"; }; buildInputs = [m4 perl]; } diff --git a/pkgs/development/tools/misc/ltrace/default.nix b/pkgs/development/tools/misc/ltrace/0.5-3deb.nix index 23b44bf3b5b..bff3e6a8fbc 100644 --- a/pkgs/development/tools/misc/ltrace/default.nix +++ b/pkgs/development/tools/misc/ltrace/0.5-3deb.nix @@ -1,5 +1,10 @@ -args : with args; - with builderDefs { +args : with args; let + patch = fetchurl { + url = ftp://ftp.debian.org/debian/pool/main/l/ltrace/ltrace_0.5-3.diff.gz; + sha256 = "0rin25si7117wld5bc7vf3d73c5k9ph3zach7cbg9h9vvz376c26"; + }; + localDefs = with (builderDefs {src="";} null); + builderDefs { src = /* put a fetchurl here */ fetchurl { url = ftp://ftp.debian.org/debian/pool/main/l/ltrace/ltrace_0.5.orig.tar.gz; @@ -11,7 +16,12 @@ args : with args; goSrcDir = " cd ltrace-*; "; + preBuild = FullDepEntry ('' + gunzip < ${patch} | patch -Np1 + sed -e s@-Werror@@ -i Makefile.in + '')["minInit" "doUnpack"]; } null; /* null is a terminator for sumArgs */ + in with localDefs; let preConfigure = FullDepEntry (" sed -e 's@-o root -g root@@' -i Makefile.in; @@ -20,7 +30,7 @@ in stdenv.mkDerivation rec { name = "ltrace-0.5"; builder = writeScript (name + "-builder") - (textClosure [preConfigure doConfigure doMakeInstall doForceShare]); + (textClosure localDefs [preBuild preConfigure doConfigure doMakeInstall doForceShare]); meta = { description = " Library call tracer. diff --git a/pkgs/development/tools/misc/pkgconfig/default.nix b/pkgs/development/tools/misc/pkgconfig/default.nix index 481d2174ebc..41a61f600e0 100644 --- a/pkgs/development/tools/misc/pkgconfig/default.nix +++ b/pkgs/development/tools/misc/pkgconfig/default.nix @@ -5,14 +5,9 @@ stdenv.mkDerivation { setupHook = ./setup-hook.sh; src = fetchurl { url = http://pkgconfig.freedesktop.org/releases/pkg-config-0.22.tar.gz; - sha256 = "1rpb5wygmp0f8nal7y3ga4556i7hkjdslv3wdq04fj30gns621vy"; + sha256 = "1rpb5wygmp0f8nal7y3ga4556i7hkjdslv3wdq04fj30gns621vy"; }; - postInstall = " - ensureDir \$out/nix-support - cp \$setupHook \$out/nix-support/setup-hook - "; - patches = [ # Process Requires.private properly, see # http://bugs.freedesktop.org/show_bug.cgi?id=4738. @@ -23,3 +18,4 @@ stdenv.mkDerivation { }) ]; } + diff --git a/pkgs/development/tools/misc/pkgconfig/setup-hook.sh b/pkgs/development/tools/misc/pkgconfig/setup-hook.sh index f13a44eb999..c137fb0e96c 100644 --- a/pkgs/development/tools/misc/pkgconfig/setup-hook.sh +++ b/pkgs/development/tools/misc/pkgconfig/setup-hook.sh @@ -1,5 +1,5 @@ addPkgConfigPath () { - addToSearchPath PKG_CONFIG_PATH /lib/pkgconfig "" $1 + addToSearchPath PKG_CONFIG_PATH /lib/pkgconfig "" $1 } envHooks=(${envHooks[@]} addPkgConfigPath) diff --git a/pkgs/development/tools/misc/strace/default.nix b/pkgs/development/tools/misc/strace/default.nix index b94a313d23d..5091a715167 100644 --- a/pkgs/development/tools/misc/strace/default.nix +++ b/pkgs/development/tools/misc/strace/default.nix @@ -1,10 +1,10 @@ {stdenv, fetchurl}: stdenv.mkDerivation { - name = "strace-4.5.15"; + name = "strace-4.5.16"; src = fetchurl { - url = mirror://sourceforge/strace/strace-4.5.15.tar.gz; - sha256 = "07n62yv53p2hsb59srfaxb0kk8b6p6iq77drmf65pq8jpa50s9ip"; + url = mirror://sourceforge/strace/strace-4.5.16.tar.bz2; + sha256 = "15ks9i1gv7mbyiwnzbjls2xy0pyv5x4j9a5ca2x0258fq8lxwdhp"; }; } diff --git a/pkgs/development/tools/misc/swig/default.nix b/pkgs/development/tools/misc/swig/default.nix index e8e77924b8c..72dd19b7af8 100644 --- a/pkgs/development/tools/misc/swig/default.nix +++ b/pkgs/development/tools/misc/swig/default.nix @@ -6,12 +6,12 @@ assert pythonSupport -> python != null; assert javaSupport -> jdk != null; stdenv.mkDerivation { - name = "swig-1.3.31"; + name = "swig-1.3.33"; builder = ./builder.sh; src = fetchurl { - url = mirror://sourceforge/swig/swig-1.3.31.tar.gz; - sha256 = "01fqf6xvhaqh76kh13bknn5j7axpm1pdnjpzwxsa9d1lbq4n7bf2"; + url = mirror://sourceforge/swig/swig-1.3.33.tar.gz; + sha256 = "02rz31i642sbsngny7k98d9hxlkcb9snvbzlnz3sh0qiyr3ciggv"; }; inherit perlSupport pythonSupport javaSupport; diff --git a/pkgs/development/tools/misc/uisp/default.nix b/pkgs/development/tools/misc/uisp/default.nix index c6810939dd4..694dc940d92 100644 --- a/pkgs/development/tools/misc/uisp/default.nix +++ b/pkgs/development/tools/misc/uisp/default.nix @@ -1,16 +1,14 @@ -args: -args.stdenv.mkDerivation { +args: with args; +stdenv.mkDerivation { name = "uisp-20050207"; configureFlags="--disable-dependency-tracking"; - src = args.fetchurl { + src = fetchurl { url = http://mirror.switch.ch/mirror/gentoo/distfiles/uisp-20050207.tar.gz; sha256 = "1bncxp5yxh9r1yrp04vvhfiva8livi1pwic7v8xj99q09zrwahvw"; }; - #buildInputs =(with args; []); - meta = { description = "tool for AVR microcontrollers which can interface to many hardware in-system programmers"; license = "GPL-2"; diff --git a/pkgs/development/tools/misc/valgrind/default.nix b/pkgs/development/tools/misc/valgrind/default.nix index 5fb0e85dda1..7f46228304b 100644 --- a/pkgs/development/tools/misc/valgrind/default.nix +++ b/pkgs/development/tools/misc/valgrind/default.nix @@ -1,16 +1,17 @@ {stdenv, fetchurl}: stdenv.mkDerivation { - name = "valgrind-3.2.3"; + name = "valgrind-3.3.0"; src = fetchurl { - url = http://valgrind.org/downloads/valgrind-3.2.3.tar.bz2; - sha256 = "0hf48y13mm1c1zg59bvkbr0lzcwng5mb33lgiv3d0gzl4w2r5jhv"; + url = http://valgrind.org/downloads/valgrind-3.3.0.tar.bz2; + sha256 = "0yllx5a2f5bx18gqz74aikr27zxwpblswn65lqvm9rbzswlq5w2s"; }; configureFlags = if stdenv.system == "x86_64-linux" then ["--enable-only64bit"] else []; meta = { + homepage = http://www.valgrind.org/; description = "Award-winning suite of tools for debugging and profiling Linux programs"; }; } |