diff options
Diffstat (limited to 'pkgs/development/tools/misc')
73 files changed, 655 insertions, 305 deletions
diff --git a/pkgs/development/tools/misc/ShellCheck/default.nix b/pkgs/development/tools/misc/ShellCheck/default.nix index 8beca12325b8..519ca892f3c1 100644 --- a/pkgs/development/tools/misc/ShellCheck/default.nix +++ b/pkgs/development/tools/misc/ShellCheck/default.nix @@ -1,19 +1,25 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! -{ cabal, json, mtl, parsec, QuickCheck, regexCompat }: +{ cabal, json, mtl, parsec, QuickCheck, regexCompat, transformers +}: cabal.mkDerivation (self: { pname = "ShellCheck"; - version = "0.3.4"; - sha256 = "07fw8c33p7h1kvg899dwnvqpxpywcidhbw9jhjd8xsma7kz471iw"; + version = "0.3.5"; + sha256 = "0x4rvhpzrjkn9a9fsmp9iwv9g21hkrd8fgq05iy4wgv8nfhgv2cj"; isLibrary = true; isExecutable = true; - buildDepends = [ json mtl parsec QuickCheck regexCompat ]; - testDepends = [ json mtl parsec QuickCheck regexCompat ]; + buildDepends = [ + json mtl parsec QuickCheck regexCompat transformers + ]; + testDepends = [ + json mtl parsec QuickCheck regexCompat transformers + ]; meta = { homepage = "http://www.shellcheck.net/"; description = "Shell script analysis tool"; - license = "unknown"; + license = self.stdenv.lib.licenses.agpl3; platforms = self.ghc.meta.platforms; + maintainers = with self.stdenv.lib.maintainers; [ aycanirican ]; }; }) diff --git a/pkgs/development/tools/misc/arcanist/default.nix b/pkgs/development/tools/misc/arcanist/default.nix index c4f4caa3b658..64de64dea067 100644 --- a/pkgs/development/tools/misc/arcanist/default.nix +++ b/pkgs/development/tools/misc/arcanist/default.nix @@ -2,19 +2,19 @@ let libphutil = fetchgit { - url = "git://github.com/facebook/libphutil.git"; - rev = "49f08a756a54f12405d3704c0f978b71c7b13811"; - sha256 = "b32267fe19c6e9532887388815b8553519e2844bc5b839b5ad35efeab6b07fb8"; + url = "git://github.com/phacility/libphutil.git"; + rev = "ce3959b4046f5dcc4f3413a59328bda2a42e76b0"; + sha256 = "3c206b428fa5e0391868f7782db4af4d1cf2f338899831a36771cef74db14a76"; }; arcanist = fetchgit { - url = "git://github.com/facebook/arcanist.git"; - rev = "4c0edd296e3301fffdda33c447f6fcafe7d1de01"; - sha256 = "a9f162fb6b47bcf628130e0e8988ab650278b3a6606fa425e4707241ed22dd3e"; + url = "git://github.com/phacility/arcanist.git"; + rev = "b961869edac9469be93f2c3ac7a24562d3186860"; + sha256 = "2ae1272c76a1e2bdedd87d453ddb75f6110f9224063e7ee39e88fcb8b3b4c884"; }; in stdenv.mkDerivation rec { name = "arcanist-${version}"; - version = "20140812"; + version = "20150318"; src = [ arcanist libphutil ]; buildInputs = [ php makeWrapper flex ]; diff --git a/pkgs/development/tools/misc/astyle/default.nix b/pkgs/development/tools/misc/astyle/default.nix index c7cda38ef431..770162c237e4 100644 --- a/pkgs/development/tools/misc/astyle/default.nix +++ b/pkgs/development/tools/misc/astyle/default.nix @@ -2,26 +2,32 @@ let name = "astyle"; - version = "2.04"; + version = "2.05.1"; in stdenv.mkDerivation { name = "${name}-${version}"; src = fetchurl { url = "mirror://sourceforge/${name}/${name}_${version}_linux.tar.gz"; - sha256 = "0q3b2579ng01glfwan75zcyvkggixdz9c4i6cgid2664ad47zcvh"; + sha256 = "1b0f4wm1qmgcswmixv9mwbp86hbdqxk754hml8cjv5vajvqwdpzv"; }; - sourceRoot = "astyle/build/gcc"; + sourceRoot = if (stdenv.cc.cc.isClang or false) + then "astyle/build/clang" + else "astyle/build/gcc"; + + # -s option is obsolete on Darwin and breaks build + postPatch = if stdenv.isDarwin then '' + substituteInPlace Makefile --replace "LDFLAGSr = -s" "LDFLAGSr =" + '' else null; installFlags = "INSTALL=install prefix=$$out"; meta = { homepage = "http://astyle.sourceforge.net/"; description = "Source code indenter, formatter, and beautifier for C, C++, C# and Java"; - license = "LGPL"; - - platforms = stdenv.lib.platforms.linux; + license = stdenv.lib.licenses.lgpl3; + platforms = stdenv.lib.platforms.unix; maintainers = [ stdenv.lib.maintainers.simons ]; }; } diff --git a/pkgs/development/tools/misc/autoconf-archive/default.nix b/pkgs/development/tools/misc/autoconf-archive/default.nix new file mode 100644 index 000000000000..0e6ca01c625e --- /dev/null +++ b/pkgs/development/tools/misc/autoconf-archive/default.nix @@ -0,0 +1,17 @@ +{ stdenv, fetchurl, xz }: +stdenv.mkDerivation rec { + name = "autoconf-archive-${version}"; + version = "2014.10.15"; + + src = fetchurl { + url = "http://ftp.heanet.ie/mirrors/gnu/autoconf-archive/autoconf-archive-${version}.tar.xz"; + sha256 = "198yrdf8bhrpl7insdyzn65zd60qll0gr9vpz7fl7dpcj78yc7gy"; + }; + buildInputs = [ xz ]; + + meta = with stdenv.lib; { + description = "Archive of autoconf m4 macros."; + homepage = http://www.gnu.org/software/autoconf-archive/; + license = licenses.gpl3; + }; +} diff --git a/pkgs/development/tools/misc/autoconf/2.13.nix b/pkgs/development/tools/misc/autoconf/2.13.nix index c3b44ca56863..29939a423af5 100644 --- a/pkgs/development/tools/misc/autoconf/2.13.nix +++ b/pkgs/development/tools/misc/autoconf/2.13.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { name = "autoconf-2.13"; - + src = fetchurl { url = "mirror://gnu/autoconf/${name}.tar.gz"; sha256 = "07krzl4czczdsgzrrw9fiqx35xcf32naf751khg821g5pqv12qgh"; @@ -16,6 +16,8 @@ stdenv.mkDerivation rec { # "fixed" path in generated files! dontPatchShebangs = true; + postInstall = ''ln -s autoconf "$out"/bin/autoconf-2.13''; + meta = { homepage = http://www.gnu.org/software/autoconf/; description = "Part of the GNU Build System"; diff --git a/pkgs/development/tools/misc/autoconf/default.nix b/pkgs/development/tools/misc/autoconf/default.nix index 4dca332722bf..472f437978bf 100644 --- a/pkgs/development/tools/misc/autoconf/default.nix +++ b/pkgs/development/tools/misc/autoconf/default.nix @@ -44,6 +44,6 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.gpl2Plus; - maintainers = [ stdenv.lib.maintainers.ludo ]; + platforms = stdenv.lib.platforms.all; }; } diff --git a/pkgs/development/tools/misc/autogen/default.nix b/pkgs/development/tools/misc/autogen/default.nix index a26c1fdd1995..48533f553fe4 100644 --- a/pkgs/development/tools/misc/autogen/default.nix +++ b/pkgs/development/tools/misc/autogen/default.nix @@ -50,6 +50,6 @@ let version = "5.18"; in homepage = http://www.gnu.org/software/autogen/; - maintainers = [ stdenv.lib.maintainers.ludo ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/tools/misc/automake/automake-1.10.x.nix b/pkgs/development/tools/misc/automake/automake-1.10.x.nix new file mode 100644 index 000000000000..a06426e9cf40 --- /dev/null +++ b/pkgs/development/tools/misc/automake/automake-1.10.x.nix @@ -0,0 +1,46 @@ +{ stdenv, fetchurl, perl, autoconf, makeWrapper }: + +stdenv.mkDerivation rec { + name = "automake-1.10.3"; + + # TODO: Remove the `aclocal' wrapper when $ACLOCAL_PATH support is + # available upstream; see + # <http://debbugs.gnu.org/cgi/bugreport.cgi?bug=9026>. + builder = ./builder.sh; + + setupHook = ./setup-hook.sh; + + src = fetchurl { + url = "mirror://gnu/automake/${name}.tar.gz"; + sha256 = "fda9b22ec8705780c8292510b3376bb45977f45a4f7eb3578c5ad126d7758028"; + }; + + buildInputs = [perl autoconf makeWrapper]; + + # Disable indented log output from Make, otherwise "make.test" will + # fail. + preCheck = "unset NIX_INDENT_MAKE"; + + # Don't fixup "#! /bin/sh" in Libtool, otherwise it will use the + # "fixed" path in generated files! + dontPatchShebangs = true; + + # Run the test suite in parallel. + enableParallelBuilding = true; + + meta = { + branch = "1.10"; + homepage = http://www.gnu.org/software/automake/; + description = "GNU standard-compliant makefile generator"; + + longDescription = '' + GNU Automake is a tool for automatically generating + `Makefile.in' files compliant with the GNU Coding + Standards. Automake requires the use of Autoconf. + ''; + + license = stdenv.lib.licenses.gpl2Plus; + + maintainers = [ ]; + }; +} diff --git a/pkgs/development/tools/misc/automake/automake-1.11.x.nix b/pkgs/development/tools/misc/automake/automake-1.11.x.nix index 2cd80eb4bac5..9b4864e92fe5 100644 --- a/pkgs/development/tools/misc/automake/automake-1.11.x.nix +++ b/pkgs/development/tools/misc/automake/automake-1.11.x.nix @@ -31,6 +31,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = { + branch = "1.11"; homepage = http://www.gnu.org/software/automake/; description = "GNU standard-compliant makefile generator"; @@ -42,6 +43,6 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.gpl2Plus; - maintainers = [ stdenv.lib.maintainers.ludo ]; + platforms = stdenv.lib.platforms.all; }; } diff --git a/pkgs/development/tools/misc/automake/automake-1.12.x.nix b/pkgs/development/tools/misc/automake/automake-1.12.x.nix index 6a93cdc78fdc..34bffff23d4a 100644 --- a/pkgs/development/tools/misc/automake/automake-1.12.x.nix +++ b/pkgs/development/tools/misc/automake/automake-1.12.x.nix @@ -37,6 +37,7 @@ stdenv.mkDerivation rec { dontPatchShebangs = true; meta = { + branch = "1.12"; homepage = http://www.gnu.org/software/automake/; description = "GNU standard-compliant makefile generator"; @@ -48,6 +49,6 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.gpl2Plus; - maintainers = [ stdenv.lib.maintainers.ludo ]; + platforms = stdenv.lib.platforms.all; }; } diff --git a/pkgs/development/tools/misc/automake/automake-1.13.x.nix b/pkgs/development/tools/misc/automake/automake-1.13.x.nix index d4369787f1b6..96a481ade1c1 100644 --- a/pkgs/development/tools/misc/automake/automake-1.13.x.nix +++ b/pkgs/development/tools/misc/automake/automake-1.13.x.nix @@ -25,6 +25,7 @@ stdenv.mkDerivation rec { dontPatchShebangs = true; meta = { + branch = "1.13"; homepage = "http://www.gnu.org/software/automake/"; description = "GNU standard-compliant makefile generator"; license = stdenv.lib.licenses.gpl2Plus; @@ -35,6 +36,8 @@ stdenv.mkDerivation rec { Standards. Automake requires the use of Autoconf. ''; - maintainers = [ stdenv.lib.maintainers.ludo stdenv.lib.maintainers.simons ]; + maintainers = [ stdenv.lib.maintainers.simons ]; + + platforms = stdenv.lib.platforms.all; }; } diff --git a/pkgs/development/tools/misc/automake/automake-1.14.x.nix b/pkgs/development/tools/misc/automake/automake-1.14.x.nix index 0c6ed42825a9..c78e9e6c0a41 100644 --- a/pkgs/development/tools/misc/automake/automake-1.14.x.nix +++ b/pkgs/development/tools/misc/automake/automake-1.14.x.nix @@ -25,6 +25,7 @@ stdenv.mkDerivation rec { dontPatchShebangs = true; meta = { + branch = "1.14"; homepage = "http://www.gnu.org/software/automake/"; description = "GNU standard-compliant makefile generator"; license = stdenv.lib.licenses.gpl2Plus; @@ -35,6 +36,8 @@ stdenv.mkDerivation rec { Standards. Automake requires the use of Autoconf. ''; - maintainers = [ stdenv.lib.maintainers.ludo stdenv.lib.maintainers.simons ]; + maintainers = [ stdenv.lib.maintainers.simons ]; + + platforms = stdenv.lib.platforms.all; }; } diff --git a/pkgs/development/tools/misc/automake/automake-1.15.x.nix b/pkgs/development/tools/misc/automake/automake-1.15.x.nix new file mode 100644 index 000000000000..9db2375a5c63 --- /dev/null +++ b/pkgs/development/tools/misc/automake/automake-1.15.x.nix @@ -0,0 +1,43 @@ +{ stdenv, fetchurl, perl, autoconf, makeWrapper, doCheck ? false }: + +stdenv.mkDerivation rec { + name = "automake-1.15"; + + src = fetchurl { + url = "mirror://gnu/automake/${name}.tar.xz"; + sha256 = "0dl6vfi2lzz8alnklwxzfz624b95hb1ipjvd3mk177flmddcf24r"; + }; + + buildInputs = [ perl autoconf ]; + + setupHook = ./setup-hook.sh; + + # Disable indented log output from Make, otherwise "make.test" will + # fail. + preCheck = "unset NIX_INDENT_MAKE"; + inherit doCheck; + + # The test suite can run in parallel. + enableParallelBuilding = true; + + # Don't fixup "#! /bin/sh" in Libtool, otherwise it will use the + # "fixed" path in generated files! + dontPatchShebangs = true; + + meta = { + branch = "1.15"; + homepage = "http://www.gnu.org/software/automake/"; + description = "GNU standard-compliant makefile generator"; + license = stdenv.lib.licenses.gpl2Plus; + + longDescription = '' + GNU Automake is a tool for automatically generating + `Makefile.in' files compliant with the GNU Coding + Standards. Automake requires the use of Autoconf. + ''; + + maintainers = [ stdenv.lib.maintainers.simons ]; + + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/development/tools/misc/babeltrace/default.nix b/pkgs/development/tools/misc/babeltrace/default.nix index aa8e70b5edc5..282ab740b494 100644 --- a/pkgs/development/tools/misc/babeltrace/default.nix +++ b/pkgs/development/tools/misc/babeltrace/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, glib, libuuid, popt }: stdenv.mkDerivation rec { - name = "babeltrace-1.2.1"; + name = "babeltrace-1.2.4"; src = fetchurl { url = "http://www.efficios.com/files/babeltrace/${name}.tar.bz2"; - sha256 = "1pwg0y57iy4c8wynb6bj7f6bxaiclmxcm4f3nllpw9brhbdzygc1"; + sha256 = "1ccy432srwz4xzi6pswfkjsymw00g1p0aqwr0l1mfzfws8d3lvk6"; }; buildInputs = [ pkgconfig glib libuuid popt ]; diff --git a/pkgs/development/tools/misc/binutils/default.nix b/pkgs/development/tools/misc/binutils/default.nix index 316089fa7c63..c0d7fdc4d936 100644 --- a/pkgs/development/tools/misc/binutils/default.nix +++ b/pkgs/development/tools/misc/binutils/default.nix @@ -2,6 +2,8 @@ , cross ? null, gold ? true, bison ? null }: +assert !stdenv.isDarwin; + let basename = "binutils-2.23.1"; in with { inherit (stdenv.lib) optional optionals optionalString; }; @@ -36,9 +38,8 @@ stdenv.mkDerivation rec { outputs = [ "dev" "out" "info" ]; - buildInputs = - [ zlib ] - ++ optional gold bison; + nativeBuildInputs = optional gold bison; + buildInputs = [ zlib ]; inherit noSysDirs; diff --git a/pkgs/development/tools/misc/bossa/bossa-no-applet-build.patch b/pkgs/development/tools/misc/bossa/bossa-no-applet-build.patch new file mode 100644 index 000000000000..4284245f485d --- /dev/null +++ b/pkgs/development/tools/misc/bossa/bossa-no-applet-build.patch @@ -0,0 +1,16 @@ +diff --git a/Makefile b/Makefile +index cc8882e..97b11ee 100644 +--- a/Makefile ++++ b/Makefile +@@ -184,11 +184,6 @@ $(foreach src,$(COMMON_SRCS),$(eval $(call common_obj,$(src)))) + # Applet rules + # + define applet_obj +-$(SRCDIR)/$(1:%.asm=%.cpp): $(SRCDIR)/$(1) +- @echo APPLET $(1:%.asm=%) +- $$(Q)$$(ARMAS) -o $$(@:%.o=%.obj) $$< +- $$(Q)$$(ARMOBJCOPY) -O binary $$(@:%.o=%.obj) $$(@:%.o=%.bin) +- $$(Q)appletgen $(1:%.asm=%) $(SRCDIR) $(OBJDIR) + $(OBJDIR)/$(1:%.asm=%.o): $(SRCDIR)/$(1:%.asm=%.cpp) + @echo CPP APPLET $$< + $$(Q)$$(CXX) $$(COMMON_CXXFLAGS) -c -o $$(@) $$(<:%.asm=%.cpp) diff --git a/pkgs/development/tools/misc/bossa/default.nix b/pkgs/development/tools/misc/bossa/default.nix index f0b6d81e69eb..71148755a756 100644 --- a/pkgs/development/tools/misc/bossa/default.nix +++ b/pkgs/development/tools/misc/bossa/default.nix @@ -22,6 +22,8 @@ stdenv.mkDerivation rec { sha256 = "01y8r45fw02rps9q995mv82bxrm6p0mysv4wir5glpagrhnyw7md"; }; + patches = [ ./bossa-no-applet-build.patch ]; + nativeBuildInputs = [ bin2c ]; buildInputs = [ wxGTK libX11 readline ]; diff --git a/pkgs/development/tools/misc/ccache/default.nix b/pkgs/development/tools/misc/ccache/default.nix index 3dd634274f3e..7c0cfa51cd79 100644 --- a/pkgs/development/tools/misc/ccache/default.nix +++ b/pkgs/development/tools/misc/ccache/default.nix @@ -3,10 +3,10 @@ let ccache = stdenv.mkDerivation { - name = "ccache-3.1.9"; + name = "ccache-3.2.1"; src = fetchurl { - url = http://samba.org/ftp/ccache/ccache-3.1.9.tar.gz; - sha256 = "0ixlxqv1xyacwgg0k9b4a6by07c7k75y0xbr8dp76jvyada0c9x2"; + url = mirror://samba/ccache/ccache-3.2.1.tar.xz; + sha256 = "17dxb0adha2bqzb2r8rcc3kl9mk7y6vrvlh181liivrc3m7g6al7"; }; buildInputs = [ zlib ]; @@ -14,33 +14,33 @@ stdenv.mkDerivation { passthru = { # A derivation that provides gcc and g++ commands, but that # will end up calling ccache for the given cacheDir - links = extraConfig : (runCommand "ccache-links" - { inherit (gcc) langC langCC; } + links = extraConfig : (runCommand "ccache-links" { passthru.gcc = gcc; } '' mkdir -p $out/bin - if [ $langC -eq 1 ]; then + if [ -x "${gcc.cc}/bin/gcc" ]; then cat > $out/bin/gcc << EOF #!/bin/sh ${extraConfig} - exec ${ccache}/bin/ccache ${gcc.gcc}/bin/gcc "\$@" + exec ${ccache}/bin/ccache ${gcc.cc}/bin/gcc "\$@" EOF chmod +x $out/bin/gcc fi - if [ $langCC -eq 1 ]; then + if [ -x "${gcc.cc}/bin/g++" ]; then cat > $out/bin/g++ << EOF #!/bin/sh ${extraConfig} - exec ${ccache}/bin/ccache ${gcc.gcc}/bin/g++ "\$@" + exec ${ccache}/bin/ccache ${gcc.cc}/bin/g++ "\$@" EOF chmod +x $out/bin/g++ fi ''); }; - meta = { + meta = with stdenv.lib; { description = "Compiler cache for fast recompilation of C/C++ code"; homepage = http://ccache.samba.org/; - license = "GPL"; + license = with licenses; gpl3Plus; + maintainers = with maintainers; [ nckx ]; }; }; in diff --git a/pkgs/development/tools/misc/cflow/default.nix b/pkgs/development/tools/misc/cflow/default.nix index b1322d461ee7..c308c5c70199 100644 --- a/pkgs/development/tools/misc/cflow/default.nix +++ b/pkgs/development/tools/misc/cflow/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { patchPhase = '' substituteInPlace "src/cflow.h" \ --replace "/usr/bin/cpp" \ - "$(cat ${stdenv.gcc}/nix-support/orig-gcc)/bin/cpp" + "$(cat ${stdenv.cc}/nix-support/orig-cc)/bin/cpp" ''; buildInputs = [ gettext ] ++ @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { homepage = http://www.gnu.org/software/cflow/; - maintainers = [ stdenv.lib.maintainers.ludo ]; + maintainers = [ ]; /* On Darwin, build fails with: diff --git a/pkgs/development/tools/misc/cgdb/default.nix b/pkgs/development/tools/misc/cgdb/default.nix index 09c9325d4ff2..fa13b4d6ebb4 100644 --- a/pkgs/development/tools/misc/cgdb/default.nix +++ b/pkgs/development/tools/misc/cgdb/default.nix @@ -1,11 +1,12 @@ { stdenv, fetchurl, ncurses, readline }: stdenv.mkDerivation rec { - name = "cgdb-0.6.6"; + name = "cgdb-${version}"; + version = "0.6.7"; src = fetchurl { - url = "mirror://sourceforge/cgdb/${name}.tar.gz"; - sha256 = "0iap84ikpk1h58wy14zzi1kwszv1hsnvpvnz14swkz54yrh9z7ng"; + url = "http://cgdb.me/files/${name}.tar.gz"; + sha256 = "1agxk6a97v6q0n097zw57qqpaza4j79jg36x99bh8yl23qfx6kh7"; }; buildInputs = [ ncurses readline ]; @@ -13,7 +14,7 @@ stdenv.mkDerivation rec { meta = { description = "A curses interface to gdb"; - homepage = http://cgdb.sourceforge.net/; + homepage = https://cgdb.github.io/; repositories.git = git://github.com/cgdb/cgdb.git; diff --git a/pkgs/development/tools/misc/checkbashisms/default.nix b/pkgs/development/tools/misc/checkbashisms/default.nix new file mode 100644 index 000000000000..259224aac5da --- /dev/null +++ b/pkgs/development/tools/misc/checkbashisms/default.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchurl, perl }: +stdenv.mkDerivation rec { + inherit perl; + + name = "checkbashisms"; + version = "2.0.0.2"; + + src = fetchurl { + url = "mirror://sourceforge/project/checkbaskisms/${version}/${name}"; + sha256 = "1vm0yykkg58ja9ianfpm3mgrpah109gj33b41kl0jmmm11zip9jd"; + }; + + meta = { + homepage = http://sourceforge.net/projects/checkbaskisms/; + description = "Performs basic checks on shell scripts for the presence of non portable syntax."; + license = stdenv.lib.licenses.gpl2; + }; + + # The link returns directly the script. No need for unpacking + unpackPhase = "true"; + + installPhase = '' + mkdir -p $out/bin + cp $src $out/bin/checkbashisms + chmod 755 $out/bin/checkbashisms + ''; + + # Makes sure to point to the proper perl version + fixupPhase = '' + sed -e "s#/usr/bin/perl#$perl/bin/perl#" -i $out/bin/checkbashisms + ''; +} diff --git a/pkgs/development/tools/misc/chruby/default.nix b/pkgs/development/tools/misc/chruby/default.nix new file mode 100644 index 000000000000..ed96befca5e7 --- /dev/null +++ b/pkgs/development/tools/misc/chruby/default.nix @@ -0,0 +1,45 @@ +{ stdenv, lib, fetchFromGitHub, runCommand, rubies ? null }: + +let + rubiesEnv = runCommand "chruby-env" { preferLocalBuild = true; } '' + mkdir $out + ${lib.concatStrings + (lib.mapAttrsToList (name: path: "ln -s ${path} $out/${name}\n") rubies)} + ''; + +in stdenv.mkDerivation rec { + name = "chruby-${version}"; + + version = "0.3.9"; + + src = fetchFromGitHub { + owner = "postmodern"; + repo = "chruby"; + rev = "v${version}"; + sha256 = "1894g6fymr8kra9vwhbmnrcr58l022mcd7g9ans4zd3izla2j3gx"; + }; + + phases = [ "unpackPhase" "patchPhase" "installPhase" "fixupPhase" ]; + + patches = lib.optionalString (rubies != null) [ + ./env.patch + ]; + + postPatch = lib.optionalString (rubies != null) '' + substituteInPlace share/chruby/chruby.sh --replace "@rubiesEnv@" ${rubiesEnv} + ''; + + installPhase = '' + mkdir $out + cp -r bin $out + cp -r share $out + ''; + + meta = with lib; { + description = "Changes the current Ruby"; + homepage = https://github.com/postmodern/chruby; + license = licenses.mit; + platforms = platforms.unix; + maintainers = with maintainers; [ cstrahan ]; + }; +} diff --git a/pkgs/development/tools/misc/chruby/env.patch b/pkgs/development/tools/misc/chruby/env.patch new file mode 100644 index 000000000000..6a4ef8b73497 --- /dev/null +++ b/pkgs/development/tools/misc/chruby/env.patch @@ -0,0 +1,12 @@ +diff --git a/share/chruby/chruby.sh b/share/chruby/chruby.sh +--- a/share/chruby/chruby.sh ++++ b/share/chruby/chruby.sh +@@ -1,7 +1,7 @@ + CHRUBY_VERSION="0.3.8" + RUBIES=() + +-for dir in "$PREFIX/opt/rubies" "$HOME/.rubies"; do ++for dir in @rubiesEnv@; do + [[ -d "$dir" && -n "$(ls -A "$dir")" ]] && RUBIES+=("$dir"/*) + done + unset dir diff --git a/pkgs/development/tools/misc/cl-launch/default.nix b/pkgs/development/tools/misc/cl-launch/default.nix index d66ca9868f57..a6ea7ed766ee 100644 --- a/pkgs/development/tools/misc/cl-launch/default.nix +++ b/pkgs/development/tools/misc/cl-launch/default.nix @@ -3,11 +3,11 @@ let s = # Generated upstream information rec { baseName="cl-launch"; - version="4.0.5"; + version="4.1.2"; name="${baseName}-${version}"; - hash="00i11pkwsb9r9cjzxjmj0dsp369i0gpz04f447xss9a9v192dhlj"; - url="http://common-lisp.net/project/xcvb/cl-launch/cl-launch-4.0.5.tar.gz"; - sha256="00i11pkwsb9r9cjzxjmj0dsp369i0gpz04f447xss9a9v192dhlj"; + hash="13fgcvg71s1yp3r7jf1cs3kkpfw0pwykgmj7zryh24mw2269rx90"; + url="http://common-lisp.net/project/xcvb/cl-launch/cl-launch-4.1.2.tar.gz"; + sha256="13fgcvg71s1yp3r7jf1cs3kkpfw0pwykgmj7zryh24mw2269rx90"; }; buildInputs = [ ]; diff --git a/pkgs/development/tools/misc/coccinelle/default.nix b/pkgs/development/tools/misc/coccinelle/default.nix index 51f5ed6091fa..f21808d28f7c 100644 --- a/pkgs/development/tools/misc/coccinelle/default.nix +++ b/pkgs/development/tools/misc/coccinelle/default.nix @@ -1,20 +1,16 @@ { fetchurl, stdenv, python, ncurses, ocamlPackages, pkgconfig, makeWrapper }: -let - - name = "coccinelle-1.0.0-rc15"; - sha256 = "07fab4e17512925b958890bb13c0809797074f2e44a1107b0074bdcc156b9596"; - -in stdenv.mkDerivation { - inherit name; +stdenv.mkDerivation rec { + name = "coccinelle-${version}"; + version = "1.0.0-rc23"; src = fetchurl { url = "http://coccinelle.lip6.fr/distrib/${name}.tgz"; - inherit sha256; + sha256 = "1qrd4kr3wc0hm4l60fwn19iwzwqcjsx85mm3k4gm3cdhljjma82p"; }; buildInputs = with ocamlPackages; [ - ocaml findlib menhir + ocaml findlib menhir ocamlPackages.camlp4 ocaml_pcre pycaml python ncurses pkgconfig makeWrapper @@ -38,25 +34,23 @@ in stdenv.mkDerivation { meta = { description = "Program to apply semantic patches to C code"; - - longDescription = - '' Coccinelle is a program matching and transformation engine which - provides the language SmPL (Semantic Patch Language) for specifying - desired matches and transformations in C code. Coccinelle was - initially targeted towards performing collateral evolutions in - Linux. Such evolutions comprise the changes that are needed in - client code in response to evolutions in library APIs, and may - include modifications such as renaming a function, adding a function - argument whose value is somehow context-dependent, and reorganizing - a data structure. Beyond collateral evolutions, Coccinelle is - successfully used (by us and others) for finding and fixing bugs in - systems code. - ''; + longDescription = '' + Coccinelle is a program matching and transformation engine which + provides the language SmPL (Semantic Patch Language) for + specifying desired matches and transformations in C code. + Coccinelle was initially targeted towards performing collateral + evolutions in Linux. Such evolutions comprise the changes that + are needed in client code in response to evolutions in library + APIs, and may include modifications such as renaming a function, + adding a function argument whose value is somehow + context-dependent, and reorganizing a data structure. Beyond + collateral evolutions, Coccinelle is successfully used (by us + and others) for finding and fixing bugs in systems code. + ''; homepage = http://coccinelle.lip6.fr/; license = stdenv.lib.licenses.gpl2; - - maintainers = [ ]; - platforms = stdenv.lib.platforms.gnu; # arbitrary choice + platforms = stdenv.lib.platforms.unix; + maintainers = [ stdenv.lib.maintainers.thoughtpolice ]; }; } diff --git a/pkgs/development/tools/misc/complexity/default.nix b/pkgs/development/tools/misc/complexity/default.nix index a7ae4d17ab10..4508fd641195 100644 --- a/pkgs/development/tools/misc/complexity/default.nix +++ b/pkgs/development/tools/misc/complexity/default.nix @@ -40,6 +40,6 @@ stdenv.mkDerivation rec { homepage = http://www.gnu.org/software/complexity/; platforms = stdenv.lib.platforms.gnu; - maintainers = [ stdenv.lib.maintainers.ludo ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/tools/misc/cpphs/default.nix b/pkgs/development/tools/misc/cpphs/default.nix index f3a724f30399..8167ae924165 100644 --- a/pkgs/development/tools/misc/cpphs/default.nix +++ b/pkgs/development/tools/misc/cpphs/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "cpphs"; - version = "1.18.5"; - sha256 = "0bqfz0wkfnxvv711fgmhmh6rbwffgna1pfqbj7whb6crqji9w7g7"; + version = "1.18.6"; + sha256 = "0ds712zabigswf3cljzh7f2ys4rl1fj2cf76lbw856adm8514gxc"; isLibrary = true; isExecutable = true; buildDepends = [ polyparse ]; diff --git a/pkgs/development/tools/misc/cppi/default.nix b/pkgs/development/tools/misc/cppi/default.nix index 2942408de806..148c08d9c866 100644 --- a/pkgs/development/tools/misc/cppi/default.nix +++ b/pkgs/development/tools/misc/cppi/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.gpl3Plus; - maintainers = [ stdenv.lib.maintainers.ludo ]; + maintainers = [ ]; platforms = stdenv.lib.platforms.all; }; } diff --git a/pkgs/development/tools/misc/cproto/default.nix b/pkgs/development/tools/misc/cproto/default.nix index c91d826e3b37..a72982149265 100644 --- a/pkgs/development/tools/misc/cproto/default.nix +++ b/pkgs/development/tools/misc/cproto/default.nix @@ -13,9 +13,9 @@ stdenv.mkDerivation { # patch made by Joe Khoobyar copied from gentoo bugs patches = ./cproto_patch; - meta = { + meta = { description = "Tool to generate C function prototypes from C source code"; homepage = http://cproto.sourceforge.net/; - license = "public domain"; + license = stdenv.lib.licenses.publicDomain; }; } diff --git a/pkgs/development/tools/misc/d-feet/default.nix b/pkgs/development/tools/misc/d-feet/default.nix index df5fdbfab5a3..5afe5525d0e2 100644 --- a/pkgs/development/tools/misc/d-feet/default.nix +++ b/pkgs/development/tools/misc/d-feet/default.nix @@ -27,8 +27,6 @@ stdenv.mkDerivation rec { --prefix PYTHONPATH : "$(toPythonPath $out):$(toPythonPath ${pygobject3})" \ --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \ --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:$out/share" - - rm $out/share/icons/hicolor/icon-theme.cache ''; meta = { diff --git a/pkgs/development/tools/misc/ddd/default.nix b/pkgs/development/tools/misc/ddd/default.nix index 91150255bdaa..a57840827c1f 100644 --- a/pkgs/development/tools/misc/ddd/default.nix +++ b/pkgs/development/tools/misc/ddd/default.nix @@ -7,12 +7,14 @@ stdenv.mkDerivation rec { sha256 = "0p5nx387857w3v2jbgvps2p6mlm0chajcdw5sfrddcglsxkwvmis"; }; buildInputs = [lesstif ncurses libX11 libXt]; - configureFlags = "--with-x"; + configureFlags = "--with-x"; patches = [ ./gcc44.patch ]; - meta = { - homepage = http://www.gnu.org/software/ddd; - description = "Graphical front-end for command-line debuggers"; - license = stdenv.lib.licenses.gpl2; - }; + + meta = { + homepage = http://www.gnu.org/software/ddd; + description = "Graphical front-end for command-line debuggers"; + license = stdenv.lib.licenses.gpl2; + platforms = stdenv.lib.platforms.linux; + }; } diff --git a/pkgs/development/tools/misc/dejagnu/default.nix b/pkgs/development/tools/misc/dejagnu/default.nix index d3c2e7e63890..685fde4226d6 100644 --- a/pkgs/development/tools/misc/dejagnu/default.nix +++ b/pkgs/development/tools/misc/dejagnu/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv, expect, makeWrapper }: stdenv.mkDerivation rec { - name = "dejagnu-1.5.1"; + name = "dejagnu-1.5.2"; src = fetchurl { url = "mirror://gnu/dejagnu/${name}.tar.gz"; - sha256 = "1lik8h4qi7x0mhsi8xmj91an1yb63rjbk6v4xrmzgiy5lk8lgrv0"; + sha256 = "18ikblg4x4y5fkw8sg0c2zmqgxdqqycswmws17sxx8m4sz6g7dch"; }; patches = [ ./wrapped-runtest-program-name.patch ]; @@ -50,6 +50,6 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.ludo ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/tools/misc/dfu-programmer/default.nix b/pkgs/development/tools/misc/dfu-programmer/default.nix index 2df687b8bc6b..f63a726f73b8 100644 --- a/pkgs/development/tools/misc/dfu-programmer/default.nix +++ b/pkgs/development/tools/misc/dfu-programmer/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, libusb }: let - version = "0.7.0"; + version = "0.7.2"; in stdenv.mkDerivation rec { name="dfu-programmer-${version}"; @@ -9,14 +9,14 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://sourceforge/dfu-programmer/${name}.tar.gz"; - sha256 = "17lglglk5xrqd2n0impg5bkq4j96qc51cw3kzcghzmzmn6fvg3gf"; + sha256 = "15gr99y1z9vbvhrkd25zqhnzhg6zjmaam3vfjzf2mazd39mx7d0x"; }; configureFlags = [ "--disable-libusb_1_0" ]; meta = with stdenv.lib; { license = licenses.gpl2; - description = "A Device Firmware Update based USB programmer for Atmel chips with a USB bootloader."; + description = "A Device Firmware Update based USB programmer for Atmel chips with a USB bootloader"; homepage = http://dfu-programmer.sourceforge.net/; maintainers = [ maintainers.the-kenny ]; }; diff --git a/pkgs/development/tools/misc/distcc/default.nix b/pkgs/development/tools/misc/distcc/default.nix index 565d7835f05d..0b42b88ef7ac 100644 --- a/pkgs/development/tools/misc/distcc/default.nix +++ b/pkgs/development/tools/misc/distcc/default.nix @@ -41,11 +41,10 @@ let # # extraConfig is meant to be sh lines exporting environment # variables like DISTCC_HOSTS, DISTCC_DIR, ... - links = extraConfig : (runCommand "distcc-links" - { inherit (gcc) langC langCC; } + links = extraConfig: (runCommand "distcc-links" { passthru.gcc = gcc.cc; } '' mkdir -p $out/bin - if [ $langC -eq 1 ]; then + if [ -x "${gcc.cc}/bin/gcc" ]; then cat > $out/bin/gcc << EOF #!/bin/sh ${extraConfig} @@ -53,7 +52,7 @@ let EOF chmod +x $out/bin/gcc fi - if [ $langCC -eq 1 ]; then + if [ -x "${gcc.cc}/bin/g++" ]; then cat > $out/bin/g++ << EOF #!/bin/sh ${extraConfig} diff --git a/pkgs/development/tools/misc/distcc/masq.nix b/pkgs/development/tools/misc/distcc/masq.nix index 753c35b5d3a2..28b31cbb48d5 100644 --- a/pkgs/development/tools/misc/distcc/masq.nix +++ b/pkgs/development/tools/misc/distcc/masq.nix @@ -3,6 +3,10 @@ stdenv.mkDerivation { name = "distcc-masq-${gccRaw.name}"; + meta = { + platforms = stdenv.lib.platforms.linux; + }; + phases = [ "installPhase" ]; installPhase = '' mkdir -p $out/bin diff --git a/pkgs/development/tools/misc/epm/default.nix b/pkgs/development/tools/misc/epm/default.nix index 23b781902e7b..9d84011e3657 100644 --- a/pkgs/development/tools/misc/epm/default.nix +++ b/pkgs/development/tools/misc/epm/default.nix @@ -1,17 +1,21 @@ {stdenv, fetchurl, rpm}: -stdenv.mkDerivation { - name = "epm-4.1"; +stdenv.mkDerivation rec { + name = "epm-${version}"; + version = "4.2"; src = fetchurl { - url = http://ftp.rz.tu-bs.de/pub/mirror/ftp.easysw.com/ftp/pub/epm/4.1/epm-4.1-source.tar.bz2; - sha256 = "18xq1h9hx410x28bfccabydrqb1c0dqnq62qa17wc3846rwf234n"; + url = "http://www.msweet.org/files/project2/epm-4.2-source.tar.bz2"; + sha256 = "13imglm1fgd7p5y9lc0xsl6x4cdjsk5lnan5sn8f7m4jwbx8kik6"; }; - buildInputs = [rpm]; + buildInputs = [ rpm ]; - meta = { + meta = with stdenv.lib; { description = "The ESP Package Manager generates distribution archives for a variety of platforms"; - homepage = http://www.easysw.com/epm/index.php; + homepage = http://www.msweet.org/projects.php?Z2; + license = licenses.gpl2; + maintainers = with maintainers; [ pSub ]; + platforms = platforms.unix; }; } diff --git a/pkgs/development/tools/misc/fswatch/default.nix b/pkgs/development/tools/misc/fswatch/default.nix new file mode 100644 index 000000000000..8f7f9437d4ef --- /dev/null +++ b/pkgs/development/tools/misc/fswatch/default.nix @@ -0,0 +1,48 @@ +{ stdenv +, fetchFromGitHub +, autoconf +, automake +, findutils # for xargs +, gettext +, libtool +, makeWrapper +, texinfo +}: + +let + + version = "1.4.6"; + +in stdenv.mkDerivation { + + name = "fswatch-${version}"; + + src = fetchFromGitHub { + owner = "emcrisostomo"; + repo = "fswatch"; + rev = version; + sha256 = "0flq8baqzifhmf61zyiipdipvgy4h0kl551clxrhwa8gvzf75im4"; + }; + + buildInputs = [ autoconf automake gettext libtool makeWrapper texinfo ]; + + preConfigure = '' + ./autogen.sh + ''; + + postFixup = '' + for prog in fswatch-run fswatch-run-bash; do + wrapProgram $out/bin/$prog \ + --prefix PATH "${findutils}/bin" + done + ''; + + meta = with stdenv.lib; { + description = "A cross-platform file change monitor with multiple backends"; + homepage = https://github.com/emcrisostomo/fswatch; + license = licenses.gpl3Plus; + platforms = platforms.all; + maintainers = with maintainers; [ pSub ]; + }; + +} diff --git a/pkgs/development/tools/misc/gdb/default.nix b/pkgs/development/tools/misc/gdb/default.nix index 5ee0f64a4e41..b24b46aec3d7 100644 --- a/pkgs/development/tools/misc/gdb/default.nix +++ b/pkgs/development/tools/misc/gdb/default.nix @@ -1,5 +1,5 @@ { fetchurl, stdenv, ncurses, readline, gmp, mpfr, expat, texinfo -, dejagnu, python, target ? null +, dejagnu, python, perl, pkgconfig, guile, target ? null # Additional dependencies for GNU/Hurd. , mig ? null, hurd ? null @@ -8,7 +8,7 @@ let - basename = "gdb-7.7"; + basename = "gdb-7.8.2"; # Whether (cross-)building for GNU/Hurd. This is an approximation since # having `stdenv ? cross' doesn't tell us if we're building `crossDrv' and @@ -26,18 +26,18 @@ stdenv.mkDerivation rec { ("-" + target.config); src = fetchurl { - url = "mirror://gnu/gdb/${basename}.tar.bz2"; - sha256 = "08vcb97j1b7vxwq6088wb6s3g3bm8iwikd922y0xsgbbxv3d2104"; + url = "mirror://gnu/gdb/${basename}.tar.xz"; + sha256 = "11a4fj1vpsny71kz7xqqbqk3kgzbs5cfjj3z9gm0hpvxfkam8nb0"; }; patches = [ ./edit-signals.patch ]; # I think python is not a native input, but I leave it # here while I will not need it cross building - nativeBuildInputs = [ texinfo python ] + nativeBuildInputs = [ texinfo python perl ] ++ stdenv.lib.optional isGNU mig; - buildInputs = [ ncurses readline gmp mpfr expat ] + buildInputs = [ ncurses readline gmp mpfr expat /* pkgconfig guile */ ] ++ stdenv.lib.optional isGNU hurd ++ stdenv.lib.optional doCheck dejagnu; diff --git a/pkgs/development/tools/misc/gdb/pstack.nix b/pkgs/development/tools/misc/gdb/pstack.nix deleted file mode 100644 index 12cdc6542609..000000000000 --- a/pkgs/development/tools/misc/gdb/pstack.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ stdenv, gdb }: -stdenv.mkDerivation { - name = "pstack-20120823"; - buildCommand = '' - mkdir -p $out/bin - cat > $out/bin/pstack <<EOF - ${gdb}/bin/gdb -ex "set pagination 0" -ex "thread apply all bt" --batch -p \$1 - EOF - chmod a+x $out/bin/pstack - ''; -} diff --git a/pkgs/development/tools/misc/global/default.nix b/pkgs/development/tools/misc/global/default.nix index b366feb304a6..7b61d96e3e7e 100644 --- a/pkgs/development/tools/misc/global/default.nix +++ b/pkgs/development/tools/misc/global/default.nix @@ -1,29 +1,38 @@ -{ fetchurl, stdenv, libtool, ncurses }: +{ fetchurl, stdenv, libtool, ncurses, ctags, sqlite +, pythonPackages, makeWrapper }: stdenv.mkDerivation rec { - name = "global-6.2.12"; + name = "global-6.4"; src = fetchurl { url = "mirror://gnu/global/${name}.tar.gz"; - sha256 = "05jkhya1cs6yqhkf8nw5x56adkxxrqyga7sq7hx44dbf7alczwfa"; + sha256 = "13i4zwx6gaibc4j79wd0hgxysw8ibxz9c018zxhydnxlyadzcnri"; }; - buildInputs = [ libtool ncurses ]; + buildInputs = [ libtool ncurses makeWrapper ]; + propagatedBuildInputs = [ pythonPackages.pygments ]; configurePhase = '' ./configure --prefix="$out" --disable-static '' + ''--with-posix-sort=$(type -p sort) '' + ''--with-ltdl-include=${libtool}/include --with-ltdl-lib=${libtool}/lib '' - + ''--with-ncurses=${ncurses}''; + + ''--with-ncurses=${ncurses} '' + + ''--with-sqlite3=${sqlite} '' + + ''--with-exuberant-ctags=${ctags}/bin/ctags''; doCheck = true; postInstall = '' mkdir -p "$out/share/emacs/site-lisp" cp -v *.el "$out/share/emacs/site-lisp" + + wrapProgram $out/bin/gtags \ + --prefix PYTHONPATH : "$(toPythonPath ${pythonPackages.pygments})" + wrapProgram $out/bin/global \ + --prefix PYTHONPATH : "$(toPythonPath ${pythonPackages.pygments})" ''; - meta = { + meta = with stdenv.lib; { description = "Source code tag system"; longDescription = '' @@ -37,11 +46,11 @@ stdenv.mkDerivation rec { operating system like GNU and BSD. ''; - license = stdenv.lib.licenses.gpl3Plus; + license = licenses.gpl3Plus; homepage = http://www.gnu.org/software/global/; - maintainers = [ stdenv.lib.maintainers.ludo ]; - platforms = stdenv.lib.platforms.unix; + maintainers = with maintainers; [ pSub ]; + platforms = platforms.unix; }; } diff --git a/pkgs/development/tools/misc/go-repo-root/default.nix b/pkgs/development/tools/misc/go-repo-root/default.nix new file mode 100644 index 000000000000..16520ee0457f --- /dev/null +++ b/pkgs/development/tools/misc/go-repo-root/default.nix @@ -0,0 +1,26 @@ +{ lib, goPackages, fetchFromGitHub }: + +let + version = "0.0.1"; +in + +with lib; with goPackages; +buildGoPackage rec { + name = "go-repo-root-${version}"; + goPackagePath = "github.com/cstrahan/go-repo-root"; + src = fetchFromGitHub { + owner = "cstrahan"; + repo = "go-repo-root"; + rev = "90041e5c7dc634651549f96814a452f4e0e680f9"; + sha256 = "1rlzp8kjv0a3dnfhyqcggny0ad648j5csr2x0siq5prahlp48mg4"; + }; + + buildInputs = [ tools ]; + + meta = with lib; { + homepage = "https://github.com/cstrahan/go-repo-root"; + maintainers = with maintainers; [ cstrahan ]; + license = licenses.mit; + platforms = platforms.all; + }; +} diff --git a/pkgs/development/tools/misc/gob2/default.nix b/pkgs/development/tools/misc/gob2/default.nix index a434e54bba9f..c1ab6ebe0748 100644 --- a/pkgs/development/tools/misc/gob2/default.nix +++ b/pkgs/development/tools/misc/gob2/default.nix @@ -1,11 +1,11 @@ -{ stdenv, fetchurlGnome, pkgconfig, glib, bison, flex }: +{ stdenv, fetchurl, pkgconfig, glib, bison, flex }: stdenv.mkDerivation rec { - name = src.pkgname; + name = "gob2-${minVer}.18"; + minVer = "2.0"; - src = fetchurlGnome { - project = "gob2"; - major = "2"; minor = "0"; patchlevel = "18"; extension = "gz"; + src = fetchurl { + url = "mirror://gnome/sources/gob2/${minVer}/${name}.tar.gz"; sha256 = "1r242s3rsxyqiw2ic2gdpvvrx903jgjd1aa4mkl26in5k9zk76fa"; }; diff --git a/pkgs/development/tools/misc/grafana/default.nix b/pkgs/development/tools/misc/grafana/default.nix index b1566684cf0b..ecfd0e1fb8bd 100644 --- a/pkgs/development/tools/misc/grafana/default.nix +++ b/pkgs/development/tools/misc/grafana/default.nix @@ -4,11 +4,11 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "grafana-${version}"; - version = "1.5.4"; + version = "1.9.1"; src = fetchurl { url = "http://grafanarel.s3.amazonaws.com/${name}.zip"; - sha256 = "fee7334efba967142955be2fa39ecae7bca0cc9b7a76c301430746be4fc7ec6d"; + sha256 = "1zyzsbspxrzaf2kk6fysp6c3y025s6nd75rc2p9qq9q95dv8fj23"; }; buildInputs = [ unzip ]; diff --git a/pkgs/development/tools/misc/help2man/default.nix b/pkgs/development/tools/misc/help2man/default.nix index c4ba7073889d..088e1574ebe1 100644 --- a/pkgs/development/tools/misc/help2man/default.nix +++ b/pkgs/development/tools/misc/help2man/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, perl, gettext, LocaleGettext, makeWrapper }: stdenv.mkDerivation rec { - name = "help2man-1.44.1"; + name = "help2man-1.46.5"; src = fetchurl { url = "mirror://gnu/help2man/${name}.tar.xz"; - sha256 = "1yyyfw9zrfdvslnv91bnhyqmazwx243wmkc9wdaz888rfx36ipi2"; + sha256 = "1gqfqgxq3qgwnldjz3i5mxvzyx2w3j042r3fw1wygic3f6327nha"; }; buildInputs = [ makeWrapper perl gettext LocaleGettext ]; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { ''; - meta = { + meta = with stdenv.lib; { description = "Generate man pages from `--help' output"; longDescription = @@ -28,8 +28,8 @@ stdenv.mkDerivation rec { homepage = http://www.gnu.org/software/help2man/; - license = stdenv.lib.licenses.gpl3Plus; - platforms = stdenv.lib.platforms.gnu; # arbitrary choice - maintainers = [ stdenv.lib.maintainers.ludo ]; + license = licenses.gpl3Plus; + platforms = platforms.all; + maintainers = with maintainers; [ pSub ]; }; } diff --git a/pkgs/development/tools/misc/hydra/default.nix b/pkgs/development/tools/misc/hydra/default.nix deleted file mode 100644 index 0940bcca191a..000000000000 --- a/pkgs/development/tools/misc/hydra/default.nix +++ /dev/null @@ -1,73 +0,0 @@ -{ stdenv, fetchurl, nix, perlPackages, perl, makeWrapper, libtool -, unzip, nukeReferences, pkgconfig, boehmgc, libxslt, sqlite -, subversion, openssh, coreutils, findutils, gzip, bzip2, lzma -, gnutar, git, mercurial, gnused, graphviz, rpm, dpkg, cdrkit -}: - -let - - perldeps = with perlPackages; - [ CatalystDevel - CatalystPluginSessionStoreFastMmap - CatalystPluginStackTrace - CatalystPluginAuthorizationRoles - CatalystAuthenticationStoreDBIxClass - CatalystViewTT - CatalystEngineHTTPPrefork - CatalystViewDownload - XMLSimple - IPCRun - IOCompress - Readonly - DBDPg - EmailSender - TextTable - NetTwitterLite - PadWalker - DataDump - JSONXS - DateTime - DigestSHA1 - CryptRandPasswd - nixPerl - ]; - - version = "0.1pre27592"; - -in - -stdenv.mkDerivation { - name = "hydra-${version}"; - - src = fetchurl { - url = http://hydra.nixos.org/build/1142240/download/2/hydra-0.1pre27592.tar.gz; - sha256 = "0197bcfkabqqv7611fh9kjabfm0nfci8kanfaa59hqwf3h6fmpwz"; - }; - - configureFlags = "--with-nix=${nix}"; - - buildInputs = [ perl makeWrapper libtool nix unzip nukeReferences pkgconfig boehmgc ] ++ perldeps ; - - hydraPath = stdenv.lib.concatStringsSep ":" (map (p: "${p}/bin") ( [ - libxslt sqlite subversion openssh nix coreutils findutils - gzip bzip2 lzma gnutar unzip git mercurial gnused graphviz - rpm dpkg cdrkit])); - - postInstall = '' - for i in "$out/bin/"*; do - wrapProgram $i \ - --prefix PERL5LIB ':' $out/libexec/hydra/lib:$PERL5LIB \ - --prefix PATH ':' $out/bin:$hydraPath \ - --set HYDRA_RELEASE ${version} \ - --set HYDRA_HOME $out/libexec/hydra \ - --set NIX_RELEASE ${nix.name} - done - ''; - - meta = { - description = "Hydra, the Nix-based continuous integration system"; - homepage = http://nixos.org/hydra/; - license = stdenv.lib.licenses.gpl3Plus; - platforms = stdenv.lib.platforms.linux; - }; -} diff --git a/pkgs/development/tools/misc/inotify-tools/default.nix b/pkgs/development/tools/misc/inotify-tools/default.nix index 3402c2060e7f..4c1cd5bd7bdf 100644 --- a/pkgs/development/tools/misc/inotify-tools/default.nix +++ b/pkgs/development/tools/misc/inotify-tools/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://github.com/downloads/rvoicilas/inotify-tools/inotify-tools-${version}.tar.gz"; - sha256 = "0icl4bx041axd5dvhg89kilfkysjj86hjakc7bk8n49cxjn4cha6"; + sha256 = "0by9frv1k59f76cx08sn06sk6lmdxsfb6zr0rshzhyrxi6lcqar2"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/tools/misc/intel-gpu-tools/default.nix b/pkgs/development/tools/misc/intel-gpu-tools/default.nix index 14bfe74821de..72a364e682a3 100644 --- a/pkgs/development/tools/misc/intel-gpu-tools/default.nix +++ b/pkgs/development/tools/misc/intel-gpu-tools/default.nix @@ -1,15 +1,13 @@ { stdenv, fetchurl, pkgconfig, libdrm, libpciaccess, cairo, dri2proto, udev, libX11, libXext, libXv, libXrandr, glib, bison }: stdenv.mkDerivation rec { - name = "intel-gpu-tools-1.7"; + name = "intel-gpu-tools-1.10"; src = fetchurl { url = "http://xorg.freedesktop.org/archive/individual/app/${name}.tar.bz2"; - sha256 = "0yi0024kr1xzglkkhyjpxr081bmwvdakb61az6wiidfrpd1j6q92"; + sha256 = "0x4q7gv14yaniycgdxym9nazlj6wzcvjjhg40bbm5lkw5pqvxwkd"; }; - configureFlags = [ "--disable-tests" ]; - buildInputs = [ pkgconfig libdrm libpciaccess cairo dri2proto udev libX11 libXext libXv libXrandr glib bison ]; meta = with stdenv.lib; { @@ -17,5 +15,6 @@ stdenv.mkDerivation rec { description = "Tools for development and testing of the Intel DRM driver"; license = licenses.mit; platforms = platforms.unix; + maintainers = with maintainers; [ pSub ]; }; } diff --git a/pkgs/development/tools/misc/intltool/default.nix b/pkgs/development/tools/misc/intltool/default.nix index c9bb661935a4..40b7ea3b5782 100644 --- a/pkgs/development/tools/misc/intltool/default.nix +++ b/pkgs/development/tools/misc/intltool/default.nix @@ -3,11 +3,11 @@ let s = # Generated upstream information rec { baseName="intltool"; - version="0.50.2"; - name="intltool-0.50.2"; - hash="01j4yd7i84n9nk4ccs6yifg84pp68nr9by57jdbhj7dpdxf5rwk7"; - url="https://launchpad.net/intltool/trunk/0.50.2/+download/intltool-0.50.2.tar.gz"; - sha256="01j4yd7i84n9nk4ccs6yifg84pp68nr9by57jdbhj7dpdxf5rwk7"; + version="0.51.0"; + name="${baseName}-${version}"; + hash="1karx4sb7bnm2j67q0q74hspkfn6lqprpy5r99vkn5bb36a4viv7"; + url="https://launchpad.net/intltool/trunk/0.51.0/+download/intltool-0.51.0.tar.gz"; + sha256="1karx4sb7bnm2j67q0q74hspkfn6lqprpy5r99vkn5bb36a4viv7"; }; propagatedBuildInputs = [perl perlXMLParser]; buildInputs = []; diff --git a/pkgs/development/tools/misc/kibana/default.nix b/pkgs/development/tools/misc/kibana/default.nix new file mode 100644 index 000000000000..dab04861d9fa --- /dev/null +++ b/pkgs/development/tools/misc/kibana/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchurl, conf ? null }: + +with stdenv.lib; + +stdenv.mkDerivation rec { + name = "kibana-${version}"; + version = "3.1.1"; + + src = fetchurl { + url = "https://download.elasticsearch.org/kibana/kibana/${name}.tar.gz"; + sha256 = "195x6zq9x16nlh2akvn6z0kp8qnba4vq90yrysiafgv8dmw34p5b"; + }; + + phases = ["unpackPhase" "installPhase"]; + + installPhase = '' + mkdir -p $out + mv * $out/ + ${optionalString (conf != null) "cp ${conf} $out/config.js"} + ''; + + meta = { + description = "Visualize logs and time-stamped data"; + homepage = http://www.elasticsearch.org/overview/kibana; + license = licenses.asl20; + maintainers = with maintainers; [ offline rickynils ]; + }; +} diff --git a/pkgs/development/tools/misc/libtool/libtool2.nix b/pkgs/development/tools/misc/libtool/libtool2.nix index 924113ea5486..27ec2772e095 100644 --- a/pkgs/development/tools/misc/libtool/libtool2.nix +++ b/pkgs/development/tools/misc/libtool/libtool2.nix @@ -1,16 +1,17 @@ -{ stdenv, fetchurl, m4, perl, lzma }: +{ stdenv, fetchurl, m4, perl, help2man }: stdenv.mkDerivation rec { - name = "libtool-2.4.2"; + name = "libtool-2.4.6"; src = fetchurl { url = "mirror://gnu/libtool/${name}.tar.gz"; - sha256 = "0649qfpzkswgcj9vqkkr9rn4nlcx80faxpyqscy2k1x9c94f93dk"; + sha256 = "1qq61k6lp1fp75xs398yzi6wvbx232l7xbyn3p13cnh27mflvgg3"; }; outputs = [ "out" "lib" ]; - nativeBuildInputs = [ lzma m4 perl ]; + propagatedNativeBuildInputs = [ m4 ]; + nativeBuildInputs = [ perl help2man ]; # Don't fixup "#! /bin/sh" in Libtool, otherwise it will use the # "fixed" path in generated files! @@ -41,6 +42,6 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.gpl2Plus; - maintainers = [ stdenv.lib.maintainers.ludo ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/tools/misc/lsof/default.nix b/pkgs/development/tools/misc/lsof/default.nix index ec3a5e9bcbf6..1ef292407a47 100644 --- a/pkgs/development/tools/misc/lsof/default.nix +++ b/pkgs/development/tools/misc/lsof/default.nix @@ -30,6 +30,6 @@ stdenv.mkDerivation { socket (IPv6/IPv4/UNIX local), or partition (by opening a file from it). ''; - maintainers = stdenv.lib.maintainers.mornfall; + maintainers = [ stdenv.lib.maintainers.mornfall ]; }; } diff --git a/pkgs/development/tools/misc/lttng-tools/default.nix b/pkgs/development/tools/misc/lttng-tools/default.nix index 5758500d86f9..627a51916cb8 100644 --- a/pkgs/development/tools/misc/lttng-tools/default.nix +++ b/pkgs/development/tools/misc/lttng-tools/default.nix @@ -1,14 +1,14 @@ -{ stdenv, fetchurl, popt, libuuid, liburcu, lttng-ust, kmod }: +{ stdenv, fetchurl, popt, libuuid, liburcu, lttng-ust, kmod, libxml2 }: stdenv.mkDerivation rec { - name = "lttng-tools-2.4.1"; + name = "lttng-tools-2.5.2"; src = fetchurl { url = "https://lttng.org/files/lttng-tools/${name}.tar.bz2"; - sha256 = "1v9f7a3c2shwgn4g759bblgr27h9ql9sfq71r1mbkf8rd235g2jr"; + sha256 = "0g931f90pl9bfgsxihrj0zlw9ivyaplbiw28axkscmjvzd1d6lhz"; }; - buildInputs = [ popt libuuid liburcu lttng-ust ]; + buildInputs = [ popt libuuid liburcu lttng-ust libxml2 ]; prePatch = '' sed -e "s|/sbin/modprobe|${kmod}/sbin/modprobe|g" \ diff --git a/pkgs/development/tools/misc/lttng-ust/default.nix b/pkgs/development/tools/misc/lttng-ust/default.nix index 0cba211f28b9..38fe4d47e062 100644 --- a/pkgs/development/tools/misc/lttng-ust/default.nix +++ b/pkgs/development/tools/misc/lttng-ust/default.nix @@ -12,11 +12,11 @@ # Debian builds with std.h (systemtap). stdenv.mkDerivation rec { - name = "lttng-ust-2.4.1"; + name = "lttng-ust-2.5.1"; src = fetchurl { url = "https://lttng.org/files/lttng-ust/${name}.tar.bz2"; - sha256 = "1nx9b1haiylajzjy03wgfcy85nwg578c6gy8ip55y8cabjrw0hp1"; + sha256 = "0ij5p2j8q63zqnj3i3hgymgib717r2bq07ymy5cwdra1hvby5ngv"; }; buildInputs = [ liburcu ]; diff --git a/pkgs/development/tools/misc/lttv/default.nix b/pkgs/development/tools/misc/lttv/default.nix index 0096cbdbabf5..5cf8b6649418 100644 --- a/pkgs/development/tools/misc/lttv/default.nix +++ b/pkgs/development/tools/misc/lttv/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { homepage = http://lttng.org/; # liblttvtraceread (ltt/ directory) is distributed under the GNU LGPL v2.1. # The rest of the LTTV package is distributed under the GNU GPL v2. - # TODO license = with licenses; [ gpl2 lgpl21 ]; + license = with licenses; [ gpl2 lgpl21 ]; platforms = platforms.linux; maintainers = [ maintainers.bjornfor ]; }; diff --git a/pkgs/development/tools/misc/luarocks/default.nix b/pkgs/development/tools/misc/luarocks/default.nix index 4a38762a3ff3..dfd5c2994fd0 100644 --- a/pkgs/development/tools/misc/luarocks/default.nix +++ b/pkgs/development/tools/misc/luarocks/default.nix @@ -3,11 +3,11 @@ let s = # Generated upstream information rec { baseName="luarocks"; - version="2.2.0"; + version="2.2.1"; name="${baseName}-${version}"; - hash="1717p694455w1fdldb2ldlyklln8w3bqk1dsly8gpqh3n73lw6lv"; - url="http://luarocks.org/releases/luarocks-2.2.0-rc1.tar.gz"; - sha256="1717p694455w1fdldb2ldlyklln8w3bqk1dsly8gpqh3n73lw6lv"; + hash="0mbwbx1qsarwab2apq424gw28px9h2d89v1fp9vxrrpi6dz8lgvi"; + url="http://luarocks.org/releases/luarocks-2.2.1.tar.gz"; + sha256="0mbwbx1qsarwab2apq424gw28px9h2d89v1fp9vxrrpi6dz8lgvi"; }; buildInputs = [ lua curl makeWrapper which diff --git a/pkgs/development/tools/misc/objconv/default.nix b/pkgs/development/tools/misc/objconv/default.nix new file mode 100644 index 000000000000..154d66705d21 --- /dev/null +++ b/pkgs/development/tools/misc/objconv/default.nix @@ -0,0 +1,16 @@ +{ stdenv, fetchFromGitHub }: + +stdenv.mkDerivation { + name = "objconv-1.0"; + + src = fetchFromGitHub { + owner = "vertis"; + repo = "objconv"; + rev = "01da9219e684360fd04011599805ee3e699bae96"; + sha256 = "1by2bbrampwv0qy8vn4hhs49rykczyj7q8g373ym38da3c95bym2"; + }; + + buildPhase = "c++ -o objconv -O2 src/*.cpp"; + + installPhase = "mkdir -p $out/bin && mv objconv $out/bin"; +} diff --git a/pkgs/development/tools/misc/saleae-logic/default.nix b/pkgs/development/tools/misc/saleae-logic/default.nix index 2fa7194cf073..8e8909ee7d07 100644 --- a/pkgs/development/tools/misc/saleae-logic/default.nix +++ b/pkgs/development/tools/misc/saleae-logic/default.nix @@ -62,8 +62,8 @@ stdenv.mkDerivation rec { cp -r * "$out" # Patch it - patchelf --set-interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" "$out/Logic" - patchelf --set-rpath "${stdenv.gcc.gcc}/lib:${stdenv.gcc.gcc}/lib64:${libPath}:\$ORIGIN/Analyzers:\$ORIGIN" "$out/Logic" + patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" "$out/Logic" + patchelf --set-rpath "${stdenv.cc.cc}/lib:${stdenv.cc.cc}/lib64:${libPath}:\$ORIGIN/Analyzers:\$ORIGIN" "$out/Logic" # Build the LD_PRELOAD library that makes Logic work from a read-only directory mkdir -p "$out/lib" diff --git a/pkgs/development/tools/misc/sipp/default.nix b/pkgs/development/tools/misc/sipp/default.nix new file mode 100644 index 000000000000..d3373e9f4a61 --- /dev/null +++ b/pkgs/development/tools/misc/sipp/default.nix @@ -0,0 +1,29 @@ +{stdenv, fetchurl, ncurses, libpcap }: + +stdenv.mkDerivation rec { + + version = "3.4-beta2"; + + name = "sipp-${version}"; + + src = fetchurl { + url = "https://github.com/SIPp/sipp/archive/${version}.tar.gz"; + sha256 = "0rr3slarh5dhpinif5aqji9c9krnpvl7z49w7qahvsww1niawwdv"; + }; + + configurePhase = '' + export ac_cv_lib_curses_initscr=yes + export ac_cv_lib_pthread_pthread_mutex_init=yes + sed -i "s@-lcurses@-lncurses@g" ./configure + sed -i "s@pcap/\(.*\).pcap@$out/share/pcap/\1.pcap@g" src/scenario.cpp + ./configure --prefix=$out --with-pcap + ''; + + postInstall = '' + mkdir -pv $out/share/pcap + cp pcap/* $out/share/pcap + ''; + + buildInputs = [ncurses libpcap]; +} + diff --git a/pkgs/development/tools/misc/sloccount/default.nix b/pkgs/development/tools/misc/sloccount/default.nix index 1aa9a2c058d6..cf143f7d9e9d 100644 --- a/pkgs/development/tools/misc/sloccount/default.nix +++ b/pkgs/development/tools/misc/sloccount/default.nix @@ -29,9 +29,7 @@ stdenv.mkDerivation rec { done ''; - configurePhase = '' - sed -i "makefile" -"es|PREFIX[[:blank:]]*=.*$|PREFIX = $out|g" - ''; + makeFlags = "PREFIX=$(out) CC=cc"; doCheck = true; checkPhase = ''HOME="$TMPDIR" PATH="$PWD:$PATH" make test''; diff --git a/pkgs/development/tools/misc/sqitch/default.nix b/pkgs/development/tools/misc/sqitch/default.nix new file mode 100644 index 000000000000..0a1032cecf81 --- /dev/null +++ b/pkgs/development/tools/misc/sqitch/default.nix @@ -0,0 +1,15 @@ +{ name, stdenv, perl, makeWrapper, sqitchModule, databaseModule }: +stdenv.mkDerivation { + name = "${name}-${sqitchModule.version}"; + buildInputs = [ perl makeWrapper sqitchModule databaseModule ]; + unpackPhase = ":"; + buildPhase = ":"; + installPhase = '' + mkdir -p $out/bin + for d in bin/sqitch etc lib share ; do + ln -s ${sqitchModule}/$d $out/$d + done + ''; + dontStrip = true; + postFixup = "wrapProgram $out/bin/sqitch --prefix PERL5LIB : $PERL5LIB"; +} diff --git a/pkgs/development/tools/misc/srecord/default.nix b/pkgs/development/tools/misc/srecord/default.nix index e316b4a628e5..9d0e2d7430e8 100644 --- a/pkgs/development/tools/misc/srecord/default.nix +++ b/pkgs/development/tools/misc/srecord/default.nix @@ -1,14 +1,17 @@ -{ stdenv, fetchurl, boost, libtool, groff, ghostscript }: +{ stdenv, fetchurl, boost, libtool, groff, ghostscript, libgcrypt ? null }: stdenv.mkDerivation rec { - name = "srecord-1.63"; + name = "srecord-1.64"; src = fetchurl { url = "mirror://sourceforge/srecord/${name}.tar.gz"; - sha256 = "06mzj9lrk8lzfzhnfyh8xm4p92j242jik6zm37ihcia20inwgzkq"; + sha256 = "1qk75q0k5vzmm3932q9hqz2gp8n9rrdfjacsswxc02656f3l3929"; }; - buildInputs = [ boost libtool groff ghostscript ]; + buildInputs = [ boost libtool groff ghostscript libgcrypt ]; + + configureFlags = stdenv.lib.optionalString + (libgcrypt == null) "--without-gcrypt"; meta = with stdenv.lib; { description = "Collection of powerful tools for manipulating EPROM load files"; diff --git a/pkgs/development/tools/misc/strace/default.nix b/pkgs/development/tools/misc/strace/default.nix index 732423da5cd4..43959c8a43c8 100644 --- a/pkgs/development/tools/misc/strace/default.nix +++ b/pkgs/development/tools/misc/strace/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, perl }: stdenv.mkDerivation rec { - name = "strace-4.8"; + name = "strace-4.10"; src = fetchurl { url = "mirror://sourceforge/strace/${name}.tar.xz"; - sha256 = "1y6pw4aj4rw5470lqks1ml0n8jh5xbhwr5c3gb00bj570wgjk4pl"; + sha256 = "1qhfwijxvblwdvvm70f8bhzs4fpbzqmwwbkfp636brzrds30s676"; }; nativeBuildInputs = [ perl ]; @@ -15,6 +15,6 @@ stdenv.mkDerivation rec { description = "A system call tracer for Linux"; license = licenses.bsd3; platforms = platforms.linux; - maintainers = maintainers.mornfall; + maintainers = [ maintainers.mornfall ]; }; } diff --git a/pkgs/development/tools/misc/swig/3.x.nix b/pkgs/development/tools/misc/swig/3.x.nix index 653fb0616034..1a02c88bb71e 100644 --- a/pkgs/development/tools/misc/swig/3.x.nix +++ b/pkgs/development/tools/misc/swig/3.x.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pcre }: stdenv.mkDerivation rec { - name = "swig-3.0.0"; + name = "swig-3.0.2"; src = fetchurl { url = "mirror://sourceforge/swig/${name}.tar.gz"; - sha256 = "99cab1055877d00280509f0e04c1fe76643ec3792e9b8e7efcc9aa6e247229df"; + sha256 = "04vqrij3k6pcq41y7rzl5rmhnghqg905f11wyrqw7vdwr9brcrm2"; }; buildInputs = [ pcre ]; diff --git a/pkgs/development/tools/misc/swig/default.nix b/pkgs/development/tools/misc/swig/default.nix index 66d6b65453ea..c4fcd3158457 100644 --- a/pkgs/development/tools/misc/swig/default.nix +++ b/pkgs/development/tools/misc/swig/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { # 'make check' uses boost and tcl buildInputs = stdenv.lib.optionals doCheck [ boost tcl ]; - configureFlags = stdenv.lib.optionalString stdenv.isDarwin "--disable-ccache"; + configureFlags = "--disable-ccache"; meta = { description = "Interface compiler that connects C/C++ code to higher-level languages"; diff --git a/pkgs/development/tools/misc/sysbench/default.nix b/pkgs/development/tools/misc/sysbench/default.nix index 1b4cab361ce5..e4c2b474d46f 100644 --- a/pkgs/development/tools/misc/sysbench/default.nix +++ b/pkgs/development/tools/misc/sysbench/default.nix @@ -2,11 +2,14 @@ stdenv.mkDerivation rec { name = "sysbench-0.4.12"; - buildInputs = [ autoreconfHook mysql libxslt zlib ]; + + buildInputs = [ autoreconfHook mysql.lib libxslt zlib ]; + src = fetchurl { url = mirror://sourceforge/sysbench/sysbench-0.4.12.tar.gz; sha256 = "17pa4cw7wxvlb4mba943lfs3b3jdi64mlnaf4n8jq09y35j79yl3"; }; + preAutoreconf = '' touch NEWS AUTHORS ''; diff --git a/pkgs/development/tools/misc/tcptrack/default.nix b/pkgs/development/tools/misc/tcptrack/default.nix index 645bd0611777..a6e40a4809ab 100644 --- a/pkgs/development/tools/misc/tcptrack/default.nix +++ b/pkgs/development/tools/misc/tcptrack/default.nix @@ -12,6 +12,8 @@ stdenv.mkDerivation rec { buildInputs = [ ncurses libpcap ]; + NIX_CFLAGS_COMPILE = "-Wno-error=cpp"; + meta = with stdenv.lib; { description = "libpcap based program for live TCP connection monitoring"; homepage = http://www.rhythm.cx/~steve/devel/tcptrack/; # dead link diff --git a/pkgs/development/tools/misc/texi2html/default.nix b/pkgs/development/tools/misc/texi2html/default.nix index 1f36a14fa979..28eb95fd08b0 100644 --- a/pkgs/development/tools/misc/texi2html/default.nix +++ b/pkgs/development/tools/misc/texi2html/default.nix @@ -15,6 +15,6 @@ stdenv.mkDerivation rec { homepage = http://www.nongnu.org/texi2html/; license = stdenv.lib.licenses.gpl2; maintainers = [stdenv.lib.maintainers.marcweber]; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/tools/misc/texinfo/4.13a.nix b/pkgs/development/tools/misc/texinfo/4.13a.nix index a31552305147..6eb384f51e31 100644 --- a/pkgs/development/tools/misc/texinfo/4.13a.nix +++ b/pkgs/development/tools/misc/texinfo/4.13a.nix @@ -36,5 +36,6 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.gpl3Plus; homepage = http://www.gnu.org/software/texinfo/; + branch = "4.13"; }; } diff --git a/pkgs/development/tools/misc/texinfo/5.2.nix b/pkgs/development/tools/misc/texinfo/5.2.nix index 53076476f89b..a9edccbd200d 100644 --- a/pkgs/development/tools/misc/texinfo/5.2.nix +++ b/pkgs/development/tools/misc/texinfo/5.2.nix @@ -39,5 +39,6 @@ stdenv.mkDerivation rec { need revise only that one document. The Texinfo system is well-integrated with GNU Emacs. ''; + branch = "5.2"; }; } diff --git a/pkgs/development/tools/misc/uncrustify/default.nix b/pkgs/development/tools/misc/uncrustify/default.nix index cf1ec5edbcd9..f4add9a4b9ea 100644 --- a/pkgs/development/tools/misc/uncrustify/default.nix +++ b/pkgs/development/tools/misc/uncrustify/default.nix @@ -1,18 +1,19 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "uncrustify-0.60"; + name = "uncrustify"; + version = "0.61"; src = fetchurl { - url = "mirror://sourceforge/uncrustify/${name}.tar.gz"; - sha256 = "1v3wlkh669mfzbyg68xz7c1hj3kj7l6cavbvbj3jr47ickc3wzsa"; + url = "mirror://sourceforge/uncrustify/${name}-${version}.tar.gz"; + sha256 = "1df0e5a2716e256f0a4993db12f23d10195b3030326fdf2e07f8e6421e172df9"; }; meta = with stdenv.lib; { description = "Source code beautifier for C, C++, C#, ObjectiveC, D, Java, Pawn and VALA"; homepage = http://uncrustify.sourceforge.net/; license = licenses.gpl2Plus; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = [ maintainers.bjornfor ]; }; } diff --git a/pkgs/development/tools/misc/unifdef/default.nix b/pkgs/development/tools/misc/unifdef/default.nix index f4b38f4f7abc..6e14673701c8 100644 --- a/pkgs/development/tools/misc/unifdef/default.nix +++ b/pkgs/development/tools/misc/unifdef/default.nix @@ -1,24 +1,27 @@ { fetchurl, stdenv }: -stdenv.mkDerivation { - name = "unifdef-1.0"; +stdenv.mkDerivation rec { + name = "unifdef-2.6"; src = fetchurl { - url = http://www.cs.cmu.edu/~ajw/public/dist/unifdef-1.0.tar.gz; - sha256 = "1bcxq7qgf6r98m6l277fx6s0gn9sr4vn7f3s0r5mwx79waqk0k6i"; + url = "https://github.com/fanf2/unifdef/archive/${name}.tar.gz"; + sha256 = "1p5wr5ms9w8kijy9h7qs1mz36dlavdj6ngz2bks588w7a20kcqxj"; }; - buildPhase = '' - make unifdef + postUnpack = '' + substituteInPlace $sourceRoot/unifdef.c \ + --replace '#include "version.h"' "" + + substituteInPlace $sourceRoot/Makefile \ + --replace "unifdef.c: version.h" "unifdef.c:" ''; - installPhase = '' - mkdir -p $out/bin - cp unifdef $out/bin + preBuild = '' + unset HOME + export DESTDIR=$out ''; meta = { - description = "useful for removing #ifdef'ed lines from a file while otherwise leaving the file alone"; - + description = "Selectively remove C preprocessor conditionals"; }; } diff --git a/pkgs/development/tools/misc/usb-modeswitch/default.nix b/pkgs/development/tools/misc/usb-modeswitch/default.nix index bba7ef7fad04..cc28b011829c 100644 --- a/pkgs/development/tools/misc/usb-modeswitch/default.nix +++ b/pkgs/development/tools/misc/usb-modeswitch/default.nix @@ -1,11 +1,15 @@ { stdenv, fetchurl, pkgconfig, libusb1 }: +let + version = "2.2.1"; +in + stdenv.mkDerivation rec { - name = "usb-modeswitch-2.2.0"; + name = "usb-modeswitch-${version}"; - src =fetchurl { + src = fetchurl { url = "http://www.draisberghof.de/usb_modeswitch/${name}.tar.bz2"; - sha256 = "0flaj3mq0xhzk72kkpclwglf77kcw5rkwvkaimn5zvbiw4yi0li7"; + sha256 = "1jqih1g0y78w03rchpw7fjvzwjfakak61qjp7hbr1m5nnsh2dn9p"; }; # make clean: we always build from source. It should be necessary on x86_64 only diff --git a/pkgs/development/tools/misc/yodl/default.nix b/pkgs/development/tools/misc/yodl/default.nix index 4c92946008ec..598835c51521 100644 --- a/pkgs/development/tools/misc/yodl/default.nix +++ b/pkgs/development/tools/misc/yodl/default.nix @@ -1,31 +1,40 @@ -# This package is only used to create the documentation of zsh-cvs -# eg have a look at http://www.zsh.org/mla/users/2008/msg00715.html -# latest release is newer though +{ stdenv, fetchurl, perl, icmake }: -{ stdenv, fetchurl, perl }: +stdenv.mkDerivation rec { + name = "yodl-${version}"; + version = "3.05.00"; -stdenv.mkDerivation { - name = "yodl-2.14.3"; - - buildInputs = [ perl ]; + buildInputs = [ perl icmake ]; src = fetchurl { - url = "mirror://sourceforge/yodl/yodl_2.14.3.orig.tar.gz"; - sha256 = "0paypm76p34hap3d18vvks5rrilchcw6q56rvq6pjf9raqw8ynd4"; + url = "mirror://sourceforge/yodl/yodl_${version}.orig.tar.gz"; + sha256 = "12hv5ghrsk6kdi414glg888v3qk3m1nmicl8f0h5k4szm1i00dig"; }; - - patches = - [ (fetchurl { - url = "mirror://sourceforge/yodl/yodl_2.14.3-1.diff.gz"; - sha256 = "176hlbiidv7p9051f04anzj4sr9dwlp9439f9mjvvgks47ac0qx4"; - }) - ]; - # This doesn't isntall docs yet, do you need them? + preConfigure = '' + patchShebangs scripts/. + sed -i 's;/usr;;g' INSTALL.im + substituteInPlace build --replace /usr/bin/icmake ${icmake}/bin/icmake + substituteInPlace macros/rawmacros/startdoc.pl --replace /usr/bin/perl ${perl}/bin/perl + ''; + + buildPhase = '' + ./build programs + ./build macros + ./build man + ''; + installPhase = '' - # -> $out - sed -i "s@'/usr/@'$out/@" contrib/build.pl - perl contrib/build.pl make-software - perl contrib/build.pl install-software + ./build install programs $out + ./build install macros $out + ./build install man $out ''; + + meta = with stdenv.lib; { + description = "A package that implements a pre-document language and tools to process it"; + homepage = http://yodl.sourceforge.net/; + license = licenses.gpl3; + maintainers = with maintainers; [ pSub ]; + platforms = platforms.linux; + }; } |