diff options
Diffstat (limited to 'pkgs/development/tools')
32 files changed, 409 insertions, 110 deletions
diff --git a/pkgs/development/tools/analysis/flow/default.nix b/pkgs/development/tools/analysis/flow/default.nix index 2104e532f28..042b338b2b1 100644 --- a/pkgs/development/tools/analysis/flow/default.nix +++ b/pkgs/development/tools/analysis/flow/default.nix @@ -4,14 +4,14 @@ with lib; stdenv.mkDerivation rec { - version = "0.69.0"; + version = "0.70.0"; name = "flow-${version}"; src = fetchFromGitHub { owner = "facebook"; repo = "flow"; rev = "v${version}"; - sha256 = "11n8g471zgazcnzsxcw45gzzn63xanw91wj5xwsx8i2cp7wg9g7g"; + sha256 = "1pydmfs7xxrqjdnidp2nagwpk2d0vf5nx3m821plld3vbyh22b76"; }; installPhase = '' diff --git a/pkgs/development/tools/analysis/retdec/default.nix b/pkgs/development/tools/analysis/retdec/default.nix index f88546163d4..a4c62e6fc32 100644 --- a/pkgs/development/tools/analysis/retdec/default.nix +++ b/pkgs/development/tools/analysis/retdec/default.nix @@ -116,5 +116,6 @@ in stdenv.mkDerivation rec { homepage = https://retdec.com; license = licenses.mit; maintainers = with maintainers; [ dtzWill ]; + broken = withPEPatterns; # retdec-full is broken, 2018-04-11 }; } diff --git a/pkgs/development/tools/apktool/default.nix b/pkgs/development/tools/apktool/default.nix index d1320960f39..65211ca088b 100644 --- a/pkgs/development/tools/apktool/default.nix +++ b/pkgs/development/tools/apktool/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { name = "apktool-${version}"; - version = "2.3.1"; + version = "2.3.2"; src = fetchurl { urls = [ "https://bitbucket.org/iBotPeaches/apktool/downloads/apktool_${version}.jar" "https://github.com/iBotPeaches/Apktool/releases/download/v${version}/apktool_${version}.jar" ]; - sha256 = "01xj2hivwwp3msvv0psxyxrzg95vj2ny56l3n90glhwznn7l60ai"; + sha256 = "01sjrc3fwkpkr8b4w1i9amyiix02b29n0w2zcrw5sdj91n8vm3b4"; }; phases = [ "installPhase" ]; diff --git a/pkgs/development/tools/build-managers/buildbot/worker.nix b/pkgs/development/tools/build-managers/buildbot/worker.nix index 75e6bb0404b..59d3c93bb87 100644 --- a/pkgs/development/tools/build-managers/buildbot/worker.nix +++ b/pkgs/development/tools/build-managers/buildbot/worker.nix @@ -3,11 +3,11 @@ pythonPackages.buildPythonApplication (rec { name = "${pname}-${version}"; pname = "buildbot-worker"; - version = "1.0.0"; + version = "1.1.0"; src = pythonPackages.fetchPypi { inherit pname version; - sha256 = "0ws31ypmksah1c83h4npwg560p8v7n9j6l94p79y5pispjsgzqzl"; + sha256 = "0hpiawf0dq8phsvihlcx9bpl70n7s3rhcgbgma36bark6sgr4y8y"; }; buildInputs = with pythonPackages; [ setuptoolsTrial mock ]; diff --git a/pkgs/development/tools/build-managers/gradle/default.nix b/pkgs/development/tools/build-managers/gradle/default.nix index 5e8f14c5f84..fbbddbd0fcb 100644 --- a/pkgs/development/tools/build-managers/gradle/default.nix +++ b/pkgs/development/tools/build-managers/gradle/default.nix @@ -52,12 +52,12 @@ rec { }; gradle_latest = gradleGen rec { - name = "gradle-4.6"; + name = "gradle-4.7"; nativeVersion = "0.14"; src = fetchurl { url = "http://services.gradle.org/distributions/${name}-bin.zip"; - sha256 = "05drn7a9d2blbmd3l0443bpf5qzf5frwnl9ww0bha1qfng95zgcq"; + sha256 = "016vvjvk3gfasv3h6dxxp48kp9v4ariqj280bijn835mr1yhi9gw"; }; }; diff --git a/pkgs/development/tools/build-managers/gup/build.nix b/pkgs/development/tools/build-managers/gup/build.nix deleted file mode 100644 index a9af037bb81..00000000000 --- a/pkgs/development/tools/build-managers/gup/build.nix +++ /dev/null @@ -1,16 +0,0 @@ -# NOTE: this file is copied from the upstream repository for this package. -# Please submit any changes you make here to https://github.com/timbertson/gup/ - -{ stdenv, lib, python, which, pychecker ? null }: -{ src, version, meta ? {} }: -stdenv.mkDerivation { - inherit src meta; - name = "gup-${version}"; - buildInputs = lib.remove null [ python which pychecker ]; - SKIP_PYCHECKER = pychecker == null; - buildPhase = "make python"; - installPhase = '' - mkdir $out - cp -r python/bin $out/bin - ''; -} diff --git a/pkgs/development/tools/build-managers/gup/default.nix b/pkgs/development/tools/build-managers/gup/default.nix index 8d1ad4490e9..f6d5b7b9b59 100644 --- a/pkgs/development/tools/build-managers/gup/default.nix +++ b/pkgs/development/tools/build-managers/gup/default.nix @@ -1,21 +1,38 @@ -{ stdenv, fetchFromGitHub, lib, python, which }: -let +{ stdenv, fetchFromGitHub, nix-update-source, lib, python, which, pychecker ? null }: +stdenv.mkDerivation rec { version = "0.7.0"; src = fetchFromGitHub { - sha256 = "1pwnmlq2pgkkln9sgz4wlb9dqlqw83bkf105qljnlvggc21zm3pv"; - rev = "version-${version}"; - repo = "gup"; owner = "timbertson"; + repo = "gup"; + rev = "version-0.7.0"; + sha256 = "1pwnmlq2pgkkln9sgz4wlb9dqlqw83bkf105qljnlvggc21zm3pv"; + }; + name = "gup-${version}"; + buildInputs = lib.remove null [ python which pychecker ]; + SKIP_PYCHECKER = pychecker == null; + buildPhase = "make python"; + installPhase = '' + mkdir $out + cp -r python/bin $out/bin + ''; + passthru.updateScript = '' + set -e + echo + cd ${toString ./.} + ${nix-update-source}/bin/nix-update-source \ + --prompt version \ + --replace-attr version \ + --set owner timbertson \ + --set repo gup \ + --set type fetchFromGitHub \ + --set rev 'version-{version}' \ + --modify-nix default.nix + ''; + meta = { + inherit (src.meta) homepage; + description = "A better make, inspired by djb's redo"; + license = stdenv.lib.licenses.lgpl2Plus; + maintainers = [ stdenv.lib.maintainers.timbertson ]; + platforms = stdenv.lib.platforms.all; }; -in -import ./build.nix - { inherit stdenv lib python which; } - { inherit src version; - meta = { - inherit (src.meta) homepage; - description = "A better make, inspired by djb's redo"; - license = stdenv.lib.licenses.lgpl2Plus; - maintainers = [ stdenv.lib.maintainers.timbertson ]; - platforms = stdenv.lib.platforms.all; - }; - } +} diff --git a/pkgs/development/tools/cloudfoundry-cli/default.nix b/pkgs/development/tools/cloudfoundry-cli/default.nix index fc085b3e5ea..22c2f077418 100644 --- a/pkgs/development/tools/cloudfoundry-cli/default.nix +++ b/pkgs/development/tools/cloudfoundry-cli/default.nix @@ -2,17 +2,17 @@ buildGoPackage rec { name = "cloudfoundry-cli-${version}"; - version = "6.32.0"; + version = "6.36.1"; goPackagePath = "code.cloudfoundry.org/cli"; subPackages = [ "." ]; src = fetchFromGitHub { + owner = "cloudfoundry"; + repo = "cli"; rev = "v${version}"; - owner = "cloudfoundry-attic"; - repo = "cli-with-i18n"; - sha256 = "16r8zvahn4b98krmyb8zq9370i6572dhz88bfxb3fnddcv6zy1ng"; + sha256 = "19inl7qs2acs59p3gnl5zdsxym0wp2rn05q0zfg7rwf5sjh68amp"; }; outputs = [ "out" ]; diff --git a/pkgs/development/tools/doctl/default.nix b/pkgs/development/tools/doctl/default.nix index 14c5eab8cd6..be852066bfc 100644 --- a/pkgs/development/tools/doctl/default.nix +++ b/pkgs/development/tools/doctl/default.nix @@ -4,8 +4,8 @@ buildGoPackage rec { name = "doctl-${version}"; version = "${major}.${minor}.${patch}"; major = "1"; - minor = "7"; - patch = "2"; + minor = "8"; + patch = "0"; goPackagePath = "github.com/digitalocean/doctl"; excludedPackages = ''\(doctl-gen-doc\|install-doctl\|release-doctl\)''; @@ -19,9 +19,9 @@ buildGoPackage rec { src = fetchFromGitHub { owner = "digitalocean"; - repo = "doctl"; - rev = "v${version}"; - sha256 = "1nkyl5274mbdf4j60f2sj0kvvppcpccf7xws11c9vj9c3zxs7r97"; + repo = "doctl"; + rev = "v${version}"; + sha256 = "1h94qagbni8cvzdparmgx3m9qcnbwbk0kjlvy9jzxfd3vcpbg38j"; }; meta = { diff --git a/pkgs/development/tools/gnulib/default.nix b/pkgs/development/tools/gnulib/default.nix index 4ca3bf5e074..eeaec8eb033 100644 --- a/pkgs/development/tools/gnulib/default.nix +++ b/pkgs/development/tools/gnulib/default.nix @@ -9,8 +9,12 @@ stdenv.mkDerivation { sha256 = "0sifr3bkmhyr5s6ljgfyr0fw6w49ajf11rlp1r797f3r3r6j9w4k"; }; - installPhase = "mkdir -p $out; mv * $out/"; dontFixup = true; + # no "make install", gnulib is a collection of source code + installPhase = '' + mkdir -p $out; mv * $out/ + ln -s $out/lib $out/include + ''; meta = { homepage = http://www.gnu.org/software/gnulib/; diff --git a/pkgs/development/tools/hcloud/default.nix b/pkgs/development/tools/hcloud/default.nix index e56502a4ad0..c4f6e2565f6 100644 --- a/pkgs/development/tools/hcloud/default.nix +++ b/pkgs/development/tools/hcloud/default.nix @@ -2,14 +2,14 @@ buildGoPackage rec { name = "hcloud-${version}"; - version = "1.3.0"; + version = "1.4.0"; goPackagePath = "github.com/hetznercloud/cli"; src = fetchFromGitHub { owner = "hetznercloud"; repo = "cli"; rev = "v${version}"; - sha256 = "1216qz1kk38vkvfrznjwb65vsbhscqvvrsbp2i6pnf0i85p00pqm"; + sha256 = "1mysw091ddi3abijvciyy73ff31vqq7zb37w30sp3vhm5vq38nn2"; }; buildFlagsArray = [ "-ldflags=" "-X github.com/hetznercloud/cli.Version=${version}" ]; diff --git a/pkgs/development/tools/imatix_gsl/default.nix b/pkgs/development/tools/imatix_gsl/default.nix index 61f211b9580..1d7b22ac5ee 100644 --- a/pkgs/development/tools/imatix_gsl/default.nix +++ b/pkgs/development/tools/imatix_gsl/default.nix @@ -25,5 +25,6 @@ stdenv.mkDerivation rec { description = "A universal code generator"; platforms = platforms.unix; maintainers = [ maintainers.moosingin3space ]; + broken = stdenv.isLinux; # 2018-04-10 }; } diff --git a/pkgs/development/tools/java/visualvm/default.nix b/pkgs/development/tools/java/visualvm/default.nix index a71ee53dced..2eeefb23e04 100644 --- a/pkgs/development/tools/java/visualvm/default.nix +++ b/pkgs/development/tools/java/visualvm/default.nix @@ -1,27 +1,27 @@ -{ stdenv, fetchzip, lib, makeWrapper, jdk, gtk2, gawk }: +{ stdenv, fetchzip, lib, makeWrapper, makeDesktopItem, jdk, gtk2, gawk }: stdenv.mkDerivation rec { - name = "visualvm-1.3.9"; + version = "1.4"; + name = "visualvm-${version}"; src = fetchzip { - url = "https://github.com/visualvm/visualvm.src/releases/download/1.3.9/visualvm_139.zip"; - sha256 = "1gkdkxssh51jczhgv680i42jjrlia1vbpcqhxvf45xcq9xj95bm5"; + url = "https://github.com/visualvm/visualvm.src/releases/download/${version}/visualvm_${builtins.replaceStrings ["."] [""] version}.zip"; + sha256 = "0qpkal3yc8c8di4dmdglq54a4m7hciqximn5n6hwx2zqnfwx909z"; + }; + + desktopItem = makeDesktopItem { + name = "visualvm"; + exec = "visualvm"; + comment = "Java Troubleshooting Tool"; + desktopName = "VisualVM"; + genericName = "Java Troubleshooting Tool"; + categories = "Application;Development;"; }; nativeBuildInputs = [ makeWrapper ]; installPhase = '' - rm bin/visualvm.exe - rm platform/lib/nbexec64.exe - rm platform/lib/nbexec.exe - rm profiler/lib/deployed/jdk15/windows-amd64/profilerinterface.dll - rm profiler/lib/deployed/jdk15/windows/profilerinterface.dll - rm profiler/lib/deployed/jdk16/windows-amd64/profilerinterface.dll - rm profiler/lib/deployed/jdk16/windows/profilerinterface.dll - rm platform/modules/lib/amd64/jnidispatch-410.dll - rm platform/modules/lib/x86/jnidispatch-410.dll - rm platform/lib/nbexec.dll - rm platform/lib/nbexec64.dll + find . -type f -name "*.dll" -o -name "*.exe" -delete; substituteInPlace etc/visualvm.conf \ --replace "#visualvm_jdkhome=" "visualvm_jdkhome=" \ @@ -50,6 +50,6 @@ stdenv.mkDerivation rec { homepage = https://visualvm.java.net/; license = licenses.gpl2ClasspathPlus; platforms = platforms.all; - maintainers = with maintainers; [ michalrus ]; + maintainers = with maintainers; [ michalrus moaxcp ]; }; } diff --git a/pkgs/development/tools/jbake/default.nix b/pkgs/development/tools/jbake/default.nix index 70b8e7f2663..f4fb1b5a9e9 100644 --- a/pkgs/development/tools/jbake/default.nix +++ b/pkgs/development/tools/jbake/default.nix @@ -1,20 +1,20 @@ -{ stdenv, fetchzip, jre }: +{ stdenv, fetchzip, makeWrapper, jre }: stdenv.mkDerivation rec { - version = "2.6.0"; + version = "2.6.1"; name = "jbake-${version}"; src = fetchzip { url = "https://dl.bintray.com/jbake/binary/${name}-bin.zip"; - sha256 = "1k71rz82fwyi51xhyghg8laz794xyz06d5apmxa9psy7yz184ylk"; + sha256 = "0zlh2azmv8gj3c4d4ndivar31wd42nmvhxq6xhn09cib9kffxbc7"; }; - buildInputs = [ jre ]; + buildInputs = [ makeWrapper jre ]; installPhase = '' - substituteInPlace bin/jbake --replace "java" "${jre}/bin/java" mkdir -p $out cp -vr * $out + wrapProgram $out/bin/jbake --set JAVA_HOME "${jre}" ''; meta = with stdenv.lib; { diff --git a/pkgs/development/tools/libsigrokdecode/default.nix b/pkgs/development/tools/libsigrokdecode/default.nix index 0099e574e4a..9fd70cb60c9 100644 --- a/pkgs/development/tools/libsigrokdecode/default.nix +++ b/pkgs/development/tools/libsigrokdecode/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, glib, python3, libsigrok, check }: stdenv.mkDerivation rec { - name = "libsigrokdecode-0.5.0"; + name = "libsigrokdecode-0.5.1"; src = fetchurl { url = "https://sigrok.org/download/source/libsigrokdecode/${name}.tar.gz"; - sha256 = "1hfigfj1976qk11kfsgj75l20qvyq8c9p2h4mjw23d59rsg5ga2a"; + sha256 = "07mmb6s62ncqqgsc6szilj2yxixf6gg99ggbzsjlbhp4b9aqnga9"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/tools/misc/autoconf-archive/default.nix b/pkgs/development/tools/misc/autoconf-archive/default.nix index 0225a3f8141..cb64a4c876b 100644 --- a/pkgs/development/tools/misc/autoconf-archive/default.nix +++ b/pkgs/development/tools/misc/autoconf-archive/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "autoconf-archive-${version}"; - version = "2017.09.28"; + version = "2018.03.13"; src = fetchurl { url = "mirror://gnu/autoconf-archive/autoconf-archive-${version}.tar.xz"; - sha256 = "00gsh9hkrgg291my98plkrwlcpxkfrpq64pglf18kciqbf2bb7sw"; + sha256 = "0ng1lvpijf3kv7w7nb1shqs23vp0398yicyvkf9lsk56kw6zjxb1"; }; buildInputs = [ xz ]; diff --git a/pkgs/development/tools/misc/avarice/default.nix b/pkgs/development/tools/misc/avarice/default.nix index ca6cb14c2a4..a8f6426a3b7 100644 --- a/pkgs/development/tools/misc/avarice/default.nix +++ b/pkgs/development/tools/misc/avarice/default.nix @@ -18,6 +18,7 @@ stdenv.mkDerivation rec { homepage = https://sourceforge.net/projects/avarice/files/avarice/; maintainers = [ stdenv.lib.maintainers.smironov ]; platforms = stdenv.lib.platforms.linux; + broken = true; # 2018-04-10 }; } diff --git a/pkgs/development/tools/misc/binutils/default.nix b/pkgs/development/tools/misc/binutils/default.nix index 5c88902a68c..123f679d779 100644 --- a/pkgs/development/tools/misc/binutils/default.nix +++ b/pkgs/development/tools/misc/binutils/default.nix @@ -1,5 +1,5 @@ { stdenv, buildPackages -, fetchurl, zlib +, fetchurl, zlib, autoreconfHook264 , buildPlatform, hostPlatform, targetPlatform , noSysDirs, gold ? true, bison ? null }: @@ -64,12 +64,16 @@ stdenv.mkDerivation rec { # https://sourceware.org/bugzilla/show_bug.cgi?id=22868 ./gold-symbol-visibility.patch - ]; + ] ++ stdenv.lib.optional targetPlatform.isiOS ./support-ios.patch; outputs = [ "out" "info" "man" ]; depsBuildBuild = [ buildPackages.stdenv.cc ]; - nativeBuildInputs = [ bison ]; + nativeBuildInputs = [ + bison + ] ++ stdenv.lib.optionals targetPlatform.isiOS [ + autoreconfHook264 + ]; buildInputs = [ zlib ]; inherit noSysDirs; diff --git a/pkgs/development/tools/misc/binutils/support-ios.patch b/pkgs/development/tools/misc/binutils/support-ios.patch new file mode 100644 index 00000000000..919a3920727 --- /dev/null +++ b/pkgs/development/tools/misc/binutils/support-ios.patch @@ -0,0 +1,112 @@ +diff --git a/bfd/config.bfd b/bfd/config.bfd +index f04a993f06..3357022f35 100644 +--- a/bfd/config.bfd ++++ b/bfd/config.bfd +@@ -238,7 +238,7 @@ case "${targ}" in + + # START OF targmatch.h + #ifdef BFD64 +- aarch64-*-darwin*) ++ aarch64-*-darwin* | aarch64-*-ios*) + targ_defvec=aarch64_mach_o_vec + targ_selvecs="arm_mach_o_vec mach_o_le_vec mach_o_be_vec mach_o_fat_vec" + targ_archs="$targ_archs bfd_i386_arch bfd_powerpc_arch bfd_rs6000_arch" +@@ -358,7 +358,7 @@ case "${targ}" in + targ_selvecs=arc_elf32_be_vec + ;; + +- arm-*-darwin*) ++ arm-*-darwin* | arm-*-ios*) + targ_defvec=arm_mach_o_vec + targ_selvecs="mach_o_le_vec mach_o_be_vec mach_o_fat_vec" + targ_archs="$targ_archs bfd_i386_arch bfd_powerpc_arch bfd_rs6000_arch" +diff --git a/configure.ac b/configure.ac +index aae94501e4..4b1121e0d1 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -510,7 +510,7 @@ if test x$enable_libgomp = x ; then + ;; + *-*-solaris2* | *-*-hpux11*) + ;; +- *-*-darwin* | *-*-aix*) ++ *-*-darwin* | *-*-ios* | *-*-aix*) + ;; + nvptx*-*-*) + ;; +@@ -706,7 +706,7 @@ case "${target}" in + ;; + x86_64-*-darwin[[912]]*) + ;; +- *-*-darwin*) ++ *-*-darwin* | *-*-ios*) + noconfigdirs="$noconfigdirs target-libffi" + ;; + *-*-netware*) +@@ -788,7 +788,7 @@ esac + # Disable the go frontend on systems where it is known to not work. Please keep + # this in sync with contrib/config-list.mk. + case "${target}" in +-*-*-darwin* | *-*-cygwin* | *-*-mingw*) ++*-*-darwin* | *-*-ios* | *-*-cygwin* | *-*-mingw*) + unsupported_languages="$unsupported_languages go" + ;; + esac +@@ -797,7 +797,7 @@ esac + # For testing, you can easily override this with --enable-libgo. + if test x$enable_libgo = x; then + case "${target}" in +- *-*-darwin*) ++ *-*-darwin* | *-*-ios*) + # PR 46986 + noconfigdirs="$noconfigdirs target-libgo" + ;; +@@ -916,11 +916,11 @@ esac + case "${target}" in + *-*-chorusos) + ;; +- aarch64-*-darwin*) ++ aarch64-*-darwin* | aarch64-*-ios*) + noconfigdirs="$noconfigdirs ld gas gdb gprof" + noconfigdirs="$noconfigdirs sim target-rda" + ;; +- arm-*-darwin*) ++ arm-*-darwin* | arm-*-ios*) + noconfigdirs="$noconfigdirs ld gas gdb gprof" + noconfigdirs="$noconfigdirs sim target-rda" + ;; +@@ -936,7 +936,7 @@ case "${target}" in + noconfigdirs="$noconfigdirs ld gas gprof" + noconfigdirs="$noconfigdirs sim target-rda" + ;; +- *-*-darwin*) ++ *-*-darwin* | *-*-ios*) + noconfigdirs="$noconfigdirs ld gas gdb gprof" + noconfigdirs="$noconfigdirs sim target-rda" + ;; +@@ -1226,7 +1226,7 @@ case "${host}" in + hppa*-*) + host_makefile_frag="config/mh-pa" + ;; +- *-*-darwin*) ++ *-*-darwin* | *-*-ios*) + host_makefile_frag="config/mh-darwin" + ;; + powerpc-*-aix*) +@@ -1708,7 +1708,7 @@ ACX_ELF_TARGET_IFELSE([# ELF platforms build the lto-plugin always. + # warn during gcc/ subconfigure; unless you're bootstrapping with + # -flto it won't be needed until after installation anyway. + case $target in +- *-cygwin* | *-mingw* | *-apple-darwin* | *djgpp*) ;; ++ *-cygwin* | *-mingw* | *-apple-darwin* | *-apple-ios* | *djgpp*) ;; + *) if test x"$enable_lto" = x"yes"; then + AC_MSG_ERROR([LTO support is not enabled for this target.]) + fi +@@ -2590,7 +2590,7 @@ rm -f conftest* + # Decide which environment variable is used to find dynamic libraries. + case "${host}" in + *-*-hpux*) RPATH_ENVVAR=SHLIB_PATH ;; +- *-*-darwin*) RPATH_ENVVAR=DYLD_LIBRARY_PATH ;; ++ *-*-darwin* | *-*-ios* ) RPATH_ENVVAR=DYLD_LIBRARY_PATH ;; + *-*-mingw* | *-*-cygwin ) RPATH_ENVVAR=PATH ;; + *) RPATH_ENVVAR=LD_LIBRARY_PATH ;; + esac diff --git a/pkgs/development/tools/misc/gede/default.nix b/pkgs/development/tools/misc/gede/default.nix index 9e2f3587558..9e8ce3d9331 100644 --- a/pkgs/development/tools/misc/gede/default.nix +++ b/pkgs/development/tools/misc/gede/default.nix @@ -1,26 +1,24 @@ -{ stdenv, fetchurl, makeWrapper, python, qt4, ctags, gdb }: +{ stdenv, fetchurl, makeWrapper, python, qmake, ctags, gdb }: stdenv.mkDerivation rec { name = "gede-${version}"; - version = "2.0.4"; + version = "2.6.1"; src = fetchurl { url = "http://gede.acidron.com/uploads/source/${name}.tar.xz"; - sha256 = "0ip86ss35sc330p4aykv5qj74jbdwh38i928w1bxb6g3w0xmfqba"; + sha256 = "0jallpchl3c3i90hwic4n7n0ggk5wra0fki4by9ag26ln0k42c4r"; }; - nativeBuildInputs = [ makeWrapper python ]; + nativeBuildInputs = [ qmake makeWrapper python ]; - buildInputs = [ qt4 ]; + buildInputs = [ ctags ]; - postPatch = '' - sed -i build.py -e 's,qmake-qt4,qmake,' - ''; + dontUseQmakeConfigure = true; buildPhase = ":"; installPhase = '' - python build.py install --prefix="$out" + python build.py install --verbose --prefix="$out" wrapProgram $out/bin/gede \ --prefix PATH : ${stdenv.lib.makeBinPath [ ctags gdb ]} ''; diff --git a/pkgs/development/tools/misc/hydra/default.nix b/pkgs/development/tools/misc/hydra/default.nix index cf9057d35e2..4fdd017306a 100644 --- a/pkgs/development/tools/misc/hydra/default.nix +++ b/pkgs/development/tools/misc/hydra/default.nix @@ -1,4 +1,4 @@ -{ stdenv, nixUnstable, perlPackages, buildEnv, releaseTools, fetchFromGitHub +{ stdenv, nix, perlPackages, buildEnv, releaseTools, fetchFromGitHub , makeWrapper, autoconf, automake, libtool, unzip, pkgconfig, sqlite, libpqxx , gitAndTools, mercurial, darcs, subversion, bazaar, openssl, bzip2, libxslt , guile, perl, postgresql, aws-sdk-cpp, nukeReferences, git, boehmgc @@ -27,6 +27,7 @@ let CatalystViewDownload CatalystViewJSON CatalystViewTT + CatalystXRoleApplicator CatalystXScriptServerStarman CryptRandPasswd DBDPg @@ -39,6 +40,7 @@ let FileSlurp IOCompress IPCRun + JSONAny JSONXS LWP LWPProtocolHttps @@ -54,8 +56,8 @@ let TextDiff TextTable XMLSimple - nixUnstable - nixUnstable.perl-bindings + nix + nix.perl-bindings git boehmgc ]; @@ -77,12 +79,12 @@ in releaseTools.nixBuild rec { [ makeWrapper autoconf automake libtool unzip nukeReferences pkgconfig sqlite libpqxx gitAndTools.topGit mercurial darcs subversion bazaar openssl bzip2 libxslt guile # optional, for Guile + Guix support - perlDeps perl nixUnstable + perlDeps perl nix postgresql # for running the tests ]; hydraPath = lib.makeBinPath ( - [ sqlite subversion openssh nixUnstable coreutils findutils pixz + [ sqlite subversion openssh nix coreutils findutils pixz gzip bzip2 lzma gnutar unzip git gitAndTools.topGit mercurial darcs gnused bazaar ] ++ lib.optionals stdenv.isLinux [ rpm dpkg cdrkit ] ); @@ -117,7 +119,7 @@ in releaseTools.nixBuild rec { --prefix PATH ':' $out/bin:$hydraPath \ --set HYDRA_RELEASE ${version} \ --set HYDRA_HOME $out/libexec/hydra \ - --set NIX_RELEASE ${nixUnstable.name or "unknown"} + --set NIX_RELEASE ${nix.name or "unknown"} done ''; # */ diff --git a/pkgs/development/tools/misc/kibana/5.x.nix b/pkgs/development/tools/misc/kibana/5.x.nix index 78b5df21fde..4aa9dc8b89a 100644 --- a/pkgs/development/tools/misc/kibana/5.x.nix +++ b/pkgs/development/tools/misc/kibana/5.x.nix @@ -11,9 +11,9 @@ let elasticArch = archOverrides."${arch}" or arch; plat = elemAt info 1; shas = { - "x86_64-linux" = "1a9n7s9r0klqvpyr5d3a410cchbsb0syx6cqwbhhnihqyw8dcx1i"; - "i686-linux" = "0snnm5jwynvk6ahgl42yzl2jhld0ykn79rlcq9dsv2gpqnjb2mmv"; - "x86_64-darwin" = "0qw3xkj3n3aja8s8n9r4hbr65jm9m6dgfjhhnrln434648rx7z4v"; + "x86_64-linux" = "1rg4j5jm8mkscrwlbx5qk3qjnblyr8z9x5npvyi73zm0ism0gv4j"; + "i686-linux" = "14swgx9sf23pns2pj30yyhd0p0rnykdimdrnj8rb0r1pqszw57qx"; + "x86_64-darwin" = "10l13r47nx74xicnjgb56nvgvx2al1zx1p8f09pjldaa2gjlll2k"; }; in stdenv.mkDerivation rec { name = "kibana-${version}"; diff --git a/pkgs/development/tools/misc/kibana/6.x.nix b/pkgs/development/tools/misc/kibana/6.x.nix index d7013ef46eb..17620c9df6c 100644 --- a/pkgs/development/tools/misc/kibana/6.x.nix +++ b/pkgs/development/tools/misc/kibana/6.x.nix @@ -7,8 +7,8 @@ let arch = elemAt info 0; plat = elemAt info 1; shas = { - "x86_64-linux" = "0kgsafjn8wzrmiklfc8jg0h3cx25lhlkby8yz35wgpx4wbk3vfjx"; - "x86_64-darwin" = "0i2kq9vyjv151kk7h3dl3hjrqqgxsg0qqxdqwjwlz9ja5axzlxhd"; + "x86_64-linux" = "1br9nvwa3i5sfcbnrxp2x3dxxnsbs9iavz6zwgw0jlh5ngf5vysk"; + "x86_64-darwin" = "1w4dck02i0rrl8m18kvy2zz02cb7bb9a2pdhkd1jfy1qz4ssnhii"; }; in stdenv.mkDerivation rec { name = "kibana-${version}"; diff --git a/pkgs/development/tools/misc/lsof/darwin-dfile.patch b/pkgs/development/tools/misc/lsof/darwin-dfile.patch new file mode 100644 index 00000000000..9952228e613 --- /dev/null +++ b/pkgs/development/tools/misc/lsof/darwin-dfile.patch @@ -0,0 +1,12 @@ +diff -Naur a/dialects/darwin/libproc/dfile.c b/dialects/darwin/libproc/dfile.c +--- a/dialects/darwin/libproc/dfile.c 2018-02-14 09:28:06.000000000 -0500 ++++ b/dialects/darwin/libproc/dfile.c 2018-04-16 18:52:40.828715293 -0400 +@@ -43,7 +43,7 @@ + #include "lsof.h" + + #if defined(PROC_FP_GUARDED) +-#extern struct pff_tab Pgf_tab[]; ++extern struct pff_tab Pgf_tab[]; + #endif /* defined(PROC_FP_GUARDED) */ + + diff --git a/pkgs/development/tools/misc/lsof/default.nix b/pkgs/development/tools/misc/lsof/default.nix index 53b960a7c03..ae62c8c7aae 100644 --- a/pkgs/development/tools/misc/lsof/default.nix +++ b/pkgs/development/tools/misc/lsof/default.nix @@ -28,8 +28,12 @@ stdenv.mkDerivation rec { unpackPhase = "tar xvjf $src; cd lsof_*; tar xvf lsof_*.tar; sourceRoot=$( echo lsof_*/); "; + patches = stdenv.lib.optional stdenv.isDarwin ./darwin-dfile.patch; + postPatch = stdenv.lib.optionalString stdenv.hostPlatform.isMusl '' substituteInPlace dialects/linux/dlsof.h --replace "defined(__UCLIBC__)" 1 + '' + stdenv.lib.optionalString stdenv.isDarwin '' + sed -i 's|lcurses|lncurses|g' Configure ''; # Stop build scripts from searching global include paths diff --git a/pkgs/development/tools/mypy/default.nix b/pkgs/development/tools/mypy/default.nix index e0288b686ef..fd21a8a23d3 100644 --- a/pkgs/development/tools/mypy/default.nix +++ b/pkgs/development/tools/mypy/default.nix @@ -2,14 +2,14 @@ buildPythonApplication rec { pname = "mypy"; - version = "0.580"; + version = "0.590"; # Tests not included in pip package. doCheck = false; src = fetchPypi { inherit pname version; - sha256 = "3bd95a1369810f7693366911d85be9f0a0bd994f6cb7162b7a994e5ded90e3d9"; + sha256 = "0ynyrrj0wjyw130ay9x1ca88lbhbblp06bfsjrpzbcvp4grgxgq4"; }; propagatedBuildInputs = [ lxml typed-ast psutil ]; diff --git a/pkgs/development/tools/ocaml/js_of_ocaml/tyxml.nix b/pkgs/development/tools/ocaml/js_of_ocaml/tyxml.nix new file mode 100644 index 00000000000..041fd71f92f --- /dev/null +++ b/pkgs/development/tools/ocaml/js_of_ocaml/tyxml.nix @@ -0,0 +1,16 @@ +{ stdenv, ocaml, findlib, jbuilder, js_of_ocaml-compiler +, js_of_ocaml-ppx, ocaml-migrate-parsetree, ppx_tools_versioned +, js_of_ocaml, reactivedata, tyxml +}: + +stdenv.mkDerivation rec { + name = "js_of_ocaml-tyxml-${version}"; + + inherit (js_of_ocaml-compiler) version src installPhase meta; + + buildInputs = [ ocaml findlib jbuilder js_of_ocaml-ppx ocaml-migrate-parsetree ppx_tools_versioned ]; + + propagatedBuildInputs = [ js_of_ocaml reactivedata tyxml ]; + + buildPhase = "jbuilder build -p js_of_ocaml-tyxml"; +} diff --git a/pkgs/development/tools/qtcreator/default.nix b/pkgs/development/tools/qtcreator/default.nix new file mode 100644 index 00000000000..de94b7a8eff --- /dev/null +++ b/pkgs/development/tools/qtcreator/default.nix @@ -0,0 +1,60 @@ +{ stdenv, fetchurl, makeWrapper +, qtbase, qtquickcontrols, qtscript, qtdeclarative, qmake +, withDocumentation ? false +}: + +with stdenv.lib; + +let + baseVersion = "4.5"; + revision = "0"; +in + +stdenv.mkDerivation rec { + name = "qtcreator-${version}"; + version = "${baseVersion}.${revision}"; + + src = fetchurl { + url = "http://download.qt-project.org/official_releases/qtcreator/${baseVersion}/${version}/qt-creator-opensource-src-${version}.tar.xz"; + sha256 = "1yfrfma23xxzz8hl43g7pk7ay5lg25l9lscjlih617lyv6jmc0hl"; + }; + + buildInputs = [ qtbase qtscript qtquickcontrols qtdeclarative ]; + + nativeBuildInputs = [ qmake makeWrapper ]; + + doCheck = true; + + enableParallelBuilding = true; + + buildFlags = optional withDocumentation "docs"; + + installFlags = [ "INSTALL_ROOT=$(out)" ] ++ optional withDocumentation "install_docs"; + + preConfigure = '' + substituteInPlace src/plugins/plugins.pro \ + --replace '$$[QT_INSTALL_QML]/QtQuick/Controls' '${qtquickcontrols}/${qtbase.qtQmlPrefix}/QtQuick/Controls' + ''; + + preBuild = optional withDocumentation '' + ln -s ${getLib qtbase}/$qtDocPrefix $NIX_QT5_TMP/share + ''; + + postInstall = '' + substituteInPlace $out/share/applications/org.qt-project.qtcreator.desktop \ + --replace "Exec=qtcreator" "Exec=$out/bin/qtcreator" + ''; + + meta = { + description = "Cross-platform IDE tailored to the needs of Qt developers"; + longDescription = '' + Qt Creator is a cross-platform IDE (integrated development environment) + tailored to the needs of Qt developers. It includes features such as an + advanced code editor, a visual debugger and a GUI designer. + ''; + homepage = https://wiki.qt.io/Category:Tools::QtCreator; + license = "LGPL"; + maintainers = [ maintainers.akaWolf ]; + platforms = [ "i686-linux" "x86_64-linux" ]; + }; +} diff --git a/pkgs/development/tools/react-native-debugger/default.nix b/pkgs/development/tools/react-native-debugger/default.nix new file mode 100644 index 00000000000..5e88384c58d --- /dev/null +++ b/pkgs/development/tools/react-native-debugger/default.nix @@ -0,0 +1,83 @@ +{ stdenv, fetchurl, unzip, cairo, xorg, gdk_pixbuf, fontconfig, pango, gnome2, atk, gtk2, glib +, freetype, dbus, nss, nspr, alsaLib, cups, expat, libudev, makeDesktopItem +}: + +let + rpath = stdenv.lib.makeLibraryPath [ + cairo + stdenv.cc.cc + gdk_pixbuf + fontconfig + pango + atk + gtk2 + glib + freetype + dbus + nss + nspr + alsaLib + cups + expat + libudev + + gnome2.GConf + + xorg.libX11 + xorg.libXcursor + xorg.libXtst + xorg.libxcb + xorg.libXext + xorg.libXi + xorg.libXdamage + xorg.libXrandr + xorg.libXcomposite + xorg.libXfixes + xorg.libXrender + xorg.libXScrnSaver + ]; +in stdenv.mkDerivation rec { + name = "react-native-debugger-${version}"; + version = "0.7.18"; + + src = fetchurl { + url = "https://github.com/jhen0409/react-native-debugger/releases/download/v${version}/rn-debugger-linux-x64.zip"; + sha256 = "186n438sy9wzrx2zdw4qq4hsz89wiy01bpfa6fdjisvxgz6r8sgw"; + }; + + buildInputs = [ unzip ]; + buildCommand = '' + shopt -s extglob + mkdir -p $out + unzip $src -d $out + + mkdir $out/{lib,bin,share} + mv $out/lib{node,ffmpeg}.so $out/lib + mv $out/!(lib|share|bin) $out/share + + patchelf \ + --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ + --set-rpath ${rpath}:$out/lib \ + $out/share/React\ Native\ Debugger + + ln -s $out/share/React\ Native\ Debugger $out/bin/React\ Native\ Debugger + + install -Dm644 "${desktopItem}/share/applications/"* \ + -t $out/share/applications/ + ''; + + desktopItem = makeDesktopItem { + name = "rndebugger"; + exec = "React\\ Native\\ Debugger"; + desktopName = "React Native Debugger"; + genericName = "React Native Debugger"; + categories = "Development;Tools;"; + }; + + meta = with stdenv.lib; { + homepage = https://github.com/jhen0409/react-native-debugger; + license = licenses.mit; + description = "The standalone app based on official debugger of React Native, and includes React Inspector / Redux DevTools"; + maintainers = with maintainers; [ ma27 ]; + }; +} diff --git a/pkgs/development/tools/selenium/chromedriver/default.nix b/pkgs/development/tools/selenium/chromedriver/default.nix index cc56e57794a..d865a20fbb9 100644 --- a/pkgs/development/tools/selenium/chromedriver/default.nix +++ b/pkgs/development/tools/selenium/chromedriver/default.nix @@ -6,7 +6,7 @@ let allSpecs = { "x86_64-linux" = { system = "linux64"; - sha256 = "1pryrz4ry0pk6kawvj8sxhpqh6c6npxhm187412y2l598dcf9pwl"; + sha256 = "1h7avlns00hd44ayi53lvdj2l85h9higky0jk7bad07hm39nagks"; }; "x86_64-darwin" = { @@ -28,7 +28,7 @@ let in stdenv.mkDerivation rec { name = "chromedriver-${version}"; - version = "2.37"; + version = "2.38"; src = fetchurl { url = "http://chromedriver.storage.googleapis.com/${version}/chromedriver_${spec.system}.zip"; diff --git a/pkgs/development/tools/tradcpp/default.nix b/pkgs/development/tools/tradcpp/default.nix index e5a3004bfdb..3891617e1c7 100644 --- a/pkgs/development/tools/tradcpp/default.nix +++ b/pkgs/development/tools/tradcpp/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, autoconf }: stdenv.mkDerivation { - name = "tradcpp-0.4"; + name = "tradcpp-0.5.2"; src = fetchurl { - url = http://ftp.netbsd.org/pub/NetBSD/misc/dholland/tradcpp-0.4.tar.gz; - sha256 = "c60aa356945e0b6634bd449ead6a4fca0059d2ce3ae8044cf982140bbd54e688"; + url = http://ftp.netbsd.org/pub/NetBSD/misc/dholland/tradcpp-0.5.2.tar.gz; + sha256 = "1h2bwxwc13rz3g2236l89hm47f72hn3m4h7wjir3j532kq0m68bc"; }; # tradcpp only comes with BSD-make Makefile; the patch adds configure support diff --git a/pkgs/development/tools/yarn/default.nix b/pkgs/development/tools/yarn/default.nix index bd7dd5924c0..eefe7dcfa74 100644 --- a/pkgs/development/tools/yarn/default.nix +++ b/pkgs/development/tools/yarn/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "yarn-${version}"; - version = "1.5.1"; + version = "1.6.0"; src = fetchzip { url = "https://github.com/yarnpkg/yarn/releases/download/v${version}/yarn-v${version}.tar.gz"; - sha256 = "13m1y1c2h1fvq8fw1vlmnmnh3jx3l2cx7mz3x55sbgwcinzhkz9m"; + sha256 = "0bblp1jy4s9y5rpcqn40w61qwsmxr342xkcn7ykk88i7sng2cgfw"; }; buildInputs = [makeWrapper nodejs]; |