diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2017-09-10 08:56:39 +0200 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2017-09-10 08:56:39 +0200 |
commit | dab3272f47f13c2a7442e3aec6b4b5bcc1bfd907 (patch) | |
tree | 3fb86f38ee7bb816ca0e57e6c035491cf7e09c29 /pkgs/tools/misc | |
parent | 9d6ac8eadaade4f8564aa54b64bb9eb0dabfa322 (diff) | |
parent | 6521a83efe84a8c15b277e782700f4cf1936d3f9 (diff) | |
download | nixlib-dab3272f47f13c2a7442e3aec6b4b5bcc1bfd907.tar nixlib-dab3272f47f13c2a7442e3aec6b4b5bcc1bfd907.tar.gz nixlib-dab3272f47f13c2a7442e3aec6b4b5bcc1bfd907.tar.bz2 nixlib-dab3272f47f13c2a7442e3aec6b4b5bcc1bfd907.tar.lz nixlib-dab3272f47f13c2a7442e3aec6b4b5bcc1bfd907.tar.xz nixlib-dab3272f47f13c2a7442e3aec6b4b5bcc1bfd907.tar.zst nixlib-dab3272f47f13c2a7442e3aec6b4b5bcc1bfd907.zip |
Merge remote-tracking branch 'upstream/master' into HEAD
Diffstat (limited to 'pkgs/tools/misc')
-rw-r--r-- | pkgs/tools/misc/fontforge/fontforge-fonttools.nix | 6 | ||||
-rw-r--r-- | pkgs/tools/misc/yubikey-manager/default.nix | 8 |
2 files changed, 9 insertions, 5 deletions
diff --git a/pkgs/tools/misc/fontforge/fontforge-fonttools.nix b/pkgs/tools/misc/fontforge/fontforge-fonttools.nix index c65d8ed375d2..551fc71b7a74 100644 --- a/pkgs/tools/misc/fontforge/fontforge-fonttools.nix +++ b/pkgs/tools/misc/fontforge/fontforge-fonttools.nix @@ -1,4 +1,4 @@ -{stdenv, fetchFromGitHub, zlib}: +{ stdenv, fetchFromGitHub, zlib }: stdenv.mkDerivation rec { version = "20160404"; @@ -11,14 +11,14 @@ stdenv.mkDerivation rec { sha256 = "15nacq84n9gvlzp3slpmfrrbh57kfb6lbdlc46i7aqgci4qv6fg0"; }; - buildInputs = [zlib]; + buildInputs = [ zlib ]; setSourceRoot = ''export sourceRoot="$(echo */contrib/fonttools)"''; installPhase = '' mkdir -p "$out"/{bin,share/doc/fontforge-fonttools} for i in *.c; do - gcc "$i" -lz -lm --std=c99 -o "$out"/bin/$(basename "$i" .c) + $CC "$i" -lz -lm --std=c99 -o "$out"/bin/$(basename "$i" .c) done cp README* "$out/share/doc/fontforge-fonttools" ''; diff --git a/pkgs/tools/misc/yubikey-manager/default.nix b/pkgs/tools/misc/yubikey-manager/default.nix index 820f193e5e25..c7fbeddd13a4 100644 --- a/pkgs/tools/misc/yubikey-manager/default.nix +++ b/pkgs/tools/misc/yubikey-manager/default.nix @@ -2,11 +2,11 @@ yubikey-personalization, libu2f-host, libusb1 }: pythonPackages.buildPythonPackage rec { - name = "yubikey-manager-0.3.1"; + name = "yubikey-manager-0.4.0"; srcs = fetchurl { url = "https://developers.yubico.com/yubikey-manager/Releases/${name}.tar.gz"; - sha256 = "0vrhaqb8yc1qjq25k9dv8gmqxhbf6aa047i6dvz1lcraq6zwnq6g"; + sha256 = "0dc0mqg8r6kjh0s2rmrggfxbx9imslajjrj80rffcvg64a2vgsgb"; }; propagatedBuildInputs = @@ -16,6 +16,7 @@ pythonPackages.buildPythonPackage rec { cryptography pyscard pyusb + pyopenssl six ] ++ [ libu2f-host @@ -32,6 +33,9 @@ pythonPackages.buildPythonPackage rec { _YKMAN_COMPLETE=source $out/bin/ykman > $out/etc/bash_completion.d/ykman.sh ||true ''; + # See https://github.com/NixOS/nixpkgs/issues/29169 + doCheck = false; + meta = with lib; { homepage = https://developers.yubico.com/yubikey-manager; description = "Command line tool for configuring any YubiKey over all USB transports."; |