diff options
author | Jan Tojnar <jtojnar@gmail.com> | 2020-04-29 08:35:47 +0200 |
---|---|---|
committer | Jan Tojnar <jtojnar@gmail.com> | 2020-04-29 08:35:47 +0200 |
commit | 2874eebfd27731a8ceef3856be35338affd32eaa (patch) | |
tree | 674cb8c6addbdc3f8e2290ebdc34c5b3fa714c1b /pkgs/development/tools/misc | |
parent | 1014c7cb423c5866c06bf671dab5eed667ba245b (diff) | |
parent | f14021febf9c856e07a561124a1d67b90b5bf057 (diff) | |
download | nixlib-2874eebfd27731a8ceef3856be35338affd32eaa.tar nixlib-2874eebfd27731a8ceef3856be35338affd32eaa.tar.gz nixlib-2874eebfd27731a8ceef3856be35338affd32eaa.tar.bz2 nixlib-2874eebfd27731a8ceef3856be35338affd32eaa.tar.lz nixlib-2874eebfd27731a8ceef3856be35338affd32eaa.tar.xz nixlib-2874eebfd27731a8ceef3856be35338affd32eaa.tar.zst nixlib-2874eebfd27731a8ceef3856be35338affd32eaa.zip |
Merge branch 'staging-next' into staging
Diffstat (limited to 'pkgs/development/tools/misc')
7 files changed, 14 insertions, 14 deletions
diff --git a/pkgs/development/tools/misc/avrdude/default.nix b/pkgs/development/tools/misc/avrdude/default.nix index bca091d63095..bb0520cf28ef 100644 --- a/pkgs/development/tools/misc/avrdude/default.nix +++ b/pkgs/development/tools/misc/avrdude/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, yacc, flex, libusb, libelf, libftdi1, readline +{ stdenv, fetchurl, yacc, flex, libusb-compat-0_1, libelf, libftdi1, readline # docSupport is a big dependency, disabled by default , docSupport ? false, texLive ? null, texinfo ? null, texi2html ? null }: @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { configureFlags = stdenv.lib.optionals docSupport "--enable-doc"; - buildInputs = [ yacc flex libusb libelf libftdi1 readline ] + buildInputs = [ yacc flex libusb-compat-0_1 libelf libftdi1 readline ] ++ stdenv.lib.optionals docSupport [ texLive texinfo texi2html ]; meta = with stdenv.lib; { diff --git a/pkgs/development/tools/misc/blackmagic/default.nix b/pkgs/development/tools/misc/blackmagic/default.nix index 224cf16d7632..6e733cfe28ab 100644 --- a/pkgs/development/tools/misc/blackmagic/default.nix +++ b/pkgs/development/tools/misc/blackmagic/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchFromGitHub -, gcc-arm-embedded, libftdi1, libusb, pkgconfig +, gcc-arm-embedded, libftdi1, libusb-compat-0_1, pkgconfig , python, pythonPackages }: @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { buildInputs = [ libftdi1 - libusb + libusb-compat-0_1 python pythonPackages.intelhex ]; diff --git a/pkgs/development/tools/misc/dfu-programmer/default.nix b/pkgs/development/tools/misc/dfu-programmer/default.nix index 10e6dc0d8b82..a474ccc7e594 100644 --- a/pkgs/development/tools/misc/dfu-programmer/default.nix +++ b/pkgs/development/tools/misc/dfu-programmer/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libusb }: +{ stdenv, fetchurl, libusb-compat-0_1 }: let version = "0.7.2"; in @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { pname = "dfu-programmer"; inherit version; - buildInputs = [ libusb ]; + buildInputs = [ libusb-compat-0_1 ]; src = fetchurl { url = "mirror://sourceforge/dfu-programmer/${pname}-${version}.tar.gz"; diff --git a/pkgs/development/tools/misc/micronucleus/default.nix b/pkgs/development/tools/misc/micronucleus/default.nix index 9fbafebb10c5..890439adc6e9 100644 --- a/pkgs/development/tools/misc/micronucleus/default.nix +++ b/pkgs/development/tools/misc/micronucleus/default.nix @@ -1,7 +1,7 @@ { pkgs , stdenv -, libusb +, libusb-compat-0_1 , fetchFromGitHub , lib }: @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { sha256 = "14msy9amlbflw5mqrbs57b7bby3nsgx43srr7215zyhfdgsla0in"; }; - buildInputs = [ libusb ]; + buildInputs = [ libusb-compat-0_1 ]; makeFlags = stdenv.lib.optionals stdenv.isDarwin [ "CC=cc" ]; installPhase = '' diff --git a/pkgs/development/tools/misc/teensy-loader-cli/default.nix b/pkgs/development/tools/misc/teensy-loader-cli/default.nix index e03320f84295..62c480707cdd 100644 --- a/pkgs/development/tools/misc/teensy-loader-cli/default.nix +++ b/pkgs/development/tools/misc/teensy-loader-cli/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, go-md2man, installShellFiles, libusb }: +{ stdenv, fetchFromGitHub, go-md2man, installShellFiles, libusb-compat-0_1 }: stdenv.mkDerivation rec { pname = "teensy-loader-cli"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "1yx8vsh6b29pqr4zb6sx47429i9x51hj9psn8zksfz75j5ivfd5i"; }; - buildInputs = [ libusb ]; + buildInputs = [ libusb-compat-0_1 ]; nativeBuildInputs = [ go-md2man installShellFiles ]; diff --git a/pkgs/development/tools/misc/wishbone-tool/default.nix b/pkgs/development/tools/misc/wishbone-tool/default.nix index 8c2e27d64507..d900d14e33c2 100644 --- a/pkgs/development/tools/misc/wishbone-tool/default.nix +++ b/pkgs/development/tools/misc/wishbone-tool/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, rustPlatform, libusb }: +{ lib, fetchFromGitHub, rustPlatform, libusb-compat-0_1 }: let version = "0.6.9"; @@ -21,7 +21,7 @@ rustPlatform.buildRustPackage { ''; cargoSha256 = "0d5kcwy0cgxqfxf2xysw65ng84q4knhp4fgvh6dwqhf0nsca9gvs"; - buildInputs = [ libusb ]; + buildInputs = [ libusb-compat-0_1 ]; meta = with lib; { description = "Manipulate a Wishbone device over some sort of bridge"; diff --git a/pkgs/development/tools/misc/xc3sprog/default.nix b/pkgs/development/tools/misc/xc3sprog/default.nix index b39e9028afda..1ccd6c2ec4f2 100644 --- a/pkgs/development/tools/misc/xc3sprog/default.nix +++ b/pkgs/development/tools/misc/xc3sprog/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchsvn, cmake, libusb, libftdi }: +{ stdenv, fetchsvn, cmake, libusb-compat-0_1, libftdi }: # The xc3sprog project doesn't seem to make proper releases, they only put out # prebuilt binary subversion snapshots on sourceforge. @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { rev = version; }; - buildInputs = [ cmake libusb libftdi ]; + buildInputs = [ cmake libusb-compat-0_1 libftdi ]; meta = with stdenv.lib; { description = "Command-line tools for programming FPGAs, microcontrollers and PROMs via JTAG"; |