Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions pkgs/by-name/ak/akkoma-admin-fe/package.nix
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
fetchFromGitea,
yarn-berry_3,
nodejs,
python3,
python311,
pkg-config,
libsass,
xcbuild,
Expand Down Expand Up @@ -39,7 +39,7 @@ stdenv.mkDerivation (finalAttrs: {
yarn-berry
nodejs
pkg-config
python3
python311
libsass
]
++ lib.optional stdenv.hostPlatform.isDarwin xcbuild;
Expand Down
12 changes: 11 additions & 1 deletion pkgs/by-name/ak/akkoma/package.nix
Original file line number Diff line number Diff line change
@@ -1,13 +1,23 @@
{
lib,
beamPackages,
beam_minimal,
fetchFromGitea,
cmake,
file,
nixosTests,
nix-update-script,
}:

let
beamPackages = beam_minimal.packages.erlang_26.extend (
self: super: {
elixir = self.elixir_1_16;
rebar3 = self.rebar3WithPlugins {
plugins = with self; [ pc ];
};
}
);
in
beamPackages.mixRelease rec {
pname = "akkoma";
version = "3.17.0";
Expand Down
4 changes: 2 additions & 2 deletions pkgs/by-name/al/alsa-utils/package.nix
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
procps,
tree,
which,
fftw,
fftwFloat,
pipewire,
withPipewireLib ? true,
symlinkJoin,
Expand Down Expand Up @@ -48,7 +48,7 @@ stdenv.mkDerivation (finalAttrs: {
alsa-lib
ncurses
libsamplerate
fftw
fftwFloat
];

configureFlags = [
Expand Down
4 changes: 2 additions & 2 deletions pkgs/by-name/aq/aquamarine/package.nix
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
lib,
stdenv,
gcc15Stdenv,
cmake,
fetchFromGitHub,
hwdata,
Expand All @@ -21,7 +21,7 @@
wayland-protocols,
wayland-scanner,
}:
stdenv.mkDerivation (finalAttrs: {
gcc15Stdenv.mkDerivation (finalAttrs: {
pname = "aquamarine";
version = "0.10.0";

Expand Down
4 changes: 2 additions & 2 deletions pkgs/by-name/ar/armips/package.nix
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{
stdenv,
clangStdenv,
lib,
fetchFromGitHub,
cmake,
}:

stdenv.mkDerivation rec {
clangStdenv.mkDerivation rec {
pname = "armips";
version = "0.11.0";

Expand Down
4 changes: 2 additions & 2 deletions pkgs/by-name/ar/art/package.nix
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
lcms2,
libraw,
libiptcdata,
fftw,
fftwSinglePrec,
expat,
pcre2,
libsigcxx,
Expand Down Expand Up @@ -81,7 +81,7 @@ stdenv.mkDerivation rec {
lcms2
libraw
libiptcdata
fftw
fftwSinglePrec
expat
pcre2
libsigcxx
Expand Down
11 changes: 8 additions & 3 deletions pkgs/by-name/at/atf/package.nix
Original file line number Diff line number Diff line change
@@ -1,14 +1,19 @@
{
lib,
stdenv,
darwin,
fetchFromGitHub,
fetchpatch,
autoreconfHook,
kyua,
gitUpdater,
}:

stdenv.mkDerivation (finalAttrs: {
let
# atf is a dependency of libiconv. Avoid an infinite recursion with `pkgsStatic` by using a bootstrap stdenv.
stdenv' = if stdenv.hostPlatform.isDarwin then darwin.bootstrapStdenv else stdenv;
in
stdenv'.mkDerivation (finalAttrs: {
pname = "atf";
version = "0.23";

Expand All @@ -26,12 +31,12 @@ stdenv.mkDerivation (finalAttrs: {
--replace-fail 'atf_test_program{name="srcdir_test"}' ""
''
# These tests fail on Darwin.
+ lib.optionalString (finalAttrs.doInstallCheck && stdenv.hostPlatform.isDarwin) ''
+ lib.optionalString (finalAttrs.doInstallCheck && stdenv'.hostPlatform.isDarwin) ''
substituteInPlace atf-c/detail/process_test.c \
--replace-fail 'ATF_TP_ADD_TC(tp, status_coredump);' ""
''
# This test fails on Linux.
+ lib.optionalString (finalAttrs.doInstallCheck && stdenv.hostPlatform.isLinux) ''
+ lib.optionalString (finalAttrs.doInstallCheck && stdenv'.hostPlatform.isLinux) ''
substituteInPlace atf-c/detail/fs_test.c \
--replace-fail 'ATF_TP_ADD_TC(tp, eaccess);' ""
'';
Expand Down
6 changes: 5 additions & 1 deletion pkgs/by-name/ba/basalt-monado/package.nix
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,10 @@
cudaPackages,
enableCuda ? config.cudaSupport,
}:

let
opencv' = opencv.override { enableGtk3 = true; };
in
stdenv.mkDerivation {
pname = "basalt-monado";
version = "0-unstable-2025-09-25";
Expand Down Expand Up @@ -57,7 +61,7 @@ stdenv.mkDerivation {
libGL
lz4
magic-enum
opencv.cxxdev
opencv'.cxxdev
onetbb
xorg.libX11
]
Expand Down
12 changes: 7 additions & 5 deletions pkgs/by-name/ba/bazel_7/package.nix
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@
buildFHSEnv,
# this package (through the fixpoint glass)
# TODO probably still need for tests at some point
bazel_self,
bazel_7,
bazel_self ? bazel_7,
# native build inputs
runtimeShell,
zip,
Expand All @@ -35,10 +36,11 @@
# Apple dependencies
cctools,
libtool,
sigtool,
darwin,
# Allow to independently override the jdks used to build and run respectively
buildJdk,
runJdk,
jdk21_headless,
buildJdk ? jdk21_headless,
runJdk ? jdk21_headless,
# Toggle for hacks for running bazel under buildBazelPackage:
# Always assume all markers valid (this is needed because we remove markers; they are non-deterministic).
# Also, don't clean up environment variables (so that NIX_ environment variables are passed to compilers).
Expand Down Expand Up @@ -417,7 +419,7 @@ stdenv.mkDerivation rec {
# don't use system installed Xcode to run clang, use Nix clang instead
sed -i -E \
-e "s;/usr/bin/xcrun (--sdk macosx )?clang;${stdenv.cc}/bin/clang $NIX_CFLAGS_COMPILE $(bazelLinkFlags) -framework CoreFoundation;g" \
-e "s;/usr/bin/codesign;CODESIGN_ALLOCATE=${cctools}/bin/${cctools.targetPrefix}codesign_allocate ${sigtool}/bin/codesign;" \
-e "s;/usr/bin/codesign;CODESIGN_ALLOCATE=${cctools}/bin/${cctools.targetPrefix}codesign_allocate ${darwin.sigtool}/bin/codesign;" \
scripts/bootstrap/compile.sh \
tools/osx/BUILD

Expand Down
6 changes: 3 additions & 3 deletions pkgs/by-name/bi/biblioteca/package.nix
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
gtk4,
gobject-introspection,
libadwaita,
webkitgtk,
webkitgtk_6_0,
coreutils,
makeShellWrapper,
wrapGAppsHook4,
Expand Down Expand Up @@ -54,7 +54,7 @@ stdenv.mkDerivation (finalAttrs: {
gtk4
gobject-introspection
libadwaita
webkitgtk
webkitgtk_6_0
glib-networking
];

Expand All @@ -64,7 +64,7 @@ stdenv.mkDerivation (finalAttrs: {
gtk4.devdoc
glib.devdoc
libadwaita.devdoc
webkitgtk.devdoc
webkitgtk_6_0.devdoc
gobject-introspection.devdoc
]
++ extraDocsPackage;
Expand Down
24 changes: 12 additions & 12 deletions pkgs/by-name/bl/blender/package.nix
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@
pkg-config,
potrace,
pugixml,
python3Packages, # must use instead of python3.pkgs, see https://github.com/NixOS/nixpkgs/issues/211340
python311Packages, # must use python3Packages instead of python3.pkgs, see https://github.com/NixOS/nixpkgs/issues/211340
rocmPackages, # comes with a significantly larger closure size
rubberband,
runCommand,
Expand Down Expand Up @@ -95,8 +95,8 @@ let
(!stdenv.hostPlatform.isAarch64 && stdenv.hostPlatform.isLinux) || stdenv.hostPlatform.isDarwin;
vulkanSupport = !stdenv.hostPlatform.isDarwin;

python3 = python3Packages.python;
pyPkgsOpenusd = python3Packages.openusd.override (old: {
python3 = python311Packages.python;
pyPkgsOpenusd = python311Packages.openusd.override (old: {
opensubdiv = old.opensubdiv.override { inherit cudaSupport; };
withOsl = false;
});
Expand Down Expand Up @@ -131,7 +131,7 @@ stdenv'.mkDerivation (finalAttrs: {
substituteInPlace source/creator/CMakeLists.txt \
--replace-fail '${"$"}{LIBDIR}/python' \
'${python3}' \
--replace-fail '${"$"}{LIBDIR}/materialx/' '${python3Packages.materialx}/'
--replace-fail '${"$"}{LIBDIR}/materialx/' '${python311Packages.materialx}/'
substituteInPlace build_files/cmake/platform/platform_apple.cmake \
--replace-fail '${"$"}{LIBDIR}/brotli/lib/libbrotlicommon-static.a' \
'${lib.getLib brotli}/lib/libbrotlicommon.dylib' \
Expand All @@ -149,12 +149,12 @@ stdenv'.mkDerivation (finalAttrs: {
cmakeFlags = [
"-C../build_files/cmake/config/blender_release.cmake"

(lib.cmakeFeature "MaterialX_DIR" "${python3Packages.materialx}/lib/cmake/MaterialX")
(lib.cmakeFeature "MaterialX_DIR" "${python311Packages.materialx}/lib/cmake/MaterialX")
(lib.cmakeFeature "PYTHON_INCLUDE_DIR" "${python3}/include/${python3.libPrefix}")
(lib.cmakeFeature "PYTHON_LIBPATH" "${python3}/lib")
(lib.cmakeFeature "PYTHON_LIBRARY" "${python3.libPrefix}")
(lib.cmakeFeature "PYTHON_NUMPY_INCLUDE_DIRS" "${python3Packages.numpy_1}/${python3.sitePackages}/numpy/core/include")
(lib.cmakeFeature "PYTHON_NUMPY_PATH" "${python3Packages.numpy_1}/${python3.sitePackages}")
(lib.cmakeFeature "PYTHON_NUMPY_INCLUDE_DIRS" "${python311Packages.numpy_1}/${python3.sitePackages}/numpy/core/include")
(lib.cmakeFeature "PYTHON_NUMPY_PATH" "${python311Packages.numpy_1}/${python3.sitePackages}")
(lib.cmakeFeature "PYTHON_VERSION" "${python3.pythonVersion}")

(lib.cmakeBool "WITH_BUILDINFO" false)
Expand Down Expand Up @@ -221,7 +221,7 @@ stdenv'.mkDerivation (finalAttrs: {
cmake
llvmPackages.llvm.dev
makeWrapper
python3Packages.wrapPython
python311Packages.wrapPython
]
++ lib.optionals cudaSupport [
addDriverRunpath
Expand Down Expand Up @@ -263,7 +263,7 @@ stdenv'.mkDerivation (finalAttrs: {
potrace
pugixml
python3
python3Packages.materialx
python311Packages.materialx
rubberband
zlib
zstd
Expand Down Expand Up @@ -316,7 +316,7 @@ stdenv'.mkDerivation (finalAttrs: {

pythonPath =
let
ps = python3Packages;
ps = python311Packages;
in
[
ps.materialx
Expand Down Expand Up @@ -362,13 +362,13 @@ stdenv'.mkDerivation (finalAttrs: {

passthru = {
python = python3;
pythonPackages = python3Packages;
pythonPackages = python311Packages;

withPackages =
f:
(callPackage ./wrapper.nix { }).override {
blender = finalAttrs.finalPackage;
extraModules = (f python3Packages);
extraModules = (f python311Packages);
};

tests = {
Expand Down
3 changes: 2 additions & 1 deletion pkgs/by-name/bl/bluespec/package.nix
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@
yices, # bsc uses a patched version of yices
zlib,
ghc,
gmp-static,
gmp,
gmp-static ? gmp.override { withStatic = true; },
iverilog,
asciidoctor,
texliveFull,
Expand Down
4 changes: 2 additions & 2 deletions pkgs/by-name/ca/cantata/package.nix
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
withHttpStream ? true,
gst_all_1,
withReplaygain ? true,
ffmpeg,
ffmpeg_6,
speex,
mpg123,
withMtp ? true,
Expand Down Expand Up @@ -92,7 +92,7 @@ let
];
enable = withReplaygain;
pkgs = [
ffmpeg
ffmpeg_6
speex
mpg123
];
Expand Down
4 changes: 2 additions & 2 deletions pkgs/by-name/cl/clang-uml/package.nix
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
lib,
fetchFromGitHub,
stdenv,
clangStdenv,
cmake,
pkg-config,
installShellFiles,
Expand All @@ -15,7 +15,7 @@
enableLibcxx ? false,
debug ? false,
}:
stdenv.mkDerivation (finalAttrs: {
clangStdenv.mkDerivation (finalAttrs: {
pname = "clang-uml";
version = "0.6.2";

Expand Down
4 changes: 2 additions & 2 deletions pkgs/by-name/cl/clash-verge-rev/package.nix
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
wrapGAppsHook3,
v2ray-geoip,
v2ray-domain-list-community,
libsoup,
libsoup_3,
}:
let
pname = "clash-verge-rev";
Expand Down Expand Up @@ -38,7 +38,7 @@ let
pnpm-hash
vendor-hash
meta
libsoup
libsoup_3
;
};

Expand Down
4 changes: 2 additions & 2 deletions pkgs/by-name/cl/clash-verge-rev/unwrapped.nix
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
kdePackages,
libayatana-appindicator,
libsForQt5,
libsoup,
libsoup_3,
openssl,
webkitgtk_4_1,
}:
Expand Down Expand Up @@ -106,7 +106,7 @@ rustPlatform.buildRustPackage {

buildInputs = [
libayatana-appindicator
libsoup
libsoup_3
openssl
webkitgtk_4_1
];
Expand Down
Loading
Loading