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: 994299b7a9f8
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 1850d7a7d49c
Choose a head ref
  • 2 commits
  • 2 files changed
  • 2 contributors

Commits on May 7, 2017

  1. libscrypt: init at 1.21

    @davidak
    davidak committed May 7, 2017
    Copy the full SHA
    49c4f2b View commit details

  2. Merge pull request #25573 from davidak/libscrypt 

    libscrypt: init at 1.21
    @FRidh
    FRidh authored May 7, 2017
    Copy the full SHA
    1850d7a View commit details
Showing with 30 additions and 0 deletions.
  1. +28 −0 pkgs/development/libraries/libscrypt/default.nix
  2. +2 −0 pkgs/top-level/all-packages.nix
28 changes: 28 additions & 0 deletions pkgs/development/libraries/libscrypt/default.nix
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
{ stdenv, fetchFromGitHub }:

stdenv.mkDerivation rec {
name = "libscrypt-${version}";
version = "1.21";

src = fetchFromGitHub {
owner = "technion";
repo = "libscrypt";
rev = "v${version}";
sha256 = "1d76ys6cp7fi4ng1w3mz2l0p9dbr7ljbk33dcywyimzjz8bahdng";
};

buildFlags = stdenv.lib.optional stdenv.isDarwin "LDFLAGS= CFLAGS_EXTRA=";

installFlags = [ "PREFIX=$(out)" ];
installTargets = if stdenv.isDarwin then "install-osx" else "install";

doCheck = true;

meta = with stdenv.lib; {
description = "Shared library that implements scrypt() functionality";
homepage = "https://lolware.net/2014/04/29/libscrypt.html";
license = licenses.bsd2;
maintainers = with maintainers; [ davidak ];
platforms = platforms.unix;
};
}
2 changes: 2 additions & 0 deletions pkgs/top-level/all-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -2594,6 +2594,8 @@ with pkgs;

libcpuid = callPackage ../tools/misc/libcpuid { };

libscrypt = callPackage ../development/libraries/libscrypt { };

libsmi = callPackage ../development/libraries/libsmi { };

lesspipe = callPackage ../tools/misc/lesspipe { };