mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-09-20 12:08:17 +03:00
Merge pull request #247013 from wegank/guile-default-bump
guile: default to guile_3_0
This commit is contained in:
commit
d00dec7dd1
@ -4,22 +4,24 @@
|
|||||||
, autoreconfHook
|
, autoreconfHook
|
||||||
, guile
|
, guile
|
||||||
, pkg-config
|
, pkg-config
|
||||||
|
, texinfo
|
||||||
}:
|
}:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation {
|
||||||
pname = "guile-commonmark";
|
pname = "guile-commonmark";
|
||||||
version = "0.1.2";
|
version = "unstable-2020-04-30";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "OrangeShark";
|
owner = "OrangeShark";
|
||||||
repo = pname;
|
repo = "guile-commonmark";
|
||||||
rev = "v${version}";
|
rev = "538ffea25ca69d9f3ee17033534ba03cc27ba468";
|
||||||
hash = "sha256-qYDcIiObKOU8lmcfk327LMPx/2Px9ecI3QLrSWWLxMo=";
|
hash = "sha256-9cA7iQ/GGEx+HwsdAxKC3IssqkT/Yg8ZxaiIprS5VuI=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
autoreconfHook
|
autoreconfHook
|
||||||
pkg-config
|
pkg-config
|
||||||
|
texinfo # for makeinfo
|
||||||
];
|
];
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
guile
|
guile
|
||||||
|
@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
|
|||||||
propagatedBuildInputs = [
|
propagatedBuildInputs = [
|
||||||
libgit2 scheme-bytestructures
|
libgit2 scheme-bytestructures
|
||||||
];
|
];
|
||||||
doCheck = true;
|
doCheck = !stdenv.isDarwin;
|
||||||
makeFlags = [ "GUILE_AUTO_COMPILE=0" ];
|
makeFlags = [ "GUILE_AUTO_COMPILE=0" ];
|
||||||
|
|
||||||
enableParallelBuilding = true;
|
enableParallelBuilding = true;
|
||||||
|
@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
|
|||||||
|
|
||||||
makeFlags = [ "GUILE_AUTO_COMPILE=0" ];
|
makeFlags = [ "GUILE_AUTO_COMPILE=0" ];
|
||||||
|
|
||||||
doCheck = true;
|
doCheck = !stdenv.isDarwin;
|
||||||
|
|
||||||
preCheck = ''
|
preCheck = ''
|
||||||
# Make `libgcc_s.so' visible for `pthread_cancel'.
|
# Make `libgcc_s.so' visible for `pthread_cancel'.
|
||||||
|
@ -9,11 +9,11 @@
|
|||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "guile-ncurses";
|
pname = "guile-ncurses";
|
||||||
version = "1.7";
|
version = "3.1";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "mirror://gnu/${pname}/${pname}-${version}.tar.gz";
|
url = "mirror://gnu/${pname}/${pname}-${version}.tar.gz";
|
||||||
hash = "sha256-JZPNoQuIl5XayUpm0RdWNg8TT2LZGDOuFoae9crZe5Q=";
|
hash = "sha256-7onozq/Kud0O8/wazJsQ9NIbpLJW0ynYQtYYPmP41zM=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
@ -25,19 +25,20 @@ stdenv.mkDerivation rec {
|
|||||||
ncurses
|
ncurses
|
||||||
];
|
];
|
||||||
|
|
||||||
preConfigure = ''
|
configureFlags = [
|
||||||
configureFlags="$configureFlags --with-guilesitedir=$out/share/guile/site"
|
"--with-gnu-filesystem-hierarchy"
|
||||||
'';
|
];
|
||||||
|
|
||||||
postFixup = ''
|
postFixup =
|
||||||
for f in $out/share/guile/site/ncurses/**.scm; do \
|
let
|
||||||
substituteInPlace $f \
|
guileVersion = lib.versions.majorMinor guile.version;
|
||||||
--replace "libguile-ncurses" "$out/lib/libguile-ncurses"; \
|
in
|
||||||
done
|
''
|
||||||
'';
|
for f in $out/share/guile/site/ncurses/**.scm; do \
|
||||||
|
substituteInPlace $f \
|
||||||
# Undefined symbols for architecture arm64: "_u32_conv_from_encoding"
|
--replace "libguile-ncurses" "$out/lib/guile/${guileVersion}/libguile-ncurses"; \
|
||||||
env.NIX_LDFLAGS = "-lunistring";
|
done
|
||||||
|
'';
|
||||||
|
|
||||||
# XXX: 1 of 65 tests failed.
|
# XXX: 1 of 65 tests failed.
|
||||||
doCheck = false;
|
doCheck = false;
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
{ lib, stdenv, buildPackages, fetchurl, fetchpatch, autoreconfHook, which, pkg-config, perl, guile, libxml2 }:
|
{ lib, stdenv, buildPackages, fetchurl, fetchpatch, autoreconfHook, which, pkg-config, perl, guile_2_2, libxml2 }:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "autogen";
|
pname = "autogen";
|
||||||
@ -46,7 +46,7 @@ stdenv.mkDerivation rec {
|
|||||||
buildPackages.buildPackages.autogen buildPackages.texinfo
|
buildPackages.buildPackages.autogen buildPackages.texinfo
|
||||||
];
|
];
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
guile libxml2
|
guile_2_2 libxml2
|
||||||
];
|
];
|
||||||
|
|
||||||
preConfigure = ''
|
preConfigure = ''
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
{ stdenv, lib, fetchurl, ghostscript, gyre-fonts, texinfo, imagemagick, texi2html, guile
|
{ stdenv, lib, fetchurl, ghostscript, gyre-fonts, texinfo, imagemagick, texi2html, guile_2_2
|
||||||
, python3, gettext, flex, perl, bison, pkg-config, autoreconfHook, dblatex
|
, python3, gettext, flex, perl, bison, pkg-config, autoreconfHook, dblatex
|
||||||
, fontconfig, freetype, pango, fontforge, help2man, zip, netpbm, groff
|
, fontconfig, freetype, pango, fontforge, help2man, zip, netpbm, groff
|
||||||
, freefont_ttf, makeFontsConf
|
, freefont_ttf, makeFontsConf
|
||||||
@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
|
|||||||
nativeBuildInputs = [ autoreconfHook bison flex makeWrapper pkg-config ];
|
nativeBuildInputs = [ autoreconfHook bison flex makeWrapper pkg-config ];
|
||||||
|
|
||||||
buildInputs =
|
buildInputs =
|
||||||
[ ghostscript texinfo imagemagick texi2html guile dblatex tex zip netpbm
|
[ ghostscript texinfo imagemagick texi2html guile_2_2 dblatex tex zip netpbm
|
||||||
python3 gettext perl fontconfig freetype pango
|
python3 gettext perl fontconfig freetype pango
|
||||||
fontforge help2man groff t1utils boehmgc rsync
|
fontforge help2man groff t1utils boehmgc rsync
|
||||||
];
|
];
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
{ lib, stdenv, fetchurl, pkg-config, libX11, guile }:
|
{ lib, stdenv, fetchurl, pkg-config, libX11, guile_2_2 }:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "xbindkeys";
|
pname = "xbindkeys";
|
||||||
@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
|
|||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [ pkg-config ];
|
nativeBuildInputs = [ pkg-config ];
|
||||||
buildInputs = [ libX11 guile ];
|
buildInputs = [ libX11 guile_2_2 ];
|
||||||
|
|
||||||
meta = {
|
meta = {
|
||||||
homepage = "https://www.nongnu.org/xbindkeys/xbindkeys.html";
|
homepage = "https://www.nongnu.org/xbindkeys/xbindkeys.html";
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
{ lib, stdenv, fetchFromGitHub, fetchpatch, autoreconfHook, pkg-config, libpcap, guile, openssl }:
|
{ lib, stdenv, fetchFromGitHub, fetchpatch, autoreconfHook, pkg-config, libpcap, guile_2_2, openssl }:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "junkie";
|
pname = "junkie";
|
||||||
@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
|
|||||||
sed -i '10i#undef IP_DONTFRAG' include/junkie/proto/ip.h
|
sed -i '10i#undef IP_DONTFRAG' include/junkie/proto/ip.h
|
||||||
'';
|
'';
|
||||||
|
|
||||||
buildInputs = [ libpcap guile openssl ];
|
buildInputs = [ libpcap guile_2_2 openssl ];
|
||||||
nativeBuildInputs = [ autoreconfHook pkg-config ];
|
nativeBuildInputs = [ autoreconfHook pkg-config ];
|
||||||
configureFlags = [
|
configureFlags = [
|
||||||
"GUILELIBDIR=\${out}/share/guile/site"
|
"GUILELIBDIR=\${out}/share/guile/site"
|
||||||
|
@ -12,7 +12,7 @@
|
|||||||
, gdbm
|
, gdbm
|
||||||
, gnutls
|
, gnutls
|
||||||
, gss
|
, gss
|
||||||
, guile
|
, guile_2_2
|
||||||
, libmysqlclient
|
, libmysqlclient
|
||||||
, mailcap
|
, mailcap
|
||||||
, nettools
|
, nettools
|
||||||
@ -69,7 +69,7 @@ stdenv.mkDerivation rec {
|
|||||||
libxcrypt
|
libxcrypt
|
||||||
] ++ lib.optionals stdenv.isLinux [ nettools ]
|
] ++ lib.optionals stdenv.isLinux [ nettools ]
|
||||||
++ lib.optionals pythonSupport [ python3 ]
|
++ lib.optionals pythonSupport [ python3 ]
|
||||||
++ lib.optionals guileSupport [ guile ];
|
++ lib.optionals guileSupport [ guile_2_2 ];
|
||||||
|
|
||||||
patches = [
|
patches = [
|
||||||
./fix-build-mb-len-max.patch
|
./fix-build-mb-len-max.patch
|
||||||
|
@ -10,9 +10,9 @@
|
|||||||
, imagemagick
|
, imagemagick
|
||||||
, makeWrapper
|
, makeWrapper
|
||||||
, pkg-config
|
, pkg-config
|
||||||
, ploticus
|
|
||||||
, enableEmacs ? false, emacs
|
, enableEmacs ? false, emacs
|
||||||
, enableLout ? true, lout
|
, enableLout ? stdenv.isLinux, lout
|
||||||
|
, enablePloticus ? stdenv.isLinux, ploticus
|
||||||
, enableTex ? true, tex
|
, enableTex ? true, tex
|
||||||
}:
|
}:
|
||||||
|
|
||||||
@ -40,10 +40,10 @@ in stdenv.mkDerivation (finalAttrs: {
|
|||||||
guile-lib
|
guile-lib
|
||||||
guile-reader
|
guile-reader
|
||||||
imagemagick
|
imagemagick
|
||||||
ploticus
|
|
||||||
]
|
]
|
||||||
++ optional enableEmacs emacs
|
++ optional enableEmacs emacs
|
||||||
++ optional enableLout lout
|
++ optional enableLout lout
|
||||||
|
++ optional enablePloticus ploticus
|
||||||
++ optional enableTex tex;
|
++ optional enableTex tex;
|
||||||
|
|
||||||
postInstall =
|
postInstall =
|
||||||
|
@ -18034,7 +18034,7 @@ with pkgs;
|
|||||||
|
|
||||||
guile_3_0 = callPackage ../development/interpreters/guile/3.0.nix { };
|
guile_3_0 = callPackage ../development/interpreters/guile/3.0.nix { };
|
||||||
|
|
||||||
guile = guile_2_2;
|
guile = guile_3_0;
|
||||||
|
|
||||||
guile-cairo = callPackage ../development/guile-modules/guile-cairo { };
|
guile-cairo = callPackage ../development/guile-modules/guile-cairo { };
|
||||||
|
|
||||||
@ -18060,7 +18060,9 @@ with pkgs;
|
|||||||
|
|
||||||
guile-reader = callPackage ../development/guile-modules/guile-reader { };
|
guile-reader = callPackage ../development/guile-modules/guile-reader { };
|
||||||
|
|
||||||
guile-sdl = callPackage ../development/guile-modules/guile-sdl { };
|
guile-sdl = callPackage ../development/guile-modules/guile-sdl {
|
||||||
|
guile = guile_2_2;
|
||||||
|
};
|
||||||
|
|
||||||
guile-sdl2 = callPackage ../development/guile-modules/guile-sdl2 { };
|
guile-sdl2 = callPackage ../development/guile-modules/guile-sdl2 { };
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user