diff options
Diffstat (limited to 'pkgs/development/tools')
23 files changed, 403 insertions, 72 deletions
diff --git a/pkgs/development/tools/build-managers/cargo/common.nix b/pkgs/development/tools/build-managers/cargo/common.nix index f0d8f92dfaa3..94b9ca1f6655 100644 --- a/pkgs/development/tools/build-managers/cargo/common.nix +++ b/pkgs/development/tools/build-managers/cargo/common.nix @@ -3,6 +3,16 @@ { inherit version; + name = "cargo-${version}"; + + postInstall = '' + rm "$out/lib/rustlib/components" \ + "$out/lib/rustlib/install.log" \ + "$out/lib/rustlib/rust-installer-version" \ + "$out/lib/rustlib/uninstall.sh" \ + "$out/lib/rustlib/manifest-cargo" + ''; + platform = if stdenv.system == "i686-linux" then "i686-unknown-linux-gnu" else if stdenv.system == "x86_64-linux" @@ -16,9 +26,8 @@ meta = with stdenv.lib; { homepage = http://crates.io; description = "Downloads your Rust project's dependencies and builds your project"; + maintainers = with maintainers; [ wizeman ]; license = [ licenses.mit licenses.asl20 ]; platforms = platforms.linux; }; - - name = "cargo-${version}"; } diff --git a/pkgs/development/tools/build-managers/cargo/default.nix b/pkgs/development/tools/build-managers/cargo/default.nix new file mode 100644 index 000000000000..e7a45f1c3484 --- /dev/null +++ b/pkgs/development/tools/build-managers/cargo/default.nix @@ -0,0 +1,36 @@ +{ stdenv, fetchgit, rustPlatform, file, curl, python, pkgconfig, openssl +, cmake, zlib }: + +with ((import ./common.nix) { inherit stdenv; version = "2015-05-13"; }); + +with rustPlatform; + +buildRustPackage rec { + inherit name version meta; + + src = fetchgit { + url = "https://github.com/rust-lang/cargo.git"; + rev = "d814fcbf8efda3027d54c09e11aa7eaf0006a83c"; + sha256 = "0sppd3x2cacmbnypcjip44amnh66lrrbwwzsbz8rqf3nq2ah496x"; + leaveDotGit = true; + }; + + depsSha256 = "1b0mpdxmp7inkg59n2phjwzpz5gx22wqg9rfd1s01a5ylara37jw"; + + buildInputs = [ file curl pkgconfig python openssl cmake zlib ]; + + configurePhase = '' + ./configure --enable-optimize --prefix=$out --local-cargo=${cargo}/bin/cargo + ''; + + buildPhase = "make"; + + # Disable check phase as there are lots of failures (some probably due to + # trying to access the network). + doCheck = false; + + installPhase = '' + make install + ${postInstall} + ''; +} diff --git a/pkgs/development/tools/build-managers/cargo/snapshot.nix b/pkgs/development/tools/build-managers/cargo/snapshot.nix index 64aeb0736c17..a76fb4601e8b 100644 --- a/pkgs/development/tools/build-managers/cargo/snapshot.nix +++ b/pkgs/development/tools/build-managers/cargo/snapshot.nix @@ -19,11 +19,8 @@ let snapshotHash = if stdenv.system == "i686-linux" snapshotName = "cargo-nightly-${platform}.tar.gz"; in - stdenv.mkDerivation { - inherit name; - inherit version; - inherit meta; + inherit name version meta; src = fetchurl { url = "https://static-rust-lang-org.s3.amazonaws.com/cargo-dist/${snapshotDate}/${snapshotName}"; @@ -35,10 +32,8 @@ stdenv.mkDerivation { installPhase = '' mkdir -p "$out" ./install.sh "--prefix=$out" - rm "$out/lib/rustlib/components" \ - "$out/lib/rustlib/install.log" \ - "$out/lib/rustlib/rust-installer-version" \ - "$out/lib/rustlib/uninstall.sh" + + ${postInstall} '' + (if stdenv.isLinux then '' patchelf --interpreter "${stdenv.glibc}/lib/${stdenv.cc.dynamicLinker}" \ --set-rpath "${stdenv.cc.cc}/lib/:${stdenv.cc.cc}/lib64/:${zlib}/lib" \ diff --git a/pkgs/development/tools/build-managers/cmake/2.8.nix b/pkgs/development/tools/build-managers/cmake/2.8.nix new file mode 100644 index 000000000000..60a941a66375 --- /dev/null +++ b/pkgs/development/tools/build-managers/cmake/2.8.nix @@ -0,0 +1,73 @@ +{ stdenv, fetchurl, fetchpatch, replace, curl, expat, zlib, bzip2, libarchive +, useNcurses ? false, ncurses, useQt4 ? false, qt4, wantPS ? false, ps ? null +}: + +with stdenv.lib; + +assert wantPS -> (ps != null); + +let + os = stdenv.lib.optionalString; + majorVersion = "2.8"; + minorVersion = "12.2"; + version = "${majorVersion}.${minorVersion}"; +in + +stdenv.mkDerivation rec { + name = "cmake-${os useNcurses "cursesUI-"}${os useQt4 "qt4UI-"}${version}"; + + inherit majorVersion; + + src = fetchurl { + url = "${meta.homepage}files/v${majorVersion}/cmake-${version}.tar.gz"; + sha256 = "0phf295a9cby0v7zqdswr238v5aiy3rb2fs6dz39zjxbmzlp8rcc"; + }; + + enableParallelBuilding = true; + + patches = + [(fetchpatch { # see http://www.cmake.org/Bug/view.php?id=13959 + name = "FindFreetype-2.5.patch"; + url = "http://www.cmake.org/Bug/file_download.php?file_id=4660&type=bug"; + sha256 = "136z63ff83hnwd247cq4m8m8164pklzyl5i2csf5h6wd8p01pdkj"; + })] ++ + # Don't search in non-Nix locations such as /usr, but do search in + # Nixpkgs' Glibc. + optional (stdenv ? glibc) ./search-path.patch ++ + optional (stdenv ? cross) (fetchurl { + name = "fix-darwin-cross-compile.patch"; + url = "http://public.kitware.com/Bug/file_download.php?" + + "file_id=4981&type=bug"; + sha256 = "16acmdr27adma7gs9rs0dxdiqppm15vl3vv3agy7y8s94wyh4ybv"; + }); + + buildInputs = [ curl expat zlib bzip2 libarchive ] + ++ optional useNcurses ncurses + ++ optional useQt4 qt4; + + propagatedBuildInputs = optional wantPS ps; + + CMAKE_PREFIX_PATH = stdenv.lib.concatStringsSep ":" buildInputs; + + configureFlags = + "--docdir=/share/doc/${name} --mandir=/share/man --system-libs" + + stdenv.lib.optionalString useQt4 " --qt-gui"; + + setupHook = ./setup-hook.sh; + + dontUseCmakeConfigure = true; + + preConfigure = optionalString (stdenv ? glibc) + '' + source $setupHook + fixCmakeFiles . + substituteInPlace Modules/Platform/UnixPaths.cmake --subst-var-by glibc ${stdenv.glibc} + ''; + + meta = { + homepage = http://www.cmake.org/; + description = "Cross-Platform Makefile Generator"; + platforms = if useQt4 then qt4.meta.platforms else stdenv.lib.platforms.all; + maintainers = with stdenv.lib.maintainers; [ urkud mornfall ]; + }; +} diff --git a/pkgs/development/tools/build-managers/cmake/default.nix b/pkgs/development/tools/build-managers/cmake/default.nix index 72ecb10b0990..45bdeece45e7 100644 --- a/pkgs/development/tools/build-managers/cmake/default.nix +++ b/pkgs/development/tools/build-managers/cmake/default.nix @@ -55,7 +55,9 @@ stdenv.mkDerivation rec { "--system-libs" ] ++ optional (jsoncpp == null) "--no-system-jsoncpp" - ++ optional useQt4 "--qt-gui"; + ++ optional useQt4 "--qt-gui" + ++ ["--"] + ++ optional (!useNcurses) "-DBUILD_CursesDialog=OFF"; setupHook = ./setup-hook.sh; diff --git a/pkgs/development/tools/build-managers/cmake/search-path.patch b/pkgs/development/tools/build-managers/cmake/search-path.patch new file mode 100644 index 000000000000..31c85d6f5220 --- /dev/null +++ b/pkgs/development/tools/build-managers/cmake/search-path.patch @@ -0,0 +1,97 @@ +diff --git a/Modules/Platform/Linux.cmake b/Modules/Platform/Linux.cmake +index fe8e003..378512c 100644 +--- a/Modules/Platform/Linux.cmake ++++ b/Modules/Platform/Linux.cmake +@@ -36,13 +36,13 @@ else() + # checking the platform every time. This option is advanced enough + # that only package maintainers should need to adjust it. They are + # capable of providing a setting on the command line. +- if(EXISTS "/etc/debian_version") +- set(CMAKE_INSTALL_SO_NO_EXE 1 CACHE INTERNAL +- "Install .so files without execute permission.") +- else() ++ # if(EXISTS "/etc/debian_version") ++ # set(CMAKE_INSTALL_SO_NO_EXE 1 CACHE INTERNAL ++ # "Install .so files without execute permission.") ++ # else() + set(CMAKE_INSTALL_SO_NO_EXE 0 CACHE INTERNAL + "Install .so files without execute permission.") +- endif() ++ # endif() + endif() + + # Match multiarch library directory names. +@@ -52,6 +52,6 @@ include(Platform/UnixPaths) + + # Debian has lib64 paths only for compatibility so they should not be + # searched. +-if(EXISTS "/etc/debian_version") +- set_property(GLOBAL PROPERTY FIND_LIBRARY_USE_LIB64_PATHS FALSE) +-endif() ++# if(EXISTS "/etc/debian_version") ++# set_property(GLOBAL PROPERTY FIND_LIBRARY_USE_LIB64_PATHS FALSE) ++#endif() +diff --git a/Modules/Platform/UnixPaths.cmake b/Modules/Platform/UnixPaths.cmake +index ccb2663..39834e6 100644 +--- a/Modules/Platform/UnixPaths.cmake ++++ b/Modules/Platform/UnixPaths.cmake +@@ -33,55 +33,18 @@ get_filename_component(_CMAKE_INSTALL_DIR "${_CMAKE_INSTALL_DIR}" PATH) + # search types. + list(APPEND CMAKE_SYSTEM_PREFIX_PATH + # Standard +- /usr/local /usr / +- +- # CMake install location +- "${_CMAKE_INSTALL_DIR}" +- +- # Project install destination. +- "${CMAKE_INSTALL_PREFIX}" +- ) +- +-# List common include file locations not under the common prefixes. +-list(APPEND CMAKE_SYSTEM_INCLUDE_PATH +- # Windows API on Cygwin +- /usr/include/w32api +- +- # X11 +- /usr/X11R6/include /usr/include/X11 +- +- # Other +- /usr/pkg/include +- /opt/csw/include /opt/include +- /usr/openwin/include +- ) +- +-list(APPEND CMAKE_SYSTEM_LIBRARY_PATH +- # Windows API on Cygwin +- /usr/lib/w32api +- +- # X11 +- /usr/X11R6/lib /usr/lib/X11 +- +- # Other +- /usr/pkg/lib +- /opt/csw/lib /opt/lib +- /usr/openwin/lib +- ) +- +-list(APPEND CMAKE_SYSTEM_PROGRAM_PATH +- /usr/pkg/bin ++ "@glibc@" + ) + + list(APPEND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES +- /lib /usr/lib /usr/lib32 /usr/lib64 ++ "@glibc@/lib" + ) + + list(APPEND CMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES +- /usr/include ++ "@glibc@/include" + ) + list(APPEND CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES +- /usr/include ++ "@glibc@/include" + ) + + # Enable use of lib64 search path variants by default. diff --git a/pkgs/development/tools/documentation/gtk-doc/default.nix b/pkgs/development/tools/documentation/gtk-doc/default.nix index e1f7f19dd56f..58c8214bd462 100644 --- a/pkgs/development/tools/documentation/gtk-doc/default.nix +++ b/pkgs/development/tools/documentation/gtk-doc/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "gtk-doc-${version}"; - version = "1.21"; + version = "1.23"; src = fetchurl { url = "mirror://gnome/sources/gtk-doc/${version}/${name}.tar.xz"; - sha256 = "0gpfh25qxsic7n25pfl74mjp38hdm3pr4islhlaxv3p05q0lv4sx"; + sha256 = "1i0q0zaj3f2xg478nxyfhaivkhi6mj0dn0s6qzshzhb625qj6p0b"; }; # maybe there is a better way to pass the needed dtd and xsl files diff --git a/pkgs/development/tools/haskell/cabal2nix/default.nix b/pkgs/development/tools/haskell/cabal2nix/default.nix index d933b97d1c11..73b115083745 100644 --- a/pkgs/development/tools/haskell/cabal2nix/default.nix +++ b/pkgs/development/tools/haskell/cabal2nix/default.nix @@ -7,11 +7,11 @@ mkDerivation rec { pname = "cabal2nix"; - version = "20150505"; + version = "20150518"; src = fetchgit { url = "http://github.com/NixOS/cabal2nix.git"; - rev = "db53ac3a644eebda581c9f036ccd55a19ff3c629"; - sha256 = "1bimja9qsq865dmpjpy5wxxz43rc8wk9yva58l7hydmm87a4ch8y"; + rev = "bf850da9044b16efb9ef06a05c645fa981513444"; + sha256 = "0kwiwakff1iaglf7mfvz096smqi73pgcfd975dvp5w1cd8yazd73"; deepClone = true; }; isExecutable = true; diff --git a/pkgs/development/tools/java/cfr/default.nix b/pkgs/development/tools/java/cfr/default.nix index 6025a59f44cb..a7be59a1fea1 100644 --- a/pkgs/development/tools/java/cfr/default.nix +++ b/pkgs/development/tools/java/cfr/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, jre }: -let version = "0_100"; in +let version = "0_101"; in stdenv.mkDerivation rec { name = "cfr-${version}"; src = fetchurl { - sha256 = "0q5kh5qdksykz339p55jz0q5cjqvxdzv3a7r4kkijgbfjm1ldr5f"; + sha256 = "0zwl3whypdm2qrw3hwaqjnifkb4wcdn8fx9scrjkli54bhr6dqch"; url = "http://www.benf.org/other/cfr/cfr_${version}.jar"; }; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { ''; homepage = http://www.benf.org/other/cfr/; license = with licenses; mit; - platforms = with platforms; linux; + platforms = with platforms; all; maintainers = with maintainers; [ nckx ]; }; diff --git a/pkgs/development/tools/misc/astyle/default.nix b/pkgs/development/tools/misc/astyle/default.nix index 770162c237e4..3951212495d4 100644 --- a/pkgs/development/tools/misc/astyle/default.nix +++ b/pkgs/development/tools/misc/astyle/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation { sha256 = "1b0f4wm1qmgcswmixv9mwbp86hbdqxk754hml8cjv5vajvqwdpzv"; }; - sourceRoot = if (stdenv.cc.cc.isClang or false) + sourceRoot = if stdenv.cc.isClang then "astyle/build/clang" else "astyle/build/gcc"; diff --git a/pkgs/development/tools/misc/ccache/default.nix b/pkgs/development/tools/misc/ccache/default.nix index 7c0cfa51cd79..db02fef9f2a3 100644 --- a/pkgs/development/tools/misc/ccache/default.nix +++ b/pkgs/development/tools/misc/ccache/default.nix @@ -1,15 +1,23 @@ -{stdenv, fetchurl, runCommand, gcc, zlib}: +{ stdenv, fetchurl, runCommand, gcc, perl, zlib }: let + # TODO: find out if there's harm in just using 'rec' instead. + name = "ccache-${version}"; + version = "3.2.2"; + sha256 = "1jm0qb3h5sypllaiyj81zp6m009vm50hzjnx994ril94kxlrj3ag"; + doCheck = true; + ccache = stdenv.mkDerivation { - name = "ccache-3.2.1"; + inherit name doCheck; src = fetchurl { - url = mirror://samba/ccache/ccache-3.2.1.tar.xz; - sha256 = "17dxb0adha2bqzb2r8rcc3kl9mk7y6vrvlh181liivrc3m7g6al7"; + inherit sha256; + url = "mirror://samba/ccache/${name}.tar.xz"; }; - buildInputs = [ zlib ]; + # The test dependency on perl should be gone in the next release: + buildInputs = [ zlib ] + ++ stdenv.lib.optionals doCheck [ perl ]; passthru = { # A derivation that provides gcc and g++ commands, but that @@ -37,8 +45,10 @@ stdenv.mkDerivation { }; meta = with stdenv.lib; { + inherit version; description = "Compiler cache for fast recompilation of C/C++ code"; homepage = http://ccache.samba.org/; + downloadPage = https://ccache.samba.org/download.html; license = with licenses; gpl3Plus; maintainers = with maintainers; [ nckx ]; }; diff --git a/pkgs/development/tools/misc/ctags/default.nix b/pkgs/development/tools/misc/ctags/default.nix index bf13a5daa666..26b186c11eab 100644 --- a/pkgs/development/tools/misc/ctags/default.nix +++ b/pkgs/development/tools/misc/ctags/default.nix @@ -1,27 +1,22 @@ -{ stdenv, fetchsvn, automake, autoconf}: +{ stdenv, fetchsvn, autoreconfHook }: stdenv.mkDerivation rec { name = "ctags-${revision}"; - revision = "804"; + revision = "816"; src = fetchsvn { - url = "http://ctags.svn.sourceforge.net/svnroot/ctags/trunk"; + url = "https://ctags.svn.sourceforge.net/svnroot/ctags/trunk"; rev = revision; - sha256 = "16gln1mah2jqp32ki1z0187dwkbjx1xcnmyiardcq6c9w3p4qwcr"; + sha256 = "0jmbkrmscbl64j71qffcc39x005jrmphx8kirs1g2ws44wil39hf"; }; - buildInputs = [ automake autoconf ]; - - preConfigure = "autoreconf -i"; + nativeBuildInputs = [ autoreconfHook ]; # don't use $T(E)MP which is set to the build directory - configureFlags="--enable-tmpdir=/tmp"; + configureFlags= [ "--enable-tmpdir=/tmp" ]; - meta = { - homepage = "http://ctags.sourceforge.net/"; + meta = with stdenv.lib; { description = "A tool for fast source code browsing (exuberant ctags)"; - license = stdenv.lib.licenses.gpl2Plus; - longDescription = '' Ctags generates an index (or tag) file of language objects found in source files that allows these items to be quickly and easily @@ -30,9 +25,10 @@ stdenv.mkDerivation rec { alternatively, the index entry created for that object). Many programming languages are supported. ''; - - platforms = stdenv.lib.platforms.unix; - maintainers = [ stdenv.lib.maintainers.simons ]; + homepage = http://ctags.sourceforge.net/; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ simons ]; + platforms = platforms.unix; }; } diff --git a/pkgs/development/tools/misc/d-feet/default.nix b/pkgs/development/tools/misc/d-feet/default.nix index 5afe5525d0e2..df26db519dcd 100644 --- a/pkgs/development/tools/misc/d-feet/default.nix +++ b/pkgs/development/tools/misc/d-feet/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig libxml2 itstool intltool glib gtk3 pep8 python - gnome3.gnome_icon_theme gnome3.gnome_icon_theme_symbolic + gnome3.defaultIconTheme makeWrapper pygobject3 libwnck3 ]; diff --git a/pkgs/development/tools/misc/global/default.nix b/pkgs/development/tools/misc/global/default.nix index 7b61d96e3e7e..0fa547097885 100644 --- a/pkgs/development/tools/misc/global/default.nix +++ b/pkgs/development/tools/misc/global/default.nix @@ -1,5 +1,6 @@ -{ fetchurl, stdenv, libtool, ncurses, ctags, sqlite -, pythonPackages, makeWrapper }: +{ fetchurl, stdenv, libtool, makeWrapper +, coreutils, ctags, ncurses, pythonPackages, sqlite, pkgconfig +}: stdenv.mkDerivation rec { name = "global-6.4"; @@ -9,16 +10,20 @@ stdenv.mkDerivation rec { sha256 = "13i4zwx6gaibc4j79wd0hgxysw8ibxz9c018zxhydnxlyadzcnri"; }; - buildInputs = [ libtool ncurses makeWrapper ]; + nativeBuildInputs = [ libtool makeWrapper ]; + + buildInputs = [ ncurses ]; + 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-sqlite3=${sqlite} '' - + ''--with-exuberant-ctags=${ctags}/bin/ctags''; + configureFlags = [ + "--with-ltdl-include=${libtool}/include" + "--with-ltdl-lib=${libtool}/lib" + "--with-ncurses=${ncurses}" + "--with-sqlite3=${sqlite}" + "--with-exuberant-ctags=${ctags}/bin/ctags" + "--with-posix-sort=${coreutils}/bin/sort" + ]; doCheck = true; @@ -34,7 +39,6 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Source code tag system"; - longDescription = '' GNU GLOBAL is a source code tagging system that works the same way across diverse environments (Emacs, vi, less, Bash, web browser, etc). @@ -45,11 +49,8 @@ stdenv.mkDerivation rec { independence of any editor. It runs on a UNIX (POSIX) compatible operating system like GNU and BSD. ''; - - license = licenses.gpl3Plus; - homepage = http://www.gnu.org/software/global/; - + license = licenses.gpl3Plus; maintainers = with maintainers; [ pSub ]; platforms = platforms.unix; }; diff --git a/pkgs/development/tools/misc/intel-gpu-tools/compile-fix.patch b/pkgs/development/tools/misc/intel-gpu-tools/compile-fix.patch new file mode 100644 index 000000000000..8285867d8eda --- /dev/null +++ b/pkgs/development/tools/misc/intel-gpu-tools/compile-fix.patch @@ -0,0 +1,37 @@ +From 233808a58db1f62d773b03f9dad599924170aca6 Mon Sep 17 00:00:00 2001 +From: Chris Wilson <chris@chris-wilson.co.uk> +Date: Wed, 18 Mar 2015 08:36:37 +0000 +Subject: lib/batch: Trivial compile fix for 32-bit builds + +intel_batchbuffer.c: In function 'fill_object': +intel_batchbuffer.c:589:20: error: cast from pointer to integer of different size [-Werror=pointer-to-int-cast] + obj->relocs_ptr = (uint64_t)relocs; + ^ +intel_batchbuffer.c: In function 'exec_blit': +intel_batchbuffer.c:598:21: error: cast from pointer to integer of different size [-Werror=pointer-to-int-cast] + exec.buffers_ptr = (uint64_t)objs; + +Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> + +diff --git a/lib/intel_batchbuffer.c b/lib/intel_batchbuffer.c +index 666c323..c1c27a6 100644 +--- a/lib/intel_batchbuffer.c ++++ b/lib/intel_batchbuffer.c +@@ -548,7 +548,7 @@ fill_object(struct drm_i915_gem_exec_object2 *obj, uint32_t gem_handle, + memset(obj, 0, sizeof(*obj)); + obj->handle = gem_handle; + obj->relocation_count = count; +- obj->relocs_ptr = (uint64_t)relocs; ++ obj->relocs_ptr = (uintptr_t)relocs; + } + + static void exec_blit(int fd, +@@ -557,7 +557,7 @@ static void exec_blit(int fd, + { + struct drm_i915_gem_execbuffer2 exec; + +- exec.buffers_ptr = (uint64_t)objs; ++ exec.buffers_ptr = (uintptr_t)objs; + exec.buffer_count = count; + exec.batch_start_offset = 0; + exec.batch_len = batch_len * 4; diff --git a/pkgs/development/tools/misc/intel-gpu-tools/default.nix b/pkgs/development/tools/misc/intel-gpu-tools/default.nix index 72a364e682a3..997f1bfc0120 100644 --- a/pkgs/development/tools/misc/intel-gpu-tools/default.nix +++ b/pkgs/development/tools/misc/intel-gpu-tools/default.nix @@ -10,6 +10,8 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig libdrm libpciaccess cairo dri2proto udev libX11 libXext libXv libXrandr glib bison ]; + patches = [ ./compile-fix.patch ]; + meta = with stdenv.lib; { homepage = https://01.org/linuxgraphics/; description = "Tools for development and testing of the Intel DRM driver"; diff --git a/pkgs/development/tools/misc/ltrace/default.nix b/pkgs/development/tools/misc/ltrace/default.nix index 1d20d8eef456..c8f888f6dff7 100644 --- a/pkgs/development/tools/misc/ltrace/default.nix +++ b/pkgs/development/tools/misc/ltrace/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "ltrace-0.7.3"; src = fetchurl { - url = ftp://ftp.debian.org/debian/pool/main/l/ltrace/ltrace_0.7.3.orig.tar.bz2; + url = mirror://debian/pool/main/l/ltrace/ltrace_0.7.3.orig.tar.bz2; sha256 = "00wmbdghqbz6x95m1mcdd3wd46l6hgcr4wggdp049dbifh3qqvqf"; }; diff --git a/pkgs/development/tools/misc/rman/default.nix b/pkgs/development/tools/misc/rman/default.nix new file mode 100644 index 000000000000..1d2a3cda2b6b --- /dev/null +++ b/pkgs/development/tools/misc/rman/default.nix @@ -0,0 +1,19 @@ +{stdenv, fetchurl}: + +stdenv.mkDerivation { + name = "rman-3.2"; + src = fetchurl { + url = mirror://sourceforge/polyglotman/3.2/rman-3.2.tar.gz; + sha256 = "0prdld6nbkdlkcgc2r1zp13h2fh8r0mlwxx423dnc695ddlk18b8"; + }; + makeFlags = "BINDIR=$(out)/bin MANDIR=$(out)/share/man"; + preInstall = '' + mkdir -p $out/bin + mkdir -p $out/share/man + ''; + + meta = { + description = "Parse formatted man pages and man page source from most flavors of UNIX and converts them to HTML, ASCII, TkMan, DocBook, and other formats"; + license = "artistic"; + }; +} diff --git a/pkgs/development/tools/misc/uncrustify/default.nix b/pkgs/development/tools/misc/uncrustify/default.nix index f4add9a4b9ea..70aedbb48d23 100644 --- a/pkgs/development/tools/misc/uncrustify/default.nix +++ b/pkgs/development/tools/misc/uncrustify/default.nix @@ -1,11 +1,12 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "uncrustify"; + name = "${product}-${version}"; + product = "uncrustify"; version = "0.61"; src = fetchurl { - url = "mirror://sourceforge/uncrustify/${name}-${version}.tar.gz"; + url = "mirror://sourceforge/uncrustify/${product}-${version}.tar.gz"; sha256 = "1df0e5a2716e256f0a4993db12f23d10195b3030326fdf2e07f8e6421e172df9"; }; diff --git a/pkgs/development/tools/ocaml/opam/default.nix b/pkgs/development/tools/ocaml/opam/default.nix index b6dce1328688..283bd581a130 100644 --- a/pkgs/development/tools/ocaml/opam/default.nix +++ b/pkgs/development/tools/ocaml/opam/default.nix @@ -37,13 +37,13 @@ let sha256 = "3fd4dca045d82332da847e65e981d8b504883571d299a3f7e71447d46bc65f73"; }; opam = fetchurl { - url = "https://github.com/ocaml/opam/archive/1.2.1.zip"; - sha256 = "1mvsy89l5g9nvwmmls5jf46anh6gk8dk8a1dn42rmnihnb0zjcs4"; + url = "https://github.com/ocaml/opam/archive/1.2.2.zip"; + sha256 = "1fxd5axlh9f3jb47y9paa9ld78qwcyp7pv3m60k401ym1dps32jk"; }; }; in stdenv.mkDerivation rec { name = "opam-${version}"; - version = "1.2.1"; + version = "1.2.2"; buildInputs = [ unzip curl ncurses ocaml ]; diff --git a/pkgs/development/tools/rust/racer/default.nix b/pkgs/development/tools/rust/racer/default.nix index 4ef9cc6d285f..0b614f4edc61 100644 --- a/pkgs/development/tools/rust/racer/default.nix +++ b/pkgs/development/tools/rust/racer/default.nix @@ -1,18 +1,22 @@ -{stdenv, fetchgit, rustc, cargo, makeWrapper }: +{stdenv, fetchgit, rustPlatform, makeWrapper }: -stdenv.mkDerivation rec { +with rustPlatform; + +buildRustPackage rec { #TODO add emacs support - name = "racer-git-2015-04-12"; + name = "racer-git-2015-05-18"; src = fetchgit { url = https://github.com/phildawes/racer; - rev = "5437e2074d87dfaab75a0f1bd2597bed61c0bbf1"; - sha256 = "0a768gvjry86l0xa5q0122iyq7zn2h9adfniglsgrbs4fan49xyn"; + rev = "c2d31ed49baa11f06ffc0c7bc8f95dd00037d035"; + sha256 = "0g420cbqpknhl61a4mpk3bbia8agf657d9vzzcqr338lmni80qz7"; }; - buildInputs = [ rustc cargo makeWrapper ]; + depsSha256 = "0s951apqcr96lvc1jamk6qw3631gwnlnfgcx55vlznfm7shnmywn"; + + buildInputs = [ makeWrapper ]; - buildPhase = '' - CARGO_HOME="$NIX_BUILD_TOP/.cargo" cargo build --release + preCheck = '' + export RUST_SRC_PATH="${rustc.src}/src" ''; installPhase = '' diff --git a/pkgs/development/tools/selenium/chromedriver/default.nix b/pkgs/development/tools/selenium/chromedriver/default.nix index f2d39938a483..8d9db34446d6 100644 --- a/pkgs/development/tools/selenium/chromedriver/default.nix +++ b/pkgs/development/tools/selenium/chromedriver/default.nix @@ -7,10 +7,12 @@ assert stdenv.system == "x86_64-linux"; stdenv.mkDerivation rec { - name = "chromedriver_linux64"; + product = "chromedriver_linux64"; + name = "${product}-2.14"; + version = "2.14"; src = fetchurl { - url = "http://chromedriver.storage.googleapis.com/2.14/${name}.zip"; + url = "http://chromedriver.storage.googleapis.com/${version}/${product}.zip"; sha256 = "18kpky1v5pc3fv6kv9i2mf4wr4qicmfhf27h9zqy18gh16rlwrin"; }; diff --git a/pkgs/development/tools/thrust/default.nix b/pkgs/development/tools/thrust/default.nix new file mode 100644 index 000000000000..7f50b816cc19 --- /dev/null +++ b/pkgs/development/tools/thrust/default.nix @@ -0,0 +1,47 @@ +{ stdenv, fetchurl, buildEnv, makeWrapper, glib, alsaLib , dbus, gtk, atk +, pango, freetype, fontconfig, gdk_pixbuf , cairo, cups, expat, nspr, gconf, nss +, xlibs, libcap, unzip +}: + +let + thrustEnv = buildEnv { + name = "env-thrust"; + paths = [ + stdenv.cc.cc glib dbus gtk atk pango freetype fontconfig gdk_pixbuf + cairo cups expat alsaLib nspr gconf nss xlibs.libXrender xlibs.libX11 + xlibs.libXext xlibs.libXdamage xlibs.libXtst xlibs.libXcomposite + xlibs.libXi xlibs.libXfixes xlibs.libXrandr xlibs.libXcursor libcap + ]; + }; +in stdenv.mkDerivation rec { + name = "thrust-${version}"; + version = "0.7.6"; + + src = fetchurl { + url = "https://github.com/breach/thrust/releases/download/v${version}/thrust-v${version}-linux-x64.zip"; + sha256 = "07rrnlj0gk500pvar4b1wdqm05p4n9yjwn911x93bd2qwc8r5ymc"; + }; + + buildInputs = [ thrustEnv makeWrapper unzip ]; + + phases = [ "installPhase" "fixupPhase" ]; + + installPhase = '' + mkdir -p $out/bin + mkdir -p $out/libexec/thrust + unzip -d $out/libexec/thrust/ $src + patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + $out/libexec/thrust/thrust_shell + wrapProgram $out/libexec/thrust/thrust_shell \ + --prefix "LD_LIBRARY_PATH" : "${thrustEnv}/lib:${thrustEnv}/lib64" + ln -s $out/libexec/thrust/thrust_shell $out/bin + ''; + + meta = with stdenv.lib; { + description = "Chromium-based cross-platform / cross-language application framework"; + homepage = https://github.com/breach/thrust; + license = [ licenses.mit ]; + maintainers = [ maintainers.osener ]; + platforms = [ "x86_64-linux" ]; + }; +} |