Merge pull request #181764 from mweinelt/glibc-without-libcrypt

Changed files
+388 -171
nixos
modules
tests
pkgs
applications
networking
browsers
ladybird
irc
epic5
mailreaders
alpine
nntp-proxy
shellhub-agent
science
misc
networking
video
virtualization
open-vm-tools
window-managers
sawfish
desktops
cdesktopenv
development
compilers
gcc
llvm
10
compiler-rt
11
compiler-rt
12
compiler-rt
13
compiler-rt
14
compiler-rt
rocm
swi-prolog
swift
haskell-modules
interpreters
perl
python
cpython
qnial
unicon-lang
libraries
accountsservice
apr-util
boost
cyrus-sasl
glibc
gvm-libs
libcli
libfilezilla
libguestfs
libxcrypt
libxslt
openldap
physics
cernlib
talloc
tdb
zeroc-ice
lua-modules
python-modules
pillow
pillow-simd
twisted
tools
libsigrokdecode
games
misc
screensavers
slock
os-specific
linux
apparmor
otpw
pam
pam_mysql
pam_pgsql
policycoreutils
shadow
systemd
sysvinit
util-linux
wiringpi
servers
dante
dico
ftp
bftpd
pure-ftpd
vsftpd
http
apache-httpd
bozohttpd
hiawatha
tengine
thttpd
hylafaxplus
irc
atheme
ircd-hybrid
mail
opensmtpd
popa3d
monitoring
plugins
news
leafnode
pies
pleroma
pounce
search
groonga
sip
freeswitch
sql
pgpool
uwsgi
web-apps
x11
shells
stdenv
linux
tools
backup
partimage
misc
conserver
kermit
ldapvi
screen
toybox
networking
dcap
dropbear
haproxy
libreswan
lsh
mailutils
ocserv
ppp
srelay
xrootd
package-management
security
mokutil
super
system
monit
top-level
+1 -1
nixos/modules/config/users-groups.nix
···
value = "[a-zA-Z0-9/+.-]+";
options = "${id}(=${value})?(,${id}=${value})*";
scheme = "${id}(${sep}${options})?";
-
content = "${base64}${sep}${base64}";
+
content = "${base64}${sep}${base64}(${sep}${base64})?";
mcf = "^${sep}${scheme}${sep}${content}$";
in
if (allowsLogin user.hashedPassword
+30
nixos/tests/shadow.nix
···
password2 = "helloworld";
password3 = "bazqux";
password4 = "asdf123";
+
hashed_bcrypt = "$2b$05$8xIEflrk2RxQtcVXbGIxs.Vl0x7dF1/JSv3cyX6JJt0npzkTCWvxK"; # fnord
+
hashed_yeshash = "$y$j9T$d8Z4EAf8P1SvM/aDFbxMS0$VnTXMp/Hnc7QdCBEaLTq5ZFOAFo2/PM0/xEAFuOE88."; # fnord
in import ./make-test-python.nix ({ pkgs, ... }: {
name = "shadow";
meta = with pkgs.lib.maintainers; { maintainers = [ nequissimus ]; };
···
users.ash = {
isNormalUser = true;
password = password4;
+
shell = pkgs.bash;
+
};
+
users.berta = {
+
isNormalUser = true;
+
hashedPassword = hashed_bcrypt;
+
shell = pkgs.bash;
+
};
+
users.yesim = {
+
isNormalUser = true;
+
hashedPassword = hashed_yeshash;
shell = pkgs.bash;
};
};
···
shadow.wait_until_succeeds("pgrep login")
shadow.send_chars("${password2}\n")
shadow.wait_until_tty_matches("5", "login:")
+
+
with subtest("check alternate password hashes"):
+
shadow.send_key("alt-f6")
+
shadow.wait_until_succeeds("[ $(fgconsole) = 6 ]")
+
for u in ["berta", "yesim"]:
+
shadow.wait_for_unit("getty@tty6.service")
+
shadow.wait_until_succeeds("pgrep -f 'agetty.*tty6'")
+
shadow.wait_until_tty_matches("6", "login: ")
+
shadow.send_chars(f"{u}\n")
+
shadow.wait_until_tty_matches("6", f"login: {u}")
+
shadow.wait_until_succeeds("pgrep login")
+
shadow.sleep(2)
+
shadow.send_chars("fnord\n")
+
shadow.send_chars(f"whoami > /tmp/{u}\n")
+
shadow.wait_for_file(f"/tmp/{u}")
+
print(shadow.succeed(f"cat /tmp/{u}"))
+
assert u in shadow.succeed(f"cat /tmp/{u}")
+
shadow.send_chars("logout\n")
'';
})
+2
pkgs/applications/networking/browsers/ladybird/default.nix
···
, ninja
, unzip
, wrapQtAppsHook
+
, libxcrypt
, qtbase
, qttools
, nixosTests
···
];
buildInputs = [
+
libxcrypt
qtbase
];
+2 -2
pkgs/applications/networking/irc/epic5/default.nix
···
-
{ lib, stdenv, fetchurl, openssl, ncurses, libiconv, tcl, coreutils, fetchpatch }:
+
{ lib, stdenv, fetchurl, openssl, ncurses, libiconv, tcl, coreutils, fetchpatch, libxcrypt }:
stdenv.mkDerivation rec {
pname = "epic5";
···
};
# Darwin needs libiconv, tcl; while Linux build don't
-
buildInputs = [ openssl ncurses ]
+
buildInputs = [ openssl ncurses libxcrypt ]
++ lib.optionals stdenv.isDarwin [ libiconv tcl ];
patches = [
+2 -2
pkgs/applications/networking/mailreaders/alpine/default.nix
···
{lib, stdenv, fetchurl, ncurses, tcl, openssl, pam, libkrb5
-
, openldap
+
, openldap, libxcrypt
}:
stdenv.mkDerivation rec {
···
};
buildInputs = [
-
ncurses tcl openssl pam libkrb5 openldap
+
ncurses tcl openssl pam libkrb5 openldap libxcrypt
];
hardeningDisable = [ "format" ];
+2 -2
pkgs/applications/networking/nntp-proxy/default.nix
···
-
{ lib, stdenv, fetchFromGitHub, libconfig, pkg-config, libevent, openssl }:
+
{ lib, stdenv, fetchFromGitHub, libconfig, pkg-config, libevent, openssl, libxcrypt }:
stdenv.mkDerivation {
pname = "nntp-proxy";
···
};
nativeBuildInputs = [ pkg-config ];
-
buildInputs = [ libconfig libevent openssl ];
+
buildInputs = [ libconfig libevent openssl libxcrypt ];
installFlags = [ "INSTALL_DIR=$(out)/bin/" ];
+2
pkgs/applications/networking/shellhub-agent/default.nix
···
, gitUpdater
, makeWrapper
, openssh
+
, libxcrypt
}:
buildGoModule rec {
···
};
nativeBuildInputs = [ makeWrapper ];
+
buildInputs = [ libxcrypt ];
postInstall = ''
wrapProgram $out/bin/agent --prefix PATH : ${lib.makeBinPath [ openssh ]}
+2 -1
pkgs/applications/science/misc/root/5.nix
···
, libGL
, zlib
, libxml2
+
, libxcrypt
, lz4
, xz
, gsl_1
···
};
nativeBuildInputs = [ cmake pkg-config ];
-
buildInputs = [ pcre python2 zlib libxml2 lz4 xz gsl_1 xxHash ]
+
buildInputs = [ pcre python2 zlib libxml2 lz4 xz gsl_1 xxHash libxcrypt ]
++ lib.optionals (!stdenv.isDarwin) [ libX11 libXpm libXft libXext libGLU libGL ]
++ lib.optionals (stdenv.isDarwin) [ Cocoa OpenGL ]
;
+2
pkgs/applications/science/misc/root/default.nix
···
, libXext
, libGLU
, libGL
+
, libxcrypt
, libxml2
, llvm_9
, lz4
···
zlib
zstd
lapack
+
libxcrypt
libxml2
_llvm_9
lz4
+3 -2
pkgs/applications/science/networking/sumo/default.nix
···
{ lib, bzip2, cmake, eigen, fetchFromGitHub, ffmpeg, fox_1_6, gdal,
git, gl2ps, gpp , gtest, jdk, libGL, libGLU, libX11, libjpeg,
-
libpng, libtiff, openscenegraph , proj, python3, python37Packages,
-
stdenv, swig, xercesc, xorg, zlib }:
+
libpng, libtiff, libxcrypt, openscenegraph , proj, python3,
+
python37Packages, stdenv, swig, xercesc, xorg, zlib }:
stdenv.mkDerivation rec {
pname = "sumo";
···
libjpeg
libpng
libtiff
+
libxcrypt
openscenegraph
proj
python37Packages.setuptools
+2 -2
pkgs/applications/video/kodi/unwrapped.nix
···
{ stdenv, lib, fetchFromGitHub, autoconf, automake, libtool, makeWrapper
, pkg-config, cmake, yasm, python3Packages
-
, libgcrypt, libgpg-error, libunistring
+
, libxcrypt, libgcrypt, libgpg-error, libunistring
, boost, avahi, lame
, gettext, pcre-cpp, yajl, fribidi, which
, openssl, gperf, tinyxml2, taglib, libssh, swig, jre_headless
···
sqlite libmysqlclient avahi lame
curl bzip2 zip unzip glxinfo
libcec libcec_platform dcadec libuuid
-
libgcrypt libgpg-error libunistring
+
libxcrypt libgcrypt libgpg-error libunistring
libcrossguid libplist
bluez giflib glib harfbuzz lcms2 libpthreadstubs
ffmpeg flatbuffers fstrcmp rapidjson
+2 -2
pkgs/applications/virtualization/open-vm-tools/default.nix
···
{ stdenv, lib, fetchFromGitHub, makeWrapper, autoreconfHook
, bash, fuse3, libmspack, openssl, pam, xercesc, icu, libdnet, procps, libtirpc, rpcsvc-proto
-
, libX11, libXext, libXinerama, libXi, libXrender, libXrandr, libXtst
+
, libX11, libXext, libXinerama, libXi, libXrender, libXrandr, libXtst, libxcrypt
, pkg-config, glib, gdk-pixbuf-xlib, gtk3, gtkmm3, iproute2, dbus, systemd, which
, libdrm, udev, util-linux
, withX ? true
···
outputs = [ "out" "dev" ];
nativeBuildInputs = [ autoreconfHook makeWrapper pkg-config ];
-
buildInputs = [ fuse3 glib icu libdnet libdrm libmspack libtirpc openssl pam procps rpcsvc-proto udev xercesc ]
+
buildInputs = [ fuse3 glib icu libdnet libdrm libmspack libtirpc libxcrypt openssl pam procps rpcsvc-proto udev xercesc ]
++ lib.optionals withX [ gdk-pixbuf-xlib gtk3 gtkmm3 libX11 libXext libXinerama libXi libXrender libXrandr libXtst ];
postPatch = ''
+2
pkgs/applications/window-managers/sawfish/default.nix
···
, imlib
, libICE
, libSM
+
, libxcrypt
, libXinerama
, libXrandr
, libXtst
···
imlib
libICE
libSM
+
libxcrypt
libXinerama
libXrandr
libXtst
+2 -2
pkgs/desktops/cdesktopenv/default.nix
···
, xorgproto, libX11, bison, ksh, perl, gnum4
, libXinerama, libXt, libXext, libtirpc, motif, libXft, xbitmaps
, libjpeg, libXmu, libXdmcp, libXScrnSaver, symlinkJoin, bdftopcf
-
, ncompress, mkfontdir, tcl, libXaw, gcc, glibcLocales
+
, ncompress, mkfontdir, tcl, libXaw, libxcrypt, gcc, glibcLocales
, autoPatchelfHook, libredirect, makeWrapper, xset, xrdb, fakeroot
, rpcsvc-proto }:
···
buildInputs = [
libX11 libXinerama libXt libXext libtirpc motif libXft xbitmaps
-
libjpeg libXmu libXdmcp libXScrnSaver tcl libXaw ksh
+
libjpeg libXmu libXdmcp libXScrnSaver tcl libXaw ksh libxcrypt
];
nativeBuildInputs = [
bison ncompress autoPatchelfHook makeWrapper fakeroot
+6 -3
pkgs/development/compilers/gcc/10/default.nix
···
, gnused ? null
, cloog # unused; just for compat with gcc4, as we override the parameter on some places
, buildPackages
+
, libxcrypt
}:
# Make sure we get GNU sed.
···
++ optional targetPlatform.isLinux patchelf;
buildInputs = [
-
gmp mpfr libmpc
+
gmp mpfr libmpc libxcrypt
targetPackages.stdenv.cc.bintools # For linking code at run-time
] ++ (optional (isl != null) isl)
++ (optional (zlib != null) zlib)
···
NIX_LDFLAGS = lib.optionalString hostPlatform.isSunOS "-lm -ldl";
-
preConfigure = import ../common/pre-configure.nix {
+
preConfigure = (import ../common/pre-configure.nix {
inherit lib;
inherit version targetPlatform hostPlatform gnatboot langAda langGo langJit crossStageStatic enableMultilib;
-
};
+
}) + ''
+
ln -sf ${libxcrypt}/include/crypt.h libsanitizer/sanitizer_common/crypt.h
+
'';
dontDisableStatic = true;
+6 -3
pkgs/development/compilers/gcc/11/default.nix
···
, gnused ? null
, cloog # unused; just for compat with gcc4, as we override the parameter on some places
, buildPackages
+
, libxcrypt
}:
# Make sure we get GNU sed.
···
++ optional targetPlatform.isLinux patchelf;
buildInputs = [
-
gmp mpfr libmpc
+
gmp mpfr libmpc libxcrypt
targetPackages.stdenv.cc.bintools # For linking code at run-time
] ++ (optional (isl != null) isl)
++ (optional (zlib != null) zlib)
···
NIX_LDFLAGS = lib.optionalString hostPlatform.isSunOS "-lm -ldl";
-
preConfigure = import ../common/pre-configure.nix {
+
preConfigure = (import ../common/pre-configure.nix {
inherit lib;
inherit version targetPlatform hostPlatform gnatboot langAda langGo langJit crossStageStatic enableMultilib;
-
};
+
}) + ''
+
ln -sf ${libxcrypt}/include/crypt.h libsanitizer/sanitizer_common/crypt.h
+
'';
dontDisableStatic = true;
+7 -3
pkgs/development/compilers/gcc/12/default.nix
···
, gnused ? null
, cloog # unused; just for compat with gcc4, as we override the parameter on some places
, buildPackages
+
, libxcrypt
}:
# Make sure we get GNU sed.
···
++ optional targetPlatform.isLinux patchelf;
buildInputs = [
-
gmp mpfr libmpc
+
gmp mpfr libmpc libxcrypt
targetPackages.stdenv.cc.bintools # For linking code at run-time
] ++ (optional (isl != null) isl)
++ (optional (zlib != null) zlib)
···
NIX_LDFLAGS = lib.optionalString hostPlatform.isSunOS "-lm -ldl";
-
preConfigure = import ../common/pre-configure.nix {
+
+
preConfigure = (import ../common/pre-configure.nix {
inherit lib;
inherit version targetPlatform hostPlatform gnatboot langAda langGo langJit crossStageStatic enableMultilib;
-
};
+
}) + ''
+
ln -sf ${libxcrypt}/include/crypt.h libsanitizer/sanitizer_common/crypt.h
+
'';
dontDisableStatic = true;
+3 -1
pkgs/development/compilers/llvm/10/compiler-rt/default.nix
···
-
{ lib, stdenv, llvm_meta, version, fetch, cmake, python3, libllvm, libcxxabi }:
+
{ lib, stdenv, llvm_meta, version, fetch, cmake, python3, libllvm, libcxxabi, libxcrypt }:
let
···
"-DCOMPILER_RT_DEFAULT_TARGET_ONLY=ON"
"-DCMAKE_C_COMPILER_TARGET=${stdenv.hostPlatform.config}"
"-DCMAKE_ASM_COMPILER_TARGET=${stdenv.hostPlatform.config}"
+
] ++ lib.optionals (haveLibc && !isMusl) [
+
"-DSANITIZER_COMMON_CFLAGS=-I${libxcrypt}/include"
] ++ lib.optionals (useLLVM || bareMetal || isMusl) [
"-DCOMPILER_RT_BUILD_SANITIZERS=OFF"
"-DCOMPILER_RT_BUILD_XRAY=OFF"
+3 -1
pkgs/development/compilers/llvm/11/compiler-rt/default.nix
···
-
{ lib, stdenv, llvm_meta, version, fetch, cmake, python3, xcbuild, libllvm, libcxxabi }:
+
{ lib, stdenv, llvm_meta, version, fetch, cmake, python3, xcbuild, libllvm, libcxxabi, libxcrypt }:
let
···
"-DCOMPILER_RT_DEFAULT_TARGET_ONLY=ON"
"-DCMAKE_C_COMPILER_TARGET=${stdenv.hostPlatform.config}"
"-DCMAKE_ASM_COMPILER_TARGET=${stdenv.hostPlatform.config}"
+
] ++ lib.optionals (haveLibc && !isMusl) [
+
"-DSANITIZER_COMMON_CFLAGS=-I${libxcrypt}/include"
] ++ lib.optionals (useLLVM || bareMetal || isMusl || isNewDarwinBootstrap) [
"-DCOMPILER_RT_BUILD_SANITIZERS=OFF"
"-DCOMPILER_RT_BUILD_XRAY=OFF"
+3 -1
pkgs/development/compilers/llvm/12/compiler-rt/default.nix
···
-
{ lib, stdenv, llvm_meta, version, fetch, cmake, python3, xcbuild, libllvm, libcxxabi }:
+
{ lib, stdenv, llvm_meta, version, fetch, cmake, python3, xcbuild, libllvm, libcxxabi, libxcrypt }:
let
···
"-DCOMPILER_RT_DEFAULT_TARGET_ONLY=ON"
"-DCMAKE_C_COMPILER_TARGET=${stdenv.hostPlatform.config}"
"-DCMAKE_ASM_COMPILER_TARGET=${stdenv.hostPlatform.config}"
+
] ++ lib.optionals (haveLibc && !isMusl) [
+
"-DSANITIZER_COMMON_CFLAGS=-I${libxcrypt}/include"
] ++ lib.optionals (useLLVM || bareMetal || isMusl) [
"-DCOMPILER_RT_BUILD_SANITIZERS=OFF"
"-DCOMPILER_RT_BUILD_XRAY=OFF"
+3 -1
pkgs/development/compilers/llvm/13/compiler-rt/default.nix
···
-
{ lib, stdenv, llvm_meta, version, src, cmake, python3, xcbuild, libllvm, libcxxabi }:
+
{ lib, stdenv, llvm_meta, version, src, cmake, python3, xcbuild, libllvm, libcxxabi, libxcrypt }:
let
···
"-DCOMPILER_RT_DEFAULT_TARGET_ONLY=ON"
"-DCMAKE_C_COMPILER_TARGET=${stdenv.hostPlatform.config}"
"-DCMAKE_ASM_COMPILER_TARGET=${stdenv.hostPlatform.config}"
+
] ++ lib.optionals (haveLibc && !isMusl) [
+
"-DSANITIZER_COMMON_CFLAGS=-I${libxcrypt}/include"
] ++ lib.optionals (useLLVM || bareMetal || isMusl || isAarch64) [
"-DCOMPILER_RT_BUILD_LIBFUZZER=OFF"
] ++ lib.optionals (useLLVM || bareMetal || isMusl) [
+3 -1
pkgs/development/compilers/llvm/14/compiler-rt/default.nix
···
{ lib, stdenv, llvm_meta, version
, monorepoSrc, runCommand
-
, cmake, python3, xcbuild, libllvm, libcxxabi
+
, cmake, python3, xcbuild, libllvm, libcxxabi, libxcrypt
}:
let
···
"-DCOMPILER_RT_DEFAULT_TARGET_ONLY=ON"
"-DCMAKE_C_COMPILER_TARGET=${stdenv.hostPlatform.config}"
"-DCMAKE_ASM_COMPILER_TARGET=${stdenv.hostPlatform.config}"
+
] ++ lib.optionals (haveLibc && !isMusl) [
+
"-DSANITIZER_COMMON_CFLAGS=-I${libxcrypt}/include"
] ++ lib.optionals (useLLVM || bareMetal || isMusl) [
"-DCOMPILER_RT_BUILD_SANITIZERS=OFF"
"-DCOMPILER_RT_BUILD_XRAY=OFF"
+2 -1
pkgs/development/compilers/llvm/rocm/llvm.nix
···
, libxml2
, libffi
, libbfd
+
, libxcrypt
, ncurses
, zlib
, debugVersion ? false
···
nativeBuildInputs = [ cmake ninja python3 ];
-
buildInputs = [ libxml2 ];
+
buildInputs = [ libxml2 libxcrypt ];
propagatedBuildInputs = [ ncurses zlib ];
+2 -2
pkgs/development/compilers/swi-prolog/default.nix
···
{ lib, stdenv, fetchFromGitHub, jdk, gmp, readline, openssl, unixODBC, zlib
-
, libarchive, db, pcre, libedit, libossp_uuid, libXpm
+
, libarchive, db, pcre, libedit, libossp_uuid, libxcrypt,libXpm
, libSM, libXt, freetype, pkg-config, fontconfig
, cmake, libyaml, Security
, libjpeg, libX11, libXext, libXft, libXinerama
···
nativeBuildInputs = [ cmake pkg-config ];
buildInputs = [ gmp readline openssl
-
libarchive libyaml db pcre libedit libossp_uuid
+
libarchive libyaml db pcre libedit libossp_uuid libxcrypt
zlib ]
++ lib.optionals (withGui && !stdenv.isDarwin) [ libXpm libX11 libXext libXft libXinerama libjpeg ]
++ extraLibraries
+2
pkgs/development/compilers/swift/default.nix
···
, python3
, ncurses
, libuuid
+
, libxcrypt
, icu
, libgcc
, libblocksruntime
···
libedit
libgcc
libuuid
+
libxcrypt
libxml2
ncurses
sqlite
+28
pkgs/development/haskell-modules/configuration-common.nix
···
# Restrictive upper bound on base.
# Remove once version 1.* is released
monad-bayes = doJailbreak super.monad-bayes;
+
+
crypt-sha512 = overrideCabal (drv: {
+
librarySystemDepends = [
+
pkgs.libxcrypt
+
];
+
# Test failure after libxcrypt migration, reported upstrem at
+
# https://github.com/phadej/crypt-sha512/issues/13
+
doCheck = false;
+
}) super.crypt-sha512;
+
+
nano-cryptr = overrideCabal (drv: {
+
librarySystemDepends = [
+
pkgs.libxcrypt
+
];
+
}) super.nano-cryptr;
+
+
Unixutils = overrideCabal (drv: {
+
librarySystemDepends = [
+
pkgs.libxcrypt
+
];
+
}) super.Unixutils;
+
+
xmonad-utils = overrideCabal (drv: {
+
librarySystemDepends = [
+
pkgs.libxcrypt
+
];
+
}) super.xmonad-utils;
+
} // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super // (let
# We need to build purescript with these dependencies and thus also its reverse
# dependencies to avoid version mismatches in their dependency closure.
+6
pkgs/development/interpreters/perl/default.nix
···
{ config, lib, stdenv, fetchurl, fetchFromGitHub, pkgs, buildPackages
, callPackage
, enableThreading ? true, coreutils, makeWrapper
+
, enableCrypt ? true, libxcrypt ? null
, zlib
}:
+
+
assert (enableCrypt -> (libxcrypt != null));
# Note: this package is used for bootstrapping fetchurl, and thus
# cannot use fetchpatch! All mutable patches (generated by GitHub or
···
outputs = [ "out" "man" "devdoc" ] ++
optional crossCompiling "mini";
setOutputFlags = false;
+
+
propagatedBuildInputs = lib.optional enableCrypt libxcrypt;
disallowedReferences = [ stdenv.cc ];
···
++ optionals ((builtins.match ''5\.[0-9]*[13579]\..+'' version) != null) [ "-Dusedevel" "-Uversiononly" ]
++ optional stdenv.isSunOS "-Dcc=gcc"
++ optional enableThreading "-Dusethreads"
+
++ optional (!enableCrypt) "-A clear:d_crypt_r"
++ optional stdenv.hostPlatform.isStatic "--all-static"
++ optionals (!crossCompiling) [
"-Dprefix=${placeholder "out"}"
+5 -1
pkgs/development/interpreters/python/cpython/default.nix
···
, bluez ? null, bluezSupport ? false
, zlib
, tzdata ? null
+
, libxcrypt
, self
, configd
, autoreconfHook
···
# Never even try to use lchmod on linux,
# don't rely on detecting glibc-isms.
"ac_cv_func_lchmod=no"
+
] ++ optionals (libxcrypt != null) [
+
"CFLAGS=-I${libxcrypt}/include"
+
"LIBS=-L${libxcrypt}/lib"
] ++ optionals tzdataSupport [
"--with-tzpath=${tzdata}/share/zoneinfo"
] ++ optional static "LDFLAGS=-static";
···
postInstall = let
# References *not* to nuke from (sys)config files
keep-references = concatMapStringsSep " " (val: "-e ${val}") ([
-
(placeholder "out")
+
(placeholder "out") libxcrypt
] ++ optionals tzdataSupport [
tzdata
]);
+2 -1
pkgs/development/interpreters/qnial/default.nix
···
-
{ lib, stdenv, fetchFromGitHub, unzip, pkg-config, makeWrapper, ncurses }:
+
{ lib, stdenv, fetchFromGitHub, unzip, pkg-config, makeWrapper, ncurses, libxcrypt }:
stdenv.mkDerivation {
pname = "qnial";
···
buildInputs = [
ncurses
+
libxcrypt
];
meta = {
+2 -2
pkgs/development/interpreters/unicon-lang/default.nix
···
-
{ lib, stdenv, fetchurl, unzip, libX11, libXt, libnsl }:
+
{ lib, stdenv, fetchurl, unzip, libX11, libXt, libnsl, libxcrypt }:
stdenv.mkDerivation {
pname = "unicon-lang";
···
sha256 = "1g9l2dfp99dqih2ir2limqfjgagh3v9aqly6x0l3qavx3qkkwf61";
};
nativeBuildInputs = [ unzip ];
-
buildInputs = [ libnsl libX11 libXt ];
+
buildInputs = [ libnsl libX11 libXt libxcrypt ];
hardeningDisable = [ "fortify" ];
+2
pkgs/development/libraries/accountsservice/default.nix
···
, python3
, vala
, gettext
+
, libxcrypt
}:
stdenv.mkDerivation rec {
···
glib
polkit
systemd
+
libxcrypt
];
mesonFlags = [
+15 -9
pkgs/development/libraries/apr-util/default.nix
···
, sslSupport ? true, openssl
, bdbSupport ? true, db
, ldapSupport ? !stdenv.isCygwin, openldap
-
, libiconv
+
, libiconv, libxcrypt
, cyrus_sasl, autoreconfHook
}:
···
sha256 = "0nq3s1yn13vplgl6qfm09f7n0wm08malff9s59bqf9nid9xjzqfk";
};
-
patches = optional stdenv.isFreeBSD ./include-static-dependencies.patch;
+
patches = [ ./fix-libxcrypt-build.patch ]
+
++ optional stdenv.isFreeBSD ./include-static-dependencies.patch;
+
+
NIX_CFLAGS_LINK = [ "-lcrypt" ];
outputs = [ "out" "dev" ];
outputBin = "dev";
···
"--without-freetds" "--without-berkeley-db" "--without-crypto" ]
;
-
# For some reason, db version 6.9 is selected when cross-compiling.
-
# It's unclear as to why, it requires someone with more autotools / configure knowledge to go deeper into that.
-
# Always replacing the link flag with a generic link flag seems to help though, so let's do that for now.
-
postConfigure = lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform) ''
-
substituteInPlace Makefile \
-
--replace "-ldb-6.9" "-ldb"
+
postConfigure = ''
+
echo '#define APR_HAVE_CRYPT_H 1' >> confdefs.h
+
'' +
+
# For some reason, db version 6.9 is selected when cross-compiling.
+
# It's unclear as to why, it requires someone with more autotools / configure knowledge to go deeper into that.
+
# Always replacing the link flag with a generic link flag seems to help though, so let's do that for now.
+
lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform) ''
+
substituteInPlace Makefile \
+
--replace "-ldb-6.9" "-ldb"
'';
-
propagatedBuildInputs = [ apr expat libiconv ]
+
propagatedBuildInputs = [ apr expat libiconv libxcrypt ]
++ optional sslSupport openssl
++ optional bdbSupport db
++ optional ldapSupport openldap
+14
pkgs/development/libraries/apr-util/fix-libxcrypt-build.patch
···
+
diff --git a/crypto/apr_passwd.c b/crypto/apr_passwd.c
+
index c961de2..a397f27 100644
+
--- a/crypto/apr_passwd.c
+
+++ b/crypto/apr_passwd.c
+
@@ -24,9 +24,7 @@
+
#if APR_HAVE_STRING_H
+
#include <string.h>
+
#endif
+
-#if APR_HAVE_CRYPT_H
+
#include <crypt.h>
+
-#endif
+
#if APR_HAVE_UNISTD_H
+
#include <unistd.h>
+
#endif
+2 -2
pkgs/development/libraries/boost/generic.nix
···
-
{ lib, stdenv, icu, expat, zlib, bzip2, python ? null, fixDarwinDylibNames, libiconv
+
{ lib, stdenv, icu, expat, zlib, bzip2, python ? null, fixDarwinDylibNames, libiconv, libxcrypt
, boost-build
, fetchpatch
, which
···
++ optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames;
buildInputs = [ expat zlib bzip2 libiconv ]
++ optional (stdenv.hostPlatform == stdenv.buildPlatform) icu
-
++ optional enablePython python
+
++ optionals enablePython [ libxcrypt python ]
++ optional enableNumpy python.pkgs.numpy;
configureScript = "./bootstrap.sh";
+2 -2
pkgs/development/libraries/cyrus-sasl/default.nix
···
{ lib, stdenv, fetchurl, openssl, openldap, libkrb5, db, gettext
-
, pam, fixDarwinDylibNames, autoreconfHook, enableLdap ? false
+
, pam, libxcrypt, fixDarwinDylibNames, autoreconfHook, enableLdap ? false
, buildPackages, pruneLibtoolFiles, nixosTests }:
with lib;
···
nativeBuildInputs = [ autoreconfHook pruneLibtoolFiles ]
++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames;
buildInputs =
-
[ openssl db gettext libkrb5 ]
+
[ openssl db gettext libkrb5 libxcrypt ]
++ lib.optional enableLdap openldap
++ lib.optional stdenv.isLinux pam;
+4 -1
pkgs/development/libraries/glibc/common.nix
···
, withLinuxHeaders ? false
, profilingLibraries ? false
, withGd ? false
+
, withLibcrypt ? false
, meta
, extraBuildInputs ? []
, extraNativeBuildInputs ? []
···
# To avoid linking with -lgcc_s (dynamic link)
# so the glibc does not depend on its compiler store path
"libc_cv_as_needed=no"
-
] ++ lib.optional withGd "--with-gd";
+
]
+
++ lib.optional withGd "--with-gd"
+
++ lib.optional (!withLibcrypt) "--disable-crypt";
makeFlags = [
"OBJCOPY=${stdenv.cc.targetPrefix}objcopy"
+2 -1
pkgs/development/libraries/glibc/default.nix
···
, withLinuxHeaders ? true
, profilingLibraries ? false
, withGd ? false
+
, withLibcrypt? false
, buildPackages
}:
···
callPackage ./common.nix { inherit stdenv; } {
pname = "glibc" + lib.optionalString withGd "-gd";
-
inherit withLinuxHeaders profilingLibraries withGd;
+
inherit withLinuxHeaders profilingLibraries withGd withLibcrypt;
# Note:
# Things you write here override, and do not add to,
+2
pkgs/development/libraries/gvm-libs/default.nix
···
, libpcap
, libssh
, libuuid
+
, libxcrypt
, libxml2
, pkg-config
, zlib
···
libpcap
libssh
libuuid
+
libxcrypt
libxml2
zlib
];
+3 -1
pkgs/development/libraries/libcli/default.nix
···
-
{ lib, stdenv, fetchFromGitHub, fetchurl }:
+
{ lib, stdenv, fetchFromGitHub, fetchurl, libxcrypt }:
stdenv.mkDerivation rec {
pname = "libcli";
···
sha256 = "0szjiw3gd7by1sv924shnngfxvc98xvaqvx228b575xq93xxjcwl";
})
];
+
+
buildInputs = [ libxcrypt ];
enableParallelBuilding = true;
+2 -1
pkgs/development/libraries/libfilezilla/default.nix
···
, nettle
, pkg-config
, libiconv
+
, libxcrypt
, ApplicationServices
}:
···
nativeBuildInputs = [ autoreconfHook pkg-config ];
-
buildInputs = [ gettext gnutls nettle ]
+
buildInputs = [ gettext gnutls nettle libxcrypt ]
++ lib.optionals stdenv.isDarwin [ libiconv ApplicationServices ];
enableParallelBuilding = true;
+2
pkgs/development/libraries/libguestfs/default.nix
···
, pkg-config
, autoreconfHook
, makeWrapper
+
, libxcrypt
, ncurses
, cpio
, gperf
···
] ++ (with perlPackages; [ perl libintl-perl GetoptLong ModuleBuild ])
++ (with ocamlPackages; [ ocaml findlib ]);
buildInputs = [
+
libxcrypt
ncurses
jansson
pcre2
+14 -23
pkgs/development/libraries/libxcrypt/default.nix
···
-
{ lib, stdenv, fetchFromGitHub, autoconf, automake, libtool, pkg-config, perl, fetchpatch }:
+
{ lib, stdenv, fetchurl, perl }:
stdenv.mkDerivation rec {
pname = "libxcrypt";
version = "4.4.28";
-
src = fetchFromGitHub {
-
owner = "besser82";
-
repo = "libxcrypt";
-
rev = "v${version}";
-
sha256 = "sha256-Ohf+RCOXnoCxAFnXXV9e2TCqpfZziQl+FGJTGDSQTF0=";
+
src = fetchurl {
+
url = "https://github.com/besser82/libxcrypt/releases/download/v${version}/libxcrypt-${version}.tar.xz";
+
sha256 = "sha256-npNoEfn60R28ozyhm9l8VcUus8oVkB8nreBGzHnmnoc=";
};
-
patches = [
-
# Fix for tests on musl is being upstreamed:
-
# https://github.com/besser82/libxcrypt/pull/157
-
# Applied in all environments to prevent patchrot
-
(fetchpatch {
-
url = "https://github.com/besser82/libxcrypt/commit/a4228faa0b96986abc076125cf97d352a063d92f.patch";
-
sha256 = "sha256-iGNz8eer6OkA0yR74WisE6GbFTYyXKw7koXl/R7DhVE=";
-
})
+
configureFlags = [
+
"--enable-hashes=all"
+
"--enable-obsolete-api=glibc"
+
"--disable-failure-tokens"
+
] ++ lib.optionals stdenv.hostPlatform.isMusl [
+
"--disable-werror"
];
-
preConfigure = ''
-
patchShebangs autogen.sh
-
./autogen.sh
-
'';
-
-
configureFlags = [
-
"--disable-werror"
+
nativeBuildInputs = [
+
perl
];
-
nativeBuildInputs = [ autoconf automake libtool pkg-config perl ];
+
enableParallelBuilding = true;
-
doCheck = true;
+
doCheck = !stdenv.hostPlatform.isMusl;
meta = with lib; {
description = "Extended crypt library for descrypt, md5crypt, bcrypt, and others";
+2 -1
pkgs/development/libraries/libxslt/default.nix
···
, gettext
, python
, ncurses
+
, libxcrypt
, libgcrypt
, cryptoSupport ? false
, pythonSupport ? true
···
];
buildInputs = [
-
libxml2.dev
+
libxml2.dev libxcrypt
] ++ lib.optional stdenv.isDarwin [
gettext
] ++ lib.optionals pythonSupport [
+2
pkgs/development/libraries/openldap/default.nix
···
, libtool
, openssl
, systemdMinimal
+
, libxcrypt
}:
stdenv.mkDerivation rec {
···
libsodium
libtool
openssl
+
libxcrypt
] ++ lib.optionals (stdenv.isLinux) [
systemdMinimal
];
+2 -2
pkgs/development/libraries/physics/cernlib/default.nix
···
-
{ lib, stdenv, fetchurl, gfortran, imake, makedepend, motif, xorg }:
+
{ lib, stdenv, fetchurl, gfortran, imake, makedepend, motif, xorg, libxcrypt }:
stdenv.mkDerivation rec {
version = "2006";
···
sha256 = "0awla1rl96z82br7slcmg8ks1d2a7slk6dj79ywb871j2ksi3fky";
};
-
buildInputs = with xorg; [ gfortran motif libX11 libXft libXt ];
+
buildInputs = with xorg; [ gfortran motif libX11 libXft libXt libxcrypt ];
nativeBuildInputs = [ imake makedepend ];
sourceRoot = ".";
+2
pkgs/development/libraries/talloc/default.nix
···
, pkg-config
, readline
, libxslt
+
, libxcrypt
, docbook-xsl-nons
, docbook_xml_dtd_42
, fixDarwinDylibNames
···
python3
readline
libxslt
+
libxcrypt
];
wafPath = "buildtools/bin/waf";
+2
pkgs/development/libraries/tdb/default.nix
···
, python3
, readline
, libxslt
+
, libxcrypt
, docbook-xsl-nons
, docbook_xml_dtd_45
}:
···
buildInputs = [
python3
readline # required to build python
+
libxcrypt
];
wafPath = "buildtools/bin/waf";
+2 -2
pkgs/development/libraries/zeroc-ice/default.nix
···
{ stdenv, lib, fetchFromGitHub
-
, bzip2, expat, libedit, lmdb, openssl
+
, bzip2, expat, libedit, lmdb, openssl, libxcrypt
, python3 # for tests only
, cpp11 ? false
}:
···
sha256 = "sha256-h455isEmnRyoasXhh1UaA5PICcEEM8/C3IJf5yHRl5g=";
};
-
buildInputs = [ zeroc_mcpp bzip2 expat libedit lmdb openssl ];
+
buildInputs = [ zeroc_mcpp bzip2 expat libedit lmdb openssl libxcrypt ];
preBuild = ''
makeFlagsArray+=(
+7
pkgs/development/lua-modules/overrides.nix
···
, libmysqlclient
, libuuid
, libuv
+
, libxcrypt
, libyaml
, mariadb
, mpfr
···
# https://github.com/wahern/luaossl/pull/199
{ name = "CRYPTO"; dep = openssl_1_1; }
{ name = "OPENSSL"; dep = openssl_1_1; }
+
];
+
});
+
+
luaposix = prev.luaLib.overrideLuarocks prev.luaposix (drv: {
+
externalDeps = [
+
{ name = "CRYPT"; dep = libxcrypt; }
];
});
+1 -1
pkgs/development/python-modules/pillow-simd/default.nix
···
{ lib, stdenv, buildPythonPackage, fetchFromGitHub, isPyPy, isPy3k
-
, olefile, freetype, libjpeg, zlib, libtiff, libwebp, tcl, lcms2
+
, olefile, freetype, libjpeg, zlib, libtiff, libwebp, libxcrypt, tcl, lcms2
, libxcb, tk, libX11, openjpeg, libimagequant, pyroma, numpy, defusedxml
, pytestCheckHook
}@args:
+1 -1
pkgs/development/python-modules/pillow/default.nix
···
, pythonOlder
, fetchPypi
, isPyPy
-
, defusedxml, olefile, freetype, libjpeg, zlib, libtiff, libwebp, tcl, lcms2, tk, libX11
+
, defusedxml, olefile, freetype, libjpeg, zlib, libtiff, libwebp, libxcrypt, tcl, lcms2, tk, libX11
, libxcb, openjpeg, libimagequant, pyroma, numpy, pytestCheckHook
# for passthru.tests
, imageio, matplotlib, pilkit, pydicom, reportlab
+1 -1
pkgs/development/python-modules/pillow/generic.nix
···
checkInputs = [ pytestCheckHook pyroma numpy ];
-
buildInputs = [ freetype libjpeg openjpeg libimagequant zlib libtiff libwebp tcl lcms2 ]
+
buildInputs = [ freetype libjpeg openjpeg libimagequant zlib libtiff libwebp libxcrypt tcl lcms2 ]
++ lib.optionals (lib.versionAtLeast version "7.1.0") [ libxcb ]
++ lib.optionals (isPyPy) [ tk libX11 ];
+3
pkgs/development/python-modules/twisted/default.nix
···
echo 'MulticastTests.test_multicast.skip = "Reactor was unclean"'>> src/twisted/test/test_udp.py
echo 'MulticastTests.test_multiListen.skip = "No such device"'>> src/twisted/test/test_udp.py
+
# fails since migrating to libxcrypt
+
echo 'HelperTests.test_refuteCryptedPassword.skip = "OSError: Invalid argument"' >> src/twisted/conch/test/test_checkers.py
+
# not packaged
substituteInPlace src/twisted/test/test_failure.py \
--replace "from cython_test_exception_raiser import raiser # type: ignore[import]" "raiser = None"
+2 -2
pkgs/development/tools/libsigrokdecode/default.nix
···
-
{ lib, stdenv, fetchurl, pkg-config, glib, python3, check }:
+
{ lib, stdenv, fetchurl, pkg-config, glib, python3, check, libxcrypt }:
stdenv.mkDerivation rec {
pname = "libsigrokdecode";
···
};
nativeBuildInputs = [ pkg-config ];
-
buildInputs = [ glib python3 ];
+
buildInputs = [ glib python3 libxcrypt ];
checkInputs = [ check ];
doCheck = true;
+2 -1
pkgs/games/snis/default.nix
···
, sox
, libopus
, openscad
+
, libxcrypt
}:
stdenv.mkDerivation {
···
'';
nativeBuildInputs = [ pkg-config openscad makeWrapper ];
-
buildInputs = [ coreutils portaudio libbsd libpng libvorbis SDL2 lua5_2 glew openssl picotts sox alsa-utils libopus ];
+
buildInputs = [ coreutils portaudio libbsd libpng libvorbis SDL2 lua5_2 glew openssl picotts sox alsa-utils libopus libxcrypt ];
postBuild = ''
make models -j$NIX_BUILD_CORES
+2 -2
pkgs/misc/screensavers/slock/default.nix
···
{ lib, stdenv, fetchurl, writeText
-
, xorgproto, libX11, libXext, libXrandr
+
, xorgproto, libX11, libXext, libXrandr, libxcrypt
# default header can be obtained from
# https://git.suckless.org/slock/tree/config.def.h
, conf ? null }:
···
sha256 = "0sif752303dg33f14k6pgwq2jp1hjyhqv6x4sy3sj281qvdljf5m";
};
-
buildInputs = [ xorgproto libX11 libXext libXrandr ];
+
buildInputs = [ xorgproto libX11 libXext libXrandr libxcrypt ];
installFlags = [ "PREFIX=$(out)" ];
+3 -1
pkgs/os-specific/linux/apparmor/default.nix
···
, writeShellScript
, closureInfo
, runCommand
+
, libxcrypt
}:
let
···
perl
] ++ lib.optional withPython python;
-
buildInputs = lib.optional withPerl perl
+
buildInputs = [ libxcrypt ]
+
++ lib.optional withPerl perl
++ lib.optional withPython python;
# required to build apparmor-parser
+2 -2
pkgs/os-specific/linux/otpw/default.nix
···
-
{ lib, stdenv, fetchurl, pam }:
+
{ lib, stdenv, fetchurl, pam, libxcrypt }:
stdenv.mkDerivation rec {
pname = "otpw";
···
cp *.8 $out/share/man/man8
'';
-
buildInputs = [ pam ];
+
buildInputs = [ pam libxcrypt ];
hardeningDisable = [ "stackprotector" ];
+1 -1
pkgs/os-specific/linux/pam/default.nix
···
{ lib, stdenv, buildPackages, fetchurl, flex, cracklib, db4, gettext, audit
, nixosTests
-
, withLibxcrypt ? false, libxcrypt
+
, withLibxcrypt ? true, libxcrypt
}:
stdenv.mkDerivation rec {
+2 -2
pkgs/os-specific/linux/pam_mysql/default.nix
···
-
{ lib, stdenv, fetchFromGitHub, meson, ninja, pam, pkg-config, libmysqlclient, mariadb }:
+
{ lib, stdenv, fetchFromGitHub, meson, ninja, pam, pkg-config, libmysqlclient, mariadb, libxcrypt }:
stdenv.mkDerivation rec {
pname = "pam_mysql";
···
};
nativeBuildInputs = [ meson pkg-config ninja ];
-
buildInputs = [ pam libmysqlclient mariadb ];
+
buildInputs = [ pam libmysqlclient mariadb libxcrypt ];
meta = with lib; {
description = "PAM authentication module against a MySQL database";
+2 -2
pkgs/os-specific/linux/pam_pgsql/default.nix
···
-
{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, postgresql, libgcrypt, pam }:
+
{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, postgresql, libgcrypt, pam, libxcrypt }:
stdenv.mkDerivation rec {
pname = "pam_pgsql";
···
};
nativeBuildInputs = [ autoreconfHook pkg-config ];
-
buildInputs = [ libgcrypt pam postgresql ];
+
buildInputs = [ libgcrypt pam postgresql libxcrypt ];
meta = with lib; {
description = "Support to authenticate against PostgreSQL for PAM-enabled appliations";
+2 -2
pkgs/os-specific/linux/policycoreutils/default.nix
···
-
{ lib, stdenv, fetchurl, gettext, libsepol, libselinux, libsemanage }:
+
{ lib, stdenv, fetchurl, gettext, libsepol, libselinux, libsemanage, libxcrypt }:
stdenv.mkDerivation rec {
pname = "policycoreutils";
···
'';
nativeBuildInputs = [ gettext ];
-
buildInputs = [ libsepol libselinux libsemanage ];
+
buildInputs = [ libsepol libselinux libsemanage libxcrypt ];
makeFlags = [
"PREFIX=$(out)"
+5 -2
pkgs/os-specific/linux/shadow/default.nix
···
{ lib, stdenv, nixosTests, fetchpatch, fetchFromGitHub, autoreconfHook, libxslt
, libxml2 , docbook_xml_dtd_45, docbook_xsl, itstool, flex, bison, runtimeShell
-
, pam ? null, glibcCross ? null
+
, libxcrypt, pam ? null, glibcCross ? null
}:
let
···
sha256 = "sha256-PxLX5V0t18JftT5wT41krNv18Ew7Kz3MfZkOi/80ODA=";
};
-
buildInputs = lib.optional (pam != null && stdenv.isLinux) pam;
+
buildInputs = [ libxcrypt ]
+
++ lib.optional (pam != null && stdenv.isLinux) pam;
nativeBuildInputs = [autoreconfHook libxslt libxml2
docbook_xml_dtd_45 docbook_xsl flex bison itstool
];
···
configureFlags = [
"--enable-man"
"--with-group-name-max-length=32"
+
"--with-bcrypt"
+
"--with-yescrypt"
] ++ lib.optional (stdenv.hostPlatform.libc != "glibc") "--disable-nscd";
preBuild = lib.optionalString (stdenv.hostPlatform.libc == "glibc")
+2
pkgs/os-specific/linux/systemd/default.nix
···
, util-linux
, kbd
, kmod
+
, libxcrypt
# Optional dependencies
, pam
···
acl
audit
kmod
+
libxcrypt
libcap
libidn2
libuuid
+3 -1
pkgs/os-specific/linux/sysvinit/default.nix
···
-
{ lib, stdenv, fetchurl, withoutInitTools ? false }:
+
{ lib, stdenv, fetchurl, libxcrypt, withoutInitTools ? false }:
stdenv.mkDerivation rec {
pname = if withoutInitTools then "sysvtools" else "sysvinit";
···
# Patch some minimal hard references, so halt/shutdown work
sed -i -e "s,/sbin/,$out/sbin/," src/halt.c src/init.c src/paths.h
'';
+
+
buildInputs = [ libxcrypt ];
makeFlags = [ "SULOGINLIBS=-lcrypt" "ROOT=$(out)" "MANDIR=/share/man" ];
+2 -1
pkgs/os-specific/linux/util-linux/default.nix
···
{ lib, stdenv, fetchurl, pkg-config, zlib, shadow
, capabilitiesSupport ? true
, libcap_ng
+
, libxcrypt
, ncursesSupport ? true
, ncurses
, pamSupport ? true
···
nativeBuildInputs = [ pkg-config ]
++ lib.optionals translateManpages [ po4a ];
-
buildInputs = [ zlib ]
+
buildInputs = [ zlib libxcrypt ]
++ lib.optionals pamSupport [ pam ]
++ lib.optionals capabilitiesSupport [ libcap_ng ]
++ lib.optionals ncursesSupport [ ncurses ]
+6
pkgs/os-specific/linux/wiringpi/default.nix
···
, stdenv
, symlinkJoin
, fetchFromGitHub
+
, libxcrypt
}:
let
···
inherit mkSubProject;
wiringPi = mkSubProject {
subprj = "wiringPi";
+
buildInputs = [
+
libxcrypt
+
];
};
devLib = mkSubProject {
subprj = "devLib";
···
wiringPiD = mkSubProject {
subprj = "wiringPiD";
buildInputs = [
+
libxcrypt
passthru.wiringPi
passthru.devLib
];
···
gpio = mkSubProject {
subprj = "gpio";
buildInputs = [
+
libxcrypt
passthru.wiringPi
passthru.devLib
];
+3 -2
pkgs/servers/dante/default.nix
···
-
{ lib, stdenv, fetchurl, fetchpatch, pam, libkrb5, cyrus_sasl, miniupnpc, autoreconfHook }:
+
{ lib, stdenv, fetchurl, fetchpatch, autoreconfHook
+
, pam, libkrb5, cyrus_sasl, miniupnpc, libxcrypt }:
stdenv.mkDerivation rec {
pname = "dante";
···
};
nativeBuildInputs = lib.optional stdenv.hostPlatform.isMips64 autoreconfHook;
-
buildInputs = [ pam libkrb5 cyrus_sasl miniupnpc ];
+
buildInputs = [ pam libkrb5 cyrus_sasl miniupnpc libxcrypt ];
configureFlags = if !stdenv.isDarwin
then [ "--with-libc=libc.so.6" ]
+2 -2
pkgs/servers/dico/default.nix
···
{ fetchurl, lib, stdenv, libtool, gettext, zlib, readline, gsasl
-
, guile, python3, pcre, libffi, groff }:
+
, guile, python3, pcre, libffi, groff, libxcrypt }:
stdenv.mkDerivation rec {
pname = "dico";
···
nativeBuildInputs = [ groff ];
buildInputs =
-
[ libtool gettext zlib readline gsasl guile python3 pcre libffi ];
+
[ libtool gettext zlib readline gsasl guile python3 pcre libffi libxcrypt ];
strictDeps = true;
+3 -1
pkgs/servers/ftp/bftpd/default.nix
···
-
{ lib, stdenv, fetchurl }:
+
{ lib, stdenv, fetchurl, libxcrypt }:
stdenv.mkDerivation rec {
pname = "bftpd";
···
url = "mirror://sourceforge/project/${pname}/${pname}/${pname}-${version}/${pname}-${version}.tar.gz";
sha256 = "sha256-lyHQYU4aXQ/muAyaigStqO/ULL393SOelagFmuKDqm8=";
};
+
+
buildInputs = [ libxcrypt ];
preConfigure = ''
sed -re 's/-[og] 0//g' -i Makefile*
+2 -2
pkgs/servers/ftp/pure-ftpd/default.nix
···
-
{ lib, stdenv, fetchurl, openssl, pam, fetchpatch }:
+
{ lib, stdenv, fetchurl, openssl, pam, libxcrypt }:
stdenv.mkDerivation rec {
pname = "pure-ftpd";
···
sha256 = "sha256-QWD2a3ZhXuojl+rE6j8KFGt5KCB7ebxMwvma17e9lRM=";
};
-
buildInputs = [ openssl pam ];
+
buildInputs = [ openssl pam libxcrypt ];
configureFlags = [ "--with-tls" ];
+2 -2
pkgs/servers/ftp/vsftpd/default.nix
···
-
{ lib, stdenv, fetchurl, libcap, libseccomp, openssl, pam, nixosTests }:
+
{ lib, stdenv, fetchurl, libcap, libseccomp, openssl, pam, libxcrypt, nixosTests }:
stdenv.mkDerivation rec {
pname = "vsftpd";
···
sha256 = "sha256-JrYCrkVLC6bZnvRKCba54N+n9nIoEGc23x8njHC8kdM=";
};
-
buildInputs = [ libcap openssl libseccomp pam ];
+
buildInputs = [ libcap openssl libseccomp pam libxcrypt ];
patches = [ ./CVE-2015-1419.patch ];
+2 -2
pkgs/servers/http/apache-httpd/2.4.nix
···
-
{ lib, stdenv, fetchurl, perl, zlib, apr, aprutil, pcre2, libiconv, lynx, which
+
{ lib, stdenv, fetchurl, perl, zlib, apr, aprutil, pcre2, libiconv, lynx, which, libxcrypt
, nixosTests
, proxySupport ? true
, sslSupport ? true, openssl
···
nativeBuildInputs = [ which ];
-
buildInputs = [ perl ] ++
+
buildInputs = [ perl libxcrypt ] ++
lib.optional brotliSupport brotli ++
lib.optional sslSupport openssl ++
lib.optional ldapSupport openldap ++ # there is no --with-ldap flag
+2 -1
pkgs/servers/http/bozohttpd/default.nix
···
, inetutils
, wget
, openssl
+
, libxcrypt
, minimal ? false
, userSupport ? !minimal
, cgiSupport ? !minimal
···
];
patchFlags = [ "-p3" ];
-
buildInputs = [ openssl ] ++ optional (luaSupport) lua;
+
buildInputs = [ openssl libxcrypt ] ++ optional (luaSupport) lua;
nativeBuildInputs = [ bmake groff ];
COPTS = [
+2 -1
pkgs/servers/http/hiawatha/default.nix
···
, cmake
, ninja
, mbedtls
+
, libxcrypt
, enableCache ? true # Internal cache support.
, enableIpV6 ? true
···
};
nativeBuildInputs = [ cmake ninja ];
-
buildInputs = [ mbedtls ] ++ lib.optionals enableXslt [ libxslt libxml2 ];
+
buildInputs = [ mbedtls libxcrypt ] ++ lib.optionals enableXslt [ libxslt libxml2 ];
prePatch = ''
substituteInPlace CMakeLists.txt --replace SETUID ""
+2 -2
pkgs/servers/http/tengine/default.nix
···
-
{ lib, stdenv, fetchFromGitHub, openssl, zlib, pcre, libxml2, libxslt
+
{ lib, stdenv, fetchFromGitHub, openssl, zlib, pcre, libxcrypt, libxml2, libxslt
, substituteAll, gd, geoip, gperftools, jemalloc, nixosTests
, withDebug ? false
, withMail ? false
···
};
buildInputs =
-
[ openssl zlib pcre libxml2 libxslt gd geoip gperftools jemalloc ]
+
[ openssl zlib pcre libxcrypt libxml2 libxslt gd geoip gperftools jemalloc ]
++ concatMap (mod: mod.inputs or []) modules;
patches = singleton (substituteAll {
+5 -1
pkgs/servers/http/thttpd/default.nix
···
-
{ lib, stdenv, fetchurl }:
+
{ lib, stdenv, fetchurl, libxcrypt }:
stdenv.mkDerivation rec {
pname = "thttpd";
···
sed -i -e 's/getline/getlineX/' extras/htpasswd.c
sed -i -e 's/chmod 2755/chmod 755/' extras/Makefile.in
'';
+
+
buildInputs = [
+
libxcrypt
+
];
preInstall = ''
mkdir -p "$out/man/man1"
+2
pkgs/servers/hylafaxplus/default.nix
···
, gnugrep
, gnused
, libtiff
+
, libxcrypt
, openssl
, psmisc
, sharutils
···
file # for `file` command
ghostscript
libtiff
+
libxcrypt
openssl
psmisc # for `fuser` command
sharutils # for `uuencode` command
+2 -2
pkgs/servers/irc/atheme/default.nix
···
-
{ lib, stdenv, fetchgit, libmowgli, pkg-config, git, gettext, pcre, libidn, cracklib, openssl }:
+
{ lib, stdenv, fetchgit, libmowgli, pkg-config, git, gettext, pcre, libidn, libxcrypt, cracklib, openssl }:
stdenv.mkDerivation rec {
pname = "atheme";
···
};
nativeBuildInputs = [ pkg-config git gettext ];
-
buildInputs = [ libmowgli pcre libidn cracklib openssl ];
+
buildInputs = [ libmowgli pcre libidn libxcrypt cracklib openssl ];
configureFlags = [
"--with-pcre"
+2 -2
pkgs/servers/irc/ircd-hybrid/default.nix
···
-
{ lib, stdenv, fetchurl, openssl, zlib }:
+
{ lib, stdenv, fetchurl, openssl, zlib, libxcrypt }:
stdenv.mkDerivation rec {
pname = "ircd-hybrid";
···
sha256 = "sha256-vQNzx4DjCMGm9piQFf8o4cIpme92S3toY2tihXPCUe8=";
};
-
buildInputs = [ openssl zlib ];
+
buildInputs = [ openssl zlib libxcrypt ];
configureFlags = [
"--with-nicklen=100"
+2 -2
pkgs/servers/mail/opensmtpd/default.nix
···
{ lib, stdenv, fetchurl, autoconf, automake, libtool, bison
-
, libasr, libevent, zlib, libressl, db, pam, nixosTests
+
, libasr, libevent, zlib, libressl, db, pam, libxcrypt, nixosTests
}:
stdenv.mkDerivation rec {
···
version = "6.8.0p2";
nativeBuildInputs = [ autoconf automake libtool bison ];
-
buildInputs = [ libasr libevent zlib libressl db pam ];
+
buildInputs = [ libasr libevent zlib libressl db pam libxcrypt ];
src = fetchurl {
url = "https://www.opensmtpd.org/archives/${pname}-${version}.tar.gz";
+2 -2
pkgs/servers/mail/popa3d/default.nix
···
-
{ lib, stdenv, fetchurl, openssl }:
+
{ lib, stdenv, fetchurl, openssl, libxcrypt }:
stdenv.mkDerivation rec {
pname = "popa3d";
···
sha256 = "1g48cd74sqhl496wmljhq44iyfpghaz363a1ip8nyhpjz7d57f03";
};
-
buildInputs = [ openssl ];
+
buildInputs = [ openssl libxcrypt ];
patches = [
./fix-mail-spool-path.patch
+2 -2
pkgs/servers/monitoring/plugins/wmic-bin.nix
···
-
{ stdenv, lib, fetchFromGitHub, autoPatchelfHook, popt }:
+
{ stdenv, lib, fetchFromGitHub, autoPatchelfHook, popt, libxcrypt }:
stdenv.mkDerivation rec {
pname = "wmic-bin";
···
sha256 = "1w1mdbiwz37wzry1q38h8dyjaa6iggmsb9wcyhhlawwm1vj50w48";
};
-
buildInputs = [ popt ];
+
buildInputs = [ popt libxcrypt ];
nativeBuildInputs = [ autoPatchelfHook ];
+2 -2
pkgs/servers/news/leafnode/default.nix
···
-
{ lib, stdenv, fetchurl, pcre }:
+
{ lib, stdenv, fetchurl, pcre, libxcrypt }:
stdenv.mkDerivation {
pname = "leafnode";
···
sed -i validatefqdn.c -e 's/int is_validfqdn(const char \*f) {/int is_validfqdn(const char *f) { return 1;/;'
'';
-
buildInputs = [ pcre];
+
buildInputs = [ pcre libxcrypt ];
meta = {
homepage = "http://leafnode.sourceforge.net/";
+3 -1
pkgs/servers/pies/default.nix
···
-
{ fetchurl, lib, stdenv }:
+
{ fetchurl, lib, stdenv, libxcrypt }:
stdenv.mkDerivation rec {
pname = "pies";
···
url = "mirror://gnu/pies/${pname}-${version}.tar.bz2";
sha256 = "12r7rjjyibjdj08dvwbp0iflfpzl4s0zhn6cr6zj3hwf9gbzgl1g";
};
+
+
buildInputs = [ libxcrypt ];
configureFlags = ["--sysconfdir=/etc"];
+3
pkgs/servers/pleroma/default.nix
···
{ lib, beamPackages
, fetchFromGitHub, fetchFromGitLab
, file, cmake
+
, libxcrypt
, nixosTests, writeText
, ...
}:
···
postInstall = "mv $out/lib/erlang/lib/crypt-${version}/priv/{source,crypt}.so";
beamDeps = with final; [ elixir_make ];
+
+
buildInputs = [ libxcrypt ];
};
web_push_encryption = beamPackages.buildMix rec {
name = "web_push_encryption";
+2 -2
pkgs/servers/pounce/default.nix
···
-
{ lib, stdenv, libressl, fetchzip, pkg-config }:
+
{ lib, stdenv, libressl, fetchzip, pkg-config, libxcrypt }:
stdenv.mkDerivation rec {
pname = "pounce";
···
sha256 = "17vmbfr7ika6kmq9jqa3rpd4cr71arapav7hlmggnj7a9yw5b9mg";
};
-
buildInputs = [ libressl ];
+
buildInputs = [ libressl libxcrypt ];
nativeBuildInputs = [ pkg-config ];
+2 -2
pkgs/servers/search/groonga/default.nix
···
-
{ lib, stdenv, fetchurl, autoreconfHook, mecab, kytea, libedit, pkg-config
+
{ lib, stdenv, fetchurl, autoreconfHook, mecab, kytea, libedit, pkg-config, libxcrypt
, suggestSupport ? false, zeromq, libevent, msgpack, openssl
, lz4Support ? false, lz4
, zlibSupport ? true, zlib
···
'';
buildInputs = with lib;
-
[ mecab kytea libedit openssl ]
+
[ mecab kytea libedit openssl libxcrypt ]
++ optional lz4Support lz4
++ optional zlibSupport zlib
++ optionals suggestSupport [ zeromq libevent msgpack ];
+2 -2
pkgs/servers/sip/freeswitch/default.nix
···
{ fetchFromGitHub, stdenv, lib, pkg-config, autoreconfHook
, ncurses, gnutls, readline
, openssl, perl, sqlite, libjpeg, speex, pcre, libuuid
-
, ldns, libedit, yasm, which, libsndfile, libtiff
+
, ldns, libedit, yasm, which, libsndfile, libtiff, libxcrypt
, callPackage
···
openssl ncurses gnutls readline libjpeg
sqlite pcre speex ldns libedit
libsndfile libtiff
-
libuuid
+
libuuid libxcrypt
]
++ lib.unique (lib.concatMap (mod: mod.inputs) enabledModules)
++ lib.optionals stdenv.isDarwin [ SystemConfiguration ];
+2
pkgs/servers/sql/pgpool/default.nix
···
, fetchurl
, postgresql
, openssl
+
, libxcrypt
, withPam ? stdenv.isLinux
, pam
}:
···
buildInputs = [
postgresql
openssl
+
libxcrypt
] ++ lib.optional withPam pam;
configureFlags = [
+2 -2
pkgs/servers/uwsgi/default.nix
···
-
{ stdenv, nixosTests, lib, fetchurl, pkg-config, jansson, pcre
+
{ stdenv, nixosTests, lib, fetchurl, pkg-config, jansson, pcre, libxcrypt
# plugins: list of strings, eg. [ "python2" "python3" ]
, plugins ? []
, pam, withPAM ? stdenv.isLinux
···
nativeBuildInputs = [ python3 pkg-config ];
-
buildInputs = [ jansson pcre ]
+
buildInputs = [ jansson pcre libxcrypt ]
++ lib.optional withPAM pam
++ lib.optional withSystemd systemd
++ lib.optional withCap libcap
+2 -2
pkgs/servers/web-apps/sogo/default.nix
···
-
{ gnustep, lib, fetchFromGitHub, fetchpatch, makeWrapper, python3, lndir
+
{ gnustep, lib, fetchFromGitHub, fetchpatch, makeWrapper, python3, lndir, libxcrypt
, openssl, openldap, sope, libmemcached, curl, libsodium, libytnef, libzip, pkg-config, nixosTests
, oath-toolkit
, enableActiveSync ? false
···
};
nativeBuildInputs = [ gnustep.make makeWrapper python3 pkg-config ];
-
buildInputs = [ gnustep.base sope openssl libmemcached curl libsodium libytnef libzip openldap oath-toolkit ]
+
buildInputs = [ gnustep.base sope openssl libmemcached curl libsodium libytnef libzip openldap oath-toolkit libxcrypt ]
++ lib.optional enableActiveSync libwbxml;
patches = lib.optional enableActiveSync ./enable-activesync.patch;
+2 -2
pkgs/servers/x11/xorg/default.nix
···
}) {};
# THIS IS A GENERATED FILE. DO NOT EDIT!
-
xdm = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXau, libXaw, libXdmcp, libXext, libXft, libXinerama, libXmu, libXpm, xorgproto, libXrender, libXt }: stdenv.mkDerivation {
+
xdm = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXau, libXaw, libXdmcp, libXext, libXft, libXinerama, libXmu, libXpm, libxcrypt, xorgproto, libXrender, libXt }: stdenv.mkDerivation {
pname = "xdm";
version = "1.1.12";
builder = ./builder.sh;
···
hardeningDisable = [ "bindnow" "relro" ];
strictDeps = true;
nativeBuildInputs = [ pkg-config ];
-
buildInputs = [ libX11 libXau libXaw libXdmcp libXext libXft libXinerama libXmu libXpm xorgproto libXrender libXt ];
+
buildInputs = [ libX11 libXau libXaw libXdmcp libXext libXft libXinerama libXmu libXpm xorgproto libXrender libXt libxcrypt ];
meta.platforms = lib.platforms.unix;
}) {};
+2
pkgs/shells/tcsh/default.nix
···
, stdenv
, fetchurl
, fetchpatch
+
, libxcrypt
, ncurses
}:
···
strictDeps = true;
buildInputs = [
+
libxcrypt
ncurses
];
+1 -1
pkgs/stdenv/linux/default.nix
···
# This is not an issue for the final stdenv, because this perl
# won't be included in the final stdenv and won't be exported to
# top-level pkgs as an override either.
-
perl = super.perl.override { enableThreading = false; };
+
perl = super.perl.override { enableThreading = false; enableCrypt = false; };
};
})
+2 -1
pkgs/tools/backup/partimage/default.nix
···
, openssl
, pkg-config
, slang
+
, libxcrypt
, autoreconfHook
}:
stdenv.mkDerivation rec {
···
configureFlags = [ "--with-ssl-headers=${openssl.dev}/include/openssl" ];
nativeBuildInputs = [ pkg-config autoreconfHook ];
-
buildInputs = [ bzip2 zlib newt newt openssl slang ];
+
buildInputs = [ bzip2 zlib newt newt openssl slang libxcrypt ];
patches = [
./gentoos-zlib.patch
+2 -1
pkgs/tools/misc/conserver/default.nix
···
, fetchFromGitHub
, fetchpatch
, autoreconfHook
+
, libxcrypt
, gssapiSupport ? false
, libkrb5
, freeipmiSupport ? false
···
nativeBuildInputs = [ autoreconfHook ];
-
buildInputs = [ ]
+
buildInputs = [ libxcrypt ]
++ lib.optionals freeipmiSupport [ freeipmi ]
++ lib.optionals gssapiSupport [ libkrb5 ]
++ lib.optionals opensslSupport [ openssl ];
+2 -2
pkgs/tools/misc/kermit/default.nix
···
-
{ lib, stdenv, fetchurl, ncurses, glibc }:
+
{ lib, stdenv, fetchurl, ncurses, libxcrypt }:
stdenv.mkDerivation {
pname = "kermit";
···
sha256 = "0487mh6s99ijqf1pfmbm302pa5i4pzmm8s439hdl1ffs5g8jqpqd";
};
-
buildInputs = [ ncurses glibc ];
+
buildInputs = [ ncurses libxcrypt ];
unpackPhase = ''
mkdir -p src
+2 -2
pkgs/tools/misc/ldapvi/default.nix
···
-
{ lib, stdenv, fetchgit, openldap, openssl, popt, glib, ncurses, readline, pkg-config, cyrus_sasl, autoconf, automake }:
+
{ lib, stdenv, fetchgit, openldap, openssl, popt, glib, libxcrypt, ncurses, readline, pkg-config, cyrus_sasl, autoconf, automake }:
stdenv.mkDerivation {
pname = "ldapvi";
···
};
nativeBuildInputs = [ pkg-config autoconf automake ];
-
buildInputs = [ openldap openssl popt glib ncurses readline cyrus_sasl ];
+
buildInputs = [ openldap openssl popt glib libxcrypt ncurses readline cyrus_sasl ];
preConfigure = ''
cd ldapvi
+2 -1
pkgs/tools/misc/screen/default.nix
···
-
{ lib, stdenv, fetchurl, autoreconfHook, ncurses, utmp, pam ? null }:
+
{ lib, stdenv, fetchurl, autoreconfHook, ncurses, libxcrypt, utmp, pam ? null }:
stdenv.mkDerivation rec {
pname = "screen";
···
];
buildInputs = [
ncurses
+
libxcrypt
] ++ lib.optional stdenv.isLinux pam
++ lib.optional stdenv.isDarwin utmp;
+7 -3
pkgs/tools/misc/toybox/default.nix
···
{
stdenv, lib, fetchFromGitHub, which,
-
buildPackages,
+
buildPackages, libxcrypt,
enableStatic ? stdenv.hostPlatform.isStatic,
enableMinimal ? false,
extraConfig ? ""
···
};
depsBuildBuild = [ buildPackages.stdenv.cc ]; # needed for cross
-
buildInputs = lib.optionals (enableStatic && stdenv.cc.libc ? static)
-
[ stdenv.cc.libc stdenv.cc.libc.static ];
+
buildInputs = [
+
libxcrypt
+
] ++lib.optionals (enableStatic && stdenv.cc.libc ? static) [
+
stdenv.cc.libc
+
stdenv.cc.libc.static
+
];
postPatch = "patchShebangs .";
+2 -1
pkgs/tools/networking/dcap/default.nix
···
, libtool
, zlib
, cunit
+
, libxcrypt
}:
stdenv.mkDerivation rec {
pname = "dcap";
···
};
nativeBuildInputs = [ autoconf automake libtool ];
-
buildInputs = [ zlib ];
+
buildInputs = [ zlib libxcrypt ];
preConfigure = ''
patchShebangs bootstrap.sh
+2 -2
pkgs/tools/networking/dropbear/default.nix
···
-
{ lib, stdenv, fetchurl, glibc, zlib
+
{ lib, stdenv, fetchurl, glibc, zlib, libxcrypt
, enableStatic ? stdenv.hostPlatform.isStatic
, enableSCP ? false
, sftpPath ? "/run/current-system/sw/libexec/sftp-server"
···
./pass-path.patch
];
-
buildInputs = [ zlib ] ++ lib.optionals enableStatic [ glibc.static zlib.static ];
+
buildInputs = [ zlib libxcrypt ] ++ lib.optionals enableStatic [ glibc.static zlib.static ];
meta = with lib; {
homepage = "https://matt.ucc.asn.au/dropbear/dropbear.html";
+2 -2
pkgs/tools/networking/haproxy/default.nix
···
, usePcre ? true
, withPrometheusExporter ? true
, stdenv, lib, fetchurl, nixosTests
-
, openssl, zlib
+
, openssl, zlib, libxcrypt
, lua5_3 ? null, pcre ? null, systemd ? null
}:
···
sha256 = "sha256-zp4Z6/zdQ+Ua+KYJDx341RLZct33QvpkimQ7uxkFZgU=";
};
-
buildInputs = [ openssl zlib ]
+
buildInputs = [ openssl zlib libxcrypt ]
++ lib.optional useLua lua5_3
++ lib.optional usePcre pcre
++ lib.optional stdenv.isLinux systemd;
+2 -1
pkgs/tools/networking/libreswan/default.nix
···
, pam
, libevent
, libcap_ng
+
, libxcrypt
, curl
, nspr
, bash
···
buildInputs = [
systemd coreutils
gnused gawk gmp unbound pam libevent
-
libcap_ng curl nspr nss ldns
+
libcap_ng libxcrypt curl nspr nss ldns
# needed to patch shebangs
python3 bash
] ++ lib.optional stdenv.isLinux libselinux;
+2 -2
pkgs/tools/networking/lsh/default.nix
···
{ lib, stdenv, fetchurl, gperf, guile, gmp, zlib, liboop, readline, gnum4, pam
-
, nettools, lsof, procps }:
+
, nettools, lsof, procps, libxcrypt }:
stdenv.mkDerivation rec {
pname = "lsh";
···
# Should be present in upcoming 2.1 release.
NIX_CFLAGS_COMPILE = "-std=gnu90 -fcommon";
-
buildInputs = [ gperf guile gmp zlib liboop readline gnum4 pam ];
+
buildInputs = [ gperf guile gmp zlib liboop readline gnum4 pam libxcrypt ];
meta = {
description = "GPL'd implementation of the SSH protocol";
+2
pkgs/tools/networking/mailutils/default.nix
···
, python3
, sasl
, system-sendmail
+
, libxcrypt
}:
stdenv.mkDerivation rec {
···
python3
readline
sasl
+
libxcrypt
] ++ lib.optionals stdenv.isLinux [ nettools ];
patches = [
+2 -2
pkgs/tools/networking/ocserv/default.nix
···
{ lib, stdenv, fetchFromGitLab, autoreconfHook, pkg-config, nettle, gnutls
, libev, protobufc, guile, geoip, libseccomp, gperf, readline
-
, lz4, libgssglue, ronn, pam
+
, lz4, libgssglue, ronn, pam, libxcrypt
}:
stdenv.mkDerivation rec {
···
};
nativeBuildInputs = [ autoreconfHook gperf pkg-config ronn ];
-
buildInputs = [ nettle gnutls libev protobufc guile geoip libseccomp readline lz4 libgssglue pam ];
+
buildInputs = [ nettle gnutls libev protobufc guile geoip libseccomp readline lz4 libgssglue pam libxcrypt ];
meta = with lib; {
homepage = "https://gitlab.com/openconnect/ocserv";
+9
pkgs/tools/networking/ppp/default.nix
···
, fetchFromGitHub
, substituteAll
, libpcap
+
, libxcrypt
, openssl
, bash
+
, nixosTests
}:
stdenv.mkDerivation rec {
···
buildInputs = [
libpcap
+
libxcrypt
openssl
bash
];
···
makeFlags = [
"CC=${stdenv.cc.targetPrefix}cc"
];
+
+
NIX_LDFLAGS = "-lcrypt";
installPhase = ''
runHook preInstall
···
postFixup = ''
substituteInPlace "$out/bin/pon" --replace "/usr/sbin" "$out/bin"
'';
+
+
passthru.tests = {
+
inherit (nixosTests) pppd;
+
};
meta = with lib; {
homepage = "https://ppp.samba.org";
+3 -1
pkgs/tools/networking/srelay/default.nix
···
-
{ lib, stdenv, fetchurl }:
+
{ lib, stdenv, fetchurl, libxcrypt }:
stdenv.mkDerivation rec {
pname = "srelay";
···
};
patches = [ ./arm.patch ];
+
+
buildInputs = [ libxcrypt ];
installPhase = "install -D srelay $out/bin/srelay";
+2
pkgs/tools/networking/xrootd/default.nix
···
, fuse
, libkrb5
, libuuid
+
, libxcrypt
, libxml2
, openssl
, readline
···
curl
libkrb5
libuuid
+
libxcrypt
libxml2
openssl
readline
+3 -1
pkgs/tools/package-management/cde/default.nix
···
-
{ lib, stdenv, fetchFromGitHub }:
+
{ lib, stdenv, fetchFromGitHub, libxcrypt }:
stdenv.mkDerivation rec {
pname = "cde";
···
# older systems, where modern binaries might not be
# useful.
preferLocalBuild = true;
+
+
buildInputs = [ libxcrypt ];
patchBuild = ''
sed -i -e '/install/d' $src/Makefile
+2
pkgs/tools/security/mokutil/default.nix
···
, openssl
, efivar
, keyutils
+
, libxcrypt
}:
stdenv.mkDerivation rec {
···
openssl
efivar
keyutils
+
libxcrypt
];
meta = with lib; {
+3 -1
pkgs/tools/security/super/default.nix
···
-
{ lib, stdenv, fetchurl, fetchpatch }:
+
{ lib, stdenv, fetchurl, fetchpatch, libxcrypt }:
stdenv.mkDerivation rec {
pname = "super";
···
"--sysconfdir=/etc"
"--localstatedir=/var"
];
+
+
buildInputs = [ libxcrypt ];
installFlags = [ "sysconfdir=$(out)/etc" "localstatedir=$(TMPDIR)" ];
+2 -1
pkgs/tools/system/monit/default.nix
···
, bison
, flex
, zlib
+
, libxcrypt
, usePAM ? stdenv.hostPlatform.isLinux
, pam
, useSSL ? true
···
};
nativeBuildInputs = [ bison flex ];
-
buildInputs = [ zlib.dev ] ++
+
buildInputs = [ zlib.dev libxcrypt ] ++
lib.optionals useSSL [ openssl ] ++
lib.optionals usePAM [ pam ];
+7 -1
pkgs/top-level/all-packages.nix
···
libx86 = callPackage ../development/libraries/libx86 {};
-
libxcrypt = callPackage ../development/libraries/libxcrypt { };
+
libxcrypt = callPackage ../development/libraries/libxcrypt {
+
fetchurl = stdenv.fetchurlBoot;
+
perl = buildPackages.perl.override {
+
enableCrypt = false;
+
fetchurl = stdenv.fetchurlBoot;
+
};
+
};
libxdg_basedir = callPackage ../development/libraries/libxdg-basedir { };