mirror of
https://github.com/NixOS/nixpkgs.git
synced 2026-07-20 15:41:16 +00:00
Merge remote-tracking branch 'origin/staging-next' into staging
This commit is contained in:
K900
@@ -9556,6 +9556,12 @@
|
||||
githubId = 127353;
|
||||
name = "Geoffrey Huntley";
|
||||
};
|
||||
gibbert = {
|
||||
email = "gbjgms@gmail.com";
|
||||
github = "zgibberish";
|
||||
githubId = 67570424;
|
||||
name = "gibbert";
|
||||
};
|
||||
gigahawk = {
|
||||
email = "Jasper Chan";
|
||||
name = "jasperchan515@gmail.com";
|
||||
|
||||
@@ -6,9 +6,9 @@
|
||||
pkg-config,
|
||||
glfw,
|
||||
libvgm,
|
||||
libX11,
|
||||
libXau,
|
||||
libXdmcp,
|
||||
libx11,
|
||||
libxau,
|
||||
libxdmcp,
|
||||
cppunit,
|
||||
}:
|
||||
|
||||
@@ -55,9 +55,9 @@ stdenv.mkDerivation {
|
||||
libvgm
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isLinux [
|
||||
libX11
|
||||
libXau
|
||||
libXdmcp
|
||||
libx11
|
||||
libxau
|
||||
libxdmcp
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
|
||||
@@ -7,8 +7,8 @@
|
||||
ninja,
|
||||
lv2,
|
||||
sord,
|
||||
libX11,
|
||||
libXext,
|
||||
libx11,
|
||||
libxext,
|
||||
glew,
|
||||
lv2lint,
|
||||
pname,
|
||||
@@ -40,8 +40,8 @@ stdenv.mkDerivation {
|
||||
buildInputs = [
|
||||
lv2
|
||||
sord
|
||||
libX11
|
||||
libXext
|
||||
libx11
|
||||
libxext
|
||||
glew
|
||||
lv2lint
|
||||
]
|
||||
|
||||
@@ -6,8 +6,8 @@
|
||||
alsa-utils,
|
||||
fltk,
|
||||
libjack2,
|
||||
libXft,
|
||||
libXpm,
|
||||
libxft,
|
||||
libxpm,
|
||||
libjpeg,
|
||||
libpng,
|
||||
libsamplerate,
|
||||
@@ -37,8 +37,8 @@ stdenv.mkDerivation rec {
|
||||
alsa-utils
|
||||
fltk
|
||||
libjack2
|
||||
libXft
|
||||
libXpm
|
||||
libxft
|
||||
libxpm
|
||||
libjpeg
|
||||
libpng
|
||||
libsamplerate
|
||||
|
||||
@@ -36,8 +36,8 @@
|
||||
fltk,
|
||||
libGL,
|
||||
libjpeg,
|
||||
libX11,
|
||||
libXpm,
|
||||
libx11,
|
||||
libxpm,
|
||||
ntk,
|
||||
|
||||
# Test dependencies
|
||||
@@ -116,16 +116,16 @@ stdenv.mkDerivation rec {
|
||||
++ lib.optionals (guiModule == "fltk") [
|
||||
fltk
|
||||
libjpeg
|
||||
libXpm
|
||||
libxpm
|
||||
]
|
||||
++ lib.optionals (guiModule == "ntk") [
|
||||
ntk
|
||||
cairo
|
||||
libXpm
|
||||
libxpm
|
||||
]
|
||||
++ lib.optionals (guiModule == "zest") [
|
||||
libGL
|
||||
libX11
|
||||
libx11
|
||||
];
|
||||
|
||||
cmakeFlags = [
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
ruby,
|
||||
libGL,
|
||||
libuv,
|
||||
libX11,
|
||||
libx11,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
|
||||
buildInputs = [
|
||||
libGL
|
||||
libuv
|
||||
libX11
|
||||
libx11
|
||||
];
|
||||
|
||||
# Force optimization to fix:
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
pkg-config,
|
||||
qttools,
|
||||
libxcb,
|
||||
libXau,
|
||||
libxau,
|
||||
pam,
|
||||
qtbase,
|
||||
qtdeclarative,
|
||||
@@ -62,7 +62,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
buildInputs = [
|
||||
libxcb
|
||||
libXau
|
||||
libxau
|
||||
pam
|
||||
qtbase
|
||||
qtdeclarative
|
||||
|
||||
@@ -25,12 +25,12 @@
|
||||
fontsConf,
|
||||
fontconfig,
|
||||
freetype,
|
||||
libX11,
|
||||
libXext,
|
||||
libXi,
|
||||
libXrandr,
|
||||
libXrender,
|
||||
libXtst,
|
||||
libx11,
|
||||
libxext,
|
||||
libxi,
|
||||
libxrandr,
|
||||
libxrender,
|
||||
libxtst,
|
||||
makeFontsConf,
|
||||
makeWrapper,
|
||||
ncurses5,
|
||||
@@ -107,14 +107,14 @@ let
|
||||
# Crash at startup without these
|
||||
fontconfig
|
||||
freetype
|
||||
libXext
|
||||
libXi
|
||||
libXrender
|
||||
libXtst
|
||||
libX11
|
||||
libxext
|
||||
libxi
|
||||
libxrender
|
||||
libxtst
|
||||
libx11
|
||||
|
||||
# Support multiple monitors
|
||||
libXrandr
|
||||
libxrandr
|
||||
|
||||
# For GTKLookAndFeel
|
||||
gtk2
|
||||
|
||||
@@ -34,7 +34,7 @@
|
||||
libpng,
|
||||
libuuid,
|
||||
libsecret,
|
||||
libX11,
|
||||
libx11,
|
||||
libxcb,
|
||||
libxkbcommon,
|
||||
mesa-demos,
|
||||
@@ -44,15 +44,15 @@
|
||||
libxcb-image,
|
||||
libxcb-cursor,
|
||||
libxkbfile,
|
||||
libXcomposite,
|
||||
libXcursor,
|
||||
libXdamage,
|
||||
libXext,
|
||||
libXfixes,
|
||||
libXi,
|
||||
libXrandr,
|
||||
libXrender,
|
||||
libXtst,
|
||||
libxcomposite,
|
||||
libxcursor,
|
||||
libxdamage,
|
||||
libxext,
|
||||
libxfixes,
|
||||
libxi,
|
||||
libxrandr,
|
||||
libxrender,
|
||||
libxtst,
|
||||
makeWrapper,
|
||||
ncurses5,
|
||||
nspr,
|
||||
@@ -141,10 +141,10 @@ let
|
||||
# Crash at startup without these
|
||||
fontconfig
|
||||
freetype
|
||||
libXext
|
||||
libXi
|
||||
libXrender
|
||||
libXtst
|
||||
libxext
|
||||
libxi
|
||||
libxrender
|
||||
libxtst
|
||||
libsecret
|
||||
|
||||
# No crash, but attempted to load at startup
|
||||
@@ -159,7 +159,7 @@ let
|
||||
zlib
|
||||
pkgsi686Linux.zlib
|
||||
# Support multiple monitors
|
||||
libXrandr
|
||||
libxrandr
|
||||
|
||||
# For Android emulator
|
||||
alsa-lib
|
||||
@@ -168,7 +168,7 @@ let
|
||||
libbsd
|
||||
libpulseaudio
|
||||
libuuid
|
||||
libX11
|
||||
libx11
|
||||
libxcb
|
||||
libxkbcommon
|
||||
libxcb-wm
|
||||
@@ -179,10 +179,10 @@ let
|
||||
libice
|
||||
libsm
|
||||
libxkbfile
|
||||
libXcomposite
|
||||
libXcursor
|
||||
libXdamage
|
||||
libXfixes
|
||||
libxcomposite
|
||||
libxcursor
|
||||
libxdamage
|
||||
libxfixes
|
||||
libGL
|
||||
libdrm
|
||||
libpng
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
coreutils,
|
||||
lazarus,
|
||||
fpc,
|
||||
libX11,
|
||||
libx11,
|
||||
|
||||
# GTK2/3
|
||||
pango,
|
||||
@@ -68,7 +68,7 @@ stdenv.mkDerivation rec {
|
||||
++ lib.optional (widgetset == "qt5") libsForQt5.wrapQtAppsHook;
|
||||
|
||||
buildInputs = [
|
||||
libX11
|
||||
libx11
|
||||
]
|
||||
++ lib.optionals (lib.hasPrefix "gtk" widgetset) [
|
||||
pango
|
||||
|
||||
@@ -4,14 +4,14 @@
|
||||
makeDesktopItem,
|
||||
freetype,
|
||||
fontconfig,
|
||||
libX11,
|
||||
libXrender,
|
||||
libx11,
|
||||
libxrender,
|
||||
zlib,
|
||||
jdk,
|
||||
glib,
|
||||
glib-networking,
|
||||
gtk,
|
||||
libXtst,
|
||||
libxtst,
|
||||
libsecret,
|
||||
gsettings-desktop-schemas,
|
||||
webkitgtk_4_1,
|
||||
@@ -52,9 +52,9 @@ stdenv.mkDerivation rec {
|
||||
gsettings-desktop-schemas
|
||||
gtk
|
||||
jdk
|
||||
libX11
|
||||
libXrender
|
||||
libXtst
|
||||
libx11
|
||||
libxrender
|
||||
libxtst
|
||||
libsecret
|
||||
zlib
|
||||
]
|
||||
@@ -73,8 +73,8 @@ stdenv.mkDerivation rec {
|
||||
lib.makeLibraryPath [
|
||||
freetype
|
||||
fontconfig
|
||||
libX11
|
||||
libXrender
|
||||
libx11
|
||||
libxrender
|
||||
zlib
|
||||
]
|
||||
} $libCairo
|
||||
@@ -91,7 +91,7 @@ stdenv.mkDerivation rec {
|
||||
[
|
||||
glib
|
||||
gtk
|
||||
libXtst
|
||||
libxtst
|
||||
libsecret
|
||||
]
|
||||
++ lib.optional (webkitgtk_4_1 != null) webkitgtk_4_1
|
||||
|
||||
@@ -6,12 +6,12 @@
|
||||
makeWrapper,
|
||||
freetype,
|
||||
fontconfig,
|
||||
libX11,
|
||||
libXrender,
|
||||
libx11,
|
||||
libxrender,
|
||||
zlib,
|
||||
glib,
|
||||
gtk3,
|
||||
libXtst,
|
||||
libxtst,
|
||||
jdk,
|
||||
gsettings-desktop-schemas,
|
||||
webkitgtk_4_1 ? null, # for internal web browser
|
||||
@@ -56,13 +56,13 @@ let
|
||||
makeDesktopItem
|
||||
freetype
|
||||
fontconfig
|
||||
libX11
|
||||
libXrender
|
||||
libx11
|
||||
libxrender
|
||||
zlib
|
||||
jdk
|
||||
glib
|
||||
gtk
|
||||
libXtst
|
||||
libxtst
|
||||
gsettings-desktop-schemas
|
||||
webkitgtk_4_1
|
||||
makeWrapper
|
||||
|
||||
@@ -30,12 +30,12 @@
|
||||
harfbuzz,
|
||||
imagemagick,
|
||||
jansson,
|
||||
libXaw,
|
||||
libXcursor,
|
||||
libXft,
|
||||
libXi,
|
||||
libXpm,
|
||||
libXrandr,
|
||||
libxaw,
|
||||
libxcursor,
|
||||
libxft,
|
||||
libxi,
|
||||
libxpm,
|
||||
libxrandr,
|
||||
libgccjit,
|
||||
libjpeg,
|
||||
libotf,
|
||||
@@ -314,7 +314,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
++ lib.optionals withPgtk [
|
||||
giflib
|
||||
gtk3
|
||||
libXpm
|
||||
libxpm
|
||||
libjpeg
|
||||
libpng
|
||||
librsvg
|
||||
@@ -335,9 +335,9 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
++ lib.optionals withX [
|
||||
Xaw3d
|
||||
giflib
|
||||
libXaw
|
||||
libXpm
|
||||
libXrandr
|
||||
libxaw
|
||||
libxpm
|
||||
libxrandr
|
||||
libjpeg
|
||||
libpng
|
||||
librsvg
|
||||
@@ -347,10 +347,10 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
cairo
|
||||
]
|
||||
++ lib.optionals (withX && !withCairo) [
|
||||
libXft
|
||||
libxft
|
||||
]
|
||||
++ lib.optionals withXinput2 [
|
||||
libXi
|
||||
libxi
|
||||
]
|
||||
++ lib.optionals withWebkitgtk [
|
||||
webkitgtk_4_1
|
||||
@@ -485,7 +485,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
'';
|
||||
|
||||
postFixup = lib.optionalString (stdenv.hostPlatform.isLinux && withX && toolkit == "lucid") ''
|
||||
patchelf --add-rpath ${lib.makeLibraryPath [ libXcursor ]} $out/bin/emacs
|
||||
patchelf --add-rpath ${lib.makeLibraryPath [ libxcursor ]} $out/bin/emacs
|
||||
patchelf --add-needed "libXcursor.so.1" "$out/bin/emacs"
|
||||
'';
|
||||
|
||||
|
||||
@@ -21,7 +21,7 @@
|
||||
glibcLocales,
|
||||
fontconfig,
|
||||
libGL,
|
||||
libX11,
|
||||
libx11,
|
||||
|
||||
jdk,
|
||||
vmopts ? null,
|
||||
@@ -85,7 +85,7 @@ lib.extendMkDerivation {
|
||||
stdenv.cc.cc
|
||||
fontconfig
|
||||
libGL
|
||||
libX11
|
||||
libx11
|
||||
];
|
||||
|
||||
nativeBuildInputs = nativeBuildInputs ++ [
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
musl,
|
||||
libice,
|
||||
libsm,
|
||||
libX11,
|
||||
libx11,
|
||||
dotnetCorePackages,
|
||||
libxcb-keysyms,
|
||||
expat,
|
||||
@@ -75,7 +75,7 @@ in
|
||||
# Avalonia dependencies needed for dotMemory
|
||||
libice
|
||||
libsm
|
||||
libX11
|
||||
libx11
|
||||
];
|
||||
|
||||
# NOTE: meta attrs are used for the Linux desktop entries and may cause rebuilds when changed
|
||||
|
||||
@@ -16,14 +16,14 @@
|
||||
perl,
|
||||
tcl,
|
||||
ruby,
|
||||
libX11,
|
||||
libXext,
|
||||
libx11,
|
||||
libxext,
|
||||
libsm,
|
||||
libXpm,
|
||||
libXt,
|
||||
libXaw,
|
||||
libXau,
|
||||
libXmu,
|
||||
libxpm,
|
||||
libxt,
|
||||
libxaw,
|
||||
libxau,
|
||||
libxmu,
|
||||
libsodium,
|
||||
libice,
|
||||
wayland-scanner,
|
||||
@@ -179,13 +179,13 @@ stdenv.mkDerivation {
|
||||
++ lib.optionals (guiSupport == "gtk2" || guiSupport == "gtk3") [
|
||||
libsm
|
||||
libice
|
||||
libX11
|
||||
libXext
|
||||
libXpm
|
||||
libXt
|
||||
libXaw
|
||||
libXau
|
||||
libXmu
|
||||
libx11
|
||||
libxext
|
||||
libxpm
|
||||
libxt
|
||||
libxaw
|
||||
libxau
|
||||
libxmu
|
||||
]
|
||||
++ lib.optional (guiSupport == "gtk2") gtk2-x11
|
||||
++ lib.optional (guiSupport == "gtk3") gtk3-x11
|
||||
|
||||
@@ -15188,6 +15188,19 @@ final: prev: {
|
||||
meta.hydraPlatforms = [ ];
|
||||
};
|
||||
|
||||
telescope-ast-grep-nvim = buildVimPlugin {
|
||||
pname = "telescope-ast-grep.nvim";
|
||||
version = "0-unstable-2023-11-05";
|
||||
src = fetchFromGitHub {
|
||||
owner = "ray-x";
|
||||
repo = "telescope-ast-grep.nvim";
|
||||
rev = "fa7d7fa5c723b57bba333429224e99fde2a63632";
|
||||
hash = "sha256-WPzFG8gdf0XzxsFkxgseOy6GQBu9C2KDOXeasdct0F8=";
|
||||
};
|
||||
meta.homepage = "https://github.com/ray-x/telescope-ast-grep.nvim/";
|
||||
meta.hydraPlatforms = [ ];
|
||||
};
|
||||
|
||||
telescope-asynctasks-nvim = buildVimPlugin {
|
||||
pname = "telescope-asynctasks.nvim";
|
||||
version = "0-unstable-2022-04-09";
|
||||
|
||||
@@ -1166,6 +1166,7 @@ https://github.com/wellle/targets.vim/,,
|
||||
https://github.com/tbabej/taskwiki/,,
|
||||
https://github.com/tomtom/tcomment_vim/,,
|
||||
https://github.com/nvim-telekasten/telekasten.nvim/,,
|
||||
https://github.com/ray-x/telescope-ast-grep.nvim/,HEAD,
|
||||
https://github.com/GustavoKatel/telescope-asynctasks.nvim/,,
|
||||
https://github.com/nvim-telescope/telescope-cheat.nvim/,,
|
||||
https://github.com/fannheyward/telescope-coc.nvim/,,
|
||||
|
||||
@@ -10,10 +10,10 @@
|
||||
gtk2,
|
||||
alsa-lib,
|
||||
libsm,
|
||||
libX11,
|
||||
libx11,
|
||||
gdk-pixbuf,
|
||||
pango,
|
||||
libXinerama,
|
||||
libxinerama,
|
||||
mpg123,
|
||||
runtimeShell,
|
||||
}:
|
||||
@@ -27,10 +27,10 @@ let
|
||||
gtk2
|
||||
alsa-lib
|
||||
libsm
|
||||
libX11
|
||||
libx11
|
||||
gdk-pixbuf
|
||||
pango
|
||||
libXinerama
|
||||
libxinerama
|
||||
];
|
||||
|
||||
in
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
fetchFromGitHub,
|
||||
libGL,
|
||||
libGLU,
|
||||
libX11,
|
||||
libx11,
|
||||
mkLibretroCore,
|
||||
}:
|
||||
mkLibretroCore {
|
||||
@@ -29,7 +29,7 @@ mkLibretroCore {
|
||||
extraBuildInputs = [
|
||||
libGL
|
||||
libGLU
|
||||
libX11
|
||||
libx11
|
||||
];
|
||||
|
||||
extraNativeBuildInputs = [ cmake ];
|
||||
|
||||
@@ -12,8 +12,8 @@
|
||||
fontconfig,
|
||||
glm,
|
||||
installShellFiles,
|
||||
libXi,
|
||||
libXinerama,
|
||||
libxi,
|
||||
libxinerama,
|
||||
libjpeg,
|
||||
libpcap,
|
||||
libpulseaudio,
|
||||
@@ -93,8 +93,8 @@ stdenv.mkDerivation rec {
|
||||
++ lib.optionals stdenv.hostPlatform.isLinux [
|
||||
alsa-lib
|
||||
libpulseaudio
|
||||
libXinerama
|
||||
libXi
|
||||
libxinerama
|
||||
libxi
|
||||
fontconfig
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
libGL,
|
||||
libGLU,
|
||||
libpng,
|
||||
libX11,
|
||||
libx11,
|
||||
nasm,
|
||||
pkg-config,
|
||||
zlib,
|
||||
@@ -35,7 +35,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
libGL
|
||||
libGLU
|
||||
libpng
|
||||
libX11
|
||||
libx11
|
||||
zlib
|
||||
];
|
||||
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
lib,
|
||||
stdenv,
|
||||
fetchurl,
|
||||
libX11,
|
||||
libx11,
|
||||
libxinerama,
|
||||
imlib2,
|
||||
}:
|
||||
@@ -16,7 +16,7 @@ stdenv.mkDerivation {
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
libX11
|
||||
libx11
|
||||
imlib2
|
||||
libxinerama
|
||||
];
|
||||
@@ -26,7 +26,7 @@ stdenv.mkDerivation {
|
||||
|
||||
gcc -g imlibsetroot.c -o imlibsetroot \
|
||||
-I${imlib2.dev}/include -L${imlib2}/lib -lImlib2 \
|
||||
-I${libX11.dev}/include -lXinerama -lX11
|
||||
-I${libx11.dev}/include -lXinerama -lX11
|
||||
|
||||
runHook postBuild
|
||||
'';
|
||||
|
||||
@@ -32,7 +32,7 @@
|
||||
libsigcxx,
|
||||
libvisio,
|
||||
libwpg,
|
||||
libXft,
|
||||
libxft,
|
||||
libxml2,
|
||||
libxslt,
|
||||
readline,
|
||||
@@ -160,7 +160,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
libsigcxx
|
||||
libvisio
|
||||
libwpg
|
||||
libXft
|
||||
libxft
|
||||
libxml2
|
||||
libxslt
|
||||
readline
|
||||
|
||||
@@ -12,14 +12,14 @@
|
||||
libdatrie,
|
||||
libxkbcommon,
|
||||
libepoxy,
|
||||
libXtst,
|
||||
libxtst,
|
||||
wrapGAppsHook3,
|
||||
makeWrapper,
|
||||
pixman,
|
||||
libpthread-stubs,
|
||||
gtkmm3,
|
||||
libXau,
|
||||
libXdmcp,
|
||||
libxau,
|
||||
libxdmcp,
|
||||
lcms2,
|
||||
libiptcdata,
|
||||
fftw,
|
||||
@@ -81,12 +81,12 @@ stdenv.mkDerivation rec {
|
||||
libdatrie
|
||||
libxkbcommon
|
||||
libepoxy
|
||||
libXtst
|
||||
libxtst
|
||||
pixman
|
||||
libpthread-stubs
|
||||
gtkmm3
|
||||
libXau
|
||||
libXdmcp
|
||||
libxau
|
||||
libxdmcp
|
||||
lcms2
|
||||
libiptcdata
|
||||
fftw
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
fetchpatch,
|
||||
autoconf,
|
||||
sane-backends,
|
||||
libX11,
|
||||
libx11,
|
||||
gtk2,
|
||||
pkg-config,
|
||||
libusb-compat-0_1 ? null,
|
||||
@@ -64,7 +64,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
buildInputs = [
|
||||
sane-backends
|
||||
libX11
|
||||
libx11
|
||||
gtk2
|
||||
]
|
||||
++ lib.optional (libusb-compat-0_1 != null) libusb-compat-0_1;
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
libXft,
|
||||
libxft,
|
||||
imlib2,
|
||||
giflib,
|
||||
libexif,
|
||||
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
|
||||
preBuild = lib.optionalString (conf != null) "cp ${configFile} config.def.h";
|
||||
|
||||
buildInputs = [
|
||||
libXft
|
||||
libxft
|
||||
imlib2
|
||||
giflib
|
||||
libexif
|
||||
|
||||
@@ -4,10 +4,10 @@
|
||||
fetchurl,
|
||||
makeWrapper,
|
||||
autoPatchelfHook,
|
||||
libX11,
|
||||
libXext,
|
||||
libXrandr,
|
||||
libXinerama,
|
||||
libx11,
|
||||
libxext,
|
||||
libxrandr,
|
||||
libxinerama,
|
||||
libglvnd,
|
||||
openal,
|
||||
glibc,
|
||||
@@ -80,10 +80,10 @@ stdenv.mkDerivation rec {
|
||||
|
||||
buildInputs = [
|
||||
stdenv.cc.cc
|
||||
libX11
|
||||
libXext
|
||||
libXrandr
|
||||
libXinerama
|
||||
libx11
|
||||
libxext
|
||||
libxrandr
|
||||
libxinerama
|
||||
];
|
||||
|
||||
dontUnpack = true;
|
||||
|
||||
@@ -7,17 +7,17 @@
|
||||
fontconfig,
|
||||
zlib,
|
||||
qtquickcontrols2,
|
||||
libXinerama,
|
||||
libxinerama,
|
||||
libxcb,
|
||||
libsm,
|
||||
libXi,
|
||||
libxi,
|
||||
libglvnd,
|
||||
libXext,
|
||||
libXrandr,
|
||||
libxext,
|
||||
libxrandr,
|
||||
mailspring,
|
||||
libX11,
|
||||
libx11,
|
||||
libice,
|
||||
libXrender,
|
||||
libxrender,
|
||||
autoPatchelfHook,
|
||||
makeWrapper,
|
||||
xkeyboard_config,
|
||||
@@ -52,17 +52,17 @@ let
|
||||
fontconfig
|
||||
zlib
|
||||
qtquickcontrols2
|
||||
libXinerama
|
||||
libxinerama
|
||||
libxcb
|
||||
libsm
|
||||
libXi
|
||||
libxi
|
||||
libglvnd
|
||||
libXext
|
||||
libXrandr
|
||||
libxext
|
||||
libxrandr
|
||||
mailspring
|
||||
libX11
|
||||
libx11
|
||||
libice
|
||||
libXrender
|
||||
libxrender
|
||||
];
|
||||
|
||||
installPhase = ''
|
||||
@@ -109,17 +109,17 @@ buildFHSEnv {
|
||||
fontconfig
|
||||
zlib
|
||||
qtquickcontrols2
|
||||
libXinerama
|
||||
libxinerama
|
||||
libxcb
|
||||
libsm
|
||||
libXi
|
||||
libxi
|
||||
libglvnd
|
||||
libXext
|
||||
libXrandr
|
||||
libxext
|
||||
libxrandr
|
||||
mailspring
|
||||
libX11
|
||||
libx11
|
||||
libice
|
||||
libXrender
|
||||
libxrender
|
||||
openal
|
||||
];
|
||||
runScript = "superposition";
|
||||
|
||||
@@ -4,10 +4,10 @@
|
||||
fetchurl,
|
||||
makeWrapper,
|
||||
autoPatchelfHook,
|
||||
libX11,
|
||||
libXext,
|
||||
libXrandr,
|
||||
libXinerama,
|
||||
libx11,
|
||||
libxext,
|
||||
libxrandr,
|
||||
libxinerama,
|
||||
libglvnd,
|
||||
openal,
|
||||
glibc,
|
||||
@@ -78,10 +78,10 @@ stdenv.mkDerivation {
|
||||
|
||||
buildInputs = [
|
||||
stdenv.cc.cc
|
||||
libX11
|
||||
libXext
|
||||
libXrandr
|
||||
libXinerama
|
||||
libx11
|
||||
libxext
|
||||
libxrandr
|
||||
libxinerama
|
||||
];
|
||||
|
||||
dontUnpack = true;
|
||||
|
||||
@@ -4,13 +4,13 @@
|
||||
fetchFromGitHub,
|
||||
buildDotnetModule,
|
||||
dotnetCorePackages,
|
||||
libX11,
|
||||
libx11,
|
||||
libice,
|
||||
libsm,
|
||||
libXi,
|
||||
libXcursor,
|
||||
libXext,
|
||||
libXrandr,
|
||||
libxi,
|
||||
libxcursor,
|
||||
libxext,
|
||||
libxrandr,
|
||||
fontconfig,
|
||||
glew,
|
||||
makeDesktopItem,
|
||||
@@ -59,13 +59,13 @@ buildDotnetModule rec {
|
||||
|
||||
runtimeDeps = [
|
||||
# Avalonia UI
|
||||
libX11
|
||||
libx11
|
||||
libice
|
||||
libsm
|
||||
libXi
|
||||
libXcursor
|
||||
libXext
|
||||
libXrandr
|
||||
libxi
|
||||
libxcursor
|
||||
libxext
|
||||
libxrandr
|
||||
fontconfig
|
||||
glew
|
||||
];
|
||||
|
||||
@@ -16,7 +16,7 @@
|
||||
fmt,
|
||||
bzip2,
|
||||
libiconv,
|
||||
libXtst,
|
||||
libxtst,
|
||||
qtbase,
|
||||
qtsvg,
|
||||
qtwebengine,
|
||||
@@ -62,7 +62,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
hunspell
|
||||
xz
|
||||
lzo
|
||||
libXtst
|
||||
libxtst
|
||||
bzip2
|
||||
libiconv
|
||||
opencc
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
pkg-config,
|
||||
libXtst,
|
||||
libxtst,
|
||||
libvorbis,
|
||||
hunspell,
|
||||
lzo,
|
||||
@@ -72,7 +72,7 @@ stdenv.mkDerivation rec {
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isLinux [
|
||||
qtx11extras
|
||||
libXtst
|
||||
libxtst
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
bzip2
|
||||
|
||||
@@ -8,10 +8,10 @@
|
||||
libGLU,
|
||||
libsm,
|
||||
|
||||
libXcomposite,
|
||||
libXi,
|
||||
libXrender,
|
||||
libX11,
|
||||
libxcomposite,
|
||||
libxi,
|
||||
libxrender,
|
||||
libx11,
|
||||
|
||||
libxcb,
|
||||
sqlite,
|
||||
@@ -65,10 +65,10 @@ stdenv.mkDerivation rec {
|
||||
libGL
|
||||
libGLU
|
||||
libsm
|
||||
libX11
|
||||
libXcomposite
|
||||
libXi
|
||||
libXrender
|
||||
libx11
|
||||
libxcomposite
|
||||
libxi
|
||||
libxrender
|
||||
libproxy
|
||||
libxcb
|
||||
libxml2_13
|
||||
|
||||
@@ -16,7 +16,7 @@
|
||||
zenity,
|
||||
luajit_2_1,
|
||||
libGL,
|
||||
libX11,
|
||||
libx11,
|
||||
|
||||
builderArgs,
|
||||
}:
|
||||
@@ -58,7 +58,7 @@ buildDubPackage (
|
||||
freetype
|
||||
SDL2
|
||||
libGL
|
||||
libX11
|
||||
libx11
|
||||
];
|
||||
|
||||
dontUseCmakeConfigure = true;
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
fetchFromGitHub,
|
||||
|
||||
# buildInputs
|
||||
libXScrnSaver,
|
||||
libxscrnsaver,
|
||||
magic-enum,
|
||||
|
||||
# nativeBuildInputs
|
||||
@@ -45,7 +45,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
'';
|
||||
|
||||
buildInputs = [
|
||||
libXScrnSaver
|
||||
libxscrnsaver
|
||||
magic-enum
|
||||
qtbase
|
||||
qtconnectivity
|
||||
|
||||
@@ -10,11 +10,11 @@
|
||||
openssl,
|
||||
udev,
|
||||
libglvnd,
|
||||
libX11,
|
||||
libXcursor,
|
||||
libXi,
|
||||
libXrandr,
|
||||
libXfixes,
|
||||
libx11,
|
||||
libxcursor,
|
||||
libxi,
|
||||
libxrandr,
|
||||
libxfixes,
|
||||
libpulseaudio,
|
||||
libva,
|
||||
ffmpeg_7,
|
||||
@@ -43,7 +43,7 @@ stdenvNoCC.mkDerivation {
|
||||
buildInputs = [
|
||||
stdenv.cc.cc # libstdc++
|
||||
libglvnd
|
||||
libX11
|
||||
libx11
|
||||
];
|
||||
|
||||
runtimeDependenciesPath = lib.makeLibraryPath [
|
||||
@@ -58,11 +58,11 @@ stdenvNoCC.mkDerivation {
|
||||
libpng
|
||||
libjpeg8
|
||||
curl
|
||||
libX11
|
||||
libXcursor
|
||||
libXi
|
||||
libXrandr
|
||||
libXfixes
|
||||
libx11
|
||||
libxcursor
|
||||
libxi
|
||||
libxrandr
|
||||
libxfixes
|
||||
vulkan-loader
|
||||
];
|
||||
|
||||
|
||||
@@ -2,8 +2,8 @@
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
libX11,
|
||||
libXtst,
|
||||
libx11,
|
||||
libxtst,
|
||||
cmake,
|
||||
qtbase,
|
||||
qttools,
|
||||
@@ -35,8 +35,8 @@ stdenv.mkDerivation rec {
|
||||
libscrypt
|
||||
]
|
||||
++ lib.optionals x11Support [
|
||||
libX11
|
||||
libXtst
|
||||
libx11
|
||||
libxtst
|
||||
];
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
|
||||
@@ -24,7 +24,7 @@
|
||||
withDrm ? stdenv.hostPlatform.isLinux,
|
||||
libdrm,
|
||||
withVidmode ? stdenv.hostPlatform.isLinux,
|
||||
libXxf86vm,
|
||||
libxxf86vm,
|
||||
|
||||
withGeolocation ? true,
|
||||
withCoreLocation ? withGeolocation && stdenv.hostPlatform.isDarwin,
|
||||
@@ -88,7 +88,7 @@ let
|
||||
++ lib.optional withRandr libxcb
|
||||
++ lib.optional withGeoclue geoclue
|
||||
++ lib.optional withDrm libdrm
|
||||
++ lib.optional withVidmode libXxf86vm
|
||||
++ lib.optional withVidmode libxxf86vm
|
||||
++ lib.optional withAppIndicator (
|
||||
if (pname != "gammastep") then libappindicator else libayatana-appindicator
|
||||
);
|
||||
|
||||
@@ -6,10 +6,10 @@
|
||||
wrapQtAppsHook,
|
||||
patchelf,
|
||||
qt5,
|
||||
libXtst,
|
||||
libXext,
|
||||
libX11,
|
||||
libXScrnSaver,
|
||||
libxtst,
|
||||
libxext,
|
||||
libx11,
|
||||
libxscrnsaver,
|
||||
writeScript,
|
||||
common-updater-scripts,
|
||||
curl,
|
||||
@@ -53,10 +53,10 @@ stdenv.mkDerivation rec {
|
||||
--set-rpath "${
|
||||
lib.makeLibraryPath [
|
||||
qt5.qtbase
|
||||
libXtst
|
||||
libXext
|
||||
libX11
|
||||
libXScrnSaver
|
||||
libxtst
|
||||
libxext
|
||||
libx11
|
||||
libxscrnsaver
|
||||
]
|
||||
}" \
|
||||
$out/bin/rescuetime
|
||||
|
||||
@@ -24,7 +24,7 @@
|
||||
qtsvg,
|
||||
qttools,
|
||||
qtpositioning,
|
||||
libXcomposite,
|
||||
libxcomposite,
|
||||
bluez,
|
||||
writeScript,
|
||||
}:
|
||||
@@ -89,7 +89,7 @@ let
|
||||
buildInputs = [
|
||||
qtbase
|
||||
qtlocation
|
||||
libXcomposite
|
||||
libxcomposite
|
||||
];
|
||||
|
||||
dontWrapQtApps = true;
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
gsettings-desktop-schemas,
|
||||
p7zip,
|
||||
autoPatchelfHook,
|
||||
libXxf86vm,
|
||||
libxxf86vm,
|
||||
libGL,
|
||||
copyDesktopItems,
|
||||
|
||||
@@ -96,7 +96,7 @@ stdenv.mkDerivation {
|
||||
p7zip
|
||||
gtk3
|
||||
gsettings-desktop-schemas
|
||||
libXxf86vm
|
||||
libxxf86vm
|
||||
];
|
||||
|
||||
# upstream targets Java 7 by default
|
||||
|
||||
@@ -59,9 +59,9 @@
|
||||
glib,
|
||||
gtk3,
|
||||
dbus-glib,
|
||||
libXScrnSaver,
|
||||
libXcursor,
|
||||
libXtst,
|
||||
libxscrnsaver,
|
||||
libxcursor,
|
||||
libxtst,
|
||||
libxshmfence,
|
||||
libGLU,
|
||||
libGL,
|
||||
@@ -70,7 +70,7 @@
|
||||
pciutils,
|
||||
protobuf,
|
||||
speechd-minimal,
|
||||
libXdamage,
|
||||
libxdamage,
|
||||
at-spi2-core,
|
||||
pipewire,
|
||||
libva,
|
||||
@@ -365,9 +365,9 @@ let
|
||||
glib
|
||||
gtk3
|
||||
dbus-glib
|
||||
libXScrnSaver
|
||||
libXcursor
|
||||
libXtst
|
||||
libxscrnsaver
|
||||
libxcursor
|
||||
libxtst
|
||||
libxshmfence
|
||||
libGLU
|
||||
libGL
|
||||
@@ -375,7 +375,7 @@ let
|
||||
pciutils
|
||||
protobuf
|
||||
speechd-minimal
|
||||
libXdamage
|
||||
libxdamage
|
||||
at-spi2-core
|
||||
pipewire
|
||||
libva
|
||||
@@ -425,9 +425,9 @@ let
|
||||
glib
|
||||
gtk3
|
||||
dbus-glib
|
||||
libXScrnSaver
|
||||
libXcursor
|
||||
libXtst
|
||||
libxscrnsaver
|
||||
libxcursor
|
||||
libxtst
|
||||
libxshmfence
|
||||
libGLU
|
||||
libGL
|
||||
@@ -436,7 +436,7 @@ let
|
||||
pciutils
|
||||
protobuf
|
||||
speechd-minimal
|
||||
libXdamage
|
||||
libxdamage
|
||||
at-spi2-core
|
||||
pipewire
|
||||
libva
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
curl,
|
||||
dbus-glib,
|
||||
gtk3,
|
||||
libXtst,
|
||||
libxtst,
|
||||
libva,
|
||||
pciutils,
|
||||
pipewire,
|
||||
@@ -92,7 +92,7 @@ stdenv.mkDerivation {
|
||||
adwaita-icon-theme
|
||||
alsa-lib
|
||||
dbus-glib
|
||||
libXtst
|
||||
libxtst
|
||||
];
|
||||
runtimeDependencies = [
|
||||
curl
|
||||
|
||||
@@ -13,7 +13,7 @@
|
||||
withGTK3 ? true,
|
||||
gtk3,
|
||||
libglvnd,
|
||||
libXt,
|
||||
libxt,
|
||||
libpulseaudio,
|
||||
makeDesktopItem,
|
||||
wrapGAppsHook3,
|
||||
@@ -41,7 +41,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
alsa-lib
|
||||
dbus-glib
|
||||
gtk2-x11
|
||||
libXt
|
||||
libxt
|
||||
(lib.getLib stdenv.cc.cc)
|
||||
]
|
||||
++ lib.optionals withGTK3 [
|
||||
|
||||
@@ -1,10 +1,10 @@
|
||||
{
|
||||
traefik-crd = {
|
||||
url = "https://k3s.io/k3s-charts/assets/traefik-crd/traefik-crd-37.1.1+up37.1.0.tgz";
|
||||
sha256 = "0q568ffjhxmw87fzwafxlxrzx2lgcqlqbwj87pbc2xszh9pyakyd";
|
||||
url = "https://k3s.io/k3s-charts/assets/traefik-crd/traefik-crd-38.0.201+up38.0.2.tgz";
|
||||
sha256 = "1fxkdmk859nwn0x9iq0abdwb16njsang7257ppaj9s1if06fsncd";
|
||||
};
|
||||
traefik = {
|
||||
url = "https://k3s.io/k3s-charts/assets/traefik/traefik-37.1.1+up37.1.0.tgz";
|
||||
sha256 = "0gpcr6zfbncvp2sjjwzg732k4xfr5ba0pbc5x08lgwvibqpp4r27";
|
||||
url = "https://k3s.io/k3s-charts/assets/traefik/traefik-38.0.201+up38.0.2.tgz";
|
||||
sha256 = "16kzjy8dgswn4jfx62dn2ihmgpkzcfvjv6ync9zdi397fz32mqjv";
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,26 +1,26 @@
|
||||
{
|
||||
"airgap-images-amd64-tar-gz": {
|
||||
"url": "https://github.com/k3s-io/k3s/releases/download/v1.32.11%2Bk3s1/k3s-airgap-images-amd64.tar.gz",
|
||||
"sha256": "6dfe83a7d8984a5fe6be63a429698ce3fc61761ce68e3f4f2c6f3ff96a349f37"
|
||||
"url": "https://github.com/k3s-io/k3s/releases/download/v1.32.11%2Bk3s3/k3s-airgap-images-amd64.tar.gz",
|
||||
"sha256": "572f512cc0bdf89213d2c532e6182d4a291663bb38a51beb57197bf3fb67dd47"
|
||||
},
|
||||
"airgap-images-amd64-tar-zst": {
|
||||
"url": "https://github.com/k3s-io/k3s/releases/download/v1.32.11%2Bk3s1/k3s-airgap-images-amd64.tar.zst",
|
||||
"sha256": "9b6a7ea64b7b14a6c43613e4e170902e99c600857265875282f8d4b9dfefa6f4"
|
||||
"url": "https://github.com/k3s-io/k3s/releases/download/v1.32.11%2Bk3s3/k3s-airgap-images-amd64.tar.zst",
|
||||
"sha256": "a65a1ed1cf081285d4c32ed3989d95cb0a4d90209e99a8765b65d41b02ea059d"
|
||||
},
|
||||
"airgap-images-arm-tar-gz": {
|
||||
"url": "https://github.com/k3s-io/k3s/releases/download/v1.32.11%2Bk3s1/k3s-airgap-images-arm.tar.gz",
|
||||
"sha256": "cbda428d59a8593267343fb32ad985bf2125f45860425f9b7b31bbea9d305046"
|
||||
"url": "https://github.com/k3s-io/k3s/releases/download/v1.32.11%2Bk3s3/k3s-airgap-images-arm.tar.gz",
|
||||
"sha256": "ffaee35854e9bfa6f34fae0a7a2ff81e8909cfb2d5a5bd65df89c03a1ceb1b3a"
|
||||
},
|
||||
"airgap-images-arm-tar-zst": {
|
||||
"url": "https://github.com/k3s-io/k3s/releases/download/v1.32.11%2Bk3s1/k3s-airgap-images-arm.tar.zst",
|
||||
"sha256": "b1a253aab260beabea305517d8d57cce4594d2e071320d5700d389b29eb3c196"
|
||||
"url": "https://github.com/k3s-io/k3s/releases/download/v1.32.11%2Bk3s3/k3s-airgap-images-arm.tar.zst",
|
||||
"sha256": "b92568a2fa8683a5abd29c151d12f2737bf7ac961dfa615a2fa891a66f2d23cf"
|
||||
},
|
||||
"airgap-images-arm64-tar-gz": {
|
||||
"url": "https://github.com/k3s-io/k3s/releases/download/v1.32.11%2Bk3s1/k3s-airgap-images-arm64.tar.gz",
|
||||
"sha256": "0f6e598bf90b9ced4f1f758db6b0d7f8afbf9b5973d801d8a743c5b27ac3b748"
|
||||
"url": "https://github.com/k3s-io/k3s/releases/download/v1.32.11%2Bk3s3/k3s-airgap-images-arm64.tar.gz",
|
||||
"sha256": "cc99b0211110b8dc14c47cde0fe9b93b7e36c2ead64286412a896f6aa8a722cf"
|
||||
},
|
||||
"airgap-images-arm64-tar-zst": {
|
||||
"url": "https://github.com/k3s-io/k3s/releases/download/v1.32.11%2Bk3s1/k3s-airgap-images-arm64.tar.zst",
|
||||
"sha256": "297beda34a0a2a7ff727fced94dba6f999636a4e9b2cdd6e30840cc0e746a4ee"
|
||||
"url": "https://github.com/k3s-io/k3s/releases/download/v1.32.11%2Bk3s3/k3s-airgap-images-arm64.tar.zst",
|
||||
"sha256": "a7ab99f7e2a6cf6ecc833c8ba67ba154b3ff186c58d574fa4bbda2e70dcb55f7"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,20 +1,20 @@
|
||||
{
|
||||
k3sVersion = "1.32.11+k3s1";
|
||||
k3sCommit = "8119508834f2503e3c7bace3125f5db6b038d377";
|
||||
k3sRepoSha256 = "0fni4sh3a5flyrli7xxd9zxj9sh75kv79msy3zkfbgjxqz7rg4v9";
|
||||
k3sVendorHash = "sha256-8gzvad5Cpkatc8158m9FBGnkGEbajn30alSPlzhor0E=";
|
||||
k3sVersion = "1.32.11+k3s3";
|
||||
k3sCommit = "c9aa1d2889a003715698542826c2af94160ac2e5";
|
||||
k3sRepoSha256 = "0fi634dnsghjwnp07h6jhknccqlr9n5g3l34sipc41vvfmn4b0k8";
|
||||
k3sVendorHash = "sha256-qbmqzsd8oMQSFCh7HvjDiYds5gLEIGjjcv4EJbgxfJI=";
|
||||
chartVersions = import ./chart-versions.nix;
|
||||
imagesVersions = builtins.fromJSON (builtins.readFile ./images-versions.json);
|
||||
k3sRootVersion = "0.15.0";
|
||||
k3sRootSha256 = "008n8xx7x36y9y4r24hx39xagf1dxbp3pqq2j53s9zkaiqc62hd0";
|
||||
k3sCNIVersion = "1.8.0-k3s1";
|
||||
k3sCNISha256 = "04xig5spp81l81781ixmk99ghiz8lk0p16zhcbja5mslfdjmc7vg";
|
||||
k3sCNIVersion = "1.9.0-k3s1";
|
||||
k3sCNISha256 = "0naqf3jkxz3rd9ljd40wbm8walgi2bx6d1l9wr6mcvrgj7d5g28c";
|
||||
containerdVersion = "2.1.5-k3s1.32";
|
||||
containerdSha256 = "1fzld9q0ycfg9b3054qg70mif1p6i7xqikcbabrmxapk81fy83kn";
|
||||
containerdPackage = "github.com/k3s-io/containerd/v2";
|
||||
criCtlVersion = "1.31.0-k3s2";
|
||||
flannelVersion = "v0.27.4";
|
||||
flannelPluginVersion = "v1.8.0-flannel1";
|
||||
flannelVersion = "v0.28.0";
|
||||
flannelPluginVersion = "v1.9.0-flannel1";
|
||||
kubeRouterVersion = "v2.6.3-k3s1";
|
||||
criDockerdVersion = "v0.3.19-k3s2.32";
|
||||
helmJobVersion = "v0.9.12-build20251215";
|
||||
|
||||
@@ -1,10 +1,10 @@
|
||||
{
|
||||
traefik-crd = {
|
||||
url = "https://k3s.io/k3s-charts/assets/traefik-crd/traefik-crd-37.1.1+up37.1.0.tgz";
|
||||
sha256 = "0q568ffjhxmw87fzwafxlxrzx2lgcqlqbwj87pbc2xszh9pyakyd";
|
||||
url = "https://k3s.io/k3s-charts/assets/traefik-crd/traefik-crd-38.0.201+up38.0.2.tgz";
|
||||
sha256 = "1fxkdmk859nwn0x9iq0abdwb16njsang7257ppaj9s1if06fsncd";
|
||||
};
|
||||
traefik = {
|
||||
url = "https://k3s.io/k3s-charts/assets/traefik/traefik-37.1.1+up37.1.0.tgz";
|
||||
sha256 = "0gpcr6zfbncvp2sjjwzg732k4xfr5ba0pbc5x08lgwvibqpp4r27";
|
||||
url = "https://k3s.io/k3s-charts/assets/traefik/traefik-38.0.201+up38.0.2.tgz";
|
||||
sha256 = "16kzjy8dgswn4jfx62dn2ihmgpkzcfvjv6ync9zdi397fz32mqjv";
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,26 +1,26 @@
|
||||
{
|
||||
"airgap-images-amd64-tar-gz": {
|
||||
"url": "https://github.com/k3s-io/k3s/releases/download/v1.33.7%2Bk3s1/k3s-airgap-images-amd64.tar.gz",
|
||||
"sha256": "47644f3141878535a1951fdaf03bc485001b50a58b8fb58d97c75c49ea38a1f0"
|
||||
"url": "https://github.com/k3s-io/k3s/releases/download/v1.33.7%2Bk3s3/k3s-airgap-images-amd64.tar.gz",
|
||||
"sha256": "130a3b3e51947b7a0beffca422b85c2d3fbe78b1163a0fc069871877021123d3"
|
||||
},
|
||||
"airgap-images-amd64-tar-zst": {
|
||||
"url": "https://github.com/k3s-io/k3s/releases/download/v1.33.7%2Bk3s1/k3s-airgap-images-amd64.tar.zst",
|
||||
"sha256": "9b6a7ea64b7b14a6c43613e4e170902e99c600857265875282f8d4b9dfefa6f4"
|
||||
"url": "https://github.com/k3s-io/k3s/releases/download/v1.33.7%2Bk3s3/k3s-airgap-images-amd64.tar.zst",
|
||||
"sha256": "b0d7062008fa7fcad9ad7c6b60f74ae1c561927dbb5a4105433f5afbd091361b"
|
||||
},
|
||||
"airgap-images-arm-tar-gz": {
|
||||
"url": "https://github.com/k3s-io/k3s/releases/download/v1.33.7%2Bk3s1/k3s-airgap-images-arm.tar.gz",
|
||||
"sha256": "ee76f65f39a0ca12bbaa6bf9fdd5dc161b553b15a5746d47795cf0113916c063"
|
||||
"url": "https://github.com/k3s-io/k3s/releases/download/v1.33.7%2Bk3s3/k3s-airgap-images-arm.tar.gz",
|
||||
"sha256": "6451f4bd29b4ab76dcbfa520d907425976a04e9d5044b969e81fa2dfdc085c20"
|
||||
},
|
||||
"airgap-images-arm-tar-zst": {
|
||||
"url": "https://github.com/k3s-io/k3s/releases/download/v1.33.7%2Bk3s1/k3s-airgap-images-arm.tar.zst",
|
||||
"sha256": "b1a253aab260beabea305517d8d57cce4594d2e071320d5700d389b29eb3c196"
|
||||
"url": "https://github.com/k3s-io/k3s/releases/download/v1.33.7%2Bk3s3/k3s-airgap-images-arm.tar.zst",
|
||||
"sha256": "03a165ad40d022616281fbf329bcfa546b9245a9f431d1c362b86faff72d83dd"
|
||||
},
|
||||
"airgap-images-arm64-tar-gz": {
|
||||
"url": "https://github.com/k3s-io/k3s/releases/download/v1.33.7%2Bk3s1/k3s-airgap-images-arm64.tar.gz",
|
||||
"sha256": "a2f534291abd4d6491dc669b46e437df1fe0cd7b573485ec30aa813510b22635"
|
||||
"url": "https://github.com/k3s-io/k3s/releases/download/v1.33.7%2Bk3s3/k3s-airgap-images-arm64.tar.gz",
|
||||
"sha256": "6243a503de28c17f4b1b16018237a5008bc99983dc3b3b87ed2a1fe790d9e211"
|
||||
},
|
||||
"airgap-images-arm64-tar-zst": {
|
||||
"url": "https://github.com/k3s-io/k3s/releases/download/v1.33.7%2Bk3s1/k3s-airgap-images-arm64.tar.zst",
|
||||
"sha256": "87db88828e43179ef30a17ba66b416a3e398c4a00673908bd8d39ae4996ce300"
|
||||
"url": "https://github.com/k3s-io/k3s/releases/download/v1.33.7%2Bk3s3/k3s-airgap-images-arm64.tar.zst",
|
||||
"sha256": "74713adf726f6b407330b93e252b7a8e0a85204137c8a6f61b66f681b5761c42"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,20 +1,20 @@
|
||||
{
|
||||
k3sVersion = "1.33.7+k3s1";
|
||||
k3sCommit = "0b396d3f7f26e0c2ae5b6a114383830f533938c2";
|
||||
k3sRepoSha256 = "0jkvm7c333zazabsxrjl6wkdsni1m5g5gamriyyf53lly9935wsf";
|
||||
k3sVendorHash = "sha256-HpgcO/mUo64mkH38sAURnLOmXdXmHh3o6iDKtQeUt/E=";
|
||||
k3sVersion = "1.33.7+k3s3";
|
||||
k3sCommit = "1288e778af2a8ae295c47c213a3d13abd2969cde";
|
||||
k3sRepoSha256 = "07274x0d0q7cn6x5g8d0zbyf67axrmchhngsjsp3plskyr313hcy";
|
||||
k3sVendorHash = "sha256-XlZFYEGqoDGFlLJYRJDDoRPWuptFYkZT6axergChFN4=";
|
||||
chartVersions = import ./chart-versions.nix;
|
||||
imagesVersions = builtins.fromJSON (builtins.readFile ./images-versions.json);
|
||||
k3sRootVersion = "0.15.0";
|
||||
k3sRootSha256 = "008n8xx7x36y9y4r24hx39xagf1dxbp3pqq2j53s9zkaiqc62hd0";
|
||||
k3sCNIVersion = "1.8.0-k3s1";
|
||||
k3sCNISha256 = "04xig5spp81l81781ixmk99ghiz8lk0p16zhcbja5mslfdjmc7vg";
|
||||
k3sCNIVersion = "1.9.0-k3s1";
|
||||
k3sCNISha256 = "0naqf3jkxz3rd9ljd40wbm8walgi2bx6d1l9wr6mcvrgj7d5g28c";
|
||||
containerdVersion = "2.1.5-k3s1.33";
|
||||
containerdSha256 = "15iw6px3710rlsx7j933i07qd4a2r7caagfjbhhfcp33m9k19v7h";
|
||||
containerdPackage = "github.com/k3s-io/containerd/v2";
|
||||
criCtlVersion = "1.33.0-k3s2";
|
||||
flannelVersion = "v0.27.4";
|
||||
flannelPluginVersion = "v1.8.0-flannel1";
|
||||
flannelVersion = "v0.28.0";
|
||||
flannelPluginVersion = "v1.9.0-flannel1";
|
||||
kubeRouterVersion = "v2.6.3-k3s1";
|
||||
criDockerdVersion = "v0.3.19-k3s2";
|
||||
helmJobVersion = "v0.9.12-build20251215";
|
||||
|
||||
@@ -1,10 +1,10 @@
|
||||
{
|
||||
traefik-crd = {
|
||||
url = "https://k3s.io/k3s-charts/assets/traefik-crd/traefik-crd-37.1.1+up37.1.0.tgz";
|
||||
sha256 = "0q568ffjhxmw87fzwafxlxrzx2lgcqlqbwj87pbc2xszh9pyakyd";
|
||||
url = "https://k3s.io/k3s-charts/assets/traefik-crd/traefik-crd-38.0.201+up38.0.2.tgz";
|
||||
sha256 = "1fxkdmk859nwn0x9iq0abdwb16njsang7257ppaj9s1if06fsncd";
|
||||
};
|
||||
traefik = {
|
||||
url = "https://k3s.io/k3s-charts/assets/traefik/traefik-37.1.1+up37.1.0.tgz";
|
||||
sha256 = "0gpcr6zfbncvp2sjjwzg732k4xfr5ba0pbc5x08lgwvibqpp4r27";
|
||||
url = "https://k3s.io/k3s-charts/assets/traefik/traefik-38.0.201+up38.0.2.tgz";
|
||||
sha256 = "16kzjy8dgswn4jfx62dn2ihmgpkzcfvjv6ync9zdi397fz32mqjv";
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,26 +1,26 @@
|
||||
{
|
||||
"airgap-images-amd64-tar-gz": {
|
||||
"url": "https://github.com/k3s-io/k3s/releases/download/v1.34.3%2Bk3s1/k3s-airgap-images-amd64.tar.gz",
|
||||
"sha256": "499d7fb0b2eab200e9bf9b3935ce787a7fa0597933dce25ad091703933d6ecc8"
|
||||
"url": "https://github.com/k3s-io/k3s/releases/download/v1.34.3%2Bk3s3/k3s-airgap-images-amd64.tar.gz",
|
||||
"sha256": "696c2e10f511295f5e0e6281a2f22eec60b33962d45bc9117703db1ac887e981"
|
||||
},
|
||||
"airgap-images-amd64-tar-zst": {
|
||||
"url": "https://github.com/k3s-io/k3s/releases/download/v1.34.3%2Bk3s1/k3s-airgap-images-amd64.tar.zst",
|
||||
"sha256": "b8dff3265568e1be66ab72ac0ded68bd266fa37a32c010f1253dba6547a49ce8"
|
||||
"url": "https://github.com/k3s-io/k3s/releases/download/v1.34.3%2Bk3s3/k3s-airgap-images-amd64.tar.zst",
|
||||
"sha256": "4805a6c4bfdfd20d3ad42bc14c79e00662739aca275e6a37cd8f3a406fae0f0a"
|
||||
},
|
||||
"airgap-images-arm-tar-gz": {
|
||||
"url": "https://github.com/k3s-io/k3s/releases/download/v1.34.3%2Bk3s1/k3s-airgap-images-arm.tar.gz",
|
||||
"sha256": "170db25228c873741f895fced05f0e5bdbbddb8ffeb5e0342a5b8e44f3c28757"
|
||||
"url": "https://github.com/k3s-io/k3s/releases/download/v1.34.3%2Bk3s3/k3s-airgap-images-arm.tar.gz",
|
||||
"sha256": "a4bc850fcf9b73bf0f45d4a1f50bd612e52d77daa5de5020589e7f99e5d1a3e6"
|
||||
},
|
||||
"airgap-images-arm-tar-zst": {
|
||||
"url": "https://github.com/k3s-io/k3s/releases/download/v1.34.3%2Bk3s1/k3s-airgap-images-arm.tar.zst",
|
||||
"sha256": "27407fd1553c89b8ccd3b45ad0fbdcd483c1a010e7b28b60b24a8e73b58aa783"
|
||||
"url": "https://github.com/k3s-io/k3s/releases/download/v1.34.3%2Bk3s3/k3s-airgap-images-arm.tar.zst",
|
||||
"sha256": "a1b0ac3a00f409fa51e196ea9db5f2282efff00a282ab797bf49b29453bb1379"
|
||||
},
|
||||
"airgap-images-arm64-tar-gz": {
|
||||
"url": "https://github.com/k3s-io/k3s/releases/download/v1.34.3%2Bk3s1/k3s-airgap-images-arm64.tar.gz",
|
||||
"sha256": "e67cddf839571cd489aef44acb2aca82285a9789a170c1a44d51b7f8b6129883"
|
||||
"url": "https://github.com/k3s-io/k3s/releases/download/v1.34.3%2Bk3s3/k3s-airgap-images-arm64.tar.gz",
|
||||
"sha256": "ceea4427499fb39be0bff18f840cf80a091f63e88421bc89fdfceb8017aab59b"
|
||||
},
|
||||
"airgap-images-arm64-tar-zst": {
|
||||
"url": "https://github.com/k3s-io/k3s/releases/download/v1.34.3%2Bk3s1/k3s-airgap-images-arm64.tar.zst",
|
||||
"sha256": "b6cb3c06f19859d3a5fba54b305097e89d2a86b5bce9e8360a46b9d2e67da565"
|
||||
"url": "https://github.com/k3s-io/k3s/releases/download/v1.34.3%2Bk3s3/k3s-airgap-images-arm64.tar.zst",
|
||||
"sha256": "e0cec00a1c19c8c6f7fde7005e325d285f23ff43752cce9ce0796ccb10e9582a"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,20 +1,20 @@
|
||||
{
|
||||
k3sVersion = "1.34.3+k3s1";
|
||||
k3sCommit = "48ffa7b6893f21b919b3029d54c9d9838ae426a1";
|
||||
k3sRepoSha256 = "1177kzbhp6ihb7dzfdi1a0idgp69y1hwh6wnwvdx1fnivg2gj7aw";
|
||||
k3sVendorHash = "sha256-dp8SU24nuy3WmG1Zln/J2nVHnVQmVyN78FBOSxNjbF8=";
|
||||
k3sVersion = "1.34.3+k3s3";
|
||||
k3sCommit = "2975fb0973ca47f54b1aa2a8c3a976a779f52349";
|
||||
k3sRepoSha256 = "0bvccp573xihzbnkd3n6xldcxpnlwiz9b5p0fw6sxv69m7jaac2f";
|
||||
k3sVendorHash = "sha256-R8QXwXmTKsONsbWaedFNDPdYZ82jaQ/T8S9sllqKPjk=";
|
||||
chartVersions = import ./chart-versions.nix;
|
||||
imagesVersions = builtins.fromJSON (builtins.readFile ./images-versions.json);
|
||||
k3sRootVersion = "0.15.0";
|
||||
k3sRootSha256 = "008n8xx7x36y9y4r24hx39xagf1dxbp3pqq2j53s9zkaiqc62hd0";
|
||||
k3sCNIVersion = "1.8.0-k3s1";
|
||||
k3sCNISha256 = "04xig5spp81l81781ixmk99ghiz8lk0p16zhcbja5mslfdjmc7vg";
|
||||
k3sCNIVersion = "1.9.0-k3s1";
|
||||
k3sCNISha256 = "0naqf3jkxz3rd9ljd40wbm8walgi2bx6d1l9wr6mcvrgj7d5g28c";
|
||||
containerdVersion = "2.1.5-k3s1";
|
||||
containerdSha256 = "0n0g58d352i8wz0bqn87vgrd7z54j268cbmbp19fz68wmifm7fl8";
|
||||
containerdPackage = "github.com/k3s-io/containerd/v2";
|
||||
criCtlVersion = "1.34.0-k3s2";
|
||||
flannelVersion = "v0.27.4";
|
||||
flannelPluginVersion = "v1.8.0-flannel1";
|
||||
flannelVersion = "v0.28.0";
|
||||
flannelPluginVersion = "v1.9.0-flannel1";
|
||||
kubeRouterVersion = "v2.6.3-k3s1";
|
||||
criDockerdVersion = "v0.3.19-k3s3";
|
||||
helmJobVersion = "v0.9.12-build20251215";
|
||||
|
||||
@@ -1,10 +1,10 @@
|
||||
{
|
||||
traefik-crd = {
|
||||
url = "https://k3s.io/k3s-charts/assets/traefik-crd/traefik-crd-37.1.1+up37.1.0.tgz";
|
||||
sha256 = "0q568ffjhxmw87fzwafxlxrzx2lgcqlqbwj87pbc2xszh9pyakyd";
|
||||
url = "https://k3s.io/k3s-charts/assets/traefik-crd/traefik-crd-38.0.201+up38.0.2.tgz";
|
||||
sha256 = "1fxkdmk859nwn0x9iq0abdwb16njsang7257ppaj9s1if06fsncd";
|
||||
};
|
||||
traefik = {
|
||||
url = "https://k3s.io/k3s-charts/assets/traefik/traefik-37.1.1+up37.1.0.tgz";
|
||||
sha256 = "0gpcr6zfbncvp2sjjwzg732k4xfr5ba0pbc5x08lgwvibqpp4r27";
|
||||
url = "https://k3s.io/k3s-charts/assets/traefik/traefik-38.0.201+up38.0.2.tgz";
|
||||
sha256 = "16kzjy8dgswn4jfx62dn2ihmgpkzcfvjv6ync9zdi397fz32mqjv";
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,26 +1,26 @@
|
||||
{
|
||||
"airgap-images-amd64-tar-gz": {
|
||||
"url": "https://github.com/k3s-io/k3s/releases/download/v1.35.0%2Bk3s1/k3s-airgap-images-amd64.tar.gz",
|
||||
"sha256": "af7ce67f0a8c457618a492ba995cc645d8ad13512008b88db97719941c39389a"
|
||||
"url": "https://github.com/k3s-io/k3s/releases/download/v1.35.0%2Bk3s3/k3s-airgap-images-amd64.tar.gz",
|
||||
"sha256": "8a1c1f25d62d3395fbb2b37d55cf3d836ca4bc68e6358d21b6573f42d295c6f0"
|
||||
},
|
||||
"airgap-images-amd64-tar-zst": {
|
||||
"url": "https://github.com/k3s-io/k3s/releases/download/v1.35.0%2Bk3s1/k3s-airgap-images-amd64.tar.zst",
|
||||
"sha256": "2e3d6d14bbbeb8c16f1849cca8da48887c5a7ddceb1cc2bf60be63e4fa8c63f3"
|
||||
"url": "https://github.com/k3s-io/k3s/releases/download/v1.35.0%2Bk3s3/k3s-airgap-images-amd64.tar.zst",
|
||||
"sha256": "4805a6c4bfdfd20d3ad42bc14c79e00662739aca275e6a37cd8f3a406fae0f0a"
|
||||
},
|
||||
"airgap-images-arm-tar-gz": {
|
||||
"url": "https://github.com/k3s-io/k3s/releases/download/v1.35.0%2Bk3s1/k3s-airgap-images-arm.tar.gz",
|
||||
"sha256": "82cf1310db1bfac5733c5c16864034c6c7c7affc60c39be610ce7cf169631ef5"
|
||||
"url": "https://github.com/k3s-io/k3s/releases/download/v1.35.0%2Bk3s3/k3s-airgap-images-arm.tar.gz",
|
||||
"sha256": "8659dda950ab0ddff37b2c8d59f527489e1accde30f652b6c3b434385825b8b5"
|
||||
},
|
||||
"airgap-images-arm-tar-zst": {
|
||||
"url": "https://github.com/k3s-io/k3s/releases/download/v1.35.0%2Bk3s1/k3s-airgap-images-arm.tar.zst",
|
||||
"sha256": "27407fd1553c89b8ccd3b45ad0fbdcd483c1a010e7b28b60b24a8e73b58aa783"
|
||||
"url": "https://github.com/k3s-io/k3s/releases/download/v1.35.0%2Bk3s3/k3s-airgap-images-arm.tar.zst",
|
||||
"sha256": "fab2006d48153f278332504c1aa8b03e5683c14924f66ecbd5eeb7db3a5dedd9"
|
||||
},
|
||||
"airgap-images-arm64-tar-gz": {
|
||||
"url": "https://github.com/k3s-io/k3s/releases/download/v1.35.0%2Bk3s1/k3s-airgap-images-arm64.tar.gz",
|
||||
"sha256": "cb3d24f44c9f29da3421e99db0801f2a30b3e16c7032c423a9b631c0fc66a5fa"
|
||||
"url": "https://github.com/k3s-io/k3s/releases/download/v1.35.0%2Bk3s3/k3s-airgap-images-arm64.tar.gz",
|
||||
"sha256": "ec9a3d8b04445afe24093dd0f4e65a1da6b3a5d73f3c739746aaa8ec0aaa03cb"
|
||||
},
|
||||
"airgap-images-arm64-tar-zst": {
|
||||
"url": "https://github.com/k3s-io/k3s/releases/download/v1.35.0%2Bk3s1/k3s-airgap-images-arm64.tar.zst",
|
||||
"sha256": "b6cb3c06f19859d3a5fba54b305097e89d2a86b5bce9e8360a46b9d2e67da565"
|
||||
"url": "https://github.com/k3s-io/k3s/releases/download/v1.35.0%2Bk3s3/k3s-airgap-images-arm64.tar.zst",
|
||||
"sha256": "4c6a31ffa5bc267986f47f36396c51232f55b5db22253630bf7e8b48ea41084f"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,20 +1,20 @@
|
||||
{
|
||||
k3sVersion = "1.35.0+k3s1";
|
||||
k3sCommit = "a6c6cd15c0c42ec9fce21f8ad5f42aa74fddb4f2";
|
||||
k3sRepoSha256 = "0033m0vbysy2bcjfmam387580j1cmq6cys8diismgf8m5s64nivb";
|
||||
k3sVendorHash = "sha256-S9GkT87C8qbuefH93Y6d0Y95NNuT6paNdDkmSDllFIY=";
|
||||
k3sVersion = "1.35.0+k3s3";
|
||||
k3sCommit = "323b95245012f0d56a863d8c23964399814191c2";
|
||||
k3sRepoSha256 = "1h6az9xj074pj8s60p2yw9gbqz2dabrxvrq41igcw0nq7ymcwaaz";
|
||||
k3sVendorHash = "sha256-4Qs03mrOJBxsyQe4RrDG9vvS23JwjUPhPec/TebS4Yw=";
|
||||
chartVersions = import ./chart-versions.nix;
|
||||
imagesVersions = builtins.fromJSON (builtins.readFile ./images-versions.json);
|
||||
k3sRootVersion = "0.15.0";
|
||||
k3sRootSha256 = "008n8xx7x36y9y4r24hx39xagf1dxbp3pqq2j53s9zkaiqc62hd0";
|
||||
k3sCNIVersion = "1.8.0-k3s1";
|
||||
k3sCNISha256 = "04xig5spp81l81781ixmk99ghiz8lk0p16zhcbja5mslfdjmc7vg";
|
||||
k3sCNIVersion = "1.9.0-k3s1";
|
||||
k3sCNISha256 = "0naqf3jkxz3rd9ljd40wbm8walgi2bx6d1l9wr6mcvrgj7d5g28c";
|
||||
containerdVersion = "2.1.5-k3s1";
|
||||
containerdSha256 = "0n0g58d352i8wz0bqn87vgrd7z54j268cbmbp19fz68wmifm7fl8";
|
||||
containerdPackage = "github.com/k3s-io/containerd/v2";
|
||||
criCtlVersion = "1.35.0-k3s2";
|
||||
flannelVersion = "v0.27.4";
|
||||
flannelPluginVersion = "v1.8.0-flannel1";
|
||||
flannelVersion = "v0.28.0";
|
||||
flannelPluginVersion = "v1.9.0-flannel1";
|
||||
kubeRouterVersion = "v2.6.3-k3s1";
|
||||
criDockerdVersion = "v0.3.19-k3s3";
|
||||
helmJobVersion = "v0.9.12-build20251215";
|
||||
|
||||
@@ -45,13 +45,13 @@
|
||||
"vendorHash": "sha256-6sVapd0vqL4xGLqTQS4zQIlnMA8HRmjufDi1lOgldlU="
|
||||
},
|
||||
"aliyun_alicloud": {
|
||||
"hash": "sha256-JcNbhR9qeakHWTDu4tF3Sl2G5zfcohNEsK87znI5hiM=",
|
||||
"hash": "sha256-NL2UmL4wLBbdT5DW7uGYOBQwPN0nQUP54gtFwc2PcB8=",
|
||||
"homepage": "https://registry.terraform.io/providers/aliyun/alicloud",
|
||||
"owner": "aliyun",
|
||||
"repo": "terraform-provider-alicloud",
|
||||
"rev": "v1.269.0",
|
||||
"rev": "v1.270.0",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-ogQLStDbsM0aRf4QIbITB8Z+L9DUtZwoAPK6T4xylXI="
|
||||
"vendorHash": "sha256-Hvk2jckla1LcMankcdUTct8Kea0OznyxDxTJ+UrJHy0="
|
||||
},
|
||||
"aminueza_minio": {
|
||||
"hash": "sha256-rgrX08mO99cl95YTW0rqFH/jJhyxMr/DSIEL5Wg9R9s=",
|
||||
|
||||
@@ -32,17 +32,17 @@
|
||||
libpulseaudio,
|
||||
libuuid,
|
||||
libva,
|
||||
libX11,
|
||||
libXScrnSaver,
|
||||
libXcomposite,
|
||||
libXcursor,
|
||||
libXdamage,
|
||||
libXext,
|
||||
libXfixes,
|
||||
libXi,
|
||||
libXrandr,
|
||||
libXrender,
|
||||
libXtst,
|
||||
libx11,
|
||||
libxscrnsaver,
|
||||
libxcomposite,
|
||||
libxcursor,
|
||||
libxdamage,
|
||||
libxext,
|
||||
libxfixes,
|
||||
libxi,
|
||||
libxrandr,
|
||||
libxrender,
|
||||
libxtst,
|
||||
libxcb,
|
||||
libxshmfence,
|
||||
libgbm,
|
||||
@@ -116,10 +116,10 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
cups
|
||||
libdrm
|
||||
libuuid
|
||||
libXdamage
|
||||
libX11
|
||||
libXScrnSaver
|
||||
libXtst
|
||||
libxdamage
|
||||
libx11
|
||||
libxscrnsaver
|
||||
libxtst
|
||||
libxcb
|
||||
libxshmfence
|
||||
libgbm
|
||||
@@ -153,24 +153,24 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
gtk3
|
||||
libglvnd
|
||||
libnotify
|
||||
libX11
|
||||
libXcomposite
|
||||
libx11
|
||||
libxcomposite
|
||||
libunity
|
||||
libuuid
|
||||
libva
|
||||
libXcursor
|
||||
libXdamage
|
||||
libXext
|
||||
libXfixes
|
||||
libXi
|
||||
libXrandr
|
||||
libXrender
|
||||
libXtst
|
||||
libxcursor
|
||||
libxdamage
|
||||
libxext
|
||||
libxfixes
|
||||
libxi
|
||||
libxrandr
|
||||
libxrender
|
||||
libxtst
|
||||
nspr
|
||||
libxcb
|
||||
pango
|
||||
pipewire
|
||||
libXScrnSaver
|
||||
libxscrnsaver
|
||||
libappindicator-gtk3
|
||||
libdbusmenu
|
||||
wayland
|
||||
|
||||
@@ -5,8 +5,8 @@
|
||||
glew,
|
||||
gsm,
|
||||
lib,
|
||||
libX11,
|
||||
libXext,
|
||||
libx11,
|
||||
libxext,
|
||||
libopus,
|
||||
libpulseaudio,
|
||||
libsForQt5,
|
||||
@@ -47,8 +47,8 @@ mkLinphoneDerivation (finalAttrs: {
|
||||
|
||||
ffmpeg_4
|
||||
glew
|
||||
libX11
|
||||
libXext
|
||||
libx11
|
||||
libxext
|
||||
libpulseaudio
|
||||
libv4l
|
||||
speex
|
||||
|
||||
@@ -18,8 +18,8 @@
|
||||
lib,
|
||||
libice,
|
||||
libsm,
|
||||
libXScrnSaver,
|
||||
libXext,
|
||||
libxscrnsaver,
|
||||
libxext,
|
||||
libgcrypt,
|
||||
libgnt,
|
||||
libidn,
|
||||
@@ -76,8 +76,8 @@ let
|
||||
gst_all_1.gstreamer
|
||||
libice
|
||||
libsm
|
||||
libXScrnSaver
|
||||
libXext
|
||||
libxscrnsaver
|
||||
libxext
|
||||
libgnt
|
||||
libidn
|
||||
libstartup_notification
|
||||
|
||||
@@ -20,8 +20,8 @@
|
||||
readline,
|
||||
sqlite,
|
||||
autoAwaySupport ? true,
|
||||
libXScrnSaver,
|
||||
libX11,
|
||||
libxscrnsaver,
|
||||
libx11,
|
||||
notifySupport ? true,
|
||||
libnotify,
|
||||
gdk-pixbuf,
|
||||
@@ -77,8 +77,8 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
sqlite
|
||||
]
|
||||
++ lib.optionals autoAwaySupport [
|
||||
libXScrnSaver
|
||||
libX11
|
||||
libxscrnsaver
|
||||
libx11
|
||||
]
|
||||
++ lib.optionals notifySupport [
|
||||
libnotify
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
qttools,
|
||||
libidn,
|
||||
qca-qt5,
|
||||
libXScrnSaver,
|
||||
libxscrnsaver,
|
||||
hunspell,
|
||||
libsecret,
|
||||
libgcrypt,
|
||||
@@ -77,7 +77,7 @@ stdenv.mkDerivation rec {
|
||||
qtx11extras
|
||||
libidn
|
||||
qca-qt5
|
||||
libXScrnSaver
|
||||
libxscrnsaver
|
||||
hunspell
|
||||
libsecret
|
||||
libgcrypt
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
qtwebengine,
|
||||
libidn,
|
||||
qca-qt5,
|
||||
libXScrnSaver,
|
||||
libxscrnsaver,
|
||||
hunspell,
|
||||
}:
|
||||
|
||||
@@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
|
||||
qtwebengine
|
||||
libidn
|
||||
qca-qt5
|
||||
libXScrnSaver
|
||||
libxscrnsaver
|
||||
hunspell
|
||||
];
|
||||
|
||||
|
||||
@@ -13,14 +13,14 @@
|
||||
openh264,
|
||||
crc32c,
|
||||
libvpx,
|
||||
libX11,
|
||||
libXtst,
|
||||
libXcomposite,
|
||||
libXdamage,
|
||||
libXext,
|
||||
libXrender,
|
||||
libXrandr,
|
||||
libXi,
|
||||
libx11,
|
||||
libxtst,
|
||||
libxcomposite,
|
||||
libxdamage,
|
||||
libxext,
|
||||
libxrender,
|
||||
libxrandr,
|
||||
libxi,
|
||||
glib,
|
||||
abseil-cpp,
|
||||
pipewire,
|
||||
@@ -80,14 +80,14 @@ stdenv.mkDerivation {
|
||||
abseil-cpp
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isLinux [
|
||||
libX11
|
||||
libXtst
|
||||
libXcomposite
|
||||
libXdamage
|
||||
libXext
|
||||
libXrender
|
||||
libXrandr
|
||||
libXi
|
||||
libx11
|
||||
libxtst
|
||||
libxcomposite
|
||||
libxdamage
|
||||
libxext
|
||||
libxrender
|
||||
libxrandr
|
||||
libxi
|
||||
glib
|
||||
pipewire
|
||||
libgbm
|
||||
|
||||
@@ -11,8 +11,8 @@
|
||||
cmake,
|
||||
openssl,
|
||||
xorgproto,
|
||||
libX11,
|
||||
libXScrnSaver,
|
||||
libx11,
|
||||
libxscrnsaver,
|
||||
xz,
|
||||
zlib,
|
||||
}:
|
||||
@@ -39,8 +39,8 @@ stdenv.mkDerivation {
|
||||
qtwebkit
|
||||
openssl
|
||||
xorgproto
|
||||
libX11
|
||||
libXScrnSaver
|
||||
libx11
|
||||
libxscrnsaver
|
||||
xz
|
||||
zlib
|
||||
];
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
pkg-config,
|
||||
wrapQtAppsHook,
|
||||
bzip2,
|
||||
libX11,
|
||||
libx11,
|
||||
qtbase,
|
||||
qttools,
|
||||
qtmultimedia,
|
||||
@@ -51,7 +51,7 @@ stdenv.mkDerivation rec {
|
||||
qtmultimedia
|
||||
qtscript
|
||||
bzip2
|
||||
libX11
|
||||
libx11
|
||||
pcre-cpp
|
||||
libidn
|
||||
lua5
|
||||
|
||||
@@ -15,7 +15,7 @@
|
||||
libxslt,
|
||||
sqlcipher,
|
||||
rapidjson,
|
||||
libXScrnSaver,
|
||||
libxscrnsaver,
|
||||
qtbase,
|
||||
qtx11extras,
|
||||
qtmultimedia,
|
||||
@@ -62,7 +62,7 @@ stdenv.mkDerivation rec {
|
||||
qtbase
|
||||
libgnome-keyring
|
||||
bzip2
|
||||
libXScrnSaver
|
||||
libxscrnsaver
|
||||
libxml2
|
||||
libxslt
|
||||
sqlcipher
|
||||
|
||||
@@ -8,13 +8,13 @@
|
||||
dbus,
|
||||
getconf,
|
||||
glibc,
|
||||
libXrandr,
|
||||
libX11,
|
||||
libXext,
|
||||
libXdamage,
|
||||
libXtst,
|
||||
libxrandr,
|
||||
libx11,
|
||||
libxext,
|
||||
libxdamage,
|
||||
libxtst,
|
||||
libsm,
|
||||
libXfixes,
|
||||
libxfixes,
|
||||
coreutils,
|
||||
wrapQtAppsHook,
|
||||
icu63,
|
||||
@@ -126,13 +126,13 @@ stdenv.mkDerivation rec {
|
||||
}"
|
||||
"--prefix LD_LIBRARY_PATH : ${
|
||||
lib.makeLibraryPath [
|
||||
libXrandr
|
||||
libX11
|
||||
libXext
|
||||
libXdamage
|
||||
libXtst
|
||||
libxrandr
|
||||
libx11
|
||||
libxext
|
||||
libxdamage
|
||||
libxtst
|
||||
libsm
|
||||
libXfixes
|
||||
libxfixes
|
||||
dbus
|
||||
icu63
|
||||
]
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
qtwebkit,
|
||||
qtx11extras,
|
||||
lzo,
|
||||
libX11,
|
||||
libx11,
|
||||
wrapQtAppsHook,
|
||||
}:
|
||||
|
||||
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
|
||||
qtwebkit
|
||||
qtx11extras
|
||||
lzo
|
||||
libX11
|
||||
libx11
|
||||
];
|
||||
nativeBuildInputs = [
|
||||
qmake
|
||||
|
||||
@@ -11,11 +11,11 @@
|
||||
glib,
|
||||
gst_all_1,
|
||||
libGL,
|
||||
libX11,
|
||||
libXext,
|
||||
libXmu,
|
||||
libXrandr,
|
||||
libXrender,
|
||||
libx11,
|
||||
libxext,
|
||||
libxmu,
|
||||
libxrandr,
|
||||
libxrender,
|
||||
|
||||
# For fixing up execution of /bin/ls, which is necessary for
|
||||
# product unlocking.
|
||||
@@ -60,11 +60,11 @@ stdenv.mkDerivation {
|
||||
gst_all_1.gstreamer
|
||||
gst_all_1.gst-plugins-base
|
||||
libGL
|
||||
libX11
|
||||
libXext
|
||||
libXmu
|
||||
libXrandr
|
||||
libXrender
|
||||
libx11
|
||||
libxext
|
||||
libxmu
|
||||
libxrandr
|
||||
libxrender
|
||||
(lib.getLib stdenv.cc.cc)
|
||||
];
|
||||
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
libsndfile,
|
||||
libsamplerate,
|
||||
libpulseaudio,
|
||||
libXinerama,
|
||||
libxinerama,
|
||||
gettext,
|
||||
pkg-config,
|
||||
alsa-lib,
|
||||
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
buildInputs = [
|
||||
libXinerama
|
||||
libxinerama
|
||||
gettext
|
||||
hamlib
|
||||
fltk_1_3
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
libusb1,
|
||||
soapysdr,
|
||||
mesa_glu,
|
||||
libX11,
|
||||
libx11,
|
||||
gnuplot,
|
||||
fltk,
|
||||
withGui ? false,
|
||||
@@ -55,7 +55,7 @@ stdenv.mkDerivation rec {
|
||||
]
|
||||
++ lib.optionals withGui [
|
||||
fltk
|
||||
libX11
|
||||
libx11
|
||||
mesa_glu
|
||||
wxGTK32
|
||||
];
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
gtkglext,
|
||||
libjpeg_turbo,
|
||||
libtheora,
|
||||
libXmu,
|
||||
libxmu,
|
||||
lua,
|
||||
libGLU,
|
||||
libGL,
|
||||
@@ -52,7 +52,7 @@ stdenv.mkDerivation rec {
|
||||
perl
|
||||
libjpeg_turbo
|
||||
libtheora
|
||||
libXmu
|
||||
libxmu
|
||||
libGLU
|
||||
libGL
|
||||
];
|
||||
|
||||
@@ -4,12 +4,12 @@
|
||||
fetchurl,
|
||||
wrapQtAppsHook,
|
||||
makeDesktopItem,
|
||||
libXrender,
|
||||
libXrandr,
|
||||
libXcursor,
|
||||
libX11,
|
||||
libXext,
|
||||
libXi,
|
||||
libxrender,
|
||||
libxrandr,
|
||||
libxcursor,
|
||||
libx11,
|
||||
libxext,
|
||||
libxi,
|
||||
libxcb,
|
||||
libGL,
|
||||
glib,
|
||||
@@ -27,12 +27,12 @@
|
||||
|
||||
let
|
||||
libPath = lib.makeLibraryPath [
|
||||
libXrender
|
||||
libXrandr
|
||||
libXcursor
|
||||
libX11
|
||||
libXext
|
||||
libXi
|
||||
libxrender
|
||||
libxrandr
|
||||
libxcursor
|
||||
libx11
|
||||
libxext
|
||||
libxi
|
||||
libxcb
|
||||
libGL
|
||||
glib
|
||||
@@ -72,12 +72,12 @@ stdenv.mkDerivation rec {
|
||||
nativeBuildInputs = [ wrapQtAppsHook ];
|
||||
|
||||
buildInputs = [
|
||||
libXrender
|
||||
libXrandr
|
||||
libXcursor
|
||||
libX11
|
||||
libXext
|
||||
libXi
|
||||
libxrender
|
||||
libxrandr
|
||||
libxcursor
|
||||
libx11
|
||||
libxext
|
||||
libxi
|
||||
libxcb
|
||||
libGL
|
||||
glib
|
||||
|
||||
@@ -4,9 +4,9 @@
|
||||
fetchurl,
|
||||
bzip2,
|
||||
gfortran,
|
||||
libX11,
|
||||
libXmu,
|
||||
libXt,
|
||||
libx11,
|
||||
libxmu,
|
||||
libxt,
|
||||
libjpeg,
|
||||
libpng,
|
||||
libtiff,
|
||||
@@ -73,10 +73,10 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
buildInputs = [
|
||||
bzip2
|
||||
gfortran
|
||||
libX11
|
||||
libXmu
|
||||
libXt
|
||||
libXt
|
||||
libx11
|
||||
libxmu
|
||||
libxt
|
||||
libxt
|
||||
libjpeg
|
||||
libpng
|
||||
libtiff
|
||||
|
||||
@@ -4,11 +4,11 @@
|
||||
fetchurl,
|
||||
fetchpatch,
|
||||
makeDesktopItem,
|
||||
libX11,
|
||||
libXt,
|
||||
libXft,
|
||||
libXrender,
|
||||
libXext,
|
||||
libx11,
|
||||
libxt,
|
||||
libxft,
|
||||
libxrender,
|
||||
libxext,
|
||||
ncurses,
|
||||
fontconfig,
|
||||
freetype,
|
||||
@@ -66,18 +66,18 @@ stdenv.mkDerivation {
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [
|
||||
libX11
|
||||
libXt
|
||||
libXft
|
||||
libx11
|
||||
libxt
|
||||
libxft
|
||||
ncurses # required to build the terminfo file
|
||||
fontconfig
|
||||
freetype
|
||||
libXrender
|
||||
libxrender
|
||||
libptytty
|
||||
]
|
||||
++ lib.optionals perlSupport [
|
||||
perl
|
||||
libXext
|
||||
libxext
|
||||
]
|
||||
++ lib.optional gdkPixbufSupport gdk-pixbuf;
|
||||
|
||||
@@ -90,8 +90,6 @@ stdenv.mkDerivation {
|
||||
(
|
||||
if emojiSupport then
|
||||
[
|
||||
# the required patches to libXft are in nixpkgs by default, see
|
||||
# ../../../servers/x11/xorg/overrides.nix
|
||||
(fetchPatchFromAUR {
|
||||
name = "enable-wide-glyphs.patch";
|
||||
package = "rxvt-unicode-truecolor-wide-glyphs";
|
||||
|
||||
@@ -5,15 +5,15 @@
|
||||
dbus,
|
||||
fontconfig,
|
||||
gccForLibs,
|
||||
libX11,
|
||||
libXcomposite,
|
||||
libXcursor,
|
||||
libXdamage,
|
||||
libXext,
|
||||
libXi,
|
||||
libXrandr,
|
||||
libXrender,
|
||||
libXtst,
|
||||
libx11,
|
||||
libxcomposite,
|
||||
libxcursor,
|
||||
libxdamage,
|
||||
libxext,
|
||||
libxi,
|
||||
libxrandr,
|
||||
libxrender,
|
||||
libxtst,
|
||||
libinput,
|
||||
libxcb,
|
||||
libxkbcommon,
|
||||
@@ -47,15 +47,15 @@ let
|
||||
dbus
|
||||
fontconfig
|
||||
gccForLibs
|
||||
libX11
|
||||
libXcomposite
|
||||
libXcursor
|
||||
libXdamage
|
||||
libXext
|
||||
libXi
|
||||
libXrandr
|
||||
libXrender
|
||||
libXtst
|
||||
libx11
|
||||
libxcomposite
|
||||
libxcursor
|
||||
libxdamage
|
||||
libxext
|
||||
libxi
|
||||
libxrandr
|
||||
libxrender
|
||||
libxtst
|
||||
libinput
|
||||
libxcb
|
||||
libxkbcommon
|
||||
|
||||
@@ -14,9 +14,9 @@
|
||||
libcec,
|
||||
libftdi1,
|
||||
libusb1,
|
||||
libX11,
|
||||
libx11,
|
||||
libxcb,
|
||||
libXrandr,
|
||||
libxrandr,
|
||||
python3,
|
||||
qtbase,
|
||||
qtserialport,
|
||||
@@ -47,9 +47,9 @@ stdenv.mkDerivation rec {
|
||||
hidapi
|
||||
libftdi1
|
||||
libusb1
|
||||
libX11
|
||||
libx11
|
||||
libxcb
|
||||
libXrandr
|
||||
libxrandr
|
||||
flatbuffers
|
||||
protobuf
|
||||
mbedtls
|
||||
|
||||
@@ -14,7 +14,7 @@
|
||||
mpvqt,
|
||||
libcec,
|
||||
SDL2,
|
||||
libXrandr,
|
||||
libxrandr,
|
||||
cacert,
|
||||
nix-update-script,
|
||||
}:
|
||||
@@ -52,7 +52,7 @@ stdenv.mkDerivation rec {
|
||||
SDL2
|
||||
|
||||
# frame rate switching
|
||||
libXrandr
|
||||
libxrandr
|
||||
cacert
|
||||
]
|
||||
++ lib.optional (!stdenv.hostPlatform.isDarwin) mpvqt;
|
||||
|
||||
@@ -6,10 +6,10 @@
|
||||
extra-cmake-modules,
|
||||
libvlc,
|
||||
libv4l,
|
||||
libX11,
|
||||
libx11,
|
||||
kidletime,
|
||||
kdelibs4support,
|
||||
libXScrnSaver,
|
||||
libxscrnsaver,
|
||||
wrapQtAppsHook,
|
||||
qtx11extras,
|
||||
}:
|
||||
@@ -35,11 +35,11 @@ stdenv.mkDerivation rec {
|
||||
buildInputs = [
|
||||
libvlc
|
||||
libv4l
|
||||
libX11
|
||||
libx11
|
||||
kidletime
|
||||
qtx11extras
|
||||
kdelibs4support
|
||||
libXScrnSaver
|
||||
libxscrnsaver
|
||||
];
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -92,17 +92,17 @@
|
||||
lirc,
|
||||
mesa-gl-headers,
|
||||
x11Support ? true,
|
||||
libX11,
|
||||
libx11,
|
||||
xorgproto,
|
||||
libXt,
|
||||
libXmu,
|
||||
libXext,
|
||||
libXinerama,
|
||||
libXrandr,
|
||||
libXtst,
|
||||
libXfixes,
|
||||
libxt,
|
||||
libxmu,
|
||||
libxext,
|
||||
libxinerama,
|
||||
libxrandr,
|
||||
libxtst,
|
||||
libxfixes,
|
||||
xdpyinfo,
|
||||
libXdmcp,
|
||||
libxdmcp,
|
||||
dbusSupport ? true,
|
||||
dbus,
|
||||
joystickSupport ? true,
|
||||
@@ -350,16 +350,16 @@ stdenv.mkDerivation (
|
||||
zlib
|
||||
]
|
||||
++ lib.optionals x11Support [
|
||||
libX11
|
||||
libx11
|
||||
xorgproto
|
||||
libXt
|
||||
libXmu
|
||||
libXext.dev
|
||||
libXdmcp
|
||||
libXinerama
|
||||
libXrandr.dev
|
||||
libXtst
|
||||
libXfixes
|
||||
libxt
|
||||
libxmu
|
||||
libxext.dev
|
||||
libxdmcp
|
||||
libxinerama
|
||||
libxrandr.dev
|
||||
libxtst
|
||||
libxfixes
|
||||
]
|
||||
++ lib.optional dbusSupport dbus
|
||||
++ lib.optional joystickSupport cwiid
|
||||
|
||||
@@ -16,18 +16,18 @@
|
||||
fribidiSupport ? true,
|
||||
fribidi,
|
||||
x11Support ? true,
|
||||
libX11,
|
||||
libXext,
|
||||
libx11,
|
||||
libxext,
|
||||
libGLU,
|
||||
libGL,
|
||||
xineramaSupport ? true,
|
||||
libXinerama,
|
||||
libxinerama,
|
||||
xvSupport ? true,
|
||||
libXv,
|
||||
libxv,
|
||||
alsaSupport ? stdenv.hostPlatform.isLinux,
|
||||
alsa-lib,
|
||||
screenSaverSupport ? true,
|
||||
libXScrnSaver,
|
||||
libxscrnsaver,
|
||||
vdpauSupport ? false,
|
||||
libvdpau,
|
||||
cddaSupport ? !stdenv.hostPlatform.isDarwin,
|
||||
@@ -146,16 +146,16 @@ stdenv.mkDerivation {
|
||||
++ lib.optional fontconfigSupport fontconfig
|
||||
++ lib.optional fribidiSupport fribidi
|
||||
++ lib.optionals x11Support [
|
||||
libX11
|
||||
libXext
|
||||
libx11
|
||||
libxext
|
||||
libGLU
|
||||
libGL
|
||||
]
|
||||
++ lib.optional alsaSupport alsa-lib
|
||||
++ lib.optional xvSupport libXv
|
||||
++ lib.optional xvSupport libxv
|
||||
++ lib.optional theoraSupport libtheora
|
||||
++ lib.optional cacaSupport libcaca
|
||||
++ lib.optional xineramaSupport libXinerama
|
||||
++ lib.optional xineramaSupport libxinerama
|
||||
++ lib.optional dvdnavSupport libdvdnav
|
||||
++ lib.optional dvdreadSupport libdvdread
|
||||
++ lib.optional bluraySupport libbluray
|
||||
@@ -167,7 +167,7 @@ stdenv.mkDerivation {
|
||||
]
|
||||
++ lib.optional x264Support x264
|
||||
++ lib.optional pulseSupport libpulseaudio
|
||||
++ lib.optional screenSaverSupport libXScrnSaver
|
||||
++ lib.optional screenSaverSupport libxscrnsaver
|
||||
++ lib.optional lameSupport lame
|
||||
++ lib.optional vdpauSupport libvdpau
|
||||
++ lib.optional speexSupport speex
|
||||
|
||||
@@ -19,13 +19,13 @@
|
||||
libsamplerate,
|
||||
libbluray,
|
||||
lzo,
|
||||
libX11,
|
||||
libXv,
|
||||
libXrandr,
|
||||
libXvMC,
|
||||
libXinerama,
|
||||
libXxf86vm,
|
||||
libXmu,
|
||||
libx11,
|
||||
libxv,
|
||||
libxrandr,
|
||||
libxvmc,
|
||||
libxinerama,
|
||||
libxxf86vm,
|
||||
libxmu,
|
||||
yasm,
|
||||
libuuid,
|
||||
taglib,
|
||||
@@ -75,14 +75,14 @@ stdenv.mkDerivation rec {
|
||||
alsa-lib
|
||||
libpulseaudio
|
||||
fftwSinglePrec
|
||||
libX11
|
||||
libXv
|
||||
libXrandr
|
||||
libXvMC
|
||||
libXmu
|
||||
libXinerama
|
||||
libXxf86vm
|
||||
libXmu
|
||||
libx11
|
||||
libxv
|
||||
libxrandr
|
||||
libxvmc
|
||||
libxmu
|
||||
libxinerama
|
||||
libxxf86vm
|
||||
libxmu
|
||||
libuuid
|
||||
taglib
|
||||
exiv2
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
expat,
|
||||
extra-cmake-modules,
|
||||
glog,
|
||||
libXdmcp,
|
||||
libxdmcp,
|
||||
python312,
|
||||
wayland,
|
||||
}:
|
||||
@@ -76,7 +76,7 @@ stdenv.mkDerivation {
|
||||
wayland
|
||||
glog
|
||||
ceres-solver
|
||||
libXdmcp
|
||||
libxdmcp
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
|
||||
@@ -18,7 +18,7 @@
|
||||
libjack2,
|
||||
libxkbcommon,
|
||||
libpthread-stubs,
|
||||
libXdmcp,
|
||||
libxdmcp,
|
||||
qtbase,
|
||||
qtsvg,
|
||||
speex,
|
||||
@@ -140,7 +140,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
libv4l
|
||||
libxkbcommon
|
||||
libpthread-stubs
|
||||
libXdmcp
|
||||
libxdmcp
|
||||
qtbase
|
||||
qtsvg
|
||||
speex
|
||||
|
||||
@@ -17,7 +17,7 @@
|
||||
qtbase,
|
||||
stdenv,
|
||||
websocketpp,
|
||||
libXScrnSaver,
|
||||
libxscrnsaver,
|
||||
libusb1,
|
||||
pkg-config,
|
||||
# #FIXME: Could not get cmake to pick up on these dependencies
|
||||
@@ -64,7 +64,7 @@ stdenv.mkDerivation rec {
|
||||
procps
|
||||
qtbase
|
||||
websocketpp
|
||||
libXScrnSaver
|
||||
libxscrnsaver
|
||||
libusb1
|
||||
];
|
||||
|
||||
|
||||
@@ -9,9 +9,9 @@
|
||||
wayland-scanner,
|
||||
obs-studio,
|
||||
libffi,
|
||||
libX11,
|
||||
libXau,
|
||||
libXdmcp,
|
||||
libx11,
|
||||
libxau,
|
||||
libxdmcp,
|
||||
libxcb,
|
||||
vulkan-headers,
|
||||
vulkan-loader,
|
||||
@@ -45,9 +45,9 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
buildInputs = [
|
||||
libGL
|
||||
libffi
|
||||
libX11
|
||||
libXau
|
||||
libXdmcp
|
||||
libx11
|
||||
libxau
|
||||
libxdmcp
|
||||
libxcb
|
||||
vulkan-headers
|
||||
vulkan-loader
|
||||
@@ -60,8 +60,8 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
postPatch = ''
|
||||
substituteInPlace src/glinject.c \
|
||||
--replace "libGLX.so.0" "${lib.getLib libGL}/lib/libGLX.so.0" \
|
||||
--replace "libX11.so.6" "${lib.getLib libX11}/lib/libX11.so.6" \
|
||||
--replace "libX11-xcb.so.1" "${lib.getLib libX11}/lib/libX11-xcb.so.1" \
|
||||
--replace "libX11.so.6" "${lib.getLib libx11}/lib/libX11.so.6" \
|
||||
--replace "libX11-xcb.so.1" "${lib.getLib libx11}/lib/libX11-xcb.so.1" \
|
||||
--replace "libxcb-dri3.so.0" "${lib.getLib libxcb}/lib/libxcb-dri3.so.0" \
|
||||
--replace "libEGL.so.1" "${lib.getLib libGL}/lib/libEGL.so.1" \
|
||||
--replace "libvulkan.so.1" "${lib.getLib vulkan-loader}/lib/libvulkan.so.1"
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
ninja,
|
||||
wayland,
|
||||
obs-studio,
|
||||
libX11,
|
||||
libx11,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
@@ -30,7 +30,7 @@ stdenv.mkDerivation {
|
||||
buildInputs = [
|
||||
wayland
|
||||
obs-studio
|
||||
libX11
|
||||
libx11
|
||||
];
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -5,11 +5,11 @@
|
||||
alsa-lib,
|
||||
ffmpeg,
|
||||
libjack2,
|
||||
libX11,
|
||||
libXext,
|
||||
libXinerama,
|
||||
libx11,
|
||||
libxext,
|
||||
libxinerama,
|
||||
qtx11extras,
|
||||
libXfixes,
|
||||
libxfixes,
|
||||
libGLU,
|
||||
libGL,
|
||||
pkg-config,
|
||||
@@ -60,10 +60,10 @@ stdenv.mkDerivation {
|
||||
alsa-lib
|
||||
ffmpeg
|
||||
libjack2
|
||||
libX11
|
||||
libXext
|
||||
libXfixes
|
||||
libXinerama
|
||||
libx11
|
||||
libxext
|
||||
libxfixes
|
||||
libxinerama
|
||||
libGLU
|
||||
libGL
|
||||
libpulseaudio
|
||||
|
||||
@@ -10,10 +10,10 @@
|
||||
libextractor,
|
||||
libglvnd,
|
||||
libGLU,
|
||||
libX11,
|
||||
libXext,
|
||||
libXrender,
|
||||
libXrandr,
|
||||
libx11,
|
||||
libxext,
|
||||
libxrender,
|
||||
libxrandr,
|
||||
ffmpeg,
|
||||
avahi,
|
||||
wayland,
|
||||
@@ -71,10 +71,10 @@ let
|
||||
libglvnd
|
||||
libGLU
|
||||
libvdpau
|
||||
libXext
|
||||
libXrandr
|
||||
libXrender
|
||||
libX11
|
||||
libxext
|
||||
libxrandr
|
||||
libxrender
|
||||
libx11
|
||||
vdr
|
||||
xine-lib
|
||||
avahi
|
||||
|
||||
@@ -10,12 +10,12 @@
|
||||
pam,
|
||||
libxslt,
|
||||
libxml2,
|
||||
libX11,
|
||||
libx11,
|
||||
xorgproto,
|
||||
libXext,
|
||||
libXcursor,
|
||||
libXfixes,
|
||||
libXmu,
|
||||
libxext,
|
||||
libxcursor,
|
||||
libxfixes,
|
||||
libxmu,
|
||||
SDL2,
|
||||
libcap,
|
||||
libGL,
|
||||
@@ -23,8 +23,8 @@
|
||||
libpng,
|
||||
glib,
|
||||
lvm2,
|
||||
libXrandr,
|
||||
libXinerama,
|
||||
libxrandr,
|
||||
libxinerama,
|
||||
libopus,
|
||||
libtpms,
|
||||
qt6,
|
||||
@@ -144,9 +144,9 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
libxslt
|
||||
libxml2
|
||||
xorgproto
|
||||
libX11
|
||||
libXext
|
||||
libXcursor
|
||||
libx11
|
||||
libxext
|
||||
libxcursor
|
||||
libcap
|
||||
glib
|
||||
lvm2
|
||||
@@ -156,8 +156,8 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
pam
|
||||
makeself
|
||||
perl
|
||||
libXmu
|
||||
libXrandr
|
||||
libxmu
|
||||
libxrandr
|
||||
libpng
|
||||
libopus
|
||||
libtpms
|
||||
@@ -172,7 +172,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
qtbase
|
||||
qttools
|
||||
qtscxml
|
||||
libXinerama
|
||||
libxinerama
|
||||
SDL2
|
||||
libGLU
|
||||
]
|
||||
@@ -208,7 +208,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
s@"libdbus-1\.so\.3"@"${dbus.lib}/lib/libdbus-1.so.3"@g'
|
||||
|
||||
grep 'libXfixes\.so\.3' src include -rI --files-with-match | xargs sed -i -e '
|
||||
s@"libXfixes\.so\.3"@"${libXfixes.out}/lib/libXfixes.so.3"@g'
|
||||
s@"libXfixes\.so\.3"@"${libxfixes.out}/lib/libXfixes.so.3"@g'
|
||||
|
||||
grep 'libasound\.so\.2' src include -rI --files-with-match | xargs sed -i -e '
|
||||
s@"libasound\.so\.2"@"${alsa-lib.out}/lib/libasound.so.2"@g'
|
||||
|
||||
@@ -5,11 +5,11 @@
|
||||
lib,
|
||||
pam,
|
||||
libxslt,
|
||||
libXext,
|
||||
libXcursor,
|
||||
libXmu,
|
||||
libxext,
|
||||
libxcursor,
|
||||
libxmu,
|
||||
glib,
|
||||
libXrandr,
|
||||
libxrandr,
|
||||
dbus,
|
||||
xz,
|
||||
pkg-config,
|
||||
@@ -58,11 +58,11 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
buildInputs = [
|
||||
dbus
|
||||
libxslt
|
||||
libXext
|
||||
libXcursor
|
||||
libxext
|
||||
libxcursor
|
||||
pam
|
||||
libXmu
|
||||
libXrandr
|
||||
libxmu
|
||||
libxrandr
|
||||
];
|
||||
|
||||
KERN_DIR = "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build";
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
libxcb,
|
||||
libxcb-keysyms,
|
||||
libxcb-wm,
|
||||
libX11,
|
||||
libx11,
|
||||
libxcb-util,
|
||||
xcbutilxrm,
|
||||
}:
|
||||
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
|
||||
libxcb
|
||||
libxcb-keysyms
|
||||
libxcb-wm
|
||||
libX11
|
||||
libx11
|
||||
libxcb-util
|
||||
xcbutilxrm
|
||||
];
|
||||
|
||||
@@ -2,10 +2,10 @@
|
||||
lib,
|
||||
stdenv,
|
||||
fetchurl,
|
||||
libX11,
|
||||
libXext,
|
||||
libXrandr,
|
||||
libXrender,
|
||||
libx11,
|
||||
libxext,
|
||||
libxrandr,
|
||||
libxrender,
|
||||
xorgproto,
|
||||
patches ? [ ],
|
||||
}:
|
||||
@@ -20,10 +20,10 @@ stdenv.mkDerivation rec {
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
libX11
|
||||
libXext
|
||||
libXrandr
|
||||
libXrender
|
||||
libx11
|
||||
libxext
|
||||
libxrandr
|
||||
libxrender
|
||||
xorgproto
|
||||
];
|
||||
|
||||
|
||||
@@ -7,8 +7,8 @@
|
||||
glib,
|
||||
gtkmm3,
|
||||
harfbuzz,
|
||||
libX11,
|
||||
libXdmcp,
|
||||
libx11,
|
||||
libxdmcp,
|
||||
libxcb,
|
||||
makeWrapper,
|
||||
pcre2,
|
||||
@@ -46,8 +46,8 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
glib
|
||||
gtkmm3
|
||||
harfbuzz
|
||||
libX11
|
||||
libXdmcp
|
||||
libx11
|
||||
libxdmcp
|
||||
libxcb
|
||||
pcre2
|
||||
libxcb-cursor
|
||||
@@ -81,7 +81,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
description = "Tiling X11 window manager written in modern C++";
|
||||
license = lib.licenses.bsd3;
|
||||
maintainers = [ ];
|
||||
inherit (libX11.meta) platforms;
|
||||
inherit (libx11.meta) platforms;
|
||||
mainProgram = "Hypr";
|
||||
};
|
||||
})
|
||||
|
||||
@@ -13,7 +13,7 @@
|
||||
libxcb-wm,
|
||||
xcbutilxrm,
|
||||
libstartup_notification,
|
||||
libX11,
|
||||
libx11,
|
||||
pcre2,
|
||||
libev,
|
||||
yajl,
|
||||
@@ -75,7 +75,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
xcbutilxrm
|
||||
libxkbcommon
|
||||
libstartup_notification
|
||||
libX11
|
||||
libx11
|
||||
pcre2
|
||||
libev
|
||||
yajl
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
libxcb-keysyms,
|
||||
libxcb-image,
|
||||
pam,
|
||||
libX11,
|
||||
libx11,
|
||||
libev,
|
||||
cairo,
|
||||
libxkbcommon,
|
||||
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
|
||||
libxcb-keysyms
|
||||
libxcb-image
|
||||
pam
|
||||
libX11
|
||||
libx11
|
||||
libev
|
||||
cairo
|
||||
libxkbcommon
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
libxcb-image,
|
||||
xcbutilxrm,
|
||||
pam,
|
||||
libX11,
|
||||
libx11,
|
||||
libev,
|
||||
cairo,
|
||||
libxkbcommon,
|
||||
@@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
|
||||
libxcb-image
|
||||
xcbutilxrm
|
||||
pam
|
||||
libX11
|
||||
libx11
|
||||
libev
|
||||
cairo
|
||||
libxkbcommon
|
||||
|
||||
@@ -7,8 +7,8 @@
|
||||
groff,
|
||||
libice,
|
||||
libsm,
|
||||
libX11,
|
||||
libXext,
|
||||
libx11,
|
||||
libxext,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
@@ -23,8 +23,8 @@ stdenv.mkDerivation rec {
|
||||
buildInputs = [
|
||||
libice
|
||||
libsm
|
||||
libX11
|
||||
libXext
|
||||
libx11
|
||||
libxext
|
||||
lua
|
||||
gettext
|
||||
groff
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user