various: move to pkgs/by-name (#479415)
This commit is contained in:
Gergő Gutyina
@@ -7,7 +7,7 @@
|
||||
alsa-lib ? null,
|
||||
carla ? null,
|
||||
fftwFloat,
|
||||
fltk13,
|
||||
fltk_1_3,
|
||||
fluidsynth ? null,
|
||||
lame ? null,
|
||||
libgig ? null,
|
||||
@@ -47,7 +47,7 @@ mkDerivation rec {
|
||||
carla
|
||||
alsa-lib
|
||||
fftwFloat
|
||||
fltk13
|
||||
fltk_1_3
|
||||
fluidsynth
|
||||
lame
|
||||
libgig
|
||||
|
||||
@@ -154,7 +154,7 @@ in
|
||||
|
||||
nativeBuildInputs = old.nativeBuildInputs or [ ] ++ [ pkgs.pkg-config ];
|
||||
|
||||
buildInputs = old.buildInputs or [ ] ++ [ pkgs.enchant2 ];
|
||||
buildInputs = old.buildInputs or [ ] ++ [ pkgs.enchant_2 ];
|
||||
|
||||
postBuild =
|
||||
old.postBuild or ""
|
||||
|
||||
@@ -353,7 +353,7 @@ let
|
||||
pkgs.pkg-config
|
||||
];
|
||||
|
||||
buildInputs = (old.buildInputs or [ ]) ++ [ pkgs.enchant2 ];
|
||||
buildInputs = (old.buildInputs or [ ]) ++ [ pkgs.enchant_2 ];
|
||||
|
||||
postBuild = ''
|
||||
NIX_CFLAGS_COMPILE="$($PKG_CONFIG --cflags enchant-2) $NIX_CFLAGS_COMPILE"
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
cacert,
|
||||
cairo,
|
||||
dconf,
|
||||
enchant2,
|
||||
enchant,
|
||||
file,
|
||||
fontconfig,
|
||||
freetype,
|
||||
@@ -153,7 +153,7 @@ stdenv.mkDerivation rec {
|
||||
atk
|
||||
cairo
|
||||
dconf
|
||||
enchant2
|
||||
enchant
|
||||
fontconfig
|
||||
freetype
|
||||
fuse3'
|
||||
|
||||
@@ -66,7 +66,7 @@
|
||||
nspr,
|
||||
libwpg,
|
||||
dbus-glib,
|
||||
clucene_core_2,
|
||||
clucene-core_2,
|
||||
libcdr,
|
||||
lcms2,
|
||||
unixODBC,
|
||||
@@ -408,7 +408,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
bluez5
|
||||
box2d_2
|
||||
cairo
|
||||
clucene_core_2
|
||||
clucene-core_2
|
||||
cppunit
|
||||
cups
|
||||
curl
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
stdenv,
|
||||
fetchurl,
|
||||
hamlib,
|
||||
fltk13,
|
||||
fltk_1_3,
|
||||
libjpeg,
|
||||
libpng,
|
||||
portaudio,
|
||||
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
|
||||
libXinerama
|
||||
gettext
|
||||
hamlib
|
||||
fltk13
|
||||
fltk_1_3
|
||||
libjpeg
|
||||
libpng
|
||||
portaudio
|
||||
|
||||
@@ -200,7 +200,7 @@ rec {
|
||||
libogg
|
||||
libvorbis
|
||||
SDL2_image
|
||||
glew110
|
||||
glew_1_10
|
||||
openssl
|
||||
libidn
|
||||
onetbb
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
fetchFromGitHub,
|
||||
fetchpatch,
|
||||
dbus,
|
||||
fltk13,
|
||||
fltk_1_3,
|
||||
gtk2,
|
||||
libICE,
|
||||
libSM,
|
||||
@@ -58,7 +58,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
buildInputs = [
|
||||
dbus
|
||||
fltk13
|
||||
fltk_1_3
|
||||
gtk2
|
||||
libICE
|
||||
libSM
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
gccStdenv,
|
||||
fetchurl,
|
||||
autoconf,
|
||||
automake,
|
||||
@@ -10,7 +10,9 @@
|
||||
SDL,
|
||||
libX11,
|
||||
}:
|
||||
|
||||
let
|
||||
stdenv = gccStdenv;
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "agg";
|
||||
version = "2.5";
|
||||
@@ -3,7 +3,7 @@
|
||||
stdenv,
|
||||
fetchurl,
|
||||
alsa-lib,
|
||||
fltk13,
|
||||
fltk_1_3,
|
||||
gtk2,
|
||||
gtk3,
|
||||
makeWrapper,
|
||||
@@ -27,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
buildInputs = [
|
||||
alsa-lib
|
||||
fltk13
|
||||
fltk_1_3
|
||||
gtk2
|
||||
gtk3
|
||||
psmisc
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{
|
||||
lib,
|
||||
boost,
|
||||
clucene_core_2,
|
||||
clucene-core_2,
|
||||
cmake,
|
||||
docbook_xml_dtd_45,
|
||||
docbook_xsl_ns,
|
||||
@@ -46,7 +46,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
buildInputs = [
|
||||
boost
|
||||
clucene_core_2
|
||||
clucene-core_2
|
||||
qtbase
|
||||
qtsvg
|
||||
qttools
|
||||
@@ -54,7 +54,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
];
|
||||
|
||||
preConfigure = ''
|
||||
export CLUCENE_HOME=${clucene_core_2};
|
||||
export CLUCENE_HOME=${clucene-core_2};
|
||||
export SWORD_HOME=${sword};
|
||||
'';
|
||||
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
fetchFromGitHub,
|
||||
makeDesktopItem,
|
||||
imagemagick,
|
||||
glew110,
|
||||
glew_1_10,
|
||||
SDL_compat,
|
||||
nix-update-script,
|
||||
}:
|
||||
@@ -23,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
nativeBuildInputs = [ imagemagick ];
|
||||
|
||||
buildInputs = [
|
||||
glew110
|
||||
glew_1_10
|
||||
SDL_compat
|
||||
];
|
||||
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
stdenv,
|
||||
fetchurl,
|
||||
pkg-config,
|
||||
fltk13,
|
||||
fltk_1_3,
|
||||
portaudio,
|
||||
lame,
|
||||
libvorbis,
|
||||
@@ -43,7 +43,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
fltk13
|
||||
fltk_1_3
|
||||
portaudio
|
||||
lame
|
||||
libvorbis
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
clangStdenv,
|
||||
fetchFromGitHub,
|
||||
|
||||
cmake,
|
||||
@@ -9,9 +9,11 @@
|
||||
opencv,
|
||||
onetbb,
|
||||
|
||||
avx2Support ? stdenv.hostPlatform.avx2Support,
|
||||
avx2Support ? clangStdenv.hostPlatform.avx2Support,
|
||||
}:
|
||||
|
||||
let
|
||||
stdenv = clangStdenv;
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "cctag";
|
||||
version = "1.0.4";
|
||||
@@ -17,7 +17,7 @@
|
||||
pam,
|
||||
libcap,
|
||||
coreutils,
|
||||
clucene_core_2,
|
||||
clucene-core_2,
|
||||
icu75,
|
||||
libexttextcat,
|
||||
libsodium,
|
||||
@@ -63,7 +63,7 @@ stdenv.mkDerivation rec {
|
||||
zlib
|
||||
zstd
|
||||
xz
|
||||
clucene_core_2
|
||||
clucene-core_2
|
||||
icu75
|
||||
libexttextcat
|
||||
libsodium
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
{
|
||||
lib,
|
||||
callPackage,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
nix-update-script,
|
||||
@@ -10,11 +11,11 @@
|
||||
withTranscoder ? true,
|
||||
eigen,
|
||||
ghc_filesystem,
|
||||
tinygltf,
|
||||
}:
|
||||
|
||||
let
|
||||
cmakeBool = b: if b then "ON" else "OFF";
|
||||
tinygltf = callPackage ./tinygltf.nix { };
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
version = "1.5.7";
|
||||
+6
-7
@@ -1,7 +1,7 @@
|
||||
{
|
||||
fetchurl,
|
||||
lib,
|
||||
stdenv,
|
||||
gccStdenv,
|
||||
fetchurl,
|
||||
cmake,
|
||||
netcdf,
|
||||
openjpeg,
|
||||
@@ -11,12 +11,11 @@
|
||||
perl,
|
||||
ctestCheckHook,
|
||||
enablePython ? false,
|
||||
pythonPackages,
|
||||
python3Packages ? null,
|
||||
enablePosixThreads ? false,
|
||||
enableOpenMPThreads ? false,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
gccStdenv.mkDerivation rec {
|
||||
pname = "eccodes";
|
||||
version = "2.44.0";
|
||||
|
||||
@@ -54,8 +53,8 @@ stdenv.mkDerivation rec {
|
||||
];
|
||||
|
||||
propagatedBuildInputs = lib.optionals enablePython [
|
||||
pythonPackages.python
|
||||
pythonPackages.numpy
|
||||
python3Packages.python
|
||||
python3Packages.numpy
|
||||
];
|
||||
|
||||
cmakeFlags = [
|
||||
+4
-8
@@ -3,16 +3,12 @@
|
||||
stdenv,
|
||||
fetchurl,
|
||||
fetchpatch,
|
||||
buildPackages,
|
||||
libnice,
|
||||
pkg-config,
|
||||
autoreconfHook,
|
||||
gstreamer,
|
||||
gst-plugins-base,
|
||||
gst_all_1,
|
||||
gupnp-igd,
|
||||
gobject-introspection,
|
||||
gst-plugins-good,
|
||||
gst-plugins-bad,
|
||||
gst-libav,
|
||||
python3,
|
||||
}:
|
||||
|
||||
@@ -46,12 +42,12 @@ stdenv.mkDerivation rec {
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
autoreconfHook
|
||||
buildPackages.autoreconfHook269
|
||||
gobject-introspection
|
||||
python3
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
propagatedBuildInputs = with gst_all_1; [
|
||||
gstreamer
|
||||
gst-plugins-base
|
||||
gst-plugins-good
|
||||
@@ -4,7 +4,7 @@
|
||||
fetchgit,
|
||||
autoreconfHook,
|
||||
pkg-config,
|
||||
fltk13,
|
||||
fltk_1_3,
|
||||
gettext,
|
||||
}:
|
||||
|
||||
@@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
fltk13
|
||||
fltk_1_3
|
||||
];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
@@ -25,7 +25,7 @@
|
||||
cmake,
|
||||
libpng,
|
||||
udev,
|
||||
fltk13,
|
||||
fltk_1_3,
|
||||
apr,
|
||||
qt5,
|
||||
glew,
|
||||
@@ -93,7 +93,7 @@ stdenv.mkDerivation rec {
|
||||
boost
|
||||
libpng
|
||||
udev
|
||||
fltk13
|
||||
fltk_1_3
|
||||
apr
|
||||
qt5.qtbase
|
||||
qt5.qtquickcontrols2
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
lib,
|
||||
stdenv,
|
||||
fetchurl,
|
||||
fltk13,
|
||||
fltk_1_3,
|
||||
libjpeg,
|
||||
pkg-config,
|
||||
}:
|
||||
@@ -17,12 +17,12 @@ stdenv.mkDerivation rec {
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
fltk13
|
||||
fltk_1_3
|
||||
libjpeg
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
fltk13 # fltk-config
|
||||
fltk_1_3 # fltk-config
|
||||
pkg-config
|
||||
];
|
||||
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
lib,
|
||||
stdenv,
|
||||
fetchurl,
|
||||
fltk13,
|
||||
fltk_1_3,
|
||||
libjpeg,
|
||||
pkg-config,
|
||||
}:
|
||||
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
fltk13
|
||||
fltk_1_3
|
||||
libjpeg
|
||||
];
|
||||
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
lib,
|
||||
stdenv,
|
||||
fetchurl,
|
||||
fltk13,
|
||||
fltk_1_3,
|
||||
ghostscript,
|
||||
}:
|
||||
|
||||
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "0vngqxanykicabhfdznisv82k5ypkxwg0s93ms9ribvhpm8vf2xp";
|
||||
};
|
||||
|
||||
buildInputs = [ fltk13 ];
|
||||
buildInputs = [ fltk_1_3 ];
|
||||
|
||||
postPatch = ''
|
||||
# replace the execvp call to ghostscript
|
||||
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
|
||||
configureFlags = [
|
||||
"ac_cv_func_malloc_0_nonnull=yes"
|
||||
"ac_cv_func_realloc_0_nonnull=yes"
|
||||
"FLTKCONFIG=${lib.getExe' (lib.getDev fltk13) "fltk-config"}"
|
||||
"FLTKCONFIG=${lib.getExe' (lib.getDev fltk_1_3) "fltk-config"}"
|
||||
];
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
lib,
|
||||
stdenv,
|
||||
fetchurl,
|
||||
fltk13,
|
||||
fltk_1_3,
|
||||
libjpeg,
|
||||
eudev,
|
||||
pkg-config,
|
||||
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
fltk13
|
||||
fltk_1_3
|
||||
libjpeg
|
||||
eudev
|
||||
];
|
||||
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
|
||||
pkg-config
|
||||
];
|
||||
|
||||
env.FLTK_CONFIG = lib.getExe' (lib.getDev fltk13) "fltk-config";
|
||||
env.FLTK_CONFIG = lib.getExe' (lib.getDev fltk_1_3) "fltk-config";
|
||||
|
||||
meta = {
|
||||
description = "Digital modem rig control program";
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
lib,
|
||||
stdenv,
|
||||
fetchurl,
|
||||
fltk13,
|
||||
fltk_1_3,
|
||||
libjpeg,
|
||||
pkg-config,
|
||||
}:
|
||||
@@ -21,12 +21,12 @@ stdenv.mkDerivation rec {
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
fltk13
|
||||
fltk_1_3
|
||||
libjpeg
|
||||
];
|
||||
|
||||
configureFlags = [
|
||||
"FLTK_CONFIG=${lib.getExe' (lib.getDev fltk13) "fltk-config"}"
|
||||
"FLTK_CONFIG=${lib.getExe' (lib.getDev fltk_1_3) "fltk-config"}"
|
||||
];
|
||||
|
||||
meta = {
|
||||
|
||||
+4
-2
@@ -5,10 +5,12 @@
|
||||
cmake,
|
||||
ninja,
|
||||
go,
|
||||
protobuf,
|
||||
protobuf_21,
|
||||
openssl,
|
||||
}:
|
||||
|
||||
let
|
||||
protobuf = protobuf_21;
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "GameNetworkingSockets";
|
||||
version = "1.4.1";
|
||||
@@ -6,7 +6,7 @@
|
||||
cmake,
|
||||
enableVTK ? true,
|
||||
vtk,
|
||||
DarwinTools, # sw_vers
|
||||
darwin, # sw_vers
|
||||
enablePython ? false,
|
||||
python ? null,
|
||||
swig,
|
||||
@@ -61,7 +61,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
cmake
|
||||
pkg-config
|
||||
]
|
||||
++ lib.optional stdenv.hostPlatform.isDarwin DarwinTools;
|
||||
++ lib.optional stdenv.hostPlatform.isDarwin darwin.DarwinTools;
|
||||
|
||||
buildInputs = [
|
||||
expat
|
||||
@@ -5,7 +5,7 @@
|
||||
pkg-config,
|
||||
gtk3,
|
||||
vala,
|
||||
enchant2,
|
||||
enchant,
|
||||
wrapGAppsHook3,
|
||||
meson,
|
||||
ninja,
|
||||
@@ -70,7 +70,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
buildInputs = [
|
||||
adwaita-icon-theme
|
||||
enchant2
|
||||
enchant
|
||||
folks
|
||||
gcr
|
||||
glib-networking
|
||||
|
||||
@@ -29,7 +29,7 @@
|
||||
gexiv2,
|
||||
libwebp,
|
||||
luajit,
|
||||
openexr,
|
||||
openexr_2,
|
||||
suitesparse,
|
||||
withLuaJIT ? lib.meta.availableOn stdenv.hostPlatform luajit,
|
||||
gimp,
|
||||
@@ -77,7 +77,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
libraw
|
||||
libwebp
|
||||
gexiv2
|
||||
openexr
|
||||
openexr_2
|
||||
suitesparse
|
||||
]
|
||||
++ lib.optionals stdenv.cc.isClang [
|
||||
@@ -1,6 +1,7 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
buildPackages,
|
||||
fetchurl,
|
||||
zlib,
|
||||
libtasn1,
|
||||
@@ -8,7 +9,6 @@
|
||||
pkg-config,
|
||||
perl,
|
||||
gmp,
|
||||
autoconf,
|
||||
automake,
|
||||
libidn2,
|
||||
libiconv,
|
||||
@@ -16,7 +16,7 @@
|
||||
unbound,
|
||||
dns-root-data,
|
||||
gettext,
|
||||
util-linux,
|
||||
util-linuxMinimal,
|
||||
cxxBindings ? !stdenv.hostPlatform.isStatic, # tries to link libstdc++.so
|
||||
tpmSupport ? false,
|
||||
trousers,
|
||||
@@ -55,6 +55,9 @@ let
|
||||
&& stdenv.buildPlatform == stdenv.hostPlatform;
|
||||
|
||||
inherit (stdenv.hostPlatform) isDarwin;
|
||||
|
||||
# break the cyclic dependency
|
||||
util-linux = util-linuxMinimal;
|
||||
in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
@@ -161,7 +164,7 @@ stdenv.mkDerivation rec {
|
||||
texinfo
|
||||
]
|
||||
++ [
|
||||
autoconf
|
||||
buildPackages.autoconf269
|
||||
automake
|
||||
]
|
||||
++ lib.optionals doCheck [
|
||||
@@ -13,7 +13,7 @@
|
||||
mesonEmulatorHook,
|
||||
gtk3,
|
||||
icu,
|
||||
enchant2,
|
||||
enchant,
|
||||
gnome,
|
||||
}:
|
||||
|
||||
@@ -55,7 +55,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
propagatedBuildInputs = [
|
||||
# required for pkg-config
|
||||
enchant2
|
||||
enchant
|
||||
];
|
||||
|
||||
passthru = {
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{
|
||||
dbus-glib,
|
||||
desktop-file-utils,
|
||||
enchant2,
|
||||
enchant_2,
|
||||
fetchFromGitHub,
|
||||
gtk2,
|
||||
isocodes,
|
||||
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
#hexchat and hexchat-text loads enchant spell checking library at run time and so it needs to have route to the path
|
||||
postPatch = ''
|
||||
sed -i "s,libenchant-2.so.2,${enchant2}/lib/libenchant-2.so.2,g" src/fe-gtk/sexy-spell-entry.c
|
||||
sed -i "s,libenchant-2.so.2,${enchant_2}/lib/libenchant-2.so.2,g" src/fe-gtk/sexy-spell-entry.c
|
||||
sed -i "/flag.startswith('-I')/i if flag.contains('no-such-path')\ncontinue\nendif" plugins/perl/meson.build
|
||||
chmod +x meson_post_install.py
|
||||
for f in meson_post_install.py \
|
||||
|
||||
+2
-2
@@ -10,7 +10,7 @@
|
||||
pulseaudioSupport ? config.pulseaudio or stdenv.hostPlatform.isLinux,
|
||||
libpulseaudio,
|
||||
jackSupport ? true,
|
||||
jack,
|
||||
libjack2,
|
||||
coreaudioSupport ? stdenv.hostPlatform.isDarwin,
|
||||
}:
|
||||
|
||||
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
|
||||
buildInputs =
|
||||
lib.optional alsaSupport alsa-lib
|
||||
++ lib.optional pulseaudioSupport libpulseaudio
|
||||
++ lib.optional jackSupport jack;
|
||||
++ lib.optional jackSupport libjack2;
|
||||
|
||||
cmakeFlags = [
|
||||
"-DRTAUDIO_API_ALSA=${if alsaSupport then "ON" else "OFF"}"
|
||||
+2
-2
@@ -8,7 +8,7 @@
|
||||
alsaSupport ? stdenv.hostPlatform.isLinux,
|
||||
alsa-lib,
|
||||
jackSupport ? true,
|
||||
jack,
|
||||
libjack2,
|
||||
coremidiSupport ? stdenv.hostPlatform.isDarwin,
|
||||
}:
|
||||
|
||||
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
|
||||
pkg-config
|
||||
];
|
||||
|
||||
buildInputs = lib.optional alsaSupport alsa-lib ++ lib.optional jackSupport jack;
|
||||
buildInputs = lib.optional alsaSupport alsa-lib ++ lib.optional jackSupport libjack2;
|
||||
|
||||
cmakeFlags = [
|
||||
"-DRTMIDI_API_ALSA=${if alsaSupport then "ON" else "OFF"}"
|
||||
@@ -4,7 +4,7 @@
|
||||
fetchurl,
|
||||
pkg-config,
|
||||
icu,
|
||||
clucene_core,
|
||||
clucene-core,
|
||||
|
||||
autoreconfHook,
|
||||
bzip2,
|
||||
@@ -38,7 +38,7 @@ stdenv.mkDerivation (
|
||||
icu
|
||||
]
|
||||
++ (lib.optionals stdenv.hostPlatform.isUnix [
|
||||
clucene_core
|
||||
clucene-core
|
||||
curl
|
||||
])
|
||||
++ (lib.optionals stdenv.hostPlatform.isWindows [
|
||||
|
||||
@@ -760,7 +760,7 @@ builtins.intersectAttrs super {
|
||||
fltkhs = overrideCabal (drv: {
|
||||
libraryToolDepends = (drv.libraryToolDepends or [ ]) ++ [ pkgs.buildPackages.autoconf ];
|
||||
librarySystemDepends = (drv.librarySystemDepends or [ ]) ++ [
|
||||
pkgs.fltk13
|
||||
pkgs.fltk_1_3
|
||||
pkgs.libGL
|
||||
pkgs.libjpeg
|
||||
];
|
||||
|
||||
+3
-3
@@ -239746,7 +239746,7 @@ self: {
|
||||
Cabal,
|
||||
directory,
|
||||
filepath,
|
||||
fltk14,
|
||||
fltk_1_4,
|
||||
libGL,
|
||||
libGLU,
|
||||
mtl,
|
||||
@@ -239775,7 +239775,7 @@ self: {
|
||||
text
|
||||
vector
|
||||
];
|
||||
librarySystemDepends = [ fltk14 ];
|
||||
librarySystemDepends = [ fltk_1_4 ];
|
||||
libraryPkgconfigDepends = [
|
||||
libGL
|
||||
libGLU
|
||||
@@ -239800,7 +239800,7 @@ self: {
|
||||
}
|
||||
)
|
||||
{
|
||||
inherit (pkgs) fltk14;
|
||||
inherit (pkgs) fltk_1_4;
|
||||
inherit (pkgs) libGL;
|
||||
inherit (pkgs) libGLU;
|
||||
inherit (pkgs) pkg-config;
|
||||
|
||||
@@ -1,5 +0,0 @@
|
||||
{ callPackage }:
|
||||
{
|
||||
c-blosc = callPackage ./1.nix { };
|
||||
c-blosc2 = callPackage ./2.nix { };
|
||||
}
|
||||
@@ -21,7 +21,7 @@
|
||||
wayland-protocols,
|
||||
wayland-scanner,
|
||||
libwebp,
|
||||
enchant2,
|
||||
enchant,
|
||||
xorg,
|
||||
libxkbcommon,
|
||||
libavif,
|
||||
@@ -141,7 +141,7 @@ clangStdenv.mkDerivation (finalAttrs: {
|
||||
buildInputs = [
|
||||
at-spi2-core
|
||||
cairo # required even when using skia
|
||||
enchant2
|
||||
enchant
|
||||
flite
|
||||
libavif
|
||||
libepoxy
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
buildPythonPackage,
|
||||
isPy27,
|
||||
fetchPypi,
|
||||
enchant2,
|
||||
enchant_2,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
@@ -18,7 +18,7 @@ buildPythonPackage rec {
|
||||
sha256 = "sha256-glKIJGtd68lDb5GWdlCXTvDVY2RYUCYZ4yLEdvEoOJE=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ enchant2 ];
|
||||
propagatedBuildInputs = [ enchant_2 ];
|
||||
|
||||
postPatch =
|
||||
let
|
||||
@@ -33,7 +33,7 @@ buildPythonPackage rec {
|
||||
# it "accidentally" work by pulling something from /opt.
|
||||
substituteInPlace enchant/_enchant.py \
|
||||
--replace 'os.environ.get("PYENCHANT_LIBRARY_PATH")' \
|
||||
"'${enchant2}/lib/libenchant-2${libext}'" \
|
||||
"'${enchant_2}/lib/libenchant-2${libext}'" \
|
||||
--replace '/opt/local/lib/' ""
|
||||
'';
|
||||
|
||||
|
||||
@@ -466,6 +466,8 @@ mapAliases {
|
||||
clima = throw "'clima' has been removed, as it has been unmaintained upstream since December 2024, use glow instead"; # Added 2026-01-01
|
||||
clipbuzz = throw "clipbuzz has been removed, as it does not build with supported Zig versions"; # Added 2025-08-09
|
||||
cloudlogoffline = throw "cloudlogoffline has been removed"; # Added 2025-05-18
|
||||
clucene_core = warnAlias "'clucene_core' has been renamed to 'clucene-core'" clucene-core; # Added 2026-01-12
|
||||
clucene_core_2 = warnAlias "'clucene_core_2' has been renamed to 'clucene-core_2'" clucene-core_2; # Added 2026-01-12
|
||||
cockroachdb-bin = throw "'cockroachdb-bin' has been renamed to/replaced by 'cockroachdb'"; # Converted to throw 2025-10-27
|
||||
code-browser-gtk2 = throw "'code-browser-gtk2' has been removed, as it was broken since 22.11"; # Added 2025-08-22
|
||||
code-browser-gtk = throw "'code-browser-gtk' has been removed, as it was broken since 22.11"; # Added 2025-08-22
|
||||
@@ -585,6 +587,7 @@ mapAliases {
|
||||
EmptyEpsilon = throw "'EmptyEpsilon' has been renamed to/replaced by 'empty-epsilon'"; # Converted to throw 2025-10-27
|
||||
emulationstation = throw "emulationstation was removed due to numerous vulnerabilities in freeimage"; # Added 2025-10-23
|
||||
emulationstation-de = throw "emulationstation-de was removed due to numerous vulnerabilities in freeimage"; # Added 2025-10-23
|
||||
enchant2 = warnAlias "'enchant2' has been renamed to 'enchant_2'" enchant_2; # Added 2026-01-14
|
||||
enyo-doom = throw "'enyo-doom' has been renamed to/replaced by 'enyo-launcher'"; # Converted to throw 2025-10-27
|
||||
epapirus-icon-theme = throw "'epapirus-icon-theme' has been removed because 'papirus-icon-theme' no longer supports building with elementaryOS icon support"; # Added 2025-06-15
|
||||
eris-go = throw "'eris-go' has been removed due to a hostile upstream moving tags and breaking src FODs"; # Added 2025-09-01
|
||||
@@ -627,6 +630,10 @@ mapAliases {
|
||||
floorp = throw "floorp has been replaced with floorp-bin, as building from upstream sources has become unfeasible starting with version 12.x"; # Added 2025-09-06
|
||||
floorp-unwrapped = throw "floorp-unwrapped has been replaced with floorp-bin-unwrapped, as building from upstream sources has become unfeasible starting with version 12.x"; # Added 2025-09-06
|
||||
flow-editor = throw "'flow-editor' has been renamed to/replaced by 'flow-control'"; # Converted to throw 2025-10-27
|
||||
fltk13 = warnAlias "'fltk13' has been renamed to 'fltk_1_3'" fltk_1_3; # Added 2026-01-14
|
||||
fltk13-minimal = warnAlias "'fltk13-minimal' has been renamed to 'fltk_1_3-minimal'" fltk_1_3-minimal; # Added 2026-01-14
|
||||
fltk14 = warnAlias "'fltk14' has been renamed to 'fltk_1_4'" fltk_1_4; # Added 2026-01-14
|
||||
fltk14-minimal = warnAlias "'fltk14-minimal' has been renamed to 'fltk_1_4-minimal'" fltk_1_4-minimal; # Added 2026-01-14
|
||||
flut-renamer = throw "flut-renamer is unmaintained and has been removed"; # Added 2025-08-26
|
||||
flutter324 = throw "flutter324 has been removed because it isn't updated anymore, and no packages in nixpkgs use it. If you still need it, use flutter.mkFlutter to get a custom version"; # Added 2025-10-28
|
||||
flutter326 = throw "flutter326 has been removed because it isn't updated anymore, and no packages in nixpkgs use it. If you still need it, use flutter.mkFlutter to get a custom version"; # Added 2025-06-08
|
||||
@@ -692,6 +699,7 @@ mapAliases {
|
||||
gjay = throw "'gjay' has been removed as it is unmaintained upstream"; # Added 2025-05-25
|
||||
glabels = throw "'glabels' has been removed because it is no longer maintained. Consider using 'glabels-qt', which is an active fork."; # Added 2025-09-16
|
||||
glaxnimate = kdePackages.glaxnimate; # Added 2025-09-17
|
||||
glew110 = warnAlias "'glew110' has been renamed to 'glew_1_10'" glew_1_10; # Added 2026-01-14
|
||||
glew-egl = throw "'glew-egl' has been renamed to/replaced by 'glew'"; # Converted to throw 2025-10-27
|
||||
glfw-wayland = throw "'glfw-wayland' has been renamed to/replaced by 'glfw'"; # Converted to throw 2025-10-27
|
||||
glfw-wayland-minecraft = throw "'glfw-wayland-minecraft' has been renamed to/replaced by 'glfw3-minecraft'"; # Converted to throw 2025-10-27
|
||||
|
||||
+13
-128
@@ -1632,9 +1632,7 @@ with pkgs;
|
||||
|
||||
asmrepl = callPackage ../development/interpreters/asmrepl { };
|
||||
|
||||
avahi = callPackage ../development/libraries/avahi { };
|
||||
|
||||
avahi-compat = callPackage ../development/libraries/avahi {
|
||||
avahi-compat = callPackage ../by-name/av/avahi/package.nix {
|
||||
withLibdnssdCompat = true;
|
||||
};
|
||||
|
||||
@@ -1719,13 +1717,6 @@ with pkgs;
|
||||
'';
|
||||
});
|
||||
|
||||
capstone = callPackage ../development/libraries/capstone { };
|
||||
capstone_4 = callPackage ../development/libraries/capstone/4.nix { };
|
||||
|
||||
ceres-solver = callPackage ../development/libraries/ceres-solver {
|
||||
gflags = null; # only required for examples/tests
|
||||
};
|
||||
|
||||
cedille = callPackage ../applications/science/logic/cedille {
|
||||
inherit (haskellPackages)
|
||||
alex
|
||||
@@ -2562,10 +2553,6 @@ with pkgs;
|
||||
inherit (darwin) autoSignDarwinBinariesHook;
|
||||
};
|
||||
|
||||
fox = callPackage ../development/libraries/fox { };
|
||||
|
||||
fox_1_6 = callPackage ../development/libraries/fox/fox-1.6.nix { };
|
||||
|
||||
fpm = callPackage ../tools/package-management/fpm { };
|
||||
|
||||
ferdium = callPackage ../applications/networking/instant-messengers/ferdium {
|
||||
@@ -3593,13 +3580,7 @@ with pkgs;
|
||||
|
||||
rocket = libsForQt5.callPackage ../tools/graphics/rocket { };
|
||||
|
||||
rtaudio = callPackage ../development/libraries/audio/rtaudio {
|
||||
jack = libjack2;
|
||||
};
|
||||
|
||||
rtmidi = callPackage ../development/libraries/audio/rtmidi {
|
||||
jack = libjack2;
|
||||
};
|
||||
rtaudio = rtaudio_5;
|
||||
|
||||
mpi = openmpi; # this attribute should used to build MPI applications
|
||||
openmodelica = recurseIntoAttrs (callPackage ../applications/science/misc/openmodelica { });
|
||||
@@ -6579,10 +6560,6 @@ with pkgs;
|
||||
|
||||
acl = callPackage ../development/libraries/acl { };
|
||||
|
||||
agg = callPackage ../development/libraries/agg {
|
||||
stdenv = gccStdenv;
|
||||
};
|
||||
|
||||
allegro = allegro4;
|
||||
allegro4 = callPackage ../development/libraries/allegro { };
|
||||
allegro5 = callPackage ../development/libraries/allegro/5.nix { };
|
||||
@@ -6642,25 +6619,12 @@ with pkgs;
|
||||
|
||||
botanEsdm = botan3.override { withEsdm = true; };
|
||||
|
||||
c-ares = callPackage ../development/libraries/c-ares { };
|
||||
|
||||
c-aresMinimal = callPackage ../development/libraries/c-ares {
|
||||
withCMake = false;
|
||||
};
|
||||
|
||||
inherit (callPackages ../development/libraries/c-blosc { })
|
||||
c-blosc
|
||||
c-blosc2
|
||||
;
|
||||
c-aresMinimal = callPackage ../by-name/c-/c-ares/package.nix { withCMake = false; };
|
||||
|
||||
niv = lib.getBin (haskell.lib.compose.justStaticExecutables haskellPackages.niv);
|
||||
|
||||
ormolu = lib.getBin (haskell.lib.compose.justStaticExecutables haskellPackages.ormolu);
|
||||
|
||||
cctag = callPackage ../development/libraries/cctag {
|
||||
stdenv = clangStdenv;
|
||||
};
|
||||
|
||||
ceedling = callPackage ../development/tools/ceedling { };
|
||||
|
||||
celt = callPackage ../development/libraries/celt { };
|
||||
@@ -6679,9 +6643,7 @@ with pkgs;
|
||||
]
|
||||
);
|
||||
|
||||
clucene_core_2 = callPackage ../development/libraries/clucene-core/2.x.nix { };
|
||||
|
||||
clucene_core = clucene_core_2;
|
||||
clucene-core = clucene-core_2;
|
||||
|
||||
codecserver = callPackage ../applications/audio/codecserver {
|
||||
protobuf = protobuf_21;
|
||||
@@ -6713,14 +6675,6 @@ with pkgs;
|
||||
db60 = callPackage ../development/libraries/db/db-6.0.nix { };
|
||||
db62 = callPackage ../development/libraries/db/db-6.2.nix { };
|
||||
|
||||
dbus = callPackage ../development/libraries/dbus { };
|
||||
|
||||
makeDBusConf = callPackage ../development/libraries/dbus/make-dbus-conf.nix { };
|
||||
|
||||
draco = callPackage ../development/libraries/draco {
|
||||
tinygltf = callPackage ../development/libraries/draco/tinygltf.nix { };
|
||||
};
|
||||
|
||||
# Multi-arch "drivers" which we want to build for i686.
|
||||
driversi686Linux = recurseIntoAttrs {
|
||||
inherit (pkgsi686Linux)
|
||||
@@ -6734,15 +6688,9 @@ with pkgs;
|
||||
;
|
||||
};
|
||||
|
||||
eccodes = callPackage ../development/libraries/eccodes {
|
||||
pythonPackages = python3Packages;
|
||||
stdenv = if stdenv.hostPlatform.isDarwin then gccStdenv else stdenv;
|
||||
};
|
||||
|
||||
vapoursynth-editor = libsForQt5.callPackage ../by-name/va/vapoursynth/editor.nix { };
|
||||
|
||||
enchant2 = callPackage ../development/libraries/enchant/2.x.nix { };
|
||||
enchant = enchant2;
|
||||
enchant = enchant_2;
|
||||
|
||||
factorPackages-0_99 = callPackage ./factor-packages.nix {
|
||||
factor-unwrapped = callPackage ../development/compilers/factor-lang/0.99.nix { };
|
||||
@@ -6764,17 +6712,6 @@ with pkgs;
|
||||
factor-lang-0_101 = factorPackages-0_101.factor-lang;
|
||||
factor-lang = factor-lang-0_101;
|
||||
|
||||
farstream = callPackage ../development/libraries/farstream {
|
||||
inherit (gst_all_1)
|
||||
gstreamer
|
||||
gst-plugins-base
|
||||
gst-plugins-good
|
||||
gst-plugins-bad
|
||||
gst-libav
|
||||
;
|
||||
autoreconfHook = buildPackages.autoreconfHook269;
|
||||
};
|
||||
|
||||
inherit (callPackage ../development/libraries/ffmpeg { })
|
||||
ffmpeg_4
|
||||
ffmpeg_4-headless
|
||||
@@ -6803,23 +6740,21 @@ with pkgs;
|
||||
};
|
||||
fftwMpi = fftw.override { enableMpi = true; };
|
||||
|
||||
fltk13 = callPackage ../development/libraries/fltk { };
|
||||
fltk14 = callPackage ../development/libraries/fltk/1.4.nix { };
|
||||
fltk13-minimal = fltk13.override {
|
||||
fltk_1_3-minimal = fltk_1_3.override {
|
||||
withGL = false;
|
||||
withCairo = false;
|
||||
withExamples = false;
|
||||
withDocs = false;
|
||||
};
|
||||
fltk14-minimal = fltk14.override {
|
||||
fltk_1_4-minimal = fltk_1_4.override {
|
||||
withGL = false;
|
||||
withCairo = false;
|
||||
withPango = false;
|
||||
withExamples = false;
|
||||
withDocs = false;
|
||||
};
|
||||
fltk = fltk13;
|
||||
fltk-minimal = fltk13-minimal;
|
||||
fltk = fltk_1_3;
|
||||
fltk-minimal = fltk_1_3-minimal;
|
||||
|
||||
inherit (callPackages ../development/libraries/fmt { })
|
||||
fmt_9
|
||||
@@ -6830,9 +6765,6 @@ with pkgs;
|
||||
|
||||
fmt = fmt_12;
|
||||
|
||||
fplll = callPackage ../development/libraries/fplll { };
|
||||
fplll_20160331 = callPackage ../development/libraries/fplll/20160331.nix { };
|
||||
|
||||
freeipa = callPackage ../os-specific/linux/freeipa {
|
||||
# NOTE: freeipa and sssd need to be built with the same version of python
|
||||
kerberos = krb5.override {
|
||||
@@ -6850,53 +6782,32 @@ with pkgs;
|
||||
|
||||
makeFontsCache = callPackage ../development/libraries/fontconfig/make-fonts-cache.nix { };
|
||||
|
||||
gamenetworkingsockets = callPackage ../development/libraries/gamenetworkingsockets {
|
||||
protobuf = protobuf_21;
|
||||
};
|
||||
|
||||
gamt = callPackage ../by-name/am/amtterm/package.nix { withGamt = true; };
|
||||
|
||||
gcr = callPackage ../development/libraries/gcr { };
|
||||
|
||||
gcr_4 = callPackage ../development/libraries/gcr/4.nix { };
|
||||
|
||||
gecode_3 = callPackage ../development/libraries/gecode/3.nix { };
|
||||
gecode_6 = qt5.callPackage ../development/libraries/gecode { };
|
||||
gecode = gecode_6;
|
||||
|
||||
gegl = callPackage ../development/libraries/gegl {
|
||||
openexr = openexr_2;
|
||||
};
|
||||
|
||||
geoclue2-with-demo-agent = geoclue2.override { withDemoAgent = true; };
|
||||
|
||||
geoipWithDatabase = makeOverridable (callPackage ../development/libraries/geoip) {
|
||||
geoipWithDatabase = makeOverridable (callPackage ../by-name/ge/geoip/package.nix) {
|
||||
drvName = "geoip-tools";
|
||||
geoipDatabase = geolite-legacy;
|
||||
};
|
||||
|
||||
geoip = callPackage ../development/libraries/geoip { };
|
||||
|
||||
gettext = callPackage ../development/libraries/gettext { };
|
||||
|
||||
gdalMinimal = gdal.override {
|
||||
useMinimalFeatures = true;
|
||||
};
|
||||
|
||||
gdcm = callPackage ../development/libraries/gdcm {
|
||||
inherit (darwin) DarwinTools;
|
||||
};
|
||||
|
||||
ghp-import = with python3Packages; toPythonApplication ghp-import;
|
||||
|
||||
ghcid = haskellPackages.ghcid.bin;
|
||||
|
||||
graphia = qt6Packages.callPackage ../applications/science/misc/graphia { };
|
||||
|
||||
glew = callPackage ../development/libraries/glew { };
|
||||
glew110 = callPackage ../development/libraries/glew/1.10.nix { };
|
||||
glfw = glfw3;
|
||||
glfw2 = callPackage ../development/libraries/glfw/2.x.nix { };
|
||||
|
||||
glfw3-minecraft = callPackage ../by-name/gl/glfw3/package.nix {
|
||||
withMinecraftPatch = true;
|
||||
@@ -7061,11 +6972,6 @@ with pkgs;
|
||||
|
||||
gst_all_1 = recurseIntoAttrs (callPackage ../development/libraries/gstreamer { });
|
||||
|
||||
gnutls = callPackage ../development/libraries/gnutls {
|
||||
util-linux = util-linuxMinimal; # break the cyclic dependency
|
||||
autoconf = buildPackages.autoconf269;
|
||||
};
|
||||
|
||||
grantlee = libsForQt5.callPackage ../development/libraries/grantlee { };
|
||||
|
||||
glib = callPackage ../by-name/gl/glib/package.nix (
|
||||
@@ -7081,33 +6987,17 @@ with pkgs;
|
||||
}
|
||||
);
|
||||
|
||||
glibmm = callPackage ../development/libraries/glibmm { };
|
||||
|
||||
glibmm_2_68 = callPackage ../development/libraries/glibmm/2.68.nix { };
|
||||
|
||||
glirc = haskell.lib.compose.justStaticExecutables haskellPackages.glirc;
|
||||
|
||||
# Not moved to aliases while we decide if we should split the package again.
|
||||
atk = at-spi2-core;
|
||||
|
||||
atkmm = callPackage ../development/libraries/atkmm { };
|
||||
|
||||
atkmm_2_36 = callPackage ../development/libraries/atkmm/2.36.nix { };
|
||||
|
||||
cairomm = callPackage ../development/libraries/cairomm { };
|
||||
|
||||
cairomm_1_16 = callPackage ../development/libraries/cairomm/1.16.nix { };
|
||||
|
||||
pangomm = callPackage ../development/libraries/pangomm { };
|
||||
|
||||
pangomm_2_48 = callPackage ../development/libraries/pangomm/2.48.nix { };
|
||||
|
||||
pangomm_2_42 = callPackage ../development/libraries/pangomm/2.42.nix { };
|
||||
|
||||
gdk-pixbuf = callPackage ../development/libraries/gdk-pixbuf { };
|
||||
|
||||
gdk-pixbuf-xlib = callPackage ../development/libraries/gdk-pixbuf/xlib.nix { };
|
||||
|
||||
gtk2 = callPackage ../development/libraries/gtk/2.x.nix { };
|
||||
|
||||
gtk2-x11 = gtk2.override {
|
||||
@@ -7994,9 +7884,6 @@ with pkgs;
|
||||
protobuf_21
|
||||
;
|
||||
|
||||
flatbuffers = callPackage ../development/libraries/flatbuffers { };
|
||||
flatbuffers_23 = callPackage ../development/libraries/flatbuffers/23.nix { };
|
||||
|
||||
nanopbMalloc = callPackage ../by-name/na/nanopb/package.nix { enableMalloc = true; };
|
||||
|
||||
pth = if stdenv.hostPlatform.isMusl then npth else gnupth;
|
||||
@@ -8811,8 +8698,6 @@ with pkgs;
|
||||
};
|
||||
cassandra = cassandra_4;
|
||||
|
||||
cassandra-cpp-driver = callPackage ../development/libraries/cassandra-cpp-driver/default.nix { };
|
||||
|
||||
apache-jena = callPackage ../servers/nosql/apache-jena/binary.nix {
|
||||
java = jre;
|
||||
};
|
||||
@@ -11644,7 +11529,7 @@ with pkgs;
|
||||
};
|
||||
|
||||
rakarrack = callPackage ../applications/audio/rakarrack {
|
||||
fltk = fltk13;
|
||||
fltk = fltk_1_3;
|
||||
};
|
||||
|
||||
rawtherapee = callPackage ../applications/graphics/rawtherapee {
|
||||
@@ -12089,7 +11974,7 @@ with pkgs;
|
||||
);
|
||||
|
||||
virtualglLib = callPackage ../tools/X11/virtualgl/lib.nix {
|
||||
fltk = fltk13;
|
||||
fltk = fltk_1_3;
|
||||
};
|
||||
|
||||
virtualgl = callPackage ../tools/X11/virtualgl {
|
||||
@@ -13924,7 +13809,7 @@ with pkgs;
|
||||
yaziPlugins = recurseIntoAttrs (callPackage ../by-name/ya/yazi/plugins { });
|
||||
|
||||
dillo = callPackage ../by-name/di/dillo/package.nix {
|
||||
fltk = fltk13;
|
||||
fltk = fltk_1_3;
|
||||
};
|
||||
|
||||
libkazv = callPackage ../by-name/li/libkazv/package.nix {
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
bzip2,
|
||||
curl,
|
||||
cyrus_sasl,
|
||||
enchant2,
|
||||
enchant,
|
||||
freetds,
|
||||
gd,
|
||||
gettext,
|
||||
@@ -450,7 +450,7 @@ lib.makeScope pkgs.newScope (
|
||||
}
|
||||
{
|
||||
name = "enchant";
|
||||
buildInputs = [ enchant2 ];
|
||||
buildInputs = [ enchant ];
|
||||
configureFlags = [ "--with-enchant" ];
|
||||
doCheck = false;
|
||||
}
|
||||
|
||||
@@ -4775,7 +4775,7 @@ self: super: with self; {
|
||||
eccodes = toPythonModule (
|
||||
pkgs.eccodes.override {
|
||||
enablePython = true;
|
||||
pythonPackages = self;
|
||||
python3Packages = self;
|
||||
}
|
||||
);
|
||||
|
||||
@@ -13377,7 +13377,7 @@ self: super: with self; {
|
||||
|
||||
pyemvue = callPackage ../development/python-modules/pyemvue { };
|
||||
|
||||
pyenchant = callPackage ../development/python-modules/pyenchant { inherit (pkgs) enchant2; };
|
||||
pyenchant = callPackage ../development/python-modules/pyenchant { inherit (pkgs) enchant_2; };
|
||||
|
||||
pyenphase = callPackage ../development/python-modules/pyenphase { };
|
||||
|
||||
|
||||
Reference in New Issue
Block a user