public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #124180 from Atemu/backport/minimalIso-remove-ruby2.7

Browse Source 
[21.05] minimalIso: remove ruby2.7
This commit is contained in:
Arnout Engelen 2021-05-24 22:29:22 +02:00 committed by GitHub
commit 0ef2fe6f77
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/applications/version-management/git-and-tools/git/default.nix
View File

@ -2,7 +2,7 @@
, curl, openssl, zlib, expat, perlPackages, python3, gettext, cpio , curl, openssl, zlib, expat, perlPackages, python3, gettext, cpio
, gnugrep, gnused, gawk, coreutils # needed at runtime by git-filter-branch etc , gnugrep, gnused, gawk, coreutils # needed at runtime by git-filter-branch etc
, openssh, pcre2 , openssh, pcre2
, asciidoctor, texinfo, xmlto, docbook2x, docbook_xsl, docbook_xsl_ns, docbook_xml_dtd_45 , asciidoc, texinfo, xmlto, docbook2x, docbook_xsl, docbook_xml_dtd_45
, libxslt, tcl, tk, makeWrapper, libiconv , libxslt, tcl, tk, makeWrapper, libiconv
, svnSupport, subversionClient, perlLibs, smtpPerlLibs , svnSupport, subversionClient, perlLibs, smtpPerlLibs
, perlSupport ? stdenv.buildPlatform == stdenv.hostPlatform , perlSupport ? stdenv.buildPlatform == stdenv.hostPlatform
@ -68,8 +68,8 @@ stdenv.mkDerivation {
''; '';
nativeBuildInputs = [ gettext perlPackages.perl makeWrapper ] nativeBuildInputs = [ gettext perlPackages.perl makeWrapper ]
++ lib.optionals withManual [ asciidoctor texinfo xmlto docbook2x ++ lib.optionals withManual [ asciidoc texinfo xmlto docbook2x
docbook_xsl docbook_xsl_ns docbook_xml_dtd_45 libxslt ]; docbook_xsl docbook_xml_dtd_45 libxslt ];
buildInputs = [curl openssl zlib expat cpio libiconv] buildInputs = [curl openssl zlib expat cpio libiconv]
++ lib.optionals perlSupport [ perlPackages.perl ] ++ lib.optionals perlSupport [ perlPackages.perl ]
++ lib.optionals guiSupport [tcl tk] ++ lib.optionals guiSupport [tcl tk]
@ -148,7 +148,7 @@ stdenv.mkDerivation {
} }
# Install git-subtree. # Install git-subtree.
make -C contrib/subtree install ${lib.optionalString withManual "USE_ASCIIDOCTOR=1 install-doc"} make -C contrib/subtree install ${lib.optionalString withManual "install-doc"}
rm -rf contrib/subtree rm -rf contrib/subtree
# Install contrib stuff. # Install contrib stuff.
@ -233,7 +233,7 @@ stdenv.mkDerivation {
'') '')
+ lib.optionalString withManual ''# Install man pages + lib.optionalString withManual ''# Install man pages
make -j $NIX_BUILD_CORES -l $NIX_BUILD_CORES USE_ASCIIDOCTOR=1 PERL_PATH="${buildPackages.perl}/bin/perl" cmd-list.made install install-html \ make -j $NIX_BUILD_CORES -l $NIX_BUILD_CORES PERL_PATH="${buildPackages.perl}/bin/perl" cmd-list.made install install-html \
-C Documentation '' -C Documentation ''
+ (if guiSupport then '' + (if guiSupport then ''

5
pkgs/development/libraries/libndctl/default.nix
View File

@ -1,5 +1,5 @@
{ lib, stdenv, fetchFromGitHub, autoreconfHook { lib, stdenv, fetchFromGitHub, autoreconfHook
, asciidoctor, pkg-config, xmlto, docbook_xsl, docbook_xml_dtd_45, libxslt , asciidoc, pkg-config, xmlto, docbook_xsl, docbook_xml_dtd_45, libxslt
, json_c, kmod, which, util-linux, udev, keyutils , json_c, kmod, which, util-linux, udev, keyutils
}: }:
@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
outputs = [ "out" "lib" "man" "dev" ]; outputs = [ "out" "lib" "man" "dev" ];
nativeBuildInputs = nativeBuildInputs =
[ autoreconfHook asciidoctor pkg-config xmlto docbook_xml_dtd_45 docbook_xsl libxslt [ autoreconfHook asciidoc pkg-config xmlto docbook_xml_dtd_45 docbook_xsl libxslt
which which
]; ];
@ -28,6 +28,7 @@ stdenv.mkDerivation rec {
configureFlags = configureFlags =
[ "--without-bash" [ "--without-bash"
"--without-systemd" "--without-systemd"
"--disable-asciidoctor" # depends on ruby 2.7, use asciidoc instead
]; ];
patchPhase = '' patchPhase = ''