diff options
Diffstat (limited to 'nixpkgs/pkgs/development/tools')
23 files changed, 281 insertions, 114 deletions
diff --git a/nixpkgs/pkgs/development/tools/analysis/flow/default.nix b/nixpkgs/pkgs/development/tools/analysis/flow/default.nix index c26a5d8e0c8b..85ce733892f9 100644 --- a/nixpkgs/pkgs/development/tools/analysis/flow/default.nix +++ b/nixpkgs/pkgs/development/tools/analysis/flow/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "flow"; - version = "0.105.0"; + version = "0.105.2"; src = fetchFromGitHub { owner = "facebook"; repo = "flow"; rev = "refs/tags/v${version}"; - sha256 = "0p79v65h580vxm6j5nlrcxpkk4bxgn8wcvwmlfs70pbmdsj0hzwx"; + sha256 = "1zvg4yz9rpibvai66lb781qivgx9gr8222z3dix673dns06rd4nf"; }; installPhase = '' diff --git a/nixpkgs/pkgs/development/tools/avro-tools/default.nix b/nixpkgs/pkgs/development/tools/avro-tools/default.nix index ee2367d28bba..678988480ece 100644 --- a/nixpkgs/pkgs/development/tools/avro-tools/default.nix +++ b/nixpkgs/pkgs/development/tools/avro-tools/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, makeWrapper, jre, lib }: stdenv.mkDerivation rec { + pname = "avro-tools"; version = "1.9.0"; - name = "avro-tools-${version}"; src = fetchurl { url = - "https://repo1.maven.org/maven2/org/apache/avro/avro-tools/${version}/${name}.jar"; + "https://repo1.maven.org/maven2/org/apache/avro/avro-tools/${version}/${pname}-${version}.jar"; sha256 = "164mcz7ljd2ikwsq9ba98galcjar4g4n6ag7kkh466nwrpbmd2zi"; }; @@ -19,11 +19,10 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p $out/bin mkdir -p $out/libexec/avro-tools - mv $src ${name}.jar - cp ${name}.jar $out/libexec/avro-tools + cp $src $out/libexec/avro-tools/${pname}.jar makeWrapper ${jre}/bin/java $out/bin/avro-tools \ - --add-flags "-jar $out/libexec/avro-tools/${name}.jar" + --add-flags "-jar $out/libexec/avro-tools/${pname}.jar" ''; meta = with stdenv.lib; { diff --git a/nixpkgs/pkgs/development/tools/bazel-watcher/default.nix b/nixpkgs/pkgs/development/tools/bazel-watcher/default.nix index 51aeebb82e52..62ecc47b17bd 100644 --- a/nixpkgs/pkgs/development/tools/bazel-watcher/default.nix +++ b/nixpkgs/pkgs/development/tools/bazel-watcher/default.nix @@ -62,7 +62,7 @@ buildBazelPackage rec { sed -e '/^FILE:@bazel_gazelle_go_repository_tools.*/d' -i $bazelOut/external/\@*.marker ''; - sha256 = "1i3b6kn9kq70a34wkpm8zjqj1skawdxs3r01b7r6ws1rbdnfj6mp"; + sha256 = "0g2y283glx2ykxxqc3vsg520a6s2w5d937wndhgpfajc5yjgiz43"; }; buildAttrs = { diff --git a/nixpkgs/pkgs/development/tools/build-managers/bazel/default.nix b/nixpkgs/pkgs/development/tools/build-managers/bazel/default.nix index f67d8e761b43..1007f4df8cad 100644 --- a/nixpkgs/pkgs/development/tools/build-managers/bazel/default.nix +++ b/nixpkgs/pkgs/development/tools/build-managers/bazel/default.nix @@ -323,7 +323,7 @@ stdenv.mkDerivation rec { genericPatches = '' # Substitute python's stub shebang to plain python path. (see TODO add pr URL) # See also `postFixup` where python is added to $out/nix-support - patchShebangs src/main/java/com/google/devtools/build/lib/bazel/rules/python/python_stub_template.txt \ + substituteInPlace src/main/java/com/google/devtools/build/lib/bazel/rules/python/python_stub_template.txt \ --replace "#!/usr/bin/env python" "#!${python3}/bin/python" # md5sum is part of coreutils diff --git a/nixpkgs/pkgs/development/tools/build-managers/sbt-extras/default.nix b/nixpkgs/pkgs/development/tools/build-managers/sbt-extras/default.nix index e0cfe59b0516..cf19862b0056 100644 --- a/nixpkgs/pkgs/development/tools/build-managers/sbt-extras/default.nix +++ b/nixpkgs/pkgs/development/tools/build-managers/sbt-extras/default.nix @@ -1,8 +1,8 @@ { stdenv, fetchFromGitHub, which, curl, makeWrapper, jdk }: let - rev = "a47a965e00ecd66793832e2a12a1972d25e6f734"; - version = "2019-04-05"; + rev = "53f1edc685d8f269ac551336809e34faf7cd29a6"; + version = "2019-08-14"; in stdenv.mkDerivation { name = "sbt-extras-${version}"; @@ -12,7 +12,7 @@ stdenv.mkDerivation { owner = "paulp"; repo = "sbt-extras"; inherit rev; - sha256 = "1hrz7kg0k2iqq18bg6ll2bdj487p0987880dz0c0g35ah70ps2hj"; + sha256 = "1fyfwcnr30c0rgq6xfd2is9a8j1hsrl2p0xqicwqi4bzijy4r6gw"; }; dontBuild = true; diff --git a/nixpkgs/pkgs/development/tools/build-managers/scons/default.nix b/nixpkgs/pkgs/development/tools/build-managers/scons/default.nix index ce15de8678d6..08644def517d 100644 --- a/nixpkgs/pkgs/development/tools/build-managers/scons/default.nix +++ b/nixpkgs/pkgs/development/tools/build-managers/scons/default.nix @@ -8,7 +8,7 @@ in { sha256 = "0wzid419mlwqw9llrg8gsx4nkzhqy16m4m40r0xnh6cwscw5wir4"; }; scons_latest = mkScons { - version = "3.0.5"; - sha256 = "0gn7fgxvx94bjm4cim29cdz91ar1rmfxk2f39wwgljvdvhinyryz"; + version = "3.1.0"; + sha256 = "0bqkrpk5j6wvlljpdsimazav44y43qkl9mzc4f8ig8nl73blixgk"; }; } diff --git a/nixpkgs/pkgs/development/tools/castxml/default.nix b/nixpkgs/pkgs/development/tools/castxml/default.nix index 653d0d4505e7..1011f95cce7f 100644 --- a/nixpkgs/pkgs/development/tools/castxml/default.nix +++ b/nixpkgs/pkgs/development/tools/castxml/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub +{ lib, stdenv, fetchFromGitHub , pythonPackages , cmake , llvmPackages @@ -19,8 +19,10 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ] ++ stdenv.lib.optionals withMan [ pythonPackages.sphinx ]; + clangVersion = lib.getVersion llvmPackages.clang; + cmakeFlags = [ - "-DCLANG_RESOURCE_DIR=${llvmPackages.clang-unwrapped}" + "-DCLANG_RESOURCE_DIR=${llvmPackages.clang-unwrapped}/lib/clang/${clangVersion}/" "-DSPHINX_MAN=${if withMan then "ON" else "OFF"}" ]; diff --git a/nixpkgs/pkgs/development/tools/cppclean/default.nix b/nixpkgs/pkgs/development/tools/cppclean/default.nix index 99f8d55bd87e..85d49667a9af 100644 --- a/nixpkgs/pkgs/development/tools/cppclean/default.nix +++ b/nixpkgs/pkgs/development/tools/cppclean/default.nix @@ -3,14 +3,14 @@ with python3Packages; buildPythonApplication rec { - name = "cppclean-unstable-${version}"; - version = "2018-05-12"; + pname = "cppclean"; + version = "0.13"; src = fetchFromGitHub { owner = "myint"; repo = "cppclean"; - rev = "e7da41eca5e1fd2bd1dddd6655e50128bb96dc28"; - sha256 = "0pymh6r7y19bwcypfkmgwyixrx36pmz338jd83yrjflsbjlriqm4"; + rev = "v${version}"; + sha256 = "081bw7kkl7mh3vwyrmdfrk3fgq8k5laacx7hz8fjpchrvdrkqph0"; }; postUnpack = '' diff --git a/nixpkgs/pkgs/development/tools/electron/6.x.nix b/nixpkgs/pkgs/development/tools/electron/6.x.nix new file mode 100644 index 000000000000..5d412848d2d6 --- /dev/null +++ b/nixpkgs/pkgs/development/tools/electron/6.x.nix @@ -0,0 +1,86 @@ +{ stdenv, libXScrnSaver, makeWrapper, fetchurl, wrapGAppsHook, gtk3, unzip, atomEnv, libuuid, at-spi2-atk, at-spi2-core}: + +let + version = "6.0.1"; + name = "electron-${version}"; + + throwSystem = throw "Unsupported system: ${stdenv.hostPlatform.system}"; + + meta = with stdenv.lib; { + description = "Cross platform desktop application shell"; + homepage = https://github.com/electron/electron; + license = licenses.mit; + maintainers = with maintainers; [ travisbhartwell manveru ]; + platforms = [ "x86_64-darwin" "x86_64-linux" "i686-linux" "armv7l-linux" "aarch64-linux" ]; + }; + + linux = { + inherit name version meta; + src = { + i686-linux = fetchurl { + url = "https://github.com/electron/electron/releases/download/v${version}/electron-v${version}-linux-ia32.zip"; + sha256 = "0ly6mjcljw0axkkrz7dsvfywmjb3pmspalfk2259gyqqxj8a37pb"; + }; + x86_64-linux = fetchurl { + url = "https://github.com/electron/electron/releases/download/v${version}/electron-v${version}-linux-x64.zip"; + sha256 = "0l8k6v16ynikf6x59w5byzhji0d6mqp2q0kjlrby56546qzyfkh6"; + }; + armv7l-linux = fetchurl { + url = "https://github.com/electron/electron/releases/download/v${version}/electron-v${version}-linux-armv7l.zip"; + sha256 = "0c2xl8dm9fmj0d92w53zbn2np2fiwr88hw0dqjdn1rwczhw7zqss"; + }; + aarch64-linux = fetchurl { + url = "https://github.com/electron/electron/releases/download/v${version}/electron-v${version}-linux-arm64.zip"; + sha256 = "0iyq229snm7z411xxfsv7f0bqg6hbw2l8y6ymys110f83hp01f8a"; + }; + }.${stdenv.hostPlatform.system} or throwSystem; + + buildInputs = [ gtk3 ]; + + nativeBuildInputs = [ + unzip + makeWrapper + wrapGAppsHook + ]; + + dontWrapGApps = true; # electron is in lib, we need to wrap it manually + + buildCommand = '' + mkdir -p $out/lib/electron $out/bin + unzip -d $out/lib/electron $src + ln -s $out/lib/electron/electron $out/bin + + fixupPhase + + patchelf \ + --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + --set-rpath "${atomEnv.libPath}:${stdenv.lib.makeLibraryPath [ libuuid at-spi2-atk at-spi2-core ]}:$out/lib/electron" \ + $out/lib/electron/electron + + wrapProgram $out/lib/electron/electron \ + --prefix LD_PRELOAD : ${stdenv.lib.makeLibraryPath [ libXScrnSaver ]}/libXss.so.1 \ + "''${gappsWrapperArgs[@]}" + ''; + }; + + darwin = { + inherit name version meta; + + src = fetchurl { + url = "https://github.com/electron/electron/releases/download/v${version}/electron-v${version}-darwin-x64.zip"; + sha256 = "0m8v5fs69kanrd1yk6smbmaaj9gb5j3q487z3wicifry0xn381i2"; + }; + + buildInputs = [ unzip ]; + + buildCommand = '' + mkdir -p $out/Applications + unzip $src + mv Electron.app $out/Applications + mkdir -p $out/bin + ln -s $out/Applications/Electron.app/Contents/MacOs/Electron $out/bin/electron + ''; + }; +in + + stdenv.mkDerivation (if stdenv.isDarwin then darwin else linux) diff --git a/nixpkgs/pkgs/development/tools/icestorm/default.nix b/nixpkgs/pkgs/development/tools/icestorm/default.nix index c287e40d823a..851acd17b7ea 100644 --- a/nixpkgs/pkgs/development/tools/icestorm/default.nix +++ b/nixpkgs/pkgs/development/tools/icestorm/default.nix @@ -1,23 +1,26 @@ { stdenv, fetchFromGitHub , pkgconfig, libftdi , python3, pypy3 -}: -let - pypyCompatible = stdenv.isx86_64; /* pypy3 seems broken on i686 */ - pythonPkg = if pypyCompatible then pypy3 else python3; - pythonInterp = pythonPkg.interpreter; -in +# PyPy yields large improvements in build time and runtime performance, +# and IceStorm isn't intended to be used as a library other than by the +# nextpnr build process (which is also sped up by using PyPy), so we +# use it by default. See 18839e1 for more details. +, usePyPy ? stdenv.isx86_64 /* pypy3 seems broken on i686 */ +}: stdenv.mkDerivation rec { - name = "icestorm-${version}"; - version = "2019.04.16"; + pname = "icestorm"; + version = "2019.08.08"; + + pythonPkg = if usePyPy then pypy3 else python3; + pythonInterp = pythonPkg.interpreter; src = fetchFromGitHub { owner = "cliffordwolf"; repo = "icestorm"; - rev = "d9ea2e15fccebbbce59409b0ae7a1481d78aab86"; - sha256 = "1qa37p7hm7c2ga26xcvsd8xkqrp4hm0w6yh7cvz2q988yjzal5ky"; + rev = "2ccae0d3864fd7268118287a85963c0116745cff"; + sha256 = "1vlk5k7x6c1bjp19niyl0shljj8il94q2brjmda1rwhqxz81g9s7"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/nixpkgs/pkgs/development/tools/literate-programming/noweb/default.nix b/nixpkgs/pkgs/development/tools/literate-programming/noweb/default.nix index 44df2b1e1534..43cb6e6c2c75 100644 --- a/nixpkgs/pkgs/development/tools/literate-programming/noweb/default.nix +++ b/nixpkgs/pkgs/development/tools/literate-programming/noweb/default.nix @@ -1,29 +1,77 @@ -{stdenv, fetchurl, gawk}: - -stdenv.mkDerivation { - name = "noweb-2.11b"; - src = fetchurl { - urls = [ "http://ftp.de.debian.org/debian/pool/main/n/noweb/noweb_2.11b.orig.tar.gz" - "ftp://www.eecs.harvard.edu/pub/nr/noweb.tgz" - ]; - sha256 = "10hdd6mrk26kyh4bnng4ah5h1pnanhsrhqa7qwqy6dyv3rng44y9"; +{ stdenv, fetchFromGitHub, gawk, groff, icon-lang ? null }: + +let noweb = stdenv.mkDerivation rec { + pname = "noweb"; + version = "2.12"; + + src = fetchFromGitHub { + owner = "nrnrnr"; + repo = "noweb"; + rev = "v${builtins.replaceStrings ["."] ["_"] version}"; + sha256 = "1160i2ghgzqvnb44kgwd6s3p4jnk9668rmc15jlcwl7pdf3xqm95"; }; + + patches = [ ./no-FAQ.patch ]; + + nativeBuildInputs = [ groff ] ++ stdenv.lib.optionals (!isNull icon-lang) [ icon-lang ]; + preBuild = '' - mkdir -p $out/lib/noweb + mkdir -p "$out/lib/noweb" cd src - makeFlags="BIN=$out/bin LIB=$out/lib/noweb MAN=$out/share/man TEXINPUTS=$out/share/texmf/tex/latex" ''; - preInstall=''mkdir -p $out/share/texmf/tex/latex''; - postInstall= '' - substituteInPlace $out/bin/cpif --replace "PATH=/bin:/usr/bin" "" - for f in $out/bin/{noweb,nountangle,noroots,noroff,noindex} \ - $out/lib/noweb/{toroff,btdefn,totex,noidx,unmarkup,toascii,tohtml,emptydefn}; do - substituteInPlace $f --replace "nawk" "${gawk}/bin/awk" + + makeFlags = stdenv.lib.optionals (!isNull icon-lang) [ + "LIBSRC=icon" + "ICONC=icont" + ] ++ stdenv.lib.optionals stdenv.isDarwin [ + "CC=clang" + ]; + + installFlags = [ + "BIN=$(out)/bin" + "ELISP=$(out)/share/emacs/site-lisp" + "LIB=$(out)/lib/noweb" + "MAN=$(out)/share/man" + "TEXINPUTS=$(tex)/tex/latex/noweb" + ]; + + preInstall = '' + mkdir -p "$tex/tex/latex/noweb" + ''; + + installTargets = "install-code install-tex install-elisp"; + + postInstall = '' + substituteInPlace "$out/bin/cpif" --replace "PATH=/bin:/usr/bin" "" + + for f in $out/bin/no{index,roff,roots,untangle,web} \ + $out/lib/noweb/to{ascii,html,roff,tex} \ + $out/lib/noweb/{bt,empty}defn \ + $out/lib/noweb/{noidx,unmarkup}; do + # NOTE: substituteInPlace breaks Icon binaries, so make sure the script + # uses (n)awk before calling. + if grep -q nawk "$f"; then + substituteInPlace "$f" --replace "nawk" "${gawk}/bin/awk" + fi done + + # HACK: This is ugly, but functional. + PATH=$out/bin:$PATH make -BC xdoc + make $installFlags install-man + + ln -s "$tex" "$out/share/texmf" ''; - patches = [ ./no-FAQ.patch ]; - meta = { - platforms = stdenv.lib.platforms.linux; + outputs = [ "out" "tex" ]; + + tlType = "run"; + passthru.pkgs = [ noweb.tex ]; + + meta = with stdenv.lib; { + description = "A simple, extensible literate-programming tool"; + homepage = https://www.cs.tufts.edu/~nr/noweb; + license = licenses.bsd2; + maintainers = with maintainers; [ yurrriq ]; + platforms = with platforms; linux ++ darwin; }; -} +}; in noweb diff --git a/nixpkgs/pkgs/development/tools/misc/blackmagic/default.nix b/nixpkgs/pkgs/development/tools/misc/blackmagic/default.nix index 281463528354..ddc15f856b53 100644 --- a/nixpkgs/pkgs/development/tools/misc/blackmagic/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/blackmagic/default.nix @@ -1,28 +1,30 @@ { stdenv, lib, fetchFromGitHub -, gcc-arm-embedded, binutils-arm-embedded, libftdi +, gcc-arm-embedded, libftdi1 , python, pythonPackages }: with lib; stdenv.mkDerivation rec { - name = "blackmagic-${version}"; - version = "1.6.1"; + pname = "blackmagic"; + version = "unstable-2019-08-13"; + # `git describe --always` + firmwareVersion = "v1.6.1-317-gc9c8b08"; src = fetchFromGitHub { owner = "blacksphere"; repo = "blackmagic"; - rev = "29386aee140e5e99a958727358f60980418b4c88"; - sha256 = "05x19y80mixk6blpnfpfngy5d41jpjvdqgjzkmhv1qc03bhyhc82"; + rev = "c9c8b089f716c31433432f5ee54c5c206e4945cf"; + sha256 = "0175plba7h3r1p584ygkjlvg2clvxa2m0xfdcb2v8jza2vzc8ywd"; fetchSubmodules = true; }; nativeBuildInputs = [ - gcc-arm-embedded binutils-arm-embedded + gcc-arm-embedded ]; buildInputs = [ - libftdi + libftdi1 python pythonPackages.intelhex ]; @@ -30,7 +32,7 @@ stdenv.mkDerivation rec { postPatch = '' # Prevent calling out to `git' to generate a version number: substituteInPlace src/Makefile \ - --replace '`git describe --always --dirty`' '${version}' + --replace '$(shell git describe --always --dirty)' '${firmwareVersion}' # Fix scripts that generate headers: for f in $(find scripts libopencm3/scripts -type f); do @@ -41,6 +43,8 @@ stdenv.mkDerivation rec { buildPhase = "${stdenv.shell} ${./helper.sh}"; installPhase = ":"; # buildPhase does this. + enableParallelBuilding = true; + meta = { description = "In-application debugger for ARM Cortex microcontrollers"; longDescription = '' @@ -56,7 +60,7 @@ stdenv.mkDerivation rec { ''; homepage = https://github.com/blacksphere/blackmagic; license = licenses.gpl3Plus; - maintainers = with maintainers; [ pjones ]; + maintainers = with maintainers; [ pjones emily ]; platforms = platforms.unix; }; } diff --git a/nixpkgs/pkgs/development/tools/misc/blackmagic/helper.sh b/nixpkgs/pkgs/development/tools/misc/blackmagic/helper.sh index b4c7558885bb..991d0249e169 100755 --- a/nixpkgs/pkgs/development/tools/misc/blackmagic/helper.sh +++ b/nixpkgs/pkgs/development/tools/misc/blackmagic/helper.sh @@ -10,6 +10,8 @@ out=${out:-/tmp} ################################################################################ export CFLAGS=$NIX_CFLAGS_COMPILE +export MAKEFLAGS="\ + ${enableParallelBuilding:+-j${NIX_BUILD_CORES} -l${NIX_BUILD_CORES}}" ################################################################################ PRODUCTS="blackmagic.bin blackmagic.hex blackmagic_dfu.bin blackmagic_dfu.hex" diff --git a/nixpkgs/pkgs/development/tools/misc/cgdb/default.nix b/nixpkgs/pkgs/development/tools/misc/cgdb/default.nix index 31e720b13f29..6de69a34b290 100644 --- a/nixpkgs/pkgs/development/tools/misc/cgdb/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/cgdb/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "cgdb-${version}"; - version = "0.7.0"; + version = "0.7.1"; src = fetchurl { url = "https://cgdb.me/files/${name}.tar.gz"; - sha256 = "08slzg3702v5nivjhdx2bciqxc5vqcn8pc4i4lsgkcwdcrj94ymz"; + sha256 = "1671gpz5gx5j0zga8xy2x7h33vqh3nij93lbb6dbb366ivjknwmv"; }; buildInputs = [ ncurses readline flex texinfo ]; diff --git a/nixpkgs/pkgs/development/tools/misc/libtool/libtool2.nix b/nixpkgs/pkgs/development/tools/misc/libtool/libtool2.nix index 0fb3dfed7445..0424b9012519 100644 --- a/nixpkgs/pkgs/development/tools/misc/libtool/libtool2.nix +++ b/nixpkgs/pkgs/development/tools/misc/libtool/libtool2.nix @@ -2,10 +2,11 @@ }: stdenv.mkDerivation rec { - name = "libtool-2.4.6"; + pname = "libtool"; + version = "2.4.6"; src = fetchurl { - url = "mirror://gnu/libtool/${name}.tar.gz"; + url = "mirror://gnu/libtool/${pname}-${version}.tar.gz"; sha256 = "1qq61k6lp1fp75xs398yzi6wvbx232l7xbyn3p13cnh27mflvgg3"; }; @@ -23,13 +24,14 @@ stdenv.mkDerivation rec { doCheck = false; doInstallCheck = false; + enableParallelBuilding = true; + # Don't run the native `strip' when cross-compiling. This breaks at least # with `.a' files for MinGW. dontStrip = stdenv.hostPlatform != stdenv.buildPlatform; - meta = { + meta = with stdenv.lib; { description = "GNU Libtool, a generic library support script"; - longDescription = '' GNU libtool is a generic library support script. Libtool hides the complexity of using shared libraries behind a consistent, @@ -39,12 +41,9 @@ stdenv.mkDerivation rec { your Makefile, Makefile.in, or Makefile.am. See the documentation for details. ''; - homepage = https://www.gnu.org/software/libtool/; - - license = stdenv.lib.licenses.gpl2Plus; - + license = licenses.gpl2Plus; maintainers = [ ]; - platforms = stdenv.lib.platforms.unix; + platforms = platforms.unix; }; } diff --git a/nixpkgs/pkgs/development/tools/misc/luarocks/darwin-3.0.x.patch b/nixpkgs/pkgs/development/tools/misc/luarocks/darwin-3.0.x.patch index a5e4ac461b48..013ac5180afa 100644 --- a/nixpkgs/pkgs/development/tools/misc/luarocks/darwin-3.0.x.patch +++ b/nixpkgs/pkgs/development/tools/misc/luarocks/darwin-3.0.x.patch @@ -10,7 +10,7 @@ index f93e67a..2eb2db9 100644 + defaults.variables.STAT = "stat" defaults.variables.STATFLAG = "-f '%A'" - local version = util.popen_read("sw_vers -productVersion") -+ local version = "10.10" ++ local version = os.getenv("MACOSX_DEPLOYMENT_TARGET") or "10.12" version = tonumber(version and version:match("^[^.]+%.([^.]+)")) or 3 if version >= 10 then version = 8 diff --git a/nixpkgs/pkgs/development/tools/misc/luarocks/darwin-3.1.3.patch b/nixpkgs/pkgs/development/tools/misc/luarocks/darwin-3.1.3.patch index 7ef1c7a319ca..4ba883f01130 100644 --- a/nixpkgs/pkgs/development/tools/misc/luarocks/darwin-3.1.3.patch +++ b/nixpkgs/pkgs/development/tools/misc/luarocks/darwin-3.1.3.patch @@ -7,7 +7,7 @@ index c5af5a2..1949fdc 100644 defaults.arch = "macosx-"..target_cpu defaults.variables.LIBFLAG = "-bundle -undefined dynamic_lookup -all_load" - local version = util.popen_read("sw_vers -productVersion") -+ local version = "10.10" ++ local version = os.getenv("MACOSX_DEPLOYMENT_TARGET") or "10.12" version = tonumber(version and version:match("^[^.]+%.([^.]+)")) or 3 if version >= 10 then version = 8 diff --git a/nixpkgs/pkgs/development/tools/misc/tinyprog/default.nix b/nixpkgs/pkgs/development/tools/misc/tinyprog/default.nix new file mode 100644 index 000000000000..10d067e2c618 --- /dev/null +++ b/nixpkgs/pkgs/development/tools/misc/tinyprog/default.nix @@ -0,0 +1,42 @@ +{ lib +, python3Packages +, fetchFromGitHub +}: + +with python3Packages; buildPythonApplication rec { + pname = "tinyprog"; + # `python setup.py --version` from repo checkout + version = "1.0.24.dev99+ga77f828"; + + src = fetchFromGitHub { + owner = "tinyfpga"; + repo = "TinyFPGA-Bootloader"; + rev = "a77f828d3d6ae077e323ec96fc3925efab5aa9d7"; + sha256 = "0jg47q0n1qkdrzri2q6n9a7czicj0qk58asz0xhzkajx1k9z3g5q"; + }; + + sourceRoot = "source/programmer"; + + propagatedBuildInputs = [ + pyserial + jsonmerge + intelhex + tqdm + six + packaging + pyusb + ]; + + nativeBuildInputs = [ setuptools_scm ]; + + preBuild = '' + export SETUPTOOLS_SCM_PRETEND_VERSION="${version}" + ''; + + meta = with lib; { + homepage = https://github.com/tinyfpga/TinyFPGA-Bootloader/tree/master/programmer; + description = "Programmer for FPGA boards using the TinyFPGA USB Bootloader"; + maintainers = with maintainers; [ emily ]; + license = licenses.asl20; + }; +} diff --git a/nixpkgs/pkgs/development/tools/profiling/pyprof2calltree/default.nix b/nixpkgs/pkgs/development/tools/profiling/pyprof2calltree/default.nix deleted file mode 100644 index a2d98bcf2387..000000000000 --- a/nixpkgs/pkgs/development/tools/profiling/pyprof2calltree/default.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ lib, buildPythonApplication, fetchFromGitHub }: - -buildPythonApplication rec { - pname = "pyprof2calltree"; - version = "1.4.4"; - - # Fetch from GitHub because the PyPi packaged version does not - # include all test files. - src = fetchFromGitHub { - owner = "pwaller"; - repo = "pyprof2calltree"; - rev = "v" + version; - sha256 = "1vrip41ib7nmkwa8rjny1na1wyp7nvvgvm0h9bd21i262kbm4nqx"; - }; - - meta = with lib; { - description = "Help visualize profiling data from cProfile with kcachegrind and qcachegrind"; - homepage = https://pypi.python.org/pypi/pyprof2calltree/; - license = licenses.mit; - maintainers = with maintainers; [ sfrijters ]; - }; -} diff --git a/nixpkgs/pkgs/development/tools/rust/cargo-expand/default.nix b/nixpkgs/pkgs/development/tools/rust/cargo-expand/default.nix index 32cd368fb04d..0a36efa79eb4 100644 --- a/nixpkgs/pkgs/development/tools/rust/cargo-expand/default.nix +++ b/nixpkgs/pkgs/development/tools/rust/cargo-expand/default.nix @@ -1,18 +1,22 @@ -{ stdenv, rustPlatform, fetchFromGitHub, darwin }: +{ stdenv, rustPlatform, fetchFromGitHub, llvmPackages, darwin }: rustPlatform.buildRustPackage rec { pname = "cargo-expand"; - version = "0.4.12"; + version = "0.4.13"; src = fetchFromGitHub { owner = "dtolnay"; repo = pname; rev = version; - sha256 = "0m57v7mh7wdl0rdbad7vkvcgy93p9gcb971wap8i5nzjvzmp4wlb"; + sha256 = "0s3xd9dr0n64j0m38gd4cafrdr5vnpl557ks4wr0jszyhldnlfkz"; }; - cargoSha256 = "1wvqxj2w02d6zhyw3z5v0w4bfmbmldh63ygmvfxa3ngfb36gcacz"; - buildInputs = stdenv.lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Security; + cargoSha256 = "13zz3n1p75267h3qrmvpmd8agnkbk8vfbr8s38wcyysck81pr4px"; + + buildInputs = [ llvmPackages.libclang ] + ++ stdenv.lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Security; + + LIBCLANG_PATH = "${llvmPackages.libclang}/lib"; meta = with stdenv.lib; { description = "A utility and Cargo subcommand designed to let people expand macros in their Rust source code"; diff --git a/nixpkgs/pkgs/development/tools/rust/cargo-make/default.nix b/nixpkgs/pkgs/development/tools/rust/cargo-make/default.nix index 56f550e37a21..92e21bfc00e3 100644 --- a/nixpkgs/pkgs/development/tools/rust/cargo-make/default.nix +++ b/nixpkgs/pkgs/development/tools/rust/cargo-make/default.nix @@ -2,7 +2,7 @@ rustPlatform.buildRustPackage rec { pname = "cargo-make"; - version = "0.21.0"; + version = "0.22.0"; src = let @@ -10,11 +10,11 @@ rustPlatform.buildRustPackage rec { owner = "sagiegurari"; repo = pname; rev = version; - sha256 = "02hxf0mbk4nj9ja1z70k8fskh1kl3pixwy7gx0si5fbp9rmn04wk"; + sha256 = "13nl370immbhjarc0vfzrsflml3alh2f2zrh4znbks4yc3yp790z"; }; cargo-lock = fetchurl { - url = "https://gist.githubusercontent.com/xrelkd/e4c9c7738b21f284d97cb7b1d181317d/raw/b6017fd825b52987ac7c3b65620917e5d567312b/cargo-make-Cargo.lock"; - sha256 = "15ajxza58bbviwjxl98c0z89w4430902j0z46b594nbm02kv2ad9"; + url = "https://gist.githubusercontent.com/xrelkd/e4c9c7738b21f284d97cb7b1d181317d/raw/d31cfb3598d0a2886abd4d2ed43a02d493c8de8c/cargo-make-Cargo.lock"; + sha256 = "08fzl98d277n9xn3hrg9jahkqwdjfi5saajsppwzdbb3l7xw4jh2"; }; in runCommand "cargo-make-src" {} '' @@ -25,7 +25,7 @@ rustPlatform.buildRustPackage rec { buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; - cargoSha256 = "1fsfjavad1cbq1xvck2j5vyppxck606cpmqrwbs4fjvdmlbgx3gp"; + cargoSha256 = "0gj4a15slxnp31mlfgh57h3cwv0lnw5gdmkrmmj79migi96i5i6y"; # Some tests fail because they need network access. # However, Travis ensures a proper build. diff --git a/nixpkgs/pkgs/development/tools/skaffold/default.nix b/nixpkgs/pkgs/development/tools/skaffold/default.nix index d5a6f3915f2e..61d47cf907bc 100644 --- a/nixpkgs/pkgs/development/tools/skaffold/default.nix +++ b/nixpkgs/pkgs/development/tools/skaffold/default.nix @@ -2,9 +2,9 @@ buildGoPackage rec { name = "skaffold-${version}"; - version = "0.30.0"; - # rev is the 0.30.0 commit, mainly for skaffold version command output - rev = "fe31429012110e6fd70f97971288bd266ba95bed"; + version = "0.35.0"; + # rev is the 0.35.0 commit, mainly for skaffold version command output + rev = "1da7608f9eb21ebe722bc054584e591e4223a3dc"; goPackagePath = "github.com/GoogleContainerTools/skaffold"; subPackages = ["cmd/skaffold"]; diff --git a/nixpkgs/pkgs/development/tools/trellis/default.nix b/nixpkgs/pkgs/development/tools/trellis/default.nix index a348e295933e..0888130c2d45 100644 --- a/nixpkgs/pkgs/development/tools/trellis/default.nix +++ b/nixpkgs/pkgs/development/tools/trellis/default.nix @@ -7,22 +7,22 @@ let boostWithPython3 = boost.override { python = python3; enablePython = true; }; in stdenv.mkDerivation rec { - name = "trellis-${version}"; - version = "2019.04.22"; + pname = "trellis"; + version = "2019.08.09"; srcs = [ (fetchFromGitHub { owner = "symbiflow"; repo = "prjtrellis"; - rev = "5eb0ad870f30422b95d090ac9a476343809c62b9"; - sha256 = "10jkjfhqdr2bff41mh3w8a7kszf2whqqgk5s1z5z07mlh6zfdjlg"; + rev = "a67379179985bb12a611c75d975548cdf6e7d12e"; + sha256 = "0vqwfsblf7ylz0jnnf532kap5s1d1zcvbavxmb6a4v32b9xfdv35"; name = "trellis"; }) (fetchFromGitHub { owner = "symbiflow"; repo = "prjtrellis-db"; - rev = "d0b219af41ae3da6150645fbc5cc5613b530603f"; - sha256 = "1mnzvrqrcbfypvbagwyf6arv3kmj6q7n27gcmyk6ap2xnavkx4bq"; + rev = "b4d626b6402c131e9a035470ffe4cf33ccbe7986"; + sha256 = "0k26lq6c049ja8hhqcljwjb1y5k4gcici23l2n86gyp83jr03ilx"; name = "database"; }) ]; |