diff options
Diffstat (limited to 'nixpkgs/pkgs/development/tools/misc')
30 files changed, 394 insertions, 94 deletions
diff --git a/nixpkgs/pkgs/development/tools/misc/argbash/default.nix b/nixpkgs/pkgs/development/tools/misc/argbash/default.nix new file mode 100644 index 00000000000..b8e3ff4a9df --- /dev/null +++ b/nixpkgs/pkgs/development/tools/misc/argbash/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchFromGitHub, autoconf }: + +stdenv.mkDerivation rec { + pname = "argbash"; + + version = "2.8.1"; + + src = fetchFromGitHub { + owner = "matejak"; + repo = "argbash"; + rev = "${version}"; + sha256 = "0zara7v3pnwiwkpb0x0g37pxhmim4425q4gba712f6djj115r1mr"; + }; + + sourceRoot = "${src}/resources"; + + nativeBuildInputs = [ autoconf ]; + + makeFlags = [ "PREFIX=$(out)" ]; + + meta = with stdenv.lib; { + description = "Bash argument parsing code generator"; + homepage = "https://argbash.io/"; + license = licenses.free; # custom license. See LICENSE in source repo. + maintainers = with maintainers; [ rencire ]; + }; +} diff --git a/nixpkgs/pkgs/development/tools/misc/automake/automake-1.15.x.nix b/nixpkgs/pkgs/development/tools/misc/automake/automake-1.15.x.nix index e1aeb025c30..f1a48644617 100644 --- a/nixpkgs/pkgs/development/tools/misc/automake/automake-1.15.x.nix +++ b/nixpkgs/pkgs/development/tools/misc/automake/automake-1.15.x.nix @@ -13,6 +13,8 @@ stdenv.mkDerivation rec { setupHook = ./setup-hook.sh; + patches = [ ./help2man-SOURCE_DATE_EPOCH-support.patch ]; + # Disable indented log output from Make, otherwise "make.test" will # fail. preCheck = "unset NIX_INDENT_MAKE"; diff --git a/nixpkgs/pkgs/development/tools/misc/automake/help2man-SOURCE_DATE_EPOCH-support.patch b/nixpkgs/pkgs/development/tools/misc/automake/help2man-SOURCE_DATE_EPOCH-support.patch new file mode 100644 index 00000000000..048f75e6334 --- /dev/null +++ b/nixpkgs/pkgs/development/tools/misc/automake/help2man-SOURCE_DATE_EPOCH-support.patch @@ -0,0 +1,41 @@ +From 2e3357d7f0d63f1caeb40d9644c2436a5cd0da5f Mon Sep 17 00:00:00 2001 +From: David Terry <me@xwvvvvwx.com> +Date: Fri, 18 Oct 2019 10:23:11 +0200 +Subject: [PATCH] help2man: add support for SOURCE_DATE_EPOCH + +--- + doc/help2man | 14 +++++++++++++- + 1 file changed, 13 insertions(+), 1 deletion(-) + +diff --git a/doc/help2man b/doc/help2man +index af4306f..4a64167 100755 +--- a/doc/help2man ++++ b/doc/help2man +@@ -213,11 +213,23 @@ sub get_option_value; + my $help_text = get_option_value $ARGV[0], $help_option; + $version_text ||= get_option_value $ARGV[0], $version_option; + ++# By default the generated manual pages will include the current date. This may ++# however be overriden by setting the environment variable $SOURCE_DATE_EPOCH ++# to an integer value of the seconds since the UNIX epoch. This is primarily ++# intended to support reproducible builds (wiki.debian.org/ReproducibleBuilds) ++# and will additionally ensure that the output date string is UTC. ++my $epoch_secs = time; ++if (exists $ENV{SOURCE_DATE_EPOCH} and $ENV{SOURCE_DATE_EPOCH} =~ /^(\d+)$/) ++{ ++ $epoch_secs = $1; ++ $ENV{TZ} = 'UTC'; ++} ++ + # Translators: the following message is a strftime(3) format string, which in + # the English version expands to the month as a word and the full year. It + # is used on the footer of the generated manual pages. If in doubt, you may + # just use %x as the value (which should be the full locale-specific date). +-my $date = enc strftime _("%B %Y"), localtime; ++my $date = enc strftime _("%B %Y"), localtime $epoch_secs; + (my $program = $ARGV[0]) =~ s!.*/!!; + my $package = $program; + my $version; +-- +2.23.0 + diff --git a/nixpkgs/pkgs/development/tools/misc/binutils/default.nix b/nixpkgs/pkgs/development/tools/misc/binutils/default.nix index 210659289d1..4b3e2cc3bed 100644 --- a/nixpkgs/pkgs/development/tools/misc/binutils/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/binutils/default.nix @@ -1,11 +1,13 @@ { stdenv, lib, buildPackages -, fetchurl, zlib, autoreconfHook, gettext +, fetchFromGitHub, fetchurl, zlib, autoreconfHook, gettext # Enabling all targets increases output size to a multiple. , withAllTargets ? false, libbfd, libopcodes , enableShared ? true , noSysDirs , gold ? !stdenv.buildPlatform.isDarwin || stdenv.hostPlatform == stdenv.targetPlatform , bison ? null +, flex +, texinfo }: let @@ -20,16 +22,23 @@ let # PATH to both be usable. targetPrefix = lib.optionalString (stdenv.targetPlatform != stdenv.hostPlatform) "${stdenv.targetPlatform.config}-"; + vc4-binutils-src = fetchFromGitHub { + owner = "itszor"; + repo = "binutils-vc4"; + rev = "708acc851880dbeda1dd18aca4fd0a95b2573b36"; + sha256 = "1kdrz6fki55lm15rwwamn74fnqpy0zlafsida2zymk76n3656c63"; + }; + # HACK to ensure that we preserve source from bootstrap binutils to not rebuild LLVM + normal-src = stdenv.__bootPackages.binutils-unwrapped.src or (fetchurl { + url = "mirror://gnu/binutils/${basename}.tar.bz2"; + sha256 = "1l34hn1zkmhr1wcrgf0d4z7r3najxnw3cx2y2fk7v55zjlk3ik7z"; + }); in stdenv.mkDerivation { name = targetPrefix + basename; - # HACK to ensure that we preserve source from bootstrap binutils to not rebuild LLVM - src = stdenv.__bootPackages.binutils-unwrapped.src or (fetchurl { - url = "mirror://gnu/binutils/${basename}.tar.bz2"; - sha256 = "1l34hn1zkmhr1wcrgf0d4z7r3najxnw3cx2y2fk7v55zjlk3ik7z"; - }); + src = if stdenv.targetPlatform.isVc4 then vc4-binutils-src else normal-src; patches = [ # Make binutils output deterministic by default. @@ -54,6 +63,8 @@ stdenv.mkDerivation { # cross-compiling. ./always-search-rpath.patch + ] ++ lib.optionals (!stdenv.targetPlatform.isVc4) + [ # https://sourceware.org/bugzilla/show_bug.cgi?id=22868 ./gold-symbol-visibility.patch @@ -69,9 +80,9 @@ stdenv.mkDerivation { depsBuildBuild = [ buildPackages.stdenv.cc ]; nativeBuildInputs = [ bison - ] ++ lib.optionals stdenv.targetPlatform.isiOS [ + ] ++ (lib.optionals stdenv.targetPlatform.isiOS [ autoreconfHook - ]; + ]) ++ lib.optionals stdenv.targetPlatform.isVc4 [ texinfo flex ]; buildInputs = [ zlib gettext ]; inherit noSysDirs; diff --git a/nixpkgs/pkgs/development/tools/misc/ccls/default.nix b/nixpkgs/pkgs/development/tools/misc/ccls/default.nix index 8f805fcb759..8748cdf52b4 100644 --- a/nixpkgs/pkgs/development/tools/misc/ccls/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/ccls/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "ccls"; - version = "0.20190823.3"; + version = "0.20190823.5"; src = fetchFromGitHub { owner = "MaskRay"; repo = "ccls"; rev = version; - sha256 = "1sx31zp6q2qc6fz3r78rx34zp2x4blrqzxwbpww71vb6lp1clmdm"; + sha256 = "0b2pkpzn576b92zcxpwchpkyw2fww6s69818rx4g9z34kzm35zy5"; }; nativeBuildInputs = [ cmake ]; diff --git a/nixpkgs/pkgs/development/tools/misc/ccls/wrapper b/nixpkgs/pkgs/development/tools/misc/ccls/wrapper index f8d7b9eb3fe..155e6d4f647 100644 --- a/nixpkgs/pkgs/development/tools/misc/ccls/wrapper +++ b/nixpkgs/pkgs/development/tools/misc/ccls/wrapper @@ -9,4 +9,4 @@ fi initString+="]}}" -exec -a "$0" "@out@/bin/@wrapped@" "${initString}" "${extraFlagsArray[@]}" "$@" +exec -a "$0" "@out@/bin/@wrapped@" "${initString}" "$@" diff --git a/nixpkgs/pkgs/development/tools/misc/chrpath/default.nix b/nixpkgs/pkgs/development/tools/misc/chrpath/default.nix index 956a8df69ce..3cae6aa2ae6 100644 --- a/nixpkgs/pkgs/development/tools/misc/chrpath/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/chrpath/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "chrpath-0.16"; src = fetchurl { - url = "https://alioth.debian.org/frs/download.php/file/3979/chrpath-0.16.tar.gz"; + url = "https://alioth-archive.debian.org/releases/chrpath/chrpath/0.16/chrpath-0.16.tar.gz"; sha256 = "0yvfq891mcdkf8g18gjjkn2m5rvs8z4z4cl1vwdhx6f2p9a4q3dv"; }; @@ -15,7 +15,7 @@ stdenv.mkDerivation { binary. The rpath, or runpath if it is present, is where the runtime linker should look for the libraries needed for a program. ''; - homepage = https://alioth.debian.org/projects/chrpath/; + homepage = https://tracker.debian.org/pkg/chrpath; license = licenses.gpl2; platforms = platforms.linux; maintainers = [ maintainers.bjornfor ]; diff --git a/nixpkgs/pkgs/development/tools/misc/cquery/wrapper b/nixpkgs/pkgs/development/tools/misc/cquery/wrapper index 534f900f94a..8b3e5729042 100644 --- a/nixpkgs/pkgs/development/tools/misc/cquery/wrapper +++ b/nixpkgs/pkgs/development/tools/misc/cquery/wrapper @@ -9,4 +9,4 @@ fi initString+="]}" -exec -a "$0" "@out@/bin/@wrapped@" "${initString}" "${extraFlagsArray[@]}" "$@" +exec -a "$0" "@out@/bin/@wrapped@" "${initString}" "$@" diff --git a/nixpkgs/pkgs/development/tools/misc/editorconfig-checker/default.nix b/nixpkgs/pkgs/development/tools/misc/editorconfig-checker/default.nix new file mode 100644 index 00000000000..cbb6a38f67a --- /dev/null +++ b/nixpkgs/pkgs/development/tools/misc/editorconfig-checker/default.nix @@ -0,0 +1,22 @@ +{ buildGoModule, fetchFromGitHub, lib }: + +buildGoModule rec { + pname = "editorconfig-checker"; + version = "2.0.2"; + + src = fetchFromGitHub { + owner = "editorconfig-checker"; + repo = "editorconfig-checker"; + rev = "${version}"; + sha256 = "0v2ml9r8b5admi3sv80wa1pwl9qnz03q2p84vgcmgg2nv1v6yxf3"; + }; + + modSha256 = "09b1v9gyh6827yqlfxxxq3lcqhd5snn3n7gdlbjmga3wyp2x4g2r"; + + meta = with lib; { + description = "A tool to verify that your files are in harmony with your .editorconfig"; + homepage = "https://editorconfig-checker.github.io/"; + license = licenses.mit; + maintainers = with maintainers; [ uri-canva ]; + }; +} diff --git a/nixpkgs/pkgs/development/tools/misc/elfkickers/default.nix b/nixpkgs/pkgs/development/tools/misc/elfkickers/default.nix index c7eaafd9c7a..288e8bf9699 100644 --- a/nixpkgs/pkgs/development/tools/misc/elfkickers/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/elfkickers/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "elfkickers"; - version = "3.1"; + version = "3.1a"; src = fetchurl { url = "http://www.muppetlabs.com/~breadbox/pub/software/ELFkickers-${version}.tar.gz"; - sha256 = "0n0sypjrdm3ramv0sby4sdh3i3j9d0ihadr951wa08ypdnq3yrkd"; + sha256 = "02354yn1lh1dxny35ky2d0b44iq302krsqpwk5grr4glma00hhq6"; }; makeFlags = [ "CC=cc prefix=$(out)" ]; diff --git a/nixpkgs/pkgs/development/tools/misc/fsatrace/default.nix b/nixpkgs/pkgs/development/tools/misc/fsatrace/default.nix index 152792dcee2..b8202f94ce9 100644 --- a/nixpkgs/pkgs/development/tools/misc/fsatrace/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/fsatrace/default.nix @@ -2,23 +2,26 @@ stdenv.mkDerivation rec { pname = "fsatrace"; - version = "0.0.1-160"; + version = "0.0.1-324"; src = fetchFromGitHub { owner = "jacereda"; repo = "fsatrace"; - rev = "2bf89d836e0156e68f121b0ffeedade7c9381f77"; - sha256 = "0bndfmm0y738azwzf6m6xg6gjnrwcqlfjsampk67vga40yylwkbw"; + rev = "41fbba17da580f81ababb32ec7e6e5fd49f11473"; + sha256 = "1ihm2v723idd6m0kc1z9v73hmfvh2v0vjs8wvx5w54jaxh3lmj1y"; }; - preConfigure = '' - mkdir -p $out/libexec/${pname}-${version} - export makeFlags=INSTALLDIR=$out/libexec/${pname}-${version} + installDir = "libexec/${pname}-${version}"; + + makeFlags = [ "INSTALLDIR=$(out)/$(installDir)" ]; + + preInstall = '' + mkdir -p $out/$installDir ''; postInstall = '' mkdir -p $out/bin - ln -s $out/libexec/${pname}-${version}/fsatrace $out/bin/ + ln -s $out/$installDir/fsatrace $out/bin/fsatrace ''; meta = with stdenv.lib; { diff --git a/nixpkgs/pkgs/development/tools/misc/gputils/default.nix b/nixpkgs/pkgs/development/tools/misc/gputils/default.nix index 37a7a8c931c..2ad496bfb88 100644 --- a/nixpkgs/pkgs/development/tools/misc/gputils/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/gputils/default.nix @@ -10,7 +10,8 @@ stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - homepage = https://gputils.sourceforge.io/; + homepage = "https://gputils.sourceforge.io"; + description = "A collection of tools for the Microchip (TM) PIC microcontrollers. It includes gpasm, gplink, and gplib"; license = licenses.gpl2; maintainers = with maintainers; [ yorickvp ]; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/development/tools/misc/itstool/default.nix b/nixpkgs/pkgs/development/tools/misc/itstool/default.nix index 9368a3c1acf..a5c3623b699 100644 --- a/nixpkgs/pkgs/development/tools/misc/itstool/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/itstool/default.nix @@ -1,24 +1,14 @@ -{ stdenv, fetchurl, python2, libxml2Python }: -# We need the same Python as is used to build libxml2Python +{ stdenv, fetchurl, python3 }: stdenv.mkDerivation rec { - # 2.0.3+ breaks the build of gnome3.gnome-desktop - # https://github.com/itstool/itstool/issues/17 - name = "itstool-2.0.2"; + name = "itstool-2.0.6"; src = fetchurl { url = "http://files.itstool.org/itstool/${name}.tar.bz2"; - sha256 = "bf909fb59b11a646681a8534d5700fec99be83bb2c57badf8c1844512227033a"; + sha256 = "1acjgf8zlyk7qckdk19iqaca4jcmywd7vxjbcs1mm6kaf8icqcv2"; }; - buildInputs = [ python2 libxml2Python ]; - - patchPhase = - '' - sed -e '/import libxml2/i import sys\ - sys.path.append("${libxml2Python}/lib/${python2.libPrefix}/site-packages")' \ - -i itstool.in - ''; + buildInputs = [ (python3.withPackages(ps: with ps; [ libxml2 ])) ]; meta = { homepage = http://itstool.org/; diff --git a/nixpkgs/pkgs/development/tools/misc/lttng-tools/default.nix b/nixpkgs/pkgs/development/tools/misc/lttng-tools/default.nix index 17837a54877..815d5aac406 100644 --- a/nixpkgs/pkgs/development/tools/misc/lttng-tools/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/lttng-tools/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "lttng-tools"; - version = "2.10.7"; + version = "2.11.0"; src = fetchurl { url = "https://lttng.org/files/lttng-tools/${pname}-${version}.tar.bz2"; - sha256 = "04hkga0hnyjmv42mxj3njaykqmq9x4abd5qfyds5r62x1khfnwgd"; + sha256 = "1g0g7ypxvc7wd5x4d4ixmfgl9yk0lxax3ymm95hcjwxn5p497r6w"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/nixpkgs/pkgs/development/tools/misc/mkcert/default.nix b/nixpkgs/pkgs/development/tools/misc/mkcert/default.nix index b9b1f83322d..ae0a4a6dfe2 100644 --- a/nixpkgs/pkgs/development/tools/misc/mkcert/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/mkcert/default.nix @@ -1,17 +1,23 @@ -{ lib, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: -buildGoPackage rec { +buildGoModule rec { pname = "mkcert"; - version = "1.4.0"; + version = "1.4.1"; src = fetchFromGitHub { owner = "FiloSottile"; repo = pname; rev = "v${version}"; - sha256 = "0xcmvzh5lq8vs3b0f1zw645fxdr8471v7prl1656q02v38f58ly7"; + sha256 = "0w1ji96hbd3anzsz82xjcafsqhgyz7c7n41rsq60yrllwbj5946f"; }; + modSha256 = "13a3snhcqq3a9lfy9zfr2rx10mf2ymvhmds1bg8n4m7lbwnzm4fg"; + goPackagePath = "github.com/FiloSottile/mkcert"; + buildFlagsArray = '' + -ldflags= + -X ${goPackagePath}/main.Version=${version} + ''; meta = with lib; { homepage = https://github.com/FiloSottile/mkcert; diff --git a/nixpkgs/pkgs/development/tools/misc/patchelf/setup-hook.sh b/nixpkgs/pkgs/development/tools/misc/patchelf/setup-hook.sh index bc1cddd4879..576b9ca2103 100644 --- a/nixpkgs/pkgs/development/tools/misc/patchelf/setup-hook.sh +++ b/nixpkgs/pkgs/development/tools/misc/patchelf/setup-hook.sh @@ -2,7 +2,7 @@ # directories from the RPATH of every library or executable in every # output. -fixupOutputHooks+=('if [ -z "$dontPatchELF" ]; then patchELF "$prefix"; fi') +fixupOutputHooks+=('if [ -z "${dontPatchELF-}" ]; then patchELF "$prefix"; fi') patchELF() { local dir="$1" diff --git a/nixpkgs/pkgs/development/tools/misc/premake/setup-hook.sh b/nixpkgs/pkgs/development/tools/misc/premake/setup-hook.sh index ba06ea2c761..6e65e9e8c73 100644 --- a/nixpkgs/pkgs/development/tools/misc/premake/setup-hook.sh +++ b/nixpkgs/pkgs/development/tools/misc/premake/setup-hook.sh @@ -14,6 +14,6 @@ premakeConfigurePhase() { runHook postConfigure } -if [ -z "$configurePhase" ]; then +if [ -z "${configurePhase-}" ]; then configurePhase=premakeConfigurePhase fi diff --git a/nixpkgs/pkgs/development/tools/misc/sccache/default.nix b/nixpkgs/pkgs/development/tools/misc/sccache/default.nix index 998abe112a6..16a3f9557d2 100644 --- a/nixpkgs/pkgs/development/tools/misc/sccache/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/sccache/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, cargo, rustc, rustPlatform, pkgconfig, glib, openssl, darwin }: rustPlatform.buildRustPackage rec { - version = "0.2.11"; + version = "0.2.12"; pname = "sccache"; src = fetchFromGitHub { owner = "mozilla"; repo = "sccache"; rev = version; - sha256 = "0084ddvzjgdpkwqc38kvzaz8n6av9ml3qqlkjma70hsis8w8gqjz"; + sha256 = "1yd3rfp032crwlmfn2p3z12f67q7bxm78fhvdlc7azm2a4hkif4k"; }; cargoSha256 = "1bkglgrasyjyzjj9mwm32d3g3mg5yv74jj3zl7jf20dlq3rg3fh6"; diff --git a/nixpkgs/pkgs/development/tools/misc/stm32cubemx/default.nix b/nixpkgs/pkgs/development/tools/misc/stm32cubemx/default.nix new file mode 100644 index 00000000000..53336ab417c --- /dev/null +++ b/nixpkgs/pkgs/development/tools/misc/stm32cubemx/default.nix @@ -0,0 +1,78 @@ +{ stdenv, requireFile, makeDesktopItem, libicns, imagemagick, zstd, jre }: + +let + version = "5.3.0"; + desktopItem = makeDesktopItem { + name = "stm32CubeMX"; + exec = "stm32cubemx"; + desktopName = "STM32CubeMX"; + categories = "Application;Development;"; + icon = "stm32cubemx"; + }; +in +stdenv.mkDerivation rec { + pname = "stm32cubemx"; + inherit version; + + src = requireFile rec { + name = "STM32CubeMX.tar.zst"; + message = '' + Unfortunately, we cannot download file ${name} automatically. + Please proceed with the following steps to download and add it to the Nix + store yourself: + + 1. get en.STM32CubeMX_${builtins.replaceStrings ["."] ["-"] version}.zip + 2. unzip en.STM32CubeMX_${builtins.replaceStrings ["."] ["-"] version}.zip + 3. run the setup: java -jar SetupSTM32CubeMX-${version}.exe + 4. create a tar from created folder: tar --zstd -cf ${name} STM32CubeMX + 5. add the result to the store: nix-prefetch-url file://\$PWD/${name} + + Notice: The setup will quit with an error about /bin/chmod + ''; + sha256 = "1r5k5wmsvw1w2nfs3nb4gc6pb3j0x6bqljn9jzc4r8y5bxc34rr8"; + }; + + nativeBuildInputs = [ libicns imagemagick zstd ]; + + buildCommand = '' + mkdir -p $out/{bin,opt,share/applications} + + tar --extract --zstd --file $src --directory $out/opt/ + chmod +rx $out/opt/STM32CubeMX/STM32CubeMX.exe + + cat << EOF > $out/bin/${pname} + #!${stdenv.shell} + ${jre}/bin/java -jar $out/opt/STM32CubeMX/STM32CubeMX.exe + EOF + chmod +x $out/bin/${pname} + + icns2png --extract $out/opt/STM32CubeMX/${pname}.icns + ls + for size in 16 24 32 48 64 128 256; do + mkdir -pv $out/share/icons/hicolor/"$size"x"$size"/apps + if [ -e ${pname}_"$size"x"$size"x32.png ]; then + mv ${pname}_"$size"x"$size"x32.png \ + $out/share/icons/hicolor/"$size"x"$size"/apps/${pname}.png + else + convert -resize "$size"x"$size" ${pname}_256x256x32.png \ + $out/share/icons/hicolor/"$size"x"$size"/apps/${pname}.png + fi + done; + + ln -s ${desktopItem}/share/applications/* $out/share/applications + ''; + + meta = with stdenv.lib; { + description = '' + A graphical tool that allows a very easy configuration of STM32 + microcontrollers and microprocessors, as well as the generation of the + corresponding initialization C code for the Arm® Cortex®-M core or a + partial Linux® Device Tree for Arm® Cortex®-A core), through a + step-by-step process. + ''; + homepage = "https://www.st.com/en/development-tools/stm32cubemx.html"; + license = licenses.unfree; + maintainers = with maintainers; [ wucke13 ]; + platforms = platforms.all; + }; +} diff --git a/nixpkgs/pkgs/development/tools/misc/sysbench/default.nix b/nixpkgs/pkgs/development/tools/misc/sysbench/default.nix index 8076925f29b..8feeb13db95 100644 --- a/nixpkgs/pkgs/development/tools/misc/sysbench/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/sysbench/default.nix @@ -1,21 +1,26 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, vim, libmysqlclient -, libaio }: +{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig +, libmysqlclient, libaio +}: -stdenv.mkDerivation { - name = "sysbench-1.0.17"; +stdenv.mkDerivation rec { + pname = "sysbench"; + version = "1.0.18"; nativeBuildInputs = [ autoreconfHook pkgconfig ]; - buildInputs = [ vim libmysqlclient libaio ]; + buildInputs = [ libmysqlclient libaio ]; src = fetchFromGitHub { owner = "akopytov"; - repo = "sysbench"; - rev = "1.0.17"; - sha256 = "02i9knvp0bjw6ri848xxiy2dbww2xv70nah9yn67a6zgw617hwa6"; + repo = pname; + rev = version; + sha256 = "1r6lkyfp65xqklj1rdfw551srqqyak144agi8x3wjz3wmsbqls19"; }; + enableParallelBuilding = true; + meta = { description = "Modular, cross-platform and multi-threaded benchmark tool"; + homepage = https://github.com/akopytov/sysbench; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; }; diff --git a/nixpkgs/pkgs/development/tools/misc/terracognita/default.nix b/nixpkgs/pkgs/development/tools/misc/terracognita/default.nix index 832a2285569..e18f32fb07c 100644 --- a/nixpkgs/pkgs/development/tools/misc/terracognita/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/terracognita/default.nix @@ -2,16 +2,18 @@ buildGoModule rec { pname = "terracognita"; - version = "0.1.6"; + version = "0.2.0"; src = fetchFromGitHub { owner = "cycloidio"; repo = pname; rev = "v${version}"; - sha256 = "0ljh9dyn919k5f0yaca5an2vczj8cd5cb6qb4i5bdgmlh3wijiag"; + sha256 = "06qw3mycgqkj2f5n6lm9xb2c21xjim2qlwizxsdc5hjrwbasl2q0"; }; - modSha256 = "1ssz6rhdqma79x75qsxpa9is5zw1nlc0rv1h23dfsk8vla3p84ml"; + modSha256 = "0sjs1dd8z8brxj5wwfrwimnlscy7i6flc4kq4576zwrcjg6pjvkr"; + + buildFlagsArray = [ "-ldflags=-s -w -X github.com/cycloidio/terracognita/cmd.Version=${version}" ]; meta = with lib; { description = "Reads from existing Cloud Providers (reverse Terraform) and generates your infrastructure as code on Terraform configuration"; diff --git a/nixpkgs/pkgs/development/tools/misc/texlab/citeproc/package.json b/nixpkgs/pkgs/development/tools/misc/texlab/citeproc/package.json new file mode 100644 index 00000000000..87e7ccc1c92 --- /dev/null +++ b/nixpkgs/pkgs/development/tools/misc/texlab/citeproc/package.json @@ -0,0 +1,31 @@ +{ + "name": "citeproc", + "version": "0.1.0", + "description": "Render BibTeX citations", + "repository": "https://github.com/latex-lsp/citeproc.git", + "author": "Eric Förster <efoerster@users.noreply.github.com>", + "license": "MIT", + "scripts": { + "dist": "webpack", + "format": "prettier --write \"src/**/*.{js,json}\" \"*.{js,json,yml,md}\" \".vscode/**/*.{json}\"" + }, + "dependencies": { + "@babel/core": "^7.5.5", + "@babel/preset-env": "^7.5.5", + "@citation-js/core": "^0.4.8", + "@citation-js/plugin-bibtex": "^0.4.8", + "@citation-js/plugin-csl": "^0.4.8", + "@types/node": "^11.13.17", + "@types/webpack": "^4.4.35", + "babel-loader": "^8.0.6", + "babel-polyfill": "^6.26.0", + "null-loader": "^0.1.1", + "prettier": "^1.18.2", + "ts-loader": "^5.4.5", + "ts-node": "^8.3.0", + "tslint": "^5.18.0", + "tslint-config-prettier": "^1.15.0", + "webpack": "^4.35.3", + "webpack-cli": "^3.3.6" + } +} diff --git a/nixpkgs/pkgs/development/tools/misc/texlab/citeproc/update-package.json.sh b/nixpkgs/pkgs/development/tools/misc/texlab/citeproc/update-package.json.sh new file mode 100755 index 00000000000..b57e48e10bc --- /dev/null +++ b/nixpkgs/pkgs/development/tools/misc/texlab/citeproc/update-package.json.sh @@ -0,0 +1,14 @@ +#!/usr/bin/env nix-shell +#! nix-shell -i bash -p jq + +set -eu -o pipefail + +if [ "$#" -ne 1 ] || [[ "$1" == -* ]]; then + echo "Usage: $0 <git release tag>" + exit 1 +fi + +TEXLAB_WEB_SRC="https://raw.githubusercontent.com/latex-lsp/texlab/$1" + +curl --silent "$TEXLAB_WEB_SRC/src/citeproc/js/package.json" | \ + jq '. + {"dependencies": .devDependencies} | del(.devDependencies)' > package.json diff --git a/nixpkgs/pkgs/development/tools/misc/texlab/default.nix b/nixpkgs/pkgs/development/tools/misc/texlab/default.nix new file mode 100644 index 00000000000..e11c288c1e9 --- /dev/null +++ b/nixpkgs/pkgs/development/tools/misc/texlab/default.nix @@ -0,0 +1,39 @@ +{ stdenv +, rustPlatform +, fetchFromGitHub +, nodejs +, Security +, texlab-citeproc-build-deps +}: + +rustPlatform.buildRustPackage rec { + pname = "texlab"; + version = "1.7.0"; + + src = fetchFromGitHub { + owner = "latex-lsp"; + repo = pname; + rev = "v${version}"; + sha256 = "0b9lw6cmh7gyzj0pb3ghvqc3q7lzl12bfg9pjhl31lib3mmga8yb"; + }; + + cargoSha256 = "0qnysl0ayc242dgvanqgmx8v4a2cjg0f1lhbyw16qjv61qcsx8y5"; + + nativeBuildInputs = [ nodejs ]; + + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; + + preBuild = '' + rm build.rs + ln -s ${texlab-citeproc-build-deps}/lib/node_modules/citeproc/node_modules src/citeproc/js + (cd src/citeproc/js && npm run dist) + ''; + + meta = with stdenv.lib; { + description = "An implementation of the Language Server Protocol for LaTeX"; + homepage = https://texlab.netlify.com/; + license = licenses.mit; + maintainers = with maintainers; [ doronbehar metadark ]; + platforms = platforms.all; + }; +} diff --git a/nixpkgs/pkgs/development/tools/misc/tokei/Cargo.lock.patch b/nixpkgs/pkgs/development/tools/misc/tokei/Cargo.lock.patch deleted file mode 100644 index 46bd80a218d..00000000000 --- a/nixpkgs/pkgs/development/tools/misc/tokei/Cargo.lock.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/Cargo.lock b/Cargo.lock -index db09bc4..1e4892d 100644 ---- a/Cargo.lock -+++ b/Cargo.lock -@@ -961,7 +961,7 @@ dependencies = [ - - [[package]] - name = "tokei" --version = "10.0.0" -+version = "10.0.1" - dependencies = [ - "clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)", - "dirs 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)", diff --git a/nixpkgs/pkgs/development/tools/misc/tokei/default.nix b/nixpkgs/pkgs/development/tools/misc/tokei/default.nix index 104aa4691ab..e3e8e2c046c 100644 --- a/nixpkgs/pkgs/development/tools/misc/tokei/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/tokei/default.nix @@ -2,19 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "tokei"; - version = "10.0.1"; + version = "10.1.0"; src = fetchFromGitHub { owner = "XAMPPRocky"; repo = pname; rev = "v${version}"; - sha256 = "0g8p4f8g9zb1fqzzb1qi28idskahi5nldsma6rydjyrgi9gynpa0"; + sha256 = "0l7vqmdagfhi4hnp50ng253zy4g48qjhs5kmnk2xh5v3c59ys4zs"; }; - cargoSha256 = "0pwq1scll5ga8rw4lx97s915zvp7v171b6316cin54f2zzpbrxx5"; - - # Patch for v10.0.1 Cargo.lock issue - patches = [ ./Cargo.lock.patch ]; + cargoSha256 = "140nm0nswmgdp549gqp71dbn99rc5g7cagl9s5m5qirl9mbpys8x"; buildInputs = stdenv.lib.optionals stdenv.isDarwin [ libiconv darwin.apple_sdk.frameworks.Security diff --git a/nixpkgs/pkgs/development/tools/misc/travis/Gemfile b/nixpkgs/pkgs/development/tools/misc/travis/Gemfile index 0a470854aaf..3da9975913e 100644 --- a/nixpkgs/pkgs/development/tools/misc/travis/Gemfile +++ b/nixpkgs/pkgs/development/tools/misc/travis/Gemfile @@ -1,3 +1,4 @@ source "https://rubygems.org" -gem "travis", "1.8.10" +gem "travis" +gem "pry", "~> 0.11.0" diff --git a/nixpkgs/pkgs/development/tools/misc/travis/Gemfile.lock b/nixpkgs/pkgs/development/tools/misc/travis/Gemfile.lock index c5ac09cb9e6..a29f329ca8a 100644 --- a/nixpkgs/pkgs/development/tools/misc/travis/Gemfile.lock +++ b/nixpkgs/pkgs/development/tools/misc/travis/Gemfile.lock @@ -3,13 +3,14 @@ GEM specs: addressable (2.4.0) backports (3.15.0) + coderay (1.1.2) ethon (0.12.0) ffi (>= 1.3.0) - faraday (0.15.4) + faraday (0.17.0) multipart-post (>= 1.2, < 3) faraday_middleware (0.13.1) faraday (>= 0.7.4, < 1.0) - ffi (1.11.1) + ffi (1.11.2) gh (0.15.1) addressable (~> 2.4.0) backports @@ -21,10 +22,14 @@ GEM json (2.2.0) launchy (2.4.3) addressable (~> 2.3) - multi_json (1.13.1) + method_source (0.9.2) + multi_json (1.14.1) multipart-post (2.1.1) net-http-persistent (2.9.4) net-http-pipeline (1.0.1) + pry (0.11.3) + coderay (~> 1.1.0) + method_source (~> 0.9.0) pusher-client (0.6.2) json websocket (~> 1.0) @@ -45,7 +50,8 @@ PLATFORMS ruby DEPENDENCIES - travis (= 1.8.10) + pry (~> 0.11.0) + travis BUNDLED WITH 1.17.2 diff --git a/nixpkgs/pkgs/development/tools/misc/travis/gemset.nix b/nixpkgs/pkgs/development/tools/misc/travis/gemset.nix index 09d5d41454e..a12a891b3e7 100644 --- a/nixpkgs/pkgs/development/tools/misc/travis/gemset.nix +++ b/nixpkgs/pkgs/development/tools/misc/travis/gemset.nix @@ -15,6 +15,16 @@ }; version = "3.15.0"; }; + coderay = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "15vav4bhcc2x3jmi3izb11l4d9f3xv8hp2fszb7iqmpsccv1pz4y"; + type = "gem"; + }; + version = "1.1.2"; + }; ethon = { dependencies = ["ffi"]; source = { @@ -26,12 +36,14 @@ }; faraday = { dependencies = ["multipart-post"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0s72m05jvzc1pd6cw1i289chas399q0a14xrwg4rvkdwy7bgzrh0"; + sha256 = "0jk2bar4x6miq2cr73lv0lsbmw4cymiljvp29xb85jifsb3ba6az"; type = "gem"; }; - version = "0.15.4"; + version = "0.17.0"; }; faraday_middleware = { dependencies = ["faraday"]; @@ -43,12 +55,14 @@ version = "0.13.1"; }; ffi = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "06mvxpjply8qh4j3fj9wh08kdzwkbnvsiysh0vrhlk5cwxzjmblh"; + sha256 = "0cbads5da12lb3j0mg2hjrd57s5qkkairxh2y6r9bqyblb5b8xbw"; type = "gem"; }; - version = "1.11.1"; + version = "1.11.2"; }; gh = { dependencies = ["addressable" "backports" "faraday" "multi_json" "net-http-persistent" "net-http-pipeline"]; @@ -84,13 +98,25 @@ }; version = "2.4.3"; }; + method_source = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1pviwzvdqd90gn6y7illcdd9adapw8fczml933p5vl739dkvl3lq"; + type = "gem"; + }; + version = "0.9.2"; + }; multi_json = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1rl0qy4inf1mp8mybfk56dfga0mvx97zwpmq5xmiwl5r770171nv"; + sha256 = "0xy54mjf7xg41l8qrg1bqri75agdqmxap9z466fjismc1rn2jwfr"; type = "gem"; }; - version = "1.13.1"; + version = "1.14.1"; }; multipart-post = { source = { @@ -116,6 +142,17 @@ }; version = "1.0.1"; }; + pry = { + dependencies = ["coderay" "method_source"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1mh312k3y94sj0pi160wpia0ps8f4kmzvm505i6bvwynfdh7v30g"; + type = "gem"; + }; + version = "0.11.3"; + }; pusher-client = { dependencies = ["json" "websocket"]; source = { @@ -151,4 +188,4 @@ }; version = "1.2.8"; }; -} +}
\ No newline at end of file diff --git a/nixpkgs/pkgs/development/tools/misc/uncrustify/default.nix b/nixpkgs/pkgs/development/tools/misc/uncrustify/default.nix index d85cd1a8216..01ed6603018 100644 --- a/nixpkgs/pkgs/development/tools/misc/uncrustify/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/uncrustify/default.nix @@ -1,18 +1,18 @@ -{ stdenv, fetchFromGitHub, cmake }: +{ stdenv, fetchFromGitHub, cmake, python }: stdenv.mkDerivation rec { name = "${product}-${version}"; product = "uncrustify"; - version = "0.67"; + version = "0.70.1"; src = fetchFromGitHub { owner = product; repo = product; rev = name; - sha256 = "0hf8c93aj1hjg6cc77x6p7nf7ddp8mn4b6a9gpcrvmx8w81afpd3"; + sha256 = "0zr3vxhd947zdvwccw3cj0vsriaawcpfjq3x94v9887hsi8fk87b"; }; - nativeBuildInputs = [ cmake ]; + nativeBuildInputs = [ cmake python ]; enableParallelBuilding = true; |