diff options
Diffstat (limited to 'nixpkgs/pkgs/development/tools')
33 files changed, 113 insertions, 113 deletions
diff --git a/nixpkgs/pkgs/development/tools/analysis/checkstyle/default.nix b/nixpkgs/pkgs/development/tools/analysis/checkstyle/default.nix index 78033633b963..a1dfd91c29fe 100644 --- a/nixpkgs/pkgs/development/tools/analysis/checkstyle/default.nix +++ b/nixpkgs/pkgs/development/tools/analysis/checkstyle/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ makeWrapper ]; buildInputs = [ jre ]; - unpackPhase = ":"; + dontUnpack = true; installPhase = '' runHook preInstall diff --git a/nixpkgs/pkgs/development/tools/analysis/egypt/default.nix b/nixpkgs/pkgs/development/tools/analysis/egypt/default.nix index 7db46005f453..6259756794df 100644 --- a/nixpkgs/pkgs/development/tools/analysis/egypt/default.nix +++ b/nixpkgs/pkgs/development/tools/analysis/egypt/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, perlPackages }: perlPackages.buildPerlPackage rec { - name = "egypt-${version}"; + pname = "egypt"; version = "1.10"; src = fetchurl { sha256 = "0r0wj6v8z9fzlh9pb5617kyjdf92ppmlbzajaarrq729bbb6ln5m"; - url = "https://www.gson.org/egypt/download/${name}.tar.gz"; + url = "https://www.gson.org/egypt/download/${pname}-${version}.tar.gz"; }; outputs = [ "out" ]; diff --git a/nixpkgs/pkgs/development/tools/build-managers/cmake/application-services.patch b/nixpkgs/pkgs/development/tools/build-managers/cmake/application-services.patch index 2107dcdfbc66..0373ca2d67cd 100644 --- a/nixpkgs/pkgs/development/tools/build-managers/cmake/application-services.patch +++ b/nixpkgs/pkgs/development/tools/build-managers/cmake/application-services.patch @@ -47,3 +47,14 @@ index d7af6e2..d4808fc 100644 add_subdirectory(libarchive) install(FILES COPYING DESTINATION ${CMAKE_DOC_DIR}/cmlibarchive) +index e505bdd..f45557d 100644 +--- a/Utilities/cmlibuv/src/unix/darwin-proctitle.c ++++ b/Utilities/cmlibuv/src/unix/darwin-proctitle.c +@@ -30,7 +30,6 @@ + + #if !TARGET_OS_IPHONE + # include <CoreFoundation/CoreFoundation.h> +-# include <ApplicationServices/ApplicationServices.h> + #endif + + #define S(s) pCFStringCreateWithCString(NULL, (s), kCFStringEncodingUTF8) diff --git a/nixpkgs/pkgs/development/tools/build-managers/cmake/default.nix b/nixpkgs/pkgs/development/tools/build-managers/cmake/default.nix index 290860a0d9c3..4761d8dc5b11 100644 --- a/nixpkgs/pkgs/development/tools/build-managers/cmake/default.nix +++ b/nixpkgs/pkgs/development/tools/build-managers/cmake/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig +{ stdenv, lib, fetchurl, pkgconfig , bzip2, curl, expat, libarchive, xz, zlib, libuv, rhash , buildPackages # darwin attributes @@ -13,25 +13,18 @@ assert withQt5 -> useQt4 == false; assert useQt4 -> withQt5 == false; -with stdenv.lib; - -let - os = stdenv.lib.optionalString; - majorVersion = "3.13"; - minorVersion = "4"; - # from https://cmake.org/files/v3.13/cmake-3.13.4-SHA-256.txt for cmake-3.13.4.tar.gz - sha256 = "fdd928fee35f472920071d1c7f1a6a2b72c9b25e04f7a37b409349aef3f20e9b"; - version = "${majorVersion}.${minorVersion}"; -in - stdenv.mkDerivation rec { - name = "cmake-${os isBootstrap "boot-"}${os useNcurses "cursesUI-"}${os withQt5 "qt5UI-"}${os useQt4 "qt4UI-"}${version}"; - - inherit majorVersion; + pname = "cmake" + + lib.optionalString isBootstrap "-boot" + + lib.optionalString useNcurses "-cursesUI" + + lib.optionalString withQt5 "-qt5UI" + + lib.optionalString useQt4 "-qt4UI"; + version = "3.14.5"; src = fetchurl { - url = "${meta.homepage}files/v${majorVersion}/cmake-${version}.tar.gz"; - inherit sha256; + url = "${meta.homepage}files/v${lib.versions.majorMinor version}/cmake-${version}.tar.gz"; + # compare with https://cmake.org/files/v${lib.versions.majorMinor version}/cmake-${version}-SHA-256.txt + sha256 = "505ae49ebe3c63c595fa5f814975d8b72848447ee13b6613b0f8b96ebda18c06"; }; patches = [ @@ -43,7 +36,7 @@ stdenv.mkDerivation rec { # Derived from https://github.com/libuv/libuv/commit/1a5d4f08238dd532c3718e210078de1186a5920d ./libuv-application-services.patch - ] ++ optional stdenv.isCygwin ./3.2.2-cygwin.patch; + ] ++ lib.optional stdenv.isCygwin ./3.2.2-cygwin.patch; outputs = [ "out" ]; setOutputFlags = false; @@ -52,21 +45,21 @@ stdenv.mkDerivation rec { buildInputs = [ setupHook pkgconfig ] - ++ optionals useSharedLibraries [ bzip2 curl expat libarchive xz zlib libuv rhash ] - ++ optional useNcurses ncurses - ++ optional useQt4 qt4 - ++ optional withQt5 qtbase; + ++ lib.optionals useSharedLibraries [ bzip2 curl expat libarchive xz zlib libuv rhash ] + ++ lib.optional useNcurses ncurses + ++ lib.optional useQt4 qt4 + ++ lib.optional withQt5 qtbase; depsBuildBuild = [ buildPackages.stdenv.cc ]; - propagatedBuildInputs = optional stdenv.isDarwin ps; + propagatedBuildInputs = lib.optional stdenv.isDarwin ps; preConfigure = '' fixCmakeFiles . substituteInPlace Modules/Platform/UnixPaths.cmake \ - --subst-var-by libc_bin ${getBin stdenv.cc.libc} \ - --subst-var-by libc_dev ${getDev stdenv.cc.libc} \ - --subst-var-by libc_lib ${getLib stdenv.cc.libc} + --subst-var-by libc_bin ${lib.getBin stdenv.cc.libc} \ + --subst-var-by libc_dev ${lib.getDev stdenv.cc.libc} \ + --subst-var-by libc_lib ${lib.getLib stdenv.cc.libc} substituteInPlace Modules/FindCxxTest.cmake \ --replace "$""{PYTHON_EXECUTABLE}" ${stdenv.shell} # BUILD_CC and BUILD_CXX are used to bootstrap cmake @@ -74,9 +67,9 @@ stdenv.mkDerivation rec { ''; configureFlags = [ - "--docdir=share/doc/${name}" + "--docdir=share/doc/${pname}${version}" ] ++ (if useSharedLibraries then [ "--no-system-jsoncpp" "--system-libs" ] else [ "--no-system-libs" ]) # FIXME: cleanup - ++ optional (useQt4 || withQt5) "--qt-gui" + ++ lib.optional (useQt4 || withQt5) "--qt-gui" ++ [ "--" # We should set the proper `CMAKE_SYSTEM_NAME`. @@ -87,15 +80,15 @@ stdenv.mkDerivation rec { # package being built. "-DCMAKE_CXX_COMPILER=${stdenv.cc.targetPrefix}c++" "-DCMAKE_C_COMPILER=${stdenv.cc.targetPrefix}cc" - "-DCMAKE_AR=${getBin stdenv.cc.bintools.bintools}/bin/${stdenv.cc.targetPrefix}ar" - "-DCMAKE_RANLIB=${getBin stdenv.cc.bintools.bintools}/bin/${stdenv.cc.targetPrefix}ranlib" - "-DCMAKE_STRIP=${getBin stdenv.cc.bintools.bintools}/bin/${stdenv.cc.targetPrefix}strip" + "-DCMAKE_AR=${lib.getBin stdenv.cc.bintools.bintools}/bin/${stdenv.cc.targetPrefix}ar" + "-DCMAKE_RANLIB=${lib.getBin stdenv.cc.bintools.bintools}/bin/${stdenv.cc.targetPrefix}ranlib" + "-DCMAKE_STRIP=${lib.getBin stdenv.cc.bintools.bintools}/bin/${stdenv.cc.targetPrefix}strip" ] # Avoid depending on frameworks. - ++ optional (!useNcurses) "-DBUILD_CursesDialog=OFF"; + ++ lib.optional (!useNcurses) "-DBUILD_CursesDialog=OFF"; # make install attempts to use the just-built cmake - preInstall = optional (stdenv.hostPlatform != stdenv.buildPlatform) '' + preInstall = lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) '' sed -i 's|bin/cmake|${buildPackages.cmake}/bin/cmake|g' Makefile ''; @@ -108,7 +101,7 @@ stdenv.mkDerivation rec { doCheck = false; # fails - meta = with stdenv.lib; { + meta = with lib; { homepage = http://www.cmake.org/; description = "Cross-Platform Makefile Generator"; platforms = if useQt4 then qt4.meta.platforms else platforms.all; diff --git a/nixpkgs/pkgs/development/tools/build-managers/cmake/libuv-application-services.patch b/nixpkgs/pkgs/development/tools/build-managers/cmake/libuv-application-services.patch index 08899f5c241f..c5b9cdff1d07 100644 --- a/nixpkgs/pkgs/development/tools/build-managers/cmake/libuv-application-services.patch +++ b/nixpkgs/pkgs/development/tools/build-managers/cmake/libuv-application-services.patch @@ -24,36 +24,6 @@ diff -ur cmake-3.12.1/Utilities/cmlibuv/CMakeLists.txt cmake-3.12.1-patched/Util endif() if(CMAKE_SYSTEM_NAME STREQUAL "Linux") -diff -ur cmake-3.12.1/Utilities/cmlibuv/src/unix/darwin-proctitle.c cmake-3.12.1-patched/Utilities/cmlibuv/src/unix/darwin-proctitle.c ---- cmake-3.12.1/Utilities/cmlibuv/src/unix/darwin-proctitle.c 2018-08-09 21:14:08.000000000 +0900 -+++ cmake-3.12.1-patched/Utilities/cmlibuv/src/unix/darwin-proctitle.c 2018-08-13 10:01:29.000000000 +0900 -@@ -26,9 +26,7 @@ - #include <stdlib.h> - #include <string.h> - --#include <TargetConditionals.h> -- --#if !TARGET_OS_IPHONE -+#if HAVE_APPLICATIONSERVICES_APPLICATIONSERVICES_H - # include <CoreFoundation/CoreFoundation.h> - # include <ApplicationServices/ApplicationServices.h> - #endif -@@ -58,7 +56,7 @@ - - - int uv__set_process_title(const char* title) { --#if TARGET_OS_IPHONE -+#if !HAVE_APPLICATIONSERVICES_APPLICATIONSERVICES_H - return uv__pthread_setname_np(title); - #else - CFStringRef (*pCFStringCreateWithCString)(CFAllocatorRef, -@@ -205,5 +203,5 @@ - dlclose(application_services_handle); - - return err; --#endif /* !TARGET_OS_IPHONE */ -+#endif /* HAVE_APPLICATIONSERVICES_APPLICATIONSERVICES_H */ - } diff -ur cmake-3.12.1/Utilities/cmlibuv/src/unix/fsevents.c cmake-3.12.1-patched/Utilities/cmlibuv/src/unix/fsevents.c --- cmake-3.12.1/Utilities/cmlibuv/src/unix/fsevents.c 2018-08-09 21:14:08.000000000 +0900 +++ cmake-3.12.1-patched/Utilities/cmlibuv/src/unix/fsevents.c 2018-08-13 10:01:29.000000000 +0900 diff --git a/nixpkgs/pkgs/development/tools/build-managers/cmake/search-path.patch b/nixpkgs/pkgs/development/tools/build-managers/cmake/search-path.patch index 6213138402b1..2f5e4d62c86d 100644 --- a/nixpkgs/pkgs/development/tools/build-managers/cmake/search-path.patch +++ b/nixpkgs/pkgs/development/tools/build-managers/cmake/search-path.patch @@ -38,12 +38,27 @@ diff -ur cmake-3.9.1/Modules/Platform/UnixPaths.cmake cmake-3.9.1-mod/Modules/Pl + @libc_lib@/lib ) - list(APPEND CMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES -- /usr/include + if(CMAKE_SYSROOT_COMPILE) + set(_cmake_sysroot_compile "${CMAKE_SYSROOT_COMPILE}") + else() + set(_cmake_sysroot_compile "${CMAKE_SYSROOT}") + endif() + + # Default per-language values. These may be later replaced after + # parsing the implicit directory information from compiler output. + set(_CMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES_INIT + ${CMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES} +- "${_cmake_sysroot_compile}/usr/include" ++ @libc_dev@/include + ) + set(_CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES_INIT + ${CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES} +- "${_cmake_sysroot_compile}/usr/include" + @libc_dev@/include ) - list(APPEND CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES -- /usr/include + set(_CMAKE_CUDA_IMPLICIT_INCLUDE_DIRECTORIES_INIT + ${CMAKE_CUDA_IMPLICIT_INCLUDE_DIRECTORIES} +- "${_cmake_sysroot_compile}/usr/include" + @libc_dev@/include ) diff --git a/nixpkgs/pkgs/development/tools/build-managers/doit/default.nix b/nixpkgs/pkgs/development/tools/build-managers/doit/default.nix index e2689f2c2652..6fc03a550940 100644 --- a/nixpkgs/pkgs/development/tools/build-managers/doit/default.nix +++ b/nixpkgs/pkgs/development/tools/build-managers/doit/default.nix @@ -25,7 +25,7 @@ in python3Packages.buildPythonApplication { checkPhase = "py.test"; meta = with stdenv.lib; { - homepage = http://pydoit.org/; + homepage = https://pydoit.org/; description = "A task management & automation tool"; license = licenses.mit; longDescription = '' diff --git a/nixpkgs/pkgs/development/tools/build-managers/leiningen/default.nix b/nixpkgs/pkgs/development/tools/build-managers/leiningen/default.nix index 99692d1ef50c..d73683287a1e 100644 --- a/nixpkgs/pkgs/development/tools/build-managers/leiningen/default.nix +++ b/nixpkgs/pkgs/development/tools/build-managers/leiningen/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { JARNAME = "${name}-standalone.jar"; - unpackPhase = "true"; + dontUnpack = true; buildInputs = [ makeWrapper ]; propagatedBuildInputs = [ jdk ]; diff --git a/nixpkgs/pkgs/development/tools/build-managers/meson/default.nix b/nixpkgs/pkgs/development/tools/build-managers/meson/default.nix index 638fd2eaa43f..b5ee5d758170 100644 --- a/nixpkgs/pkgs/development/tools/build-managers/meson/default.nix +++ b/nixpkgs/pkgs/development/tools/build-managers/meson/default.nix @@ -11,12 +11,12 @@ let }; in python3Packages.buildPythonApplication rec { - version = "0.49.2"; pname = "meson"; + version = "0.50.1"; src = python3Packages.fetchPypi { inherit pname version; - sha256 = "0ckkzq0kbnnk4rwv20lggm9a4fb5054jbv99i9pwjhid23qy7059"; + sha256 = "05k3wsxjcnnq7a8n5kzxh2cdh5jdkh13xagigz5axs48j36zfai4"; }; postFixup = '' diff --git a/nixpkgs/pkgs/development/tools/build-managers/meson/setup-hook.sh b/nixpkgs/pkgs/development/tools/build-managers/meson/setup-hook.sh index 06375c1528e0..6e8d94523e14 100644 --- a/nixpkgs/pkgs/development/tools/build-managers/meson/setup-hook.sh +++ b/nixpkgs/pkgs/development/tools/build-managers/meson/setup-hook.sh @@ -17,10 +17,11 @@ mesonConfigurePhase() { --includedir=${!outputInclude}/include \ --mandir=${!outputMan}/share/man --infodir=${!outputInfo}/share/info \ --localedir=${!outputLib}/share/locale \ - -Dauto_features=disabled \ + -Dauto_features=${mesonAutoFeatures:-enabled} \ + -Dwrap_mode=${mesonWrapMode:-nodownload} \ $mesonFlags" - mesonFlags="${crossMesonFlags+$crossMesonFlags }--buildtype=${mesonBuildType:-release} $mesonFlags" + mesonFlags="${crossMesonFlags+$crossMesonFlags }--buildtype=${mesonBuildType:-plain} $mesonFlags" echo "meson flags: $mesonFlags ${mesonFlagsArray[@]}" diff --git a/nixpkgs/pkgs/development/tools/build-managers/mill/default.nix b/nixpkgs/pkgs/development/tools/build-managers/mill/default.nix index 7b472c1c4e3a..ff49bea526a1 100644 --- a/nixpkgs/pkgs/development/tools/build-managers/mill/default.nix +++ b/nixpkgs/pkgs/development/tools/build-managers/mill/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ makeWrapper ]; - unpackPhase = "true"; + dontUnpack = true; dontConfigure = true; dontBuild = true; diff --git a/nixpkgs/pkgs/development/tools/clang-tools/default.nix b/nixpkgs/pkgs/development/tools/clang-tools/default.nix index bd8401ac80dd..0fcaee574681 100644 --- a/nixpkgs/pkgs/development/tools/clang-tools/default.nix +++ b/nixpkgs/pkgs/development/tools/clang-tools/default.nix @@ -7,7 +7,7 @@ in stdenv.mkDerivation { name = "clang-tools-${version}"; - unpackPhase = ":"; + dontUnpack = true; installPhase = '' mkdir -p $out/bin for tool in \ diff --git a/nixpkgs/pkgs/development/tools/database/schemaspy/default.nix b/nixpkgs/pkgs/development/tools/database/schemaspy/default.nix index ab62fdf3d523..128921a67d7a 100644 --- a/nixpkgs/pkgs/development/tools/database/schemaspy/default.nix +++ b/nixpkgs/pkgs/development/tools/database/schemaspy/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "0ph1l62hy163m2hgybhkccqbcj6brna1vdbr7536zc37lzjxq9rn"; }; - unpackPhase = "true"; + dontUnpack = true; buildInputs = [ jre diff --git a/nixpkgs/pkgs/development/tools/gotools/default.nix b/nixpkgs/pkgs/development/tools/gotools/default.nix index 9bb57bfe5029..d83f0ec40149 100644 --- a/nixpkgs/pkgs/development/tools/gotools/default.nix +++ b/nixpkgs/pkgs/development/tools/gotools/default.nix @@ -2,16 +2,26 @@ buildGoModule rec { name = "gotools-unstable-${version}"; - version = "2019-06-03"; - rev = "8aaa1484dc108aa23dcf2d4a09371c0c9e280f6b"; + version = "2019-07-06"; + rev = "72ffa07ba3db8d09f5215feec0f89464f3028f8e"; src = fetchgit { inherit rev; url = "https://go.googlesource.com/tools"; - sha256 = "0sa41fi38b6pvz7jjr6vqrd152qjvmbcagm1qdxw41vqcdw3ljx3"; + sha256 = "0c0s5aiwj807vxfzwrah32spwq8cnxvy0j117i5cbsqw2df80pgv"; }; - modSha256 = "0cm7fwb1k5hvbhh86kagzsw5vwgkr6dr7glhbjxg5xaahlhx2w5w"; + # Build of golang.org/x/tools/gopls fails with: + # can't load package: package golang.org/x/tools/gopls: unknown import path "golang.org/x/tools/gopls": cannot find module providing package golang.org/x/tools/gopls + # That is most probably caused by golang.org/x/tools/gopls containing a separate Go module. + # In order to fix this, we simply remove the module. + # Note that build of golang.org/x/tools/cmd/gopls provides identical binary as golang.org/x/tools/gopls. + # See https://github.com/NixOS/nixpkgs/pull/64335. + postPatch = '' + rm -rf gopls + ''; + + modSha256 = "16nkrpki9fnxsrxxxs9ljz49plcz393z0sqq2knkk30pmncpwd3q"; postConfigure = '' # Make the builtin tools available here diff --git a/nixpkgs/pkgs/development/tools/java/jhiccup/default.nix b/nixpkgs/pkgs/development/tools/java/jhiccup/default.nix index 6fb34588cd0b..4577de0cde4c 100644 --- a/nixpkgs/pkgs/development/tools/java/jhiccup/default.nix +++ b/nixpkgs/pkgs/development/tools/java/jhiccup/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1hsvi8wjh615fnjf75h7b5afp04chqcgvini30vfcn3m9a5icbgy"; }; - configurePhase = ":"; + dontConfigure = true; buildPhase = ":"; installPhase = '' mkdir -p $out/bin $out/share/java diff --git a/nixpkgs/pkgs/development/tools/misc/bossa/default.nix b/nixpkgs/pkgs/development/tools/misc/bossa/default.nix index bb81a461188a..0d78cfbbab8c 100644 --- a/nixpkgs/pkgs/development/tools/misc/bossa/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/bossa/default.nix @@ -7,7 +7,7 @@ let bin2c = stdenv.mkDerivation { name = "bossa-bin2c"; src = ./bin2c.c; - unpackPhase = "true"; + dontUnpack = true; buildPhase = ''cc $src -o bin2c''; installPhase = ''mkdir -p $out/bin; cp bin2c $out/bin/''; }; diff --git a/nixpkgs/pkgs/development/tools/misc/checkbashisms/default.nix b/nixpkgs/pkgs/development/tools/misc/checkbashisms/default.nix index 2564b42731b3..5f98df54c0a0 100644 --- a/nixpkgs/pkgs/development/tools/misc/checkbashisms/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/checkbashisms/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { buildInputs = [ perl ]; # The link returns directly the script. No need for unpacking - unpackPhase = "true"; + dontUnpack = true; installPhase = '' install -D -m755 $src $out/bin/checkbashisms diff --git a/nixpkgs/pkgs/development/tools/misc/ninka/default.nix b/nixpkgs/pkgs/development/tools/misc/ninka/default.nix index df793866cbb8..af3b45a8e62c 100644 --- a/nixpkgs/pkgs/development/tools/misc/ninka/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/ninka/default.nix @@ -3,7 +3,7 @@ assert stdenv ? glibc; perlPackages.buildPerlPackage rec { - name = "ninka-${version}"; + pname = "ninka"; version = "2.0-pre"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/tools/misc/pahole/default.nix b/nixpkgs/pkgs/development/tools/misc/pahole/default.nix index 3864ad945835..5b17f111b45a 100644 --- a/nixpkgs/pkgs/development/tools/misc/pahole/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/pahole/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchgit, cmake, elfutils, zlib }: stdenv.mkDerivation rec { - name = "pahole-${version}"; - version = "1.12"; + pname = "pahole"; + version = "1.15"; src = fetchgit { url = https://git.kernel.org/pub/scm/devel/pahole/pahole.git; - sha256 = "1a8xfwqdc2j3ydh9bk2pkvsaf3lrkbxj66vj991c7knc31ix8kpw"; rev = "v${version}"; + sha256 = "10af9mh3qxbx0hgjcmh0vjbg22bgxzhbpd9395ymasyw4npg6l9x"; }; nativeBuildInputs = [ cmake ]; diff --git a/nixpkgs/pkgs/development/tools/misc/ycmd/default.nix b/nixpkgs/pkgs/development/tools/misc/ycmd/default.nix index 062f90e3389d..2e67da18ae9a 100644 --- a/nixpkgs/pkgs/development/tools/misc/ycmd/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/ycmd/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { ${python.interpreter} build.py --system-libclang --clang-completer --system-boost ''; - configurePhase = ":"; + dontConfigure = true; # remove the tests # diff --git a/nixpkgs/pkgs/development/tools/parsing/antlr/3.4.nix b/nixpkgs/pkgs/development/tools/parsing/antlr/3.4.nix index ad0ebbdebba0..b53116b888e1 100644 --- a/nixpkgs/pkgs/development/tools/parsing/antlr/3.4.nix +++ b/nixpkgs/pkgs/development/tools/parsing/antlr/3.4.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "1xqbam8vf04q5fasb0m2n1pn5dbp2yw763sj492ncq04c5mqcglx"; }; - unpackPhase = "true"; + dontUnpack = true; installPhase = '' mkdir -p "$out"/{lib/antlr,bin} diff --git a/nixpkgs/pkgs/development/tools/parsing/antlr/3.5.nix b/nixpkgs/pkgs/development/tools/parsing/antlr/3.5.nix index cf37287beff8..4c213ed1c4c2 100644 --- a/nixpkgs/pkgs/development/tools/parsing/antlr/3.5.nix +++ b/nixpkgs/pkgs/development/tools/parsing/antlr/3.5.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "0srjwxipwsfzmpi0v32d1l5lzk9gi5in8ayg33sq8wyp8ygnbji6"; }; - unpackPhase = "true"; + dontUnpack = true; installPhase = '' mkdir -p "$out"/{lib/antlr,bin} diff --git a/nixpkgs/pkgs/development/tools/parsing/antlr/4.7.nix b/nixpkgs/pkgs/development/tools/parsing/antlr/4.7.nix index 40f9bf74ac40..e6e54f8dab92 100644 --- a/nixpkgs/pkgs/development/tools/parsing/antlr/4.7.nix +++ b/nixpkgs/pkgs/development/tools/parsing/antlr/4.7.nix @@ -41,7 +41,7 @@ let sha256 = "1236gwnzchama92apb2swmklnypj01m7bdwwfvwvl8ym85scw7gl"; }; - unpackPhase = "true"; + dontUnpack = true; installPhase = '' mkdir -p "$out"/{share/java,bin} diff --git a/nixpkgs/pkgs/development/tools/phantomjs/default.nix b/nixpkgs/pkgs/development/tools/phantomjs/default.nix index 43fdeff9090b..2c37d71e75ce 100644 --- a/nixpkgs/pkgs/development/tools/phantomjs/default.nix +++ b/nixpkgs/pkgs/development/tools/phantomjs/default.nix @@ -61,7 +61,7 @@ stdenv.mkDerivation rec { - Network Monitoring ''; - homepage = http://phantomjs.org/; + homepage = https://phantomjs.org/; license = lib.licenses.bsd3; maintainers = [ lib.maintainers.bluescreen303 ]; diff --git a/nixpkgs/pkgs/development/tools/phantomjs2/default.nix b/nixpkgs/pkgs/development/tools/phantomjs2/default.nix index 51cecd81ecac..a37de2a3f628 100644 --- a/nixpkgs/pkgs/development/tools/phantomjs2/default.nix +++ b/nixpkgs/pkgs/development/tools/phantomjs2/default.nix @@ -105,7 +105,7 @@ in stdenv.mkDerivation rec { - Network Monitoring ''; - homepage = http://phantomjs.org/; + homepage = https://phantomjs.org/; license = licenses.bsd3; maintainers = [ maintainers.aflatter ]; diff --git a/nixpkgs/pkgs/development/tools/rubocop/Gemfile.lock b/nixpkgs/pkgs/development/tools/rubocop/Gemfile.lock index 314daff01c26..91fca663bf28 100644 --- a/nixpkgs/pkgs/development/tools/rubocop/Gemfile.lock +++ b/nixpkgs/pkgs/development/tools/rubocop/Gemfile.lock @@ -2,12 +2,12 @@ GEM remote: https://rubygems.org/ specs: ast (2.4.0) - jaro_winkler (1.5.2) + jaro_winkler (1.5.3) parallel (1.17.0) parser (2.6.3.0) ast (~> 2.4.0) rainbow (3.0.0) - rubocop (0.71.0) + rubocop (0.72.0) jaro_winkler (~> 1.5.1) parallel (~> 1.10) parser (>= 2.6) diff --git a/nixpkgs/pkgs/development/tools/rubocop/default.nix b/nixpkgs/pkgs/development/tools/rubocop/default.nix index 288ccfa1524b..b91a36cb0613 100644 --- a/nixpkgs/pkgs/development/tools/rubocop/default.nix +++ b/nixpkgs/pkgs/development/tools/rubocop/default.nix @@ -11,7 +11,7 @@ bundlerEnv rec { description = "Automatic Ruby code style checking tool"; homepage = "https://docs.rubocop.org/"; license = licenses.mit; - maintainers = with maintainers; [ leemachin ]; + maintainers = with maintainers; [ marsam leemachin ]; platforms = platforms.unix; }; } diff --git a/nixpkgs/pkgs/development/tools/rubocop/gemset.nix b/nixpkgs/pkgs/development/tools/rubocop/gemset.nix index 89428cdab0b9..1f83bbf96b78 100644 --- a/nixpkgs/pkgs/development/tools/rubocop/gemset.nix +++ b/nixpkgs/pkgs/development/tools/rubocop/gemset.nix @@ -14,10 +14,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1zz27z88qznix4r65gd9h56gl177snlfpgv10b0s69vi8qpl909l"; + sha256 = "1930v0chc1q4fr7hn0y1j34mw0v032a8kh0by4d4sbz8ksy056kf"; type = "gem"; }; - version = "1.5.2"; + version = "1.5.3"; }; parallel = { groups = ["default"]; @@ -56,10 +56,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0mjyrf1dmf58i40izs8rp2j4mqnyd4qpah9svmkwhs33ckxsjh6b"; + sha256 = "192vmm9ah6b4wyabawaszpr8n3z93y3ymykp3m4pncrbwngmn3m2"; type = "gem"; }; - version = "0.71.0"; + version = "0.72.0"; }; ruby-progressbar = { groups = ["default"]; diff --git a/nixpkgs/pkgs/development/tools/rust/cargo-xbuild/default.nix b/nixpkgs/pkgs/development/tools/rust/cargo-xbuild/default.nix index 413e1c2debff..b349fbc6bd99 100644 --- a/nixpkgs/pkgs/development/tools/rust/cargo-xbuild/default.nix +++ b/nixpkgs/pkgs/development/tools/rust/cargo-xbuild/default.nix @@ -2,13 +2,13 @@ rustPlatform.buildRustPackage rec { pname = "cargo-xbuild"; - version = "0.5.12"; + version = "0.5.14"; src = fetchFromGitHub { owner = "rust-osdev"; repo = pname; - rev = "v${version}"; - sha256 = "1vjsss2zrja4kpr83vw6g0hf9xdx658wjhdiymzndbcf32qrx7x1"; + rev = version; + sha256 = "1f87rz17bdpdipc9x2j4gq1zq181gcshhn7vc9pnn6f487hz0bgq"; }; cargoSha256 = "1r9i79lymfwpbcx2lp509v435qpkl9bqly1ya369p41n5yprrcjv"; diff --git a/nixpkgs/pkgs/development/tools/rust/pyo3-pack/default.nix b/nixpkgs/pkgs/development/tools/rust/pyo3-pack/default.nix index 91d25fe68071..a17d50262a0e 100644 --- a/nixpkgs/pkgs/development/tools/rust/pyo3-pack/default.nix +++ b/nixpkgs/pkgs/development/tools/rust/pyo3-pack/default.nix @@ -5,16 +5,16 @@ let inherit (darwin.apple_sdk.frameworks) Security; in rustPlatform.buildRustPackage rec { name = "pyo3-pack-${version}"; - version = "0.5.0"; + version = "0.6.1"; src = fetchFromGitHub { owner = "PyO3"; repo = "pyo3-pack"; rev = "v${version}"; - sha256 = "0577v8nqjbb7l7fqvac706bg9zrcp8fbh9ca1mkj44db12v02kgb"; + sha256 = "0zk0jhr7lnl9z6c8pbk7si3wa8b1kqzj3wrslc1n5fjla7xx8fzn"; }; - cargoSha256 = "1prwgkgvg11cbpx086irrafg59mfvnykadagcp3qgyry6d82blsv"; + cargoSha256 = "13gycipxc17baxg8nvjzkw96i1pxgncx7qjcrm9aab7p9vi2vrih"; nativeBuildInputs = [ pkgconfig ]; diff --git a/nixpkgs/pkgs/development/tools/selenium/htmlunit-driver/default.nix b/nixpkgs/pkgs/development/tools/selenium/htmlunit-driver/default.nix index 03c3c23c7559..a8085399b3db 100644 --- a/nixpkgs/pkgs/development/tools/selenium/htmlunit-driver/default.nix +++ b/nixpkgs/pkgs/development/tools/selenium/htmlunit-driver/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "1sd3cwpamcbq9pv0mvcm8x6minqrlb4i0r12q3jg91girqswm2dp"; }; - unpackPhase = "true"; + dontUnpack = true; installPhase = "install -D $src $out/share/lib/${name}/${name}.jar"; diff --git a/nixpkgs/pkgs/development/tools/selenium/selendroid/default.nix b/nixpkgs/pkgs/development/tools/selenium/selendroid/default.nix index dcc3893ee0de..82b6d7e1161a 100644 --- a/nixpkgs/pkgs/development/tools/selenium/selendroid/default.nix +++ b/nixpkgs/pkgs/development/tools/selenium/selendroid/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { inherit name; inherit version; - unpackPhase = "true"; + dontUnpack = true; buildInputs = [ jdk makeWrapper ]; diff --git a/nixpkgs/pkgs/development/tools/selenium/server/default.nix b/nixpkgs/pkgs/development/tools/selenium/server/default.nix index 48bfbdd689b8..61b74ce108d6 100644 --- a/nixpkgs/pkgs/development/tools/selenium/server/default.nix +++ b/nixpkgs/pkgs/development/tools/selenium/server/default.nix @@ -16,7 +16,7 @@ in stdenv.mkDerivation rec { sha256 = "11v340nm8vzqc2bkmbjfm9a7j4dj0bi9bfk8wdpfan0fb8prf772"; }; - unpackPhase = "true"; + dontUnpack = true; buildInputs = [ jre makeWrapper ]; |