diff options
| author | Sandro <sandro.jaeckel@gmail.com> | 2021-02-28 16:53:58 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-28 16:53:58 +0100 |
| commit | 2aaaa3ba8638fc40099a0377a13f686fe402d8cd (patch) | |
| tree | 83f1f0a24582bfb97c0e7746eb55804d3350f16c | |
| parent | 39be4b5be85e90e97465600393533698aa5b1daa (diff) | |
| parent | 4d6786891290d20fcc824366e01af25621584294 (diff) | |
| download | nixpkgs-2aaaa3ba8638fc40099a0377a13f686fe402d8cd.tar nixpkgs-2aaaa3ba8638fc40099a0377a13f686fe402d8cd.tar.gz nixpkgs-2aaaa3ba8638fc40099a0377a13f686fe402d8cd.tar.bz2 nixpkgs-2aaaa3ba8638fc40099a0377a13f686fe402d8cd.tar.lz nixpkgs-2aaaa3ba8638fc40099a0377a13f686fe402d8cd.tar.xz nixpkgs-2aaaa3ba8638fc40099a0377a13f686fe402d8cd.tar.zst nixpkgs-2aaaa3ba8638fc40099a0377a13f686fe402d8cd.zip | |
Merge pull request #114635 from dottedmag/libxcrypt
| -rw-r--r-- | maintainers/maintainer-list.nix | 10 | ||||
| -rw-r--r-- | pkgs/development/libraries/libxcrypt/default.nix | 30 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
3 files changed, 42 insertions, 0 deletions
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 2d122346fca..2770e20c008 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -2417,6 +2417,16 @@ githubId = 6806011; name = "Robert Schütz"; }; + dottedmag = { + email = "dottedmag@dottedmag.net"; + github = "dottedmag"; + githubId = 16120; + name = "Misha Gusarov"; + keys = [{ + longkeyid = "rsa4096/0x9D20F6503E338888"; + fingerprint = "A8DF 1326 9E5D 9A38 E57C FAC2 9D20 F650 3E33 8888"; + }]; + }; doublec = { email = "chris.double@double.co.nz"; github = "doublec"; diff --git a/pkgs/development/libraries/libxcrypt/default.nix b/pkgs/development/libraries/libxcrypt/default.nix new file mode 100644 index 00000000000..4df5bde2287 --- /dev/null +++ b/pkgs/development/libraries/libxcrypt/default.nix @@ -0,0 +1,30 @@ +{ lib, stdenv, fetchFromGitHub, autoconf, automake, libtool, pkg-config, perl }: + +stdenv.mkDerivation rec { + pname = "libxcrypt"; + version = "4.4.18"; + + src = fetchFromGitHub { + owner = "besser82"; + repo = "libxcrypt"; + rev = "v${version}"; + sha256 = "4015bf1b3a2aab31da5a544424be36c1a0f0ffc1eaa219c0e7b048e4cdcbbfe1"; + }; + + preConfigure = '' + patchShebangs autogen.sh + ./autogen.sh + ''; + + nativeBuildInputs = [ autoconf automake libtool pkg-config perl ]; + + doCheck = true; + + meta = with lib; { + description = "Extended crypt library for descrypt, md5crypt, bcrypt, and others"; + homepage = "https://github.com/besser82/libxcrypt/"; + platforms = platforms.all; + maintainers = with maintainers; [ dottedmag ]; + license = licenses.lgpl21Plus; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 78aa21f044f..e42ed1a0a00 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15778,6 +15778,8 @@ in libx86 = callPackage ../development/libraries/libx86 {}; + libxcrypt = callPackage ../development/libraries/libxcrypt { }; + libxdg_basedir = callPackage ../development/libraries/libxdg-basedir { }; libxkbcommon = libxkbcommon_8; |