gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/staging' into staging-next

Browse Source
This commit is contained in:
K900
2025-02-11 18:11:54 +03:00
parent 0cf5e066c2 9b8d90a951
commit 9ec082cb1c
202 changed files with 889 additions and 1123 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nixos/maintainers/scripts/incus/incus-container-image.nix
+1 -2
View File
@@ -16,8 +16,7 @@
# copy the config for nixos-rebuild
system.activationScripts.config =
let
config = pkgs.substituteAll {
src = ./incus-container-image-inner.nix;
config = pkgs.replaceVars ./incus-container-image-inner.nix {
stateVersion = lib.trivial.release;
};
in
nixos/maintainers/scripts/incus/incus-virtual-machine-image.nix
+1 -2
View File
@@ -16,8 +16,7 @@
# copy the config for nixos-rebuild
system.activationScripts.config =
let
config = pkgs.substituteAll {
src = ./incus-virtual-machine-image-inner.nix;
config = pkgs.replaceVars ./incus-virtual-machine-image-inner.nix {
stateVersion = lib.trivial.release;
};
in
nixos/maintainers/scripts/lxd/lxd-container-image.nix
+1 -2
View File
@@ -18,8 +18,7 @@
# copy the config for nixos-rebuild
system.activationScripts.config =
let
config = pkgs.substituteAll {
src = ./lxd-container-image-inner.nix;
config = pkgs.replaceVars ./lxd-container-image-inner.nix {
stateVersion = lib.trivial.release;
};
in
nixos/maintainers/scripts/lxd/lxd-virtual-machine-image.nix
+1 -2
View File
@@ -18,8 +18,7 @@
# copy the config for nixos-rebuild
system.activationScripts.config =
let
config = pkgs.substituteAll {
src = ./lxd-virtual-machine-image-inner.nix;
config = pkgs.replaceVars ./lxd-virtual-machine-image-inner.nix {
stateVersion = lib.trivial.release;
};
in
nixos/modules/installer/cd-dvd/iso-image.nix
+1 -5
View File
@@ -832,11 +832,7 @@ in
{ source = config.isoImage.splashImage;
target = "/isolinux/background.png";
}
{ source = pkgs.substituteAll {
name = "isolinux.cfg";
src = pkgs.writeText "isolinux.cfg-in" isolinuxCfg;
bootRoot = "/boot";
};
{ source = isolinuxCfg;
target = "/isolinux/isolinux.cfg";
}
{ source = "${pkgs.syslinux}/share/syslinux";
nixos/modules/services/misc/taskserver/default.nix
+1 -2
View File
@@ -142,8 +142,7 @@ let
src = pkgs.runCommand "nixos-taskserver-src" { preferLocalBuild = true; } ''
mkdir -p "$out"
cat "${
pkgs.substituteAll {
src = ./helper-tool.py;
pkgs.replaceVars ./helper-tool.py {
inherit taskd certtool;
inherit (cfg)
dataDir
nixos/modules/system/boot/loader/grub/grub.nix
+4 -2
View File
@@ -727,11 +727,13 @@ in
system.build.installBootLoader =
let
install-grub-pl = pkgs.substituteAll {
src = ./install-grub.pl;
install-grub-pl = pkgs.replaceVars ./install-grub.pl {
utillinux = pkgs.util-linux;
btrfsprogs = pkgs.btrfs-progs;
inherit (config.system.nixos) distroName;
# targets of a replacement in code
bootPath = null;
bootRoot = null;
};
perl = pkgs.perl.withPackages (p: with p; [
FileSlurp FileCopyRecursive
pkgs/applications/editors/emacs/make-emacs.nix
-1
View File
@@ -185,7 +185,6 @@ mkDerivation (finalAttrs: {
./native-comp-driver-options-30.patch
)
{
backendPath = (
lib.concatStringsSep " " (
builtins.map (x: ''"-B${x}"'') (
pkgs/applications/networking/dropbox/cli.nix
+4 -3
View File
@@ -1,7 +1,7 @@
{
lib,
stdenv,
substituteAll,
replaceVars,
autoreconfHook,
pkg-config,
fetchurl,
@@ -34,9 +34,10 @@ stdenv.mkDerivation {
strictDeps = true;
patches = [
(substituteAll {
src = ./fix-cli-paths.patch;
(replaceVars ./fix-cli-paths.patch {
inherit dropboxd;
# patch context
DESKTOP_FILE_DIR = null;
})
];
pkgs/applications/science/logic/z3/default.nix
+1 -1
View File
@@ -150,7 +150,7 @@ let
};
# replace @dir@ in the path of the given list of patches
fixupPatches = dir: map (patch: replaceVars patch { dir = dir; });
fixupPatches = dir: map (patch: replaceVars patch { inherit dir; });
in
{
z3_4_13 = common {
pkgs/build-support/replace-vars/replace-vars-with.nix
+5 -7
View File
@@ -58,13 +58,11 @@
let
# We use `--replace-fail` instead of `--subst-var-by` so that if the thing isn't there, we fail.
subst-var-by =
name: value:
lib.optionals (value != null) [
"--replace-fail"
(lib.escapeShellArg "@${name}@")
(lib.escapeShellArg value)
];
subst-var-by = name: value: [
"--replace-fail"
(lib.escapeShellArg "@${name}@")
(lib.escapeShellArg (lib.defaultTo "@${name}@" value))
];
substitutions = lib.concatLists (lib.mapAttrsToList subst-var-by replacements);
pkgs/build-support/setup-hooks/multiple-outputs.sh
+1 -1
View File
@@ -85,7 +85,7 @@ _multioutConfig() {
prependToVar configureFlags \
--bindir="${!outputBin}"/bin --sbindir="${!outputBin}"/sbin \
--includedir="${!outputInclude}"/include --oldincludedir="${!outputInclude}"/include \
--includedir="${!outputInclude}"/include \
--mandir="${!outputMan}"/share/man --infodir="${!outputInfo}"/share/info \
--docdir="${!outputDoc}"/share/doc/"${shareDocName}" \
--libdir="${!outputLib}"/lib --libexecdir="${!outputLib}"/libexec \
pkgs/by-name/ar/arma3-unix-launcher/package.nix
+2 -3
View File
@@ -11,7 +11,7 @@
nlohmann_json,
qt5,
spdlog,
substituteAll,
replaceVars,
buildDayZLauncher ? false,
}:
stdenv.mkDerivation (finalAttrs: {
@@ -27,8 +27,7 @@ stdenv.mkDerivation (finalAttrs: {
patches = [
# prevent CMake from trying to get libraries on the internet
(substituteAll {
src = ./dont_fetch_dependencies.patch;
(replaceVars ./dont_fetch_dependencies.patch {
argparse_src = fetchFromGitHub {
owner = "p-ranav";
repo = "argparse";
pkgs/by-name/br/brillo/package.nix
+4 -3
View File
@@ -4,7 +4,7 @@
fetchFromGitLab,
go-md2man,
coreutils,
substituteAll,
replaceVars,
}:
stdenv.mkDerivation rec {
@@ -19,9 +19,10 @@ stdenv.mkDerivation rec {
};
patches = [
(substituteAll {
src = ./udev-rule.patch;
(replaceVars ./udev-rule.patch {
inherit coreutils;
# patch context
group = null;
})
];
pkgs/by-name/bu/budgie-control-center/package.nix
+2 -4
View File
@@ -2,7 +2,7 @@
lib,
stdenv,
fetchFromGitHub,
substituteAll,
replaceVars,
accountsservice,
adwaita-icon-theme,
budgie-desktop,
@@ -81,13 +81,11 @@ stdenv.mkDerivation (finalAttrs: {
};
patches = [
(substituteAll {
src = ./paths.patch;
(replaceVars ./paths.patch {
budgie_desktop = budgie-desktop;
gcm = gnome-color-manager;
inherit
cups
glibc
libgnomekbd
shadow
;
pkgs/by-name/cb/cbmc/0001-Do-not-download-sources-in-cmake.patch
+1 -1
View File
@@ -17,7 +17,7 @@ index 2c1289a..8128362 100644
download_project(PROJ cudd
- URL https://sourceforge.net/projects/cudd-mirror/files/cudd-3.0.0.tar.gz/download
- URL_MD5 4fdafe4924b81648b908881c81fe6c30
+ SOURCE_DIR @cudd.src@
+ SOURCE_DIR @cudd@
)
if(NOT EXISTS ${cudd_SOURCE_DIR}/Makefile)
pkgs/by-name/cb/cbmc/package.nix
+3 -4
View File
@@ -8,7 +8,7 @@
flex,
makeWrapper,
perl,
substituteAll,
replaceVars,
cudd,
nix-update-script,
fetchpatch,
@@ -47,9 +47,8 @@ stdenv.mkDerivation (finalAttrs: {
];
patches = [
(substituteAll {
src = ./0001-Do-not-download-sources-in-cmake.patch;
inherit cudd;
(replaceVars ./0001-Do-not-download-sources-in-cmake.patch {
cudd = cudd.src;
})
./0002-Do-not-download-sources-in-cmake.patch
# Fixes build with libc++ >= 19 due to the removal of std::char_traits<unsigned>.
pkgs/by-name/cm/cmake/setup-hook.sh
-1
View File
@@ -93,7 +93,6 @@ cmakeConfigurePhase() {
prependToVar cmakeFlags "-DCMAKE_INSTALL_BINDIR=${!outputBin}/bin"
prependToVar cmakeFlags "-DCMAKE_INSTALL_SBINDIR=${!outputBin}/sbin"
prependToVar cmakeFlags "-DCMAKE_INSTALL_INCLUDEDIR=${!outputInclude}/include"
prependToVar cmakeFlags "-DCMAKE_INSTALL_OLDINCLUDEDIR=${!outputInclude}/include"
prependToVar cmakeFlags "-DCMAKE_INSTALL_MANDIR=${!outputMan}/share/man"
prependToVar cmakeFlags "-DCMAKE_INSTALL_INFODIR=${!outputInfo}/share/info"
prependToVar cmakeFlags "-DCMAKE_INSTALL_DOCDIR=${!outputDoc}/share/doc/${shareDocName}"
pkgs/by-name/du/duktape/package.nix
+18 -12
View File
@@ -21,19 +21,25 @@ stdenv.mkDerivation (finalAttrs: {
validatePkgConfig
] ++ lib.optionals stdenv.hostPlatform.isDarwin [ fixDarwinDylibNames ];
buildPhase = ''
make -f Makefile.sharedlibrary
make -f Makefile.cmdline
'';
buildPhase =
''
make -f Makefile.cmdline
''
+ lib.optionalString (!stdenv.hostPlatform.isStatic) ''
make -f Makefile.sharedlibrary
'';
installPhase = ''
install -d $out/bin
install -m755 duk $out/bin/
install -d $out/lib/pkgconfig
install -d $out/include
make -f Makefile.sharedlibrary install INSTALL_PREFIX=$out
substituteAll ${./duktape.pc.in} $out/lib/pkgconfig/duktape.pc
'';
installPhase =
''
install -d $out/bin
install -m755 duk $out/bin/
''
+ lib.optionalString (!stdenv.hostPlatform.isStatic) ''
install -d $out/lib/pkgconfig
install -d $out/include
make -f Makefile.sharedlibrary install INSTALL_PREFIX=$out
substituteAll ${./duktape.pc.in} $out/lib/pkgconfig/duktape.pc
'';
enableParallelBuilding = true;
pkgs/by-name/fb/fbmenugen/package.nix
+4 -3
View File
@@ -5,7 +5,7 @@
gnused,
makeWrapper,
perlPackages,
substituteAll,
replaceVars,
xorg,
wrapGAppsHook3,
gitUpdater,
@@ -23,10 +23,11 @@ perlPackages.buildPerlPackage rec {
};
patches = [
(substituteAll {
src = ./0001-Fix-paths.patch;
(replaceVars ./0001-Fix-paths.patch {
xmessage = xorg.xmessage;
inherit fluxbox gnused;
# replaced in postPatch
fbmenugen = null;
})
];
pkgs/by-name/fr/freenet/package.nix
+4 -3
View File
@@ -8,7 +8,7 @@
gradle_8,
bash,
coreutils,
substituteAll,
replaceVars,
nixosTests,
writeText,
}:
@@ -50,14 +50,15 @@ stdenv.mkDerivation rec {
jdk
];
wrapper = substituteAll {
src = ./freenetWrapper;
wrapper = replaceVars ./freenetWrapper {
inherit
bash
coreutils
jre
seednodes
;
# replaced in installPhase
CLASSPATH = null;
};
mitmCache = gradle.fetchDeps {
pkgs/by-name/gl/glance/package.nix
+3 -3
View File
@@ -8,16 +8,16 @@
buildGoModule rec {
pname = "glance";
version = "0.6.4";
version = "0.7.1";
src = fetchFromGitHub {
owner = "glanceapp";
repo = "glance";
rev = "v${version}";
hash = "sha256-L3IBCh4pDeaErxl89s/1yMHoU8dYtRcmqcIgFiyGq2U=";
hash = "sha256-Ef3Kf7rYmkWqOUpde7P46IRs1x/+jMW3lmN13hfTCNs=";
};
vendorHash = "sha256-6PDcUb2Rv+Shqb+wtsit8Yt9RSgN5tz+MeXrujZXDCo=";
vendorHash = "sha256-lURRHlZoxbuW1SXxrxy2BkMndcEllGFmVCB4pXBad8Q=";
excludedPackages = [ "scripts/build-and-ship" ];
pkgs/by-name/in/iniparser/package.nix
-1
View File
@@ -27,7 +27,6 @@ stdenv.mkDerivation (finalAttrs: {
(replaceVars ./remove-fetchcontent-usage.patch {
# Do not let cmake's fetchContent download unity
unitySrc = symlinkJoin {
name = "unity-with-iniparser-config";
paths = [
(fetchFromGitHub {
owner = "throwtheswitch";
pkgs/by-name/lc/lcms2/package.nix
+2 -2
View File
@@ -9,11 +9,11 @@
stdenv.mkDerivation rec {
pname = "lcms2";
version = "2.16";
version = "2.17";
src = fetchurl {
url = "mirror://sourceforge/lcms/${pname}-${version}.tar.gz";
hash = "sha256-2HPTSti5tM6gEGMfGmIo0gh0deTcXnY+uBrMI9nUWlE=";
hash = "sha256-0Rr1aeQqG6oWUNIK1h0S5Br0/q1Kp5ZKAfk7CLU6sHQ=";
};
outputs = [
pkgs/by-name/le/lesspipe/package.nix
+4
View File
@@ -167,6 +167,7 @@ stdenv.mkDerivation rec {
};
execer = [
"cannot:${iconv}/bin/iconv"
"cannot:${file}/bin/file"
];
}}
${resholve.phraseSolution "lesscomplete" {
@@ -216,6 +217,9 @@ stdenv.mkDerivation rec {
];
builtin = [ "setopt" ];
};
execer = [
"cannot:${file}/bin/file"
];
}}
'';
pkgs/by-name/li/libtiff/package.nix
+18 -12
View File
@@ -2,7 +2,6 @@
lib,
stdenv,
fetchFromGitLab,
fetchpatch,
nix-update-script,
cmake,
@@ -17,6 +16,17 @@
zlib,
zstd,
# Because lerc is C++ and static libraries don't track dependencies,
# that every downstream dependent of libtiff has to link with a C++
# compiler, or the C++ standard library won't be linked, resulting
# in undefined symbol errors. Without systematic support for this
# in build systems, fixing this would require modifying the build
# system of every libtiff user. Hopefully at some point build
# systems will figure this out, and then we can enable this.
#
# See https://github.com/mesonbuild/meson/issues/14234
withLerc ? !stdenv.hostPlatform.isStatic,
# for passthru.tests
libgeotiff,
python3Packages,
@@ -43,13 +53,6 @@ stdenv.mkDerivation (finalAttrs: {
# libc++abi 11 has an `#include <version>`, this picks up files name
# `version` in the project's include paths
./rename-version.patch
# https://gitlab.com/libtiff/libtiff/-/merge_requests/685
(fetchpatch {
name = "static.patch";
url = "https://gitlab.com/libtiff/libtiff/-/commit/e6f3d60187a699507d6c85c5c63a8f258d8b8ebc.patch";
hash = "sha256-TZE7nyOPojxnR9/jiZbv2LgKS2Yz+Db9lbLgeefrQsc=";
})
];
postPatch = ''
@@ -80,10 +83,13 @@ stdenv.mkDerivation (finalAttrs: {
sphinx
];
buildInputs = [
lerc
zstd
];
buildInputs =
[
zstd
]
++ lib.optionals withLerc [
lerc
];
# TODO: opengl support (bogus configure detection)
propagatedBuildInputs = [
pkgs/by-name/ma/maturin/package.nix
+3 -3
View File
@@ -13,17 +13,17 @@
rustPlatform.buildRustPackage rec {
pname = "maturin";
version = "1.8.1";
version = "1.8.2";
src = fetchFromGitHub {
owner = "PyO3";
repo = "maturin";
rev = "v${version}";
hash = "sha256-Ix1UTVYJRPTii/LqJQto+und+BrSAIZeHlTA6biysm0=";
hash = "sha256-k4s0kh68kycc8MSVkD64X547mWmFW4UuToDIcZ87OSc=";
};
useFetchCargoVendor = true;
cargoHash = "sha256-vgMzl3Kx1OqHSkVdykgwoMn+XNrjg93OmVgDc6I7AV0=";
cargoHash = "sha256-6aLWkphWLScUz6l0RJj9LmNad6aPxLz2iVxXVOXq7pg=";
buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
darwin.apple_sdk.frameworks.Security
pkgs/by-name/me/meson/package.nix
+2 -3
View File
@@ -12,7 +12,7 @@
ninja,
pkg-config,
python3,
substituteAll,
replaceVars,
zlib,
}:
@@ -46,8 +46,7 @@ python3.pkgs.buildPythonApplication rec {
# are not as predictable, therefore we need to keep them in the RPATH.
# At the moment we are keeping the paths starting with /nix/store.
# https://github.com/NixOS/nixpkgs/issues/31222#issuecomment-365811634
(substituteAll {
src = ./001-fix-rpath.patch;
(replaceVars ./001-fix-rpath.patch {
inherit (builtins) storeDir;
})
pkgs/by-name/nu/nuget-to-json/package.nix
+14 -12
View File
@@ -1,7 +1,7 @@
{
lib,
runtimeShell,
substituteAll,
replaceVarsWith,
nix,
coreutils,
jq,
@@ -12,23 +12,25 @@
cacert,
}:
substituteAll {
replaceVarsWith {
name = "nuget-to-json";
dir = "bin";
src = ./nuget-to-json.sh;
isExecutable = true;
inherit runtimeShell cacert;
binPath = lib.makeBinPath [
nix
coreutils
jq
xmlstarlet
curl
gnugrep
gawk
];
replacements = {
inherit runtimeShell cacert;
binPath = lib.makeBinPath [
nix
coreutils
jq
xmlstarlet
curl
gnugrep
gawk
];
};
meta = {
description = "Convert a nuget packages directory to a lockfile for buildDotnetModule";
pkgs/by-name/nu/nuget-to-nix/package.nix
+15 -13
View File
@@ -1,7 +1,7 @@
{
lib,
runtimeShell,
substituteAll,
replaceVarsWith,
nix,
coreutils,
jq,
@@ -13,24 +13,26 @@
cacert,
}:
substituteAll {
replaceVarsWith {
name = "nuget-to-nix";
dir = "bin";
src = ./nuget-to-nix.sh;
isExecutable = true;
inherit runtimeShell cacert;
binPath = lib.makeBinPath [
nix
coreutils
jq
xmlstarlet
curl
gnugrep
gawk
nuget-to-json
];
replacements = {
inherit runtimeShell cacert;
binPath = lib.makeBinPath [
nix
coreutils
jq
xmlstarlet
curl
gnugrep
gawk
nuget-to-json
];
};
meta = {
description = "Convert a nuget packages directory to a lockfile for buildDotnetModule";
pkgs/by-name/sp/speechd/package.nix
+6 -6
View File
@@ -1,7 +1,7 @@
{
stdenv,
lib,
substituteAll,
replaceVars,
pkg-config,
fetchurl,
python3Packages,
@@ -47,16 +47,16 @@ stdenv.mkDerivation rec {
patches =
[
(substituteAll {
src = ./fix-paths.patch;
(replaceVars ./fix-paths.patch {
utillinux = util-linux;
# patch context
bindir = null;
})
]
++ lib.optionals (withEspeak && espeak.mbrolaSupport) [
# Replace FHS paths.
(substituteAll {
src = ./fix-mbrola-paths.patch;
inherit espeak mbrola;
(replaceVars ./fix-mbrola-paths.patch {
inherit mbrola;
})
];
pkgs/by-name/us/usbutils/package.nix
+2 -3
View File
@@ -2,7 +2,7 @@
lib,
stdenv,
fetchurl,
substituteAll,
replaceVars,
fetchpatch,
meson,
ninja,
@@ -23,8 +23,7 @@ stdenv.mkDerivation rec {
patches =
[
(substituteAll {
src = ./fix-paths.patch;
(replaceVars ./fix-paths.patch {
inherit hwdata;
})
]
pkgs/by-name/wa/waf/package.nix
+2 -2
View File
@@ -10,13 +10,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "waf";
version = "2.1.4";
version = "2.1.5";
src = fetchFromGitLab {
owner = "ita1024";
repo = "waf";
rev = "waf-${finalAttrs.version}";
hash = "sha256-Dt8eo/rY6JRu6teTQM0y7bjMzQjOv3WSL6bcF9g0B8o=";
hash = "sha256-cZ8tt17m1KUGxYPJf+cHf9j8rzNCrGyY8rcZcSvebyY=";
};
nativeBuildInputs = [
pkgs/by-name/zl/zlib-ng/package.nix
+2 -2
View File
@@ -10,13 +10,13 @@
stdenv.mkDerivation rec {
pname = "zlib-ng";
version = "2.2.3";
version = "2.2.4";
src = fetchFromGitHub {
owner = "zlib-ng";
repo = "zlib-ng";
rev = version;
hash = "sha256-22JX7diwhPaAhqErUdFymeSMzEGQkOp7LdBFwCnx5oc=";
hash = "sha256-Khmrhp5qy4vvoQe4WgoogpjWrgcUB/q8zZeqIydthYg=";
};
outputs = [
pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl/default.nix
+2 -3
View File
@@ -1,7 +1,7 @@
{
lib,
stdenv,
substituteAll,
replaceVars,
fetchurl,
fetchpatch,
findXMLCatalogs,
@@ -50,8 +50,7 @@ let
})
# Add legacy sourceforge.net URIs to the catalog
(substituteAll {
src = ./catalog-legacy-uris.patch;
(replaceVars ./catalog-legacy-uris.patch {
inherit legacySuffix suffix version;
})
]
pkgs/desktops/gnome/extensions/extensionOverrides.nix
+1 -3
View File
@@ -21,7 +21,6 @@
, smartmontools
, replaceVars
, stdenvNoCC
, substituteAll
, touchegg
, util-linux
, vte
@@ -136,8 +135,7 @@ super: lib.trivial.pipe super [
});
in {
patches = [
(substituteAll {
src = ./extensionOverridesPatches/lunarcal_at_ailin.nemui.patch;
(replaceVars ./extensionOverridesPatches/lunarcal_at_ailin.nemui.patch {
chinese_calendar_path = chinese-calendar;
})
];
pkgs/desktops/gnome/extensions/gsconnect/default.nix
+4 -3
View File
@@ -1,7 +1,7 @@
{ stdenv
, lib
, fetchFromGitHub
, substituteAll
, replaceVars
, openssl
, gsound
, meson
@@ -35,9 +35,10 @@ stdenv.mkDerivation rec {
patches = [
# Make typelibs available in the extension
(substituteAll {
src = ./fix-paths.patch;
(replaceVars ./fix-paths.patch {
gapplication = "${glib.bin}/bin/gapplication";
# Replaced in postPatch
typelibPath = null;
})
# Allow installing installed tests to a separate output
pkgs/desktops/gnome/extensions/taskwhisperer/default.nix
+2 -4
View File
@@ -1,7 +1,7 @@
{
lib,
stdenv,
substituteAll,
replaceVars,
fetchFromGitHub,
taskwarrior2,
gettext,
@@ -37,10 +37,8 @@ stdenv.mkDerivation rec {
];
patches = [
(substituteAll {
src = ./fix-paths.patch;
(replaceVars ./fix-paths.patch {
task = "${taskwarrior2}/bin/task";
shell = runtimeShell;
})
];
pkgs/desktops/lomiri/qml/lomiri-ui-toolkit/default.nix
+2 -4
View File
@@ -3,7 +3,7 @@
lib,
fetchFromGitLab,
gitUpdater,
substituteAll,
replaceVars,
testers,
dbus-test-runner,
dpkg,
@@ -63,9 +63,7 @@ stdenv.mkDerivation (finalAttrs: {
patches = [
./2001-Mark-problematic-tests.patch
(substituteAll {
src = ./2002-Nixpkgs-versioned-QML-path.patch.in;
name = "2002-Nixpkgs-versioned-QML-path.patch";
(replaceVars ./2002-Nixpkgs-versioned-QML-path.patch.in {
qtVersion = lib.versions.major qtbase.version;
})
];
pkgs/desktops/mate/caja-dropbox/default.nix
+4 -3
View File
@@ -2,7 +2,7 @@
lib,
stdenv,
fetchurl,
substituteAll,
replaceVars,
pkg-config,
gobject-introspection,
gdk-pixbuf,
@@ -26,9 +26,10 @@ stdenv.mkDerivation rec {
};
patches = [
(substituteAll {
src = ./fix-cli-paths.patch;
(replaceVars ./fix-cli-paths.patch {
inherit dropboxd;
# patch context
DESKTOP_FILE_DIR = null;
})
];
pkgs/development/compilers/crystal/default.nix
+2 -3
View File
@@ -4,7 +4,7 @@
, fetchurl
, fetchpatch
, lib
, substituteAll
, replaceVars
# Dependencies
, boehmgc
, coreutils
@@ -95,8 +95,7 @@ let
};
patches = [
(substituteAll {
src = ./tzdata.patch;
(replaceVars ./tzdata.patch {
inherit tzdata;
})
]
pkgs/development/compilers/dotnet/sign-apphost.nix
+2 -3
View File
@@ -1,12 +1,11 @@
{
substituteAll,
replaceVars,
callPackage,
}:
let
sigtool = callPackage ./sigtool.nix { };
in
substituteAll {
src = ./sign-apphost.proj;
replaceVars ./sign-apphost.proj {
codesign = "${sigtool}/bin/codesign";
}
pkgs/development/compilers/dotnet/wrapper.nix
+6 -5
View File
@@ -15,7 +15,7 @@
darwin,
icu,
lndir,
substituteAll,
replaceVars,
nugetPackageHook,
xmlstarlet,
}:
@@ -42,10 +42,11 @@ stdenvNoCC.mkDerivation (finalAttrs: {
[
./dotnet-setup-hook.sh
]
++ lib.optional (type == "sdk") (substituteAll {
src = ./dotnet-sdk-setup-hook.sh;
inherit lndir xmlstarlet;
});
++ lib.optional (type == "sdk") (
replaceVars ./dotnet-sdk-setup-hook.sh {
inherit lndir xmlstarlet;
}
);
propagatedSandboxProfile = toString unwrapped.__propagatedSandboxProfile;
pkgs/development/compilers/emscripten/default.nix
+2 -3
View File
@@ -10,7 +10,7 @@
llvmPackages,
symlinkJoin,
makeWrapper,
substituteAll,
replaceVars,
buildNpmPackage,
emscripten,
}:
@@ -57,8 +57,7 @@ stdenv.mkDerivation rec {
];
patches = [
(substituteAll {
src = ./0001-emulate-clang-sysroot-include-logic.patch;
(replaceVars ./0001-emulate-clang-sysroot-include-logic.patch {
resourceDir = "${llvmEnv}/lib/clang/${lib.versions.major llvmPackages.llvm.version}/";
})
];
pkgs/development/compilers/go/1.22.nix
+4 -7
View File
@@ -3,7 +3,7 @@
stdenv,
fetchurl,
tzdata,
substituteAll,
replaceVars,
iana-etc,
xcbuild,
mailcap,
@@ -75,20 +75,17 @@ stdenv.mkDerivation (finalAttrs: {
'';
patches = [
(substituteAll {
src = ./iana-etc-1.17.patch;
(replaceVars ./iana-etc-1.17.patch {
iana = iana-etc;
})
# Patch the mimetype database location which is missing on NixOS.
# but also allow static binaries built with NixOS to run outside nix
(substituteAll {
src = ./mailcap-1.17.patch;
(replaceVars ./mailcap-1.17.patch {
inherit mailcap;
})
# prepend the nix path to the zoneinfo files but also leave the original value for static binaries
# that run outside a nix server
(substituteAll {
src = ./tzdata-1.19.patch;
(replaceVars ./tzdata-1.19.patch {
inherit tzdata;
})
./remove-tools-1.11.patch
pkgs/development/compilers/go/1.23.nix
+4 -7
View File
@@ -3,7 +3,7 @@
stdenv,
fetchurl,
tzdata,
substituteAll,
replaceVars,
iana-etc,
xcbuild,
mailcap,
@@ -75,20 +75,17 @@ stdenv.mkDerivation (finalAttrs: {
'';
patches = [
(substituteAll {
src = ./iana-etc-1.17.patch;
(replaceVars ./iana-etc-1.17.patch {
iana = iana-etc;
})
# Patch the mimetype database location which is missing on NixOS.
# but also allow static binaries built with NixOS to run outside nix
(substituteAll {
src = ./mailcap-1.17.patch;
(replaceVars ./mailcap-1.17.patch {
inherit mailcap;
})
# prepend the nix path to the zoneinfo files but also leave the original value for static binaries
# that run outside a nix server
(substituteAll {
src = ./tzdata-1.19.patch;
(replaceVars ./tzdata-1.19.patch {
inherit tzdata;
})
./remove-tools-1.11.patch
pkgs/development/compilers/go/1.24.nix
+4 -7
View File
@@ -3,7 +3,7 @@
stdenv,
fetchurl,
tzdata,
substituteAll,
replaceVars,
iana-etc,
xcbuild,
mailcap,
@@ -75,20 +75,17 @@ stdenv.mkDerivation (finalAttrs: {
'';
patches = [
(substituteAll {
src = ./iana-etc-1.17.patch;
(replaceVars ./iana-etc-1.17.patch {
iana = iana-etc;
})
# Patch the mimetype database location which is missing on NixOS.
# but also allow static binaries built with NixOS to run outside nix
(substituteAll {
src = ./mailcap-1.17.patch;
(replaceVars ./mailcap-1.17.patch {
inherit mailcap;
})
# prepend the nix path to the zoneinfo files but also leave the original value for static binaries
# that run outside a nix server
(substituteAll {
src = ./tzdata-1.19.patch;
(replaceVars ./tzdata-1.19.patch {
inherit tzdata;
})
./remove-tools-1.11.patch
pkgs/development/compilers/ponyc/default.nix
+2 -3
View File
@@ -13,7 +13,7 @@
python3,
# Not really used for anything real, just at build time.
git,
substituteAll,
replaceVars,
which,
z3,
cctools,
@@ -67,8 +67,7 @@ stdenv.mkDerivation (rec {
./disable-networking-tests.patch
]
++ lib.optionals stdenv.hostPlatform.isDarwin [
(substituteAll {
src = ./fix-darwin-build.patch;
(replaceVars ./fix-darwin-build.patch {
libSystem = darwin.Libsystem;
})
];
pkgs/development/compilers/swift/compiler/default.nix
+3 -5
View File
@@ -28,7 +28,7 @@
, glibc
, libuuid
# Darwin-specific
, substituteAll
, replaceVars
, fixDarwinDylibNames
, xcbuild
, cctools # libtool
@@ -300,12 +300,10 @@ in stdenv.mkDerivation {
patch -p1 -d swift -i ${./patches/swift-linux-fix-libc-paths.patch}
patch -p1 -d swift -i ${./patches/swift-linux-fix-linking.patch}
patch -p1 -d swift -i ${./patches/swift-darwin-libcxx-flags.patch}
patch -p1 -d swift -i ${substituteAll {
src = ./patches/swift-darwin-plistbuddy-workaround.patch;
patch -p1 -d swift -i ${replaceVars ./patches/swift-darwin-plistbuddy-workaround.patch {
inherit swiftArch;
}}
patch -p1 -d swift -i ${substituteAll {
src = ./patches/swift-prevent-sdk-dirs-warning.patch;
patch -p1 -d swift -i ${replaceVars ./patches/swift-prevent-sdk-dirs-warning.patch {
inherit (builtins) storeDir;
}}
pkgs/development/compilers/swift/swift-driver/default.nix
+2 -3
View File
@@ -10,7 +10,7 @@
XCTest,
sqlite,
ncurses,
substituteAll,
replaceVars,
}:
let
sources = callPackage ../sources.nix { };
@@ -50,8 +50,7 @@ stdenv.mkDerivation {
hash = "sha256-eVBaKN6uzj48ZnHtwGV0k5ChKjak1tDCyE+wTdyGq2c=";
})
# Prevent a warning about SDK directories we don't have.
(substituteAll {
src = ./patches/prevent-sdk-dirs-warnings.patch;
(replaceVars ./patches/prevent-sdk-dirs-warnings.patch {
inherit (builtins) storeDir;
})
];
pkgs/development/compilers/swift/swiftpm/default.nix
+3 -5
View File
@@ -13,7 +13,7 @@
pkg-config,
sqlite,
ncurses,
substituteAll,
replaceVars,
runCommandLocal,
makeWrapper,
DarwinTools, # sw_vers
@@ -45,8 +45,7 @@ let
./patches/disable-xctest.patch
./patches/fix-clang-cxx.patch
./patches/nix-pkgconfig-vars.patch
(substituteAll {
src = ./patches/fix-stdlib-path.patch;
(replaceVars ./patches/fix-stdlib-path.patch {
inherit (builtins) storeDir;
swiftLib = swift.swift.lib;
})
@@ -429,8 +428,7 @@ stdenv.mkDerivation (
# Prevent a warning about SDK directories we don't have.
swiftpmMakeMutable swift-driver
patch -p1 -d .build/checkouts/swift-driver -i ${
substituteAll {
src = ../swift-driver/patches/prevent-sdk-dirs-warnings.patch;
replaceVars ../swift-driver/patches/prevent-sdk-dirs-warnings.patch {
inherit (builtins) storeDir;
}
}
pkgs/development/compilers/temurin-bin/sources.json
+306 -306
View File
@@ -6,52 +6,52 @@
"packageType": "jdk",
"vmType": "hotspot",
"x86_64": {
"build": "9",
"sha256": "0a431310ccccc36c85b1274b5d31e368fdc8cf62cb7c2ed98d7b59eb5a13dc82",
"url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.25%2B9/OpenJDK11U-jdk_x64_alpine-linux_hotspot_11.0.25_9.tar.gz",
"version": "11.0.25"
"build": "4",
"sha256": "2e1f667395cdb1e872bd7320e3eda96c0f0978e29e574e75f9cdf61160e8974a",
"url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.26%2B4/OpenJDK11U-jdk_x64_alpine-linux_hotspot_11.0.26_4.tar.gz",
"version": "11.0.26"
}
},
"openjdk17": {
"packageType": "jdk",
"vmType": "hotspot",
"x86_64": {
"build": "11",
"sha256": "67632ee4563e9827b56f62ab6da95bce200d9e82092b211988c0d2113abc4071",
"url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.13%2B11/OpenJDK17U-jdk_x64_alpine-linux_hotspot_17.0.13_11.tar.gz",
"version": "17.0.13"
"build": "7",
"sha256": "259c85e16f7bbfdfb3e0a2ec1c5d6e2063300d413422286583265a9d8a882358",
"url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.14%2B7/OpenJDK17U-jdk_x64_alpine-linux_hotspot_17.0.14_7.tar.gz",
"version": "17.0.14"
}
},
"openjdk21": {
"aarch64": {
"build": "11",
"sha256": "f22e32b869dd0e5e3f248646f62bffaa307b360299488ac8764e622923d7e747",
"url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.5%2B11/OpenJDK21U-jdk_aarch64_alpine-linux_hotspot_21.0.5_11.tar.gz",
"version": "21.0.5"
"build": "7",
"sha256": "2798990401d9c47eaeddb7d5148f577770e4c1013b9223290a43765463204ae4",
"url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.6%2B7/OpenJDK21U-jdk_aarch64_alpine-linux_hotspot_21.0.6_7.tar.gz",
"version": "21.0.6"
},
"packageType": "jdk",
"vmType": "hotspot",
"x86_64": {
"build": "11",
"sha256": "8da7da49101d45f646272616f20e8b10d57472bbf5961d64ffb07d7ba93c6909",
"url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.5%2B11/OpenJDK21U-jdk_x64_alpine-linux_hotspot_21.0.5_11.tar.gz",
"version": "21.0.5"
"build": "7",
"sha256": "6c66470a9143ad562570a34c1583d9fa50bf904f6f9ced642e9d800ce043a0f3",
"url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.6%2B7/OpenJDK21U-jdk_x64_alpine-linux_hotspot_21.0.6_7.tar.gz",
"version": "21.0.6"
}
},
"openjdk23": {
"aarch64": {
"build": "11",
"sha256": "ebdd6602d27bd7535bf06f21e8a0c3d563be7b790a90bef00cb6ac4123c66f86",
"url": "https://github.com/adoptium/temurin23-binaries/releases/download/jdk-23.0.1%2B11/OpenJDK23U-jdk_aarch64_alpine-linux_hotspot_23.0.1_11.tar.gz",
"version": "23.0.1"
"build": "7",
"sha256": "b55c5c881a2fed17ec5a59feaa33d9263703b399d1bfae3a5eaed3f140aa4570",
"url": "https://github.com/adoptium/temurin23-binaries/releases/download/jdk-23.0.2%2B7/OpenJDK23U-jdk_aarch64_alpine-linux_hotspot_23.0.2_7.tar.gz",
"version": "23.0.2"
},
"packageType": "jdk",
"vmType": "hotspot",
"x86_64": {
"build": "11",
"sha256": "4c37a9e885c4e099b049c3ba9baa073de1525e28cd5ffca016c5c5bd7ed385a6",
"url": "https://github.com/adoptium/temurin23-binaries/releases/download/jdk-23.0.1%2B11/OpenJDK23U-jdk_x64_alpine-linux_hotspot_23.0.1_11.tar.gz",
"version": "23.0.1"
"build": "7",
"sha256": "2c05c6dfea23a83fdbfaf5b03cc3cfd8d998c8069e930e0e585a39d4a99f3d99",
"url": "https://github.com/adoptium/temurin23-binaries/releases/download/jdk-23.0.2%2B7/OpenJDK23U-jdk_x64_alpine-linux_hotspot_23.0.2_7.tar.gz",
"version": "23.0.2"
}
},
"openjdk8": {
@@ -59,9 +59,9 @@
"vmType": "hotspot",
"x86_64": {
"build": "6",
"sha256": "86071bc98901cae80c62745a64bb4486212985fe5b66b5aec36ce92e8a036a9d",
"url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u432-b06/OpenJDK8U-jdk_x64_alpine-linux_hotspot_8u432b06.tar.gz",
"version": "8.0.432"
"sha256": "9fcb96380b25c1d1caec65b7606c387716a7ae51caf359f5f3ff0dcca40f231f",
"url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u442-b06/OpenJDK8U-jdk_x64_alpine-linux_hotspot_8u442b06.tar.gz",
"version": "8.0.442"
}
}
},
@@ -70,52 +70,52 @@
"packageType": "jre",
"vmType": "hotspot",
"x86_64": {
"build": "9",
"sha256": "905e35f14228904d67a7a56f9f0b8ede58e9b15f9af3a3d54fb86f78c8e47a34",
"url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.25%2B9/OpenJDK11U-jre_x64_alpine-linux_hotspot_11.0.25_9.tar.gz",
"version": "11.0.25"
"build": "4",
"sha256": "69031fc68d41189691dbeca73447ca543040d26995f61cef83fd7aed8fb4dbd2",
"url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.26%2B4/OpenJDK11U-jre_x64_alpine-linux_hotspot_11.0.26_4.tar.gz",
"version": "11.0.26"
}
},
"openjdk17": {
"packageType": "jre",
"vmType": "hotspot",
"x86_64": {
"build": "11",
"sha256": "7a2df4e2f86eca649af1e17d990ab8e354cb6dee389606025b9d05f75623c388",
"url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.13%2B11/OpenJDK17U-jre_x64_alpine-linux_hotspot_17.0.13_11.tar.gz",
"version": "17.0.13"
"build": "7",
"sha256": "9dcc53a30676692e604571a6e0bd13ac0c1b15f4bc2b78d19f88bd316075f84a",
"url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.14%2B7/OpenJDK17U-jre_x64_alpine-linux_hotspot_17.0.14_7.tar.gz",
"version": "17.0.14"
}
},
"openjdk21": {
"aarch64": {
"build": "11",
"sha256": "12b988a3d934e3eb89c6a981a93f8e2adf0a62cc9030487dee76c0c29b93714d",
"url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.5%2B11/OpenJDK21U-jre_aarch64_alpine-linux_hotspot_21.0.5_11.tar.gz",
"version": "21.0.5"
"build": "7",
"sha256": "bcd459e70cdddaa6ada0d855ce944c592814042f1e12d53aa08fa89eedcdf893",
"url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.6%2B7/OpenJDK21U-jre_aarch64_alpine-linux_hotspot_21.0.6_7.tar.gz",
"version": "21.0.6"
},
"packageType": "jre",
"vmType": "hotspot",
"x86_64": {
"build": "11",
"sha256": "2dfa33fb8e9474e6967c6cf17964abb5ddce9c17fa6a9f8d7aa221a0ae295df9",
"url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.5%2B11/OpenJDK21U-jre_x64_alpine-linux_hotspot_21.0.5_11.tar.gz",
"version": "21.0.5"
"build": "7",
"sha256": "2330f38feb59ab7af0e2fffc12d5500005d35f7f53f49dd8a9f9aa1ae68aee5f",
"url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.6%2B7/OpenJDK21U-jre_x64_alpine-linux_hotspot_21.0.6_7.tar.gz",
"version": "21.0.6"
}
},
"openjdk23": {
"aarch64": {
"build": "11",
"sha256": "b56eaedc094cb9107be2d5be9ad34c3dd9492c45aa671d102b5829a488cfc744",
"url": "https://github.com/adoptium/temurin23-binaries/releases/download/jdk-23.0.1%2B11/OpenJDK23U-jre_aarch64_alpine-linux_hotspot_23.0.1_11.tar.gz",
"version": "23.0.1"
"build": "7",
"sha256": "248a2ffb3abcb0cee7841ce648af7af415c96ee88cba4f8bf676c0115d38de5e",
"url": "https://github.com/adoptium/temurin23-binaries/releases/download/jdk-23.0.2%2B7/OpenJDK23U-jre_aarch64_alpine-linux_hotspot_23.0.2_7.tar.gz",
"version": "23.0.2"
},
"packageType": "jre",
"vmType": "hotspot",
"x86_64": {
"build": "11",
"sha256": "38a1b20b5ee8869b20e9f9aefdc91eedf245584d35287842a66540f0745dd3d0",
"url": "https://github.com/adoptium/temurin23-binaries/releases/download/jdk-23.0.1%2B11/OpenJDK23U-jre_x64_alpine-linux_hotspot_23.0.1_11.tar.gz",
"version": "23.0.1"
"build": "7",
"sha256": "4513750bd10cc6c38f0c19d335dac7dcc112bba64e52010f81ba29e7a71e2a76",
"url": "https://github.com/adoptium/temurin23-binaries/releases/download/jdk-23.0.2%2B7/OpenJDK23U-jre_x64_alpine-linux_hotspot_23.0.2_7.tar.gz",
"version": "23.0.2"
}
},
"openjdk8": {
@@ -123,9 +123,9 @@
"vmType": "hotspot",
"x86_64": {
"build": "6",
"sha256": "7f7c265560dd5a42533bf282831d7d2f044a7ff7f4c310b40a0f9f8e19ff12e5",
"url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u432-b06/OpenJDK8U-jre_x64_alpine-linux_hotspot_8u432b06.tar.gz",
"version": "8.0.432"
"sha256": "4fb0636534b0cd4534a3cdcbbe7cf2e937523d6376d9cef00cc6cfd5d19537e8",
"url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u442-b06/OpenJDK8U-jre_x64_alpine-linux_hotspot_8u442b06.tar.gz",
"version": "8.0.442"
}
}
}
@@ -134,332 +134,332 @@
"jdk": {
"openjdk11": {
"aarch64": {
"build": "9",
"sha256": "f2087cc3abdd509b74facf8e43e81e36244d14c70dec080b8f3a662695417ca7",
"url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.25%2B9/OpenJDK11U-jdk_aarch64_linux_hotspot_11.0.25_9.tar.gz",
"version": "11.0.25"
"build": "4",
"sha256": "e7b3d37c347fe7af2a53711f16da8b9b164748ce4a84e47bb0739c3be7f1c421",
"url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.26%2B4/OpenJDK11U-jdk_aarch64_linux_hotspot_11.0.26_4.tar.gz",
"version": "11.0.26"
},
"armv6l": {
"build": "9",
"sha256": "6bdd7da08c9f8fedded8da0411b6566c16cb9a904d164b68a0b7f11c8376673a",
"url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.25%2B9/OpenJDK11U-jdk_arm_linux_hotspot_11.0.25_9.tar.gz",
"version": "11.0.25"
"build": "4",
"sha256": "79d574328f6960d40349996ef8c5949581f9e533dc76f134857c4125c78558ff",
"url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.26%2B4/OpenJDK11U-jdk_arm_linux_hotspot_11.0.26_4.tar.gz",
"version": "11.0.26"
},
"armv7l": {
"build": "9",
"sha256": "6bdd7da08c9f8fedded8da0411b6566c16cb9a904d164b68a0b7f11c8376673a",
"url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.25%2B9/OpenJDK11U-jdk_arm_linux_hotspot_11.0.25_9.tar.gz",
"version": "11.0.25"
"build": "4",
"sha256": "79d574328f6960d40349996ef8c5949581f9e533dc76f134857c4125c78558ff",
"url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.26%2B4/OpenJDK11U-jdk_arm_linux_hotspot_11.0.26_4.tar.gz",
"version": "11.0.26"
},
"packageType": "jdk",
"powerpc64le": {
"build": "9",
"sha256": "0014ffdae26d2b8f840b4842e3f9d4edc3576b4a961770708273d8ecc86ba5b6",
"url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.25%2B9/OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.25_9.tar.gz",
"version": "11.0.25"
"build": "4",
"sha256": "42c63651125a149cee2ba781300d75ffa67a25032f95038d50ee6d6177cb2e41",
"url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.26%2B4/OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.26_4.tar.gz",
"version": "11.0.26"
},
"vmType": "hotspot",
"x86_64": {
"build": "9",
"sha256": "191baa2e052627614022171400a917d28f0987dc54da48aaf07b06f552bb9884",
"url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.25%2B9/OpenJDK11U-jdk_x64_linux_hotspot_11.0.25_9.tar.gz",
"version": "11.0.25"
"build": "4",
"sha256": "7def4c5807b38ef1a7bb30a86572a795ca604127cc8d1f5b370abf23618104e6",
"url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.26%2B4/OpenJDK11U-jdk_x64_linux_hotspot_11.0.26_4.tar.gz",
"version": "11.0.26"
}
},
"openjdk17": {
"aarch64": {
"build": "11",
"sha256": "0c17fa4f14c0d2cc9e9334f996fccdddc5da4459d768f3105c7ff0283c47bf62",
"url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.13%2B11/OpenJDK17U-jdk_aarch64_linux_hotspot_17.0.13_11.tar.gz",
"version": "17.0.13"
"build": "7",
"sha256": "62efc3e83fc9bcd08db7c4f02977328cb3559a54519078d8337314cf025d19b7",
"url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.14%2B7/OpenJDK17U-jdk_aarch64_linux_hotspot_17.0.14_7.tar.gz",
"version": "17.0.14"
},
"armv6l": {
"build": "11",
"sha256": "e69d43be937e05dbccae4cc98f732ed86aa11993234bf5ad6e81c30475a78ce7",
"url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.13%2B11/OpenJDK17U-jdk_arm_linux_hotspot_17.0.13_11.tar.gz",
"version": "17.0.13"
"build": "7",
"sha256": "f43986385403c0f08bd3512c9d11a51c49044a7c8a0a39cf4e2e3731ca0db229",
"url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.14%2B7/OpenJDK17U-jdk_arm_linux_hotspot_17.0.14_7.tar.gz",
"version": "17.0.14"
},
"armv7l": {
"build": "11",
"sha256": "e69d43be937e05dbccae4cc98f732ed86aa11993234bf5ad6e81c30475a78ce7",
"url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.13%2B11/OpenJDK17U-jdk_arm_linux_hotspot_17.0.13_11.tar.gz",
"version": "17.0.13"
"build": "7",
"sha256": "f43986385403c0f08bd3512c9d11a51c49044a7c8a0a39cf4e2e3731ca0db229",
"url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.14%2B7/OpenJDK17U-jdk_arm_linux_hotspot_17.0.14_7.tar.gz",
"version": "17.0.14"
},
"packageType": "jdk",
"powerpc64le": {
"build": "11",
"sha256": "d4e553c6fa7afdfe2577420c6e77a558db8113a3cef84e755384148f5610834e",
"url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.13%2B11/OpenJDK17U-jdk_ppc64le_linux_hotspot_17.0.13_11.tar.gz",
"version": "17.0.13"
"build": "7",
"sha256": "f4cb9ee5906a44d110fa381310cd7181d95498d27087d449e7e9b74bddd9def2",
"url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.14%2B7/OpenJDK17U-jdk_ppc64le_linux_hotspot_17.0.14_7.tar.gz",
"version": "17.0.14"
},
"riscv64": {
"build": "11",
"sha256": "e7c82833a7381a05cae2be0e947c08e971bbae4f2e4142c6ec87bbd7530a5646",
"url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.13%2B11/OpenJDK17U-jdk_riscv64_linux_hotspot_17.0.13_11.tar.gz",
"version": "17.0.13"
"build": "7",
"sha256": "d7ba818b1417b67f1f3cdcf7c5fac5e179998469dce7448349f24175eb9b2871",
"url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.14%2B7/OpenJDK17U-jdk_riscv64_linux_hotspot_17.0.14_7.tar.gz",
"version": "17.0.14"
},
"vmType": "hotspot",
"x86_64": {
"build": "11",
"sha256": "8682892fc02965930b9022c066fa164dd6f458ef4a5dc262016aa28333b30f49",
"url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.13%2B11/OpenJDK17U-jdk_x64_linux_hotspot_17.0.13_11.tar.gz",
"version": "17.0.13"
"build": "7",
"sha256": "a3af83983fb94dd7d11b13ba2dba0fb6819dc2caaf87e6937afd22ad4680ae9a",
"url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.14%2B7/OpenJDK17U-jdk_x64_linux_hotspot_17.0.14_7.tar.gz",
"version": "17.0.14"
}
},
"openjdk21": {
"aarch64": {
"build": "11",
"sha256": "6482639ed9fd22aa2e704cc366848b1b3e1586d2bf1213869c43e80bca58fe5c",
"url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.5%2B11/OpenJDK21U-jdk_aarch64_linux_hotspot_21.0.5_11.tar.gz",
"version": "21.0.5"
"build": "7",
"sha256": "04fe1273f624187d927f1b466e8cdb630d70786db07bee7599bfa5153060afd3",
"url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.6%2B7/OpenJDK21U-jdk_aarch64_linux_hotspot_21.0.6_7.tar.gz",
"version": "21.0.6"
},
"packageType": "jdk",
"powerpc64le": {
"build": "11",
"sha256": "3c6f4c358facfb6c19d90faf02bfe0fc7512d6b0e80ac18146bbd7e0d01deeef",
"url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.5%2B11/OpenJDK21U-jdk_ppc64le_linux_hotspot_21.0.5_11.tar.gz",
"version": "21.0.5"
"build": "7",
"sha256": "163724b70b86d5a8461f85092165a9cc5a098ed900fee90d1b0c0be9607ae3d2",
"url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.6%2B7/OpenJDK21U-jdk_ppc64le_linux_hotspot_21.0.6_7.tar.gz",
"version": "21.0.6"
},
"riscv64": {
"build": "11",
"sha256": "2f1b3e401e36de803398dfb9818861f9f14ca8ae7db650ea0946ab048fefe3b9",
"url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.5%2B11/OpenJDK21U-jdk_riscv64_linux_hotspot_21.0.5_11.tar.gz",
"version": "21.0.5"
"build": "7",
"sha256": "203796e4ba2689aa921b5e0cdc9e02984d88622f80fcb9acb05a118b05007be8",
"url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.6%2B7/OpenJDK21U-jdk_riscv64_linux_hotspot_21.0.6_7.tar.gz",
"version": "21.0.6"
},
"vmType": "hotspot",
"x86_64": {
"build": "11",
"sha256": "3c654d98404c073b8a7e66bffb27f4ae3e7ede47d13284c132d40a83144bfd8c",
"url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.5%2B11/OpenJDK21U-jdk_x64_linux_hotspot_21.0.5_11.tar.gz",
"version": "21.0.5"
"build": "7",
"sha256": "a2650fba422283fbed20d936ce5d2a52906a5414ec17b2f7676dddb87201dbae",
"url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.6%2B7/OpenJDK21U-jdk_x64_linux_hotspot_21.0.6_7.tar.gz",
"version": "21.0.6"
}
},
"openjdk23": {
"aarch64": {
"build": "11",
"sha256": "808e3843293e50515bf02ad2f956e543da65e32dac82ae7a266a147b3485c61a",
"url": "https://github.com/adoptium/temurin23-binaries/releases/download/jdk-23.0.1%2B11/OpenJDK23U-jdk_aarch64_linux_hotspot_23.0.1_11.tar.gz",
"version": "23.0.1"
"build": "7",
"sha256": "fb43ae1202402842559cb6223886ec1663b90ffbec48479abbcb92c92c9012eb",
"url": "https://github.com/adoptium/temurin23-binaries/releases/download/jdk-23.0.2%2B7/OpenJDK23U-jdk_aarch64_linux_hotspot_23.0.2_7.tar.gz",
"version": "23.0.2"
},
"packageType": "jdk",
"powerpc64le": {
"build": "11",
"sha256": "1885ab141fe7b8ed6beb77b814b1c1c99fd54713399bf917edb6a4020545adde",
"url": "https://github.com/adoptium/temurin23-binaries/releases/download/jdk-23.0.1%2B11/OpenJDK23U-jdk_ppc64le_linux_hotspot_23.0.1_11.tar.gz",
"version": "23.0.1"
"build": "7",
"sha256": "548fd82af4eb0802fe20b0b61a4664a69c7f03cd963540908f30dbf73636dafe",
"url": "https://github.com/adoptium/temurin23-binaries/releases/download/jdk-23.0.2%2B7/OpenJDK23U-jdk_ppc64le_linux_hotspot_23.0.2_7.tar.gz",
"version": "23.0.2"
},
"riscv64": {
"build": "11",
"sha256": "80d7bab9f9614bdf934c6bc441031bd1fead3aea85f16770123bd8a6bcdc52b6",
"url": "https://github.com/adoptium/temurin23-binaries/releases/download/jdk-23.0.1%2B11/OpenJDK23U-jdk_riscv64_linux_hotspot_23.0.1_11.tar.gz",
"version": "23.0.1"
"build": "7",
"sha256": "1e102e1e6653f8810ef6c275b0d38ea7036abd4a8709f0f916b339f65e76bb56",
"url": "https://github.com/adoptium/temurin23-binaries/releases/download/jdk-23.0.2%2B7/OpenJDK23U-jdk_riscv64_linux_hotspot_23.0.2_7.tar.gz",
"version": "23.0.2"
},
"vmType": "hotspot",
"x86_64": {
"build": "11",
"sha256": "2400267e4e9c0f6ae880a4d763af6caf18c673714bdee5debf8388b0b5d52886",
"url": "https://github.com/adoptium/temurin23-binaries/releases/download/jdk-23.0.1%2B11/OpenJDK23U-jdk_x64_linux_hotspot_23.0.1_11.tar.gz",
"version": "23.0.1"
"build": "7",
"sha256": "870ac8c05c6fe563e7a3878a47d0234b83c050e83651d2c47e8b822ec74512dd",
"url": "https://github.com/adoptium/temurin23-binaries/releases/download/jdk-23.0.2%2B7/OpenJDK23U-jdk_x64_linux_hotspot_23.0.2_7.tar.gz",
"version": "23.0.2"
}
},
"openjdk8": {
"aarch64": {
"build": "6",
"sha256": "383caabc20428e9500f2e07965317ed4387a0e336104483e29a9e06eeffbf26b",
"url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u432-b06/OpenJDK8U-jdk_aarch64_linux_hotspot_8u432b06.tar.gz",
"version": "8.0.432"
"sha256": "1d1662bd8ca7edc9281c723d9eebafea940e6a41464bdc43a83b564bc974c7e5",
"url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u442-b06/OpenJDK8U-jdk_aarch64_linux_hotspot_8u442b06.tar.gz",
"version": "8.0.442"
},
"armv6l": {
"build": "6",
"sha256": "ff1ce3f6f1cf11987ab63f278b29cf1aae799652606c547f8a590e7acbd16b61",
"url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u432-b06/OpenJDK8U-jdk_arm_linux_hotspot_8u432b06.tar.gz",
"version": "8.0.432"
"sha256": "c555750ee41799d30553bd9744c1ab9b8e6b2a2ea83195619a11ef30cc4154f4",
"url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u442-b06/OpenJDK8U-jdk_arm_linux_hotspot_8u442b06.tar.gz",
"version": "8.0.442"
},
"armv7l": {
"build": "6",
"sha256": "ff1ce3f6f1cf11987ab63f278b29cf1aae799652606c547f8a590e7acbd16b61",
"url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u432-b06/OpenJDK8U-jdk_arm_linux_hotspot_8u432b06.tar.gz",
"version": "8.0.432"
"sha256": "c555750ee41799d30553bd9744c1ab9b8e6b2a2ea83195619a11ef30cc4154f4",
"url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u442-b06/OpenJDK8U-jdk_arm_linux_hotspot_8u442b06.tar.gz",
"version": "8.0.442"
},
"packageType": "jdk",
"powerpc64le": {
"build": "6",
"sha256": "64fb17e83b79f9ad41dc18351a408bfe90324fd6360903ca5c0a740006c81be3",
"url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u432-b06/OpenJDK8U-jdk_ppc64le_linux_hotspot_8u432b06.tar.gz",
"version": "8.0.432"
"sha256": "7eac77deb8fc6c6130f9445c9a68af0bcc40bf6736b5672ef5c3d737c025e84d",
"url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u442-b06/OpenJDK8U-jdk_ppc64le_linux_hotspot_8u442b06.tar.gz",
"version": "8.0.442"
},
"vmType": "hotspot",
"x86_64": {
"build": "6",
"sha256": "abaaa90deadf51bd28921453baf2992b3dff6171bb7142f5bdd14ef269f7b245",
"url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u432-b06/OpenJDK8U-jdk_x64_linux_hotspot_8u432b06.tar.gz",
"version": "8.0.432"
"sha256": "5b0a0145e7790552a9c8767b4680074c4628ec276e5bb278b61d85cf90facafa",
"url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u442-b06/OpenJDK8U-jdk_x64_linux_hotspot_8u442b06.tar.gz",
"version": "8.0.442"
}
}
},
"jre": {
"openjdk11": {
"aarch64": {
"build": "9",
"sha256": "e37ba6636e31f3c9191ac7e3fd0ab7fb354a2f3b320d68bfb95efd1e053134c9",
"url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.25%2B9/OpenJDK11U-jre_aarch64_linux_hotspot_11.0.25_9.tar.gz",
"version": "11.0.25"
"build": "4",
"sha256": "4ececb5c229763107e9e4acf3b7035db38cf18a98a47176fa5ed1be3f3d15518",
"url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.26%2B4/OpenJDK11U-jre_aarch64_linux_hotspot_11.0.26_4.tar.gz",
"version": "11.0.26"
},
"armv6l": {
"build": "9",
"sha256": "6b7b1297da762cf2b1eb4834073e6a45cda82a359efb17a89eba3fc6b59b4d26",
"url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.25%2B9/OpenJDK11U-jre_arm_linux_hotspot_11.0.25_9.tar.gz",
"version": "11.0.25"
"build": "4",
"sha256": "e4a00a3ea318a63ba97236633f34c8a5477f6cdb643cf6883788840818110f5f",
"url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.26%2B4/OpenJDK11U-jre_arm_linux_hotspot_11.0.26_4.tar.gz",
"version": "11.0.26"
},
"armv7l": {
"build": "9",
"sha256": "6b7b1297da762cf2b1eb4834073e6a45cda82a359efb17a89eba3fc6b59b4d26",
"url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.25%2B9/OpenJDK11U-jre_arm_linux_hotspot_11.0.25_9.tar.gz",
"version": "11.0.25"
"build": "4",
"sha256": "e4a00a3ea318a63ba97236633f34c8a5477f6cdb643cf6883788840818110f5f",
"url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.26%2B4/OpenJDK11U-jre_arm_linux_hotspot_11.0.26_4.tar.gz",
"version": "11.0.26"
},
"packageType": "jre",
"powerpc64le": {
"build": "9",
"sha256": "7e7edaf34c29c304514d60f40f6c9ce58eb3e32b0dec20bb6ccd1cfbb4456698",
"url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.25%2B9/OpenJDK11U-jre_ppc64le_linux_hotspot_11.0.25_9.tar.gz",
"version": "11.0.25"
"build": "4",
"sha256": "69b38f0dde128d8c606012335cd60f1f55afa09b4135582188943bee699ebf03",
"url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.26%2B4/OpenJDK11U-jre_ppc64le_linux_hotspot_11.0.26_4.tar.gz",
"version": "11.0.26"
},
"vmType": "hotspot",
"x86_64": {
"build": "9",
"sha256": "84cd7101f39172a4db085fb52940595bb14dad6bc3afb5bf82ee497eceaf86d3",
"url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.25%2B9/OpenJDK11U-jre_x64_linux_hotspot_11.0.25_9.tar.gz",
"version": "11.0.25"
"build": "4",
"sha256": "d26c566a7010d1303d3979b6f076e7911b49419a609c9e4d81f27262bf47f87c",
"url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.26%2B4/OpenJDK11U-jre_x64_linux_hotspot_11.0.26_4.tar.gz",
"version": "11.0.26"
}
},
"openjdk17": {
"aarch64": {
"build": "11",
"sha256": "97c4fb748eaa1292fb2f28fec90a3eba23e35974ef67f8b3aa304ad4db2ba162",
"url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.13%2B11/OpenJDK17U-jre_aarch64_linux_hotspot_17.0.13_11.tar.gz",
"version": "17.0.13"
"build": "7",
"sha256": "bab3f352fc7144ac1435924f056872d16f4b32c8bcda58b9a77b636eb1c664f4",
"url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.14%2B7/OpenJDK17U-jre_aarch64_linux_hotspot_17.0.14_7.tar.gz",
"version": "17.0.14"
},
"armv6l": {
"build": "11",
"sha256": "f9c4008680db016c9cab26cc2739d4553898911522f6a78a611fafa1f5270c88",
"url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.13%2B11/OpenJDK17U-jre_arm_linux_hotspot_17.0.13_11.tar.gz",
"version": "17.0.13"
"build": "7",
"sha256": "7ac439bce4d5ecddb250b31401b1c1a6da2762f51652eafedd53584a0d9e3130",
"url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.14%2B7/OpenJDK17U-jre_arm_linux_hotspot_17.0.14_7.tar.gz",
"version": "17.0.14"
},
"armv7l": {
"build": "11",
"sha256": "f9c4008680db016c9cab26cc2739d4553898911522f6a78a611fafa1f5270c88",
"url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.13%2B11/OpenJDK17U-jre_arm_linux_hotspot_17.0.13_11.tar.gz",
"version": "17.0.13"
"build": "7",
"sha256": "7ac439bce4d5ecddb250b31401b1c1a6da2762f51652eafedd53584a0d9e3130",
"url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.14%2B7/OpenJDK17U-jre_arm_linux_hotspot_17.0.14_7.tar.gz",
"version": "17.0.14"
},
"packageType": "jre",
"powerpc64le": {
"build": "11",
"sha256": "790f53fcc95cc76ed8f27d3146cf789fc354a2afb7148cffd197ca61a643212f",
"url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.13%2B11/OpenJDK17U-jre_ppc64le_linux_hotspot_17.0.13_11.tar.gz",
"version": "17.0.13"
"build": "7",
"sha256": "2a730e9d34cce4d588739b626a034ed68c065a2db61048ee7886be48ec9fe460",
"url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.14%2B7/OpenJDK17U-jre_ppc64le_linux_hotspot_17.0.14_7.tar.gz",
"version": "17.0.14"
},
"riscv64": {
"build": "11",
"sha256": "f6f3e71e5452b764aad47e6ffa4f0b26fcfe69bd9eb07fbd468343f9dd5f17b5",
"url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.13%2B11/OpenJDK17U-jre_riscv64_linux_hotspot_17.0.13_11.tar.gz",
"version": "17.0.13"
"build": "7",
"sha256": "2f77e44aa9fec9cf35b0b1fd492055e7fec0a3ea4d4338def6b42bd46d485e02",
"url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.14%2B7/OpenJDK17U-jre_riscv64_linux_hotspot_17.0.14_7.tar.gz",
"version": "17.0.14"
},
"vmType": "hotspot",
"x86_64": {
"build": "11",
"sha256": "4086cc7cb2d9e7810141f255063caad10a8a018db5e6b47fa5394c506ab65bff",
"url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.13%2B11/OpenJDK17U-jre_x64_linux_hotspot_17.0.13_11.tar.gz",
"version": "17.0.13"
"build": "7",
"sha256": "a4b0015872758aac6a5d17139e952a3951ee536ae6d9a99828823a80a71add56",
"url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.14%2B7/OpenJDK17U-jre_x64_linux_hotspot_17.0.14_7.tar.gz",
"version": "17.0.14"
}
},
"openjdk21": {
"aarch64": {
"build": "11",
"sha256": "e4d02c33aeaf8e1148c1c505e129a709c5bc1889e855d4fb4f001b1780db42b4",
"url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.5%2B11/OpenJDK21U-jre_aarch64_linux_hotspot_21.0.5_11.tar.gz",
"version": "21.0.5"
"build": "7",
"sha256": "f1b78f2bd6d505d5e0539261737740ad11ade3233376b4ca52e6c72fbefd2bf6",
"url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.6%2B7/OpenJDK21U-jre_aarch64_linux_hotspot_21.0.6_7.tar.gz",
"version": "21.0.6"
},
"packageType": "jre",
"powerpc64le": {
"build": "11",
"sha256": "ae9ad61578da420fa7aeb01d3f6909da8a74d54a31bb8ba090a263cfadf221cc",
"url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.5%2B11/OpenJDK21U-jre_ppc64le_linux_hotspot_21.0.5_11.tar.gz",
"version": "21.0.5"
"build": "7",
"sha256": "381e31581af3858d4c471829c3da3263e83dfe8ac5d36b58403babb57f6e202c",
"url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.6%2B7/OpenJDK21U-jre_ppc64le_linux_hotspot_21.0.6_7.tar.gz",
"version": "21.0.6"
},
"riscv64": {
"build": "11",
"sha256": "c6fe71bb6ce61366242073e3904c4f51613252a885d54be81c65d3fadd2c5b7c",
"url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.5%2B11/OpenJDK21U-jre_riscv64_linux_hotspot_21.0.5_11.tar.gz",
"version": "21.0.5"
"build": "7",
"sha256": "a8d219a4a97f9c53ba88cb8927910005d4f3d08a87ab1bdebff921ef41afa93d",
"url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.6%2B7/OpenJDK21U-jre_riscv64_linux_hotspot_21.0.6_7.tar.gz",
"version": "21.0.6"
},
"vmType": "hotspot",
"x86_64": {
"build": "11",
"sha256": "553dda64b3b1c3c16f8afe402377ffebe64fb4a1721a46ed426a91fd18185e62",
"url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.5%2B11/OpenJDK21U-jre_x64_linux_hotspot_21.0.5_11.tar.gz",
"version": "21.0.5"
"build": "7",
"sha256": "7fc9d6837da5fa1f12e0f41901fd70a73154914b8c8ecbbcad2d44176a989937",
"url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.6%2B7/OpenJDK21U-jre_x64_linux_hotspot_21.0.6_7.tar.gz",
"version": "21.0.6"
}
},
"openjdk23": {
"aarch64": {
"build": "11",
"sha256": "0b498a5b673cb50fe9cfd0a13bd39c7259b4fad4d930d614e1563aeb8bca7f0e",
"url": "https://github.com/adoptium/temurin23-binaries/releases/download/jdk-23.0.1%2B11/OpenJDK23U-jre_aarch64_linux_hotspot_23.0.1_11.tar.gz",
"version": "23.0.1"
"build": "7",
"sha256": "b2a8a287ebd2d2a1d5d32eb6b79768cf2b5e02f1b4d6d4791297feb8636b9e2f",
"url": "https://github.com/adoptium/temurin23-binaries/releases/download/jdk-23.0.2%2B7/OpenJDK23U-jre_aarch64_linux_hotspot_23.0.2_7.tar.gz",
"version": "23.0.2"
},
"packageType": "jre",
"powerpc64le": {
"build": "11",
"sha256": "ae5d49932f7d9b182c2d9ededa18bd4defc61873f1d717caa3d905bba870a683",
"url": "https://github.com/adoptium/temurin23-binaries/releases/download/jdk-23.0.1%2B11/OpenJDK23U-jre_ppc64le_linux_hotspot_23.0.1_11.tar.gz",
"version": "23.0.1"
"build": "7",
"sha256": "a21355923fdcdcc49fcf6359f2763f49f001bd4caeb970f7313f18aeaa61b588",
"url": "https://github.com/adoptium/temurin23-binaries/releases/download/jdk-23.0.2%2B7/OpenJDK23U-jre_ppc64le_linux_hotspot_23.0.2_7.tar.gz",
"version": "23.0.2"
},
"riscv64": {
"build": "11",
"sha256": "cf65a926c2d7cbdbaa63242a8d20ce747335e7260eaaabd7bb52d51c099fda9a",
"url": "https://github.com/adoptium/temurin23-binaries/releases/download/jdk-23.0.1%2B11/OpenJDK23U-jre_riscv64_linux_hotspot_23.0.1_11.tar.gz",
"version": "23.0.1"
"build": "7",
"sha256": "c2c8f8add6af6518cfc565ec0a7410e031301b91f2d8bd594303d7f04680da4e",
"url": "https://github.com/adoptium/temurin23-binaries/releases/download/jdk-23.0.2%2B7/OpenJDK23U-jre_riscv64_linux_hotspot_23.0.2_7.tar.gz",
"version": "23.0.2"
},
"vmType": "hotspot",
"x86_64": {
"build": "11",
"sha256": "1233cbec40f05c76ad926b68521ae78c6ae4f454996ef549602be6987069fa77",
"url": "https://github.com/adoptium/temurin23-binaries/releases/download/jdk-23.0.1%2B11/OpenJDK23U-jre_x64_linux_hotspot_23.0.1_11.tar.gz",
"version": "23.0.1"
"build": "7",
"sha256": "1a16c654e67a72dadfa632969a457404ad1cc30c6375857fdcb393e0592ce3ba",
"url": "https://github.com/adoptium/temurin23-binaries/releases/download/jdk-23.0.2%2B7/OpenJDK23U-jre_x64_linux_hotspot_23.0.2_7.tar.gz",
"version": "23.0.2"
}
},
"openjdk8": {
"aarch64": {
"build": "6",
"sha256": "786522da4c761104dd8274c81edc90126a25acaafbbbc5da886b3fb51f33cba2",
"url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u432-b06/OpenJDK8U-jre_aarch64_linux_hotspot_8u432b06.tar.gz",
"version": "8.0.432"
"sha256": "730ed649ee973b7408cf7107e90576b67e8ed4b3aebb9e3e8a1056151f373152",
"url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u442-b06/OpenJDK8U-jre_aarch64_linux_hotspot_8u442b06.tar.gz",
"version": "8.0.442"
},
"armv6l": {
"build": "6",
"sha256": "49894dbe2f915dfad026cf7b4013118c0284e88359172499b1b25a4dac195ff1",
"url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u432-b06/OpenJDK8U-jre_arm_linux_hotspot_8u432b06.tar.gz",
"version": "8.0.432"
"sha256": "055c47c5c1dfe8c9c135d87fed7a3745c17374618bc8d5acb9316d1b812c0e6d",
"url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u442-b06/OpenJDK8U-jre_arm_linux_hotspot_8u442b06.tar.gz",
"version": "8.0.442"
},
"armv7l": {
"build": "6",
"sha256": "49894dbe2f915dfad026cf7b4013118c0284e88359172499b1b25a4dac195ff1",
"url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u432-b06/OpenJDK8U-jre_arm_linux_hotspot_8u432b06.tar.gz",
"version": "8.0.432"
"sha256": "055c47c5c1dfe8c9c135d87fed7a3745c17374618bc8d5acb9316d1b812c0e6d",
"url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u442-b06/OpenJDK8U-jre_arm_linux_hotspot_8u442b06.tar.gz",
"version": "8.0.442"
},
"packageType": "jre",
"powerpc64le": {
"build": "6",
"sha256": "c573f33f9e5ba49a4838847d0d34efc9c1dc57a9ba71b926599530bbcda87f65",
"url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u432-b06/OpenJDK8U-jre_ppc64le_linux_hotspot_8u432b06.tar.gz",
"version": "8.0.432"
"sha256": "812ebf110f1d1cfc26a135368850064f96689e7918aa6bbac1c8f210fad5752f",
"url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u442-b06/OpenJDK8U-jre_ppc64le_linux_hotspot_8u442b06.tar.gz",
"version": "8.0.442"
},
"vmType": "hotspot",
"x86_64": {
"build": "6",
"sha256": "bb8c8cc575b69e68e12a213674ec2e3848baff4f1955d2973d98e67666ab94d7",
"url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u432-b06/OpenJDK8U-jre_x64_linux_hotspot_8u432b06.tar.gz",
"version": "8.0.432"
"sha256": "730fe33b1fc1f7da1e325d007b475d25a063850a167b548ea4bf689d4fcd867d",
"url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u442-b06/OpenJDK8U-jre_x64_linux_hotspot_8u442b06.tar.gz",
"version": "8.0.442"
}
}
}
@@ -468,66 +468,66 @@
"jdk": {
"openjdk11": {
"aarch64": {
"build": "9",
"sha256": "658f73050ab168109862d4e25eefeedb587063cc01128a78ea4081e8ec62edcf",
"url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.25%2B9/OpenJDK11U-jdk_aarch64_mac_hotspot_11.0.25_9.tar.gz",
"version": "11.0.25"
"build": "4",
"sha256": "c970e5917964da1b50c0029ba88a6fbe962783def4de6a8a2835af6a6859002c",
"url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.26%2B4/OpenJDK11U-jdk_aarch64_mac_hotspot_11.0.26_4.tar.gz",
"version": "11.0.26"
},
"packageType": "jdk",
"vmType": "hotspot",
"x86_64": {
"build": "9",
"sha256": "fa6f88ebd8c3d2b4f5146cd45e4ef875cb2d073b6e95b60de86a1ce0bfdb463a",
"url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.25%2B9/OpenJDK11U-jdk_x64_mac_hotspot_11.0.25_9.tar.gz",
"version": "11.0.25"
"build": "4",
"sha256": "b0142c2c85da43bb3565321164e8129b1166de5d6a43c88e567a92c39128c003",
"url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.26%2B4/OpenJDK11U-jdk_x64_mac_hotspot_11.0.26_4.tar.gz",
"version": "11.0.26"
}
},
"openjdk17": {
"aarch64": {
"build": "11",
"sha256": "d8b2f77f755d06e81a540834c5be22ed86f3c8a51a20396606c074303f8f9e2d",
"url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.13%2B11/OpenJDK17U-jdk_aarch64_mac_hotspot_17.0.13_11.tar.gz",
"version": "17.0.13"
"build": "7",
"sha256": "95bcc8052340394b87644d71a60fb26f31857f4090a7dfee57113e9e0f2dfacb",
"url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.14%2B7/OpenJDK17U-jdk_aarch64_mac_hotspot_17.0.14_7.tar.gz",
"version": "17.0.14"
},
"packageType": "jdk",
"vmType": "hotspot",
"x86_64": {
"build": "11",
"sha256": "840535070200a944a6b582d258ee84608bd25c9f2b5d1cdddb58dfadb019675a",
"url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.13%2B11/OpenJDK17U-jdk_x64_mac_hotspot_17.0.13_11.tar.gz",
"version": "17.0.13"
"build": "7",
"sha256": "bc2e9225d156d27149fc7a91817e6b64f76132b2b81d1f44cb8c90d7497b6ea7",
"url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.14%2B7/OpenJDK17U-jdk_x64_mac_hotspot_17.0.14_7.tar.gz",
"version": "17.0.14"
}
},
"openjdk21": {
"aarch64": {
"build": "11",
"sha256": "dc6db7347907d23743d13af935d3c10e8b3490acdf542115f578838227da0dab",
"url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.5%2B11/OpenJDK21U-jdk_aarch64_mac_hotspot_21.0.5_11.tar.gz",
"version": "21.0.5"
"build": "7",
"sha256": "4ef4083919126a3d93e603284b405c7493905497485a92b375f5d6c3e8f7e8f2",
"url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.6%2B7/OpenJDK21U-jdk_aarch64_mac_hotspot_21.0.6_7.tar.gz",
"version": "21.0.6"
},
"packageType": "jdk",
"vmType": "hotspot",
"x86_64": {
"build": "11",
"sha256": "b9b46f396ab5f3658fa5569af963896167c7f735cfec816359c04101fae38bdf",
"url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.5%2B11/OpenJDK21U-jdk_x64_mac_hotspot_21.0.5_11.tar.gz",
"version": "21.0.5"
"build": "7",
"sha256": "7aacfc400078ad65b7c7de3ec75ff74bf5c2077d6740b350f85ae10be4f71e76",
"url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.6%2B7/OpenJDK21U-jdk_x64_mac_hotspot_21.0.6_7.tar.gz",
"version": "21.0.6"
}
},
"openjdk23": {
"aarch64": {
"build": "11",
"sha256": "9e69810a50c8183e01429243d0bb112e381a122c6e7be936b7c13c3cfe7b29a0",
"url": "https://github.com/adoptium/temurin23-binaries/releases/download/jdk-23.0.1%2B11/OpenJDK23U-jdk_aarch64_mac_hotspot_23.0.1_11.tar.gz",
"version": "23.0.1"
"build": "7",
"sha256": "749993e751f085c7ae713140066a90800075e4aeedfac50a5ed0c5457131c5a0",
"url": "https://github.com/adoptium/temurin23-binaries/releases/download/jdk-23.0.2%2B7/OpenJDK23U-jdk_aarch64_mac_hotspot_23.0.2_7.tar.gz",
"version": "23.0.2"
},
"packageType": "jdk",
"vmType": "hotspot",
"x86_64": {
"build": "11",
"sha256": "055a5b9c27991ad955c8207a20b549ac3254d479aa8a4fc199b6b02d56b1875e",
"url": "https://github.com/adoptium/temurin23-binaries/releases/download/jdk-23.0.1%2B11/OpenJDK23U-jdk_x64_mac_hotspot_23.0.1_11.tar.gz",
"version": "23.0.1"
"build": "7",
"sha256": "97fca2e90668351f248f149d4e96e16875094eba6716a8dd1dcf163be9e19085",
"url": "https://github.com/adoptium/temurin23-binaries/releases/download/jdk-23.0.2%2B7/OpenJDK23U-jdk_x64_mac_hotspot_23.0.2_7.tar.gz",
"version": "23.0.2"
}
},
"openjdk8": {
@@ -535,75 +535,75 @@
"vmType": "hotspot",
"x86_64": {
"build": "6",
"sha256": "e5cc78b704cf96f7a6c4ad677048f79331f38cd37fbef6c86dce75e1bfe28895",
"url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u432-b06/OpenJDK8U-jdk_x64_mac_hotspot_8u432b06.tar.gz",
"version": "8.0.432"
"sha256": "2f70725e032fe55629a2659d53646b14c538b12cdcedc2d3c9fa342e1b401cf1",
"url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u442-b06/OpenJDK8U-jdk_x64_mac_hotspot_8u442b06.tar.gz",
"version": "8.0.442"
}
}
},
"jre": {
"openjdk11": {
"aarch64": {
"build": "9",
"sha256": "f1d602b478269c7def552d4a01c5ba3ac91cc34f5d66b5313da3aa0b72d670e7",
"url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.25%2B9/OpenJDK11U-jre_aarch64_mac_hotspot_11.0.25_9.tar.gz",
"version": "11.0.25"
"build": "4",
"sha256": "ea341e15094e8e892a2d9ff1d4960d1fd05937385278912618905d4b9e7c88e8",
"url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.26%2B4/OpenJDK11U-jre_aarch64_mac_hotspot_11.0.26_4.tar.gz",
"version": "11.0.26"
},
"packageType": "jre",
"vmType": "hotspot",
"x86_64": {
"build": "9",
"sha256": "97e0e32b12460e92e3b4632492b3ccd648cf03a6023ca2ee7dc81f7cfa3bd275",
"url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.25%2B9/OpenJDK11U-jre_x64_mac_hotspot_11.0.25_9.tar.gz",
"version": "11.0.25"
"build": "4",
"sha256": "6d184fbcfa659675f52a7d789d4db05b9c9873c18ad9975a7b3c31e20ee4c878",
"url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.26%2B4/OpenJDK11U-jre_x64_mac_hotspot_11.0.26_4.tar.gz",
"version": "11.0.26"
}
},
"openjdk17": {
"aarch64": {
"build": "11",
"sha256": "a886b8f2a50eca2e59b45ea59f5a2e8e9d27ff5b5b3b069443a70cda7f27c907",
"url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.13%2B11/OpenJDK17U-jre_aarch64_mac_hotspot_17.0.13_11.tar.gz",
"version": "17.0.13"
"build": "7",
"sha256": "9fb89125d5807f42cec588824fde487be42273a89c55ccfc5f44efda64e03e2c",
"url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.14%2B7/OpenJDK17U-jre_aarch64_mac_hotspot_17.0.14_7.tar.gz",
"version": "17.0.14"
},
"packageType": "jre",
"vmType": "hotspot",
"x86_64": {
"build": "11",
"sha256": "bf9faf4540001a251e6bfb52b99c7ec5b1f36d3ebe94e104f61a30f173ba8c78",
"url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.13%2B11/OpenJDK17U-jre_x64_mac_hotspot_17.0.13_11.tar.gz",
"version": "17.0.13"
"build": "7",
"sha256": "f2c7454f7aba076cd414887b31da92e4a50fda7a13d97f6e295c911af60de0b6",
"url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.14%2B7/OpenJDK17U-jre_x64_mac_hotspot_17.0.14_7.tar.gz",
"version": "17.0.14"
}
},
"openjdk21": {
"aarch64": {
"build": "11",
"sha256": "12249a1c5386957c93fc372260c483ae921b1ec6248a5136725eabd0abc07f93",
"url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.5%2B11/OpenJDK21U-jre_aarch64_mac_hotspot_21.0.5_11.tar.gz",
"version": "21.0.5"
"build": "7",
"sha256": "9b792bbd408676483caaeb619439190abf1552fe11ab05b19c80d408e5f49c25",
"url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.6%2B7/OpenJDK21U-jre_aarch64_mac_hotspot_21.0.6_7.tar.gz",
"version": "21.0.6"
},
"packageType": "jre",
"vmType": "hotspot",
"x86_64": {
"build": "11",
"sha256": "0e0dcb571f7bf7786c111fe066932066d9eab080c9f86d8178da3e564324ee81",
"url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.5%2B11/OpenJDK21U-jre_x64_mac_hotspot_21.0.5_11.tar.gz",
"version": "21.0.5"
"build": "7",
"sha256": "632f7cba1aa752ae4108eccf3abc8b7e51b75d262e11e0cb9077b847438e5549",
"url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.6%2B7/OpenJDK21U-jre_x64_mac_hotspot_21.0.6_7.tar.gz",
"version": "21.0.6"
}
},
"openjdk23": {
"aarch64": {
"build": "11",
"sha256": "e29029d35608f4e415e49c7990ebe0f42d0ecb7dc2d4d444e41adf3e3287f922",
"url": "https://github.com/adoptium/temurin23-binaries/releases/download/jdk-23.0.1%2B11/OpenJDK23U-jre_aarch64_mac_hotspot_23.0.1_11.tar.gz",
"version": "23.0.1"
"build": "7",
"sha256": "56b86d4f5745ba44894310c3417755e4b4aaa62d4a17a5cb4dab6200c14c56fe",
"url": "https://github.com/adoptium/temurin23-binaries/releases/download/jdk-23.0.2%2B7/OpenJDK23U-jre_aarch64_mac_hotspot_23.0.2_7.tar.gz",
"version": "23.0.2"
},
"packageType": "jre",
"vmType": "hotspot",
"x86_64": {
"build": "11",
"sha256": "87e532fda02327e0f2766650223b6bd63a4407c4907f82790edb5862a5285116",
"url": "https://github.com/adoptium/temurin23-binaries/releases/download/jdk-23.0.1%2B11/OpenJDK23U-jre_x64_mac_hotspot_23.0.1_11.tar.gz",
"version": "23.0.1"
"build": "7",
"sha256": "2c5b81ce3234d6bef0ec352734aa2de19c0950020c55a1cbfc21ae5fda7690b8",
"url": "https://github.com/adoptium/temurin23-binaries/releases/download/jdk-23.0.2%2B7/OpenJDK23U-jre_x64_mac_hotspot_23.0.2_7.tar.gz",
"version": "23.0.2"
}
},
"openjdk8": {
@@ -611,9 +611,9 @@
"vmType": "hotspot",
"x86_64": {
"build": "6",
"sha256": "55aac241ad7cb7c1903d4810ad705ffe2f2536a88b6a88efabb4942a9f09db33",
"url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u432-b06/OpenJDK8U-jre_x64_mac_hotspot_8u432b06.tar.gz",
"version": "8.0.432"
"sha256": "e2658d0808fd2f4d5ad261a8954366a9b277eabd55a404452674b56abc325fec",
"url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u442-b06/OpenJDK8U-jre_x64_mac_hotspot_8u442b06.tar.gz",
"version": "8.0.442"
}
}
}
pkgs/development/compilers/vala/default.nix
+2 -3
View File
@@ -15,7 +15,7 @@
libintl,
libtool,
expat,
substituteAll,
replaceVars,
vala,
gobject-introspection,
}:
@@ -45,8 +45,7 @@ let
pname = "vala";
inherit version;
setupHook = substituteAll {
src = ./setup-hook.sh;
setupHook = replaceVars ./setup-hook.sh {
apiVersion = lib.versions.majorMinor version;
};
pkgs/development/embedded/platformio/core.nix
+3 -5
View File
@@ -6,7 +6,7 @@
installShellFiles,
git,
spdx-license-list-data,
substituteAll,
replaceVars,
}:
with python3Packages;
@@ -29,12 +29,10 @@ buildPythonApplication rec {
];
patches = [
(substituteAll {
src = ./interpreter.patch;
(replaceVars ./interpreter.patch {
interpreter = (python3Packages.python.withPackages (_: propagatedBuildInputs)).interpreter;
})
(substituteAll {
src = ./use-local-spdx-license-list.patch;
(replaceVars ./use-local-spdx-license-list.patch {
spdx_license_list_data = spdx-license-list-data.json;
})
./missing-udev-rules-nixos.patch
pkgs/development/haskell-modules/configuration-nix.nix
+4 -2
View File
@@ -1325,9 +1325,11 @@ self: super: builtins.intersectAttrs super {
# whatever graphviz is in PATH.
graphviz = overrideCabal (drv: {
patches = [
(pkgs.substituteAll {
src = ./patches/graphviz-hardcode-graphviz-store-path.patch;
(pkgs.replaceVars ./patches/graphviz-hardcode-graphviz-store-path.patch {
inherit (pkgs) graphviz;
# patch context
dot = null;
PATH = null;
})
] ++ (drv.patches or []);
}) super.graphviz;
pkgs/development/interpreters/acl2/default.nix
+2 -3
View File
@@ -6,7 +6,7 @@
fetchpatch,
runCommandLocal,
makeWrapper,
substituteAll,
replaceVars,
sbcl,
bash,
which,
@@ -52,8 +52,7 @@ stdenv.mkDerivation rec {
libipasir = callPackage ./libipasirglucose4 { };
patches = [
(substituteAll {
src = ./0001-Fix-some-paths-for-Nix-build.patch;
(replaceVars ./0001-Fix-some-paths-for-Nix-build.patch {
libipasir = "${libipasir}/lib/${libipasir.libname}";
libssl = "${lib.getLib openssl}/lib/libssl${stdenv.hostPlatform.extensions.sharedLibrary}";
libcrypto = "${lib.getLib openssl}/lib/libcrypto${stdenv.hostPlatform.extensions.sharedLibrary}";
pkgs/development/interpreters/python/pypy/default.nix
+3 -5
View File
@@ -1,4 +1,4 @@
{ lib, stdenv, substituteAll, fetchurl
{ lib, stdenv, replaceVars, fetchurl
, zlibSupport ? true, zlib
, bzip2, pkg-config, libffi
, sqlite, openssl, ncurses, python, expat, tcl, tk, tclPackages, libX11
@@ -76,8 +76,7 @@ in with passthru; stdenv.mkDerivation rec {
patches = [
./dont_fetch_vendored_deps.patch
(substituteAll {
src = ./tk_tcl_paths.patch;
(replaceVars ./tk_tcl_paths.patch {
inherit tk tcl;
tk_dev = tk.dev;
tcl_dev = tcl;
@@ -85,8 +84,7 @@ in with passthru; stdenv.mkDerivation rec {
tcl_libprefix = tcl.libPrefix;
})
(substituteAll {
src = ./sqlite_paths.patch;
(replaceVars ./sqlite_paths.patch {
inherit (sqlite) out dev;
})
];
pkgs/development/libraries/SDL2/default.nix
+2 -2
View File
@@ -70,13 +70,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "SDL2";
version = "2.30.12";
version = "2.32.0";
src = fetchFromGitHub {
owner = "libsdl-org";
repo = "SDL";
rev = "release-${finalAttrs.version}";
hash = "sha256-9f7V15p8Cso1TVxcd7bEFGO3C3oIhQikyLh4pWXLaiA=";
hash = "sha256-BdyMlttrDwQMoz+bO6bfU3bh0xKnT8yQF6nb6OGRbHw=";
};
dontDisableStatic = if withStatic then 1 else 0;
outputs = [
pkgs/development/libraries/appstream/default.nix
+2 -3
View File
@@ -1,6 +1,6 @@
{ lib
, stdenv
, substituteAll
, replaceVars
, fetchFromGitHub
, meson
, mesonEmulatorHook
@@ -50,8 +50,7 @@ stdenv.mkDerivation (finalAttrs: {
patches = [
# Fix hardcoded paths
(substituteAll {
src = ./fix-paths.patch;
(replaceVars ./fix-paths.patch {
libstemmer_includedir = "${lib.getDev libstemmer}/include";
})
pkgs/development/libraries/gdk-pixbuf/default.nix
-1
View File
@@ -53,7 +53,6 @@ stdenv.mkDerivation (finalAttrs: {
./installed-tests-path.patch
./static-deps.patch
./static-lerc.patch
];
# gdk-pixbuf-thumbnailer is not wrapped therefore strictDeps will work
pkgs/development/libraries/gdk-pixbuf/static-lerc.patch
-79
View File
@@ -1,79 +0,0 @@
From 3bca69d889fe545dda4ed9a8fab8ff3fe38ba487 Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Wed, 5 Feb 2025 19:37:27 +0100
Subject: [PATCH] build: fix linking with libtiff with lerc support
Lerc is written in C++. When C and C++ objects are linked, a C++
linker should be used to ensure C++-specific things are correctly
handled. See e.g. this comment in the Meson source for reference[1].
One symptom of using a C linker to link with C++ objects is that
libstdc++ won't be linked when building static executables, causing
link failures.
Unfortunately, Meson does not know whether dependencies found by
pkg-config are C++, and therefore require a C++ linker, so we have to
tell it ourselves to use a C++ linker. There's no way to check
whether libtiff is built with Lerc support, so we always use a C++
linker if one is available and libtiff support is enabled. If a C++
linker ends up being used to link only C objects, it shouldn't do any
harm.
[1]: https://github.com/mesonbuild/meson/blob/9fd5281befe7881c9d1210c9e6865382bc0f2b08/mesonbuild/build.py#L1558-L1565
---
Link: https://gitlab.gnome.org/GNOME/gdk-pixbuf/-/merge_requests/181
gdk-pixbuf/meson.build | 6 ++++++
meson.build | 6 ++++++
2 files changed, 12 insertions(+)
diff --git a/gdk-pixbuf/meson.build b/gdk-pixbuf/meson.build
index 570625bfe..5cc11355f 100644
--- a/gdk-pixbuf/meson.build
+++ b/gdk-pixbuf/meson.build
@@ -333,6 +333,11 @@ gdkpixbuf_bin = [
[ 'gdk-pixbuf-query-loaders', [ 'queryloaders.c' ] ],
]
+bin_link_language = 'c'
+if loaders_cpp
+ bin_link_language = 'cpp'
+endif
+
foreach bin: gdkpixbuf_bin
bin_name = bin[0]
bin_source = bin.get(1, bin_name + '.c')
@@ -342,6 +347,7 @@ foreach bin: gdkpixbuf_bin
dependencies: gdk_pixbuf_deps + [ gdkpixbuf_dep ],
include_directories: [ root_inc, gdk_pixbuf_inc ],
c_args: common_cflags + gdk_pixbuf_cflags,
+ link_language : bin_link_language,
install: true)
meson.override_find_program(bin_name, bin)
diff --git a/meson.build b/meson.build
index f0d4812f4..31b3197fc 100644
--- a/meson.build
+++ b/meson.build
@@ -345,6 +345,8 @@ endif
# Don't check and build the tiff loader if native_windows_loaders is true
tiff_opt = get_option('tiff')
+tiff_dep = dependency('', required: false)
+loaders_cpp = false
if not tiff_opt.disabled() and not native_windows_loaders
# We currently don't have a fallback subproject, but this handles error
# reporting if tiff_opt is enabled.
@@ -353,6 +355,10 @@ if not tiff_opt.disabled() and not native_windows_loaders
if tiff_dep.found()
enabled_loaders += 'tiff'
loaders_deps += tiff_dep
+
+ # If libtiff is built with LERC support, it should be linked with
+ # a C++ linker.
+ loaders_cpp = loaders_cpp or add_languages('cpp', required: false, native: false)
endif
endif
--
GitLab
pkgs/development/libraries/gssdp/tools.nix
+2 -3
View File
@@ -1,7 +1,7 @@
{
stdenv,
lib,
substituteAll,
replaceVars,
meson,
ninja,
pkg-config,
@@ -18,8 +18,7 @@ stdenv.mkDerivation rec {
patches = [
# Allow building tools separately from the library.
# This is needed to break the depenency cycle.
(substituteAll {
src = ./standalone-tools.patch;
(replaceVars ./standalone-tools.patch {
inherit version;
})
];
pkgs/development/libraries/gstreamer/bad/default.nix
+2 -3
View File
@@ -2,7 +2,7 @@
, stdenv
, fetchurl
, fetchpatch
, substituteAll
, replaceVars
, meson
, ninja
, gettext
@@ -127,8 +127,7 @@ stdenv.mkDerivation rec {
patches = [
# Add fallback paths for nvidia userspace libraries
(substituteAll {
src = ./fix-paths.patch;
(replaceVars ./fix-paths.patch {
inherit (addDriverRunpath) driverLink;
})
# Add support for newer AJA SDK from next GStreamer release
pkgs/development/libraries/gstreamer/good/default.nix
+2 -3
View File
@@ -1,6 +1,6 @@
{ lib, stdenv
, fetchurl
, substituteAll
, replaceVars
, meson
, nasm
, ninja
@@ -71,8 +71,7 @@ stdenv.mkDerivation rec {
# Reenable dynamic loading of libsoup on Darwin and use a different approach to do it.
./souploader-darwin.diff
# dlopen libsoup_3 with an absolute path
(substituteAll {
src = ./souploader.diff;
(replaceVars ./souploader.diff {
nixLibSoup3Path = "${lib.getLib libsoup_3}/lib";
})
];
pkgs/development/libraries/gtk/2.x.nix
+2 -3
View File
@@ -22,7 +22,7 @@
pango,
perl,
pkg-config,
substituteAll,
replaceVars,
testers,
AppKit,
Cocoa,
@@ -32,8 +32,7 @@
}:
let
gtkCleanImmodulesCache = substituteAll {
src = ./hooks/clean-immodules-cache.sh;
gtkCleanImmodulesCache = replaceVars ./hooks/clean-immodules-cache.sh {
gtk_module_path = "gtk-2.0";
gtk_binary_version = "2.10.0";
};
pkgs/development/libraries/gtk/3.x.nix
+2 -3
View File
@@ -1,6 +1,6 @@
{ lib
, stdenv
, substituteAll
, replaceVars
, fetchurl
, pkg-config
, gettext
@@ -53,8 +53,7 @@
let
gtkCleanImmodulesCache = substituteAll {
src = ./hooks/clean-immodules-cache.sh;
gtkCleanImmodulesCache = replaceVars ./hooks/clean-immodules-cache.sh {
gtk_module_path = "gtk-3.0";
gtk_binary_version = "3.0.0";
};
pkgs/development/libraries/gtk/4.x.nix
+2 -3
View File
@@ -1,7 +1,7 @@
{ lib
, stdenv
, buildPackages
, substituteAll
, replaceVars
, fetchurl
, pkg-config
, docutils
@@ -58,8 +58,7 @@
let
gtkCleanImmodulesCache = substituteAll {
src = ./hooks/clean-immodules-cache.sh;
gtkCleanImmodulesCache = replaceVars ./hooks/clean-immodules-cache.sh {
gtk_module_path = "gtk-4.0";
gtk_binary_version = "4.0.0";
};
pkgs/development/libraries/libextractor/default.nix
+2 -3
View File
@@ -3,7 +3,7 @@
stdenv,
fetchurl,
fetchpatch2,
substituteAll,
replaceVars,
libtool,
gettext,
zlib,
@@ -60,8 +60,7 @@ stdenv.mkDerivation rec {
++ lib.optionals gstreamerSupport [
# Libraries cannot be wrapped so we need to hardcode the plug-in paths.
(substituteAll {
src = ./gst-hardcode-plugins.patch;
(replaceVars ./gst-hardcode-plugins.patch {
load_gst_plugins = lib.concatMapStrings (
plugin: ''gst_registry_scan_path(gst_registry_get(), "${lib.getLib plugin}/lib/gstreamer-1.0");''
) (gstPlugins gst_all_1);
pkgs/development/libraries/libpeas/2.x.nix
+2 -3
View File
@@ -3,7 +3,7 @@
, buildPackages
, fetchurl
, pkgsCross
, substituteAll
, replaceVars
, pkg-config
, gi-docgen
, gobject-introspection
@@ -34,8 +34,7 @@ stdenv.mkDerivation rec {
patches = [
# Make PyGObject’s gi library available.
(substituteAll {
src = ./fix-paths.patch;
(replaceVars ./fix-paths.patch {
pythonPaths = lib.concatMapStringsSep ", " (pkg: "'${pkg}/${python3.sitePackages}'") [
python3.pkgs.pygobject3
];
pkgs/development/libraries/libpeas/default.nix
+2 -3
View File
@@ -2,7 +2,7 @@
stdenv,
lib,
fetchurl,
substituteAll,
replaceVars,
meson,
ninja,
pkg-config,
@@ -34,8 +34,7 @@ stdenv.mkDerivation rec {
patches = [
# Make PyGObject’s gi library available.
(substituteAll {
src = ./fix-paths.patch;
(replaceVars ./fix-paths.patch {
pythonPaths = lib.concatMapStringsSep ", " (pkg: "'${pkg}/${python3.sitePackages}'") [
python3.pkgs.pygobject3
];
pkgs/development/libraries/libproxy/default.nix
+27 -16
View File
@@ -15,19 +15,26 @@
ninja,
pkg-config,
stdenv,
substituteAll,
replaceVars,
vala,
buildPackages,
withIntrospection ?
lib.meta.availableOn stdenv.hostPlatform gobject-introspection
&& stdenv.hostPlatform.emulatorAvailable buildPackages,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "libproxy";
version = "0.5.9";
outputs = [
"out"
"dev"
"devdoc"
];
outputs =
[
"out"
"dev"
]
++ lib.optionals withIntrospection [
"devdoc"
];
src = fetchFromGitHub {
owner = "libproxy";
@@ -46,8 +53,7 @@ stdenv.mkDerivation (finalAttrs: {
# Hardcode path to Settings schemas for GNOME & related desktops.
# Otherwise every app using libproxy would need to be wrapped individually.
(substituteAll {
src = ./hardcode-gsettings.patch;
(replaceVars ./hardcode-gsettings.patch {
gds = glib.getSchemaPath gsettings-desktop-schemas;
})
];
@@ -65,14 +71,17 @@ stdenv.mkDerivation (finalAttrs: {
--replace-fail "requires_private: 'gobject-2.0'" "requires: 'gobject-2.0'"
'';
nativeBuildInputs = [
gi-docgen
gobject-introspection
meson
ninja
pkg-config
vala
];
nativeBuildInputs =
[
meson
ninja
pkg-config
]
++ lib.optionals withIntrospection [
gi-docgen
gobject-introspection
vala
];
buildInputs =
[
@@ -95,6 +104,8 @@ stdenv.mkDerivation (finalAttrs: {
[
# Prevent installing commit hook.
"-Drelease=true"
(lib.mesonBool "docs" withIntrospection)
(lib.mesonBool "introspection" withIntrospection)
]
++ lib.optionals stdenv.hostPlatform.isDarwin [
"-Dconfig-gnome=false"
pkgs/development/libraries/libqofono/default.nix
+2 -3
View File
@@ -1,6 +1,6 @@
{
lib,
substituteAll,
replaceVars,
mkDerivation,
fetchFromGitHub,
gitUpdater,
@@ -22,8 +22,7 @@ mkDerivation rec {
};
patches = [
(substituteAll {
src = ./0001-NixOS-provide-mobile-broadband-provider-info-path.patch;
(replaceVars ./0001-NixOS-provide-mobile-broadband-provider-info-path.patch {
mobileBroadbandProviderInfo = mobile-broadband-provider-info;
})
./0001-NixOS-Skip-tests-they-re-shock-full-of-hardcoded-FHS.patch
pkgs/development/libraries/librsvg/default.nix
+2 -12
View File
@@ -141,18 +141,8 @@ stdenv.mkDerivation (finalAttrs: {
(lib.mesonBool "tests" finalAttrs.finalPackage.doCheck)
];
doCheck =
# Probably broken MIME type detection.
!stdenv.isDarwin
&&
# Could be made to work, but requires the C API test to be linked
# with a C++ linker because
# librsvg -> gdk-pixbuf -> libtiff -> lerc (C++).
#
# Doesn't make sense to pursue this upstream until gdk-pixbuf
# itself is fixed:
# https://gitlab.gnome.org/GNOME/gdk-pixbuf/-/merge_requests/181
!stdenv.hostPlatform.isStatic;
# Probably broken MIME type detection.
doCheck = !stdenv.isDarwin;
env = {
PKG_CONFIG_GDK_PIXBUF_2_0_GDK_PIXBUF_QUERY_LOADERS = writeShellScript "gdk-pixbuf-loader-loaders-wrapped" ''
pkgs/development/libraries/libsbsms/common.nix
+2 -3
View File
@@ -2,7 +2,7 @@
lib,
stdenv,
fetchurl,
substituteAll,
replaceVars,
pname,
version,
url,
@@ -19,8 +19,7 @@ stdenv.mkDerivation rec {
patches = [
# Fix buidling on platforms other than x86
(substituteAll {
src = ./configure.patch;
(replaceVars ./configure.patch {
msse = lib.optionalString stdenv.hostPlatform.isx86_64 "-msse";
})
];
pkgs/development/libraries/libvirt/default.nix
+2 -3
View File
@@ -32,7 +32,7 @@
, readline
, rpcsvc-proto
, stdenv
, substituteAll
, replaceVars
, xhtml1
, json_c
, writeScript
@@ -127,8 +127,7 @@ stdenv.mkDerivation rec {
patches = [
./0001-meson-patch-in-an-install-prefix-for-building-on-nix.patch
] ++ lib.optionals enableZfs [
(substituteAll {
src = ./0002-substitute-zfs-and-zpool-commands.patch;
(replaceVars ./0002-substitute-zfs-and-zpool-commands.patch {
zfs = "${zfs}/bin/zfs";
zpool = "${zfs}/bin/zpool";
})
pkgs/development/libraries/openssl/3.3/use-etc-ssl-certs-darwin.patch → pkgs/development/libraries/openssl/3.4/use-etc-ssl-certs-darwin.patch
View File
pkgs/development/libraries/openssl/3.3/use-etc-ssl-certs.patch → pkgs/development/libraries/openssl/3.4/use-etc-ssl-certs.patch
View File
pkgs/development/libraries/openssl/default.nix
+7 -7
View File
@@ -344,8 +344,8 @@ in
};
openssl_3 = common {
version = "3.0.15";
hash = "sha256-I8Zm0O3yDxQkmz2PA2isrumrWFsJ4d6CEHxm4fPslTM=";
version = "3.0.16";
hash = "sha256-V+A8UP6rXTGxUq8rdk8QN5rs2O6S8WyYWYPOSpn374Y=";
patches = [
./3.0/nix-ssl-cert-file.patch
@@ -366,9 +366,9 @@ in
};
};
openssl_3_3 = common {
version = "3.3.2";
hash = "sha256-LopAsBl5r+i+C7+z3l3BxnCf7bRtbInBDaEUq1/D0oE=";
openssl_3_4 = common {
version = "3.4.1";
hash = "sha256-1LIlJ6ZFrPdrU+REh6jbaHxu7WIdckaJHQJeOLqMllE=";
patches = [
./3.0/nix-ssl-cert-file.patch
@@ -379,9 +379,9 @@ in
(
if stdenv.hostPlatform.isDarwin then
./3.3/use-etc-ssl-certs-darwin.patch
./3.4/use-etc-ssl-certs-darwin.patch
else
./3.3/use-etc-ssl-certs.patch
./3.4/use-etc-ssl-certs.patch
)
];
pkgs/development/libraries/qgnomeplatform/default.nix
+2 -3
View File
@@ -11,7 +11,7 @@
gtk3,
qtbase,
qtwayland,
substituteAll,
replaceVars,
gsettings-desktop-schemas,
useQt6 ? false,
}:
@@ -29,8 +29,7 @@ stdenv.mkDerivation rec {
patches = [
# Hardcode GSettings schema path to avoid crashes from missing schemas
(substituteAll {
src = ./hardcode-gsettings.patch;
(replaceVars ./hardcode-gsettings.patch {
gds_gsettings_path = glib.getSchemaPath gsettings-desktop-schemas;
})
pkgs/development/libraries/qt-5/modules/qttools.nix
+3 -5
View File
@@ -4,7 +4,7 @@
lib,
qtbase,
qtdeclarative,
substituteAll,
replaceVars,
llvmPackages,
}:
@@ -29,13 +29,11 @@ qtModule {
patches = [
# fixQtBuiltinPaths overwrites builtin paths we should keep
(substituteAll {
src = ./qttools-QT_HOST_DATA-refs.patch;
(replaceVars ./qttools-QT_HOST_DATA-refs.patch {
qtbaseDev = lib.getDev qtbase;
})
(substituteAll {
src = ./qttools-libclang-main-header.patch;
(replaceVars ./qttools-libclang-main-header.patch {
libclangDev = lib.getDev llvmPackages.libclang;
})
];
pkgs/development/libraries/quictls/default.nix
+2 -2
View File
@@ -32,8 +32,8 @@ stdenv.mkDerivation rec {
../openssl/3.0/openssl-disable-kernel-detection.patch
(if stdenv.hostPlatform.isDarwin
then ../openssl/3.3/use-etc-ssl-certs-darwin.patch
else ../openssl/3.3/use-etc-ssl-certs.patch)
then ../openssl/3.4/use-etc-ssl-certs-darwin.patch
else ../openssl/3.4/use-etc-ssl-certs.patch)
];
postPatch = ''
pkgs/development/libraries/science/math/or-tools/default.nix
+2 -3
View File
@@ -7,7 +7,7 @@
eigen,
ensureNewerSourcesForZipFilesHook,
fetchFromGitHub,
substituteAll,
replaceVars,
glpk,
lib,
pkg-config,
@@ -40,8 +40,7 @@ stdenv.mkDerivation rec {
};
patches = [
(substituteAll {
src = ./offline.patch;
(replaceVars ./offline.patch {
pybind11_protobuf = "../../pybind11_protobuf";
})
];
pkgs/development/libraries/wayqt/default.nix
+2 -3
View File
@@ -2,7 +2,7 @@
stdenv,
lib,
fetchFromGitLab,
substituteAll,
replaceVars,
meson,
pkg-config,
qttools,
@@ -25,8 +25,7 @@ stdenv.mkDerivation (finalAttrs: {
patches = [
# qmake get qtbase's path, but wayqt need qtwayland
(substituteAll {
src = ./fix-qtwayland-header-path.diff;
(replaceVars ./fix-qtwayland-header-path.diff {
qtWaylandPath = "${qtwayland}/include";
})
];
pkgs/development/libraries/webkitgtk/default.nix
+2 -3
View File
@@ -65,7 +65,7 @@
libbacktrace,
systemd,
xdg-dbus-proxy,
substituteAll,
replaceVars,
glib,
unifdef,
addDriverRunpath,
@@ -103,8 +103,7 @@ clangStdenv.mkDerivation (finalAttrs: {
};
patches = lib.optionals clangStdenv.hostPlatform.isLinux [
(substituteAll {
src = ./fix-bubblewrap-paths.patch;
(replaceVars ./fix-bubblewrap-paths.patch {
inherit (builtins) storeDir;
inherit (addDriverRunpath) driverLink;
})
pkgs/development/lisp-modules/nix-cl.nix
+2 -3
View File
@@ -59,7 +59,7 @@ let
;
inherit (pkgs)
substituteAll
replaceVars
;
# Stolen from python-packages.nix
@@ -209,8 +209,7 @@ let
;
};
buildScript = substituteAll {
src = ./builder.lisp;
buildScript = replaceVars ./builder.lisp {
asdf = "${asdfFasl}/asdf.${faslExt}";
};
pkgs/development/lua-modules/nfd/default.nix
+2 -3
View File
@@ -5,7 +5,7 @@
lua,
pkg-config,
lib,
substituteAll,
replaceVars,
zenity,
AppKit,
}:
@@ -24,8 +24,7 @@ buildLuarocksPackage {
# use zenity because default gtk impl just crashes
patches = [
(substituteAll {
src = ./zenity.patch;
(replaceVars ./zenity.patch {
inherit zenity;
})
];
pkgs/development/ocaml-modules/carton/default.nix
+2 -3
View File
@@ -27,7 +27,7 @@
cmdliner,
hxd,
getconf,
substituteAll,
replaceVars,
}:
buildDunePackage rec {
@@ -42,8 +42,7 @@ buildDunePackage rec {
};
patches = [
(substituteAll {
src = ./carton-find-getconf.patch;
(replaceVars ./carton-find-getconf.patch {
getconf = "${getconf}";
})
];
pkgs/development/ocaml-modules/menhir/default.nix
+2 -3
View File
@@ -1,6 +1,6 @@
{
buildDunePackage,
substituteAll,
replaceVars,
ocaml,
menhirLib,
menhirSdk,
@@ -19,8 +19,7 @@ buildDunePackage rec {
];
patches = [
(substituteAll {
src = ./menhir-suggest-menhirLib.patch;
(replaceVars ./menhir-suggest-menhirLib.patch {
libdir = "${menhirLib}/lib/ocaml/${ocaml.version}/site-lib/menhirLib";
})
];
pkgs/development/ocaml-modules/plotkicadsch/default.nix
+2 -3
View File
@@ -1,7 +1,7 @@
{
lib,
buildDunePackage,
substituteAll,
replaceVars,
base64,
cmdliner,
digestif,
@@ -24,8 +24,7 @@ buildDunePackage rec {
minimalOCamlVersion = "4.09";
patches = [
(substituteAll {
src = ./fix-paths.patch;
(replaceVars ./fix-paths.patch {
inherit coreutils imagemagick;
})
];
pkgs/development/php-packages/couchbase/default.nix
+2 -3
View File
@@ -4,7 +4,7 @@
fetchFromGitHub,
libcouchbase,
zlib,
substituteAll,
replaceVars,
php,
}:
let
@@ -29,8 +29,7 @@ buildPecl {
];
patches = [
(substituteAll {
src = ./libcouchbase.patch;
(replaceVars ./libcouchbase.patch {
inherit libcouchbase;
})
];
pkgs/development/python-modules/aiohttp/default.nix
+2 -3
View File
@@ -4,7 +4,7 @@
buildPythonPackage,
fetchFromGitHub,
fetchpatch2,
substituteAll,
replaceVars,
isPy310,
isPyPy,
@@ -57,8 +57,7 @@ buildPythonPackage rec {
};
patches = [
(substituteAll {
src = ./unvendor-llhttp.patch;
(replaceVars ./unvendor-llhttp.patch {
llhttpDev = lib.getDev llhttp;
llhttpLib = lib.getLib llhttp;
})
pkgs/development/python-modules/anytree/default.nix
+2 -3
View File
@@ -8,7 +8,7 @@
pytest7CheckHook,
pythonOlder,
six,
substituteAll,
replaceVars,
withGraphviz ? true,
}:
@@ -27,8 +27,7 @@ buildPythonPackage rec {
};
patches = lib.optionals withGraphviz [
(substituteAll {
src = ./graphviz.patch;
(replaceVars ./graphviz.patch {
inherit graphviz;
})
];
pkgs/development/python-modules/attrs/default.nix
+2 -3
View File
@@ -4,7 +4,7 @@
buildPythonPackage,
fetchPypi,
pythonOlder,
substituteAll,
replaceVars,
hatchling,
}:
@@ -20,9 +20,8 @@ buildPythonPackage rec {
};
patches = [
(substituteAll {
(replaceVars ./remove-hatch-plugins.patch {
# hatch-vcs and hatch-fancy-pypi-readme depend on pytest, which depends on attrs
src = ./remove-hatch-plugins.patch;
inherit version;
})
];
pkgs/development/python-modules/bash-kernel/default.nix
+2 -3
View File
@@ -8,7 +8,7 @@
python,
pexpect,
bashInteractive,
substituteAll,
replaceVars,
}:
buildPythonPackage rec {
@@ -23,8 +23,7 @@ buildPythonPackage rec {
};
patches = [
(substituteAll {
src = ./bash-path.patch;
(replaceVars ./bash-path.patch {
bash = lib.getExe bashInteractive;
})
];
pkgs/development/python-modules/bokeh/default.nix
+2 -3
View File
@@ -4,7 +4,7 @@
fetchPypi,
fetchFromGitHub,
pythonOlder,
substituteAll,
replaceVars,
colorama,
contourpy,
jinja2,
@@ -64,8 +64,7 @@ buildPythonPackage rec {
};
patches = [
(substituteAll {
src = ./hardcode-nodejs-npmjs-paths.patch;
(replaceVars ./hardcode-nodejs-npmjs-paths.patch {
node_bin = "${nodejs}/bin/node";
npm_bin = "${nodejs}/bin/npm";
})
pkgs/development/python-modules/cairocffi/default.nix
+2 -3
View File
@@ -5,7 +5,7 @@
pythonOlder,
fetchPypi,
lib,
substituteAll,
replaceVars,
pikepdf,
pytestCheckHook,
cairo,
@@ -32,8 +32,7 @@ buildPythonPackage rec {
patches = [
# OSError: dlopen() failed to load a library: gdk-pixbuf-2.0 / gdk-pixbuf-2.0-0
(substituteAll {
src = ./dlopen-paths.patch;
(replaceVars ./dlopen-paths.patch {
ext = stdenv.hostPlatform.extensions.sharedLibrary;
cairo = cairo.out;
glib = glib.out;
pkgs/development/python-modules/cmdstanpy/default.nix
+2 -3
View File
@@ -2,7 +2,7 @@
lib,
buildPythonPackage,
fetchFromGitHub,
substituteAll,
replaceVars,
cmdstan,
setuptools,
pandas,
@@ -27,8 +27,7 @@ buildPythonPackage rec {
};
patches = [
(substituteAll {
src = ./use-nix-cmdstan-path.patch;
(replaceVars ./use-nix-cmdstan-path.patch {
cmdstan = "${cmdstan}/opt/cmdstan";
})
];
pkgs/development/python-modules/debugpy/default.nix
+4 -7
View File
@@ -5,7 +5,7 @@
pythonOlder,
pythonAtLeast,
fetchFromGitHub,
substituteAll,
replaceVars,
gdb,
lldb,
pytestCheckHook,
@@ -39,8 +39,7 @@ buildPythonPackage rec {
patches =
[
# Use nixpkgs version instead of versioneer
(substituteAll {
src = ./hardcode-version.patch;
(replaceVars ./hardcode-version.patch {
inherit version;
})
@@ -62,15 +61,13 @@ buildPythonPackage rec {
]
++ lib.optionals stdenv.hostPlatform.isLinux [
# Hard code GDB path (used to attach to process)
(substituteAll {
src = ./hardcode-gdb.patch;
(replaceVars ./hardcode-gdb.patch {
inherit gdb;
})
]
++ lib.optionals stdenv.hostPlatform.isDarwin [
# Hard code LLDB path (used to attach to process)
(substituteAll {
src = ./hardcode-lldb.patch;
(replaceVars ./hardcode-lldb.patch {
inherit lldb;
})
];
pkgs/development/python-modules/deltachat2/default.nix
+2 -3
View File
@@ -4,7 +4,7 @@
buildPythonPackage,
deltachat-rpc-server,
setuptools-scm,
substituteAll,
replaceVars,
}:
buildPythonPackage rec {
@@ -20,8 +20,7 @@ buildPythonPackage rec {
};
patches = [
(substituteAll {
src = ./paths.patch;
(replaceVars ./paths.patch {
deltachatrpcserver = lib.getExe deltachat-rpc-server;
})
];
pkgs/development/python-modules/django/3.nix
+9 -9
View File
@@ -3,7 +3,7 @@
stdenv,
buildPythonPackage,
fetchPypi,
substituteAll,
replaceVars,
geos_3_9,
gdal,
asgiref,
@@ -28,17 +28,17 @@ buildPythonPackage rec {
patches =
[
(substituteAll {
src = ./django_3_set_zoneinfo_dir.patch;
(replaceVars ./django_3_set_zoneinfo_dir.patch {
zoneinfo = tzdata + "/share/zoneinfo";
})
]
++ lib.optional withGdal (substituteAll {
src = ./django_3_set_geos_gdal_lib.patch;
inherit geos_3_9;
inherit gdal;
extension = stdenv.hostPlatform.extensions.sharedLibrary;
});
++ lib.optional withGdal (
replaceVars ./django_3_set_geos_gdal_lib.patch {
inherit geos_3_9;
inherit gdal;
extension = stdenv.hostPlatform.extensions.sharedLibrary;
}
);
propagatedBuildInputs = [
asgiref

Some files were not shown because too many files have changed in this diff Show More