diff options
Diffstat (limited to 'pkgs/development/tools')
71 files changed, 738 insertions, 568 deletions
diff --git a/pkgs/development/tools/activator/default.nix b/pkgs/development/tools/activator/default.nix index a992a90623e0..394c60e0fdd7 100644 --- a/pkgs/development/tools/activator/default.nix +++ b/pkgs/development/tools/activator/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "activator"; - version = "1.3.10"; + version = "1.3.12"; src = fetchurl { url = "http://downloads.typesafe.com/typesafe-${pname}/${version}/typesafe-${name}.zip"; - sha256 = "43693f041c8422ee06a2a90a805fd7b0e258dc85da31f0a4dca340dfd119b4ce"; + sha256 = "0c7mxznfgvywnyvr8l5jh4cp67ila5cdq14p6jwrkh6lwif3ah1p"; }; buildInputs = [ unzip jre ]; diff --git a/pkgs/development/tools/ammonite/default.nix b/pkgs/development/tools/ammonite/default.nix new file mode 100644 index 000000000000..7cb4afbc12e2 --- /dev/null +++ b/pkgs/development/tools/ammonite/default.nix @@ -0,0 +1,37 @@ +{ stdenv, lib, fetchurl, makeWrapper, jre }: + +stdenv.mkDerivation rec { + name = "ammonite-repl-${version}"; + version = "0.7.8"; + + src = fetchurl { + url = "https://github.com/lihaoyi/Ammonite/releases/download/${version}/${version}"; + sha256 = "0s34p168h5c7ij61rbmaygb95r654yj4j0wh6qya53k4ywl32vkp"; + }; + + propagatedBuildInputs = [ jre ] ; + buildInputs = [ makeWrapper ] ; + + phases = "installPhase"; + + installPhase = '' + mkdir -p $out/bin + cp ${src} $out/bin/amm + chmod +x $out/bin/amm + wrapProgram $out/bin/amm --prefix PATH ":" ${jre}/bin ; + ''; + + meta = { + description = "Improved Scala REPL"; + longDescription = '' + The Ammonite-REPL is an improved Scala REPL, re-implemented from first principles. + It is much more featureful than the default REPL and comes + with a lot of ergonomic improvements and configurability + that may be familiar to people coming from IDEs or other REPLs such as IPython or Zsh. + ''; + homepage = http://www.lihaoyi.com/Ammonite/; + license = lib.licenses.mit; + platforms = lib.platforms.all; + maintainer = [ lib.maintainers.nequissimus ]; + }; +} diff --git a/pkgs/development/tools/analysis/cppcheck/default.nix b/pkgs/development/tools/analysis/cppcheck/default.nix index 31d62bdae19b..e25cb696a656 100644 --- a/pkgs/development/tools/analysis/cppcheck/default.nix +++ b/pkgs/development/tools/analysis/cppcheck/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "cppcheck"; - version = "1.74"; + version = "1.76.1"; name = "${pname}-${version}"; src = fetchurl { url = "mirror://sourceforge/${pname}/${name}.tar.bz2"; - sha256 = "0m62byiprabm1m3mc4r2w54p7qyhgi8msipnpm66ychr8rz2yny0"; + sha256 = "1l46bmzm5syfr9m5l0bqkj8lcyrynhw8gjf95s4fwhp2b7f0zisv"; }; nativeBuildInputs = [ libxslt docbook_xsl docbook_xml_dtd_45 ]; @@ -16,6 +16,8 @@ stdenv.mkDerivation rec { outputs = [ "out" "man" ]; + enableParallelBuilding = true; + postInstall = '' make DB2MAN=${docbook_xsl}/xml/xsl/docbook/manpages/docbook.xsl man mkdir -p $man/share/man/man1 diff --git a/pkgs/development/tools/analysis/flow/default.nix b/pkgs/development/tools/analysis/flow/default.nix index 723c6eb26bb2..213222577d3f 100644 --- a/pkgs/development/tools/analysis/flow/default.nix +++ b/pkgs/development/tools/analysis/flow/default.nix @@ -3,14 +3,14 @@ with lib; stdenv.mkDerivation rec { - version = "0.32.0"; + version = "0.34.0"; name = "flow-${version}"; src = fetchFromGitHub { owner = "facebook"; repo = "flow"; rev = "v${version}"; - sha256 = "17v2qb9xsjv4lj62x553knnhb7z43y2frzvs0q1hvamw8wyp086h"; + sha256 = "0fydrxp1aq4nmjkqya3j4z4zjbjvqx575qdgjzvkxq71akg56hqv"; }; installPhase = '' diff --git a/pkgs/development/tools/analysis/radare2/default.nix b/pkgs/development/tools/analysis/radare2/default.nix index 4b57e15d0884..1c1dace284f1 100644 --- a/pkgs/development/tools/analysis/radare2/default.nix +++ b/pkgs/development/tools/analysis/radare2/default.nix @@ -9,16 +9,16 @@ assert useX11 -> (gtk2 != null && vte != null && gtkdialog != null); assert rubyBindings -> ruby != null; assert pythonBindings -> python != null; -let +let optional = stdenv.lib.optional; in stdenv.mkDerivation rec { - version = "0.9.7"; + version = "0.10.6"; name = "radare2-${version}"; src = fetchurl { url = "http://radare.org/get/${name}.tar.xz"; - sha256 = "01sdsnbvx1qzyradj03sg24rk2bi9x58m40r0aqj8skv92c87s7l"; + sha256 = "0icxd8zilygnggxc50lkk6jmcq8xl66rqxqhzqwpiprbn8k7b24f"; }; diff --git a/pkgs/development/tools/analysis/rr/default.nix b/pkgs/development/tools/analysis/rr/default.nix index 8cd38a152ecf..7606705edd85 100644 --- a/pkgs/development/tools/analysis/rr/default.nix +++ b/pkgs/development/tools/analysis/rr/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, libpfm, zlib, python, pkgconfig, pythonPackages, which, procps, gdb }: +{ stdenv, fetchFromGitHub, cmake, libpfm, zlib, pkgconfig, python2Packages, which, procps, gdb }: stdenv.mkDerivation rec { version = "4.3.0"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { patchShebangs . ''; - buildInputs = [ cmake libpfm zlib python pkgconfig pythonPackages.pexpect which procps gdb ]; + buildInputs = [ cmake libpfm zlib python2Packages.python pkgconfig python2Packages.pexpect which procps gdb ]; cmakeFlags = [ "-DCMAKE_C_FLAGS_RELEASE:STRING=" "-DCMAKE_CXX_FLAGS_RELEASE:STRING=" diff --git a/pkgs/development/tools/analysis/valgrind/default.nix b/pkgs/development/tools/analysis/valgrind/default.nix index 0e0e44183f6b..2ecb5eaa1329 100644 --- a/pkgs/development/tools/analysis/valgrind/default.nix +++ b/pkgs/development/tools/analysis/valgrind/default.nix @@ -1,30 +1,20 @@ { stdenv, fetchurl, fetchpatch, perl, gdb }: stdenv.mkDerivation rec { - name = "valgrind-3.11.0"; + name = "valgrind-3.12.0"; src = fetchurl { url = "http://valgrind.org/downloads/${name}.tar.bz2"; - sha256 = "0hiv871b9bk689mv42mkhp76za78l5773glszfkdbpf1m1qn4fbc"; + sha256 = "18bnrw9b1d55wi1wnl68n25achsp9w48n51n1xw4fwjjnaal7jk7"; }; - patches = - [ (fetchpatch { - name = "glibc-2.21.patch"; - url = "https://projects.archlinux.org/svntogit/packages.git/plain/trunk" - + "/valgrind-3.9.0-glibc-2.21.patch?h=packages/valgrind&id=41e87313b69"; - sha256 = "14sgsvjjalbcqpcayyv5cndc9hfm5bigkp684b6cr6virksmlk19"; - }) - ]; - - outputs = [ "out" "doc" ]; + outputs = [ "out" "dev" "man" "doc" ]; hardeningDisable = [ "stackprotector" ]; # Perl is needed for `cg_annotate'. # GDB is needed to provide a sane default for `--db-command'. - nativeBuildInputs = [ perl ]; - buildInputs = stdenv.lib.optional (!stdenv.isDarwin) gdb; + buildInputs = [ perl ] ++ stdenv.lib.optional (!stdenv.isDarwin) gdb; enableParallelBuilding = true; diff --git a/pkgs/development/tools/asn2quickder/default.nix b/pkgs/development/tools/asn2quickder/default.nix new file mode 100644 index 000000000000..69051714ab4c --- /dev/null +++ b/pkgs/development/tools/asn2quickder/default.nix @@ -0,0 +1,36 @@ +{ stdenv, fetchFromGitHub, pythonPackages, makeWrapper }: + +stdenv.mkDerivation rec { + pname = "asn2quickder"; + name = "${pname}-${version}"; + version = "0.7-RC1"; + + src = fetchFromGitHub { + sha256 = "0ynajhbml28m4ipbj5mscjcv6g1a7frvxfimxh813rhgl0w3sgq8"; + rev = "version-${version}"; + owner = "vanrein"; + repo = "${pname}"; + }; + + propagatedBuildInputs = with pythonPackages; [ pyparsing makeWrapper ]; + + patchPhase = with pythonPackages; '' + substituteInPlace Makefile \ + --replace '..' '..:$(DESTDIR)/${python.sitePackages}:${pythonPackages.pyparsing}/${python.sitePackages}' \ + ''; + + installPhase = '' + mkdir -p $out/${pythonPackages.python.sitePackages}/ + mkdir -p $out/bin $out/lib $out/sbin $out/man + make DESTDIR=$out PREFIX=/ all + make DESTDIR=$out PREFIX=/ install + ''; + + meta = with stdenv.lib; { + description = "An ASN.1 compiler with a backend for Quick DER"; + homepage = https://github.com/vanrein/asn2quickder; + license = licenses.bsd3; + platforms = platforms.linux; + maintainers = with maintainers; [ leenaars ]; + }; +} diff --git a/pkgs/development/tools/build-managers/bazel/default.nix b/pkgs/development/tools/build-managers/bazel/default.nix index 002d3bde201e..5d57c9b4579a 100644 --- a/pkgs/development/tools/build-managers/bazel/default.nix +++ b/pkgs/development/tools/build-managers/bazel/default.nix @@ -1,35 +1,70 @@ -{ stdenv, fetchFromGitHub, jdk, zip, zlib, protobuf3_0, pkgconfig, libarchive, unzip, which, makeWrapper }: -stdenv.mkDerivation rec { - version = "0.3.1"; - name = "bazel-${version}"; +{ stdenv, fetchFromGitHub, buildFHSUserEnv, writeScript, jdk, zip, unzip, + which, makeWrapper, binutils }: - src = fetchFromGitHub { - owner = "google"; - repo = "bazel"; - rev = version; - sha256 = "1cm8zjxf8y3ai6h9wndxvflfsijjqhg87fll9ar7ff0hbbbdf6l5"; +let + + version = "0.3.2"; + + meta = with stdenv.lib; { + homepage = http://github.com/bazelbuild/bazel/; + description = "Build tool that builds code quickly and reliably"; + license = licenses.asl20; + maintainers = [ maintainers.philandstuff ]; + platforms = platforms.linux; }; - buildInputs = [ pkgconfig protobuf3_0 zlib zip libarchive unzip which makeWrapper jdk ]; + bootstrapEnv = buildFHSUserEnv { + name = "bazel-bootstrap-env"; - buildPhase = '' - export LD_LIBRARY_PATH="${stdenv.lib.makeLibraryPath [ stdenv.cc.cc.lib ]}" + targetPkgs = pkgs: [ ]; - bash compile.sh - ''; + inherit meta; + }; - installPhase = '' - mkdir -p $out/bin $out/share - cp -R output $out/share/bazel - ln -s $out/share/bazel/bazel $out/bin/bazel - wrapProgram $out/bin/bazel --set JAVA_HOME "${jdk.home}" - ''; + bazelBinary = stdenv.mkDerivation rec { + name = "bazel-${version}"; - meta = { - homepage = http://github.com/google/bazel/; - description = "Build tool that builds code quickly and reliably"; - license = stdenv.lib.licenses.asl20; - maintainers = [ stdenv.lib.maintainers.philandstuff ]; - platforms = [ "x86_64-linux" ]; + src = fetchFromGitHub { + owner = "bazelbuild"; + repo = "bazel"; + rev = version; + sha256 = "085cjz0qhm4a12jmhkjd9w3ic4a67035j01q111h387iklvgn6xg"; + }; + patches = [ ./java_stub_template.patch ]; + + packagesNotFromEnv = [ + stdenv.cc stdenv.cc.cc.lib jdk which zip unzip binutils ]; + buildInputs = packagesNotFromEnv ++ [ bootstrapEnv makeWrapper ]; + + buildTimeBinPath = stdenv.lib.makeBinPath packagesNotFromEnv; + buildTimeLibPath = stdenv.lib.makeLibraryPath packagesNotFromEnv; + + runTimeBinPath = stdenv.lib.makeBinPath [ jdk stdenv.cc.cc ]; + runTimeLibPath = stdenv.lib.makeLibraryPath [ stdenv.cc.cc.lib ]; + + buildWrapper = writeScript "build-wrapper.sh" '' + #! ${stdenv.shell} -e + export PATH="${buildTimeBinPath}:$PATH" + export LD_LIBRARY_PATH="${buildTimeLibPath}:$LD_LIBRARY_PATH" + ./compile.sh + ''; + + buildPhase = '' + bazel-bootstrap-env ${buildWrapper} + ''; + + installPhase = '' + mkdir -p $out/bin + cp output/bazel $out/bin/ + wrapProgram $out/bin/bazel \ + --suffix PATH ":" "${runTimeBinPath}" \ + --suffix LD_LIBRARY_PATH ":" "${runTimeLibPath}" + ''; + + dontStrip = true; + dontPatchELF = true; + + inherit meta; }; -} + +in bazelBinary diff --git a/pkgs/development/tools/build-managers/bazel/java_stub_template.patch b/pkgs/development/tools/build-managers/bazel/java_stub_template.patch new file mode 100644 index 000000000000..4e456a78d800 --- /dev/null +++ b/pkgs/development/tools/build-managers/bazel/java_stub_template.patch @@ -0,0 +1,16 @@ +commit 5525326e3287243e0e7417de96bf7d58d04b4c8b +Author: Irene Knapp <ireneista@google.com> +Date: Sat Oct 8 19:36:12 2016 -0700 + + Change #!/bin/bash to #!/usr/bin/env bash. + +diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/java/java_stub_template.txt b/src/main/java/com/google/devtools/build/lib/bazel/rules/java/java_stub_template.txt +index f77051f..fbf367a 100644 +--- a/src/main/java/com/google/devtools/build/lib/bazel/rules/java/java_stub_template.txt ++++ b/src/main/java/com/google/devtools/build/lib/bazel/rules/java/java_stub_template.txt +@@ -1,4 +1,4 @@ +-#!/bin/bash --posix ++#!/usr/bin/env bash + # Copyright 2014 The Bazel Authors. All rights reserved. + # + # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/pkgs/development/tools/build-managers/buildbot/default.nix b/pkgs/development/tools/build-managers/buildbot/default.nix index 4431105d18f8..d16b83a2831c 100644 --- a/pkgs/development/tools/build-managers/buildbot/default.nix +++ b/pkgs/development/tools/build-managers/buildbot/default.nix @@ -1,16 +1,12 @@ -{ stdenv -, pythonPackages -, fetchurl -, plugins ? [] -}: +{ stdenv, pythonPackages, fetchurl, coreutils, plugins ? [] }: pythonPackages.buildPythonApplication (rec { name = "${pname}-${version}"; pname = "buildbot"; - version = "0.9.0rc3"; + version = "0.9.0rc4"; src = fetchurl { url = "mirror://pypi/b/${pname}/${name}.tar.gz"; - sha256 = "18238n9l0pfivb23csy5lnkx91fcm4jgmhxn03f2nfnp00rlppzb"; + sha256 = "16bnrr5qkfpnby9sw9azcagnw0ybi7d8bpdlga2a4c61jg2d5dnc"; }; buildInputs = with pythonPackages; [ @@ -61,16 +57,17 @@ pythonPackages.buildPythonApplication (rec { preInstall = '' # writes out a file that can't be read properly sed -i.bak -e '69,84d' buildbot/test/unit/test_www_config.py + + # re-hardcode path to tail + sed -i.bak 's|/usr/bin/tail|${coreutils}/bin/tail|' buildbot/scripts/logwatcher.py ''; postFixup = '' - buildPythonPath "$out" - patchPythonScript "$out/bin/buildbot" mv -v $out/bin/buildbot $out/bin/.wrapped-buildbot - echo "#!/bin/bash" > $out/bin/buildbot - echo "export PYTHONPATH=$out/lib/python2.7/site-packages:$PYTHONPATH" >> $out/bin/buildbot + echo "#!/bin/sh" > $out/bin/buildbot + echo "export PYTHONPATH=$PYTHONPATH" >> $out/bin/buildbot echo "exec $out/bin/.wrapped-buildbot \"\$@\"" >> $out/bin/buildbot - chmod -c 755 $out/bin/buildbot + chmod -c 555 $out/bin/buildbot ''; meta = with stdenv.lib; { @@ -78,5 +75,6 @@ pythonPackages.buildPythonApplication (rec { description = "Continuous integration system that automates the build/test cycle"; maintainers = with maintainers; [ nand0p ryansydnor ]; platforms = platforms.all; + license = licenses.gpl2; }; }) diff --git a/pkgs/development/tools/build-managers/buildbot/plugins.nix b/pkgs/development/tools/build-managers/buildbot/plugins.nix index 384452e27d9c..09f8b1e750a5 100644 --- a/pkgs/development/tools/build-managers/buildbot/plugins.nix +++ b/pkgs/development/tools/build-managers/buildbot/plugins.nix @@ -1,17 +1,14 @@ -{ stdenv -, fetchurl -, pythonPackages -}: +{ stdenv, fetchurl, pythonPackages }: let buildbot-pkg = pythonPackages.buildPythonPackage rec { name = "${pname}-${version}"; pname = "buildbot-pkg"; - version = "0.9.0rc3"; + version = "0.9.0rc4"; src = fetchurl { url = "mirror://pypi/b/${pname}/${name}.tar.gz"; - sha256 = "0a05dgc5nn6sx3nicfvqwar9iy8yxhq92688dhs5p6mzjxaprlxm"; + sha256 = "0dfdyc3x0926dynzdl9w7z0p84w287l362mxdl3r6wl87gkisr10"; }; propagatedBuildInputs = with pythonPackages; [ setuptools ]; @@ -21,6 +18,7 @@ let description = "Buildbot Packaging Helper"; maintainers = with maintainers; [ nand0p ryansydnor ]; platforms = platforms.all; + license = licenses.gpl2; }; }; @@ -29,13 +27,14 @@ in { www = pythonPackages.buildPythonPackage rec { name = "${pname}-${version}"; pname = "buildbot_www"; - version = "0.9.0rc3"; + version = "0.9.0rc4"; # NOTE: wheel is used due to buildbot circular dependency format = "wheel"; + src = fetchurl { - url = "https://pypi.python.org/packages/93/1e/09e329fc831ae4f5be05eb3363c9028ab7e26e9c7e5d89e3aa66c3f25d9d/${name}-py2-none-any.whl"; - sha256 = "0fy2v7y1kc53zm67ddx85yz5qh4b7hmcbfzmsziiv9n83a0qh1i6"; + url = "https://pypi.python.org/packages/78/45/b43bd85695cd0178f8bac9c3b394062e9eb46f489b655c11e950e54278a2/${name}-py2-none-any.whl"; + sha256 = "0ixi0y0jhbql55swsvy0jin1v6xf4q4mw9p5n9sll2h10lyp9h0p"; }; propagatedBuildInputs = [ buildbot-pkg ]; @@ -45,17 +44,18 @@ in { description = "Buildbot UI"; maintainers = with maintainers; [ nand0p ryansydnor ]; platforms = platforms.all; + license = licenses.gpl2; }; }; console-view = pythonPackages.buildPythonPackage rec { name = "${pname}-${version}"; pname = "buildbot-console-view"; - version = "0.9.0rc3"; + version = "0.9.0rc4"; src = fetchurl { url = "mirror://pypi/b/${pname}/${name}.tar.gz"; - sha256 = "09yfqrnwfambg1j4x7ywnjg4xfhvv6f242zzh35fwj64cnqmqx07"; + sha256 = "1fig635yg5dgn239g9wzfpw9wc3p91lcl9nnig9k7fijz85pwrva"; }; propagatedBuildInputs = [ buildbot-pkg ]; @@ -65,17 +65,18 @@ in { description = "Buildbot Console View Plugin"; maintainers = with maintainers; [ nand0p ryansydnor ]; platforms = platforms.all; + license = licenses.gpl2; }; }; waterfall-view = pythonPackages.buildPythonPackage rec { name = "${pname}-${version}"; pname = "buildbot-waterfall-view"; - version = "0.9.0rc3"; + version = "0.9.0rc4"; src = fetchurl { url = "mirror://pypi/b/${pname}/${name}.tar.gz"; - sha256 = "0xpqxj3mmwl5xdhm3p52shl24d85qapdk4v66f9hrb9pnk5k4a81"; + sha256 = "08kh966grj9b4mif337vv7bqy5ixz8xz31ml63wysjb65djnjbk8"; }; propagatedBuildInputs = [ buildbot-pkg ]; @@ -85,6 +86,7 @@ in { description = "Buildbot Waterfall View Plugin"; maintainers = with maintainers; [ nand0p ryansydnor ]; platforms = platforms.all; + license = licenses.gpl2; }; }; } diff --git a/pkgs/development/tools/build-managers/buildbot/worker.nix b/pkgs/development/tools/build-managers/buildbot/worker.nix index 2c8e17a37c00..01b2051aaa6d 100644 --- a/pkgs/development/tools/build-managers/buildbot/worker.nix +++ b/pkgs/development/tools/build-managers/buildbot/worker.nix @@ -1,16 +1,13 @@ -{ stdenv -, fetchurl -, pythonPackages -}: +{ stdenv, fetchurl, pythonPackages }: pythonPackages.buildPythonApplication (rec { name = "${pname}-${version}"; pname = "buildbot-worker"; - version = "0.9.0rc3"; + version = "0.9.0rc4"; src = fetchurl { url = "mirror://pypi/b/${pname}/${name}.tar.gz"; - sha256 = "0wqn2176rk7hc27r4hfy5qnxp0nr9iis5nyzg5x07xljnsspnhy1"; + sha256 = "1fv40pki1awv5f2z9vd7phjk7dlsy1cp4blsy2vdhqwbc7112a8c"; }; buildInputs = with pythonPackages; [ setuptoolsTrial mock ]; @@ -21,5 +18,6 @@ pythonPackages.buildPythonApplication (rec { description = "Buildbot Worker Daemon"; maintainers = with maintainers; [ nand0p ryansydnor ]; platforms = platforms.all; + license = licenses.gpl2; }; }) diff --git a/pkgs/development/tools/build-managers/gnumake/3.81/default.nix b/pkgs/development/tools/build-managers/gnumake/3.81/default.nix deleted file mode 100644 index 333ff3529270..000000000000 --- a/pkgs/development/tools/build-managers/gnumake/3.81/default.nix +++ /dev/null @@ -1,48 +0,0 @@ -{stdenv, fetchurl}: - -let version = "3.81"; in -stdenv.mkDerivation { - name = "gnumake-${version}"; - - src = fetchurl { - url = "mirror://gnu/make/make-${version}.tar.bz2"; - md5 = "354853e0b2da90c527e35aabb8d6f1e6"; - }; - - doCheck = true; - - patches = - [ - # Provide nested log output for subsequent pretty-printing by - # nix-log2xml. - ./log-3.81.patch - - # Purity: don't look for library dependencies (of the form - # `-lfoo') in /lib and /usr/lib. It's a stupid feature anyway. - # Likewise, when searching for included Makefiles, don't look in - # /usr/include and friends. - ./impure-dirs.patch - ]; - patchFlags = "-p0"; - - meta = { - description = "GNU Make, a program controlling the generation of non-source files from sources"; - - longDescription = - '' Make is a tool which controls the generation of executables and - other non-source files of a program from the program's source files. - - Make gets its knowledge of how to build your program from a file - called the makefile, which lists each of the non-source files and - how to compute it from other files. When you write a program, you - should write a makefile for it, so that it is possible to use Make - to build and install the program. - ''; - - homepage = http://www.gnu.org/software/make/; - - license = stdenv.lib.licenses.gpl2Plus; - maintainers = [ ]; - platforms = stdenv.lib.platforms.unix; - }; -} diff --git a/pkgs/development/tools/build-managers/gnumake/3.81/impure-dirs.patch b/pkgs/development/tools/build-managers/gnumake/3.81/impure-dirs.patch deleted file mode 100644 index f6646f1d0126..000000000000 --- a/pkgs/development/tools/build-managers/gnumake/3.81/impure-dirs.patch +++ /dev/null @@ -1,34 +0,0 @@ -diff -rc read.c read.c -*** read.c 2006-03-17 15:24:20.000000000 +0100 ---- read.c 2007-05-24 17:16:31.000000000 +0200 -*************** -*** 99,107 **** ---- 99,109 ---- - #endif - INCLUDEDIR, - #ifndef _AMIGA -+ #if 0 - "/usr/gnu/include", - "/usr/local/include", - "/usr/include", -+ #endif - #endif - 0 - }; -diff -rc reremake.c -*** remake.c 2006-03-20 03:36:37.000000000 +0100 ---- remake.c 2007-05-24 17:06:54.000000000 +0200 -*************** -*** 1452,1460 **** ---- 1452,1462 ---- - static char *dirs[] = - { - #ifndef _AMIGA -+ #if 0 - "/lib", - "/usr/lib", - #endif -+ #endif - #if defined(WINDOWS32) && !defined(LIBDIR) - /* - * This is completely up to the user at product install time. Just define diff --git a/pkgs/development/tools/build-managers/gnumake/3.81/log-3.81.patch b/pkgs/development/tools/build-managers/gnumake/3.81/log-3.81.patch deleted file mode 100644 index b98d85a08265..000000000000 --- a/pkgs/development/tools/build-managers/gnumake/3.81/log-3.81.patch +++ /dev/null @@ -1,125 +0,0 @@ -diff -rc job.c job.c -*** job.c 2006-03-20 04:03:04.000000000 +0100 ---- job.c 2009-01-19 19:37:28.000000000 +0100 -*************** -*** 1083,1089 **** - appear. */ - - message (0, (just_print_flag || (!(flags & COMMANDS_SILENT) && !silent_flag)) -! ? "%s" : (char *) 0, p); - - /* Tell update_goal_chain that a command has been started on behalf of - this target. It is important that this happens here and not in ---- 1083,1089 ---- - appear. */ - - message (0, (just_print_flag || (!(flags & COMMANDS_SILENT) && !silent_flag)) -! ? (enable_nested_output ? "\e[3s\e[a%s\e[b" : "%s") : (char *) 0, p); - - /* Tell update_goal_chain that a command has been started on behalf of - this target. It is important that this happens here and not in -diff -rc main.c main.c -*** main.c 2006-03-20 03:36:37.000000000 +0100 ---- main.c 2009-01-19 19:41:41.000000000 +0100 -*************** -*** 886,891 **** ---- 886,900 ---- - } - - -+ static void close_nesting() -+ { -+ while (stdout_nesting_level--) -+ printf("\e[q"); -+ while (stderr_nesting_level--) -+ fprintf(stderr, "\e[q"); -+ } -+ -+ - #ifdef _AMIGA - int - main (int argc, char **argv) -*************** -*** 931,936 **** ---- 940,950 ---- - atexit (close_stdout); - #endif - -+ atexit(close_nesting); -+ -+ if (getenv("NIX_INDENT_MAKE")) -+ enable_nested_output = 1; -+ - /* Needed for OS/2 */ - initialize_main(&argc, &argv); - -*************** -*** 3095,3100 **** ---- 3109,3120 ---- - - /* Use entire sentences to give the translators a fighting chance. */ - -+ if (entering && enable_nested_output) -+ { -+ printf("\e[p"); -+ stdout_nesting_level++; -+ } -+ - if (makelevel == 0) - if (starting_directory == 0) - if (entering) -*************** -*** 3124,3129 **** ---- 3144,3159 ---- - printf (_("%s[%u]: Leaving directory `%s'\n"), - program, makelevel, starting_directory); - -+ if (!entering && enable_nested_output) -+ { -+ printf("\e[q"); -+ stdout_nesting_level--; -+ } -+ - /* Flush stdout to be sure this comes before any stderr output. */ - fflush (stdout); - } -+ -+ int enable_nested_output = 0; -+ int stdout_nesting_level = 0; -+ int stderr_nesting_level = 0; -diff -rc make.h -*** make.h 2006-02-16 00:54:43.000000000 +0100 ---- make.h 2009-01-19 19:32:03.000000000 +0100 -*************** -*** 609,611 **** ---- 609,614 ---- - #define ENULLLOOP(_v,_c) do{ errno = 0; \ - while (((_v)=_c)==0 && errno==EINTR); }while(0) - -+ extern int enable_nested_output; -+ extern int stdout_nesting_level; -+ extern int stderr_nesting_level; -diff -rc reremake.c -*** remake.c 2006-03-20 03:36:37.000000000 +0100 ---- remake.c 2009-01-19 19:39:40.000000000 +0100 -*************** -*** 1120,1126 **** ---- 1120,1137 ---- - /* The normal case: start some commands. */ - if (!touch_flag || file->cmds->any_recurse) - { -+ if (enable_nested_output) -+ { -+ log_working_directory (1); -+ fprintf(stderr, "\e[pbuilding %s\n", file->name); -+ stderr_nesting_level++; -+ } - execute_file_commands (file); -+ if (enable_nested_output) -+ { -+ fprintf(stderr, "\e[q"); -+ stderr_nesting_level--; -+ } - return; - } - diff --git a/pkgs/development/tools/build-managers/meson/default.nix b/pkgs/development/tools/build-managers/meson/default.nix index 47c6e12a5860..558b8acf70f1 100644 --- a/pkgs/development/tools/build-managers/meson/default.nix +++ b/pkgs/development/tools/build-managers/meson/default.nix @@ -1,10 +1,11 @@ { lib, python3Packages, fetchurl }: python3Packages.buildPythonPackage rec { - name = "meson-0.32.0"; + version = "0.35.0"; + name = "meson-${version}"; src = fetchurl { url = "mirror://pypi/m/meson/${name}.tar.gz"; - sha256 = "1i5m4q53sr55aw8kx761kh0rsfwkpq0gfa0c0k3jf66y4aml6n54"; + sha256 = "0w4vian55cwcv2m5qzn73aznf9a0y24cszqb7dkpahrb9yrg25l3"; }; meta = with lib; { diff --git a/pkgs/development/tools/build-managers/sbt/default.nix b/pkgs/development/tools/build-managers/sbt/default.nix index 48ec100f593c..e6006e948817 100644 --- a/pkgs/development/tools/build-managers/sbt/default.nix +++ b/pkgs/development/tools/build-managers/sbt/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "sbt-${version}"; - version = "0.13.12"; + version = "0.13.13"; src = fetchurl { url = "https://dl.bintray.com/sbt/native-packages/sbt/${version}/${name}.tgz"; - sha256 = "1pq3c9nhxbdpx5csmpvjv93nz2z04n2gzzwyd7sllaplqgwk00i8"; + sha256 = "0ygrz92qkzasj6fps1bjg7wlgl69867jjjc37yjadib0l8hkvl20"; }; patchPhase = '' diff --git a/pkgs/development/tools/build-managers/scons/default.nix b/pkgs/development/tools/build-managers/scons/default.nix index 19dbdb76a360..550a59a887e4 100644 --- a/pkgs/development/tools/build-managers/scons/default.nix +++ b/pkgs/development/tools/build-managers/scons/default.nix @@ -1,29 +1,17 @@ -{stdenv, fetchurl, python, makeWrapper}: +{stdenv, fetchurl, python2Packages}: let name = "scons"; version = "2.5.0"; -in - -stdenv.mkDerivation { +in python2Packages.buildPythonApplication { name = "${name}-${version}"; src = fetchurl { url = "mirror://sourceforge/scons/${name}-${version}.tar.gz"; sha256 = "1sdcj8iapfzmlq7098yas40qwl6khsiwydbxv33sw81wy93nnagb"; }; - - buildInputs = [python makeWrapper]; - - preConfigure = '' - for i in "script/"*; do - substituteInPlace $i --replace "/usr/bin/env python" "${python}/bin/python" - done - ''; - buildPhase = "python setup.py install --prefix=$out --install-data=$out/share --install-lib=$(toPythonPath $out) --symlink-scons -O1"; - installPhase = "for n in $out/bin/*-${version}; do wrapProgram $n --suffix PYTHONPATH ':' \"$(toPythonPath $out)\"; done"; - - pythonPath = []; + # No tests + doCheck = false; meta = { homepage = "http://scons.org/"; diff --git a/pkgs/development/tools/cdecl/default.nix b/pkgs/development/tools/cdecl/default.nix index 9e9fcfcc19d5..c5bccf6ddae6 100644 --- a/pkgs/development/tools/cdecl/default.nix +++ b/pkgs/development/tools/cdecl/default.nix @@ -3,8 +3,8 @@ stdenv.mkDerivation { name = "cdecl-2.5"; src = fetchurl { - url = "http://cdecl.org/files/cdecl-blocks-2.5.tar.gz"; - md5 = "c1927e146975b1c7524cbaf07a7c10f8"; + url = "http://www.cdecl.org/files/cdecl-blocks-2.5.tar.gz"; + sha256 = "1b7k0ra30hh8mg8fqv0f0yzkaac6lfg6n376drgbpxg4wwml1rly"; }; patches = [ ./cdecl-2.5-lex.patch ]; diff --git a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix index 6bef2d7b548a..c66c0fc93b79 100644..100755 --- a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix +++ b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix @@ -1,16 +1,16 @@ { lib, buildGoPackage, fetchFromGitLab, fetchurl, go-bindata }: let - version = "1.6.0"; + version = "1.7.0"; # Gitlab runner embeds some docker images these are prebuilt for arm and x86_64 docker_x86_64 = fetchurl { url = "https://gitlab-ci-multi-runner-downloads.s3.amazonaws.com/v${version}/docker/prebuilt-x86_64.tar.xz"; - sha256 = "1ygc2ipprd5pr8b7y511id1af91zw15f8j28v3rx4vjapmbzpk8d"; + sha256 = "1qc0kmb6wxsy73vf0k2x95jlfb5dicgxw8c63mfn7ryxrh8a42z5"; }; docker_arm = fetchurl { url = "https://gitlab-ci-multi-runner-downloads.s3.amazonaws.com/v${version}/docker/prebuilt-arm.tar.xz"; - sha256 = "0aw6cfh92f7fywzry0yswa635hpmzh6fqcav0ljc5vqs26wdmjc1"; + sha256 = "0jbgpv4y0fmvl1plri4ifj1vmk6rr82pncrccpz2k640nlniyhqi"; }; in buildGoPackage rec { @@ -29,7 +29,7 @@ buildGoPackage rec { owner = "gitlab-org"; repo = "gitlab-ci-multi-runner"; rev = "v${version}"; - sha256 = "10w222k4klxqyzk08c0j7nmhdbdnn70p6n1hfqy6h5mczlffqv61"; + sha256 = "18wlab63fmmq9kgr0zmkgsr1kj6rjdqmyg87b7ryb9f40gmygcvj"; }; buildInputs = [ go-bindata ]; diff --git a/pkgs/development/tools/deis/default.nix b/pkgs/development/tools/deis/default.nix index 5c76fc69ac3a..fe4ec06322f4 100644 --- a/pkgs/development/tools/deis/default.nix +++ b/pkgs/development/tools/deis/default.nix @@ -1,10 +1,10 @@ -{ stdenv, lib, buildGoPackage, fetchFromGitHub }: +{ stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { name = "deis-${version}"; - version = "1.13.0"; + version = "1.13.3"; rev = "v${version}"; - + goPackagePath = "github.com/deis/deis"; subPackages = [ "client" ]; @@ -18,8 +18,20 @@ buildGoPackage rec { inherit rev; owner = "deis"; repo = "deis"; - sha256 = "1qv9lxqx7m18029lj8cw3k7jngvxs4iciwrypdy0gd2nnghc68sw"; + sha256 = "15q44jyjms8fdmly0z4sn4ymf1dx6cmdavgixjixdj2wbjw0yi2p"; }; - goDeps = ./deps.nix; + preBuild = '' + export GOPATH=$GOPATH:$NIX_BUILD_TOP/go/src/${goPackagePath}/Godeps/_workspace + ''; + + meta = with stdenv.lib; { + homepage = https://deis.io; + description = "A command line utility used to interact with the Deis open source PaaS."; + license = licenses.asl20; + platforms = platforms.linux; + maintainers = with maintainers; [ + jgeerds + ]; + }; } diff --git a/pkgs/development/tools/deis/deps.nix b/pkgs/development/tools/deis/deps.nix deleted file mode 100644 index 5a1b30a7e662..000000000000 --- a/pkgs/development/tools/deis/deps.nix +++ /dev/null @@ -1,29 +0,0 @@ -[ - { - goPackagePath = "gopkg.in/yaml.v2"; - fetch = { - type = "git"; - url = "https://gopkg.in/yaml.v2"; - rev = "a83829b6f1293c91addabc89d0571c246397bbf4"; - sha256 = "1m4dsmk90sbi17571h6pld44zxz7jc4lrnl4f27dpd1l8g5xvjhh"; - }; - } - { - goPackagePath = "github.com/docopt/docopt-go"; - fetch = { - type = "git"; - url = "https://github.com/docopt/docopt-go"; - rev = "784ddc588536785e7299f7272f39101f7faccc3f"; - sha256 = "0wwz48jl9fvl1iknvn9dqr4gfy1qs03gxaikrxxp9gry6773v3sj"; - }; - } - { - goPackagePath = "golang.org/x/crypto"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/crypto"; - rev = "575fdbe86e5dd89229707ebec0575ce7d088a4a6"; - sha256 = "1kgv1mkw9y404pk3lcwbs0vgl133mwyp294i18jg9hp10s5d56xa"; - }; - } -] diff --git a/pkgs/development/tools/deisctl/default.nix b/pkgs/development/tools/deisctl/default.nix new file mode 100644 index 000000000000..3f818ea7be62 --- /dev/null +++ b/pkgs/development/tools/deisctl/default.nix @@ -0,0 +1,31 @@ +{ stdenv, buildGoPackage, fetchFromGitHub }: + +buildGoPackage rec { + name = "deis-${version}"; + version = "1.13.3"; + rev = "v${version}"; + + goPackagePath = "github.com/deis/deis"; + subPackages = [ "deisctl" ]; + + src = fetchFromGitHub { + inherit rev; + owner = "deis"; + repo = "deis"; + sha256 = "15q44jyjms8fdmly0z4sn4ymf1dx6cmdavgixjixdj2wbjw0yi2p"; + }; + + preBuild = '' + export GOPATH=$GOPATH:$NIX_BUILD_TOP/go/src/${goPackagePath}/Godeps/_workspace + ''; + + meta = with stdenv.lib; { + homepage = https://deis.io; + description = "A command-line utility used to provision and operate a Deis cluster."; + license = licenses.asl20; + platforms = platforms.linux; + maintainers = with maintainers; [ + jgeerds + ]; + }; +} diff --git a/pkgs/development/tools/devpi-client/default.nix b/pkgs/development/tools/devpi-client/default.nix index 1e848e5d611c..f724b65dd823 100644 --- a/pkgs/development/tools/devpi-client/default.nix +++ b/pkgs/development/tools/devpi-client/default.nix @@ -1,17 +1,20 @@ -{ stdenv, fetchurl, pythonPackages, python} : +{ stdenv, fetchurl, pythonPackages, glibcLocales} : pythonPackages.buildPythonApplication rec { name = "devpi-client-${version}"; - version = "2.3.2"; + version = "2.7.0"; src = fetchurl { - url = "mirror://pypi/d/devpi-client/devpi-client-${version}.tar.gz"; - md5= "bfc8cd768f983fd0585c347bca00c8bb"; + url = "mirror://pypi/d/devpi-client/${name}.tar.gz"; + sha256 = "0z7vaf0a66n82mz0vx122pbynjvkhp2mjf9lskgyv09y3bxzzpj3"; }; - buildInputs = [ pythonPackages.tox pythonPackages.check-manifest pythonPackages.pkginfo ]; + doCheck = false; - propagatedBuildInputs = [ pythonPackages.py pythonPackages.devpi-common ]; + LC_ALL = "en_US.UTF-8"; + buildInputs = with pythonPackages; [ glibcLocales tox check-manifest pkginfo ]; + + propagatedBuildInputs = with pythonPackages; [ py devpi-common ]; meta = { homepage = http://doc.devpi.net; diff --git a/pkgs/development/tools/documentation/gnome-doc-utils/default.nix b/pkgs/development/tools/documentation/gnome-doc-utils/default.nix index b653c705478d..18933426db0a 100644 --- a/pkgs/development/tools/documentation/gnome-doc-utils/default.nix +++ b/pkgs/development/tools/documentation/gnome-doc-utils/default.nix @@ -1,7 +1,7 @@ -{stdenv, fetchurl, python, pkgconfig, libxml2Python, libxslt, intltool -, makeWrapper, pythonPackages }: +{stdenv, fetchurl, pkgconfig, libxml2Python, libxslt, intltool +, makeWrapper, python2Packages }: -stdenv.mkDerivation { +python2Packages.mkPythonDerivation { name = "gnome-doc-utils-0.20.10"; src = fetchurl { @@ -10,9 +10,6 @@ stdenv.mkDerivation { }; configureFlags = "--disable-scrollkeeper"; - buildInputs = [ python libxml2Python libxslt ]; - pythonPath = [ libxml2Python ]; - postInstall = "wrapPythonPrograms"; - - nativeBuildInputs = [ pkgconfig intltool pythonPackages.wrapPython ]; + buildInputs = [ libxslt pkgconfig intltool ]; + propagatedBuildInputs = [ libxml2Python ]; } diff --git a/pkgs/development/tools/documentation/gtk-doc/default.nix b/pkgs/development/tools/documentation/gtk-doc/default.nix index b080be846cd9..b46b0be748ad 100644 --- a/pkgs/development/tools/documentation/gtk-doc/default.nix +++ b/pkgs/development/tools/documentation/gtk-doc/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "0hpxcij9xx9ny3gs9p0iz4r8zslw8wqymbyababiyl7603a6x90y"; }; - outputDocdev = "out"; + outputDevdoc = "out"; # maybe there is a better way to pass the needed dtd and xsl files # "-//OASIS//DTD DocBook XML V4.1.2//EN" and "http://docbook.sourceforge.net/release/xsl/current/html/chunk.xsl" diff --git a/pkgs/development/tools/grabserial/default.nix b/pkgs/development/tools/grabserial/default.nix index 1020ed864dfb..c86c2e275ed1 100644 --- a/pkgs/development/tools/grabserial/default.nix +++ b/pkgs/development/tools/grabserial/default.nix @@ -2,13 +2,13 @@ pythonPackages.buildPythonApplication rec { - name = "grabserial-20141120"; + name = "grabserial-1.9.3"; namePrefix = ""; src = fetchgit { url = https://github.com/tbird20d/grabserial.git; - rev = "8b9c98ea35d382bac2aafc7a8a9c02440369a792"; - sha256 = "ff27f5e5ab38c8450a4a0291e943e6c5a265e56d29d6a1caa849ae3238d71679"; + rev = "7cbf104b61ffdf68e6782a8e885050565399a014"; + sha256 = "043r2p5jw0ymx8ka1d39q1ap39i7sliq5f4w3yr1n53lzshjmc5g"; }; propagatedBuildInputs = [ pythonPackages.pyserial ]; diff --git a/pkgs/development/tools/hexio/default.nix b/pkgs/development/tools/hexio/default.nix new file mode 100644 index 000000000000..6d75c7256ee0 --- /dev/null +++ b/pkgs/development/tools/hexio/default.nix @@ -0,0 +1,36 @@ +{ stdenv, fetchFromGitHub, fetchurl, python, pcsclite, pth, glibc }: + +stdenv.mkDerivation rec { + pname = "hexio"; + name = "${pname}-${version}"; + version = "201605"; + + src = fetchFromGitHub { + sha256 = "08jxkdi0gjsi8s793f9kdlad0a58a0xpsaayrsnpn9bpmm5cgihq"; + rev = "f6f963bd0fcd2808977e0ad82dcb3100691cdd7c"; + owner = "vanrein"; + repo = "hexio"; + }; + + buildInputs = [ python pcsclite pth glibc ]; + + patchPhase = '' + substituteInPlace Makefile \ + --replace '-I/usr/local/include/PCSC/' '-I${pcsclite}/include/PCSC/' \ + --replace '-L/usr/local/lib/pth' '-I${pth}/lib/' + ''; + + installPhase = '' + mkdir -p $out/bin $out/lib $out/sbin $out/man + make DESTDIR=$out PREFIX=/ all + make DESTDIR=$out PREFIX=/ install + ''; + + meta = with stdenv.lib; { + description = "Low-level I/O helpers for hexadecimal, tty/serial devices and so on"; + homepage = https://github.com/vanrein/hexio; + license = licenses.bsd2; + platforms = platforms.linux; + maintainers = with maintainers; [ leenaars ]; + }; +} diff --git a/pkgs/development/tools/mdk/default.nix b/pkgs/development/tools/mdk/default.nix index f54b409efb6d..ca8c2de9630f 100644 --- a/pkgs/development/tools/mdk/default.nix +++ b/pkgs/development/tools/mdk/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "gnu-mdk-1.2.9"; src = fetchurl { url = http://ftp.gnu.org/gnu/mdk/v1.2.9/mdk-1.2.9.tar.gz; - md5 = "08c96baa4b99dd9d25190dd15fe415a5"; + sha256 = "0c24wzrzbk0l4z1p5nnxihaqra75amwmw59va44554infkfms9kc"; }; buildInputs = [ intltool pkgconfig glib ]; postInstall = '' diff --git a/pkgs/development/tools/misc/awf/default.nix b/pkgs/development/tools/misc/awf/default.nix new file mode 100644 index 000000000000..b29dbcf79be0 --- /dev/null +++ b/pkgs/development/tools/misc/awf/default.nix @@ -0,0 +1,37 @@ +{ stdenv, fetchFromGitHub, autoreconfHook, gtk2, gtk3, pkgconfig +, wrapGAppsHook }: + +stdenv.mkDerivation rec { + name = "awf-${version}"; + version = "1.3.1"; + + src = fetchFromGitHub { + owner = "valr"; + repo = "awf"; + rev = "v${version}"; + sha256 = "18dqa2269cwr0hrn67vp0ifwbv8vc2xn6mg145pbnc038hicql8m"; + }; + + nativeBuildInputs = [ autoreconfHook pkgconfig wrapGAppsHook ]; + + buildInputs = [ gtk2 gtk3 ]; + + autoreconfPhase = '' + patchShebangs ./autogen.sh + ./autogen.sh + ''; + + meta = with stdenv.lib; { + description = "A Widget Factory"; + longDescription = '' + A widget factory is a theme preview application for gtk2 and + gtk3. It displays the various widget types provided by gtk2/gtk3 + in a single window allowing to see the visual effect of the + applied theme. + ''; + homepage = https://github.com/valr/awf; + license = licenses.gpl3; + platforms = platforms.all; + maintainers = with maintainers; [ michalrus ]; + }; +} diff --git a/pkgs/development/tools/misc/gdb/default.nix b/pkgs/development/tools/misc/gdb/default.nix index 48e74cf2631d..da0447c49da8 100644 --- a/pkgs/development/tools/misc/gdb/default.nix +++ b/pkgs/development/tools/misc/gdb/default.nix @@ -12,7 +12,7 @@ let - basename = "gdb-7.11.1"; + basename = "gdb-7.12"; # Whether (cross-)building for GNU/Hurd. This is an approximation since # having `stdenv ? cross' doesn't tell us if we're building `crossDrv' and @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnu/gdb/${basename}.tar.xz"; - sha256 = "0w7wi1llznlqdqk2lmzygz2xylb2c9mh580s9i0rypkmwfj6s8g9"; + sha256 = "152g2qa8337cxif3lkvabjcxfd9jphfb2mza8f1p2c4bjk2z6kw3"; }; nativeBuildInputs = [ pkgconfig texinfo perl ] @@ -43,6 +43,9 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + # darwin build fails with format hardening since v7.12 + hardeningDisable = stdenv.lib.optionals stdenv.isDarwin [ "format" ]; + configureFlags = with stdenv.lib; [ "--with-gmp=${gmp.dev}" "--with-mpfr=${mpfr.dev}" "--with-system-readline" "--with-system-zlib" "--with-expat" "--with-libexpat-prefix=${expat.dev}" diff --git a/pkgs/development/tools/misc/gpshell/default.nix b/pkgs/development/tools/misc/gpshell/default.nix index a4ed3a44f350..f552fe00566b 100644 --- a/pkgs/development/tools/misc/gpshell/default.nix +++ b/pkgs/development/tools/misc/gpshell/default.nix @@ -1,4 +1,6 @@ -{ stdenv, fetchurl, pkgconfig, globalplatform, pcsclite }: +{ stdenv, fetchurl, pkgconfig, globalplatform, pcsclite, gppcscconnectionplugin +, makeWrapper +}: stdenv.mkDerivation rec { name = "gpshell-${version}"; @@ -9,7 +11,11 @@ stdenv.mkDerivation rec { sha256 = "19a77zvyf2vazbv17185s4pynhylk2ky8vhl4i8pg9zww29sicqi"; }; - buildInputs = [ pkgconfig globalplatform pcsclite ]; + buildInputs = [ pkgconfig globalplatform pcsclite makeWrapper ]; + + postFixup = '' + wrapProgram "$out/bin/gpshell" --prefix LD_LIBRARY_PATH : "${gppcscconnectionplugin}/lib" + ''; meta = with stdenv.lib; { homepage = https://sourceforge.net/p/globalplatform/wiki/Home/; diff --git a/pkgs/development/tools/misc/help2man/default.nix b/pkgs/development/tools/misc/help2man/default.nix index 6839335245fc..8bf3db59147b 100644 --- a/pkgs/development/tools/misc/help2man/default.nix +++ b/pkgs/development/tools/misc/help2man/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnu/help2man/${name}.tar.xz"; - sha256 = "0miqq77ssk5rgsc9xlv7k5n2wk2c5wv2m1kh4zhbwrggfmjaycn2"; + sha256 = "0lvp4306f5nq08f3snffs5pp1zwv8l35z6f5g0dds51zs6bzdv6l"; }; buildInputs = [ makeWrapper perl gettext LocaleGettext ]; diff --git a/pkgs/development/tools/misc/hound/default.nix b/pkgs/development/tools/misc/hound/default.nix new file mode 100644 index 000000000000..e9da64b112b6 --- /dev/null +++ b/pkgs/development/tools/misc/hound/default.nix @@ -0,0 +1,27 @@ +{ stdenv, buildGoPackage, fetchFromGitHub }: + +buildGoPackage rec { + name = "hound-unstable-${version}"; + version = "20160919-${stdenv.lib.strings.substring 0 7 rev}"; + rev = "f95e9a9224b8878b9cd8fac0afb6d31f83a65ca7"; + + goPackagePath = "github.com/etsy/hound"; + + src = fetchFromGitHub { + inherit rev; + owner = "etsy"; + repo = "hound"; + sha256 = "0d4mhka7f8x8xfjrjhl5l0v06ng8kc868jrajpv5bjkxsj71nwbg"; + }; + + goDeps = ./deps.nix; + + meta = { + inherit (src.meta) homepage; + + description = "Lightning fast code searching made easy"; + license = stdenv.lib.licenses.mit; + maintainers = with stdenv.lib.maintainers; [ grahamc ]; + platforms = stdenv.lib.platforms.unix; + }; +} diff --git a/pkgs/development/tools/misc/hound/deps.nix b/pkgs/development/tools/misc/hound/deps.nix new file mode 100644 index 000000000000..fe51488c7066 --- /dev/null +++ b/pkgs/development/tools/misc/hound/deps.nix @@ -0,0 +1 @@ +[] diff --git a/pkgs/development/tools/misc/intel-gpu-tools/default.nix b/pkgs/development/tools/misc/intel-gpu-tools/default.nix index 3d3e457781ad..5ecc0421c361 100644 --- a/pkgs/development/tools/misc/intel-gpu-tools/default.nix +++ b/pkgs/development/tools/misc/intel-gpu-tools/default.nix @@ -2,11 +2,11 @@ , libX11, libXext, libXv, libXrandr, glib, bison, libunwind, python3 }: stdenv.mkDerivation rec { - name = "intel-gpu-tools-1.14"; + name = "intel-gpu-tools-1.16"; src = fetchurl { url = "http://xorg.freedesktop.org/archive/individual/app/${name}.tar.bz2"; - sha256 = "030g1akybk19y3jcxd8pp573ymrd4w7mmzxbspp064lwdv9y35im"; + sha256 = "1q9sfb15081zm1rq4z67sfj13ryvbdha4fa6pdzdsfd9261nvgn6"; }; buildInputs = [ pkgconfig libdrm libpciaccess cairo dri2proto udev libX11 diff --git a/pkgs/development/tools/misc/intltool/default.nix b/pkgs/development/tools/misc/intltool/default.nix index 4ab9fa284915..3c5dacb6f65e 100644 --- a/pkgs/development/tools/misc/intltool/default.nix +++ b/pkgs/development/tools/misc/intltool/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { patches = [(fetchpatch { name = "perl-5.22.patch"; url = "https://anonscm.debian.org/viewvc/pkg-gnome/desktop/unstable/intltool" - + "/debian/patches/perl5.22-regex-fixes?revision=47255&view=co"; + + "/debian/patches/perl5.22-regex-fixes.patch?revision=47258&view=co"; sha256 = "17clqczb9fky7hp8czxa0fy82b5478irvz4f3fnans3sqxl95hx3"; })]; diff --git a/pkgs/development/tools/misc/itstool/default.nix b/pkgs/development/tools/misc/itstool/default.nix index fa8002d4f6c7..8c2686d9a229 100644 --- a/pkgs/development/tools/misc/itstool/default.nix +++ b/pkgs/development/tools/misc/itstool/default.nix @@ -1,4 +1,5 @@ -{ stdenv, fetchurl, python, libxml2Python }: +{ stdenv, fetchurl, python2, libxml2Python }: +# We need the same Python as is used to build libxml2Python stdenv.mkDerivation rec { name = "itstool-2.0.2"; @@ -8,12 +9,12 @@ stdenv.mkDerivation rec { sha256 = "bf909fb59b11a646681a8534d5700fec99be83bb2c57badf8c1844512227033a"; }; - buildInputs = [ python libxml2Python ]; + buildInputs = [ python2 libxml2Python ]; patchPhase = '' sed -e '/import libxml2/i import sys\ - sys.path.append("${libxml2Python}/lib/${python.libPrefix}/site-packages")' \ + sys.path.append("${libxml2Python}/lib/${python2.libPrefix}/site-packages")' \ -i itstool.in ''; diff --git a/pkgs/development/tools/misc/kibana/default.nix b/pkgs/development/tools/misc/kibana/default.nix index d851741405ff..677ffa49c998 100644 --- a/pkgs/development/tools/misc/kibana/default.nix +++ b/pkgs/development/tools/misc/kibana/default.nix @@ -3,8 +3,12 @@ with stdenv.lib; let inherit (builtins) elemAt; + archOverrides = { + "i686" = "x86"; + }; info = splitString "-" stdenv.system; - arch = elemAt info 0; + arch = (elemAt info 0); + elasticArch = archOverrides."${arch}" or arch; plat = elemAt info 1; shas = { "x86_64-linux" = "1md3y3a8rxvf37lnfc56kbirv2rjl68pa5672yxhfmjngrr20rcw"; @@ -16,7 +20,7 @@ in stdenv.mkDerivation rec { version = "4.6.0"; src = fetchurl { - url = "https://download.elastic.co/kibana/kibana/${name}-${plat}-${arch}.tar.gz"; + url = "https://download.elastic.co/kibana/kibana/${name}-${plat}-${elasticArch}.tar.gz"; sha256 = shas."${stdenv.system}"; }; diff --git a/pkgs/development/tools/misc/lsof/default.nix b/pkgs/development/tools/misc/lsof/default.nix index ed2f0f101650..37e5ae6f7105 100644 --- a/pkgs/development/tools/misc/lsof/default.nix +++ b/pkgs/development/tools/misc/lsof/default.nix @@ -1,9 +1,11 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchurl, ncurses }: stdenv.mkDerivation rec { name = "lsof-${version}"; version = "4.89"; + buildInputs = [ ncurses ]; + src = fetchurl { urls = ["ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/lsof_${version}.tar.bz2"] @@ -11,19 +13,30 @@ stdenv.mkDerivation rec { # the tarball is moved after new version is released isOld: "ftp://sunsite.ualberta.ca/pub/Mirror/lsof/" + "${stdenv.lib.optionalString isOld "OLD/"}lsof_${version}.tar.bz2" - ) [ false true ]; + ) [ false true ] + ++ map ( + # the tarball is moved after new version is released + isOld: "http://www.mirrorservice.org/sites/lsof.itap.purdue.edu/pub/tools/unix/lsof/" + + "${stdenv.lib.optionalString isOld "OLD/"}lsof_${version}.tar.bz2" + ) [ false true ] + ; sha256 = "061p18v0mhzq517791xkjs8a5dfynq1418a1mwxpji69zp2jzb41"; }; unpackPhase = "tar xvjf $src; cd lsof_*; tar xvf lsof_*.tar; sourceRoot=$( echo lsof_*/); "; - - preBuild = "sed -i Makefile -e 's/^CFGF=/& -DHASIPv6=1/;';"; + + patches = [ ./dfile.patch ]; configurePhase = '' # Stop build scripts from searching global include paths - export LSOF_INCLUDE=/$(md5sum <(echo $name) | awk '{print $1}') + export LSOF_INCLUDE=${stdenv.cc.libc}/include ./Configure -n ${if stdenv.isDarwin then "darwin" else "linux"} ''; + + preBuild = '' + sed -i Makefile -e 's/^CFGF=/& -DHASIPv6=1/;' -e 's/-lcurses/-lncurses/' + ''; + installPhase = '' mkdir -p $out/bin $out/man/man8 diff --git a/pkgs/development/tools/misc/lsof/dfile.patch b/pkgs/development/tools/misc/lsof/dfile.patch new file mode 100644 index 000000000000..47202d5ebeab --- /dev/null +++ b/pkgs/development/tools/misc/lsof/dfile.patch @@ -0,0 +1,18 @@ +--- lsof_4.89_src/dialects/darwin/libproc/dfile.c 2014-10-30 12:39:46.000000000 +0100 ++++ lsof_4.89_src/dialects/darwin/libproc/dfile_new.c 2016-10-04 13:44:58.000000000 +0200 +@@ -286,13 +286,13 @@ + + #if defined(PROC_FP_GUARDED) + if (extra > 1) +- putchar(`,'); ++ putchar(','); + if (lf->guardflags) { + struct pff_tab *tp; + long gf; + + (void) printf("guard="); +- tp = Pgf_tab; ++ tp = Pff_tab; + gf = lf->guardflags; + while (gf && !FsvFlagX) { + while (tp->nm) { diff --git a/pkgs/development/tools/misc/saleae-logic/default.nix b/pkgs/development/tools/misc/saleae-logic/default.nix index 50e35928bba4..86be86cb6d63 100644 --- a/pkgs/development/tools/misc/saleae-logic/default.nix +++ b/pkgs/development/tools/misc/saleae-logic/default.nix @@ -25,7 +25,7 @@ assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux"; stdenv.mkDerivation rec { pname = "saleae-logic"; - version = "1.2.9"; + version = "1.2.10"; name = "${pname}-${version}"; src = @@ -33,13 +33,13 @@ stdenv.mkDerivation rec { fetchurl { name = "saleae-logic-${version}-32bit.zip"; url = "http://downloads.saleae.com/logic/${version}/Logic%20${version}%20(32-bit).zip"; - sha256 = "0000004xgv8v8l12shimhhn54nn0dldbxz1gpbx92ysd8q8x1q79"; + sha256 = "1dyrj07cgj2fvwi1sk97vady9ri8f8n7mxy9zyzmw9isngs7bmll"; } else if stdenv.system == "x86_64-linux" then fetchurl { name = "saleae-logic-${version}-64bit.zip"; url = "http://downloads.saleae.com/logic/${version}/Logic%20${version}%20(64-bit).zip"; - sha256 = "1d4hmp756ysfk5i1ys4mlkd1czbdw0zqznkzx08pyqk93zc7b16s"; + sha256 = "1skx2pfnic7pyss7c69qb7kg2xvflpxf112xkf9awk516dw1w4h7"; } else abort "Saleae Logic software requires i686-linux or x86_64-linux"; diff --git a/pkgs/development/tools/misc/texinfo/6.1.nix b/pkgs/development/tools/misc/texinfo/6.3.nix index e3001ffba7bd..b75878b8d332 100644 --- a/pkgs/development/tools/misc/texinfo/6.1.nix +++ b/pkgs/development/tools/misc/texinfo/6.3.nix @@ -3,11 +3,11 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "texinfo-6.1"; + name = "texinfo-6.3"; src = fetchurl { url = "mirror://gnu/texinfo/${name}.tar.xz"; - sha256 = "1ll3d0l8izygdxqz96wfr2631kxahifwdknpgsx2090vw963js5c"; + sha256 = "0fpr9kdjjl6nj2pc50k2zr7134hvqz8bi8pfqa7131a9lpzz6v14"; }; buildInputs = [ perl xz ] diff --git a/pkgs/development/tools/misc/travis/default.nix b/pkgs/development/tools/misc/travis/default.nix index adc63ce7c43f..a520c4deb342 100644 --- a/pkgs/development/tools/misc/travis/default.nix +++ b/pkgs/development/tools/misc/travis/default.nix @@ -1,29 +1,14 @@ -{ stdenv, lib, bundlerEnv, ruby }: +{ lib, bundlerEnv, ruby }: -stdenv.mkDerivation rec { - name = "travis-${version}"; - version = env.gems.travis.version; - - env = bundlerEnv { - inherit ruby; - name = "${name}-gems"; - gemset = ./gemset.nix; - gemfile = ./Gemfile; - lockfile = ./Gemfile.lock; - }; - - phases = ["installPhase"]; - - installPhase = '' - mkdir -p $out/bin - ln -s ${env}/bin/travis $out/bin/travis - ''; +bundlerEnv { + inherit ruby; + pname = "travis"; + gemdir = ./.; meta = with lib; { description = "CLI and Ruby client library for Travis CI"; homepage = https://github.com/travis-ci/travis.rb; license = licenses.mit; maintainers = with maintainers; [ zimbatm ]; - platforms = ruby.meta.platforms; }; } diff --git a/pkgs/development/tools/misc/trv/default.nix b/pkgs/development/tools/misc/trv/default.nix index c14a41cc5599..4b83c12bed77 100644 --- a/pkgs/development/tools/misc/trv/default.nix +++ b/pkgs/development/tools/misc/trv/default.nix @@ -2,15 +2,11 @@ , re2_p4, async_extra_p4, sexplib_p4, async_shell, core_extended_p4, async_find , cohttp, uri, tzdata}: -let - ocaml_version = (builtins.parseDrvName ocaml.name).version; - version = "0.1.3"; -in - -assert stdenv.lib.versionOlder "4.02" ocaml_version; +assert stdenv.lib.versionOlder "4.02" ocaml.version; -stdenv.mkDerivation { +stdenv.mkDerivation rec { name = "trv-${version}"; + version = "0.1.3"; src = fetchFromGitHub { owner = "afiniate"; diff --git a/pkgs/development/tools/mypy-lang/default.nix b/pkgs/development/tools/mypy-lang/default.nix index ebce2b86c1f7..6831c7f2b56c 100644 --- a/pkgs/development/tools/mypy-lang/default.nix +++ b/pkgs/development/tools/mypy-lang/default.nix @@ -2,14 +2,14 @@ python35Packages.buildPythonApplication rec { name = "mypy-lang-${version}"; - version = "0.4.3"; + version = "0.4.5"; # Tests not included in pip package. doCheck = false; src = fetchurl { url = "mirror://pypi/m/mypy-lang/${name}.tar.gz"; - sha256 = "11d8195xg8hksyh2qapbv66jvjgfpjwkc61nwljcfq9si144f2nb"; + sha256 = "0x1n6r5in57zv4s75r22smpqxrz7xxp84fnrhkwzbpjnafa3y81f"; }; propagatedBuildInputs = with python35Packages; [ lxml ]; diff --git a/pkgs/development/tools/nimble/default.nix b/pkgs/development/tools/nimble/default.nix index 51fa9cad0d5b..d3248d6219e8 100644 --- a/pkgs/development/tools/nimble/default.nix +++ b/pkgs/development/tools/nimble/default.nix @@ -3,31 +3,29 @@ stdenv.mkDerivation rec { name = "nimble-${version}"; - version = "0.7.4"; + version = "0.7.10"; src = fetchFromGitHub { owner = "nim-lang"; repo = "nimble"; rev = "v${version}"; - sha256 = "1l477f1zlqpc738jg47pz599cwjasgy9jqdsplj3ywd12xfqpc96"; + sha256 = "1bcv8chir73nn6x7q8n3sw2scf3m0x2w9gkkzx162ryivza1nm1r"; }; - buildInputs = [ nim ]; + buildInputs = [ nim openssl ]; patchPhase = '' substituteInPlace src/nimble.nim.cfg --replace "./vendor/nim" "${nim}/share" + echo "--clib:crypto" >> src/nimble.nim.cfg ''; buildPhase = '' - nim c src/nimble + cd src && nim c -d:release nimble ''; installPhase = '' mkdir -p $out/bin - cp src/nimble $out/bin - patchelf --set-rpath "${stdenv.lib.makeLibraryPath [stdenv.cc.libc openssl]}" \ - --add-needed libcrypto.so \ - "$out/bin/nimble" + cp nimble $out/bin ''; dontStrip = true; diff --git a/pkgs/development/tools/ocaml/camlidl/default.nix b/pkgs/development/tools/ocaml/camlidl/default.nix index 7a980c69c183..feedd8835485 100644 --- a/pkgs/development/tools/ocaml/camlidl/default.nix +++ b/pkgs/development/tools/ocaml/camlidl/default.nix @@ -1,13 +1,12 @@ -{stdenv, fetchurl, makeWrapper, gcc, ocaml, ncurses}: +{ stdenv, fetchurl, makeWrapper, ocaml, ncurses }: + let - ocaml_version = (builtins.parseDrvName ocaml.name).version; pname = "camlidl"; - version = "1.05"; webpage = "http://caml.inria.fr/pub/old_caml_site/camlidl/"; in -stdenv.mkDerivation { - +stdenv.mkDerivation rec { name = "${pname}-${version}"; + version = "1.05"; src = fetchurl { url = "http://caml.inria.fr/pub/old_caml_site/distrib/bazar-ocaml/${pname}-${version}.tar.gz"; @@ -19,13 +18,13 @@ stdenv.mkDerivation { preBuild = '' mv config/Makefile.unix config/Makefile substituteInPlace config/Makefile --replace BINDIR=/usr/local/bin BINDIR=$out - substituteInPlace config/Makefile --replace OCAMLLIB=/usr/local/lib/ocaml OCAMLLIB=$out/lib/ocaml/${ocaml_version}/site-lib/camlidl - substituteInPlace config/Makefile --replace CPP=/lib/cpp CPP=${gcc}/bin/cpp - mkdir -p $out/lib/ocaml/${ocaml_version}/site-lib/camlidl/caml + substituteInPlace config/Makefile --replace OCAMLLIB=/usr/local/lib/ocaml OCAMLLIB=$out/lib/ocaml/${ocaml.version}/site-lib/camlidl + substituteInPlace config/Makefile --replace CPP=/lib/cpp CPP=${stdenv.cc}/bin/cpp + mkdir -p $out/lib/ocaml/${ocaml.version}/site-lib/camlidl/caml ''; postInstall = '' - cat >$out/lib/ocaml/${ocaml_version}/site-lib/camlidl/META <<EOF + cat >$out/lib/ocaml/${ocaml.version}/site-lib/camlidl/META <<EOF # Courtesy of GODI description = "Stub generator" version = "${version}" diff --git a/pkgs/development/tools/ocaml/camlp4/4_03.nix b/pkgs/development/tools/ocaml/camlp4/4_03.nix deleted file mode 100644 index f05a556c3886..000000000000 --- a/pkgs/development/tools/ocaml/camlp4/4_03.nix +++ /dev/null @@ -1,45 +0,0 @@ -{stdenv, fetchzip, which, ocaml, ocamlbuild}: -let - ocaml_version = (stdenv.lib.getVersion ocaml); - version = "4.03+1"; - -in - -assert stdenv.lib.versionAtLeast ocaml_version "4.02"; - -stdenv.mkDerivation { - name = "camlp4-${version}"; - src = fetchzip { - url = "https://github.com/ocaml/camlp4/archive/${version}.tar.gz"; - sha256 = "1f2ndch6f1m4fgnxsjb94qbpwjnjgdlya6pard44y6n0dqxi1wsq"; - }; - - buildInputs = [ which ocaml ocamlbuild ]; - - dontAddPrefix = true; - - preConfigure = '' - configureFlagsArray=( - --bindir=$out/bin - --libdir=$out/lib/ocaml/${ocaml_version}/site-lib - --pkgdir=$out/lib/ocaml/${ocaml_version}/site-lib - ) - ''; - - postConfigure = '' - substituteInPlace camlp4/META.in \ - --replace +camlp4 $out/lib/ocaml/${ocaml_version}/site-lib/camlp4 - ''; - - - makeFlags = "all"; - - installTargets = "install install-META"; - - meta = with stdenv.lib; { - description = "A software system for writing extensible parsers for programming languages"; - homepage = https://github.com/ocaml/camlp4; - platforms = ocaml.meta.platforms or []; - }; -} - diff --git a/pkgs/development/tools/ocaml/camlp4/default.nix b/pkgs/development/tools/ocaml/camlp4/default.nix index ae253180aee1..1e1d2eb68eab 100644 --- a/pkgs/development/tools/ocaml/camlp4/default.nix +++ b/pkgs/development/tools/ocaml/camlp4/default.nix @@ -1,37 +1,41 @@ -{stdenv, fetchzip, which, ocaml}: -let - ocaml_version = (stdenv.lib.getVersion ocaml); - version = "4.02+6"; +{ stdenv, fetchzip, which, ocaml, ocamlbuild }: +let param = { + "4.02.3" = { + version = "4.02+6"; + sha256 = "06yl4q0qazl7g25b0axd1gdkfd4qpqzs1gr5fkvmkrcbz113h1hj"; }; + "4.03.0" = { + version = "4.03+1"; + sha256 = "1f2ndch6f1m4fgnxsjb94qbpwjnjgdlya6pard44y6n0dqxi1wsq"; }; + }."${ocaml.version}"; in -assert stdenv.lib.versionAtLeast ocaml_version "4.02"; - -stdenv.mkDerivation { +stdenv.mkDerivation rec { name = "camlp4-${version}"; + inherit (param) version; + src = fetchzip { url = "https://github.com/ocaml/camlp4/archive/${version}.tar.gz"; - sha256 = "06yl4q0qazl7g25b0axd1gdkfd4qpqzs1gr5fkvmkrcbz113h1hj"; + inherit (param) sha256; }; - buildInputs = [ which ocaml ]; + buildInputs = [ which ocaml ocamlbuild ]; dontAddPrefix = true; preConfigure = '' configureFlagsArray=( --bindir=$out/bin - --libdir=$out/lib/ocaml/${ocaml_version}/site-lib - --pkgdir=$out/lib/ocaml/${ocaml_version}/site-lib + --libdir=$out/lib/ocaml/${ocaml.version}/site-lib + --pkgdir=$out/lib/ocaml/${ocaml.version}/site-lib ) ''; postConfigure = '' substituteInPlace camlp4/META.in \ - --replace +camlp4 $out/lib/ocaml/${ocaml_version}/site-lib/camlp4 + --replace +camlp4 $out/lib/ocaml/${ocaml.version}/site-lib/camlp4 ''; - makeFlags = "all"; installTargets = "install install-META"; diff --git a/pkgs/development/tools/ocaml/camlp5/5.15.nix b/pkgs/development/tools/ocaml/camlp5/5.15.nix index e8cda36f101b..2e03bb8025ef 100644 --- a/pkgs/development/tools/ocaml/camlp5/5.15.nix +++ b/pkgs/development/tools/ocaml/camlp5/5.15.nix @@ -1,18 +1,17 @@ {stdenv, fetchurl, ocaml, transitional ? false}: let - ocaml_version = (builtins.parseDrvName ocaml.name).version; pname = "camlp5"; - version = "5.15"; webpage = http://pauillac.inria.fr/~ddr/camlp5/; metafile = ./META; in -assert !stdenv.lib.versionOlder "4.00" ocaml_version; +assert !stdenv.lib.versionOlder "4.00" ocaml.version; -stdenv.mkDerivation { +stdenv.mkDerivation rec { name = "${pname}${if transitional then "_transitional" else ""}-${version}"; + version = "5.15"; src = fetchurl { url = "${webpage}/distrib/src/${pname}-${version}.tgz"; @@ -24,11 +23,11 @@ stdenv.mkDerivation { prefixKey = "-prefix "; preConfigure = "configureFlagsArray=(" + (if transitional then "--transitional" else "--strict") + - " --libdir $out/lib/ocaml/${ocaml_version}/site-lib)"; + " --libdir $out/lib/ocaml/${ocaml.version}/site-lib)"; buildFlags = "world.opt"; - postInstall = "cp ${metafile} $out/lib/ocaml/${ocaml_version}/site-lib/camlp5/META"; + postInstall = "cp ${metafile} $out/lib/ocaml/${ocaml.version}/site-lib/camlp5/META"; meta = { description = "Preprocessor-pretty-printer for OCaml"; diff --git a/pkgs/development/tools/ocaml/camlp5/default.nix b/pkgs/development/tools/ocaml/camlp5/default.nix index bb44bbc8d6ee..3e37de9bd100 100644 --- a/pkgs/development/tools/ocaml/camlp5/default.nix +++ b/pkgs/development/tools/ocaml/camlp5/default.nix @@ -1,7 +1,6 @@ {stdenv, fetchurl, ocaml, transitional ? false}: let - ocaml_version = (builtins.parseDrvName ocaml.name).version; metafile = ./META; in @@ -19,11 +18,11 @@ stdenv.mkDerivation { prefixKey = "-prefix "; preConfigure = "configureFlagsArray=(" + (if transitional then "--transitional" else "--strict") + - " --libdir $out/lib/ocaml/${ocaml_version}/site-lib)"; + " --libdir $out/lib/ocaml/${ocaml.version}/site-lib)"; buildFlags = "world.opt"; - postInstall = "cp ${metafile} $out/lib/ocaml/${ocaml_version}/site-lib/camlp5/META"; + postInstall = "cp ${metafile} $out/lib/ocaml/${ocaml.version}/site-lib/camlp5/META"; meta = with stdenv.lib; { description = "Preprocessor-pretty-printer for OCaml"; diff --git a/pkgs/development/tools/ocaml/cppo/default.nix b/pkgs/development/tools/ocaml/cppo/default.nix index 38b97c006cde..59130bec50e4 100644 --- a/pkgs/development/tools/ocaml/cppo/default.nix +++ b/pkgs/development/tools/ocaml/cppo/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, ocaml, findlib }: +{ stdenv, fetchFromGitHub, ocaml, findlib, ocamlbuild }: let pname = "cppo"; version = "1.3.2"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { sha256 = "06j0zr78f04ahxi2459vjn61z25hkvs4dfj76200ydg3g6ifb3k1"; }; - buildInputs = [ ocaml findlib ]; + buildInputs = [ ocaml findlib ocamlbuild ]; createFindlibDestdir = true; diff --git a/pkgs/development/tools/ocaml/findlib/default.nix b/pkgs/development/tools/ocaml/findlib/default.nix index 5d9757f2666e..1391bc6eb8ab 100644 --- a/pkgs/development/tools/ocaml/findlib/default.nix +++ b/pkgs/development/tools/ocaml/findlib/default.nix @@ -1,9 +1,5 @@ {stdenv, fetchurl, m4, ncurses, ocaml, writeText}: -let - ocaml_version = (builtins.parseDrvName ocaml.name).version; -in - stdenv.mkDerivation rec { name = "ocaml-findlib-${version}"; version = "1.6.1"; @@ -23,7 +19,7 @@ stdenv.mkDerivation rec { configureFlagsArray=( -bindir $out/bin -mandir $out/share/man - -sitelib $out/lib/ocaml/${ocaml_version}/site-lib + -sitelib $out/lib/ocaml/${ocaml.version}/site-lib -config $out/etc/findlib.conf ) ''; @@ -35,10 +31,10 @@ stdenv.mkDerivation rec { setupHook = writeText "setupHook.sh" '' addOCamlPath () { - if test -d "''$1/lib/ocaml/${ocaml_version}/site-lib"; then - export OCAMLPATH="''${OCAMLPATH}''${OCAMLPATH:+:}''$1/lib/ocaml/${ocaml_version}/site-lib/" + if test -d "''$1/lib/ocaml/${ocaml.version}/site-lib"; then + export OCAMLPATH="''${OCAMLPATH}''${OCAMLPATH:+:}''$1/lib/ocaml/${ocaml.version}/site-lib/" fi - export OCAMLFIND_DESTDIR="''$out/lib/ocaml/${ocaml_version}/site-lib/" + export OCAMLFIND_DESTDIR="''$out/lib/ocaml/${ocaml.version}/site-lib/" if test -n "$createFindlibDestdir"; then mkdir -p $OCAMLFIND_DESTDIR fi diff --git a/pkgs/development/tools/ocaml/js_of_ocaml/default.nix b/pkgs/development/tools/ocaml/js_of_ocaml/default.nix index 3f5bd770dcf0..b19f078d9a27 100644 --- a/pkgs/development/tools/ocaml/js_of_ocaml/default.nix +++ b/pkgs/development/tools/ocaml/js_of_ocaml/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, ocaml, findlib, ocaml_lwt, menhir, ocsigen_deriving, camlp4, +{ stdenv, fetchurl, ocaml, findlib, ocaml_lwt, menhir, ocsigen_deriving, ppx_deriving, camlp4, cmdliner, tyxml, reactivedata, cppo, which, base64}: stdenv.mkDerivation { @@ -8,7 +8,7 @@ stdenv.mkDerivation { sha256 = "1dali1akyd4zmkwav0d957ynxq2jj6cc94r4xiaql7ca89ajz4jj"; }; - buildInputs = [ocaml findlib menhir ocsigen_deriving + buildInputs = [ ocaml findlib menhir ocsigen_deriving ppx_deriving cmdliner tyxml reactivedata cppo which base64]; propagatedBuildInputs = [ ocaml_lwt camlp4 ]; diff --git a/pkgs/development/tools/ocaml/merlin/default.nix b/pkgs/development/tools/ocaml/merlin/default.nix index ed441ea8c10b..3c99c3b9580b 100644 --- a/pkgs/development/tools/ocaml/merlin/default.nix +++ b/pkgs/development/tools/ocaml/merlin/default.nix @@ -8,10 +8,10 @@ let then "2.3.1" else - "2.5.0"; + "2.5.1"; hashes = { "2.3.1" = "192jamcc7rmvadlqqsjkzsl6hlgwhg9my1qc89fxh1lmd4qdsrpn"; - "2.5.0" = "1q09mnq4qmh6vfn45qxh2v81l364iazcpjs5dyczmlhln8b25bff"; + "2.5.1" = "0p3hqxawp18q43ws6506cnndi49f3gxzmai0x2qch7h42dgh1cb8"; }; in diff --git a/pkgs/development/tools/ocaml/oasis/0.4.6.nix b/pkgs/development/tools/ocaml/oasis/0.4.6.nix index 6dcf05222320..b5e977d623b3 100644 --- a/pkgs/development/tools/ocaml/oasis/0.4.6.nix +++ b/pkgs/development/tools/ocaml/oasis/0.4.6.nix @@ -1,5 +1,6 @@ -{stdenv, fetchurl, ocaml, findlib, ocaml_data_notation, type_conv, camlp4, - ocamlmod, ocamlify, ounit, expect}: +{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, camlp4 +, ocaml_data_notation, type_conv, ocamlmod, ocamlify, ounit, expect +}: stdenv.mkDerivation { name = "ocaml-oasis-0.4.6"; @@ -13,7 +14,7 @@ stdenv.mkDerivation { buildInputs = [ - ocaml findlib type_conv ocamlmod ocamlify ounit camlp4 + ocaml findlib ocamlbuild type_conv ocamlmod ocamlify ounit camlp4 ]; propagatedBuildInputs = [ ocaml_data_notation ]; diff --git a/pkgs/development/tools/ocaml/oasis/default.nix b/pkgs/development/tools/ocaml/oasis/default.nix index eb6cd35b2561..214a2239688a 100644 --- a/pkgs/development/tools/ocaml/oasis/default.nix +++ b/pkgs/development/tools/ocaml/oasis/default.nix @@ -1,5 +1,6 @@ -{stdenv, fetchurl, ocaml, findlib, ocaml_data_notation, type_conv, camlp4, - ocamlmod, ocamlify, ounit, expect}: +{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, camlp4 +, ocaml_data_notation, type_conv, ocamlmod, ocamlify, ounit, expect +}: stdenv.mkDerivation rec { version = "0.4.7"; @@ -16,7 +17,7 @@ stdenv.mkDerivation rec { buildInputs = [ - ocaml findlib type_conv ocamlmod ocamlify ounit camlp4 + ocaml findlib ocamlbuild type_conv ocamlmod ocamlify ounit camlp4 ]; propagatedBuildInputs = [ ocaml_data_notation ]; diff --git a/pkgs/development/tools/ocaml/ocamlify/default.nix b/pkgs/development/tools/ocaml/ocamlify/default.nix index f3caa42b8fd7..d5dd0c19d987 100644 --- a/pkgs/development/tools/ocaml/ocamlify/default.nix +++ b/pkgs/development/tools/ocaml/ocamlify/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, ocaml, findlib}: +{ stdenv, fetchurl, ocaml, findlib, ocamlbuild }: stdenv.mkDerivation { name = "ocamlify-0.0.2"; @@ -8,7 +8,7 @@ stdenv.mkDerivation { sha256 = "1f0fghvlbfryf5h3j4as7vcqrgfjb4c8abl5y0y5h069vs4kp5ii"; }; - buildInputs = [ocaml findlib]; + buildInputs = [ ocaml findlib ocamlbuild ]; configurePhase = "ocaml setup.ml -configure --prefix $out"; buildPhase = "ocaml setup.ml -build"; diff --git a/pkgs/development/tools/ocaml/ocamlmod/default.nix b/pkgs/development/tools/ocaml/ocamlmod/default.nix index 19ac4701252e..0b92a45153c1 100644 --- a/pkgs/development/tools/ocaml/ocamlmod/default.nix +++ b/pkgs/development/tools/ocaml/ocamlmod/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, ocaml, findlib}: +{ stdenv, fetchurl, ocaml, findlib, ocamlbuild }: stdenv.mkDerivation rec { name = "ocamlmod-${version}"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1w0w8lfyymvk300dv13gvhrddpcyknvyp4g2yvq2vaw7khkhjs9g"; }; - buildInputs = [ocaml findlib]; + buildInputs = [ ocaml findlib ocamlbuild ]; configurePhase = "ocaml setup.ml -configure --prefix $out"; buildPhase = "ocaml setup.ml -build"; diff --git a/pkgs/development/tools/ocaml/ocp-index/default.nix b/pkgs/development/tools/ocaml/ocp-index/default.nix index 5ca1aed810cf..721111f676fb 100644 --- a/pkgs/development/tools/ocaml/ocp-index/default.nix +++ b/pkgs/development/tools/ocaml/ocp-index/default.nix @@ -8,7 +8,6 @@ assert versionAtLeast (getVersion ocpIndent) "1.4.2"; let version = "1.1.4"; - ocaml_version = getVersion ocaml; srcs = { "4.03.0" = { rev = "${version}-4.03"; @@ -27,7 +26,7 @@ let src = fetchFromGitHub ({ owner = "OCamlPro"; repo = "ocp-index"; - } // srcs."${ocaml_version}"); + } // srcs."${ocaml.version}"); in stdenv.mkDerivation { diff --git a/pkgs/development/tools/ocaml/utop/default.nix b/pkgs/development/tools/ocaml/utop/default.nix index 45888924a2ef..b8740bc37932 100644 --- a/pkgs/development/tools/ocaml/utop/default.nix +++ b/pkgs/development/tools/ocaml/utop/default.nix @@ -1,5 +1,5 @@ -{stdenv, fetchurl, ocaml, findlib, lambdaTerm, ocaml_lwt, makeWrapper, - ocaml_react, camomile, zed, cppo, camlp4, ppx_tools +{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, camlp4, ocaml_react +, lambdaTerm, ocaml_lwt, makeWrapper, camomile, zed, cppo, ppx_tools }: stdenv.mkDerivation rec { @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "0hxybkqmrh0sz1yyyrgzdmxp46gda4vk22pv07s0qpfg2dpv56jh"; }; - buildInputs = [ ocaml findlib makeWrapper cppo camlp4 ppx_tools ]; + buildInputs = [ ocaml findlib ocamlbuild makeWrapper cppo camlp4 ppx_tools ]; propagatedBuildInputs = [ lambdaTerm ocaml_lwt ]; diff --git a/pkgs/development/tools/parsing/flex/default.nix b/pkgs/development/tools/parsing/flex/default.nix index 64d5f2f551b1..7ee2e27e60ad 100644 --- a/pkgs/development/tools/parsing/flex/default.nix +++ b/pkgs/development/tools/parsing/flex/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, bison, m4 }: stdenv.mkDerivation rec { - name = "flex-2.6.0"; + name = "flex-2.6.1"; src = fetchurl { - url = "mirror://sourceforge/flex/${name}.tar.bz2"; - sha256 = "1sdqx63yadindzafrq1w31ajblf9gl1c301g068s20s7bbpi3ri4"; + url = "https://github.com/westes/flex/releases/download/v2.6.1/flex-2.6.1.tar.gz"; + sha256 = "0fy14c35yz2m1n1m4f02by3501fn0cca37zn7jp8lpp4b3kgjhrw"; }; buildInputs = [ bison ]; @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { }; meta = { - homepage = http://flex.sourceforge.net/; + homepage = https://github.com/westes/flex; description = "A fast lexical analyser generator"; platforms = stdenv.lib.platforms.unix; }; diff --git a/pkgs/development/tools/reno/default.nix b/pkgs/development/tools/reno/default.nix new file mode 100644 index 000000000000..dbc2401970b9 --- /dev/null +++ b/pkgs/development/tools/reno/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchurl, pythonPackages }: + +pythonPackages.buildPythonApplication rec { + name = "reno-${version}"; + version = "1.8.0"; + + src = fetchurl { + url = "mirror://pypi/r/reno/${name}.tar.gz"; + sha256 = "1pqg0xzcilmyrrnpa87m11xwlvfc94a98s28z9cgddkhw27lg3ps"; + }; + + # Don't know how to make tests pass + doCheck = false; + + # Nothing to strip (python files) + dontStrip = true; + + propagatedBuildInputs = with pythonPackages; [ pbr six pyyaml ]; + buildInputs = with pythonPackages; [ Babel ]; + + meta = with stdenv.lib; { + description = "Release Notes Manager"; + homepage = http://docs.openstack.org/developer/reno/; + license = licenses.asl20; + maintainers = with maintainers; [ guillaumekoenig ]; + }; +} diff --git a/pkgs/development/tools/scalafmt/default.nix b/pkgs/development/tools/scalafmt/default.nix index 295109cda471..a53cb4bc0bd0 100644 --- a/pkgs/development/tools/scalafmt/default.nix +++ b/pkgs/development/tools/scalafmt/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, unzip, jre }: stdenv.mkDerivation rec { - version = "0.3.1"; + version = "0.4.2"; baseName = "scalafmt"; name = "${baseName}-${version}"; src = fetchurl { url = "https://github.com/olafurpg/scalafmt/releases/download/v${version}/${baseName}.tar.gz"; - sha256 = "08jbhwnmcqjq95a4c0wsw7vp2v9apys6czrpjjaw7x1q4vgcnjzv"; + sha256 = "087zj30jnd2zic9glfk7kl8r97bzv34y2qz56iyh75a69dcs6gnk"; }; unpackPhase = "tar xvzf $src"; diff --git a/pkgs/development/tools/simavr/default.nix b/pkgs/development/tools/simavr/default.nix new file mode 100644 index 000000000000..823f93f9ac4f --- /dev/null +++ b/pkgs/development/tools/simavr/default.nix @@ -0,0 +1,35 @@ +{ stdenv, fetchFromGitHub, avrgcclibc, libelf, which, git, pkgconfig, freeglut +, mesa }: + +stdenv.mkDerivation rec { + name = "simavr-${version}"; + version = "1.3"; + enableParallelBuilding = true; + + src = fetchFromGitHub { + owner = "buserror"; + repo = "simavr"; + rev = "51d5fa69f9bc3d62941827faec02f8fbc7e187ab"; + sha256 = "0k8xwzw9i6xsmf98q43fxhphq0wvflvmzqma1n4jd1ym9wi48lfx"; + }; + + buildFlags = "AVR_ROOT=${avrgcclibc}/avr SIMAVR_VERSION=${version}"; + installFlags = buildFlags + " DESTDIR=$(out)"; + + postFixup = '' + target="$out/bin/simavr" + patchelf --set-rpath "$(patchelf --print-rpath "$target"):$out/lib" "$target" + ''; + + buildInputs = [ which git avrgcclibc libelf pkgconfig freeglut mesa ]; + + meta = with stdenv.lib; { + description = "A lean and mean Atmel AVR simulator"; + homepage = https://github.com/buserror/simavr; + license = licenses.gpl3; + platforms = platforms.linux; + maintainers = with maintainers; [ goodrone ]; + }; + +} + diff --git a/pkgs/development/tools/spirv-tools/default.nix b/pkgs/development/tools/spirv-tools/default.nix new file mode 100644 index 000000000000..b0c15a6df4b1 --- /dev/null +++ b/pkgs/development/tools/spirv-tools/default.nix @@ -0,0 +1,42 @@ +{ stdenv, fetchFromGitHub, cmake, python }: + +let + +spirv_sources = { + # `vulkan-loader` requires a specific version of `spirv-tools` and `spirv-headers` as specified in + # `<vulkan-loader-repo>/spirv-tools_revision`. + tools = fetchFromGitHub { + owner = "KhronosGroup"; + repo = "SPIRV-Tools"; + rev = "923a4596b44831a07060df45caacb522613730c9"; + sha256 = "0hmgng2sv34amfsag3ya09prnv1w535djwlzfn8h2vh430vgawxa"; + }; + headers = fetchFromGitHub { + owner = "KhronosGroup"; + repo = "SPIRV-Headers"; + rev = "33d41376d378761ed3a4c791fc4b647761897f26"; + sha256 = "1s103bpi3g6hhq453qa4jbabfkyxxpf9vn213j8k4vm26lsi8hs2"; + }; +}; + +in + +stdenv.mkDerivation rec { + name = "spirv-tools-${version}"; + version = "2016-07-18"; + + src = spirv_sources.tools; + patchPhase = ''ln -sv ${spirv_sources.headers} external/spirv-headers''; + enableParallelBuilding = true; + + buildInputs = [ cmake python ]; + + passthru = { + headers = spirv_sources.headers; + }; + + meta = with stdenv.lib; { + inherit (src.meta) homepage; + description = "The SPIR-V Tools project provides an API and commands for processing SPIR-V modules."; + }; +} diff --git a/pkgs/development/tools/vagrant/default.nix b/pkgs/development/tools/vagrant/default.nix index c9987aea8325..062873f0ccd4 100644 --- a/pkgs/development/tools/vagrant/default.nix +++ b/pkgs/development/tools/vagrant/default.nix @@ -1,10 +1,8 @@ { stdenv, fetchurl, fetchpatch, dpkg, curl, libarchive, openssl, ruby, buildRubyGem, libiconv -, libxml2, libxslt, makeWrapper }: - -assert stdenv.system == "x86_64-linux" || stdenv.system == "i686-linux"; +, libxml2, libxslt, makeWrapper, p7zip, xar, gzip, cpio }: let - version = "1.8.5"; + version = "1.8.6"; rake = buildRubyGem { inherit ruby; gemName = "rake"; @@ -12,9 +10,16 @@ let sha256 = "1rn03rqlf1iv6n87a78hkda2yqparhhaivfjpizblmxvlw2hk5r8"; }; + url = if stdenv.isLinux + then "https://releases.hashicorp.com/vagrant/${version}/vagrant_${version}_${arch}.deb" + else if stdenv.isDarwin + then "https://releases.hashicorp.com/vagrant/${version}/vagrant_${version}.dmg" + else "system ${stdenv.system} not supported"; + sha256 = { - "x86_64-linux" = "1na5hxm3ilx268hk68dpgkks1jjh9q7p3ksjx8ssiijq6df47vih"; - "i686-linux" = "16psr5s0azpzavizh74085z7wygkfs4ribsfalvbd96phkrkp2wp"; + "x86_64-linux" = "1nkhf160hcl02yvafj6hq53j204qqxyvxjngnmf4f5md8dmkpn76"; + "i686-linux" = "0mr4pn7nggjdsqyxh1z2mflvvmpzhbxh5gax501d2hi8xr0y68df"; + "x86_64-darwin" = "1nd2adxwhs2vwmi5vw2z720ny4q9rpj8i4dlcdxzbyli7h8cs5mr"; }."${stdenv.system}" or (throw "system ${stdenv.system} not supported"); arch = builtins.replaceStrings ["-linux"] [""] stdenv.system; @@ -24,36 +29,37 @@ in stdenv.mkDerivation rec { inherit version; src = fetchurl { - url = "https://releases.hashicorp.com/vagrant/${version}/vagrant_${version}_${arch}.deb"; - inherit sha256; + inherit url sha256; }; - # Remove the patchFlags/patches when 1.8.6 is released - patchFlags = [ - "-p1" - "-d ./opt/vagrant/embedded/gems/gems/vagrant-${version}" - ]; - patches = [ - (fetchpatch { - url = "https://patch-diff.githubusercontent.com/raw/mitchellh/vagrant/pull/7611.diff"; - name = "fix_incorrect_ssh_keys_permissions.patch"; - sha256 = "0lqa9xpg79ggp9fc8gzb5lv675ydj2p8l55bx4hs1hf8zz2c1hjf"; - }) - ]; - meta = with stdenv.lib; { description = "A tool for building complete development environments"; homepage = http://vagrantup.com; license = licenses.mit; - maintainers = with maintainers; [ lovek323 globin jgeerds ]; - platforms = platforms.linux; + maintainers = with maintainers; [ lovek323 globin jgeerds kamilchm ]; + platforms = with platforms; linux ++ darwin; }; - buildInputs = [ makeWrapper ]; + buildInputs = [ makeWrapper ] + ++ stdenv.lib.optional stdenv.isDarwin [ p7zip xar gzip cpio ]; - unpackPhase = '' - ${dpkg}/bin/dpkg-deb -x "$src" . - ''; + unpackPhase = if stdenv.isLinux + then '' + ${dpkg}/bin/dpkg-deb -x "$src" . + '' + else '' + 7z x $src + cd Vagrant/ + xar -xf Vagrant.pkg + cd core.pkg/ + cat Payload | gzip -d - | cpio -id + + # move unpacked directories to match unpacked .deb from linux, + # so installPhase can be shared + mkdir -p opt/vagrant/ usr/ + mv embedded opt/vagrant/embedded + mv bin usr/bin + ''; buildPhase = ""; @@ -123,5 +129,10 @@ in stdenv.mkDerivation rec { postFixup = '' chmod +x "$out/opt/vagrant/embedded/gems/gems/bundler-1.12.5/lib/bundler/templates/Executable" chmod +x "$out/opt/vagrant/embedded/gems/gems/vagrant-$version/plugins/provisioners/salt/bootstrap-salt.sh" - ''; + '' + + (stdenv.lib.optionalString stdenv.isDarwin '' + # undo the directory movement done in unpackPhase + mv $out/opt/vagrant/embedded $out/ + rm -r $out/opt + ''); } diff --git a/pkgs/development/tools/valadoc/default.nix b/pkgs/development/tools/valadoc/default.nix new file mode 100644 index 000000000000..7d4e61c87995 --- /dev/null +++ b/pkgs/development/tools/valadoc/default.nix @@ -0,0 +1,24 @@ +{stdenv, fetchgit, gnome3, automake, autoconf, which, libtool, pkgconfig, graphviz, glib, gobjectIntrospection, expat}: +stdenv.mkDerivation rec { + version = "2016-10-09"; + name = "valadoc-unstable-${version}"; + + src = fetchgit { + url = "git://git.gnome.org/valadoc"; + rev = "37756970379d1363453562e9f2af2c354d172fb4"; + sha256 = "1s9sf6f0srh5sqqikswnb3bgwv5s1r9bd4n10hs2lzfmh7z227qb"; + }; + + nativeBuildInputs = [ automake autoconf which gnome3.vala libtool pkgconfig gobjectIntrospection ]; + buildInputs = [ graphviz glib gnome3.libgee expat ]; + + preConfigure = "./autogen.sh"; + + meta = with stdenv.lib; { + description = "valadoc is a documentation generator for generating API documentation from Vala source code"; + homepage = http://valadoc.org; + license = stdenv.lib.licenses.gpl2; + maintainers = with maintainers; [ sternenseemann ]; + platforms = with platforms; linux; + }; +} diff --git a/pkgs/development/tools/xcbuild/default.nix b/pkgs/development/tools/xcbuild/default.nix new file mode 100644 index 000000000000..e313672aea3f --- /dev/null +++ b/pkgs/development/tools/xcbuild/default.nix @@ -0,0 +1,43 @@ +{ stdenv, cmake, fetchFromGitHub, zlib, libxml2, libpng, CoreServices, CoreGraphics, ImageIO }: + +let + googletest = fetchFromGitHub { + owner = "google"; + repo = "googletest"; + rev = "43359642a1c16ad3f4fc575c7edd0cb935810815"; + sha256 = "0y4xaah62fjr3isaryc3vfz3mn9xflr00vchdimj8785milxga4q"; + }; + + linenoise = fetchFromGitHub { + owner = "antirez"; + repo = "linenoise"; + rev = "c894b9e59f02203dbe4e2be657572cf88c4230c3"; + sha256 = "0wasql7ph5g473zxhc2z47z3pjp42q0dsn4gpijwzbxawid71b4w"; + }; +in stdenv.mkDerivation rec { + name = "xcbuild-${stdenv.lib.substring 0 8 version}"; + version = "49f8a5923f1381f87ac03ad4c1b138d1d2b74369"; + + src = fetchFromGitHub { + owner = "facebook"; + repo = "xcbuild"; + rev = version; + sha256 = "0l107xkh7dab2xc58dqyrrhpd1gp12cpzh0wrx0i9jbh0idbwnk0"; + }; + + prePatch = '' + rmdir ThirdParty/* + cp -r --no-preserve=all ${googletest} ThirdParty/googletest + cp -r --no-preserve=all ${linenoise} ThirdParty/linenoise + ''; + + enableParallelBuilding = true; + + # TODO: instruct cmake not to put it in /usr, rather than cleaning up + postInstall = '' + mv $out/usr/* $out + rmdir $out/usr + ''; + + buildInputs = [ cmake zlib libxml2 libpng CoreServices CoreGraphics ImageIO ]; +}
\ No newline at end of file |