Clone of https://github.com/NixOS/nixpkgs.git (to stress-test knotserver)

18.03-google-authenticator-failed-to-use-libqrencode - use libqrencode 4 and update both qrencode and google-authenticator

+5 -5
+3 -3
pkgs/os-specific/linux/google-authenticator/default.nix
··· 2 2 3 3 stdenv.mkDerivation rec { 4 4 name = "google-authenticator-libpam-${version}"; 5 - version = "1.03"; 5 + version = "1.05"; 6 6 7 7 src = fetchurl { 8 8 url = "https://github.com/google/google-authenticator-libpam/archive/${version}.tar.gz"; 9 - sha256 = "0wb95z5v1w4sk0p7y9pbn4v95w9hrbf80vw9k2z2sgs0156ljkb7"; 9 + sha256 = "026vljmddi0zqcb3c0vdpabmi4r17kahc00mh6fs3qbyjbb14946"; 10 10 }; 11 11 12 12 nativeBuildInputs = [ autoreconfHook ]; 13 13 buildInputs = [ pam ]; 14 14 15 15 preConfigure = '' 16 - sed -i "s|libqrencode.so.3|${qrencode}/lib/libqrencode.so.3|" src/google-authenticator.c 16 + sed -i "s|libqrencode.so.4|${qrencode}/lib/libqrencode.so.4|" src/google-authenticator.c 17 17 ''; 18 18 19 19 installPhase = ''
+2 -2
pkgs/tools/graphics/qrencode/default.nix
··· 1 1 { stdenv, fetchurl, libpng, pkgconfig }: 2 2 3 3 stdenv.mkDerivation rec { 4 - name = "qrencode-4.0.0"; 4 + name = "qrencode-4.0.2"; 5 5 6 6 src = fetchurl { 7 7 url = "${meta.homepage}/${name}.tar.bz2"; 8 - sha256 = "02vx69fl52jbcrmnydsaxcmy6nxqm9jyxzd7hr07s491d7hka069"; 8 + sha256 = "1d2q5d3v8g3hsi3h5jq4n177bjhf3kawms09immw7p187f6jgjy9"; 9 9 }; 10 10 11 11 buildInputs = [ libpng ];