Skip to content
This repository was archived by the owner on Apr 12, 2021. It is now read-only.
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: a4e1e9cbd761
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 2e0ea4e0444a
Choose a head ref
  • 2 commits
  • 2 files changed
  • 2 contributors

Commits on Jun 21, 2018

  1. 18.03-google-authenticator-failed-to-use-libqrencode - use libqrencod… 

    …e 4 and update both qrencode and google-authenticator
    Sander Hollaar committed Jun 21, 2018
    Copy the full SHA
    eaa6c3d View commit details

Commits on Jun 29, 2018

  1. Merge pull request #42339 from ookhoi/18.03-google-authenticator-fail… 

    …ed-to-use-libqrencode

18.03-google-authenticator-failed-to-use-libqrencode - use libqrencod…
    @matthewbauer
    matthewbauer authored Jun 29, 2018
    Copy the full SHA
    2e0ea4e View commit details
Showing with 5 additions and 5 deletions.
  1. +3 −3 pkgs/os-specific/linux/google-authenticator/default.nix
  2. +2 −2 pkgs/tools/graphics/qrencode/default.nix
6 changes: 3 additions & 3 deletions pkgs/os-specific/linux/google-authenticator/default.nix
View file
Original file line number Diff line number Diff line change
@@ -2,18 +2,18 @@

stdenv.mkDerivation rec {
name = "google-authenticator-libpam-${version}";
version = "1.03";
version = "1.05";

src = fetchurl {
url = "https://github.com/google/google-authenticator-libpam/archive/${version}.tar.gz";
sha256 = "0wb95z5v1w4sk0p7y9pbn4v95w9hrbf80vw9k2z2sgs0156ljkb7";
sha256 = "026vljmddi0zqcb3c0vdpabmi4r17kahc00mh6fs3qbyjbb14946";
};

nativeBuildInputs = [ autoreconfHook ];
buildInputs = [ pam ];

preConfigure = ''
sed -i "s|libqrencode.so.3|${qrencode}/lib/libqrencode.so.3|" src/google-authenticator.c
sed -i "s|libqrencode.so.4|${qrencode}/lib/libqrencode.so.4|" src/google-authenticator.c
'';

installPhase = ''
4 changes: 2 additions & 2 deletions pkgs/tools/graphics/qrencode/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, libpng, pkgconfig }:

stdenv.mkDerivation rec {
name = "qrencode-4.0.0";
name = "qrencode-4.0.2";

src = fetchurl {
url = "${meta.homepage}/${name}.tar.bz2";
sha256 = "02vx69fl52jbcrmnydsaxcmy6nxqm9jyxzd7hr07s491d7hka069";
sha256 = "1d2q5d3v8g3hsi3h5jq4n177bjhf3kawms09immw7p187f6jgjy9";
};

buildInputs = [ libpng ];