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/tools | |
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/tools')
20 files changed, 56 insertions, 86 deletions
diff --git a/pkgs/tools/admin/lego/default.nix b/pkgs/tools/admin/lego/default.nix index 72c61ceecaf2..ce250d33e946 100644 --- a/pkgs/tools/admin/lego/default.nix +++ b/pkgs/tools/admin/lego/default.nix @@ -22,6 +22,6 @@ buildGoModule rec { description = "Let's Encrypt client and ACME library written in Go"; license = licenses.mit; homepage = "https://go-acme.github.io/lego/"; - maintainers = with maintainers; [ andrew-d ]; + maintainers = teams.acme.members; }; } diff --git a/pkgs/tools/admin/pebble/default.nix b/pkgs/tools/admin/pebble/default.nix index efd9bfe05964..4813f86ea641 100644 --- a/pkgs/tools/admin/pebble/default.nix +++ b/pkgs/tools/admin/pebble/default.nix @@ -21,6 +21,6 @@ in buildGoPackage { homepage = "https://github.com/letsencrypt/pebble"; description = "A miniature version of Boulder, Pebble is a small RFC 8555 ACME test server not suited for a production CA"; license = [ lib.licenses.mpl20 ]; - maintainers = with lib.maintainers; [ emily ]; + maintainers = lib.teams.acme.members; }; } diff --git a/pkgs/tools/admin/scaleway-cli/default.nix b/pkgs/tools/admin/scaleway-cli/default.nix index 68c20493d195..f9b608ebc4c6 100644 --- a/pkgs/tools/admin/scaleway-cli/default.nix +++ b/pkgs/tools/admin/scaleway-cli/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec{ pname = "scaleway-cli"; - version = "1.17"; + version = "1.20"; goPackagePath = "github.com/scaleway/scaleway-cli"; @@ -10,7 +10,7 @@ buildGoPackage rec{ owner = "scaleway"; repo = "scaleway-cli"; rev = "v${version}"; - sha256 = "0v50wk6q8537880whi6w83dia9y934v0s2xr1z52cn3mrsjghsnd"; + sha256 = "14likzp3hl04nq9nmpmh9m5zqjyspy5cyk20dkh03c1nhkd4vcnx"; }; meta = with stdenv.lib; { diff --git a/pkgs/tools/bluetooth/obex-data-server/default.nix b/pkgs/tools/bluetooth/obex-data-server/default.nix index 15661d6e360d..f95869e789cb 100644 --- a/pkgs/tools/bluetooth/obex-data-server/default.nix +++ b/pkgs/tools/bluetooth/obex-data-server/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, libusb, glib, dbus-glib, bluez, openobex, dbus }: +{ stdenv, fetchurl, pkgconfig, libusb-compat-0_1, glib, dbus-glib, bluez, openobex, dbus }: stdenv.mkDerivation rec { name = "obex-data-server-0.4.6"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ libusb glib dbus-glib bluez openobex dbus ]; + buildInputs = [ libusb-compat-0_1 glib dbus-glib bluez openobex dbus ]; patches = [ ./obex-data-server-0.4.6-build-fixes-1.patch ]; diff --git a/pkgs/tools/bluetooth/openobex/default.nix b/pkgs/tools/bluetooth/openobex/default.nix index ccf2eee1bb13..7ac0234852c1 100644 --- a/pkgs/tools/bluetooth/openobex/default.nix +++ b/pkgs/tools/bluetooth/openobex/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, bluez, libusb, cmake }: +{ stdenv, fetchurl, pkgconfig, bluez, libusb-compat-0_1, cmake }: stdenv.mkDerivation rec { name = "openobex-1.7.2"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig cmake ]; - buildInputs = [ bluez libusb ]; + buildInputs = [ bluez libusb-compat-0_1 ]; configureFlags = [ "--enable-apps" ]; diff --git a/pkgs/tools/misc/gnokii/default.nix b/pkgs/tools/misc/gnokii/default.nix index c0e516a15ad3..25c316661917 100644 --- a/pkgs/tools/misc/gnokii/default.nix +++ b/pkgs/tools/misc/gnokii/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, intltool, perl, gettext, libusb, pkgconfig, bluez +{ stdenv, fetchurl, intltool, perl, gettext, libusb-compat-0_1, pkgconfig, bluez , readline, pcsclite, libical, gtk2, glib, libXpm }: stdenv.mkDerivation rec { @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ - perl intltool gettext libusb + perl intltool gettext libusb-compat-0_1 glib gtk2 pkgconfig bluez readline libXpm pcsclite libical ]; diff --git a/pkgs/tools/misc/grub/2.0x.nix b/pkgs/tools/misc/grub/2.0x.nix index a64df8669812..4e00a4ddd49c 100644 --- a/pkgs/tools/misc/grub/2.0x.nix +++ b/pkgs/tools/misc/grub/2.0x.nix @@ -1,5 +1,5 @@ { stdenv, fetchgit, flex, bison, python, autoconf, automake, gnulib, libtool -, gettext, ncurses, libusb, freetype, qemu, lvm2, unifont, pkgconfig +, gettext, ncurses, libusb-compat-0_1, freetype, qemu, lvm2, unifont, pkgconfig , fuse # only needed for grub-mount , zfs ? null , efiSupport ? false @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ bison flex python pkgconfig autoconf automake ]; - buildInputs = [ ncurses libusb freetype gettext lvm2 fuse libtool ] + buildInputs = [ ncurses libusb-compat-0_1 freetype gettext lvm2 fuse libtool ] ++ optional doCheck qemu ++ optional zfsSupport zfs; diff --git a/pkgs/tools/misc/grub/trusted.nix b/pkgs/tools/misc/grub/trusted.nix index 27676c4745b6..f14758a3ae75 100644 --- a/pkgs/tools/misc/grub/trusted.nix +++ b/pkgs/tools/misc/grub/trusted.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, fetchgit, autogen, flex, bison, python, autoconf, automake -, gettext, ncurses, libusb, freetype, qemu, lvm2 +, gettext, ncurses, libusb-compat-0_1, freetype, qemu, lvm2 , for_HP_laptop ? false }: @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ autogen flex bison python autoconf automake ]; - buildInputs = [ ncurses libusb freetype gettext lvm2 ] + buildInputs = [ ncurses libusb-compat-0_1 freetype gettext lvm2 ] ++ optional doCheck qemu; hardeningDisable = [ "stackprotector" "pic" ]; diff --git a/pkgs/tools/misc/pk2cmd/default.nix b/pkgs/tools/misc/pk2cmd/default.nix index 97628da67f76..8c7e5b8bcf22 100644 --- a/pkgs/tools/misc/pk2cmd/default.nix +++ b/pkgs/tools/misc/pk2cmd/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, libusb, makeWrapper}: +{stdenv, fetchurl, libusb-compat-0_1, makeWrapper}: stdenv.mkDerivation { name = "pk2cmd-1.20"; @@ -7,7 +7,7 @@ stdenv.mkDerivation { sha256 = "1yjpi2qshnqfpan4w3ggakkr3znfrx5cxkny92ka7v9na3g2fc4h"; }; - makeFlags = [ "LIBUSB=${libusb.dev}" "linux" ]; + makeFlags = [ "LIBUSB=${libusb-compat-0_1.dev}" "linux" ]; installPhase = '' mkdir -p $out/bin $out/share/pk2 @@ -16,7 +16,7 @@ stdenv.mkDerivation { wrapProgram $out/bin/pk2cmd --prefix PATH : $out/share/pk2 ''; - buildInputs = [ libusb makeWrapper ]; + buildInputs = [ libusb-compat-0_1 makeWrapper ]; meta = { homepage = "https://www.microchip.com/pickit2"; diff --git a/pkgs/tools/misc/sixpair/default.nix b/pkgs/tools/misc/sixpair/default.nix index fafee99db5af..f738ed71ec7a 100644 --- a/pkgs/tools/misc/sixpair/default.nix +++ b/pkgs/tools/misc/sixpair/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libusb }: +{ stdenv, fetchurl, libusb-compat-0_1 }: stdenv.mkDerivation { name = "sixpair-2007-04-18"; @@ -10,7 +10,7 @@ stdenv.mkDerivation { # hcitool is depricated patches = [ ./hcitool.patch ]; - buildInputs = [ libusb ]; + buildInputs = [ libusb-compat-0_1 ]; unpackPhase = '' cp $src sixpair.c diff --git a/pkgs/tools/misc/starship/default.nix b/pkgs/tools/misc/starship/default.nix index 5503c8ecc563..6e720bf1034c 100644 --- a/pkgs/tools/misc/starship/default.nix +++ b/pkgs/tools/misc/starship/default.nix @@ -3,13 +3,13 @@ rustPlatform.buildRustPackage rec { pname = "starship"; - version = "0.40.1"; + version = "0.41.0"; src = fetchFromGitHub { owner = "starship"; repo = pname; rev = "v${version}"; - sha256 = "0jnm586wx5by1b6v78v78a84qzg05n1ha1hlmnjfyzhgjkbkayp1"; + sha256 = "1m5pi49g3pj2qr5slyasda5xp9lz3xhz3qb9k0pa6fvcn9581r9q"; }; nativeBuildInputs = stdenv.lib.optionals stdenv.isLinux [ pkg-config ]; @@ -22,7 +22,7 @@ rustPlatform.buildRustPackage rec { --replace "/bin/echo" "echo" ''; - cargoSha256 = "1jrlzihcq543z6hb1gq8zq6hqvgralzsknj3xnb6gia1n49b3zxz"; + cargoSha256 = "18z1p8xj1v9w6amc52gc2vcn5f4z8k71ig20zmj005v24si9pfwf"; checkPhase = "cargo test -- --skip directory::home_directory --skip directory::directory_in_root"; meta = with stdenv.lib; { diff --git a/pkgs/tools/misc/urjtag/default.nix b/pkgs/tools/misc/urjtag/default.nix index 67b25eaca82f..2056fb9d0a5a 100644 --- a/pkgs/tools/misc/urjtag/default.nix +++ b/pkgs/tools/misc/urjtag/default.nix @@ -1,5 +1,5 @@ { stdenv, autoconf, automake, pkgconfig, gettext, libtool, bison -, flex, which, subversion, fetchsvn, makeWrapper, libftdi, libusb, readline +, flex, which, subversion, fetchsvn, makeWrapper, libftdi, libusb-compat-0_1, readline , python3 , svfSupport ? true , bsdlSupport ? true @@ -19,7 +19,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ gettext autoconf automake libtool bison flex which - subversion makeWrapper readline libftdi libusb python3 ]; + subversion makeWrapper readline libftdi libusb-compat-0_1 python3 ]; configureFlags = [ (stdenv.lib.enableFeature svfSupport "svf") diff --git a/pkgs/tools/misc/xburst-tools/default.nix b/pkgs/tools/misc/xburst-tools/default.nix index 48045999329a..12acbcfbe1c8 100644 --- a/pkgs/tools/misc/xburst-tools/default.nix +++ b/pkgs/tools/misc/xburst-tools/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, libusb, libusb1, autoconf, automake, libconfuse, pkgconfig +{ stdenv, fetchgit, libusb-compat-0_1, libusb1, autoconf, automake, libconfuse, pkgconfig , gccCross ? null }: @@ -30,7 +30,7 @@ stdenv.mkDerivation { dontCrossStrip = true; nativeBuildInputs = [ autoconf automake pkgconfig ]; - buildInputs = [ libusb libusb1 libconfuse ] ++ + buildInputs = [ libusb-compat-0_1 libusb1 libconfuse ] ++ stdenv.lib.optional (gccCross != null) gccCross; meta = { diff --git a/pkgs/tools/networking/pykms/default.nix b/pkgs/tools/networking/pykms/default.nix index e1a13b73120e..345999c00bcd 100644 --- a/pkgs/tools/networking/pykms/default.nix +++ b/pkgs/tools/networking/pykms/default.nix @@ -44,16 +44,14 @@ in buildPythonApplication rec { propagatedBuildInputs = [ systemd pytz tzlocal ]; + # Fix https://github.com/SystemRage/py-kms/issues/64 : + patches = [ ./log-to-current-directory-by-default.patch ]; + postPatch = '' siteDir=$out/${python3.sitePackages} substituteInPlace pykms_DB2Dict.py \ --replace "'KmsDataBase.xml'" "'$siteDir/KmsDataBase.xml'" - - # we are logging to journal - sed -i pykms_Misc.py \ - -e '6ifrom systemd import journal' \ - -e 's/log_obj.addHandler(log_handler)/log_obj.addHandler(journal.JournalHandler())/' ''; format = "other"; diff --git a/pkgs/tools/networking/pykms/log-to-current-directory-by-default.patch b/pkgs/tools/networking/pykms/log-to-current-directory-by-default.patch new file mode 100644 index 000000000000..7c8c65b63a2a --- /dev/null +++ b/pkgs/tools/networking/pykms/log-to-current-directory-by-default.patch @@ -0,0 +1,20 @@ +# By default, create log files in current directory, instead of the script directory. +--- ../original/py-kms/pykms_Client.py ++++ py-kms/pykms_Client.py +@@ -48,5 +48,5 @@ + 'choi' : ["CRITICAL", "ERROR", "WARNING", "INFO", "DEBUG", "MINI"]}, + 'lfile' : {'help' : 'Use this option to set an output log file. The default is \"pykms_logclient.log\" or type \"STDOUT\" to view log info on stdout.', +- 'def' : os.path.dirname(os.path.abspath( __file__ )) + "/pykms_logclient.log", 'des' : "logfile"}, ++ 'def' : "pykms_logclient.log", 'des' : "logfile"}, + 'lsize' : {'help' : 'Use this flag to set a maximum size (in MB) to the output log file. Desactivated by default.', 'def' : 0, 'des': "logsize"}, + } +--- ../original/py-kms/pykms_Server.py ++++ py-kms/pykms_Server.py +@@ -85,5 +85,5 @@ + 'choi' : ["CRITICAL", "ERROR", "WARNING", "INFO", "DEBUG", "MINI"]}, + 'lfile' : {'help' : 'Use this option to set or not an output log file. The default is \"pykms_logserver.log\" or type \"STDOUT\" to view log info on stdout.', +- 'def' : os.path.dirname(os.path.abspath( __file__ )) + "/pykms_logserver.log", 'des' : "logfile"}, ++ 'def' : "pykms_logserver.log", 'des' : "logfile"}, + 'lsize' : {'help' : 'Use this flag to set a maximum size (in MB) to the output log file. Desactivated by default.', 'def' : 0, 'des': "logsize"}, + } + ''); diff --git a/pkgs/tools/package-management/nix-du/default.nix b/pkgs/tools/package-management/nix-du/default.nix index fa1394242d29..417962733af6 100644 --- a/pkgs/tools/package-management/nix-du/default.nix +++ b/pkgs/tools/package-management/nix-du/default.nix @@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "1a6svl89dcdb5fpvs2i32i6agyhl0sx7kkkw70rqr17fyzl5psai"; doCheck = true; - checkInputs = [ graphviz ]; + checkInputs = [ nix graphviz ]; buildInputs = [ boost diff --git a/pkgs/tools/security/gnupg/20.nix b/pkgs/tools/security/gnupg/20.nix index ea9001607526..f5b693fed35a 100644 --- a/pkgs/tools/security/gnupg/20.nix +++ b/pkgs/tools/security/gnupg/20.nix @@ -4,7 +4,7 @@ # Each of the dependencies below are optional. # Gnupg can be built without them at the cost of reduced functionality. , pinentry ? null, guiSupport ? false -, openldap ? null, bzip2 ? null, libusb ? null, curl ? null +, openldap ? null, bzip2 ? null, libusb-compat-0_1 ? null, curl ? null }: with stdenv.lib; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { buildInputs = [ readline zlib libgpgerror libgcrypt libassuan libksba pth - openldap bzip2 libusb curl libiconv ]; + openldap bzip2 libusb-compat-0_1 curl libiconv ]; patches = [ ./gpgkey2ssh-20.patch ]; diff --git a/pkgs/tools/security/libacr38u/default.nix b/pkgs/tools/security/libacr38u/default.nix index 45d0279099fd..b56c15af3d62 100644 --- a/pkgs/tools/security/libacr38u/default.nix +++ b/pkgs/tools/security/libacr38u/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, pcsclite , libusb }: +{ stdenv, fetchurl, pkgconfig, pcsclite , libusb-compat-0_1 }: stdenv.mkDerivation { version = "1.7.11"; @@ -12,7 +12,7 @@ stdenv.mkDerivation { doCheck = true; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ pcsclite libusb ]; + buildInputs = [ pcsclite libusb-compat-0_1 ]; preBuild = '' makeFlagsArray=(usbdropdir="$out/pcsc/drivers"); diff --git a/pkgs/tools/security/pcsc-scm-scl011/default.nix b/pkgs/tools/security/pcsc-scm-scl011/default.nix index b400d628fd77..62f4c3e85564 100644 --- a/pkgs/tools/security/pcsc-scm-scl011/default.nix +++ b/pkgs/tools/security/pcsc-scm-scl011/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, unzip, libusb }: +{ stdenv, fetchurl, unzip, libusb-compat-0_1 }: let arch = if stdenv.hostPlatform.system == "i686-linux" then "32" @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { cp -r proprietary/*.bundle $out/pcsc/drivers ''; - libPath = stdenv.lib.makeLibraryPath [ libusb ]; + libPath = stdenv.lib.makeLibraryPath [ libusb-compat-0_1 ]; fixupPhase = '' patchelf --set-rpath $libPath \ diff --git a/pkgs/tools/security/prey/default.nix b/pkgs/tools/security/prey/default.nix deleted file mode 100644 index c66756012311..000000000000 --- a/pkgs/tools/security/prey/default.nix +++ /dev/null @@ -1,48 +0,0 @@ -{ stdenv, fetchurl, fetchgit, curl, scrot, imagemagick, xawtv, inetutils, makeWrapper, coreutils -, apiKey ? "" -, deviceKey ? "" }: - -# TODO: this should assert keys are set, somehow if set through .override assertion fails -#assert apiKey != ""; -#assert deviceKey != ""; - -let - modulesSrc = fetchgit { - url = "git://github.com/prey/prey-bash-client-modules.git"; - rev = "aba260ef110834cb2e92923a31f50c15970639ee"; - sha256 = "9cb1ad813d052a0a3e3bbdd329a8711ae3272e340379489511f7dd578d911e30"; - }; -in stdenv.mkDerivation rec { - pname = "prey-bash-client"; - version = "0.6.0"; - - src = fetchurl { - url = "https://github.com/prey/prey-bash-client/archive/v${version}.tar.gz"; - sha256 = "09cb15jh4jdwvix9nx048ajkw2r5jaflk68y3rkha541n8n0qwh0"; - }; - - buildInputs = [ curl scrot imagemagick xawtv makeWrapper ]; - - phases = "unpackPhase installPhase"; - - installPhase = '' - substituteInPlace config --replace api_key=\'\' "api_key='${apiKey}'" - substituteInPlace config --replace device_key=\'\' "device_key='${deviceKey}'" - - substituteInPlace prey.sh --replace /bin/bash $(type -Pp bash) - mkdir -p $out/modules - cp -R . $out - cp -R ${modulesSrc}/* $out/modules/ - wrapProgram "$out/prey.sh" \ - --prefix PATH ":" "${stdenv.lib.makeBinPath [ xawtv imagemagick curl scrot inetutils coreutils ]}" \ - --set CURL_CA_BUNDLE "/etc/ssl/certs/ca-certificates.crt" - ''; - - meta = with stdenv.lib; { - homepage = "https://preyproject.com"; - description = "Proven tracking software that helps you find, lock and recover your devices when stolen or missing"; - maintainers = with maintainers; [ domenkozar ]; - license = licenses.gpl3; - platforms = with platforms; linux; - }; -} |