Skip to content
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
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 5550015b200a
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 409b97c95f80
Choose a head ref
  • 2 commits
  • 1 file changed
  • 1 contributor

Commits on May 13, 2018

  1. libb2: 0.97 -> 0.98

    @dezgeg
    Robert Schütz authored and dezgeg committed May 13, 2018

    Verified

    This commit was signed with the committer’s verified signature.
    nbbeeken Neal Beeken
    GPG key ID: 22F3C38EA1A0C076
    Verified
    Learn about vigilant mode
    Copy the full SHA
    03318ef View commit details

  2. libb2: fix build on ARM

    @dezgeg
    Robert Schütz authored and dezgeg committed May 13, 2018

    Verified

    This commit was signed with the committer’s verified signature.
    nbbeeken Neal Beeken
    GPG key ID: 22F3C38EA1A0C076
    Verified
    Learn about vigilant mode
    Copy the full SHA
    409b97c View commit details
Showing with 17 additions and 8 deletions.
  1. +17 −8 pkgs/development/libraries/libb2/default.nix
25 changes: 17 additions & 8 deletions pkgs/development/libraries/libb2/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,17 +1,26 @@
{stdenv, fetchurl}:
with stdenv; with lib;
mkDerivation rec {
name = "libb2-${meta.version}";
{ stdenv, hostPlatform, fetchurl, autoconf, automake, libtool }:

stdenv.mkDerivation rec {
name = "libb2-${version}";
version = "0.98";

src = fetchurl {
url = "https://blake2.net/${name}.tar.gz";
sha256 = "7829c7309347650239c76af7f15d9391af2587b38f0a65c250104a2efef99051";
sha256 = "1852gh8wwnsghdb9zhxdhw0173plpqzk684npxbl4bzk1hhzisal";
};

configureFlags = [ "--enable-fat=yes" ];
preConfigure = ''
patchShebangs autogen.sh
./autogen.sh
'';

configureFlags = stdenv.lib.optional hostPlatform.isx86 "--enable-fat=yes";

nativeBuildInputs = [ autoconf automake libtool ];

doCheck = true;

meta = {
version = "0.97";
meta = with stdenv.lib; {
description = "The BLAKE2 family of cryptographic hash functions";
platforms = platforms.all;
maintainers = with maintainers; [ dfoxfranke ];