Merge master into staging-next
This commit is contained in:
@@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
|
||||
mktplcRef = {
|
||||
publisher = "sourcegraph";
|
||||
name = "amp";
|
||||
version = "0.0.1769991964";
|
||||
hash = "sha256-RlACEEbRZjeM1JUgAxfMlwFIo8CmrJxr1DVq1XxRdoM=";
|
||||
version = "0.0.1770596843";
|
||||
hash = "sha256-FLajygfJM+EPOXSU7g5I7Yo1YU7zYvTuw2cfY3B17BE=";
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -44,6 +44,6 @@ stdenv.mkDerivation {
|
||||
platforms
|
||||
;
|
||||
|
||||
broken = !(lib.versionAtLeast kernel.version "6.16" && lib.versionOlder kernel.version "6.19");
|
||||
broken = !(lib.versionAtLeast kernel.version "6.16" && lib.versionOlder kernel.version "6.20");
|
||||
};
|
||||
}
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "LAStools";
|
||||
pname = "lastools";
|
||||
version = "2.0.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
@@ -11,13 +11,13 @@
|
||||
# https://github.com/abathur/resholve/issues/107
|
||||
resholve.mkDerivation rec {
|
||||
pname = "nix-direnv";
|
||||
version = "3.1.0";
|
||||
version = "3.1.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nix-community";
|
||||
repo = "nix-direnv";
|
||||
rev = version;
|
||||
hash = "sha256-HdnQRcysoKNPbVa/D3KDcLgqf5+u9JDPmcl29cGj4AI=";
|
||||
hash = "sha256-AsWnRH7LAb78iFfE+ZdYyCR5AVuPloT8ZnghDXW6arY=";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
|
||||
@@ -17,15 +17,17 @@
|
||||
weights, and freely available to all.
|
||||
'',
|
||||
}:
|
||||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
let
|
||||
_variants = map (variant: builtins.replaceStrings [ " " ] [ "" ] variant) variants;
|
||||
in
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "noto-fonts${suffix}";
|
||||
version = "2026.02.01";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "notofonts";
|
||||
repo = "notofonts.github.io";
|
||||
rev = "noto-monthly-release-${version}";
|
||||
tag = "noto-monthly-release-${finalAttrs.version}";
|
||||
hash = "sha256-vhu3jojG6QlgY5gP4bCbpJznsQ1gExAfcRT42FcZUp4=";
|
||||
};
|
||||
|
||||
@@ -34,8 +36,6 @@ stdenvNoCC.mkDerivation rec {
|
||||
"megamerge" # Experimental fonts created by merging regular notofonts
|
||||
];
|
||||
|
||||
_variants = map (variant: builtins.replaceStrings [ " " ] [ "" ] variant) variants;
|
||||
|
||||
installPhase = ''
|
||||
# We check availability in order of variable -> otf -> ttf
|
||||
# unhinted -- the hinted versions use autohint
|
||||
@@ -61,7 +61,7 @@ stdenvNoCC.mkDerivation rec {
|
||||
''
|
||||
else
|
||||
''
|
||||
for variant in $_variants; do
|
||||
for variant in ${lib.concatStringsSep " " _variants}; do
|
||||
if [[ -d fonts/"$variant"/unhinted/variable-ttf ]]; then
|
||||
install -m444 -Dt $out_font fonts/"$variant"/unhinted/variable-ttf/*.ttf
|
||||
elif [[ -d fonts/"$variant"/unhinted/otf ]]; then
|
||||
@@ -91,4 +91,4 @@ stdenvNoCC.mkDerivation rec {
|
||||
jopejoe1
|
||||
];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -7,13 +7,13 @@
|
||||
|
||||
buildGoModule {
|
||||
pname = "pkgsite";
|
||||
version = "0-unstable-2026-01-16";
|
||||
version = "0-unstable-2026-02-06";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "golang";
|
||||
repo = "pkgsite";
|
||||
rev = "550788255d99f0e9ee169f12bf65d16e1ede9f7b";
|
||||
hash = "sha256-Gx4MKLQ7Ed8XIy9oULWD1mRVcD2f7i+fb2aDjFrG9RI=";
|
||||
rev = "2a8da3345a36148f4dca0cfb2b99cbe84ba9a50b";
|
||||
hash = "sha256-693eUnNtuagCwfXq+FYAVHHHgHDT0CDXu7kaYK2ru9Q=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-udLOOjBMLZ38jrX/7r+hmiUr/k6gxU0Sypo6S0ezep0=";
|
||||
|
||||
@@ -32,9 +32,11 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
ncurses
|
||||
];
|
||||
|
||||
# By no known reason libtirpc is not detected
|
||||
env.NIX_CFLAGS_COMPILE = toString [ "-I${libtirpc.dev}/include/tirpc" ];
|
||||
NIX_LDFLAGS = [ "-ltirpc" ];
|
||||
env = {
|
||||
# By no known reason libtirpc is not detected
|
||||
NIX_CFLAGS_COMPILE = toString [ "-I${libtirpc.dev}/include/tirpc" ];
|
||||
NIX_LDFLAGS = [ "-ltirpc" ];
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace CMakeLists.txt \
|
||||
|
||||
@@ -108,18 +108,20 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
--prefix XDG_DATA_DIRS : "$out/share:$GSETTINGS_SCHEMAS_PATH"
|
||||
'';
|
||||
|
||||
# Tenacity only looks for ffmpeg at runtime, so we need to link it in manually.
|
||||
# On darwin, these are ignored by the ffmpeg search even when linked.
|
||||
NIX_LDFLAGS = lib.optionalString stdenv.hostPlatform.isLinux (toString [
|
||||
"-lavcodec"
|
||||
"-lavdevice"
|
||||
"-lavfilter"
|
||||
"-lavformat"
|
||||
"-lavutil"
|
||||
"-lpostproc"
|
||||
"-lswresample"
|
||||
"-lswscale"
|
||||
]);
|
||||
env = lib.optionalAttrs stdenv.hostPlatform.isLinux {
|
||||
# Tenacity only looks for ffmpeg at runtime, so we need to link it in manually.
|
||||
# On darwin, these are ignored by the ffmpeg search even when linked.
|
||||
NIX_LDFLAGS = toString [
|
||||
"-lavcodec"
|
||||
"-lavdevice"
|
||||
"-lavfilter"
|
||||
"-lavformat"
|
||||
"-lavutil"
|
||||
"-lpostproc"
|
||||
"-lswresample"
|
||||
"-lswscale"
|
||||
];
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
|
||||
@@ -33,7 +33,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
preConfigure = "./autogen.sh";
|
||||
|
||||
NIX_LDFLAGS = "-lm";
|
||||
env.NIX_LDFLAGS = "-lm";
|
||||
|
||||
meta = {
|
||||
description = "JACK audio recorder";
|
||||
|
||||
@@ -47,7 +47,7 @@ stdenv.mkDerivation rec {
|
||||
openssl
|
||||
];
|
||||
|
||||
NIX_LDFLAGS = ''
|
||||
env.NIX_LDFLAGS = ''
|
||||
-L${lib.getLib stdenv.cc.cc}/lib -lX11 -lglib-2.0 -lgtk-x11-2.0
|
||||
-lgdk-x11-2.0 -lgdk_pixbuf-2.0 -lpango-1.0 -latk-1.0 -lcairo
|
||||
-lc -lcrypto
|
||||
@@ -71,7 +71,7 @@ stdenv.mkDerivation rec {
|
||||
"INSTALL_PREFIX=$(out)"
|
||||
];
|
||||
|
||||
LCL_PLATFORM = "gtk2";
|
||||
env.LCL_PLATFORM = "gtk2";
|
||||
|
||||
desktopItem = makeDesktopItem {
|
||||
name = pname;
|
||||
|
||||
@@ -44,14 +44,16 @@ stdenv.mkDerivation {
|
||||
sed -i 's|^_select(int|select(int|' trickle-overload.c
|
||||
'';
|
||||
|
||||
NIX_LDFLAGS = [
|
||||
"-levent"
|
||||
"-ltirpc"
|
||||
];
|
||||
env.NIX_CFLAGS_COMPILE = toString [
|
||||
"-I${libtirpc.dev}/include/tirpc"
|
||||
"-Wno-error=incompatible-pointer-types"
|
||||
];
|
||||
env = {
|
||||
NIX_LDFLAGS = toString [
|
||||
"-levent"
|
||||
"-ltirpc"
|
||||
];
|
||||
NIX_CFLAGS_COMPILE = toString [
|
||||
"-I${libtirpc.dev}/include/tirpc"
|
||||
"-Wno-error=incompatible-pointer-types"
|
||||
];
|
||||
};
|
||||
|
||||
configureFlags = [ "--with-libevent" ];
|
||||
|
||||
|
||||
@@ -23,8 +23,10 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
pkg-config
|
||||
];
|
||||
|
||||
# Ensure the linker is using atomic when compiling for RISC-V, otherwise fails
|
||||
NIX_LDFLAGS = lib.optionalString stdenv.hostPlatform.isRiscV "-latomic";
|
||||
env = lib.optionalAttrs stdenv.hostPlatform.isRiscV {
|
||||
# Ensure the linker is using atomic when compiling for RISC-V, otherwise fails
|
||||
NIX_LDFLAGS = "-latomic";
|
||||
};
|
||||
|
||||
cmakeFlags = lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [
|
||||
# Some x86 tests are interrupted by signal 10
|
||||
|
||||
@@ -26,8 +26,10 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
cctools
|
||||
];
|
||||
|
||||
# Ensure the linker is using atomic when compiling for RISC-V, otherwise fails
|
||||
NIX_LDFLAGS = lib.optionalString stdenv.hostPlatform.isRiscV "-latomic";
|
||||
env = lib.optionalAttrs stdenv.hostPlatform.isRiscV {
|
||||
# Ensure the linker is using atomic when compiling for RISC-V, otherwise fails
|
||||
NIX_LDFLAGS = "-latomic";
|
||||
};
|
||||
|
||||
cmakeFlags = lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [
|
||||
# Some x86 tests are interrupted by signal 10
|
||||
|
||||
@@ -125,11 +125,13 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
doCheck = true;
|
||||
dontUseNinjaCheck = true;
|
||||
|
||||
NIX_LDFLAGS = lib.optionalString finalAttrs.doCheck "-rpath ${
|
||||
lib.makeLibraryPath [
|
||||
onetbb
|
||||
]
|
||||
}";
|
||||
env = lib.optionalAttrs finalAttrs.doCheck {
|
||||
NIX_LDFLAGS = "-rpath ${
|
||||
lib.makeLibraryPath [
|
||||
onetbb
|
||||
]
|
||||
}";
|
||||
};
|
||||
|
||||
disabledTests = [
|
||||
# These tests try to access sysfs, which is unavailable in the sandbox
|
||||
|
||||
@@ -79,7 +79,16 @@ stdenv.mkDerivation rec {
|
||||
|
||||
makefile = "unix/Makefile";
|
||||
|
||||
NIX_LDFLAGS = "-lbz2" + lib.optionalString enableNLS " -lnatspec";
|
||||
env = {
|
||||
NIX_LDFLAGS = toString (
|
||||
[
|
||||
"-lbz2"
|
||||
]
|
||||
++ lib.optionals enableNLS [
|
||||
"-lnatspec"
|
||||
]
|
||||
);
|
||||
};
|
||||
|
||||
buildFlags = [
|
||||
"generic"
|
||||
|
||||
@@ -56,7 +56,14 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
"CC=${stdenv.cc.targetPrefix}cc"
|
||||
];
|
||||
|
||||
NIX_LDFLAGS = "-lcrypt -lssl -lcrypto -lpam -lcap -lseccomp";
|
||||
env.NIX_LDFLAGS = toString [
|
||||
"-lcrypt"
|
||||
"-lssl"
|
||||
"-lcrypto"
|
||||
"-lpam"
|
||||
"-lcap"
|
||||
"-lseccomp"
|
||||
];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
|
||||
@@ -22,7 +22,12 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
NIX_LDFLAGS = lib.optionalString stdenv.hostPlatform.isDarwin "-framework AppKit";
|
||||
env = lib.optionalAttrs stdenv.hostPlatform.isDarwin {
|
||||
NIX_LDFLAGS = toString [
|
||||
"-framework"
|
||||
"AppKit"
|
||||
];
|
||||
};
|
||||
|
||||
checkFlags = [
|
||||
"--skip=help"
|
||||
|
||||
@@ -38,7 +38,7 @@ stdenv.mkDerivation {
|
||||
spice-protocol
|
||||
];
|
||||
|
||||
NIX_LDFLAGS = "-lpthread";
|
||||
env.NIX_LDFLAGS = "-lpthread";
|
||||
|
||||
meta = {
|
||||
description = "Enable a running X11 desktop to be available via a Spice server";
|
||||
|
||||
@@ -37,7 +37,9 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
libintl
|
||||
];
|
||||
|
||||
NIX_LDFLAGS = if stdenv.isDarwin then "-liconv" else null;
|
||||
env = lib.optionalAttrs stdenv.isDarwin {
|
||||
NIX_LDFLAGS = "-liconv";
|
||||
};
|
||||
|
||||
preFixup = ''
|
||||
# fallback values need to be last
|
||||
|
||||
@@ -66,10 +66,10 @@ stdenv.mkDerivation {
|
||||
'cmake_minimum_required(VERSION 3.10)'
|
||||
'';
|
||||
|
||||
env.NIX_CFLAGS_COMPILE = lib.optionalString (
|
||||
stdenv.hostPlatform.libc == "glibc"
|
||||
) "-I${libtirpc.dev}/include/tirpc";
|
||||
NIX_LDFLAGS = lib.optional (stdenv.hostPlatform.libc == "glibc") "-ltirpc";
|
||||
env = lib.optionalAttrs (stdenv.hostPlatform.libc == "glibc") {
|
||||
NIX_CFLAGS_COMPILE = "-I${libtirpc.dev}/include/tirpc";
|
||||
NIX_LDFLAGS = "-ltirpc";
|
||||
};
|
||||
|
||||
hardeningDisable = [ "format" ];
|
||||
|
||||
|
||||
@@ -52,7 +52,7 @@ stdenv.mkDerivation {
|
||||
nativeBuildInputs = [ fpc ];
|
||||
buildInputs = [ openssl ];
|
||||
|
||||
NIX_LDFLAGS = [ "-lcrypto" ];
|
||||
env.NIX_LDFLAGS = toString [ "-lcrypto" ];
|
||||
|
||||
patchPhase = ''
|
||||
patchShebangs \
|
||||
|
||||
@@ -79,7 +79,7 @@ lib.fix (
|
||||
configureFlags = [ "--enable-soap" ];
|
||||
|
||||
# otherwise libxmlsec1-gnutls.so won't find libgcrypt.so, after #909
|
||||
NIX_LDFLAGS = "-lgcrypt";
|
||||
env.NIX_LDFLAGS = "-lgcrypt";
|
||||
|
||||
postInstall = ''
|
||||
moveToOutput "bin/xmlsec1-config" "$dev"
|
||||
|
||||
@@ -67,24 +67,25 @@ clangStdenv.mkDerivation (finalAttrs: {
|
||||
];
|
||||
|
||||
# JUCE dlopen's these at runtime, crashes without them
|
||||
NIX_LDFLAGS = lib.optionalString clangStdenv.hostPlatform.isLinux (toString [
|
||||
"-lX11"
|
||||
"-lXext"
|
||||
"-lXcursor"
|
||||
"-lXinerama"
|
||||
"-lXrandr"
|
||||
]);
|
||||
|
||||
env.NIX_CFLAGS_COMPILE = lib.optionalString clangStdenv.hostPlatform.isLinux (toString [
|
||||
# juce, compiled in this build as part of a Git submodule, uses `-flto` as
|
||||
# a Link Time Optimization flag, and instructs the plugin compiled here to
|
||||
# use this flag to. This breaks the build for us. Using _fat_ LTO allows
|
||||
# successful linking while still providing LTO benefits. If our build of
|
||||
# `juce` was used as a dependency, we could have patched that `-flto` line
|
||||
# in our juce's source, but that is not possible because it is used as a
|
||||
# Git Submodule.
|
||||
"-ffat-lto-objects"
|
||||
]);
|
||||
env = lib.optionalAttrs clangStdenv.hostPlatform.isLinux {
|
||||
NIX_LDFLAGS = toString [
|
||||
"-lX11"
|
||||
"-lXext"
|
||||
"-lXcursor"
|
||||
"-lXinerama"
|
||||
"-lXrandr"
|
||||
];
|
||||
NIX_CFLAGS_COMPILE = toString [
|
||||
# juce, compiled in this build as part of a Git submodule, uses `-flto` as
|
||||
# a Link Time Optimization flag, and instructs the plugin compiled here to
|
||||
# use this flag to. This breaks the build for us. Using _fat_ LTO allows
|
||||
# successful linking while still providing LTO benefits. If our build of
|
||||
# `juce` was used as a dependency, we could have patched that `-flto` line
|
||||
# in our juce's source, but that is not possible because it is used as a
|
||||
# Git Submodule.
|
||||
"-ffat-lto-objects"
|
||||
];
|
||||
};
|
||||
|
||||
cmakeFlags = [
|
||||
# see: https://github.com/ZL-Audio/ZlEqualizer#clone-and-build
|
||||
|
||||
@@ -66,25 +66,27 @@ clangStdenv.mkDerivation (finalAttrs: {
|
||||
libxkbcommon
|
||||
];
|
||||
|
||||
# JUCE dlopen's these at runtime, crashes without them
|
||||
NIX_LDFLAGS = lib.optionalString clangStdenv.hostPlatform.isLinux (toString [
|
||||
"-lX11"
|
||||
"-lXext"
|
||||
"-lXcursor"
|
||||
"-lXinerama"
|
||||
"-lXrandr"
|
||||
]);
|
||||
env = lib.optionalAttrs clangStdenv.hostPlatform.isLinux {
|
||||
# JUCE dlopen's these at runtime, crashes without them
|
||||
NIX_LDFLAGS = toString [
|
||||
"-lX11"
|
||||
"-lXext"
|
||||
"-lXcursor"
|
||||
"-lXinerama"
|
||||
"-lXrandr"
|
||||
];
|
||||
|
||||
env.NIX_CFLAGS_COMPILE = lib.optionalString clangStdenv.hostPlatform.isLinux (toString [
|
||||
# juce, compiled in this build as part of a Git submodule, uses `-flto` as
|
||||
# a Link Time Optimization flag, and instructs the plugin compiled here to
|
||||
# use this flag to. This breaks the build for us. Using _fat_ LTO allows
|
||||
# successful linking while still providing LTO benefits. If our build of
|
||||
# `juce` was used as a dependency, we could have patched that `-flto` line
|
||||
# in our juce's source, but that is not possible because it is used as a
|
||||
# Git Submodule.
|
||||
"-ffat-lto-objects"
|
||||
]);
|
||||
NIX_CFLAGS_COMPILE = toString [
|
||||
# juce, compiled in this build as part of a Git submodule, uses `-flto` as
|
||||
# a Link Time Optimization flag, and instructs the plugin compiled here to
|
||||
# use this flag to. This breaks the build for us. Using _fat_ LTO allows
|
||||
# successful linking while still providing LTO benefits. If our build of
|
||||
# `juce` was used as a dependency, we could have patched that `-flto` line
|
||||
# in our juce's source, but that is not possible because it is used as a
|
||||
# Git Submodule.
|
||||
"-ffat-lto-objects"
|
||||
];
|
||||
};
|
||||
|
||||
cmakeFlags = [
|
||||
# see: https://github.com/ZL-Audio/ZLEqualizer#clone-and-build
|
||||
|
||||
@@ -66,25 +66,26 @@ clangStdenv.mkDerivation (finalAttrs: {
|
||||
libxkbcommon
|
||||
];
|
||||
|
||||
# JUCE dlopen's these at runtime, crashes without them
|
||||
NIX_LDFLAGS = lib.optionalString clangStdenv.hostPlatform.isLinux (toString [
|
||||
"-lX11"
|
||||
"-lXext"
|
||||
"-lXcursor"
|
||||
"-lXinerama"
|
||||
"-lXrandr"
|
||||
]);
|
||||
|
||||
env.NIX_CFLAGS_COMPILE = lib.optionalString clangStdenv.hostPlatform.isLinux (toString [
|
||||
# juce, compiled in this build as part of a Git submodule, uses `-flto` as
|
||||
# a Link Time Optimization flag, and instructs the plugin compiled here to
|
||||
# use this flag to. This breaks the build for us. Using _fat_ LTO allows
|
||||
# successful linking while still providing LTO benefits. If our build of
|
||||
# `juce` was used as a dependency, we could have patched that `-flto` line
|
||||
# in our juce's source, but that is not possible because it is used as a
|
||||
# Git Submodule.
|
||||
"-ffat-lto-objects"
|
||||
]);
|
||||
env = lib.optionalAttrs clangStdenv.hostPlatform.isLinux {
|
||||
# JUCE dlopen's these at runtime, crashes without them
|
||||
NIX_LDFLAGS = toString [
|
||||
"-lX11"
|
||||
"-lXext"
|
||||
"-lXcursor"
|
||||
"-lXinerama"
|
||||
"-lXrandr"
|
||||
];
|
||||
NIX_CFLAGS_COMPILE = toString [
|
||||
# juce, compiled in this build as part of a Git submodule, uses `-flto` as
|
||||
# a Link Time Optimization flag, and instructs the plugin compiled here to
|
||||
# use this flag to. This breaks the build for us. Using _fat_ LTO allows
|
||||
# successful linking while still providing LTO benefits. If our build of
|
||||
# `juce` was used as a dependency, we could have patched that `-flto` line
|
||||
# in our juce's source, but that is not possible because it is used as a
|
||||
# Git Submodule.
|
||||
"-ffat-lto-objects"
|
||||
];
|
||||
};
|
||||
|
||||
cmakeFlags = [
|
||||
# see: https://github.com/ZL-Audio/ZlEqualizer#clone-and-build
|
||||
|
||||
@@ -178,11 +178,14 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
# "-Duser_manual=true" # needs sphinx-intl
|
||||
];
|
||||
|
||||
NIX_LDFLAGS = ''
|
||||
-lfftw3_threads -lfftw3f_threads
|
||||
'';
|
||||
env = {
|
||||
NIX_LDFLAGS = toString [
|
||||
"-lfftw3_threads"
|
||||
"-lfftw3f_threads"
|
||||
];
|
||||
|
||||
GUILE_AUTO_COMPILE = 0;
|
||||
GUILE_AUTO_COMPILE = 0;
|
||||
};
|
||||
|
||||
dontStrip = true;
|
||||
|
||||
|
||||
@@ -0,0 +1,33 @@
|
||||
{
|
||||
lib,
|
||||
buildDunePackage,
|
||||
fetchFromGitHub,
|
||||
fmt,
|
||||
prelude,
|
||||
smtml,
|
||||
}:
|
||||
|
||||
buildDunePackage (finalAttrs: {
|
||||
pname = "symex";
|
||||
version = "0.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ocamlpro";
|
||||
repo = "symex";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-jKwFtxVcBD8Y1bfKRB8Z/MSeQLQWKvk00i8HqodkBbM=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
fmt
|
||||
prelude
|
||||
smtml
|
||||
];
|
||||
|
||||
meta = {
|
||||
description = "Primitives to write symbolic execution engines";
|
||||
homepage = "https://github.com/ocamlpro/symex";
|
||||
license = lib.licenses.agpl3Plus;
|
||||
maintainers = with lib.maintainers; [ redianthus ];
|
||||
};
|
||||
})
|
||||
@@ -11,7 +11,7 @@
|
||||
cmake,
|
||||
gmp,
|
||||
onetbb,
|
||||
LAStools,
|
||||
lastools,
|
||||
eigen,
|
||||
mpfr,
|
||||
numpy,
|
||||
@@ -60,7 +60,7 @@ buildPythonPackage rec {
|
||||
eigen
|
||||
]
|
||||
++ lib.optionals withLAS [
|
||||
LAStools
|
||||
lastools
|
||||
];
|
||||
|
||||
dependencies = [
|
||||
|
||||
@@ -70,7 +70,13 @@ stdenv.mkDerivation {
|
||||
];
|
||||
|
||||
# these libraries are only searched for at runtime so we need to force-link them
|
||||
NIX_LDFLAGS = "-lgvc -lmysqlclient -lecpg -lssl -L${libmysqlclient}/lib/mariadb";
|
||||
env.NIX_LDFLAGS = toString [
|
||||
"-lgvc"
|
||||
"-lmysqlclient"
|
||||
"-lecpg"
|
||||
"-lssl"
|
||||
"-L${libmysqlclient}/lib/mariadb"
|
||||
];
|
||||
|
||||
qtWrapperArgs = [
|
||||
"--prefix PATH : ${lib.getBin graphviz}/bin"
|
||||
|
||||
@@ -1,212 +0,0 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchurl,
|
||||
unzip,
|
||||
patchelf,
|
||||
libxxf86vm,
|
||||
libxext,
|
||||
openal,
|
||||
}:
|
||||
|
||||
let
|
||||
urls = file: [
|
||||
# Untrusted mirrors - do not update hashes
|
||||
"https://ludios.org/mirror/ue4demos/${file}"
|
||||
"https://web.archive.org/web/20140824192039/http://ue4linux.raxxy.com/${file}"
|
||||
];
|
||||
|
||||
buildDemo =
|
||||
{ name, src }:
|
||||
stdenv.mkDerivation rec {
|
||||
inherit name src;
|
||||
|
||||
nativeBuildInputs = [
|
||||
unzip
|
||||
patchelf
|
||||
];
|
||||
|
||||
rtdeps =
|
||||
lib.makeLibraryPath [
|
||||
libxxf86vm
|
||||
libxext
|
||||
openal
|
||||
]
|
||||
+ ":"
|
||||
+ lib.makeSearchPathOutput "lib" "lib64" [ stdenv.cc.cc ];
|
||||
|
||||
buildCommand = ''
|
||||
mkdir -p "$out"
|
||||
cd $out
|
||||
unzip $src
|
||||
|
||||
interpreter=$(echo ${stdenv.cc.libc}/lib/ld-linux*.so.2)
|
||||
binary=$(find . -executable -type f)
|
||||
patchelf \
|
||||
--set-interpreter $interpreter \
|
||||
--set-rpath ${rtdeps} \
|
||||
"$binary"
|
||||
|
||||
# Workaround on
|
||||
# LogLinuxPlatformFile:Warning: open('/nix/store/hash-ue4demos-demo/demo/demo/Saved/Config/CleanSourceConfigs/Engine.ini', Flags=0x00080241) failed: errno=2 (No such file or directory)
|
||||
# for Vehicle, Shooter and Strategy games.
|
||||
ls | grep ' ' && $(
|
||||
haxname=$(ls | grep ' ' | sed 's/ //g'); \
|
||||
haxpath=$(ls | grep ' ')/$haxname/Saved; \
|
||||
mkdir -p "$haxpath"/Config/CleanSourceConfigs; \
|
||||
ln -s /dev/null "$haxpath"/Config/CleanSourceConfigs/Engine.ini; \
|
||||
mkdir -p "$haxpath"/Logs; \
|
||||
ln -s /dev/null "$haxpath"/Logs/$haxname.log)
|
||||
|
||||
# Executables are buried under a varied paths across demos.
|
||||
mkdir bin
|
||||
cd bin
|
||||
ln -s "$out/$binary" $(basename "$out/$binary")
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Unreal Engine 4 Linux demos";
|
||||
homepage = "https://wiki.unrealengine.com/Linux_Demos";
|
||||
platforms = [ "x86_64-linux" ];
|
||||
license = lib.licenses.unfree;
|
||||
};
|
||||
};
|
||||
|
||||
in
|
||||
{
|
||||
tappy_chicken = buildDemo {
|
||||
name = "ue4demos-tappy_chicken";
|
||||
src = fetchurl {
|
||||
urls = urls "tappy_chicken.zip";
|
||||
sha256 = "0lwhvk3lpb2r5ng2cnzk7fpjj5lwhy2sch1a8v154x1xfhfb3h4v";
|
||||
};
|
||||
};
|
||||
|
||||
swing_ninja = buildDemo {
|
||||
name = "ue4demos-swing_ninja";
|
||||
src = fetchurl {
|
||||
urls = urls "swing_ninja.zip";
|
||||
sha256 = "1bmgqqk3lda5h7nnqi59jgyrsn0clr3xs0k1jclnqf9fk0m8hjcv";
|
||||
};
|
||||
};
|
||||
|
||||
card_game = buildDemo {
|
||||
name = "ue4demos-card_game";
|
||||
src = fetchurl {
|
||||
urls = urls "card_game.zip";
|
||||
sha256 = "154baqias5q7kad0c89k35jbmnmlm865sll02mi7bk1yllcckz5z";
|
||||
};
|
||||
};
|
||||
|
||||
vehicle_game = buildDemo {
|
||||
name = "ue4demos-vehicle_game";
|
||||
src = fetchurl {
|
||||
urls = urls "vehicle_game.zip";
|
||||
sha256 = "03dlacf1iv7sgn7pl3sx9r6243wy8fsi2kd858syfm9slg0190bs";
|
||||
};
|
||||
};
|
||||
|
||||
shooter_game = buildDemo {
|
||||
name = "ue4demos-shooter_game";
|
||||
src = fetchurl {
|
||||
urls = urls "shooter_game.zip";
|
||||
sha256 = "1bk32k349iqbqk8x8jffnqq0pjiqmvrvv675xxmlvkkr8qrlhz98";
|
||||
};
|
||||
};
|
||||
|
||||
strategy_game = buildDemo {
|
||||
name = "ue4demos-strategy_game";
|
||||
src = fetchurl {
|
||||
urls = urls "strategy_game.zip";
|
||||
sha256 = "1p7i966v1ssm20y12g4wsccpgnky3szy19qyjlacynk7bgbk6lg7";
|
||||
};
|
||||
};
|
||||
|
||||
black_jack = buildDemo {
|
||||
name = "ue4demos-black_jack";
|
||||
src = fetchurl {
|
||||
urls = urls "black_jack.zip";
|
||||
sha256 = "0g52wkzn5isa3az32y25yx5b56wxks97pajqwkmm6gf4qpkfksxv";
|
||||
};
|
||||
};
|
||||
|
||||
landscape_mountains = buildDemo {
|
||||
name = "ue4demos-landscape_mountains";
|
||||
src = fetchurl {
|
||||
urls = urls "landscape_mountains.zip";
|
||||
sha256 = "14jzajhs3cpydvf3ag7lpj4hkpbjpwnn3xkdvdx92fi0pcl8cwym";
|
||||
};
|
||||
};
|
||||
|
||||
matinee_demo = buildDemo {
|
||||
name = "ue4demos-matinee_demo";
|
||||
src = fetchurl {
|
||||
urls = urls "matinee_demo.zip";
|
||||
sha256 = "0ib8k6fl15cxzdarar2sqq5v3g3c7p2jidkdjd00nym6cvkibb4d";
|
||||
};
|
||||
};
|
||||
|
||||
elemental_demo = buildDemo {
|
||||
name = "ue4demos-elemental_demo";
|
||||
src = fetchurl {
|
||||
urls = urls "elemental_demo.zip";
|
||||
sha256 = "1v4jdsy8jvv8wgc8dx17q17xigfrya5q0nfdzw4md7fzm3bg9z0v";
|
||||
};
|
||||
};
|
||||
|
||||
effects_cave_demo = buildDemo {
|
||||
name = "ue4demos-effects_cave_demo";
|
||||
src = fetchurl {
|
||||
urls = urls "effects_cave_demo.zip";
|
||||
sha256 = "0lvd3aaha2x9pnpkdmrzi6nf7hymr95834z3l8shygjf9kbbzsz4";
|
||||
};
|
||||
};
|
||||
|
||||
realistic_rendering = buildDemo {
|
||||
name = "ue4demos-realistic_rendering";
|
||||
src = fetchurl {
|
||||
urls = urls "realistic_rendering_demo.zip";
|
||||
sha256 = "0r16nznkv475hkw5rnngqsc69ch8vh86dppyyyr9nn43dkr2110a";
|
||||
};
|
||||
};
|
||||
|
||||
reflections_subway = buildDemo {
|
||||
name = "ue4demos-reflections_subway";
|
||||
src = fetchurl {
|
||||
urls = urls "reflections_subway_demo.zip";
|
||||
sha256 = "0dw5sm7405gxw9iqz0vpnhdprrb4wl5i14pvzl1381k973m8bd00";
|
||||
};
|
||||
};
|
||||
|
||||
scifi_hallway_demo = buildDemo {
|
||||
name = "ue4demos-scifi_hallway_demo";
|
||||
src = fetchurl {
|
||||
urls = urls "sci-fi_hallway_demo.zip";
|
||||
sha256 = "14qp9iwm47awn8d9j6ijh6cnds308x60xs4vi2fvz2666jlz1pq2";
|
||||
};
|
||||
};
|
||||
|
||||
mobile_temple_demo = buildDemo {
|
||||
name = "ue4demos-mobile_temple_demo";
|
||||
src = fetchurl {
|
||||
urls = urls "mobile_temple_demo.zip";
|
||||
sha256 = "12bz4h1b9lhmqglwsa6r8q48ijqbjdha9fql31540d01kigaka75";
|
||||
};
|
||||
};
|
||||
|
||||
stylized_demo = buildDemo {
|
||||
name = "ue4demos-stylized_demo";
|
||||
src = fetchurl {
|
||||
urls = urls "stylized_demo.zip";
|
||||
sha256 = "1676ridmj8rk4y4hbdscfnnka5l636av1xxl0qwvk236kq9j7v0l";
|
||||
};
|
||||
};
|
||||
|
||||
blueprint_examples_demo = buildDemo {
|
||||
name = "ue4demos-blueprint_examples_demo";
|
||||
src = fetchurl {
|
||||
urls = urls "blueprint_examples_demo.zip";
|
||||
sha256 = "076q33h2hy965fvr805hsprkpcmizf638lj2ik8k923v86b15nbv";
|
||||
};
|
||||
};
|
||||
}
|
||||
@@ -33,5 +33,10 @@
|
||||
"version": "6.18.9",
|
||||
"hash": "sha256:0y05jg6126h946pac5mkl5myh573qgml1p29hinm7jxlizzia083",
|
||||
"lts": false
|
||||
},
|
||||
"6.19": {
|
||||
"version": "6.19",
|
||||
"hash": "sha256:0mqka8ii7bvmx9hvfjdiyva9ib0j7m390gxhh8gki3qb4nl7jc1h",
|
||||
"lts": false
|
||||
}
|
||||
}
|
||||
|
||||
@@ -81,6 +81,7 @@ stdenv.mkDerivation rec {
|
||||
"--firewall=${firewall}"
|
||||
# allow using various config options
|
||||
"--ipv6"
|
||||
"--igd2"
|
||||
"--leasefile"
|
||||
"--regex"
|
||||
"--vendorcfg"
|
||||
|
||||
@@ -961,6 +961,7 @@ mapAliases {
|
||||
lanzaboote-tool = throw "lanzaboote-tool has been removed due to lack of integration maintenance with nixpkgs. Consider using the Nix expressions provided by https://github.com/nix-community/lanzaboote"; # Added 2025-07-23
|
||||
larynx = throw "'larynx' has been renamed to/replaced by 'piper-tts'"; # Converted to throw 2025-10-27
|
||||
lash = throw "'lash' has been removed, as it is unmaintained upstream"; # Added 2026-01-02
|
||||
LAStools = lastools; # Added 2026-02-08
|
||||
LASzip2 = throw "'LASzip2' has been renamed to/replaced by 'laszip_2'"; # Converted to throw 2025-10-27
|
||||
LASzip = throw "'LASzip' has been renamed to/replaced by 'laszip'"; # Converted to throw 2025-10-27
|
||||
latinmodern-math = throw "'latinmodern-math' has been renamed to/replaced by 'lmmath'"; # Converted to throw 2025-10-27
|
||||
@@ -1096,6 +1097,7 @@ mapAliases {
|
||||
linux_6_16 = throw "linux 6.16 was removed because it has reached its end of life upstream"; # Added 2025-10-22
|
||||
linux_6_17 = linuxKernel.kernels.linux_6_17;
|
||||
linux_6_18 = linuxKernel.kernels.linux_6_18;
|
||||
linux_6_19 = linuxKernel.kernels.linux_6_19;
|
||||
linux_ham = throw "linux_ham has been removed in favour of the standard kernel packages"; # Added 2025-06-24
|
||||
linux_hardened = linuxPackages_hardened.kernel; # Added 2025-08-10
|
||||
linux_latest-libre = throw "linux_latest_libre has been removed due to lack of maintenance"; # Added 2025-10-01
|
||||
@@ -1126,6 +1128,7 @@ mapAliases {
|
||||
linuxPackages_6_16 = throw "linux 6.16 was removed because it has reached its end of life upstream"; # Added 2025-10-22
|
||||
linuxPackages_6_17 = linuxKernel.packages.linux_6_17;
|
||||
linuxPackages_6_18 = linuxKernel.packages.linux_6_18;
|
||||
linuxPackages_6_19 = linuxKernel.packages.linux_6_19;
|
||||
linuxPackages_ham = throw "linux_ham has been removed in favour of the standard kernel packages"; # Added 2025-06-24
|
||||
linuxPackages_hardened = linuxKernel.packages.linux_hardened; # Added 2025-08-10
|
||||
linuxPackages_latest-libre = throw "linux_latest_libre has been removed due to lack of maintenance"; # Added 2025-10-01
|
||||
@@ -1264,6 +1267,7 @@ mapAliases {
|
||||
minetest-touch = throw "'minetest-touch' has been renamed to/replaced by 'luanti-client'"; # Converted to throw 2025-10-27
|
||||
minetestclient = throw "'minetestclient' has been renamed to/replaced by 'luanti-client'"; # Converted to throw 2025-10-27
|
||||
minetestserver = throw "'minetestserver' has been renamed to/replaced by 'luanti-server'"; # Converted to throw 2025-10-27
|
||||
miniHttpd = mini-httpd; # Added 2026-02-08
|
||||
minio_legacy_fs = throw "'minio_legacy_fs' has been removed, migrate your data and use 'minio'"; # Added 2026-02-02
|
||||
minizincide = warnAlias "'minizincide' has been renamed to 'minizinc-ide'" minizinc-ide; # Added 2026-01-03
|
||||
minizip2 = throw "'minizip2' has been renamed to/replaced by 'minizip-ng'"; # Converted to throw 2025-10-27
|
||||
@@ -1874,6 +1878,7 @@ mapAliases {
|
||||
uae = throw "'uae' has been removed due to lack of upstream maintenance. Consider using 'fsuae' instead."; # Added 2025-06-11
|
||||
ubuntu_font_family = throw "'ubuntu_font_family' has been renamed to/replaced by 'ubuntu-classic'"; # Converted to throw 2025-10-27
|
||||
udisks2 = udisks; # Added 2025-10-30
|
||||
ue4demos = throw "'ue4demos' has been removed because it is unmaintained"; # Added 2026-02-07
|
||||
unicap = throw "'unicap' has been removed because it is unmaintained"; # Added 2025-05-17
|
||||
unifi-poller = throw "'unifi-poller' has been renamed to/replaced by 'unpoller'"; # Converted to throw 2025-10-27
|
||||
unzoo = throw "'unzoo' has been removed since it is unmaintained upstream and doesn't compile with newer versions of GCC anymore"; # Removed 2025-05-24
|
||||
|
||||
@@ -11864,8 +11864,6 @@ with pkgs;
|
||||
|
||||
ultrastar-manager = libsForQt5.callPackage ../tools/misc/ultrastar-manager { };
|
||||
|
||||
ue4demos = recurseIntoAttrs (callPackage ../games/ue4demos { });
|
||||
|
||||
# To ensure vdrift's code is built on hydra
|
||||
vdrift-bin = vdrift.bin;
|
||||
|
||||
|
||||
@@ -204,6 +204,14 @@ in
|
||||
];
|
||||
};
|
||||
|
||||
linux_6_19 = callPackage ../os-specific/linux/kernel/mainline.nix {
|
||||
branch = "6.19";
|
||||
kernelPatches = [
|
||||
kernelPatches.bridge_stp_helper
|
||||
kernelPatches.request_key_helper
|
||||
];
|
||||
};
|
||||
|
||||
linux_testing =
|
||||
let
|
||||
testing = callPackage ../os-specific/linux/kernel/mainline.nix {
|
||||
@@ -730,6 +738,7 @@ in
|
||||
linux_6_6 = recurseIntoAttrs (packagesFor kernels.linux_6_6);
|
||||
linux_6_12 = recurseIntoAttrs (packagesFor kernels.linux_6_12);
|
||||
linux_6_18 = recurseIntoAttrs (packagesFor kernels.linux_6_18);
|
||||
linux_6_19 = recurseIntoAttrs (packagesFor kernels.linux_6_19);
|
||||
}
|
||||
// lib.optionalAttrs config.allowAliases {
|
||||
linux_4_19 = throw "linux 4.19 was removed because it will reach its end of life within 24.11"; # Added 2024-09-21
|
||||
@@ -805,7 +814,7 @@ in
|
||||
packageAliases = {
|
||||
linux_default = packages.linux_6_12;
|
||||
# Update this when adding the newest kernel major version!
|
||||
linux_latest = packages.linux_6_18;
|
||||
linux_latest = packages.linux_6_19;
|
||||
linux_rt_default = packages.linux_rt_5_15;
|
||||
linux_rt_latest = packages.linux_rt_6_6;
|
||||
}
|
||||
|
||||
@@ -2052,6 +2052,8 @@ let
|
||||
|
||||
swhid_core = callPackage ../development/ocaml-modules/swhid_core { };
|
||||
|
||||
symex = callPackage ../development/ocaml-modules/symex { };
|
||||
|
||||
synchronizer = callPackage ../development/ocaml-modules/synchronizer { };
|
||||
|
||||
syslog = callPackage ../development/ocaml-modules/syslog { };
|
||||
|
||||
Reference in New Issue
Block a user